Change CBot default include directory. Make all include directive absolute.

2015-11-23 21:59:56 +01:00 · 2015-11-23 21:59:56 +01:00 · de5a57f793
parent fa9dc0dace
commit de5a57f793
136 changed files with 475 additions and 475 deletions
--- a/src/CBot/CBotCStack.cpp
+++ b/src/CBot/CBotCStack.cpp
@ -19,14 +19,14 @@


 // Modules inlcude
-#include "CBotCStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotToken.h"
-#include "CBotCall.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotCall.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

-#include "CBotInstr/CBotFunction.h"
+#include "CBot/CBotInstr/CBotFunction.h"

 // Local include

--- a/src/CBot/CBotCStack.h
+++ b/src/CBot/CBotCStack.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotProgram.h"
+#include "CBot/CBotProgram.h"

 // Local include

--- a/src/CBot/CBotCall.cpp
+++ b/src/CBot/CBotCall.cpp
@ -18,14 +18,14 @@
 */

 // Modules inlcude
-#include "CBotCall.h"
+#include "CBot/CBotCall.h"

-#include "CBotToken.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotUtils.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotUtils.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"


 // Local include
--- a/src/CBot/CBotCall.h
+++ b/src/CBot/CBotCall.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotString.h"
+#include "CBot/CBotString.h"

 // Local include

--- a/src/CBot/CBotCallMethode.cpp
+++ b/src/CBot/CBotCallMethode.cpp
@ -18,13 +18,13 @@
 */

 // Modules inlcude
-#include "CBotCallMethode.h"
+#include "CBot/CBotCallMethode.h"

-#include "CBotUtils.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotUtils.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotCallMethode.h
+++ b/src/CBot/CBotCallMethode.h
@ -20,8 +20,8 @@
 #pragma once

 // Modules inlcude
-#include "CBotTypResult.h"
-#include "CBotString.h"
+#include "CBot/CBotTypResult.h"
+#include "CBot/CBotString.h"

 // Local include

--- a/src/CBot/CBotClass.cpp
+++ b/src/CBot/CBotClass.cpp
@ -18,24 +18,24 @@
 */

 // Modules inlcude
-#include "CBotClass.h"
+#include "CBot/CBotClass.h"

-#include "CBotInstr/CBotNew.h"
-#include "CBotInstr/CBotLeftExprVar.h"
-#include "CBotInstr/CBotTwoOpExpr.h"
-#include "CBotInstr/CBotFunction.h"
-#include "CBotInstr/CBotExpression.h"
-#include "CBotInstr/CBotListArray.h"
-#include "CBotInstr/CBotEmpty.h"
+#include "CBot/CBotInstr/CBotNew.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotFunction.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotListArray.h"
+#include "CBot/CBotInstr/CBotEmpty.h"

-#include "CBotCall.h"
-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotUtils.h"
-#include "CBotFileUtils.h"
-#include "CBotCallMethode.h"
+#include "CBot/CBotCall.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotUtils.h"
+#include "CBot/CBotFileUtils.h"
+#include "CBot/CBotCallMethode.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotClass.h
+++ b/src/CBot/CBotClass.h
@ -20,11 +20,11 @@
 #pragma once

 // Modules inlcude
-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"

-#include "CBotTypResult.h"
+#include "CBot/CBotTypResult.h"

-#include "CBotString.h"
+#include "CBot/CBotString.h"

 // Local include

--- a/src/CBot/CBotDefParam.cpp
+++ b/src/CBot/CBotDefParam.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotDefParam.h"
+#include "CBot/CBotDefParam.h"

-#include "CBotUtils.h"
-#include "CBotCStack.h"
+#include "CBot/CBotUtils.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarClass.h"

 // Local include

--- a/src/CBot/CBotDefParam.h
+++ b/src/CBot/CBotDefParam.h
@ -20,8 +20,8 @@
 #pragma once

 // Modules inlcude
-#include "CBotToken.h"
-#include "CBotStack.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotStack.h"

 // Local include

--- a/src/CBot/CBotFileUtils.cpp
+++ b/src/CBot/CBotFileUtils.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotFileUtils.h"
+#include "CBot/CBotFileUtils.h"

