diff --git a/project/msvc/grafx2-sdl2.vcxproj b/project/msvc/grafx2-sdl2.vcxproj
index b025baa4..51719957 100644
--- a/project/msvc/grafx2-sdl2.vcxproj
+++ b/project/msvc/grafx2-sdl2.vcxproj
@@ -89,14 +89,20 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\6502.h" />
+    <ClInclude Include="..\..\src\6502types.h" />
     <ClInclude Include="..\..\src\bitcount.h" />
     <ClInclude Include="..\..\src\brush.h" />
     <ClInclude Include="..\..\src\buttons.h" />
+    <ClInclude Include="..\..\src\c64load.h" />
+    <ClInclude Include="..\..\src\c64picview_inc.h" />
     <ClInclude Include="..\..\src\colorred.h" />
     <ClInclude Include="..\..\src\const.h" />
+    <ClInclude Include="..\..\src\cpc_scr_simple_loader.h" />
     <ClInclude Include="..\..\src\engine.h" />
     <ClInclude Include="..\..\src\errors.h" />
     <ClInclude Include="..\..\src\factory.h" />
+    <ClInclude Include="..\..\src\fileformats.h" />
     <ClInclude Include="..\..\src\filesel.h" />
     <ClInclude Include="..\..\src\gfx2log.h" />
     <ClInclude Include="..\..\src\gfx2mem.h" />
@@ -107,7 +113,9 @@
     <ClInclude Include="..\..\src\help.h" />
     <ClInclude Include="..\..\src\helpfile.h" />
     <ClInclude Include="..\..\src\hotkeys.h" />
+    <ClInclude Include="..\..\src\impdraw_loader.h" />
     <ClInclude Include="..\..\src\init.h" />
+    <ClInclude Include="..\..\src\init_buttons.h" />
     <ClInclude Include="..\..\src\input.h" />
     <ClInclude Include="..\..\src\io.h" />
     <ClInclude Include="..\..\src\keyboard.h" />
@@ -115,11 +123,13 @@
     <ClInclude Include="..\..\src\layers.h" />
     <ClInclude Include="..\..\src\libraw2crtc.h" />
     <ClInclude Include="..\..\src\loadsave.h" />
+    <ClInclude Include="..\..\src\loadsavefuncs.h" />
     <ClInclude Include="..\..\src\misc.h" />
     <ClInclude Include="..\..\src\mountlist.h" />
     <ClInclude Include="..\..\src\oldies.h" />
     <ClInclude Include="..\..\src\operatio.h" />
     <ClInclude Include="..\..\src\op_c.h" />
+    <ClInclude Include="..\..\src\packbits.h" />
     <ClInclude Include="..\..\src\pages.h" />
     <ClInclude Include="..\..\src\palette.h" />
     <ClInclude Include="..\..\src\pxdouble.h" />
@@ -154,11 +164,18 @@
     <ResourceCompile Include="..\..\src\gfx2.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\6502.c">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CPU_6502_STATIC;CPU_6502_USE_LOCAL_HEADER;CPU_6502_DEPENDENCIES_H="6502types.h";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CPU_6502_STATIC;CPU_6502_USE_LOCAL_HEADER;CPU_6502_DEPENDENCIES_H="6502types.h";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="..\..\src\brush.c" />
     <ClCompile Include="..\..\src\brush_ops.c" />
     <ClCompile Include="..\..\src\buttons.c" />
     <ClCompile Include="..\..\src\buttons_effects.c" />
+    <ClCompile Include="..\..\src\c64formats.c" />
+    <ClCompile Include="..\..\src\c64load.c" />
     <ClCompile Include="..\..\src\colorred.c" />
+    <ClCompile Include="..\..\src\cpcformats.c" />
     <ClCompile Include="..\..\src\engine.c" />
     <ClCompile Include="..\..\src\factory.c" />
     <ClCompile Include="..\..\src\fileformats.c" />
@@ -169,6 +186,7 @@
     <ClCompile Include="..\..\src\graph.c" />
     <ClCompile Include="..\..\src\help.c" />
     <ClCompile Include="..\..\src\hotkeys.c" />
