diff --git a/src/apps/zeromq/acomms/ip_gateway/ip_gateway.cpp b/src/apps/zeromq/acomms/ip_gateway/ip_gateway.cpp
index d09643959..1f4c7145e 100644
--- a/src/apps/zeromq/acomms/ip_gateway/ip_gateway.cpp
+++ b/src/apps/zeromq/acomms/ip_gateway/ip_gateway.cpp
@@ -42,6 +42,7 @@
 #include "goby/acomms/ip_codecs.h"
 #include "goby/acomms/protobuf/modem_message.pb.h"
 #include "goby/middleware/acomms/groups.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/dccl_compat.h"
 #include "goby/zeromq/application/single_thread.h"
diff --git a/src/middleware/transport/identifier.cpp b/src/middleware/transport/identifier.cpp
index 1c97bf655..51c63bb91 100644
--- a/src/middleware/transport/identifier.cpp
+++ b/src/middleware/transport/identifier.cpp
@@ -1,3 +1,7 @@
+#include <algorithm>
+#include <string>
+#include <vector>
+
 #include "identifier.h"
 
 const char goby::middleware::InterProcessIdentifierManager::delimiter{'/'};
diff --git a/src/middleware/transport/identifier.h b/src/middleware/transport/identifier.h
index 3e4d49eca..375016353 100644
--- a/src/middleware/transport/identifier.h
+++ b/src/middleware/transport/identifier.h
@@ -2,12 +2,10 @@
 #ifndef GOBY_MIDDLEWARE_TRANSPORT_IDENTIFIER_H
 #define GOBY_MIDDLEWARE_TRANSPORT_IDENTIFIER_H
 
-#include <algorithm>
 #include <string>
 #include <thread>
 #include <unistd.h> // for getpid
 #include <unordered_map>
-#include <vector>
 
 #include "goby/middleware/group.h"
 #include "goby/middleware/marshalling/interface.h"            // for Seri...
diff --git a/src/middleware/transport/interprocess.h b/src/middleware/transport/interprocess.h
index ca4acbae8..7ae72120f 100644
--- a/src/middleware/transport/interprocess.h
+++ b/src/middleware/transport/interprocess.h
@@ -27,7 +27,6 @@
 
 #include <atomic>
 #include <functional>
-#include <sys/types.h>
 #include <thread>
 #include <tuple>
 #include <unistd.h>
diff --git a/src/middleware/transport/serialization_handlers.h b/src/middleware/transport/serialization_handlers.h
index a0ead0463..7deebb828 100644
--- a/src/middleware/transport/serialization_handlers.h
+++ b/src/middleware/transport/serialization_handlers.h
@@ -25,14 +25,14 @@
 #ifndef GOBY_MIDDLEWARE_TRANSPORT_SERIALIZATION_HANDLERS_H
 #define GOBY_MIDDLEWARE_TRANSPORT_SERIALIZATION_HANDLERS_H
 
-#include <chrono>
+#include <functional>
 #include <memory>
 #include <regex>
+#include <set>
 #include <thread>
-#include <unordered_map>
+#include <vector>
 
 #include "goby/exception.h"
-#include "goby/util/binary.h"
 
 #include "goby/middleware/common.h"
 #include "goby/middleware/protobuf/intermodule.pb.h"
diff --git a/src/test/acomms/ipcodecs/test.cpp b/src/test/acomms/ipcodecs/test.cpp
index d8e0f73fb..eab94f362 100644
--- a/src/test/acomms/ipcodecs/test.cpp
+++ b/src/test/acomms/ipcodecs/test.cpp
@@ -26,6 +26,7 @@
 #include <netinet/in.h>
 
 #include "goby/acomms/ip_codecs.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/dccl_compat.h"
 #include "goby/util/debug_logger.h"
diff --git a/src/test/acomms/queue1/test.cpp b/src/test/acomms/queue1/test.cpp
index 03ad00482..713e6bf5c 100644
--- a/src/test/acomms/queue1/test.cpp
+++ b/src/test/acomms/queue1/test.cpp
@@ -27,6 +27,7 @@
 #include "goby/acomms/connect.h"
 #include "goby/acomms/protobuf/modem_message.pb.h"
 #include "goby/acomms/queue.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/debug_logger.h"
 #include "goby/util/protobuf/io.h"
diff --git a/src/test/acomms/queue2/test.cpp b/src/test/acomms/queue2/test.cpp
index d09c66c0a..f644855b5 100644
--- a/src/test/acomms/queue2/test.cpp
+++ b/src/test/acomms/queue2/test.cpp
@@ -27,6 +27,7 @@
 #include "goby/acomms/dccl.h"
 #include "goby/acomms/protobuf/modem_message.pb.h"
 #include "goby/acomms/queue.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/debug_logger.h"
 #include "goby/util/protobuf/io.h"
diff --git a/src/test/acomms/queue3/test.cpp b/src/test/acomms/queue3/test.cpp
index 33dfdbb01..4d78bee69 100644
--- a/src/test/acomms/queue3/test.cpp
+++ b/src/test/acomms/queue3/test.cpp
@@ -28,6 +28,7 @@
 #include "goby/acomms/dccl.h"
 #include "goby/acomms/protobuf/modem_message.pb.h"
 #include "goby/acomms/queue.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/debug_logger.h"
 #include "goby/util/protobuf/io.h"
