diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 89ae588cb..f426a13a6 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -94,6 +94,7 @@ set(lib_SRCS
 		registerTypes/TypesClientPacks2.cpp
 		registerTypes/TypesMapObjects1.cpp
 		registerTypes/TypesMapObjects2.cpp
+                registerTypes/TypesMapObjects3.cpp
 		registerTypes/TypesPregamePacks.cpp
 		registerTypes/TypesServerPacks.cpp
 )
diff --git a/lib/VCMI_lib.cbp b/lib/VCMI_lib.cbp
index 0bf21859e..aaff61c72 100644
--- a/lib/VCMI_lib.cbp
+++ b/lib/VCMI_lib.cbp
@@ -91,8 +91,6 @@
 		<Unit filename="CCreatureHandler.h" />
 		<Unit filename="CCreatureSet.cpp" />
 		<Unit filename="CCreatureSet.h" />
-		<Unit filename="CDefObjInfoHandler.cpp" />
-		<Unit filename="CDefObjInfoHandler.h" />
 		<Unit filename="CGameInfoCallback.cpp" />
 		<Unit filename="CGameInfoCallback.h" />
 		<Unit filename="CGameInterface.cpp" />
@@ -105,8 +103,6 @@
 		<Unit filename="CHeroHandler.h" />
 		<Unit filename="CModHandler.cpp" />
 		<Unit filename="CModHandler.h" />
-		<Unit filename="CObjectHandler.cpp" />
-		<Unit filename="CObjectHandler.h" />
 		<Unit filename="CObstacleInstance.cpp" />
 		<Unit filename="CObstacleInstance.h" />
 		<Unit filename="CRandomGenerator.cpp" />
@@ -185,6 +181,37 @@
 		<Unit filename="logging/CBasicLogConfigurator.h" />
 		<Unit filename="logging/CLogger.cpp" />
 		<Unit filename="logging/CLogger.h" />
+		<Unit filename="mapObjects/CArmedInstance.cpp" />
+		<Unit filename="mapObjects/CArmedInstance.h" />
+		<Unit filename="mapObjects/CBank.cpp" />
+		<Unit filename="mapObjects/CBank.h" />
+		<Unit filename="mapObjects/CGHeroInstance.cpp" />
+		<Unit filename="mapObjects/CGHeroInstance.h" />
+		<Unit filename="mapObjects/CGMarket.cpp" />
+		<Unit filename="mapObjects/CGMarket.h" />
+		<Unit filename="mapObjects/CGPandoraBox.cpp" />
+		<Unit filename="mapObjects/CGPandoraBox.h" />
+		<Unit filename="mapObjects/CGTownInstance.cpp" />
+		<Unit filename="mapObjects/CGTownInstance.h" />
+		<Unit filename="mapObjects/CObjectClassesHandler.cpp" />
+		<Unit filename="mapObjects/CObjectClassesHandler.h" />
+		<Unit filename="mapObjects/CObjectHandler.cpp" />
+		<Unit filename="mapObjects/CObjectHandler.h" />
+		<Unit filename="mapObjects/CQuest.cpp" />
+		<Unit filename="mapObjects/CQuest.h" />
+		<Unit filename="mapObjects/CRewardableConstructor.cpp" />
+		<Unit filename="mapObjects/CRewardableConstructor.h" />
+		<Unit filename="mapObjects/CRewardableObject.cpp" />
+		<Unit filename="mapObjects/CRewardableObject.h" />
+		<Unit filename="mapObjects/CommonConstructors.cpp" />
+		<Unit filename="mapObjects/CommonConstructors.h" />
+		<Unit filename="mapObjects/JsonRandom.cpp" />
+		<Unit filename="mapObjects/JsonRandom.h" />
+		<Unit filename="mapObjects/MapObjects.h" />
+		<Unit filename="mapObjects/MiscObjects.cpp" />
+		<Unit filename="mapObjects/MiscObjects.h" />
+		<Unit filename="mapObjects/ObjectTemplate.cpp" />
+		<Unit filename="mapObjects/ObjectTemplate.h" />
 		<Unit filename="mapping/CCampaignHandler.cpp" />
 		<Unit filename="mapping/CCampaignHandler.h" />
 		<Unit filename="mapping/CMap.cpp" />
@@ -205,6 +232,7 @@
 		<Unit filename="registerTypes/TypesClientPacks2.cpp" />
 		<Unit filename="registerTypes/TypesMapObjects1.cpp" />
 		<Unit filename="registerTypes/TypesMapObjects2.cpp" />
