From 79036484dd1268c870b2d97a89f6bb0a28d56af6 Mon Sep 17 00:00:00 2001
From: DjWarmonger <Warmonger@vp.pl>
Date: Mon, 23 Jun 2014 19:58:19 +0200
Subject: [PATCH] Trying to sort out project changes and compile issues.

---
 client/VCMI_client.vcxproj               |   1 -
 client/VCMI_client.vcxproj.filters       |   1 -
 lib/VCMI_lib.vcxproj                     |  38 +++++++--
 lib/VCMI_lib.vcxproj.filters             | 104 +++++++++++++++++++++--
 lib/mapObjects/CArmedInstance.cpp        |   2 +-
 lib/mapObjects/CArmedInstance.h          |   2 +-
 lib/mapObjects/CBank.cpp                 |   2 +-
 lib/mapObjects/CBank.h                   |   2 +-
 lib/mapObjects/CGHeroInstance.cpp        |   2 +-
 lib/mapObjects/CGHeroInstance.h          |   2 +-
 lib/mapObjects/CGMarket.cpp              |   2 +-
 lib/mapObjects/CGMarket.h                |   2 +-
 lib/mapObjects/CGPandoraBox.cpp          |   2 +-
 lib/mapObjects/CGPandoraBox.h            |   2 +-
 lib/mapObjects/CGTownInstance.cpp        |   2 +-
 lib/mapObjects/CGTownInstance.h          |   2 +-
 lib/mapObjects/CObjectClassesHandler.cpp |   4 +-
 lib/mapObjects/CObjectClassesHandler.h   |   4 +-
 lib/mapObjects/CObjectHandler.cpp        |   2 +-
 lib/mapObjects/CObjectHandler.h          |   2 +-
 lib/mapObjects/ObjectTemplate.cpp        |   2 +-
 lib/rmg/CRmgTemplateZone.cpp             |   3 +
 scripting/erm/ERMInterpreter.cpp         |   3 +-
 23 files changed, 152 insertions(+), 36 deletions(-)

diff --git a/client/VCMI_client.vcxproj b/client/VCMI_client.vcxproj
index 6bc9b673d..7b1226997 100644
--- a/client/VCMI_client.vcxproj
+++ b/client/VCMI_client.vcxproj
@@ -229,7 +229,6 @@
     <ClInclude Include="CPlayerInterface.h" />
     <ClInclude Include="CPreGame.h" />
     <ClInclude Include="CQuestLog.h" />
-    <ClInclude Include="CSoundBase.h" />
     <ClInclude Include="CSpellWindow.h" />
     <ClInclude Include="CVideoHandler.h" />
     <ClInclude Include="FontBase.h" />
diff --git a/client/VCMI_client.vcxproj.filters b/client/VCMI_client.vcxproj.filters
index 89dd439e0..ab9f794a4 100644
--- a/client/VCMI_client.vcxproj.filters
+++ b/client/VCMI_client.vcxproj.filters
@@ -78,7 +78,6 @@
     <ClInclude Include="CMusicHandler.h" />
     <ClInclude Include="CPlayerInterface.h" />
     <ClInclude Include="CPreGame.h" />
-    <ClInclude Include="CSoundBase.h" />
     <ClInclude Include="CSpellWindow.h" />
     <ClInclude Include="CVideoHandler.h" />
     <ClInclude Include="FontBase.h" />
diff --git a/lib/VCMI_lib.vcxproj b/lib/VCMI_lib.vcxproj
index 18e150ee1..2cad8a718 100644
--- a/lib/VCMI_lib.vcxproj
+++ b/lib/VCMI_lib.vcxproj
@@ -135,8 +135,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='RD|Win32'">
     <ClCompile>
-      <AdditionalOptions>/Oy- %(AdditionalOptions) /bigobj
- /Zm150</AdditionalOptions>
+      <AdditionalOptions>/Oy- /bigobj /Zm150 </AdditionalOptions>
       <PreprocessorDefinitions>VCMI_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeaderFile>StdInc.h</PrecompiledHeaderFile>
       <PrecompiledHeader>Use</PrecompiledHeader>
