cli include fixes?

upython.h

@@ -1,6 +1,7 @@
 #pragma once
 
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <furi.h>
 
 #define TAG "uPython"

upython_file.c

@@ -1,4 +1,5 @@
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <furi.h>
 
 #include <genhdr/mpversion.h>

upython_repl.c

@@ -1,6 +1,7 @@
 #include <stdio.h>
 
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <cli/cli_ansi.h>
 #include <furi.h>
 

upython_splash.c

@@ -4,7 +4,8 @@
 #include <gui/gui.h>
 #include <dialogs/dialogs.h>
 #include <storage/storage.h>
-#include <cli/cli.h>
+#include <toolbox/cli/cli_command.h>
+#include <cli/cli_main_commands.h>
 #include <cli/cli_vcp.h>
 
 #include <mp_flipper_runtime.h>