diff --git a/.clang-format b/.clang-format
index 17d370f..113030c 100644
--- a/.clang-format
+++ b/.clang-format
@@ -47,12 +47,21 @@
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
 IncludeCategories: 
+
+  - Regex:           '^[<"](crow)'
+    Priority:        5
+  - Regex:           '^[<"](boost)'
+    Priority:        6
+  - Regex:           '^[<"](gtest|gmock)'
+    Priority:        7
   - Regex:           '^<.*\.h>'
     Priority:        1
-  - Regex:           '^<.*'
+  - Regex:           '^<.*\.hpp>'
     Priority:        2
-  - Regex:           '.*'
+  - Regex:           '^<.*'
     Priority:        3
+  - Regex:           '.*'
+    Priority:        4
 IndentCaseLabels: true
 IndentWidth:     2
 IndentWrappedFunctionNames: false