10 files changed, 4 insertions, 21 deletions
diff --git a/src/Fl_BMP_Image.cxx b/src/Fl_BMP_Image.cxx
index bcbac4ebb..234d6b2ce 100644
--- a/src/Fl_BMP_Image.cxx
+++ b/src/Fl_BMP_Image.cxx
@@ -28,7 +28,6 @@
 #include <FL/Fl_BMP_Image.H>
 #include <FL/fl_utf8.h>
 #include <FL/Fl.H>
-#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/Fl_Window_Driver.cxx b/src/Fl_Window_Driver.cxx
index acb00712c..012eb9a93 100644
--- a/src/Fl_Window_Driver.cxx
+++ b/src/Fl_Window_Driver.cxx
@@ -18,7 +18,6 @@
 //
 
 
-#include <config.h>
 #include <FL/Fl_Window_Driver.H>
 #include <FL/Fl_Overlay_Window.H>
 #include <FL/fl_draw.H>
diff --git a/src/Fl_get_key_mac.cxx b/src/Fl_get_key_mac.cxx
index 52d99e222..358678015 100644
--- a/src/Fl_get_key_mac.cxx
+++ b/src/Fl_get_key_mac.cxx
@@ -20,7 +20,6 @@
 // which are actually X keysyms.  So this has to translate to macOS
 // symbols.
 
-#include <config.h>
 #include <FL/Fl.H>
 #include <FL/x.H>
 
diff --git a/src/Fl_grab.cxx b/src/Fl_grab.cxx
index f014c14d7..5a33e4b7c 100644
--- a/src/Fl_grab.cxx
+++ b/src/Fl_grab.cxx
@@ -16,7 +16,6 @@
 //     http://www.fltk.org/str.php
 //
 
-#include <config.h>
 #include <FL/Fl.H>
 #include <FL/Fl_Screen_Driver.H>
 
diff --git a/src/Fl_visual.cxx b/src/Fl_visual.cxx
index e3c08806e..eaa0f776b 100644
--- a/src/Fl_visual.cxx
+++ b/src/Fl_visual.cxx
@@ -18,7 +18,6 @@
 
 // Set the default visual according to passed switches:
 
-#include <config.h>
 #include <FL/Fl.H>
 #include <FL/Fl_Screen_Driver.H>
 
diff --git a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
index 4af0b129f..54740fc10 100644
--- a/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
+++ b/src/drivers/GDI/Fl_GDI_Graphics_Driver.cxx
@@ -17,7 +17,6 @@
 //
 
 
-#include <config.h>
 #include "../../config_lib.h"
 #include "Fl_GDI_Graphics_Driver.H"
 #include <FL/Fl.H>
diff --git a/src/fl_color.cxx b/src/fl_color.cxx
index 4fa08dd08..c3021e7ea 100644
--- a/src/fl_color.cxx
+++ b/src/fl_color.cxx
@@ -26,8 +26,6 @@
 #include <FL/Fl.H>
 #include <FL/Fl_Device.H>
 #include <FL/Fl.H>
-#include <config.h>
-#include "config_lib.h"
 
 // fl_cmap needs to be defined globally (here) and is used in the device
 // specific graphics drivers
diff --git a/src/fl_read_image_mac.cxx b/src/fl_read_image_mac.cxx
index 3d84c80a2..36f2ad017 100644
--- a/src/fl_read_image_mac.cxx
+++ b/src/fl_read_image_mac.cxx
@@ -1,7 +1,7 @@
 //
 // "$Id$"
 //
-// WIN32 image reading routines for the Fast Light Tool Kit (FLTK).
+// Mac OS image reading routines for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2016 by Bill Spitzak and others.
 //
@@ -16,8 +16,6 @@
 //     http://www.fltk.org/str.php
 //
 
-#include <config.h>
-
 //
 // 'fl_read_image()' - Read an image from the current window or off-screen buffer.
 //
diff --git a/src/fl_rect.cxx b/src/fl_rect.cxx
index d8709d8e0..af096d390 100644
--- a/src/fl_rect.cxx
+++ b/src/fl_rect.cxx
@@ -26,13 +26,8 @@
 // Also all fl_clip routines, since they are always linked in so
 // that minimal update works.
 
-#include <config.h>
-#include "config_lib.h"
-#include <FL/Fl.H>
 #include <FL/x.H>
-#include <FL/Fl_Widget.H>
-#include <FL/Fl_Printer.H>
-#include <FL/fl_draw.H>
+#include <FL/Fl_Graphics_Driver.H>
 
 // -----------------------------------------------------------------------------
 // all driver code is now in drivers/XXX/Fl_XXX_Graphics_Driver_xyz.cxx
@@ -53,7 +48,7 @@ void Fl_Graphics_Driver::clip_region(Fl_Region r) {
   Fl_Region oldr = rstack[rstackptr];
   if (oldr) XDestroyRegion(oldr);
   rstack[rstackptr] = r;
-  fl_restore_clip();
+  restore_clip();
 }
 
 
diff --git a/src/fl_vertex.cxx b/src/fl_vertex.cxx
index 1a425895c..e108d2163 100644
--- a/src/fl_vertex.cxx
+++ b/src/fl_vertex.cxx
@@ -32,9 +32,7 @@
 // all driver code is now in drivers/XXX/Fl_XXX_Graphics_Driver_xyz.cxx
 // -----------------------------------------------------------------------------
 
-#include <config.h>
-#include "config_lib.h"
-#include <FL/fl_draw.H>
+#include <FL/Fl_Graphics_Driver.H>
 #include <FL/Fl.H>
 #include <FL/math.h>
 #include <stdlib.h>