diff --git a/client/VCMI_client.cbp b/client/VCMI_client.cbp
index 2ff9c874d..64ffd0400 100644
--- a/client/VCMI_client.cbp
+++ b/client/VCMI_client.cbp
@@ -126,26 +126,12 @@
 		</Linker>
 		<Unit filename="../CCallback.cpp" />
 		<Unit filename="../CCallback.h" />
-		<Unit filename="AdventureMapClasses.cpp" />
-		<Unit filename="AdventureMapClasses.h" />
-		<Unit filename="CAdvmapInterface.cpp" />
-		<Unit filename="CAdvmapInterface.h" />
-		<Unit filename="CAnimation.cpp" />
-		<Unit filename="CAnimation.h" />
 		<Unit filename="CBitmapHandler.cpp" />
 		<Unit filename="CBitmapHandler.h" />
-		<Unit filename="CCastleInterface.cpp" />
-		<Unit filename="CCastleInterface.h" />
-		<Unit filename="CCreatureWindow.cpp" />
-		<Unit filename="CCreatureWindow.h" />
 		<Unit filename="CDefHandler.cpp" />
 		<Unit filename="CDefHandler.h" />
 		<Unit filename="CGameInfo.cpp" />
 		<Unit filename="CGameInfo.h" />
-		<Unit filename="CHeroWindow.cpp" />
-		<Unit filename="CHeroWindow.h" />
-		<Unit filename="CKingdomInterface.cpp" />
-		<Unit filename="CKingdomInterface.h" />
 		<Unit filename="CMT.cpp" />
 		<Unit filename="CMT.h" />
 		<Unit filename="CMessage.cpp" />
@@ -156,16 +142,10 @@
 		<Unit filename="CPlayerInterface.h" />
 		<Unit filename="CPreGame.cpp" />
 		<Unit filename="CPreGame.h" />
-		<Unit filename="CQuestLog.cpp" />
-		<Unit filename="CQuestLog.h" />
-		<Unit filename="CSpellWindow.cpp" />
-		<Unit filename="CSpellWindow.h" />
 		<Unit filename="CVideoHandler.cpp" />
 		<Unit filename="CVideoHandler.h" />
 		<Unit filename="Client.cpp" />
 		<Unit filename="Client.h" />
-		<Unit filename="GUIClasses.cpp" />
-		<Unit filename="GUIClasses.h" />
 		<Unit filename="Graphics.cpp" />
 		<Unit filename="Graphics.h" />
 		<Unit filename="NetPacksClient.cpp" />
@@ -184,14 +164,14 @@
 		<Unit filename="battle/CBattleInterfaceClasses.h" />
 		<Unit filename="battle/CCreatureAnimation.cpp" />
 		<Unit filename="battle/CCreatureAnimation.h" />
+		<Unit filename="gui/CAnimation.cpp" />
+		<Unit filename="gui/CAnimation.h" />
 		<Unit filename="gui/CCursorHandler.cpp" />
 		<Unit filename="gui/CCursorHandler.h" />
 		<Unit filename="gui/CGuiHandler.cpp" />
 		<Unit filename="gui/CGuiHandler.h" />
 		<Unit filename="gui/CIntObject.cpp" />
 		<Unit filename="gui/CIntObject.h" />
-		<Unit filename="gui/CIntObjectClasses.cpp" />
-		<Unit filename="gui/CIntObjectClasses.h" />
 		<Unit filename="gui/Fonts.cpp" />
 		<Unit filename="gui/Fonts.h" />
 		<Unit filename="gui/Geometries.cpp" />
@@ -203,6 +183,46 @@
 		<Unit filename="mapHandler.cpp" />
 		<Unit filename="mapHandler.h" />
 		<Unit filename="resource.h" />
