Fix missing (new) source file in fluid and dependencies

New file: Fl_Button_Type.cxx

4 files changed, 251 insertions, 28 deletions

diff --git a/fluid/Makefile b/fluid/Makefile
index a5569b70f..5cab97a69 100644
--- a/fluid/Makefile
+++ b/fluid/Makefile
@@ -1,7 +1,7 @@
 #
 # FLUID Makefile for the Fast Light Tool Kit (FLTK).
 #
-# Copyright 1998-2021 by Bill Spitzak and others.
+# Copyright 1998-2023 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
@@ -20,6 +20,7 @@ CPPFILES = \
 	CodeEditor.cxx \
 	StyleParse.cxx \
 	Fd_Snap_Action.cxx \
+	Fl_Button_Type.cxx \
 	Fl_Function_Type.cxx \
 	Fl_Group_Type.cxx \
 	Fl_Menu_Type.cxx \
diff --git a/fluid/makedepend b/fluid/makedepend
index 8e2b8361f..a019f23a9 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -32,6 +32,7 @@ alignment_panel.o: ../FL/fl_ask.H
 alignment_panel.o: ../FL/fl_attr.h
 alignment_panel.o: ../FL/Fl_Bitmap.H
 alignment_panel.o: ../FL/Fl_Box.H
+alignment_panel.o: ../FL/Fl_Browser.H
 alignment_panel.o: ../FL/Fl_Browser_.H
 alignment_panel.o: ../FL/Fl_Button.H
 alignment_panel.o: ../FL/Fl_Cairo.H
@@ -43,6 +44,11 @@ alignment_panel.o: ../FL/Fl_Device.H
 alignment_panel.o: ../FL/Fl_Double_Window.H
 alignment_panel.o: ../FL/fl_draw.H
 alignment_panel.o: ../FL/Fl_Export.H
+alignment_panel.o: ../FL/Fl_File_Browser.H
+alignment_panel.o: ../FL/Fl_File_Chooser.H
+alignment_panel.o: ../FL/Fl_File_Icon.H
+alignment_panel.o: ../FL/Fl_File_Input.H
+alignment_panel.o: ../FL/Fl_Flex.H
 alignment_panel.o: ../FL/Fl_Graphics_Driver.H
 alignment_panel.o: ../FL/Fl_Group.H
 alignment_panel.o: ../FL/Fl_Image.H
@@ -51,15 +57,18 @@ alignment_panel.o: ../FL/Fl_Input_.H
 alignment_panel.o: ../FL/Fl_Int_Input.H
 alignment_panel.o: ../FL/Fl_Light_Button.H
 alignment_panel.o: ../FL/Fl_Menu_.H
+alignment_panel.o: ../FL/Fl_Menu_Button.H
 alignment_panel.o: ../FL/Fl_Menu_Item.H
+alignment_panel.o: ../FL/Fl_Native_File_Chooser.H
+alignment_panel.o: ../FL/Fl_Pack.H
 alignment_panel.o: ../FL/Fl_Pixmap.H
 alignment_panel.o: ../FL/Fl_Plugin.H
+alignment_panel.o: ../FL/Fl_PNG_Image.H
 alignment_panel.o: ../FL/Fl_Preferences.H
 alignment_panel.o: ../FL/Fl_Rect.H
 alignment_panel.o: ../FL/Fl_Repeat_Button.H
 alignment_panel.o: ../FL/Fl_Return_Button.H
 alignment_panel.o: ../FL/Fl_RGB_Image.H
-alignment_panel.o: ../FL/Fl_Round_Button.H
 alignment_panel.o: ../FL/Fl_Scheme.H
 alignment_panel.o: ../FL/Fl_Scheme_Choice.H
 alignment_panel.o: ../FL/Fl_Scrollbar.H
@@ -67,19 +76,30 @@ alignment_panel.o: ../FL/Fl_Simple_Terminal.H
 alignment_panel.o: ../FL/Fl_Slider.H
 alignment_panel.o: ../FL/Fl_Spinner.H
 alignment_panel.o: ../FL/Fl_String.H
+alignment_panel.o: ../FL/fl_string_functions.h
 alignment_panel.o: ../FL/Fl_Tabs.H
 alignment_panel.o: ../FL/Fl_Text_Buffer.H
 alignment_panel.o: ../FL/Fl_Text_Display.H
+alignment_panel.o: ../FL/Fl_Tile.H
 alignment_panel.o: ../FL/Fl_Tooltip.H
 alignment_panel.o: ../FL/fl_types.h
 alignment_panel.o: ../FL/fl_utf8.h
 alignment_panel.o: ../FL/Fl_Valuator.H
+alignment_panel.o: ../FL/Fl_Value_Input.H
 alignment_panel.o: ../FL/Fl_Widget.H
 alignment_panel.o: ../FL/Fl_Window.H
+alignment_panel.o: ../FL/Fl_Wizard.H
 alignment_panel.o: ../FL/platform_types.h
 alignment_panel.o: alignment_panel.h
+alignment_panel.o: code.h
+alignment_panel.o: Fd_Snap_Action.h
 alignment_panel.o: fluid.h
+alignment_panel.o: Fl_Group_Type.h
+alignment_panel.o: Fl_Type.h
+alignment_panel.o: Fl_Widget_Type.h
+alignment_panel.o: Fl_Window_Type.h
 alignment_panel.o: shell_command.h
+alignment_panel.o: undo.h
 alignment_panel.o: widget_browser.h
 align_widget.o: ../FL/Enumerations.H
 align_widget.o: ../FL/filename.H
@@ -122,9 +142,11 @@ code.o: ../config.h
 code.o: ../FL/Enumerations.H
 code.o: ../FL/filename.H
 code.o: ../FL/Fl.H
+code.o: ../FL/fl_ask.H
 code.o: ../FL/fl_attr.h
 code.o: ../FL/Fl_Bitmap.H
 code.o: ../FL/Fl_Box.H
+code.o: ../FL/Fl_Browser.H
 code.o: ../FL/Fl_Browser_.H
 code.o: ../FL/Fl_Button.H
 code.o: ../FL/Fl_Cairo.H
@@ -136,6 +158,10 @@ code.o: ../FL/Fl_Device.H
 code.o: ../FL/Fl_Double_Window.H
 code.o: ../FL/fl_draw.H
 code.o: ../FL/Fl_Export.H
+code.o: ../FL/Fl_File_Browser.H
+code.o: ../FL/Fl_File_Chooser.H
+code.o: ../FL/Fl_File_Icon.H
+code.o: ../FL/Fl_File_Input.H
 code.o: ../FL/Fl_Flex.H
 code.o: ../FL/Fl_Graphics_Driver.H
 code.o: ../FL/Fl_Group.H
