Shift around glfw includes;

src/graphics/font.c

@@ -11,6 +11,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 
+#include "graphics/opengl/opengl.h"
+
 static float* lovrFontAlignLine(float* x, float* lineEnd, float width, HorizontalAlign halign) {
   while(x < lineEnd) {
     if (halign == ALIGN_CENTER) {

src/graphics/graphics.c

@@ -13,6 +13,8 @@
 #include <string.h>
 #include <math.h>
 
+#include "graphics/opengl/opengl.h"
+
 static GraphicsState state;
 
 static void onCloseWindow(GLFWwindow* window) {

src/graphics/opengl/gpu.c

@@ -3,7 +3,6 @@
 #include "resources/shaders.h"
 #include "data/modelData.h"
 #include "math/mat4.h"
-#include "lib/glfw.h"
 #include <string.h>
 
 #define MAX_TEXTURES 16

src/graphics/opengl/opengl.h

@@ -3,12 +3,18 @@
 #include "graphics/canvas.h"
 #include "graphics/mesh.h"
 #include "util.h"
-#include "lib/glfw.h"
 #include "lib/map/map.h"
 #include <stdint.h>
 
 #pragma once
 
+#if EMSCRIPTEN
+#include <GLES3/gl3.h>
+#include <GLES2/gl2ext.h>
+#else
+#include "lib/glad/glad.h"
+#endif
+
 #define LOVR_SHADER_POSITION 0
 #define LOVR_SHADER_NORMAL 1
 #define LOVR_SHADER_TEX_COORD 2

src/headset/openvr.c

@@ -17,6 +17,8 @@
 #pragma pack(pop)
 #endif
 
+#include "graphics/opengl/opengl.h"
+
 // From openvr_capi.h
 extern intptr_t VR_InitInternal(EVRInitError *peError, EVRApplicationType eType);
 extern void VR_ShutdownInternal();

src/lib/glfw.h

@@ -4,11 +4,5 @@
 #define APIENTRY __stdcall
 #endif
 
-#if EMSCRIPTEN
-#define GLFW_INCLUDE_ES3
-#define GLFW_INCLUDE_GLEXT
-#else
-#include "glad/glad.h"
-#endif
-
+#define GLFW_INCLUDE_NONE
 #include <GLFW/glfw3.h>