diff --git a/src/nvme/NVMeBasicContext.hpp b/src/nvme/NVMeBasicContext.hpp
index 52b6a09..edf52ec 100644
--- a/src/nvme/NVMeBasicContext.hpp
+++ b/src/nvme/NVMeBasicContext.hpp
@@ -1,10 +1,13 @@
 #pragma once
 
 #include "NVMeContext.hpp"
+#include "NVMeSensor.hpp"
 
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/posix/stream_descriptor.hpp>
 
+#include <cstddef>
+#include <memory>
 #include <thread>
 
 class NVMeBasicContext : public NVMeContext
diff --git a/src/nvme/NVMeContext.hpp b/src/nvme/NVMeContext.hpp
index 4eb81e4..e2ada1b 100644
--- a/src/nvme/NVMeContext.hpp
+++ b/src/nvme/NVMeContext.hpp
@@ -4,9 +4,15 @@
 
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/steady_timer.hpp>
+#include <boost/container/flat_map.hpp>
 
+#include <algorithm>
+#include <cstddef>
+#include <list>
 #include <memory>
+#include <optional>
 #include <stdexcept>
+#include <string>
 
 class NVMeContext : public std::enable_shared_from_this<NVMeContext>
 {
diff --git a/src/nvme/NVMeSensor.hpp b/src/nvme/NVMeSensor.hpp
index a7cfba1..31afbf3 100644
--- a/src/nvme/NVMeSensor.hpp
+++ b/src/nvme/NVMeSensor.hpp
@@ -1,8 +1,17 @@
 #pragma once
 
+#include "Thresholds.hpp"
+
 #include <boost/asio/io_context.hpp>
+#include <sdbusplus/asio/connection.hpp>
+#include <sdbusplus/asio/object_server.hpp>
 #include <sensor.hpp>
 
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <vector>
+
 class NVMeSensor : public Sensor
 {
   public: