diff --git a/external/utilities b/external/utilities
index 403ecdfff..2c2658257 160000
--- a/external/utilities
+++ b/external/utilities
@@ -1 +1 @@
-Subproject commit 403ecdfffa89da88bde4d9d83d51da82af94199f
+Subproject commit 2c26582577de9c9101f7e7c1bda3d7cc90344fb3
diff --git a/python/mrc/_pymrc/include/pymrc/asyncio_runnable.hpp b/python/mrc/_pymrc/include/pymrc/asyncio_runnable.hpp
index 2517acdd8..36dad7208 100644
--- a/python/mrc/_pymrc/include/pymrc/asyncio_runnable.hpp
+++ b/python/mrc/_pymrc/include/pymrc/asyncio_runnable.hpp
@@ -212,7 +212,7 @@ class AsyncioRunnable : public AsyncSink<InputT>,
     /**
      * @brief A semaphore used to control the number of outstanding operations. Acquire one before
      * beginning a task, and release it when finished.
-    */
+     */
     std::counting_semaphore<8> m_task_tickets{8};
 };
 
diff --git a/python/mrc/_pymrc/include/pymrc/utilities/function_wrappers.hpp b/python/mrc/_pymrc/include/pymrc/utilities/function_wrappers.hpp
index f6f5c3c30..83e243d63 100644
--- a/python/mrc/_pymrc/include/pymrc/utilities/function_wrappers.hpp
+++ b/python/mrc/_pymrc/include/pymrc/utilities/function_wrappers.hpp
@@ -27,7 +27,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 
-#include <array>
 #include <exception>
 #include <functional>
 #include <sstream>
diff --git a/python/mrc/_pymrc/src/executor.cpp b/python/mrc/_pymrc/src/executor.cpp
index a62e2c1e7..8e1ad5c67 100644
--- a/python/mrc/_pymrc/src/executor.cpp
+++ b/python/mrc/_pymrc/src/executor.cpp
@@ -25,7 +25,6 @@
 #include "mrc/types.hpp"
 
 #include <boost/fiber/future/async.hpp>
-#include <boost/fiber/future/future.hpp>
 #include <boost/fiber/future/future_status.hpp>
 #include <glog/logging.h>
 #include <pybind11/cast.h>
diff --git a/python/mrc/_pymrc/src/module_registry.cpp b/python/mrc/_pymrc/src/module_registry.cpp
index 424eb2b68..bedcf7ebf 100644
--- a/python/mrc/_pymrc/src/module_registry.cpp
+++ b/python/mrc/_pymrc/src/module_registry.cpp
@@ -28,7 +28,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 
-#include <array>
 #include <memory>
 #include <ostream>
 #include <utility>
diff --git a/python/mrc/_pymrc/src/module_wrappers/pickle.cpp b/python/mrc/_pymrc/src/module_wrappers/pickle.cpp
index fd6e99290..378fa83e2 100644
--- a/python/mrc/_pymrc/src/module_wrappers/pickle.cpp
+++ b/python/mrc/_pymrc/src/module_wrappers/pickle.cpp
@@ -24,7 +24,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 
-#include <array>
 #include <memory>
 #include <ostream>
 
diff --git a/python/mrc/_pymrc/src/module_wrappers/shared_memory.cpp b/python/mrc/_pymrc/src/module_wrappers/shared_memory.cpp
index 9a4106f76..944487e2d 100644
--- a/python/mrc/_pymrc/src/module_wrappers/shared_memory.cpp
+++ b/python/mrc/_pymrc/src/module_wrappers/shared_memory.cpp
@@ -20,10 +20,8 @@
 #include "pymrc/utilities/object_cache.hpp"
 
 #include <pybind11/cast.h>
-#include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 
-#include <array>
 #include <cstddef>
 #include <stdexcept>
 #include <string>
diff --git a/python/mrc/_pymrc/src/segment.cpp b/python/mrc/_pymrc/src/segment.cpp
index 4e60e63e4..f5b931cf0 100644
--- a/python/mrc/_pymrc/src/segment.cpp
+++ b/python/mrc/_pymrc/src/segment.cpp
@@ -28,12 +28,9 @@
 #include "mrc/channel/status.hpp"
 #include "mrc/edge/edge_builder.hpp"
 #include "mrc/node/port_registry.hpp"
-#include "mrc/node/rx_sink_base.hpp"
-#include "mrc/node/rx_source_base.hpp"
 #include "mrc/runnable/context.hpp"
 #include "mrc/segment/builder.hpp"
 #include "mrc/segment/object.hpp"
