diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..39ba352
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,20 @@
+# <project>/.clang-format
+BasedOnStyle: LLVM
+IndentWidth: 2
+TabWidth: 2
+UseTab: Never
+
+# Stop collapsing things to one line
+AllowShortFunctionsOnASingleLine: None       # or 'Empty' if you want only {} allowed
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortBlocksOnASingleLine: false
+
+SortIncludes: true
+IncludeBlocks: Merge
+IncludeCategories:
+  - Regex: '^".*"'
+    Priority: 1
+  - Regex: '^<.*>'
+    Priority: 2
diff --git a/.gitignore b/.gitignore
index 511ece8..a4ac81a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 .cache
 compile_commands.json
-.clang-format
 
 build/
 obj/
diff --git a/src/debug.c b/src/debug.c
index ec06ba3..711a425 100644
--- a/src/debug.c
+++ b/src/debug.c
@@ -1,8 +1,7 @@
 #include "debug.h"
-#include <stdio.h>
-
 #include "chunk.h"
 #include "value.h"
+#include <stdio.h>
 
 void disassembleChunk(Chunk *chunk, const char *name) {
   printf("== %s ==\n", name);
diff --git a/src/value.c b/src/value.c
index 5ec70ea..20b5110 100644
--- a/src/value.c
+++ b/src/value.c
@@ -1,7 +1,6 @@
-#include <stdio.h>
-
-#include "memory.h"
 #include "value.h"
+#include "memory.h"
+#include <stdio.h>
 
 void initValueArray(ValueArray *array) {
   array->values = NULL;