diff --git a/CMakeLists.txt b/CMakeLists.txt
index caa333b1..8acb45b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -314,7 +314,7 @@ endif()
 
 set_target_properties(lovr PROPERTIES C_VISIBILITY_PRESET default)
 set_target_properties(lovr PROPERTIES C_STANDARD 99)
-target_include_directories(lovr PRIVATE src src/core src/modules)
+target_include_directories(lovr PRIVATE src src/modules)
 target_link_libraries(lovr
   ${LOVR_ENET}
   ${LOVR_GLFW}
diff --git a/Tuprules.tup b/Tuprules.tup
index c98564b0..1212ee96 100644
--- a/Tuprules.tup
+++ b/Tuprules.tup
@@ -19,7 +19,6 @@ CFLAGS += -fvisibility=hidden
 
 # Include paths
 CFLAGS += -I$(ROOT)/src
-CFLAGS += -I$(ROOT)/src/core
 CFLAGS += -I$(ROOT)/src/modules
 
 # Modules
diff --git a/src/api/api.c b/src/api/api.c
index e484337c..55e483ca 100644
--- a/src/api/api.c
+++ b/src/api/api.c
@@ -1,7 +1,7 @@
 #include "api.h"
-#include "util.h"
 #include "core/ref.h"
 #include "core/platform.h"
+#include "core/util.h"
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdbool.h>
diff --git a/src/api/api.h b/src/api/api.h
index d2891fb7..bee496ea 100644
--- a/src/api/api.h
+++ b/src/api/api.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "core/hash.h"
-#include "util.h"
+#include "core/util.h"
 
 #pragma once
 
diff --git a/src/api/l_curve.c b/src/api/l_curve.c
index 543628ab..4d3eec3d 100644
--- a/src/api/l_curve.c
+++ b/src/api/l_curve.c
@@ -1,6 +1,6 @@
 #include "api.h"
-#include "util.h"
 #include "math/curve.h"
+#include "core/util.h"
 #include <stdlib.h>
 
 static int l_lovrCurveEvaluate(lua_State* L) {
diff --git a/src/api/l_event.c b/src/api/l_event.c
index a0d2355a..c2d6bdc7 100644
--- a/src/api/l_event.c
+++ b/src/api/l_event.c
@@ -1,9 +1,9 @@
 #include "api.h"
-#include "util.h"
 #include "event/event.h"
 #include "thread/thread.h"
 #include "core/platform.h"
 #include "core/ref.h"
+#include "core/util.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/api/l_filesystem.c b/src/api/l_filesystem.c
index 877c0ac2..b4c625dc 100644
--- a/src/api/l_filesystem.c
+++ b/src/api/l_filesystem.c
@@ -2,10 +2,10 @@
 #include "filesystem/filesystem.h"
 #include "data/blob.h"
 #include "core/fs.h"
+#include "core/platform.h"
 #include "core/ref.h"
 #include <stdlib.h>
 #include <string.h>
-#include "platform.h"
 
 #ifdef _WIN32
 const char lovrDirSep = '\\';
diff --git a/src/api/l_lovr.c b/src/api/l_lovr.c
index 67b57aa6..4fdc0fa9 100644
--- a/src/api/l_lovr.c
+++ b/src/api/l_lovr.c
@@ -1,6 +1,6 @@
 #include "api.h"
-#include "util.h"
-#include "platform.h"
+#include "core/util.h"
+#include "core/platform.h"
 #include "lib/lua-cjson/lua_cjson.h"
 #include "lib/lua-enet/enet.h"
 
diff --git a/src/main.c b/src/main.c
index 104cbde0..b6070fa9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,7 +1,7 @@
 #include "resources/boot.lua.h"
 #include "api/api.h"
-#include "platform.h"
-#include "util.h"
+#include "core/platform.h"
+#include "core/util.h"
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/modules/audio/audio.c b/src/modules/audio/audio.c
index 890f5bd9..337010fc 100644
--- a/src/modules/audio/audio.c
+++ b/src/modules/audio/audio.c
@@ -4,7 +4,7 @@
 #include "core/arr.h"
 #include "core/maf.h"
 #include "core/ref.h"
-#include "util.h"
+#include "core/util.h"
 #include <stdlib.h>
 #include <AL/al.h>
 #include <AL/alc.h>
diff --git a/src/modules/audio/microphone.c b/src/modules/audio/microphone.c
index e0fed947..8aae5010 100644
--- a/src/modules/audio/microphone.c
+++ b/src/modules/audio/microphone.c
@@ -2,7 +2,7 @@
 #include "audio/audio.h"
 #include "data/soundData.h"
 #include "core/ref.h"
-#include "util.h"
+#include "core/util.h"
 #include <AL/al.h>
 #include <AL/alc.h>
 
diff --git a/src/modules/data/audioStream.c b/src/modules/data/audioStream.c
index f26f74bf..6fe5197d 100644
--- a/src/modules/data/audioStream.c
+++ b/src/modules/data/audioStream.c
@@ -1,8 +1,8 @@
 #include "data/audioStream.h"
 #include "data/blob.h"
 #include "core/ref.h"
+#include "core/util.h"
 #include "lib/stb/stb_vorbis.h"
-#include "util.h"
 #include <stdlib.h>
 
 AudioStream* lovrAudioStreamInit(AudioStream* stream, Blob* blob, size_t bufferSize) {
diff --git a/src/modules/data/modelData.h b/src/modules/data/modelData.h
index ba6be249..f1fb9629 100644
--- a/src/modules/data/modelData.h
+++ b/src/modules/data/modelData.h
@@ -1,5 +1,5 @@
-#include "util.h"
 #include "core/map.h"
+#include "core/util.h"
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
diff --git a/src/modules/data/soundData.c b/src/modules/data/soundData.c
index 325d4739..a11a0a14 100644
--- a/src/modules/data/soundData.c
+++ b/src/modules/data/soundData.c
@@ -1,6 +1,6 @@
 #include "data/soundData.h"
 #include "data/audioStream.h"
-#include "util.h"
+#include "core/util.h"
 #include "lib/stb/stb_vorbis.h"
 #include <limits.h>
 #include <stdlib.h>
diff --git a/src/modules/data/textureData.h b/src/modules/data/textureData.h
index 71ff107e..57b1574d 100644
--- a/src/modules/data/textureData.h
+++ b/src/modules/data/textureData.h
@@ -1,5 +1,5 @@
 #include "data/blob.h"
-#include "util.h"
+#include "core/util.h"
 #include <stdint.h>
 #include <stdbool.h>
 
diff --git a/src/modules/event/event.c b/src/modules/event/event.c
index 819e820e..08a2d452 100644
--- a/src/modules/event/event.c
+++ b/src/modules/event/event.c
@@ -1,6 +1,6 @@
 #include "event/event.h"
-#include "platform.h"
 #include "core/arr.h"
+#include "core/platform.h"
 #include "core/ref.h"
 #include "core/util.h"
 #include <stdlib.h>
diff --git a/src/modules/graphics/buffer.c b/src/modules/graphics/buffer.c
index 3a29f453..409030dc 100644
--- a/src/modules/graphics/buffer.c
+++ b/src/modules/graphics/buffer.c
@@ -1,5 +1,4 @@
 #include "graphics/buffer.h"
-#include "util.h"
 
 size_t lovrBufferGetSize(Buffer* buffer) {
   return buffer->size;
diff --git a/src/modules/graphics/graphics.h b/src/modules/graphics/graphics.h
index c9512a13..4107f74d 100644
--- a/src/modules/graphics/graphics.h
+++ b/src/modules/graphics/graphics.h
@@ -1,8 +1,8 @@
 #include "graphics/font.h"
 #include "data/modelData.h"
 #include "core/maf.h"
-#include "util.h"
-#include "platform.h"
+#include "core/platform.h"
+#include "core/util.h"
 #include <stdbool.h>
 #include <stdint.h>
 
diff --git a/src/modules/graphics/material.h b/src/modules/graphics/material.h
index 083ad5ae..60667c0f 100644
--- a/src/modules/graphics/material.h
+++ b/src/modules/graphics/material.h
@@ -1,5 +1,5 @@
 #include "data/modelData.h"
-#include "util.h"
+#include "core/util.h"
 
 #pragma once
 
diff --git a/src/modules/headset/headset.c b/src/modules/headset/headset.c
index 9a9e044d..6b09ba73 100644
--- a/src/modules/headset/headset.c
+++ b/src/modules/headset/headset.c
@@ -1,5 +1,5 @@
 #include "headset/headset.h"
-#include "util.h"
+#include "core/util.h"
 
 HeadsetInterface* lovrHeadsetDriver = NULL;
 HeadsetInterface* lovrHeadsetTrackingDrivers = NULL;
diff --git a/src/modules/headset/leap.c b/src/modules/headset/leap.c
index 6e9b7c0f..9c85b301 100644
--- a/src/modules/headset/leap.c
+++ b/src/modules/headset/leap.c
@@ -1,7 +1,7 @@
 #include "headset/headset.h"
-#include "platform.h"
-#include "util.h"
 #include "core/maf.h"
+#include "core/platform.h"
+#include "core/util.h"
 #include "lib/tinycthread/tinycthread.h"
 #include <LeapC.h>
 #include <stdlib.h>
diff --git a/src/modules/headset/oculus_mobile.c b/src/modules/headset/oculus_mobile.c
index 79ef8106..a9a251df 100644
--- a/src/modules/headset/oculus_mobile.c
+++ b/src/modules/headset/oculus_mobile.c
@@ -1,13 +1,13 @@
 #include "headset/headset.h"
 #include "oculus_mobile_bridge.h"
-#include "math.h"
 #include "graphics/graphics.h"
 #include "graphics/canvas.h"
+#include "core/platform.h"
 #include "lib/glad/glad.h"
+#include <android/log.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <android/log.h>
-#include "platform.h"
+#include <math.h>
 
 #define LOG(...)  __android_log_print(ANDROID_LOG_DEBUG, "LOVR", __VA_ARGS__)
 #define INFO(...) __android_log_print(ANDROID_LOG_INFO,  "LOVR", __VA_ARGS__)
diff --git a/src/modules/headset/openvr.c b/src/modules/headset/openvr.c
index 8d00cdd6..d596dcba 100644
--- a/src/modules/headset/openvr.c
+++ b/src/modules/headset/openvr.c
@@ -8,8 +8,8 @@
 #include "graphics/graphics.h"
 #include "graphics/canvas.h"
 #include "core/maf.h"
+#include "core/platform.h"
 #include "core/ref.h"
-#include "platform.h"
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/modules/math/math.c b/src/modules/math/math.c
index 9b2bd4fd..8af81ea2 100644
--- a/src/modules/math/math.c
+++ b/src/modules/math/math.c
@@ -2,8 +2,8 @@
 #include "math/randomGenerator.h"
 #include "core/maf.h"
 #include "core/ref.h"
+#include "core/util.h"
 #include "lib/noise1234/noise1234.h"
-#include "util.h"
 #include <math.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/modules/math/randomGenerator.c b/src/modules/math/randomGenerator.c
index 808c84d2..4513a061 100644
--- a/src/modules/math/randomGenerator.c
+++ b/src/modules/math/randomGenerator.c
@@ -1,6 +1,6 @@
 #include "math/randomGenerator.h"
 #include "core/ref.h"
-#include "util.h"
+#include "core/util.h"
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/modules/thread/channel.c b/src/modules/thread/channel.c
index e66901ba..5d19702e 100644
--- a/src/modules/thread/channel.c
+++ b/src/modules/thread/channel.c
@@ -2,7 +2,7 @@
 #include "event/event.h"
 #include "core/arr.h"
 #include "core/ref.h"
-#include "util.h"
+#include "core/util.h"
 #include "lib/tinycthread/tinycthread.h"
 #include <stdlib.h>
 #include <stddef.h>
diff --git a/src/modules/thread/thread.c b/src/modules/thread/thread.c
index 44b1d9ed..f102c71b 100644
--- a/src/modules/thread/thread.c
+++ b/src/modules/thread/thread.c
@@ -4,7 +4,7 @@
 #include "core/hash.h"
 #include "core/map.h"
 #include "core/ref.h"
-#include "util.h"
+#include "core/util.h"
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/modules/timer/timer.c b/src/modules/timer/timer.c
index a9c89a7b..7ce4d1d2 100644
--- a/src/modules/timer/timer.c
+++ b/src/modules/timer/timer.c
@@ -1,5 +1,5 @@
 #include "timer/timer.h"
-#include "platform.h"
+#include "core/platform.h"
 #include <string.h>
 
 static struct {