diff --git a/src/ADCSensor.cpp b/src/ADCSensor.cpp
index 4d3628d..3ee4533 100644
--- a/src/ADCSensor.cpp
+++ b/src/ADCSensor.cpp
@@ -21,14 +21,17 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <cmath>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
 #include <limits>
+#include <memory>
 #include <optional>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 #include <string>
+#include <vector>
 static constexpr unsigned int sensorPollMs = 500;
 static constexpr size_t warnAfterErrorCount = 10;
 static constexpr unsigned int gpioBridgeEnableMs = 20;
diff --git a/src/ADCSensorMain.cpp b/src/ADCSensorMain.cpp
index 53d09c2..1b56d93 100644
--- a/src/ADCSensorMain.cpp
+++ b/src/ADCSensorMain.cpp
@@ -24,10 +24,16 @@
 #include <boost/container/flat_set.hpp>
 #include <filesystem>
 #include <fstream>
+#include <functional>
+#include <memory>
 #include <optional>
 #include <regex>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+#include <string>
+#include <variant>
+#include <vector>
 
 static constexpr bool DEBUG = false;
 
diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp
index 5aedf4b..9458896 100644
--- a/src/CPUSensor.cpp
+++ b/src/CPUSensor.cpp
@@ -24,10 +24,14 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <iostream>
+#include <istream>
 #include <limits>
+#include <memory>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <stdexcept>
 #include <string>