-#include "CBotString.h"
-#include "CBotClass.h"
+#include "CBot/CBotString.h"
+#include "CBot/CBotClass.h"

-#include "CBotEnums.h"
+#include "CBot/CBotEnums.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotBlock.cpp
+++ b/src/CBot/CBotInstr/CBotBlock.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotBlock.h"
+#include "CBot/CBotInstr/CBotBlock.h"

-#include "CBotCStack.h"
-#include "CBotListInstr.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotInstr/CBotListInstr.h"

-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotBlock.h
+++ b/src/CBot/CBotInstr/CBotBlock.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotBoolExpr.cpp
+++ b/src/CBot/CBotInstr/CBotBoolExpr.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotBoolExpr.h"
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotBoolExpr.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"

-#include "CBotCStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotBoolExpr.h
+++ b/src/CBot/CBotInstr/CBotBoolExpr.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotBoolean.cpp
+++ b/src/CBot/CBotInstr/CBotBoolean.cpp
@ -18,15 +18,15 @@
 */

 // Modules inlcude
-#include "CBotBoolean.h"
-#include "CBotLeftExprVar.h"
-#include "CBotTwoOpExpr.h"
-#include "CBotInstArray.h"
+#include "CBot/CBotInstr/CBotBoolean.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotInstArray.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotBoolean.h
+++ b/src/CBot/CBotInstr/CBotBoolean.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotBreak.cpp
+++ b/src/CBot/CBotInstr/CBotBreak.cpp
@ -18,10 +18,10 @@
 */

 // Modules inlcude
-#include "CBotBreak.h"
+#include "CBot/CBotInstr/CBotBreak.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotBreak.h
+++ b/src/CBot/CBotInstr/CBotBreak.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotCase.cpp
+++ b/src/CBot/CBotInstr/CBotCase.cpp
@ -18,11 +18,11 @@
 */

 // Modules inlcude
-#include "CBotCase.h"
-#include "CBotExprNum.h"
+#include "CBot/CBotInstr/CBotCase.h"
+#include "CBot/CBotInstr/CBotExprNum.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotCase.h
+++ b/src/CBot/CBotInstr/CBotCase.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotCatch.cpp
+++ b/src/CBot/CBotInstr/CBotCatch.cpp
@ -18,14 +18,14 @@
 */

 // Modules inlcude
-#include "CBotCatch.h"
-#include "CBotBlock.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotCatch.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotExpression.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotCatch.h
+++ b/src/CBot/CBotInstr/CBotCatch.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotClassInst.cpp
+++ b/src/CBot/CBotInstr/CBotClassInst.cpp
@ -20,18 +20,18 @@
 // Modules inlcude
 #include "CBotClassInst.h"

-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"

-#include "CBotLeftExprVar.h"
-#include "CBotTwoOpExpr.h"
-#include "CBotInstArray.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotInstArray.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"

-#include "CBotVar/CBotVarPointer.h"
-#include "CBotVar/CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarPointer.h"
+#include "CBot/CBotVar/CBotVarClass.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotClassInst.h
+++ b/src/CBot/CBotInstr/CBotClassInst.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotCondition.cpp
+++ b/src/CBot/CBotInstr/CBotCondition.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotCondition.h"
-#include "CBotBoolExpr.h"
+#include "CBot/CBotInstr/CBotCondition.h"
+#include "CBot/CBotInstr/CBotBoolExpr.h"

-#include "CBotCStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotCondition.h
+++ b/src/CBot/CBotInstr/CBotCondition.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotDo.cpp
+++ b/src/CBot/CBotInstr/CBotDo.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotDo.h"
-#include "CBotBlock.h"
-#include "CBotCondition.h"
+#include "CBot/CBotInstr/CBotDo.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotCondition.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotDo.h
+++ b/src/CBot/CBotInstr/CBotDo.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotEmpty.cpp
+++ b/src/CBot/CBotInstr/CBotEmpty.cpp
@ -18,11 +18,11 @@
 */

 // Modules inlcude
-#include "CBotEmpty.h"
+#include "CBot/CBotInstr/CBotEmpty.h"

