clang-format: Set Bitcoin Core IncludeCategories

diff --git a/src/.clang-format b/src/.clang-format
index dd3f1070..bef63e64 100644
--- a/src/.clang-format
+++ b/src/.clang-format
@@ -99,17 +99,20 @@ IfMacros:
   - KJ_IF_MAYBE
 IncludeBlocks:   Preserve
 IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+  - Regex:           '^<bitcoin-build-config\.h>'
+    Priority:        -1
+    CaseSensitive:   true
+  - Regex:           '^<boost/'
     Priority:        2
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    CaseSensitive:   true
+  - Regex:           '^<Q'
+    Priority:        2
+    CaseSensitive:   true
+  - Regex:           '^<[^>.]*>'
     Priority:        3
-    SortPriority:    0
     CaseSensitive:   false
   - Regex:           '.*'
     Priority:        1
-    SortPriority:    0
     CaseSensitive:   false
 IncludeIsMainRegex: '(Test)?$'
 IncludeIsMainSourceRegex: ''
diff --git a/src/test/blockchain_tests.cpp b/src/test/blockchain_tests.cpp
index 5da2841c..23556884 100644
--- a/src/test/blockchain_tests.cpp
+++ b/src/test/blockchain_tests.cpp
@@ -2,8 +2,6 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <boost/test/unit_test.hpp>
-
 #include <chain.h>
 #include <node/blockstorage.h>
 #include <rpc/blockchain.h>
@@ -11,6 +9,8 @@
 #include <test/util/setup_common.h>
 #include <util/string.h>
 
+#include <boost/test/unit_test.hpp>
+
 #include <cstdlib>
 
 using util::ToString;