diff --git a/.clang-format b/.clang-format
index 0aa74c9d..db8aa6c4 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,34 +1,39 @@
 BasedOnStyle:  WebKit
 Language:        Cpp
 AlignAfterOpenBracket: true
 AlwaysBreakTemplateDeclarations: true
 AllowShortFunctionsOnASingleLine: Inline
 BreakBeforeBraces: Linux
 ColumnLimit: 0
 CommentPragmas:  '^ (FALLTHROUGH|krazy:) '
 Standard:        Cpp11
 IndentWidth:     4
 TabWidth:        4
 UseTab:          Never
 PointerAlignment: Right
 SpacesInParentheses: false
 SpacesInAngles:  false
 SpacesInCStyleCastParentheses: false
 SpaceAfterControlStatementKeyword: true
 SpaceBeforeAssignmentOperators: true
 ContinuationIndentWidth: 4
-#IncludeBlocks: Regroup
+SortIncludes: true
+
+# IncludeBlocks:
+#  I'd like to set this to "Regroup", but that leads some false-positives in the commit-hook.
+#  See: https://bugs.llvm.org/show_bug.cgi?id=39327
+IncludeBlocks: Preserve
 IncludeCategories:
 # include order:
 # 1. "config-kpa-xxx.h"
 # 2. "MAIN_HEADER.h"
 # 3. KPA-includes
 # 4. other includes
   - Regex:           '^<(DB|Utilities|ThumbnailView|AnnotationDialog|BackgroundJobs|BackgroundTaskManager|Browser|CategoryListView|DateBar|Exif|HTMLGenerator|ImageManager|ImportExport|MainWindow|MainWindow/DuplicateMerger|Plugins|Settings|Viewer|XMLDB)/'
     Priority:        2
   - Regex:           '^(</)'
     Priority:        3
   - Regex:           '^"config-kpa'
     Priority:        -1
   - Regex:           '^"'
     Priority:        1
diff --git a/dev/scripts/clang-format-all.sh b/dev/scripts/clang-format-all.sh
index 0b2de1df..f9bf24f7 100755
--- a/dev/scripts/clang-format-all.sh
+++ b/dev/scripts/clang-format-all.sh
@@ -1,26 +1,27 @@
 #!/bin/bash
 # Apply clang-format in-place to all source files
-# Note: AndroidRemoteControl is excluded for now:
+# Note: AndroidRemoteControl is excluded for now because clang-format would butcher the symlinks.
 
-clang-format -i \
-	DB/*.{cpp,h} \
-	Utilities/*.{cpp,h} \
-	ThumbnailView/*.{cpp,h} \
+clang-format -style=file -i \
 	AnnotationDialog/*.{cpp,h} \
 	BackgroundJobs/*.{cpp,h} \
 	BackgroundTaskManager/*.{cpp,h} \
 	Browser/*.{cpp,h} \
 	CategoryListView/*.{cpp,h} \
 	DateBar/*.{cpp,h} \
+	DB/*.{cpp,h} \
 	Exif/*.{cpp,h} \
 	HTMLGenerator/*.{cpp,h} \
 	ImageManager/*.{cpp,h} \
 	ImportExport/*.{cpp,h} \
 	MainWindow/*.{cpp,h} \
 	MainWindow/DuplicateMerger/*.{cpp,h} \
 	Map/*.{cpp,h} \
 	Plugins/*.{cpp,h} \
 	RemoteControl/*.{cpp,h} \
 	Settings/*.{cpp,h} \
+	ThumbnailView/*.{cpp,h} \
+	Utilities/*.{cpp,h} \
 	Viewer/*.{cpp,h} \
-	XMLDB/*.{cpp,h}
+	XMLDB/*.{cpp,h} \
+	main.cpp