@@ -177,13 +176,11 @@
     <ClCompile Include="CConsoleHandler.cpp" />
     <ClCompile Include="CCreatureHandler.cpp" />
     <ClCompile Include="CCreatureSet.cpp" />
-    <ClCompile Include="CDefObjInfoHandler.cpp" />
     <ClCompile Include="CGameInterface.cpp" />
     <ClCompile Include="CGameState.cpp" />
     <ClCompile Include="CGeneralTextHandler.cpp" />
     <ClCompile Include="CHeroHandler.cpp" />
     <ClCompile Include="CModHandler.cpp" />
-    <ClCompile Include="CObjectHandler.cpp" />
     <ClCompile Include="CObstacleInstance.cpp" />
     <ClCompile Include="Connection.cpp" />
     <ClCompile Include="CSpellHandler.cpp" />
@@ -204,6 +201,21 @@
     <ClCompile Include="GameConstants.cpp" />
     <ClCompile Include="JsonDetail.cpp" />
     <ClCompile Include="LogicalExpression.cpp" />
+    <ClCompile Include="mapObjects\CArmedInstance.cpp" />
+    <ClCompile Include="mapObjects\CBank.cpp" />
+    <ClCompile Include="mapObjects\CGHeroInstance.cpp" />
+    <ClCompile Include="mapObjects\CGMarket.cpp" />
+    <ClCompile Include="mapObjects\CGPandoraBox.cpp" />
+    <ClCompile Include="mapObjects\CGTownInstance.cpp" />
+    <ClCompile Include="mapObjects\CObjectClassesHandler.cpp" />
+    <ClCompile Include="mapObjects\CObjectHandler.cpp" />
+    <ClCompile Include="mapObjects\CommonConstructors.cpp" />
+    <ClCompile Include="mapObjects\CQuest.cpp" />
+    <ClCompile Include="mapObjects\CRewardableConstructor.cpp" />
+    <ClCompile Include="mapObjects\CRewardableObject.cpp" />
+    <ClCompile Include="mapObjects\JsonRandom.cpp" />
+    <ClCompile Include="mapObjects\MiscObjects.cpp" />
+    <ClCompile Include="mapObjects\ObjectTemplate.cpp" />
     <ClCompile Include="mapping\CCampaignHandler.cpp" />
     <ClCompile Include="mapping\CMap.cpp" />
     <ClCompile Include="mapping\CMapInfo.cpp" />
@@ -259,13 +271,11 @@
     <ClInclude Include="CConsoleHandler.h" />
     <ClInclude Include="CCreatureHandler.h" />
     <ClInclude Include="CCreatureSet.h" />
-    <ClInclude Include="CDefObjInfoHandler.h" />
     <ClInclude Include="CGameInterface.h" />
     <ClInclude Include="CGameState.h" />
     <ClInclude Include="CGeneralTextHandler.h" />
     <ClInclude Include="CHeroHandler.h" />
     <ClInclude Include="CModHandler.h" />
-    <ClInclude Include="CObjectHandler.h" />
     <ClInclude Include="CObstacleInstance.h" />
     <ClInclude Include="CondSh.h" />
     <ClInclude Include="Connection.h" />
@@ -293,6 +303,22 @@
     <ClInclude Include="IBonusTypeHandler.h" />
     <ClInclude Include="JsonDetail.h" />
     <ClInclude Include="LogicalExpression.h" />
