diff --git a/cairo/Fl_Cairo.cxx b/cairo/Fl_Cairo.cxx
index 4c760b667..0b655033a 100644
--- a/cairo/Fl_Cairo.cxx
+++ b/cairo/Fl_Cairo.cxx
@@ -39,7 +39,7 @@
 #elif defined(FLTK_USE_WAYLAND)   // Wayland or hybrid
 #  include "../src/drivers/Wayland/Fl_Wayland_Graphics_Driver.H"
 #  include "../src/drivers/Wayland/Fl_Wayland_Window_Driver.H"
-#  if defined(FLTK_USE_X11) 
+#  if defined(FLTK_USE_X11)
 #    include <cairo-xlib.h>
 #  else
      static void *fl_gc = NULL;
diff --git a/fluid/makedepend b/fluid/makedepend
index 4c6a865bf..d71451077 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -621,6 +621,7 @@ Fl_Group_Type.o: ../FL/Fl_Flex.H
 Fl_Group_Type.o: ../FL/Fl_Graphics_Driver.H
 Fl_Group_Type.o: ../FL/Fl_Group.H
 Fl_Group_Type.o: ../FL/Fl_Image.H
+Fl_Group_Type.o: ../FL/Fl_Int_Vector.H
 Fl_Group_Type.o: ../FL/Fl_Menu_Item.H
 Fl_Group_Type.o: ../FL/fl_message.H
 Fl_Group_Type.o: ../FL/Fl_Pack.H
@@ -798,6 +799,7 @@ Fl_Widget_Type.o: ../FL/Fl_Input.H
 Fl_Widget_Type.o: ../FL/Fl_Input_.H
 Fl_Widget_Type.o: ../FL/Fl_Input_Choice.H
 Fl_Widget_Type.o: ../FL/Fl_Int_Input.H
+Fl_Widget_Type.o: ../FL/Fl_Int_Vector.H
 Fl_Widget_Type.o: ../FL/Fl_Light_Button.H
 Fl_Widget_Type.o: ../FL/Fl_Menu.H
 Fl_Widget_Type.o: ../FL/Fl_Menu_.H
