diff --git a/AI/VCAI/FuzzyHelper.cpp b/AI/VCAI/FuzzyHelper.cpp
index ae1941eb8..2f2a75d67 100644
--- a/AI/VCAI/FuzzyHelper.cpp
+++ b/AI/VCAI/FuzzyHelper.cpp
@@ -13,11 +13,11 @@
 #include "Goals/Goals.h"
 #include "VCAI.h"
 
-#include "../../../lib/mapObjectConstructors/AObjectTypeHandler.h"
-#include "../../../lib/mapObjectConstructors/CObjectClassesHandler.h"
-#include "../../../lib/mapObjectConstructors/CommonConstructors.h"
-#include "../../../lib/mapObjects/CBank.h"
-#include "../../../lib/mapObjects/CGDwelling.h"
+#include "../../lib/mapObjectConstructors/AObjectTypeHandler.h"
+#include "../../lib/mapObjectConstructors/CObjectClassesHandler.h"
+#include "../../lib/mapObjectConstructors/CommonConstructors.h"
+#include "../../lib/mapObjects/CBank.h"
+#include "../../lib/mapObjects/CGDwelling.h"
 
 FuzzyHelper * fh;
 
diff --git a/AI/VCAI/MapObjectsEvaluator.h b/AI/VCAI/MapObjectsEvaluator.h
index d51873a02..eb025b608 100644
--- a/AI/VCAI/MapObjectsEvaluator.h
+++ b/AI/VCAI/MapObjectsEvaluator.h
@@ -8,7 +8,8 @@
 *
 */
 #pragma once
-#include "../../lib/mapObjects/CObjectClassesHandler.h"
+
+#include "../../lib/mapObjectConstructors/CObjectClassesHandler.h"
 
 class MapObjectsEvaluator
 {
diff --git a/lib/mapObjectConstructors/IObjectInfo.h b/lib/mapObjectConstructors/IObjectInfo.h
index 17219fbfd..29c0ff66f 100644
--- a/lib/mapObjectConstructors/IObjectInfo.h
+++ b/lib/mapObjectConstructors/IObjectInfo.h
@@ -56,3 +56,5 @@ public:
 
 	virtual ~IObjectInfo() = default;
 };
+
+VCMI_LIB_NAMESPACE_END
diff --git a/lib/mapObjects/CGObjectInstance.cpp b/lib/mapObjects/CGObjectInstance.cpp
index ef139b4b6..6418c84d2 100644
--- a/lib/mapObjects/CGObjectInstance.cpp
+++ b/lib/mapObjects/CGObjectInstance.cpp
@@ -25,6 +25,8 @@
 #include "../mapping/CMap.h"
 #include "../serializer/JsonSerializeFormat.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 //TODO: remove constructor
 CGObjectInstance::CGObjectInstance():
 	pos(-1,-1,-1),
@@ -342,3 +344,5 @@ BattleField CGObjectInstance::getBattlefield() const
 {
 	return VLC->objtypeh->getHandlerFor(ID, subID)->getBattlefield();
 }
+
+VCMI_LIB_NAMESPACE_END
diff --git a/lib/mapObjects/CGObjectInstance.h b/lib/mapObjects/CGObjectInstance.h
index 8563858a5..1be8f011e 100644
--- a/lib/mapObjects/CGObjectInstance.h
+++ b/lib/mapObjects/CGObjectInstance.h
@@ -141,3 +141,5 @@ protected:
 
 	void serializeJsonOwner(JsonSerializeFormat & handler);
 };
+
+VCMI_LIB_NAMESPACE_END
diff --git a/lib/mapObjects/IMarket.cpp b/lib/mapObjects/IMarket.cpp
index 4832987fe..a6c8528a9 100644
--- a/lib/mapObjects/IMarket.cpp
+++ b/lib/mapObjects/IMarket.cpp
@@ -18,6 +18,8 @@
 
 #include "../VCMI_Lib.h"
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 bool IMarket::getOffer(int id1, int id2, int &val1, int &val2, EMarketMode::EMarketMode mode) const
 {
 	switch(mode)
@@ -173,3 +175,5 @@ std::vector<EMarketMode::EMarketMode> IMarket::availableModes() const
 
 	return ret;
 }
+
+VCMI_LIB_NAMESPACE_END
diff --git a/lib/rewardable/Reward.h b/lib/rewardable/Reward.h
index ff9655342..16f93bb8d 100644
--- a/lib/rewardable/Reward.h
+++ b/lib/rewardable/Reward.h
@@ -11,6 +11,8 @@
 #pragma once
 
 #include "../ResourceSet.h"
+#include "../bonuses/Bonus.h"
+#include "../CCreatureSet.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 
diff --git a/test/map/MapComparer.cpp b/test/map/MapComparer.cpp
index dd5c804bf..a94e6fafe 100644
--- a/test/map/MapComparer.cpp
+++ b/test/map/MapComparer.cpp
@@ -12,6 +12,7 @@
 #include "MapComparer.h"
 
 #include "../lib/mapping/CMap.h"
+#include "../lib/mapObjects/ObjectTemplate.h"
 
 #define VCMI_CHECK_FIELD_EQUAL_P(field) EXPECT_EQ(actual->field, expected->field)