diff --git a/Makefile b/Makefile
index 34388d5..0763bd7 100644
--- a/Makefile
+++ b/Makefile
@@ -19,14 +19,12 @@ SRC = src/engine/engine.c \
 	src/components/camera_follow.c \
 	src/components/fixed_to_cam.c \
 	src/components/parallax_component.c \
-	src/components/controllable_component.c \
 	src/components/friction_component.c \
 	src/components/friction_giver.c \
 	src/components/clickable_component.c \
 	src/components/input_component.c \
 	src/components/tag_component.c \
 	src/components/tooltip_component.c \
-	src/components/controllers/keyboard_controller.c \
 	src/components/renderers/sprite_renderer.c \
 	src/components/renderers/anim_renderer.c \
 	src/components/renderers/text_renderer.c \
@@ -45,7 +43,6 @@ SRC = src/engine/engine.c \
 	src/systems/camera_follow_system.c \
 	src/systems/collision_system.c \
 	src/systems/parallax_system.c \
-	src/systems/controllers/keyboard_controller_system.c \
 	src/systems/friction_system.c \
 	src/systems/tooltip_system.c \
 	src/systems/clickable_system.c \
diff --git a/include/map_utils.h b/include/map_utils.h
index 6713266..91f0531 100644
--- a/include/map_utils.h
+++ b/include/map_utils.h
@@ -11,7 +11,6 @@
 
 #define ANGLE_X 25
 #define ANGLE_Y 35
-#define ADD_VALUE 10
 
 struct tile *get_tile_from_pos(struct vertex_component *map, gc_vector2 pos);
 gc_vector2 gc_vector2_from_coords(float x, float y, float z);
diff --git a/src/components/camera_follow.c b/src/components/camera_follow.c
index 2e58aea..a058248 100644
--- a/src/components/camera_follow.c
+++ b/src/components/camera_follow.c
@@ -7,10 +7,6 @@
 
 #include "xml.h"
 #include "component.h"
-#include "components/controllable_component.h"
-#include "components/camerafollow_component.h"
-#include "utility.h"
-#include <stdlib.h>
 
 static void ctr(void *component, va_list args)
 {
diff --git a/src/systems/movable_system.c b/src/systems/movable_system.c
index 094dbb9..9047dfb 100644
--- a/src/systems/movable_system.c
+++ b/src/systems/movable_system.c
@@ -7,16 +7,10 @@
 
 #include "entity.h"
 #include "system.h"
-#include "vector2.h"
 #include "utility.h"
 #include "components/movable_component.h"
 #include "components/collision_component.h"
 #include "components/transform_component.h"
-#include "components/renderer.h"
-#include "systems/movable_system.h"
-#include <stddef.h>
-
-#include "components/controllable_component.h"
 
 void clamp_vel(struct movable_component *mov, struct collision_component *col)
 {