diff --git a/src/fan/PresenceGpio.hpp b/src/fan/PresenceGpio.hpp
index 627270b..ac42638 100644
--- a/src/fan/PresenceGpio.hpp
+++ b/src/fan/PresenceGpio.hpp
@@ -1,10 +1,14 @@
 #pragma once
 
-#include "sensor.hpp"
-
+#include <boost/asio/io_context.hpp>
+#include <boost/asio/posix/stream_descriptor.hpp>
+#include <boost/asio/steady_timer.hpp>
 #include <gpiod.hpp>
 #include <phosphor-logging/lg2.hpp>
 
+#include <memory>
+#include <string>
+
 class PresenceGpio
 {
   public:
diff --git a/src/fan/TachSensor.hpp b/src/fan/TachSensor.hpp
index d2ca101..6e22f76 100644
--- a/src/fan/TachSensor.hpp
+++ b/src/fan/TachSensor.hpp
@@ -2,15 +2,19 @@
 
 #include "PresenceGpio.hpp"
 #include "Thresholds.hpp"
+#include "Utils.hpp"
 #include "sensor.hpp"
 
+#include <boost/asio/io_context.hpp>
 #include <boost/asio/random_access_file.hpp>
+#include <boost/asio/steady_timer.hpp>
 #include <boost/container/flat_map.hpp>
-#include <boost/container/flat_set.hpp>
-#include <gpiod.hpp>
 #include <phosphor-logging/lg2.hpp>
+#include <sdbusplus/asio/connection.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 
+#include <array>
+#include <cstddef>
 #include <memory>
 #include <optional>
 #include <string>