diff --git a/.clang-format b/.clang-format
index ba40986..5af7937 100644
--- a/.clang-format
+++ b/.clang-format
@@ -44,11 +44,15 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ Q_FOREACH,  BOOST_FOREACH ]
+IncludeBlocks: Regroup
+
 IncludeCategories:
-  - Regex:           '^<(BeastConfig)'
-    Priority:        0
-  - Regex:           '^<(ripple)/'
+  - Regex:           '^<xrpl/.*>'
     Priority:        2
+  - Regex:           '^<(test)/'
+    Priority:        1
+  - Regex:           '^<.*\.h>'
+    Priority:        0
   - Regex:           '^<(boost)/'
     Priority:        3
   - Regex:           '.*'
diff --git a/src/ValidatorKeys.cpp b/src/ValidatorKeys.cpp
index 0cd8a26..7e2f6f4 100644
--- a/src/ValidatorKeys.cpp
+++ b/src/ValidatorKeys.cpp
@@ -20,15 +20,17 @@
 
 #include <ValidatorKeys.h>
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/base64.h>
-#include <ripple/json/json_reader.h>
-#include <ripple/json/to_string.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/Sign.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/json/json_reader.h>
+#include <xrpl/json/to_string.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Sign.h>
+
 #include <boost/algorithm/clamp.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/regex.hpp>
+
 #include <fstream>
 
 namespace ripple {
diff --git a/src/ValidatorKeys.h b/src/ValidatorKeys.h
index 327fdab..3741c45 100644
--- a/src/ValidatorKeys.h
+++ b/src/ValidatorKeys.h
@@ -18,9 +18,11 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/KeyType.h>
-#include <ripple/protocol/SecretKey.h>
+#include <xrpl/protocol/KeyType.h>
+#include <xrpl/protocol/SecretKey.h>
+
 #include <boost/optional.hpp>
+
 #include <cstdint>
 #include <string>
 #include <vector>
diff --git a/src/ValidatorKeysTool.cpp b/src/ValidatorKeysTool.cpp
index a12daea..a899234 100644
--- a/src/ValidatorKeysTool.cpp
+++ b/src/ValidatorKeysTool.cpp
@@ -18,14 +18,14 @@
 */
 //==============================================================================
 
+#include <ValidatorKeys.h>
 #include <ValidatorKeysTool.h>
 
-#include <ValidatorKeys.h>
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/beast/core/SemanticVersion.h>
+#include <xrpl/beast/unit_test.h>
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/base64.h>
-#include <ripple/beast/core/SemanticVersion.h>
-#include <ripple/beast/unit_test.h>
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 #include <boost/preprocessor/stringize.hpp>
diff --git a/src/ValidatorKeysTool.h b/src/ValidatorKeysTool.h
index d69ff99..90ce4cb 100644
--- a/src/ValidatorKeysTool.h
+++ b/src/ValidatorKeysTool.h
@@ -19,6 +19,7 @@
 //==============================================================================
 
 #include <boost/optional.hpp>
+
 #include <vector>
 
 namespace boost {
diff --git a/src/test/KeyFileGuard.h b/src/test/KeyFileGuard.h
index 9683dbe..842c092 100644
--- a/src/test/KeyFileGuard.h
+++ b/src/test/KeyFileGuard.h
@@ -17,8 +17,10 @@
 */
 //==============================================================================
 
-#include <ripple/beast/unit_test.h>
+#include <xrpl/beast/unit_test.h>
+
 #include <boost/filesystem.hpp>
+
 #include <fstream>
 
 namespace ripple {
diff --git a/src/test/ValidatorKeysTool_test.cpp b/src/test/ValidatorKeysTool_test.cpp
index 8ff3aa3..4bf6aaf 100644
--- a/src/test/ValidatorKeysTool_test.cpp
+++ b/src/test/ValidatorKeysTool_test.cpp
@@ -17,11 +17,13 @@
 */
 //==============================================================================
 
-#include <ripple/protocol/SecretKey.h>
 #include <ValidatorKeys.h>
 #include <ValidatorKeysTool.h>
+
 #include <test/KeyFileGuard.h>
 
+#include <xrpl/protocol/SecretKey.h>
+
 namespace ripple {
 
 namespace tests {
diff --git a/src/test/ValidatorKeys_test.cpp b/src/test/ValidatorKeys_test.cpp
index 0352a7d..0299275 100644
--- a/src/test/ValidatorKeys_test.cpp
+++ b/src/test/ValidatorKeys_test.cpp
@@ -17,13 +17,15 @@
 */
 //==============================================================================
 
-#include <ripple/basics/StringUtilities.h>
-#include <ripple/basics/base64.h>
-#include <ripple/protocol/HashPrefix.h>
-#include <ripple/protocol/Sign.h>
 #include <ValidatorKeys.h>
+
 #include <test/KeyFileGuard.h>
 
+#include <xrpl/basics/StringUtilities.h>
+#include <xrpl/basics/base64.h>
+#include <xrpl/protocol/HashPrefix.h>
+#include <xrpl/protocol/Sign.h>
+
 namespace ripple {
 
 namespace tests {