diff --git a/AI/VCAI/FuzzyEngines.h b/AI/VCAI/FuzzyEngines.h
index 26de9c1ef..cad20a48a 100644
--- a/AI/VCAI/FuzzyEngines.h
+++ b/AI/VCAI/FuzzyEngines.h
@@ -8,7 +8,7 @@
 *
 */
 #pragma once
-#include "fl/Headers.h"
+#include <fl/Headers.h>
 #include "Goals/AbstractGoal.h"
 
 class CArmedInstance;
@@ -69,4 +69,4 @@ public:
 	float evaluate(Goals::VisitObj & goal);
 protected:
 	fl::InputVariable * objectValue;
-};
\ No newline at end of file
+};
diff --git a/AI/VCAI/FuzzyHelper.h b/AI/VCAI/FuzzyHelper.h
index c82a91923..4d75aeda9 100644
--- a/AI/VCAI/FuzzyHelper.h
+++ b/AI/VCAI/FuzzyHelper.h
@@ -12,7 +12,7 @@
 
 class CBank;
 
-class FuzzyHelper
+class DLL_EXPORT FuzzyHelper
 {
 public:
 	TacticalAdvantageEngine tacticalAdvantageEngine;
diff --git a/AI/VCAI/VCAI.cbp b/AI/VCAI/VCAI.cbp
index 33a004611..91277c4c8 100644
--- a/AI/VCAI/VCAI.cbp
+++ b/AI/VCAI/VCAI.cbp
@@ -91,8 +91,53 @@
 		<Unit filename="FuzzyEngines.h" />
 		<Unit filename="FuzzyHelper.cpp" />
 		<Unit filename="FuzzyHelper.h" />
-		<Unit filename="Goals.cpp" />
-		<Unit filename="Goals.h" />
+		<Unit filename="Goals/AbstractGoal.cpp" />
+		<Unit filename="Goals/AbstractGoal.h" />
+		<Unit filename="Goals/AdventureSpellCast.cpp" />
+		<Unit filename="Goals/AdventureSpellCast.h" />
+		<Unit filename="Goals/Build.cpp" />
+		<Unit filename="Goals/Build.h" />
+		<Unit filename="Goals/BuildBoat.cpp" />
+		<Unit filename="Goals/BuildBoat.h" />
+		<Unit filename="Goals/BuildThis.cpp" />
+		<Unit filename="Goals/BuildThis.h" />
+		<Unit filename="Goals/BuyArmy.cpp" />
+		<Unit filename="Goals/BuyArmy.h" />
+		<Unit filename="Goals/CGoal.h" />
+		<Unit filename="Goals/ClearWayTo.cpp" />
+		<Unit filename="Goals/ClearWayTo.h" />
+		<Unit filename="Goals/CollectRes.cpp" />
+		<Unit filename="Goals/CollectRes.h" />
+		<Unit filename="Goals/CompleteQuest.cpp" />
+		<Unit filename="Goals/CompleteQuest.h" />
+		<Unit filename="Goals/Conquer.cpp" />
+		<Unit filename="Goals/Conquer.h" />
+		<Unit filename="Goals/DigAtTile.cpp" />
+		<Unit filename="Goals/DigAtTile.h" />
+		<Unit filename="Goals/Explore.cpp" />
+		<Unit filename="Goals/Explore.h" />
+		<Unit filename="Goals/FindObj.cpp" />
+		<Unit filename="Goals/FindObj.h" />
+		<Unit filename="Goals/GatherArmy.cpp" />
+		<Unit filename="Goals/GatherArmy.h" />
+		<Unit filename="Goals/GatherTroops.cpp" />
+		<Unit filename="Goals/GatherTroops.h" />
+		<Unit filename="Goals/GetArtOfType.cpp" />
+		<Unit filename="Goals/GetArtOfType.h" />
+		<Unit filename="Goals/Goals.h" />
+		<Unit filename="Goals/Invalid.h" />
+		<Unit filename="Goals/RecruitHero.cpp" />
+		<Unit filename="Goals/RecruitHero.h" />
+		<Unit filename="Goals/Trade.cpp" />
+		<Unit filename="Goals/Trade.h" />
+		<Unit filename="Goals/VisitHero.cpp" />
+		<Unit filename="Goals/VisitHero.h" />
+		<Unit filename="Goals/VisitObj.cpp" />
+		<Unit filename="Goals/VisitObj.h" />
+		<Unit filename="Goals/VisitTile.cpp" />
+		<Unit filename="Goals/VisitTile.h" />
+		<Unit filename="Goals/Win.cpp" />
+		<Unit filename="Goals/Win.h" />
 		<Unit filename="MapObjectsEvaluator.cpp" />
 		<Unit filename="MapObjectsEvaluator.h" />
 		<Unit filename="Pathfinding/AINodeStorage.cpp" />
diff --git a/test/Test.cbp b/test/Test.cbp
index 883c262ff..a95509733 100644
--- a/test/Test.cbp
+++ b/test/Test.cbp
@@ -61,6 +61,7 @@
 			<Add directory="../include" />
 			<Add directory="googletest/googletest" />
 			<Add directory="googletest/googlemock" />
+			<Add directory="../AI/FuzzyLite/fuzzylite" />
 		</Compiler>
 		<Linker>
 			<Add option="-lVCMI_lib" />
diff --git a/test/vcai/mock_VCAI_CGoal.h b/test/vcai/mock_VCAI_CGoal.h
index 4086fb7b9..5e32eb1b1 100644
--- a/test/vcai/mock_VCAI_CGoal.h
+++ b/test/vcai/mock_VCAI_CGoal.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "../AI/VCAI/Goals.h"
+#include "../../AI/VCAI/Goals/Goals.h"
 
 namespace Goals
 {