-#include "CBotStack.h"
+#include "CBot/CBotStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotEmpty.h
+++ b/src/CBot/CBotInstr/CBotEmpty.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprAlpha.cpp
+++ b/src/CBot/CBotInstr/CBotExprAlpha.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotExprAlpha.h"
+#include "CBot/CBotInstr/CBotExprAlpha.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprAlpha.h
+++ b/src/CBot/CBotInstr/CBotExprAlpha.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprBool.cpp
+++ b/src/CBot/CBotInstr/CBotExprBool.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotExprBool.h"
+#include "CBot/CBotInstr/CBotExprBool.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprBool.h
+++ b/src/CBot/CBotInstr/CBotExprBool.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprNan.cpp
+++ b/src/CBot/CBotInstr/CBotExprNan.cpp
@ -18,11 +18,11 @@
 */

 // Modules inlcude
-#include "CBotExprNan.h"
+#include "CBot/CBotInstr/CBotExprNan.h"

-#include "CBotStack.h"
+#include "CBot/CBotStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprNan.h
+++ b/src/CBot/CBotInstr/CBotExprNan.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprNull.cpp
+++ b/src/CBot/CBotInstr/CBotExprNull.cpp
@ -18,11 +18,11 @@
 */

 // Modules inlcude
-#include "CBotExprNull.h"
+#include "CBot/CBotInstr/CBotExprNull.h"

-#include "CBotStack.h"
+#include "CBot/CBotStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprNull.h
+++ b/src/CBot/CBotInstr/CBotExprNull.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprNum.cpp
+++ b/src/CBot/CBotInstr/CBotExprNum.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotExprNum.h"
+#include "CBot/CBotInstr/CBotExprNum.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprNum.h
+++ b/src/CBot/CBotInstr/CBotExprNum.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprUnaire.cpp
+++ b/src/CBot/CBotInstr/CBotExprUnaire.cpp
@ -18,13 +18,13 @@
 */

 // Modules inlcude
-#include "CBotExprUnaire.h"
-#include "CBotParExpr.h"
+#include "CBot/CBotInstr/CBotExprUnaire.h"
+#include "CBot/CBotInstr/CBotParExpr.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprUnaire.h
+++ b/src/CBot/CBotInstr/CBotExprUnaire.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprVar.cpp
+++ b/src/CBot/CBotInstr/CBotExprVar.cpp
@ -18,16 +18,16 @@
 */

 // Modules inlcude
-#include "CBotExprVar.h"
-#include "CBotInstrMethode.h"
-#include "CBotExpression.h"
-#include "CBotIndexExpr.h"
-#include "CBotFieldExpr.h"
+#include "CBot/CBotInstr/CBotExprVar.h"
+#include "CBot/CBotInstr/CBotInstrMethode.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotIndexExpr.h"
+#include "CBot/CBotInstr/CBotFieldExpr.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVarArray.h"
+#include "CBot/CBotVar/CBotVarArray.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExprVar.h
+++ b/src/CBot/CBotInstr/CBotExprVar.h
@ -20,9 +20,9 @@
 #pragma once

 // Modules inlcude
-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"

-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExpression.cpp
+++ b/src/CBot/CBotInstr/CBotExpression.cpp
@ -18,16 +18,16 @@
 */

 // Modules inlcude
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotExpression.h"

-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"

-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotExpression.h
+++ b/src/CBot/CBotInstr/CBotExpression.h
@ -20,9 +20,9 @@
 #pragma once

 // Modules inlcude
-#include "CBotLeftExpr.h"
+#include "CBot/CBotInstr/CBotLeftExpr.h"

-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotFieldExpr.cpp
+++ b/src/CBot/CBotInstr/CBotFieldExpr.cpp
@ -18,13 +18,13 @@
 */

 // Modules inlcude
-#include "CBotFieldExpr.h"
+#include "CBot/CBotInstr/CBotFieldExpr.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"

