Move Fl_Window_Driver.H from FL/ to src/

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12974 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

33 files changed, 257 insertions, 53 deletions

diff --git a/src/Fl.cxx b/src/Fl.cxx
index 381d7394c..b7ca2ebb7 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -21,7 +21,7 @@
 #include <FL/Fl.H>
 #include <FL/platform.H>
 #include <FL/Fl_Screen_Driver.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_System_Driver.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Tooltip.H>
diff --git a/src/Fl_Double_Window.cxx b/src/Fl_Double_Window.cxx
index 54421c191..cd58f63e5 100644
--- a/src/Fl_Double_Window.cxx
+++ b/src/Fl_Double_Window.cxx
@@ -23,7 +23,7 @@
 #include <FL/platform.H>
 #include <FL/Fl_Double_Window.H>
 #include <FL/fl_draw.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 
 // On systems that support double buffering "naturally" the base
 // Fl_Window class will probably do double-buffer and this subclass
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx
index acb9df1e6..f0ff9dc8b 100644
--- a/src/Fl_Gl_Window.cxx
+++ b/src/Fl_Gl_Window.cxx
@@ -24,7 +24,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/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_Graphics_Driver.H>
 #include <stdlib.h>
 #include <FL/fl_utf8.h>
@@ -704,7 +704,7 @@ void* Fl_WinAPI_Gl_Window_Driver::GetProcAddress(const char *procName) {
 #include <FL/platform.H>
 #include "Fl_Gl_Choice.H"
 #include <FL/Fl_Screen_Driver.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 
 Fl_Gl_Window_Driver *Fl_Gl_Window_Driver::newGlWindowDriver(Fl_Gl_Window *w)
 {
diff --git a/src/Fl_Group.cxx b/src/Fl_Group.cxx
index 9754766d2..db829d949 100644
--- a/src/Fl_Group.cxx
+++ b/src/Fl_Group.cxx
@@ -22,7 +22,7 @@
 // handling is designed so windows themselves work correctly.
 
 #include <FL/Fl_Group.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_Rect.H>
 #include <FL/fl_draw.H>
 
diff --git a/src/Fl_Menu_Window.cxx b/src/Fl_Menu_Window.cxx
index 2010295fd..c6a04ad16 100644
--- a/src/Fl_Menu_Window.cxx
+++ b/src/Fl_Menu_Window.cxx
@@ -24,7 +24,7 @@
 // can be used to dismiss the menus.
 
 #include <FL/Fl_Menu_Window.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 
 void Fl_Menu_Window::show() {
   Fl_Window_Driver::driver(this)->show_menu();
diff --git a/src/Fl_Overlay_Window.cxx b/src/Fl_Overlay_Window.cxx
index b5e755bdf..5b7c90313 100644
--- a/src/Fl_Overlay_Window.cxx
+++ b/src/Fl_Overlay_Window.cxx
@@ -23,7 +23,7 @@
 
 #include <FL/Fl.H>
 #include <FL/Fl_Overlay_Window.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 
 
 Fl_Overlay_Window::Fl_Overlay_Window(int W, int H, const char *l)
diff --git a/src/Fl_Screen_Driver.cxx b/src/Fl_Screen_Driver.cxx
index e154fd5bf..713732395 100644
--- a/src/Fl_Screen_Driver.cxx
+++ b/src/Fl_Screen_Driver.cxx
@@ -30,7 +30,7 @@
 #include <FL/Fl_Group.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Input.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_Image_Surface.H>
 #include <FL/Fl_Box.H>
 #include <FL/Fl_Tooltip.H>
diff --git a/src/Fl_Widget_Surface.cxx b/src/Fl_Widget_Surface.cxx
index 1b6e98e53..431ef73b6 100644
--- a/src/Fl_Widget_Surface.cxx
+++ b/src/Fl_Widget_Surface.cxx
@@ -20,7 +20,7 @@
 #include <FL/fl_draw.H>
 #include <FL/Fl.H>
 #include <FL/platform.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_Screen_Driver.H>
 
 
diff --git a/src/Fl_Window.cxx b/src/Fl_Window.cxx
index f8b25042c..433c09781 100644
--- a/src/Fl_Window.cxx
+++ b/src/Fl_Window.cxx
@@ -24,7 +24,7 @@
 #include <config.h>
 #include <FL/Fl.H>
 #include <FL/platform.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_RGB_Image.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Tooltip.H>
diff --git a/src/Fl_Window_Driver.H b/src/Fl_Window_Driver.H
new file mode 100644
index 000000000..a695d422e
--- /dev/null
+++ b/src/Fl_Window_Driver.H
@@ -0,0 +1,204 @@
+//
+// "$Id$"
+//
+// A base class for platform specific window handling code
+// for the Fast Light Tool Kit (FLTK).
+//
+// Copyright 2010-2018 by Bill Spitzak and others.
+//
+// This library is free software. Distribution and use rights are outlined in
+// the file "COPYING" which should have been included with this file.  If this
+// file is missing or damaged, see the license at:
+//
+//     http://www.fltk.org/COPYING.php
+//
+// Please report all bugs and problems on the following page:
+//
+//     http://www.fltk.org/str.php
+//
+
+/**
+ \cond DriverDev
+ \addtogroup DriverDeveloper
+ \{
+ */
+
+/** \file Fl_Window_Driver.H
+ \brief declaration of class Fl_Window_Driver.
+*/
+
+#ifndef FL_WINDOW_DRIVER_H
+#define FL_WINDOW_DRIVER_H
+
+#include <FL/Fl_Export.H>
+#include <FL/Fl_Window.H>
+#include <FL/Fl_Overlay_Window.H>
+
+#include <stdlib.h>
+
+class Fl_X;
+class Fl_Image;
+class Fl_RGB_Image;
+
+/**
+ \brief A base class for platform specific window handling code.
+
+ This class is only for internal use by the FLTK library.
+ 
+ When porting FLTK to a new platform, many mothods in this class provide
+ a minimal default implementation. Some methods must be overridden to make
+ sure that the Graphics Driver will draw into the bitmap associated with
+ this window.
+*/
+class FL_EXPORT Fl_Window_Driver
+{
+  friend class Fl_Window;
+  friend class Fl_X;
+private:
+  static bool is_a_rescale_; // true when a top-level window is being rescaled
+
+protected:
+  Fl_Window *pWindow;
+  struct shape_data_type;
+  shape_data_type *shape_data_; ///< non-null means the window has a non-rectangular shape
+  void flush_Fl_Window(); // accessor to protected Fl_Window::flush()
+public:
+  Fl_Window_Driver(Fl_Window *);
+  virtual ~Fl_Window_Driver();
+  static Fl_Window_Driver *newWindowDriver(Fl_Window *);
+  int wait_for_expose_value;
+  Fl_Offscreen other_xid; // offscreen bitmap (overlay and double-buffered windows)
+  virtual int screen_num();
+  virtual void screen_num(int) {}
+  static bool is_a_rescale() {return is_a_rescale_;};
+
+
+  // --- frequently used accessors to public window data
+  /** returns the x coordinate of the window. */
+  int x() const { return pWindow->x(); }
+  /** returns the y coordinate of the window. */
+  int y() const { return pWindow->y(); }
+  /** returns the width of the window. */
+  int w() const { return pWindow->w(); }
+  /** returns the height of the window. */
+  int h() const { return pWindow->h(); }
+  /** returns whether the window has a border. */
+  int border() const { return pWindow->border(); }
+  /** returns whether the window itself is visible(). */
+  int visible() const { return pWindow->visible(); }
+  /** returns whether the window and all its parents are visible(). */
+  int visible_r() const { return pWindow->visible_r(); }
+  /** returns whether the window is shown(). */
+  int shown() const { return pWindow->shown(); }
+  /** returns the parent of the window. */
+  Fl_Group *parent() const { return pWindow->parent(); }
+
+  // --- accessors to private window data
+  int minw();
+  int minh();
+  int maxw();
+  int maxh();
+  int dw();
+  int dh();
+  int aspect();
+  int fullscreen_screen_top();
+  int fullscreen_screen_bottom();
+  int fullscreen_screen_left();
+  int fullscreen_screen_right();
+  unsigned char size_range_set();
+  int force_position();
+  void force_position(int c);
+  void x(int X);
+  void y(int Y);
+  void current(Fl_Window *c);
+  char show_iconic() { return Fl_Window::show_iconic_; }
+  void show_iconic(char c) { Fl_Window::show_iconic_ = c; }
+  void i(Fl_X *x) { pWindow->i = x; }
+  /** for an Fl_Overlay_Window, returns the value of its overlay_ member variable */
+  Fl_Window *overlay() {
+    return pWindow->as_overlay_window() ? pWindow->as_overlay_window()->overlay_ : NULL;
+  }
+  /** for an Fl_Overlay_Window, sets the value of its overlay_ member variable */
+  void overlay(Fl_Window *o) {
+    if (pWindow->as_overlay_window()) pWindow->as_overlay_window()->overlay_ = o;
+  }
+  
+  void resize_after_scale_change(int ns, float old_f, float new_f);
+
+  // --- window data
+  virtual int decorated_w() { return w(); } // default, should be overidden by driver
+  virtual int decorated_h() { return h(); }
+
+  // --- window management
+  virtual void take_focus();
+  virtual void flush(); // the default implementation may be enough
+  virtual void flush_double();
+  virtual void flush_overlay();
+  virtual void flush_menu();
+  virtual void erase_menu() {}
+  /** Usable for platform-specific code executed before the platform-independent part of Fl_Window::draw() */
+  virtual void draw_begin();
+  /** Usable for platform-specific code executed after the platform-independent part of Fl_Window::draw() */
+  virtual void draw_end();
+  void draw();
+  virtual void make_current();
+  virtual void label(const char *name, const char *mininame);
+
+  virtual Fl_X *makeWindow() { return 0; }
+  virtual void wait_for_expose();
+  virtual void destroy_double_buffer();
+  virtual void show();
+  virtual void show_menu();
+  virtual void resize(int X,int Y,int W,int H) {}
+  virtual void hide() {}
+  int hide_common();
+  virtual void map() {}
+  virtual void unmap() {}
+  virtual void fullscreen_on() {}
+  virtual void fullscreen_off(int X, int Y, int W, int H) {}
+  virtual void use_border();
+  virtual void size_range();
+  virtual void iconize() {}
+  virtual void decoration_sizes(int *top, int *left,  int *right, int *bottom) {
+    *top = *left = *right = *bottom = 0;
+  }
+  virtual void show_with_args_begin() {}
+  virtual void show_with_args_end(int argc, char **argv) {}
+  virtual int can_do_overlay();
+  virtual void redraw_overlay();
+  
+  // --- window cursor stuff
+  virtual int set_cursor(Fl_Cursor);
+  virtual int set_cursor(const Fl_RGB_Image*, int, int);
+
+  // --- window shape stuff
+  void shape_pixmap_(Fl_Image* pixmap); // platform-independent, support function
+  virtual void shape(const Fl_Image* img) {}
+  virtual void shape_alpha_(Fl_Image* img, int offset) {}
+
+  // --- window icon stuff
+  virtual void icons(const Fl_RGB_Image *icons[], int count) {}
+  virtual const void *icon() const {return NULL;}
+  virtual void icon(const void * ic) {}
+  virtual void free_icons() {}
+  // each platform implements this its own way
+  static void default_icons(const Fl_RGB_Image *icons[], int count);
+
+  // --- window printing/drawing helper
+  virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left,
+                                            Fl_RGB_Image*& bottom, Fl_RGB_Image*& right);
+  virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y,
+                     void (*draw_area)(void*, int,int,int,int), void* data) { return 0; }
+  static inline Fl_Window_Driver* driver(const Fl_Window *win) {return win->pWindowDriver;}
+};
+
+#endif // FL_WINDOW_DRIVER_H
+
+/**
+ \}
+ \endcond
+ */
+
+//
+// End of "$Id$".
+//
diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx
index 6bede091b..56d2915aa 100644
--- a/src/Fl_Window_Driver.cxx
+++ b/src/Fl_Window_Driver.cxx
@@ -23,7 +23,7 @@
  \{
  */
 
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_Overlay_Window.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl.H>
diff --git a/src/Fl_Window_fullscreen.cxx b/src/Fl_Window_fullscreen.cxx
index 71695c806..1dc11f081 100644
--- a/src/Fl_Window_fullscreen.cxx
+++ b/src/Fl_Window_fullscreen.cxx
@@ -17,7 +17,7 @@
 //
 
 #include <FL/Fl_Window.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 
 void Fl_Window::border(int b) {
   if (b) {
diff --git a/src/Fl_Window_hotspot.cxx b/src/Fl_Window_hotspot.cxx
index 21813ddfc..552811770 100644
--- a/src/Fl_Window_hotspot.cxx
+++ b/src/Fl_Window_hotspot.cxx
@@ -18,7 +18,7 @@
 
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 
 void Fl_Window::hotspot(int X, int Y, int offscreen) {
   int mx,my;
diff --git a/src/Fl_Window_iconize.cxx b/src/Fl_Window_iconize.cxx
index 7077d8e0f..6450516bd 100644
--- a/src/Fl_Window_iconize.cxx
+++ b/src/Fl_Window_iconize.cxx
@@ -17,7 +17,7 @@
 //
 
 #include <FL/Fl_Window.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 
 void Fl_Window::iconize() {
   if (!shown()) {
diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx
index 2712b72ae..064e28eed 100644
--- a/src/Fl_arg.cxx
+++ b/src/Fl_arg.cxx
@@ -21,7 +21,7 @@
 
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_System_Driver.H>
 #include <FL/Fl_Tooltip.H>
 #include <FL/filename.H>
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index ed22a7417..0da6cd4a3 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -37,7 +37,7 @@ extern "C" {
 #include "config_lib.h"
 #include <FL/Fl.H>
 #include <FL/platform.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_Screen_Driver.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Tooltip.H>
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx
index a1ae3405d..662713da2 100644
--- a/src/Fl_win32.cxx
+++ b/src/Fl_win32.cxx
@@ -54,7 +54,7 @@ void fl_cleanup_dc_list(void);
 #include "config_lib.h"
 #include <FL/Fl.H>
 #include <FL/platform.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/Fl_Screen_Driver.H>
 #include <FL/Fl_Graphics_Driver.H> // for fl_graphics_driver
 #include "drivers/WinAPI/Fl_WinAPI_Window_Driver.H"
diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx
index f911793cc..595a7a944 100644
--- a/src/Fl_x.cxx
+++ b/src/Fl_x.cxx
@@ -25,7 +25,7 @@
 #  include <config.h>
 #  include <FL/Fl.H>
 #  include <FL/platform.H>
-#  include <FL/Fl_Window_Driver.H>
+#  include "Fl_Window_Driver.H"
 #  include <FL/Fl_Window.H>
 #  include <FL/fl_utf8.h>
 #  include <FL/Fl_Tooltip.H>
diff --git a/src/drivers/Android/Fl_Android_Window_Driver.H b/src/drivers/Android/Fl_Android_Window_Driver.H
index 519f55b5d..aebf2ebf2 100644
--- a/src/drivers/Android/Fl_Android_Window_Driver.H
+++ b/src/drivers/Android/Fl_Android_Window_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_ANDROID_WINDOW_DRIVER_H
 #define FL_ANDROID_WINDOW_DRIVER_H
 
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 //#include <windows.h>
 
 /*
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
index 179c304bf..85b526358 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
+++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm
@@ -18,7 +18,7 @@
 
 #include <FL/Fl_Paged_Device.H>
 #include <FL/Fl_Printer.H>
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 #include <FL/Fl_Screen_Driver.H>
 #include "../Quartz/Fl_Quartz_Graphics_Driver.H"
 #include "../Darwin/Fl_Darwin_System_Driver.H"
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
index 475494467..7ce5fe6aa 100644
--- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
+++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_COCOA_WINDOW_DRIVER_H
 #define FL_COCOA_WINDOW_DRIVER_H
 
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 #include <ApplicationServices/ApplicationServices.h>
 
 class Fl_Image;
diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
index fa9414ca3..27a1f4cc5 100644
--- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
+++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx
@@ -94,7 +94,7 @@ Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw,
 #else
 
 #include <FL/Fl_Screen_Driver.H>
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window *glw, int x, int y, int w, int h)
 /* captures a rectangle of a Fl_Gl_Window window, and returns it as a RGB image
  */
diff --git a/src/drivers/Pico/Fl_Pico_Window_Driver.H b/src/drivers/Pico/Fl_Pico_Window_Driver.H
index 3ef57f9b2..73b361a18 100644
--- a/src/drivers/Pico/Fl_Pico_Window_Driver.H
+++ b/src/drivers/Pico/Fl_Pico_Window_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_PICO_WINDOW_DRIVER_H
 #define FL_PICO_WINDOW_DRIVER_H
 
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 
 
 class FL_EXPORT Fl_Pico_Window_Driver : public Fl_Window_Driver
diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx
index 83ed47a83..6ab2d5025 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Screen_Driver.cxx
@@ -28,7 +28,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Double_Window.H>
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 #include <FL/Fl_Image_Surface.H>
 #include <FL/Fl_Graphics_Driver.H>
 #include <FL/fl_draw.H>
diff --git a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
index ce1eeac1d..0fdad34bd 100644
--- a/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
+++ b/src/drivers/PicoAndroid/Fl_PicoAndroid_Window_Driver.cxx
@@ -32,7 +32,7 @@
 #include <FL/platform.H>
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 #include <FL/fl_draw.H>
 
 
diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx
index 72b727c8e..771a13339 100644
--- a/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx
@@ -22,7 +22,7 @@
 
 #include "Fl_PicoSDL_Screen_Driver.H"
 #include <FL/platform.H>
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 
 #include <FL/Fl.H>
 #define __APPLE__
diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx
index 4d676a928..abd70c4cc 100644
--- a/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx
@@ -21,7 +21,7 @@
 #include "Fl_PicoSDL_Screen_Driver.H"
 
 #include <FL/platform.H>
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 
 #define __APPLE__
 #include <SDL2/SDL.h>
diff --git a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
index 44cc06ccc..14939cd18 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_Window_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_WINAPI_WINDOW_DRIVER_H
 #define FL_WINAPI_WINDOW_DRIVER_H
 
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 #include <windows.h>
 
 /*
diff --git a/src/drivers/X11/Fl_X11_Window_Driver.H b/src/drivers/X11/Fl_X11_Window_Driver.H
index e1ff50105..099516726 100644
--- a/src/drivers/X11/Fl_X11_Window_Driver.H
+++ b/src/drivers/X11/Fl_X11_Window_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_X11_WINDOW_DRIVER_H
 #define FL_X11_WINDOW_DRIVER_H
 
-#include <FL/Fl_Window_Driver.H>
+#include "../../Fl_Window_Driver.H"
 #include <config.h> // for USE_XDBE
 #include <FL/platform.H> // for Cursor
 class Fl_Bitmap;
diff --git a/src/fl_cursor.cxx b/src/fl_cursor.cxx
index 0f0491034..f3bd7e2b0 100644
--- a/src/fl_cursor.cxx
+++ b/src/fl_cursor.cxx
@@ -27,7 +27,7 @@
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Pixmap.H>
 #include <FL/Fl_RGB_Image.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/fl_draw.H>
 
 #include "fl_cursor_wait.xpm"
diff --git a/src/fl_dnd_win32.cxx b/src/fl_dnd_win32.cxx
index d906cf491..b3443fe4c 100644
--- a/src/fl_dnd_win32.cxx
+++ b/src/fl_dnd_win32.cxx
@@ -23,7 +23,7 @@
 #include <FL/Fl.H>
 #include <FL/platform.H>
 #include <FL/Fl_Window.H>
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 #include <FL/fl_utf8.h>
 #include "drivers/WinAPI/Fl_WinAPI_Screen_Driver.H"
 #include "flstring.h"
diff --git a/src/fl_scroll_area.cxx b/src/fl_scroll_area.cxx
index 36f27b75d..002ce44ad 100644
--- a/src/fl_scroll_area.cxx
+++ b/src/fl_scroll_area.cxx
@@ -20,7 +20,7 @@
 // a "callback" which is called to draw rectangular areas that are moved
 // into the drawing area.
 
-#include <FL/Fl_Window_Driver.H>
+#include "Fl_Window_Driver.H"
 
 // scroll a rectangle and redraw the newly exposed portions:
 /**
diff --git a/src/makedepend b/src/makedepend
index 463381e09..b7e409ec8 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -10,7 +10,7 @@ Fl.o: ../FL/Fl_Plugin.H ../FL/Fl_Preferences.H ../FL/Fl_Image.H
 Fl.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
 Fl.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H
 Fl.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
-Fl.o: ../FL/Fl_Text_Buffer.H ../FL/Fl_Window_Driver.H ../FL/Fl_Window.H
+Fl.o: ../FL/Fl_Text_Buffer.H Fl_Window_Driver.H ../FL/Fl_Window.H
 Fl.o: ../FL/Fl_Group.H ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
 Fl.o: ../FL/Fl_Window.H ../FL/Fl_System_Driver.H ../FL/filename.H
 Fl.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H
@@ -124,7 +124,7 @@ Fl_Double_Window.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Double_Window.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H
 Fl_Double_Window.o: ../FL/fl_types.h ../FL/Enumerations.H
 Fl_Double_Window.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
-Fl_Double_Window.o: ../FL/fl_draw.H ../FL/Fl_Window_Driver.H
+Fl_Double_Window.o: ../FL/fl_draw.H Fl_Window_Driver.H
 Fl_Double_Window.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H
 Fl_Double_Window.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl.H
 Fl_Double_Window.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
@@ -199,7 +199,7 @@ Fl_Graphics_Driver.o: ../FL/fl_draw.H ../FL/Fl_Image_Surface.H
 Fl_Graphics_Driver.o: ../FL/Fl_Widget_Surface.H ../FL/Fl_Window.H
 Fl_Graphics_Driver.o: ../FL/Fl_Group.H ../FL/Fl_Shared_Image.H ../FL/math.h
 Fl_Graphics_Driver.o: ../FL/platform.H
-Fl_Group.o: ../FL/Fl_Group.H ../FL/Fl_Window_Driver.H ../FL/Fl_Export.H
+Fl_Group.o: ../FL/Fl_Group.H Fl_Window_Driver.H ../FL/Fl_Export.H
 Fl_Group.o: ../FL/Fl_Window.H ../FL/Fl.H ../FL/platform_types.h
 Fl_Group.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Group.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Bitmap.H
@@ -301,7 +301,7 @@ Fl_Menu_Button.o: ../FL/Fl_Menu_Button.H ../FL/Fl_Menu_.H ../FL/Fl_Widget.H
 Fl_Menu_Button.o: ../FL/Fl.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H
 Fl_Menu_Button.o: ../FL/fl_draw.H
 Fl_Menu_Window.o: ../FL/Fl_Menu_Window.H ../FL/Fl_Single_Window.H
-Fl_Menu_Window.o: ../FL/Fl_Window.H ../FL/Fl_Window_Driver.H
+Fl_Menu_Window.o: ../FL/Fl_Window.H Fl_Window_Driver.H
 Fl_Menu_Window.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl.H
 Fl_Menu_Window.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_Menu_Window.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
@@ -344,7 +344,7 @@ Fl_Overlay_Window.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_Overlay_Window.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Overlay_Window.o: ../FL/Enumerations.H ../FL/abi-version.h
 Fl_Overlay_Window.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
-Fl_Overlay_Window.o: ../FL/Fl_Window.H ../FL/Fl_Window_Driver.H
+Fl_Overlay_Window.o: ../FL/Fl_Window.H Fl_Window_Driver.H
 Fl_Overlay_Window.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H
 Fl_Overlay_Window.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl.H
 Fl_Pack.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -421,7 +421,7 @@ Fl_Screen_Driver.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
 Fl_Screen_Driver.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H
 Fl_Screen_Driver.o: ../FL/platform.H ../FL/Fl_Group.H ../FL/Fl_Window.H
 Fl_Screen_Driver.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H
-Fl_Screen_Driver.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H
+Fl_Screen_Driver.o: Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H
 Fl_Screen_Driver.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 Fl_Screen_Driver.o: ../FL/Fl_Image_Surface.H ../FL/Fl_Widget_Surface.H
 Fl_Screen_Driver.o: ../FL/Fl_Shared_Image.H ../FL/Fl_Box.H ../FL/Fl_Tooltip.H
@@ -608,7 +608,7 @@ Fl_Widget_Surface.o: ../FL/fl_types.h ../FL/Enumerations.H
 Fl_Widget_Surface.o: ../FL/abi-version.h ../FL/Fl_Group.H ../FL/Fl_Bitmap.H
 Fl_Widget_Surface.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl.H
 Fl_Widget_Surface.o: ../FL/fl_draw.H ../FL/platform.H ../FL/fl_types.h
-Fl_Widget_Surface.o: ../FL/Enumerations.H ../FL/Fl_Window_Driver.H
+Fl_Widget_Surface.o: ../FL/Enumerations.H Fl_Window_Driver.H
 Fl_Widget_Surface.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
 Fl_Widget_Surface.o: ../FL/Fl_Window.H ../FL/Fl_Screen_Driver.H
 Fl_Widget_Surface.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H
@@ -619,13 +619,13 @@ Fl_Widget_Surface.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H
 Fl_Window.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_Window.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Window.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H
-Fl_Window.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Window_Driver.H
+Fl_Window.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Window_Driver.H
 Fl_Window.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H
 Fl_Window.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl.H
 Fl_Window.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
 Fl_Window.o: ../FL/Fl_Window.H ../FL/Fl_RGB_Image.H ../FL/Fl_Tooltip.H
 Fl_Window.o: ../FL/Fl_Widget.H ../FL/fl_draw.H flstring.h
-Fl_Window_Driver.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Export.H
+Fl_Window_Driver.o: Fl_Window_Driver.H ../FL/Fl_Export.H
 Fl_Window_Driver.o: ../FL/Fl_Window.H ../FL/Fl.H ../FL/platform_types.h
 Fl_Window_Driver.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Window_Driver.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Group.H
@@ -639,7 +639,7 @@ Fl_Window_fullscreen.o: ../FL/platform_types.h ../FL/fl_utf8.h
 Fl_Window_fullscreen.o: ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Window_fullscreen.o: ../FL/Enumerations.H ../FL/abi-version.h
 Fl_Window_fullscreen.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
-Fl_Window_fullscreen.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Window_Driver.H
+Fl_Window_fullscreen.o: ../FL/Fl_Widget.H ../FL/Fl.H Fl_Window_Driver.H
 Fl_Window_fullscreen.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
 Fl_Window_fullscreen.o: ../FL/Fl_Window.H
 Fl_Window_hotspot.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -647,14 +647,14 @@ Fl_Window_hotspot.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Window_hotspot.o: ../FL/Enumerations.H ../FL/abi-version.h
 Fl_Window_hotspot.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H
 Fl_Window_hotspot.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl.H
-Fl_Window_hotspot.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H
+Fl_Window_hotspot.o: Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H
 Fl_Window_hotspot.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 Fl_Window_iconize.o: ../FL/Fl_Window.H ../FL/Fl.H ../FL/Fl_Export.H
 Fl_Window_iconize.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_Window_iconize.o: ../FL/fl_types.h ../FL/Enumerations.H
 Fl_Window_iconize.o: ../FL/abi-version.h ../FL/Fl_Group.H ../FL/Fl_Bitmap.H
 Fl_Window_iconize.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl.H
-Fl_Window_iconize.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H
+Fl_Window_iconize.o: Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H
 Fl_Window_iconize.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H
 Fl_Wizard.o: ../FL/Fl_Wizard.H ../FL/Fl_Group.H ../FL/Fl_Window.H ../FL/Fl.H
 Fl_Wizard.o: ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
@@ -682,7 +682,7 @@ Fl_arg.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 Fl_arg.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 Fl_arg.o: ../FL/abi-version.h ../FL/Fl_Window.H ../FL/Fl_Group.H
 Fl_arg.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl.H
-Fl_arg.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H
+Fl_arg.o: Fl_Window_Driver.H ../FL/Fl_Overlay_Window.H
 Fl_arg.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/Fl_System_Driver.H
 Fl_arg.o: ../FL/filename.H ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H
 Fl_arg.o: ../FL/Fl_Widget.H ../FL/fl_draw.H flstring.h ../config.h
@@ -817,7 +817,7 @@ fl_cursor.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H
 fl_cursor.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Window.H
 fl_cursor.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
 fl_cursor.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Pixmap.H
-fl_cursor.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Window_Driver.H
+fl_cursor.o: ../FL/Fl_RGB_Image.H Fl_Window_Driver.H
 fl_cursor.o: ../FL/Fl_Overlay_Window.H ../FL/Fl_Double_Window.H
 fl_cursor.o: ../FL/Fl_Window.H ../FL/fl_draw.H fl_cursor_wait.xpm
 fl_cursor.o: fl_cursor_help.xpm fl_cursor_nwse.xpm fl_cursor_nesw.xpm
@@ -942,7 +942,7 @@ fl_set_font.o: ../FL/Fl.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
 fl_set_font.o: ../FL/Fl_Pixmap.H ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H
 fl_set_font.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
 fl_set_font.o: ../FL/Fl_Text_Buffer.H flstring.h ../config.h
-fl_scroll_area.o: ../FL/Fl_Window_Driver.H ../FL/Fl_Export.H
+fl_scroll_area.o: Fl_Window_Driver.H ../FL/Fl_Export.H
 fl_scroll_area.o: ../FL/Fl_Window.H ../FL/Fl.H ../FL/platform_types.h
 fl_scroll_area.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 fl_scroll_area.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Group.H
@@ -1128,7 +1128,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Slider.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Valuator.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Text_Buffer.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: drivers/X11/Fl_X11_Window_Driver.H
-drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Window_Driver.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: Fl_Window_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Window.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Group.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Overlay_Window.H
@@ -1279,7 +1279,7 @@ drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Valuator.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Text_Buffer.H
 drivers/X11/Fl_X11_Window_Driver.o: config_lib.h ../config.h
 drivers/X11/Fl_X11_Window_Driver.o: drivers/X11/Fl_X11_Window_Driver.H
-drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Window_Driver.H
+drivers/X11/Fl_X11_Window_Driver.o: Fl_Window_Driver.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Export.H ../FL/Fl_Window.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl.H ../FL/platform_types.h
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_utf8.h ../FL/Fl_Export.H
@@ -1328,7 +1328,7 @@ drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Text_Buffer.H
 drivers/X11/Fl_X11_Screen_Driver.o: drivers/Xlib/Fl_Font.H
 drivers/X11/Fl_X11_Screen_Driver.o: drivers/X11/Fl_X11_Window_Driver.H
-drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Window_Driver.H
+drivers/X11/Fl_X11_Screen_Driver.o: Fl_Window_Driver.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Window.H ../FL/Fl_Group.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Overlay_Window.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Double_Window.H
@@ -1402,7 +1402,7 @@ drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Input.H ../FL/Fl_Pixmap.H
 Fl_x.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_x.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_x.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H
-Fl_x.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Window_Driver.H
+Fl_x.o: ../FL/fl_types.h ../FL/Enumerations.H Fl_Window_Driver.H
 Fl_x.o: ../FL/Fl_Window.H ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
 Fl_x.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Overlay_Window.H
 Fl_x.o: ../FL/Fl_Double_Window.H ../FL/Fl_Window.H ../FL/fl_utf8.h
@@ -1662,7 +1662,7 @@ Fl_Gl_Device_Plugin.o: ../FL/Fl_Preferences.H ../FL/Fl_Export.H
 Fl_Gl_Window.o: config_lib.h ../config.h ../FL/gl.h ../FL/Enumerations.H
 Fl_Gl_Window.o: ../FL/abi-version.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Gl_Window.o: ../FL/platform_types.h ../FL/Fl_Gl_Window.H ../FL/Fl_Window.H
-Fl_Gl_Window.o: ../FL/Fl_Gl_Window_Driver.H ../FL/Fl_Window_Driver.H
+Fl_Gl_Window.o: ../FL/Fl_Gl_Window_Driver.H Fl_Window_Driver.H
 Fl_Gl_Window.o: ../FL/Fl_Export.H ../FL/Fl_Window.H ../FL/Fl.H
 Fl_Gl_Window.o: ../FL/fl_utf8.h ../FL/Fl_Group.H ../FL/Fl_Bitmap.H
 Fl_Gl_Window.o: ../FL/Fl_Image.H ../FL/Fl_Widget.H ../FL/Fl.H
@@ -1764,7 +1764,7 @@ drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Scrollbar.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Slider.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Valuator.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Text_Buffer.H
-drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Window_Driver.H
+drivers/OpenGL/Fl_OpenGL_Display_Device.o: Fl_Window_Driver.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Window.H ../FL/Fl_Group.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Overlay_Window.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Double_Window.H