diff --git a/src/gpio.cpp b/src/gpio.cpp
index 72c569a..b78d2bc 100644
--- a/src/gpio.cpp
+++ b/src/gpio.cpp
@@ -14,13 +14,15 @@
 // limitations under the License.
 */
 
-#include <experimental/filesystem>
+#include "gpio.hpp"
+
 #include <fcntl.h>
+#include <unistd.h>
+
+#include <experimental/filesystem>
 #include <fstream>
 #include <phosphor-logging/elog-errors.hpp>
-#include <unistd.h>
 #include <xyz/openbmc_project/Common/error.hpp>
-#include "gpio.hpp"
 
 const static constexpr char* SYSMGR_SERVICE = "org.openbmc.managers.System";
 const static constexpr char* SYSMGR_OBJ_PATH = "/org/openbmc/managers/System";
@@ -85,7 +87,7 @@
             stream.close();
         }
 
-        catch (const std::exception &e)
+        catch (const std::exception& e)
         {
             phosphor::logging::log<phosphor::logging::level::ERR>(
                 "Error in writing!",
diff --git a/src/main.cpp b/src/main.cpp
index bd4ec2a..6107949 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -14,9 +14,9 @@
 // limitations under the License.
 */
 
-#include "reset_button.hpp"
-#include "power_button.hpp"
 #include "id_button.hpp"
+#include "power_button.hpp"
+#include "reset_button.hpp"
 
 int main(int argc, char* argv[])
 {
diff --git a/src/reset_button.cpp b/src/reset_button.cpp
index 1747b71..31e01e1 100644
--- a/src/reset_button.cpp
+++ b/src/reset_button.cpp
@@ -14,10 +14,10 @@
 // limitations under the License.
 */
 
-#include "xyz/openbmc_project/Chassis/Buttons/Reset/server.hpp"
-
 #include "reset_button.hpp"
 
+#include "xyz/openbmc_project/Chassis/Buttons/Reset/server.hpp"
+
 void ResetButton::simPress()
 {
     pressed();