diff --git a/src/win/msvc/vc15/VARCem.vcxproj b/src/win/msvc/vc15/VARCem.vcxproj
index 33d7221..282101c 100644
--- a/src/win/msvc/vc15/VARCem.vcxproj
+++ b/src/win/msvc/vc15/VARCem.vcxproj
@@ -19,7 +19,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\bugger.c" />
+    <ClCompile Include="..\..\..\devices\misc\bugger.c" />
     <ClCompile Include="..\..\..\devices\cdrom\cdrom.c" />
     <ClCompile Include="..\..\..\devices\cdrom\cdrom_dosbox.cpp" />
     <ClCompile Include="..\..\..\devices\cdrom\cdrom_image.cpp" />
@@ -63,7 +63,7 @@
     <ClCompile Include="..\..\..\devices\network\slirp\ip_input.c" />
     <ClCompile Include="..\..\..\devices\network\slirp\ip_output.c" />
     <ClCompile Include="..\..\..\devices\network\slirp\mbuf.c" />
-    <ClCompile Include="..\..\..\devices\network\slirp\misc.c" />
+    <ClCompile Include="..\..\..\devices\network\slirp\slirp_misc.c" />
     <ClCompile Include="..\..\..\devices\network\slirp\queue.c" />
     <ClCompile Include="..\..\..\devices\network\slirp\sbuf.c" />
     <ClCompile Include="..\..\..\devices\network\slirp\slirp.c" />
@@ -240,6 +240,7 @@
     <ClCompile Include="..\..\..\devices\network\net_ne2000.c" />
     <ClCompile Include="..\..\..\devices\network\net_pcap.c" />
     <ClCompile Include="..\..\..\devices\network\net_slirp.c" />
+    <ClCompile Include="..\..\..\misc.c" />
     <ClCompile Include="..\..\..\nvr.c" />
     <ClCompile Include="..\..\..\pc.c" />
     <ClCompile Include="..\..\..\devices\ports\game.c" />
@@ -254,7 +255,7 @@
     <ClCompile Include="..\..\..\devices\sound\munt\sha1\sha1.cpp" />
     <ClCompile Include="..\..\..\timer.c" />
     <ClCompile Include="..\..\..\ui\ui_main.c" />
-    <ClCompile Include="..\..\..\ui\ui_new_floppy.c" />
+    <ClCompile Include="..\..\..\ui\ui_new_image.c" />
     <ClCompile Include="..\..\..\ui\ui_stbar.c" />
     <ClCompile Include="..\..\..\devices\video\video.c" />
     <ClCompile Include="..\..\..\devices\video\vid_ati18800.c" />
@@ -295,6 +296,7 @@
     <ClCompile Include="..\..\..\devices\video\vid_vga.c" />
     <ClCompile Include="..\..\..\devices\video\vid_voodoo.c" />
     <ClCompile Include="..\..\..\devices\video\vid_wy700.c" />
+    <ClCompile Include="..\..\..\ui\ui_vidapi.c" />
     <ClCompile Include="..\..\..\win\win.c" />
     <ClCompile Include="..\..\..\win\win_about.c" />
     <ClCompile Include="..\..\..\win\win_cdrom.c" />
@@ -309,16 +311,18 @@
     <ClCompile Include="..\..\..\win\win_keyboard.c" />
     <ClCompile Include="..\..\..\win\win_midi.c" />
     <ClCompile Include="..\..\..\win\win_mouse.cpp" />
-    <ClCompile Include="..\..\..\win\win_new_floppy.c" />
     <ClCompile Include="..\..\..\win\win_opendir.c" />
     <ClCompile Include="..\..\..\win\win_settings.c" />
     <ClCompile Include="..\..\..\win\win_snd_gain.c" />
     <ClCompile Include="..\..\..\win\win_status.c" />
     <ClCompile Include="..\..\..\win\win_thread.c" />
     <ClCompile Include="..\..\..\win\win_ui.c" />
+    <ClCompile Include="..\..\win_lang.c" />
+    <ClCompile Include="..\..\win_new_image.c" />
+    <ClCompile Include="..\..\win_sdl.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\bugger.h" />
+    <ClInclude Include="..\..\..\devices\misc\bugger.h" />
     <ClInclude Include="..\..\..\devices\cdrom\cdrom.h" />
     <ClInclude Include="..\..\..\devices\cdrom\cdrom_dosbox.h" />
     <ClInclude Include="..\..\..\devices\cdrom\cdrom_image.h" />
