Cleanup:

- removed commented-out #includ'es
- renamed some files to match name of class

AI/VCAI/AIUtility.cpp

@@ -3,7 +3,6 @@
 #include "VCAI.h"
 
 #include "../../lib/UnlockGuard.h"
-//#include "../../lib/mapObjects/CObjectHandler.h"
 #include "../../lib/CConfigHandler.h"
 #include "../../lib/CHeroHandler.h"
 

AI/VCAI/AIUtility.h

@@ -5,7 +5,6 @@
 #include "../../lib/CCreatureHandler.h"
 #include "../../lib/CTownHandler.h"
 #include "../../lib/CSpellHandler.h"
-//#include "../../lib/mapObjects/CObjectHandler.h"
 #include "../../lib/Connection.h"
 #include "../../lib/CGameState.h"
 #include "../../lib/mapping/CMap.h"

AI/VCAI/Fuzzy.cpp

@@ -6,7 +6,6 @@
 #include "../../lib/CCreatureHandler.h"
 #include "../../lib/VCMI_Lib.h"
 #include "../../CCallback.h"
-//#include "Goals.cpp"
 #include "VCAI.h"
 
 /*

AI/VCAI/Goals.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../../lib/VCMI_Lib.h"
-//#include "../../lib/mapObjects/CObjectHandler.h"
 #include "../../lib/CBuildingHandler.h"
 #include "../../lib/CCreatureHandler.h"
 #include "../../lib/CTownHandler.h"

AI/VCAI/VCAI.h

@@ -4,7 +4,6 @@
 #include "Goals.h"
 #include "../../lib/AI_Base.h"
 #include "../../CCallback.h"
-//#include "../../lib/mapObjects/CObjectClassesHandler.h"
 
 #include "../../lib/CThreadHelper.h"
 
@@ -14,7 +13,6 @@
 #include "../../lib/CCreatureHandler.h"
 #include "../../lib/CTownHandler.h"
 #include "../../lib/CSpellHandler.h"
-//#include "../../lib/mapObjects/CObjectHandler.h"
 #include "../../lib/Connection.h"
 #include "../../lib/CGameState.h"
 #include "../../lib/mapping/CMap.h"

CCallback.cpp

@@ -12,7 +12,6 @@
 #include "lib/mapObjects/CObjectClassesHandler.h"
 #include "lib/CGeneralTextHandler.h"
 #include "lib/CHeroHandler.h"
-//#include "lib/mapObjects/CObjectHandler.h"
 #include "lib/Connection.h"
 #include "lib/NetPacks.h"
 #include "client/mapHandler.h"

client/CHeroWindow.h

@@ -4,8 +4,6 @@
 #include "gui/CIntObjectClasses.h"
 #include "GUIClasses.h"
 
-//#include "CPlayerInterface.h"
-
 /*
  * CHeroWindow.h, part of VCMI engine
  *

client/CMT.cpp

@@ -34,7 +34,6 @@
 #include "CMessage.h"
 #include "../lib/CModHandler.h"
 #include "../lib/CTownHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/CArtHandler.h"
 #include "../lib/CScriptingModule.h"
 #include "../lib/GameConstants.h"
@@ -44,7 +43,6 @@
 #ifdef _WIN32
 #include "SDL_syswm.h"
 #endif
-//#include "../lib/mapObjects/CObjectClassesHandler.h"
 #include "../lib/UnlockGuard.h"
 #include "CMT.h"
 

client/CPlayerInterface.cpp

@@ -1,5 +1,4 @@
 #include "StdInc.h"
-//#include "../lib/mapObjects/CObjectClassesHandler.h"
 #include "CAdvmapInterface.h"
 #include "battle/CBattleInterface.h"
 #include "battle/CBattleInterfaceClasses.h"
@@ -13,7 +12,6 @@
 #include "CQuestLog.h"
 #include "CMessage.h"
 #include "CPlayerInterface.h"
-//#include "gui/SDL_Extensions.h"
 #include "gui/SDL_Extensions.h"
 #include "../lib/CConfigHandler.h"
 #include "battle/CCreatureAnimation.h"
@@ -21,7 +19,6 @@
 #include "../lib/CArtHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/Connection.h"
 #include "../lib/CSpellHandler.h"
 #include "../lib/CTownHandler.h"

client/CPreGame.cpp

@@ -11,11 +11,9 @@
 #include "gui/CCursorHandler.h"
 #include "CAnimation.h"
 #include "CDefHandler.h"
-//#include "../lib/mapObjects/CObjectClassesHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CTownHandler.h"
 #include "../lib/CHeroHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/mapping/CCampaignHandler.h"
 #include "../lib/CCreatureHandler.h"
 #include "../lib/JsonNode.h"

client/CQuestLog.cpp

@@ -16,7 +16,6 @@
 #include "../lib/CGameState.h"
 #include "../lib/CArtHandler.h"
 #include "../lib/NetPacksBase.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 
 #include "gui/CGuiHandler.h"
 #include "gui/CIntObjectClasses.h"

client/CSpellWindow.cpp

@@ -3,7 +3,6 @@
 
 #include "Graphics.h"
 #include "CDefHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/CSpellHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "CVideoHandler.h"

client/Client.cpp

@@ -11,11 +11,9 @@
 #include "../lib/BattleState.h"
 #include "../lib/CModHandler.h"
 #include "../lib/CArtHandler.h"
-//#include "../lib/mapObjects/CObjectClassesHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
 #include "../lib/CTownHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/CBuildingHandler.h"
 #include "../lib/CSpellHandler.h"
 #include "../lib/Connection.h"

client/GUIClasses.cpp

@@ -24,7 +24,6 @@
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
 #include "../lib/CModHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/CSpellHandler.h"
 #include "../lib/CTownHandler.h"
 #include "../lib/CondSh.h"

client/Graphics.cpp

@@ -12,13 +12,10 @@
 #include "../CCallback.h"
 #include "../lib/CHeroHandler.h"
 #include "../lib/CTownHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CCreatureHandler.h"
 #include "CBitmapHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/CSpellHandler.h"
-//#include "../lib/mapObjects/CObjectClassesHandler.h"
 #include "../lib/CGameState.h"
 #include "../lib/JsonNode.h"
 #include "../lib/vcmi_endian.h"

client/NetPacksClient.cpp

@@ -9,9 +9,7 @@
 #include "CGameInfo.h"
 #include "../lib/Connection.h"
 #include "../lib/CGeneralTextHandler.h"
-//#include "../lib/mapObjects/CObjectClassesHandler.h"
 #include "../lib/CHeroHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/VCMI_Lib.h"
 #include "../lib/mapping/CMap.h"
 #include "../lib/VCMIDirs.h"

client/battle/CBattleInterface.cpp

@@ -6,7 +6,6 @@
 #include "../CAdvmapInterface.h"
 #include "../CAnimation.h"
 #include "../CBitmapHandler.h"
-//#include "../../lib/mapObjects/CObjectHandler.h"
 #include "../../lib/CHeroHandler.h"
 # include "../CDefHandler.h"
 #include "../../lib/CSpellHandler.h"

client/battle/CBattleInterfaceClasses.cpp

@@ -16,7 +16,6 @@
 #include "../../lib/CGeneralTextHandler.h"
 #include "../../lib/NetPacks.h"
 #include "../../lib/CCreatureHandler.h"
-//#include "../../lib/mapObjects/CObjectHandler.h"
 #include "../../lib/BattleState.h"
 #include "../CMusicHandler.h"
 #include "../CVideoHandler.h"

client/battle/CCreatureAnimation.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include "../../lib/FunctionList.h"
-//#include "../CDefHandler.h"
 #include "../CAnimation.h"
 
 /*

lib/CGameState.h

@@ -14,7 +14,6 @@
 #include "IGameCallback.h"
 #include "ResourceSet.h"
 #include "int3.h"
-//#include "mapObjects/CObjectHandler.h"
 #include "CRandomGenerator.h"
 
 /*

lib/CMakeLists.txt

@@ -19,8 +19,8 @@ set(lib_SRCS
 		filesystem/Filesystem.cpp
 		filesystem/ResourceID.cpp
 
-		mapObjects/CGArmedInstance.cpp
-		mapObjects/CGBank.cpp
+		mapObjects/CArmedInstance.cpp
+		mapObjects/CBank.cpp
 		mapObjects/CGHeroInstance.cpp
 		mapObjects/CGMarket.cpp
 		mapObjects/CGPandoraBox.cpp

lib/mapObjects/CArmedInstance.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CArmedInstance.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -9,7 +9,7 @@
  */
 
 #include "StdInc.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../CTownHandler.h"
 #include "../CCreatureHandler.h"

