diff --git a/.clang-format b/.clang-format
index 8ad55d0..ea71ad6 100644
--- a/.clang-format
+++ b/.clang-format
@@ -42,12 +42,26 @@
 ConstructorInitializerIndentWidth: 4
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
-DerivePointerAlignment: true
+DerivePointerAlignment: false
 PointerAlignment: Left
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '^[<"](gtest|gmock)'
+    Priority:        5
+  - Regex:           '^"config.h"'
+    Priority:        -1
+  - Regex:           '^".*\.hpp"'
+    Priority:        1
+  - Regex:           '^<.*\.h>'
+    Priority:        2
+  - Regex:           '^<.*'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        4
 IndentCaseLabels: true
 IndentWidth:     4
 IndentWrappedFunctionNames: true
@@ -65,9 +79,9 @@
 PenaltyBreakString: 1000
 PenaltyExcessCharacter: 1000000
 PenaltyReturnTypeOnItsOwnLine: 60
-PointerAlignment: Right
 ReflowComments:  true
-SortIncludes:    false
+SortIncludes:    true
+SortUsingDeclarations: true
 SpaceAfterCStyleCast: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: ControlStatements
diff --git a/ipmi.cpp b/ipmi.cpp
index 3c43aa7..6e28625 100644
--- a/ipmi.cpp
+++ b/ipmi.cpp
@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
-#include <cstring>
-#include <unordered_map>
+#include "ipmi.hpp"
 
 #include "flash-ipmi.hpp"
