diff --git a/libsnes/vs2015/libsnes.vcxproj b/libsnes/vs2015/libsnes.vcxproj
index 668837a1fe..75f893b5a6 100644
--- a/libsnes/vs2015/libsnes.vcxproj
+++ b/libsnes/vs2015/libsnes.vcxproj
@@ -81,12 +81,12 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Compatibility|Win32'">
     <TargetName>libsneshawk-32-compatibility</TargetName>
-    <OutDir>..\..\output\dll</OutDir>
+    <OutDir>..\..\output\dll\</OutDir>
     <IntDir>.obj\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Performance|Win32'">
     <TargetName>libsneshawk-32-performance</TargetName>
-    <OutDir>..\..\output\dll</OutDir>
+    <OutDir>..\..\output\dll\</OutDir>
     <IntDir>.obj\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Performance|Win32'">
@@ -135,6 +135,7 @@
       <OmitFramePointers>true</OmitFramePointers>
       <EnableEnhancedInstructionSet>StreamingSIMDExtensions</EnableEnhancedInstructionSet>
       <FloatingPointModel>Fast</FloatingPointModel>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -146,7 +147,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release-Compatibility|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
+      <Optimization>Full</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>false</SDLCheck>
@@ -154,6 +155,10 @@
       <AdditionalIncludeDirectories>$(ProjectDir)../bsnes</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>HOOKS;BIZHAWK;PROFILE_COMPATIBILITY;GAMEBOY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DebugInformationFormat>None</DebugInformationFormat>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -318,6 +323,7 @@
     <ClCompile Include="..\bsnes\gameboy\scheduler\scheduler.cpp" />
     <ClCompile Include="..\bsnes\gameboy\system\system.cpp" />
     <ClCompile Include="..\bsnes\gameboy\video\video.cpp" />
+    <ClCompile Include="..\bsnes\libco\x86.c" />
     <ClCompile Include="..\bsnes\snes\alt\cpu\cpu.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug-Compatibility|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release-Compatibility|Win32'">true</ExcludedFromBuild>
@@ -709,7 +715,6 @@
     <ClCompile Include="..\bsnes\snes\system\system.cpp" />
     <ClCompile Include="..\bsnes\target-libsnes\libsnes.cpp" />
     <ClCompile Include="..\bsnes\target-libsnes\libsnes_pwrap.cpp" />
-    <ClCompile Include="..\libco_msvc_win32\libco_msvc_win32.c" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\bsnes\snes\alt\smp\core\cc.sh">
diff --git a/libsnes/vs2015/libsnes.vcxproj.filters b/libsnes/vs2015/libsnes.vcxproj.filters
index b60aa69a48..58dd9fbf95 100644
--- a/libsnes/vs2015/libsnes.vcxproj.filters
+++ b/libsnes/vs2015/libsnes.vcxproj.filters
@@ -139,9 +139,6 @@
     <Filter Include="target-libsnes">
       <UniqueIdentifier>{1d1cf6c9-9e1b-402c-b1cc-7ed8866092e7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="libco_msvc_win32">
-      <UniqueIdentifier>{d2cbafd7-caaf-404c-9fdb-4adaaf5c1687}</UniqueIdentifier>
-    </Filter>
     <Filter Include="snes\cpu\core">
       <UniqueIdentifier>{be676f5c-dcb3-4a39-911c-4e102dfa25d8}</UniqueIdentifier>
     </Filter>
@@ -166,6 +163,9 @@
     <Filter Include="snes\smp\timing">
       <UniqueIdentifier>{a2db2d0e-68ec-4fa0-91fc-2bcc8ac33d32}</UniqueIdentifier>
     </Filter>
+    <Filter Include="libco">
+      <UniqueIdentifier>{70659d45-e958-48ff-94a3-8a57aa76dd61}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\bsnes\base\base.hpp">
@@ -392,9 +392,6 @@
     <ClCompile Include="..\bsnes\target-libsnes\libsnes_pwrap.cpp">
       <Filter>target-libsnes</Filter>
     </ClCompile>
-    <ClCompile Include="..\libco_msvc_win32\libco_msvc_win32.c">
-      <Filter>libco_msvc_win32</Filter>
-    </ClCompile>
     <ClCompile Include="..\bsnes\snes\cpu\core\core.cpp">
       <Filter>snes\cpu\core</Filter>
     </ClCompile>
@@ -569,6 +566,9 @@
     <ClCompile Include="..\bsnes\snes\dsp\counter.cpp">
       <Filter>snes\dsp</Filter>
     </ClCompile>
+    <ClCompile Include="..\bsnes\libco\x86.c">
+      <Filter>libco</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\bsnes\snes\alt\smp\core\op_misc.b">
diff --git a/output/dll/libsneshawk-32-compatibility.dll b/output/dll/libsneshawk-32-compatibility.dll
index 2f41379eb2..b8e06af9bd 100644
Binary files a/output/dll/libsneshawk-32-compatibility.dll and b/output/dll/libsneshawk-32-compatibility.dll differ
diff --git a/output/dll/libsneshawk-32-performance.dll b/output/dll/libsneshawk-32-performance.dll
index 4effa733ba..559da54ce0 100644
Binary files a/output/dll/libsneshawk-32-performance.dll and b/output/dll/libsneshawk-32-performance.dll differ