diff --git a/src/button_handler.cpp b/src/button_handler.cpp
old mode 100755
new mode 100644
index 2d1f1eb..ae9cc5d
--- a/src/button_handler.cpp
+++ b/src/button_handler.cpp
@@ -1,7 +1,6 @@
-#include "config.h"
-
 #include "button_handler.hpp"
 
+#include "config.hpp"
 #include "power_button_profile_factory.hpp"
 
 #include <phosphor-logging/lg2.hpp>
diff --git a/src/cpld.cpp b/src/cpld.cpp
index af1bbd9..8afa535 100644
--- a/src/cpld.cpp
+++ b/src/cpld.cpp
@@ -1,7 +1,6 @@
 
-#include "config.h"
-
 #include "button_config.hpp"
+#include "config.hpp"
 
 #include <error.h>
 #include <fcntl.h>
diff --git a/src/gpio.cpp b/src/gpio.cpp
index a946aa3..99f31e8 100644
--- a/src/gpio.cpp
+++ b/src/gpio.cpp
@@ -14,9 +14,8 @@
 // limitations under the License.
 */
 
-#include "config.h"
-
 #include "button_config.hpp"
+#include "config.hpp"
 
 #include <error.h>
 #include <fcntl.h>
diff --git a/src/host_then_chassis_poweroff.cpp b/src/host_then_chassis_poweroff.cpp
index 5aedc9f..7abde43 100644
--- a/src/host_then_chassis_poweroff.cpp
+++ b/src/host_then_chassis_poweroff.cpp
@@ -1,7 +1,6 @@
-#include "config.h"
-
 #include "host_then_chassis_poweroff.hpp"
 
+#include "config.hpp"
 #include "power_button_profile_factory.hpp"
 
 #include <phosphor-logging/lg2.hpp>