diff --git a/src/CBot/CBot.h b/src/CBot/CBot.h
index 458cfdd2..97e2919f 100644
--- a/src/CBot/CBot.h
+++ b/src/CBot/CBot.h
@@ -29,11 +29,6 @@
 #include "CBotToken.h"                  // token management
 #include "CBotProgram.h"
 
-#define    STACKMEM    1                /// \def preserve memory for the execution stack
-#define    MAXSTACK    990              /// \def stack size reserved
-
-#define    EOX         (reinterpret_cast<CBotStack*>(-1))   /// \def tag special condition
-
 
 /////////////////////////////////////////////////////////////////////
 // forward declaration
diff --git a/src/CBot/CBotDefines.h b/src/CBot/CBotDefines.h
index 9830fcbf..9cb70ab7 100644
--- a/src/CBot/CBotDefines.h
+++ b/src/CBot/CBotDefines.h
@@ -28,6 +28,11 @@
 // Global include
 
 
+#define    STACKMEM    1                /// \def preserve memory for the execution stack
+#define    MAXSTACK    990              /// \def stack size reserved
+
+#define    EOX         (reinterpret_cast<CBotStack*>(-1))   /// \def tag special condition
+
 #define    MAXARRAYSIZE    9999
 
 // variable type SetPrivate / IsPrivate
diff --git a/src/CBot/CBotStack.h b/src/CBot/CBotStack.h
index 36f45b1e..283a8ae3 100644
--- a/src/CBot/CBotStack.h
+++ b/src/CBot/CBotStack.h
@@ -22,6 +22,8 @@
 // Modules inlcude
 #include "CBot.h"
 
+#include "CBotDefines.h"
+
 // Local include
 
 // Global include