lib/mapObjects/CArmedInstance.h

@@ -4,7 +4,7 @@
 #include "../CCreatureSet.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CArmedInstance.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CBank.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CBank.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -9,10 +9,10 @@
  */
 
 #include "StdInc.h"
-#include "CGBank.h"
+#include "CBank.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
 #include "../client/CSoundBase.h"
 
 using namespace boost::assign;

lib/mapObjects/CBank.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CBank.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CGHeroInstance.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CGHeroInstance.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,11 +11,11 @@
 #include "StdInc.h"
 #include "CGHeroInstance.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
-#include "CHeroHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
+#include "../CHeroHandler.h"
 #include "../client/CSoundBase.h"
-#include "CSpellHandler.h"
+#include "../CSpellHandler.h"
 #include "CObjectClassesHandler.h"
 
 

lib/mapObjects/CGHeroInstance.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../CArtHandler.h" // For CArtifactSet
 #include "../CRandomGenerator.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CGHeroInstance.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CGMarket.cpp

@@ -1,5 +1,6 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ *
+ * CGMarket.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,8 +12,8 @@
 #include "StdInc.h"
 #include "CGMarket.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
 
 using namespace boost::assign;
 

lib/mapObjects/CGMarket.h

@@ -3,7 +3,7 @@
 #include "CObjectHandler.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CGMarket.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CGPandoraBox.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CGPandoraBox.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,7 +11,7 @@
 #include "StdInc.h"
 #include "CGPandoraBox.h"
 