+    <ClInclude Include="mapObjects\CArmedInstance.h" />
+    <ClInclude Include="mapObjects\CBank.h" />
+    <ClInclude Include="mapObjects\CGHeroInstance.h" />
+    <ClInclude Include="mapObjects\CGMarket.h" />
+    <ClInclude Include="mapObjects\CGPandoraBox.h" />
+    <ClInclude Include="mapObjects\CGTownInstance.h" />
+    <ClInclude Include="mapObjects\CObjectClassesHandler.h" />
+    <ClInclude Include="mapObjects\CObjectHandler.h" />
+    <ClInclude Include="mapObjects\CommonConstructors.h" />
+    <ClInclude Include="mapObjects\CQuest.h" />
+    <ClInclude Include="mapObjects\CRewardableConstructor.h" />
+    <ClInclude Include="mapObjects\CRewardableObject.h" />
+    <ClInclude Include="mapObjects\JsonRandom.h" />
+    <ClInclude Include="mapObjects\MapObjects.h" />
+    <ClInclude Include="mapObjects\MiscObjects.h" />
+    <ClInclude Include="mapObjects\ObjectTemplate.h" />
     <ClInclude Include="mapping\CCampaignHandler.h" />
     <ClInclude Include="mapping\CMap.h" />
     <ClInclude Include="mapping\CMapInfo.h" />
diff --git a/lib/VCMI_lib.vcxproj.filters b/lib/VCMI_lib.vcxproj.filters
index 4650865c0..2bc0e6327 100644
--- a/lib/VCMI_lib.vcxproj.filters
+++ b/lib/VCMI_lib.vcxproj.filters
@@ -23,6 +23,9 @@
     <Filter Include="registerTypes">
       <UniqueIdentifier>{927d9b6e-3dc5-4370-b603-1b9887095509}</UniqueIdentifier>
     </Filter>
+    <Filter Include="mapObjects">
+      <UniqueIdentifier>{ee24c7f7-f4e2-4d35-b994-94a6e29ea92f}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="BattleAction.cpp" />
@@ -30,10 +33,8 @@
     <ClCompile Include="CArtHandler.cpp" />
     <ClCompile Include="CBuildingHandler.cpp" />
     <ClCompile Include="CCreatureHandler.cpp" />
-    <ClCompile Include="CDefObjInfoHandler.cpp" />
     <ClCompile Include="CGeneralTextHandler.cpp" />
     <ClCompile Include="CHeroHandler.cpp" />
-    <ClCompile Include="CObjectHandler.cpp" />
     <ClCompile Include="CSpellHandler.cpp" />
     <ClCompile Include="CTownHandler.cpp" />
     <ClCompile Include="CCreatureSet.cpp" />
@@ -157,6 +158,51 @@
     </ClCompile>
     <ClCompile Include="registerTypes\TypesMapObjects1.cpp" />
     <ClCompile Include="registerTypes\TypesMapObjects2.cpp" />
+    <ClCompile Include="mapObjects\CArmedInstance.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CBank.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CGHeroInstance.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CGMarket.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CGPandoraBox.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CGTownInstance.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CObjectClassesHandler.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CObjectHandler.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CommonConstructors.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CQuest.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CRewardableConstructor.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\CRewardableObject.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\JsonRandom.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\MiscObjects.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
+    <ClCompile Include="mapObjects\ObjectTemplate.cpp">
+      <Filter>mapObjects</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CCreatureSet.h">
@@ -201,18 +247,12 @@
     <ClInclude Include="CCreatureHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CDefObjInfoHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="CGeneralTextHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="CHeroHandler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="CObjectHandler.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="ConstTransitivePtr.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -399,5 +439,53 @@
     <ClInclude Include="rmg\float3.h">
       <Filter>rmg</Filter>
     </ClInclude>
+    <ClInclude Include="mapObjects\CArmedInstance.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CBank.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CGHeroInstance.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CGMarket.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CGPandoraBox.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CGTownInstance.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CObjectClassesHandler.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CObjectHandler.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CommonConstructors.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CQuest.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CRewardableConstructor.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\CRewardableObject.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\JsonRandom.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\MapObjects.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\MiscObjects.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
+    <ClInclude Include="mapObjects\ObjectTemplate.h">
+      <Filter>mapObjects</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/lib/mapObjects/CArmedInstance.cpp b/lib/mapObjects/CArmedInstance.cpp
index 050c10f38..72be9775f 100644
--- a/lib/mapObjects/CArmedInstance.cpp
+++ b/lib/mapObjects/CArmedInstance.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * CArmedInstance.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
diff --git a/lib/mapObjects/CArmedInstance.h b/lib/mapObjects/CArmedInstance.h
index f85b8a07e..bb771fc4e 100644
--- a/lib/mapObjects/CArmedInstance.h
+++ b/lib/mapObjects/CArmedInstance.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "CObjectHandler.h"
 #include "../CCreatureSet.h"
