From 53fea46fed8e075b7b0d3fe78dd3e1d4bc79ad02 Mon Sep 17 00:00:00 2001
From: Seth Hillbrand <seth@kipro-pcb.com>
Date: Wed, 19 Oct 2022 20:03:13 -0700
Subject: [PATCH] Re-order headers to avoid X11 None def

X.h helpfully defines the word "None" because surely no one would ever
use that as a token, right?  Right?
---
 common/gal/opengl/opengl_gal.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/common/gal/opengl/opengl_gal.cpp b/common/gal/opengl/opengl_gal.cpp
index 21010c2521..2ecab198a3 100644
--- a/common/gal/opengl/opengl_gal.cpp
+++ b/common/gal/opengl/opengl_gal.cpp
@@ -32,8 +32,6 @@
 #define GL_SILENCE_DEPRECATION 1
 #endif
 
-#include <gl_utils.h>
-
 #include <advanced_config.h>
 #include <gal/opengl/opengl_gal.h>
 #include <gal/opengl/utils.h>
@@ -53,6 +51,8 @@
 #include <profile.h>
 #include <trace_helpers.h>
 
+#include <gl_utils.h>
+
 #include <functional>
 #include <limits>
 #include <memory>