diff --git a/src/gamecode.vcxproj b/src/gamecode.vcxproj
deleted file mode 100644
index e9cd8c4be..000000000
--- a/src/gamecode.vcxproj
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1E8BFF9E-3044-0742-992F-C5765B80FE65}</ProjectGuid>
-    <RootNamespace>gamecode</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../external;../../external/lua/src;../../external/tolua/include;..\..\external\pdcurses;..\..\external\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)gamecode.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>.;../../external;../../external/lua/src;../../external/tolua/include;..\..\external\pdcurses;..\..\external\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)gamecode.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="gamecode\archetype.c" />
-    <ClCompile Include="gamecode\creation.c" />
-    <ClCompile Include="gamecode\creport.c" />
-    <ClCompile Include="gamecode\economy.c" />
-    <ClCompile Include="eressea.c" />
-    <ClCompile Include="gamecode\economy_test.c" />
-    <ClCompile Include="gamecode\give.c" />
-    <ClCompile Include="gamecode\xmlreport.c" />
-    <ClCompile Include="gmtool.c" />
-    <ClCompile Include="gamecode\items.c" />
-    <ClCompile Include="gamecode\laws.c" />
-    <ClCompile Include="gamecode\laws_test.c" />
-    <ClCompile Include="gamecode\market.c" />
-    <ClCompile Include="gamecode\market_test.c" />
-    <ClCompile Include="gamecode\monster.c" />
-    <ClCompile Include="gamecode\randenc.c" />
-    <ClCompile Include="gamecode\report.c" />
-    <ClCompile Include="gamecode\spy.c" />
-    <ClCompile Include="gamecode\study.c" />
-    <ClCompile Include="gamecode\summary.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="gamecode\archetype.h" />
-    <ClInclude Include="gamecode\creation.h" />
-    <ClInclude Include="gamecode\creport.h" />
-    <ClInclude Include="gamecode\economy.h" />
-    <ClInclude Include="eressea.h" />
-    <ClInclude Include="gamecode\give.h" />
-    <ClInclude Include="gamecode\xmlreport.h" />
-    <ClInclude Include="gmtool.h" />
-    <ClInclude Include="gmtool_structs.h" />
-    <ClInclude Include="gamecode\items.h" />
-    <ClInclude Include="gamecode\laws.h" />
-    <ClInclude Include="gamecode\market.h" />
-    <ClInclude Include="gamecode\monster.h" />
-    <ClInclude Include="gamecode\randenc.h" />
-    <ClInclude Include="gamecode\report.h" />
-    <ClInclude Include="settings.h" />
-    <ClInclude Include="gamecode\spy.h" />
-    <ClInclude Include="gamecode\study.h" />
-    <ClInclude Include="gamecode\summary.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/gamecode.vcxproj.filters b/src/gamecode.vcxproj.filters
deleted file mode 100644
index 176c488c8..000000000
--- a/src/gamecode.vcxproj.filters
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{d83e7c3e-0495-4145-86ea-a86b7d4d405b}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{7553a025-8a64-4b5a-90cb-a2eeae9190d3}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="gamecode\archetype.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\creation.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\creport.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\economy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="eressea.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\give.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gmtool.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\items.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\laws.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\laws_test.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\market.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\market_test.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\monster.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\randenc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\report.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\spy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\study.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\summary.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\xmlreport.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="gamecode\economy_test.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="gamecode\archetype.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\creation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\creport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\economy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="eressea.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\give.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gmtool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gmtool_structs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\items.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\laws.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\market.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\monster.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\randenc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\report.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="settings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\spy.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\study.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\summary.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="gamecode\xmlreport.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/kernel.vcxproj b/src/kernel.vcxproj
deleted file mode 100644
index 24d6df48b..000000000
--- a/src/kernel.vcxproj
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{6F104C0A-DDF5-A34B-A89C-0DC278DCEF6D}</ProjectGuid>
-    <RootNamespace>kernel</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\..\external;..\..\external\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)kernel.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>.;..\..\external;..\..\external\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)kernel.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="kernel\alchemy.c" />
-    <ClCompile Include="kernel\alliance.c" />
-    <ClCompile Include="kernel\battle.c" />
-    <ClCompile Include="kernel\battle_test.c" />
-    <ClCompile Include="kernel\binarystore.c" />
-    <ClCompile Include="kernel\build.c" />
-    <ClCompile Include="kernel\building.c" />
-    <ClCompile Include="kernel\building_test.c" />
-    <ClCompile Include="kernel\calendar.c" />
-    <ClCompile Include="kernel\command.c" />
-    <ClCompile Include="kernel\config.c" />
-    <ClCompile Include="kernel\connection.c" />
-    <ClCompile Include="kernel\curse.c" />
-    <ClCompile Include="kernel\equipment.c" />
-    <ClCompile Include="kernel\equipment_test.c" />
-    <ClCompile Include="kernel\faction.c" />
-    <ClCompile Include="kernel\group.c" />
-    <ClCompile Include="kernel\item.c" />
-    <ClCompile Include="kernel\item_test.c" />
-    <ClCompile Include="kernel\magic.c" />
-    <ClCompile Include="kernel\magic_test.c" />
-    <ClCompile Include="kernel\message.c" />
-    <ClCompile Include="kernel\move.c" />
-    <ClCompile Include="kernel\move_test.c" />
-    <ClCompile Include="kernel\names.c" />
-    <ClCompile Include="kernel\order.c" />
-    <ClCompile Include="kernel\pathfinder.c" />
-    <ClCompile Include="kernel\plane.c" />
-    <ClCompile Include="kernel\player.c" />
-    <ClCompile Include="kernel\pool.c" />
-    <ClCompile Include="kernel\pool_test.c" />
-    <ClCompile Include="kernel\race.c" />
-    <ClCompile Include="kernel\region.c" />
-    <ClCompile Include="kernel\reports.c" />
-    <ClCompile Include="kernel\reports_test.c" />
-    <ClCompile Include="kernel\resources.c" />
-    <ClCompile Include="kernel\save.c" />
-    <ClCompile Include="kernel\ship.c" />
-    <ClCompile Include="kernel\ship_test.c" />
-    <ClCompile Include="kernel\skill.c" />
-    <ClCompile Include="kernel\spell.c" />
-    <ClCompile Include="kernel\spellbook.c" />
-    <ClCompile Include="kernel\spellbook_test.c" />
-    <ClCompile Include="kernel\spell_test.c" />
-    <ClCompile Include="kernel\sqlite.c" />
-    <ClCompile Include="kernel\teleport.c" />
-    <ClCompile Include="kernel\terrain.c" />
-    <ClCompile Include="kernel\textstore.c" />
-    <ClCompile Include="kernel\unit.c" />
-    <ClCompile Include="kernel\xmlreader.c" />
-    <ClCompile Include="triggers\changefaction.c" />
-    <ClCompile Include="triggers\changerace.c" />
-    <ClCompile Include="triggers\clonedied.c" />
-    <ClCompile Include="triggers\createcurse.c" />
-    <ClCompile Include="triggers\createunit.c" />
-    <ClCompile Include="triggers\gate.c" />
-    <ClCompile Include="triggers\giveitem.c" />
-    <ClCompile Include="triggers\killunit.c" />
-    <ClCompile Include="triggers\removecurse.c" />
-    <ClCompile Include="triggers\shock.c" />
-    <ClCompile Include="triggers\timeout.c" />
-    <ClCompile Include="triggers\triggers.c" />
-    <ClCompile Include="triggers\unguard.c" />
-    <ClCompile Include="triggers\unitmessage.c" />
-    <ClCompile Include="items\artrewards.c" />
-    <ClCompile Include="items\demonseye.c" />
-    <ClCompile Include="items\itemtypes.c" />
-    <ClCompile Include="items\phoenixcompass.c" />
-    <ClCompile Include="items\seed.c" />
-    <ClCompile Include="items\speedsail.c" />
-    <ClCompile Include="items\weapons.c" />
-    <ClCompile Include="items\xerewards.c" />
-    <ClCompile Include="modules\arena.c" />
-    <ClCompile Include="modules\autoseed.c" />
-    <ClCompile Include="modules\dungeon.c" />
-    <ClCompile Include="modules\gmcmd.c" />
-    <ClCompile Include="modules\museum.c" />
-    <ClCompile Include="modules\score.c" />
-    <ClCompile Include="modules\weather.c" />
-    <ClCompile Include="modules\wormhole.c" />
-    <ClCompile Include="modules\xecmd.c" />
-    <ClCompile Include="modules\xmas.c" />
-    <ClCompile Include="attributes\alliance.c" />
-    <ClCompile Include="attributes\attributes.c" />
-    <ClCompile Include="attributes\fleechance.c" />
-    <ClCompile Include="attributes\follow.c" />
-    <ClCompile Include="attributes\giveitem.c" />
-    <ClCompile Include="attributes\gm.c" />
-    <ClCompile Include="attributes\hate.c" />
-    <ClCompile Include="attributes\iceberg.c" />
-    <ClCompile Include="attributes\key.c" />
-    <ClCompile Include="attributes\matmod.c" />
-    <ClCompile Include="attributes\moved.c" />
-    <ClCompile Include="attributes\movement.c" />
-    <ClCompile Include="attributes\object.c" />
-    <ClCompile Include="attributes\orcification.c" />
-    <ClCompile Include="attributes\otherfaction.c" />
-    <ClCompile Include="attributes\overrideroads.c" />
-    <ClCompile Include="attributes\racename.c" />
-    <ClCompile Include="attributes\raceprefix.c" />
-    <ClCompile Include="attributes\reduceproduction.c" />
-    <ClCompile Include="attributes\targetregion.c" />
-    <ClCompile Include="kernel\curse_test.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="kernel\alchemy.h" />
-    <ClInclude Include="kernel\alliance.h" />
-    <ClInclude Include="kernel\battle.h" />
-    <ClInclude Include="kernel\binarystore.h" />
-    <ClInclude Include="kernel\build.h" />
-    <ClInclude Include="kernel\building.h" />
-    <ClInclude Include="kernel\calendar.h" />
-    <ClInclude Include="kernel\command.h" />
-    <ClInclude Include="kernel\config.h" />
-    <ClInclude Include="kernel\connection.h" />
-    <ClInclude Include="kernel\curse.h" />
-    <ClInclude Include="kernel\equipment.h" />
-    <ClInclude Include="kernel\faction.h" />
-    <ClInclude Include="kernel\group.h" />
-    <ClInclude Include="kernel\item.h" />
-    <ClInclude Include="kernel\magic.h" />
-    <ClInclude Include="kernel\message.h" />
-    <ClInclude Include="kernel\move.h" />
-    <ClInclude Include="kernel\names.h" />
-    <ClInclude Include="kernel\objtypes.h" />
-    <ClInclude Include="kernel\order.h" />
-    <ClInclude Include="kernel\pathfinder.h" />
-    <ClInclude Include="kernel\plane.h" />
-    <ClInclude Include="kernel\player.h" />
-    <ClInclude Include="kernel\pool.h" />
-    <ClInclude Include="kernel\race.h" />
-    <ClInclude Include="kernel\region.h" />
-    <ClInclude Include="kernel\render.h" />
-    <ClInclude Include="kernel\reports.h" />
-    <ClInclude Include="kernel\resources.h" />
-    <ClInclude Include="kernel\save.h" />
-    <ClInclude Include="kernel\ship.h" />
-    <ClInclude Include="kernel\skill.h" />
-    <ClInclude Include="kernel\spell.h" />
-    <ClInclude Include="kernel\spellbook.h" />
-    <ClInclude Include="kernel\spellid.h" />
-    <ClInclude Include="kernel\teleport.h" />
-    <ClInclude Include="kernel\terrain.h" />
-    <ClInclude Include="kernel\terrainid.h" />
-    <ClInclude Include="kernel\textstore.h" />
-    <ClInclude Include="kernel\types.h" />
-    <ClInclude Include="kernel\unit.h" />
-    <ClInclude Include="kernel\version.h" />
-    <ClInclude Include="kernel\xmlkernel.h" />
-    <ClInclude Include="kernel\xmlreader.h" />
-    <ClInclude Include="triggers\changefaction.h" />
-    <ClInclude Include="triggers\changerace.h" />
-    <ClInclude Include="triggers\clonedied.h" />
-    <ClInclude Include="triggers\createcurse.h" />
-    <ClInclude Include="triggers\createunit.h" />
-    <ClInclude Include="triggers\gate.h" />
-    <ClInclude Include="triggers\giveitem.h" />
-    <ClInclude Include="triggers\killunit.h" />
-    <ClInclude Include="triggers\removecurse.h" />
-    <ClInclude Include="triggers\shock.h" />
-    <ClInclude Include="triggers\timeout.h" />
-    <ClInclude Include="triggers\triggers.h" />
-    <ClInclude Include="triggers\unguard.h" />
-    <ClInclude Include="triggers\unitmessage.h" />
-    <ClInclude Include="items\artrewards.h" />
-    <ClInclude Include="items\demonseye.h" />
-    <ClInclude Include="items\itemtypes.h" />
-    <ClInclude Include="items\phoenixcompass.h" />
-    <ClInclude Include="items\seed.h" />
-    <ClInclude Include="items\speedsail.h" />
-    <ClInclude Include="items\weapons.h" />
-    <ClInclude Include="items\xerewards.h" />
-    <ClInclude Include="modules\arena.h" />
-    <ClInclude Include="modules\autoseed.h" />
-    <ClInclude Include="modules\dungeon.h" />
-    <ClInclude Include="modules\gmcmd.h" />
-    <ClInclude Include="modules\museum.h" />
-    <ClInclude Include="modules\score.h" />
-    <ClInclude Include="modules\weather.h" />
-    <ClInclude Include="modules\wormhole.h" />
-    <ClInclude Include="modules\xecmd.h" />
-    <ClInclude Include="modules\xmas.h" />
-    <ClInclude Include="attributes\aggressive.h" />
-    <ClInclude Include="attributes\alliance.h" />
-    <ClInclude Include="attributes\attributes.h" />
-    <ClInclude Include="attributes\fleechance.h" />
-    <ClInclude Include="attributes\follow.h" />
-    <ClInclude Include="attributes\giveitem.h" />
-    <ClInclude Include="attributes\gm.h" />
-    <ClInclude Include="attributes\hate.h" />
-    <ClInclude Include="attributes\iceberg.h" />
-    <ClInclude Include="attributes\key.h" />
-    <ClInclude Include="attributes\matmod.h" />
-    <ClInclude Include="attributes\moved.h" />
-    <ClInclude Include="attributes\movement.h" />
-    <ClInclude Include="attributes\object.h" />
-    <ClInclude Include="attributes\orcification.h" />
-    <ClInclude Include="attributes\otherfaction.h" />
-    <ClInclude Include="attributes\overrideroads.h" />
-    <ClInclude Include="attributes\racename.h" />
-    <ClInclude Include="attributes\raceprefix.h" />
-    <ClInclude Include="attributes\reduceproduction.h" />
-    <ClInclude Include="attributes\targetregion.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/kernel.vcxproj.filters b/src/kernel.vcxproj.filters
deleted file mode 100644
index c75975ed2..000000000
--- a/src/kernel.vcxproj.filters
+++ /dev/null
@@ -1,625 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="kernel">
-      <UniqueIdentifier>{0d7b749c-a7f2-4791-b356-6ae450020131}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="triggers">
-      <UniqueIdentifier>{0ebbe376-a35f-44f6-97c6-9b449a839ddb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="items">
-      <UniqueIdentifier>{0f293992-e32e-49fb-a5f2-74686b0d042e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="modules">
-      <UniqueIdentifier>{e12969f3-9de3-4f65-812d-1e120875a15c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="attributes">
-      <UniqueIdentifier>{c10dd4f8-3a6a-470b-8a04-bb652854e228}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="kernel\alchemy.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\alliance.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\battle.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\binarystore.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\build.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\building.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\calendar.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\command.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\config.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\connection.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\curse.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\equipment.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\faction.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\group.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\item.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\magic.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\message.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\move.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\names.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\order.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\pathfinder.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\plane.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\player.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\pool.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\race.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\region.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\reports.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\resources.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\save.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\ship.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\skill.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\spell.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\sqlite.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\teleport.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\terrain.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\textstore.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\unit.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\xmlreader.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\changefaction.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\changerace.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\clonedied.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\createcurse.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\createunit.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\gate.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\giveitem.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\killunit.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\removecurse.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\shock.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\timeout.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\triggers.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\unguard.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="triggers\unitmessage.c">
-      <Filter>triggers</Filter>
-    </ClCompile>
-    <ClCompile Include="items\artrewards.c">
-      <Filter>items</Filter>
-    </ClCompile>
-    <ClCompile Include="items\demonseye.c">
-      <Filter>items</Filter>
-    </ClCompile>
-    <ClCompile Include="items\itemtypes.c">
-      <Filter>items</Filter>
-    </ClCompile>
-    <ClCompile Include="items\phoenixcompass.c">
-      <Filter>items</Filter>
-    </ClCompile>
-    <ClCompile Include="items\seed.c">
-      <Filter>items</Filter>
-    </ClCompile>
-    <ClCompile Include="items\speedsail.c">
-      <Filter>items</Filter>
-    </ClCompile>
-    <ClCompile Include="items\weapons.c">
-      <Filter>items</Filter>
-    </ClCompile>
-    <ClCompile Include="items\xerewards.c">
-      <Filter>items</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\arena.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\autoseed.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\dungeon.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\gmcmd.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\museum.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\score.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\weather.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\wormhole.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\xecmd.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="modules\xmas.c">
-      <Filter>modules</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\alliance.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\attributes.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\fleechance.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\follow.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\giveitem.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\gm.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\hate.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\iceberg.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\key.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\matmod.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\moved.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\movement.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\object.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\orcification.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\otherfaction.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\overrideroads.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\racename.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\raceprefix.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\reduceproduction.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="attributes\targetregion.c">
-      <Filter>attributes</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\curse_test.c" />
-    <ClCompile Include="kernel\move_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\battle_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\spell_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\ship_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\reports_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\building_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\item_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\magic_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\spellbook.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\spellbook_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\equipment_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-    <ClCompile Include="kernel\pool_test.c">
-      <Filter>kernel</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="kernel\alchemy.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\alliance.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\battle.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\binarystore.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\build.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\building.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\calendar.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\command.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\config.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\connection.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\curse.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\equipment.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\faction.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\group.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\item.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\magic.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\message.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\move.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\names.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\objtypes.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\order.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\pathfinder.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\plane.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\player.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\pool.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\race.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\region.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\render.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\reports.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\resources.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\save.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\ship.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\skill.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\spell.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\spellid.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\teleport.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\terrain.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\terrainid.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\textstore.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\types.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\unit.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\version.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\xmlkernel.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\xmlreader.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\changefaction.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\changerace.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\clonedied.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\createcurse.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\createunit.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\gate.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\giveitem.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\killunit.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\removecurse.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\shock.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\timeout.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\triggers.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\unguard.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="triggers\unitmessage.h">
-      <Filter>triggers</Filter>
-    </ClInclude>
-    <ClInclude Include="items\artrewards.h">
-      <Filter>items</Filter>
-    </ClInclude>
-    <ClInclude Include="items\demonseye.h">
-      <Filter>items</Filter>
-    </ClInclude>
-    <ClInclude Include="items\itemtypes.h">
-      <Filter>items</Filter>
-    </ClInclude>
-    <ClInclude Include="items\phoenixcompass.h">
-      <Filter>items</Filter>
-    </ClInclude>
-    <ClInclude Include="items\seed.h">
-      <Filter>items</Filter>
-    </ClInclude>
-    <ClInclude Include="items\speedsail.h">
-      <Filter>items</Filter>
-    </ClInclude>
-    <ClInclude Include="items\weapons.h">
-      <Filter>items</Filter>
-    </ClInclude>
-    <ClInclude Include="items\xerewards.h">
-      <Filter>items</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\arena.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\autoseed.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\dungeon.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\gmcmd.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\museum.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\score.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\weather.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\wormhole.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\xecmd.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="modules\xmas.h">
-      <Filter>modules</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\aggressive.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\alliance.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\attributes.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\fleechance.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\follow.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\giveitem.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\gm.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\hate.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\iceberg.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\key.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\matmod.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\moved.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\movement.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\object.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\orcification.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\otherfaction.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\overrideroads.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\racename.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\raceprefix.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\reduceproduction.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="attributes\targetregion.h">
-      <Filter>attributes</Filter>
-    </ClInclude>
-    <ClInclude Include="kernel\spellbook.h">
-      <Filter>kernel</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/lua-bindings.vcxproj b/src/lua-bindings.vcxproj
deleted file mode 100644
index 5714a1cbd..000000000
--- a/src/lua-bindings.vcxproj
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{75501170-51C2-E641-BA8B-EDC008184192}</ProjectGuid>
-    <RootNamespace>lua-bindings</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../external;../../external/lua/src;../../external/tolua/include;..\..\external\pdcurses;..\..\external\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)lua-bindings.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>.;../../external;../../external/lua/src;../../external/tolua/include;..\..\external\pdcurses;..\..\external\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)lua-bindings.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="bindings\bind_attrib.c" />
-    <ClCompile Include="bindings\bind_building.c" />
-    <ClCompile Include="bindings\bind_faction.c" />
-    <ClCompile Include="bindings\bind_gmtool.c" />
-    <ClCompile Include="bindings\bind_hashtable.c" />
-    <ClCompile Include="bindings\bind_message.c" />
-    <ClCompile Include="bindings\bind_region.c" />
-    <ClCompile Include="bindings\bind_ship.c" />
-    <ClCompile Include="bindings\bind_sqlite.c" />
-    <ClCompile Include="bindings\bind_storage.c" />
-    <ClCompile Include="bindings\bind_unit.c" />
-    <ClCompile Include="bindings\bindings.c" />
-    <ClCompile Include="bindings\helpers.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="bindings\bind_attrib.h" />
-    <ClInclude Include="bindings\bind_building.h" />
-    <ClInclude Include="bindings\bind_faction.h" />
-    <ClInclude Include="bindings\bind_gmtool.h" />
-    <ClInclude Include="bindings\bind_hashtable.h" />
-    <ClInclude Include="bindings\bind_message.h" />
-    <ClInclude Include="bindings\bind_region.h" />
-    <ClInclude Include="bindings\bind_ship.h" />
-    <ClInclude Include="bindings\bind_storage.h" />
-    <ClInclude Include="bindings\bind_unit.h" />
-    <ClInclude Include="bindings\bindings.h" />
-    <ClInclude Include="bindings\helpers.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/lua-bindings.vcxproj.filters b/src/lua-bindings.vcxproj.filters
deleted file mode 100644
index 83b65c358..000000000
--- a/src/lua-bindings.vcxproj.filters
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{1a17299b-610f-40df-864f-84b37b67ebe7}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{5135c52b-b087-4aab-8d89-2b06da54e8e7}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="bindings\bind_attrib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_building.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_faction.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_gmtool.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_hashtable.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_message.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_region.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_ship.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_sqlite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_storage.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bind_unit.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\bindings.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bindings\helpers.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="bindings\bind_attrib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bind_building.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bind_faction.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bind_gmtool.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bind_hashtable.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bind_message.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bind_region.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bind_ship.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bind_storage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bind_unit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\bindings.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="bindings\helpers.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/util.vcxproj b/src/util.vcxproj
deleted file mode 100644
index a0967f595..000000000
--- a/src/util.vcxproj
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{F70CFB27-8A2F-E447-B452-4E1C590EDA6D}</ProjectGuid>
-    <RootNamespace>util</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\$(ProjectName)\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;../../external;../../external/lua/src;../../external/pdcurses;..\..\external\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <TreatWarningAsError>true</TreatWarningAsError>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)util.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>Full</Optimization>
-      <AdditionalIncludeDirectories>.;../../external;../../external/lua/src;../../external/pdcurses;..\..\external\libxml2\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level4</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-    </ClCompile>
-    <ResourceCompile>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_DEPRECATE;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Lib>
-      <OutputFile>$(OutDir)util.lib</OutputFile>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="util\attrib.h" />
-    <ClInclude Include="util\base36.h" />
-    <ClInclude Include="util\bsdstring.h" />
-    <ClInclude Include="util\console.h" />
-    <ClInclude Include="util\critbit.h" />
-    <ClInclude Include="util\crmessage.h" />
-    <ClInclude Include="util\event.h" />
-    <ClInclude Include="util\eventbus.h" />
-    <ClInclude Include="util\filereader.h" />
-    <ClInclude Include="util\functions.h" />
-    <ClInclude Include="util\goodies.h" />
-    <ClInclude Include="util\language.h" />
-    <ClInclude Include="util\language_struct.h" />
-    <ClInclude Include="util\listbox.h" />
-    <ClInclude Include="util\lists.h" />
-    <ClInclude Include="util\log.h" />
-    <ClInclude Include="util\message.h" />
-    <ClInclude Include="util\nrmessage.h" />
-    <ClInclude Include="util\nrmessage_struct.h" />
-    <ClInclude Include="util\os.h" />
-    <ClInclude Include="util\parser.h" />
-    <ClInclude Include="util\quicklist.h" />
-    <ClInclude Include="util\rand.h" />
-    <ClInclude Include="util\resolve.h" />
-    <ClInclude Include="util\rng.h" />
-    <ClInclude Include="util\sql.h" />
-    <ClInclude Include="util\storage.h" />
-    <ClInclude Include="util\translation.h" />
-    <ClInclude Include="util\umlaut.h" />
-    <ClInclude Include="util\unicode.h" />
-    <ClInclude Include="util\variant.h" />
-    <ClInclude Include="util\xml.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="util\attrib.c" />
-    <ClCompile Include="util\base36.c" />
-    <ClCompile Include="util\base36_test.c" />
-    <ClCompile Include="util\bsdstring.c" />
-    <ClCompile Include="util\bsdstring_test.c" />
-    <ClCompile Include="util\console.c" />
-    <ClCompile Include="util\critbit.c" />
-    <ClCompile Include="util\crmessage.c" />
-    <ClCompile Include="util\dice.c" />
-    <ClCompile Include="util\event.c" />
-    <ClCompile Include="util\eventbus.c" />
-    <ClCompile Include="util\filereader.c" />
-    <ClCompile Include="util\functions.c" />
-    <ClCompile Include="util\functions_test.c" />
-    <ClCompile Include="util\goodies.c" />
-    <ClCompile Include="util\language.c" />
-    <ClCompile Include="util\listbox.c" />
-    <ClCompile Include="util\lists.c" />
-    <ClCompile Include="util\log.c" />
-    <ClCompile Include="util\message.c" />
-    <ClCompile Include="util\nrmessage.c" />
-    <ClCompile Include="util\os.c" />
-    <ClCompile Include="util\parser.c" />
-    <ClCompile Include="util\quicklist.c" />
-    <ClCompile Include="util\quicklist_test.c" />
-    <ClCompile Include="util\rand.c" />
-    <ClCompile Include="util\resolve.c" />
-    <ClCompile Include="util\sql.c" />
-    <ClCompile Include="util\strings.c" />
-    <ClCompile Include="util\translation.c" />
-    <ClCompile Include="util\umlaut.c" />
-    <ClCompile Include="util\umlaut_test.c" />
-    <ClCompile Include="util\unicode.c" />
-    <ClCompile Include="util\xml.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/util.vcxproj.filters b/src/util.vcxproj.filters
deleted file mode 100644
index 43fb1d700..000000000
--- a/src/util.vcxproj.filters
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93caffaa-508e-4e78-b1ba-5a8d6aa4ab9a}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{77dd9146-7564-475b-a364-b1610046b1bb}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="util\attrib.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\base36.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\bsdstring.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\console.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\crmessage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\event.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\eventbus.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\filereader.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\functions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\goodies.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\language.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\language_struct.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\listbox.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\lists.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\log.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\message.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\nrmessage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\nrmessage_struct.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\parser.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\rand.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\resolve.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\rng.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\sql.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\storage.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\translation.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\umlaut.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\unicode.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\variant.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\xml.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\quicklist.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\os.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="util\critbit.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="util\attrib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\base36.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\base36_test.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\bsdstring.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\console.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\crmessage.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\dice.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\event.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\eventbus.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\filereader.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\functions.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\goodies.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\language.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\listbox.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\lists.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\log.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\message.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\nrmessage.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\parser.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\rand.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\resolve.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\sql.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\strings.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\translation.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\umlaut.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\unicode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\xml.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\quicklist.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\quicklist_test.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\os.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\critbit.c">
-      <Filter>Header Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\functions_test.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\umlaut_test.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="util\bsdstring_test.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file