diff --git a/lib/registerTypes/RegisterTypes.cpp b/lib/registerTypes/RegisterTypes.cpp
index 4b837cd57..798cfdf4c 100644
--- a/lib/registerTypes/RegisterTypes.cpp
+++ b/lib/registerTypes/RegisterTypes.cpp
@@ -2,22 +2,22 @@
 #define INSTANTIATE_REGISTER_TYPES_HERE
 #include "RegisterTypes.h"
 
-#include "mapping/CMapInfo.h"
-#include "StartInfo.h"
-#include "BattleState.h"
-#include "CGameState.h"
-#include "mapping/CMap.h"
-#include "CModHandler.h"
-#include "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 "CDefObjInfoHandler.h"
+#include "../mapping/CMapInfo.h"
+#include "../StartInfo.h"
+#include "../BattleState.h"
+#include "../CGameState.h"
+#include "../mapping/CMap.h"
+#include "../CModHandler.h"
+#include "../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 "../CDefObjInfoHandler.h"
 
 // For reference: peak memory usage by gcc during compilation of register type templates
 // registerTypesMapObjects:  1.9 Gb
diff --git a/lib/registerTypes/RegisterTypes.h b/lib/registerTypes/RegisterTypes.h
index 61f4aed51..1bab8ea8e 100644
--- a/lib/registerTypes/RegisterTypes.h
+++ b/lib/registerTypes/RegisterTypes.h
@@ -1,14 +1,14 @@
 #pragma  once
 
-#include "Connection.h"
-#include "NetPacks.h"
-#include "VCMI_Lib.h"
-#include "CArtHandler.h"
-#include "CObjectHandler.h"
-#include "CGameState.h"
-#include "CHeroHandler.h"
-#include "CTownHandler.h"
-#include "CModHandler.h" //needed?
+#include "../Connection.h"
+#include "../NetPacks.h"
+#include "../VCMI_Lib.h"
+#include "../CArtHandler.h"
+#include "../CObjectHandler.h"
+#include "../CGameState.h"
+#include "../CHeroHandler.h"
+#include "../CTownHandler.h"
+#include "../CModHandler.h" //needed?
 
 /*
  * RegisterTypes.h, part of VCMI engine
diff --git a/lib/registerTypes/TypesClientPacks1.cpp b/lib/registerTypes/TypesClientPacks1.cpp
index 056527196..97e461493 100644
--- a/lib/registerTypes/TypesClientPacks1.cpp
+++ b/lib/registerTypes/TypesClientPacks1.cpp
@@ -1,22 +1,22 @@
 #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 "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 "CDefObjInfoHandler.h"
+#include "../mapping/CMapInfo.h"
+#include "../StartInfo.h"
+#include "../BattleState.h"
+#include "../CGameState.h"
+#include "../mapping/CMap.h"
+#include "../CModHandler.h"
+#include "../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 "../CDefObjInfoHandler.h"
 
 
 template void registerTypesClientPacks1<CISer<CConnection>>(CISer<CConnection>& s);
diff --git a/lib/registerTypes/TypesClientPacks2.cpp b/lib/registerTypes/TypesClientPacks2.cpp
index 95e63a9c2..be4b656b5 100644
--- a/lib/registerTypes/TypesClientPacks2.cpp
+++ b/lib/registerTypes/TypesClientPacks2.cpp
@@ -1,22 +1,22 @@
 #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 "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 "CDefObjInfoHandler.h"
+#include "../mapping/CMapInfo.h"
+#include "../StartInfo.h"
+#include "../BattleState.h"
+#include "../CGameState.h"
+#include "../mapping/CMap.h"
+#include "../CModHandler.h"
+#include "../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 "../CDefObjInfoHandler.h"
 
 
 template void registerTypesClientPacks2<CISer<CConnection>>(CISer<CConnection>& s);
diff --git a/lib/registerTypes/TypesMapObjects.cpp b/lib/registerTypes/TypesMapObjects.cpp
index 9e99baadf..9c5eda717 100644
--- a/lib/registerTypes/TypesMapObjects.cpp
+++ b/lib/registerTypes/TypesMapObjects.cpp
@@ -1,22 +1,22 @@
 #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 "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 "CDefObjInfoHandler.h"
+#include "../mapping/CMapInfo.h"
+#include "../StartInfo.h"
+#include "../BattleState.h"
+#include "../CGameState.h"
+#include "../mapping/CMap.h"
+#include "../CModHandler.h"
+#include "../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 "../CDefObjInfoHandler.h"
 
 
 template void registerTypesMapObjects<CISer<CConnection>>(CISer<CConnection>& s);
diff --git a/lib/registerTypes/TypesPregamePacks.cpp b/lib/registerTypes/TypesPregamePacks.cpp
index d482a4cc9..1fd97e76b 100644
--- a/lib/registerTypes/TypesPregamePacks.cpp
+++ b/lib/registerTypes/TypesPregamePacks.cpp
@@ -1,22 +1,22 @@
 #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 "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 "CDefObjInfoHandler.h"
+#include "../mapping/CMapInfo.h"
+#include "../StartInfo.h"
+#include "../BattleState.h"
+#include "../CGameState.h"
+#include "../mapping/CMap.h"
+#include "../CModHandler.h"
+#include "../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 "../CDefObjInfoHandler.h"
 
 template void registerTypesPregamePacks<CISer<CConnection>>(CISer<CConnection>& s);
 template void registerTypesPregamePacks<COSer<CConnection>>(COSer<CConnection>& s);
diff --git a/lib/registerTypes/TypesServerPacks.cpp b/lib/registerTypes/TypesServerPacks.cpp
index 935695630..caabdcd1e 100644
--- a/lib/registerTypes/TypesServerPacks.cpp
+++ b/lib/registerTypes/TypesServerPacks.cpp
@@ -1,22 +1,22 @@
 #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 "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 "CDefObjInfoHandler.h"
+#include "../mapping/CMapInfo.h"
+#include "../StartInfo.h"
+#include "../BattleState.h"
+#include "../CGameState.h"
+#include "../mapping/CMap.h"
+#include "../CModHandler.h"
+#include "../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 "../CDefObjInfoHandler.h"
 
 template void registerTypesServerPacks<CISer<CConnection>>(CISer<CConnection>& s);
 template void registerTypesServerPacks<COSer<CConnection>>(COSer<CConnection>& s);