@@ -564,11 +568,47 @@
     <ClInclude Include="..\..\..\win\plat_dir.h" />
     <ClInclude Include="..\..\..\win\resource.h" />
     <ClInclude Include="..\..\..\win\win.h" />
-    <ClInclude Include="..\..\..\win\win_d3d.h" />
-    <ClInclude Include="..\..\..\win\win_ddraw.h" />
+    <ClInclude Include="..\..\win_opendir.h" />
+    <ClInclude Include="..\..\win_sdl.h" />
+    <ClInclude Include="..\..\win_settings_disk.h" />
+    <ClInclude Include="..\..\win_settings_floppy.h" />
+    <ClInclude Include="..\..\win_settings_input.h" />
+    <ClInclude Include="..\..\win_settings_machine.h" />
+    <ClInclude Include="..\..\win_settings_network.h" />
+    <ClInclude Include="..\..\win_settings_periph.h" />
+    <ClInclude Include="..\..\win_settings_ports.h" />
+    <ClInclude Include="..\..\win_settings_remov.h" />
+    <ClInclude Include="..\..\win_settings_sound.h" />
+    <ClInclude Include="..\..\win_settings_video.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\..\VARCem.rc" />
+    <ResourceCompile Include="..\..\VARCem.rc">
+      <ShowProgress Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ShowProgress>
+      <ShowProgress Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ShowProgress>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">_MSC_VER</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">_MSC_VER</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\VARCem.mpp">
+      <FileType>Document</FileType>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Manifest file...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Manifest file...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Manifest file...</Message>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Manifest file...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">VARCem.manifest</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">VARCem.manifest</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">VARCem.manifest</Outputs>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">VARCem.manifest</Outputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">VARCem.rc</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">VARCem.rc</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">VARCem.rc</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">VARCem.rc</AdditionalInputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">cl -nologo -EP %(FullPath) &gt; $(SolutionDir)..\..\%(Outputs)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">cl -nologo -EP %(FullPath) &gt; $(SolutionDir)..\..\%(Outputs)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">cl -nologo -EP %(FullPath) &gt; $(SolutionDir)..\..\%(Outputs)</Command>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">cl -nologo -EP %(FullPath) &gt; $(SolutionDir)..\..\%(Outputs)</Command>
+    </CustomBuild>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>15.0</VCProjectVersion>
@@ -629,6 +669,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <LibraryPath>$(ProjectDir)\..\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
+    <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
@@ -638,6 +679,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
     <LibraryPath>$(ProjectDir)\..\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
+    <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
@@ -655,7 +697,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
     </Link>
     <ResourceCompile>
@@ -674,7 +716,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
     </Link>
     <ResourceCompile>
@@ -696,7 +738,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
     </Link>
     <ResourceCompile>
@@ -719,7 +761,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
-      <AdditionalDependencies>winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;version.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <MinimumRequiredVersion>5.01</MinimumRequiredVersion>
     </Link>
     <ResourceCompile>
diff --git a/src/win/msvc/vc15/VARCem.vcxproj.filters b/src/win/msvc/vc15/VARCem.vcxproj.filters
index 999e423..cc44658 100644
--- a/src/win/msvc/vc15/VARCem.vcxproj.filters
+++ b/src/win/msvc/vc15/VARCem.vcxproj.filters
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\bugger.c" />
     <ClCompile Include="..\..\..\config.c" />
     <ClCompile Include="..\..\..\device.c" />
     <ClCompile Include="..\..\..\io.c" />
@@ -104,9 +103,6 @@
     <ClCompile Include="..\..\..\win\win_mouse.cpp">
       <Filter>win</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\win\win_new_floppy.c">
-      <Filter>win</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\win\win_opendir.c">
       <Filter>win</Filter>
     </ClCompile>
@@ -129,9 +125,6 @@
     <ClCompile Include="..\..\..\ui\ui_main.c">
       <Filter>ui</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\ui\ui_new_floppy.c">
-      <Filter>ui</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\ui\ui_stbar.c">
       <Filter>ui</Filter>
     </ClCompile>
