diff --git a/src/package.cpp b/src/package.cpp
index 2832749df..19a9092be 100644
--- a/src/package.cpp
+++ b/src/package.cpp
@@ -17,6 +17,8 @@
 
 #include "rogue/Directives.h"
 
+#include <cstdio>
+
 #include <boost/python.hpp>
 
 #include "rogue/Version.h"
diff --git a/src/rogue/GeneralError.cpp b/src/rogue/GeneralError.cpp
index aa349c417..e6e83aa78 100644
--- a/src/rogue/GeneralError.cpp
+++ b/src/rogue/GeneralError.cpp
@@ -20,6 +20,9 @@
 
 #include <stdarg.h>
 
+#include <cstdio>
+#include <string>
+
 #ifndef NO_PYTHON
     #include <boost/python.hpp>
 namespace bp = boost::python;
diff --git a/src/rogue/Logging.cpp b/src/rogue/Logging.cpp
index 658d23395..26b4dfd64 100644
--- a/src/rogue/Logging.cpp
+++ b/src/rogue/Logging.cpp
@@ -25,6 +25,9 @@
 #include <unistd.h>
 
 #include <memory>
+#include <vector>
+#include <string>
+#include <cstdio>
 
 #if defined(__linux__)
     #include <sys/syscall.h>
diff --git a/src/rogue/Version.cpp b/src/rogue/Version.cpp
index 92e07721d..0bcb18bce 100644
--- a/src/rogue/Version.cpp
+++ b/src/rogue/Version.cpp
@@ -24,6 +24,7 @@
 
 #include <sstream>
 #include <string>
+#include <cstdio>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/hardware/axi/AxiMemMap.cpp b/src/rogue/hardware/axi/AxiMemMap.cpp
index 2be33d6d2..ac6b98a10 100644
--- a/src/rogue/hardware/axi/AxiMemMap.cpp
+++ b/src/rogue/hardware/axi/AxiMemMap.cpp
@@ -29,6 +29,7 @@
 #include <cstring>
 #include <memory>
 #include <thread>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/hardware/axi/AxiStreamDma.cpp b/src/rogue/hardware/axi/AxiStreamDma.cpp
index 40111d6a7..20a85e04c 100644
--- a/src/rogue/hardware/axi/AxiStreamDma.cpp
+++ b/src/rogue/hardware/axi/AxiStreamDma.cpp
@@ -22,6 +22,9 @@
 #include <stdlib.h>
 
 #include <memory>
+#include <map>
+#include <cstdio>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/ZmqClient.cpp b/src/rogue/interfaces/ZmqClient.cpp
index cc37bf36e..274b5bda7 100644
--- a/src/rogue/interfaces/ZmqClient.cpp
+++ b/src/rogue/interfaces/ZmqClient.cpp
@@ -24,6 +24,7 @@
 
 #include <memory>
 #include <string>
+#include <cstdio>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/api/Bsp.cpp b/src/rogue/interfaces/api/Bsp.cpp
index b4b8d3066..0d87d4e3a 100644
--- a/src/rogue/interfaces/api/Bsp.cpp
+++ b/src/rogue/interfaces/api/Bsp.cpp
@@ -17,7 +17,9 @@
 #include "rogue/interfaces/api/Bsp.h"
 
 #include <boost/make_shared.hpp>
+
 #include <string>
+#include <memory>
 
 #include "rogue/GeneralError.h"
 
diff --git a/src/rogue/interfaces/memory/Block.cpp b/src/rogue/interfaces/memory/Block.cpp
index 563d5c923..2c7f323a4 100644
--- a/src/rogue/interfaces/memory/Block.cpp
+++ b/src/rogue/interfaces/memory/Block.cpp
@@ -28,6 +28,9 @@
 #include <iomanip>
 #include <memory>
 #include <sstream>
+#include <vector>
+#include <string>
+#include <cstdio>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/memory/Emulate.cpp b/src/rogue/interfaces/memory/Emulate.cpp
index 0cdce91d9..edc793c57 100644
--- a/src/rogue/interfaces/memory/Emulate.cpp
+++ b/src/rogue/interfaces/memory/Emulate.cpp
@@ -24,6 +24,8 @@
 #include <string.h>
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include "rogue/GilRelease.h"
 #include "rogue/interfaces/memory/Constants.h"
diff --git a/src/rogue/interfaces/memory/Hub.cpp b/src/rogue/interfaces/memory/Hub.cpp
index 742f15cc5..95c1958ef 100644
--- a/src/rogue/interfaces/memory/Hub.cpp
+++ b/src/rogue/interfaces/memory/Hub.cpp
@@ -24,6 +24,7 @@
 
 #include <cmath>
 #include <memory>
+#include <string>
 
 #include "rogue/GilRelease.h"
 #include "rogue/ScopedGil.h"
diff --git a/src/rogue/interfaces/memory/Master.cpp b/src/rogue/interfaces/memory/Master.cpp
index e4c9e84ac..71dd56843 100644
--- a/src/rogue/interfaces/memory/Master.cpp
+++ b/src/rogue/interfaces/memory/Master.cpp
@@ -23,6 +23,7 @@
 
 #include <cstring>
 #include <memory>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/memory/Slave.cpp b/src/rogue/interfaces/memory/Slave.cpp
index 709e7e709..80d4e8bf6 100644
--- a/src/rogue/interfaces/memory/Slave.cpp
+++ b/src/rogue/interfaces/memory/Slave.cpp
@@ -19,6 +19,7 @@
 #include "rogue/interfaces/memory/Slave.h"
 
 #include <memory>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/memory/TcpClient.cpp b/src/rogue/interfaces/memory/TcpClient.cpp
index 9d451024f..b227a82cd 100644
--- a/src/rogue/interfaces/memory/TcpClient.cpp
+++ b/src/rogue/interfaces/memory/TcpClient.cpp
@@ -24,6 +24,7 @@
 
 #include <cstring>
 #include <memory>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/memory/TcpServer.cpp b/src/rogue/interfaces/memory/TcpServer.cpp
index 77eb287a7..46ad41f47 100644
--- a/src/rogue/interfaces/memory/TcpServer.cpp
+++ b/src/rogue/interfaces/memory/TcpServer.cpp
@@ -24,6 +24,7 @@
 
 #include <cstring>
 #include <memory>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/memory/Transaction.cpp b/src/rogue/interfaces/memory/Transaction.cpp
index f5962d1b2..62f69d16e 100644
--- a/src/rogue/interfaces/memory/Transaction.cpp
+++ b/src/rogue/interfaces/memory/Transaction.cpp
@@ -23,6 +23,8 @@
 #include <sys/time.h>
 
 #include <memory>
+#include <string>
+#include <cstdio>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"