From d3fd42ab936d9ae520a263501891da4ebb19aa34 Mon Sep 17 00:00:00 2001
From: midwan <midwan@gmail.com>
Date: Tue, 1 Jan 2019 21:40:18 +0100
Subject: [PATCH] Updated VisualGDB projects, now using the latest toolchain
 for SDL1 version as well.

---
 VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj |  6 +-
 .../Amiberry-RPI1.vcxproj.filters             | 18 ++--
 .../Amiberry-sdl1-Debug.vgdbsettings          | 93 ++++++++++---------
 ...iberry-sdl1-Debug.vgdbsettings.midwan.user | 15 ---
 VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj | 17 +---
 .../Amiberry-sdl1.vcxproj.filters             | 39 ++------
 .../Amiberry/Amiberry-Debug.vgdbsettings      |  3 +-
 VisualGDB/Amiberry/Amiberry.vcxproj           | 13 +--
 VisualGDB/Amiberry/Amiberry.vcxproj.filters   | 39 ++------
 9 files changed, 87 insertions(+), 156 deletions(-)
 delete mode 100644 VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings.midwan.user

diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj
index f46f6bfa..d480bf82 100644
--- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj
+++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj
@@ -290,15 +290,14 @@
     <ClInclude Include="..\..\src\archivers\mp2\kjmp2.h" />
     <ClInclude Include="..\..\src\archivers\wrp\warp.h" />
     <ClInclude Include="..\..\src\archivers\zip\unzip.h" />
-    <ClInclude Include="..\..\src\blit.h" />
-    <ClInclude Include="..\..\src\blitfunc.h" />
     <ClInclude Include="..\..\src\caps\CapsAPI.h" />
     <ClInclude Include="..\..\src\caps\Comtype.h" />
-    <ClInclude Include="..\..\src\cputbl.h" />
     <ClInclude Include="..\..\src\include\akiko.h" />
     <ClInclude Include="..\..\src\include\ar.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" />
@@ -307,6 +306,7 @@
     <ClInclude Include="..\..\src\include\cia.h" />
     <ClInclude Include="..\..\src\include\commpipe.h" />
     <ClInclude Include="..\..\src\include\cpummu.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" />
diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj.filters b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj.filters
index 983507b7..b2f11688 100644
--- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj.filters
+++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj.filters
@@ -613,15 +613,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\blit.h">
-      <Filter>Source files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\blitfunc.h">
-      <Filter>Source files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cputbl.h">
-      <Filter>Source files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\archivers\7z\7z.h">
       <Filter>Source files\archivers\7z</Filter>
     </ClInclude>
@@ -1021,5 +1012,14 @@
     <ClInclude Include="..\..\src\threaddep\thread.h">
       <Filter>Source files\threaddep</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\include\blit.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\blitfunc.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\cputbl.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings
index 4e5a4b37..83d8e713 100644
--- a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings
@@ -50,9 +50,9 @@
     <ToolchainID>
       <ID>com.visualgdb.raspberry_pi</ID>
       <Version>
-        <GCC>4.9.2</GCC>
-        <GDB>7.7.1</GDB>
-        <Revision>4</Revision>
+        <GCC>6.3.0</GCC>
+        <GDB>7.12</GDB>
+        <Revision>3</Revision>
       </Version>
     </ToolchainID>
     <ProjectFile>Amiberry-sdl1.vcxproj</ProjectFile>
@@ -63,6 +63,51 @@
     <ParallelJobCount>1</ParallelJobCount>
     <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
   </Build>
+  <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>False</Enabled>
+    <CFLAGS />
+    <CXXFLAGS />
+    <ExternalSourceFileList />
+    <ExtraSettings>
+      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
+      <SupportLightweightReferenceAnalysis>false</SupportLightweightReferenceAnalysis>
+      <DiscoverySettings>
+        <Mode>Enabled</Mode>
+        <SearchInProjectDir>true</SearchInProjectDir>
+        <SearchInSourceDirs>true</SearchInSourceDirs>
+        <SearchInIncludeSubdirs>true</SearchInIncludeSubdirs>
+        <IgnoredDirs />
+        <IgnoredHeaders />
+      </DiscoverySettings>
+      <CheckForClangFormatFiles xsi:nil="true" />
+      <FormattingEngine xsi:nil="true" />
+    </ExtraSettings>
+    <CodeAnalyzerSettings>
+      <Enabled>false</Enabled>
+    </CodeAnalyzerSettings>
+  </CodeSense>
+  <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
+  <Configurations />
+  <ProgramArgumentsSuggestions />
   <Debug xsi:type="com.visualgdb.debug.remote">
     <AdditionalStartupCommands />
     <AdditionalGDBSettings>