@@ -146,7 +172,9 @@ code.o: ../FL/Fl_Int_Input.H
 code.o: ../FL/Fl_Light_Button.H
 code.o: ../FL/Fl_Menu.H
 code.o: ../FL/Fl_Menu_.H
+code.o: ../FL/Fl_Menu_Button.H
 code.o: ../FL/Fl_Menu_Item.H
+code.o: ../FL/Fl_Native_File_Chooser.H
 code.o: ../FL/Fl_Pack.H
 code.o: ../FL/Fl_Pixmap.H
 code.o: ../FL/Fl_Plugin.H
@@ -155,7 +183,6 @@ code.o: ../FL/Fl_Rect.H
 code.o: ../FL/Fl_Repeat_Button.H
 code.o: ../FL/Fl_Return_Button.H
 code.o: ../FL/Fl_RGB_Image.H
-code.o: ../FL/Fl_Round_Button.H
 code.o: ../FL/Fl_Scheme.H
 code.o: ../FL/Fl_Scheme_Choice.H
 code.o: ../FL/Fl_Scrollbar.H
@@ -168,10 +195,11 @@ code.o: ../FL/fl_string_functions.h
 code.o: ../FL/Fl_Tabs.H
 code.o: ../FL/Fl_Text_Buffer.H
 code.o: ../FL/Fl_Text_Display.H
-code.o: ../FL/Fl_Tooltip.H
+code.o: ../FL/Fl_Tile.H
 code.o: ../FL/fl_types.h
 code.o: ../FL/fl_utf8.h
 code.o: ../FL/Fl_Valuator.H
+code.o: ../FL/Fl_Value_Input.H
 code.o: ../FL/Fl_Widget.H
 code.o: ../FL/Fl_Window.H
 code.o: ../FL/Fl_Wizard.H
@@ -180,6 +208,7 @@ code.o: ../src/flstring.h
 code.o: alignment_panel.h
 code.o: code.h
 code.o: ExternalCodeEditor_UNIX.h
+code.o: Fd_Snap_Action.h
 code.o: file.h
 code.o: fluid.h
 code.o: Fluid_Image.h
@@ -238,6 +267,7 @@ custom_widgets.o: ../FL/Fl_Device.H
 custom_widgets.o: ../FL/Fl_Double_Window.H
 custom_widgets.o: ../FL/fl_draw.H
 custom_widgets.o: ../FL/Fl_Export.H
+custom_widgets.o: ../FL/Fl_Flex.H
 custom_widgets.o: ../FL/Fl_Graphics_Driver.H
 custom_widgets.o: ../FL/Fl_Group.H
 custom_widgets.o: ../FL/Fl_Image.H
@@ -248,6 +278,7 @@ custom_widgets.o: ../FL/Fl_Light_Button.H
 custom_widgets.o: ../FL/Fl_Menu_.H
 custom_widgets.o: ../FL/Fl_Menu_Button.H
 custom_widgets.o: ../FL/Fl_Menu_Item.H
+custom_widgets.o: ../FL/Fl_Pack.H
 custom_widgets.o: ../FL/Fl_Pixmap.H
 custom_widgets.o: ../FL/Fl_Plugin.H
 custom_widgets.o: ../FL/Fl_Preferences.H
@@ -270,6 +301,7 @@ custom_widgets.o: ../FL/Fl_Valuator.H
 custom_widgets.o: ../FL/Fl_Value_Input.H
 custom_widgets.o: ../FL/Fl_Widget.H
 custom_widgets.o: ../FL/Fl_Window.H
+custom_widgets.o: ../FL/Fl_Wizard.H
 custom_widgets.o: ../FL/platform.H
 custom_widgets.o: ../FL/platform_types.h
 custom_widgets.o: ../FL/x11.H
@@ -279,6 +311,7 @@ custom_widgets.o: CodeEditor.h
 custom_widgets.o: custom_widgets.h
 custom_widgets.o: factory.h
 custom_widgets.o: fluid.h
+custom_widgets.o: Fl_Group_Type.h
 custom_widgets.o: Fl_Type.h
 custom_widgets.o: Fl_Widget_Type.h
 custom_widgets.o: Fl_Window_Type.h
@@ -320,7 +353,6 @@ factory.o: ../FL/Fl_Button.H
 factory.o: ../FL/Fl_Cairo.H
 factory.o: ../FL/fl_casts.H
 factory.o: ../FL/Fl_Check_Browser.H
-factory.o: ../FL/Fl_Check_Button.H
 factory.o: ../FL/Fl_Clock.H
 factory.o: ../FL/fl_config.h
 factory.o: ../FL/Fl_Counter.H
@@ -338,7 +370,6 @@ factory.o: ../FL/Fl_Help_View.H
 factory.o: ../FL/Fl_Image.H
 factory.o: ../FL/Fl_Input.H
 factory.o: ../FL/Fl_Input_.H
-factory.o: ../FL/Fl_Light_Button.H
 factory.o: ../FL/Fl_Menu_Item.H
 factory.o: ../FL/Fl_Multi_Label.H
 factory.o: ../FL/Fl_Output.H
@@ -349,10 +380,8 @@ factory.o: ../FL/Fl_Preferences.H
 factory.o: ../FL/Fl_Progress.H
 factory.o: ../FL/Fl_Rect.H
 factory.o: ../FL/Fl_Repeat_Button.H
-factory.o: ../FL/Fl_Return_Button.H
 factory.o: ../FL/Fl_RGB_Image.H
 factory.o: ../FL/Fl_Roller.H
-factory.o: ../FL/Fl_Round_Button.H
 factory.o: ../FL/Fl_Scrollbar.H
 factory.o: ../FL/Fl_Simple_Terminal.H
 factory.o: ../FL/Fl_Slider.H
@@ -379,6 +408,7 @@ factory.o: ../FL/platform_types.h
 factory.o: ../src/flstring.h
 factory.o: code.h
 factory.o: factory.h
+factory.o: Fd_Snap_Action.h
 factory.o: fluid.h
 factory.o: Fl_Group_Type.h
 factory.o: Fl_Type.h
@@ -386,6 +416,81 @@ factory.o: Fl_Widget_Type.h
 factory.o: Fl_Window_Type.h
 factory.o: pixmaps.h
 factory.o: undo.h
