diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj
index 488e254c..3a3fabf0 100644
--- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj
+++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj
@@ -130,7 +130,7 @@
     <ClCompile Include="..\..\src\blkdev_cdimage.cpp" />
     <ClCompile Include="..\..\src\bsdsocket.cpp" />
     <ClCompile Include="..\..\src\calc.cpp" />
-    <ClCompile Include="..\..\src\caps\caps_win32.cpp" />
+    <ClCompile Include="..\..\src\caps\caps_amiberry.cpp" />
     <ClCompile Include="..\..\src\cd32_fmv.cpp" />
     <ClCompile Include="..\..\src\cd32_fmv_genlock.cpp" />
     <ClCompile Include="..\..\src\cdrom.cpp" />
diff --git a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj.filters b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj.filters
index b171f2c4..277461f5 100644
--- a/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj.filters
+++ b/VisualGDB/Amiberry-RPI1/Amiberry-RPI1.vcxproj.filters
@@ -434,9 +434,6 @@
     <ClCompile Include="..\..\src\archivers\zip\unzip.cpp">
       <Filter>Source files\archivers\zip</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\caps\caps_win32.cpp">
-      <Filter>Source files\caps</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\machdep\support.cpp">
       <Filter>Source files\machdep</Filter>
     </ClCompile>
@@ -605,6 +602,9 @@
     <ClCompile Include="..\..\src\osdep\amiberry_whdbooter.cpp">
       <Filter>Source files\osdep</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\caps\caps_amiberry.cpp">
+      <Filter>Source files\caps</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\archivers\7z\7z.h">
diff --git a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
index 2b80eae7..1cc200c6 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
@@ -7,7 +7,7 @@
       <PathStyle>Unknown</PathStyle>
     </CustomSourceDirectories>
     <DeploymentHost>
-      <HostName>192.168.1.173</HostName>
+      <HostName>192.168.1.142</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
@@ -55,6 +55,7 @@
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
     <RemoteBuildEnvironment>
       <Records />
+      <EnvironmentSetupFiles />
     </RemoteBuildEnvironment>
     <ParallelJobCount>1</ParallelJobCount>
     <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index 87a19390..57408c9d 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -188,7 +188,7 @@
     <ClCompile Include="..\..\src\blkdev_cdimage.cpp" />
     <ClCompile Include="..\..\src\bsdsocket.cpp" />
     <ClCompile Include="..\..\src\calc.cpp" />
-    <ClCompile Include="..\..\src\caps\caps_win32.cpp" />
+    <ClCompile Include="..\..\src\caps\caps_amiberry.cpp" />
     <ClCompile Include="..\..\src\cd32_fmv.cpp" />
     <ClCompile Include="..\..\src\cd32_fmv_genlock.cpp" />
     <ClCompile Include="..\..\src\cdrom.cpp" />
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj.filters b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
index 8b3b8b41..b2dcec9f 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj.filters
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj.filters
@@ -595,12 +595,12 @@
     <ClCompile Include="..\..\src\dlopen.cpp">
       <Filter>Source files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\caps\caps_win32.cpp">
-      <Filter>Source files\caps</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\osdep\amiberry_whdbooter.cpp">
       <Filter>Source files\osdep</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\caps\caps_amiberry.cpp">
+      <Filter>Source files\caps</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\threaddep\thread.h">