@@ -279,9 +272,6 @@
     <ClCompile Include="..\..\..\devices\network\slirp\mbuf.c">
       <Filter>devices\network\slirp</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\devices\network\slirp\misc.c">
-      <Filter>devices\network\slirp</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\..\devices\network\slirp\queue.c">
       <Filter>devices\network\slirp</Filter>
     </ClCompile>
@@ -870,9 +860,30 @@
     <ClCompile Include="..\..\..\devices\video\video_dev.c">
       <Filter>devices\video</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\devices\misc\bugger.c">
+      <Filter>devices\misc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ui\ui_vidapi.c">
+      <Filter>ui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\misc.c" />
+    <ClCompile Include="..\..\..\devices\network\slirp\slirp_misc.c">
+      <Filter>devices\network\slirp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\win_new_image.c">
+      <Filter>win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\win_sdl.c">
+      <Filter>win</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\ui\ui_new_image.c">
+      <Filter>ui</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\win_lang.c">
+      <Filter>win</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\..\bugger.h" />
     <ClInclude Include="..\..\..\config.h" />
     <ClInclude Include="..\..\..\device.h" />
     <ClInclude Include="..\..\..\emu.h" />
@@ -1093,12 +1104,6 @@
     <ClInclude Include="..\..\..\win\win.h">
       <Filter>win</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\win\win_d3d.h">
-      <Filter>win</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\win\win_ddraw.h">
-      <Filter>win</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\version.h" />
     <ClInclude Include="..\..\..\ui\ui.h">
       <Filter>ui</Filter>
@@ -1592,6 +1597,45 @@
     <ClInclude Include="..\..\..\machines\machine.h">
       <Filter>machines</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\devices\misc\bugger.h">
+      <Filter>devices\misc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_sdl.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_opendir.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_disk.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_floppy.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_input.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_machine.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_network.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_periph.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_ports.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_remov.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_sound.h">
+      <Filter>win</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\win_settings_video.h">
+      <Filter>win</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="cpu">
@@ -1663,10 +1707,18 @@
     <Filter Include="machines">
       <UniqueIdentifier>{c21f8b49-308c-4e25-b69d-b03c1e24617a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="devices\misc">
+      <UniqueIdentifier>{51f1c4aa-4a2a-4639-bcbc-2075ffaf3e27}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\VARCem.rc">
       <Filter>win</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <CustomBuild Include="..\..\VARCem.mpp">
+      <Filter>win</Filter>
+    </CustomBuild>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/win/msvc/vc15/VARCem.vcxproj.user b/src/win/msvc/vc15/VARCem.vcxproj.user
index be25078..e0a0433 100644
--- a/src/win/msvc/vc15/VARCem.vcxproj.user
+++ b/src/win/msvc/vc15/VARCem.vcxproj.user
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LocalDebuggerCommandArguments>-L varcem.log</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerCommandArguments>-L varcem.log</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LocalDebuggerCommandArguments>-L varcem.log</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LocalDebuggerCommandArguments>-L varcem.log</LocalDebuggerCommandArguments>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/win/msvc/vc15/global.props b/src/win/msvc/vc15/global.props
index d29a058..92ab33c 100644
--- a/src/win/msvc/vc15/global.props
+++ b/src/win/msvc/vc15/global.props
@@ -3,12 +3,12 @@
   <ImportGroup Label="PropertySheets" />
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup>
-   <IncludePath>$(ProjectDir)\..\Include;$(ProjectDir)\..\..\mingw\include;$(ProjectDir)\..\..\mingw\include\pcap;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\..\Include;$(ProjectDir)\..\..\mingw\include;$(ProjectDir)\..\..\mingw\include\pcap;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;USE_DYNAREC;USE_OPENAL</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_USE_MATH_DEFINES;_CRT_NONSTDC_NO_DEPRECATE;_WINSOCK_DEPRECATED_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;USE_DYNAREC;USE_OPENAL;USE_SDL</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/win/win_lang.c b/src/win/win_lang.c
index c9c4786..925765f 100644
--- a/src/win/win_lang.c
+++ b/src/win/win_lang.c
@@ -108,7 +108,7 @@ static void
 lang_add(lang_t *ptr, int sort)
 {
     lang_t *p, *pp;
-    lang_t *prev;
+    lang_t *prev = 0;
 
     /* Create a copy of the entry data. */
     pp = (lang_t *)malloc(sizeof(lang_t));