+Fd_Snap_Action.o: ../FL/Enumerations.H
+Fd_Snap_Action.o: ../FL/filename.H
+Fd_Snap_Action.o: ../FL/Fl.H
+Fd_Snap_Action.o: ../FL/fl_ask.H
+Fd_Snap_Action.o: ../FL/fl_attr.h
+Fd_Snap_Action.o: ../FL/Fl_Bitmap.H
+Fd_Snap_Action.o: ../FL/Fl_Box.H
+Fd_Snap_Action.o: ../FL/Fl_Browser.H
+Fd_Snap_Action.o: ../FL/Fl_Browser_.H
+Fd_Snap_Action.o: ../FL/Fl_Button.H
+Fd_Snap_Action.o: ../FL/Fl_Cairo.H
+Fd_Snap_Action.o: ../FL/fl_casts.H
+Fd_Snap_Action.o: ../FL/Fl_Check_Button.H
+Fd_Snap_Action.o: ../FL/Fl_Choice.H
+Fd_Snap_Action.o: ../FL/fl_config.h
+Fd_Snap_Action.o: ../FL/Fl_Device.H
+Fd_Snap_Action.o: ../FL/Fl_Double_Window.H
+Fd_Snap_Action.o: ../FL/fl_draw.H
+Fd_Snap_Action.o: ../FL/Fl_Export.H
+Fd_Snap_Action.o: ../FL/Fl_File_Browser.H
+Fd_Snap_Action.o: ../FL/Fl_File_Chooser.H
+Fd_Snap_Action.o: ../FL/Fl_File_Icon.H
+Fd_Snap_Action.o: ../FL/Fl_File_Input.H
+Fd_Snap_Action.o: ../FL/Fl_Flex.H
+Fd_Snap_Action.o: ../FL/Fl_Graphics_Driver.H
+Fd_Snap_Action.o: ../FL/Fl_Group.H
+Fd_Snap_Action.o: ../FL/Fl_Image.H
+Fd_Snap_Action.o: ../FL/Fl_Input.H
+Fd_Snap_Action.o: ../FL/Fl_Input_.H
+Fd_Snap_Action.o: ../FL/Fl_Int_Input.H
+Fd_Snap_Action.o: ../FL/Fl_Light_Button.H
+Fd_Snap_Action.o: ../FL/Fl_Menu_.H
+Fd_Snap_Action.o: ../FL/Fl_Menu_Bar.H
+Fd_Snap_Action.o: ../FL/Fl_Menu_Button.H
+Fd_Snap_Action.o: ../FL/Fl_Menu_Item.H
+Fd_Snap_Action.o: ../FL/Fl_Native_File_Chooser.H
+Fd_Snap_Action.o: ../FL/Fl_Pack.H
+Fd_Snap_Action.o: ../FL/Fl_Pixmap.H
+Fd_Snap_Action.o: ../FL/Fl_Plugin.H
+Fd_Snap_Action.o: ../FL/Fl_Preferences.H
+Fd_Snap_Action.o: ../FL/Fl_Rect.H
+Fd_Snap_Action.o: ../FL/Fl_Repeat_Button.H
+Fd_Snap_Action.o: ../FL/Fl_Return_Button.H
+Fd_Snap_Action.o: ../FL/Fl_RGB_Image.H
+Fd_Snap_Action.o: ../FL/Fl_Scheme.H
+Fd_Snap_Action.o: ../FL/Fl_Scheme_Choice.H
+Fd_Snap_Action.o: ../FL/Fl_Scrollbar.H
+Fd_Snap_Action.o: ../FL/Fl_Simple_Terminal.H
+Fd_Snap_Action.o: ../FL/Fl_Slider.H
+Fd_Snap_Action.o: ../FL/Fl_Spinner.H
+Fd_Snap_Action.o: ../FL/Fl_String.H
+Fd_Snap_Action.o: ../FL/fl_string_functions.h
+Fd_Snap_Action.o: ../FL/Fl_Tabs.H
+Fd_Snap_Action.o: ../FL/Fl_Text_Buffer.H
+Fd_Snap_Action.o: ../FL/Fl_Text_Display.H
+Fd_Snap_Action.o: ../FL/Fl_Tile.H
+Fd_Snap_Action.o: ../FL/fl_types.h
+Fd_Snap_Action.o: ../FL/fl_utf8.h
+Fd_Snap_Action.o: ../FL/Fl_Valuator.H
+Fd_Snap_Action.o: ../FL/Fl_Value_Input.H
+Fd_Snap_Action.o: ../FL/Fl_Widget.H
+Fd_Snap_Action.o: ../FL/Fl_Window.H
+Fd_Snap_Action.o: ../FL/Fl_Wizard.H
+Fd_Snap_Action.o: ../FL/platform_types.h
+Fd_Snap_Action.o: alignment_panel.h
+Fd_Snap_Action.o: code.h
+Fd_Snap_Action.o: Fd_Snap_Action.h
+Fd_Snap_Action.o: file.h
+Fd_Snap_Action.o: fluid.h
+Fd_Snap_Action.o: Fl_Group_Type.h
+Fd_Snap_Action.o: Fl_Type.h
+Fd_Snap_Action.o: Fl_Widget_Type.h
+Fd_Snap_Action.o: Fl_Window_Type.h
+Fd_Snap_Action.o: shell_command.h
+Fd_Snap_Action.o: widget_browser.h
 file.o: ../config.h
 file.o: ../FL/Enumerations.H
 file.o: ../FL/filename.H
@@ -394,6 +499,7 @@ file.o: ../FL/fl_ask.H
 file.o: ../FL/fl_attr.h
 file.o: ../FL/Fl_Bitmap.H
 file.o: ../FL/Fl_Box.H
+file.o: ../FL/Fl_Browser.H
 file.o: ../FL/Fl_Browser_.H
 file.o: ../FL/Fl_Button.H
 file.o: ../FL/Fl_Cairo.H
@@ -405,6 +511,11 @@ file.o: ../FL/Fl_Device.H
 file.o: ../FL/Fl_Double_Window.H
 file.o: ../FL/fl_draw.H
 file.o: ../FL/Fl_Export.H
+file.o: ../FL/Fl_File_Browser.H
+file.o: ../FL/Fl_File_Chooser.H
+file.o: ../FL/Fl_File_Icon.H
+file.o: ../FL/Fl_File_Input.H
+file.o: ../FL/Fl_Flex.H
 file.o: ../FL/Fl_Graphics_Driver.H
 file.o: ../FL/Fl_Group.H
 file.o: ../FL/Fl_Image.H
@@ -414,8 +525,11 @@ file.o: ../FL/Fl_Int_Input.H
 file.o: ../FL/Fl_Light_Button.H
 file.o: ../FL/Fl_Menu.H
 file.o: ../FL/Fl_Menu_.H
