diff --git a/nvme_manager.cpp b/nvme_manager.cpp
index 9ceed7c..ccd2b60 100644
--- a/nvme_manager.cpp
+++ b/nvme_manager.cpp
@@ -218,7 +218,7 @@
     nvmeData.smartWarnings = "";
     nvmeData.statusFlags = "";
     nvmeData.driveLifeUsed = "";
-    nvmeData.sensorValue = (int8_t)TEMPERATURE_SENSOR_FAILURE;
+    nvmeData.sensorValue = static_cast<int8_t>(TEMPERATURE_SENSOR_FAILURE);
     nvmeData.wcTemp = 0;
 
     phosphor::smbus::Smbus smbus;
diff --git a/nvmes.cpp b/nvmes.cpp
index 972d406..b936f8a 100644
--- a/nvmes.cpp
+++ b/nvmes.cpp
@@ -1,5 +1,9 @@
 #include "nvmes.hpp"
 
+#include <xyz/openbmc_project/Sensor/Threshold/Critical/server.hpp>
+#include <xyz/openbmc_project/Sensor/Threshold/Warning/server.hpp>
+#include <xyz/openbmc_project/Sensor/Value/server.hpp>
+
 namespace phosphor
 {
 namespace nvme
diff --git a/nvmes.hpp b/nvmes.hpp
index 64d279e..61c027f 100644
--- a/nvmes.hpp
+++ b/nvmes.hpp
@@ -1,12 +1,6 @@
 #pragma once
 
-#include "config.h"
-
 #include <sdbusplus/bus.hpp>
-#include <sdbusplus/server.hpp>
-#include <sdeventplus/clock.hpp>
-#include <sdeventplus/event.hpp>
-#include <sdeventplus/utility/timer.hpp>
 #include <xyz/openbmc_project/Sensor/Threshold/Critical/server.hpp>
 #include <xyz/openbmc_project/Sensor/Threshold/Warning/server.hpp>
 #include <xyz/openbmc_project/Sensor/Value/server.hpp>
@@ -62,4 +56,4 @@
     sdbusplus::bus::bus& bus;
 };
 } // namespace nvme
-} // namespace phosphor
\ No newline at end of file
+} // namespace phosphor