-#include "CBotVar/CBotVarClass.h"
+#include "CBot/CBotVar/CBotVarClass.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotFieldExpr.h
+++ b/src/CBot/CBotInstr/CBotFieldExpr.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotFloat.cpp
+++ b/src/CBot/CBotInstr/CBotFloat.cpp
@ -18,15 +18,15 @@
 */

 // Modules inlcude
-#include "CBotFloat.h"
-#include "CBotLeftExprVar.h"
-#include "CBotTwoOpExpr.h"
-#include "CBotInstArray.h"
+#include "CBot/CBotInstr/CBotFloat.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotInstArray.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotFloat.h
+++ b/src/CBot/CBotInstr/CBotFloat.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotFor.cpp
+++ b/src/CBot/CBotInstr/CBotFor.cpp
@ -18,13 +18,13 @@
 */

 // Modules inlcude
-#include "CBotFor.h"
-#include "CBotListExpression.h"
-#include "CBotBlock.h"
-#include "CBotBoolExpr.h"
+#include "CBot/CBotInstr/CBotFor.h"
+#include "CBot/CBotInstr/CBotListExpression.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotBoolExpr.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotFor.h
+++ b/src/CBot/CBotInstr/CBotFor.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotFunction.cpp
+++ b/src/CBot/CBotInstr/CBotFunction.cpp
@ -19,23 +19,23 @@


 // Modules inlcude
-#include "CBotFunction.h"
+#include "CBot/CBotInstr/CBotFunction.h"

-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"

-#include "CBotInstr/CBotBlock.h"
-#include "CBotInstr/CBotTwoOpExpr.h"
-#include "CBotInstr/CBotExpression.h"
-#include "CBotInstr/CBotEmpty.h"
-#include "CBotInstr/CBotListArray.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotEmpty.h"
+#include "CBot/CBotInstr/CBotListArray.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
-#include "CBotDefParam.h"
-#include "CBotUtils.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"
+#include "CBot/CBotDefParam.h"
+#include "CBot/CBotUtils.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotFunction.h
+++ b/src/CBot/CBotInstr/CBotFunction.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotIString.cpp
+++ b/src/CBot/CBotInstr/CBotIString.cpp
@ -18,14 +18,14 @@
 */

 // Modules inlcude
-#include "CBotIString.h"
-#include "CBotLeftExprVar.h"
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotIString.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotIString.h
+++ b/src/CBot/CBotInstr/CBotIString.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotIf.cpp
+++ b/src/CBot/CBotInstr/CBotIf.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotIf.h"
-#include "CBotInstr/CBotBlock.h"
-#include "CBotInstr/CBotCondition.h"
+#include "CBot/CBotInstr/CBotIf.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotCondition.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotIf.h
+++ b/src/CBot/CBotInstr/CBotIf.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotIndexExpr.cpp
+++ b/src/CBot/CBotInstr/CBotIndexExpr.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotIndexExpr.h"
+#include "CBot/CBotInstr/CBotIndexExpr.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVarArray.h"
+#include "CBot/CBotVar/CBotVarArray.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotIndexExpr.h
+++ b/src/CBot/CBotInstr/CBotIndexExpr.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInstArray.cpp
+++ b/src/CBot/CBotInstr/CBotInstArray.cpp
@ -18,19 +18,19 @@
 */

 // Modules inlcude
-#include "CBotInstArray.h"
+#include "CBot/CBotInstr/CBotInstArray.h"

-#include "CBotLeftExprVar.h"
-#include "CBotExpression.h"
-#include "CBotListArray.h"
-#include "CBotEmpty.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotListArray.h"
+#include "CBot/CBotInstr/CBotEmpty.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotDefines.h"
+#include "CBot/CBotDefines.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInstArray.h
+++ b/src/CBot/CBotInstr/CBotInstArray.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInstr.cpp
+++ b/src/CBot/CBotInstr/CBotInstr.cpp
@ -18,29 +18,29 @@
 */

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

