diff --git a/Makefile b/Makefile
index 2bc60f8..58cff27 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ all: build_core build_src compress_assets
 
 # Sub Makefiles
 SOURCE_DIR = src
-CORE_DIR = core/src
+CORE_DIR = core
 ASSETS_DIR = assets
 
 include $(CORE_DIR)/Makefile
diff --git a/src/Makefile b/src/Makefile
index 952b193..b2d2670 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -11,7 +11,7 @@ SOURCES := \
 # Compiler and flags
 SRC_CC = gcc
 SRC_CFLAGS = -Wall -Wextra -std=c17 -g
-SRC_INCLUDE_DIRS = $(SOURCE_DIR)/headers $(SOURCE_DIR)/ecs/headers $(SOURCE_DIR)/ecs/components/headers $(CORE_DIR)/headers
+SRC_INCLUDE_DIRS = $(SOURCE_DIR)/headers $(SOURCE_DIR)/ecs/headers $(SOURCE_DIR)/ecs/components/headers $(CORE_DIR)/$(CORE_SRC_DIR)/headers
 SRC_LDFLAGS =
 
 # Deduce objects