diff --git a/Makefile b/Makefile
index a955dac7..5645f152 100644
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ clean:
 	rm -f tippecanoe *.o
 
 indent:
-	clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 8, UseTab: Always, AllowShortIfStatementsOnASingleLine: false, ColumnLimit: 0, ContinuationIndentWidth: 8, SpaceAfterCStyleCast: true, IndentCaseLabels: false, AllowShortBlocksOnASingleLine: false, AllowShortFunctionsOnASingleLine: false}" $(C) $(H)
+	clang-format -i -style="{BasedOnStyle: Google, IndentWidth: 8, UseTab: Always, AllowShortIfStatementsOnASingleLine: false, ColumnLimit: 0, ContinuationIndentWidth: 8, SpaceAfterCStyleCast: true, IndentCaseLabels: false, AllowShortBlocksOnASingleLine: false, AllowShortFunctionsOnASingleLine: false, SortIncludes: false}" $(C) $(H)
 
 TESTS = $(wildcard tests/*/out/*.json)
 SPACE = $(NULL) $(NULL)
diff --git a/geometry.cpp b/geometry.cpp
index 88b3f7dd..152f68cf 100644
--- a/geometry.cpp
+++ b/geometry.cpp
@@ -314,8 +314,7 @@ static void decode_clipped(ClipperLib::PolyNode *t, drawvec &out) {
 				}
 			}
 		}
-	nextring:
-		;
+	nextring:;
 	}
 
 	// Then reverse the winding order of any rings that turned out