diff --git a/include/ADCSensor.hpp b/include/ADCSensor.hpp
index cb595c9..39b9aaa 100644
--- a/include/ADCSensor.hpp
+++ b/include/ADCSensor.hpp
@@ -4,8 +4,12 @@
 #include "sensor.hpp"
 
 #include <gpiod.hpp>
+#include <memory>
 #include <optional>
 #include <sdbusplus/asio/object_server.hpp>
+#include <stdexcept>
+#include <string>
+#include <vector>
 
 class BridgeGpio
 {
diff --git a/include/CPUSensor.hpp b/include/CPUSensor.hpp
index 01eadc1..589b1f6 100644
--- a/include/CPUSensor.hpp
+++ b/include/CPUSensor.hpp
@@ -8,7 +8,12 @@
 #include <filesystem>
 #include <fstream>
 #include <gpiod.hpp>
+#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+#include <stdexcept>
+#include <string>
+#include <variant>
+#include <vector>
 
 class CPUSensor : public Sensor
 {
diff --git a/include/ChassisIntrusionSensor.hpp b/include/ChassisIntrusionSensor.hpp
index 4bc421a..651e768 100644
--- a/include/ChassisIntrusionSensor.hpp
+++ b/include/ChassisIntrusionSensor.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+#include <string>
 
 enum IntrusionSensorType
 {
diff --git a/include/ExitAirTempSensor.hpp b/include/ExitAirTempSensor.hpp
index 2142923..33ecb04 100644
--- a/include/ExitAirTempSensor.hpp
+++ b/include/ExitAirTempSensor.hpp
@@ -4,6 +4,9 @@
 #include <boost/container/flat_map.hpp>
 #include <chrono>
 #include <limits>
+#include <memory>
+#include <sdbusplus/bus/match.hpp>
+#include <string>
 #include <vector>
 
 struct ExitAirTempSensor;
diff --git a/include/HwmonTempSensor.hpp b/include/HwmonTempSensor.hpp
index b5d80e3..d5c1051 100644
--- a/include/HwmonTempSensor.hpp
+++ b/include/HwmonTempSensor.hpp
@@ -4,6 +4,8 @@
 #include "sensor.hpp"
 
 #include <sdbusplus/asio/object_server.hpp>
+#include <string>
+#include <vector>
 
 class HwmonTempSensor : public Sensor
 {
diff --git a/include/IpmbSensor.hpp b/include/IpmbSensor.hpp
index e7a9540..f226483 100644
--- a/include/IpmbSensor.hpp
+++ b/include/IpmbSensor.hpp
@@ -5,6 +5,9 @@
 #include <boost/container/flat_map.hpp>
 #include <chrono>
 #include <limits>
+#include <memory>
+#include <optional>
+#include <string>
 #include <vector>
 
 enum class IpmbType
diff --git a/include/MCUTempSensor.hpp b/include/MCUTempSensor.hpp
index 5dd3c03..eb12c9a 100644
--- a/include/MCUTempSensor.hpp
+++ b/include/MCUTempSensor.hpp
@@ -5,6 +5,8 @@
 #include <boost/container/flat_map.hpp>
 #include <chrono>
 #include <limits>
+#include <memory>
+#include <string>
 #include <vector>
 
 struct MCUTempSensor : public Sensor
diff --git a/include/PSUEvent.hpp b/include/PSUEvent.hpp
index 165ac92..e47670b 100644
--- a/include/PSUEvent.hpp
+++ b/include/PSUEvent.hpp
@@ -16,7 +16,12 @@
 
 #pragma once
 
+#include <boost/container/flat_map.hpp>
+#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+#include <set>
+#include <string>
+#include <vector>
 
 class PSUSubEvent
 {
diff --git a/include/PSUSensor.hpp b/include/PSUSensor.hpp
index f7ed88f..c0ebe6a 100644
--- a/include/PSUSensor.hpp
+++ b/include/PSUSensor.hpp
@@ -4,7 +4,9 @@
 #include "Thresholds.hpp"
 #include "sensor.hpp"
 
+#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+#include <string>
 
 class PSUSensor : public Sensor
 {
diff --git a/include/PwmSensor.hpp b/include/PwmSensor.hpp
index 973d695..345e7b5 100644
--- a/include/PwmSensor.hpp
+++ b/include/PwmSensor.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+#include <string>
 
 class PwmSensor
 {
diff --git a/include/TachSensor.hpp b/include/TachSensor.hpp
index 8ab1083..94af80a 100644
--- a/include/TachSensor.hpp
+++ b/include/TachSensor.hpp
@@ -7,7 +7,12 @@
 
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
+#include <memory>
+#include <optional>
 #include <sdbusplus/asio/object_server.hpp>
+#include <string>
+#include <utility>
+#include <vector>
 
 class PresenceSensor
 {
diff --git a/include/Thresholds.hpp b/include/Thresholds.hpp
index f1e7cc6..00df68c 100644
--- a/include/Thresholds.hpp
+++ b/include/Thresholds.hpp
@@ -2,7 +2,12 @@
 #include "Utils.hpp"
 
 #include <boost/asio/io_service.hpp>
+#include <list>
+#include <memory>
 #include <nlohmann/json.hpp>
+#include <string>
+#include <utility>
+#include <vector>
 
 struct Sensor;
 namespace thresholds
diff --git a/include/Utils.hpp b/include/Utils.hpp
index 37b5a85..44e7e2e 100644
--- a/include/Utils.hpp
+++ b/include/Utils.hpp
@@ -4,11 +4,18 @@
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/container/flat_map.hpp>
 #include <filesystem>
+#include <functional>
 #include <iostream>
+#include <memory>
 #include <regex>
 #include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 #include <sdbusplus/message/types.hpp>
+#include <string>
+#include <tuple>
+#include <utility>
+#include <variant>
+#include <vector>
 
 constexpr const char* gpioPath = "/sys/class/gpio/";
 const constexpr char* jsonStore = "/var/configuration/flattened.json";
diff --git a/include/sensor.hpp b/include/sensor.hpp
index aad8548..f83a45e 100644
--- a/include/sensor.hpp
+++ b/include/sensor.hpp
@@ -2,7 +2,11 @@
 
 #include "Thresholds.hpp"
 
+#include <limits>
+#include <memory>
 #include <sdbusplus/asio/object_server.hpp>
+#include <string>
+#include <vector>
 
 constexpr size_t sensorFailedPollTimeMs = 5000;