-#include "ipmi.hpp"
+
+#include <cstring>
+#include <unordered_map>
 
 IpmiFlashHandler getCommandHandler(FlashSubCmds command)
 {
diff --git a/ipmi.hpp b/ipmi.hpp
index bc457c0..5950ec5 100644
--- a/ipmi.hpp
+++ b/ipmi.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
+#include "flash-ipmi.hpp"
+
 #include <functional>
 
 #include "host-ipmid/ipmid-api.h"
 
-#include "flash-ipmi.hpp"
-
 using IpmiFlashHandler =
     std::function<ipmi_ret_t(UpdateInterface* updater, const uint8_t* reqBuf,
                              uint8_t* replyBuf, size_t* dataLen)>;
diff --git a/main.cpp b/main.cpp
index 961a131..765a0fd 100644
--- a/main.cpp
+++ b/main.cpp
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
+#include "config.h"
+
+#include "flash-ipmi.hpp"
+#include "host-ipmid/oemrouter.hpp"
+#include "ipmi.hpp"
+
 #include <memory>
 
 #include "host-ipmid/ipmid-api.h"
-#include "host-ipmid/oemrouter.hpp"
-
-#include "config.h"
-#include "flash-ipmi.hpp"
-#include "ipmi.hpp"
 
 static constexpr auto stagingPath = STAGING_PATH;
 static constexpr auto hashPath = HASH_PATH;
diff --git a/test/flash_checkverify_unittest.cpp b/test/flash_checkverify_unittest.cpp
index 0f2a513..f55beff 100644
--- a/test/flash_checkverify_unittest.cpp
+++ b/test/flash_checkverify_unittest.cpp
@@ -2,11 +2,12 @@
 
 #include <cstdio>
 #include <fstream>
-#include <gtest/gtest.h>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 class FlashIpmiCheckVerifyTest : public ::testing::Test
 {
   protected:
diff --git a/test/flash_flashabort_unittest.cpp b/test/flash_flashabort_unittest.cpp
index 64039ed..e077aa6 100644
--- a/test/flash_flashabort_unittest.cpp
+++ b/test/flash_flashabort_unittest.cpp
@@ -2,10 +2,11 @@
 
 #include <cstdio>
 #include <cstring>
-#include <gtest/gtest.h>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <string>
 
+#include <gtest/gtest.h>
+
 #define THIRTYTWO_MIB 33554432
 
 using ::testing::IsNull;
diff --git a/test/flash_flashdata_unittest.cpp b/test/flash_flashdata_unittest.cpp
index 17aeeb6..6b12873 100644
--- a/test/flash_flashdata_unittest.cpp
+++ b/test/flash_flashdata_unittest.cpp
@@ -2,11 +2,12 @@
 
 #include <cstdio>
 #include <cstring>
-#include <gtest/gtest.h>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 #define THIRTYTWO_MIB 33554432
 
 class FlashIpmiFlashDataTest : public ::testing::Test
diff --git a/test/flash_flashfinish_unittest.cpp b/test/flash_flashfinish_unittest.cpp
index 84a9e40..cf03864 100644
--- a/test/flash_flashfinish_unittest.cpp
+++ b/test/flash_flashfinish_unittest.cpp
@@ -2,11 +2,12 @@
 
 #include <cstdio>
 #include <cstring>
-#include <gtest/gtest.h>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 #define THIRTYTWO_MIB 33554432
 
 class FlashIpmiFlashDataTest : public ::testing::Test
diff --git a/test/flash_hashdata_unittest.cpp b/test/flash_hashdata_unittest.cpp
index 0a011e5..a438be7 100644
--- a/test/flash_hashdata_unittest.cpp
+++ b/test/flash_hashdata_unittest.cpp
@@ -2,11 +2,12 @@
 
 #include <cstdio>
 #include <cstring>
-#include <gtest/gtest.h>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 #define THIRTYTWO_MIB 33554432
 
 class FlashIpmiHashDataTest : public ::testing::Test
diff --git a/test/flash_hashfinish_unittest.cpp b/test/flash_hashfinish_unittest.cpp
index 2d5e5b0..3bc36b4 100644
--- a/test/flash_hashfinish_unittest.cpp
+++ b/test/flash_hashfinish_unittest.cpp
@@ -2,11 +2,12 @@
 
 #include <cstdio>
 #include <cstring>
-#include <gtest/gtest.h>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <string>
 #include <vector>
 
+#include <gtest/gtest.h>
+
 #define THIRTYTWO_MIB 33554432
 
 class FlashIpmiHashDataTest : public ::testing::Test
diff --git a/test/flash_hashstart_unittest.cpp b/test/flash_hashstart_unittest.cpp
index 3cf46ed..d8c1d24 100644
--- a/test/flash_hashstart_unittest.cpp
+++ b/test/flash_hashstart_unittest.cpp
@@ -1,10 +1,11 @@
 #include "flash-ipmi.hpp"
 
 #include <cstdio>
-#include <gtest/gtest.h>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <string>
 
+#include <gtest/gtest.h>
+
 #define THIRTYTWO_MIB 33554432
 
 TEST(FlashIpmiHashStartTest, OutofSequenceFails)
diff --git a/test/flash_start_unittest.cpp b/test/flash_start_unittest.cpp
index a70359a..8bf4ba1 100644
--- a/test/flash_start_unittest.cpp
+++ b/test/flash_start_unittest.cpp
@@ -1,10 +1,11 @@
 #include "flash-ipmi.hpp"
 
 #include <cstdio>
-#include <gtest/gtest.h>
 #include <sdbusplus/test/sdbus_mock.hpp>
 #include <string>
 
+#include <gtest/gtest.h>
+
 #define THIRTYTWO_MIB 33554432
 
 TEST(FlashIpmiStartTest, VerifiesFieldsAndAction)
diff --git a/test/ipmi_abort_unittest.cpp b/test/ipmi_abort_unittest.cpp
index 671a30c..9c334ec 100644
--- a/test/ipmi_abort_unittest.cpp
+++ b/test/ipmi_abort_unittest.cpp
@@ -1,6 +1,5 @@
 #include "flash-ipmi.hpp"
 #include "ipmi.hpp"
-
 #include "updater_mock.hpp"
 
 #include <gtest/gtest.h>
diff --git a/test/ipmi_flashdata_unittest.cpp b/test/ipmi_flashdata_unittest.cpp
index 9121d97..f4af2a2 100644
--- a/test/ipmi_flashdata_unittest.cpp
+++ b/test/ipmi_flashdata_unittest.cpp
@@ -1,9 +1,9 @@
 #include "flash-ipmi.hpp"
 #include "ipmi.hpp"
-
 #include "updater_mock.hpp"
 
 #include <cstring>
+
 #include <gtest/gtest.h>
 
 using ::testing::ElementsAreArray;
diff --git a/test/ipmi_flashfinish_unittest.cpp b/test/ipmi_flashfinish_unittest.cpp
index 6844776..f28ff56 100644
--- a/test/ipmi_flashfinish_unittest.cpp
+++ b/test/ipmi_flashfinish_unittest.cpp
@@ -1,9 +1,9 @@
 #include "flash-ipmi.hpp"
 #include "ipmi.hpp"
-
 #include "updater_mock.hpp"
 
 #include <cstring>
+
 #include <gtest/gtest.h>
 
 using ::testing::Return;
diff --git a/test/ipmi_hashdata_unittest.cpp b/test/ipmi_hashdata_unittest.cpp
index 17de66c..9725183 100644
--- a/test/ipmi_hashdata_unittest.cpp
+++ b/test/ipmi_hashdata_unittest.cpp
@@ -1,9 +1,9 @@
 #include "flash-ipmi.hpp"
 #include "ipmi.hpp"
-
 #include "updater_mock.hpp"
 
 #include <cstring>
+
 #include <gtest/gtest.h>
 
 using ::testing::ElementsAreArray;
diff --git a/test/ipmi_hashfinish_unittest.cpp b/test/ipmi_hashfinish_unittest.cpp
index 006525d..a0d40b8 100644
--- a/test/ipmi_hashfinish_unittest.cpp
+++ b/test/ipmi_hashfinish_unittest.cpp
@@ -1,9 +1,9 @@
 #include "flash-ipmi.hpp"
 #include "ipmi.hpp"
-
 #include "updater_mock.hpp"
 
 #include <cstring>
+
 #include <gtest/gtest.h>
 
 using ::testing::Return;
diff --git a/test/ipmi_starthash_unittest.cpp b/test/ipmi_starthash_unittest.cpp
index c8db942..695a8ff 100644
--- a/test/ipmi_starthash_unittest.cpp
+++ b/test/ipmi_starthash_unittest.cpp
@@ -1,9 +1,9 @@
 #include "flash-ipmi.hpp"
 #include "ipmi.hpp"
-
 #include "updater_mock.hpp"
 
 #include <cstring>
+
 #include <gtest/gtest.h>
 
 using ::testing::Return;
diff --git a/test/ipmi_starttransfer_unittest.cpp b/test/ipmi_starttransfer_unittest.cpp
index 4bd9e35..2f9f953 100644
--- a/test/ipmi_starttransfer_unittest.cpp
+++ b/test/ipmi_starttransfer_unittest.cpp
@@ -1,9 +1,9 @@
 #include "flash-ipmi.hpp"
 #include "ipmi.hpp"
-
 #include "updater_mock.hpp"
 
 #include <cstring>
+
 #include <gtest/gtest.h>
 
 using ::testing::NotNull;
diff --git a/test/ipmi_startverify_unittest.cpp b/test/ipmi_startverify_unittest.cpp
index 87e818d..a46077a 100644
--- a/test/ipmi_startverify_unittest.cpp
+++ b/test/ipmi_startverify_unittest.cpp
@@ -1,5 +1,4 @@
 #include "ipmi.hpp"
-
 #include "updater_mock.hpp"
 
 #include <gtest/gtest.h>
diff --git a/test/ipmi_verifycheck_unittest.cpp b/test/ipmi_verifycheck_unittest.cpp
index f71155f..309333a 100644
--- a/test/ipmi_verifycheck_unittest.cpp
+++ b/test/ipmi_verifycheck_unittest.cpp
@@ -1,5 +1,4 @@
 #include "ipmi.hpp"
-
 #include "updater_mock.hpp"
 
 #include <gtest/gtest.h>
diff --git a/test/updater_mock.hpp b/test/updater_mock.hpp
index 0fd6683..ce64a54 100644
--- a/test/updater_mock.hpp
+++ b/test/updater_mock.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <gmock/gmock.h>
+#include "flash-ipmi.hpp"
+
 #include <vector>
 
-#include "flash-ipmi.hpp"
+#include <gmock/gmock.h>
 
 class UpdaterMock : public UpdateInterface
 {