diff --git a/.clang-format b/.clang-format
index b9adbf55848311365da9464ec060dbe9ba40716c..9564df548e90078bbe9cbbd684889495121cc11d 100644
--- a/.clang-format
+++ b/.clang-format
@@ -37,7 +37,22 @@ DerivePointerAlignment: false
 DisableFormat: false
 ExperimentalAutoDetectBinPacking: false
 FixNamespaceComments: true
-IncludeBlocks: Preserve
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '^("|<)Cbm'
+    Priority:        1
+  - Regex:           '^("|<)Fair'
+    Priority:        2
+  - Regex:           '^("|<)T'
+    Priority:        3
+  - Regex:           '^("|<)boost'
+    Priority:        4
+  - Regex:           '^<.*[^\.h]>'
+    Priority:        5
+  - Regex:           '^<.*>'
+    Priority:        6
+  - Regex:           '.*'
+    Priority:        7
 IndentCaseLabels: true
 IndentPPDirectives: None
 IndentWidth: 2