diff --git a/lib/mapObjects/CBank.cpp b/lib/mapObjects/CBank.cpp
index 8f4f52582..1c74a4fad 100644
--- a/lib/mapObjects/CBank.cpp
+++ b/lib/mapObjects/CBank.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * CBank.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
diff --git a/lib/mapObjects/CBank.h b/lib/mapObjects/CBank.h
index c8f8471aa..a08cb9874 100644
--- a/lib/mapObjects/CBank.h
+++ b/lib/mapObjects/CBank.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "CObjectHandler.h"
 #include "CArmedInstance.h"
diff --git a/lib/mapObjects/CGHeroInstance.cpp b/lib/mapObjects/CGHeroInstance.cpp
index 61e5da8c5..20fe4e870 100644
--- a/lib/mapObjects/CGHeroInstance.cpp
+++ b/lib/mapObjects/CGHeroInstance.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * CGHeroInstance.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
diff --git a/lib/mapObjects/CGHeroInstance.h b/lib/mapObjects/CGHeroInstance.h
index 327c0725b..602342a20 100644
--- a/lib/mapObjects/CGHeroInstance.h
+++ b/lib/mapObjects/CGHeroInstance.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "CObjectHandler.h"
 #include "CArmedInstance.h"
diff --git a/lib/mapObjects/CGMarket.cpp b/lib/mapObjects/CGMarket.cpp
index 98205974e..4968f9594 100644
--- a/lib/mapObjects/CGMarket.cpp
+++ b/lib/mapObjects/CGMarket.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  *
  * CGMarket.cpp, part of VCMI engine
  *
diff --git a/lib/mapObjects/CGMarket.h b/lib/mapObjects/CGMarket.h
index 8f010a705..8858c3a66 100644
--- a/lib/mapObjects/CGMarket.h
+++ b/lib/mapObjects/CGMarket.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "CObjectHandler.h"
 
diff --git a/lib/mapObjects/CGPandoraBox.cpp b/lib/mapObjects/CGPandoraBox.cpp
index 8f102e0a0..ed368c63c 100644
--- a/lib/mapObjects/CGPandoraBox.cpp
+++ b/lib/mapObjects/CGPandoraBox.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * CGPandoraBox.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
diff --git a/lib/mapObjects/CGPandoraBox.h b/lib/mapObjects/CGPandoraBox.h
index 227615cdf..828ce4697 100644
--- a/lib/mapObjects/CGPandoraBox.h
+++ b/lib/mapObjects/CGPandoraBox.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "CObjectHandler.h"
 #include "CArmedInstance.h"
diff --git a/lib/mapObjects/CGTownInstance.cpp b/lib/mapObjects/CGTownInstance.cpp
index ed7d51c84..89a0edba6 100644
--- a/lib/mapObjects/CGTownInstance.cpp
+++ b/lib/mapObjects/CGTownInstance.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * CGTownInstance.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
diff --git a/lib/mapObjects/CGTownInstance.h b/lib/mapObjects/CGTownInstance.h
index fda070a30..1b56fc99b 100644
--- a/lib/mapObjects/CGTownInstance.h
+++ b/lib/mapObjects/CGTownInstance.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "CObjectHandler.h"
 #include "CGMarket.h" // For IMarket interface