+file.o: ../FL/Fl_Menu_Button.H
 file.o: ../FL/Fl_Menu_Item.H
 file.o: ../FL/fl_message.H
+file.o: ../FL/Fl_Native_File_Chooser.H
+file.o: ../FL/Fl_Pack.H
 file.o: ../FL/Fl_Pixmap.H
 file.o: ../FL/Fl_Plugin.H
 file.o: ../FL/Fl_Preferences.H
@@ -423,7 +537,6 @@ file.o: ../FL/Fl_Rect.H
 file.o: ../FL/Fl_Repeat_Button.H
 file.o: ../FL/Fl_Return_Button.H
 file.o: ../FL/Fl_RGB_Image.H
-file.o: ../FL/Fl_Round_Button.H
 file.o: ../FL/Fl_Scheme.H
 file.o: ../FL/Fl_Scheme_Choice.H
 file.o: ../FL/Fl_Scrollbar.H
@@ -436,22 +549,26 @@ file.o: ../FL/fl_string_functions.h
 file.o: ../FL/Fl_Tabs.H
 file.o: ../FL/Fl_Text_Buffer.H
 file.o: ../FL/Fl_Text_Display.H
-file.o: ../FL/Fl_Tooltip.H
+file.o: ../FL/Fl_Tile.H
 file.o: ../FL/fl_types.h
 file.o: ../FL/fl_utf8.h
 file.o: ../FL/Fl_Valuator.H
+file.o: ../FL/Fl_Value_Input.H
 file.o: ../FL/Fl_Widget.H
 file.o: ../FL/Fl_Window.H
+file.o: ../FL/Fl_Wizard.H
 file.o: ../FL/platform_types.h
 file.o: ../src/flstring.h
 file.o: alignment_panel.h
 file.o: code.h
 file.o: ExternalCodeEditor_UNIX.h
 file.o: factory.h
+file.o: Fd_Snap_Action.h
 file.o: file.h
 file.o: fluid.h
 file.o: Fluid_Image.h
 file.o: Fl_Function_Type.h
+file.o: Fl_Group_Type.h
 file.o: Fl_Type.h
 file.o: Fl_Widget_Type.h
 file.o: Fl_Window_Type.h
@@ -509,7 +626,6 @@ fluid.o: ../FL/Fl_Rect.H
 fluid.o: ../FL/Fl_Repeat_Button.H
 fluid.o: ../FL/Fl_Return_Button.H
 fluid.o: ../FL/Fl_RGB_Image.H
-fluid.o: ../FL/Fl_Round_Button.H
 fluid.o: ../FL/Fl_Scheme.H
 fluid.o: ../FL/Fl_Scheme_Choice.H
 fluid.o: ../FL/Fl_Scrollbar.H
@@ -524,10 +640,10 @@ fluid.o: ../FL/Fl_Text_Buffer.H
 fluid.o: ../FL/Fl_Text_Display.H
 fluid.o: ../FL/Fl_Text_Editor.H
 fluid.o: ../FL/Fl_Tile.H
-fluid.o: ../FL/Fl_Tooltip.H
 fluid.o: ../FL/fl_types.h
 fluid.o: ../FL/fl_utf8.h
 fluid.o: ../FL/Fl_Valuator.H
+fluid.o: ../FL/Fl_Value_Input.H
 fluid.o: ../FL/Fl_Widget.H
 fluid.o: ../FL/Fl_Widget_Surface.H
 fluid.o: ../FL/Fl_Window.H
@@ -540,6 +656,7 @@ fluid.o: code.h
 fluid.o: CodeEditor.h
 fluid.o: ExternalCodeEditor_UNIX.h
 fluid.o: factory.h
+fluid.o: Fd_Snap_Action.h
 fluid.o: file.h
 fluid.o: fluid.h
 fluid.o: Fluid_Image.h
@@ -619,6 +736,46 @@ Fluid_Image.o: Fl_Group_Type.h
 Fluid_Image.o: Fl_Type.h
 Fluid_Image.o: Fl_Widget_Type.h
 Fluid_Image.o: Fl_Window_Type.h
+Fl_Button_Type.o: ../FL/Enumerations.H
+Fl_Button_Type.o: ../FL/Fl.H
+Fl_Button_Type.o: ../FL/fl_attr.h
+Fl_Button_Type.o: ../FL/Fl_Bitmap.H
+Fl_Button_Type.o: ../FL/Fl_Button.H
+Fl_Button_Type.o: ../FL/Fl_Cairo.H
+Fl_Button_Type.o: ../FL/fl_casts.H
+Fl_Button_Type.o: ../FL/Fl_Check_Button.H
+Fl_Button_Type.o: ../FL/fl_config.h
+Fl_Button_Type.o: ../FL/Fl_Device.H
+Fl_Button_Type.o: ../FL/fl_draw.H
+Fl_Button_Type.o: ../FL/Fl_Export.H
+Fl_Button_Type.o: ../FL/Fl_Flex.H
+Fl_Button_Type.o: ../FL/Fl_Graphics_Driver.H
+Fl_Button_Type.o: ../FL/Fl_Group.H
+Fl_Button_Type.o: ../FL/Fl_Image.H
+Fl_Button_Type.o: ../FL/Fl_Light_Button.H
+Fl_Button_Type.o: ../FL/Fl_Menu_Item.H
+Fl_Button_Type.o: ../FL/Fl_Pack.H
+Fl_Button_Type.o: ../FL/Fl_Pixmap.H
+Fl_Button_Type.o: ../FL/Fl_Plugin.H
+Fl_Button_Type.o: ../FL/Fl_Preferences.H
+Fl_Button_Type.o: ../FL/Fl_Rect.H
+Fl_Button_Type.o: ../FL/Fl_Repeat_Button.H
+Fl_Button_Type.o: ../FL/Fl_Return_Button.H
+Fl_Button_Type.o: ../FL/Fl_RGB_Image.H
+Fl_Button_Type.o: ../FL/Fl_Round_Button.H
+Fl_Button_Type.o: ../FL/Fl_Tabs.H
+Fl_Button_Type.o: ../FL/fl_types.h
+Fl_Button_Type.o: ../FL/fl_utf8.h
+Fl_Button_Type.o: ../FL/Fl_Widget.H
+Fl_Button_Type.o: ../FL/Fl_Wizard.H
+Fl_Button_Type.o: ../FL/platform_types.h
+Fl_Button_Type.o: code.h
+Fl_Button_Type.o: Fd_Snap_Action.h
+Fl_Button_Type.o: Fl_Button_Type.h
+Fl_Button_Type.o: Fl_Group_Type.h
+Fl_Button_Type.o: Fl_Type.h
+Fl_Button_Type.o: Fl_Widget_Type.h
+Fl_Button_Type.o: Fl_Window_Type.h
 Fl_Function_Type.o: ../config.h
 Fl_Function_Type.o: ../FL/Enumerations.H
 Fl_Function_Type.o: ../FL/filename.H