@@ -110,46 +155,4 @@
     <DeployWhenLaunchedWithoutDebugging>true</DeployWhenLaunchedWithoutDebugging>
     <SuppressTTYCreation>false</SuppressTTYCreation>
   </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>False</Enabled>
-    <CFLAGS />
-    <CXXFLAGS />
-    <ExternalSourceFileList />
-    <ExtraSettings>
-      <HideErrorsInSystemHeaders>true</HideErrorsInSystemHeaders>
-      <SupportLightweightReferenceAnalysis>false</SupportLightweightReferenceAnalysis>
-      <DiscoverySettings>
-        <Mode>Enabled</Mode>
-        <SearchInProjectDir>true</SearchInProjectDir>
-        <SearchInSourceDirs>true</SearchInSourceDirs>
-        <SearchInIncludeSubdirs>true</SearchInIncludeSubdirs>
-        <IgnoredDirs />
-        <IgnoredHeaders />
-      </DiscoverySettings>
-    </ExtraSettings>
-    <CodeAnalyzerSettings>
-      <Enabled>false</Enabled>
-    </CodeAnalyzerSettings>
-  </CodeSense>
-  <BuildContextDirectory>VisualGDB\VisualGDBCache</BuildContextDirectory>
-  <ProgramArgumentsSuggestions />
 </VisualGDBProjectSettings2>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings.midwan.user b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings.midwan.user
deleted file mode 100644
index 7b1bb4f2..00000000
--- a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1-Debug.vgdbsettings.midwan.user
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<VisualGDBUserPreferences xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <UserDefinedVariableValues />
-  <DebugPreferences>
-    <CatchpointConfiguration>
-      <Exec>false</Exec>
-      <Fork>false</Fork>
-      <Vfork>false</Vfork>
-      <Syscalls />
-      <CXXCatchpoints />
-    </CatchpointConfiguration>
-    <MaskInterruptsWhileStepping>false</MaskInterruptsWhileStepping>
-    <MemoryWindowPreferences />
-  </DebugPreferences>
-</VisualGDBUserPreferences>
\ No newline at end of file
diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj
index 650c6ed7..e31b8b02 100644
--- a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj
@@ -28,11 +28,11 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>4.9.2/7.7.1/r4</ToolchainVersion>
+    <ToolchainVersion>6.3.0/7.12/r3</ToolchainVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>4.9.2/7.7.1/r4</ToolchainVersion>
+    <ToolchainVersion>6.3.0/7.12/r3</ToolchainVersion>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <ClCompile>
@@ -102,15 +102,14 @@
     <ClInclude Include="..\..\src\archivers\mp2\kjmp2.h" />
     <ClInclude Include="..\..\src\archivers\wrp\warp.h" />
     <ClInclude Include="..\..\src\archivers\zip\unzip.h" />
-    <ClInclude Include="..\..\src\blit.h" />
-    <ClInclude Include="..\..\src\blitfunc.h" />
     <ClInclude Include="..\..\src\caps\CapsAPI.h" />
     <ClInclude Include="..\..\src\caps\Comtype.h" />
-    <ClInclude Include="..\..\src\cputbl.h" />
     <ClInclude Include="..\..\src\include\akiko.h" />
     <ClInclude Include="..\..\src\include\ar.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" />
@@ -119,6 +118,7 @@
     <ClInclude Include="..\..\src\include\cia.h" />
     <ClInclude Include="..\..\src\include\commpipe.h" />
     <ClInclude Include="..\..\src\include\cpummu.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" />
@@ -137,7 +137,6 @@
     <ClInclude Include="..\..\src\include\fsdb.h" />
     <ClInclude Include="..\..\src\include\fsusage.h" />
     <ClInclude Include="..\..\src\include\gayle.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" />
