diff --git a/src/audio/audio.c b/src/audio/audio.c
index 5cddea21..32249d19 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -1,10 +1,8 @@
 #include "audio/audio.h"
-#include "loaders/source.h"
 #include "math/vec3.h"
 #include "math/quat.h"
 #include "util.h"
 #include <stdlib.h>
-#include <math.h>
 
 static AudioState state;
 
diff --git a/src/audio/source.c b/src/audio/source.c
index 4912c437..131ceb50 100644
--- a/src/audio/source.c
+++ b/src/audio/source.c
@@ -1,8 +1,8 @@
 #include "audio/source.h"
 #include "loaders/source.h"
-#include <float.h>
 #define _USE_MATH_DEFINES
 #include <math.h>
+#include <stdlib.h>
 
 static ALenum lovrSourceGetFormat(Source* source) {
   int channels = source->sourceData->channels;
diff --git a/src/filesystem/filesystem.c b/src/filesystem/filesystem.c
index c852be3c..bb27efad 100644
--- a/src/filesystem/filesystem.c
+++ b/src/filesystem/filesystem.c
@@ -3,6 +3,7 @@
 #include <physfs.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #ifdef __APPLE__
 #include <mach-o/dyld.h>
 #endif
diff --git a/src/graphics/skybox.h b/src/graphics/skybox.h
index 21757f4b..a0649847 100644
--- a/src/graphics/skybox.h
+++ b/src/graphics/skybox.h
@@ -1,5 +1,5 @@
 #include "filesystem/blob.h"
-#include "lib/glfw.h"
+#include "lib/glad/glad.h"
 #include "util.h"
 
 #pragma once
diff --git a/src/loaders/model.c b/src/loaders/model.c
index 03dcd709..b59c4ec2 100644
--- a/src/loaders/model.c
+++ b/src/loaders/model.c
@@ -1,8 +1,11 @@
 #include "loaders/model.h"
 #include "math/mat4.h"
 #include <stdlib.h>
-#include <assimp/scene.h>
 #include <assimp/cimport.h>
+#include <assimp/scene.h>
+#include <assimp/mesh.h>
+#include <assimp/matrix4x4.h>
+#include <assimp/vector3.h>
 #include <assimp/postprocess.h>
 
 static void assimpNodeTraversal(ModelNode* node, struct aiNode* assimpNode) {
diff --git a/src/loaders/texture.h b/src/loaders/texture.h
index 65477d9e..5a193860 100644
--- a/src/loaders/texture.h
+++ b/src/loaders/texture.h
@@ -1,5 +1,6 @@
 #include "filesystem/blob.h"
-#include "lib/glfw.h"
+#include "lib/glad/glad.h"
+#include <stddef.h>
 #include <stdint.h>
 
 #pragma once
diff --git a/src/math/mat4.c b/src/math/mat4.c
index d4128e95..f0a2b925 100644
--- a/src/math/mat4.c
+++ b/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
diff --git a/src/math/quat.c b/src/math/quat.c
index 85a58f3b..0ae24c7c 100644
--- a/src/math/quat.c
+++ b/src/math/quat.c
@@ -1,7 +1,6 @@
 #include "math/quat.h"
 #include "math/vec3.h"
 #include <math.h>
-#include <stdlib.h>
 
 quat quat_init(quat q, quat r) {
   return quat_set(q, r[0], r[1], r[2], r[3]);
diff --git a/src/math/transform.c b/src/math/transform.c
index 0845e783..b88aea06 100644
--- a/src/math/transform.c
+++ b/src/math/transform.c
@@ -1,5 +1,6 @@
 #include "transform.h"
 #include "math/mat4.h"
+#include <stdlib.h>
 
 Transform* lovrTransformCreate(mat4 transfrom) {
   Transform* transform = lovrAlloc(sizeof(Transform), lovrTransformDestroy);
diff --git a/src/math/vec3.c b/src/math/vec3.c
index 45665a29..00f3ea50 100644
--- a/src/math/vec3.c
+++ b/src/math/vec3.c
@@ -1,6 +1,5 @@
 #include "math/vec3.h"
 #include <math.h>
-#include <stdlib.h>
 
 vec3 vec3_init(vec3 v, vec3 u) {
   return vec3_set(v, u[0], u[1], u[2]);