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

7 files changed, 203 insertions, 110 deletions

diff --git a/test/cairo_test.cxx b/test/cairo_test.cxx
index d2808e8d8..1fbdb0c90 100644
--- a/test/cairo_test.cxx
+++ b/test/cairo_test.cxx
@@ -1,7 +1,7 @@
 //
 // Cairo drawing test program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2019 by Bill Spitzak and others.
+// Copyright 1998-2021 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
@@ -14,15 +14,16 @@
 //     https://www.fltk.org/bugs.php
 //
 
-#include <config.h>
+#include <FL/Fl.H>      // includes <FL/fl_config.h>
 
-#ifdef FLTK_HAVE_CAIRO
+#ifdef FLTK_HAVE_CAIRO  // defined in <FL/fl_config.h> since FLTK 1.4.0
 
 #include <FL/Fl_Cairo_Window.H>
 #include <FL/Fl_Box.H>
 #include <FL/platform.H>
 #include <FL/fl_draw.H>
 #include <FL/math.h>
+
 #define DEF_WIDTH 0.03
 
 // uncomment the following line to enable Cairo context autolink feature:
@@ -145,7 +146,9 @@ int main(int argc, char **argv) {
 
   return Fl::run();
 }
-#else
+
+#else // (!FLTK_HAVE_CAIRO)
+
 #include <FL/fl_ask.H>
 
 int main(int argc, char **argv) {
@@ -155,4 +158,4 @@ int main(int argc, char **argv) {
     "or one of the CMake options OPTION_CAIRO or OPTION_CAIROEXT, respectively.");
   return 0;
 }
-#endif
+#endif // (FLTK_HAVE_CAIRO)
diff --git a/test/color_chooser.cxx b/test/color_chooser.cxx
index 67881f28d..257e2a89a 100644
--- a/test/color_chooser.cxx
+++ b/test/color_chooser.cxx
@@ -110,7 +110,7 @@ int main(int argc, char ** argv) {
            " - : default visual\n"
            " r : call Fl::visual(FL_RGB)\n"
            " c : call Fl::own_colormap()\n",argv[0]);
-#if USE_X11
+#ifdef FLTK_USE_X11
     printf(" # : use this visual with an empty colormap:\n");
     list_visuals();
 #endif