-#include "CBotInstr/CBotFor.h"
-#include "CBotInstr/CBotDo.h"
-#include "CBotInstr/CBotBreak.h"
-#include "CBotInstr/CBotSwitch.h"
-#include "CBotInstr/CBotTry.h"
-#include "CBotInstr/CBotThrow.h"
-#include "CBotInstr/CBotInt.h"
-#include "CBotInstr/CBotFloat.h"
-#include "CBotInstr/CBotWhile.h"
-#include "CBotInstr/CBotIString.h"
-#include "CBotInstr/CBotBoolean.h"
-#include "CBotInstr/CBotIf.h"
-#include "CBotInstr/CBotReturn.h"
-#include "CBotInstr/CBotClassInst.h"
-#include "CBotInstr/CBotExpression.h"
-#include "CBotInstr/CBotInstArray.h"
+#include "CBot/CBotInstr/CBotFor.h"
+#include "CBot/CBotInstr/CBotDo.h"
+#include "CBot/CBotInstr/CBotBreak.h"
+#include "CBot/CBotInstr/CBotSwitch.h"
+#include "CBot/CBotInstr/CBotTry.h"
+#include "CBot/CBotInstr/CBotThrow.h"
+#include "CBot/CBotInstr/CBotInt.h"
+#include "CBot/CBotInstr/CBotFloat.h"
+#include "CBot/CBotInstr/CBotWhile.h"
+#include "CBot/CBotInstr/CBotIString.h"
+#include "CBot/CBotInstr/CBotBoolean.h"
+#include "CBot/CBotInstr/CBotIf.h"
+#include "CBot/CBotInstr/CBotReturn.h"
+#include "CBot/CBotInstr/CBotClassInst.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotInstArray.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

-#include "CBotClass.h"
-#include "CBotStack.h"
+#include "CBot/CBotClass.h"
+#include "CBot/CBotStack.h"


 // Local include
--- a/src/CBot/CBotInstr/CBotInstr.h
+++ b/src/CBot/CBotInstr/CBotInstr.h
@ -20,9 +20,9 @@
 #pragma once

 // Modules inlcude
-#include "CBotToken.h"
+#include "CBot/CBotToken.h"

-#include "CBotCStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInstrCall.cpp
+++ b/src/CBot/CBotInstr/CBotInstrCall.cpp
@ -19,12 +19,12 @@

 // Modules inlcude
 #include "CBotInstrCall.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotExpression.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInstrCall.h
+++ b/src/CBot/CBotInstr/CBotInstrCall.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInstrMethode.cpp
+++ b/src/CBot/CBotInstr/CBotInstrMethode.cpp
@ -18,15 +18,15 @@
 */

 // Modules inlcude
-#include "CBotInstrMethode.h"
+#include "CBot/CBotInstr/CBotInstrMethode.h"

-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInstrMethode.h
+++ b/src/CBot/CBotInstr/CBotInstrMethode.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInstrUtils.cpp
+++ b/src/CBot/CBotInstr/CBotInstrUtils.cpp
@ -18,15 +18,15 @@
 */

 // Modules inlcude
-#include "CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"

-#include "CBotToken.h"
-#include "CBotCStack.h"
-#include "CBotTypResult.h"
-#include "CBotExpression.h"
-#include "CBotClass.h"
+#include "CBot/CBotToken.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotTypResult.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotClass.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInt.cpp
+++ b/src/CBot/CBotInstr/CBotInt.cpp
@ -18,16 +18,16 @@
 */

 // Modules inlcude
-#include "CBotInt.h"
+#include "CBot/CBotInstr/CBotInt.h"

-#include "CBotLeftExprVar.h"
-#include "CBotInstArray.h"
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotInstArray.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotInt.h
+++ b/src/CBot/CBotInstr/CBotInt.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotLeftExpr.cpp
+++ b/src/CBot/CBotInstr/CBotLeftExpr.cpp
@ -18,16 +18,16 @@
 */

 // Modules inlcude
-#include "CBotLeftExpr.h"
-#include "CBotFieldExpr.h"
-#include "CBotIndexExpr.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotLeftExpr.h"
+#include "CBot/CBotInstr/CBotFieldExpr.h"
+#include "CBot/CBotInstr/CBotIndexExpr.h"
+#include "CBot/CBotInstr/CBotExpression.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"

