diff --git a/mednafen/libmednahawk/libmednahawk.vcxproj b/mednafen/libmednahawk/libmednahawk.vcxproj
index 7eacb9c448..cfff891cc0 100644
--- a/mednafen/libmednahawk/libmednahawk.vcxproj
+++ b/mednafen/libmednahawk/libmednahawk.vcxproj
@@ -72,7 +72,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>.;..\src;..\include;..\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\src;..\include;..\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WANT_PSF;HEADLESS;WIN32;_DEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -95,7 +95,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalIncludeDirectories>.;..\src;..\include;..\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\src;..\include;..\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WANT_PSF;HEADLESS;WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>1Byte</StructMemberAlignment>
@@ -125,7 +125,7 @@
       <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
       <Optimization>Full</Optimization>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>.;..\src;..\include;..\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;..\src;..\include;..\zlib123;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WANT_PSF;HEADLESS;WIN32;NDEBUG;_CONSOLE;HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <StructMemberAlignment>1Byte</StructMemberAlignment>
@@ -286,6 +286,7 @@
     <ClInclude Include="..\src\debug.h" />
     <ClInclude Include="..\src\drivers\gfxdebugger.h" />
     <ClInclude Include="..\src\drivers\joystick.h" />
+    <ClInclude Include="..\src\mednafen-driver.h" />
     <ClInclude Include="..\src\mednafen-endian.h" />
     <ClInclude Include="..\src\drivers\logdebugger.h" />
     <ClInclude Include="..\src\drivers\prompt.h" />
@@ -297,6 +298,7 @@
     <ClInclude Include="..\src\general.h" />
     <ClInclude Include="..\src\math_ops.h" />
     <ClInclude Include="..\src\md5.h" />
+    <ClInclude Include="..\src\mednafen-types.h" />
     <ClInclude Include="..\src\mednafen.h" />
     <ClInclude Include="..\src\mednafen-memory.h" />
     <ClInclude Include="..\src\MemoryStream.h" />
@@ -312,7 +314,6 @@
     <ClInclude Include="..\src\state.h" />
     <ClInclude Include="..\src\Stream.h" />
     <ClInclude Include="..\src\tests.h" />
-    <ClInclude Include="..\src\types.h" />
     <ClInclude Include="..\src\video-driver.h" />
     <ClInclude Include="..\src\video.h" />
     <ClInclude Include="..\src\psx\cdc.h" />
diff --git a/mednafen/libmednahawk/libmednahawk.vcxproj.filters b/mednafen/libmednahawk/libmednahawk.vcxproj.filters
index f4d092a54d..6b3a77a569 100644
--- a/mednafen/libmednahawk/libmednahawk.vcxproj.filters
+++ b/mednafen/libmednahawk/libmednahawk.vcxproj.filters
@@ -629,9 +629,6 @@
     <ClInclude Include="..\src\drivers\joystick.h">
       <Filter>src\drivers</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\types.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="..\headless\headless.h">
       <Filter>headless</Filter>
     </ClInclude>
@@ -651,6 +648,12 @@
       <Filter>src\drivers</Filter>
     </ClInclude>
     <ClInclude Include="..\src\endian.h" />
+    <ClInclude Include="..\src\mednafen-driver.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\mednafen-types.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\src\psx\gpu_command_table.inc">
diff --git a/mednafen/src/mednafen-types.h b/mednafen/src/mednafen-types.h
index fd4d43c3c9..0425607e0d 100644
--- a/mednafen/src/mednafen-types.h
+++ b/mednafen/src/mednafen-types.h
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include "headless/headless.h"
+
 #include <assert.h>
 #include <inttypes.h>