diff --git a/apphandler.cpp b/apphandler.cpp
index 4a77cfa..bfc821e 100644
--- a/apphandler.cpp
+++ b/apphandler.cpp
@@ -1,6 +1,6 @@
 #include "apphandler.h"
 #include "ipmid-api.h"
-#include "ipmid.H"
+#include "ipmid.hpp"
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
@@ -26,7 +26,7 @@
 }__attribute__((packed)) ipmi_device_id_t;
 
 //---------------------------------------------------------------------
-// Called by Host on seeing a SMS_ATN bit set. Return a hardcoded 
+// Called by Host on seeing a SMS_ATN bit set. Return a hardcoded
 // value of 0x2 indicating we need Host read some data.
 //-------------------------------------------------------------------
 ipmi_ret_t ipmi_app_get_msg_flags(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
@@ -39,8 +39,8 @@
     printf("IPMI APP GET MSG FLAGS returning with [bit:2] set\n");
 
 	// From IPMI spec V2.0 for Get Message Flags Command :
-	// bit:[1] from LSB : 1b = Event Message Buffer Full. 
-	// Return as 0 if Event Message Buffer is not supported, 
+	// bit:[1] from LSB : 1b = Event Message Buffer Full.
+	// Return as 0 if Event Message Buffer is not supported,
 	// or when the Event Message buffer is disabled.
 	// TODO. For now. assume its not disabled and send "0x2" anyway:
 
diff --git a/groupext.cpp b/groupext.cpp
index b834f9b..92edd04 100644
--- a/groupext.cpp
+++ b/groupext.cpp
@@ -1,5 +1,5 @@
 #include "ipmid-api.h"
-#include "ipmid.H"
+#include "ipmid.hpp"
 #include <stdio.h>
 #include <stdint.h>
 
diff --git a/ipmid.cpp b/ipmid.cpp
index c9c7dda..2689117 100644
--- a/ipmid.cpp
+++ b/ipmid.cpp
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <map>
-#include "ipmid.H"
+#include "ipmid.hpp"
 #include <sys/time.h>
 #include <errno.h>
 #include <mapper.h>
diff --git a/ipmid.H b/ipmid.hpp
similarity index 100%
rename from ipmid.H
rename to ipmid.hpp
diff --git a/ipmisensor.cpp b/ipmisensor.cpp
index b6927ac..3e67b41 100644
--- a/ipmisensor.cpp
+++ b/ipmisensor.cpp
@@ -2,7 +2,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <malloc.h>
-#include <ipmid.H>
+#include <ipmid.hpp>
 #include "sensorhandler.h"
 
 extern uint8_t find_sensor(uint8_t);
diff --git a/storageaddsel.cpp b/storageaddsel.cpp
index 9d15a49..165e9d5 100644
--- a/storageaddsel.cpp
+++ b/storageaddsel.cpp
@@ -8,7 +8,7 @@
 #include <memory>
 #include <systemd/sd-bus.h>
 #include <mapper.h>
-#include "ipmid.H"
+#include "ipmid.hpp"
 #include "storagehandler.h"
 #include "sensorhandler.h"
 
diff --git a/transporthandler.cpp b/transporthandler.cpp
index 5bb5355..0739d06 100644
--- a/transporthandler.cpp
+++ b/transporthandler.cpp
@@ -5,7 +5,7 @@
 #include <string>
 
 #include "ipmid-api.h"
-#include "ipmid.H"
+#include "ipmid.hpp"
 #include "transporthandler.h"
 
 #define SYSTEMD_NETWORKD_DBUS 1