-#include "CBotVar/CBotVarArray.h"
+#include "CBot/CBotVar/CBotVarArray.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotLeftExpr.h
+++ b/src/CBot/CBotInstr/CBotLeftExpr.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotLeftExprVar.cpp
+++ b/src/CBot/CBotInstr/CBotLeftExprVar.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotLeftExprVar.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotLeftExprVar.h
+++ b/src/CBot/CBotInstr/CBotLeftExprVar.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotListArray.cpp
+++ b/src/CBot/CBotInstr/CBotListArray.cpp
@ -18,17 +18,17 @@
 */

 // Modules inlcude
-#include "CBotListArray.h"
+#include "CBot/CBotInstr/CBotListArray.h"

-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"

-#include "CBotExprNull.h"
-#include "CBotTwoOpExpr.h"
+#include "CBot/CBotInstr/CBotExprNull.h"
+#include "CBot/CBotInstr/CBotTwoOpExpr.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotListArray.h
+++ b/src/CBot/CBotInstr/CBotListArray.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotListExpression.cpp
+++ b/src/CBot/CBotInstr/CBotListExpression.cpp
@ -18,15 +18,15 @@
 */

 // Modules inlcude
-#include "CBotListExpression.h"
-#include "CBotExpression.h"
-#include "CBotIString.h"
-#include "CBotFloat.h"
+#include "CBot/CBotInstr/CBotListExpression.h"
+#include "CBot/CBotInstr/CBotExpression.h"
+#include "CBot/CBotInstr/CBotIString.h"
+#include "CBot/CBotInstr/CBotFloat.h"
 #include "CBotBoolean.h"
-#include "CBotInt.h"
+#include "CBot/CBotInstr/CBotInt.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotListExpression.h
+++ b/src/CBot/CBotInstr/CBotListExpression.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotListInstr.cpp
+++ b/src/CBot/CBotInstr/CBotListInstr.cpp
@ -18,11 +18,11 @@
 */

 // Modules inlcude
-#include "CBotListInstr.h"
-#include "CBotBlock.h"
+#include "CBot/CBotInstr/CBotListInstr.h"
+#include "CBot/CBotInstr/CBotBlock.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotListInstr.h
+++ b/src/CBot/CBotInstr/CBotListInstr.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotLogicExpr.cpp
+++ b/src/CBot/CBotInstr/CBotLogicExpr.cpp
@ -18,9 +18,9 @@
 */

 // Modules inlcude
-#include "CBotLogicExpr.h"
+#include "CBot/CBotInstr/CBotLogicExpr.h"

-#include "CBotStack.h"
+#include "CBot/CBotStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotLogicExpr.h
+++ b/src/CBot/CBotInstr/CBotLogicExpr.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotNew.cpp
+++ b/src/CBot/CBotInstr/CBotNew.cpp
@ -18,15 +18,15 @@
 */

 // Modules inlcude
-#include "CBotNew.h"
+#include "CBot/CBotInstr/CBotNew.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
-#include "CBotClass.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"
+#include "CBot/CBotClass.h"

-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotNew.h
+++ b/src/CBot/CBotInstr/CBotNew.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotParExpr.cpp
+++ b/src/CBot/CBotInstr/CBotParExpr.cpp
@ -18,23 +18,23 @@
 */

 // Modules inlcude
-#include "CBotParExpr.h"
-#include "CBotExprUnaire.h"
-#include "CBotExprVar.h"
-#include "CBotInstrCall.h"
-#include "CBotPostIncExpr.h"
-#include "CBotPreIncExpr.h"
-#include "CBotExprNum.h"
-#include "CBotExprAlpha.h"
-#include "CBotExprBool.h"
-#include "CBotNew.h"
-#include "CBotExprNull.h"
-#include "CBotExprNan.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotParExpr.h"
+#include "CBot/CBotInstr/CBotExprUnaire.h"
+#include "CBot/CBotInstr/CBotExprVar.h"
+#include "CBot/CBotInstr/CBotInstrCall.h"
+#include "CBot/CBotInstr/CBotPostIncExpr.h"
+#include "CBot/CBotInstr/CBotPreIncExpr.h"
+#include "CBot/CBotInstr/CBotExprNum.h"
+#include "CBot/CBotInstr/CBotExprAlpha.h"
+#include "CBot/CBotInstr/CBotExprBool.h"
+#include "CBot/CBotInstr/CBotNew.h"
+#include "CBot/CBotInstr/CBotExprNull.h"
+#include "CBot/CBotInstr/CBotExprNan.h"
+#include "CBot/CBotInstr/CBotExpression.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

