diff --git a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp
index 57d8f376c..25371867d 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_sdbg.cpp
@@ -25,6 +25,7 @@
 
 #include "dxbc_container.h"
 
+#include "os/os_specific.h"
 #include "dxbc_sdbg.h"
 
 namespace DXBC
diff --git a/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp b/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp
index b065ea193..b133e345a 100644
--- a/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp
+++ b/renderdoc/driver/shaders/dxbc/dxbc_spdb.cpp
@@ -28,6 +28,7 @@
 #include "dxbc_container.h"
 
 #include "official/cvinfo.h"
+#include "os/os_specific.h"
 #include "dxbc_spdb.h"
 
 // uncomment the following to print (very verbose) debugging prints for SPDB processing
diff --git a/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp b/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp
index 7f9e2cacb..a4b94cc2d 100644
--- a/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp
+++ b/renderdoc/driver/shaders/dxil/dxil_bytecode.cpp
@@ -28,6 +28,7 @@
 #include <string>
 #include "common/common.h"
 #include "common/formatting.h"
+#include "os/os_specific.h"
 #include "llvm_decoder.h"
 
 // undef some annoying defines that might come from OS headers
diff --git a/renderdoc/driver/shaders/dxil/llvm_decoder.cpp b/renderdoc/driver/shaders/dxil/llvm_decoder.cpp
index 94a00248e..eb98e24b7 100644
--- a/renderdoc/driver/shaders/dxil/llvm_decoder.cpp
+++ b/renderdoc/driver/shaders/dxil/llvm_decoder.cpp
@@ -23,6 +23,7 @@
  ******************************************************************************/
 
 #include "llvm_decoder.h"
+#include "os/os_specific.h"
 
 namespace LLVMBC
 {
diff --git a/renderdoc/maths/formatpacking.cpp b/renderdoc/maths/formatpacking.cpp
index 8a4090483..48895a4a8 100644
--- a/renderdoc/maths/formatpacking.cpp
+++ b/renderdoc/maths/formatpacking.cpp
@@ -28,6 +28,7 @@
 #include "api/replay/data_types.h"
 #include "api/replay/rdcpair.h"
 #include "common/common.h"
+#include "os/os_specific.h"
 
 //	for(int i=0; i < 256; i++)
 //	{
diff --git a/renderdoc/os/win32/win32_network.cpp b/renderdoc/os/win32/win32_network.cpp
index 1d8f091a1..e67a7a921 100644
--- a/renderdoc/os/win32/win32_network.cpp
+++ b/renderdoc/os/win32/win32_network.cpp
@@ -25,6 +25,7 @@
 
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#include "api/replay/stringise.h"
 #include "common/common.h"
 #include "common/formatting.h"
 #include "os/os_specific.h"