diff --git a/src/test/acomms/queue4/test.cpp b/src/test/acomms/queue4/test.cpp
index b10aa84cc..3ee5aa0b9 100644
--- a/src/test/acomms/queue4/test.cpp
+++ b/src/test/acomms/queue4/test.cpp
@@ -27,6 +27,7 @@
 #include "goby/acomms/dccl.h"
 #include "goby/acomms/protobuf/modem_message.pb.h"
 #include "goby/acomms/queue.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/debug_logger.h"
 #include "goby/util/protobuf/io.h"
diff --git a/src/test/acomms/queue5/test.cpp b/src/test/acomms/queue5/test.cpp
index 131f25bbe..2546c9949 100644
--- a/src/test/acomms/queue5/test.cpp
+++ b/src/test/acomms/queue5/test.cpp
@@ -27,6 +27,7 @@
 #include "goby/acomms/connect.h"
 #include "goby/acomms/protobuf/modem_message.pb.h"
 #include "goby/acomms/queue.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/debug_logger.h"
 #include "goby/util/protobuf/io.h"
diff --git a/src/test/acomms/queue6/test.cpp b/src/test/acomms/queue6/test.cpp
index 432d76ae5..4d18330de 100644
--- a/src/test/acomms/queue6/test.cpp
+++ b/src/test/acomms/queue6/test.cpp
@@ -26,6 +26,7 @@
 #include "goby/acomms/connect.h"
 #include "goby/acomms/protobuf/modem_message.pb.h"
 #include "goby/acomms/queue.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/debug_logger.h"
 #include "goby/util/protobuf/io.h"
diff --git a/src/test/acomms/route1/test.cpp b/src/test/acomms/route1/test.cpp
index f8db4b265..4f0273089 100644
--- a/src/test/acomms/route1/test.cpp
+++ b/src/test/acomms/route1/test.cpp
@@ -43,6 +43,7 @@
 #include "goby/test/acomms/route1/test.pb.h"
 #include "goby/time.h"
 #include "goby/util/as.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/debug_logger.h"
 #include <cstdlib>
diff --git a/src/test/acomms/udpdriver2/test.cpp b/src/test/acomms/udpdriver2/test.cpp
index 600661e96..4fb8031c3 100644
--- a/src/test/acomms/udpdriver2/test.cpp
+++ b/src/test/acomms/udpdriver2/test.cpp
@@ -29,6 +29,7 @@
 #include "goby/acomms/protobuf/modem_message.pb.h"
 #include "goby/acomms/protobuf/udp_driver.pb.h"
 #include "goby/util/as.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/debug_logger.h"
 #include "goby/util/protobuf/io.h"
diff --git a/src/test/acomms/udpdriver3/test.cpp b/src/test/acomms/udpdriver3/test.cpp
index dd2260bef..70502ac5e 100644
--- a/src/test/acomms/udpdriver3/test.cpp
+++ b/src/test/acomms/udpdriver3/test.cpp
@@ -30,6 +30,7 @@
 #include "goby/acomms/modemdriver/udp_driver.h"
 #include "goby/acomms/protobuf/udp_driver.pb.h"
 #include "goby/acomms/queue.h"
+#include <iostream>
 #include "goby/util/binary.h"
 #include "goby/util/debug_logger.h"
 #include "goby/util/protobuf/io.h"
diff --git a/src/test/middleware/hdf5/test-plugin.cpp b/src/test/middleware/hdf5/test-plugin.cpp
index 1457938d3..caae4af2f 100644
--- a/src/test/middleware/hdf5/test-plugin.cpp
+++ b/src/test/middleware/hdf5/test-plugin.cpp
@@ -25,6 +25,7 @@
 #include "goby/middleware/log/hdf5/hdf5_plugin.h"
 
 #include "goby/time.h"
+#include <iostream>
 #include "goby/util/binary.h"
 
 #include "goby/test/acomms/dccl1/test.pb.h"
diff --git a/src/test/middleware/mavlink/mavlink.cpp b/src/test/middleware/mavlink/mavlink.cpp
index 3a3d0abc7..ba5507f51 100644
--- a/src/test/middleware/mavlink/mavlink.cpp
+++ b/src/test/middleware/mavlink/mavlink.cpp
@@ -25,6 +25,7 @@
 #include <boost/test/included/unit_test.hpp>
 
 #include "goby/middleware/marshalling/mavlink.h"
+#include <iostream>
 #include "goby/util/binary.h"
 
 using goby::middleware::SerializerParserHelper;
diff --git a/src/test/util/nmea/nmea.cpp b/src/test/util/nmea/nmea.cpp
index b30f40e45..b680c60d0 100644
--- a/src/test/util/nmea/nmea.cpp
+++ b/src/test/util/nmea/nmea.cpp
@@ -25,6 +25,9 @@
 #define BOOST_TEST_MODULE nmea_test
 #include <boost/test/included/unit_test.hpp>
 
+#include <cmath>
+#include <iostream>
+
 #include "goby/util/binary.h"
 #include "goby/util/linebasedcomms.h"
 
diff --git a/src/util/binary.h b/src/util/binary.h
index 59b49a8a8..236741aba 100644
--- a/src/util/binary.h
+++ b/src/util/binary.h
@@ -25,13 +25,9 @@
 #ifndef GOBY_UTIL_BINARY_H
 #define GOBY_UTIL_BINARY_H
 
-#include <cmath>
 #include <iomanip>
-#include <iostream>
 #include <sstream>
-
-#include <bitset>
-#include <boost/dynamic_bitset.hpp>
+#include <string>
 
 namespace goby
 {