Move rest of ClientSource/ into Controllers/SerialPABotBase/.

Mysticial · Mysticial · commit 9c9d41dbfc7d · 2025-09-28T21:55:50.000-07:00
diff --git a/Common/Cpp/Time.cpp b/Common/Cpp/Time.cpp
@@ -6,6 +6,7 @@
 
 #include <ctime>
 //#include <format>
+#include <sstream>
 #include "Common/Cpp/PrettyPrint.h"
 #include "Time.h"
 
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/BotBase.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/BotBase.cpp
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/BotBase.h b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/BotBase.h
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/BotBaseMessage.h b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/BotBaseMessage.h
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageConverter.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageConverter.cpp
@@ -11,7 +11,7 @@
 #include "Common/Cpp/Exceptions.h"
 //#include "Common/Microcontroller/PABotBaseIDs.h"
 //#include "Common/NintendoSwitch/NintendoSwitch_Protocol_PushButtons.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
+#include "Controllers/SerialPABotBase/Connection/BotBaseMessage.h"
 #include "MessageConverter.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageConverter.h b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageConverter.h
@@ -5,7 +5,7 @@
  */
 
 #include <string>
-#include "ClientSource/Connection/BotBase.h"
+#include "BotBase.h"
 
 namespace PokemonAutomation{
 
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageLogger.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageLogger.cpp
@@ -6,7 +6,7 @@
 
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
-#include "ClientSource/Libraries/MessageConverter.h"
+#include "Controllers/SerialPABotBase/Connection/MessageConverter.h"
 #include "BotBaseMessage.h"
 #include "MessageLogger.h"
 
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageLogger.h b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageLogger.h
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageSniffer.h b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/MessageSniffer.h
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBase.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBase.cpp
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBase.h b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBase.h
@@ -32,8 +32,8 @@
 #include "Common/Cpp/AbstractLogger.h"
 #include "Common/Cpp/Concurrency/SpinLock.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
-#include "ClientSource/Connection/MessageLogger.h"
-#include "ClientSource/Connection/PABotBaseConnection.h"
+#include "Controllers/SerialPABotBase/Connection/MessageLogger.h"
+#include "Controllers/SerialPABotBase/Connection/PABotBaseConnection.h"
 #include "BotBase.h"
 #include "BotBaseMessage.h"
 
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBaseConnection.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBaseConnection.cpp
@@ -6,7 +6,7 @@
 
 #include "Common/CRC32.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
-#include "ClientSource/Libraries/MessageConverter.h"
+//#include "Controllers/SerialPABotBase/Connection/MessageConverter.h"
 #include "BotBaseMessage.h"
 #include "PABotBaseConnection.h"
 
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBaseConnection.h b/SerialPrograms/Source/Controllers/SerialPABotBase/Connection/PABotBaseConnection.h
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.cpp
@@ -7,15 +7,14 @@
 #include <QtGlobal>
 #include <QSerialPortInfo>
 #include <QMessageBox>
+#include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/PanicDump.h"
-#include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/SerialConnection/SerialConnection.h"
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "ClientSource/Connection/PABotBase.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Options/Environment/ThemeSelectorOption.h"
 #include "Controllers/ControllerTypeStrings.h"
+#include "Controllers/SerialPABotBase/Connection/PABotBase.h"
 #include "Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.h"
 #include "SerialPABotBase.h"
 #include "SerialPABotBase_Connection.h"
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Connection.h
@@ -8,13 +8,13 @@
 #define PokemonAutomation_Controllers_SerialPABotBase_Connection_H
 
 #include <memory>
-#include <set>
+//#include <set>
 #include <mutex>
 #include <condition_variable>
 #include <thread>
-#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "ClientSource/Connection/MessageLogger.h"
+//#include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
+#include "Controllers/SerialPABotBase/Connection/BotBase.h"
+#include "Controllers/SerialPABotBase/Connection/MessageLogger.h"
 #include "Controllers/ControllerConnection.h"
 
 class QSerialPortInfo;
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.cpp
@@ -6,7 +6,7 @@
 
 #include <sstream>
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h"
-#include "ClientSource/Libraries/MessageConverter.h"
+#include "Controllers/SerialPABotBase/Connection/MessageConverter.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.h b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_HID_Keyboard.h
@@ -8,7 +8,7 @@
 #define PokemonAutomation_SerialPABotBase_HID_Keyboard_H
 
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_HID_Keyboard.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
+#include "Controllers/SerialPABotBase/Connection/BotBaseMessage.h"
 
 namespace PokemonAutomation{
 namespace SerialPABotBase{
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.cpp
@@ -7,7 +7,7 @@
 #include <sstream>
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_NS1_WirelessControllers.h"
-#include "ClientSource/Libraries/MessageConverter.h"
+#include "Controllers/SerialPABotBase/Connection/MessageConverter.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 
 namespace PokemonAutomation{
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.h b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS1_WirelessControllers.h
@@ -9,8 +9,8 @@
 
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_NS1_WirelessControllers.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
 #include "Controllers/ControllerTypes.h"
+#include "Controllers/SerialPABotBase/Connection/BotBaseMessage.h"
 
 namespace PokemonAutomation{
 namespace SerialPABotBase{
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS2_WiredController.cpp b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS2_WiredController.cpp
@@ -6,7 +6,7 @@
 
 #include <sstream>
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_NS2_WiredController.h"
-#include "ClientSource/Libraries/MessageConverter.h"
+#include "Controllers/SerialPABotBase/Connection/MessageConverter.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 //#include "NintendoSwitch/Controllers/NintendoSwitch_ControllerButtons.h"
 
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS2_WiredController.h b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_NS2_WiredController.h
@@ -8,7 +8,7 @@
 #define PokemonAutomation_SerialPABotBase_NS2_WiredController_H
 
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_NS2_WiredController.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
+#include "Controllers/SerialPABotBase/Connection/BotBaseMessage.h"
 
 namespace PokemonAutomation{
 namespace SerialPABotBase{
diff --git a/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.h b/SerialPrograms/Source/Controllers/SerialPABotBase/SerialPABotBase_Routines_Protocol.h
@@ -9,8 +9,8 @@
 
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol_IDs.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
+#include "Controllers/SerialPABotBase/Connection/BotBase.h"
+#include "Controllers/SerialPABotBase/Connection/BotBaseMessage.h"
 
 namespace PokemonAutomation{
 namespace SerialPABotBase{
diff --git a/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.h b/SerialPrograms/Source/Controllers/StandardHid/StandardHid_Keyboard_SerialPABotBase.h
@@ -7,7 +7,6 @@
 #ifndef PokemonAutomation_StandardHid_Keyboard_SerialPABotBase_H
 #define PokemonAutomation_StandardHid_Keyboard_SerialPABotBase_H
 
-#include "ClientSource/Connection/BotBase.h"
 #include "Controllers/SerialPABotBase/SerialPABotBase_Connection.h"
 #include "Controllers/SerialPABotBase/SerialPABotBase_StatusThread.h"
 #include "StandardHid_Keyboard.h"
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.cpp
@@ -4,7 +4,6 @@
  * 
  */
 
-#include "ClientSource/Libraries/MessageConverter.h"
 #include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch_Commands_Superscalar.h"
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.cpp
@@ -4,17 +4,10 @@
  * 
  */
 
-//#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
-#include "CommonFramework/VideoPipeline/VideoFeed.h"
-#include "CommonTools/Async/InferenceRoutines.h"
-#include "NintendoSwitch/NintendoSwitch_Settings.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
 #include "NintendoSwitch_Commands_Routines.h"
 #include "NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch_Commands_Superscalar.h"
-#include "NintendoSwitch/Inference/NintendoSwitch_HomeMenuDetector.h"
-//#include "NintendoSwitch_Messages_Routines.h"
 
 //#include <iostream>
 //using std::cout;
diff --git a/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp b/SerialPrograms/Source/NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.cpp
@@ -4,8 +4,6 @@
  *
  */
 
-//#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
 #include "NintendoSwitch_Commands_Superscalar.h"
 //#include "NintendoSwitch_Messages_Superscalar.h"
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Controller.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Controller.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
 #include "Controllers/ControllerTypeStrings.h"
 #include "NintendoSwitch_SerialPABotBase_Controller.h"
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Controller.h b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_Controller.h
@@ -7,7 +7,7 @@
 #ifndef PokemonAutomation_NintendoSwitch_SerialPABotBase_Controller_H
 #define PokemonAutomation_NintendoSwitch_SerialPABotBase_Controller_H
 
-#include "ClientSource/Connection/BotBase.h"
+#include "Controllers/SerialPABotBase/Connection/BotBase.h"
 #include "Controllers/SerialPABotBase/SerialPABotBase_Connection.h"
 #include "NintendoSwitch/Controllers/NintendoSwitch_ControllerWithScheduler.h"
 
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessJoycon.cpp
@@ -5,7 +5,6 @@
  */
 
 #include "Common/Cpp/Exceptions.h"
-#include "ClientSource/Libraries/MessageConverter.h"
 #include "NintendoSwitch_SerialPABotBase_WirelessJoycon.h"
 
 //#include <iostream>
diff --git a/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.cpp b/SerialPrograms/Source/NintendoSwitch/Controllers/SerialPABotBase/NintendoSwitch_SerialPABotBase_WirelessProController.cpp
@@ -5,7 +5,7 @@
  */
 
 #include "Common/SerialPABotBase/SerialPABotBase_Messages_NS1_WirelessControllers.h"
-#include "ClientSource/Libraries/MessageConverter.h"
+#include "Controllers/SerialPABotBase/Connection/MessageConverter.h"
 #include "NintendoSwitch_SerialPABotBase_WirelessProController.h"
 
 //#include <iostream>
diff --git a/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp b/SerialPrograms/Source/NintendoSwitch/DevPrograms/TestDudunsparceFormDetector.cpp
@@ -6,14 +6,14 @@
 
 #include "3rdParty/ONNX/OnnxToolsPA.h"
 #include "Common/Cpp/Time.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "CommonFramework/ImageTypes/ImageRGB32.h"
+//#include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
+#include "CommonFramework/VideoPipeline/VideoOverlay.h"
+#include "CommonFramework/VideoPipeline/VideoOverlayScopes.h"
 #include "CommonTools/Async/InferenceRoutines.h"
-#include "CommonTools/Async/InferenceSession.h"
+//#include "CommonTools/Async/InferenceSession.h"
 #include "CommonTools/InferenceCallbacks/VisualInferenceCallback.h"
-#include "CommonFramework/VideoPipeline/VideoOverlay.h"
 #include "TestDudunsparceFormDetector.h"
 
 #include <opencv2/imgproc.hpp>
@@ -22,7 +22,7 @@
 #include <onnxruntime_cxx_api.h>
 
 #include <limits>
-#include <vector>
+//#include <vector>
 #include <iostream>
 using std::cout, std::endl;
 
diff --git a/SerialPrograms/Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp b/SerialPrograms/Source/PokemonLGPE/Commands/PokemonLGPE_DateSpam.cpp
@@ -4,7 +4,7 @@
  * 
  */
 
-#include "ClientSource/Libraries/MessageConverter.h"
+#include "Controllers/SerialPABotBase/Connection/MessageConverter.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch/Programs/NintendoSwitch_GameEntry.h"
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_AutoHosts.cpp
@@ -4,7 +4,6 @@
  * 
  */
 
-#include "ClientSource/Libraries/MessageConverter.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_DateSpam.cpp
@@ -4,7 +4,6 @@
  * 
  */
 
-#include "ClientSource/Libraries/MessageConverter.h"
 //#include "CommonFramework/VideoPipeline/VideoFeed.h"
 //#include "Controllers/ControllerTypes.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_EggRoutines.cpp
@@ -4,7 +4,6 @@
  * 
  */
 
-#include "ClientSource/Libraries/MessageConverter.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonSwSh_Commands_EggRoutines.h"
 //#include "PokemonSwSh_Messages_EggRoutines.h"
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_GameEntry.cpp
@@ -4,8 +4,6 @@
  * 
  */
 
-#include <sstream>
-#include "ClientSource/Libraries/MessageConverter.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_PushButtons.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Routines.h"
diff --git a/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp b/SerialPrograms/Source/PokemonSwSh/Commands/PokemonSwSh_Commands_Misc.cpp
@@ -4,7 +4,6 @@
  * 
  */
 
-#include "ClientSource/Libraries/MessageConverter.h"
 #include "NintendoSwitch/Commands/NintendoSwitch_Commands_Superscalar.h"
 #include "PokemonSwSh_Commands_Misc.h"
 
diff --git a/SerialPrograms/Source/Tests/NintendoSwitch_Tests.cpp b/SerialPrograms/Source/Tests/NintendoSwitch_Tests.cpp
@@ -7,6 +7,7 @@
 
 #include "Common/Compiler.h"
 #include "Common/Cpp/Time.h"
+#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/ImageTypes/ImageRGB32.h"
 #include "CommonFramework/ImageTypes/ImageViewRGB32.h"
 #include "CommonFramework/Recording/StreamHistorySession.h"
diff --git a/SerialPrograms/Source/Tests/PokemonLZA_Tests.cpp b/SerialPrograms/Source/Tests/PokemonLZA_Tests.cpp
@@ -7,6 +7,7 @@
 #include "Common/Compiler.h"
 #include "PokemonLZA_Tests.h"
 #include "TestUtils.h"
+#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/Language.h"
 #include "CommonFramework/ImageTools/ImageBoxes.h"
 #include "CommonFramework/Recording/StreamHistorySession.h"
diff --git a/SerialPrograms/Source/Tests/PokemonSV_Tests.cpp b/SerialPrograms/Source/Tests/PokemonSV_Tests.cpp
@@ -14,6 +14,7 @@
 #include "TestUtils.h"
 
 #include "Common/Cpp/Containers/FixedLimitVector.tpp"
+#include "CommonFramework/Logging/Logger.h"
 #include "PokemonSV/Inference/Battles/PokemonSV_NormalBattleMenus.h"
 #include "PokemonSV/Inference/Boxes/PokemonSV_BoxDetection.h"
 #include "PokemonSV/Inference/Boxes/PokemonSV_BoxEggDetector.h"
diff --git a/SerialPrograms/Source/Tests/TestUtils.h b/SerialPrograms/Source/Tests/TestUtils.h
@@ -9,19 +9,19 @@
 #ifndef PokemonAutomation_Tests_TestUtils_H
 #define PokemonAutomation_Tests_TestUtils_H
 
+#include <iostream>
+#include <string>
+#include <vector>
+#include <map>
 #include "Common/SerialPABotBase/SerialPABotBase_Protocol.h"
-#include "ClientSource/Connection/BotBase.h"
-#include "ClientSource/Connection/BotBaseMessage.h"
+#include "Controllers/SerialPABotBase/Connection/BotBase.h"
+#include "Controllers/SerialPABotBase/Connection/BotBaseMessage.h"
 #include "CommonFramework/AudioPipeline/AudioFeed.h"
-#include "CommonFramework/Logging/Logger.h"
+//#include "CommonFramework/Logging/Logger.h"
 #include "CommonFramework/VideoPipeline/VideoFeed.h"
 #include "CommonFramework/VideoPipeline/VideoOverlay.h"
-#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
+//#include "NintendoSwitch/NintendoSwitch_ConsoleHandle.h"
 
-#include <iostream>
-#include <string>
-#include <vector>
-#include <map>
 
 namespace PokemonAutomation{
 
diff --git a/SerialPrograms/SourceFiles.cmake b/SerialPrograms/SourceFiles.cmake
