9 files changed, 10 insertions, 0 deletions
diff --git a/usrp/host/lib/inband/qa_inband_packet_prims.cc b/usrp/host/lib/inband/qa_inband_packet_prims.cc
index 868a1e064..d9bbbec22 100644
--- a/usrp/host/lib/inband/qa_inband_packet_prims.cc
+++ b/usrp/host/lib/inband/qa_inband_packet_prims.cc
@@ -26,6 +26,7 @@
 #include <qa_inband_packet_prims.h>
 #include <cppunit/TestAssert.h>
 #include <stdio.h>
+#include <string.h>
 #include <usrp_inband_usb_packet.h>             // will change on gigabit crossover
 
 typedef usrp_inband_usb_packet transport_pkt;
diff --git a/usrp/host/lib/inband/test_usrp_inband.cc b/usrp/host/lib/inband/test_usrp_inband.cc
index dd8d46f84..64fbf3a97 100644
--- a/usrp/host/lib/inband/test_usrp_inband.cc
+++ b/usrp/host/lib/inband/test_usrp_inband.cc
@@ -24,6 +24,7 @@
 #endif
 
 #include <stdio.h>
+#include <string.h>
 #include <iostream>
 #include <usrp_inband_usb_packet.h>
 #include <mb_mblock.h>
diff --git a/usrp/host/lib/inband/usrp_inband_usb_packet.cc b/usrp/host/lib/inband/usrp_inband_usb_packet.cc
index b8befa493..ee4cb22f3 100644
--- a/usrp/host/lib/inband/usrp_inband_usb_packet.cc
+++ b/usrp/host/lib/inband/usrp_inband_usb_packet.cc
@@ -28,6 +28,7 @@
 #include <usrp_bytesex.h>
 #include <iostream>
 #include <stdio.h>
+#include <string.h>
 
 bool usrp_inband_usb_packet::align32()
 {
diff --git a/usrp/host/lib/inband/usrp_rx_stub.cc b/usrp/host/lib/inband/usrp_rx_stub.cc
index 5ea8135aa..4bdb106b1 100644
--- a/usrp/host/lib/inband/usrp_rx_stub.cc
+++ b/usrp/host/lib/inband/usrp_rx_stub.cc
@@ -33,6 +33,7 @@
 #include <fpga_regs_common.h>
 #include "usrp_standard.h"
 #include <stdio.h>
+#include <string.h>
 #include <ui_nco.h>
 #include <fstream>
 
diff --git a/usrp/host/lib/inband/usrp_server.cc b/usrp/host/lib/inband/usrp_server.cc
index d73c7d525..1948a43b2 100644
--- a/usrp/host/lib/inband/usrp_server.cc
+++ b/usrp/host/lib/inband/usrp_server.cc
@@ -28,6 +28,7 @@
 #include <mb_class_registry.h>
 #include <vector>
 #include <usrp_usb_interface.h>
+#include <string.h>
 
 #include <symbols_usrp_server_cs.h>
 #include <symbols_usrp_channel.h>
@@ -35,6 +36,7 @@
 #include <symbols_usrp_rx.h>
 #include <symbols_usrp_low_level_cs.h>
 #include <symbols_usrp_interface_cs.h>
+
 static pmt_t s_shutdown = pmt_intern("%shutdown");
 
 typedef usrp_inband_usb_packet transport_pkt;   // makes conversion to gigabit easy
diff --git a/usrp/host/lib/legacy/fusb_win32.cc b/usrp/host/lib/legacy/fusb_win32.cc
index eee373272..8900576d9 100644
--- a/usrp/host/lib/legacy/fusb_win32.cc
+++ b/usrp/host/lib/legacy/fusb_win32.cc
@@ -28,6 +28,7 @@
 #include <usb.h>
 #include <assert.h>
 #include <stdexcept>
+#include <string.h>
 
 static const int MAX_BLOCK_SIZE = fusb_sysconfig::max_block_size();
 static const int DEFAULT_BLOCK_SIZE = MAX_BLOCK_SIZE;
diff --git a/usrp/host/lib/legacy/usrp_basic.cc b/usrp/host/lib/legacy/usrp_basic.cc
index 8bb4a191e..f67300306 100644
--- a/usrp/host/lib/legacy/usrp_basic.cc
+++ b/usrp/host/lib/legacy/usrp_basic.cc
@@ -34,6 +34,7 @@
 #include <assert.h>
 #include <math.h>
 #include <ad9862.h>
+#include <string.h>
 
 using namespace ad9862;
 
diff --git a/usrp/host/lib/legacy/usrp_local_sighandler.cc b/usrp/host/lib/legacy/usrp_local_sighandler.cc
index b87a7656b..69cde0b37 100644
--- a/usrp/host/lib/legacy/usrp_local_sighandler.cc
+++ b/usrp/host/lib/legacy/usrp_local_sighandler.cc
@@ -32,6 +32,7 @@
 #include <usrp_local_sighandler.h>
 #include <stdexcept>
 #include <stdio.h>
+#include <string.h>
 
 usrp_local_sighandler::usrp_local_sighandler (int signum,
 					      void (*new_handler)(int))
diff --git a/usrp/host/lib/legacy/usrp_prims.cc b/usrp/host/lib/legacy/usrp_prims.cc
index 8fe87a723..0034bb31e 100644
--- a/usrp/host/lib/legacy/usrp_prims.cc
+++ b/usrp/host/lib/legacy/usrp_prims.cc
@@ -62,6 +62,7 @@ static char *default_firmware_filename = "std.ihx";
 static char *default_fpga_filename     = "std_2rxhb_2tx.rbf";
 
 #include "std_paths.h"
+#include <stdio.h>
 
 static char *
 find_file (const char *filename, int hw_rev)