Generate FL/fl_config.h rather than FL/abi-version.h

... as discussed in fltk.coredev in thread "RFC: introduce public
config header <FL/fl_config.h>", see:
https://groups.google.com/g/fltkcoredev/c/xLCs1AIXMVo/m/MHZpQggzAQAJ

- Rename abi-version.h to fl_config.h, rename input files,
  update dependencies, .gitignore, CMake, configure and Makefiles.

- Include Cairo options in FL/fl_config.h

- Rename FLTK_USE_CAIRO to FLTK_HAVE_CAIROEXT for consistency.

- Include <FL/fl_config.h> in config.h and wherever necessary,
  fix include order (move FL/Fl.H to the top) and more.

- Move USE_X11 to fl_config.h and rename to FLTK_USE_X11

- Do not include <config.h> in Cairo demo program which is no
  longer required in Cairo programs since FLTK 1.4.0

2 files changed, 52 insertions, 23 deletions

diff --git a/fluid/CMakeLists.txt b/fluid/CMakeLists.txt
index ed1cf94b6..4dc71ac68 100644
--- a/fluid/CMakeLists.txt
+++ b/fluid/CMakeLists.txt
@@ -107,6 +107,12 @@ else ()
 endif (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
 
 target_link_libraries (fluid fltk fltk_images)
+
+# we must link all programs with fltk_cairo if option CAIROEXT is enabled
+if (FLTK_HAVE_CAIROEXT)
+  target_link_libraries (fluid fltk_cairo cairo)
+endif (FLTK_HAVE_CAIROEXT)
+
 if (FLTK_HAVE_CAIRO)
   fl_target_link_directories (fluid PRIVATE "${PKG_CAIRO_LIBRARY_DIRS}")
 endif (FLTK_HAVE_CAIRO)
diff --git a/fluid/makedepend b/fluid/makedepend
index cce556bce..6341f5f5f 100644
--- a/fluid/makedepend
+++ b/fluid/makedepend
@@ -1,13 +1,14 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 about_panel.o: ../config.h
-about_panel.o: ../FL/abi-version.h
 about_panel.o: ../FL/Enumerations.H
 about_panel.o: ../FL/Fl.H
 about_panel.o: ../FL/Fl_Bitmap.H
 about_panel.o: ../FL/Fl_Box.H
 about_panel.o: ../FL/Fl_Button.H
+about_panel.o: ../FL/Fl_Cairo.H
 about_panel.o: ../FL/fl_casts.H
+about_panel.o: ../FL/fl_config.h
 about_panel.o: ../FL/Fl_Double_Window.H
 about_panel.o: ../FL/Fl_Export.H
 about_panel.o: ../FL/Fl_Group.H
@@ -21,7 +22,6 @@ about_panel.o: ../FL/Fl_Window.H
 about_panel.o: ../FL/platform_types.h
 about_panel.o: ../src/flstring.h
 about_panel.o: about_panel.h
-alignment_panel.o: ../FL/abi-version.h
 alignment_panel.o: ../FL/Enumerations.H
 alignment_panel.o: ../FL/filename.H
 alignment_panel.o: ../FL/Fl.H
@@ -31,9 +31,11 @@ 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_Button.H
+alignment_panel.o: ../FL/Fl_Cairo.H
 alignment_panel.o: ../FL/fl_casts.H
 alignment_panel.o: ../FL/Fl_Check_Button.H
 alignment_panel.o: ../FL/Fl_Choice.H
+alignment_panel.o: ../FL/fl_config.h
 alignment_panel.o: ../FL/Fl_Device.H
 alignment_panel.o: ../FL/Fl_Double_Window.H
 alignment_panel.o: ../FL/fl_draw.H
@@ -74,12 +76,13 @@ alignment_panel.o: alignment_panel.h
 alignment_panel.o: fluid.h
 alignment_panel.o: shell_command.h
 alignment_panel.o: widget_browser.h
-align_widget.o: ../FL/abi-version.h
 align_widget.o: ../FL/Enumerations.H
 align_widget.o: ../FL/filename.H
 align_widget.o: ../FL/Fl.H
 align_widget.o: ../FL/Fl_Bitmap.H
+align_widget.o: ../FL/Fl_Cairo.H
 align_widget.o: ../FL/fl_casts.H
+align_widget.o: ../FL/fl_config.h
 align_widget.o: ../FL/Fl_Device.H
 align_widget.o: ../FL/fl_draw.H
 align_widget.o: ../FL/Fl_Export.H
@@ -107,7 +110,6 @@ align_widget.o: Fl_Type.h
 align_widget.o: Fl_Widget_Type.h
 align_widget.o: undo.h
 code.o: ../config.h
-code.o: ../FL/abi-version.h
 code.o: ../FL/Enumerations.H
 code.o: ../FL/filename.H
 code.o: ../FL/Fl.H
@@ -116,9 +118,11 @@ code.o: ../FL/Fl_Bitmap.H
 code.o: ../FL/Fl_Box.H
 code.o: ../FL/Fl_Browser_.H
 code.o: ../FL/Fl_Button.H
+code.o: ../FL/Fl_Cairo.H
 code.o: ../FL/fl_casts.H
 code.o: ../FL/Fl_Check_Button.H
 code.o: ../FL/Fl_Choice.H
+code.o: ../FL/fl_config.h
 code.o: ../FL/Fl_Device.H
 code.o: ../FL/Fl_Double_Window.H
 code.o: ../FL/fl_draw.H
@@ -173,11 +177,12 @@ code.o: Fl_Widget_Type.h
 code.o: Fl_Window_Type.h
 code.o: shell_command.h
 code.o: widget_browser.h
-CodeEditor.o: ../FL/abi-version.h
 CodeEditor.o: ../FL/Enumerations.H
 CodeEditor.o: ../FL/Fl.H
 CodeEditor.o: ../FL/Fl_Bitmap.H
+CodeEditor.o: ../FL/Fl_Cairo.H
 CodeEditor.o: ../FL/fl_casts.H
+CodeEditor.o: ../FL/fl_config.h
 CodeEditor.o: ../FL/Fl_Device.H
 CodeEditor.o: ../FL/fl_draw.H
 CodeEditor.o: ../FL/Fl_Export.H
@@ -201,13 +206,14 @@ CodeEditor.o: ../FL/Fl_Widget.H
 CodeEditor.o: ../FL/platform_types.h
 CodeEditor.o: CodeEditor.h
 CodeEditor.o: StyleParse.h
-ExternalCodeEditor_UNIX.o: ../FL/abi-version.h
 ExternalCodeEditor_UNIX.o: ../FL/Enumerations.H
 ExternalCodeEditor_UNIX.o: ../FL/filename.H
 ExternalCodeEditor_UNIX.o: ../FL/Fl.H
 ExternalCodeEditor_UNIX.o: ../FL/fl_ask.H
 ExternalCodeEditor_UNIX.o: ../FL/fl_attr.h
+ExternalCodeEditor_UNIX.o: ../FL/Fl_Cairo.H
 ExternalCodeEditor_UNIX.o: ../FL/fl_casts.H
+ExternalCodeEditor_UNIX.o: ../FL/fl_config.h
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Export.H
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Menu_Item.H
 ExternalCodeEditor_UNIX.o: ../FL/Fl_Preferences.H
@@ -219,7 +225,6 @@ ExternalCodeEditor_UNIX.o: ../FL/platform_types.h
 ExternalCodeEditor_UNIX.o: ExternalCodeEditor_UNIX.h
 ExternalCodeEditor_UNIX.o: fluid.h
 factory.o: ../config.h
-factory.o: ../FL/abi-version.h
 factory.o: ../FL/Enumerations.H
 factory.o: ../FL/filename.H
 factory.o: ../FL/Fl.H
@@ -229,10 +234,12 @@ factory.o: ../FL/Fl_Box.H
 factory.o: ../FL/Fl_Browser.H
 factory.o: ../FL/Fl_Browser_.H
 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
 factory.o: ../FL/Fl_Device.H
 factory.o: ../FL/Fl_Dial.H
@@ -290,7 +297,6 @@ factory.o: Fl_Window_Type.h
 factory.o: pixmaps.h
 factory.o: undo.h
 file.o: ../config.h
-file.o: ../FL/abi-version.h
 file.o: ../FL/Enumerations.H
 file.o: ../FL/filename.H
 file.o: ../FL/Fl.H
@@ -300,9 +306,11 @@ file.o: ../FL/Fl_Bitmap.H
 file.o: ../FL/Fl_Box.H
 file.o: ../FL/Fl_Browser_.H
 file.o: ../FL/Fl_Button.H
+file.o: ../FL/Fl_Cairo.H
 file.o: ../FL/fl_casts.H
 file.o: ../FL/Fl_Check_Button.H
 file.o: ../FL/Fl_Choice.H
+file.o: ../FL/fl_config.h
 file.o: ../FL/Fl_Device.H
 file.o: ../FL/Fl_Double_Window.H
 file.o: ../FL/fl_draw.H
@@ -358,7 +366,6 @@ file.o: Fl_Window_Type.h
 file.o: shell_command.h
 file.o: widget_browser.h
 fluid.o: ../config.h
-fluid.o: ../FL/abi-version.h
 fluid.o: ../FL/Enumerations.H
 fluid.o: ../FL/filename.H
 fluid.o: ../FL/Fl.H
@@ -369,9 +376,11 @@ fluid.o: ../FL/Fl_Box.H
 fluid.o: ../FL/Fl_Browser.H
 fluid.o: ../FL/Fl_Browser_.H
 fluid.o: ../FL/Fl_Button.H
+fluid.o: ../FL/Fl_Cairo.H
 fluid.o: ../FL/fl_casts.H
 fluid.o: ../FL/Fl_Check_Button.H
 fluid.o: ../FL/Fl_Choice.H
+fluid.o: ../FL/fl_config.h
 fluid.o: ../FL/Fl_Device.H
 fluid.o: ../FL/Fl_Double_Window.H
 fluid.o: ../FL/fl_draw.H
@@ -451,7 +460,6 @@ fluid.o: template_panel.h
 fluid.o: undo.h
 fluid.o: widget_browser.h
 Fluid_Image.o: ../config.h
-Fluid_Image.o: ../FL/abi-version.h
 Fluid_Image.o: ../FL/Enumerations.H
 Fluid_Image.o: ../FL/filename.H
 Fluid_Image.o: ../FL/Fl.H
@@ -462,9 +470,11 @@ Fluid_Image.o: ../FL/Fl_Box.H
 Fluid_Image.o: ../FL/Fl_Browser.H
 Fluid_Image.o: ../FL/Fl_Browser_.H
 Fluid_Image.o: ../FL/Fl_Button.H
+Fluid_Image.o: ../FL/Fl_Cairo.H
 Fluid_Image.o: ../FL/fl_casts.H
 Fluid_Image.o: ../FL/Fl_Check_Button.H
 Fluid_Image.o: ../FL/Fl_Choice.H
+Fluid_Image.o: ../FL/fl_config.h
 Fluid_Image.o: ../FL/Fl_Device.H
 Fluid_Image.o: ../FL/Fl_Double_Window.H
 Fluid_Image.o: ../FL/fl_draw.H
@@ -510,7 +520,6 @@ Fluid_Image.o: Fl_Type.h
 Fluid_Image.o: Fl_Widget_Type.h
 Fluid_Image.o: Fl_Window_Type.h
 Fl_Function_Type.o: ../config.h
-Fl_Function_Type.o: ../FL/abi-version.h
 Fl_Function_Type.o: ../FL/Enumerations.H
 Fl_Function_Type.o: ../FL/filename.H
 Fl_Function_Type.o: ../FL/Fl.H
@@ -521,9 +530,11 @@ Fl_Function_Type.o: ../FL/Fl_Box.H
 Fl_Function_Type.o: ../FL/Fl_Browser.H
 Fl_Function_Type.o: ../FL/Fl_Browser_.H
 Fl_Function_Type.o: ../FL/Fl_Button.H
+Fl_Function_Type.o: ../FL/Fl_Cairo.H
 Fl_Function_Type.o: ../FL/fl_casts.H
 Fl_Function_Type.o: ../FL/Fl_Check_Button.H
 Fl_Function_Type.o: ../FL/Fl_Choice.H
+Fl_Function_Type.o: ../FL/fl_config.h
 Fl_Function_Type.o: ../FL/Fl_Device.H
 Fl_Function_Type.o: ../FL/Fl_Double_Window.H
 Fl_Function_Type.o: ../FL/fl_draw.H
@@ -583,7 +594,6 @@ Fl_Function_Type.o: function_panel.h
 Fl_Function_Type.o: StyleParse.h
 Fl_Function_Type.o: widget_browser.h
 Fl_Group_Type.o: ../config.h
-Fl_Group_Type.o: ../FL/abi-version.h
 Fl_Group_Type.o: ../FL/Enumerations.H
 Fl_Group_Type.o: ../FL/filename.H
 Fl_Group_Type.o: ../FL/Fl.H
@@ -591,7 +601,9 @@ Fl_Group_Type.o: ../FL/fl_ask.H
 Fl_Group_Type.o: ../FL/fl_attr.h
 Fl_Group_Type.o: ../FL/Fl_Bitmap.H
 Fl_Group_Type.o: ../FL/Fl_Browser_.H
+Fl_Group_Type.o: ../FL/Fl_Cairo.H
 Fl_Group_Type.o: ../FL/fl_casts.H
+Fl_Group_Type.o: ../FL/fl_config.h
 Fl_Group_Type.o: ../FL/Fl_Device.H
 Fl_Group_Type.o: ../FL/fl_draw.H
 Fl_Group_Type.o: ../FL/Fl_Export.H
@@ -627,7 +639,6 @@ Fl_Group_Type.o: Fl_Type.h
 Fl_Group_Type.o: Fl_Widget_Type.h
 Fl_Group_Type.o: widget_browser.h
 Fl_Menu_Type.o: ../config.h
-Fl_Menu_Type.o: ../FL/abi-version.h
 Fl_Menu_Type.o: ../FL/Enumerations.H
 Fl_Menu_Type.o: ../FL/filename.H
 Fl_Menu_Type.o: ../FL/Fl.H
@@ -637,9 +648,11 @@ 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_Button.H
+Fl_Menu_Type.o: ../FL/Fl_Cairo.H
 Fl_Menu_Type.o: ../FL/fl_casts.H
 Fl_Menu_Type.o: ../FL/Fl_Check_Button.H
 Fl_Menu_Type.o: ../FL/Fl_Choice.H
+Fl_Menu_Type.o: ../FL/fl_config.h
 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
@@ -697,14 +710,15 @@ Fl_Menu_Type.o: shell_command.h
 Fl_Menu_Type.o: Shortcut_Button.h
 Fl_Menu_Type.o: widget_browser.h
 Fl_Type.o: ../config.h
-Fl_Type.o: ../FL/abi-version.h
 Fl_Type.o: ../FL/Enumerations.H
 Fl_Type.o: ../FL/filename.H
 Fl_Type.o: ../FL/Fl.H
 Fl_Type.o: ../FL/fl_attr.h
 Fl_Type.o: ../FL/Fl_Bitmap.H
 Fl_Type.o: ../FL/Fl_Browser_.H
+Fl_Type.o: ../FL/Fl_Cairo.H
 Fl_Type.o: ../FL/fl_casts.H
+Fl_Type.o: ../FL/fl_config.h
 Fl_Type.o: ../FL/Fl_Device.H
 Fl_Type.o: ../FL/fl_draw.H
 Fl_Type.o: ../FL/Fl_Export.H
@@ -745,7 +759,6 @@ Fl_Type.o: shell_command.h
 Fl_Type.o: undo.h
 Fl_Type.o: widget_browser.h
 Fl_Widget_Type.o: ../config.h
-Fl_Widget_Type.o: ../FL/abi-version.h
 Fl_Widget_Type.o: ../FL/Enumerations.H
 Fl_Widget_Type.o: ../FL/filename.H
 Fl_Widget_Type.o: ../FL/Fl.H
@@ -755,9 +768,11 @@ 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_Button.H
+Fl_Widget_Type.o: ../FL/Fl_Cairo.H
 Fl_Widget_Type.o: ../FL/fl_casts.H
 Fl_Widget_Type.o: ../FL/Fl_Check_Button.H
 Fl_Widget_Type.o: ../FL/Fl_Choice.H
+Fl_Widget_Type.o: ../FL/fl_config.h
 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
@@ -828,7 +843,6 @@ Fl_Widget_Type.o: StyleParse.h
 Fl_Widget_Type.o: widget_browser.h
 Fl_Widget_Type.o: widget_panel.h
 Fl_Window_Type.o: ../config.h
-Fl_Window_Type.o: ../FL/abi-version.h
 Fl_Window_Type.o: ../FL/Enumerations.H
 Fl_Window_Type.o: ../FL/filename.H
 Fl_Window_Type.o: ../FL/Fl.H
@@ -838,9 +852,11 @@ 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_Button.H
+Fl_Window_Type.o: ../FL/Fl_Cairo.H
 Fl_Window_Type.o: ../FL/fl_casts.H
 Fl_Window_Type.o: ../FL/Fl_Check_Button.H
 Fl_Window_Type.o: ../FL/Fl_Choice.H
+Fl_Window_Type.o: ../FL/fl_config.h
 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
@@ -899,7 +915,6 @@ Fl_Window_Type.o: StyleParse.h
 Fl_Window_Type.o: undo.h
 Fl_Window_Type.o: widget_browser.h
 Fl_Window_Type.o: widget_panel.h
-function_panel.o: ../FL/abi-version.h
 function_panel.o: ../FL/Enumerations.H
 function_panel.o: ../FL/filename.H
 function_panel.o: ../FL/Fl.H
@@ -907,9 +922,11 @@ function_panel.o: ../FL/Fl_Bitmap.H
 function_panel.o: ../FL/Fl_Box.H
 function_panel.o: ../FL/Fl_Browser_.H
 function_panel.o: ../FL/Fl_Button.H
+function_panel.o: ../FL/Fl_Cairo.H
 function_panel.o: ../FL/fl_casts.H
 function_panel.o: ../FL/Fl_Check_Button.H
 function_panel.o: ../FL/Fl_Choice.H
+function_panel.o: ../FL/fl_config.h
 function_panel.o: ../FL/Fl_Device.H
 function_panel.o: ../FL/Fl_Double_Window.H
 function_panel.o: ../FL/fl_draw.H
@@ -1012,7 +1029,6 @@ pixmaps.o: pixmaps/flWizard.xpm
 pixmaps.o: pixmaps/invisible.xpm
 pixmaps.o: pixmaps/lock.xpm
 pixmaps.o: pixmaps/protected.xpm
-shell_command.o: ../FL/abi-version.h
 shell_command.o: ../FL/Enumerations.H
 shell_command.o: ../FL/filename.H
 shell_command.o: ../FL/Fl.H
@@ -1022,9 +1038,11 @@ 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_Button.H
+shell_command.o: ../FL/Fl_Cairo.H
 shell_command.o: ../FL/fl_casts.H
 shell_command.o: ../FL/Fl_Check_Button.H
 shell_command.o: ../FL/Fl_Choice.H
+shell_command.o: ../FL/fl_config.h
 shell_command.o: ../FL/Fl_Device.H
 shell_command.o: ../FL/Fl_Double_Window.H
 shell_command.o: ../FL/fl_draw.H
@@ -1068,7 +1086,6 @@ shell_command.o: fluid.h
 shell_command.o: shell_command.h
 shell_command.o: widget_browser.h
 Shortcut_Button.o: ../config.h
-Shortcut_Button.o: ../FL/abi-version.h
 Shortcut_Button.o: ../FL/Enumerations.H
 Shortcut_Button.o: ../FL/filename.H
 Shortcut_Button.o: ../FL/Fl.H
@@ -1076,8 +1093,10 @@ Shortcut_Button.o: ../FL/Fl_Bitmap.H
 Shortcut_Button.o: ../FL/Fl_Box.H
 Shortcut_Button.o: ../FL/Fl_Browser_.H
 Shortcut_Button.o: ../FL/Fl_Button.H
+Shortcut_Button.o: ../FL/Fl_Cairo.H
 Shortcut_Button.o: ../FL/fl_casts.H
 Shortcut_Button.o: ../FL/Fl_Choice.H
+Shortcut_Button.o: ../FL/fl_config.h
 Shortcut_Button.o: ../FL/Fl_Device.H
 Shortcut_Button.o: ../FL/Fl_Double_Window.H
 Shortcut_Button.o: ../FL/fl_draw.H
@@ -1124,7 +1143,6 @@ Shortcut_Button.o: widget_browser.h
 Shortcut_Button.o: widget_panel.h
 StyleParse.o: StyleParse.h
 template_panel.o: ../config.h
-template_panel.o: ../FL/abi-version.h
 template_panel.o: ../FL/Enumerations.H
 template_panel.o: ../FL/filename.H
 template_panel.o: ../FL/Fl.H
@@ -1135,7 +1153,9 @@ template_panel.o: ../FL/Fl_Box.H
 template_panel.o: ../FL/Fl_Browser.H
 template_panel.o: ../FL/Fl_Browser_.H
 template_panel.o: ../FL/Fl_Button.H
+template_panel.o: ../FL/Fl_Cairo.H
 template_panel.o: ../FL/fl_casts.H
+template_panel.o: ../FL/fl_config.h
 template_panel.o: ../FL/Fl_Double_Window.H
 template_panel.o: ../FL/Fl_Export.H
 template_panel.o: ../FL/Fl_Group.H
@@ -1157,14 +1177,15 @@ template_panel.o: ../src/flstring.h
 template_panel.o: fluid.h
 template_panel.o: template_panel.h
 undo.o: ../config.h
-undo.o: ../FL/abi-version.h
 undo.o: ../FL/Enumerations.H
 undo.o: ../FL/filename.H
 undo.o: ../FL/Fl.H
 undo.o: ../FL/fl_attr.h
 undo.o: ../FL/Fl_Bitmap.H
 undo.o: ../FL/Fl_Browser_.H
+undo.o: ../FL/Fl_Cairo.H
 undo.o: ../FL/fl_casts.H
+undo.o: ../FL/fl_config.h
 undo.o: ../FL/Fl_Device.H
 undo.o: ../FL/fl_draw.H
 undo.o: ../FL/Fl_Export.H
@@ -1191,13 +1212,14 @@ undo.o: fluid.h
 undo.o: Fl_Type.h
 undo.o: undo.h
 undo.o: widget_browser.h
-widget_browser.o: ../FL/abi-version.h
 widget_browser.o: ../FL/Enumerations.H
 widget_browser.o: ../FL/filename.H
 widget_browser.o: ../FL/Fl.H
 widget_browser.o: ../FL/Fl_Bitmap.H
 widget_browser.o: ../FL/Fl_Browser_.H
+widget_browser.o: ../FL/Fl_Cairo.H
 widget_browser.o: ../FL/fl_casts.H
+widget_browser.o: ../FL/fl_config.h
 widget_browser.o: ../FL/Fl_Device.H
 widget_browser.o: ../FL/fl_draw.H
 widget_browser.o: ../FL/Fl_Export.H
@@ -1221,14 +1243,15 @@ widget_browser.o: Fl_Type.h
 widget_browser.o: Fl_Widget_Type.h
 widget_browser.o: pixmaps.h
 widget_browser.o: widget_browser.h
-widget_panel.o: ../FL/abi-version.h
 widget_panel.o: ../FL/Enumerations.H
 widget_panel.o: ../FL/Fl.H
 widget_panel.o: ../FL/Fl_Bitmap.H
 widget_panel.o: ../FL/Fl_Box.H
 widget_panel.o: ../FL/Fl_Button.H
+widget_panel.o: ../FL/Fl_Cairo.H
 widget_panel.o: ../FL/fl_casts.H
 widget_panel.o: ../FL/Fl_Choice.H
+widget_panel.o: ../FL/fl_config.h
 widget_panel.o: ../FL/Fl_Device.H
 widget_panel.o: ../FL/Fl_Double_Window.H
 widget_panel.o: ../FL/fl_draw.H