diff --git a/source/frontends/sdl/CMakeLists.txt b/source/frontends/sdl/CMakeLists.txt
index c4567774..a0ffc2b2 100644
--- a/source/frontends/sdl/CMakeLists.txt
+++ b/source/frontends/sdl/CMakeLists.txt
@@ -83,7 +83,7 @@ target_sources(sa2 PRIVATE
   imgui/settingshelper.h
   imgui/sdlsettings.h
   imgui/imconfig.h
-  imgui/gles.h
+  imgui/glselector.h
 
   ${IMGUI_PATH}/imgui.h
   ${IMGUI_PATH}/imgui.cpp
diff --git a/source/frontends/sdl/imgui/gles.h b/source/frontends/sdl/imgui/glselector.h
similarity index 95%
rename from source/frontends/sdl/imgui/gles.h
rename to source/frontends/sdl/imgui/glselector.h
index 27088b49..5cfff4e1 100644
--- a/source/frontends/sdl/imgui/gles.h
+++ b/source/frontends/sdl/imgui/glselector.h
@@ -7,6 +7,8 @@
 // "Supported versions are: 1.00 ES"
 
 #include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+
 #define SA2_CONTEXT_FLAGS 0
 #define SA2_CONTEXT_PROFILE_MASK SDL_GL_CONTEXT_PROFILE_ES
 #define SA2_CONTEXT_MAJOR_VERSION 2
@@ -16,9 +18,6 @@
 #define SA2_IMAGE_FORMAT_INTERNAL   GL_BGRA_EXT
 #define SA2_IMAGE_FORMAT            GL_BGRA_EXT
 
-// this is used in all cases for GL_BGRA_EXT
-#include <GLES2/gl2ext.h>
-
 #elif defined(IMGUI_IMPL_OPENGL_ES3)
 
 // Pi4 with Fake KMS
@@ -29,7 +28,11 @@
 // "OpenGL ES 3.1 Mesa 20.2.6"
 // "Supported versions are: 1.00 ES, 3.00 ES, and 3.10 ES"
 
+// "310 es" is accepted on a Pi4, but the imgui shaders do not compile
+
 #include <GLES3/gl3.h>
+#include <GLES2/gl2ext.h>
+
 #define SA2_CONTEXT_FLAGS 0
 #define SA2_CONTEXT_PROFILE_MASK SDL_GL_CONTEXT_PROFILE_ES
 #define SA2_CONTEXT_MAJOR_VERSION 3
@@ -39,13 +42,10 @@
 #define SA2_IMAGE_FORMAT_INTERNAL   GL_BGRA_EXT
 #define SA2_IMAGE_FORMAT            GL_BGRA_EXT
 
-// "310 es" is accepted on a Pi4, but the imgui shaders do not compile
-// this is used in all cases for GL_BGRA_EXT
-#include <GLES2/gl2ext.h>
-
 #elif defined(__APPLE__)
 
 #include <SDL_opengl.h>
+
 #define SA2_CONTEXT_FLAGS SDL_GL_CONTEXT_FORWARD_COMPATIBLE_FLAG
 #define SA2_CONTEXT_PROFILE_MASK SDL_GL_CONTEXT_PROFILE_CORE
 #define SA2_CONTEXT_MAJOR_VERSION 3
@@ -57,6 +57,7 @@
 #else
 
 #include <SDL_opengl.h>
+
 #define SA2_CONTEXT_FLAGS 0
 #define SA2_CONTEXT_PROFILE_MASK SDL_GL_CONTEXT_PROFILE_CORE
 #define SA2_CONTEXT_MAJOR_VERSION 3
@@ -67,7 +68,6 @@
 
 #endif
 
-
 #include "imgui.h"
 #include "imgui_impl_sdl.h"
 #include "imgui_impl_opengl3.h"
diff --git a/source/frontends/sdl/imgui/image.h b/source/frontends/sdl/imgui/image.h
index 19aedbd3..b0778edb 100644
--- a/source/frontends/sdl/imgui/image.h
+++ b/source/frontends/sdl/imgui/image.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <cstddef>
-#include "frontends/sdl/imgui/gles.h"
+#include "frontends/sdl/imgui/glselector.h"
 
 namespace sa2
 {
diff --git a/source/frontends/sdl/imgui/sdlimguiframe.h b/source/frontends/sdl/imgui/sdlimguiframe.h
index c9df2dd2..b18472f5 100644
--- a/source/frontends/sdl/imgui/sdlimguiframe.h
+++ b/source/frontends/sdl/imgui/sdlimguiframe.h
@@ -2,7 +2,7 @@
 
 #include "frontends/sdl/sdlframe.h"
 #include "frontends/sdl/imgui/sdlsettings.h"
-#include "frontends/sdl/imgui/gles.h"
+#include "frontends/sdl/imgui/glselector.h"
 
 namespace common2
 {
diff --git a/source/frontends/sdl/imgui/sdlsettings.h b/source/frontends/sdl/imgui/sdlsettings.h
index d3920ec7..7e2f1327 100644
--- a/source/frontends/sdl/imgui/sdlsettings.h
+++ b/source/frontends/sdl/imgui/sdlsettings.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "frontends/sdl/imgui/gles.h"
+#include "frontends/sdl/imgui/glselector.h"
 #include "frontends/sdl/sdirectsound.h"
 #include "Debugger/Debug.h"
 #include "Debugger/Debugger_Console.h"
diff --git a/source/frontends/sdl/imgui/settingshelper.cpp b/source/frontends/sdl/imgui/settingshelper.cpp
index 7d1b0007..c1ef383f 100644
--- a/source/frontends/sdl/imgui/settingshelper.cpp
+++ b/source/frontends/sdl/imgui/settingshelper.cpp
@@ -8,7 +8,7 @@
 #include "Tfe/tfe.h"
 #include "frontends/sdl/imgui/settingshelper.h"
 
-#include "frontends/sdl/imgui/gles.h"
+#include "frontends/sdl/imgui/glselector.h"
 #include "imgui_internal.h"