diff --git a/cpp/mrc/benchmarks/bench_baselines.cpp b/cpp/mrc/benchmarks/bench_baselines.cpp
index 6d9b737b9..a39ea0109 100644
--- a/cpp/mrc/benchmarks/bench_baselines.cpp
+++ b/cpp/mrc/benchmarks/bench_baselines.cpp
@@ -21,6 +21,7 @@
 #include <benchmark/benchmark.h>
 #include <rxcpp/rx.hpp>
 
+#include <algorithm>
 #include <chrono>
 #include <cstddef>
 #include <iostream>
diff --git a/cpp/mrc/benchmarks/bench_segment.cpp b/cpp/mrc/benchmarks/bench_segment.cpp
index 75c1e1ea1..ec9109b76 100644
--- a/cpp/mrc/benchmarks/bench_segment.cpp
+++ b/cpp/mrc/benchmarks/bench_segment.cpp
@@ -27,6 +27,7 @@
 #include <nlohmann/json.hpp>
 #include <rxcpp/rx.hpp>
 
+#include <algorithm>
 #include <chrono>
 #include <cstddef>
 #include <iostream>
diff --git a/cpp/mrc/include/mrc/benchmarking/tracer.hpp b/cpp/mrc/include/mrc/benchmarking/tracer.hpp
index 38a8e52d2..52c4cd577 100644
--- a/cpp/mrc/include/mrc/benchmarking/tracer.hpp
+++ b/cpp/mrc/include/mrc/benchmarking/tracer.hpp
@@ -22,7 +22,6 @@
 #include <glog/logging.h>
 #include <nlohmann/json.hpp>
 
-#include <array>
 #include <chrono>
 #include <cstddef>
 #include <map>
@@ -31,6 +30,7 @@
 #include <string>
 #include <tuple>
 #include <type_traits>
+#include <utility>
 #include <vector>
 
 // IWYU pragma: no_include <compare> (Issues with this header)
diff --git a/cpp/mrc/include/mrc/channel/buffered_channel.hpp b/cpp/mrc/include/mrc/channel/buffered_channel.hpp
index 8f6ddfe67..de1e1aa3b 100644
--- a/cpp/mrc/include/mrc/channel/buffered_channel.hpp
+++ b/cpp/mrc/include/mrc/channel/buffered_channel.hpp
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Copyright (c) 2021-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+ * SPDX-FileCopyrightText: Copyright (c) 2021-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/cpp/mrc/include/mrc/modules/module_registry.hpp b/cpp/mrc/include/mrc/modules/module_registry.hpp
index 348dd434d..0bb6a0c7e 100644
--- a/cpp/mrc/include/mrc/modules/module_registry.hpp
+++ b/cpp/mrc/include/mrc/modules/module_registry.hpp
@@ -19,6 +19,7 @@
 
 #include <nlohmann/json.hpp>
 
+#include <algorithm>
 #include <functional>
 #include <map>
 #include <memory>
diff --git a/cpp/mrc/include/mrc/utils/type_utils.hpp b/cpp/mrc/include/mrc/utils/type_utils.hpp
index 9d6fab5a9..4a7caa789 100644
--- a/cpp/mrc/include/mrc/utils/type_utils.hpp
+++ b/cpp/mrc/include/mrc/utils/type_utils.hpp
@@ -19,12 +19,13 @@
 
 #include <boost/type_index.hpp>
 
-#include <array>
 #include <climits>
 #include <cstddef>
 #include <cstdint>
 #include <string>
+#include <type_traits>
 #include <typeindex>
