6 files changed, 56 insertions, 64 deletions
diff --git a/src/script/cbottoken.cpp b/src/script/cbottoken.cpp
index d97239d..ce1a161 100644
--- a/src/script/cbottoken.cpp
+++ b/src/script/cbottoken.cpp
@@ -21,14 +21,14 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "global.h"
-#include "event.h"
-#include "object.h"
-#include "cbottoken.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/language.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "object/object.h"
+#include "script/cbottoken.h"
 
 
 
diff --git a/src/script/cbottoken.h b/src/script/cbottoken.h
index 0767b04..2093d39 100644
--- a/src/script/cbottoken.h
+++ b/src/script/cbottoken.h
@@ -16,11 +16,10 @@
 
 // cbottoken.h
 
-#ifndef _CBOTTOKEN_H_
-#define	_CBOTTOKEN_H_
+#pragma once
 
 
-#include "object.h"
+#include "object/object.h"
 
 
 
@@ -35,5 +34,3 @@ extern BOOL IsFunction(const char *token);
 extern char* RetHelpText(const char *token);
 
 
-
-#endif //_CBOTTOKEN_H_
diff --git a/src/script/cmdtoken.cpp b/src/script/cmdtoken.cpp
index d5295c5..5eac291 100644
--- a/src/script/cmdtoken.cpp
+++ b/src/script/cmdtoken.cpp
@@ -21,17 +21,17 @@
 #include <stdio.h>
 #include <d3d.h>
 
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "language.h"
-#include "global.h"
-#include "event.h"
-#include "water.h"
-#include "pyro.h"
-#include "camera.h"
-#include "object.h"
-#include "cmdtoken.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/language.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "graphics/common/water.h"
+#include "graphics/common/pyro.h"
+#include "graphics/common/camera.h"
+#include "object/object.h"
+#include "script/cmdtoken.h"
 
 
 
diff --git a/src/script/cmdtoken.h b/src/script/cmdtoken.h
index 40fb36a..5b228f8 100644
--- a/src/script/cmdtoken.h
+++ b/src/script/cmdtoken.h
@@ -16,16 +16,15 @@
 
 // cmdtoken.h
 
-#ifndef _CMDTOKEN_H_
-#define	_CMDTOKEN_H_
+#pragma once
 
 
-#include "d3denum.h"
-#include "d3dengine.h"
-#include "object.h"
-#include "water.h"
-#include "pyro.h"
-#include "camera.h"
+#include "graphics/d3d/d3denum.h"
+#include "graphics/d3d/d3dengine.h"
+#include "object/object.h"
+#include "graphics/common/water.h"
+#include "graphics/common/pyro.h"
+#include "graphics/common/camera.h"
 
 
 
@@ -63,5 +62,3 @@ extern D3DCOLOR OpColor(char *line, char *op, D3DCOLOR def);
 extern D3DCOLORVALUE OpColorValue(char *line, char *op, D3DCOLORVALUE def);
 
 
-
-#endif //_CMDTOKEN_H_
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 62b2d25..1bb4463 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -24,32 +24,32 @@
 #include <d3d.h>
 
 #include "CBot/CBotDll.h"
-#include "struct.h"
-#include "d3dengine.h"
-#include "d3dmath.h"
-#include "global.h"
-#include "event.h"
-#include "misc.h"
-#include "iman.h"
-#include "restext.h"
-#include "math3d.h"
-#include "robotmain.h"
-#include "terrain.h"
-#include "water.h"
-#include "object.h"
-#include "physics.h"
-#include "interface.h"
-#include "edit.h"
-#include "list.h"
-#include "text.h"
-#include "displaytext.h"
-#include "taskmanager.h"
-#include "task.h"
-#include "taskmanip.h"
-#include "taskgoto.h"
-#include "taskshield.h"
-#include "cbottoken.h"
-#include "script.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "math/old/d3dmath.h"
+#include "common/global.h"
+#include "common/event.h"
+#include "common/misc.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "math/old/math3d.h"
+#include "object/robotmain.h"
+#include "graphics/common/terrain.h"
+#include "graphics/common/water.h"
+#include "object/object.h"
+#include "physics/physics.h"
+#include "ui/interface.h"
+#include "ui/edit.h"
+#include "ui/list.h"
+#include "graphics/common/text.h"
+#include "ui/displaytext.h"
+#include "object/task/taskmanager.h"
+#include "object/task/task.h"
+#include "object/task/taskmanip.h"
+#include "object/task/taskgoto.h"
+#include "object/task/taskshield.h"
+#include "script/cbottoken.h"
+#include "script/script.h"
 
 
 
diff --git a/src/script/script.h b/src/script/script.h
index eeb8ac8..ac81916 100644
--- a/src/script/script.h
+++ b/src/script/script.h
@@ -16,11 +16,10 @@
 
 // script.h
 
-#ifndef _SCRIPT_H_
-#define	_SCRIPT_H_
+#pragma once
 
 
-#include "event.h"
+#include "common/event.h"
 
 
 class CInstanceManager;
@@ -115,4 +114,3 @@ public:
 };
 
 
-#endif //_SCRIPT_H_