@@ -735,11 +892,13 @@ Fl_Group_Type.o: ../FL/Fl_Wizard.H
 Fl_Group_Type.o: ../FL/platform_types.h
 Fl_Group_Type.o: ../src/flstring.h
 Fl_Group_Type.o: code.h
+Fl_Group_Type.o: Fd_Snap_Action.h
 Fl_Group_Type.o: file.h
 Fl_Group_Type.o: fluid.h
 Fl_Group_Type.o: Fl_Group_Type.h
 Fl_Group_Type.o: Fl_Type.h
 Fl_Group_Type.o: Fl_Widget_Type.h
+Fl_Group_Type.o: Fl_Window_Type.h
 Fl_Group_Type.o: undo.h
 Fl_Group_Type.o: widget_browser.h
 Fl_Menu_Type.o: ../config.h
@@ -750,6 +909,7 @@ Fl_Menu_Type.o: ../FL/fl_ask.H
 Fl_Menu_Type.o: ../FL/fl_attr.h
 Fl_Menu_Type.o: ../FL/Fl_Bitmap.H
 Fl_Menu_Type.o: ../FL/Fl_Box.H
+Fl_Menu_Type.o: ../FL/Fl_Browser.H
 Fl_Menu_Type.o: ../FL/Fl_Browser_.H
 Fl_Menu_Type.o: ../FL/Fl_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Cairo.H
@@ -761,6 +921,11 @@ Fl_Menu_Type.o: ../FL/Fl_Device.H
 Fl_Menu_Type.o: ../FL/Fl_Double_Window.H
 Fl_Menu_Type.o: ../FL/fl_draw.H
 Fl_Menu_Type.o: ../FL/Fl_Export.H
+Fl_Menu_Type.o: ../FL/Fl_File_Browser.H
+Fl_Menu_Type.o: ../FL/Fl_File_Chooser.H
+Fl_Menu_Type.o: ../FL/Fl_File_Icon.H
+Fl_Menu_Type.o: ../FL/Fl_File_Input.H
+Fl_Menu_Type.o: ../FL/Fl_Flex.H
 Fl_Menu_Type.o: ../FL/Fl_Graphics_Driver.H
 Fl_Menu_Type.o: ../FL/Fl_Group.H
 Fl_Menu_Type.o: ../FL/Fl_Image.H
@@ -775,7 +940,9 @@ Fl_Menu_Type.o: ../FL/Fl_Menu_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Menu_Item.H
 Fl_Menu_Type.o: ../FL/fl_message.H
 Fl_Menu_Type.o: ../FL/Fl_Multi_Label.H
+Fl_Menu_Type.o: ../FL/Fl_Native_File_Chooser.H
 Fl_Menu_Type.o: ../FL/Fl_Output.H
+Fl_Menu_Type.o: ../FL/Fl_Pack.H
 Fl_Menu_Type.o: ../FL/Fl_Pixmap.H
 Fl_Menu_Type.o: ../FL/Fl_Plugin.H
 Fl_Menu_Type.o: ../FL/Fl_Preferences.H
@@ -783,7 +950,6 @@ Fl_Menu_Type.o: ../FL/Fl_Rect.H
 Fl_Menu_Type.o: ../FL/Fl_Repeat_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Return_Button.H
 Fl_Menu_Type.o: ../FL/Fl_RGB_Image.H
-Fl_Menu_Type.o: ../FL/Fl_Round_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Scheme.H
 Fl_Menu_Type.o: ../FL/Fl_Scheme_Choice.H
 Fl_Menu_Type.o: ../FL/Fl_Scrollbar.H
@@ -793,24 +959,29 @@ Fl_Menu_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Menu_Type.o: ../FL/Fl_Slider.H
 Fl_Menu_Type.o: ../FL/Fl_Spinner.H
 Fl_Menu_Type.o: ../FL/Fl_String.H
+Fl_Menu_Type.o: ../FL/fl_string_functions.h
 Fl_Menu_Type.o: ../FL/Fl_Tabs.H
 Fl_Menu_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Menu_Type.o: ../FL/Fl_Text_Display.H
-Fl_Menu_Type.o: ../FL/Fl_Tooltip.H
+Fl_Menu_Type.o: ../FL/Fl_Tile.H
 Fl_Menu_Type.o: ../FL/fl_types.h
 Fl_Menu_Type.o: ../FL/fl_utf8.h
 Fl_Menu_Type.o: ../FL/Fl_Valuator.H
 Fl_Menu_Type.o: ../FL/Fl_Value_Input.H
 Fl_Menu_Type.o: ../FL/Fl_Widget.H
 Fl_Menu_Type.o: ../FL/Fl_Window.H
+Fl_Menu_Type.o: ../FL/Fl_Wizard.H
 Fl_Menu_Type.o: ../FL/platform_types.h
 Fl_Menu_Type.o: ../src/flstring.h
 Fl_Menu_Type.o: alignment_panel.h
 Fl_Menu_Type.o: code.h
 Fl_Menu_Type.o: custom_widgets.h
+Fl_Menu_Type.o: Fd_Snap_Action.h
 Fl_Menu_Type.o: file.h
 Fl_Menu_Type.o: fluid.h
 Fl_Menu_Type.o: Fluid_Image.h
+Fl_Menu_Type.o: Fl_Button_Type.h
+Fl_Menu_Type.o: Fl_Group_Type.h
 Fl_Menu_Type.o: Fl_Menu_Type.h
 Fl_Menu_Type.o: Fl_Type.h
 Fl_Menu_Type.o: Fl_Widget_Type.h
@@ -856,6 +1027,7 @@ Fl_Type.o: ../FL/platform_types.h
 Fl_Type.o: ../src/flstring.h
 Fl_Type.o: code.h
 Fl_Type.o: ExternalCodeEditor_UNIX.h
+Fl_Type.o: Fd_Snap_Action.h
 Fl_Type.o: file.h
 Fl_Type.o: fluid.h
 Fl_Type.o: Fluid_Image.h