+    <ClCompile Include="..\..\src\ifformat.c" />
     <ClCompile Include="..\..\src\init.c" />
     <ClCompile Include="..\..\src\input.c" />
     <ClCompile Include="..\..\src\io.c" />
@@ -177,15 +195,20 @@
     <ClCompile Include="..\..\src\libraw2crtc.c" />
     <ClCompile Include="..\..\src\loadrecoil.c" />
     <ClCompile Include="..\..\src\loadsave.c" />
+    <ClCompile Include="..\..\src\loadsavefuncs.c" />
     <ClCompile Include="..\..\src\main.c" />
     <ClCompile Include="..\..\src\misc.c" />
     <ClCompile Include="..\..\src\miscfileformats.c" />
+    <ClCompile Include="..\..\src\motoformats.c" />
     <ClCompile Include="..\..\src\mountlist.c" />
+    <ClCompile Include="..\..\src\msxformats.c" />
     <ClCompile Include="..\..\src\oldies.c" />
     <ClCompile Include="..\..\src\operatio.c" />
     <ClCompile Include="..\..\src\op_c.c" />
+    <ClCompile Include="..\..\src\packbits.c" />
     <ClCompile Include="..\..\src\pages.c" />
     <ClCompile Include="..\..\src\palette.c" />
+    <ClCompile Include="..\..\src\pngformat.c" />
     <ClCompile Include="..\..\src\pversion.c" />
     <ClCompile Include="..\..\src\pxdouble.c" />
     <ClCompile Include="..\..\src\pxquad.c" />
@@ -206,6 +229,7 @@
     <ClCompile Include="..\..\src\SFont.c" />
     <ClCompile Include="..\..\src\shade.c" />
     <ClCompile Include="..\..\src\special.c" />
+    <ClCompile Include="..\..\src\stformats.c" />
     <ClCompile Include="..\..\src\text.c" />
     <ClCompile Include="..\..\src\tifformat.c" />
     <ClCompile Include="..\..\src\tiles.c" />
diff --git a/project/msvc/grafx2-sdl2.vcxproj.filters b/project/msvc/grafx2-sdl2.vcxproj.filters
index 7f4b24e1..1d4338f3 100644
--- a/project/msvc/grafx2-sdl2.vcxproj.filters
+++ b/project/msvc/grafx2-sdl2.vcxproj.filters
@@ -195,6 +195,36 @@
     <ClInclude Include="..\..\src\gfx2mem.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\6502.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\6502types.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\c64load.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\c64picview_inc.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cpc_scr_simple_loader.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\fileformats.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\impdraw_loader.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\init_buttons.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\loadsavefuncs.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\packbits.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\gfx2.rc">
@@ -379,5 +409,38 @@
     <ClCompile Include="..\..\src\gfx2mem.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\6502.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\msxformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\packbits.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\c64formats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpcformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ifformat.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\motoformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\pngformat.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\stformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\loadsavefuncs.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\c64load.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/project/msvc/grafx2-win32.vcxproj b/project/msvc/grafx2-win32.vcxproj
index d79cb76d..3d72a582 100644
--- a/project/msvc/grafx2-win32.vcxproj
+++ b/project/msvc/grafx2-win32.vcxproj
@@ -82,11 +82,18 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\6502.c">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CPU_6502_STATIC;CPU_6502_USE_LOCAL_HEADER;CPU_6502_DEPENDENCIES_H="6502types.h";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CPU_6502_STATIC;CPU_6502_USE_LOCAL_HEADER;CPU_6502_DEPENDENCIES_H="6502types.h";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="..\..\src\brush.c" />
     <ClCompile Include="..\..\src\brush_ops.c" />
     <ClCompile Include="..\..\src\buttons.c" />
     <ClCompile Include="..\..\src\buttons_effects.c" />
+    <ClCompile Include="..\..\src\c64formats.c" />
+    <ClCompile Include="..\..\src\c64load.c" />
     <ClCompile Include="..\..\src\colorred.c" />
