diff --git a/Sources/Engine/Base/Base.h b/Sources/Engine/Base/Base.h
index 8850021..41fa86e 100644
--- a/Sources/Engine/Base/Base.h
+++ b/Sources/Engine/Base/Base.h
@@ -13,7 +13,8 @@ You should have received a copy of the GNU General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */
 
-
+#ifndef SE_INCL_ENGINE_BASE_BASE_H
+#define SE_INCL_ENGINE_BASE_BASE_H
 /*
  * rcg10042001 In case these don't get defined in the project file, try to
  *   catch them here...
@@ -83,3 +84,4 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #define ENGINE_API
 #endif
 
+#endif
diff --git a/Sources/Engine/Engine.h b/Sources/Engine/Engine.h
index 538a294..73f7f28 100644
--- a/Sources/Engine/Engine.h
+++ b/Sources/Engine/Engine.h
@@ -19,11 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
   #pragma once
 #endif
 
-#ifdef _WIN32
-  #ifndef PLATFORM_WIN32
-    #define PLATFORM_WIN32 1
-  #endif
-#endif
+//#include <Engine/Base/Platform.h>
+#include <Engine/Base/Base.h>
 
 // set this to 1 to enable checks whether somethig is deleted while iterating some array/container
 #define CHECKARRAYLOCKING 0
@@ -38,17 +35,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <search.h>   // for qsort
 #include <float.h>    // for FPU control
 
-/* rcg10042001 !!! FIXME: Move these somewhere. */
-#if (defined PLATFORM_WIN32)
-#include <malloc.h>
-#include <conio.h>
-#include <crtdbg.h>
-#include <winsock2.h>
-#include <windows.h>
-#include <mmsystem.h> // for timers
-#endif
 
-#include <Engine/Base/Base.h>
+#include <Engine/Base/SystemSpecificInclude.h>
+
 #include <Engine/Base/Types.h>
 
 #include <Engine/Base/Input.h>