diff --git a/src/Fl_SVG_Image.cxx b/src/Fl_SVG_Image.cxx
index ccecfc373..c971f2156 100644
--- a/src/Fl_SVG_Image.cxx
+++ b/src/Fl_SVG_Image.cxx
@@ -159,7 +159,7 @@ void Fl_SVG_Image::init_(const char *filename, const unsigned char *in_filedata,
   average_weight_ = 1;
   proportional = true;
   bool is_compressed = true;
-  
+
   if (filename || length) { // process file or byte buffer
 #if defined(HAVE_LIBZ)
     int fdread, fdwrite = -1;
diff --git a/src/makedepend b/src/makedepend
index 46d4b6b01..9f85625e6 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -330,27 +330,76 @@ drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Widget_Surface.H
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Window.H
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/math.h
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/platform_types.h
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../config.h
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Enumerations.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Bitmap.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Cairo.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/fl_casts.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/fl_config.h
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Device.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/fl_draw.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Export.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Graphics_Driver.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Group.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Image.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Pixmap.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Plugin.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Preferences.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Rect.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_RGB_Image.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Scrollbar.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Slider.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Text_Buffer.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Text_Display.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Text_Editor.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/fl_types.h
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/fl_utf8.h
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Valuator.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/Fl_Widget.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: ../FL/platform_types.h
+drivers/Unix/Fl_Unix_Screen_Driver.o: drivers/Unix/Fl_Unix_Screen_Driver.H
+drivers/Unix/Fl_Unix_Screen_Driver.o: Fl_Screen_Driver.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../config.h
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Enumerations.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/filename.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Bitmap.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Browser.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Cairo.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/fl_casts.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/fl_config.h
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Device.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/fl_draw.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Export.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_File_Browser.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_File_Icon.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Graphics_Driver.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Group.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Image.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Pixmap.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Plugin.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Preferences.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Rect.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_RGB_Image.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Scrollbar.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Slider.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/fl_string_functions.h
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Text_Buffer.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Text_Display.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Text_Editor.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/fl_types.h
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/fl_utf8.h
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Valuator.H
+drivers/Unix/Fl_Unix_System_Driver.o: ../FL/Fl_Widget.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/platform.H
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/platform_types.h
 drivers/Unix/Fl_Unix_System_Driver.o: ../FL/x11.H
 drivers/Unix/Fl_Unix_System_Driver.o: drivers/Posix/Fl_Posix_System_Driver.H
+drivers/Unix/Fl_Unix_System_Driver.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 drivers/Unix/Fl_Unix_System_Driver.o: drivers/Unix/Fl_Unix_System_Driver.H
 drivers/Unix/Fl_Unix_System_Driver.o: flstring.h
+drivers/Unix/Fl_Unix_System_Driver.o: Fl_Screen_Driver.H
 drivers/Unix/Fl_Unix_System_Driver.o: Fl_System_Driver.H
 drivers/Unix/Fl_Unix_System_Driver.o: Fl_Timeout.h
 drivers/X11/fl_X11_gl_platform_init.o: ../config.h
@@ -442,6 +491,7 @@ drivers/X11/fl_X11_platform_init.o: ../FL/platform.H
 drivers/X11/fl_X11_platform_init.o: ../FL/platform_types.h
 drivers/X11/fl_X11_platform_init.o: ../FL/x11.H
 drivers/X11/fl_X11_platform_init.o: drivers/Posix/Fl_Posix_System_Driver.H
+drivers/X11/fl_X11_platform_init.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 drivers/X11/fl_X11_platform_init.o: drivers/Unix/Fl_Unix_System_Driver.H
 drivers/X11/fl_X11_platform_init.o: drivers/X11/Fl_X11_Screen_Driver.H
 drivers/X11/fl_X11_platform_init.o: drivers/X11/Fl_X11_Window_Driver.H
@@ -495,7 +545,7 @@ drivers/X11/Fl_X11_Screen_Driver.o: ../FL/platform.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/platform_types.h
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/x11.H
 drivers/X11/Fl_X11_Screen_Driver.o: drivers/Posix/Fl_Posix_System_Driver.H
-drivers/X11/Fl_X11_Screen_Driver.o: drivers/Unix/Fl_Unix_System_Driver.H
+drivers/X11/Fl_X11_Screen_Driver.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 drivers/X11/Fl_X11_Screen_Driver.o: drivers/X11/Fl_X11_Screen_Driver.H
 drivers/X11/Fl_X11_Screen_Driver.o: drivers/X11/Fl_X11_Window_Driver.H
 drivers/X11/Fl_X11_Screen_Driver.o: Fl_Screen_Driver.H
@@ -541,6 +591,7 @@ drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Window.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/platform.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/platform_types.h
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/x11.H
+drivers/X11/Fl_X11_Window_Driver.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 drivers/X11/Fl_X11_Window_Driver.o: drivers/X11/Fl_X11_Screen_Driver.H
 drivers/X11/Fl_X11_Window_Driver.o: drivers/X11/Fl_X11_Window_Driver.H
 drivers/X11/Fl_X11_Window_Driver.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
@@ -579,6 +630,7 @@ drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Window.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/platform.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/platform_types.h
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/x11.H
+drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: drivers/X11/Fl_X11_Screen_Driver.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
@@ -711,6 +763,7 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Window.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/platform.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/platform_types.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/x11.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: drivers/X11/Fl_X11_Screen_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: drivers/X11/Fl_X11_Window_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
@@ -1495,6 +1548,7 @@ fl_dnd_x.o: ../FL/Fl_Window.H
 fl_dnd_x.o: ../FL/platform.H
 fl_dnd_x.o: ../FL/platform_types.h
 fl_dnd_x.o: ../FL/x11.H
+fl_dnd_x.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 fl_dnd_x.o: drivers/X11/Fl_X11_Screen_Driver.H
 fl_dnd_x.o: flstring.h
 fl_dnd_x.o: Fl_Screen_Driver.H
@@ -1822,21 +1876,37 @@ fl_font.o: flstring.h
 fl_font.o: Fl_Screen_Driver.H
 Fl_get_key.o: ../config.h
 Fl_get_key.o: ../FL/Enumerations.H
-Fl_get_key.o: ../FL/filename.H
 Fl_get_key.o: ../FL/Fl.H
+Fl_get_key.o: ../FL/Fl_Bitmap.H
 Fl_get_key.o: ../FL/Fl_Cairo.H
 Fl_get_key.o: ../FL/fl_casts.H
 Fl_get_key.o: ../FL/fl_config.h
+Fl_get_key.o: ../FL/Fl_Device.H
+Fl_get_key.o: ../FL/fl_draw.H
 Fl_get_key.o: ../FL/Fl_Export.H
+Fl_get_key.o: ../FL/Fl_Graphics_Driver.H
+Fl_get_key.o: ../FL/Fl_Group.H
+Fl_get_key.o: ../FL/Fl_Image.H
+Fl_get_key.o: ../FL/Fl_Pixmap.H
+Fl_get_key.o: ../FL/Fl_Plugin.H
 Fl_get_key.o: ../FL/Fl_Preferences.H
+Fl_get_key.o: ../FL/Fl_Rect.H
+Fl_get_key.o: ../FL/Fl_RGB_Image.H
+Fl_get_key.o: ../FL/Fl_Scrollbar.H
+Fl_get_key.o: ../FL/Fl_Slider.H
+Fl_get_key.o: ../FL/Fl_Text_Buffer.H
+Fl_get_key.o: ../FL/Fl_Text_Display.H
+Fl_get_key.o: ../FL/Fl_Text_Editor.H
 Fl_get_key.o: ../FL/fl_types.h
 Fl_get_key.o: ../FL/fl_utf8.h
+Fl_get_key.o: ../FL/Fl_Valuator.H
+Fl_get_key.o: ../FL/Fl_Widget.H
 Fl_get_key.o: ../FL/platform.H
 Fl_get_key.o: ../FL/platform_types.h
 Fl_get_key.o: ../FL/x11.H
-Fl_get_key.o: drivers/Posix/Fl_Posix_System_Driver.H
-Fl_get_key.o: drivers/Unix/Fl_Unix_System_Driver.H
-Fl_get_key.o: Fl_System_Driver.H
+Fl_get_key.o: drivers/Unix/Fl_Unix_Screen_Driver.H
+Fl_get_key.o: drivers/X11/Fl_X11_Screen_Driver.H
+Fl_get_key.o: Fl_Screen_Driver.H
 Fl_get_system_colors.o: ../config.h
 Fl_get_system_colors.o: ../FL/Enumerations.H
 Fl_get_system_colors.o: ../FL/filename.H
@@ -2122,6 +2192,7 @@ Fl_Help_View.o: ../FL/Fl_Graphics_Driver.H
 Fl_Help_View.o: ../FL/Fl_Group.H
 Fl_Help_View.o: ../FL/Fl_Help_View.H
 Fl_Help_View.o: ../FL/Fl_Image.H
+Fl_Help_View.o: ../FL/Fl_Int_Vector.H
 Fl_Help_View.o: ../FL/Fl_Pixmap.H
 Fl_Help_View.o: ../FL/Fl_Plugin.H
 Fl_Help_View.o: ../FL/Fl_Preferences.H
@@ -2298,6 +2369,16 @@ Fl_Input_Choice.o: ../FL/fl_types.h
 Fl_Input_Choice.o: ../FL/fl_utf8.h
 Fl_Input_Choice.o: ../FL/Fl_Widget.H
 Fl_Input_Choice.o: ../FL/platform_types.h
+Fl_Int_Vector.o: ../FL/Enumerations.H
+Fl_Int_Vector.o: ../FL/Fl.H
+Fl_Int_Vector.o: ../FL/Fl_Cairo.H
+Fl_Int_Vector.o: ../FL/fl_casts.H
+Fl_Int_Vector.o: ../FL/fl_config.h
+Fl_Int_Vector.o: ../FL/Fl_Export.H
+Fl_Int_Vector.o: ../FL/Fl_Int_Vector.H
+Fl_Int_Vector.o: ../FL/fl_types.h
+Fl_Int_Vector.o: ../FL/fl_utf8.h
+Fl_Int_Vector.o: ../FL/platform_types.h
 Fl_JPEG_Image.o: ../config.h
 Fl_JPEG_Image.o: ../FL/Enumerations.H
 Fl_JPEG_Image.o: ../FL/Fl.H
@@ -2355,30 +2436,41 @@ Fl_lock.o: ../FL/platform_types.h
 Fl_lock.o: Fl_System_Driver.H
 Fl_Menu.o: ../config.h
 Fl_Menu.o: ../FL/Enumerations.H
-Fl_Menu.o: ../FL/filename.H
 Fl_Menu.o: ../FL/Fl.H
 Fl_Menu.o: ../FL/Fl_Bitmap.H
 Fl_Menu.o: ../FL/Fl_Cairo.H
 Fl_Menu.o: ../FL/fl_casts.H
 Fl_Menu.o: ../FL/fl_config.h
+Fl_Menu.o: ../FL/Fl_Device.H
 Fl_Menu.o: ../FL/Fl_Double_Window.H
 Fl_Menu.o: ../FL/fl_draw.H
 Fl_Menu.o: ../FL/Fl_Export.H
+Fl_Menu.o: ../FL/Fl_Graphics_Driver.H
 Fl_Menu.o: ../FL/Fl_Group.H
 Fl_Menu.o: ../FL/Fl_Image.H
 Fl_Menu.o: ../FL/Fl_Menu_.H
 Fl_Menu.o: ../FL/Fl_Menu_Item.H
 Fl_Menu.o: ../FL/Fl_Menu_Window.H
 Fl_Menu.o: ../FL/Fl_Overlay_Window.H
+Fl_Menu.o: ../FL/Fl_Pixmap.H
+Fl_Menu.o: ../FL/Fl_Plugin.H
 Fl_Menu.o: ../FL/Fl_Preferences.H
+Fl_Menu.o: ../FL/Fl_Rect.H
+Fl_Menu.o: ../FL/Fl_RGB_Image.H
+Fl_Menu.o: ../FL/Fl_Scrollbar.H
 Fl_Menu.o: ../FL/Fl_Single_Window.H
+Fl_Menu.o: ../FL/Fl_Slider.H
+Fl_Menu.o: ../FL/Fl_Text_Buffer.H
+Fl_Menu.o: ../FL/Fl_Text_Display.H
+Fl_Menu.o: ../FL/Fl_Text_Editor.H
 Fl_Menu.o: ../FL/fl_types.h
 Fl_Menu.o: ../FL/fl_utf8.h
+Fl_Menu.o: ../FL/Fl_Valuator.H
 Fl_Menu.o: ../FL/Fl_Widget.H
 Fl_Menu.o: ../FL/Fl_Window.H
 Fl_Menu.o: ../FL/platform_types.h
 Fl_Menu.o: flstring.h
-Fl_Menu.o: Fl_System_Driver.H
+Fl_Menu.o: Fl_Screen_Driver.H
 Fl_Menu.o: Fl_Window_Driver.H
 Fl_Menu_.o: ../config.h
 Fl_Menu_.o: ../FL/Enumerations.H
@@ -2645,6 +2737,7 @@ Fl_Native_File_Chooser_GTK.o: ../FL/platform.H
 Fl_Native_File_Chooser_GTK.o: ../FL/platform_types.h
 Fl_Native_File_Chooser_GTK.o: ../FL/x11.H
 Fl_Native_File_Chooser_GTK.o: drivers/Posix/Fl_Posix_System_Driver.H
+Fl_Native_File_Chooser_GTK.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 Fl_Native_File_Chooser_GTK.o: drivers/Unix/Fl_Unix_System_Driver.H
 Fl_Native_File_Chooser_GTK.o: Fl_Native_File_Chooser_Kdialog.H
 Fl_Native_File_Chooser_GTK.o: Fl_Screen_Driver.H
@@ -2665,12 +2758,15 @@ Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_casts.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Check_Button.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Choice.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_config.h
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Device.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Double_Window.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_draw.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Export.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_File_Browser.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_File_Chooser.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_File_Icon.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_File_Input.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Graphics_Driver.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Group.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Image.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Input.H
@@ -2681,19 +2777,28 @@ Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Menu_Button.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Menu_Item.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Native_File_Chooser.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Overlay_Window.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Pixmap.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Plugin.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Preferences.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Rect.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Return_Button.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_RGB_Image.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Scrollbar.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Slider.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_String.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Text_Buffer.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Text_Display.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Text_Editor.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Tile.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_types.h
 Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_utf8.h
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Valuator.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Widget.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Window.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/platform_types.h
-Fl_Native_File_Chooser_Kdialog.o: drivers/Posix/Fl_Posix_System_Driver.H
-Fl_Native_File_Chooser_Kdialog.o: drivers/Unix/Fl_Unix_System_Driver.H
+Fl_Native_File_Chooser_Kdialog.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 Fl_Native_File_Chooser_Kdialog.o: Fl_Native_File_Chooser_Kdialog.H
-Fl_Native_File_Chooser_Kdialog.o: Fl_System_Driver.H
+Fl_Native_File_Chooser_Kdialog.o: Fl_Screen_Driver.H
 Fl_Native_File_Chooser_Kdialog.o: Fl_Window_Driver.H
 fl_open_uri.o: ../config.h
 fl_open_uri.o: ../FL/Enumerations.H
@@ -2767,17 +2872,33 @@ Fl_Overlay_Window.o: ../FL/Fl_Window.H
 Fl_Overlay_Window.o: ../FL/platform_types.h
 Fl_Overlay_Window.o: Fl_Window_Driver.H
 Fl_own_colormap.o: ../FL/Enumerations.H
-Fl_own_colormap.o: ../FL/filename.H
 Fl_own_colormap.o: ../FL/Fl.H
+Fl_own_colormap.o: ../FL/Fl_Bitmap.H
 Fl_own_colormap.o: ../FL/Fl_Cairo.H
 Fl_own_colormap.o: ../FL/fl_casts.H
 Fl_own_colormap.o: ../FL/fl_config.h
+Fl_own_colormap.o: ../FL/Fl_Device.H
+Fl_own_colormap.o: ../FL/fl_draw.H
 Fl_own_colormap.o: ../FL/Fl_Export.H
+Fl_own_colormap.o: ../FL/Fl_Graphics_Driver.H
+Fl_own_colormap.o: ../FL/Fl_Group.H
+Fl_own_colormap.o: ../FL/Fl_Image.H
+Fl_own_colormap.o: ../FL/Fl_Pixmap.H
+Fl_own_colormap.o: ../FL/Fl_Plugin.H
 Fl_own_colormap.o: ../FL/Fl_Preferences.H
+Fl_own_colormap.o: ../FL/Fl_Rect.H
+Fl_own_colormap.o: ../FL/Fl_RGB_Image.H
+Fl_own_colormap.o: ../FL/Fl_Scrollbar.H
+Fl_own_colormap.o: ../FL/Fl_Slider.H
+Fl_own_colormap.o: ../FL/Fl_Text_Buffer.H
+Fl_own_colormap.o: ../FL/Fl_Text_Display.H
+Fl_own_colormap.o: ../FL/Fl_Text_Editor.H
 Fl_own_colormap.o: ../FL/fl_types.h
 Fl_own_colormap.o: ../FL/fl_utf8.h
+Fl_own_colormap.o: ../FL/Fl_Valuator.H
+Fl_own_colormap.o: ../FL/Fl_Widget.H
 Fl_own_colormap.o: ../FL/platform_types.h
-Fl_own_colormap.o: Fl_System_Driver.H
+Fl_own_colormap.o: Fl_Screen_Driver.H
 Fl_Pack.o: ../FL/Enumerations.H
 Fl_Pack.o: ../FL/Fl.H
 Fl_Pack.o: ../FL/Fl_Cairo.H
@@ -3201,18 +3322,34 @@ fl_shortcut.o: ../config.h
 fl_shortcut.o: ../FL/Enumerations.H
 fl_shortcut.o: ../FL/filename.H
 fl_shortcut.o: ../FL/Fl.H
+fl_shortcut.o: ../FL/Fl_Bitmap.H
 fl_shortcut.o: ../FL/Fl_Button.H
 fl_shortcut.o: ../FL/Fl_Cairo.H
 fl_shortcut.o: ../FL/fl_casts.H
 fl_shortcut.o: ../FL/fl_config.h
+fl_shortcut.o: ../FL/Fl_Device.H
 fl_shortcut.o: ../FL/fl_draw.H
 fl_shortcut.o: ../FL/Fl_Export.H
+fl_shortcut.o: ../FL/Fl_Graphics_Driver.H
+fl_shortcut.o: ../FL/Fl_Group.H
+fl_shortcut.o: ../FL/Fl_Image.H
+fl_shortcut.o: ../FL/Fl_Pixmap.H
+fl_shortcut.o: ../FL/Fl_Plugin.H
 fl_shortcut.o: ../FL/Fl_Preferences.H
+fl_shortcut.o: ../FL/Fl_Rect.H
+fl_shortcut.o: ../FL/Fl_RGB_Image.H
+fl_shortcut.o: ../FL/Fl_Scrollbar.H
+fl_shortcut.o: ../FL/Fl_Slider.H
+fl_shortcut.o: ../FL/Fl_Text_Buffer.H
+fl_shortcut.o: ../FL/Fl_Text_Display.H
+fl_shortcut.o: ../FL/Fl_Text_Editor.H
 fl_shortcut.o: ../FL/fl_types.h
 fl_shortcut.o: ../FL/fl_utf8.h
+fl_shortcut.o: ../FL/Fl_Valuator.H
 fl_shortcut.o: ../FL/Fl_Widget.H
 fl_shortcut.o: ../FL/platform_types.h
 fl_shortcut.o: flstring.h
+fl_shortcut.o: Fl_Screen_Driver.H
 fl_shortcut.o: Fl_System_Driver.H
 fl_show_colormap.o: ../config.h
 fl_show_colormap.o: ../FL/Enumerations.H
@@ -3302,6 +3439,7 @@ fl_string_functions.o: ../FL/platform_types.h
 fl_string_functions.o: Fl_System_Driver.H
 Fl_SVG_Image.o: ../config.h
 Fl_SVG_Image.o: ../FL/Enumerations.H
+Fl_SVG_Image.o: ../FL/filename.H
 Fl_SVG_Image.o: ../FL/Fl.H
 Fl_SVG_Image.o: ../FL/Fl_Bitmap.H
 Fl_SVG_Image.o: ../FL/Fl_Cairo.H
@@ -3333,6 +3471,7 @@ Fl_SVG_Image.o: ../FL/platform_types.h
 Fl_SVG_Image.o: ../nanosvg/nanosvg.h
 Fl_SVG_Image.o: ../nanosvg/nanosvgrast.h
 Fl_SVG_Image.o: Fl_Screen_Driver.H
+Fl_SVG_Image.o: Fl_System_Driver.H
 fl_symbols.o: ../config.h
 fl_symbols.o: ../FL/Enumerations.H
 fl_symbols.o: ../FL/Fl.H
@@ -3392,6 +3531,7 @@ Fl_Table.o: ../FL/fl_config.h
 Fl_Table.o: ../FL/fl_draw.H
 Fl_Table.o: ../FL/Fl_Export.H
 Fl_Table.o: ../FL/Fl_Group.H
+Fl_Table.o: ../FL/Fl_Int_Vector.H
 Fl_Table.o: ../FL/Fl_Scroll.H
 Fl_Table.o: ../FL/Fl_Scrollbar.H
 Fl_Table.o: ../FL/Fl_Slider.H
@@ -3409,6 +3549,7 @@ Fl_Table_Row.o: ../FL/fl_config.h
 Fl_Table_Row.o: ../FL/fl_draw.H
 Fl_Table_Row.o: ../FL/Fl_Export.H
 Fl_Table_Row.o: ../FL/Fl_Group.H
+Fl_Table_Row.o: ../FL/Fl_Int_Vector.H
 Fl_Table_Row.o: ../FL/Fl_Scroll.H
 Fl_Table_Row.o: ../FL/Fl_Scrollbar.H
 Fl_Table_Row.o: ../FL/Fl_Slider.H
@@ -4012,6 +4153,7 @@ Fl_x.o: ../FL/platform.H
 Fl_x.o: ../FL/platform_types.h
 Fl_x.o: ../FL/x11.H
 Fl_x.o: drivers/Posix/Fl_Posix_System_Driver.H
+Fl_x.o: drivers/Unix/Fl_Unix_Screen_Driver.H
 Fl_x.o: drivers/Unix/Fl_Unix_System_Driver.H
 Fl_x.o: drivers/X11/Fl_X11_Screen_Driver.H
 Fl_x.o: drivers/X11/Fl_X11_Window_Driver.H
diff --git a/test/makedepend b/test/makedepend
index 0067905a5..cd18315e0 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -2315,6 +2315,7 @@ table.o: ../FL/Fl_Group.H
 table.o: ../FL/Fl_Image.H
 table.o: ../FL/Fl_Input.H
 table.o: ../FL/Fl_Input_.H
+table.o: ../FL/Fl_Int_Vector.H
 table.o: ../FL/Fl_Light_Button.H
 table.o: ../FL/Fl_Menu_.H
 table.o: ../FL/Fl_Menu_Item.H
@@ -2776,6 +2777,7 @@ unittest_scrollbarsize.o: ../FL/Fl_Export.H
 unittest_scrollbarsize.o: ../FL/Fl_Graphics_Driver.H
 unittest_scrollbarsize.o: ../FL/Fl_Group.H
 unittest_scrollbarsize.o: ../FL/Fl_Image.H
+unittest_scrollbarsize.o: ../FL/Fl_Int_Vector.H
 unittest_scrollbarsize.o: ../FL/Fl_Pixmap.H
 unittest_scrollbarsize.o: ../FL/Fl_Plugin.H
 unittest_scrollbarsize.o: ../FL/Fl_Preferences.H