diff --git a/lib/mapObjects/CObjectClassesHandler.cpp b/lib/mapObjects/CObjectClassesHandler.cpp
index 122068eb6..b02d8c174 100644
--- a/lib/mapObjects/CObjectClassesHandler.cpp
+++ b/lib/mapObjects/CObjectClassesHandler.cpp
@@ -1,9 +1,9 @@
-#include "StdInc.h"
+#include "StdInc.h"
 #include "CObjectClassesHandler.h"
 
 #include "../filesystem/Filesystem.h"
 #include "../filesystem/CBinaryReader.h"
-#include "../lib/VCMI_Lib.h"
+#include "../VCMI_Lib.h"
 #include "../GameConstants.h"
 #include "../StringConstants.h"
 #include "../CGeneralTextHandler.h"
diff --git a/lib/mapObjects/CObjectClassesHandler.h b/lib/mapObjects/CObjectClassesHandler.h
index 413deea9e..0d7bed369 100644
--- a/lib/mapObjects/CObjectClassesHandler.h
+++ b/lib/mapObjects/CObjectClassesHandler.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "ObjectTemplate.h"
 
@@ -93,7 +93,7 @@ public:
 
 class CGObjectInstance;
 
-class AObjectTypeHandler : public boost::noncopyable
+class DLL_EXPORT AObjectTypeHandler : public boost::noncopyable
 {
 	RandomMapInfo rmgInfo;
 
diff --git a/lib/mapObjects/CObjectHandler.cpp b/lib/mapObjects/CObjectHandler.cpp
index bdc06a286..a74eaaf74 100644
--- a/lib/mapObjects/CObjectHandler.cpp
+++ b/lib/mapObjects/CObjectHandler.cpp
@@ -1,4 +1,4 @@
-/*
+/*
  * CObjectHandler.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
diff --git a/lib/mapObjects/CObjectHandler.h b/lib/mapObjects/CObjectHandler.h
index e1031a123..b340ac919 100644
--- a/lib/mapObjects/CObjectHandler.h
+++ b/lib/mapObjects/CObjectHandler.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include "ObjectTemplate.h"
 
diff --git a/lib/mapObjects/ObjectTemplate.cpp b/lib/mapObjects/ObjectTemplate.cpp
index 6cec38ba1..fd17e9810 100644
--- a/lib/mapObjects/ObjectTemplate.cpp
+++ b/lib/mapObjects/ObjectTemplate.cpp
@@ -3,7 +3,7 @@
 
 #include "../filesystem/Filesystem.h"
 #include "../filesystem/CBinaryReader.h"
-#include "../lib/VCMI_Lib.h"
+#include "../VCMI_Lib.h"
 #include "../GameConstants.h"
 #include "../StringConstants.h"
 #include "../CGeneralTextHandler.h"
diff --git a/lib/rmg/CRmgTemplateZone.cpp b/lib/rmg/CRmgTemplateZone.cpp
index bdc6bcb4e..b8824ba9a 100644
--- a/lib/rmg/CRmgTemplateZone.cpp
+++ b/lib/rmg/CRmgTemplateZone.cpp
@@ -20,6 +20,9 @@
 #include "../CSpellHandler.h" //for choosing random spells
 
 #include "../mapObjects/CObjectClassesHandler.h"
+//#include "../mapObjects/CGPandoraBox.h"
+//#include "../mapObjects/CRewardableObject.h"
+#include "../mapObjects/MapObjects.h"
 
 class CMap;
 class CMapEditManager;
diff --git a/scripting/erm/ERMInterpreter.cpp b/scripting/erm/ERMInterpreter.cpp
index e769ddc14..8abd3096d 100644
--- a/scripting/erm/ERMInterpreter.cpp
+++ b/scripting/erm/ERMInterpreter.cpp
@@ -2,7 +2,8 @@
 #include "ERMInterpreter.h"
 
 #include <cctype>
-#include "../../lib/CObjectHandler.h"
+#include "../../lib/mapObjects/CObjectHandler.h"
+#include "../../lib/mapObjects/MapObjects.h"
 #include "../../lib/CHeroHandler.h"
 #include "../../lib/CCreatureHandler.h"
 #include "../../lib/VCMIDirs.h"