Move Fl_System_Driver.H from FL/ to src/

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

38 files changed, 320 insertions, 72 deletions

diff --git a/src/Fl.cxx b/src/Fl.cxx
index dd940d071..3a682c039 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -22,7 +22,7 @@
 #include <FL/platform.H>
 #include "Fl_Screen_Driver.H"
 #include "Fl_Window_Driver.H"
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Tooltip.H>
 #include <FL/fl_draw.H>
diff --git a/src/Fl_Clock.cxx b/src/Fl_Clock.cxx
index 4f8d4ee80..a9271452b 100644
--- a/src/Fl_Clock.cxx
+++ b/src/Fl_Clock.cxx
@@ -19,7 +19,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Clock.H>
 #include <FL/Fl_Round_Clock.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/fl_draw.H>
 #include <math.h>
 #include <time.h>
diff --git a/src/Fl_File_Browser.cxx b/src/Fl_File_Browser.cxx
index c5e67132a..8956361da 100644
--- a/src/Fl_File_Browser.cxx
+++ b/src/Fl_File_Browser.cxx
@@ -33,7 +33,7 @@
 
 #include <FL/Fl_File_Browser.H>
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/fl_draw.H>
 #include <FL/filename.H>
 #include <FL/Fl_Image.H>	// icon
diff --git a/src/Fl_File_Chooser2.cxx b/src/Fl_File_Chooser2.cxx
index eed1d670b..b0cf27529 100644
--- a/src/Fl_File_Chooser2.cxx
+++ b/src/Fl_File_Chooser2.cxx
@@ -344,7 +344,7 @@
 //
 
 #include <FL/Fl_File_Chooser.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl.H>
 #include <FL/filename.H>
 #include <FL/fl_ask.H>
diff --git a/src/Fl_File_Icon.cxx b/src/Fl_File_Icon.cxx
index 5c59e9be8..f95e9db25 100644
--- a/src/Fl_File_Icon.cxx
+++ b/src/Fl_File_Icon.cxx
@@ -37,7 +37,7 @@
 #include <FL/fl_utf8.h>
 #include "flstring.h"
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl_File_Icon.H>
 #include <FL/Fl_Widget.H>
 #include <FL/fl_draw.H>
diff --git a/src/Fl_File_Input.cxx b/src/Fl_File_Input.cxx
index be343d9b6..4a4f3b49a 100644
--- a/src/Fl_File_Input.cxx
+++ b/src/Fl_File_Input.cxx
@@ -18,7 +18,7 @@
 //
 
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl_File_Input.H>
 #include <FL/Fl_Window.H>
 #include <FL/fl_draw.H>
diff --git a/src/Fl_Input.cxx b/src/Fl_Input.cxx
index 67c64cd01..d1f76796e 100644
--- a/src/Fl_Input.cxx
+++ b/src/Fl_Input.cxx
@@ -27,7 +27,7 @@
 #include <FL/Fl.H>
 #include <FL/platform.H>
 #include <FL/Fl_Window.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include "Fl_Screen_Driver.H"
 #include <FL/Fl_Input.H>
 #include <FL/fl_draw.H>
diff --git a/src/Fl_Menu.cxx b/src/Fl_Menu.cxx
index a943a6b33..1d7f47672 100644
--- a/src/Fl_Menu.cxx
+++ b/src/Fl_Menu.cxx
@@ -23,7 +23,7 @@
 // Fl_Menu_ widget.
 
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl_Menu_Window.H>
 #include <FL/Fl_Menu_.H>
 #include <FL/fl_draw.H>
diff --git a/src/Fl_Native_File_Chooser_FLTK.cxx b/src/Fl_Native_File_Chooser_FLTK.cxx
index e1bbc0526..ef5ce5d95 100644
--- a/src/Fl_Native_File_Chooser_FLTK.cxx
+++ b/src/Fl_Native_File_Chooser_FLTK.cxx
@@ -25,7 +25,7 @@
 #include <FL/Fl_Native_File_Chooser.H>
 #include <FL/Fl_File_Chooser.H>
 #include <FL/Fl_File_Icon.H>
-#include <FL/Fl_System_Driver.H> // for struct stat
+#include "Fl_System_Driver.H" // for struct stat
 #include <string.h>
 
 
diff --git a/src/Fl_PNG_Image.cxx b/src/Fl_PNG_Image.cxx
index a8e253ad0..bd2d4540f 100644
--- a/src/Fl_PNG_Image.cxx
+++ b/src/Fl_PNG_Image.cxx
@@ -30,7 +30,7 @@
 
 #include <config.h>
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl_PNG_Image.H>
 #include <FL/Fl_Shared_Image.H>
 #include <FL/fl_utf8.h>
diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx
index 29f44fd67..48e77bc24 100644
--- a/src/Fl_Preferences.cxx
+++ b/src/Fl_Preferences.cxx
@@ -17,7 +17,7 @@
 //
 
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl_Preferences.H>
 #include <FL/Fl_Plugin.H>
 #include <FL/filename.H>
