10 files changed, 33 insertions, 30 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index c6adabf..a9e2b6d 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -9,4 +9,7 @@ add_library(daw_core
   src/state.c
   )
 
-target_include_directories(daw_core PRIVATE include)
+set_property(SOURCE src/loop.c APPEND PROPERTY OBJECT_DEPENDS ${GLAD_HEADER})
+
+target_include_directories(daw_core PRIVATE ${DAW_INCLUDE_DIRS})
+target_link_libraries(daw_core PRIVATE cglm)
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
 
diff --git a/src/core/src/dltools.c b/src/core/src/dltools.c
index 1e43b79..d27c4ff 100644
--- a/src/core/src/dltools.c
+++ b/src/core/src/dltools.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include <stdbool.h>
 
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
 /* include winapi */
@@ -6,8 +7,8 @@
 #include <dlfcn.h>
 #endif
 
-#include <engine/dltools.h>
-#include <engine/logging.h>
+#include <engine/core/dltools.h>
+#include <engine/core/logging.h>
 
 bool dynamic_library_close(void* shared_library) {
 #if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
diff --git a/src/core/src/logging.c b/src/core/src/logging.c
index 7870258..94782ac 100644
--- a/src/core/src/logging.c
+++ b/src/core/src/logging.c
@@ -1,5 +1,5 @@
-#include <engine/logging.h>
-#include <engine/types.h>
+#include <engine/core/logging.h>
+#include <engine/core/types.h>
 #include <stdlib.h>
 
 char* itoa(i32 x) {
diff --git a/src/core/src/loop.c b/src/core/src/loop.c
index 79e0c0c..837d193 100644
--- a/src/core/src/loop.c
+++ b/src/core/src/loop.c
@@ -25,14 +25,12 @@
 #endif
 
 #define ENGINE_INTERNALS
-#include <engine/btree.h>
 #include <engine/engine.h>
-#include <engine/hashmap.h>
-#include <engine/list.h>
+#include <engine/utils/btree.h>
+#include <engine/utils/hashmap.h>
+#include <engine/utils/list.h>
 
-#include <engine/state.h>
-// #include <states/titlescreen.h>
-// #include <states/gameover.h>
+#include <engine/core/state.h>
 
 #define DEFAULT_NUM_PROCS 8
 
diff --git a/src/core/src/memory.c b/src/core/src/memory.c
index f19803e..7a51a0d 100644
--- a/src/core/src/memory.c
+++ b/src/core/src/memory.c
@@ -2,9 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <engine/logging.h>
-
-#include <engine/memory.h>
+#include <engine/core/logging.h>
+#include <engine/core/memory.h>
 
 memory* memory_new(usize max_size) {
   memory* m = malloc(sizeof(memory));
diff --git a/src/core/src/state.c b/src/core/src/state.c
index 55f2a12..a2af5e1 100644
--- a/src/core/src/state.c
+++ b/src/core/src/state.c
@@ -1,9 +1,9 @@
 #include <string.h>
 
-#include <engine/dltools.h>
-#include <engine/input.h>
-#include <engine/logging.h>
-#include <engine/state.h>
+#include <engine/core/dltools.h>
+#include <engine/core/logging.h>
+#include <engine/core/state.h>
+#include <engine/ctrl/input.h>
 
 typedef StateType state_update_t(void*);