diff --git a/include/commandutils.hpp b/include/commandutils.hpp
index 30ed68a..3d42aeb 100644
--- a/include/commandutils.hpp
+++ b/include/commandutils.hpp
@@ -16,6 +16,7 @@
 
 #pragma once
 #include <iostream>
+#include <ipmid/api.hpp>
 #include <sdbusplus/bus.hpp>
 
 static constexpr bool debug = false;
diff --git a/include/sensorutils.hpp b/include/sensorutils.hpp
index ffd06a0..30fee66 100644
--- a/include/sensorutils.hpp
+++ b/include/sensorutils.hpp
@@ -15,10 +15,9 @@
 */
 
 #pragma once
-#include <ipmid/api.h>
-
 #include <cmath>
 #include <iostream>
+#include <ipmid/api.hpp>
 #include <phosphor-logging/log.hpp>
 
 namespace ipmi
@@ -181,4 +180,4 @@
     return scaleIPMIValueFromDouble(value, mValue, rExp, bValue, bExp, bSigned);
 }
 
-} // namespace ipmi
\ No newline at end of file
+} // namespace ipmi
diff --git a/src/oemcommands.cpp b/src/oemcommands.cpp
index 2af6a0a..8bfc1ce 100644
--- a/src/oemcommands.cpp
+++ b/src/oemcommands.cpp
@@ -17,7 +17,6 @@
 #include "xyz/openbmc_project/Common/error.hpp"
 #include "xyz/openbmc_project/Led/Physical/server.hpp"
 
-#include <ipmid/api.h>
 #include <systemd/sd-journal.h>
 
 #include <array>
@@ -27,7 +26,6 @@
 #include <commandutils.hpp>
 #include <iostream>
 #include <ipmid/api.hpp>
-#include <ipmid/registration.hpp>
 #include <ipmid/utils.hpp>
 #include <oemcommands.hpp>
 #include <phosphor-logging/log.hpp>
diff --git a/src/sensorcommands.cpp b/src/sensorcommands.cpp
index 45cd30b..bb0c60f 100644
--- a/src/sensorcommands.cpp
+++ b/src/sensorcommands.cpp
@@ -14,14 +14,13 @@
 // limitations under the License.
 */
 
-#include <ipmid/api.h>
-
 #include <boost/algorithm/string.hpp>
 #include <boost/container/flat_map.hpp>
 #include <chrono>
 #include <cmath>
 #include <commandutils.hpp>
 #include <iostream>
+#include <ipmid/api.hpp>
 #include <ipmid/utils.hpp>
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/bus.hpp>
diff --git a/src/storagecommands.cpp b/src/storagecommands.cpp
index 9c9b8ba..33e4611 100644
--- a/src/storagecommands.cpp
+++ b/src/storagecommands.cpp
@@ -14,12 +14,11 @@
 // limitations under the License.
 */
 
-#include <ipmid/api.h>
-
 #include <boost/container/flat_map.hpp>
 #include <boost/process.hpp>
 #include <commandutils.hpp>
 #include <iostream>
+#include <ipmid/api.hpp>
 #include <phosphor-ipmi-host/selutility.hpp>
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/message/types.hpp>