diff --git a/src/acomms/amac/mac_manager.h b/src/acomms/amac/mac_manager.h
index b75a3e5b..1b9d2b5c 100644
--- a/src/acomms/amac/mac_manager.h
+++ b/src/acomms/amac/mac_manager.h
@@ -26,7 +26,6 @@
 #define GOBY_ACOMMS_AMAC_MAC_MANAGER_H
 
 #include <boost/signals2/signal.hpp>      // for signal
-#include <boost/smart_ptr/shared_ptr.hpp> // for shared_ptr
 #include <chrono>                         // for seconds
 #include <iosfwd>                         // for ostream
 #include <list>                           // for list, list<>::ite...
diff --git a/src/acomms/dccl/dccl.cpp b/src/acomms/dccl/dccl.cpp
index 56490626..d5be0359 100644
--- a/src/acomms/dccl/dccl.cpp
+++ b/src/acomms/dccl/dccl.cpp
@@ -24,7 +24,6 @@
 
 #include "dccl.h"
 
-#include <boost/smart_ptr/shared_ptr.hpp> // for shared_ptr
 #include <dccl/codec.h>                   // for Codec
 
 #include "goby/util/debug_logger/term_color.h" // for Colors, Colors::lt_blue
diff --git a/src/acomms/modemdriver/driver_base.h b/src/acomms/modemdriver/driver_base.h
index 14975c77..be08d947 100644
--- a/src/acomms/modemdriver/driver_base.h
+++ b/src/acomms/modemdriver/driver_base.h
@@ -25,12 +25,11 @@
 #ifndef GOBY_ACOMMS_MODEMDRIVER_DRIVER_BASE_H
 #define GOBY_ACOMMS_MODEMDRIVER_DRIVER_BASE_H
 
-#include <atomic>                         // for atomic
-#include <boost/signals2/signal.hpp>      // for signal
-#include <boost/smart_ptr/shared_ptr.hpp> // for shared_ptr
-#include <iosfwd>                         // for ofstream
-#include <memory>                         // for shared_ptr, __shared_p...
-#include <string>                         // for string
+#include <atomic>                    // for atomic
+#include <boost/signals2/signal.hpp> // for signal
+#include <iosfwd>                    // for ofstream
+#include <memory>                    // for shared_ptr, __shared_p...
+#include <string>                    // for string
 
 #include "goby/acomms/protobuf/driver_base.pb.h" // for DriverCo...
 
diff --git a/src/acomms/queue/queue.h b/src/acomms/queue/queue.h
index 5c7cfb84..49579e7c 100644
--- a/src/acomms/queue/queue.h
+++ b/src/acomms/queue/queue.h
@@ -26,7 +26,7 @@
 #define GOBY_ACOMMS_QUEUE_QUEUE_H
 
 #include <cstddef> // for size_t
-#include <iostream> // for ostream
+#include <iosfwd>  // for ostream
 #include <list>     // for list
 #include <map>      // for multimap
 #include <memory>   // for shared_ptr
diff --git a/src/middleware/frontseat/interface.h b/src/middleware/frontseat/interface.h
index 3ddd80b5..e697c6b2 100644
--- a/src/middleware/frontseat/interface.h
+++ b/src/middleware/frontseat/interface.h
@@ -30,7 +30,6 @@
 #include <string> // for string
 
 #include <boost/signals2/signal.hpp>      // for signal
-#include <boost/smart_ptr/shared_ptr.hpp> // for shared_ptr
 
 #include "goby/middleware/protobuf/frontseat.pb.h"        // for InterfaceS...
 #include "goby/middleware/protobuf/frontseat_config.pb.h" // for Config
diff --git a/src/middleware/transport/intervehicle/driver_thread.h b/src/middleware/transport/intervehicle/driver_thread.h
index dd6badcd..ddf6e28a 100644
--- a/src/middleware/transport/intervehicle/driver_thread.h
+++ b/src/middleware/transport/intervehicle/driver_thread.h
@@ -24,8 +24,6 @@
 #ifndef GOBY_MIDDLEWARE_TRANSPORT_INTERVEHICLE_DRIVER_THREAD_H
 #define GOBY_MIDDLEWARE_TRANSPORT_INTERVEHICLE_DRIVER_THREAD_H
 
-#include <algorithm>
-#include <chrono>
 #include <cstddef>
 #include <map>
 #include <memory>
diff --git a/src/moos/goby_moos_app.h b/src/moos/goby_moos_app.h
index 419f401b..79137a2c 100644
--- a/src/moos/goby_moos_app.h
+++ b/src/moos/goby_moos_app.h
@@ -65,7 +65,6 @@
 #include <boost/program_options/variables_map.hpp>          // for variab...
 #include <boost/range/iterator_range_core.hpp>              // for iterat...
 #include <boost/signals2/signal.hpp>                        // for signal
-#include <boost/smart_ptr/shared_ptr.hpp>                   // for shared...
 #include <boost/units/quantity.hpp>                         // for operator/
 #include <boost/units/systems/si/time.hpp>                  // for seconds
 #include <google/protobuf/descriptor.h>                     // for FieldD...
diff --git a/src/zeromq/transport/interprocess.h b/src/zeromq/transport/interprocess.h
index 15b6000b..bf989d20 100644
--- a/src/zeromq/transport/interprocess.h
+++ b/src/zeromq/transport/interprocess.h
@@ -31,13 +31,11 @@
 #include <condition_variable> // for cond...
 #include <deque>              // for deque
 #include <functional>         // for func...
-#include <iosfwd>             // for size_t
 #include <memory>             // for shar...
 #include <mutex>              // for time...
 #include <set>                // for set
 #include <string>             // for string
 #include <thread>             // for get_id
-#include <tuple>              // for make...
 #include <unordered_map>      // for unor...
 #include <utility>            // for make...
 #include <vector>             // for vector