-#include "NetPacks.h"
+#include "../NetPacks.h"
 #include "../client/CSoundBase.h"
 
 #include "../CSpellHandler.h"

lib/mapObjects/CGPandoraBox.h

@@ -1,11 +1,10 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
-
+#include "CArmedInstance.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CGPandoraBox.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CGTownInstance.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * CGTownInstance.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,7 +11,7 @@
 #include "StdInc.h"
 #include "CGTownInstance.h"
 
-#include "NetPacks.h"
+#include "../NetPacks.h"
 #include "../CGeneralTextHandler.h"
 
 using namespace boost::assign;

lib/mapObjects/CGTownInstance.h

@@ -2,12 +2,12 @@
 
 #include "CObjectHandler.h"
 #include "CGMarket.h" // For IMarket interface
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../CTownHandler.h" // For CTown
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CGTownInstance.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CObjectClassesHandler.cpp

@@ -1,14 +1,14 @@
 #include "StdInc.h"
 #include "CObjectClassesHandler.h"
 
-#include "filesystem/Filesystem.h"
-#include "filesystem/CBinaryReader.h"
+#include "../filesystem/Filesystem.h"
+#include "../filesystem/CBinaryReader.h"
 #include "../lib/VCMI_Lib.h"
-#include "GameConstants.h"
-#include "StringConstants.h"
-#include "CGeneralTextHandler.h"
-#include "CModHandler.h"
-#include "JsonNode.h"
+#include "../GameConstants.h"
+#include "../StringConstants.h"
+#include "../CGeneralTextHandler.h"
+#include "../CModHandler.h"
+#include "../JsonNode.h"
 
 #include "CRewardableConstructor.h"
 #include "MapObjects.h"