-#include "CBotCStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotParExpr.h
+++ b/src/CBot/CBotInstr/CBotParExpr.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotPostIncExpr.cpp
+++ b/src/CBot/CBotInstr/CBotPostIncExpr.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotPostIncExpr.h"
-#include "CBotExprVar.h"
+#include "CBot/CBotInstr/CBotPostIncExpr.h"
+#include "CBot/CBotInstr/CBotExprVar.h"

-#include "CBotStack.h"
+#include "CBot/CBotStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotPostIncExpr.h
+++ b/src/CBot/CBotInstr/CBotPostIncExpr.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotPreIncExpr.cpp
+++ b/src/CBot/CBotInstr/CBotPreIncExpr.cpp
@ -18,12 +18,12 @@
 */

 // Modules inlcude
-#include "CBotPreIncExpr.h"
-#include "CBotExprVar.h"
+#include "CBot/CBotInstr/CBotPreIncExpr.h"
+#include "CBot/CBotInstr/CBotExprVar.h"

-#include "CBotStack.h"
+#include "CBot/CBotStack.h"

-#include "CBotVar/CBotVar.h"
+#include "CBot/CBotVar/CBotVar.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotPreIncExpr.h
+++ b/src/CBot/CBotInstr/CBotPreIncExpr.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotReturn.cpp
+++ b/src/CBot/CBotInstr/CBotReturn.cpp
@ -18,14 +18,14 @@
 */

 // Modules inlcude
-#include "CBotReturn.h"
+#include "CBot/CBotInstr/CBotReturn.h"

-#include "CBotInstr/CBotInstrUtils.h"
+#include "CBot/CBotInstr/CBotInstrUtils.h"

-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotExpression.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotReturn.h
+++ b/src/CBot/CBotInstr/CBotReturn.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotSwitch.cpp
+++ b/src/CBot/CBotInstr/CBotSwitch.cpp
@ -20,13 +20,13 @@
 */

 // Modules inlcude
-#include "CBotSwitch.h"
-#include "CBotCase.h"
-#include "CBotBlock.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotSwitch.h"
+#include "CBot/CBotInstr/CBotCase.h"
+#include "CBot/CBotInstr/CBotBlock.h"
+#include "CBot/CBotInstr/CBotExpression.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotSwitch.h
+++ b/src/CBot/CBotInstr/CBotSwitch.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotThrow.cpp
+++ b/src/CBot/CBotInstr/CBotThrow.cpp
@ -18,11 +18,11 @@
 */

 // Modules inlcude
-#include "CBotThrow.h"
-#include "CBotExpression.h"
+#include "CBot/CBotInstr/CBotThrow.h"
+#include "CBot/CBotInstr/CBotExpression.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotThrow.h
+++ b/src/CBot/CBotInstr/CBotThrow.h
@ -20,7 +20,7 @@
 #pragma once

 // Modules inlcude
-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotTry.cpp
+++ b/src/CBot/CBotInstr/CBotTry.cpp
@ -19,10 +19,10 @@

 // Modules inlcude
 #include "CBotTry.h"
-#include "CBotBlock.h"
+#include "CBot/CBotInstr/CBotBlock.h"

-#include "CBotStack.h"
-#include "CBotCStack.h"
+#include "CBot/CBotStack.h"
+#include "CBot/CBotCStack.h"

 // Local include

--- a/src/CBot/CBotInstr/CBotTry.h
+++ b/src/CBot/CBotInstr/CBotTry.h
@ -18,9 +18,9 @@
 */

 // Modules inlcude
-#include "CBotCatch.h"
+#include "CBot/CBotInstr/CBotCatch.h"

-#include "CBotInstr.h"
+#include "CBot/CBotInstr/CBotInstr.h"

 // Local include

--- a/Show More
+++ b/Show More