diff --git a/src/Fl_System_Driver.H b/src/Fl_System_Driver.H
new file mode 100644
index 000000000..c3f8dc013
--- /dev/null
+++ b/src/Fl_System_Driver.H
@@ -0,0 +1,248 @@
+//
+// "$Id$"
+//
+// A base class for platform specific system calls
+// 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_System_Driver.H
+ \brief declaration of class Fl_System_Driver.
+*/
+
+#ifndef FL_SYSTEM_DRIVER_H
+#define FL_SYSTEM_DRIVER_H
+
+#include <FL/Fl.H>
+#include <FL/Fl_Export.H>
+#include <FL/filename.H>
+#include <FL/Fl_Preferences.H>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <string.h>
+#include <time.h>
+
+class Fl_File_Icon;
+class Fl_File_Browser;
+class Fl_Pixmap;
+class Fl_Widget;
+
+/**
+ \brief A base class for platform-specific system operations.
+ This class is only for internal use by the FLTK library.
+ Each supported platform implements several of the virtual methods of this class.
+  */
+class FL_EXPORT Fl_System_Driver {
+  friend class Fl;
+public:
+  struct Keyname {
+    unsigned int key;
+    const char* name;
+  };
+protected:
+  // implement once for each platform
+  static Fl_System_Driver *newSystemDriver();
+  Fl_System_Driver();
+  // key_table and key_table_size are used in fl_shortcut to translate key names
+  Keyname *key_table;
+  int key_table_size;
+public:
+  virtual ~Fl_System_Driver();
+  // These flags are useful after calling XParseGeometry(). They indicate which of its arguments
+  // contain meaningful data upon return.
+  static const int fl_NoValue;
+  static const int fl_WidthValue;
+  static const int fl_HeightValue;
+  static const int fl_XValue;
+  static const int fl_YValue;
+  static const int fl_XNegative;
+  static const int fl_YNegative;
+
+  // implement if the system adds unwanted program argument(s)
+  virtual int single_arg(const char *arg) { return 0; }
+  // implement if the system adds unwanted program argument pair(s)
+  virtual int arg_and_value(const char *name, const char *value) { return 0; }
+  // implement to process the -display argument
+  virtual void display_arg(const char *arg) { }
+  // default implementation should be enough
+  virtual int XParseGeometry(const char* string, int* x, int* y, unsigned int* width, unsigned int* height);
+  static void warning(const char* format, ...);
+  // implement to set the default effect of Fl::warning()
+  virtual void warning(const char* format, va_list args);
+  static void error(const char* format, ...);
+  // implement to set the default effect of Fl::error()
+  virtual void error(const char* format, va_list args);
+  static void fatal(const char* format, ...);
+  // implement to set the default effect of Fl::error()
+  virtual void fatal(const char* format, va_list args);
+
+  // implement these to support cross-platform file operations
+  virtual char *utf2mbcs(const char *s) {return (char*)s;}
+  virtual char *getenv(const char* v) {return NULL;}
+  virtual int putenv(char* v) {return -1;}
+  virtual int open(const char* f, int oflags, int pmode) {return -1;}
+
+  // Note: the default implementation ignores the 'binary' argument.
+  // Some platforms (notably Windows) may use this argument.
+  virtual int open_ext(const char* f, int binary, int oflags, int pmode) {
+    return this->open(f, oflags, pmode);
+  }
+  virtual FILE *fopen(const char* f, const char *mode);
+  virtual int system(const char* cmd) {return -1;}
+  virtual int execvp(const char *file, char *const *argv) {return -1;}
+  virtual int chmod(const char* f, int mode) {return -1;}
+  virtual int access(const char* f, int mode) { return -1;}
+  virtual int stat(const char* f, struct stat *b) { return -1;}
+  virtual char *getcwd(char* b, int l) {return NULL;}
+  virtual int chdir(const char* path) {return -1;}
+  virtual int unlink(const char* fname) {return -1;}
+  virtual int mkdir(const char* f, int mode) {return -1;}
+  virtual int rmdir(const char* f) {return -1;}
+  virtual int rename(const char* f, const char *n) {return -1;}
+
+  // the default implementation of these utf8... functions should be enough
+  virtual unsigned utf8towc(const char* src, unsigned srclen, wchar_t* dst, unsigned dstlen);
+  virtual unsigned utf8fromwc(char* dst, unsigned dstlen, const wchar_t* src, unsigned srclen);
+  virtual int utf8locale() {return 1;}
+  virtual unsigned utf8to_mb(const char* src, unsigned srclen, char* dst, unsigned dstlen);
+  virtual unsigned utf8from_mb(char* dst, unsigned dstlen, const char* src, unsigned srclen);
+  // implement to shield fprintf() from locale changes in decimal point
+  virtual int clocale_printf(FILE *output, const char *format, va_list args);
+  // implement functions telling whether a key is pressed
+  virtual int event_key(int k) {return 0;}
+  virtual int get_key(int k) {return 0;}
+  // implement scandir-like function
+  virtual int filename_list(const char *d, dirent ***list, int (*sort)(struct dirent **, struct dirent **) ) {return -1;}
+  // the default implementation of filename_expand() may be enough
+  virtual int filename_expand(char *to, int tolen, const char *from);
+  // to implement
+  virtual const char *getpwnam(const char *login) {return NULL;}
+  // the default implementation of filename_relative() is in src/filename_absolute.cxx and may be enough
+  virtual int filename_relative(char *to, int tolen, const char *from, const char *base);
+  // the default implementation of filename_absolute() is in src/filename_absolute.cxx and may be enough
+  virtual int filename_absolute(char *to, int tolen, const char *from);
+  // the default implementation of filename_isdir() is in src/filename_isdir.cxx and may be enough
+  virtual int filename_isdir(const char* n);
+  // the default implementation of filename_isdir_quick() is in src/filename_isdir.cxx and may be enough
+  virtual int filename_isdir_quick(const char* n);
+  // the default implementation of filename_ext() is in src/filename_ext.cxx and may be enough
+  virtual const char *filename_ext(const char *buf);
+  // implement to support fl_filename_name()
+  virtual const char *filename_name(const char *buf) {return buf;}
+  // whether a platform uses additional code in Fl_Menu::handle(int e)
+  virtual int need_menu_handle_part2() {return 0;}
+  // whether a platform uses additional code in Fl_Menu::handle_part1(int e)
+  virtual int need_menu_handle_part1_extra() {return 0;}
+  // implement to support fl_open_uri()
+  virtual int open_uri(const char *uri, char *msg, int msglen) {return 0;}
+  // the default implementation of use_tooltip_timeout_condition() may be enough
+  virtual int use_tooltip_timeout_condition() {return 0;}
+  // the default implementation of use_recent_tooltip_fix() may be enough
+  virtual int use_recent_tooltip_fix() {return 0;}
+  // the default implementation of shortcut_add_key_name() is in src/fl_shortcut.cxx
+  virtual const char *shortcut_add_key_name(unsigned key, char *p, char *buf, const char **);
+  // the default implementation of need_test_shortcut_extra() may be enough
+  virtual int need_test_shortcut_extra() {return 0;}
+  // implement to support Fl_File_Browser::load()
+  virtual int file_browser_load_filesystem(Fl_File_Browser *browser, char *filename, int lname, Fl_File_Icon *icon) {return 0;}
+  // the default implementation of file_browser_load_directory() should be enough
+  virtual int file_browser_load_directory(const char *directory, char *filename, size_t name_size, dirent ***pfiles, Fl_File_Sort_F *sort);
+  // implement to support Fl_Preferences
+  virtual void newUUID(char *uuidBuffer) { uuidBuffer[0] = 0; }
+  // implement to support Fl_Preferences
+  virtual char *preference_rootnode(Fl_Preferences *prefs, Fl_Preferences::Root root, const char *vendor,
+                                    const char *application) {return NULL;}
+  // the default implementation of preferences_need_protection_check() may be enough
+  virtual int preferences_need_protection_check() {return 0;}
+  // implement to support Fl_Plugin_Manager::load()
+  virtual void *dlopen(const char *filename) {return NULL;}
+  // the default implementation is most probably enough
+  virtual void png_extra_rgba_processing(unsigned char *array, int w, int h) {}
+  // the default implementation is most probably enough
+  virtual const char *next_dir_sep(const char *start) { return strchr(start, '/');}
+  // implement to support threading
+  virtual void awake(void*) {}
+  virtual int lock() {return 1;}
+  virtual void unlock() {}
+  virtual void* thread_message() {return NULL;}
+  // implement to support Fl_File_Icon
+  virtual int file_type(const char *filename);
+  // implement to return the user's home directory name
+  virtual const char *home_directory_name() { return ""; }
+  // the default implementation is most probably enough
+  virtual const char *filesystems_label() { return "File Systems"; }
+  // return TRUE means \ same as / in file names
+  virtual int backslash_as_slash() {return 0;}
+  // return TRUE means : indicates a drive letter in file names
+  virtual int colon_is_drive() {return 0;}
+  // return TRUE means that files whose name begins with dot are hidden
+  virtual int dot_file_hidden() {return 0;}
+  // return TRUE when file names are case insensitive
+  virtual int case_insensitive_filenames() {return 0;}
+  // the implementations of local_to_latin1() and latin1_to_local() are in fl_encoding_latin1.cxx
+  virtual const char *local_to_latin1(const char *t, int n);
+  virtual const char *latin1_to_local(const char *t, int n);
+  // the implementations of local_to_mac_roman() and mac_roman_to_local() are in fl_encoding_mac_roman.cxx
+  virtual const char *local_to_mac_roman(const char *t, int n);
+  virtual const char *mac_roman_to_local(const char *t, int n);
+  // the default implementation is most probably enough
+  virtual void own_colormap() {}
+  // the default implementations of tree_openpixmap() and tree_closepixmap() are
+  // in Fl_Tree_Prefs.cxx and can be enough
+  virtual Fl_Pixmap *tree_openpixmap();
+  virtual Fl_Pixmap *tree_closepixmap();
+  static const char *const tree_open_xpm[]; // used by tree_openpixmap()
+  static const char * const tree_close_xpm[]; // used by tree_closepixmap()
+  // the default implementation of tree_connector_style() is in Fl_Tree_Prefs.cxx and can be enough
+  virtual int tree_connector_style();
+  // implement to support copy-to-clipboard
+  virtual void copy(const char *stuff, int len, int clipboard, const char *type) {}
+  // implement to support paste-from-clipboard
+  virtual void paste(Fl_Widget &receiver, int clipboard, const char *type) {}
+  // implement to support paste-from-clipboard
+  virtual int clipboard_contains(const char *type) {return 0;}
+  //  implement to support paste-from-clipboard
+  virtual void clipboard_notify_change() {}
+  virtual void add_fd(int fd, int when, Fl_FD_Handler cb, void* = 0);
+  virtual void add_fd(int fd, Fl_FD_Handler cb, void* = 0);
+  virtual void remove_fd(int, int when);
+  virtual void remove_fd(int);
+  // the default implementation of open_callback() may be enough
+  virtual void open_callback(void (*)(const char *));
+  // The default implementation may be enough.
+  virtual void gettime(time_t *sec, int *usec);
+  // The default implementation of the next 4 functions may be enough.
+  virtual const char *shift_name() { return "Shift"; }
+  virtual const char *meta_name() { return "Meta"; }
+  virtual const char *alt_name() { return "Alt"; }
+  virtual const char *control_name() { return "Ctrl"; }
+};
+
+#endif // FL_SYSTEM_DRIVER_H
+
+/**
+ \}
+ \endcond
+ */
+
+//
+// End of "$Id$".
+//
diff --git a/src/Fl_System_Driver.cxx b/src/Fl_System_Driver.cxx
index b3597f4d4..f4550566a 100644
--- a/src/Fl_System_Driver.cxx
+++ b/src/Fl_System_Driver.cxx
@@ -22,7 +22,7 @@
  \{
  */
 
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl.H>
 #include <FL/Fl_File_Icon.H>
 #include <FL/fl_utf8.h>
diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx
index e4411c8da..06058df6e 100644
--- a/src/Fl_Tooltip.cxx
+++ b/src/Fl_Tooltip.cxx
@@ -20,7 +20,7 @@
 #include <FL/fl_draw.H>
 #include <FL/Fl_Menu_Window.H>
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 
 #include <stdio.h>
 #include <string.h>   // strdup()
diff --git a/src/Fl_Tree_Prefs.cxx b/src/Fl_Tree_Prefs.cxx
index de81d3d74..48394989c 100644
--- a/src/Fl_Tree_Prefs.cxx
+++ b/src/Fl_Tree_Prefs.cxx
@@ -22,7 +22,7 @@
 
 #include "config_lib.h"
 
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl.H>
 #include <FL/Fl_Pixmap.H>
 #include <FL/Fl_Tree_Prefs.H>
diff --git a/src/Fl_abort.cxx b/src/Fl_abort.cxx
index f0125e905..2c4bd04fe 100644
--- a/src/Fl_abort.cxx
+++ b/src/Fl_abort.cxx
@@ -19,7 +19,7 @@
 // You can also override this by redefining all of these.
 
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <stdarg.h>
 
 void (*Fl::warning)(const char* format, ...) = Fl_System_Driver::warning;
diff --git a/src/Fl_arg.cxx b/src/Fl_arg.cxx
index 064e28eed..4ab6bfe4a 100644
--- a/src/Fl_arg.cxx
+++ b/src/Fl_arg.cxx
@@ -22,7 +22,7 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Window.H>
 #include "Fl_Window_Driver.H"
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl_Tooltip.H>
 #include <FL/filename.H>
 #include <FL/fl_draw.H>
diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx
index fbb9f5915..baac7dcf0 100644
--- a/src/Fl_get_system_colors.cxx
+++ b/src/Fl_get_system_colors.cxx
@@ -18,7 +18,7 @@
 
 #include <FL/Fl.H>
 #include "Fl_Screen_Driver.H"
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/fl_draw.H>
 #include <FL/platform.H>
 #include <FL/math.h>
diff --git a/src/Fl_lock.cxx b/src/Fl_lock.cxx
index 85636217b..7c18b6e9d 100644
--- a/src/Fl_lock.cxx
+++ b/src/Fl_lock.cxx
@@ -18,7 +18,7 @@
 
 #include "config_lib.h"
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 
 #include <stdlib.h>
 
diff --git a/src/Fl_own_colormap.cxx b/src/Fl_own_colormap.cxx
index 4ca5fe857..cc2ac180d 100644
--- a/src/Fl_own_colormap.cxx
+++ b/src/Fl_own_colormap.cxx
@@ -27,7 +27,7 @@
 #include "config_lib.h"
 #include <FL/Fl.H>
 #include <FL/platform.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 
 
 #if defined(FL_CFG_WIN_X11) && !defined(FL_DOXYGEN)
diff --git a/src/drivers/Pico/Fl_Pico_System_Driver.H b/src/drivers/Pico/Fl_Pico_System_Driver.H
index b60b32d7f..740ceceb1 100644
--- a/src/drivers/Pico/Fl_Pico_System_Driver.H
+++ b/src/drivers/Pico/Fl_Pico_System_Driver.H
@@ -20,7 +20,7 @@
 #ifndef FL_PICO_SYSTEM_DRIVER_H
 #define FL_PICO_SYSTEM_DRIVER_H
 
-#include <FL/Fl_System_Driver.H>
+#include "../../Fl_System_Driver.H"
 
 class Fl_Pico_System_Driver : public Fl_System_Driver {
 public:
diff --git a/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx b/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx
index f568858de..028f02324 100644
--- a/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx
+++ b/src/drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx
@@ -18,7 +18,7 @@
 
 
 #include "../../config_lib.h"
-#include <FL/Fl_System_Driver.H>
+#include "../../Fl_System_Driver.H"
 //#include "Fl_PicoSDL_System_Driver.h"
 
 
diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.H b/src/drivers/Posix/Fl_Posix_System_Driver.H
index 6b6d25f61..e4d6eba1e 100644
--- a/src/drivers/Posix/Fl_Posix_System_Driver.H
+++ b/src/drivers/Posix/Fl_Posix_System_Driver.H
@@ -25,7 +25,7 @@
 #ifndef FL_POSIX_SYSTEM_DRIVER_H
 #define FL_POSIX_SYSTEM_DRIVER_H
 
-#include <FL/Fl_System_Driver.H>
+#include "../../Fl_System_Driver.H"
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx
index ac74b4f63..e62946392 100644
--- a/src/drivers/PostScript/Fl_PostScript.cxx
+++ b/src/drivers/PostScript/Fl_PostScript.cxx
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <FL/Fl_PostScript.H>
 #include <FL/Fl_Native_File_Chooser.H>
-#include <FL/Fl_System_Driver.H>
+#include "../../Fl_System_Driver.H"
 #include <stdarg.h>
 
 const char *Fl_PostScript_File_Device::file_chooser_title = "Select a .ps file";
diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
index 0742c7142..b4189da4a 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
@@ -24,7 +24,7 @@
 #ifndef FL_WINAPI_SYSTEM_DRIVER_H
 #define FL_WINAPI_SYSTEM_DRIVER_H
 
-#include <FL/Fl_System_Driver.H>
+#include "../../Fl_System_Driver.H"
 #include <stdarg.h>
 
 /*
diff --git a/src/filename_absolute.cxx b/src/filename_absolute.cxx
index e7acddeba..19c1d97a6 100644
--- a/src/filename_absolute.cxx
+++ b/src/filename_absolute.cxx
@@ -24,7 +24,7 @@
 
 #include <FL/filename.H>
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <stdlib.h>
 #include "flstring.h"
 
diff --git a/src/filename_expand.cxx b/src/filename_expand.cxx
index 4179ce43d..412bafd41 100644
--- a/src/filename_expand.cxx
+++ b/src/filename_expand.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl.H>
 
 /** Expands a filename containing shell variables and tilde (~).
diff --git a/src/filename_ext.cxx b/src/filename_ext.cxx
index 8eb90ea5c..90e090f62 100644
--- a/src/filename_ext.cxx
+++ b/src/filename_ext.cxx
@@ -16,7 +16,7 @@
 //     http://www.fltk.org/str.php
 //
 
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl.H>
 
 /** Gets the extension of a filename.
diff --git a/src/filename_isdir.cxx b/src/filename_isdir.cxx
index 0d0751029..5488f9131 100644
--- a/src/filename_isdir.cxx
+++ b/src/filename_isdir.cxx
@@ -19,7 +19,7 @@
 // Used by fl_file_chooser
 
 #include "flstring.h"
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/filename.H>
 #include <FL/Fl.H>
 
diff --git a/src/filename_list.cxx b/src/filename_list.cxx
index 262b79974..0cd2a551c 100644
--- a/src/filename_list.cxx
+++ b/src/filename_list.cxx
@@ -20,7 +20,7 @@
 
 #include <FL/filename.H>
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/fl_utf8.h>
 #include "flstring.h"
 #include <stdlib.h>
diff --git a/src/fl_draw_pixmap.cxx b/src/fl_draw_pixmap.cxx
index de06a3696..777753673 100644
--- a/src/fl_draw_pixmap.cxx
+++ b/src/fl_draw_pixmap.cxx
@@ -34,7 +34,7 @@
 
 #include "config_lib.h"
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #if defined(FL_CFG_SYS_WIN32)
 #include "drivers/GDI/Fl_GDI_Graphics_Driver.H"
 #endif
diff --git a/src/fl_encoding_latin1.cxx b/src/fl_encoding_latin1.cxx
index eee0804e3..0cede695a 100644
--- a/src/fl_encoding_latin1.cxx
+++ b/src/fl_encoding_latin1.cxx
@@ -19,7 +19,7 @@
 #include "config_lib.h"
 #include <FL/fl_draw.H>
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Enumerations.H>
 #include <stdlib.h>
 #include "flstring.h"
diff --git a/src/fl_encoding_mac_roman.cxx b/src/fl_encoding_mac_roman.cxx
index 37b040f9c..5317f93d5 100644
--- a/src/fl_encoding_mac_roman.cxx
+++ b/src/fl_encoding_mac_roman.cxx
@@ -18,7 +18,7 @@
 
 #include "config_lib.h"
 #include <FL/fl_draw.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/Fl.H>
 #include <FL/Enumerations.H>
 #include <stdlib.h>
diff --git a/src/fl_open_uri.cxx b/src/fl_open_uri.cxx
index 6cde5d18b..d569557b8 100644
--- a/src/fl_open_uri.cxx
+++ b/src/fl_open_uri.cxx
@@ -27,7 +27,7 @@
 #include "config_lib.h"
 #include <FL/filename.H>
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <stdio.h>
 #include <stdlib.h>
 #include "flstring.h"
diff --git a/src/fl_shortcut.cxx b/src/fl_shortcut.cxx
index 4e9f5ec41..526bc2e1d 100644
--- a/src/fl_shortcut.cxx
+++ b/src/fl_shortcut.cxx
@@ -36,7 +36,7 @@
 #include <FL/Fl_Widget.H>
 #include <FL/Fl_Button.H>
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/fl_draw.H>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/src/fl_utf8.cxx b/src/fl_utf8.cxx
index 4f9e3fffe..7f40a6bb8 100644
--- a/src/fl_utf8.cxx
+++ b/src/fl_utf8.cxx
@@ -19,7 +19,7 @@
 //
 
 #include <FL/Fl.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <FL/filename.H>
 #include <stdarg.h>
 #include <FL/fl_utf8.h>
diff --git a/src/forms_timer.cxx b/src/forms_timer.cxx
index cb343f33b..47d1c1b8d 100644
--- a/src/forms_timer.cxx
+++ b/src/forms_timer.cxx
@@ -24,7 +24,7 @@
 #include <FL/Fl_Timer.H>
 #include <FL/fl_draw.H>
 #include <FL/forms.H>
-#include <FL/Fl_System_Driver.H>
+#include "Fl_System_Driver.H"
 #include <stdio.h>
 
 #define FL_TIMER_BLINKRATE	0.2
diff --git a/src/makedepend b/src/makedepend
index 704e95297..811c32bd6 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -12,7 +12,7 @@ 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_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_Window.H Fl_System_Driver.H ../FL/filename.H
 Fl.o: ../FL/Fl_Preferences.H ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H
 Fl.o: ../FL/fl_draw.H flstring.h
 Fl_Adjuster.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -83,7 +83,7 @@ Fl_Clock.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_Clock.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Clock.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Clock.H
 Fl_Clock.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Round_Clock.H
-Fl_Clock.o: ../FL/Fl_Clock.H ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_Clock.o: ../FL/Fl_Clock.H Fl_System_Driver.H ../FL/filename.H
 Fl_Clock.o: ../FL/Fl_Preferences.H ../FL/fl_draw.H
 Fl_Color_Chooser.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_Color_Chooser.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
@@ -133,7 +133,7 @@ Fl_File_Browser.o: ../FL/Fl_File_Icon.H ../FL/Fl.H ../FL/filename.H
 Fl_File_Browser.o: ../FL/Fl_Export.H ../FL/platform_types.h ../FL/Fl.H
 Fl_File_Browser.o: ../FL/Fl_Export.H ../FL/fl_utf8.h ../FL/fl_types.h
 Fl_File_Browser.o: ../FL/Enumerations.H ../FL/abi-version.h
-Fl_File_Browser.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_File_Browser.o: Fl_System_Driver.H ../FL/filename.H
 Fl_File_Browser.o: ../FL/Fl_Preferences.H ../FL/fl_draw.H ../FL/Fl_Image.H
 Fl_File_Browser.o: ../FL/Fl_Widget.H flstring.h ../config.h
 Fl_File_Chooser.o: ../FL/Fl_File_Chooser.H ../FL/Fl.H ../FL/Fl_Export.H
@@ -163,20 +163,20 @@ Fl_File_Chooser2.o: ../FL/Fl_File_Icon.H ../FL/filename.H ../FL/Fl_Box.H
 Fl_File_Chooser2.o: ../FL/Fl_Check_Button.H ../FL/Fl_Light_Button.H
 Fl_File_Chooser2.o: ../FL/Fl_Button.H ../FL/Fl_File_Input.H ../FL/Fl_Input.H
 Fl_File_Chooser2.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H ../FL/fl_ask.H
-Fl_File_Chooser2.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_File_Chooser2.o: Fl_System_Driver.H ../FL/filename.H
 Fl_File_Chooser2.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H
 Fl_File_Chooser2.o: ../FL/Fl_Shared_Image.H ../FL/fl_draw.H flstring.h
 Fl_File_Chooser2.o: ../config.h
 Fl_File_Icon.o: ../FL/fl_utf8.h flstring.h ../FL/Fl_Export.H ../config.h
 Fl_File_Icon.o: ../FL/Fl.H ../FL/platform_types.h ../FL/fl_utf8.h
 Fl_File_Icon.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
-Fl_File_Icon.o: ../FL/abi-version.h ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_File_Icon.o: ../FL/abi-version.h Fl_System_Driver.H ../FL/filename.H
 Fl_File_Icon.o: ../FL/Fl_Preferences.H ../FL/Fl_File_Icon.H ../FL/Fl.H
 Fl_File_Icon.o: ../FL/Fl_Widget.H ../FL/fl_draw.H
 Fl_File_Input.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_File_Input.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_File_Input.o: ../FL/Enumerations.H ../FL/abi-version.h
-Fl_File_Input.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_File_Input.o: Fl_System_Driver.H ../FL/filename.H
 Fl_File_Input.o: ../FL/Fl_Preferences.H ../FL/Fl_File_Input.H
 Fl_File_Input.o: ../FL/Fl_Input.H ../FL/Fl_Input_.H ../FL/Fl_Window.H
 Fl_File_Input.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
@@ -240,7 +240,7 @@ Fl_Input.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Input.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/platform.H
 Fl_Input.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/Fl_Window.H
 Fl_Input.o: ../FL/Fl_Group.H ../FL/Fl_Bitmap.H ../FL/Fl_Image.H
-Fl_Input.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_System_Driver.H
+Fl_Input.o: ../FL/Fl_Widget.H ../FL/Fl.H Fl_System_Driver.H
 Fl_Input.o: ../FL/filename.H ../FL/Fl_Preferences.H Fl_Screen_Driver.H
 Fl_Input.o: ../FL/Fl_Text_Editor.H ../FL/Fl_Text_Display.H ../FL/fl_draw.H
 Fl_Input.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Device.H ../FL/Fl_Plugin.H
@@ -279,7 +279,7 @@ Fl_Light_Button.o: ../FL/Fl_Radio_Light_Button.H ../FL/Fl_Light_Button.H
 Fl_Light_Button.o: ../FL/fl_draw.H flstring.h ../config.h
 Fl_Menu.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_Menu.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
-Fl_Menu.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_System_Driver.H
+Fl_Menu.o: ../FL/Enumerations.H ../FL/abi-version.h Fl_System_Driver.H
 Fl_Menu.o: ../FL/filename.H ../FL/Fl_Preferences.H ../FL/Fl_Menu_Window.H
 Fl_Menu.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H ../FL/Fl_Menu_.H
 Fl_Menu.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H
@@ -373,7 +373,7 @@ Fl_Positioner.o: ../FL/fl_draw.H
 Fl_Preferences.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_Preferences.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 Fl_Preferences.o: ../FL/Enumerations.H ../FL/abi-version.h
-Fl_Preferences.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_Preferences.o: Fl_System_Driver.H ../FL/filename.H
 Fl_Preferences.o: ../FL/Fl_Preferences.H ../FL/Fl_Plugin.H
 Fl_Preferences.o: ../FL/Fl_Preferences.H ../FL/fl_utf8.h flstring.h
 Fl_Preferences.o: ../config.h
@@ -474,7 +474,7 @@ Fl_Sys_Menu_Bar.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Export.H
 Fl_Sys_Menu_Bar.o: ../FL/fl_types.h ../FL/platform_types.h ../FL/Fl.H
 Fl_Sys_Menu_Bar.o: ../FL/Fl_Menu_Item.H ../FL/Fl_Image.H ../FL/platform.H
 Fl_Sys_Menu_Bar.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
-Fl_System_Driver.o: ../FL/Fl_System_Driver.H ../FL/Fl.H ../FL/Fl_Export.H
+Fl_System_Driver.o: Fl_System_Driver.H ../FL/Fl.H ../FL/Fl_Export.H
 Fl_System_Driver.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_System_Driver.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
 Fl_System_Driver.o: ../FL/filename.H ../FL/Fl_Preferences.H
@@ -562,7 +562,7 @@ Fl_Tree_Item_Array.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 Fl_Tree_Item_Array.o: ../FL/abi-version.h ../FL/Fl_Tree_Item.H
 Fl_Tree_Item_Array.o: ../FL/Fl_Widget.H ../FL/Fl_Image.H ../FL/Fl_Widget.H
 Fl_Tree_Item_Array.o: ../FL/Fl.H ../FL/fl_draw.H ../FL/Fl_Tree_Prefs.H
-Fl_Tree_Prefs.o: config_lib.h ../config.h ../FL/Fl_System_Driver.H ../FL/Fl.H
+Fl_Tree_Prefs.o: config_lib.h ../config.h Fl_System_Driver.H ../FL/Fl.H
 Fl_Tree_Prefs.o: ../FL/Fl_Export.H ../FL/platform_types.h ../FL/fl_utf8.h
 Fl_Tree_Prefs.o: ../FL/Fl_Export.H ../FL/fl_types.h ../FL/Enumerations.H
 Fl_Tree_Prefs.o: ../FL/abi-version.h ../FL/filename.H ../FL/Fl_Preferences.H
@@ -572,7 +572,7 @@ Fl_Tooltip.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_Tooltip.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
 Fl_Tooltip.o: ../FL/Fl_Widget.H ../FL/fl_draw.H ../FL/Fl_Menu_Window.H
 Fl_Tooltip.o: ../FL/Fl_Single_Window.H ../FL/Fl_Window.H
-Fl_Tooltip.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_Tooltip.o: Fl_System_Driver.H ../FL/filename.H
 Fl_Tooltip.o: ../FL/Fl_Preferences.H
 Fl_Valuator.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_Valuator.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
@@ -673,7 +673,7 @@ Fl_XPM_Image.o: ../FL/Fl_Pixmap.H ../FL/Fl_Image.H ../FL/fl_utf8.h flstring.h
 Fl_XPM_Image.o: ../config.h
 Fl_abort.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_abort.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
-Fl_abort.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_System_Driver.H
+Fl_abort.o: ../FL/Enumerations.H ../FL/abi-version.h Fl_System_Driver.H
 Fl_abort.o: ../FL/filename.H ../FL/Fl_Preferences.H
 Fl_add_idle.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_add_idle.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
@@ -683,7 +683,7 @@ 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_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/Fl_Double_Window.H ../FL/Fl_Window.H 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
 Fl_compose.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -721,7 +721,7 @@ Fl_get_system_colors.o: ../FL/Fl_Bitmap.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H
 Fl_get_system_colors.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H
 Fl_get_system_colors.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H
 Fl_get_system_colors.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H
-Fl_get_system_colors.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_get_system_colors.o: Fl_System_Driver.H ../FL/filename.H
 Fl_get_system_colors.o: ../FL/Fl_Preferences.H ../FL/fl_draw.H
 Fl_get_system_colors.o: ../FL/platform.H ../FL/math.h ../FL/fl_utf8.h
 Fl_get_system_colors.o: flstring.h ../config.h ../FL/Fl_Tiled_Image.H
@@ -739,13 +739,13 @@ Fl_grab.o: ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H
 Fl_lock.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H
 Fl_lock.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_lock.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
-Fl_lock.o: ../FL/Fl_System_Driver.H ../FL/filename.H ../FL/Fl_Preferences.H
+Fl_lock.o: Fl_System_Driver.H ../FL/filename.H ../FL/Fl_Preferences.H
 Fl_lock.o: drivers/Posix/Fl_Posix_System_Driver.H
 Fl_own_colormap.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H
 Fl_own_colormap.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_own_colormap.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
 Fl_own_colormap.o: ../FL/platform.H ../FL/fl_types.h ../FL/Enumerations.H
-Fl_own_colormap.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_own_colormap.o: Fl_System_Driver.H ../FL/filename.H
 Fl_own_colormap.o: ../FL/Fl_Preferences.H drivers/X11/Fl_X11_System_Driver.H
 Fl_own_colormap.o: drivers/Posix/Fl_Posix_System_Driver.H
 Fl_visual.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -761,25 +761,25 @@ Fl_visual.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H
 filename_absolute.o: ../FL/filename.H ../FL/Fl_Export.H
 filename_absolute.o: ../FL/platform_types.h ../FL/Fl.H ../FL/Fl_Export.H
 filename_absolute.o: ../FL/fl_utf8.h ../FL/fl_types.h ../FL/Enumerations.H
-filename_absolute.o: ../FL/abi-version.h ../FL/Fl_System_Driver.H
+filename_absolute.o: ../FL/abi-version.h Fl_System_Driver.H
 filename_absolute.o: ../FL/Fl_Preferences.H flstring.h ../config.h
-filename_expand.o: ../FL/Fl_System_Driver.H ../FL/Fl.H ../FL/Fl_Export.H
+filename_expand.o: Fl_System_Driver.H ../FL/Fl.H ../FL/Fl_Export.H
 filename_expand.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 filename_expand.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
 filename_expand.o: ../FL/filename.H ../FL/Fl_Preferences.H
-filename_ext.o: ../FL/Fl_System_Driver.H ../FL/Fl.H ../FL/Fl_Export.H
+filename_ext.o: Fl_System_Driver.H ../FL/Fl.H ../FL/Fl_Export.H
 filename_ext.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 filename_ext.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
 filename_ext.o: ../FL/filename.H ../FL/Fl_Preferences.H
 filename_isdir.o: flstring.h ../FL/Fl_Export.H ../config.h
-filename_isdir.o: ../FL/Fl_System_Driver.H ../FL/Fl.H ../FL/platform_types.h
+filename_isdir.o: Fl_System_Driver.H ../FL/Fl.H ../FL/platform_types.h
 filename_isdir.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 filename_isdir.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/filename.H
 filename_isdir.o: ../FL/Fl_Preferences.H
 filename_list.o: ../FL/filename.H ../FL/Fl_Export.H ../FL/platform_types.h
 filename_list.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/fl_utf8.h
 filename_list.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
-filename_list.o: ../FL/Fl_System_Driver.H ../FL/Fl_Preferences.H
+filename_list.o: Fl_System_Driver.H ../FL/Fl_Preferences.H
 filename_list.o: ../FL/fl_utf8.h flstring.h ../config.h
 filename_match.o: ../FL/filename.H ../FL/Fl_Export.H ../FL/platform_types.h
 filename_setext.o: ../FL/filename.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -834,17 +834,17 @@ fl_draw.o: flstring.h ../config.h
 fl_draw_pixmap.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H
 fl_draw_pixmap.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 fl_draw_pixmap.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
-fl_draw_pixmap.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+fl_draw_pixmap.o: Fl_System_Driver.H ../FL/filename.H
 fl_draw_pixmap.o: ../FL/Fl_Preferences.H ../FL/platform.H ../FL/fl_types.h
 fl_draw_pixmap.o: ../FL/Enumerations.H ../FL/fl_draw.H flstring.h
 fl_encoding_latin1.o: config_lib.h ../config.h ../FL/fl_draw.H ../FL/Fl.H
 fl_encoding_latin1.o: ../FL/Fl_Export.H ../FL/platform_types.h
 fl_encoding_latin1.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 fl_encoding_latin1.o: ../FL/Enumerations.H ../FL/abi-version.h
-fl_encoding_latin1.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+fl_encoding_latin1.o: Fl_System_Driver.H ../FL/filename.H
 fl_encoding_latin1.o: ../FL/Fl_Preferences.H ../FL/Enumerations.H flstring.h
 fl_encoding_mac_roman.o: config_lib.h ../config.h ../FL/fl_draw.H
-fl_encoding_mac_roman.o: ../FL/Fl_System_Driver.H ../FL/Fl.H
+fl_encoding_mac_roman.o: Fl_System_Driver.H ../FL/Fl.H
 fl_encoding_mac_roman.o: ../FL/Fl_Export.H ../FL/platform_types.h
 fl_encoding_mac_roman.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 fl_encoding_mac_roman.o: ../FL/Enumerations.H ../FL/abi-version.h
@@ -883,7 +883,7 @@ fl_labeltype.o: ../FL/Fl_Widget.H ../FL/Fl.H ../FL/Fl_Input_.H
 fl_open_uri.o: config_lib.h ../config.h ../FL/filename.H ../FL/Fl_Export.H
 fl_open_uri.o: ../FL/platform_types.h ../FL/Fl.H ../FL/Fl_Export.H
 fl_open_uri.o: ../FL/fl_utf8.h ../FL/fl_types.h ../FL/Enumerations.H
-fl_open_uri.o: ../FL/abi-version.h ../FL/Fl_System_Driver.H
+fl_open_uri.o: ../FL/abi-version.h Fl_System_Driver.H
 fl_open_uri.o: ../FL/Fl_Preferences.H flstring.h
 fl_open_uri.o: drivers/Posix/Fl_Posix_System_Driver.H
 fl_oval_box.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
@@ -956,7 +956,7 @@ fl_shortcut.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 fl_shortcut.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
 fl_shortcut.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_Widget.H
 fl_shortcut.o: ../FL/Fl_Button.H ../FL/Fl_Widget.H ../FL/Fl.H
-fl_shortcut.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+fl_shortcut.o: Fl_System_Driver.H ../FL/filename.H
 fl_shortcut.o: ../FL/Fl_Preferences.H ../FL/fl_draw.H flstring.h ../config.h
 fl_show_colormap.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 fl_show_colormap.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
@@ -987,7 +987,7 @@ screen_xywh.o: ../FL/Fl_Scrollbar.H ../FL/Fl_Slider.H ../FL/Fl_Valuator.H
 screen_xywh.o: ../FL/Fl_Text_Buffer.H ../config.h
 fl_utf8.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 fl_utf8.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
-fl_utf8.o: ../FL/Enumerations.H ../FL/abi-version.h ../FL/Fl_System_Driver.H
+fl_utf8.o: ../FL/Enumerations.H ../FL/abi-version.h Fl_System_Driver.H
 fl_utf8.o: ../FL/filename.H ../FL/Fl_Preferences.H ../FL/fl_utf8.h
 fl_utf8.o: utf8_internal.h xutf8/mk_wcwidth.c
 drivers/PostScript/Fl_PostScript.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H
@@ -1017,7 +1017,7 @@ drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Input_.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Return_Button.H
-drivers/PostScript/Fl_PostScript.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+drivers/PostScript/Fl_PostScript.o: Fl_System_Driver.H ../FL/filename.H
 drivers/PostScript/Fl_PostScript_image.o: ../config.h ../FL/Fl_PostScript.H
 drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_Paged_Device.H
 drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_Widget_Surface.H
@@ -1341,7 +1341,7 @@ drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Shared_Image.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Tooltip.H ../FL/Fl_Widget.H
 drivers/Posix/Fl_Posix_System_Driver.o: ../config.h
 drivers/Posix/Fl_Posix_System_Driver.o: drivers/Posix/Fl_Posix_System_Driver.H
-drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_System_Driver.H ../FL/Fl.H
+drivers/Posix/Fl_Posix_System_Driver.o: Fl_System_Driver.H ../FL/Fl.H
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_Export.H
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/platform_types.h
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/fl_utf8.h ../FL/Fl_Export.H
@@ -1354,7 +1354,7 @@ drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_File_Icon.H ../FL/Fl.H
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/filename.H ../FL/Fl_File_Icon.H
 drivers/X11/Fl_X11_System_Driver.o: drivers/X11/Fl_X11_System_Driver.H
 drivers/X11/Fl_X11_System_Driver.o: drivers/Posix/Fl_Posix_System_Driver.H
-drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_System_Driver.H ../FL/Fl.H
+drivers/X11/Fl_X11_System_Driver.o: Fl_System_Driver.H ../FL/Fl.H
 drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_Export.H ../FL/platform_types.h
 drivers/X11/Fl_X11_System_Driver.o: ../FL/fl_utf8.h ../FL/Fl_Export.H
 drivers/X11/Fl_X11_System_Driver.o: ../FL/fl_types.h ../FL/Enumerations.H
@@ -1416,7 +1416,7 @@ Fl_x.o: ../FL/Fl_Graphics_Driver.H ../FL/Fl_Image.H ../FL/Fl_Pixmap.H
 Fl_x.o: ../FL/Fl_RGB_Image.H ../FL/Fl_Group.H ../FL/Fl_Scrollbar.H
 Fl_x.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Text_Buffer.H
 Fl_x.o: drivers/X11/Fl_X11_Window_Driver.H drivers/X11/Fl_X11_System_Driver.H
-Fl_x.o: drivers/Posix/Fl_Posix_System_Driver.H ../FL/Fl_System_Driver.H
+Fl_x.o: drivers/Posix/Fl_Posix_System_Driver.H Fl_System_Driver.H
 Fl_x.o: ../FL/Fl_Preferences.H drivers/Xlib/Fl_Xlib_Graphics_Driver.H Xutf8.h
 fl_dnd_x.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h
 fl_dnd_x.o: ../FL/fl_utf8.h ../FL/Fl_Export.H ../FL/fl_types.h
@@ -1450,7 +1450,7 @@ Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Light_Button.H ../FL/Fl_Button.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_File_Input.H ../FL/Fl_Input.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/fl_ask.H ../FL/Fl_File_Icon.H
-Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_Native_File_Chooser_FLTK.o: Fl_System_Driver.H ../FL/filename.H
 Fl_Native_File_Chooser_GTK.o: config_lib.h ../config.h ../FL/platform.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Export.H ../FL/platform_types.h
 Fl_Native_File_Chooser_GTK.o: ../FL/fl_types.h ../FL/Enumerations.H
@@ -1476,7 +1476,7 @@ Fl_get_key.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H
 Fl_get_key.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_get_key.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
 Fl_get_key.o: drivers/X11/Fl_X11_System_Driver.H
-Fl_get_key.o: drivers/Posix/Fl_Posix_System_Driver.H ../FL/Fl_System_Driver.H
+Fl_get_key.o: drivers/Posix/Fl_Posix_System_Driver.H Fl_System_Driver.H
 Fl_get_key.o: ../FL/filename.H ../FL/Fl_Preferences.H ../FL/platform.H
 Fl_get_key.o: ../FL/fl_types.h ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: flstring.h ../FL/Fl_Export.H
@@ -1639,7 +1639,7 @@ forms_timer.o: ../FL/Fl_Check_Button.H ../FL/Fl_File_Input.H ../FL/Fl_Input.H
 forms_timer.o: ../FL/Fl_Input_.H ../FL/Fl_Return_Button.H ../FL/fl_ask.H
 forms_timer.o: ../FL/Fl_Input.H ../FL/Fl_Menu_Button.H ../FL/Fl_Positioner.H
 forms_timer.o: ../FL/Fl_Slider.H ../FL/Fl_Valuator.H ../FL/Fl_Value_Slider.H
-forms_timer.o: ../FL/Fl_Timer.H ../FL/Fl_System_Driver.H ../FL/filename.H
+forms_timer.o: ../FL/Fl_Timer.H Fl_System_Driver.H ../FL/filename.H
 Fl_Gl_Choice.o: config_lib.h ../config.h ../FL/Fl.H ../FL/Fl_Export.H
 Fl_Gl_Choice.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_Gl_Choice.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
@@ -1950,7 +1950,7 @@ Fl_JPEG_Image.o: ../FL/abi-version.h ../config.h
 Fl_PNG_Image.o: ../config.h ../FL/Fl.H ../FL/Fl_Export.H
 Fl_PNG_Image.o: ../FL/platform_types.h ../FL/fl_utf8.h ../FL/Fl_Export.H
 Fl_PNG_Image.o: ../FL/fl_types.h ../FL/Enumerations.H ../FL/abi-version.h
-Fl_PNG_Image.o: ../FL/Fl_System_Driver.H ../FL/filename.H
+Fl_PNG_Image.o: Fl_System_Driver.H ../FL/filename.H
 Fl_PNG_Image.o: ../FL/Fl_Preferences.H ../FL/Fl_PNG_Image.H ../FL/Fl_Image.H
 Fl_PNG_Image.o: ../FL/Fl_Shared_Image.H ../FL/fl_utf8.h
 Fl_PNM_Image.o: ../FL/Fl.H ../FL/Fl_Export.H ../FL/platform_types.h