-#include "mrc/types.hpp"
 
 #include <glog/logging.h>
 #include <pybind11/cast.h>
@@ -44,7 +41,6 @@
 #include <exception>
 #include <fstream>
 #include <functional>
-#include <future>
 #include <iterator>
 #include <map>
 #include <stdexcept>
@@ -52,7 +48,6 @@
 #include <type_traits>
 #include <typeindex>
 #include <utility>
-#include <vector>
 
 // IWYU thinks we need array for py::print
 // IWYU pragma: no_include <array>
diff --git a/python/mrc/_pymrc/src/subscriber.cpp b/python/mrc/_pymrc/src/subscriber.cpp
index 3fc064f8e..c00aaa187 100644
--- a/python/mrc/_pymrc/src/subscriber.cpp
+++ b/python/mrc/_pymrc/src/subscriber.cpp
@@ -28,7 +28,6 @@
 #include <pybind11/pytypes.h>
 #include <rxcpp/rx.hpp>
 
-#include <array>
 #include <exception>
 #include <functional>
 #include <stdexcept>
diff --git a/python/mrc/_pymrc/src/utilities/object_cache.cpp b/python/mrc/_pymrc/src/utilities/object_cache.cpp
index 604a21200..574afc2a2 100644
--- a/python/mrc/_pymrc/src/utilities/object_cache.cpp
+++ b/python/mrc/_pymrc/src/utilities/object_cache.cpp
@@ -24,7 +24,6 @@
 #include <pybind11/pytypes.h>
 #include <pylifecycle.h>
 
-#include <array>
 #include <mutex>
 #include <ostream>
 #include <stdexcept>
diff --git a/python/mrc/_pymrc/src/watchers.cpp b/python/mrc/_pymrc/src/watchers.cpp
index d474d7ae4..114bc6dac 100644
--- a/python/mrc/_pymrc/src/watchers.cpp
+++ b/python/mrc/_pymrc/src/watchers.cpp
@@ -24,8 +24,8 @@
 #include "mrc/benchmarking/tracer.hpp"
 #include "mrc/node/rx_node.hpp"
 #include "mrc/node/rx_sink.hpp"
-#include "mrc/node/rx_source.hpp"
 #include "mrc/segment/builder.hpp"
+#include "mrc/segment/object.hpp"
 
 #include <nlohmann/json.hpp>
 #include <pybind11/gil.h>
@@ -34,11 +34,9 @@
 
 #include <cstddef>
 #include <functional>
-#include <map>
 #include <memory>
 #include <string>
 #include <utility>