+    <ClCompile Include="..\..\src\cpcformats.c" />
     <ClCompile Include="..\..\src\engine.c" />
     <ClCompile Include="..\..\src\factory.c" />
     <ClCompile Include="..\..\src\fileformats.c" />
@@ -97,6 +104,7 @@
     <ClCompile Include="..\..\src\graph.c" />
     <ClCompile Include="..\..\src\help.c" />
     <ClCompile Include="..\..\src\hotkeys.c" />
+    <ClCompile Include="..\..\src\ifformat.c" />
     <ClCompile Include="..\..\src\init.c" />
     <ClCompile Include="..\..\src\input.c" />
     <ClCompile Include="..\..\src\io.c" />
@@ -105,15 +113,20 @@
     <ClCompile Include="..\..\src\libraw2crtc.c" />
     <ClCompile Include="..\..\src\loadrecoil.c" />
     <ClCompile Include="..\..\src\loadsave.c" />
+    <ClCompile Include="..\..\src\loadsavefuncs.c" />
     <ClCompile Include="..\..\src\main.c" />
     <ClCompile Include="..\..\src\misc.c" />
     <ClCompile Include="..\..\src\miscfileformats.c" />
+    <ClCompile Include="..\..\src\motoformats.c" />
     <ClCompile Include="..\..\src\mountlist.c" />
+    <ClCompile Include="..\..\src\msxformats.c" />
     <ClCompile Include="..\..\src\oldies.c" />
     <ClCompile Include="..\..\src\operatio.c" />
     <ClCompile Include="..\..\src\op_c.c" />
+    <ClCompile Include="..\..\src\packbits.c" />
     <ClCompile Include="..\..\src\pages.c" />
     <ClCompile Include="..\..\src\palette.c" />
+    <ClCompile Include="..\..\src\pngformat.c" />
     <ClCompile Include="..\..\src\pversion.c" />
     <ClCompile Include="..\..\src\pxdouble.c" />
     <ClCompile Include="..\..\src\pxquad.c" />
@@ -133,6 +146,7 @@
     <ClCompile Include="..\..\src\SFont.c" />
     <ClCompile Include="..\..\src\shade.c" />
     <ClCompile Include="..\..\src\special.c" />
+    <ClCompile Include="..\..\src\stformats.c" />
     <ClCompile Include="..\..\src\text.c" />
     <ClCompile Include="..\..\src\tifformat.c" />
     <ClCompile Include="..\..\src\tiles.c" />
@@ -143,9 +157,13 @@
     <ClCompile Include="..\..\src\windows.c" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\6502.h" />
+    <ClInclude Include="..\..\src\6502types.h" />
     <ClInclude Include="..\..\src\bitcount.h" />
     <ClInclude Include="..\..\src\brush.h" />
     <ClInclude Include="..\..\src\buttons.h" />
+    <ClInclude Include="..\..\src\c64load.h" />
+    <ClInclude Include="..\..\src\c64picview_inc.h" />
     <ClInclude Include="..\..\src\colorred.h" />
     <ClInclude Include="..\..\src\const.h" />
     <ClInclude Include="..\..\src\engine.h" />
@@ -170,11 +188,13 @@
     <ClInclude Include="..\..\src\layers.h" />
     <ClInclude Include="..\..\src\libraw2crtc.h" />
     <ClInclude Include="..\..\src\loadsave.h" />
+    <ClInclude Include="..\..\src\loadsavefuncs.h" />
     <ClInclude Include="..\..\src\misc.h" />
     <ClInclude Include="..\..\src\mountlist.h" />
     <ClInclude Include="..\..\src\oldies.h" />
     <ClInclude Include="..\..\src\operatio.h" />
     <ClInclude Include="..\..\src\op_c.h" />
+    <ClInclude Include="..\..\src\packbits.h" />
     <ClInclude Include="..\..\src\pages.h" />
     <ClInclude Include="..\..\src\palette.h" />
     <ClInclude Include="..\..\src\pxdouble.h" />
