diff --git a/src/rogue/interfaces/memory/Variable.cpp b/src/rogue/interfaces/memory/Variable.cpp
index 3bb928625..b6be4d008 100644
--- a/src/rogue/interfaces/memory/Variable.cpp
+++ b/src/rogue/interfaces/memory/Variable.cpp
@@ -26,6 +26,9 @@
 #include <iostream>
 #include <memory>
 #include <sstream>
+#include <vector>
+#include <cstdio>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/stream/Buffer.cpp b/src/rogue/interfaces/stream/Buffer.cpp
index 8608f8202..169614a75 100644
--- a/src/rogue/interfaces/stream/Buffer.cpp
+++ b/src/rogue/interfaces/stream/Buffer.cpp
@@ -20,6 +20,7 @@
 #include <inttypes.h>
 
 #include <memory>
+#include <cstdio>
 
 #include "rogue/GeneralError.h"
 #include "rogue/interfaces/stream/Frame.h"
diff --git a/src/rogue/interfaces/stream/Frame.cpp b/src/rogue/interfaces/stream/Frame.cpp
index aeaa74fad..5c8315f3a 100644
--- a/src/rogue/interfaces/stream/Frame.cpp
+++ b/src/rogue/interfaces/stream/Frame.cpp
@@ -21,6 +21,7 @@
 #include <inttypes.h>
 
 #include <memory>
+#include <cstdio>
 
 #include "rogue/GeneralError.h"
 #include "rogue/interfaces/stream/Buffer.h"
diff --git a/src/rogue/interfaces/stream/Master.cpp b/src/rogue/interfaces/stream/Master.cpp
index 3fdb9927e..34bcff666 100644
--- a/src/rogue/interfaces/stream/Master.cpp
+++ b/src/rogue/interfaces/stream/Master.cpp
@@ -21,6 +21,7 @@
 #include <unistd.h>
 
 #include <memory>
+#include <vector>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/stream/RateDrop.cpp b/src/rogue/interfaces/stream/RateDrop.cpp
index 34773d223..77be40bf3 100644
--- a/src/rogue/interfaces/stream/RateDrop.cpp
+++ b/src/rogue/interfaces/stream/RateDrop.cpp
@@ -22,6 +22,7 @@
 #include <sys/time.h>
 
 #include <memory>
+#include <cstdio>
 
 #include "rogue/Logging.h"
 #include "rogue/interfaces/stream/Frame.h"
diff --git a/src/rogue/interfaces/stream/Slave.cpp b/src/rogue/interfaces/stream/Slave.cpp
index ccbba1fe6..dbd1d9971 100644
--- a/src/rogue/interfaces/stream/Slave.cpp
+++ b/src/rogue/interfaces/stream/Slave.cpp
@@ -26,6 +26,7 @@
 
 #include <memory>
 #include <string>
+#include <cstdio>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/stream/TcpClient.cpp b/src/rogue/interfaces/stream/TcpClient.cpp
index 0de7abde3..30f1388a9 100644
--- a/src/rogue/interfaces/stream/TcpClient.cpp
+++ b/src/rogue/interfaces/stream/TcpClient.cpp
@@ -21,6 +21,7 @@
 #include <zmq.h>
 
 #include <memory>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/stream/TcpCore.cpp b/src/rogue/interfaces/stream/TcpCore.cpp
index 9e15ef204..f363e95e6 100644
--- a/src/rogue/interfaces/stream/TcpCore.cpp
+++ b/src/rogue/interfaces/stream/TcpCore.cpp
@@ -23,6 +23,7 @@
 #include <zmq.h>
 
 #include <memory>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/interfaces/stream/TcpServer.cpp b/src/rogue/interfaces/stream/TcpServer.cpp
index b680b4dd8..693dbae6e 100644
--- a/src/rogue/interfaces/stream/TcpServer.cpp
+++ b/src/rogue/interfaces/stream/TcpServer.cpp
@@ -21,6 +21,7 @@
 #include <zmq.h>
 
 #include <memory>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/protocols/rssi/Controller.cpp b/src/rogue/protocols/rssi/Controller.cpp
index 7a8e73a1d..0230e3cd5 100644
--- a/src/rogue/protocols/rssi/Controller.cpp
+++ b/src/rogue/protocols/rssi/Controller.cpp
@@ -25,6 +25,8 @@
 
 #include <cmath>
 #include <memory>
+#include <map>
+#include <utility>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/protocols/rssi/Header.cpp b/src/rogue/protocols/rssi/Header.cpp
index 1958412b9..71c022ead 100644
--- a/src/rogue/protocols/rssi/Header.cpp
+++ b/src/rogue/protocols/rssi/Header.cpp
@@ -26,6 +26,7 @@
 #include <iostream>
 #include <memory>
 #include <sstream>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/protocols/udp/Client.cpp b/src/rogue/protocols/udp/Client.cpp
