diff --git a/src/bindings/bind_building.c b/src/bindings/bind_building.c
index e5c9efde3..a177b1975 100644
--- a/src/bindings/bind_building.c
+++ b/src/bindings/bind_building.c
@@ -14,10 +14,13 @@ without prior permission by the authors of Eressea.
 #include "bind_building.h"
 #include "bind_unit.h"
 
+#include <kernel/config.h>
 #include <kernel/unit.h>
 #include <kernel/building.h>
 #include <kernel/region.h>
 
+#include <util/language.h>
+
 #include <lua.h>
 #include <tolua.h>
 
diff --git a/src/gamecode.vcproj b/src/gamecode.vcproj
index a1f0dfc6e..d852037e7 100644
--- a/src/gamecode.vcproj
+++ b/src/gamecode.vcproj
@@ -42,16 +42,14 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../external"
-				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
+				AdditionalIncludeDirectories=".;..\..\external;..\..\external\libxml2\include;..\..\external\pdcurses;..\..\external\lua\src"
+				PreprocessorDefinitions="LIBXML_STATIC;WIN32;_CRT_SECURE_NO_DEPRECATE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="true"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -110,14 +108,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="3"
-				AdditionalIncludeDirectories=".;../../external"
-				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
+				AdditionalIncludeDirectories=".;..\..\external;..\..\external\libxml2\include;..\..\external\pdcurses;..\..\external\lua\src"
+				PreprocessorDefinitions="LIBXML_STATIC;WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"
 			/>
 			<Tool
diff --git a/src/kernel.vcproj b/src/kernel.vcproj
index cba6c4ab5..1ee01709a 100644
--- a/src/kernel.vcproj
+++ b/src/kernel.vcproj
@@ -42,16 +42,14 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;../../external"
+				AdditionalIncludeDirectories=".;..\..\external;..\..\external\libxml2\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="true"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -110,14 +108,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="3"
-				AdditionalIncludeDirectories=".;../../external"
+				AdditionalIncludeDirectories=".;..\..\external;..\..\external\libxml2\include"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"
 			/>
 			<Tool
@@ -942,6 +939,22 @@
 		<File
 			RelativePath=".\kernel\curse_test.c"
 			>
+			<FileConfiguration
+				Name="Debug|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+				/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32"
+				ExcludedFromBuild="true"
+				>
+				<Tool
+					Name="VCCLCompilerTool"
+				/>
+			</FileConfiguration>
 		</File>
 	</Files>
 	<Globals>
diff --git a/src/kernel/item.c b/src/kernel/item.c
index 02e110f93..d68808d8f 100644
--- a/src/kernel/item.c
+++ b/src/kernel/item.c
@@ -44,6 +44,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <util/event.h>
 #include <util/functions.h>
 #include <util/goodies.h>
+#include <util/log.h>
 #include <util/language.h>
 #include <util/message.h>
 #include <util/umlaut.h>
diff --git a/src/lua-bindings.vcproj b/src/lua-bindings.vcproj
index c53e667dd..a43b73683 100644
--- a/src/lua-bindings.vcproj
+++ b/src/lua-bindings.vcproj
@@ -42,16 +42,14 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\external;..\..\external\lua\src;..\..\external\tolua\include;..\..\external\libxml2\include"
+				AdditionalIncludeDirectories=".;..\..\external;..\..\external\lua\src;..\..\external\tolua\include;..\..\external\libxml2\include;..\..\external\pdcurses"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="true"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -110,14 +108,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="3"
-				AdditionalIncludeDirectories=".;..\..\external;..\..\external\lua\src;..\..\external\tolua\include;..\..\external\libxml2\include"
+				AdditionalIncludeDirectories=".;..\..\external;..\..\external\lua\src;..\..\external\tolua\include;..\..\external\libxml2\include;..\..\external\pdcurses"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"
 			/>
 			<Tool
diff --git a/src/modules/wormhole.c b/src/modules/wormhole.c
index 1ad7c93bf..0f0062398 100644
--- a/src/modules/wormhole.c
+++ b/src/modules/wormhole.c
@@ -29,6 +29,7 @@
 #include <util/attrib.h>
 #include <util/rng.h>
 #include <util/resolve.h>
+#include <util/language.h>
 #include <util/storage.h>
 
 /* libc includes */
diff --git a/src/util.vcproj b/src/util.vcproj
index 5b112e0a6..6a4e95ef9 100644
--- a/src/util.vcproj
+++ b/src/util.vcproj
@@ -42,16 +42,14 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories=".;..\..\external;..\..\external\pdcurses"
+				AdditionalIncludeDirectories=".;..\..\external;..\..\external\pdcurses;..\..\external\libxml2\include;..\..\external\lua\src"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE"
-				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				WarnAsError="true"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="4"
 			/>
 			<Tool
@@ -110,14 +108,13 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="3"
-				AdditionalIncludeDirectories=".;..\..\external;..\..\external\pdcurses"
+				AdditionalIncludeDirectories=".;..\..\external;..\..\external\pdcurses;..\..\external\libxml2\include;..\..\external\lua\src"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
 				DebugInformationFormat="0"
 			/>
 			<Tool