diff --git a/project/msvc/grafx2-win32.vcxproj.filters b/project/msvc/grafx2-win32.vcxproj.filters
index 28ebc61b..03e94f5c 100644
--- a/project/msvc/grafx2-win32.vcxproj.filters
+++ b/project/msvc/grafx2-win32.vcxproj.filters
@@ -192,6 +192,39 @@
     <ClCompile Include="..\..\src\gfx2mem.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\c64formats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpcformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\motoformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\stformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ifformat.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\pngformat.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\loadsavefuncs.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\c64load.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\6502.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\msxformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\packbits.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\brush.h">
@@ -371,6 +404,24 @@
     <ClInclude Include="..\..\src\gfx2mem.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\loadsavefuncs.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\6502types.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\c64load.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\6502.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\c64picview_inc.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\packbits.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\gfx2.rc">
diff --git a/project/msvc/grafx2.vcxproj b/project/msvc/grafx2.vcxproj
index 31c4c18a..4a1704a2 100644
--- a/project/msvc/grafx2.vcxproj
+++ b/project/msvc/grafx2.vcxproj
@@ -89,14 +89,20 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClInclude Include="..\..\src\6502.h" />
+    <ClInclude Include="..\..\src\6502types.h" />
     <ClInclude Include="..\..\src\bitcount.h" />
     <ClInclude Include="..\..\src\brush.h" />
     <ClInclude Include="..\..\src\buttons.h" />
+    <ClInclude Include="..\..\src\c64load.h" />
+    <ClInclude Include="..\..\src\c64picview_inc.h" />
     <ClInclude Include="..\..\src\colorred.h" />
     <ClInclude Include="..\..\src\const.h" />
+    <ClInclude Include="..\..\src\cpc_scr_simple_loader.h" />
     <ClInclude Include="..\..\src\engine.h" />
     <ClInclude Include="..\..\src\errors.h" />
     <ClInclude Include="..\..\src\factory.h" />
+    <ClInclude Include="..\..\src\fileformats.h" />
     <ClInclude Include="..\..\src\filesel.h" />
     <ClInclude Include="..\..\src\gfx2log.h" />
     <ClInclude Include="..\..\src\gfx2mem.h" />
@@ -107,7 +113,9 @@
     <ClInclude Include="..\..\src\help.h" />
     <ClInclude Include="..\..\src\helpfile.h" />
     <ClInclude Include="..\..\src\hotkeys.h" />
+    <ClInclude Include="..\..\src\impdraw_loader.h" />
     <ClInclude Include="..\..\src\init.h" />
+    <ClInclude Include="..\..\src\init_buttons.h" />
     <ClInclude Include="..\..\src\input.h" />
     <ClInclude Include="..\..\src\io.h" />
     <ClInclude Include="..\..\src\keyboard.h" />
@@ -115,11 +123,13 @@
     <ClInclude Include="..\..\src\layers.h" />
     <ClInclude Include="..\..\src\libraw2crtc.h" />
     <ClInclude Include="..\..\src\loadsave.h" />
+    <ClInclude Include="..\..\src\loadsavefuncs.h" />
     <ClInclude Include="..\..\src\misc.h" />
     <ClInclude Include="..\..\src\mountlist.h" />
     <ClInclude Include="..\..\src\oldies.h" />
     <ClInclude Include="..\..\src\operatio.h" />
     <ClInclude Include="..\..\src\op_c.h" />
+    <ClInclude Include="..\..\src\packbits.h" />
     <ClInclude Include="..\..\src\pages.h" />
     <ClInclude Include="..\..\src\palette.h" />
     <ClInclude Include="..\..\src\pxdouble.h" />
@@ -154,11 +164,18 @@
     <ResourceCompile Include="..\..\src\gfx2.rc" />
   </ItemGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\6502.c">
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CPU_6502_STATIC;CPU_6502_USE_LOCAL_HEADER;CPU_6502_DEPENDENCIES_H="6502types.h";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CPU_6502_STATIC;CPU_6502_USE_LOCAL_HEADER;CPU_6502_DEPENDENCIES_H="6502types.h";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
     <ClCompile Include="..\..\src\brush.c" />
     <ClCompile Include="..\..\src\brush_ops.c" />
     <ClCompile Include="..\..\src\buttons.c" />
     <ClCompile Include="..\..\src\buttons_effects.c" />
