4 files changed, 23 insertions, 29 deletions
diff --git a/src/app/d3dapp.cpp b/src/app/d3dapp.cpp
index a1d5c6a..fd7f148 100644
--- a/src/app/d3dapp.cpp
+++ b/src/app/d3dapp.cpp
@@ -26,19 +26,19 @@
 #include <zmouse.h>
 #include <dinput.h>
 
-#include "struct.h"
-#include "d3dtextr.h"
-#include "d3dengine.h"
-#include "language.h"
-#include "event.h"
-#include "profile.h"
-#include "iman.h"
-#include "restext.h"
-#include "math3d.h"
-#include "joystick.h"
-#include "robotmain.h"
-#include "sound.h"
-#include "d3dapp.h"
+#include "common/struct.h"
+#include "graphics/d3d/d3dtextr.h"
+#include "graphics/d3d/d3dengine.h"
+#include "common/language.h"
+#include "common/event.h"
+#include "common/profile.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "math/old/math3d.h"
+#include "app/joystick.h"
+#include "object/robotmain.h"
+#include "sound/sound.h"
+#include "app/d3dapp.h"
 
 // fix for "MSH_MOUSEWHEEL undefined" error
 #ifdef UNICODE
diff --git a/src/app/d3dapp.h b/src/app/d3dapp.h
index 6f28cda..fe4a3eb 100644
--- a/src/app/d3dapp.h
+++ b/src/app/d3dapp.h
@@ -16,21 +16,20 @@
 
 // d3dapp.h
 
+#pragma once
 
-#ifndef  _D3DAPP_H
-#define  _D3DAPP_H
 
 #define  D3D_OVERLOADS
 
 #include <d3d.h>
 
-#include "d3dengine.h"
-#include "d3dframe.h"
-#include "d3denum.h"
-#include "d3dutil.h"
-#include "d3dres.h"
-#include "misc.h"
-#include "struct.h"
+#include "graphics/d3d/d3dengine.h"
+#include "graphics/d3d/d3dframe.h"
+#include "graphics/d3d/d3denum.h"
+#include "graphics/d3d/d3dutil.h"
+#include "old/d3dres.h"
+#include "common/misc.h"
+#include "common/struct.h"
 
 
 class CInstanceManager;
@@ -165,4 +164,3 @@ public:
 };
 
 
-#endif // _D3DAPP_H
diff --git a/src/app/joystick.cpp b/src/app/joystick.cpp
index 609a1fb..91dc27f 100644
--- a/src/app/joystick.cpp
+++ b/src/app/joystick.cpp
@@ -23,7 +23,7 @@
 #include <dinput.h>
 #include <stdio.h>
 
-#include "joystick.h"
+#include "app/joystick.h"
 
 
 
diff --git a/src/app/joystick.h b/src/app/joystick.h
index 4b465e0..d6904a3 100644
--- a/src/app/joystick.h
+++ b/src/app/joystick.h
@@ -16,9 +16,7 @@
 
 // joystick.h
 
-#ifndef _JOYSTICK_H_
-#define	_JOYSTICK_H_
-
+#pragma once
 
 
 extern BOOL InitDirectInput(HINSTANCE hInst, HWND hWnd);
@@ -27,5 +25,3 @@ extern BOOL UpdateInputState(DIJOYSTATE &js);
 extern BOOL FreeDirectInput();
 
 
-
-#endif //_JOYSTICK_H_