diff --git a/.clang-format b/.clang-format
index 9381b501f1..e2fc2068a9 100644
--- a/.clang-format
+++ b/.clang-format
@@ -77,3 +77,4 @@ PenaltyExcessCharacter: 100
 Standard: Cpp11
 ContinuationIndentWidth: 8
 RemoveParentheses: ReturnStatement
+RemoveSemicolon: true
diff --git a/.clang-format.headers b/.clang-format.headers
index 4043abbd46..8a4f06661d 100644
--- a/.clang-format.headers
+++ b/.clang-format.headers
@@ -65,3 +65,4 @@ PenaltyExcessCharacter: 100
 Standard: Cpp11
 ContinuationIndentWidth: 8
 RemoveParentheses: ReturnStatement
+RemoveSemicolon: true