diff --git a/src/Fl_Gl_Choice.cxx b/src/Fl_Gl_Choice.cxx
index a20924b17..014635e14 100644
--- a/src/Fl_Gl_Choice.cxx
+++ b/src/Fl_Gl_Choice.cxx
@@ -23,7 +23,7 @@
 #  include <stdlib.h>
 #  include "Fl_Gl_Choice.H"
 #  include <FL/Fl_Gl_Window.H>
-#  include <FL/Fl_Gl_Window_Driver.H>
+#  include "Fl_Gl_Window_Driver.H"
 #  include <FL/gl_draw.H>
 #  include "flstring.h"
 #  include <FL/fl_utf8.h>
diff --git a/src/Fl_Gl_Overlay.cxx b/src/Fl_Gl_Overlay.cxx
index b24c1026e..13cbfbac6 100644
--- a/src/Fl_Gl_Overlay.cxx
+++ b/src/Fl_Gl_Overlay.cxx
@@ -22,7 +22,7 @@
 #include <FL/Fl.H>
 #include <FL/gl.h>
 #include <FL/Fl_Gl_Window.H>
-#include <FL/Fl_Gl_Window_Driver.H>
+#include "Fl_Gl_Window_Driver.H"
 #include <stdlib.h>
 
 /**
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx
index 473f022f3..7d4ad1a3f 100644
--- a/src/Fl_Gl_Window.cxx
+++ b/src/Fl_Gl_Window.cxx
@@ -23,7 +23,7 @@ extern int fl_gl_load_plugin;
 
 #include <FL/gl.h>
 #include <FL/Fl_Gl_Window.H>
-#include <FL/Fl_Gl_Window_Driver.H>
+#include "Fl_Gl_Window_Driver.H"
 #include "Fl_Window_Driver.H"
 #include <FL/Fl_Graphics_Driver.H>
 #include <stdlib.h>
diff --git a/FL/Fl_Gl_Window_Driver.H b/src/Fl_Gl_Window_Driver.H
similarity index 100%
rename from FL/Fl_Gl_Window_Driver.H
rename to src/Fl_Gl_Window_Driver.H
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 220d265c4..95788ac98 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -43,7 +43,7 @@ extern "C" {
 #include <FL/Fl_Tooltip.H>
 #include <FL/Fl_Printer.H>
 #include <FL/fl_draw.H>
-#include <FL/Fl_Gl_Window_Driver.H>
+#include "Fl_Gl_Window_Driver.H"
 #include "drivers/Quartz/Fl_Quartz_Graphics_Driver.H"
 #include "drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H"
 #include "drivers/Cocoa/Fl_Cocoa_Screen_Driver.H"
diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
index 302fc7348..66570ae41 100644
--- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
@@ -38,7 +38,7 @@ Fl_OpenGL_Display_Device::Fl_OpenGL_Display_Device(Fl_OpenGL_Graphics_Driver *gr
 }
 
 #ifdef FL_CFG_GFX_QUARTZ
-#include <FL/Fl_Gl_Window_Driver.H>
+#include "../../Fl_Gl_Window_Driver.H"
 
 // convert BGRA to RGB and also exchange top and bottom
 static uchar *convert_BGRA_to_RGB(uchar *baseAddress, int w, int h, int mByteWidth)
diff --git a/src/gl_draw.cxx b/src/gl_draw.cxx
index 38bb4f603..a77c9fa4b 100644
--- a/src/gl_draw.cxx
+++ b/src/gl_draw.cxx
@@ -39,7 +39,7 @@
 #include <FL/gl.h>
 #include <FL/gl_draw.H>
 #include <FL/fl_draw.H>
-#include <FL/Fl_Gl_Window_Driver.H>
+#include "Fl_Gl_Window_Driver.H"
 #include <FL/Fl_Image_Surface.H>
 #include <FL/glu.h>  // for gluUnProject()
 #include <FL/glut.H> // for glutStrokeString() and glutStrokeLength()
diff --git a/src/gl_start.cxx b/src/gl_start.cxx
index 07540f751..18ce99bc9 100644
--- a/src/gl_start.cxx
+++ b/src/gl_start.cxx
@@ -37,7 +37,7 @@
 #include <FL/gl.h>
 class Fl_Gl_Choice;
 #include <FL/Fl_Gl_Window.H>
-#include <FL/Fl_Gl_Window_Driver.H>
+#include "Fl_Gl_Window_Driver.H"
 
 static GLContext context;
 static int clip_state_number=-1;
diff --git a/src/glut_compatibility.cxx b/src/glut_compatibility.cxx
index 38312f5d5..7f3821b77 100644
--- a/src/glut_compatibility.cxx
+++ b/src/glut_compatibility.cxx
@@ -28,7 +28,7 @@
 
 #include "flstring.h"
 #if HAVE_GL
-#  include <FL/Fl_Gl_Window_Driver.H>
+#  include "Fl_Gl_Window_Driver.H"
 #  include "Fl_Screen_Driver.H"
 #  include <FL/glut.H>
 #  define MAXWINDOWS 32