diff --git a/VisualGDB/Amiberry-gles/Amiberry-gles-Debug.vgdbsettings b/VisualGDB/Amiberry-gles/Amiberry-gles-Debug.vgdbsettings
deleted file mode 100644
index 40763779..00000000
--- a/VisualGDB/Amiberry-gles/Amiberry-gles-Debug.vgdbsettings
+++ /dev/null
@@ -1,120 +0,0 @@
-<?xml version="1.0"?>
-<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <ConfigurationName>Debug</ConfigurationName>
-  <Project xsi:type="com.visualgdb.project.linux">
-    <CustomSourceDirectories>
-      <Directories />
-      <PathStyle>MinGWUnixSlash</PathStyle>
-    </CustomSourceDirectories>
-    <DeploymentHost>
-      <HostName>192.168.1.152</HostName>
-      <Transport>SSH</Transport>
-      <UserName>pi</UserName>
-    </DeploymentHost>
-    <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
-    <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
-    <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
-    <RemoveRemoteDirectoryOnClean>false</RemoveRemoteDirectoryOnClean>
-    <SkipDeploymentTests>true</SkipDeploymentTests>
-    <MainSourceDirectoryForLocalBuilds>$(ProjectDir)</MainSourceDirectoryForLocalBuilds>
-  </Project>
-  <Build xsi:type="com.visualgdb.build.msbuild">
-    <Toolchain>
-      <Name>Raspberry PI</Name>
-      <UniqueID>com.visualgdb.raspberry_pi</UniqueID>
-      <Location>C:\SysGCC\raspberry</Location>
-      <UnixSystem>false</UnixSystem>
-      <GCC>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-gcc.exe</GCC>
-      <GXX>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-g++.exe</GXX>
-      <GDB>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-gdb.exe</GDB>
-      <AR>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-ar.exe</AR>
-      <OBJCOPY>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-objcopy.exe</OBJCOPY>
-      <Make>C:\SysGCC\raspberry\bin\make.exe</Make>
-      <AdditionalPathDirectories>
-        <string>C:\SysGCC\raspberry\bin</string>
-      </AdditionalPathDirectories>
-      <RequireCmdExe>true</RequireCmdExe>
-      <RequireCtrlBreak>false</RequireCtrlBreak>
-      <SourceDirMapping>
-        <Directories />
-        <PathStyle>MinGWUnixSlash</PathStyle>
-      </SourceDirMapping>
-    </Toolchain>
-    <ProjectFile>Amiberry-gles.vcxproj</ProjectFile>
-    <RemoteBuildEnvironment>
-      <Records />
-    </RemoteBuildEnvironment>
-    <ParallelJobCount>1</ParallelJobCount>
-  </Build>
-  <Debug xsi:type="com.visualgdb.debug.remote">
-    <AdditionalStartupCommands />
-    <AdditionalGDBSettings>
-      <Features>
-        <DisableAutoDetection>false</DisableAutoDetection>
-        <UseFrameParameter>false</UseFrameParameter>
-        <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
-        <ListLocalsSupported>false</ListLocalsSupported>
-        <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
-        <ThreadInfoSupported>false</ThreadInfoSupported>
-        <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
-        <SupportTargetCommand>false</SupportTargetCommand>
-        <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
-      </Features>
-      <EnableSmartStepping>false</EnableSmartStepping>
-      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
-      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
-      <UseAppleExtensions>false</UseAppleExtensions>
-      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
-      <MakeLogFile>false</MakeLogFile>
-      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
-      <UseRelativePathsOnly>false</UseRelativePathsOnly>
-      <ExitAction>None</ExitAction>
-      <DisableDisassembly>false</DisableDisassembly>
-      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
-      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
-      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
-      <DisableSignals>false</DisableSignals>
-      <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
-      <EnableNonStopMode>false</EnableNonStopMode>
-    </AdditionalGDBSettings>
-    <LaunchGDBSettings xsi:type="GDBLaunchParametersNewInstance">
-      <DebuggedProgram>$(TargetPath)</DebuggedProgram>
-      <GDBServerPort>2000</GDBServerPort>
-      <ProgramArguments />
-    </LaunchGDBSettings>
-    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
-    <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
-    <X11WindowMode>Local</X11WindowMode>
-    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
-    <RunGDBUnderSudo>false</RunGDBUnderSudo>
-    <DeploymentMode>Auto</DeploymentMode>
-    <LdLibraryPath />
-    <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
-  </Debug>
-  <CustomBuild>
-    <PreSyncActions />
-    <PreBuildActions />
-    <PostBuildActions />
-    <PreCleanActions />
-    <PostCleanActions />
-  </CustomBuild>
-  <CustomDebug>
-    <PreDebugActions />
-    <PostDebugActions />
-    <DebugStopActions />
-    <BreakMode>Default</BreakMode>
-  </CustomDebug>
-  <CustomShortcuts>
-    <Shortcuts />
-    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
-  </CustomShortcuts>
-  <UserDefinedVariables />
-  <ImportedPropertySheets />
-  <CodeSense>
-    <Enabled>Unknown</Enabled>
-    <ExtraSettings>
-      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
-    </ExtraSettings>
-  </CodeSense>
-  <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
-</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-gles/Amiberry-gles-Release.vgdbsettings b/VisualGDB/Amiberry-gles/Amiberry-gles-Release.vgdbsettings
deleted file mode 100644
index 9375789f..00000000
--- a/VisualGDB/Amiberry-gles/Amiberry-gles-Release.vgdbsettings
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0"?>
-<VisualGDBProjectSettings2 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <ConfigurationName>Release</ConfigurationName>
-  <Project xsi:type="com.visualgdb.project.linux">
-    <CustomSourceDirectories>
-      <Directories />
-      <PathStyle>MinGWUnixSlash</PathStyle>
-    </CustomSourceDirectories>
-    <DeploymentHost>
-      <HostName>192.168.1.152</HostName>
-      <Transport>SSH</Transport>
-      <UserName>pi</UserName>
-    </DeploymentHost>
-    <AllowChangingHostForMainCommands>false</AllowChangingHostForMainCommands>
-    <SkipBuildIfNoSourceFilesChanged>false</SkipBuildIfNoSourceFilesChanged>
-    <IgnoreFileTransferErrors>false</IgnoreFileTransferErrors>
-    <RemoveRemoteDirectoryOnClean>false</RemoveRemoteDirectoryOnClean>
-    <SkipDeploymentTests>true</SkipDeploymentTests>
-    <MainSourceDirectoryForLocalBuilds>$(ProjectDir)</MainSourceDirectoryForLocalBuilds>
-  </Project>
-  <Build xsi:type="com.visualgdb.build.msbuild">
-    <Toolchain>
-      <Name>Raspberry PI</Name>
-      <UniqueID>com.visualgdb.raspberry_pi</UniqueID>
-      <Location>C:\SysGCC\raspberry</Location>
-      <UnixSystem>false</UnixSystem>
-      <GCC>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-gcc.exe</GCC>
-      <GXX>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-g++.exe</GXX>
-      <GDB>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-gdb.exe</GDB>
-      <AR>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-ar.exe</AR>
-      <OBJCOPY>C:\SysGCC\raspberry\bin\arm-linux-gnueabihf-objcopy.exe</OBJCOPY>
-      <Make>C:\SysGCC\raspberry\bin\make.exe</Make>
-      <AdditionalPathDirectories>
-        <string>C:\SysGCC\raspberry\bin</string>
-      </AdditionalPathDirectories>
-      <RequireCmdExe>true</RequireCmdExe>
-      <RequireCtrlBreak>false</RequireCtrlBreak>
-      <SourceDirMapping>
-        <Directories />
-        <PathStyle>MinGWUnixSlash</PathStyle>
-      </SourceDirMapping>
-    </Toolchain>
-    <ProjectFile>Amiberry-gles.vcxproj</ProjectFile>
-    <RemoteBuildEnvironment>
-      <Records />
-    </RemoteBuildEnvironment>
-    <ParallelJobCount>1</ParallelJobCount>
-  </Build>
-  <Debug xsi:type="com.visualgdb.debug.remote">
-    <AdditionalStartupCommands />
-    <AdditionalGDBSettings>
-      <Features>
-        <DisableAutoDetection>false</DisableAutoDetection>
-        <UseFrameParameter>false</UseFrameParameter>
-        <SimpleValuesFlagSupported>false</SimpleValuesFlagSupported>
-        <ListLocalsSupported>false</ListLocalsSupported>
-        <ByteLevelMemoryCommandsAvailable>false</ByteLevelMemoryCommandsAvailable>
-        <ThreadInfoSupported>false</ThreadInfoSupported>
-        <PendingBreakpointsSupported>false</PendingBreakpointsSupported>
-        <SupportTargetCommand>false</SupportTargetCommand>
-        <ReliableBreakpointNotifications>false</ReliableBreakpointNotifications>
-      </Features>
-      <EnableSmartStepping>false</EnableSmartStepping>
-      <FilterSpuriousStoppedNotifications>false</FilterSpuriousStoppedNotifications>
-      <ForceSingleThreadedMode>false</ForceSingleThreadedMode>
-      <UseAppleExtensions>false</UseAppleExtensions>
-      <CanAcceptCommandsWhileRunning>false</CanAcceptCommandsWhileRunning>
-      <MakeLogFile>false</MakeLogFile>
-      <IgnoreModuleEventsWhileStepping>true</IgnoreModuleEventsWhileStepping>
-      <UseRelativePathsOnly>false</UseRelativePathsOnly>
-      <ExitAction>None</ExitAction>
-      <DisableDisassembly>false</DisableDisassembly>
-      <ExamineMemoryWithXCommand>false</ExamineMemoryWithXCommand>
-      <StepIntoNewInstanceEntry>main</StepIntoNewInstanceEntry>
-      <ExamineRegistersInRawFormat>true</ExamineRegistersInRawFormat>
-      <DisableSignals>false</DisableSignals>
-      <EnableAsyncExecutionMode>false</EnableAsyncExecutionMode>
-      <EnableNonStopMode>false</EnableNonStopMode>
-    </AdditionalGDBSettings>
-    <LaunchGDBSettings xsi:type="GDBLaunchParametersNewInstance">
-      <GDBEnvironment>
-        <Records>
-          <Record>
-            <VariableName>LANG</VariableName>
-            <Value>en_US.UTF-8</Value>
-          </Record>
-          <Record>
-            <VariableName>PATH</VariableName>
-            <Value>C:\SysGCC\raspberry\bin;%PATH%</Value>
-          </Record>
-        </Records>
-      </GDBEnvironment>
-      <DebuggedProgram>$(TargetPath)</DebuggedProgram>
-      <GDBServerPort>2000</GDBServerPort>
-      <ProgramArguments />
-    </LaunchGDBSettings>
-    <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
-    <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
-    <X11WindowMode>Local</X11WindowMode>
-    <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
-    <RunGDBUnderSudo>false</RunGDBUnderSudo>
-    <DeploymentMode>Auto</DeploymentMode>
-    <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
-  </Debug>
-  <CustomBuild>
-    <PreSyncActions />
-    <PreBuildActions />
-    <PostBuildActions />
-    <PreCleanActions />
-    <PostCleanActions />
-  </CustomBuild>
-  <CustomDebug>
-    <PreDebugActions />
-    <PostDebugActions />
-    <DebugStopActions />
-    <BreakMode>Default</BreakMode>
-  </CustomDebug>
-  <CustomShortcuts>
-    <Shortcuts />
-    <ShowMessageAfterExecuting>true</ShowMessageAfterExecuting>
-  </CustomShortcuts>
-  <UserDefinedVariables />
-  <ImportedPropertySheets />
-  <CodeSense>
-    <Enabled>Unknown</Enabled>
-    <ExtraSettings>
-      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
-    </ExtraSettings>
-  </CodeSense>
-  <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
-</VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-gles/Amiberry-gles.vcxproj b/VisualGDB/Amiberry-gles/Amiberry-gles.vcxproj
deleted file mode 100644
index beab3416..00000000
--- a/VisualGDB/Amiberry-gles/Amiberry-gles.vcxproj
+++ /dev/null
@@ -1,338 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|VisualGDB">
-      <Configuration>Debug</Configuration>
-      <Platform>VisualGDB</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|VisualGDB">
-      <Configuration>Release</Configuration>
-      <Platform>VisualGDB</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{AB3DAC01-999D-43CD-A9CD-4B2A16B6063E}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
-    <GNUConfigurationType>Debug</GNUConfigurationType>
-    <Toolchain>C:\SysGCC\raspberry</Toolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
-    <Toolchain>C:\SysGCC\raspberry</Toolchain>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
-    <ClCompile>
-      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>../../src;../../src/include;../../src/osdep;../../src/threaddep;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>DEBUG=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";HAVE_GLES;SHADER_SUPPORT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>bcm_host;SDL;pthread;m;z;SDL_image;png;rt;xml2;FLAC;mpg123;dl;SDL_ttf;guichan_sdl;guichan;EGL;GLESv2;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
-      <LinkerScript />
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
-    <ClCompile>
-      <CPPLanguageStandard>GNUPP14</CPPLanguageStandard>
-      <AdditionalIncludeDirectories>../../src;../../src/include;../../src/osdep;../../src/threaddep;=/opt/vc/include;=/opt/vc/include/interface/vmcs_host/linux;=/opt/vc/include/interface/vcos/pthreads;=/usr/include/SDL;=/usr/include/libxml2;%(ClCompile.AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>NDEBUG=1;RELEASE=1;_REENTRANT;RASPBERRY;CAPSLOCK_DEBIAN_WORKAROUND;ARMV6T2;PICASSO96;USE_ARMNEON;CPU_arm;ARMV6_ASSEMBLY;PANDORA;WITH_INGAME_WARNING;USE_SDL;ROM_PATH_PREFIX=\"./\";DATA_PREFIX=\"./data/\";SAVE_PREFIX=\"./saves/\";GCCCONSTFUNC="__attribute__((const))";HAVE_GLES;SHADER_SUPPORT;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>-march=armv8-a -mfpu=neon-fp-armv8 -mfloat-abi=hard %(AdditionalOptions)</AdditionalOptions>
-      <OmitFramePointer>true</OmitFramePointer>
-      <InlineFunctions>true</InlineFunctions>
-    </ClCompile>
-    <Link>
-      <AdditionalLinkerInputs>;%(Link.AdditionalLinkerInputs)</AdditionalLinkerInputs>
-      <LibrarySearchDirectories>=/opt/vc/lib;%(Link.LibrarySearchDirectories)</LibrarySearchDirectories>
-      <AdditionalLibraryNames>bcm_host;SDL;pthread;m;z;SDL_image;png;rt;xml2;FLAC;mpg123;dl;SDL_ttf;guichan_sdl;guichan;EGL;GLESv2;%(Link.AdditionalLibraryNames)</AdditionalLibraryNames>
-      <LinkerScript />
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <None Include="..\..\src\filesys.asm" />
-    <None Include="..\..\src\inputevents.def" />
-    <None Include="..\..\src\table68k" />
-    <None Include="Amiberry-gles-Debug.vgdbsettings" />
-    <None Include="Amiberry-gles-Release.vgdbsettings" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\akiko.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\7zBuf.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\7zCrc.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\7zStream.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zDecode.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zExtract.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zHeader.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zIn.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zItem.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Bcj2.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Bra.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\Bra86.cpp" />
-    <ClCompile Include="..\..\src\archivers\7z\LzmaDec.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\crc_csum.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\getbits.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\maketbl.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\pfile.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\tables.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\u_deep.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\u_heavy.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\u_init.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\u_medium.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\u_quick.cpp" />
-    <ClCompile Include="..\..\src\archivers\dms\u_rle.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\crcio.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\dhuf.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\header.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\huf.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\larc.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\lhamaketbl.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\lharc.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\shuf.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\slide.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\uae_lha.cpp" />
-    <ClCompile Include="..\..\src\archivers\lha\util.cpp" />
-    <ClCompile Include="..\..\src\archivers\lzx\unlzx.cpp" />
-    <ClCompile Include="..\..\src\archivers\wrp\warp.cpp" />
-    <ClCompile Include="..\..\src\archivers\zip\unzip.cpp" />
-    <ClCompile Include="..\..\src\aros.rom.cpp" />
-    <ClCompile Include="..\..\src\audio.cpp" />
-    <ClCompile Include="..\..\src\autoconf.cpp" />
-    <ClCompile Include="..\..\src\blitfunc.cpp" />
-    <ClCompile Include="..\..\src\blitops.cpp" />
-    <ClCompile Include="..\..\src\blittable.cpp" />
-    <ClCompile Include="..\..\src\blitter.cpp" />
-    <ClCompile Include="..\..\src\blkdev.cpp" />
-    <ClCompile Include="..\..\src\blkdev_cdimage.cpp" />
-    <ClCompile Include="..\..\src\bsdsocket.cpp" />
-    <ClCompile Include="..\..\src\calc.cpp" />
-    <ClCompile Include="..\..\src\cdrom.cpp" />
-    <ClCompile Include="..\..\src\cfgfile.cpp" />
-    <ClCompile Include="..\..\src\cia.cpp" />
-    <ClCompile Include="..\..\src\cpudefs.cpp" />
-    <ClCompile Include="..\..\src\cpuemu_0.cpp" />
-    <ClCompile Include="..\..\src\cpuemu_11.cpp" />
-    <ClCompile Include="..\..\src\cpuemu_4.cpp" />
-    <ClCompile Include="..\..\src\cpustbl.cpp" />
-    <ClCompile Include="..\..\src\crc32.cpp" />
-    <ClCompile Include="..\..\src\custom.cpp" />
-    <ClCompile Include="..\..\src\disk.cpp" />
-    <ClCompile Include="..\..\src\diskutil.cpp" />
-    <ClCompile Include="..\..\src\drawing.cpp" />
-    <ClCompile Include="..\..\src\events.cpp" />
-    <ClCompile Include="..\..\src\expansion.cpp" />
-    <ClCompile Include="..\..\src\filesys.cpp" />
-    <ClCompile Include="..\..\src\fpp.cpp" />
-    <ClCompile Include="..\..\src\fsdb.cpp" />
-    <ClCompile Include="..\..\src\fsdb_unix.cpp" />
-    <ClCompile Include="..\..\src\fsusage.cpp" />
-    <ClCompile Include="..\..\src\gfxboard.cpp" />
-    <ClCompile Include="..\..\src\gfxutil.cpp" />
-    <ClCompile Include="..\..\src\hardfile.cpp" />
-    <ClCompile Include="..\..\src\inputdevice.cpp" />
-    <ClCompile Include="..\..\src\jit\compemu.cpp" />
-    <ClCompile Include="..\..\src\jit\compemu_fpp.cpp" />
-    <ClCompile Include="..\..\src\jit\compemu_support.cpp" />
-    <ClCompile Include="..\..\src\jit\compstbl.cpp" />
-    <ClCompile Include="..\..\src\keybuf.cpp" />
-    <ClCompile Include="..\..\src\main.cpp" />
-    <ClCompile Include="..\..\src\machdep\support.cpp" />
-    <ClCompile Include="..\..\src\memory.cpp" />
-    <ClCompile Include="..\..\src\native2amiga.cpp" />
-    <ClCompile Include="..\..\src\newcpu.cpp" />
-    <ClCompile Include="..\..\src\newcpu_common.cpp" />
-    <ClCompile Include="..\..\src\od-gles\gl.cpp" />
-    <ClCompile Include="..\..\src\od-gles\gles_gfx.cpp" />
-    <ClCompile Include="..\..\src\od-gles\gl_platform.cpp" />
-    <ClCompile Include="..\..\src\od-gles\shader_stuff.cpp" />
-    <ClCompile Include="..\..\src\osdep\bsdsocket_host.cpp" />
-    <ClCompile Include="..\..\src\osdep\cda_play.cpp" />
-    <ClCompile Include="..\..\src\osdep\charset.cpp" />
-    <ClCompile Include="..\..\src\osdep\fsdb_host.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\CreateFilesysHardfile.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\EditFilesysHardfile.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\EditFilesysVirtual.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\InGameMessage.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\main_window.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\Navigation.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelChipset.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelConfig.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelCPU.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelDisplay.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelFloppy.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelHD.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelInput.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelMisc.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelPaths.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelRAM.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelROM.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelSavestate.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\PanelSound.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\sdltruetypefont.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\SelectFile.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\SelectFolder.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\SelectorEntry.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\ShowMessage.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\UaeCheckBox.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\UaeDropDown.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\UaeListBox.cpp" />
-    <ClCompile Include="..\..\src\osdep\gui\UaeRadioButton.cpp" />
-    <ClCompile Include="..\..\src\osdep\hardfile_pandora.cpp" />
-    <ClCompile Include="..\..\src\osdep\keyboard.cpp" />
-    <ClCompile Include="..\..\src\osdep\menu\menu_config.cpp" />
-    <ClCompile Include="..\..\src\osdep\mp3decoder.cpp" />
-    <ClCompile Include="..\..\src\osdep\neon_helper.s" />
-    <ClCompile Include="..\..\src\osdep\pandora.cpp" />
-    <ClCompile Include="..\..\src\osdep\pandora_filesys.cpp" />
-    <ClCompile Include="..\..\src\osdep\pandora_gfx.cpp" />
-    <ClCompile Include="..\..\src\osdep\pandora_gui.cpp" />
-    <ClCompile Include="..\..\src\osdep\pandora_input.cpp" />
-    <ClCompile Include="..\..\src\osdep\pandora_mem.cpp" />
-    <ClCompile Include="..\..\src\osdep\pandora_rp9.cpp" />
-    <ClCompile Include="..\..\src\osdep\picasso96.cpp" />
-    <ClCompile Include="..\..\src\osdep\sigsegv_handler.cpp" />
-    <ClCompile Include="..\..\src\osdep\writelog.cpp" />
-    <ClCompile Include="..\..\src\p96_blit.cpp" />
-    <ClCompile Include="..\..\src\readcpu.cpp" />
-    <ClCompile Include="..\..\src\rommgr.cpp" />
-    <ClCompile Include="..\..\src\savestate.cpp" />
-    <ClCompile Include="..\..\src\sounddep\sound_sdl_new.cpp" />
-    <ClCompile Include="..\..\src\sinctable.cpp" />
-    <ClCompile Include="..\..\src\statusline.cpp" />
-    <ClCompile Include="..\..\src\traps.cpp" />
-    <ClCompile Include="..\..\src\uaelib.cpp" />
-    <ClCompile Include="..\..\src\uaeresource.cpp" />
-    <ClCompile Include="..\..\src\zfile.cpp" />
-    <ClCompile Include="..\..\src\zfile_archive.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\archivers\7z\7zBuf.h" />
-    <ClInclude Include="..\..\src\archivers\7z\7zCrc.h" />
-    <ClInclude Include="..\..\src\archivers\7z\7zVersion.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zDecode.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zExtract.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zHeader.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zIn.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zItem.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Bcj2.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Bra.h" />
-    <ClInclude Include="..\..\src\archivers\7z\CpuArch.h" />
-    <ClInclude Include="..\..\src\archivers\7z\LzmaDec.h" />
-    <ClInclude Include="..\..\src\archivers\7z\Types.h" />
-    <ClInclude Include="..\..\src\archivers\dms\cdata.h" />
-    <ClInclude Include="..\..\src\archivers\dms\crc_csum.h" />
-    <ClInclude Include="..\..\src\archivers\dms\getbits.h" />
-    <ClInclude Include="..\..\src\archivers\dms\maketbl.h" />
-    <ClInclude Include="..\..\src\archivers\dms\pfile.h" />
-    <ClInclude Include="..\..\src\archivers\dms\tables.h" />
-    <ClInclude Include="..\..\src\archivers\dms\u_deep.h" />
-    <ClInclude Include="..\..\src\archivers\dms\u_heavy.h" />
-    <ClInclude Include="..\..\src\archivers\dms\u_init.h" />
-    <ClInclude Include="..\..\src\archivers\dms\u_medium.h" />
-    <ClInclude Include="..\..\src\archivers\dms\u_quick.h" />
-    <ClInclude Include="..\..\src\archivers\dms\u_rle.h" />
-    <ClInclude Include="..\..\src\archivers\lha\lha.h" />
-    <ClInclude Include="..\..\src\archivers\lha\lha_macro.h" />
-    <ClInclude Include="..\..\src\archivers\wrp\warp.h" />
-    <ClInclude Include="..\..\src\archivers\zip\unzip.h" />
-    <ClInclude Include="..\..\src\include\akiko.h" />
-    <ClInclude Include="..\..\src\include\audio.h" />
-    <ClInclude Include="..\..\src\include\autoconf.h" />
-    <ClInclude Include="..\..\src\include\blit.h" />
-    <ClInclude Include="..\..\src\include\blitfunc.h" />
-    <ClInclude Include="..\..\src\include\blitter.h" />
-    <ClInclude Include="..\..\src\include\blkdev.h" />
-    <ClInclude Include="..\..\src\include\bsdsocket.h" />
-    <ClInclude Include="..\..\src\include\calc.h" />
-    <ClInclude Include="..\..\src\include\cia.h" />
-    <ClInclude Include="..\..\src\include\clipboard.h" />
-    <ClInclude Include="..\..\src\include\commpipe.h" />
-    <ClInclude Include="..\..\src\include\cputbl.h" />
-    <ClInclude Include="..\..\src\include\cpu_prefetch.h" />
-    <ClInclude Include="..\..\src\include\crc32.h" />
-    <ClInclude Include="..\..\src\include\custom.h" />
-    <ClInclude Include="..\..\src\include\debug.h" />
-    <ClInclude Include="..\..\src\include\disk.h" />
-    <ClInclude Include="..\..\src\include\diskutil.h" />
-    <ClInclude Include="..\..\src\include\drawing.h" />
-    <ClInclude Include="..\..\src\include\ersatz.h" />
-    <ClInclude Include="..\..\src\include\events.h" />
-    <ClInclude Include="..\..\src\include\execio.h" />
-    <ClInclude Include="..\..\src\include\execlib.h" />
-    <ClInclude Include="..\..\src\include\filesys.h" />
-    <ClInclude Include="..\..\src\include\flags_arm.h" />
-    <ClInclude Include="..\..\src\include\fpp-ieee-be.h" />
-    <ClInclude Include="..\..\src\include\fpp-unknown.h" />
-    <ClInclude Include="..\..\src\include\fsdb.h" />
-    <ClInclude Include="..\..\src\include\fsusage.h" />
-    <ClInclude Include="..\..\src\include\genblitter.h" />
-    <ClInclude Include="..\..\src\include\gensound.h" />
-    <ClInclude Include="..\..\src\include\gfxboard.h" />
-    <ClInclude Include="..\..\src\include\gui.h" />
-    <ClInclude Include="..\..\src\include\inputdevice.h" />
-    <ClInclude Include="..\..\src\include\keyboard.h" />
-    <ClInclude Include="..\..\src\include\keybuf.h" />
-    <ClInclude Include="..\..\src\include\mackbd.h" />
-    <ClInclude Include="..\..\src\include\memory.h" />
-    <ClInclude Include="..\..\src\include\native2amiga.h" />
-    <ClInclude Include="..\..\src\include\native2amiga_api.h" />
-    <ClInclude Include="..\..\src\include\newcpu.h" />
-    <ClInclude Include="..\..\src\include\options.h" />
-    <ClInclude Include="..\..\src\include\osemu.h" />
-    <ClInclude Include="..\..\src\include\picasso96.h" />
-    <ClInclude Include="..\..\src\include\readcpu.h" />
-    <ClInclude Include="..\..\src\include\rommgr.h" />
-    <ClInclude Include="..\..\src\include\rtgmodes.h" />
-    <ClInclude Include="..\..\src\include\savestate.h" />
-    <ClInclude Include="..\..\src\include\scsi.h" />
-    <ClInclude Include="..\..\src\include\scsidev.h" />
-    <ClInclude Include="..\..\src\include\statusline.h" />
-    <ClInclude Include="..\..\src\include\sysdeps.h" />
-    <ClInclude Include="..\..\src\include\traps.h" />
-    <ClInclude Include="..\..\src\include\uae.h" />
-    <ClInclude Include="..\..\src\include\uaeresource.h" />
-    <ClInclude Include="..\..\src\include\xwin.h" />
-    <ClInclude Include="..\..\src\include\zarchive.h" />
-    <ClInclude Include="..\..\src\include\zfile.h" />
-    <ClInclude Include="..\..\src\jit\codegen_arm.h" />
-    <ClInclude Include="..\..\src\jit\compemu.h" />
-    <ClInclude Include="..\..\src\jit\compemu_midfunc_arm.h" />
-    <ClInclude Include="..\..\src\jit\compemu_midfunc_arm2.h" />
-    <ClInclude Include="..\..\src\jit\comptbl.h" />
-    <ClInclude Include="..\..\src\machdep\m68k.h" />
-    <ClInclude Include="..\..\src\machdep\maccess.h" />
-    <ClInclude Include="..\..\src\machdep\md-fpp.h" />
-    <ClInclude Include="..\..\src\machdep\rpt.h" />
-    <ClInclude Include="..\..\src\od-gles\gl.h" />
-    <ClInclude Include="..\..\src\od-gles\gl_platform.h" />
-    <ClInclude Include="..\..\src\od-gles\shader_stuff.h" />
-    <ClInclude Include="..\..\src\osdep\cda_play.h" />
-    <ClInclude Include="..\..\src\osdep\config.h" />
-    <ClInclude Include="..\..\src\osdep\gui\gui_handling.h" />
-    <ClInclude Include="..\..\src\osdep\gui\sdltruetypefont.hpp" />
-    <ClInclude Include="..\..\src\osdep\gui\SelectorEntry.hpp" />
-    <ClInclude Include="..\..\src\osdep\gui\UaeCheckBox.hpp" />
-    <ClInclude Include="..\..\src\osdep\gui\UaeDropDown.hpp" />
-    <ClInclude Include="..\..\src\osdep\gui\UaeListBox.hpp" />
-    <ClInclude Include="..\..\src\osdep\gui\UaeRadioButton.hpp" />
-    <ClInclude Include="..\..\src\osdep\mp3decoder.h" />
-    <ClInclude Include="..\..\src\osdep\pandora_rp9.h" />
-    <ClInclude Include="..\..\src\osdep\sysconfig.h" />
-    <ClInclude Include="..\..\src\osdep\target.h" />
-    <ClInclude Include="..\..\src\sounddep\sound.h" />
-    <ClInclude Include="..\..\src\threaddep\thread.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-gles/Amiberry-gles.vcxproj.filters b/VisualGDB/Amiberry-gles/Amiberry-gles.vcxproj.filters
deleted file mode 100644
index f16f0b4e..00000000
--- a/VisualGDB/Amiberry-gles/Amiberry-gles.vcxproj.filters
+++ /dev/null
@@ -1,930 +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>{f7b1878b-1e90-4e7f-af6e-5bfbe0472379}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header files">
-      <UniqueIdentifier>{500bf09f-2912-4a9b-99aa-45ca70a08d82}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource files">
-      <UniqueIdentifier>{f092da83-7fa0-4b6f-839e-b2fa5474affd}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-    <Filter Include="VisualGDB settings">
-      <UniqueIdentifier>{d4a7a442-40aa-47ca-962c-43f387907b11}</UniqueIdentifier>
-      <Extensions>*.vgdbsettings</Extensions>
-    </Filter>
-    <Filter Include="Source files\od-gles">
-      <UniqueIdentifier>{49446657-502d-4761-a17c-a7a3b8ba5151}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\od-gles">
-      <UniqueIdentifier>{b3b89d16-6020-44a0-9a26-c95b9bf085ca}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\jit">
-      <UniqueIdentifier>{7087c72a-65f3-47b2-9503-fb3dd54cee68}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\include">
-      <UniqueIdentifier>{279ae879-655b-423b-8f77-2072a8bea3c1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\archivers">
-      <UniqueIdentifier>{53cbba1d-5bbc-4bcb-bea9-9fb79173ff23}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\archivers\7z">
-      <UniqueIdentifier>{ad1b8055-4cae-4662-93b2-94458518ff2d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\archivers\7z\Archive">
-      <UniqueIdentifier>{ce4546be-2038-4107-a17f-d00050875d38}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\archivers\7z\Archive\7z">
-      <UniqueIdentifier>{73862ad1-34b9-4143-9d71-cce93b99f154}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\archivers\dms">
-      <UniqueIdentifier>{7baf6f27-c7c2-4665-8490-b47a7e964a26}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\archivers\lha">
-      <UniqueIdentifier>{56b4de99-e470-4fcd-81c9-91d796c97b0e}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\archivers\wrp">
-      <UniqueIdentifier>{da74b537-689c-48d8-b29c-888d9e726dfe}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\archivers\zip">
-      <UniqueIdentifier>{42b853e5-f34f-4d40-8b88-e60974fb012c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\jit">
-      <UniqueIdentifier>{4a2180c8-6990-49c5-b535-b075c7e0b005}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers">
-      <UniqueIdentifier>{ced2ce79-31b5-48b9-9842-d089717def57}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\7z">
-      <UniqueIdentifier>{6e336d18-7787-4211-9892-5432f6bc948f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\dms">
-      <UniqueIdentifier>{7fbca5f1-5418-490c-914d-251adbcd6ea5}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\lha">
-      <UniqueIdentifier>{536fe3ed-8fd5-4e24-ae56-ba88d618fa62}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\lzx">
-      <UniqueIdentifier>{1e3a52a0-7328-4533-b95f-37e3093d9193}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\wrp">
-      <UniqueIdentifier>{e61172a9-1dcc-4fed-ba95-7803b8d8096c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\zip">
-      <UniqueIdentifier>{1c9d7046-1d3f-43b0-8c65-b7761c437735}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\7z\Archive">
-      <UniqueIdentifier>{f90f25c8-8245-46c8-8523-dfee38f0ca0a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\archivers\7z\Archive\7z">
-      <UniqueIdentifier>{c980c564-8d4f-4bc1-8736-a4b08745765c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\machdep">
-      <UniqueIdentifier>{9919a66e-283d-48c6-93f4-1d679849175c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\osdep">
-      <UniqueIdentifier>{79b9a1ab-9dbf-4862-8fad-b1f794787428}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\osdep\gui">
-      <UniqueIdentifier>{c37d5944-1218-485d-b017-466f3b499ca2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\sounddep">
-      <UniqueIdentifier>{ac9827c0-2c36-4238-b3e3-4ef8e03a37d8}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header files\threaddep">
-      <UniqueIdentifier>{936406c8-6881-47ea-af4b-dcfaab0c44c0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\machdep">
-      <UniqueIdentifier>{471328d7-3386-4188-b818-b34529bd114f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\osdep">
-      <UniqueIdentifier>{8ad93770-58f5-41c3-bcb2-5ce63a5d0f10}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\osdep\gui">
-      <UniqueIdentifier>{aa0398c7-efb1-475e-bba9-fe99057d4c89}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\osdep\menu">
-      <UniqueIdentifier>{d2a13290-1ea8-4356-9193-811d8c57dc27}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source files\sounddep">
-      <UniqueIdentifier>{17a34860-a02d-420b-b3ab-0f1db47cacb3}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Amiberry-gles-Debug.vgdbsettings">
-      <Filter>VisualGDB settings</Filter>
-    </None>
-    <None Include="Amiberry-gles-Release.vgdbsettings">
-      <Filter>VisualGDB settings</Filter>
-    </None>
-    <None Include="..\..\src\filesys.asm">
-      <Filter>Source files</Filter>
-    </None>
-    <None Include="..\..\src\inputevents.def">
-      <Filter>Source files</Filter>
-    </None>
-    <None Include="..\..\src\table68k">
-      <Filter>Source files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\akiko.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\aros.rom.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\audio.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\autoconf.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\blitfunc.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\blitops.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\blittable.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\blitter.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\blkdev.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\blkdev_cdimage.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\bsdsocket.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\calc.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cdrom.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cfgfile.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cia.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpudefs.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpuemu_0.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpuemu_4.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpuemu_11.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\cpustbl.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\crc32.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\custom.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\disk.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\diskutil.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\drawing.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\events.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\expansion.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\filesys.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\fpp.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\fsdb.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\fsdb_unix.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\fsusage.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gfxboard.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\gfxutil.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\hardfile.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\inputdevice.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\keybuf.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\main.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\memory.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\native2amiga.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\newcpu.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\newcpu_common.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\p96_blit.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\readcpu.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\rommgr.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\savestate.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sinctable.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\statusline.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\traps.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\uaelib.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\uaeresource.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\zfile.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\zfile_archive.cpp">
-      <Filter>Source files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\sounddep\sound_sdl_new.cpp">
-      <Filter>Source files\sounddep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\od-gles\gl.cpp">
-      <Filter>Source files\od-gles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\od-gles\gl_platform.cpp">
-      <Filter>Source files\od-gles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\od-gles\gles_gfx.cpp">
-      <Filter>Source files\od-gles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\od-gles\shader_stuff.cpp">
-      <Filter>Source files\od-gles</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\neon_helper.s">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\bsdsocket_host.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\cda_play.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\charset.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\fsdb_host.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\hardfile_pandora.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\keyboard.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\mp3decoder.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\pandora.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\pandora_filesys.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\pandora_gfx.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\pandora_gui.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\pandora_input.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\pandora_mem.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\pandora_rp9.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\picasso96.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\sigsegv_handler.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\writelog.cpp">
-      <Filter>Source files\osdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\CreateFilesysHardfile.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\EditFilesysHardfile.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\EditFilesysVirtual.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\InGameMessage.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\main_window.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\Navigation.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelChipset.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelConfig.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelCPU.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelDisplay.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelFloppy.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelHD.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelInput.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelMisc.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelPaths.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelRAM.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelROM.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelSavestate.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\PanelSound.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\sdltruetypefont.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\SelectFile.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\SelectFolder.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\SelectorEntry.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\ShowMessage.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\UaeCheckBox.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\UaeDropDown.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\UaeListBox.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\gui\UaeRadioButton.cpp">
-      <Filter>Source files\osdep\gui</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\osdep\menu\menu_config.cpp">
-      <Filter>Source files\osdep\menu</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\machdep\support.cpp">
-      <Filter>Source files\machdep</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\jit\compemu.cpp">
-      <Filter>Source files\jit</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\jit\compemu_fpp.cpp">
-      <Filter>Source files\jit</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\jit\compemu_support.cpp">
-      <Filter>Source files\jit</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\jit\compstbl.cpp">
-      <Filter>Source files\jit</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\zip\unzip.cpp">
-      <Filter>Source files\archivers\zip</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\wrp\warp.cpp">
-      <Filter>Source files\archivers\wrp</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lzx\unlzx.cpp">
-      <Filter>Source files\archivers\lzx</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\crcio.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\dhuf.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\header.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\huf.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\larc.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\lhamaketbl.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\lharc.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\shuf.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\slide.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\uae_lha.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\lha\util.cpp">
-      <Filter>Source files\archivers\lha</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\crc_csum.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\getbits.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\maketbl.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\pfile.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\tables.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\u_deep.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\u_heavy.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\u_init.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\u_medium.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\u_quick.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\dms\u_rle.cpp">
-      <Filter>Source files\archivers\dms</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\7zBuf.cpp">
-      <Filter>Source files\archivers\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\7zCrc.cpp">
-      <Filter>Source files\archivers\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\7zStream.cpp">
-      <Filter>Source files\archivers\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Bcj2.cpp">
-      <Filter>Source files\archivers\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Bra.cpp">
-      <Filter>Source files\archivers\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Bra86.cpp">
-      <Filter>Source files\archivers\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\LzmaDec.cpp">
-      <Filter>Source files\archivers\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zDecode.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zExtract.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zHeader.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zIn.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\archivers\7z\Archive\7z\7zItem.cpp">
-      <Filter>Source files\archivers\7z\Archive\7z</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\src\od-gles\gl.h">
-      <Filter>Header files\od-gles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\od-gles\gl_platform.h">
-      <Filter>Header files\od-gles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\od-gles\shader_stuff.h">
-      <Filter>Header files\od-gles</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\threaddep\thread.h">
-      <Filter>Header files\threaddep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\sounddep\sound.h">
-      <Filter>Header files\sounddep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\cda_play.h">
-      <Filter>Header files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\config.h">
-      <Filter>Header files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\mp3decoder.h">
-      <Filter>Header files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\pandora_rp9.h">
-      <Filter>Header files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\sysconfig.h">
-      <Filter>Header files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\target.h">
-      <Filter>Header files\osdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\gui\gui_handling.h">
-      <Filter>Header files\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\gui\sdltruetypefont.hpp">
-      <Filter>Header files\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\gui\SelectorEntry.hpp">
-      <Filter>Header files\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\gui\UaeCheckBox.hpp">
-      <Filter>Header files\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\gui\UaeDropDown.hpp">
-      <Filter>Header files\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\gui\UaeListBox.hpp">
-      <Filter>Header files\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\osdep\gui\UaeRadioButton.hpp">
-      <Filter>Header files\osdep\gui</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\machdep\m68k.h">
-      <Filter>Header files\machdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\machdep\maccess.h">
-      <Filter>Header files\machdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\machdep\md-fpp.h">
-      <Filter>Header files\machdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\machdep\rpt.h">
-      <Filter>Header files\machdep</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\jit\codegen_arm.h">
-      <Filter>Header files\jit</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\jit\compemu.h">
-      <Filter>Header files\jit</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\jit\compemu_midfunc_arm.h">
-      <Filter>Header files\jit</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\jit\compemu_midfunc_arm2.h">
-      <Filter>Header files\jit</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\jit\comptbl.h">
-      <Filter>Header files\jit</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\akiko.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\audio.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\autoconf.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\blit.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\blitfunc.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\blitter.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\blkdev.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\bsdsocket.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\calc.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\cia.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\clipboard.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\commpipe.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\cpu_prefetch.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\cputbl.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\crc32.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\custom.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\debug.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\disk.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\diskutil.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\drawing.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\ersatz.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\events.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\execio.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\execlib.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\filesys.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\flags_arm.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\fpp-ieee-be.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\fpp-unknown.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\fsdb.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\fsusage.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\genblitter.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\gensound.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\gfxboard.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\gui.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\inputdevice.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\keyboard.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\keybuf.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\mackbd.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\memory.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\native2amiga.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\native2amiga_api.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\newcpu.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\options.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\osemu.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\picasso96.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\readcpu.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\rommgr.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\rtgmodes.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\savestate.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\scsi.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\scsidev.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\statusline.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\sysdeps.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\traps.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\uae.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\uaeresource.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\xwin.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\zarchive.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\zfile.h">
-      <Filter>Header files\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\7zBuf.h">
-      <Filter>Header files\archivers\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\7zCrc.h">
-      <Filter>Header files\archivers\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\7zVersion.h">
-      <Filter>Header files\archivers\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Bcj2.h">
-      <Filter>Header files\archivers\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Bra.h">
-      <Filter>Header files\archivers\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\CpuArch.h">
-      <Filter>Header files\archivers\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\LzmaDec.h">
-      <Filter>Header files\archivers\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Types.h">
-      <Filter>Header files\archivers\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zAlloc.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zDecode.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zExtract.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zHeader.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zIn.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\7z\Archive\7z\7zItem.h">
-      <Filter>Header files\archivers\7z\Archive\7z</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\cdata.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\crc_csum.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\getbits.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\maketbl.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\pfile.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\tables.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\u_deep.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\u_heavy.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\u_init.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\u_medium.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\u_quick.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\dms\u_rle.h">
-      <Filter>Header files\archivers\dms</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\lha\lha.h">
-      <Filter>Header files\archivers\lha</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\lha\lha_macro.h">
-      <Filter>Header files\archivers\lha</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\wrp\warp.h">
-      <Filter>Header files\archivers\wrp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\archivers\zip\unzip.h">
-      <Filter>Header files\archivers\zip</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-gles/Amiberry-gles.vcxproj.user b/VisualGDB/Amiberry-gles/Amiberry-gles.vcxproj.user
deleted file mode 100644
index abe8dd89..00000000
--- a/VisualGDB/Amiberry-gles/Amiberry-gles.vcxproj.user
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup />
-</Project>
\ No newline at end of file