diff --git a/src/game_object/twn_linux_game_object.c b/src/game_object/twn_linux_game_object.c
index 2a4be2f..1fadfdc 100644
--- a/src/game_object/twn_linux_game_object.c
+++ b/src/game_object/twn_linux_game_object.c
@@ -1,6 +1,7 @@
 #include "twn_game_object_c.h"
 #include "twn_engine_context_c.h"
 #include "twn_util_c.h"
+#include "twn_util.h"
 
 #include <x-watcher.h>
 #include <SDL2/SDL.h>
diff --git a/src/game_object/twn_win32_game_object.c b/src/game_object/twn_win32_game_object.c
index a9f3ec3..4958afa 100644
--- a/src/game_object/twn_win32_game_object.c
+++ b/src/game_object/twn_win32_game_object.c
@@ -1,6 +1,7 @@
 #include "twn_game_object_c.h"
 #include "twn_engine_context_c.h"
 #include "twn_util_c.h"
+#include "twn_util.h"
 
 #include <errhandlingapi.h>
 #include <libloaderapi.h>
diff --git a/src/rendering/twn_draw_c.h b/src/rendering/twn_draw_c.h
index 6ac464f..55a5e43 100644
--- a/src/rendering/twn_draw_c.h
+++ b/src/rendering/twn_draw_c.h
@@ -3,7 +3,6 @@
 
 #include "twn_textures_c.h"
 #include "twn_text_c.h"
-#include "twn_util.h"
 #include "twn_option.h"
 
 #include <SDL2/SDL.h>
diff --git a/src/rendering/twn_fog.c b/src/rendering/twn_fog.c
index fdf9eef..2b27756 100644
--- a/src/rendering/twn_fog.c
+++ b/src/rendering/twn_fog.c
@@ -1,6 +1,5 @@
 #include "twn_draw.h"
 #include "twn_draw_c.h"
-#include "twn_util.h"
 
 #include <stdbool.h>
 
diff --git a/src/rendering/twn_gl_any_rendering.c b/src/rendering/twn_gl_any_rendering.c
index 982e04c..fc9817a 100644
--- a/src/rendering/twn_gl_any_rendering.c
+++ b/src/rendering/twn_gl_any_rendering.c
@@ -1,6 +1,4 @@
 #include "twn_draw_c.h"
-#include "twn_engine_context_c.h"
-#include "twn_util_c.h"
 
 #ifdef EMSCRIPTEN
 #include <GLES2/gl2.h>
diff --git a/src/rendering/twn_rects.c b/src/rendering/twn_rects.c
index df66c74..7d6bf04 100644
--- a/src/rendering/twn_rects.c
+++ b/src/rendering/twn_rects.c
@@ -1,10 +1,6 @@
 #include "twn_draw.h"
 #include "twn_draw_c.h"
 #include "twn_engine_context_c.h"
-#include "twn_util.h"
-#include "twn_util_c.h"
-#include "twn_textures_c.h"
-#include "twn_option.h"
 
 #include <stb_ds.h>
 
diff --git a/src/twn_audio.c b/src/twn_audio.c
index 9bea886..9a78ddf 100644
--- a/src/twn_audio.c
+++ b/src/twn_audio.c
@@ -2,6 +2,7 @@
 #include "twn_engine_context_c.h"
 #include "twn_util.h"
 #include "twn_util_c.h"
+#include "twn_audio.h"
 
 #include <SDL2/SDL.h>
 #include <stb_ds.h>
diff --git a/src/twn_audio_c.h b/src/twn_audio_c.h
index cc3fa76..01f6b1b 100644
--- a/src/twn_audio_c.h
+++ b/src/twn_audio_c.h
@@ -1,8 +1,6 @@
 #ifndef TWN_AUDIO_C_H
 #define TWN_AUDIO_C_H
 
-#include "twn_audio.h"
-
 #include <SDL2/SDL_audio.h>
 
 #define STB_VORBIS_HEADER_ONLY
diff --git a/src/twn_input.c b/src/twn_input.c
index b90e1e3..f8920cb 100644
--- a/src/twn_input.c
+++ b/src/twn_input.c
@@ -1,7 +1,9 @@
 #include "twn_input_c.h"
 #include "twn_util.h"
+#include "twn_util_c.h"
 #include "twn_control.h"
 #include "twn_engine_context_c.h"
+#include "twn_input.h"
 
 #include <SDL2/SDL.h>
 #include <stb_ds.h>
diff --git a/src/twn_input_c.h b/src/twn_input_c.h
index c30ec5f..df7ebb3 100644
--- a/src/twn_input_c.h
+++ b/src/twn_input_c.h
@@ -1,11 +1,12 @@
 #ifndef TWN_INPUT_C_H
 #define TWN_INPUT_C_H
 
-#include "twn_input.h"
-#include "twn_vec.h"
+#include "twn_types.h"
 
 #include <SDL2/SDL.h>
 
+#include <stdbool.h>
+
 
 #define KEYBIND_SLOTS_DEFAULT 3
 
diff --git a/src/twn_textures_c.h b/src/twn_textures_c.h
index 081d1f4..62ae179 100644
--- a/src/twn_textures_c.h
+++ b/src/twn_textures_c.h
@@ -1,7 +1,7 @@
 #ifndef TWN_TEXTURES_C_H
 #define TWN_TEXTURES_C_H
 
-#include "twn_util.h"
+#include "twn_types.h"
 #include "twn_texture_modes.h"
 #include "rendering/twn_gpu_texture_c.h"