8 files changed, 5 insertions, 12 deletions
diff --git a/src/common/Arena.hpp b/src/common/Arena.hpp
index b5e1eb7..0f2273a 100644
--- a/src/common/Arena.hpp
+++ b/src/common/Arena.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
+#include <vector>
 #include <cstddef>
 #include <cstdint>
 #include <cassert>
 
-#include <vector>
-
 
 class Arena {
 public:
diff --git a/src/common/Font.cpp b/src/common/Font.cpp
index 8f058ca..e3595e9 100644
--- a/src/common/Font.cpp
+++ b/src/common/Font.cpp
@@ -1,4 +1,4 @@
-#include <common/Font.hpp>
+#include "common/Font.hpp"
 
 #include <fstream>
 #include <iostream>
diff --git a/src/common/Font.hpp b/src/common/Font.hpp
index 876b03a..27c2480 100644
--- a/src/common/Font.hpp
+++ b/src/common/Font.hpp
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <common/defs.hpp>
 #include <stb_truetype.h>
 
 #include <memory>
diff --git a/src/common/MemoryManager.cpp b/src/common/MemoryManager.cpp
index d4fd068..285535b 100644
--- a/src/common/MemoryManager.cpp
+++ b/src/common/MemoryManager.cpp
@@ -1,4 +1,4 @@
-#include <common/MemoryManager.hpp>
+#include "common/MemoryManager.hpp"
 
 std::vector<std::u32string> MemoryManager::s_frame_string32s;
 
diff --git a/src/common/MemoryManager.hpp b/src/common/MemoryManager.hpp
index 59c31d7..c8c7de0 100644
--- a/src/common/MemoryManager.hpp
+++ b/src/common/MemoryManager.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include <common/defs.hpp>
-
 #include <string>
 #include <vector>
+#include <cstdint>
 
 
 using String32Id = uint32_t;
diff --git a/src/common/defs.hpp b/src/common/defs.hpp
index 007d560..8bdfd52 100644
--- a/src/common/defs.hpp
+++ b/src/common/defs.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <cassert>
-#include <cstdint>
 
 
 #define ARRAY_COUNT(x) (sizeof(x) / sizeof(x[0]))
diff --git a/src/common/math.cpp b/src/common/math.cpp
index ba54f3a..4873301 100644
--- a/src/common/math.cpp
+++ b/src/common/math.cpp
@@ -1,4 +1,4 @@
-#include <common/math.hpp>
+#include "common/math.hpp"
 
 
 /* V2ST */
diff --git a/src/common/math.hpp b/src/common/math.hpp
index de856e8..afbda1a 100644
--- a/src/common/math.hpp
+++ b/src/common/math.hpp
@@ -1,8 +1,5 @@
 #pragma once
 
-
-#include <common/defs.hpp>
-
 #include <cstddef>
 #include <cstdint>