diff --git a/.clang-format b/.clang-format
index bef07cd84338..f5d9ba940eeb 100644
--- a/.clang-format
+++ b/.clang-format
@@ -97,7 +97,7 @@ PenaltyReturnTypeOnItsOwnLine: 60
 
 PointerAlignment: Right
 ReflowComments: false
-SortIncludes: false
+SortIncludes: true
 #SortUsingDeclarations: false # Unknown to clang-format-4.0
 SpaceAfterCStyleCast: false
 SpaceAfterTemplateKeyword: false