+#include <utility>
 #include <variant>
 
 namespace mrc {
diff --git a/cpp/mrc/src/internal/codable/codable_storage.cpp b/cpp/mrc/src/internal/codable/codable_storage.cpp
index c59a274a0..fa4fb861a 100644
--- a/cpp/mrc/src/internal/codable/codable_storage.cpp
+++ b/cpp/mrc/src/internal/codable/codable_storage.cpp
@@ -36,6 +36,7 @@
 #include <glog/logging.h>
 #include <google/protobuf/any.pb.h>
 
+#include <algorithm>
 #include <cstdint>
 #include <optional>
 #include <ostream>
diff --git a/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp b/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp
index 2098f283b..471b68c8b 100644
--- a/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp
+++ b/cpp/mrc/src/internal/control_plane/server/connection_manager.cpp
@@ -27,6 +27,7 @@
 #include <glog/logging.h>
 #include <google/protobuf/any.pb.h>
 
+#include <algorithm>
 #include <sstream>
 #include <utility>
 
diff --git a/cpp/mrc/src/internal/memory/device_resources.cpp b/cpp/mrc/src/internal/memory/device_resources.cpp
index 9ec0f5b04..71179eeb1 100644
--- a/cpp/mrc/src/internal/memory/device_resources.cpp
+++ b/cpp/mrc/src/internal/memory/device_resources.cpp
@@ -39,7 +39,6 @@
 
 #include <sstream>
 #include <string>
-#include <thread>
 #include <utility>
 
 namespace mrc::memory {
diff --git a/cpp/mrc/src/internal/memory/host_resources.cpp b/cpp/mrc/src/internal/memory/host_resources.cpp
index 42acfd32b..7893e8b10 100644
--- a/cpp/mrc/src/internal/memory/host_resources.cpp
+++ b/cpp/mrc/src/internal/memory/host_resources.cpp
@@ -40,7 +40,6 @@
 #include <memory>
 #include <ostream>
 #include <string>
-#include <thread>
 #include <utility>
 #include <vector>
 
diff --git a/cpp/mrc/src/public/benchmarking/tracer.cpp b/cpp/mrc/src/public/benchmarking/tracer.cpp
index 1e3a942b4..f77854d29 100644
--- a/cpp/mrc/src/public/benchmarking/tracer.cpp
+++ b/cpp/mrc/src/public/benchmarking/tracer.cpp
@@ -21,6 +21,7 @@
 
 #include <nlohmann/json.hpp>
 
+#include <algorithm>
 #include <mutex>
 
 namespace mrc::benchmarking {
diff --git a/cpp/mrc/src/public/core/logging.cpp b/cpp/mrc/src/public/core/logging.cpp
index a8813277e..226b0b287 100644
--- a/cpp/mrc/src/public/core/logging.cpp
+++ b/cpp/mrc/src/public/core/logging.cpp
@@ -17,6 +17,8 @@
 
 #include "mrc/core/logging.hpp"
 
+#include <glog/flags.h>
+
 #include <atomic>
 
 namespace {
diff --git a/cpp/mrc/src/tests/test_control_plane_components.cpp b/cpp/mrc/src/tests/test_control_plane_components.cpp
index bccd39690..53ce919fb 100644
--- a/cpp/mrc/src/tests/test_control_plane_components.cpp
+++ b/cpp/mrc/src/tests/test_control_plane_components.cpp
@@ -23,6 +23,7 @@
 
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <atomic>
 #include <cstddef>
 #include <cstdint>
diff --git a/cpp/mrc/src/tests/test_memory.cpp b/cpp/mrc/src/tests/test_memory.cpp
index 65059071d..f0fff0198 100644
--- a/cpp/mrc/src/tests/test_memory.cpp
+++ b/cpp/mrc/src/tests/test_memory.cpp
@@ -42,7 +42,6 @@
 #include <optional>
 #include <ostream>
 #include <string>
-#include <thread>
 #include <utility>
 #include <vector>
 
diff --git a/cpp/mrc/src/tests/test_next.cpp b/cpp/mrc/src/tests/test_next.cpp
index 1886664f7..301d4f26c 100644
--- a/cpp/mrc/src/tests/test_next.cpp
+++ b/cpp/mrc/src/tests/test_next.cpp
@@ -25,11 +25,11 @@
 #include "mrc/channel/ingress.hpp"
 #include "mrc/data/reusable_pool.hpp"
 #include "mrc/edge/edge_builder.hpp"
-#include "mrc/edge/edge_writable.hpp"
 #include "mrc/node/generic_node.hpp"
 #include "mrc/node/generic_sink.hpp"
 #include "mrc/node/generic_source.hpp"
 #include "mrc/node/operators/conditional.hpp"
+#include "mrc/node/operators/router.hpp"
 #include "mrc/node/readable_endpoint.hpp"
 #include "mrc/node/rx_execute.hpp"
 #include "mrc/node/rx_node.hpp"
diff --git a/cpp/mrc/src/tests/test_ranges.cpp b/cpp/mrc/src/tests/test_ranges.cpp
index 475cd13e3..373b65cf5 100644
--- a/cpp/mrc/src/tests/test_ranges.cpp
+++ b/cpp/mrc/src/tests/test_ranges.cpp
@@ -19,6 +19,7 @@
 
 #include <gtest/gtest.h>
 
+#include <algorithm>
 #include <utility>
 #include <vector>
 
diff --git a/cpp/mrc/tests/logging/test_logging.cpp b/cpp/mrc/tests/logging/test_logging.cpp
index 0d26a82bb..a475bef0d 100644
--- a/cpp/mrc/tests/logging/test_logging.cpp
+++ b/cpp/mrc/tests/logging/test_logging.cpp
@@ -19,6 +19,7 @@
 
 #include "mrc/core/logging.hpp"
 
+#include <glog/flags.h>
 #include <glog/logging.h>
 
 namespace mrc {
diff --git a/python/mrc/_pymrc/include/pymrc/types.hpp b/python/mrc/_pymrc/include/pymrc/types.hpp
index 5446ec28a..cc40c7ca3 100644
--- a/python/mrc/_pymrc/include/pymrc/types.hpp
+++ b/python/mrc/_pymrc/include/pymrc/types.hpp
@@ -22,6 +22,7 @@
 #include "mrc/segment/object.hpp"
 
 #include <nlohmann/json_fwd.hpp>
+#include <pybind11/pytypes.h>
 #include <rxcpp/rx.hpp>
 
 #include <functional>  // for function
diff --git a/python/mrc/_pymrc/include/pymrc/utilities/object_cache.hpp b/python/mrc/_pymrc/include/pymrc/utilities/object_cache.hpp
index 68c106064..5f26e2945 100644
--- a/python/mrc/_pymrc/include/pymrc/utilities/object_cache.hpp
+++ b/python/mrc/_pymrc/include/pymrc/utilities/object_cache.hpp
@@ -23,7 +23,6 @@
 
 #include <cstddef>
 #include <functional>
-#include <map>
 #include <memory>
 #include <mutex>
 #include <string>
diff --git a/python/mrc/_pymrc/include/pymrc/utilities/object_wrappers.hpp b/python/mrc/_pymrc/include/pymrc/utilities/object_wrappers.hpp
index f20c55794..7c9be2f44 100644
--- a/python/mrc/_pymrc/include/pymrc/utilities/object_wrappers.hpp
+++ b/python/mrc/_pymrc/include/pymrc/utilities/object_wrappers.hpp
@@ -18,7 +18,6 @@
 #pragma once
 
 #include <pybind11/cast.h>
-#include <pybind11/detail/descr.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 
diff --git a/python/mrc/_pymrc/src/utilities/object_cache.cpp b/python/mrc/_pymrc/src/utilities/object_cache.cpp
index 574afc2a2..7aeff2544 100644
--- a/python/mrc/_pymrc/src/utilities/object_cache.cpp
+++ b/python/mrc/_pymrc/src/utilities/object_cache.cpp
@@ -24,6 +24,7 @@
 #include <pybind11/pytypes.h>
 #include <pylifecycle.h>
 
+#include <map>
 #include <mutex>
 #include <ostream>
 #include <stdexcept>
diff --git a/python/mrc/_pymrc/src/utils.cpp b/python/mrc/_pymrc/src/utils.cpp
index 22379b594..224c722c7 100644
--- a/python/mrc/_pymrc/src/utils.cpp
+++ b/python/mrc/_pymrc/src/utils.cpp
@@ -22,7 +22,6 @@
 #include <glog/logging.h>
 #include <nlohmann/json.hpp>
 #include <pybind11/cast.h>
-#include <pybind11/detail/internals.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 #include <pyerrors.h>
diff --git a/python/mrc/_pymrc/tests/test_object_cache.cpp b/python/mrc/_pymrc/tests/test_object_cache.cpp
index 14bb0b006..6bc289f51 100644
--- a/python/mrc/_pymrc/tests/test_object_cache.cpp
+++ b/python/mrc/_pymrc/tests/test_object_cache.cpp
@@ -18,6 +18,7 @@
 #include "test_pymrc.hpp"
 
 #include "pymrc/utilities/object_cache.hpp"
+#include "pymrc/utilities/object_wrappers.hpp"
 
 #include <gtest/gtest.h>
 #include <pybind11/cast.h>
diff --git a/python/mrc/benchmarking/trace_statistics.cpp b/python/mrc/benchmarking/trace_statistics.cpp
index cb211ef7d..726aa1f21 100644
--- a/python/mrc/benchmarking/trace_statistics.cpp
+++ b/python/mrc/benchmarking/trace_statistics.cpp
@@ -19,7 +19,6 @@
 
 #include "pymrc/utils.hpp"
 
-#include <nlohmann/json.hpp>
 #include <pybind11/cast.h>
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
diff --git a/python/mrc/tests/sample_modules.cpp b/python/mrc/tests/sample_modules.cpp
index 041d67a91..c544b1b51 100644
--- a/python/mrc/tests/sample_modules.cpp
+++ b/python/mrc/tests/sample_modules.cpp
@@ -26,6 +26,7 @@
 #include <pybind11/pybind11.h>
 #include <pybind11/pytypes.h>
 
+#include <algorithm>
 #include <sstream>
 #include <vector>