-#include <vector>
 
 namespace mrc::pymrc {
 
diff --git a/python/mrc/_pymrc/tests/test_asyncio_runnable.cpp b/python/mrc/_pymrc/tests/test_asyncio_runnable.cpp
index 46a139a04..a46bea824 100644
--- a/python/mrc/_pymrc/tests/test_asyncio_runnable.cpp
+++ b/python/mrc/_pymrc/tests/test_asyncio_runnable.cpp
@@ -80,7 +80,7 @@ class __attribute__((visibility("default"))) TestAsyncioRunnable : public ::test
 
 std::unique_ptr<pybind11::scoped_interpreter> TestAsyncioRunnable::m_interpreter;
 
-class PythonCallbackAsyncioRunnable : public pymrc::AsyncioRunnable<int, int>
+class __attribute__((visibility("default"))) PythonCallbackAsyncioRunnable : public pymrc::AsyncioRunnable<int, int>
 {
   public:
     PythonCallbackAsyncioRunnable(pymrc::PyObjectHolder operation) : m_operation(std::move(operation)) {}
diff --git a/python/mrc/_pymrc/tests/test_executor.cpp b/python/mrc/_pymrc/tests/test_executor.cpp
index 41e284d91..20ea8b10d 100644
--- a/python/mrc/_pymrc/tests/test_executor.cpp
+++ b/python/mrc/_pymrc/tests/test_executor.cpp
@@ -33,11 +33,9 @@
 #include <rxcpp/rx.hpp>
 
 #include <atomic>
-#include <map>
 #include <memory>
 #include <string>
 #include <utility>
-#include <vector>
 
 namespace py    = pybind11;
 namespace pymrc = mrc::pymrc;
diff --git a/python/mrc/_pymrc/tests/test_pipeline.cpp b/python/mrc/_pymrc/tests/test_pipeline.cpp
index 68091ba14..7b375d21a 100644
--- a/python/mrc/_pymrc/tests/test_pipeline.cpp
+++ b/python/mrc/_pymrc/tests/test_pipeline.cpp
@@ -31,9 +31,7 @@
 #include "mrc/options/topology.hpp"
 #include "mrc/segment/builder.hpp"
 #include "mrc/segment/object.hpp"
-#include "mrc/types.hpp"
 
-#include <boost/fiber/future/future.hpp>
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 #include <pybind11/cast.h>
@@ -46,7 +44,6 @@
 #include <cstddef>
 #include <functional>
 #include <iostream>
-#include <map>
 #include <memory>
 #include <stdexcept>
 #include <string>
diff --git a/python/mrc/_pymrc/tests/test_serializers.cpp b/python/mrc/_pymrc/tests/test_serializers.cpp
index cbf5147c5..e6c72e27c 100644
--- a/python/mrc/_pymrc/tests/test_serializers.cpp
+++ b/python/mrc/_pymrc/tests/test_serializers.cpp
@@ -28,7 +28,6 @@
 #include <pybind11/pytypes.h>
 #include <pybind11/stl.h>  // IWYU pragma: keep
 
-#include <array>
 #include <ostream>
 #include <stdexcept>
 #include <string>
diff --git a/python/mrc/_pymrc/tests/test_utils.cpp b/python/mrc/_pymrc/tests/test_utils.cpp
index a802009fc..713bdc5f4 100644
--- a/python/mrc/_pymrc/tests/test_utils.cpp
+++ b/python/mrc/_pymrc/tests/test_utils.cpp
@@ -34,7 +34,6 @@
 #include <climits>
 #include <map>
 #include <memory>
-#include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/python/mrc/benchmarking/watchers.cpp b/python/mrc/benchmarking/watchers.cpp
index 2a4b3418f..920826239 100644
--- a/python/mrc/benchmarking/watchers.cpp
+++ b/python/mrc/benchmarking/watchers.cpp
@@ -26,11 +26,9 @@
 #include <pybind11/gil.h>  // IWYU pragma: keep
 #include <pybind11/pybind11.h>
 
-#include <array>
 #include <cstddef>
 #include <functional>
 #include <memory>
-#include <vector>
 
 namespace mrc::pymrc {
 namespace py = pybind11;
diff --git a/python/mrc/core/common.cpp b/python/mrc/core/common.cpp
index 741fec61b..7dde55b4b 100644
--- a/python/mrc/core/common.cpp
+++ b/python/mrc/core/common.cpp
@@ -18,21 +18,15 @@
 #include "pymrc/port_builders.hpp"
 #include "pymrc/types.hpp"
 
-#include "mrc/node/rx_sink_base.hpp"
-#include "mrc/node/rx_source_base.hpp"
-#include "mrc/types.hpp"
 #include "mrc/utils/string_utils.hpp"
 #include "mrc/version.hpp"
 
-#include <boost/fiber/future/future.hpp>
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 #include <rxcpp/rx.hpp>
 
-#include <map>
 #include <memory>
 #include <sstream>
-#include <vector>
 
 namespace mrc::pymrc {
 
diff --git a/python/mrc/core/operators.cpp b/python/mrc/core/operators.cpp
index b74ff96ec..be931fc27 100644
--- a/python/mrc/core/operators.cpp
+++ b/python/mrc/core/operators.cpp
@@ -28,7 +28,6 @@
 #include <pybind11/pytypes.h>
 #include <pybind11/stl.h>  // IWYU pragma: keep
 
-#include <array>
 #include <sstream>
 
 namespace mrc::pymrc {
diff --git a/python/mrc/core/pipeline.cpp b/python/mrc/core/pipeline.cpp
index 2f1dcf970..a6e9f0b5e 100644
--- a/python/mrc/core/pipeline.cpp
+++ b/python/mrc/core/pipeline.cpp
@@ -27,7 +27,6 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>  // IWYU pragma: keep
 
-#include <array>
 #include <sstream>
 
 namespace mrc::pymrc {
diff --git a/python/mrc/core/segment.cpp b/python/mrc/core/segment.cpp
index ed87f83f2..addba6813 100644
--- a/python/mrc/core/segment.cpp
+++ b/python/mrc/core/segment.cpp
@@ -38,12 +38,9 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 
-#include <array>
-#include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <sstream>
-#include <vector>
 
 namespace mrc::pymrc {
 
diff --git a/python/mrc/core/segment/module_definitions/mirror_tap_orchestrator.cpp b/python/mrc/core/segment/module_definitions/mirror_tap_orchestrator.cpp
index 570bd3c69..49aee1f7b 100644
--- a/python/mrc/core/segment/module_definitions/mirror_tap_orchestrator.cpp
+++ b/python/mrc/core/segment/module_definitions/mirror_tap_orchestrator.cpp
@@ -26,18 +26,14 @@
 #include "mrc/experimental/modules/stream_buffer/stream_buffer_module.hpp"
 #include "mrc/modules/module_registry.hpp"
 #include "mrc/modules/module_registry_util.hpp"
-#include "mrc/node/operators/broadcast.hpp"
-#include "mrc/node/rx_sink.hpp"
-#include "mrc/node/rx_source.hpp"
 #include "mrc/version.hpp"
 
 #include <pybind11/cast.h>
 #include <pybind11/functional.h>  // IWYU pragma: keep
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
+#include <rxcpp/rx.hpp>
 
-#include <array>
-#include <map>
 #include <memory>
 #include <string>
 #include <vector>
diff --git a/python/mrc/core/segment/module_definitions/segment_module_registry.cpp b/python/mrc/core/segment/module_definitions/segment_module_registry.cpp
index 0ae7b5728..86d21f65c 100644
--- a/python/mrc/core/segment/module_definitions/segment_module_registry.cpp
+++ b/python/mrc/core/segment/module_definitions/segment_module_registry.cpp
@@ -25,12 +25,9 @@
 #include <pybind11/cast.h>
 #include <pybind11/functional.h>  // IWYU pragma: keep
 #include <pybind11/pybind11.h>
-#include <pybind11/pytypes.h>
 #include <pybind11/stl.h>  // IWYU pragma: keep
 
-#include <array>
 #include <functional>
-#include <map>
 #include <string>
 #include <vector>
 
diff --git a/python/mrc/core/segment/module_definitions/segment_modules.cpp b/python/mrc/core/segment/module_definitions/segment_modules.cpp
index 08332dd40..5cc22f61d 100644
--- a/python/mrc/core/segment/module_definitions/segment_modules.cpp
+++ b/python/mrc/core/segment/module_definitions/segment_modules.cpp
@@ -25,9 +25,7 @@
 #include <pybind11/cast.h>
 #include <pybind11/pybind11.h>
 
-#include <map>
 #include <memory>
-#include <vector>
 
 namespace mrc::pymrc {
 
diff --git a/python/mrc/core/subscriber.cpp b/python/mrc/core/subscriber.cpp
index 656ff6884..0a9458f9f 100644
--- a/python/mrc/core/subscriber.cpp
+++ b/python/mrc/core/subscriber.cpp
@@ -27,8 +27,8 @@
 #include <pybind11/functional.h>  // IWYU pragma: keep
 #include <pybind11/gil.h>         // IWYU pragma: keep(for call_guard)
 #include <pybind11/pybind11.h>
+#include <rxcpp/rx.hpp>
 
-#include <array>
 #include <memory>
 #include <sstream>
 
diff --git a/python/mrc/tests/sample_modules.cpp b/python/mrc/tests/sample_modules.cpp
index 8bd6d354e..041d67a91 100644
--- a/python/mrc/tests/sample_modules.cpp
+++ b/python/mrc/tests/sample_modules.cpp
@@ -20,15 +20,12 @@
 #include "pymrc/utils.hpp"
 
 #include "mrc/modules/module_registry_util.hpp"
-#include "mrc/node/rx_source.hpp"
 #include "mrc/utils/string_utils.hpp"
 #include "mrc/version.hpp"
 
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 
-#include <map>
-#include <memory>
 #include <sstream>
 #include <vector>
 
diff --git a/python/mrc/tests/test_edges.cpp b/python/mrc/tests/test_edges.cpp
index 1e9cc0359..ccac5a2d7 100644
--- a/python/mrc/tests/test_edges.cpp
+++ b/python/mrc/tests/test_edges.cpp
@@ -24,29 +24,22 @@
 
 #include "mrc/channel/status.hpp"
 #include "mrc/edge/edge_connector.hpp"
-#include "mrc/node/rx_sink_base.hpp"
-#include "mrc/node/rx_source_base.hpp"
 #include "mrc/segment/builder.hpp"
 #include "mrc/segment/object.hpp"
-#include "mrc/types.hpp"
 #include "mrc/utils/string_utils.hpp"
 #include "mrc/version.hpp"
 
-#include <boost/fiber/future/future.hpp>
 #include <pybind11/cast.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 #include <rxcpp/rx.hpp>
 
-#include <array>
 #include <cstddef>
 #include <exception>
-#include <map>
 #include <memory>
 #include <sstream>
 #include <string>
 #include <utility>
-#include <vector>
 
 namespace mrc::pytests {