@@ -876,6 +1048,7 @@ Fl_Widget_Type.o: ../FL/fl_ask.H
 Fl_Widget_Type.o: ../FL/fl_attr.h
 Fl_Widget_Type.o: ../FL/Fl_Bitmap.H
 Fl_Widget_Type.o: ../FL/Fl_Box.H
+Fl_Widget_Type.o: ../FL/Fl_Browser.H
 Fl_Widget_Type.o: ../FL/Fl_Browser_.H
 Fl_Widget_Type.o: ../FL/Fl_Button.H
 Fl_Widget_Type.o: ../FL/Fl_Cairo.H
@@ -887,6 +1060,10 @@ Fl_Widget_Type.o: ../FL/Fl_Device.H
 Fl_Widget_Type.o: ../FL/Fl_Double_Window.H
 Fl_Widget_Type.o: ../FL/fl_draw.H
 Fl_Widget_Type.o: ../FL/Fl_Export.H
+Fl_Widget_Type.o: ../FL/Fl_File_Browser.H
+Fl_Widget_Type.o: ../FL/Fl_File_Chooser.H
+Fl_Widget_Type.o: ../FL/Fl_File_Icon.H
+Fl_Widget_Type.o: ../FL/Fl_File_Input.H
 Fl_Widget_Type.o: ../FL/Fl_Flex.H
 Fl_Widget_Type.o: ../FL/Fl_Graphics_Driver.H
 Fl_Widget_Type.o: ../FL/Fl_Group.H
@@ -903,6 +1080,7 @@ Fl_Widget_Type.o: ../FL/Fl_Menu_Bar.H
 Fl_Widget_Type.o: ../FL/Fl_Menu_Button.H
 Fl_Widget_Type.o: ../FL/Fl_Menu_Item.H
 Fl_Widget_Type.o: ../FL/fl_message.H
+Fl_Widget_Type.o: ../FL/Fl_Native_File_Chooser.H
 Fl_Widget_Type.o: ../FL/Fl_Pack.H
 Fl_Widget_Type.o: ../FL/Fl_Pixmap.H
 Fl_Widget_Type.o: ../FL/Fl_Plugin.H
@@ -911,7 +1089,6 @@ Fl_Widget_Type.o: ../FL/Fl_Rect.H
 Fl_Widget_Type.o: ../FL/Fl_Repeat_Button.H
 Fl_Widget_Type.o: ../FL/Fl_Return_Button.H
 Fl_Widget_Type.o: ../FL/Fl_RGB_Image.H
-Fl_Widget_Type.o: ../FL/Fl_Round_Button.H
 Fl_Widget_Type.o: ../FL/Fl_Scheme.H
 Fl_Widget_Type.o: ../FL/Fl_Scheme_Choice.H
 Fl_Widget_Type.o: ../FL/Fl_Scroll.H
@@ -923,13 +1100,13 @@ Fl_Widget_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Widget_Type.o: ../FL/Fl_Slider.H
 Fl_Widget_Type.o: ../FL/Fl_Spinner.H
 Fl_Widget_Type.o: ../FL/Fl_String.H
+Fl_Widget_Type.o: ../FL/fl_string_functions.h
 Fl_Widget_Type.o: ../FL/Fl_Table.H
 Fl_Widget_Type.o: ../FL/Fl_Tabs.H
 Fl_Widget_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Widget_Type.o: ../FL/Fl_Text_Display.H
 Fl_Widget_Type.o: ../FL/Fl_Text_Editor.H
 Fl_Widget_Type.o: ../FL/Fl_Tile.H
-Fl_Widget_Type.o: ../FL/Fl_Tooltip.H
 Fl_Widget_Type.o: ../FL/fl_types.h
 Fl_Widget_Type.o: ../FL/fl_utf8.h
 Fl_Widget_Type.o: ../FL/Fl_Valuator.H
@@ -944,9 +1121,11 @@ Fl_Widget_Type.o: code.h
 Fl_Widget_Type.o: CodeEditor.h
 Fl_Widget_Type.o: custom_widgets.h
 Fl_Widget_Type.o: ExternalCodeEditor_UNIX.h
+Fl_Widget_Type.o: Fd_Snap_Action.h
 Fl_Widget_Type.o: file.h
 Fl_Widget_Type.o: fluid.h
 Fl_Widget_Type.o: Fluid_Image.h
+Fl_Widget_Type.o: Fl_Button_Type.h
 Fl_Widget_Type.o: Fl_Function_Type.h
 Fl_Widget_Type.o: Fl_Group_Type.h
 Fl_Widget_Type.o: Fl_Menu_Type.h
@@ -967,6 +1146,7 @@ Fl_Window_Type.o: ../FL/fl_ask.H
 Fl_Window_Type.o: ../FL/fl_attr.h
 Fl_Window_Type.o: ../FL/Fl_Bitmap.H
 Fl_Window_Type.o: ../FL/Fl_Box.H
+Fl_Window_Type.o: ../FL/Fl_Browser.H
 Fl_Window_Type.o: ../FL/Fl_Browser_.H
 Fl_Window_Type.o: ../FL/Fl_Button.H
 Fl_Window_Type.o: ../FL/Fl_Cairo.H
@@ -978,6 +1158,10 @@ Fl_Window_Type.o: ../FL/Fl_Device.H
 Fl_Window_Type.o: ../FL/Fl_Double_Window.H
 Fl_Window_Type.o: ../FL/fl_draw.H
 Fl_Window_Type.o: ../FL/Fl_Export.H
+Fl_Window_Type.o: ../FL/Fl_File_Browser.H
+Fl_Window_Type.o: ../FL/Fl_File_Chooser.H
+Fl_Window_Type.o: ../FL/Fl_File_Icon.H
+Fl_Window_Type.o: ../FL/Fl_File_Input.H
 Fl_Window_Type.o: ../FL/Fl_Flex.H
 Fl_Window_Type.o: ../FL/Fl_Graphics_Driver.H
 Fl_Window_Type.o: ../FL/Fl_Group.H
@@ -991,6 +1175,7 @@ Fl_Window_Type.o: ../FL/Fl_Menu_.H
 Fl_Window_Type.o: ../FL/Fl_Menu_Button.H
 Fl_Window_Type.o: ../FL/Fl_Menu_Item.H
 Fl_Window_Type.o: ../FL/fl_message.H
+Fl_Window_Type.o: ../FL/Fl_Native_File_Chooser.H
 Fl_Window_Type.o: ../FL/Fl_Overlay_Window.H
 Fl_Window_Type.o: ../FL/Fl_Pack.H
 Fl_Window_Type.o: ../FL/Fl_Pixmap.H