+		<Unit filename="widgets/AdventureMapClasses.cpp" />
+		<Unit filename="widgets/AdventureMapClasses.h" />
+		<Unit filename="widgets/Buttons.cpp" />
+		<Unit filename="widgets/Buttons.h" />
+		<Unit filename="widgets/CArtifactHolder.cpp" />
+		<Unit filename="widgets/CArtifactHolder.h" />
+		<Unit filename="widgets/CComponent.cpp" />
+		<Unit filename="widgets/CComponent.h" />
+		<Unit filename="widgets/CGarrisonInt.cpp" />
+		<Unit filename="widgets/CGarrisonInt.h" />
+		<Unit filename="widgets/Images.cpp" />
+		<Unit filename="widgets/Images.h" />
+		<Unit filename="widgets/MiscWidgets.cpp" />
+		<Unit filename="widgets/MiscWidgets.h" />
+		<Unit filename="widgets/ObjectLists.cpp" />
+		<Unit filename="widgets/ObjectLists.h" />
+		<Unit filename="widgets/TextControls.cpp" />
+		<Unit filename="widgets/TextControls.h" />
+		<Unit filename="windows/CAdvmapInterface.cpp" />
+		<Unit filename="windows/CAdvmapInterface.h" />
+		<Unit filename="windows/CCastleInterface.cpp" />
+		<Unit filename="windows/CCastleInterface.h" />
+		<Unit filename="windows/CCreatureWindow.cpp" />
+		<Unit filename="windows/CCreatureWindow.h" />
+		<Unit filename="windows/CHeroWindow.cpp" />
+		<Unit filename="windows/CHeroWindow.h" />
+		<Unit filename="windows/CKingdomInterface.cpp" />
+		<Unit filename="windows/CKingdomInterface.h" />
+		<Unit filename="windows/CQuestLog.cpp" />
+		<Unit filename="windows/CQuestLog.h" />
+		<Unit filename="windows/CSpellWindow.cpp" />
+		<Unit filename="windows/CSpellWindow.h" />
+		<Unit filename="windows/CTradeWindow.cpp" />
+		<Unit filename="windows/CTradeWindow.h" />
+		<Unit filename="windows/CWindowObject.cpp" />
+		<Unit filename="windows/CWindowObject.h" />
+		<Unit filename="windows/GUIClasses.cpp" />
+		<Unit filename="windows/GUIClasses.h" />
+		<Unit filename="windows/InfoWindows.cpp" />
+		<Unit filename="windows/InfoWindows.h" />
 		<Extensions>
 			<code_completion />
 			<envvars />
diff --git a/lib/VCMIDirs.cpp b/lib/VCMIDirs.cpp
index aff924435..1b15df1e9 100644
--- a/lib/VCMIDirs.cpp
+++ b/lib/VCMIDirs.cpp
@@ -26,6 +26,14 @@ void IVCMIDirs::init()
 
 #ifdef VCMI_WINDOWS
 
+#ifdef __MINGW32__
+    #define _WIN32_IE 0x0500
+
+	#ifndef CSIDL_MYDOCUMENTS
+	#define CSIDL_MYDOCUMENTS CSIDL_PERSONAL
+	#endif    
+#endif // __MINGW32__
+
 #include <Windows.h>
 #include <Shlobj.h>
 #include <Shellapi.h>
@@ -573,4 +581,4 @@ namespace VCMIDirs
 		}
 		return singleton;
 	}
-}
\ No newline at end of file
+}
diff --git a/test/Test.cbp b/test/Test.cbp
index eca595705..e16c403c2 100644
--- a/test/Test.cbp
+++ b/test/Test.cbp
@@ -47,6 +47,7 @@
 			<Add option="-lboost_system$(#boost.libsuffix)" />
 			<Add option="-lboost_test_exec_monitor$(#boost.libsuffix)" />
 			<Add option="-lboost_unit_test_framework$(#boost.libsuffix)" />
+			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
 			<Add directory="$(#boost.lib32)" />
 			<Add directory="../" />
 		</Linker>