index f5a88c2a4..6fc700534 100644
--- a/src/rogue/protocols/udp/Client.cpp
+++ b/src/rogue/protocols/udp/Client.cpp
@@ -24,6 +24,7 @@
 #include <unistd.h>
 
 #include <memory>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/protocols/xilinx/JtagDriver.cpp b/src/rogue/protocols/xilinx/JtagDriver.cpp
index 28232cca3..733a9081d 100644
--- a/src/rogue/protocols/xilinx/JtagDriver.cpp
+++ b/src/rogue/protocols/xilinx/JtagDriver.cpp
@@ -27,6 +27,8 @@
 #include <sys/socket.h>
 
 #include <string>
+#include <memory>
+#include <cstdio>
 
 namespace rpx = rogue::protocols::xilinx;
 
diff --git a/src/rogue/protocols/xilinx/Xvc.cpp b/src/rogue/protocols/xilinx/Xvc.cpp
index b56545f59..3e6d1b7e5 100644
--- a/src/rogue/protocols/xilinx/Xvc.cpp
+++ b/src/rogue/protocols/xilinx/Xvc.cpp
@@ -24,6 +24,8 @@
 #include <unistd.h>
 
 #include <cstring>
+#include <memory>
+#include <algorithm>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/protocols/xilinx/XvcConnection.cpp b/src/rogue/protocols/xilinx/XvcConnection.cpp
index b69458794..b8735edcc 100644
--- a/src/rogue/protocols/xilinx/XvcConnection.cpp
+++ b/src/rogue/protocols/xilinx/XvcConnection.cpp
@@ -21,6 +21,8 @@
 #include <netinet/tcp.h>
 #include <sys/select.h>
 
+#include <cstdio>
+
 namespace rpx = rogue::protocols::xilinx;
 
 rpx::XvcConnection::XvcConnection(int sd, JtagDriver* drv, uint64_t maxVecLen)
diff --git a/src/rogue/utilities/Prbs.cpp b/src/rogue/utilities/Prbs.cpp
index 45dceffdd..8cbcb0e32 100644
--- a/src/rogue/utilities/Prbs.cpp
+++ b/src/rogue/utilities/Prbs.cpp
@@ -25,6 +25,7 @@
 #include <unistd.h>
 
 #include <memory>
+#include <cstdio>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/utilities/fileio/LegacyStreamReader.cpp b/src/rogue/utilities/fileio/LegacyStreamReader.cpp
index b2ed5ebff..7e348b8c6 100644
--- a/src/rogue/utilities/fileio/LegacyStreamReader.cpp
+++ b/src/rogue/utilities/fileio/LegacyStreamReader.cpp
@@ -27,6 +27,7 @@
 #include <iostream>
 #include <memory>
 #include <thread>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/utilities/fileio/StreamReader.cpp b/src/rogue/utilities/fileio/StreamReader.cpp
index 40e15c1c5..6f960c6db 100644
--- a/src/rogue/utilities/fileio/StreamReader.cpp
+++ b/src/rogue/utilities/fileio/StreamReader.cpp
@@ -25,6 +25,7 @@
 
 #include <memory>
 #include <thread>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
diff --git a/src/rogue/utilities/fileio/StreamWriter.cpp b/src/rogue/utilities/fileio/StreamWriter.cpp
index 230c27570..48cb25480 100644
--- a/src/rogue/utilities/fileio/StreamWriter.cpp
+++ b/src/rogue/utilities/fileio/StreamWriter.cpp
@@ -42,6 +42,8 @@
 #include <cstring>
 #include <memory>
 #include <thread>
+#include <map>
+#include <string>
 
 #include "rogue/GeneralError.h"
 #include "rogue/GilRelease.h"
@@ -298,7 +300,7 @@ void ruf::StreamWriter::intWrite(void* data, uint32_t size) {
     // Attempted write is larger than buffer, raw write
     // This is called if buffer is disabled
     if (size > buffSize_) {
-        if (write(fd_, data, size) != (int32_t)size) {
+        if (write(fd_, data, size) != static_cast<int32_t>(size)) {
             ::close(fd_);
             fd_ = -1;
             log_->error("Write failed, closing file!");
@@ -347,7 +349,7 @@ void ruf::StreamWriter::checkSize(uint32_t size) {
 //! Flush file
 void ruf::StreamWriter::flush() {
     if (currBuffer_ > 0) {
-        if (write(fd_, buffer_, currBuffer_) != (int32_t)currBuffer_) {
+        if (write(fd_, buffer_, currBuffer_) != static_cast<int32_t>(currBuffer_)) {
             ::close(fd_);
             fd_ = -1;
             log_->error("Write failed, closing file!");
diff --git a/tests/api_test/src/api_test.cpp b/tests/api_test/src/api_test.cpp
index 2f1fb9f70..9e8f166d3 100644
--- a/tests/api_test/src/api_test.cpp
+++ b/tests/api_test/src/api_test.cpp
@@ -11,6 +11,9 @@
 
 #include "rogue/interfaces/api/Bsp.h"
 
+#include <string>
+#include <cstdio>
+
 void varListener(std::string path, std::string value) {
     printf("Var Listener: %s = %s\n", path.c_str(), value.c_str());
 }