@@ -1010,12 +1195,12 @@ Fl_Window_Type.o: ../FL/Fl_Simple_Terminal.H
 Fl_Window_Type.o: ../FL/Fl_Slider.H
 Fl_Window_Type.o: ../FL/Fl_Spinner.H
 Fl_Window_Type.o: ../FL/Fl_String.H
+Fl_Window_Type.o: ../FL/fl_string_functions.h
 Fl_Window_Type.o: ../FL/Fl_Tabs.H
 Fl_Window_Type.o: ../FL/Fl_Text_Buffer.H
 Fl_Window_Type.o: ../FL/Fl_Text_Display.H
 Fl_Window_Type.o: ../FL/Fl_Text_Editor.H
 Fl_Window_Type.o: ../FL/Fl_Tile.H
-Fl_Window_Type.o: ../FL/Fl_Tooltip.H
 Fl_Window_Type.o: ../FL/fl_types.h
 Fl_Window_Type.o: ../FL/fl_utf8.h
 Fl_Window_Type.o: ../FL/Fl_Valuator.H
@@ -1032,6 +1217,7 @@ Fl_Window_Type.o: code.h
 Fl_Window_Type.o: CodeEditor.h
 Fl_Window_Type.o: custom_widgets.h
 Fl_Window_Type.o: factory.h
+Fl_Window_Type.o: Fd_Snap_Action.h
 Fl_Window_Type.o: file.h
 Fl_Window_Type.o: fluid.h
 Fl_Window_Type.o: Fl_Group_Type.h
@@ -1100,8 +1286,26 @@ function_panel.o: pixmaps.h
 function_panel.o: StyleParse.h
 function_panel.o: undo.h
 function_panel.o: widget_browser.h
+pixmaps.o: ../FL/Enumerations.H
+pixmaps.o: ../FL/Fl.H
+pixmaps.o: ../FL/fl_attr.h
+pixmaps.o: ../FL/Fl_Bitmap.H
+pixmaps.o: ../FL/fl_config.h
+pixmaps.o: ../FL/Fl_Device.H
+pixmaps.o: ../FL/fl_draw.H
+pixmaps.o: ../FL/Fl_Export.H
+pixmaps.o: ../FL/Fl_Graphics_Driver.H
 pixmaps.o: ../FL/Fl_Image.H
 pixmaps.o: ../FL/Fl_Pixmap.H
+pixmaps.o: ../FL/Fl_Plugin.H
+pixmaps.o: ../FL/Fl_Preferences.H
+pixmaps.o: ../FL/Fl_Rect.H
+pixmaps.o: ../FL/Fl_RGB_Image.H
+pixmaps.o: ../FL/fl_types.h
+pixmaps.o: ../FL/Fl_Widget.H
+pixmaps.o: ../FL/platform_types.h
+pixmaps.o: code.h
+pixmaps.o: Fl_Type.h
 pixmaps.o: pixmaps.h
 pixmaps.o: pixmaps/bind.xpm
 pixmaps.o: pixmaps/compressed.xpm
@@ -1171,6 +1375,7 @@ shell_command.o: ../FL/fl_ask.H
 shell_command.o: ../FL/fl_attr.h
 shell_command.o: ../FL/Fl_Bitmap.H
 shell_command.o: ../FL/Fl_Box.H
+shell_command.o: ../FL/Fl_Browser.H
 shell_command.o: ../FL/Fl_Browser_.H
 shell_command.o: ../FL/Fl_Button.H
 shell_command.o: ../FL/Fl_Cairo.H
@@ -1182,6 +1387,11 @@ shell_command.o: ../FL/Fl_Device.H
 shell_command.o: ../FL/Fl_Double_Window.H
 shell_command.o: ../FL/fl_draw.H
 shell_command.o: ../FL/Fl_Export.H
+shell_command.o: ../FL/Fl_File_Browser.H
+shell_command.o: ../FL/Fl_File_Chooser.H
+shell_command.o: ../FL/Fl_File_Icon.H
+shell_command.o: ../FL/Fl_File_Input.H
+shell_command.o: ../FL/Fl_Flex.H
 shell_command.o: ../FL/Fl_Graphics_Driver.H
 shell_command.o: ../FL/Fl_Group.H
 shell_command.o: ../FL/Fl_Image.H
@@ -1190,8 +1400,11 @@ shell_command.o: ../FL/Fl_Input_.H
 shell_command.o: ../FL/Fl_Int_Input.H
 shell_command.o: ../FL/Fl_Light_Button.H
 shell_command.o: ../FL/Fl_Menu_.H
+shell_command.o: ../FL/Fl_Menu_Button.H
 shell_command.o: ../FL/Fl_Menu_Item.H
 shell_command.o: ../FL/fl_message.H
+shell_command.o: ../FL/Fl_Native_File_Chooser.H
+shell_command.o: ../FL/Fl_Pack.H
 shell_command.o: ../FL/Fl_Pixmap.H
 shell_command.o: ../FL/Fl_Plugin.H
 shell_command.o: ../FL/Fl_Preferences.H
@@ -1199,7 +1412,6 @@ shell_command.o: ../FL/Fl_Rect.H
 shell_command.o: ../FL/Fl_Repeat_Button.H
 shell_command.o: ../FL/Fl_Return_Button.H
 shell_command.o: ../FL/Fl_RGB_Image.H
-shell_command.o: ../FL/Fl_Round_Button.H
 shell_command.o: ../FL/Fl_Scheme.H
 shell_command.o: ../FL/Fl_Scheme_Choice.H
 shell_command.o: ../FL/Fl_Scrollbar.H
@@ -1211,15 +1423,23 @@ shell_command.o: ../FL/fl_string_functions.h
 shell_command.o: ../FL/Fl_Tabs.H
 shell_command.o: ../FL/Fl_Text_Buffer.H
 shell_command.o: ../FL/Fl_Text_Display.H
-shell_command.o: ../FL/Fl_Tooltip.H
+shell_command.o: ../FL/Fl_Tile.H
 shell_command.o: ../FL/fl_types.h
 shell_command.o: ../FL/fl_utf8.h
 shell_command.o: ../FL/Fl_Valuator.H
+shell_command.o: ../FL/Fl_Value_Input.H
 shell_command.o: ../FL/Fl_Widget.H
 shell_command.o: ../FL/Fl_Window.H
+shell_command.o: ../FL/Fl_Wizard.H
 shell_command.o: ../FL/platform_types.h
 shell_command.o: alignment_panel.h
+shell_command.o: code.h
+shell_command.o: Fd_Snap_Action.h
 shell_command.o: fluid.h