@@ -123,7 +123,7 @@ int main(int argc, char ** argv) {
     } else if (argv[i][0] == 'c') {
       Fl::own_colormap();
     } else if (argv[i][0] != '-') {
-#if USE_X11
+#ifdef FLTK_USE_X11
       int visid = atoi(argv[i]);
       fl_open_display();
       XVisualInfo templt; int num;
diff --git a/test/image.cxx b/test/image.cxx
index d90421ae3..cb6f424b6 100644
--- a/test/image.cxx
+++ b/test/image.cxx
@@ -5,7 +5,7 @@
 // as an icon or postage stamp.  Use fl_draw_image to go directly
 // from an buffered image that changes often.
 //
-// Copyright 1998-2018 by Bill Spitzak and others.
+// Copyright 1998-2021 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
@@ -71,7 +71,7 @@ void button_cb(Fl_Widget *,void *) {
 }
 
 #include <FL/platform.H>
-#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
+#if defined(FLTK_USE_X11)
 #include "list_visuals.cxx"
 #endif
 
@@ -87,7 +87,7 @@ int arg(int argc, char **argv, int &i) {
 }
 
 int main(int argc, char **argv) {
-#if defined(USE_X11)
+#if defined(FLTK_USE_X11)
   int i = 1;
 
   Fl::args(argc,argv,i,arg);
diff --git a/test/list_visuals.cxx b/test/list_visuals.cxx
index 77dce30d3..18b98045f 100644
--- a/test/list_visuals.cxx
+++ b/test/list_visuals.cxx
@@ -9,7 +9,7 @@
 // This file may be #included in another program to make a function to
 // call to list the visuals.  Fl.H must be included first to indicate this.
 //
-// Copyright 1998-2016 by Bill Spitzak and others.
+// Copyright 1998-2021 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
@@ -26,9 +26,9 @@
 #  define NEED_MAIN 1 // when not included by another FLTK program
 #endif
 
-#include <FL/platform.H> // for USE_X11
+#include <FL/platform.H> // for FLTK_USE_X11
 
-#if USE_X11
+#ifdef FLTK_USE_X11
 
 #include <config.h>
 
@@ -188,16 +188,16 @@ void list_visuals() {
   if ( overlayInfo ) { XFree(overlayInfo); overlayInfo = 0; }
 }
 
-#endif // USE_X11
+#endif // FLTK_USE_X11
 
 #ifdef NEED_MAIN
 
-#  if ! USE_X11
+#  ifndef FLTK_USE_X11
 #    include <FL/fl_ask.H>
 #  endif
 
 int main(int argc, char** argv) {
-#  if USE_X11
+#  ifdef FLTK_USE_X11
   if (argc == 1);
   else if (argc == 2 && argv[1][0]!='-') dname = argv[1];
   else {fprintf(stderr,"usage: %s <display>\n",argv[0]); exit(1);}
@@ -206,7 +206,7 @@ int main(int argc, char** argv) {
 #  else
   fl_alert("Currently, this program works only under X.");
   return 1;
-#  endif // USE_X11
+#  endif // FLTK_USE_X11
 }
 
 #endif // NEED_MAIN
diff --git a/test/makedepend b/test/makedepend
index 001c381bb..2e2f30653 100644
--- a/test/makedepend
+++ b/test/makedepend
@@ -1,12 +1,13 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-adjuster.o: ../FL/abi-version.h
 adjuster.o: ../FL/Enumerations.H
 adjuster.o: ../FL/Fl.H
 adjuster.o: ../FL/Fl_Adjuster.H
 adjuster.o: ../FL/Fl_Bitmap.H
 adjuster.o: ../FL/Fl_Box.H
+adjuster.o: ../FL/Fl_Cairo.H
 adjuster.o: ../FL/fl_casts.H
+adjuster.o: ../FL/fl_config.h
 adjuster.o: ../FL/Fl_Double_Window.H
 adjuster.o: ../FL/Fl_Export.H
 adjuster.o: ../FL/Fl_Group.H
@@ -17,12 +18,13 @@ adjuster.o: ../FL/Fl_Valuator.H
 adjuster.o: ../FL/Fl_Widget.H
 adjuster.o: ../FL/Fl_Window.H
 adjuster.o: ../FL/platform_types.h
-animated.o: ../FL/abi-version.h
 animated.o: ../FL/Enumerations.H
 animated.o: ../FL/Fl.H
 animated.o: ../FL/Fl_Bitmap.H
 animated.o: ../FL/Fl_Button.H
+animated.o: ../FL/Fl_Cairo.H
 animated.o: ../FL/fl_casts.H
+animated.o: ../FL/fl_config.h
 animated.o: ../FL/Fl_Device.H
 animated.o: ../FL/Fl_Double_Window.H
 animated.o: ../FL/fl_draw.H
@@ -41,11 +43,12 @@ animated.o: ../FL/Fl_Widget.H
 animated.o: ../FL/Fl_Window.H
 animated.o: ../FL/platform.H
 animated.o: ../FL/platform_types.h
-arc.o: ../FL/abi-version.h
 arc.o: ../FL/Enumerations.H
 arc.o: ../FL/Fl.H
 arc.o: ../FL/Fl_Bitmap.H
+arc.o: ../FL/Fl_Cairo.H
 arc.o: ../FL/fl_casts.H
+arc.o: ../FL/fl_config.h
 arc.o: ../FL/Fl_Device.H
 arc.o: ../FL/Fl_Double_Window.H
 arc.o: ../FL/fl_draw.H
@@ -67,7 +70,6 @@ arc.o: ../FL/Fl_Value_Slider.H
 arc.o: ../FL/Fl_Widget.H
 arc.o: ../FL/Fl_Window.H
 arc.o: ../FL/platform_types.h
-ask.o: ../FL/abi-version.h
 ask.o: ../FL/Enumerations.H
 ask.o: ../FL/Fl.H
 ask.o: ../FL/fl_ask.H
@@ -75,7 +77,9 @@ ask.o: ../FL/fl_attr.h
 ask.o: ../FL/Fl_Bitmap.H
 ask.o: ../FL/Fl_Box.H
 ask.o: ../FL/Fl_Button.H
+ask.o: ../FL/Fl_Cairo.H
 ask.o: ../FL/fl_casts.H
+ask.o: ../FL/fl_config.h
 ask.o: ../FL/Fl_Double_Window.H
 ask.o: ../FL/Fl_Export.H
 ask.o: ../FL/Fl_Group.H
@@ -89,12 +93,13 @@ ask.o: ../FL/fl_utf8.h
 ask.o: ../FL/Fl_Widget.H
 ask.o: ../FL/Fl_Window.H
 ask.o: ../FL/platform_types.h
-bitmap.o: ../FL/abi-version.h
 bitmap.o: ../FL/Enumerations.H
 bitmap.o: ../FL/Fl.H
 bitmap.o: ../FL/Fl_Bitmap.H
 bitmap.o: ../FL/Fl_Button.H
+bitmap.o: ../FL/Fl_Cairo.H
 bitmap.o: ../FL/fl_casts.H
+bitmap.o: ../FL/fl_config.h
 bitmap.o: ../FL/Fl_Double_Window.H
 bitmap.o: ../FL/Fl_Export.H
 bitmap.o: ../FL/Fl_Group.H
@@ -107,12 +112,13 @@ bitmap.o: ../FL/Fl_Window.H
 bitmap.o: ../FL/platform_types.h
 bitmap.o: pixmaps/sorceress.xbm
 blocks.o: ../config.h
-blocks.o: ../FL/abi-version.h
 blocks.o: ../FL/Enumerations.H
 blocks.o: ../FL/Fl.H
 blocks.o: ../FL/Fl_Bitmap.H
 blocks.o: ../FL/Fl_Button.H
+blocks.o: ../FL/Fl_Cairo.H
 blocks.o: ../FL/fl_casts.H
+blocks.o: ../FL/fl_config.h
 blocks.o: ../FL/Fl_Device.H
 blocks.o: ../FL/Fl_Double_Window.H
 blocks.o: ../FL/fl_draw.H
@@ -149,12 +155,13 @@ blocks.o: pixmaps/red.xpm
 blocks.o: pixmaps/red_bomb.xpm
 blocks.o: pixmaps/yellow.xpm
 blocks.o: pixmaps/yellow_bomb.xpm
-boxtype.o: ../FL/abi-version.h
 boxtype.o: ../FL/Enumerations.H
 boxtype.o: ../FL/Fl.H
 boxtype.o: ../FL/Fl_Bitmap.H
 boxtype.o: ../FL/Fl_Box.H
+boxtype.o: ../FL/Fl_Cairo.H
 boxtype.o: ../FL/fl_casts.H
+boxtype.o: ../FL/fl_config.h
 boxtype.o: ../FL/Fl_Device.H
 boxtype.o: ../FL/Fl_Double_Window.H
 boxtype.o: ../FL/fl_draw.H
@@ -172,7 +179,6 @@ boxtype.o: ../FL/fl_utf8.h
 boxtype.o: ../FL/Fl_Widget.H
 boxtype.o: ../FL/Fl_Window.H
 boxtype.o: ../FL/platform_types.h
-browser.o: ../FL/abi-version.h
 browser.o: ../FL/Enumerations.H
 browser.o: ../FL/Fl.H
 browser.o: ../FL/fl_ask.H
@@ -181,8 +187,10 @@ browser.o: ../FL/Fl_Bitmap.H
 browser.o: ../FL/Fl_Browser.H
 browser.o: ../FL/Fl_Browser_.H
 browser.o: ../FL/Fl_Button.H
+browser.o: ../FL/Fl_Cairo.H
 browser.o: ../FL/fl_casts.H
 browser.o: ../FL/Fl_Choice.H
+browser.o: ../FL/fl_config.h
 browser.o: ../FL/Fl_Device.H
 browser.o: ../FL/Fl_Double_Window.H
 browser.o: ../FL/fl_draw.H
@@ -213,14 +221,15 @@ browser.o: ../FL/Fl_Valuator.H
 browser.o: ../FL/Fl_Widget.H
 browser.o: ../FL/Fl_Window.H
 browser.o: ../FL/platform_types.h
-button.o: ../FL/abi-version.h
 button.o: ../FL/Enumerations.H
 button.o: ../FL/Fl.H
 button.o: ../FL/fl_ask.H
 button.o: ../FL/fl_attr.h
 button.o: ../FL/Fl_Bitmap.H
 button.o: ../FL/Fl_Button.H
+button.o: ../FL/Fl_Cairo.H
 button.o: ../FL/fl_casts.H
+button.o: ../FL/fl_config.h
 button.o: ../FL/Fl_Export.H
 button.o: ../FL/Fl_Group.H
 button.o: ../FL/Fl_Image.H
@@ -230,13 +239,14 @@ button.o: ../FL/fl_utf8.h
 button.o: ../FL/Fl_Widget.H
 button.o: ../FL/Fl_Window.H
 button.o: ../FL/platform_types.h
-buttons.o: ../FL/abi-version.h
 buttons.o: ../FL/Enumerations.H
 buttons.o: ../FL/Fl.H
 buttons.o: ../FL/Fl_Bitmap.H
 buttons.o: ../FL/Fl_Button.H
+buttons.o: ../FL/Fl_Cairo.H
 buttons.o: ../FL/fl_casts.H
 buttons.o: ../FL/Fl_Check_Button.H
+buttons.o: ../FL/fl_config.h
 buttons.o: ../FL/Fl_Export.H
 buttons.o: ../FL/Fl_Group.H
 buttons.o: ../FL/Fl_Image.H
@@ -250,14 +260,14 @@ buttons.o: ../FL/fl_utf8.h
 buttons.o: ../FL/Fl_Widget.H
 buttons.o: ../FL/Fl_Window.H
 buttons.o: ../FL/platform_types.h
-cairo_test.o: ../config.h
-cairo_test.o: ../FL/abi-version.h
 cairo_test.o: ../FL/Enumerations.H
 cairo_test.o: ../FL/Fl.H
 cairo_test.o: ../FL/Fl_Bitmap.H
 cairo_test.o: ../FL/Fl_Box.H
+cairo_test.o: ../FL/Fl_Cairo.H
 cairo_test.o: ../FL/Fl_Cairo_Window.H
 cairo_test.o: ../FL/fl_casts.H
+cairo_test.o: ../FL/fl_config.h
 cairo_test.o: ../FL/Fl_Device.H
 cairo_test.o: ../FL/Fl_Double_Window.H
 cairo_test.o: ../FL/fl_draw.H
@@ -277,14 +287,15 @@ cairo_test.o: ../FL/Fl_Window.H
 cairo_test.o: ../FL/math.h
 cairo_test.o: ../FL/platform.H
 cairo_test.o: ../FL/platform_types.h
-checkers.o: ../FL/abi-version.h
 checkers.o: ../FL/Enumerations.H
 checkers.o: ../FL/Fl.H
 checkers.o: ../FL/fl_ask.H
 checkers.o: ../FL/fl_attr.h
 checkers.o: ../FL/Fl_Bitmap.H
 checkers.o: ../FL/Fl_Box.H
+checkers.o: ../FL/Fl_Cairo.H
 checkers.o: ../FL/fl_casts.H
+checkers.o: ../FL/fl_config.h
 checkers.o: ../FL/Fl_Device.H
 checkers.o: ../FL/Fl_Double_Window.H
 checkers.o: ../FL/fl_draw.H
@@ -309,7 +320,6 @@ checkers.o: ../FL/Fl_Widget.H
 checkers.o: ../FL/Fl_Window.H
 checkers.o: ../FL/platform_types.h
 checkers.o: checkers_pieces.h
-clipboard.o: ../FL/abi-version.h
 clipboard.o: ../FL/Enumerations.H
 clipboard.o: ../FL/filename.H
 clipboard.o: ../FL/Fl.H
@@ -320,9 +330,11 @@ clipboard.o: ../FL/Fl_Box.H
 clipboard.o: ../FL/Fl_Browser.H
 clipboard.o: ../FL/Fl_Browser_.H
 clipboard.o: ../FL/Fl_Button.H
+clipboard.o: ../FL/Fl_Cairo.H
 clipboard.o: ../FL/fl_casts.H
 clipboard.o: ../FL/Fl_Check_Button.H
 clipboard.o: ../FL/Fl_Choice.H
+clipboard.o: ../FL/fl_config.h
 clipboard.o: ../FL/Fl_Device.H
 clipboard.o: ../FL/Fl_Double_Window.H
 clipboard.o: ../FL/fl_draw.H
@@ -362,12 +374,13 @@ clipboard.o: ../FL/Fl_Valuator.H
 clipboard.o: ../FL/Fl_Widget.H
 clipboard.o: ../FL/Fl_Window.H
 clipboard.o: ../FL/platform_types.h
-clock.o: ../FL/abi-version.h
 clock.o: ../FL/Enumerations.H
 clock.o: ../FL/Fl.H
 clock.o: ../FL/Fl_Bitmap.H
+clock.o: ../FL/Fl_Cairo.H
 clock.o: ../FL/fl_casts.H
 clock.o: ../FL/Fl_Clock.H
+clock.o: ../FL/fl_config.h
 clock.o: ../FL/Fl_Double_Window.H
 clock.o: ../FL/Fl_Export.H
 clock.o: ../FL/Fl_Group.H
@@ -378,7 +391,6 @@ clock.o: ../FL/fl_utf8.h
 clock.o: ../FL/Fl_Widget.H
 clock.o: ../FL/Fl_Window.H
 clock.o: ../FL/platform_types.h
-colbrowser.o: ../FL/abi-version.h
 colbrowser.o: ../FL/Enumerations.H
 colbrowser.o: ../FL/filename.H
 colbrowser.o: ../FL/Fl.H
@@ -389,7 +401,9 @@ colbrowser.o: ../FL/Fl_Box.H
 colbrowser.o: ../FL/Fl_Browser.H
 colbrowser.o: ../FL/Fl_Browser_.H
 colbrowser.o: ../FL/Fl_Button.H
+colbrowser.o: ../FL/Fl_Cairo.H
 colbrowser.o: ../FL/fl_casts.H
+colbrowser.o: ../FL/fl_config.h
 colbrowser.o: ../FL/Fl_Double_Window.H
 colbrowser.o: ../FL/Fl_Export.H
 colbrowser.o: ../FL/Fl_Group.H
@@ -406,15 +420,16 @@ colbrowser.o: ../FL/Fl_Widget.H
 colbrowser.o: ../FL/Fl_Window.H
 colbrowser.o: ../FL/platform_types.h
 color_chooser.o: ../config.h
-color_chooser.o: ../FL/abi-version.h
 color_chooser.o: ../FL/Enumerations.H
 color_chooser.o: ../FL/Fl.H
 color_chooser.o: ../FL/Fl_Bitmap.H
 color_chooser.o: ../FL/Fl_Box.H
 color_chooser.o: ../FL/Fl_Button.H
+color_chooser.o: ../FL/Fl_Cairo.H
 color_chooser.o: ../FL/fl_casts.H
 color_chooser.o: ../FL/Fl_Choice.H
 color_chooser.o: ../FL/Fl_Color_Chooser.H
+color_chooser.o: ../FL/fl_config.h
 color_chooser.o: ../FL/Fl_Device.H
 color_chooser.o: ../FL/fl_draw.H
 color_chooser.o: ../FL/Fl_Export.H
@@ -442,13 +457,14 @@ color_chooser.o: ../FL/platform.H
 color_chooser.o: ../FL/platform_types.h
 color_chooser.o: list_visuals.cxx
 cube.o: ../config.h
-cube.o: ../FL/abi-version.h
 cube.o: ../FL/Enumerations.H
 cube.o: ../FL/Fl.H
 cube.o: ../FL/Fl_Bitmap.H
 cube.o: ../FL/Fl_Box.H
 cube.o: ../FL/Fl_Button.H
+cube.o: ../FL/Fl_Cairo.H
 cube.o: ../FL/fl_casts.H
+cube.o: ../FL/fl_config.h
 cube.o: ../FL/Fl_Device.H
 cube.o: ../FL/Fl_Export.H
 cube.o: ../FL/Fl_Gl_Window.H
@@ -474,12 +490,13 @@ cube.o: ../FL/Fl_Window.H
 cube.o: ../FL/gl.h
 cube.o: ../FL/platform_types.h
 CubeMain.o: ../config.h
-CubeMain.o: ../FL/abi-version.h
 CubeMain.o: ../FL/Enumerations.H
 CubeMain.o: ../FL/Fl.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
 CubeMain.o: ../FL/Fl_Double_Window.H
 CubeMain.o: ../FL/Fl_Export.H
 CubeMain.o: ../FL/Fl_Gl_Window.H
@@ -498,11 +515,12 @@ CubeMain.o: ../FL/platform_types.h
 CubeMain.o: CubeView.h
 CubeMain.o: CubeViewUI.h
 CubeView.o: ../config.h
-CubeView.o: ../FL/abi-version.h
 CubeView.o: ../FL/Enumerations.H
 CubeView.o: ../FL/Fl.H
 CubeView.o: ../FL/Fl_Bitmap.H
+CubeView.o: ../FL/Fl_Cairo.H
 CubeView.o: ../FL/fl_casts.H
+CubeView.o: ../FL/fl_config.h
 CubeView.o: ../FL/Fl_Export.H
 CubeView.o: ../FL/Fl_Gl_Window.H
 CubeView.o: ../FL/Fl_Group.H
@@ -514,13 +532,14 @@ CubeView.o: ../FL/Fl_Window.H
 CubeView.o: ../FL/gl.h
 CubeView.o: ../FL/platform_types.h
 CubeView.o: CubeView.h
-cursor.o: ../FL/abi-version.h
 cursor.o: ../FL/Enumerations.H
 cursor.o: ../FL/Fl.H
 cursor.o: ../FL/Fl_Bitmap.H
 cursor.o: ../FL/Fl_Box.H
+cursor.o: ../FL/Fl_Cairo.H
 cursor.o: ../FL/fl_casts.H
 cursor.o: ../FL/Fl_Choice.H
+cursor.o: ../FL/fl_config.h
 cursor.o: ../FL/Fl_Device.H
 cursor.o: ../FL/Fl_Double_Window.H
 cursor.o: ../FL/fl_draw.H
@@ -544,12 +563,13 @@ 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
-curve.o: ../FL/abi-version.h
 curve.o: ../FL/Enumerations.H
 curve.o: ../FL/Fl.H
 curve.o: ../FL/Fl_Bitmap.H
 curve.o: ../FL/Fl_Button.H
+curve.o: ../FL/Fl_Cairo.H
 curve.o: ../FL/fl_casts.H
+curve.o: ../FL/fl_config.h
 curve.o: ../FL/Fl_Device.H
 curve.o: ../FL/Fl_Double_Window.H
 curve.o: ../FL/fl_draw.H
@@ -572,7 +592,6 @@ curve.o: ../FL/Fl_Value_Slider.H
 curve.o: ../FL/Fl_Widget.H
 curve.o: ../FL/Fl_Window.H
 curve.o: ../FL/platform_types.h
-demo.o: ../FL/abi-version.h
 demo.o: ../FL/Enumerations.H
 demo.o: ../FL/filename.H
 demo.o: ../FL/Fl.H
@@ -581,8 +600,10 @@ demo.o: ../FL/fl_attr.h
 demo.o: ../FL/Fl_Bitmap.H
 demo.o: ../FL/Fl_Box.H
 demo.o: ../FL/Fl_Button.H
+demo.o: ../FL/Fl_Cairo.H
 demo.o: ../FL/fl_casts.H
 demo.o: ../FL/Fl_Choice.H
+demo.o: ../FL/fl_config.h
 demo.o: ../FL/Fl_Device.H
 demo.o: ../FL/Fl_Double_Window.H
 demo.o: ../FL/fl_draw.H
@@ -611,7 +632,6 @@ demo.o: ../FL/Fl_Widget.H
 demo.o: ../FL/Fl_Window.H
 demo.o: ../FL/platform.H
 demo.o: ../FL/platform_types.h
-device.o: ../FL/abi-version.h
 device.o: ../FL/Enumerations.H
 device.o: ../FL/filename.H
 device.o: ../FL/Fl.H
@@ -622,10 +642,12 @@ device.o: ../FL/Fl_Box.H
 device.o: ../FL/Fl_Browser.H
 device.o: ../FL/Fl_Browser_.H
 device.o: ../FL/Fl_Button.H
+device.o: ../FL/Fl_Cairo.H
 device.o: ../FL/fl_casts.H
 device.o: ../FL/Fl_Check_Button.H
 device.o: ../FL/Fl_Choice.H
 device.o: ../FL/Fl_Clock.H
+device.o: ../FL/fl_config.h
 device.o: ../FL/Fl_Copy_Surface.H
 device.o: ../FL/Fl_Device.H
 device.o: ../FL/Fl_Double_Window.H
@@ -672,12 +694,13 @@ device.o: ../FL/Fl_Window.H
 device.o: ../FL/platform_types.h
 device.o: pixmaps/porsche.xpm
 device.o: pixmaps/sorceress.xbm
-doublebuffer.o: ../FL/abi-version.h
 doublebuffer.o: ../FL/Enumerations.H
 doublebuffer.o: ../FL/Fl.H
 doublebuffer.o: ../FL/Fl_Bitmap.H
 doublebuffer.o: ../FL/Fl_Box.H
+doublebuffer.o: ../FL/Fl_Cairo.H
 doublebuffer.o: ../FL/fl_casts.H
+doublebuffer.o: ../FL/fl_config.h
 doublebuffer.o: ../FL/Fl_Device.H
 doublebuffer.o: ../FL/Fl_Double_Window.H
 doublebuffer.o: ../FL/fl_draw.H
@@ -700,7 +723,6 @@ doublebuffer.o: ../FL/Fl_Widget.H
 doublebuffer.o: ../FL/Fl_Window.H
 doublebuffer.o: ../FL/math.h
 doublebuffer.o: ../FL/platform_types.h
-editor.o: ../FL/abi-version.h
 editor.o: ../FL/Enumerations.H
 editor.o: ../FL/filename.H
 editor.o: ../FL/Fl.H
@@ -711,9 +733,11 @@ editor.o: ../FL/Fl_Box.H
 editor.o: ../FL/Fl_Browser.H
 editor.o: ../FL/Fl_Browser_.H
 editor.o: ../FL/Fl_Button.H
+editor.o: ../FL/Fl_Cairo.H
 editor.o: ../FL/fl_casts.H
 editor.o: ../FL/Fl_Check_Button.H
 editor.o: ../FL/Fl_Choice.H
+editor.o: ../FL/fl_config.h
 editor.o: ../FL/Fl_Device.H
 editor.o: ../FL/Fl_Double_Window.H
 editor.o: ../FL/fl_draw.H
@@ -753,12 +777,13 @@ editor.o: ../FL/Fl_Widget.H
 editor.o: ../FL/Fl_Window.H
 editor.o: ../FL/platform.H
 editor.o: ../FL/platform_types.h
-fast_slow.o: ../FL/abi-version.h
 fast_slow.o: ../FL/Enumerations.H
 fast_slow.o: ../FL/Fl.H
 fast_slow.o: ../FL/Fl_Bitmap.H
 fast_slow.o: ../FL/Fl_Box.H
+fast_slow.o: ../FL/Fl_Cairo.H
 fast_slow.o: ../FL/fl_casts.H
+fast_slow.o: ../FL/fl_config.h
 fast_slow.o: ../FL/Fl_Double_Window.H
 fast_slow.o: ../FL/Fl_Export.H
 fast_slow.o: ../FL/Fl_Group.H
@@ -771,7 +796,6 @@ fast_slow.o: ../FL/Fl_Widget.H
 fast_slow.o: ../FL/Fl_Window.H
 fast_slow.o: ../FL/platform_types.h
 fast_slow.o: fast_slow.h
-file_chooser.o: ../FL/abi-version.h
 file_chooser.o: ../FL/Enumerations.H
 file_chooser.o: ../FL/filename.H
 file_chooser.o: ../FL/Fl.H
@@ -782,9 +806,11 @@ file_chooser.o: ../FL/Fl_Box.H
 file_chooser.o: ../FL/Fl_Browser.H
 file_chooser.o: ../FL/Fl_Browser_.H
 file_chooser.o: ../FL/Fl_Button.H
+file_chooser.o: ../FL/Fl_Cairo.H
 file_chooser.o: ../FL/fl_casts.H
 file_chooser.o: ../FL/Fl_Check_Button.H
 file_chooser.o: ../FL/Fl_Choice.H
+file_chooser.o: ../FL/fl_config.h
 file_chooser.o: ../FL/Fl_Device.H
 file_chooser.o: ../FL/Fl_Double_Window.H
 file_chooser.o: ../FL/fl_draw.H
@@ -823,14 +849,15 @@ file_chooser.o: ../FL/Fl_Valuator.H
 file_chooser.o: ../FL/Fl_Widget.H
 file_chooser.o: ../FL/Fl_Window.H
 file_chooser.o: ../FL/platform_types.h
-fltk-versions.o: ../FL/abi-version.h
 fltk-versions.o: ../FL/Enumerations.H
 fltk-versions.o: ../FL/Fl.H
 fltk-versions.o: ../FL/fl_ask.H
 fltk-versions.o: ../FL/fl_attr.h
 fltk-versions.o: ../FL/Fl_Bitmap.H
 fltk-versions.o: ../FL/Fl_Box.H
+fltk-versions.o: ../FL/Fl_Cairo.H
 fltk-versions.o: ../FL/fl_casts.H
+fltk-versions.o: ../FL/fl_config.h
 fltk-versions.o: ../FL/Fl_Export.H
 fltk-versions.o: ../FL/Fl_Group.H
 fltk-versions.o: ../FL/Fl_Image.H
@@ -840,7 +867,6 @@ fltk-versions.o: ../FL/fl_utf8.h
 fltk-versions.o: ../FL/Fl_Widget.H
 fltk-versions.o: ../FL/Fl_Window.H
 fltk-versions.o: ../FL/platform_types.h
-fonts.o: ../FL/abi-version.h
 fonts.o: ../FL/Enumerations.H
 fonts.o: ../FL/filename.H
 fonts.o: ../FL/Fl.H
@@ -851,9 +877,11 @@ fonts.o: ../FL/Fl_Box.H
 fonts.o: ../FL/Fl_Browser.H
 fonts.o: ../FL/Fl_Browser_.H
 fonts.o: ../FL/Fl_Button.H
+fonts.o: ../FL/Fl_Cairo.H
 fonts.o: ../FL/fl_casts.H
 fonts.o: ../FL/Fl_Check_Button.H
 fonts.o: ../FL/Fl_Choice.H
+fonts.o: ../FL/fl_config.h
 fonts.o: ../FL/Fl_Device.H
 fonts.o: ../FL/Fl_Double_Window.H
 fonts.o: ../FL/fl_draw.H
@@ -888,7 +916,6 @@ fonts.o: ../FL/Fl_Valuator.H
 fonts.o: ../FL/Fl_Widget.H
 fonts.o: ../FL/Fl_Window.H
 fonts.o: ../FL/platform_types.h
-forms.o: ../FL/abi-version.h
 forms.o: ../FL/Enumerations.H
 forms.o: ../FL/filename.H
 forms.o: ../FL/Fl.H
@@ -899,11 +926,13 @@ forms.o: ../FL/Fl_Box.H
 forms.o: ../FL/Fl_Browser.H
 forms.o: ../FL/Fl_Browser_.H
 forms.o: ../FL/Fl_Button.H
+forms.o: ../FL/Fl_Cairo.H
 forms.o: ../FL/fl_casts.H
 forms.o: ../FL/Fl_Chart.H
 forms.o: ../FL/Fl_Check_Button.H
 forms.o: ../FL/Fl_Choice.H
 forms.o: ../FL/Fl_Clock.H
+forms.o: ../FL/fl_config.h
 forms.o: ../FL/Fl_Counter.H
 forms.o: ../FL/Fl_Device.H
 forms.o: ../FL/Fl_Dial.H
@@ -950,12 +979,13 @@ forms.o: ../FL/forms.H
 forms.o: ../FL/platform_types.h
 forms.o: pixmaps/sorceress.xbm
 fractals.o: ../config.h
-fractals.o: ../FL/abi-version.h
 fractals.o: ../FL/Enumerations.H
 fractals.o: ../FL/Fl.H
 fractals.o: ../FL/Fl_Bitmap.H
 fractals.o: ../FL/Fl_Button.H
+fractals.o: ../FL/Fl_Cairo.H
 fractals.o: ../FL/fl_casts.H
+fractals.o: ../FL/fl_config.h
 fractals.o: ../FL/Fl_Export.H
 fractals.o: ../FL/Fl_Gl_Window.H
 fractals.o: ../FL/Fl_Group.H
@@ -970,11 +1000,12 @@ fractals.o: ../FL/glut.H
 fractals.o: ../FL/platform_types.h
 fractals.o: fracviewer.h
 fracviewer.o: ../config.h
-fracviewer.o: ../FL/abi-version.h
 fracviewer.o: ../FL/Enumerations.H
 fracviewer.o: ../FL/Fl.H
 fracviewer.o: ../FL/Fl_Bitmap.H
+fracviewer.o: ../FL/Fl_Cairo.H
 fracviewer.o: ../FL/fl_casts.H
+fracviewer.o: ../FL/fl_config.h
 fracviewer.o: ../FL/Fl_Export.H
 fracviewer.o: ../FL/Fl_Gl_Window.H
 fracviewer.o: ../FL/Fl_Group.H
@@ -989,7 +1020,6 @@ fracviewer.o: ../FL/glut.H
 fracviewer.o: ../FL/platform_types.h
 fracviewer.o: fracviewer.h
 fullscreen.o: ../config.h
-fullscreen.o: ../FL/abi-version.h
 fullscreen.o: ../FL/Enumerations.H
 fullscreen.o: ../FL/Fl.H
 fullscreen.o: ../FL/fl_ask.H
@@ -998,7 +1028,9 @@ fullscreen.o: ../FL/Fl_Bitmap.H
 fullscreen.o: ../FL/Fl_Browser.H
 fullscreen.o: ../FL/Fl_Browser_.H
 fullscreen.o: ../FL/Fl_Button.H
+fullscreen.o: ../FL/Fl_Cairo.H
 fullscreen.o: ../FL/fl_casts.H
+fullscreen.o: ../FL/fl_config.h
 fullscreen.o: ../FL/Fl_Export.H
 fullscreen.o: ../FL/Fl_Gl_Window.H
 fullscreen.o: ../FL/Fl_Group.H
@@ -1024,11 +1056,12 @@ fullscreen.o: ../FL/gl.h
 fullscreen.o: ../FL/math.h
 fullscreen.o: ../FL/platform_types.h
 glpuzzle.o: ../config.h
-glpuzzle.o: ../FL/abi-version.h
 glpuzzle.o: ../FL/Enumerations.H
 glpuzzle.o: ../FL/Fl.H
 glpuzzle.o: ../FL/Fl_Bitmap.H
+glpuzzle.o: ../FL/Fl_Cairo.H
 glpuzzle.o: ../FL/fl_casts.H
+glpuzzle.o: ../FL/fl_config.h
 glpuzzle.o: ../FL/Fl_Export.H
 glpuzzle.o: ../FL/Fl_Gl_Window.H
 glpuzzle.o: ../FL/Fl_Group.H
@@ -1044,12 +1077,13 @@ glpuzzle.o: ../FL/platform_types.h
 glpuzzle.o: trackball.c
 glpuzzle.o: trackball.h
 gl_overlay.o: ../config.h
-gl_overlay.o: ../FL/abi-version.h
 gl_overlay.o: ../FL/Enumerations.H
 gl_overlay.o: ../FL/Fl.H
 gl_overlay.o: ../FL/Fl_Bitmap.H
 gl_overlay.o: ../FL/Fl_Button.H
+gl_overlay.o: ../FL/Fl_Cairo.H
 gl_overlay.o: ../FL/fl_casts.H
+gl_overlay.o: ../FL/fl_config.h
 gl_overlay.o: ../FL/Fl_Export.H
 gl_overlay.o: ../FL/Fl_Gl_Window.H
 gl_overlay.o: ../FL/Fl_Group.H
@@ -1065,12 +1099,13 @@ gl_overlay.o: ../FL/Fl_Window.H
 gl_overlay.o: ../FL/gl.h
 gl_overlay.o: ../FL/math.h
 gl_overlay.o: ../FL/platform_types.h
-hello.o: ../FL/abi-version.h
 hello.o: ../FL/Enumerations.H
 hello.o: ../FL/Fl.H
 hello.o: ../FL/Fl_Bitmap.H
 hello.o: ../FL/Fl_Box.H
+hello.o: ../FL/Fl_Cairo.H
 hello.o: ../FL/fl_casts.H
+hello.o: ../FL/fl_config.h
 hello.o: ../FL/Fl_Export.H
 hello.o: ../FL/Fl_Group.H
 hello.o: ../FL/Fl_Image.H
@@ -1079,14 +1114,15 @@ hello.o: ../FL/fl_utf8.h
 hello.o: ../FL/Fl_Widget.H
 hello.o: ../FL/Fl_Window.H
 hello.o: ../FL/platform_types.h
-help_dialog.o: ../FL/abi-version.h
 help_dialog.o: ../FL/Enumerations.H
 help_dialog.o: ../FL/filename.H
 help_dialog.o: ../FL/Fl.H
 help_dialog.o: ../FL/Fl_Bitmap.H
 help_dialog.o: ../FL/Fl_Box.H
 help_dialog.o: ../FL/Fl_Button.H
+help_dialog.o: ../FL/Fl_Cairo.H
 help_dialog.o: ../FL/fl_casts.H
+help_dialog.o: ../FL/fl_config.h
 help_dialog.o: ../FL/Fl_Device.H
 help_dialog.o: ../FL/Fl_Double_Window.H
 help_dialog.o: ../FL/fl_draw.H
@@ -1111,12 +1147,13 @@ help_dialog.o: ../FL/Fl_Valuator.H
 help_dialog.o: ../FL/Fl_Widget.H
 help_dialog.o: ../FL/Fl_Window.H
 help_dialog.o: ../FL/platform_types.h
-icon.o: ../FL/abi-version.h
 icon.o: ../FL/Enumerations.H
 icon.o: ../FL/Fl.H
 icon.o: ../FL/Fl_Bitmap.H
+icon.o: ../FL/Fl_Cairo.H
 icon.o: ../FL/fl_casts.H
 icon.o: ../FL/Fl_Choice.H
+icon.o: ../FL/fl_config.h
 icon.o: ../FL/Fl_Double_Window.H
 icon.o: ../FL/Fl_Export.H
 icon.o: ../FL/Fl_Group.H
@@ -1129,13 +1166,14 @@ icon.o: ../FL/fl_utf8.h
 icon.o: ../FL/Fl_Widget.H
 icon.o: ../FL/Fl_Window.H
 icon.o: ../FL/platform_types.h
-iconize.o: ../FL/abi-version.h
 iconize.o: ../FL/Enumerations.H
 iconize.o: ../FL/Fl.H
 iconize.o: ../FL/Fl_Bitmap.H
 iconize.o: ../FL/Fl_Box.H
 iconize.o: ../FL/Fl_Button.H
+iconize.o: ../FL/Fl_Cairo.H
 iconize.o: ../FL/fl_casts.H
+iconize.o: ../FL/fl_config.h
 iconize.o: ../FL/Fl_Export.H
 iconize.o: ../FL/Fl_Group.H
 iconize.o: ../FL/Fl_Image.H
@@ -1145,12 +1183,13 @@ iconize.o: ../FL/Fl_Widget.H
 iconize.o: ../FL/Fl_Window.H
 iconize.o: ../FL/platform_types.h
 image.o: ../config.h
-image.o: ../FL/abi-version.h
 image.o: ../FL/Enumerations.H
 image.o: ../FL/Fl.H
 image.o: ../FL/Fl_Bitmap.H
 image.o: ../FL/Fl_Button.H
+image.o: ../FL/Fl_Cairo.H
 image.o: ../FL/fl_casts.H
+image.o: ../FL/fl_config.h
 image.o: ../FL/Fl_Double_Window.H
 image.o: ../FL/Fl_Export.H
 image.o: ../FL/Fl_Group.H
@@ -1163,15 +1202,16 @@ image.o: ../FL/Fl_Window.H
 image.o: ../FL/platform.H
 image.o: ../FL/platform_types.h
 image.o: list_visuals.cxx
-inactive.o: ../FL/abi-version.h
 inactive.o: ../FL/Enumerations.H
 inactive.o: ../FL/Fl.H
 inactive.o: ../FL/Fl_Bitmap.H
 inactive.o: ../FL/Fl_Box.H
 inactive.o: ../FL/Fl_Button.H
+inactive.o: ../FL/Fl_Cairo.H
 inactive.o: ../FL/fl_casts.H
 inactive.o: ../FL/Fl_Check_Button.H
 inactive.o: ../FL/Fl_Clock.H
+inactive.o: ../FL/fl_config.h
 inactive.o: ../FL/Fl_Dial.H
 inactive.o: ../FL/Fl_Double_Window.H
 inactive.o: ../FL/Fl_Export.H
@@ -1195,15 +1235,16 @@ inactive.o: ../FL/Fl_Widget.H
 inactive.o: ../FL/Fl_Window.H
 inactive.o: ../FL/platform_types.h
 inactive.o: inactive.h
-input.o: ../FL/abi-version.h
 input.o: ../FL/Enumerations.H
 input.o: ../FL/Fl.H
 input.o: ../FL/Fl_Bitmap.H
 input.o: ../FL/Fl_Box.H
 input.o: ../FL/Fl_Button.H
+input.o: ../FL/Fl_Cairo.H
 input.o: ../FL/fl_casts.H
 input.o: ../FL/Fl_Choice.H
 input.o: ../FL/Fl_Color_Chooser.H
+input.o: ../FL/fl_config.h
 input.o: ../FL/Fl_Device.H
 input.o: ../FL/fl_draw.H
 input.o: ../FL/Fl_Export.H
@@ -1238,12 +1279,13 @@ input.o: ../FL/Fl_Value_Input.H
 input.o: ../FL/Fl_Widget.H
 input.o: ../FL/Fl_Window.H
 input.o: ../FL/platform_types.h
-input_choice.o: ../FL/abi-version.h
 input_choice.o: ../FL/Enumerations.H
 input_choice.o: ../FL/Fl.H
 input_choice.o: ../FL/Fl_Bitmap.H
 input_choice.o: ../FL/Fl_Button.H
+input_choice.o: ../FL/Fl_Cairo.H
 input_choice.o: ../FL/fl_casts.H
+input_choice.o: ../FL/fl_config.h
 input_choice.o: ../FL/Fl_Device.H
 input_choice.o: ../FL/Fl_Double_Window.H
 input_choice.o: ../FL/fl_draw.H
@@ -1273,13 +1315,14 @@ input_choice.o: ../FL/Fl_Valuator.H
 input_choice.o: ../FL/Fl_Widget.H
 input_choice.o: ../FL/Fl_Window.H
 input_choice.o: ../FL/platform_types.h
-keyboard.o: ../FL/abi-version.h
 keyboard.o: ../FL/Enumerations.H
 keyboard.o: ../FL/Fl.H
 keyboard.o: ../FL/Fl_Bitmap.H
 keyboard.o: ../FL/Fl_Box.H
 keyboard.o: ../FL/Fl_Button.H
+keyboard.o: ../FL/Fl_Cairo.H
 keyboard.o: ../FL/fl_casts.H
+keyboard.o: ../FL/fl_config.h
 keyboard.o: ../FL/Fl_Dial.H
 keyboard.o: ../FL/Fl_Export.H
 keyboard.o: ../FL/Fl_Group.H
@@ -1294,14 +1337,15 @@ keyboard.o: ../FL/Fl_Window.H
 keyboard.o: ../FL/platform_types.h
 keyboard.o: keyboard.h
 keyboard.o: keyboard_ui.h
-label.o: ../FL/abi-version.h
 label.o: ../FL/Enumerations.H
 label.o: ../FL/Fl.H
 label.o: ../FL/Fl_Bitmap.H
 label.o: ../FL/Fl_Box.H
 label.o: ../FL/Fl_Button.H
+label.o: ../FL/Fl_Cairo.H
 label.o: ../FL/fl_casts.H
 label.o: ../FL/Fl_Choice.H
+label.o: ../FL/fl_config.h
 label.o: ../FL/Fl_Device.H
 label.o: ../FL/Fl_Double_Window.H
 label.o: ../FL/fl_draw.H
@@ -1329,15 +1373,16 @@ label.o: ../FL/Fl_Widget.H
 label.o: ../FL/Fl_Window.H
 label.o: ../FL/platform_types.h
 label.o: pixmaps/blast.xpm
-line_style.o: ../FL/abi-version.h
 line_style.o: ../FL/Enumerations.H
 line_style.o: ../FL/Fl.H
 line_style.o: ../FL/Fl_Bitmap.H
 line_style.o: ../FL/Fl_Box.H
 line_style.o: ../FL/Fl_Button.H
+line_style.o: ../FL/Fl_Cairo.H
 line_style.o: ../FL/fl_casts.H
 line_style.o: ../FL/Fl_Check_Button.H
 line_style.o: ../FL/Fl_Choice.H
+line_style.o: ../FL/fl_config.h
 line_style.o: ../FL/Fl_Device.H
 line_style.o: ../FL/Fl_Double_Window.H
 line_style.o: ../FL/fl_draw.H
@@ -1363,17 +1408,19 @@ line_style.o: ../FL/Fl_Window.H
 line_style.o: ../FL/platform_types.h
 list_visuals.o: ../config.h
 list_visuals.o: ../FL/Enumerations.H
+list_visuals.o: ../FL/fl_config.h
 list_visuals.o: ../FL/Fl_Export.H
 list_visuals.o: ../FL/fl_types.h
 list_visuals.o: ../FL/platform.H
 list_visuals.o: ../FL/platform_types.h
-mandelbrot.o: ../FL/abi-version.h
 mandelbrot.o: ../FL/Enumerations.H
 mandelbrot.o: ../FL/Fl.H
 mandelbrot.o: ../FL/Fl_Bitmap.H
 mandelbrot.o: ../FL/Fl_Box.H
 mandelbrot.o: ../FL/Fl_Button.H
+mandelbrot.o: ../FL/Fl_Cairo.H
 mandelbrot.o: ../FL/fl_casts.H
+mandelbrot.o: ../FL/fl_config.h
 mandelbrot.o: ../FL/Fl_Device.H
 mandelbrot.o: ../FL/Fl_Double_Window.H
 mandelbrot.o: ../FL/fl_draw.H
@@ -1401,7 +1448,6 @@ mandelbrot.o: ../FL/Fl_Window.H
 mandelbrot.o: ../FL/platform_types.h
 mandelbrot.o: mandelbrot.h
 mandelbrot.o: mandelbrot_ui.h
-menubar.o: ../FL/abi-version.h
 menubar.o: ../FL/Enumerations.H
 menubar.o: ../FL/Fl.H
 menubar.o: ../FL/fl_ask.H
@@ -1409,8 +1455,10 @@ menubar.o: ../FL/fl_attr.h
 menubar.o: ../FL/Fl_Bitmap.H
 menubar.o: ../FL/Fl_Box.H
 menubar.o: ../FL/Fl_Button.H
+menubar.o: ../FL/Fl_Cairo.H
 menubar.o: ../FL/fl_casts.H
 menubar.o: ../FL/Fl_Choice.H
+menubar.o: ../FL/fl_config.h
 menubar.o: ../FL/Fl_Device.H
 menubar.o: ../FL/Fl_Double_Window.H
 menubar.o: ../FL/fl_draw.H
@@ -1443,13 +1491,14 @@ menubar.o: ../FL/Fl_Value_Slider.H
 menubar.o: ../FL/Fl_Widget.H
 menubar.o: ../FL/Fl_Window.H
 menubar.o: ../FL/platform_types.h
-message.o: ../FL/abi-version.h
 message.o: ../FL/Enumerations.H
 message.o: ../FL/Fl.H
 message.o: ../FL/fl_ask.H
 message.o: ../FL/fl_attr.h
 message.o: ../FL/Fl_Bitmap.H
+message.o: ../FL/Fl_Cairo.H
 message.o: ../FL/fl_casts.H
+message.o: ../FL/fl_config.h
 message.o: ../FL/Fl_Export.H
 message.o: ../FL/Fl_Group.H
 message.o: ../FL/Fl_Image.H
@@ -1459,13 +1508,14 @@ message.o: ../FL/fl_utf8.h
 message.o: ../FL/Fl_Widget.H
 message.o: ../FL/Fl_Window.H
 message.o: ../FL/platform_types.h
-minimum.o: ../FL/abi-version.h
 minimum.o: ../FL/Enumerations.H
 minimum.o: ../FL/Fl.H
 minimum.o: ../FL/Fl_Bitmap.H
 minimum.o: ../FL/Fl_Box.H
 minimum.o: ../FL/Fl_Button.H
+minimum.o: ../FL/Fl_Cairo.H
 minimum.o: ../FL/fl_casts.H
+minimum.o: ../FL/fl_config.h
 minimum.o: ../FL/Fl_Double_Window.H
 minimum.o: ../FL/Fl_Export.H
 minimum.o: ../FL/Fl_Group.H
@@ -1478,7 +1528,6 @@ minimum.o: ../FL/Fl_Valuator.H
 minimum.o: ../FL/Fl_Widget.H
 minimum.o: ../FL/Fl_Window.H
 minimum.o: ../FL/platform_types.h
-native-filechooser.o: ../FL/abi-version.h
 native-filechooser.o: ../FL/Enumerations.H
 native-filechooser.o: ../FL/filename.H
 native-filechooser.o: ../FL/Fl.H
@@ -1489,9 +1538,11 @@ native-filechooser.o: ../FL/Fl_Box.H
 native-filechooser.o: ../FL/Fl_Browser.H
 native-filechooser.o: ../FL/Fl_Browser_.H
 native-filechooser.o: ../FL/Fl_Button.H
+native-filechooser.o: ../FL/Fl_Cairo.H
 native-filechooser.o: ../FL/fl_casts.H
 native-filechooser.o: ../FL/Fl_Check_Button.H
 native-filechooser.o: ../FL/Fl_Choice.H
+native-filechooser.o: ../FL/fl_config.h
 native-filechooser.o: ../FL/Fl_Device.H
 native-filechooser.o: ../FL/Fl_Double_Window.H
 native-filechooser.o: ../FL/fl_draw.H
@@ -1531,11 +1582,12 @@ native-filechooser.o: ../FL/Fl_Valuator.H
 native-filechooser.o: ../FL/Fl_Widget.H
 native-filechooser.o: ../FL/Fl_Window.H
 native-filechooser.o: ../FL/platform_types.h
-navigation.o: ../FL/abi-version.h
 navigation.o: ../FL/Enumerations.H
 navigation.o: ../FL/Fl.H
 navigation.o: ../FL/Fl_Bitmap.H
+navigation.o: ../FL/Fl_Cairo.H
 navigation.o: ../FL/fl_casts.H
+navigation.o: ../FL/fl_config.h
 navigation.o: ../FL/Fl_Export.H
 navigation.o: ../FL/Fl_Group.H
 navigation.o: ../FL/Fl_Image.H
@@ -1547,12 +1599,13 @@ navigation.o: ../FL/fl_utf8.h
 navigation.o: ../FL/Fl_Widget.H
 navigation.o: ../FL/Fl_Window.H
 navigation.o: ../FL/platform_types.h
-offscreen.o: ../FL/abi-version.h
 offscreen.o: ../FL/Enumerations.H
 offscreen.o: ../FL/Fl.H
 offscreen.o: ../FL/Fl_Bitmap.H
 offscreen.o: ../FL/Fl_Box.H
+offscreen.o: ../FL/Fl_Cairo.H
 offscreen.o: ../FL/fl_casts.H
+offscreen.o: ../FL/fl_config.h
 offscreen.o: ../FL/Fl_Device.H
 offscreen.o: ../FL/Fl_Double_Window.H
 offscreen.o: ../FL/fl_draw.H
@@ -1571,13 +1624,14 @@ offscreen.o: ../FL/Fl_Widget.H
 offscreen.o: ../FL/Fl_Window.H
 offscreen.o: ../FL/platform.H
 offscreen.o: ../FL/platform_types.h
-output.o: ../FL/abi-version.h
 output.o: ../FL/Enumerations.H
 output.o: ../FL/Fl.H
 output.o: ../FL/Fl_Bitmap.H
 output.o: ../FL/Fl_Box.H
 output.o: ../FL/Fl_Button.H
+output.o: ../FL/Fl_Cairo.H
 output.o: ../FL/fl_casts.H
+output.o: ../FL/fl_config.h
 output.o: ../FL/Fl_Device.H
 output.o: ../FL/Fl_Double_Window.H
 output.o: ../FL/fl_draw.H
@@ -1605,12 +1659,13 @@ output.o: ../FL/Fl_Value_Slider.H
 output.o: ../FL/Fl_Widget.H
 output.o: ../FL/Fl_Window.H
 output.o: ../FL/platform_types.h
-overlay.o: ../FL/abi-version.h
 overlay.o: ../FL/Enumerations.H
 overlay.o: ../FL/Fl.H
 overlay.o: ../FL/Fl_Bitmap.H
 overlay.o: ../FL/Fl_Button.H
+overlay.o: ../FL/Fl_Cairo.H
 overlay.o: ../FL/fl_casts.H
+overlay.o: ../FL/fl_config.h
 overlay.o: ../FL/Fl_Device.H
 overlay.o: ../FL/Fl_Double_Window.H
 overlay.o: ../FL/fl_draw.H
@@ -1629,12 +1684,13 @@ overlay.o: ../FL/fl_utf8.h
 overlay.o: ../FL/Fl_Widget.H
 overlay.o: ../FL/Fl_Window.H
 overlay.o: ../FL/platform_types.h
-pack.o: ../FL/abi-version.h
 pack.o: ../FL/Enumerations.H
 pack.o: ../FL/Fl.H
 pack.o: ../FL/Fl_Bitmap.H
 pack.o: ../FL/Fl_Button.H
+pack.o: ../FL/Fl_Cairo.H
 pack.o: ../FL/fl_casts.H
+pack.o: ../FL/fl_config.h
 pack.o: ../FL/Fl_Double_Window.H
 pack.o: ../FL/Fl_Export.H
 pack.o: ../FL/Fl_Group.H
@@ -1651,12 +1707,13 @@ pack.o: ../FL/Fl_Value_Slider.H
 pack.o: ../FL/Fl_Widget.H
 pack.o: ../FL/Fl_Window.H
 pack.o: ../FL/platform_types.h
-pixmap.o: ../FL/abi-version.h
 pixmap.o: ../FL/Enumerations.H
 pixmap.o: ../FL/Fl.H
 pixmap.o: ../FL/Fl_Bitmap.H
 pixmap.o: ../FL/Fl_Button.H
+pixmap.o: ../FL/Fl_Cairo.H
 pixmap.o: ../FL/fl_casts.H
+pixmap.o: ../FL/fl_config.h
 pixmap.o: ../FL/Fl_Double_Window.H
 pixmap.o: ../FL/Fl_Export.H
 pixmap.o: ../FL/Fl_Group.H
@@ -1671,7 +1728,6 @@ pixmap.o: ../FL/Fl_Window.H
 pixmap.o: ../FL/platform_types.h
 pixmap.o: pixmaps/porsche.xpm
 pixmap_browser.o: ../config.h
-pixmap_browser.o: ../FL/abi-version.h
 pixmap_browser.o: ../FL/Enumerations.H
 pixmap_browser.o: ../FL/filename.H
 pixmap_browser.o: ../FL/Fl.H
@@ -1682,9 +1738,11 @@ pixmap_browser.o: ../FL/Fl_Box.H
 pixmap_browser.o: ../FL/Fl_Browser.H
 pixmap_browser.o: ../FL/Fl_Browser_.H
 pixmap_browser.o: ../FL/Fl_Button.H
+pixmap_browser.o: ../FL/Fl_Cairo.H
 pixmap_browser.o: ../FL/fl_casts.H
 pixmap_browser.o: ../FL/Fl_Check_Button.H
 pixmap_browser.o: ../FL/Fl_Choice.H
+pixmap_browser.o: ../FL/fl_config.h
 pixmap_browser.o: ../FL/Fl_Device.H
 pixmap_browser.o: ../FL/Fl_Double_Window.H
 pixmap_browser.o: ../FL/Fl_Export.H
@@ -1720,7 +1778,6 @@ pixmap_browser.o: ../FL/Fl_Widget.H
 pixmap_browser.o: ../FL/Fl_Widget_Surface.H
 pixmap_browser.o: ../FL/Fl_Window.H
 pixmap_browser.o: ../FL/platform_types.h
-preferences.o: ../FL/abi-version.h
 preferences.o: ../FL/Enumerations.H
 preferences.o: ../FL/filename.H
 preferences.o: ../FL/Fl.H
@@ -1729,9 +1786,11 @@ preferences.o: ../FL/fl_attr.h
 preferences.o: ../FL/Fl_Bitmap.H
 preferences.o: ../FL/Fl_Box.H
 preferences.o: ../FL/Fl_Button.H
+preferences.o: ../FL/Fl_Cairo.H
 preferences.o: ../FL/fl_casts.H
 preferences.o: ../FL/Fl_Check_Button.H
 preferences.o: ../FL/Fl_Choice.H
+preferences.o: ../FL/fl_config.h
 preferences.o: ../FL/Fl_Double_Window.H
 preferences.o: ../FL/Fl_Export.H
 preferences.o: ../FL/Fl_Group.H
@@ -1754,13 +1813,14 @@ preferences.o: ../FL/Fl_Widget.H
 preferences.o: ../FL/Fl_Window.H
 preferences.o: ../FL/platform_types.h
 preferences.o: preferences.h
-radio.o: ../FL/abi-version.h
 radio.o: ../FL/Enumerations.H
 radio.o: ../FL/Fl.H
 radio.o: ../FL/Fl_Bitmap.H
 radio.o: ../FL/Fl_Button.H
+radio.o: ../FL/Fl_Cairo.H
 radio.o: ../FL/fl_casts.H
 radio.o: ../FL/Fl_Check_Button.H
+radio.o: ../FL/fl_config.h
 radio.o: ../FL/Fl_Double_Window.H
 radio.o: ../FL/Fl_Export.H
 radio.o: ../FL/Fl_Group.H
@@ -1777,12 +1837,13 @@ radio.o: ../FL/Fl_Widget.H
 radio.o: ../FL/Fl_Window.H
 radio.o: ../FL/platform_types.h
 radio.o: radio.h
-resize-example1.o: ../FL/abi-version.h
 resize-example1.o: ../FL/Enumerations.H
 resize-example1.o: ../FL/Fl.H
 resize-example1.o: ../FL/Fl_Bitmap.H
 resize-example1.o: ../FL/Fl_Box.H
+resize-example1.o: ../FL/Fl_Cairo.H
 resize-example1.o: ../FL/fl_casts.H
+resize-example1.o: ../FL/fl_config.h
 resize-example1.o: ../FL/Fl_Double_Window.H
 resize-example1.o: ../FL/Fl_Export.H
 resize-example1.o: ../FL/Fl_Group.H
@@ -1793,12 +1854,13 @@ resize-example1.o: ../FL/Fl_Widget.H
 resize-example1.o: ../FL/Fl_Window.H
 resize-example1.o: ../FL/platform_types.h
 resize-example1.o: resize-arrows.h
-resize-example2.o: ../FL/abi-version.h
 resize-example2.o: ../FL/Enumerations.H
 resize-example2.o: ../FL/Fl.H
 resize-example2.o: ../FL/Fl_Bitmap.H
 resize-example2.o: ../FL/Fl_Box.H
+resize-example2.o: ../FL/Fl_Cairo.H
 resize-example2.o: ../FL/fl_casts.H
+resize-example2.o: ../FL/fl_config.h
 resize-example2.o: ../FL/Fl_Double_Window.H
 resize-example2.o: ../FL/Fl_Export.H
 resize-example2.o: ../FL/Fl_Group.H
@@ -1809,13 +1871,14 @@ resize-example2.o: ../FL/Fl_Widget.H
 resize-example2.o: ../FL/Fl_Window.H
 resize-example2.o: ../FL/platform_types.h
 resize-example2.o: resize-arrows.h
-resize-example3a.o: ../FL/abi-version.h
 resize-example3a.o: ../FL/Enumerations.H
 resize-example3a.o: ../FL/Fl.H
 resize-example3a.o: ../FL/Fl_Bitmap.H
 resize-example3a.o: ../FL/Fl_Box.H
 resize-example3a.o: ../FL/Fl_Button.H
+resize-example3a.o: ../FL/Fl_Cairo.H
 resize-example3a.o: ../FL/fl_casts.H
+resize-example3a.o: ../FL/fl_config.h
 resize-example3a.o: ../FL/Fl_Double_Window.H
 resize-example3a.o: ../FL/Fl_Export.H
 resize-example3a.o: ../FL/Fl_Group.H
@@ -1826,13 +1889,14 @@ resize-example3a.o: ../FL/Fl_Widget.H
 resize-example3a.o: ../FL/Fl_Window.H
 resize-example3a.o: ../FL/platform_types.h
 resize-example3a.o: resize-arrows.h
-resize-example3b.o: ../FL/abi-version.h
 resize-example3b.o: ../FL/Enumerations.H
 resize-example3b.o: ../FL/Fl.H
 resize-example3b.o: ../FL/Fl_Bitmap.H
 resize-example3b.o: ../FL/Fl_Box.H
 resize-example3b.o: ../FL/Fl_Button.H
+resize-example3b.o: ../FL/Fl_Cairo.H
 resize-example3b.o: ../FL/fl_casts.H
+resize-example3b.o: ../FL/fl_config.h
 resize-example3b.o: ../FL/Fl_Double_Window.H
 resize-example3b.o: ../FL/Fl_Export.H
 resize-example3b.o: ../FL/Fl_Group.H
@@ -1843,13 +1907,14 @@ resize-example3b.o: ../FL/Fl_Widget.H
 resize-example3b.o: ../FL/Fl_Window.H
 resize-example3b.o: ../FL/platform_types.h
 resize-example3b.o: resize-arrows.h
-resize-example3c.o: ../FL/abi-version.h
 resize-example3c.o: ../FL/Enumerations.H
 resize-example3c.o: ../FL/Fl.H
 resize-example3c.o: ../FL/Fl_Bitmap.H
 resize-example3c.o: ../FL/Fl_Box.H
 resize-example3c.o: ../FL/Fl_Button.H
+resize-example3c.o: ../FL/Fl_Cairo.H
 resize-example3c.o: ../FL/fl_casts.H
+resize-example3c.o: ../FL/fl_config.h
 resize-example3c.o: ../FL/Fl_Double_Window.H
 resize-example3c.o: ../FL/Fl_Export.H
 resize-example3c.o: ../FL/Fl_Group.H
@@ -1860,12 +1925,13 @@ resize-example3c.o: ../FL/Fl_Widget.H
 resize-example3c.o: ../FL/Fl_Window.H
 resize-example3c.o: ../FL/platform_types.h
 resize-example3c.o: resize-arrows.h
-resize-example4a.o: ../FL/abi-version.h
 resize-example4a.o: ../FL/Enumerations.H
 resize-example4a.o: ../FL/Fl.H
 resize-example4a.o: ../FL/Fl_Bitmap.H
 resize-example4a.o: ../FL/Fl_Box.H
+resize-example4a.o: ../FL/Fl_Cairo.H
 resize-example4a.o: ../FL/fl_casts.H
+resize-example4a.o: ../FL/fl_config.h
 resize-example4a.o: ../FL/Fl_Double_Window.H
 resize-example4a.o: ../FL/Fl_Export.H
 resize-example4a.o: ../FL/Fl_Group.H
@@ -1876,12 +1942,13 @@ resize-example4a.o: ../FL/Fl_Widget.H
 resize-example4a.o: ../FL/Fl_Window.H
 resize-example4a.o: ../FL/platform_types.h
 resize-example4a.o: resize-arrows.h
-resize-example4b.o: ../FL/abi-version.h
 resize-example4b.o: ../FL/Enumerations.H
 resize-example4b.o: ../FL/Fl.H
 resize-example4b.o: ../FL/Fl_Bitmap.H
 resize-example4b.o: ../FL/Fl_Box.H
+resize-example4b.o: ../FL/Fl_Cairo.H
 resize-example4b.o: ../FL/fl_casts.H
+resize-example4b.o: ../FL/fl_config.h
 resize-example4b.o: ../FL/Fl_Double_Window.H
 resize-example4b.o: ../FL/Fl_Export.H
 resize-example4b.o: ../FL/Fl_Group.H
@@ -1892,12 +1959,13 @@ resize-example4b.o: ../FL/Fl_Widget.H
 resize-example4b.o: ../FL/Fl_Window.H
 resize-example4b.o: ../FL/platform_types.h
 resize-example4b.o: resize-arrows.h
-resize-example5a.o: ../FL/abi-version.h
 resize-example5a.o: ../FL/Enumerations.H
 resize-example5a.o: ../FL/Fl.H
 resize-example5a.o: ../FL/Fl_Bitmap.H
 resize-example5a.o: ../FL/Fl_Box.H
+resize-example5a.o: ../FL/Fl_Cairo.H
 resize-example5a.o: ../FL/fl_casts.H
+resize-example5a.o: ../FL/fl_config.h
 resize-example5a.o: ../FL/Fl_Double_Window.H
 resize-example5a.o: ../FL/Fl_Export.H
 resize-example5a.o: ../FL/Fl_Group.H
@@ -1908,12 +1976,13 @@ resize-example5a.o: ../FL/Fl_Widget.H
 resize-example5a.o: ../FL/Fl_Window.H
 resize-example5a.o: ../FL/platform_types.h
 resize-example5a.o: resize-arrows.h
-resize-example5b.o: ../FL/abi-version.h
 resize-example5b.o: ../FL/Enumerations.H
 resize-example5b.o: ../FL/Fl.H
 resize-example5b.o: ../FL/Fl_Bitmap.H
 resize-example5b.o: ../FL/Fl_Box.H
+resize-example5b.o: ../FL/Fl_Cairo.H
 resize-example5b.o: ../FL/fl_casts.H
+resize-example5b.o: ../FL/fl_config.h
 resize-example5b.o: ../FL/Fl_Double_Window.H
 resize-example5b.o: ../FL/Fl_Export.H
 resize-example5b.o: ../FL/Fl_Group.H
@@ -1924,12 +1993,13 @@ resize-example5b.o: ../FL/Fl_Widget.H
 resize-example5b.o: ../FL/Fl_Window.H
 resize-example5b.o: ../FL/platform_types.h
 resize-example5b.o: resize-arrows.h
-resize-example5c.o: ../FL/abi-version.h
 resize-example5c.o: ../FL/Enumerations.H
 resize-example5c.o: ../FL/Fl.H
 resize-example5c.o: ../FL/Fl_Bitmap.H
 resize-example5c.o: ../FL/Fl_Box.H
+resize-example5c.o: ../FL/Fl_Cairo.H
 resize-example5c.o: ../FL/fl_casts.H
+resize-example5c.o: ../FL/fl_config.h
 resize-example5c.o: ../FL/Fl_Double_Window.H
 resize-example5c.o: ../FL/Fl_Export.H
 resize-example5c.o: ../FL/Fl_Group.H
@@ -1940,13 +2010,14 @@ resize-example5c.o: ../FL/Fl_Widget.H
 resize-example5c.o: ../FL/Fl_Window.H
 resize-example5c.o: ../FL/platform_types.h
 resize-example5c.o: resize-arrows.h
-resize.o: ../FL/abi-version.h
 resize.o: ../FL/Enumerations.H
 resize.o: ../FL/Fl.H
 resize.o: ../FL/Fl_Bitmap.H
 resize.o: ../FL/Fl_Box.H
 resize.o: ../FL/Fl_Button.H
+resize.o: ../FL/Fl_Cairo.H
 resize.o: ../FL/fl_casts.H
+resize.o: ../FL/fl_config.h
 resize.o: ../FL/Fl_Double_Window.H
 resize.o: ../FL/Fl_Export.H
 resize.o: ../FL/Fl_Group.H
@@ -1957,7 +2028,6 @@ resize.o: ../FL/Fl_Widget.H
 resize.o: ../FL/Fl_Window.H
 resize.o: ../FL/platform_types.h
 resize.o: resize.h
-resizebox.o: ../FL/abi-version.h
 resizebox.o: ../FL/Enumerations.H
 resizebox.o: ../FL/Fl.H
 resizebox.o: ../FL/fl_ask.H
@@ -1965,7 +2035,9 @@ resizebox.o: ../FL/fl_attr.h
 resizebox.o: ../FL/Fl_Bitmap.H
 resizebox.o: ../FL/Fl_Box.H
 resizebox.o: ../FL/Fl_Button.H
+resizebox.o: ../FL/Fl_Cairo.H
 resizebox.o: ../FL/fl_casts.H
+resizebox.o: ../FL/fl_config.h
 resizebox.o: ../FL/Fl_Device.H
 resizebox.o: ../FL/Fl_Double_Window.H
 resizebox.o: ../FL/fl_draw.H
@@ -1986,14 +2058,15 @@ resizebox.o: ../FL/fl_utf8.h
 resizebox.o: ../FL/Fl_Widget.H
 resizebox.o: ../FL/Fl_Window.H
 resizebox.o: ../FL/platform_types.h
-rotated_text.o: ../FL/abi-version.h
 rotated_text.o: ../FL/Enumerations.H
 rotated_text.o: ../FL/Fl.H
 rotated_text.o: ../FL/Fl_Bitmap.H
 rotated_text.o: ../FL/Fl_Box.H
 rotated_text.o: ../FL/Fl_Button.H
+rotated_text.o: ../FL/Fl_Cairo.H
 rotated_text.o: ../FL/fl_casts.H
 rotated_text.o: ../FL/Fl_Choice.H
+rotated_text.o: ../FL/fl_config.h
 rotated_text.o: ../FL/Fl_Device.H
 rotated_text.o: ../FL/Fl_Double_Window.H
 rotated_text.o: ../FL/fl_draw.H
@@ -2020,13 +2093,14 @@ rotated_text.o: ../FL/Fl_Value_Slider.H
 rotated_text.o: ../FL/Fl_Widget.H
 rotated_text.o: ../FL/Fl_Window.H
 rotated_text.o: ../FL/platform_types.h
-scroll.o: ../FL/abi-version.h
 scroll.o: ../FL/Enumerations.H
 scroll.o: ../FL/Fl.H
 scroll.o: ../FL/Fl_Bitmap.H
 scroll.o: ../FL/Fl_Box.H
+scroll.o: ../FL/Fl_Cairo.H
 scroll.o: ../FL/fl_casts.H
 scroll.o: ../FL/Fl_Choice.H
+scroll.o: ../FL/fl_config.h
 scroll.o: ../FL/Fl_Device.H
 scroll.o: ../FL/Fl_Double_Window.H
 scroll.o: ../FL/fl_draw.H
@@ -2053,11 +2127,12 @@ scroll.o: ../FL/Fl_Window.H
 scroll.o: ../FL/math.h
 scroll.o: ../FL/platform_types.h
 shape.o: ../config.h
-shape.o: ../FL/abi-version.h
 shape.o: ../FL/Enumerations.H
 shape.o: ../FL/Fl.H
 shape.o: ../FL/Fl_Bitmap.H
+shape.o: ../FL/Fl_Cairo.H
 shape.o: ../FL/fl_casts.H
+shape.o: ../FL/fl_config.h
 shape.o: ../FL/Fl_Export.H
 shape.o: ../FL/Fl_Gl_Window.H
 shape.o: ../FL/Fl_Group.H
@@ -2072,13 +2147,14 @@ shape.o: ../FL/Fl_Window.H
 shape.o: ../FL/gl.h
 shape.o: ../FL/math.h
 shape.o: ../FL/platform_types.h
-subwindow.o: ../FL/abi-version.h
 subwindow.o: ../FL/Enumerations.H
 subwindow.o: ../FL/Fl.H
 subwindow.o: ../FL/Fl_Bitmap.H
 subwindow.o: ../FL/Fl_Box.H
 subwindow.o: ../FL/Fl_Button.H
+subwindow.o: ../FL/Fl_Cairo.H
 subwindow.o: ../FL/fl_casts.H
+subwindow.o: ../FL/fl_config.h
 subwindow.o: ../FL/Fl_Export.H
 subwindow.o: ../FL/Fl_Group.H
 subwindow.o: ../FL/Fl_Image.H
@@ -2094,7 +2170,6 @@ subwindow.o: ../FL/Fl_Widget.H
 subwindow.o: ../FL/Fl_Window.H
 subwindow.o: ../FL/platform_types.h
 sudoku.o: ../config.h
-sudoku.o: ../FL/abi-version.h
 sudoku.o: ../FL/Enumerations.H
 sudoku.o: ../FL/filename.H
 sudoku.o: ../FL/Fl.H
@@ -2103,7 +2178,9 @@ sudoku.o: ../FL/fl_attr.h
 sudoku.o: ../FL/Fl_Bitmap.H
 sudoku.o: ../FL/Fl_Box.H
 sudoku.o: ../FL/Fl_Button.H
+sudoku.o: ../FL/Fl_Cairo.H
 sudoku.o: ../FL/fl_casts.H
+sudoku.o: ../FL/fl_config.h
 sudoku.o: ../FL/Fl_Device.H
 sudoku.o: ../FL/Fl_Double_Window.H
 sudoku.o: ../FL/fl_draw.H
@@ -2139,12 +2216,13 @@ sudoku.o: ../FL/math.h
 sudoku.o: ../FL/platform.H
 sudoku.o: ../FL/platform_types.h
 sudoku.o: pixmaps/sudoku.xbm
-symbols.o: ../FL/abi-version.h
 symbols.o: ../FL/Enumerations.H
 symbols.o: ../FL/Fl.H
 symbols.o: ../FL/Fl_Bitmap.H
 symbols.o: ../FL/Fl_Box.H
+symbols.o: ../FL/Fl_Cairo.H
 symbols.o: ../FL/fl_casts.H
+symbols.o: ../FL/fl_config.h
 symbols.o: ../FL/Fl_Device.H
 symbols.o: ../FL/Fl_Double_Window.H
 symbols.o: ../FL/fl_draw.H
@@ -2165,16 +2243,17 @@ symbols.o: ../FL/Fl_Value_Slider.H
 symbols.o: ../FL/Fl_Widget.H
 symbols.o: ../FL/Fl_Window.H
 symbols.o: ../FL/platform_types.h
-table.o: ../FL/abi-version.h
 table.o: ../FL/Enumerations.H
 table.o: ../FL/Fl.H
 table.o: ../FL/fl_ask.H
 table.o: ../FL/fl_attr.h
 table.o: ../FL/Fl_Bitmap.H
 table.o: ../FL/Fl_Button.H
+table.o: ../FL/Fl_Cairo.H
 table.o: ../FL/fl_casts.H
 table.o: ../FL/Fl_Check_Button.H
 table.o: ../FL/Fl_Choice.H
+table.o: ../FL/fl_config.h
 table.o: ../FL/Fl_Device.H
 table.o: ../FL/fl_draw.H
 table.o: ../FL/Fl_Export.H
@@ -2206,7 +2285,6 @@ table.o: ../FL/Fl_Valuator.H
 table.o: ../FL/Fl_Widget.H
 table.o: ../FL/Fl_Window.H
 table.o: ../FL/platform_types.h
-tabs.o: ../FL/abi-version.h
 tabs.o: ../FL/Enumerations.H
 tabs.o: ../FL/Fl.H
 tabs.o: ../FL/fl_ask.H
@@ -2214,8 +2292,10 @@ tabs.o: ../FL/fl_attr.h
 tabs.o: ../FL/Fl_Bitmap.H
 tabs.o: ../FL/Fl_Box.H
 tabs.o: ../FL/Fl_Button.H
+tabs.o: ../FL/Fl_Cairo.H
 tabs.o: ../FL/fl_casts.H
 tabs.o: ../FL/Fl_Clock.H
+tabs.o: ../FL/fl_config.h
 tabs.o: ../FL/Fl_Double_Window.H
 tabs.o: ../FL/Fl_Export.H
 tabs.o: ../FL/Fl_Group.H
@@ -2233,7 +2313,6 @@ tabs.o: ../FL/Fl_Wizard.H
 tabs.o: ../FL/platform_types.h
 tabs.o: tabs.h
 threads.o: ../config.h
-threads.o: ../FL/abi-version.h
 threads.o: ../FL/Enumerations.H
 threads.o: ../FL/Fl.H
 threads.o: ../FL/fl_ask.H
@@ -2241,7 +2320,9 @@ threads.o: ../FL/fl_attr.h
 threads.o: ../FL/Fl_Bitmap.H
 threads.o: ../FL/Fl_Browser.H
 threads.o: ../FL/Fl_Browser_.H
+threads.o: ../FL/Fl_Cairo.H
 threads.o: ../FL/fl_casts.H
+threads.o: ../FL/fl_config.h
 threads.o: ../FL/Fl_Double_Window.H
 threads.o: ../FL/Fl_Export.H
 threads.o: ../FL/Fl_Group.H
@@ -2257,12 +2338,13 @@ threads.o: ../FL/Fl_Widget.H
 threads.o: ../FL/Fl_Window.H
 threads.o: ../FL/platform_types.h
 threads.o: threads.h
-tile.o: ../FL/abi-version.h
 tile.o: ../FL/Enumerations.H
 tile.o: ../FL/Fl.H
 tile.o: ../FL/Fl_Bitmap.H
 tile.o: ../FL/Fl_Box.H
+tile.o: ../FL/Fl_Cairo.H
 tile.o: ../FL/fl_casts.H
+tile.o: ../FL/fl_config.h
 tile.o: ../FL/Fl_Double_Window.H
 tile.o: ../FL/Fl_Export.H
 tile.o: ../FL/Fl_Group.H
@@ -2274,12 +2356,13 @@ tile.o: ../FL/Fl_Widget.H
 tile.o: ../FL/Fl_Window.H
 tile.o: ../FL/platform_types.h
 tiled_image.o: ../config.h
-tiled_image.o: ../FL/abi-version.h
 tiled_image.o: ../FL/Enumerations.H
 tiled_image.o: ../FL/Fl.H
 tiled_image.o: ../FL/Fl_Bitmap.H
 tiled_image.o: ../FL/Fl_Button.H
+tiled_image.o: ../FL/Fl_Cairo.H
 tiled_image.o: ../FL/fl_casts.H
+tiled_image.o: ../FL/fl_config.h
 tiled_image.o: ../FL/Fl_Double_Window.H
 tiled_image.o: ../FL/Fl_Export.H
 tiled_image.o: ../FL/Fl_Group.H
@@ -2294,7 +2377,6 @@ tiled_image.o: ../FL/platform.H
 tiled_image.o: ../FL/platform_types.h
 tiled_image.o: list_visuals.cxx
 tiled_image.o: pixmaps/tile.xpm
-tree.o: ../FL/abi-version.h
 tree.o: ../FL/Enumerations.H
 tree.o: ../FL/filename.H
 tree.o: ../FL/Fl.H
@@ -2305,10 +2387,12 @@ tree.o: ../FL/Fl_Box.H
 tree.o: ../FL/Fl_Browser.H
 tree.o: ../FL/Fl_Browser_.H
 tree.o: ../FL/Fl_Button.H
+tree.o: ../FL/Fl_Cairo.H
 tree.o: ../FL/fl_casts.H
 tree.o: ../FL/Fl_Check_Button.H
 tree.o: ../FL/Fl_Choice.H
 tree.o: ../FL/Fl_Color_Chooser.H
+tree.o: ../FL/fl_config.h
 tree.o: ../FL/Fl_Device.H
 tree.o: ../FL/Fl_Double_Window.H
 tree.o: ../FL/fl_draw.H
@@ -2354,12 +2438,13 @@ tree.o: ../FL/Fl_Widget.H
 tree.o: ../FL/Fl_Window.H
 tree.o: ../FL/platform_types.h
 tree.o: tree.h
-twowin.o: ../FL/abi-version.h
 twowin.o: ../FL/Enumerations.H
 twowin.o: ../FL/Fl.H
 twowin.o: ../FL/Fl_Bitmap.H
 twowin.o: ../FL/Fl_Button.H
+twowin.o: ../FL/Fl_Cairo.H
 twowin.o: ../FL/fl_casts.H
+twowin.o: ../FL/fl_config.h
 twowin.o: ../FL/Fl_Double_Window.H
 twowin.o: ../FL/Fl_Export.H
 twowin.o: ../FL/Fl_Group.H
@@ -2371,7 +2456,6 @@ twowin.o: ../FL/fl_utf8.h
 twowin.o: ../FL/Fl_Widget.H
 twowin.o: ../FL/Fl_Window.H
 twowin.o: ../FL/platform_types.h
-unittests.o: ../FL/abi-version.h
 unittests.o: ../FL/Enumerations.H
 unittests.o: ../FL/filename.H
 unittests.o: ../FL/Fl.H
@@ -2381,10 +2465,12 @@ unittests.o: ../FL/Fl_Box.H
 unittests.o: ../FL/Fl_Browser.H
 unittests.o: ../FL/Fl_Browser_.H
 unittests.o: ../FL/Fl_Button.H
+unittests.o: ../FL/Fl_Cairo.H
 unittests.o: ../FL/fl_casts.H
 unittests.o: ../FL/Fl_Check_Button.H
 unittests.o: ../FL/Fl_Choice.H
 unittests.o: ../FL/Fl_Clock.H
+unittests.o: ../FL/fl_config.h
 unittests.o: ../FL/Fl_Counter.H
 unittests.o: ../FL/Fl_Device.H
 unittests.o: ../FL/Fl_Double_Window.H
@@ -2447,7 +2533,6 @@ unittests.o: unittest_simple_terminal.cxx
 unittests.o: unittest_symbol.cxx
 unittests.o: unittest_text.cxx
 unittests.o: unittest_viewport.cxx
-utf8.o: ../FL/abi-version.h
 utf8.o: ../FL/Enumerations.H
 utf8.o: ../FL/Fl.H
 utf8.o: ../FL/Fl_Bitmap.H
@@ -2455,9 +2540,11 @@ utf8.o: ../FL/Fl_Box.H
 utf8.o: ../FL/Fl_Browser.H
 utf8.o: ../FL/Fl_Browser_.H
 utf8.o: ../FL/Fl_Button.H
+utf8.o: ../FL/Fl_Cairo.H
 utf8.o: ../FL/fl_casts.H
 utf8.o: ../FL/Fl_Check_Button.H
 utf8.o: ../FL/Fl_Choice.H
+utf8.o: ../FL/fl_config.h
 utf8.o: ../FL/Fl_Device.H
 utf8.o: ../FL/Fl_Double_Window.H
 utf8.o: ../FL/fl_draw.H
@@ -2489,14 +2576,15 @@ utf8.o: ../FL/Fl_Value_Output.H
 utf8.o: ../FL/Fl_Widget.H
 utf8.o: ../FL/Fl_Window.H
 utf8.o: ../FL/platform_types.h
-valuators.o: ../FL/abi-version.h
 valuators.o: ../FL/Enumerations.H
 valuators.o: ../FL/Fl.H
 valuators.o: ../FL/Fl_Adjuster.H
 valuators.o: ../FL/Fl_Bitmap.H
 valuators.o: ../FL/Fl_Box.H
 valuators.o: ../FL/Fl_Button.H
+valuators.o: ../FL/Fl_Cairo.H
 valuators.o: ../FL/fl_casts.H
+valuators.o: ../FL/fl_config.h
 valuators.o: ../FL/Fl_Counter.H
 valuators.o: ../FL/Fl_Device.H
 valuators.o: ../FL/Fl_Dial.H
@@ -2531,12 +2619,13 @@ valuators.o: ../FL/Fl_Widget.H
 valuators.o: ../FL/Fl_Window.H
 valuators.o: ../FL/platform_types.h
 valuators.o: valuators.h
-windowfocus.o: ../FL/abi-version.h
 windowfocus.o: ../FL/Enumerations.H
 windowfocus.o: ../FL/Fl.H
 windowfocus.o: ../FL/Fl_Bitmap.H
 windowfocus.o: ../FL/Fl_Box.H
+windowfocus.o: ../FL/Fl_Cairo.H
 windowfocus.o: ../FL/fl_casts.H
+windowfocus.o: ../FL/fl_config.h
 windowfocus.o: ../FL/Fl_Double_Window.H
 windowfocus.o: ../FL/Fl_Export.H
 windowfocus.o: ../FL/Fl_Group.H
diff --git a/test/sudoku.cxx b/test/sudoku.cxx
index 2a1a14376..28437fbd8 100644
--- a/test/sudoku.cxx
+++ b/test/sudoku.cxx
@@ -2,6 +2,7 @@
 // Sudoku game using the Fast Light Tool Kit (FLTK).
 //
 // Copyright 2005-2018 by Michael Sweet.
+// Copyright 2019-2021 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
@@ -437,7 +438,7 @@ void SudokuSound::play(char note) {
     Sleep(NOTE_DURATION);
   } else Beep(frequencies[note - 'A'], NOTE_DURATION);
 
-#elif USE_X11
+#elif defined(FLTK_USE_X11)
 #  ifdef HAVE_ALSA_ASOUNDLIB_H
   if (handle) {
     // Use ALSA to play the sound...
diff --git a/test/tiled_image.cxx b/test/tiled_image.cxx
index 1ab275493..54e404307 100644
--- a/test/tiled_image.cxx
+++ b/test/tiled_image.cxx
@@ -1,7 +1,7 @@
 //
 // Fl_Tiled_Image test program for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2018 by Bill Spitzak and others.
+// Copyright 1998-2021 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
@@ -47,7 +47,7 @@ int arg(int argc, char **argv, int &i) {
 }
 
 int main(int argc, char **argv) {
-#if USE_X11
+#ifdef FLTK_USE_X11
   int i = 1;
 
   Fl::args(argc,argv,i,arg);