4 files changed, 14 insertions, 12 deletions
diff --git a/src/core/include/engine/core/logging.h b/src/core/include/engine/core/logging.h
index d1c5890..52bb446 100644
--- a/src/core/include/engine/core/logging.h
+++ b/src/core/include/engine/core/logging.h
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "types.h"
+#include <engine/core/types.h>
 
 #if defined __linux__ || defined __APPLE__
 #define TERM_COLOR_RESET "\033[0m"
diff --git a/src/core/include/engine/core/memory.h b/src/core/include/engine/core/memory.h
index 04c24d5..dbdd065 100644
--- a/src/core/include/engine/core/memory.h
+++ b/src/core/include/engine/core/memory.h
@@ -1,8 +1,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-#include "types.h"
-// #include <stdlib.h>
+#include <engine/core/types.h>
 
 typedef struct memory {
   void* data;
diff --git a/src/core/include/engine/core/state.h b/src/core/include/engine/core/state.h
index 13593ed..af94560 100644
--- a/src/core/include/engine/core/state.h
+++ b/src/core/include/engine/core/state.h
@@ -1,7 +1,7 @@
 #ifndef STATE_H
 #define STATE_H
 
-#include <engine/memory.h>
+#include <engine/core/memory.h>
 
 typedef enum StateType {
   STATE_null,
diff --git a/src/core/include/engine/engine.h b/src/core/include/engine/engine.h
index e8a5ace..ba4e227 100644
--- a/src/core/include/engine/engine.h
+++ b/src/core/include/engine/engine.h
@@ -3,14 +3,17 @@
 
 #include <stdbool.h>
 
-#include <engine/input.h>
-#include <engine/logging.h>
-#include <engine/memory.h>
+// TODO: Cleanup the includes, ideally this header file should only include all
+// "public-facing" headers.
+
+#include <engine/core/types.h>
+#include <engine/core/logging.h>
+#include <engine/core/memory.h>
+#include <engine/core/state.h>
+#include <engine/ctrl/input.h>
 #include <engine/resources.h>
-#include <engine/stack.h>
-#include <engine/state.h>
-#include <engine/types.h>
-#include <engine/vector.h>
+#include <engine/utils/stack.h>
+#include <engine/utils/vector.h>
 
 typedef struct {
   u32 texture_id;
@@ -83,7 +86,7 @@ void engine_input_ctx_push(i_ctx* ctx);
 void engine_input_ctx_pop(void);
 void engine_input_ctx_reset(void);
 
-#include "rendering.h"
+#include <engine/rendering/rendering.h>
 
 #ifdef ENGINE_INTERNALS