cli include fixes?

app_api_table_i.h

@@ -1,5 +1,6 @@
 #include <stdbool.h>
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <cli/cli_ansi.h>
 #include <lib/print/wrappers.h>
 #include <lib/toolbox/args.h>

cli/cli.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <cli/cli_ansi.h>
 #include "../types/plugin_state.h"
 

cli/cli_plugin_interface.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <cli/cli_ansi.h>
 #include <furi/core/string.h>
 #include "../types/plugin_state.h"

cli/cli_shared_methods.c

@@ -1,5 +1,6 @@
 #include "cli_shared_methods.h"
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <cli/cli_ansi.h>
 #include <lib/toolbox/args.h>
 #include "cli_helpers.h"

cli/cli_shared_methods.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <cli/cli_ansi.h>
 #include "../types/plugin_state.h"