diff --git a/neo/tools/debugger/DebuggerServer.cpp b/neo/tools/debugger/DebuggerServer.cpp
index 319c7311..3b3adc7d 100644
--- a/neo/tools/debugger/DebuggerServer.cpp
+++ b/neo/tools/debugger/DebuggerServer.cpp
@@ -28,12 +28,14 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "DebuggerServer.h"
+
 
 #if defined( ID_ALLOW_TOOLS )
 #include "tools/edit_gui_common.h"
+#include "DebuggerServer.h"
 #include "DebuggerApp.h"
 #else
+#include "DebuggerServer.h"
 #include "debugger_common.h"
 // we need a lot to be able to list all threads in mars_city1
 const int MAX_MSGLEN = 8600;
diff --git a/neo/tools/debugger/debugger.cpp b/neo/tools/debugger/debugger.cpp
index dd6b6c3f..d9d47c05 100644
--- a/neo/tools/debugger/debugger.cpp
+++ b/neo/tools/debugger/debugger.cpp
@@ -26,13 +26,15 @@ If you have questions concerning this license or the applicable additional terms
 ===========================================================================
 */
 
-#include "DebuggerServer.h"
+
 
 #if defined( ID_ALLOW_TOOLS )
 #include "tools/edit_gui_common.h"
+#include "DebuggerServer.h"
 #include "../../sys/win32/rc/debugger_resource.h"
 #include "DebuggerApp.h"
 #else
+#include "DebuggerServer.h"
 #include "debugger_common.h"
 #endif