+		<Unit filename="registerTypes/TypesMapObjects3.cpp" />
 		<Unit filename="registerTypes/TypesPregamePacks.cpp" />
 		<Unit filename="registerTypes/TypesServerPacks.cpp" />
 		<Unit filename="rmg/CMapGenOptions.cpp" />
diff --git a/lib/mapObjects/CObjectClassesHandler.h b/lib/mapObjects/CObjectClassesHandler.h
index 413deea9e..95b32fc49 100644
--- a/lib/mapObjects/CObjectClassesHandler.h
+++ b/lib/mapObjects/CObjectClassesHandler.h
@@ -93,7 +93,7 @@ public:
 
 class CGObjectInstance;
 
-class AObjectTypeHandler : public boost::noncopyable
+class DLL_LINKAGE AObjectTypeHandler : public boost::noncopyable
 {
 	RandomMapInfo rmgInfo;
 
diff --git a/lib/registerTypes/TypesMapObjects1.cpp b/lib/registerTypes/TypesMapObjects1.cpp
index 0a12c1fd8..961a16136 100644
--- a/lib/registerTypes/TypesMapObjects1.cpp
+++ b/lib/registerTypes/TypesMapObjects1.cpp
@@ -18,15 +18,6 @@
 #include "../NetPacks.h"
 #include "../mapObjects/CObjectClassesHandler.h"
 
-template void registerTypesMapObjectTypes<CISer<CConnection>>(CISer<CConnection>& s);
-template void registerTypesMapObjectTypes<COSer<CConnection>>(COSer<CConnection>& s);
-template void registerTypesMapObjectTypes<CISer<CMemorySerializer>>(CISer<CMemorySerializer>& s);
-template void registerTypesMapObjectTypes<COSer<CMemorySerializer>>(COSer<CMemorySerializer>& s);
-template void registerTypesMapObjectTypes<CSaveFile>(CSaveFile & s);
-template void registerTypesMapObjectTypes<CLoadFile>(CLoadFile & s);
-template void registerTypesMapObjectTypes<CTypeList>(CTypeList & s);
-template void registerTypesMapObjectTypes<CLoadIntegrityValidator>(CLoadIntegrityValidator & s);
-
 template void registerTypesMapObjects1<CISer<CConnection>>(CISer<CConnection>& s);
 template void registerTypesMapObjects1<COSer<CConnection>>(COSer<CConnection>& s);
 template void registerTypesMapObjects1<CISer<CMemorySerializer>>(CISer<CMemorySerializer>& s);
diff --git a/lib/registerTypes/TypesMapObjects3.cpp b/lib/registerTypes/TypesMapObjects3.cpp
new file mode 100644
index 000000000..83cd20827
--- /dev/null
+++ b/lib/registerTypes/TypesMapObjects3.cpp
@@ -0,0 +1,28 @@
+#include "StdInc.h"
+#include "RegisterTypes.h"
+
+#include "../mapping/CMapInfo.h"
+#include "../StartInfo.h"
+#include "../BattleState.h"
+#include "../CGameState.h"
+#include "../mapping/CMap.h"
+#include "../CModHandler.h"
+#include "../mapObjects/CObjectHandler.h"
+#include "../CCreatureHandler.h"
+#include "../VCMI_Lib.h"
+#include "../CArtHandler.h"
+#include "../CHeroHandler.h"
+#include "../CSpellHandler.h"
+#include "../CTownHandler.h"
+#include "../mapping/CCampaignHandler.h"
+#include "../NetPacks.h"
+#include "../mapObjects/CObjectClassesHandler.h"
+
+template void registerTypesMapObjectTypes<CISer<CConnection>>(CISer<CConnection>& s);
+template void registerTypesMapObjectTypes<COSer<CConnection>>(COSer<CConnection>& s);
+template void registerTypesMapObjectTypes<CISer<CMemorySerializer>>(CISer<CMemorySerializer>& s);
+template void registerTypesMapObjectTypes<COSer<CMemorySerializer>>(COSer<CMemorySerializer>& s);
+template void registerTypesMapObjectTypes<CSaveFile>(CSaveFile & s);
+template void registerTypesMapObjectTypes<CLoadFile>(CLoadFile & s);
+template void registerTypesMapObjectTypes<CTypeList>(CTypeList & s);
+template void registerTypesMapObjectTypes<CLoadIntegrityValidator>(CLoadIntegrityValidator & s);