lib/mapObjects/CObjectHandler.cpp

@@ -11,9 +11,9 @@
 #include "StdInc.h"
 #include "CObjectHandler.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
-#include "CHeroHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
+#include "../CHeroHandler.h"
 #include "../client/CSoundBase.h"
 
 #include "CObjectClassesHandler.h"

lib/mapObjects/CQuest.cpp

@@ -1,5 +1,6 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ *
+ * CQuest.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,7 +12,7 @@
 #include "StdInc.h"
 #include "CQuest.h"
 
-#include "NetPacks.h"
+#include "../NetPacks.h"
 #include "../client/CSoundBase.h"
 #include "../CGeneralTextHandler.h"
 #include "../CHeroHandler.h"

lib/mapObjects/CQuest.h

@@ -1,13 +1,13 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../CCreatureSet.h"
 #include "../NetPacksBase.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * CQuest.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CRewardableConstructor.cpp

@@ -1,12 +1,12 @@
 #include "StdInc.h"
 #include "CRewardableConstructor.h"
 
-#include "CRandomGenerator.h"
-#include "StringConstants.h"
-#include "CCreatureHandler.h"
+#include "../CRandomGenerator.h"
+#include "../StringConstants.h"
+#include "../CCreatureHandler.h"
 
 /*
- * CObjectConstructor.cpp, part of VCMI engine
+ * CRewardableConstructor.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CRewardableConstructor.h

@@ -6,7 +6,7 @@
 #include "../JsonNode.h"
 
 /*
- * CObjectConstructor.h, part of VCMI engine
+ * CRewardableConstructor.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/CRewardableObject.cpp

@@ -1,4 +1,5 @@
 /*
+ *
  * CRewardableObject.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
@@ -10,10 +11,10 @@
 
 #include "StdInc.h"
 #include "CRewardableObject.h"
-#include "CHeroHandler.h"
-#include "CGeneralTextHandler.h"
+#include "../CHeroHandler.h"
+#include "../CGeneralTextHandler.h"
 #include "../client/CSoundBase.h"
-#include "NetPacks.h"
+#include "../NetPacks.h"
 
 #include "CObjectClassesHandler.h"
 

lib/mapObjects/CRewardableObject.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 #include "../NetPacksBase.h"
 

lib/mapObjects/MapObjects.h

@@ -14,8 +14,8 @@
 // Possible TODO - remove this header after CObjectHandler.cpp will be fully split into smaller files
 #include "CObjectHandler.h"
 
-#include "CGArmedInstance.h"
-#include "CGBank.h"
+#include "CArmedInstance.h"
+#include "CBank.h"
 #include "CGHeroInstance.h"
 #include "CGMarket.h"
 #include "CGTownInstance.h"

lib/mapObjects/MiscObjects.cpp

@@ -1,5 +1,5 @@
 /*
- * CObjectHandler.cpp, part of VCMI engine
+ * MiscObjects.cpp, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *
@@ -11,9 +11,8 @@
 #include "StdInc.h"
 #include "MiscObjects.h"
 
-#include "NetPacks.h"
-#include "CGeneralTextHandler.h"
-//#include "CHeroHandler.h"
+#include "../NetPacks.h"
+#include "../CGeneralTextHandler.h"
 #include "../client/CSoundBase.h"
 
 #include "CObjectClassesHandler.h"

lib/mapObjects/MiscObjects.h

@@ -1,10 +1,10 @@
 #pragma once
 
 #include "CObjectHandler.h"
-#include "CGArmedInstance.h"
+#include "CArmedInstance.h"
 
 /*
- * CObjectHandler.h, part of VCMI engine
+ * MiscObjects.h, part of VCMI engine
  *
  * Authors: listed in file AUTHORS in main folder
  *

lib/mapObjects/ObjectTemplate.cpp

@@ -1,15 +1,15 @@
 #include "StdInc.h"
 #include "CObjectClassesHandler.h"
 
-#include "filesystem/Filesystem.h"
-#include "filesystem/CBinaryReader.h"
+#include "../filesystem/Filesystem.h"
+#include "../filesystem/CBinaryReader.h"
 #include "../lib/VCMI_Lib.h"
-#include "GameConstants.h"
-#include "StringConstants.h"
-#include "CGeneralTextHandler.h"
+#include "../GameConstants.h"
+#include "../StringConstants.h"
+#include "../CGeneralTextHandler.h"
 #include "CObjectHandler.h"
-#include "CModHandler.h"
-#include "JsonNode.h"
+#include "../CModHandler.h"
+#include "../JsonNode.h"
 
 #include "CRewardableConstructor.h"
 

lib/mapObjects/ObjectTemplate.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GameConstants.h"
+#include "../GameConstants.h"
 
 /*
  * ObjectTemplate.h, part of VCMI engine

lib/mapping/MapFormatH3M.h

@@ -14,7 +14,6 @@
 #include "CMapService.h"
 #include "../GameConstants.h"
 #include "../ResourceSet.h"
-//#include "../mapObjects/CObjectClassesHandler.h"
 #include "../mapObjects/ObjectTemplate.h"
 
 #include "../int3.h"

lib/rmg/CMapGenerator.cpp

@@ -5,8 +5,6 @@
 #include "../VCMI_Lib.h"
 #include "../CGeneralTextHandler.h"
 #include "../mapping/CMapEditManager.h"
-//#include "../mapObjects/CObjectHandler.h"
-//#include "../mapObjects/CObjectClassesHandler.h"
 #include "../CTownHandler.h"
 #include "../StringConstants.h"
 #include "../filesystem/Filesystem.h"

server/CGameHandler.cpp

@@ -8,9 +8,7 @@
 #include "../lib/CModHandler.h"
 #include "../lib/CArtHandler.h"
 #include "../lib/CBuildingHandler.h"
-//#include "../lib/mapObjects/CObjectClassesHandler.h"
 #include "../lib/CHeroHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/CSpellHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CTownHandler.h"

server/CVCMIServer.cpp

@@ -8,7 +8,6 @@
 #include "../lib/Connection.h"
 #include "../lib/CModHandler.h"
 #include "../lib/CArtHandler.h"
-//#include "../lib/mapObjects/CObjectClassesHandler.h"
 #include "../lib/CGeneralTextHandler.h"
 #include "../lib/CHeroHandler.h"
 #include "../lib/CTownHandler.h"
@@ -26,7 +25,6 @@
 #include "../lib/VCMIDirs.h"
 #include "CGameHandler.h"
 #include "../lib/mapping/CMapInfo.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/GameConstants.h"
 #include "../lib/logging/CBasicLogConfigurator.h"
 #include "../lib/CConfigHandler.h"

server/NetPacksServer.cpp

@@ -2,7 +2,6 @@
 #include "../lib/NetPacks.h"
 
 #include "CGameHandler.h"
-//#include "../lib/mapObjects/CObjectHandler.h"
 #include "../lib/IGameCallback.h"
 #include "../lib/mapping/CMap.h"
 #include "../lib/CGameState.h"

server/StdInc.h

@@ -4,10 +4,7 @@
 
 #include <boost/crc.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp> //no i/o just types
-//#include <boost/interprocess/mapped_region.hpp>
-//#include <boost/interprocess/shared_memory_object.hpp>
 #include <boost/random/linear_congruential.hpp>
 #include <boost/random/mersenne_twister.hpp>
 #include <boost/random/variate_generator.hpp>
 #include <boost/system/system_error.hpp>
-//#include <boost/asio.hpp>