diff --git a/inc/button_config.hpp b/inc/button_config.hpp
index 7678d25..3c395c9 100644
--- a/inc/button_config.hpp
+++ b/inc/button_config.hpp
@@ -1,6 +1,5 @@
 #pragma once
-#include "config.h"
-
+#include "config.hpp"
 #include "cpld.hpp"
 #include "gpio.hpp"
 
diff --git a/inc/button_handler.hpp b/inc/button_handler.hpp
old mode 100755
new mode 100644
diff --git a/inc/cpld.hpp b/inc/cpld.hpp
index 206f0c6..7017a9b 100644
--- a/inc/cpld.hpp
+++ b/inc/cpld.hpp
@@ -1,6 +1,6 @@
 
 #pragma once
-#include "config.h"
+#include "config.hpp"
 
 #include <cstdint>
 #include <string>
diff --git a/inc/debugHostSelector_button.hpp b/inc/debugHostSelector_button.hpp
index ea5dd5f..bbae539 100644
--- a/inc/debugHostSelector_button.hpp
+++ b/inc/debugHostSelector_button.hpp
@@ -1,10 +1,9 @@
 
 #pragma once
-#include "config.h"
-
 #include "button_factory.hpp"
 #include "button_interface.hpp"
 #include "common.hpp"
+#include "config.hpp"
 #include "gpio.hpp"
 #include "xyz/openbmc_project/Chassis/Buttons/Button/server.hpp"
 #include "xyz/openbmc_project/Chassis/Common/error.hpp"
diff --git a/inc/hostSelector_switch.hpp b/inc/hostSelector_switch.hpp
index 806da06..70e31e0 100644
--- a/inc/hostSelector_switch.hpp
+++ b/inc/hostSelector_switch.hpp
@@ -1,9 +1,8 @@
 #pragma once
-#include "config.h"
-
 #include "button_factory.hpp"
 #include "button_interface.hpp"
 #include "common.hpp"
+#include "config.hpp"
 #include "gpio.hpp"
 #include "xyz/openbmc_project/Chassis/Buttons/HostSelector/server.hpp"
 #include "xyz/openbmc_project/Chassis/Common/error.hpp"
diff --git a/inc/id_button.hpp b/inc/id_button.hpp
index 24514d9..5239d77 100644
--- a/inc/id_button.hpp
+++ b/inc/id_button.hpp
@@ -15,11 +15,10 @@
 */
 
 #pragma once
-#include "config.h"
-
 #include "button_factory.hpp"
 #include "button_interface.hpp"
 #include "common.hpp"
+#include "config.hpp"
 #include "gpio.hpp"
 #include "xyz/openbmc_project/Chassis/Buttons/ID/server.hpp"
 #include "xyz/openbmc_project/Chassis/Common/error.hpp"
diff --git a/inc/power_button.hpp b/inc/power_button.hpp
index 549b51f..2cf28e4 100644
--- a/inc/power_button.hpp
+++ b/inc/power_button.hpp
@@ -15,11 +15,10 @@
 */
 
 #pragma once
-#include "config.h"
-
 #include "button_factory.hpp"
 #include "button_interface.hpp"
 #include "common.hpp"
+#include "config.hpp"
 #include "gpio.hpp"
 #include "xyz/openbmc_project/Chassis/Buttons/Power/server.hpp"
 #include "xyz/openbmc_project/Chassis/Common/error.hpp"
diff --git a/inc/power_button_profile.hpp b/inc/power_button_profile.hpp
index 37bfbe6..bb113a3 100644
--- a/inc/power_button_profile.hpp
+++ b/inc/power_button_profile.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "config.h"
+#include "config.hpp"
 
 #include <sdbusplus/bus.hpp>
 #include <sdbusplus/bus/match.hpp>
diff --git a/inc/power_button_profile_factory.hpp b/inc/power_button_profile_factory.hpp
index de11e84..3f05c77 100644
--- a/inc/power_button_profile_factory.hpp
+++ b/inc/power_button_profile_factory.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include "config.h"
-
+#include "config.hpp"
 #include "power_button_profile.hpp"
 
 #include <memory>
diff --git a/inc/reset_button.hpp b/inc/reset_button.hpp
index 918d0de..79a6096 100644
--- a/inc/reset_button.hpp
+++ b/inc/reset_button.hpp
@@ -15,11 +15,10 @@
 */
 
 #pragma once
-#include "config.h"
-
 #include "button_factory.hpp"
 #include "button_interface.hpp"
 #include "common.hpp"
+#include "config.hpp"
 #include "gpio.hpp"
 #include "xyz/openbmc_project/Chassis/Buttons/Reset/server.hpp"
 #include "xyz/openbmc_project/Chassis/Common/error.hpp"
diff --git a/inc/serial_uart_mux.hpp b/inc/serial_uart_mux.hpp
index 6898e8f..a280cb4 100644
--- a/inc/serial_uart_mux.hpp
+++ b/inc/serial_uart_mux.hpp
@@ -1,10 +1,9 @@
 
 #pragma once
-#include "config.h"
-
 #include "button_factory.hpp"
 #include "button_interface.hpp"
 #include "common.hpp"
+#include "config.hpp"
 #include "gpio.hpp"
 #include "xyz/openbmc_project/Chassis/Buttons/HostSelector/server.hpp"
 #include "xyz/openbmc_project/Chassis/Common/error.hpp"