diff --git a/renderdoc/os/posix/ggp/ggp_callstack.cpp b/renderdoc/os/posix/ggp/ggp_callstack.cpp
index 4b070f083..0379f3458 100644
--- a/renderdoc/os/posix/ggp/ggp_callstack.cpp
+++ b/renderdoc/os/posix/ggp/ggp_callstack.cpp
@@ -151,7 +151,7 @@ struct LookupModule
 class GgpResolver : public Callstack::StackResolver
 {
 public:
-  GgpResolver(vector<LookupModule> modules) { m_Modules = modules; }
+  GgpResolver(std::vector<LookupModule> modules) { m_Modules = modules; }
   Callstack::AddressDetails GetAddr(uint64_t addr)
   {
     EnsureCached(addr);
@@ -178,7 +178,8 @@ private:
       if(addr >= m_Modules[i].base && addr < m_Modules[i].end)
       {
         uint64_t relative = addr - m_Modules[i].base + m_Modules[i].offset;
-        string cmd = StringFormat::Fmt("addr2line -fCe \"%s\" 0x%llx", m_Modules[i].path, relative);
+        std::string cmd =
+            StringFormat::Fmt("addr2line -fCe \"%s\" 0x%llx", m_Modules[i].path, relative);
 
         FILE *f = ::popen(cmd.c_str(), "r");
 
@@ -246,7 +247,7 @@ StackResolver *MakeResolver(byte *moduleDB, size_t DBSize, RENDERDOC_ProgressCal
   char *search = start;
   char *dbend = (char *)(moduleDB + DBSize);
 
-  vector<LookupModule> modules;
+  std::vector<LookupModule> modules;
 
   while(search && search < dbend)
   {
diff --git a/renderdoc/os/posix/ggp/ggp_process.cpp b/renderdoc/os/posix/ggp/ggp_process.cpp
index 2a36d3574..6894deda5 100644
--- a/renderdoc/os/posix/ggp/ggp_process.cpp
+++ b/renderdoc/os/posix/ggp/ggp_process.cpp
@@ -41,14 +41,14 @@ char **GetCurrentEnvironment()
 std::vector<int> getSockets(pid_t childPid)
 {
   std::vector<int> sockets;
-  string dirPath = StringFormat::Fmt("/proc/%d/fd", (int)childPid);
+  std::string dirPath = StringFormat::Fmt("/proc/%d/fd", (int)childPid);
   std::vector<PathEntry> files = FileIO::GetFilesInDirectory(dirPath.c_str());
   if(files.empty())
     return sockets;
 
   for(const PathEntry &file : files)
   {
-    string target = StringFormat::Fmt("%s/%s", dirPath.c_str(), file.filename.c_str());
+    std::string target = StringFormat::Fmt("%s/%s", dirPath.c_str(), file.filename.c_str());
     char linkname[1024];
     ssize_t length = readlink(target.c_str(), linkname, 1023);
     if(length == -1)
@@ -67,7 +67,7 @@ int GetIdentPort(pid_t childPid)
 {
   int ret = 0;
 
-  string procfile = StringFormat::Fmt("/proc/%d/net/tcp", (int)childPid);
+  std::string procfile = StringFormat::Fmt("/proc/%d/net/tcp", (int)childPid);
 
   int waitTime = INITIAL_WAIT_TIME;
 
diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj
index 6a1668ec2..096da9eb6 100644
--- a/renderdoc/renderdoc.vcxproj
+++ b/renderdoc/renderdoc.vcxproj
@@ -463,6 +463,24 @@
     <ClCompile Include="os\posix\apple\apple_threading.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_callstack.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_hook.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_network.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_process.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_stringio.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_threading.cpp">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="os\posix\linux\linux_callstack.cpp">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
diff --git a/renderdoc/renderdoc.vcxproj.filters b/renderdoc/renderdoc.vcxproj.filters
index 06c904a93..434ced1b7 100644
--- a/renderdoc/renderdoc.vcxproj.filters
+++ b/renderdoc/renderdoc.vcxproj.filters
@@ -136,6 +136,9 @@
     <Filter Include="Common\Serialise\Codecs\cpp_codec\vulkan">
       <UniqueIdentifier>{ee6a7f7e-becf-43f0-8c7f-e0109a364ebb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="OS\Posix\GGP">
+      <UniqueIdentifier>{b76c42f4-d523-4417-a474-56d278d35a36}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="maths\camera.h">
@@ -836,6 +839,24 @@
     <ClCompile Include="core\intervals_tests.cpp">
       <Filter>Core</Filter>
     </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_callstack.cpp">
+      <Filter>OS\Posix\GGP</Filter>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_hook.cpp">
+      <Filter>OS\Posix\GGP</Filter>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_network.cpp">
+      <Filter>OS\Posix\GGP</Filter>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_process.cpp">
+      <Filter>OS\Posix\GGP</Filter>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_stringio.cpp">
+      <Filter>OS\Posix\GGP</Filter>
+    </ClCompile>
+    <ClCompile Include="os\posix\ggp\ggp_threading.cpp">
+      <Filter>OS\Posix\GGP</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="os\win32\comexport.def">