diff --git a/build.sh b/build.sh
index f89c522..b93fadd 100755
--- a/build.sh
+++ b/build.sh
@@ -2,4 +2,4 @@
 CFLAGS=${CFLAGS:-"-fsanitize=address -ggdb"}
 CC=${CC:-gcc}
 set -x
-${CC} -DDEBUG -pipe  -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -std=gnu2x $CFLAGS src/*c
+${CC} -DDEBUG -pipe  -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -std=gnu2x $CFLAGS src/*c src/base/*c
diff --git a/src/base/arena.c b/src/base/arena.c
index 8b7a1a9..6c221fd 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -1,5 +1,5 @@
 #include "arena.h"
-#include "base_core.h"
+#include "core.h"
 #include "platform.h"
 
 
diff --git a/src/base/arena.h b/src/base/arena.h
index 49d699d..0147dd4 100644
--- a/src/base/arena.h
+++ b/src/base/arena.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "base_core.h"
+#include "core.h"
 
 
 typedef U32 ArenaFlags;
diff --git a/src/base/marena.h b/src/base/marena.h
index 47cf0f3..c356194 100644
--- a/src/base/marena.h
+++ b/src/base/marena.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "base_core.h"
+#include "core.h"
 
 // Mini Arena for arena allocations from a supplied buffer
 
diff --git a/src/base/platform.c b/src/base/platform.c
index 9f50b9e..fa5a2b7 100644
--- a/src/base/platform.c
+++ b/src/base/platform.c
@@ -1,4 +1,4 @@
-#include "base_core.h"
+#include "core.h"
 #include "platform.h"
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/base/platform.h b/src/base/platform.h
index f7932dd..6526d85 100644
--- a/src/base/platform.h
+++ b/src/base/platform.h
@@ -1,6 +1,6 @@
 #pragma once
 #include <stdlib.h>
-#include "base_core.h"
+#include "core.h"
 
 void *platform_malloc(size_t size);
 void platform_free(void *mem);
diff --git a/src/base/pool.h b/src/base/pool.h
index 79bf65a..d21dc1f 100644
--- a/src/base/pool.h
+++ b/src/base/pool.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "base_core.h"
+#include "core.h"
 
 typedef union APoolElement APoolElement;
 union APoolElement {
diff --git a/src/base/string.h b/src/base/string.h
index 1bcfad7..a7ee836 100644
--- a/src/base/string.h
+++ b/src/base/string.h
@@ -1,5 +1,5 @@
 #pragma once
-#include "base_core.h"
+#include "core.h"
 
 typedef struct Str Str;
 struct Str {
diff --git a/src/main.c b/src/main.c
index 14fc202..c785523 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,9 +1,9 @@
-#include "base_core.h"
-#include "arena.h"
-#include "mini_arena.h"
-#include "platform.h"
-#include "pool.h"
-#include "string.h"
+#include "base/core.h"
+#include "base/arena.h"
+#include "base/marena.h"
+#include "base/platform.h"
+#include "base/pool.h"
+#include "base/string.h"
 #include <stdio.h>
 #include <stdlib.h>