Clean up includes;

src/api/data.c

@@ -1,5 +1,4 @@
 #include "api.h"
-#include "data/data.h"
 #include "data/audioStream.h"
 #include "data/modelData.h"
 #include "data/rasterizer.h"

src/api/filesystem.c

@@ -2,7 +2,6 @@
 #include "filesystem/filesystem.h"
 #include "data/blob.h"
 #include <stdlib.h>
-#include <string.h>
 
 // Returns a Blob, leaving stack unchanged.  The Blob must be released when finished.
 Blob* luax_readblob(lua_State* L, int index, const char* debug) {

src/api/types/modelData.c

@@ -2,8 +2,6 @@
 #include "data/modelData.h"
 #include "math/transform.h"
 #include "math/mat4.h"
-#include "math/quat.h"
-#include "math/vec3.h"
 
 int l_lovrModelDataGetVertexData(lua_State* L) {
   ModelData* modelData = luax_checktype(L, 1, ModelData);

src/api/types/shader.c

@@ -1,5 +1,4 @@
 #include "api.h"
-#include "graphics/graphics.h"
 #include "graphics/shader.h"
 #include "math/transform.h"
 

src/api/types/texture.c

@@ -1,5 +1,4 @@
 #include "api.h"
-#include "graphics/graphics.h"
 
 int l_lovrTextureGetDepth(lua_State* L) {
   Texture* texture = luax_checktypeof(L, 1, Texture);

src/data/data.c

@@ -1,5 +0,0 @@
-#include "data/data.h"
-
-void lovrDataInit() {
-  //
-}

src/data/data.h

@@ -1,3 +0,0 @@
-#pragma once
-
-void lovrDataInit();

src/data/vertexData.c

@@ -1,6 +1,5 @@
 #include "data/vertexData.h"
 #include <string.h>
-#include <stdio.h>
 
 static const size_t attributeTypeSizes[3] = { 4, 1, 4 };
 

src/data/vertexData.h

@@ -1,8 +1,6 @@
-#include "util.h"
 #include "blob.h"
 #include <stdlib.h>
 #include <stdint.h>
-#include <stdbool.h>
 
 #pragma once
 

src/event/event.c

@@ -1,6 +1,7 @@
 #include "event/event.h"
 #include "lib/glfw.h"
 #include <stdlib.h>
+#include <string.h>
 
 static EventState state;
 

src/filesystem/file.c

@@ -1,5 +1,6 @@
 #include "filesystem/file.h"
 #include <physfs.h>
+#include <stdlib.h>
 
 File* lovrFileCreate(const char* path) {
   File* file = lovrAlloc(sizeof(File), lovrFileDestroy);

src/filesystem/filesystem.c

@@ -4,6 +4,7 @@
 #include <physfs.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #ifdef __APPLE__
 #include <mach-o/dyld.h>
 #endif

src/graphics/animator.c

@@ -1,7 +1,9 @@
 #include "graphics/animator.h"
+#include "math/mat4.h"
 #include "math/vec3.h"
 #include "math/quat.h"
 #include <math.h>
+#include <stdlib.h>
 
 static Track* lovrAnimatorEnsureTrack(Animator* animator, const char* animation) {
   Track* track = map_get(&animator->trackMap, animation);

src/graphics/animator.h

@@ -1,7 +1,8 @@
 #include "data/modelData.h"
-#include "math/mat4.h"
+#include "math/math.h"
 #include "util.h"
 #include "lib/map/map.h"
+#include "lib/vec/vec.h"
 #include <stdbool.h>
 
 #pragma once

src/graphics/canvas.c

@@ -1,7 +1,7 @@
 #include "graphics/canvas.h"
 #include "graphics/graphics.h"
-#include "math/mat4.h"
-#include <math.h>
+#include "data/blob.h"
+#include "util.h"
 #include <stdlib.h>
 
 bool lovrCanvasSupportsFormat(TextureFormat format) {

src/graphics/canvas.h

@@ -1,6 +1,5 @@
 #include "graphics/texture.h"
 #include "data/textureData.h"
-#include "util.h"
 #include <stdbool.h>
 
 #pragma once

src/graphics/font.c

@@ -3,8 +3,10 @@
 #include "graphics/texture.h"
 #include "data/rasterizer.h"
 #include "data/textureData.h"
+#include "math/math.h"
 #include "util.h"
 #include <string.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <stdio.h>
 

src/graphics/font.h

@@ -2,7 +2,6 @@
 #include "data/vertexData.h"
 #include "util.h"
 #include "graphics/texture.h"
-#include "math/math.h"
 #include "lib/map/map.h"
 #include <stdint.h>
 

src/graphics/graphics.c

@@ -1,9 +1,9 @@
 #include "graphics/graphics.h"
+#include "data/modelData.h"
 #include "data/textureData.h"
 #include "data/rasterizer.h"
 #include "resources/shaders.h"
 #include "event/event.h"
-#include "filesystem/filesystem.h"
 #include "math/math.h"
 #include "math/mat4.h"
 #include "math/vec3.h"
@@ -12,6 +12,7 @@
 #define _USE_MATH_DEFINES
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 #include <math.h>
 
 static GraphicsState state;

src/graphics/graphics.h

@@ -5,6 +5,7 @@
 #include "graphics/shader.h"
 #include "graphics/texture.h"
 #include "math/math.h"
+#include "util.h"
 #include "lib/glfw.h"
 #include <stdbool.h>
 

src/graphics/material.c

@@ -1,5 +1,5 @@
-#include "graphics/graphics.h"
 #include "graphics/material.h"
+#include <stdlib.h>
 
 Material* lovrMaterialCreate(bool isDefault) {
   Material* material = lovrAlloc(sizeof(Material), lovrMaterialDestroy);

src/graphics/mesh.c

@@ -1,7 +1,9 @@
 #include "graphics/mesh.h"
 #include "graphics/graphics.h"
+#include "math/math.h"
 #include <limits.h>
 #include <stdlib.h>
+#include <string.h>
 #include <stdio.h>
 
 Mesh* lovrMeshCreate(uint32_t count, VertexFormat format, MeshDrawMode drawMode, MeshUsage usage) {

src/graphics/mesh.h

@@ -1,10 +1,10 @@
 #include "graphics/material.h"
 #include "graphics/shader.h"
 #include "data/vertexData.h"
-#include "math/math.h"
 #include "lib/glfw.h"
 #include "lib/map/map.h"
 #include "util.h"
+#include <stdbool.h>
 
 #pragma once
 

src/graphics/model.c

@@ -1,8 +1,12 @@
 #include "graphics/model.h"
 #include "graphics/graphics.h"
+#include "graphics/shader.h"
+#include "data/blob.h"
+#include "data/textureData.h"
+#include "data/vertexData.h"
 #include "math/mat4.h"
-#include "math/vec3.h"
 #include <stdlib.h>
+#include <string.h>
 
 static void renderNode(Model* model, int nodeIndex, int instances) {
   ModelNode* node = &model->modelData->nodes[nodeIndex];

src/graphics/model.h

@@ -4,7 +4,6 @@
 #include "graphics/mesh.h"
 #include "graphics/texture.h"
 #include "math/math.h"
-#include "lib/glfw.h"
 #include "util.h"
 #include <stdbool.h>
 

src/graphics/shader.c

@@ -1,9 +1,10 @@
 #include "graphics/shader.h"
 #include "graphics/graphics.h"
+#include "math/math.h"
 #include "resources/shaders.h"
-#include "math/mat4.h"
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 static UniformType getUniformType(GLenum type, const char* debug) {
   switch (type) {

src/graphics/shader.h

@@ -1,5 +1,4 @@
 #include "graphics/texture.h"
-#include "math/math.h"
 #include "lib/map/map.h"
 #include "lib/glfw.h"
 #include "util.h"

src/graphics/texture.c

@@ -1,5 +1,8 @@
 #include "graphics/texture.h"
 #include "graphics/graphics.h"
+#include "data/blob.h"
+#include "math/math.h"
+#include "lib/vec/vec.h"
 #include <math.h>
 #include <stdlib.h>
 #include <stdio.h>

src/graphics/texture.h

@@ -1,6 +1,7 @@
 #include "data/textureData.h"
 #include "lib/glfw.h"
 #include "util.h"
+#include <stdbool.h>
 
 #pragma once
 

src/headset/openvr.c

@@ -8,7 +8,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
-#include <stdbool.h>
 #ifndef WIN32
 #pragma pack(push, 4)
 #endif

src/lovr.c

@@ -3,6 +3,7 @@
 #include "event/event.h"
 #include "filesystem/filesystem.h"
 #include "graphics/graphics.h"
+#include "headset/headset.h"
 #include "math/math.h"
 #include "physics/physics.h"
 #ifndef EMSCRIPTEN
@@ -14,6 +15,8 @@
 #include "luax.h"
 #include "api.h"
 #include "util.h"
+#include <string.h>
+#include <stdio.h>
 
 #ifdef EMSCRIPTEN
 #include <emscripten.h>

src/math/mat4.c

@@ -2,7 +2,6 @@
 #include "math/quat.h"
 #include "math/vec3.h"
 #include <math.h>
-#include <stdlib.h>
 #include <string.h>
 
 // m0 m4 m8  m12

src/math/math.c

@@ -1,7 +1,7 @@
 #include "math.h"
-#include "math/vec3.h"
+#include "util.h"
 #include <math.h>
-#include <stdlib.h>
+#include <string.h>
 #include <time.h>
 
 static MathState state;

src/math/math.h

@@ -1,5 +1,5 @@
 #include "lib/vec/vec.h"
-#include "randomGenerator.h"
+#include "math/randomGenerator.h"
 #include <stdbool.h>
 
 #pragma once

src/thread/channel.c

@@ -1,7 +1,7 @@
 #include "thread/channel.h"
 #include <math.h>
 #include <stdio.h>
-#include <string.h>
+#include <stdlib.h>
 
 Channel* lovrChannelCreate() {
   Channel* channel = lovrAlloc(sizeof(Channel), lovrChannelDestroy);

src/thread/thread.c

@@ -1,7 +1,5 @@
 #include "thread/thread.h"
-#include "luax.h"
-#include "api.h"
-#include <string.h>
+#include <stdlib.h>
 
 static ThreadState state;
 

src/timer/timer.c

@@ -1,6 +1,7 @@
 #include "timer/timer.h"
 #include "lib/glfw.h"
 #include "util.h"
+#include <string.h>
 
 static TimerState state;
 

src/util.c

@@ -3,7 +3,6 @@
 #include <lauxlib.h>
 #include <lualib.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
 #ifdef _WIN32
 #include <Windows.h>