diff --git a/libpfr/inc/file.hpp b/libpfr/inc/file.hpp
index 5532169..6079eac 100644
--- a/libpfr/inc/file.hpp
+++ b/libpfr/inc/file.hpp
@@ -18,12 +18,15 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <sys/ioctl.h>
 #include <stdio.h>
-#include <experimental/filesystem>
+#include <sys/ioctl.h>
+
 #include <phosphor-logging/log.hpp>
 
-extern "C" {
+#include <experimental/filesystem>
+
+extern "C"
+{
 #include <i2c/smbus.h>
 #include <linux/i2c-dev.h>
 }
diff --git a/libpfr/inc/pfr.hpp b/libpfr/inc/pfr.hpp
index 8bf3082..704d590 100644
--- a/libpfr/inc/pfr.hpp
+++ b/libpfr/inc/pfr.hpp
@@ -43,9 +43,9 @@
 };
 
 std::string toHexString(const uint8_t val);
-std::string getFirmwareVersion(const ImageType &imgType);
-int getProvisioningStatus(bool &ufmLocked, bool &ufmProvisioned);
-int readCpldReg(const ActionType &action, uint8_t &value);
+std::string getFirmwareVersion(const ImageType& imgType);
+int getProvisioningStatus(bool& ufmLocked, bool& ufmProvisioned);
+int readCpldReg(const ActionType& action, uint8_t& value);
 int setBMCBootCheckpoint(const uint8_t checkPoint);
 
 } // namespace pfr
diff --git a/libpfr/inc/spiDev.hpp b/libpfr/inc/spiDev.hpp
index 17a4f63..667318a 100644
--- a/libpfr/inc/spiDev.hpp
+++ b/libpfr/inc/spiDev.hpp
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <stdio.h>
+
 #include <cstring>
 #include <experimental/filesystem>