diff --git a/.clang-format b/.clang-format
index 01d4945e7..f4d9bcfd0 100644
--- a/.clang-format
+++ b/.clang-format
@@ -13,7 +13,7 @@ AllowShortEnumsOnASingleLine: true
 AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: AllIfsAndElse
+AllowShortIfStatementsOnASingleLine: Never
 AllowShortLoopsOnASingleLine: false
 
 AlwaysBreakAfterDefinitionReturnType: All
@@ -45,7 +45,10 @@ Cpp11BracedListStyle: false
 
 # Never format includes
 IncludeBlocks: Preserve
-SortIncludes: Never
+# clang-format version 4.0 through 12.0:
+#SortIncludes: false
+# clang-format version 13.0+:
+#SortIncludes: Never
 
 # No length limit, in case it breaks macros, you can
 # disable it with /* clang-format off/on */ comments