diff --git a/.clang-format b/.clang-format
index 0fbebd89184..4d31ab6ad1e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -12,7 +12,7 @@
 ---
 BasedOnStyle: LLVM
 AlignConsecutiveMacros: AcrossComments
-AllowShortBlocksOnASingleLine: false
+AllowShortBlocksOnASingleLine: Never
 AllowShortCaseLabelsOnASingleLine: false
 AllowShortEnumsOnASingleLine: false
 AllowShortFunctionsOnASingleLine: None
@@ -79,7 +79,7 @@ IndentCaseLabels: false
 IndentWidth: 8
 InsertBraces: true
 SpaceBeforeParens: ControlStatementsExceptControlMacros
-SortIncludes: false
+SortIncludes: Never
 UseTab: Always
 WhitespaceSensitiveMacros:
   - STRINGIFY