+    <ClCompile Include="..\..\src\c64formats.c" />
+    <ClCompile Include="..\..\src\c64load.c" />
     <ClCompile Include="..\..\src\colorred.c" />
+    <ClCompile Include="..\..\src\cpcformats.c" />
     <ClCompile Include="..\..\src\engine.c" />
     <ClCompile Include="..\..\src\factory.c" />
     <ClCompile Include="..\..\src\fileformats.c" />
@@ -169,6 +186,7 @@
     <ClCompile Include="..\..\src\graph.c" />
     <ClCompile Include="..\..\src\help.c" />
     <ClCompile Include="..\..\src\hotkeys.c" />
+    <ClCompile Include="..\..\src\ifformat.c" />
     <ClCompile Include="..\..\src\init.c" />
     <ClCompile Include="..\..\src\input.c" />
     <ClCompile Include="..\..\src\io.c" />
@@ -177,15 +195,20 @@
     <ClCompile Include="..\..\src\libraw2crtc.c" />
     <ClCompile Include="..\..\src\loadrecoil.c" />
     <ClCompile Include="..\..\src\loadsave.c" />
+    <ClCompile Include="..\..\src\loadsavefuncs.c" />
     <ClCompile Include="..\..\src\main.c" />
     <ClCompile Include="..\..\src\misc.c" />
     <ClCompile Include="..\..\src\miscfileformats.c" />
+    <ClCompile Include="..\..\src\motoformats.c" />
     <ClCompile Include="..\..\src\mountlist.c" />
+    <ClCompile Include="..\..\src\msxformats.c" />
     <ClCompile Include="..\..\src\oldies.c" />
     <ClCompile Include="..\..\src\operatio.c" />
     <ClCompile Include="..\..\src\op_c.c" />
+    <ClCompile Include="..\..\src\packbits.c" />
     <ClCompile Include="..\..\src\pages.c" />
     <ClCompile Include="..\..\src\palette.c" />
+    <ClCompile Include="..\..\src\pngformat.c" />
     <ClCompile Include="..\..\src\pversion.c" />
     <ClCompile Include="..\..\src\pxdouble.c" />
     <ClCompile Include="..\..\src\pxquad.c" />
@@ -206,6 +229,7 @@
     <ClCompile Include="..\..\src\SFont.c" />
     <ClCompile Include="..\..\src\shade.c" />
     <ClCompile Include="..\..\src\special.c" />
+    <ClCompile Include="..\..\src\stformats.c" />
     <ClCompile Include="..\..\src\text.c" />
     <ClCompile Include="..\..\src\tifformat.c" />
     <ClCompile Include="..\..\src\tiles.c" />
diff --git a/project/msvc/grafx2.vcxproj.filters b/project/msvc/grafx2.vcxproj.filters
index 7f4b24e1..dba58b27 100644
--- a/project/msvc/grafx2.vcxproj.filters
+++ b/project/msvc/grafx2.vcxproj.filters
@@ -195,6 +195,36 @@
     <ClInclude Include="..\..\src\gfx2mem.h">
       <Filter>Fichiers d%27en-tête</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\6502.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\6502types.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\c64load.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\c64picview_inc.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cpc_scr_simple_loader.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\fileformats.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\impdraw_loader.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\init_buttons.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\loadsavefuncs.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\packbits.h">
+      <Filter>Fichiers d%27en-tête</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\src\gfx2.rc">
@@ -379,5 +409,38 @@
     <ClCompile Include="..\..\src\gfx2mem.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\msxformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\packbits.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\c64formats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\cpcformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\ifformat.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\motoformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\pngformat.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\stformats.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\loadsavefuncs.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\c64load.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\6502.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/motoformats.c b/src/motoformats.c
index 1b415a65..f8d9b391 100644
--- a/src/motoformats.c
+++ b/src/motoformats.c
@@ -29,6 +29,9 @@
 
 #include <stdlib.h>
 #include <string.h>
+#if defined(_MSC_VER)
+#define strdup _strdup
+#endif
 #include "struct.h"
 #include "io.h"
 #include "loadsave.h"