@@ -145,7 +144,6 @@
     <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\mmu_common.h" />
     <ClInclude Include="..\..\src\include\native2amiga.h" />
@@ -163,18 +161,13 @@
     <ClInclude Include="..\..\src\include\traps.h" />
     <ClInclude Include="..\..\src\include\uae.h" />
     <ClInclude Include="..\..\src\include\uaeresource.h" />
-    <ClInclude Include="..\..\src\include\uae\api.h" />
-    <ClInclude Include="..\..\src\include\uae\attributes.h" />
     <ClInclude Include="..\..\src\include\uae\caps.h" />
-    <ClInclude Include="..\..\src\include\uae\cdrom.h" />
     <ClInclude Include="..\..\src\include\uae\dlopen.h" />
-    <ClInclude Include="..\..\src\include\uae\io.h" />
     <ClInclude Include="..\..\src\include\uae\likely.h" />
     <ClInclude Include="..\..\src\include\uae\mman.h" />
     <ClInclude Include="..\..\src\include\uae\string.h" />
     <ClInclude Include="..\..\src\include\uae\types.h" />
     <ClInclude Include="..\..\src\include\uae\uae.h" />
-    <ClInclude Include="..\..\src\include\uae\vm.h" />
     <ClInclude Include="..\..\src\include\xwin.h" />
     <ClInclude Include="..\..\src\include\zarchive.h" />
     <ClInclude Include="..\..\src\include\zfile.h" />
diff --git a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters
index dbf7939b..a2fce81b 100644
--- a/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters
+++ b/VisualGDB/Amiberry-sdl1/Amiberry-sdl1.vcxproj.filters
@@ -265,15 +265,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\blit.h">
-      <Filter>Source files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\blitfunc.h">
-      <Filter>Source files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cputbl.h">
-      <Filter>Source files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\archivers\7z\7z.h">
       <Filter>Source files\archivers\7z</Filter>
     </ClInclude>
@@ -478,9 +469,6 @@
     <ClInclude Include="..\..\src\include\gayle.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\genblitter.h">
-      <Filter>Source files\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\include\gensound.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
@@ -502,9 +490,6 @@
     <ClInclude Include="..\..\src\include\keybuf.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\mackbd.h">
-      <Filter>Source files\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\include\memory.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
@@ -565,15 +550,6 @@
     <ClInclude Include="..\..\src\include\zfile.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\attributes.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\cdrom.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\io.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\include\uae\likely.h">
       <Filter>Source files\include\uae</Filter>
     </ClInclude>
@@ -586,9 +562,6 @@
     <ClInclude Include="..\..\src\include\uae\types.h">
       <Filter>Source files\include\uae</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\vm.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\jit\compemu.h">
       <Filter>Source files\jit</Filter>
     </ClInclude>
@@ -667,15 +640,21 @@
     <ClInclude Include="..\..\src\include\uae\caps.h">
       <Filter>Source files\include\uae</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\api.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\caps\CapsAPI.h">
       <Filter>Source files\caps</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\caps\Comtype.h">
       <Filter>Source files\caps</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\include\blit.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\blitfunc.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\cputbl.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\filesys.asm">
diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
index 7532a5b2..e0612410 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
@@ -10,7 +10,7 @@
       <Transport>None</Transport>
     </BuildHost>
     <DeploymentHost>
-      <HostName>192.168.1.173</HostName>
+      <HostName>192.168.1.99</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
@@ -35,7 +35,6 @@
       </FileMasks>
       <TransferNewFilesOnly>true</TransferNewFilesOnly>
       <IncludeSubdirectories>true</IncludeSubdirectories>
-      <SelectedDirectories />
       <DeleteDisappearedFiles>false</DeleteDisappearedFiles>
       <ApplyGlobalExclusionList>true</ApplyGlobalExclusionList>
     </MainSourceTransferCommand>
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index 6cb6c61a..17072086 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -346,15 +346,14 @@
     <ClInclude Include="..\..\src\archivers\mp2\kjmp2.h" />
     <ClInclude Include="..\..\src\archivers\wrp\warp.h" />
     <ClInclude Include="..\..\src\archivers\zip\unzip.h" />
