Adjust includes;

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}

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

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>

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
 

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) {

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>
 

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 = '\\';

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"
 

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>

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>

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>
 

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) {

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>

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>

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>
 

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>

src/modules/graphics/buffer.c

@@ -1,5 +1,4 @@
 #include "graphics/buffer.h"
-#include "util.h"
 
 size_t lovrBufferGetSize(Buffer* buffer) {
   return buffer->size;

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>
 

src/modules/graphics/material.h

@@ -1,5 +1,5 @@
 #include "data/modelData.h"
-#include "util.h"
+#include "core/util.h"
 
 #pragma once
 

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;

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>

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__)

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>

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>

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>

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>

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>
 

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 {