+shell_command.o: Fl_Group_Type.h
+shell_command.o: Fl_Type.h
+shell_command.o: Fl_Widget_Type.h
+shell_command.o: Fl_Window_Type.h
 shell_command.o: shell_command.h
 shell_command.o: widget_browser.h
 StyleParse.o: StyleParse.h
diff --git a/src/makedepend b/src/makedepend
index b8188eee9..40e38bb17 100644
--- a/src/makedepend
+++ b/src/makedepend
@@ -262,6 +262,7 @@ drivers/PostScript/Fl_PostScript.o: ../FL/Fl_File_Icon.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_File_Input.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Group.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Image.H
+drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Image_Surface.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Input.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Input_.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Light_Button.H
@@ -274,6 +275,7 @@ drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Plugin.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_PostScript.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Preferences.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Return_Button.H
+drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Shared_Image.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_String.H
 drivers/PostScript/Fl_PostScript.o: ../FL/fl_string_functions.h
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Tile.H
@@ -495,7 +497,6 @@ 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
-drivers/X11/fl_X11_platform_init.o: drivers/Xlib/Fl_Font.H
 drivers/X11/fl_X11_platform_init.o: drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.H
 drivers/X11/fl_X11_platform_init.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/X11/fl_X11_platform_init.o: drivers/Xlib/Fl_Xlib_Image_Surface_Driver.H
@@ -569,6 +570,7 @@ drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Export.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Graphics_Driver.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Group.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Image.H
+drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Image_Surface.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Overlay_Window.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Pixmap.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Plugin.H
@@ -576,6 +578,7 @@ drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Preferences.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Rect.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_RGB_Image.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Scrollbar.H
+drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Shared_Image.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Slider.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_String.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Text_Buffer.H
@@ -586,6 +589,7 @@ drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_types.h
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_utf8.h
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Valuator.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Widget.H
+drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Widget_Surface.H
 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
@@ -611,12 +615,14 @@ drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Export.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Group.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Image.H
+drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Image_Surface.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Pixmap.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Plugin.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Preferences.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Rect.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_RGB_Image.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Scrollbar.H
+drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Shared_Image.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Slider.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Text_Buffer.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Text_Display.H
@@ -1181,15 +1187,9 @@ Fl_BMP_Image.o: ../FL/fl_types.h
 Fl_BMP_Image.o: ../FL/fl_utf8.h
 Fl_BMP_Image.o: ../FL/platform_types.h
 Fl_BMP_Image.o: Fl_Image_Reader.h
-Fl_Box.o: ../FL/Enumerations.H
 Fl_Box.o: ../FL/Fl.H
-Fl_Box.o: ../FL/fl_attr.h
 Fl_Box.o: ../FL/Fl_Box.H
-Fl_Box.o: ../FL/fl_config.h
-Fl_Box.o: ../FL/Fl_Export.H
-Fl_Box.o: ../FL/fl_types.h
 Fl_Box.o: ../FL/Fl_Widget.H
-Fl_Box.o: ../FL/platform_types.h
 fl_boxtype.o: ../config.h
 fl_boxtype.o: ../FL/Enumerations.H
 fl_boxtype.o: ../FL/Fl.H
@@ -2640,7 +2640,6 @@ Fl_Menu_.o: ../FL/Fl_Widget.H
 Fl_Menu_.o: ../FL/platform_types.h
 Fl_Menu_.o: flstring.h
 Fl_Menu_add.o: ../config.h
-Fl_Menu_add.o: ../FL/Enumerations.H
 Fl_Menu_add.o: ../FL/Fl.H
 Fl_Menu_add.o: ../FL/fl_attr.h
 Fl_Menu_add.o: ../FL/fl_config.h
@@ -4350,6 +4349,7 @@ Fl_Window_Driver.o: ../FL/Fl_Export.H
 Fl_Window_Driver.o: ../FL/Fl_Graphics_Driver.H
 Fl_Window_Driver.o: ../FL/Fl_Group.H
 Fl_Window_Driver.o: ../FL/Fl_Image.H
+Fl_Window_Driver.o: ../FL/Fl_Image_Surface.H
 Fl_Window_Driver.o: ../FL/Fl_Overlay_Window.H
 Fl_Window_Driver.o: ../FL/Fl_Pixmap.H
 Fl_Window_Driver.o: ../FL/Fl_Plugin.H
@@ -4357,6 +4357,7 @@ Fl_Window_Driver.o: ../FL/Fl_Preferences.H
 Fl_Window_Driver.o: ../FL/Fl_Rect.H
 Fl_Window_Driver.o: ../FL/Fl_RGB_Image.H
 Fl_Window_Driver.o: ../FL/Fl_Scrollbar.H
+Fl_Window_Driver.o: ../FL/Fl_Shared_Image.H
 Fl_Window_Driver.o: ../FL/Fl_Slider.H
 Fl_Window_Driver.o: ../FL/Fl_Text_Buffer.H
 Fl_Window_Driver.o: ../FL/Fl_Text_Display.H
@@ -4365,6 +4366,7 @@ Fl_Window_Driver.o: ../FL/fl_types.h
 Fl_Window_Driver.o: ../FL/fl_utf8.h
 Fl_Window_Driver.o: ../FL/Fl_Valuator.H
 Fl_Window_Driver.o: ../FL/Fl_Widget.H
+Fl_Window_Driver.o: ../FL/Fl_Widget_Surface.H
 Fl_Window_Driver.o: ../FL/Fl_Window.H
 Fl_Window_Driver.o: ../FL/platform.H
 Fl_Window_Driver.o: ../FL/platform_types.h
diff --git a/test/makedepend b/test/makedepend
index 323339151..cd9577cbd 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -566,7 +566,6 @@ CubeMain.o: ../FL/Enumerations.H
 CubeMain.o: ../FL/Fl.H
 CubeMain.o: ../FL/fl_attr.h
 CubeMain.o: ../FL/Fl_Bitmap.H
-CubeMain.o: ../FL/Fl_Box.H
 CubeMain.o: ../FL/Fl_Cairo.H
 CubeMain.o: ../FL/fl_casts.H
 CubeMain.o: ../FL/fl_config.h
@@ -638,6 +637,7 @@ cursor.o: ../FL/Fl_Value_Slider.H
 cursor.o: ../FL/Fl_Widget.H
 cursor.o: ../FL/Fl_Window.H
 cursor.o: ../FL/platform_types.h
+cursor.o: ../fluid/pixmaps/compressed.xpm
 curve.o: ../FL/Enumerations.H
 curve.o: ../FL/Fl.H
 curve.o: ../FL/fl_attr.h