+#include <vector>
 
 CPUSensor::CPUSensor(const std::string& path, const std::string& objectType,
                      sdbusplus::asio::object_server& objectServer,
diff --git a/src/CPUSensorMain.cpp b/src/CPUSensorMain.cpp
index 7e8c7b0..a595236 100644
--- a/src/CPUSensorMain.cpp
+++ b/src/CPUSensorMain.cpp
@@ -20,16 +20,27 @@
 
 #include <fcntl.h>
 
+#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/process/child.hpp>
 #include <filesystem>
 #include <fstream>
+#include <functional>
+#include <memory>
 #include <regex>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+#include <sstream>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
 
 // clang-format off
 // this needs to be included last or we'll have build issues
diff --git a/src/ChassisIntrusionSensor.cpp b/src/ChassisIntrusionSensor.cpp
index 680d9e6..536589c 100644
--- a/src/ChassisIntrusionSensor.cpp
+++ b/src/ChassisIntrusionSensor.cpp
@@ -25,6 +25,7 @@
 #include <boost/bind.hpp>
 #include <chrono>
 #include <iostream>
+#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
 #include <string>
 #include <thread>
diff --git a/src/ExitAirTempSensor.cpp b/src/ExitAirTempSensor.cpp
index e8bba14..9692f7f 100644
--- a/src/ExitAirTempSensor.cpp
+++ b/src/ExitAirTempSensor.cpp
@@ -21,14 +21,23 @@
 
 #include <math.h>
 
+#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/container/flat_map.hpp>
 #include <chrono>
+#include <cmath>
+#include <functional>
 #include <iostream>
 #include <limits>
+#include <memory>
 #include <numeric>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+#include <stdexcept>
+#include <utility>
+#include <variant>
 #include <vector>
 
 constexpr const float altitudeFactor = 1.14;
diff --git a/src/FanMain.cpp b/src/FanMain.cpp
index a1868e2..fdd0295 100644
--- a/src/FanMain.cpp
+++ b/src/FanMain.cpp
@@ -19,15 +19,25 @@
 #include "Utils.hpp"
 #include "VariantVisitors.hpp"
 
+#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <boost/lexical_cast.hpp>
 #include <filesystem>
 #include <fstream>
+#include <functional>
+#include <memory>
+#include <optional>
 #include <regex>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
 
 static constexpr bool DEBUG = false;
 
diff --git a/src/HwmonTempMain.cpp b/src/HwmonTempMain.cpp
index b44fa10..767459b 100644
--- a/src/HwmonTempMain.cpp
+++ b/src/HwmonTempMain.cpp
@@ -17,14 +17,24 @@
 #include "HwmonTempSensor.hpp"
 #include "Utils.hpp"
 
+#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <filesystem>
 #include <fstream>
+#include <functional>
+#include <memory>
 #include <regex>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
 
 static constexpr bool DEBUG = false;
 
diff --git a/src/HwmonTempSensor.cpp b/src/HwmonTempSensor.cpp
index dd6ba7c..b195c0c 100644
--- a/src/HwmonTempSensor.cpp
+++ b/src/HwmonTempSensor.cpp
@@ -22,10 +22,13 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <iostream>
+#include <istream>
 #include <limits>
+#include <memory>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 #include <string>
+#include <vector>
 
 static constexpr unsigned int sensorPollMs = 500;
 static constexpr unsigned int sensorScaleFactor = 1000;
diff --git a/src/IntrusionSensorMain.cpp b/src/IntrusionSensorMain.cpp
index dab04ef..a7ca495 100644
--- a/src/IntrusionSensorMain.cpp
+++ b/src/IntrusionSensorMain.cpp
@@ -19,19 +19,28 @@
 
 #include <systemd/sd-journal.h>
 
+#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/asio.hpp>
+#include <boost/container/flat_map.hpp>
 #include <chrono>
 #include <ctime>
 #include <fstream>
+#include <functional>
 #include <iostream>
+#include <memory>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 #include <sdbusplus/asio/sd_event.hpp>
 #include <sdbusplus/bus.hpp>
+#include <sdbusplus/bus/match.hpp>
 #include <sdbusplus/exception.hpp>
 #include <sdbusplus/server.hpp>
 #include <sdbusplus/timer.hpp>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <vector>
 
 static constexpr bool DEBUG = false;
 
diff --git a/src/IpmbSensor.cpp b/src/IpmbSensor.cpp
index 459599d..d9a4e25 100644
--- a/src/IpmbSensor.cpp
+++ b/src/IpmbSensor.cpp
@@ -24,12 +24,19 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/container/flat_map.hpp>
 #include <chrono>
+#include <functional>
 #include <iostream>
 #include <limits>
+#include <memory>
 #include <numeric>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+#include <string>
+#include <tuple>
+#include <variant>
 #include <vector>
 
 constexpr const bool debug = false;
diff --git a/src/MCUTempSensor.cpp b/src/MCUTempSensor.cpp
index bf6c2c6..581919c 100644
--- a/src/MCUTempSensor.cpp
+++ b/src/MCUTempSensor.cpp
@@ -23,12 +23,17 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/container/flat_map.hpp>
 #include <chrono>
+#include <functional>
 #include <iostream>
 #include <limits>
+#include <memory>
 #include <numeric>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+#include <string>
 #include <vector>
 
 extern "C" {
diff --git a/src/PSUEvent.cpp b/src/PSUEvent.cpp
index d40dc54..f56b281 100644
--- a/src/PSUEvent.cpp
+++ b/src/PSUEvent.cpp
@@ -18,9 +18,16 @@
 
 #include <systemd/sd-journal.h>
 
+#include <boost/container/flat_map.hpp>
 #include <iostream>
+#include <memory>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
 
 PSUCombineEvent::PSUCombineEvent(
     sdbusplus::asio::object_server& objectServer, boost::asio::io_service& io,
diff --git a/src/PSUSensor.cpp b/src/PSUSensor.cpp
index 68c7a0e..a7b72a8 100644
--- a/src/PSUSensor.cpp
+++ b/src/PSUSensor.cpp
@@ -22,10 +22,13 @@
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <iostream>
+#include <istream>
 #include <limits>
+#include <memory>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 #include <string>
+#include <vector>
 
 static constexpr const char* sensorPathPrefix = "/xyz/openbmc_project/sensors/";
 
diff --git a/src/PSUSensorMain.cpp b/src/PSUSensorMain.cpp
index 9abde11..e3007cd 100644
--- a/src/PSUSensorMain.cpp
+++ b/src/PSUSensorMain.cpp
@@ -18,15 +18,23 @@
 #include "PSUSensor.hpp"
 #include "Utils.hpp"
 
+#include <array>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 #include <filesystem>
 #include <fstream>
+#include <functional>
 #include <iostream>
 #include <regex>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <sdbusplus/bus/match.hpp>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
 
 static constexpr bool DEBUG = false;
 
diff --git a/src/PwmSensor.cpp b/src/PwmSensor.cpp
index 86a76f2..3fdde65 100644
--- a/src/PwmSensor.cpp
+++ b/src/PwmSensor.cpp
@@ -20,6 +20,8 @@
 #include <fstream>
 #include <iostream>
 #include <sdbusplus/asio/object_server.hpp>
+#include <stdexcept>
+#include <string>
 
 static constexpr size_t pwmMax = 255;
 static constexpr double defaultPwm = 30.0;
diff --git a/src/TachSensor.cpp b/src/TachSensor.cpp
index cca2f23..86b548f 100644
--- a/src/TachSensor.cpp
+++ b/src/TachSensor.cpp
@@ -25,10 +25,16 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <fstream>
 #include <iostream>
+#include <istream>
 #include <limits>
+#include <memory>
+#include <optional>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
+#include <stdexcept>
 #include <string>
+#include <utility>
+#include <vector>
 
 static constexpr unsigned int pwmPollMs = 500;
 static constexpr size_t warnAfterErrorCount = 10;
diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
index 72697de..bbddcde 100644
--- a/src/Thresholds.cpp
+++ b/src/Thresholds.cpp
@@ -3,11 +3,19 @@
 #include "VariantVisitors.hpp"
 #include "sensor.hpp"
 
+#include <array>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/container/flat_map.hpp>
 #include <boost/lexical_cast.hpp>
 #include <cmath>
 #include <fstream>
 #include <iostream>
+#include <memory>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
 
 static constexpr bool DEBUG = false;
 namespace thresholds
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 833b141..44a6bae 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -17,12 +17,19 @@
 #include "Utils.hpp"
 
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/container/flat_map.hpp>
 #include <filesystem>
 #include <fstream>
+#include <memory>
 #include <regex>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 #include <sdbusplus/bus/match.hpp>
+#include <stdexcept>
+#include <string>
+#include <utility>
+#include <variant>
+#include <vector>
 
 namespace fs = std::filesystem;