-    <ClInclude Include="..\..\src\blit.h" />
-    <ClInclude Include="..\..\src\blitfunc.h" />
     <ClInclude Include="..\..\src\caps\CapsAPI.h" />
     <ClInclude Include="..\..\src\caps\Comtype.h" />
-    <ClInclude Include="..\..\src\cputbl.h" />
     <ClInclude Include="..\..\src\include\akiko.h" />
     <ClInclude Include="..\..\src\include\ar.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" />
@@ -363,6 +362,7 @@
     <ClInclude Include="..\..\src\include\cia.h" />
     <ClInclude Include="..\..\src\include\commpipe.h" />
     <ClInclude Include="..\..\src\include\cpummu.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" />
@@ -381,7 +381,6 @@
     <ClInclude Include="..\..\src\include\fsdb.h" />
     <ClInclude Include="..\..\src\include\fsusage.h" />
     <ClInclude Include="..\..\src\include\gayle.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" />
@@ -389,7 +388,6 @@
     <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\mmu_common.h" />
     <ClInclude Include="..\..\src\include\native2amiga.h" />
@@ -407,18 +405,13 @@
     <ClInclude Include="..\..\src\include\traps.h" />
     <ClInclude Include="..\..\src\include\uae.h" />
     <ClInclude Include="..\..\src\include\uaeresource.h" />
-    <ClInclude Include="..\..\src\include\uae\api.h" />
-    <ClInclude Include="..\..\src\include\uae\attributes.h" />
     <ClInclude Include="..\..\src\include\uae\caps.h" />
-    <ClInclude Include="..\..\src\include\uae\cdrom.h" />
     <ClInclude Include="..\..\src\include\uae\dlopen.h" />
-    <ClInclude Include="..\..\src\include\uae\io.h" />
     <ClInclude Include="..\..\src\include\uae\likely.h" />
     <ClInclude Include="..\..\src\include\uae\mman.h" />
     <ClInclude Include="..\..\src\include\uae\string.h" />
     <ClInclude Include="..\..\src\include\uae\types.h" />
     <ClInclude Include="..\..\src\include\uae\uae.h" />
-    <ClInclude Include="..\..\src\include\uae\vm.h" />
     <ClInclude Include="..\..\src\include\xwin.h" />
     <ClInclude Include="..\..\src\include\zarchive.h" />
     <ClInclude Include="..\..\src\include\zfile.h" />
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj.filters b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
index 2179ddcc..62f81fcb 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj.filters
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
@@ -609,15 +609,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\blit.h">
-      <Filter>Source files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\blitfunc.h">
-      <Filter>Source files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\cputbl.h">
-      <Filter>Source files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\threaddep\thread.h">
       <Filter>Source files\theaddep</Filter>
     </ClInclude>
@@ -756,9 +747,6 @@
     <ClInclude Include="..\..\src\include\gayle.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\genblitter.h">
-      <Filter>Source files\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\include\gensound.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
@@ -780,9 +768,6 @@
     <ClInclude Include="..\..\src\include\keybuf.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\mackbd.h">
-      <Filter>Source files\include</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\include\memory.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
@@ -843,15 +828,6 @@
     <ClInclude Include="..\..\src\include\zfile.h">
       <Filter>Source files\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\attributes.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\cdrom.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\io.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\include\uae\likely.h">
       <Filter>Source files\include\uae</Filter>
     </ClInclude>
@@ -864,9 +840,6 @@
     <ClInclude Include="..\..\src\include\uae\types.h">
       <Filter>Source files\include\uae</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\vm.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\jit\compemu.h">
       <Filter>Source files\jit</Filter>
     </ClInclude>
@@ -1008,14 +981,20 @@
     <ClInclude Include="..\..\src\include\uae\caps.h">
       <Filter>Source files\include\uae</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\include\uae\api.h">
-      <Filter>Source files\include\uae</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\caps\CapsAPI.h">
       <Filter>Source files\caps</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\caps\Comtype.h">
       <Filter>Source files\caps</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\include\blit.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\blitfunc.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\include\cputbl.h">
+      <Filter>Source files\include</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file