FLTK logo

[master] 5438954 - Generate FL/fl_config.h rather than FL/abi-version.h

FLTK matrix user chat room
(using Element browser app)   FLTK gitter user chat room   GitHub FLTK Project   FLTK News RSS Feed  
  FLTK Apps      FLTK Library      Forums      Links     Login 
 All Forums  |  Back to fltk.commit  ]
 
Previous Message ]Next Message ]

[master] 5438954 - Generate FL/fl_config.h rather than FL/abi-version.h "Albrecht Schlosser" Dec 18, 2021  
 
commit 5438954d8c6213f1b0cc9d23b70ffaae388e1d60
Author:     Albrecht Schlosser <albrechts.fltk@online.de>
AuthorDate: Sat Dec 18 22:42:30 2021 +0100
Commit:     Albrecht Schlosser <albrechts.fltk@online.de>
CommitDate: Sat Dec 18 22:44:08 2021 +0100

    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

 .gitignore                                       |   2 +-
 CMake/Android/abi-version.cmake.in               |  25 -
 CMake/Android/fl_config.cmake.in                 |  25 +
 CMake/android.cmake                              |   4 +-
 CMake/fl_create_example.cmake                    |   5 +
 CMake/install.cmake                              |   2 +-
 CMake/options.cmake                              |   6 +-
 CMakeLists.txt                                   |   4 +-
 FL/Enumerations.H                                |   4 +-
 FL/Fl.H                                          |   1 +
 FL/Fl_Cairo.H                                    |   9 +-
 FL/Fl_Cairo_Window.H                             |   7 +-
 FL/platform.H                                    |   8 +-
 Makefile                                         |   2 +-
 README.Cairo.txt                                 |  30 --
 README.Windows.txt                               |  14 +-
 README.abi-version.txt                           |   6 +-
 abi-version.cmake.in                             |  11 -
 abi-version.in                                   |  11 -
 cairo/Fl_Cairo.cxx                               |  14 +-
 cairo/makedepend                                 |   2 +-
 configh.cmake.in                                 |  33 +-
 configh.in                                       |  33 +-
 configure.ac                                     |   9 +-
 fl_config.cmake.in                               |  53 +++
 fl_config.in                                     |  53 +++
 fluid/CMakeLists.txt                             |   6 +
 fluid/makedepend                                 |  69 ++-
 src/CMakeLists.txt                               |  22 +-
 src/Fl_Window.cxx                                |   4 +-
 src/Fl_cocoa.mm                                  |   6 +-
 src/Makefile                                     |   2 +-
 src/drivers/Android/Fl_Android_Window_Driver.cxx |   6 +-
 src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx   |   6 +-
 src/fl_overlay.cxx                               |   5 +-
 src/makedepend                                   | 578 +++++++++++++++--------
 src/scandir_posix.c                              |   6 +-
 src/xutf8/utf8Input.c                            |   3 +-
 test/cairo_test.cxx                              |  13 +-
 test/color_chooser.cxx                           |   4 +-
 test/image.cxx                                   |   6 +-
 test/list_visuals.cxx                            |  14 +-
 test/makedepend                                  | 269 +++++++----
 test/sudoku.cxx                                  |   3 +-
 test/tiled_image.cxx                             |   4 +-
 45 files changed, 873 insertions(+), 526 deletions(-)

diff --git .gitignore .gitignore
index dbe31e6..fd256a7 100644
--- .gitignore
+++ .gitignore
@@ -42,7 +42,7 @@ etc/FLTKConfig.cmake
 /TAGS
 
 # /FL
-/FL/abi-version.h
+/FL/fl_config.h
 /FL/Makefile
 /FL/*.bck
 
diff --git CMake/Android/abi-version.cmake.in CMake/Android/abi-version.cmake.in
deleted file mode 100644
index 5200197..0000000
--- CMake/Android/abi-version.cmake.in
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Configuration file for the Fast Light Tool Kit (FLTK).
- *
- * Copyright 1998-2020 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
- * file is missing or damaged, see the license at:
- *
- *     https://www.fltk.org/COPYING.php
- *
- * Please see the following page on how to report bugs and issues:
- *
- *     https://www.fltk.org/bugs.php
- */
-
-/*
-  ============================================================================
-    DO NOT EDIT - This file is generated by CMake !
-  ============================================================================
-*/
-
-/* define FL_ABI_VERSION as 10x0y for FLTK ABI version 1.x.y */
-
-/* #undef FL_ABI_VERSION */
diff --git CMake/Android/fl_config.cmake.in CMake/Android/fl_config.cmake.in
new file mode 100644
index 0000000..5200197
--- /dev/null
+++ CMake/Android/fl_config.cmake.in
@@ -0,0 +1,25 @@
+/*
+ * Configuration file for the Fast Light Tool Kit (FLTK).
+ *
+ * Copyright 1998-2020 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
+ * file is missing or damaged, see the license at:
+ *
+ *     https://www.fltk.org/COPYING.php
+ *
+ * Please see the following page on how to report bugs and issues:
+ *
+ *     https://www.fltk.org/bugs.php
+ */
+
+/*
+  ============================================================================
+    DO NOT EDIT - This file is generated by CMake !
+  ============================================================================
+*/
+
+/* define FL_ABI_VERSION as 10x0y for FLTK ABI version 1.x.y */
+
+/* #undef FL_ABI_VERSION */
diff --git CMake/android.cmake CMake/android.cmake
index b5db954..9fc78d8 100644
--- CMake/android.cmake
+++ CMake/android.cmake
@@ -31,8 +31,8 @@ configure_file(
 
 # create a custom abi file for this setup
 configure_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/abi-version.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/FL/abi-version.h"
+  "${CMAKE_CURRENT_SOURCE_DIR}/fl_config.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/FL/fl_config.h"
   @ONLY
 )
 
diff --git CMake/fl_create_example.cmake CMake/fl_create_example.cmake
index 66c8efc..c2db54e 100644
--- CMake/fl_create_example.cmake
+++ CMake/fl_create_example.cmake
@@ -116,6 +116,11 @@ macro (CREATE_EXAMPLE NAME SOURCES LIBRARIES)
   set_target_properties   (${TARGET_NAME} PROPERTIES OUTPUT_NAME ${NAME})
   target_link_libraries   (${TARGET_NAME} ${LIBRARIES})
 
+  # we must link all programs with fltk_cairo if option CAIROEXT is enabled
+  if (FLTK_HAVE_CAIROEXT)
+    target_link_libraries (${TARGET_NAME} fltk_cairo cairo)
+  endif ()
+
   if (FLTK_HAVE_CAIRO)
     fl_target_link_directories (${TARGET_NAME} PRIVATE "${PKG_CAIRO_LIBRARY_DIRS}")
   endif ()
diff --git CMake/install.cmake CMake/install.cmake
index bbba125..b6b18c3 100644
--- CMake/install.cmake
+++ CMake/install.cmake
@@ -34,7 +34,7 @@ install (DIRECTORY
   DESTINATION ${FLTK_INCLUDEDIR} USE_SOURCE_PERMISSIONS
   FILES_MATCHING
     PATTERN "*.[hH]"
-    PATTERN "abi-version.h" EXCLUDE
+    PATTERN "fl_config.h" EXCLUDE
 )
 
 install (DIRECTORY
diff --git CMake/options.cmake CMake/options.cmake
index cad4b86..f1e347f 100644
--- CMake/options.cmake
+++ CMake/options.cmake
@@ -76,7 +76,7 @@ set (PATH_TO_XLIBS)
 if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
   include (FindX11)
   if (X11_FOUND)
-    set (USE_X11 1)
+    set (FLTK_USE_X11 1)
     list (APPEND FLTK_LDLIBS -lX11)
     if (X11_Xext_FOUND)
       list (APPEND FLTK_LDLIBS -lXext)
@@ -164,7 +164,7 @@ option (OPTION_CAIROEXT
 )
 
 set (FLTK_HAVE_CAIRO 0)
-set (FLTK_USE_CAIRO 0)
+set (FLTK_HAVE_CAIROEXT 0)
 
 if (OPTION_CAIRO OR OPTION_CAIROEXT)
   pkg_search_module (PKG_CAIRO cairo)
@@ -174,7 +174,7 @@ if (OPTION_CAIRO OR OPTION_CAIROEXT)
   if (PKG_CAIRO_FOUND)
     set (FLTK_HAVE_CAIRO 1)
     if (OPTION_CAIROEXT)
-      set (FLTK_USE_CAIRO 1)
+      set (FLTK_HAVE_CAIROEXT 1)
     endif (OPTION_CAIROEXT)
     add_subdirectory (cairo)
 
diff --git CMakeLists.txt CMakeLists.txt
index 72b9102..f472c4e 100644
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -142,8 +142,8 @@ include (CMake/variables.cmake)
 include (CMake/export.cmake)
 
 configure_file (
-  ${CMAKE_CURRENT_SOURCE_DIR}/abi-version.cmake.in
-  ${CMAKE_CURRENT_BINARY_DIR}/FL/abi-version.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/fl_config.cmake.in
+  ${CMAKE_CURRENT_BINARY_DIR}/FL/fl_config.h
   @ONLY
 )
 
diff --git FL/Enumerations.H FL/Enumerations.H
index d9c15bc..91a3d55 100644
--- FL/Enumerations.H
+++ FL/Enumerations.H
@@ -24,13 +24,13 @@
 /*
  ******************************************************************************
  * FL_ABI_VERSION is defined by configure or CMake since FLTK 1.3.4.
- * It is written to FL/abi-version.h and #included here.
+ * It is written to FL/fl_config.h and #included here.
  ******************************************************************************
  * For more informations on FL_ABI_VERSION see README.abi-version.txt.
  ******************************************************************************
  */
 
-#include <FL/abi-version.h>
+#include <FL/fl_config.h>
 
 #  include "Fl_Export.H"
 #  include "fl_types.h"
diff --git FL/Fl.H FL/Fl.H
index 27f2d68..3c887b6 100644
--- FL/Fl.H
+++ FL/Fl.H
@@ -21,6 +21,7 @@
 #ifndef Fl_H
 #  define Fl_H
 
+#include <FL/fl_config.h> // build configuration
 #include <FL/Fl_Export.H>
 #include <FL/platform_types.h> // for FL_SOCKET
 #include <FL/fl_casts.H>       // experimental
diff --git FL/Fl_Cairo.H FL/Fl_Cairo.H
index 3a32647..29496f0 100644
--- FL/Fl_Cairo.H
+++ FL/Fl_Cairo.H
@@ -1,7 +1,7 @@
 //
 // Main header file for the Fast Light Tool Kit (FLTK).
 //
-// 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
@@ -20,6 +20,9 @@
 
 #ifndef FL_CAIRO_H
 # define FL_CAIRO_H
+
+# include <FL/fl_config.h> // build configuration
+
 # ifdef FLTK_HAVE_CAIRO
 
 // Cairo is currently supported for the following platforms:
@@ -39,7 +42,9 @@
    A private internal & unique corresponding object is created to
    permit cairo context state handling while keeping it opaque.
    For internal use only.
-   \note Only available when configure has the --enable-cairo option
+   \note Only available when configure has the --enable-cairo or
+        --enable-cairoext option or one or both of the CMake options
+        OPTION_CAIRO or OPTION_CAIROEXT is set (ON)
 */
 class FL_EXPORT Fl_Cairo_State {
 public:
diff --git FL/Fl_Cairo_Window.H FL/Fl_Cairo_Window.H
index 8d98cd5..f660cd3 100644
--- FL/Fl_Cairo_Window.H
+++ FL/Fl_Cairo_Window.H
@@ -1,7 +1,7 @@
 //
-// Main header file for the Fast Light Tool Kit (FLTK).
+// Cairo Window header file 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
@@ -20,6 +20,9 @@
 
 #ifndef FL_CAIRO_WINDOW_H
 # define FL_CAIRO_WINDOW_H
+
+#include <FL/fl_config.h>
+
 # ifdef FLTK_HAVE_CAIRO
 
 // Cairo is currently supported for the following platforms:
diff --git FL/platform.H FL/platform.H
index 7271b1f..b1a61c0 100644
--- FL/platform.H
+++ FL/platform.H
@@ -1,7 +1,7 @@
 //
 // Platform header file for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 1998-2020 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
@@ -28,6 +28,7 @@
 #if !defined(FL_PLATFORM_H) && !defined(FL_DOXYGEN)
 #  define FL_PLATFORM_H
 
+#   include <FL/fl_config.h>
 #   include <FL/Fl_Export.H>
 #   include <FL/platform_types.h>
 #   include <FL/fl_types.h> // for uchar
@@ -42,9 +43,6 @@ class Fl_Window;
 #  else // X11
 #   include <FL/fl_types.h>
 #   include <FL/Enumerations.H>
-#    if !defined(USE_X11)
-#      define USE_X11 1
-#    endif
 #    if defined(_ABIN32) || defined(_ABI64) // fix for broken SGI Irix X .h files
 #      pragma set woff 3322
 #    endif
@@ -125,7 +123,7 @@ public:
   // static variables, static functions and member functions
   static Fl_X* first;
   static Fl_X* i(const Fl_Window* w) {return (Fl_X*)w->i;}
-#  if defined(USE_X11) // for backward compatibility
+#  if defined(FLTK_USE_X11) // for backward compatibility
   static void make_xid(Fl_Window*, XVisualInfo* =fl_visual, Colormap=fl_colormap);
   static Fl_X* set_xid(Fl_Window*, Window);
 #  endif
diff --git Makefile Makefile
index c023a9b..ade947d 100644
--- Makefile
+++ Makefile
@@ -68,7 +68,7 @@ distclean: clean
 	$(RM) fltk-config fltk.list makeinclude
 	$(RM) fltk.spec
 	$(RM) FL/Makefile
-	$(RM) FL/abi-version.h
+	$(RM) FL/fl_config.h
 	$(RM) documentation/*.$(CAT1EXT)
 	$(RM) documentation/*.$(CAT3EXT)
 	$(RM) documentation/*.$(CAT6EXT)
diff --git README.Cairo.txt README.Cairo.txt
index 47eabda..b2bfba0 100644
--- README.Cairo.txt
+++ README.Cairo.txt
@@ -83,36 +83,6 @@ For more details, please have a look to the doxygen documentation,
 in the Modules section.
 
 
- Future considerations
------------------------
-
-From Bill:
-First there is the FLTK_HAVE_CAIRO configuration option. This indicates that
-any Cairo calls are available. In this case you get something like this:
-
-// static variable holding the last Cairo context FLTK set:
-cairo_t* Fl::cr;
-
-// Make cr draw in this window. This hides the ugly platform-dependent
-// part of getting Cairo going:
-void Fl::cairo_make_current(Fl_Window*)
-
-*** POST 1.3 potential Cairo use:
-// Set cr to something you made yourself. This lets you reuse functions
-// that use cr, and also tells FLTK that cr is not one of its own and
-// thus cannot be destroyed or reused for a different window:
-void Fl::cairo_make_current(cairo_t*)
-
-Second there is the FLTK_USE_CAIRO configuration option. This means that all
-drawing is done using Cairo. In this case when a widget draw() method is
-called, it is exactly as though cairo_make_current(window) has been done.
-***
-
-Note that it should be possible to compile so FLTK_HAVE_CAIRO works even
-if FLTK_USE_CAIRO does not, and so that turning on FLTK_USE_CAIRO does not
-break any programs written for FLTK_HAVE_CAIRO.
-
-
  PLATFORM SPECIFIC NOTES
 =========================
 
diff --git README.Windows.txt README.Windows.txt
index 04c2d9a..459bb8b 100644
--- README.Windows.txt
+++ README.Windows.txt
@@ -2,6 +2,15 @@
 ------------------------------------------------------------
 
 
+
+
+â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??
+***   CAUTION: This file is outdated. This needs a major rework!   ***
+â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??â??
+
+
+
+
  CONTENTS
 ==========
 
@@ -413,10 +422,9 @@ without adding link and include paths to the solution.
 
   copy the entire FL directory into the include path
 
-  add all files from ide\VisualC2008\FL to the FL directory copied above
-    (this is currently only one file: abi-version.h)
+  add <build_dir>/FL/fl_config.h
 
-  copy all .lib files from the fltk lib directory to the VC lib directory
+  copy all .lib files from the fltk build directory to the VC lib directory
 
   copy fluid.exe in the fluid directory to the bin directory
 
diff --git README.abi-version.txt README.abi-version.txt
index 19a42e9..7ccda33 100644
--- README.abi-version.txt
+++ README.abi-version.txt
@@ -40,7 +40,7 @@ and '1' is the major version number.
 The default ABI version for all FLTK 1.4.x versions is 10400 (the binary
 version of FLTK 1.4.0), but you can configure another version, e.g.
 10401 for FLTK 1.4.1 to enable the ABI features of FLTK 1.4.1 and all
-previous versions. See CHANGES file.
+previous versions. See CHANGES.txt file.
 
 
 Depending on how you build FLTK, there are two different ways to configure
@@ -57,7 +57,7 @@ the version number.
         ./configure --with-abiversion=10401
         make
 
-    This will generate FL/abi-version.h and build FLTK as usual.
+    This will generate FL/fl_config.h and build FLTK as usual.
 
     Note: you should always make sure that you compile everything from
     scratch if you change the ABI version or any other configuration
@@ -110,7 +110,7 @@ the version number.
 General note on CMake:
 ----------------------
 
-    CMake generates FL/abi-version.h in the build tree. You may run
+    CMake generates FL/fl_config.h in the build tree. You may run
     'make install' to install the FLTK library including all headers in
     the chosen installation directory, although this is not necessary.
 
diff --git abi-version.cmake.in abi-version.cmake.in
deleted file mode 100644
index 34d7001..0000000
--- abi-version.cmake.in
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-  ABI Configuration file for the Fast Light Tool Kit (FLTK).
-
-  ============================================================================
-    DO NOT EDIT - This file is generated by CMake !
-  ============================================================================
-
-  define FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)
-*/
-
-#cmakedefine FL_ABI_VERSION @FL_ABI_VERSION@
diff --git abi-version.in abi-version.in
deleted file mode 100644
index bd2c3c7..0000000
--- abi-version.in
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-  ABI Configuration file for the Fast Light Tool Kit (FLTK).
-
-  ============================================================================
-    DO NOT EDIT - This file is generated by configure !
-  ============================================================================
-
-  define FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)
-*/
-
-#undef FL_ABI_VERSION
diff --git cairo/Fl_Cairo.cxx cairo/Fl_Cairo.cxx
index 0ebd04b..3a5b59f 100644
--- cairo/Fl_Cairo.cxx
+++ cairo/Fl_Cairo.cxx
@@ -24,11 +24,11 @@
 // Cairo is currently supported for the following platforms:
 // Win32, Apple Quartz, X11
 
-#if defined(USE_X11) // X11
+#if defined(FLTK_USE_X11)         // X11
 #  include <cairo-xlib.h>
-#elif defined(_WIN32)
+#elif defined(_WIN32)             // Windows
 #  include <cairo-win32.h>
-#elif defined(__APPLE_QUARTZ__) // PORTME: Cairo Support
+#elif defined(__APPLE_QUARTZ__)   // macOS
 #  include <cairo-quartz.h>
 #else
 #  error Cairo is not supported on this platform.
@@ -43,7 +43,7 @@ Fl_Cairo_State Fl::cairo_state_;        ///< contains all necessary info for cur
 // Fl_Cairo_State class impl
 
 void  Fl_Cairo_State::autolink(bool b)  {
-#ifdef FLTK_USE_CAIRO
+#ifdef FLTK_HAVE_CAIROEXT
   autolink_ = b;
 #else
   Fl::fatal("In Fl::autolink(bool) : Cairo autolink() feature is only "
@@ -86,7 +86,7 @@ cairo_t * Fl::cairo_make_current(Fl_Window* wi) {
 #ifndef __APPLE__
   float scale = Fl::screen_scale(wi->screen_num()); // get the screen scaling factor
 #endif
-#if defined(USE_X11)
+#if defined(FLTK_USE_X11)
   cairo_ctxt = Fl::cairo_make_current(0, wi->w() * scale, wi->h() * scale);
 #else
   // on macOS, scaling is done before by Fl_Window::make_current(), on Windows, the size is not used
@@ -105,7 +105,7 @@ cairo_t * Fl::cairo_make_current(Fl_Window* wi) {
  */
 
 static cairo_surface_t * cairo_create_surface(void * gc, int W, int H) {
-# if defined(USE_X11)
+# if defined(FLTK_USE_X11)
     return cairo_xlib_surface_create(fl_display, fl_window, fl_visual->visual, W, H);
 # elif   defined(_WIN32)
     return cairo_win32_surface_create((HDC) gc);
@@ -123,7 +123,7 @@ static cairo_surface_t * cairo_create_surface(void * gc, int W, int H) {
 */
 cairo_t * Fl::cairo_make_current(void *gc) {
     int W=0,H=0;
-#if defined(USE_X11)
+#if defined(FLTK_USE_X11)
   // FIXME X11 get W,H
   // gc will be the window handle here
   // # warning FIXME get W,H for cairo_make_current(void*)
diff --git cairo/makedepend cairo/makedepend
index 23089dc..7c0ee67 100644
--- cairo/makedepend
+++ cairo/makedepend
@@ -1,12 +1,12 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 Fl_Cairo.o: ../config.h
-Fl_Cairo.o: ../FL/abi-version.h
 Fl_Cairo.o: ../FL/Enumerations.H
 Fl_Cairo.o: ../FL/Fl.H
 Fl_Cairo.o: ../FL/Fl_Bitmap.H
 Fl_Cairo.o: ../FL/Fl_Cairo.H
 Fl_Cairo.o: ../FL/fl_casts.H
+Fl_Cairo.o: ../FL/fl_config.h
 Fl_Cairo.o: ../FL/Fl_Export.H
 Fl_Cairo.o: ../FL/Fl_Group.H
 Fl_Cairo.o: ../FL/Fl_Image.H
diff --git configh.cmake.in configh.cmake.in
index be69885..f489cdb 100644
--- configh.cmake.in
+++ configh.cmake.in
@@ -28,6 +28,12 @@
  */
 
 /*
+ * Always include the public build configuration header
+ */
+
+#include <FL/fl_config.h>
+
+/*
  * Where to find files...
  */
 
@@ -151,16 +157,6 @@
 
 #cmakedefine __APPLE_QUARTZ__ 1
 
-
-/*
- * USE_X11
- *
- * Should we use X11 for the current platform
- *
- */
-
-#cmakedefine USE_X11 1
-
 /*
  * USE_SDL
  *
@@ -272,23 +268,6 @@
 #cmakedefine HAVE_LIBJPEG 1
 
 /*
- * FLTK_USE_CAIRO
- *
- * Do we have the cairo library available and want extended cairo use in FLTK ?
- * This implies to link cairo.lib in all FLTK based apps.
- */
-
-#cmakedefine FLTK_USE_CAIRO 1
-
-/*
- * FLTK_HAVE_CAIRO
- *
- * Do we have the cairo library available?
- */
-
-#cmakedefine FLTK_HAVE_CAIRO 1
-
-/*
  * Which header file do we include for libpng?
  */
 
diff --git configh.in configh.in
index 1428bf7..0317e97 100644
--- configh.in
+++ configh.in
@@ -27,6 +27,12 @@
  */
 
 /*
+ * Always include the public build configuration header
+ */
+
+#include <FL/fl_config.h>
+
+/*
  * Where to find files...
  */
 
@@ -150,16 +156,6 @@
 
 #undef __APPLE_QUARTZ__
 
-
-/*
- * USE_X11
- *
- * Should we use X11 for the current platform
- *
- */
-
-#undef USE_X11
-
 /*
  * USE_SDL
  *
@@ -272,23 +268,6 @@
 #undef HAVE_LIBJPEG
 
 /*
- * FLTK_USE_CAIRO
- *
- * Do we have the cairo library available and want extended cairo use in FLTK ?
- * This implies to link cairo.lib in all FLTK based apps.
- */
-
-#undef FLTK_USE_CAIRO
-
-/*
- * FLTK_HAVE_CAIRO
- *
- * Do we have the cairo library available?
- */
-
-#undef FLTK_HAVE_CAIRO
-
-/*
  * Which header file do we include for libpng?
  */
 
diff --git configure.ac configure.ac
index c448b22..311108b 100644
--- configure.ac
+++ configure.ac
@@ -85,7 +85,8 @@ AC_SUBST(OPTIM)
 
 
 dnl Other options
-AC_ARG_ENABLE([cairo], AS_HELP_STRING([--enable-cairo], [use Cairo library])) AC_ARG_ENABLE([cairoext], AS_HELP_STRING([--enable-cairoext], [use FLTK code instrumentation for cairo extended use]))
+AC_ARG_ENABLE([cairo], AS_HELP_STRING([--enable-cairo], [use Cairo library]))
+AC_ARG_ENABLE([cairoext], AS_HELP_STRING([--enable-cairoext], [use FLTK code instrumentation for cairo extended use]))
 
 AC_ARG_ENABLE([cp936], AS_HELP_STRING([--enable-cp936], [turn on CP936]))
 AS_IF([test x$enable_cp936 = xyes], [
@@ -220,7 +221,7 @@ CAIROLIBS=""
 
 AS_IF([test x$enable_cairoext = xyes], [
     AS_IF([$PKGCONFIG --exists cairo], [
-        AC_DEFINE([FLTK_USE_CAIRO])
+        AC_DEFINE([FLTK_HAVE_CAIROEXT])
         AC_DEFINE([FLTK_HAVE_CAIRO])
         CAIRODIR="cairo"
         CAIROFLAGS="$($PKGCONFIG --cflags cairo)"
@@ -1010,7 +1011,7 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
     CXXFLAGS="$CXXFLAGS $X_CFLAGS"
     LDFLAGS="$X_LIBS $LDFLAGS"
     DSOFLAGS="$X_LIBS $DSOFLAGS"
-    AC_DEFINE([USE_X11])
+    AC_DEFINE([FLTK_USE_X11])
     BUILD="X11"
     AS_IF([test "x$x_includes" != x], [
         ac_cpp="$ac_cpp -I$x_includes"
@@ -1615,7 +1616,7 @@ AC_SUBST([BINARY_DIR])
 
 dnl Write all of the files...
 AC_CONFIG_HEADERS([config.h:configh.in])
-AC_CONFIG_HEADERS([FL/abi-version.h:abi-version.in])
+AC_CONFIG_HEADERS([FL/fl_config.h:fl_config.in])
 AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
 AC_OUTPUT
 
diff --git fl_config.cmake.in fl_config.cmake.in
new file mode 100644
index 0000000..3e321e9
--- /dev/null
+++ fl_config.cmake.in
@@ -0,0 +1,53 @@
+/*
+ * Build configuration file for the Fast Light Tool Kit (FLTK).
+ *
+ * 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
+ * file is missing or damaged, see the license at:
+ *
+ *     https://www.fltk.org/COPYING.php
+ *
+ * Please see the following page on how to report bugs and issues:
+ *
+ *     https://www.fltk.org/bugs.php
+ */
+
+
+/*
+ * FL_ABI_VERSION (ABI version):
+ *
+ * define FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)
+*/
+
+#cmakedefine FL_ABI_VERSION @FL_ABI_VERSION@
+
+
+/*
+ * FLTK_HAVE_CAIRO
+ *
+ * Do we have the Cairo library available?
+*/
+
+#cmakedefine FLTK_HAVE_CAIRO 1
+
+
+/*
+ * FLTK_HAVE_CAIROEXT
+ *
+ * Do we have the Cairo library available and want extended Cairo use in FLTK ?
+ * This implies to link cairo.lib in all FLTK based apps.
+*/
+
+#cmakedefine FLTK_HAVE_CAIROEXT 1
+
+
+/*
+ * FLTK_USE_X11
+ *
+ * Do we use X11 for the current platform?
+ *
+ */
+
+#cmakedefine FLTK_USE_X11 1
diff --git fl_config.in fl_config.in
new file mode 100644
index 0000000..5a25901
--- /dev/null
+++ fl_config.in
@@ -0,0 +1,53 @@
+/*
+ * Build configuration file for the Fast Light Tool Kit (FLTK).
+ *
+ * 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
+ * file is missing or damaged, see the license at:
+ *
+ *     https://www.fltk.org/COPYING.php
+ *
+ * Please see the following page on how to report bugs and issues:
+ *
+ *     https://www.fltk.org/bugs.php
+ */
+
+
+/*
+ * FL_ABI_VERSION (ABI version)
+ *
+ * define FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)
+*/
+
+#undef FL_ABI_VERSION
+
+
+/*
+ * FLTK_HAVE_CAIRO
+ *
+ * Do we have the Cairo library available?
+*/
+
+#undef FLTK_HAVE_CAIRO
+
+
+/*
+ * FLTK_HAVE_CAIROEXT
+ *
+ * Do we have the Cairo library available and want extended Cairo use in FLTK ?
+ * This implies to link cairo.lib in all FLTK based apps.
+*/
+
+#undef FLTK_HAVE_CAIROEXT
+
+
+/*
+ * FLTK_USE_X11
+ *
+ * Do we use X11 for the current platform?
+ *
+ */
+
+#undef FLTK_USE_X11
diff --git fluid/CMakeLists.txt fluid/CMakeLists.txt
index ed1cf94..4dc71ac 100644
--- fluid/CMakeLists.txt
+++ 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 fluid/makedepend fluid/makedepend
index cce556b..6341f5f 100644
--- fluid/makedepend
+++ 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
diff --git src/CMakeLists.txt src/CMakeLists.txt
index e0bd1d7..6a6178b 100644
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -172,13 +172,13 @@ file (GLOB
 
 # add generated header files in build directory
 list (APPEND HEADER_FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/../FL/abi-version.h
+  ${CMAKE_CURRENT_BINARY_DIR}/../FL/fl_config.h
   ${CMAKE_CURRENT_BINARY_DIR}/../config.h
 )
 
 set (GL_HEADER_FILES)  # FIXME: not (yet?) defined
 
-if ((USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT)
+if ((FLTK_USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT)
   set (PSFILES
   )
 else ()
@@ -186,11 +186,11 @@ else ()
     drivers/PostScript/Fl_PostScript.cxx
     drivers/PostScript/Fl_PostScript_image.cxx
   )
-endif ((USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT)
+endif ((FLTK_USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT)
 
 set (DRIVER_FILES)
 
-if (USE_X11)
+if (FLTK_USE_X11)
 
   # X11 (including APPLE with X11)
 
@@ -362,7 +362,7 @@ else ()
     drivers/GDI/Fl_Font.H
   )
 
-endif (USE_X11)
+endif (FLTK_USE_X11)
 
 source_group("Header Files" FILES ${HEADER_FILES})
 source_group("Driver Source Files" FILES ${DRIVER_FILES})
@@ -408,13 +408,13 @@ set (GL_DRIVER_FILES
   drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
   drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx
 )
-if (USE_X11)
+if (FLTK_USE_X11)
   set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/X11/Fl_X11_Gl_Window_Driver.cxx)
 elseif (APPLE)
   set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.cxx)
 elseif (WIN32)
   set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.cxx)
-endif (USE_X11)
+endif (FLTK_USE_X11)
 
 set (GL_DRIVER_HEADER_FILES
   drivers/OpenGL/Fl_OpenGL_Display_Device.H
@@ -453,7 +453,7 @@ set (CFILES
   xutf8/case.c
 )
 
-if (USE_X11)
+if (FLTK_USE_X11)
   list (APPEND CFILES
     xutf8/keysym2Ucs.c
     scandir_posix.c
@@ -465,7 +465,7 @@ if (USE_X11)
       # xutf8/utf8Input.c  # not used
     )
   endif (NOT USE_XFT)
-endif (USE_X11)
+endif (FLTK_USE_X11)
 
 if (WIN32)
   list (APPEND CFILES
@@ -515,9 +515,9 @@ if (USE_THREADS)
   list (APPEND OPTIONAL_LIBS ${CMAKE_THREAD_LIBS_INIT})
 endif (USE_THREADS)
 
-if (USE_X11)
+if (FLTK_USE_X11)
   list (APPEND OPTIONAL_LIBS ${X11_LIBRARIES})
-endif (USE_X11)
+endif (FLTK_USE_X11)
 
 if (USE_SDL)
   list (APPEND OPTIONAL_LIBS ${SDL2_LIBRARY})
diff --git src/Fl_Window.cxx src/Fl_Window.cxx
index 721ff12..063a8b0 100644
--- src/Fl_Window.cxx
+++ src/Fl_Window.cxx
@@ -1,7 +1,7 @@
 //
 // Window widget class 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
@@ -516,7 +516,7 @@ void Fl_Window::draw()
 
   pWindowDriver->draw_end();
   if (!to_display) current_ = save_current;
-# if defined(FLTK_USE_CAIRO)
+# if defined(FLTK_HAVE_CAIROEXT)
   Fl::cairo_make_current(this); // checkout if an update is necessary
 # endif
 }
diff --git src/Fl_cocoa.mm src/Fl_cocoa.mm
index a9ebb71..f2df29a 100644
--- src/Fl_cocoa.mm
+++ src/Fl_cocoa.mm
@@ -3471,12 +3471,12 @@ void Fl_Cocoa_Window_Driver::make_current()
   }
 // this is the context with origin at top left of (sub)window
   CGContextSaveGState(gc);
-#if defined(FLTK_USE_CAIRO)
+#if defined(FLTK_HAVE_CAIROEXT)
   if (Fl::cairo_autolink_context()) Fl::cairo_make_current(pWindow); // capture gc changes automatically to update the cairo context adequately
 #endif
   fl_clip_region( 0 );
 
-#if defined(FLTK_USE_CAIRO)
+#if defined(FLTK_HAVE_CAIROEXT)
   // update the cairo_t context
   if (Fl::cairo_autolink_context()) Fl::cairo_make_current(pWindow);
 #endif
@@ -3491,7 +3491,7 @@ void Fl_Cocoa_Window_Driver::q_release_context(Fl_Cocoa_Window_Driver *x) {
   CGContextRestoreGState(gc);
   CGContextFlush(gc);
   Fl_Graphics_Driver::default_driver().gc(0);
-#if defined(FLTK_USE_CAIRO)
+#if defined(FLTK_HAVE_CAIROEXT)
   if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); // capture gc changes automatically to update the cairo context adequately
 #endif
 }
diff --git src/Makefile src/Makefile
index 3c1225b..47c0615 100644
--- src/Makefile
+++ src/Makefile
@@ -698,7 +698,7 @@ drivers/X11/Fl_X11_Screen_Driver.o: Xutf8.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: drivers/Xlib/Fl_Font.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
-drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/abi-version.h
+drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Bitmap.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Device.H
diff --git src/drivers/Android/Fl_Android_Window_Driver.cxx src/drivers/Android/Fl_Android_Window_Driver.cxx
index bf53e01..6538bf2 100644
--- src/drivers/Android/Fl_Android_Window_Driver.cxx
+++ src/drivers/Android/Fl_Android_Window_Driver.cxx
@@ -1,7 +1,7 @@
 //
-// Definition of Android window driver.
+// Definition of Android window driver for the Fast Light Tool Kit (FLTK).
 //
-// Copyright 2018-2020 by Bill Spitzak and others.
+// Copyright 2018-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
@@ -667,7 +667,7 @@ void Fl_WinAPI_Window_Driver::hide() {
     fl_release_dc(fl_window, (HDC)fl_graphics_driver->gc());
     fl_window = (HWND)-1;
     fl_graphics_driver->gc(0);
-# ifdef FLTK_USE_CAIRO
+# ifdef FLTK_HAVE_CAIROEXT
     if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0);
 # endif
   }
diff --git src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
index c935b7f..a3bf07a 100644
--- src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
+++ src/drivers/WinAPI/Fl_WinAPI_Window_Driver.cxx
@@ -1,5 +1,5 @@
 //
-// Definition of Apple Cocoa window driver.
+// Definition of Windows window driver for the Fast Light Tool Kit (FLTK).
 //
 // Copyright 1998-2021 by Bill Spitzak and others.
 //
@@ -16,8 +16,8 @@
 
 
 #include <config.h>
-#include <FL/fl_draw.H>
 #include <FL/Fl.H>
+#include <FL/fl_draw.H>
 #include <FL/Fl_Window.H>
 #include <FL/Fl_Image.H>
 #include <FL/Fl_Bitmap.H>
@@ -495,7 +495,7 @@ void Fl_WinAPI_Window_Driver::hide() {
     fl_release_dc(fl_window, (HDC)fl_graphics_driver->gc());
     fl_window = (HWND)-1;
     fl_graphics_driver->gc(0);
-# ifdef FLTK_USE_CAIRO
+# ifdef FLTK_HAVE_CAIROEXT
     if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0);
 # endif
   }
diff --git src/fl_overlay.cxx src/fl_overlay.cxx
index 860b75a..0c2d0db 100644
--- src/fl_overlay.cxx
+++ src/fl_overlay.cxx
@@ -1,7 +1,7 @@
 //
 // Overlay support 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
@@ -19,6 +19,7 @@
 // to erase the overlay before drawing anything that might intersect
 // it.
 
+#include <FL/fl_config.h>
 #include <FL/platform.H>
 #include <FL/fl_draw.H>
 
@@ -42,7 +43,7 @@ static int bgx, bgy, bgw, bgh;
 
 static void draw_current_rect() {
 #ifdef USE_XOR
-# if defined(USE_X11)
+# if defined(FLTK_USE_X11)
   GC gc = (GC)fl_graphics_driver->gc();
   XSetFunction(fl_display, gc, GXxor);
   XSetForeground(fl_display, gc, 0xffffffff);
diff --git src/makedepend src/makedepend
index c071049..2edf96f 100644
--- src/makedepend
+++ src/makedepend
@@ -1,12 +1,14 @@
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
 drivers/Cairo/Fl_Cairo_Graphics_Driver.o: ../config.h
+drivers/Cairo/Fl_Cairo_Graphics_Driver.o: ../FL/fl_config.h
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../config.h
-drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/abi-version.h
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Enumerations.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Bitmap.H
+drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Cairo.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_casts.H
+drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_config.h
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Device.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/Fl_Double_Window.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: ../FL/fl_draw.H
@@ -39,11 +41,12 @@ drivers/OpenGL/Fl_OpenGL_Display_Device.o: Fl_Gl_Window_Driver.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: Fl_Screen_Driver.H
 drivers/OpenGL/Fl_OpenGL_Display_Device.o: Fl_Window_Driver.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../config.h
-drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/abi-version.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Enumerations.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Fl.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Fl_Bitmap.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Fl_Cairo.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/fl_casts.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/fl_config.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Fl_Device.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/fl_draw.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/Fl_Export.H
@@ -62,11 +65,12 @@ drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/gl.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: ../FL/platform_types.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_arci.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../config.h
-drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/abi-version.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/Enumerations.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/Fl.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/Fl_Bitmap.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/Fl_Cairo.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/fl_casts.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/fl_config.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/Fl_Device.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/fl_draw.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/Fl_Export.H
@@ -85,11 +89,12 @@ drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/gl.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: ../FL/platform_types.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_color.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../config.h
-drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/abi-version.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/Enumerations.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/Fl.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/Fl_Bitmap.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/Fl_Cairo.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/fl_casts.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/fl_config.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/Fl_Device.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/fl_draw.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/Fl_Export.H
@@ -108,11 +113,12 @@ drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/gl.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: ../FL/platform_types.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_font.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../config.h
-drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/abi-version.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/Enumerations.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/Fl.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/Fl_Bitmap.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/Fl_Cairo.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/fl_casts.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/fl_config.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/Fl_Device.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/fl_draw.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/Fl_Export.H
@@ -131,11 +137,12 @@ drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/gl.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: ../FL/platform_types.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_line_style.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../config.h
-drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/abi-version.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/Enumerations.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/Fl.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/Fl_Bitmap.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/Fl_Cairo.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/fl_casts.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/fl_config.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/Fl_Device.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/Fl_Export.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/Fl_Gl_Window.H
@@ -152,10 +159,10 @@ drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/Fl_Window.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/gl.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: ../FL/platform_types.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
-drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/abi-version.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/Enumerations.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/Fl.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/Fl_Bitmap.H
+drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/fl_config.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/Fl_Device.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/fl_draw.H
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/Fl_Export.H
@@ -172,7 +179,6 @@ drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/math.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: ../FL/platform_types.h
 drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.o: drivers/OpenGL/Fl_OpenGL_Graphics_Driver.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../config.h
-drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/abi-version.h
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Enumerations.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/filename.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl.H
@@ -181,9 +187,11 @@ drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_attr.h
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Bitmap.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Box.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Button.H
+drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Cairo.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_casts.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Check_Button.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Choice.H
+drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_config.h
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Device.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/Fl_Double_Window.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: ../FL/fl_draw.H
@@ -223,11 +231,12 @@ drivers/Posix/Fl_Posix_Printer_Driver.o: drivers/X11/Fl_X11_System_Driver.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: Fl_System_Driver.H
 drivers/Posix/Fl_Posix_Printer_Driver.o: print_panel.h
 drivers/Posix/Fl_Posix_System_Driver.o: ../config.h
-drivers/Posix/Fl_Posix_System_Driver.o: ../FL/abi-version.h
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Enumerations.H
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/filename.H
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl.H
+drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_Cairo.H
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/fl_casts.H
+drivers/Posix/Fl_Posix_System_Driver.o: ../FL/fl_config.h
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_Export.H
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_File_Icon.H
 drivers/Posix/Fl_Posix_System_Driver.o: ../FL/Fl_Preferences.H
@@ -239,7 +248,6 @@ drivers/Posix/Fl_Posix_System_Driver.o: drivers/Posix/Fl_Posix_System_Driver.H
 drivers/Posix/Fl_Posix_System_Driver.o: flstring.h
 drivers/Posix/Fl_Posix_System_Driver.o: Fl_System_Driver.H
 drivers/PostScript/Fl_PostScript.o: ../config.h
-drivers/PostScript/Fl_PostScript.o: ../FL/abi-version.h
 drivers/PostScript/Fl_PostScript.o: ../FL/Enumerations.H
 drivers/PostScript/Fl_PostScript.o: ../FL/filename.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl.H
@@ -249,9 +257,11 @@ drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Bitmap.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Box.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Browser.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Button.H
+drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Cairo.H
 drivers/PostScript/Fl_PostScript.o: ../FL/fl_casts.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Check_Button.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Choice.H
+drivers/PostScript/Fl_PostScript.o: ../FL/fl_config.h
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Device.H
 drivers/PostScript/Fl_PostScript.o: ../FL/Fl_Double_Window.H
 drivers/PostScript/Fl_PostScript.o: ../FL/fl_draw.H
@@ -287,11 +297,12 @@ drivers/PostScript/Fl_PostScript.o: ../FL/platform_types.h
 drivers/PostScript/Fl_PostScript.o: drivers/PostScript/Fl_PostScript_Graphics_Driver.H
 drivers/PostScript/Fl_PostScript.o: Fl_System_Driver.H
 drivers/PostScript/Fl_PostScript_image.o: ../config.h
-drivers/PostScript/Fl_PostScript_image.o: ../FL/abi-version.h
 drivers/PostScript/Fl_PostScript_image.o: ../FL/Enumerations.H
 drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl.H
 drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_Bitmap.H
+drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_Cairo.H
 drivers/PostScript/Fl_PostScript_image.o: ../FL/fl_casts.H
+drivers/PostScript/Fl_PostScript_image.o: ../FL/fl_config.h
 drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_Device.H
 drivers/PostScript/Fl_PostScript_image.o: ../FL/fl_draw.H
 drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_Export.H
@@ -310,11 +321,12 @@ drivers/PostScript/Fl_PostScript_image.o: ../FL/Fl_Window.H
 drivers/PostScript/Fl_PostScript_image.o: ../FL/platform_types.h
 drivers/PostScript/Fl_PostScript_image.o: drivers/PostScript/Fl_PostScript_Graphics_Driver.H
 drivers/SVG/Fl_SVG_File_Surface.o: ../config.h
-drivers/SVG/Fl_SVG_File_Surface.o: ../FL/abi-version.h
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Enumerations.H
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl.H
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Bitmap.H
+drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Cairo.H
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/fl_casts.H
+drivers/SVG/Fl_SVG_File_Surface.o: ../FL/fl_config.h
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Device.H
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/fl_draw.H
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Export.H
@@ -335,11 +347,12 @@ drivers/SVG/Fl_SVG_File_Surface.o: ../FL/Fl_Window.H
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/math.h
 drivers/SVG/Fl_SVG_File_Surface.o: ../FL/platform_types.h
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../config.h
-drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/abi-version.h
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Enumerations.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Bitmap.H
+drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Cairo.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/fl_casts.H
+drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/fl_config.h
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Device.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/Fl_Double_Window.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: ../FL/fl_draw.H
@@ -373,7 +386,6 @@ drivers/X11/Fl_X11_Gl_Window_Driver.o: Fl_Gl_Window_Driver.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: Fl_Screen_Driver.H
 drivers/X11/Fl_X11_Gl_Window_Driver.o: Fl_Window_Driver.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../config.h
-drivers/X11/Fl_X11_Screen_Driver.o: ../FL/abi-version.h
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Enumerations.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/filename.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl.H
@@ -381,7 +393,9 @@ drivers/X11/Fl_X11_Screen_Driver.o: ../FL/fl_ask.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/fl_attr.h
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Bitmap.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Box.H
+drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Cairo.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/fl_casts.H
+drivers/X11/Fl_X11_Screen_Driver.o: ../FL/fl_config.h
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Device.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/Fl_Double_Window.H
 drivers/X11/Fl_X11_Screen_Driver.o: ../FL/fl_draw.H
@@ -422,12 +436,13 @@ drivers/X11/Fl_X11_Screen_Driver.o: Fl_Screen_Driver.H
 drivers/X11/Fl_X11_Screen_Driver.o: Fl_System_Driver.H
 drivers/X11/Fl_X11_Screen_Driver.o: Fl_Window_Driver.H
 drivers/X11/Fl_X11_System_Driver.o: ../config.h
-drivers/X11/Fl_X11_System_Driver.o: ../FL/abi-version.h
 drivers/X11/Fl_X11_System_Driver.o: ../FL/Enumerations.H
 drivers/X11/Fl_X11_System_Driver.o: ../FL/filename.H
 drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl.H
 drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_Browser.H
+drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_Cairo.H
 drivers/X11/Fl_X11_System_Driver.o: ../FL/fl_casts.H
+drivers/X11/Fl_X11_System_Driver.o: ../FL/fl_config.h
 drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_Export.H
 drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_File_Browser.H
 drivers/X11/Fl_X11_System_Driver.o: ../FL/Fl_File_Icon.H
@@ -442,13 +457,14 @@ drivers/X11/Fl_X11_System_Driver.o: drivers/X11/Fl_X11_System_Driver.H
 drivers/X11/Fl_X11_System_Driver.o: flstring.h
 drivers/X11/Fl_X11_System_Driver.o: Fl_System_Driver.H
 drivers/X11/Fl_X11_Window_Driver.o: ../config.h
-drivers/X11/Fl_X11_Window_Driver.o: ../FL/abi-version.h
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Enumerations.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_ask.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_attr.h
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Bitmap.H
+drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Cairo.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_casts.H
+drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_config.h
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Device.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/Fl_Double_Window.H
 drivers/X11/Fl_X11_Window_Driver.o: ../FL/fl_draw.H
@@ -484,11 +500,12 @@ drivers/X11/Fl_X11_Window_Driver.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/X11/Fl_X11_Window_Driver.o: Fl_Screen_Driver.H
 drivers/X11/Fl_X11_Window_Driver.o: Fl_Window_Driver.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../config.h
-drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Cairo.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/fl_casts.H
+drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Copy_Surface.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: ../FL/fl_draw.H
@@ -518,10 +535,10 @@ drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: drivers/X11/Fl_X11_Screen_Driver.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Copy_Surface_Driver.o: Fl_Screen_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../config.h
-drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/fl_draw.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/Fl_Export.H
@@ -538,10 +555,10 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver.o: ../FL/platform_types.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver.o: drivers/Xlib/Fl_Font.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../config.h
-drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/fl_draw.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/Fl_Export.H
@@ -557,11 +574,12 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/platform.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: ../FL/platform_types.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_arci.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../config.h
-drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_Cairo.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/fl_casts.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/fl_draw.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/Fl_Export.H
@@ -579,11 +597,12 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: ../FL/platform_types.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_color.o: Fl_XColor.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../config.h
-drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Cairo.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/fl_casts.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/fl_draw.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: ../FL/Fl_Export.H
@@ -603,11 +622,12 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: drivers/Xlib/Fl_Font.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_font_xft.o: flstring.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../config.h
-drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Cairo.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_casts.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/Fl_Double_Window.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: ../FL/fl_draw.H
@@ -644,11 +664,12 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: Fl_Screen_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: Fl_Window_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_image.o: Fl_XColor.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../config.h
-drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Cairo.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_casts.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/fl_draw.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/Fl_Export.H
@@ -666,11 +687,12 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: ../FL/platform_types.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_line_style.o: flstring.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../config.h
-drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Fl_Cairo.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/fl_casts.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/fl_draw.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/Fl_Export.H
@@ -687,10 +709,10 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/platform.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: ../FL/platform_types.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_rect.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../config.h
-drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/fl_draw.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/Fl_Export.H
@@ -707,11 +729,12 @@ drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/platform.H
 drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: ../FL/platform_types.h
 drivers/Xlib/Fl_Xlib_Graphics_Driver_vertex.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../config.h
-drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/abi-version.h
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Enumerations.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Bitmap.H
+drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Cairo.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/fl_casts.H
+drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/fl_config.h
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Device.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/fl_draw.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/Fl_Export.H
@@ -741,11 +764,12 @@ drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: ../FL/platform_types.h
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H
 drivers/Xlib/Fl_Xlib_Image_Surface_Driver.o: Fl_Screen_Driver.H
 filename_absolute.o: ../config.h
-filename_absolute.o: ../FL/abi-version.h
 filename_absolute.o: ../FL/Enumerations.H
 filename_absolute.o: ../FL/filename.H
 filename_absolute.o: ../FL/Fl.H
+filename_absolute.o: ../FL/Fl_Cairo.H
 filename_absolute.o: ../FL/fl_casts.H
+filename_absolute.o: ../FL/fl_config.h
 filename_absolute.o: ../FL/Fl_Export.H
 filename_absolute.o: ../FL/Fl_Preferences.H
 filename_absolute.o: ../FL/fl_string.h
@@ -754,22 +778,24 @@ filename_absolute.o: ../FL/fl_utf8.h
 filename_absolute.o: ../FL/platform_types.h
 filename_absolute.o: flstring.h
 filename_absolute.o: Fl_System_Driver.H
-filename_expand.o: ../FL/abi-version.h
 filename_expand.o: ../FL/Enumerations.H
 filename_expand.o: ../FL/filename.H
 filename_expand.o: ../FL/Fl.H
+filename_expand.o: ../FL/Fl_Cairo.H
 filename_expand.o: ../FL/fl_casts.H
+filename_expand.o: ../FL/fl_config.h
 filename_expand.o: ../FL/Fl_Export.H
 filename_expand.o: ../FL/Fl_Preferences.H
 filename_expand.o: ../FL/fl_types.h
 filename_expand.o: ../FL/fl_utf8.h
 filename_expand.o: ../FL/platform_types.h
 filename_expand.o: Fl_System_Driver.H
-filename_ext.o: ../FL/abi-version.h
 filename_ext.o: ../FL/Enumerations.H
 filename_ext.o: ../FL/filename.H
 filename_ext.o: ../FL/Fl.H
+filename_ext.o: ../FL/Fl_Cairo.H
 filename_ext.o: ../FL/fl_casts.H
+filename_ext.o: ../FL/fl_config.h
 filename_ext.o: ../FL/Fl_Export.H
 filename_ext.o: ../FL/Fl_Preferences.H
 filename_ext.o: ../FL/fl_types.h
@@ -777,11 +803,12 @@ filename_ext.o: ../FL/fl_utf8.h
 filename_ext.o: ../FL/platform_types.h
 filename_ext.o: Fl_System_Driver.H
 filename_isdir.o: ../config.h
-filename_isdir.o: ../FL/abi-version.h
 filename_isdir.o: ../FL/Enumerations.H
 filename_isdir.o: ../FL/filename.H
 filename_isdir.o: ../FL/Fl.H
+filename_isdir.o: ../FL/Fl_Cairo.H
 filename_isdir.o: ../FL/fl_casts.H
+filename_isdir.o: ../FL/fl_config.h
 filename_isdir.o: ../FL/Fl_Export.H
 filename_isdir.o: ../FL/Fl_Preferences.H
 filename_isdir.o: ../FL/fl_types.h
@@ -790,11 +817,12 @@ filename_isdir.o: ../FL/platform_types.h
 filename_isdir.o: flstring.h
 filename_isdir.o: Fl_System_Driver.H
 filename_list.o: ../config.h
-filename_list.o: ../FL/abi-version.h
 filename_list.o: ../FL/Enumerations.H
 filename_list.o: ../FL/filename.H
 filename_list.o: ../FL/Fl.H
+filename_list.o: ../FL/Fl_Cairo.H
 filename_list.o: ../FL/fl_casts.H
+filename_list.o: ../FL/fl_config.h
 filename_list.o: ../FL/Fl_Export.H
 filename_list.o: ../FL/Fl_Preferences.H
 filename_list.o: ../FL/fl_types.h
@@ -807,16 +835,18 @@ filename_match.o: ../FL/Fl_Export.H
 filename_match.o: ../FL/platform_types.h
 filename_setext.o: ../config.h
 filename_setext.o: ../FL/filename.H
+filename_setext.o: ../FL/fl_config.h
 filename_setext.o: ../FL/Fl_Export.H
 filename_setext.o: ../FL/platform_types.h
 filename_setext.o: flstring.h
 Fl.o: ../config.h
-Fl.o: ../FL/abi-version.h
 Fl.o: ../FL/Enumerations.H
 Fl.o: ../FL/filename.H
 Fl.o: ../FL/Fl.H
 Fl.o: ../FL/Fl_Bitmap.H
+Fl.o: ../FL/Fl_Cairo.H
 Fl.o: ../FL/fl_casts.H
+Fl.o: ../FL/fl_config.h
 Fl.o: ../FL/Fl_Device.H
 Fl.o: ../FL/Fl_Double_Window.H
 Fl.o: ../FL/fl_draw.H
@@ -848,33 +878,37 @@ Fl.o: Fl_Screen_Driver.H
 Fl.o: Fl_System_Driver.H
 Fl.o: Fl_Window_Driver.H
 flstring.o: ../config.h
+flstring.o: ../FL/fl_config.h
 flstring.o: ../FL/Fl_Export.H
 flstring.o: flstring.h
-Fl_abort.o: ../FL/abi-version.h
 Fl_abort.o: ../FL/Enumerations.H
 Fl_abort.o: ../FL/filename.H
 Fl_abort.o: ../FL/Fl.H
+Fl_abort.o: ../FL/Fl_Cairo.H
 Fl_abort.o: ../FL/fl_casts.H
+Fl_abort.o: ../FL/fl_config.h
 Fl_abort.o: ../FL/Fl_Export.H
 Fl_abort.o: ../FL/Fl_Preferences.H
 Fl_abort.o: ../FL/fl_types.h
 Fl_abort.o: ../FL/fl_utf8.h
 Fl_abort.o: ../FL/platform_types.h
 Fl_abort.o: Fl_System_Driver.H
-Fl_add_idle.o: ../FL/abi-version.h
 Fl_add_idle.o: ../FL/Enumerations.H
 Fl_add_idle.o: ../FL/Fl.H
+Fl_add_idle.o: ../FL/Fl_Cairo.H
 Fl_add_idle.o: ../FL/fl_casts.H
+Fl_add_idle.o: ../FL/fl_config.h
 Fl_add_idle.o: ../FL/Fl_Export.H
 Fl_add_idle.o: ../FL/fl_types.h
 Fl_add_idle.o: ../FL/fl_utf8.h
 Fl_add_idle.o: ../FL/platform_types.h
-Fl_Adjuster.o: ../FL/abi-version.h
 Fl_Adjuster.o: ../FL/Enumerations.H
 Fl_Adjuster.o: ../FL/Fl.H
 Fl_Adjuster.o: ../FL/Fl_Adjuster.H
 Fl_Adjuster.o: ../FL/Fl_Bitmap.H
+Fl_Adjuster.o: ../FL/Fl_Cairo.H
 Fl_Adjuster.o: ../FL/fl_casts.H
+Fl_Adjuster.o: ../FL/fl_config.h
 Fl_Adjuster.o: ../FL/fl_draw.H
 Fl_Adjuster.o: ../FL/Fl_Export.H
 Fl_Adjuster.o: ../FL/Fl_Image.H
@@ -889,12 +923,13 @@ Fl_Adjuster.o: slowarrow.h
 fl_arc.o: ../FL/fl_draw.H
 fl_arc.o: ../FL/math.h
 Fl_arg.o: ../config.h
-Fl_arg.o: ../FL/abi-version.h
 Fl_arg.o: ../FL/Enumerations.H
 Fl_arg.o: ../FL/filename.H
 Fl_arg.o: ../FL/Fl.H
 Fl_arg.o: ../FL/Fl_Bitmap.H
+Fl_arg.o: ../FL/Fl_Cairo.H
 Fl_arg.o: ../FL/fl_casts.H
+Fl_arg.o: ../FL/fl_config.h
 Fl_arg.o: ../FL/Fl_Double_Window.H
 Fl_arg.o: ../FL/fl_draw.H
 Fl_arg.o: ../FL/Fl_Export.H
@@ -912,14 +947,15 @@ Fl_arg.o: flstring.h
 Fl_arg.o: Fl_System_Driver.H
 Fl_arg.o: Fl_Window_Driver.H
 fl_ask.o: ../config.h
-fl_ask.o: ../FL/abi-version.h
 fl_ask.o: ../FL/Enumerations.H
 fl_ask.o: ../FL/Fl.H
 fl_ask.o: ../FL/fl_ask.H
 fl_ask.o: ../FL/fl_attr.h
 fl_ask.o: ../FL/Fl_Bitmap.H
 fl_ask.o: ../FL/Fl_Box.H
+fl_ask.o: ../FL/Fl_Cairo.H
 fl_ask.o: ../FL/fl_casts.H
+fl_ask.o: ../FL/fl_config.h
 fl_ask.o: ../FL/Fl_Device.H
 fl_ask.o: ../FL/fl_draw.H
 fl_ask.o: ../FL/Fl_Export.H
@@ -947,11 +983,12 @@ fl_ask.o: ../FL/platform_types.h
 fl_ask.o: flstring.h
 fl_ask.o: Fl_Message.h
 fl_ask.o: Fl_Screen_Driver.H
-Fl_Bitmap.o: ../FL/abi-version.h
 Fl_Bitmap.o: ../FL/Enumerations.H
 Fl_Bitmap.o: ../FL/Fl.H
 Fl_Bitmap.o: ../FL/Fl_Bitmap.H
+Fl_Bitmap.o: ../FL/Fl_Cairo.H
 Fl_Bitmap.o: ../FL/fl_casts.H
+Fl_Bitmap.o: ../FL/fl_config.h
 Fl_Bitmap.o: ../FL/fl_draw.H
 Fl_Bitmap.o: ../FL/Fl_Export.H
 Fl_Bitmap.o: ../FL/Fl_Image.H
@@ -960,30 +997,32 @@ Fl_Bitmap.o: ../FL/fl_types.h
 Fl_Bitmap.o: ../FL/fl_utf8.h
 Fl_Bitmap.o: ../FL/Fl_Widget.H
 Fl_Bitmap.o: ../FL/platform_types.h
-Fl_BMP_Image.o: ../FL/abi-version.h
 Fl_BMP_Image.o: ../FL/Enumerations.H
 Fl_BMP_Image.o: ../FL/Fl.H
 Fl_BMP_Image.o: ../FL/Fl_BMP_Image.H
+Fl_BMP_Image.o: ../FL/Fl_Cairo.H
 Fl_BMP_Image.o: ../FL/fl_casts.H
+Fl_BMP_Image.o: ../FL/fl_config.h
 Fl_BMP_Image.o: ../FL/Fl_Export.H
 Fl_BMP_Image.o: ../FL/Fl_Image.H
 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/abi-version.h
 Fl_Box.o: ../FL/Enumerations.H
 Fl_Box.o: ../FL/Fl.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/abi-version.h
 fl_boxtype.o: ../FL/Enumerations.H
 fl_boxtype.o: ../FL/Fl.H
+fl_boxtype.o: ../FL/Fl_Cairo.H
 fl_boxtype.o: ../FL/fl_casts.H
+fl_boxtype.o: ../FL/fl_config.h
 fl_boxtype.o: ../FL/fl_draw.H
 fl_boxtype.o: ../FL/Fl_Export.H
 fl_boxtype.o: ../FL/fl_types.h
@@ -991,12 +1030,13 @@ fl_boxtype.o: ../FL/fl_utf8.h
 fl_boxtype.o: ../FL/Fl_Widget.H
 fl_boxtype.o: ../FL/platform_types.h
 Fl_Browser.o: ../config.h
-Fl_Browser.o: ../FL/abi-version.h
 Fl_Browser.o: ../FL/Enumerations.H
 Fl_Browser.o: ../FL/Fl.H
 Fl_Browser.o: ../FL/Fl_Browser.H
 Fl_Browser.o: ../FL/Fl_Browser_.H
+Fl_Browser.o: ../FL/Fl_Cairo.H
 Fl_Browser.o: ../FL/fl_casts.H
+Fl_Browser.o: ../FL/fl_config.h
 Fl_Browser.o: ../FL/fl_draw.H
 Fl_Browser.o: ../FL/Fl_Export.H
 Fl_Browser.o: ../FL/Fl_Group.H
@@ -1012,11 +1052,12 @@ Fl_Browser.o: ../FL/Fl_Valuator.H
 Fl_Browser.o: ../FL/Fl_Widget.H
 Fl_Browser.o: ../FL/platform_types.h
 Fl_Browser.o: flstring.h
-Fl_Browser_.o: ../FL/abi-version.h
 Fl_Browser_.o: ../FL/Enumerations.H
 Fl_Browser_.o: ../FL/Fl.H
 Fl_Browser_.o: ../FL/Fl_Browser_.H
+Fl_Browser_.o: ../FL/Fl_Cairo.H
 Fl_Browser_.o: ../FL/fl_casts.H
+Fl_Browser_.o: ../FL/fl_config.h
 Fl_Browser_.o: ../FL/fl_draw.H
 Fl_Browser_.o: ../FL/Fl_Export.H
 Fl_Browser_.o: ../FL/Fl_Group.H
@@ -1027,12 +1068,13 @@ Fl_Browser_.o: ../FL/fl_utf8.h
 Fl_Browser_.o: ../FL/Fl_Valuator.H
 Fl_Browser_.o: ../FL/Fl_Widget.H
 Fl_Browser_.o: ../FL/platform_types.h
-Fl_Browser_load.o: ../FL/abi-version.h
 Fl_Browser_load.o: ../FL/Enumerations.H
 Fl_Browser_load.o: ../FL/Fl.H
 Fl_Browser_load.o: ../FL/Fl_Browser.H
 Fl_Browser_load.o: ../FL/Fl_Browser_.H
+Fl_Browser_load.o: ../FL/Fl_Cairo.H
 Fl_Browser_load.o: ../FL/fl_casts.H
+Fl_Browser_load.o: ../FL/fl_config.h
 Fl_Browser_load.o: ../FL/Fl_Export.H
 Fl_Browser_load.o: ../FL/Fl_Group.H
 Fl_Browser_load.o: ../FL/Fl_Image.H
@@ -1043,12 +1085,13 @@ Fl_Browser_load.o: ../FL/fl_utf8.h
 Fl_Browser_load.o: ../FL/Fl_Valuator.H
 Fl_Browser_load.o: ../FL/Fl_Widget.H
 Fl_Browser_load.o: ../FL/platform_types.h
-Fl_Button.o: ../FL/abi-version.h
 Fl_Button.o: ../FL/Enumerations.H
 Fl_Button.o: ../FL/Fl.H
 Fl_Button.o: ../FL/Fl_Bitmap.H
 Fl_Button.o: ../FL/Fl_Button.H
+Fl_Button.o: ../FL/Fl_Cairo.H
 Fl_Button.o: ../FL/fl_casts.H
+Fl_Button.o: ../FL/fl_config.h
 Fl_Button.o: ../FL/Fl_Export.H
 Fl_Button.o: ../FL/Fl_Group.H
 Fl_Button.o: ../FL/Fl_Image.H
@@ -1060,11 +1103,12 @@ Fl_Button.o: ../FL/Fl_Widget.H
 Fl_Button.o: ../FL/Fl_Window.H
 Fl_Button.o: ../FL/platform_types.h
 Fl_Chart.o: ../config.h
-Fl_Chart.o: ../FL/abi-version.h
 Fl_Chart.o: ../FL/Enumerations.H
 Fl_Chart.o: ../FL/Fl.H
+Fl_Chart.o: ../FL/Fl_Cairo.H
 Fl_Chart.o: ../FL/fl_casts.H
 Fl_Chart.o: ../FL/Fl_Chart.H
+Fl_Chart.o: ../FL/fl_config.h
 Fl_Chart.o: ../FL/fl_draw.H
 Fl_Chart.o: ../FL/Fl_Export.H
 Fl_Chart.o: ../FL/fl_types.h
@@ -1074,12 +1118,13 @@ Fl_Chart.o: ../FL/math.h
 Fl_Chart.o: ../FL/platform_types.h
 Fl_Chart.o: flstring.h
 Fl_Check_Browser.o: ../config.h
-Fl_Check_Browser.o: ../FL/abi-version.h
 Fl_Check_Browser.o: ../FL/Enumerations.H
 Fl_Check_Browser.o: ../FL/Fl.H
 Fl_Check_Browser.o: ../FL/Fl_Browser_.H
+Fl_Check_Browser.o: ../FL/Fl_Cairo.H
 Fl_Check_Browser.o: ../FL/fl_casts.H
 Fl_Check_Browser.o: ../FL/Fl_Check_Browser.H
+Fl_Check_Browser.o: ../FL/fl_config.h
 Fl_Check_Browser.o: ../FL/fl_draw.H
 Fl_Check_Browser.o: ../FL/Fl_Export.H
 Fl_Check_Browser.o: ../FL/Fl_Group.H
@@ -1092,23 +1137,25 @@ Fl_Check_Browser.o: ../FL/Fl_Valuator.H
 Fl_Check_Browser.o: ../FL/Fl_Widget.H
 Fl_Check_Browser.o: ../FL/platform_types.h
 Fl_Check_Browser.o: flstring.h
-Fl_Check_Button.o: ../FL/abi-version.h
 Fl_Check_Button.o: ../FL/Enumerations.H
 Fl_Check_Button.o: ../FL/Fl.H
 Fl_Check_Button.o: ../FL/Fl_Button.H
+Fl_Check_Button.o: ../FL/Fl_Cairo.H
 Fl_Check_Button.o: ../FL/fl_casts.H
 Fl_Check_Button.o: ../FL/Fl_Check_Button.H
+Fl_Check_Button.o: ../FL/fl_config.h
 Fl_Check_Button.o: ../FL/Fl_Export.H
 Fl_Check_Button.o: ../FL/Fl_Light_Button.H
 Fl_Check_Button.o: ../FL/fl_types.h
 Fl_Check_Button.o: ../FL/fl_utf8.h
 Fl_Check_Button.o: ../FL/platform_types.h
 Fl_Choice.o: ../config.h
-Fl_Choice.o: ../FL/abi-version.h
 Fl_Choice.o: ../FL/Enumerations.H
 Fl_Choice.o: ../FL/Fl.H
+Fl_Choice.o: ../FL/Fl_Cairo.H
 Fl_Choice.o: ../FL/fl_casts.H
 Fl_Choice.o: ../FL/Fl_Choice.H
+Fl_Choice.o: ../FL/fl_config.h
 Fl_Choice.o: ../FL/fl_draw.H
 Fl_Choice.o: ../FL/Fl_Export.H
 Fl_Choice.o: ../FL/Fl_Image.H
@@ -1119,12 +1166,13 @@ Fl_Choice.o: ../FL/fl_utf8.h
 Fl_Choice.o: ../FL/Fl_Widget.H
 Fl_Choice.o: ../FL/platform_types.h
 Fl_Choice.o: flstring.h
-Fl_Clock.o: ../FL/abi-version.h
 Fl_Clock.o: ../FL/Enumerations.H
 Fl_Clock.o: ../FL/filename.H
 Fl_Clock.o: ../FL/Fl.H
+Fl_Clock.o: ../FL/Fl_Cairo.H
 Fl_Clock.o: ../FL/fl_casts.H
 Fl_Clock.o: ../FL/Fl_Clock.H
+Fl_Clock.o: ../FL/fl_config.h
 Fl_Clock.o: ../FL/fl_draw.H
 Fl_Clock.o: ../FL/Fl_Export.H
 Fl_Clock.o: ../FL/Fl_Preferences.H
@@ -1134,11 +1182,12 @@ Fl_Clock.o: ../FL/fl_utf8.h
 Fl_Clock.o: ../FL/Fl_Widget.H
 Fl_Clock.o: ../FL/platform_types.h
 Fl_Clock.o: Fl_System_Driver.H
-fl_color.o: ../FL/abi-version.h
 fl_color.o: ../FL/Enumerations.H
 fl_color.o: ../FL/Fl.H
 fl_color.o: ../FL/Fl_Bitmap.H
+fl_color.o: ../FL/Fl_Cairo.H
 fl_color.o: ../FL/fl_casts.H
+fl_color.o: ../FL/fl_config.h
 fl_color.o: ../FL/Fl_Device.H
 fl_color.o: ../FL/Fl_Export.H
 fl_color.o: ../FL/Fl_Graphics_Driver.H
@@ -1152,15 +1201,16 @@ fl_color.o: ../FL/fl_utf8.h
 fl_color.o: ../FL/Fl_Widget.H
 fl_color.o: ../FL/platform_types.h
 fl_color.o: fl_cmap.h
-Fl_Color_Chooser.o: ../FL/abi-version.h
 Fl_Color_Chooser.o: ../FL/Enumerations.H
 Fl_Color_Chooser.o: ../FL/Fl.H
 Fl_Color_Chooser.o: ../FL/Fl_Bitmap.H
 Fl_Color_Chooser.o: ../FL/Fl_Box.H
 Fl_Color_Chooser.o: ../FL/Fl_Button.H
+Fl_Color_Chooser.o: ../FL/Fl_Cairo.H
 Fl_Color_Chooser.o: ../FL/fl_casts.H
 Fl_Color_Chooser.o: ../FL/Fl_Choice.H
 Fl_Color_Chooser.o: ../FL/Fl_Color_Chooser.H
+Fl_Color_Chooser.o: ../FL/fl_config.h
 Fl_Color_Chooser.o: ../FL/fl_draw.H
 Fl_Color_Chooser.o: ../FL/Fl_Export.H
 Fl_Color_Chooser.o: ../FL/Fl_Group.H
@@ -1178,11 +1228,12 @@ Fl_Color_Chooser.o: ../FL/Fl_Widget.H
 Fl_Color_Chooser.o: ../FL/Fl_Window.H
 Fl_Color_Chooser.o: ../FL/math.h
 Fl_Color_Chooser.o: ../FL/platform_types.h
-Fl_compose.o: ../FL/abi-version.h
 Fl_compose.o: ../FL/Enumerations.H
 Fl_compose.o: ../FL/Fl.H
 Fl_compose.o: ../FL/Fl_Bitmap.H
+Fl_compose.o: ../FL/Fl_Cairo.H
 Fl_compose.o: ../FL/fl_casts.H
+Fl_compose.o: ../FL/fl_config.h
 Fl_compose.o: ../FL/Fl_Device.H
 Fl_compose.o: ../FL/fl_draw.H
 Fl_compose.o: ../FL/Fl_Export.H
@@ -1205,11 +1256,12 @@ Fl_compose.o: ../FL/Fl_Valuator.H
 Fl_compose.o: ../FL/Fl_Widget.H
 Fl_compose.o: ../FL/platform_types.h
 Fl_compose.o: Fl_Screen_Driver.H
-Fl_Copy_Surface.o: ../FL/abi-version.h
 Fl_Copy_Surface.o: ../FL/Enumerations.H
 Fl_Copy_Surface.o: ../FL/Fl.H
 Fl_Copy_Surface.o: ../FL/Fl_Bitmap.H
+Fl_Copy_Surface.o: ../FL/Fl_Cairo.H
 Fl_Copy_Surface.o: ../FL/fl_casts.H
+Fl_Copy_Surface.o: ../FL/fl_config.h
 Fl_Copy_Surface.o: ../FL/Fl_Copy_Surface.H
 Fl_Copy_Surface.o: ../FL/Fl_Device.H
 Fl_Copy_Surface.o: ../FL/Fl_Export.H
@@ -1223,10 +1275,11 @@ Fl_Copy_Surface.o: ../FL/Fl_Widget.H
 Fl_Copy_Surface.o: ../FL/Fl_Widget_Surface.H
 Fl_Copy_Surface.o: ../FL/Fl_Window.H
 Fl_Copy_Surface.o: ../FL/platform_types.h
-Fl_Counter.o: ../FL/abi-version.h
 Fl_Counter.o: ../FL/Enumerations.H
 Fl_Counter.o: ../FL/Fl.H
+Fl_Counter.o: ../FL/Fl_Cairo.H
 Fl_Counter.o: ../FL/fl_casts.H
+Fl_Counter.o: ../FL/fl_config.h
 Fl_Counter.o: ../FL/Fl_Counter.H
 Fl_Counter.o: ../FL/fl_draw.H
 Fl_Counter.o: ../FL/Fl_Export.H
@@ -1235,11 +1288,12 @@ Fl_Counter.o: ../FL/fl_types.h
 Fl_Counter.o: ../FL/fl_utf8.h
 Fl_Counter.o: ../FL/Fl_Valuator.H
 Fl_Counter.o: ../FL/platform_types.h
-fl_cursor.o: ../FL/abi-version.h
 fl_cursor.o: ../FL/Enumerations.H
 fl_cursor.o: ../FL/Fl.H
 fl_cursor.o: ../FL/Fl_Bitmap.H
+fl_cursor.o: ../FL/Fl_Cairo.H
 fl_cursor.o: ../FL/fl_casts.H
+fl_cursor.o: ../FL/fl_config.h
 fl_cursor.o: ../FL/Fl_Double_Window.H
 fl_cursor.o: ../FL/fl_draw.H
 fl_cursor.o: ../FL/Fl_Export.H
@@ -1262,11 +1316,12 @@ fl_cursor.o: fl_cursor_wait.xpm
 fl_cursor.o: Fl_Window_Driver.H
 fl_curve.o: ../FL/fl_draw.H
 Fl_Device.o: ../config.h
-Fl_Device.o: ../FL/abi-version.h
 Fl_Device.o: ../FL/Enumerations.H
 Fl_Device.o: ../FL/Fl.H
 Fl_Device.o: ../FL/Fl_Bitmap.H
+Fl_Device.o: ../FL/Fl_Cairo.H
 Fl_Device.o: ../FL/fl_casts.H
+Fl_Device.o: ../FL/fl_config.h
 Fl_Device.o: ../FL/Fl_Device.H
 Fl_Device.o: ../FL/Fl_Export.H
 Fl_Device.o: ../FL/Fl_Graphics_Driver.H
@@ -1279,10 +1334,11 @@ Fl_Device.o: ../FL/fl_types.h
 Fl_Device.o: ../FL/fl_utf8.h
 Fl_Device.o: ../FL/Fl_Widget.H
 Fl_Device.o: ../FL/platform_types.h
-Fl_Dial.o: ../FL/abi-version.h
 Fl_Dial.o: ../FL/Enumerations.H
 Fl_Dial.o: ../FL/Fl.H
+Fl_Dial.o: ../FL/Fl_Cairo.H
 Fl_Dial.o: ../FL/fl_casts.H
+Fl_Dial.o: ../FL/fl_config.h
 Fl_Dial.o: ../FL/Fl_Dial.H
 Fl_Dial.o: ../FL/fl_draw.H
 Fl_Dial.o: ../FL/Fl_Export.H
@@ -1293,20 +1349,22 @@ Fl_Dial.o: ../FL/fl_utf8.h
 Fl_Dial.o: ../FL/Fl_Valuator.H
 Fl_Dial.o: ../FL/math.h
 Fl_Dial.o: ../FL/platform_types.h
-fl_diamond_box.o: ../FL/abi-version.h
 fl_diamond_box.o: ../FL/Enumerations.H
 fl_diamond_box.o: ../FL/Fl.H
+fl_diamond_box.o: ../FL/Fl_Cairo.H
 fl_diamond_box.o: ../FL/fl_casts.H
+fl_diamond_box.o: ../FL/fl_config.h
 fl_diamond_box.o: ../FL/fl_draw.H
 fl_diamond_box.o: ../FL/Fl_Export.H
 fl_diamond_box.o: ../FL/fl_types.h
 fl_diamond_box.o: ../FL/fl_utf8.h
 fl_diamond_box.o: ../FL/platform_types.h
-Fl_display.o: ../FL/abi-version.h
 Fl_display.o: ../FL/Enumerations.H
 Fl_display.o: ../FL/Fl.H
 Fl_display.o: ../FL/Fl_Bitmap.H
+Fl_display.o: ../FL/Fl_Cairo.H
 Fl_display.o: ../FL/fl_casts.H
+Fl_display.o: ../FL/fl_config.h
 Fl_display.o: ../FL/Fl_Device.H
 Fl_display.o: ../FL/fl_draw.H
 Fl_display.o: ../FL/Fl_Export.H
@@ -1330,11 +1388,12 @@ Fl_display.o: ../FL/Fl_Widget.H
 Fl_display.o: ../FL/platform_types.h
 Fl_display.o: Fl_Screen_Driver.H
 fl_dnd_x.o: ../config.h
-fl_dnd_x.o: ../FL/abi-version.h
 fl_dnd_x.o: ../FL/Enumerations.H
 fl_dnd_x.o: ../FL/Fl.H
 fl_dnd_x.o: ../FL/Fl_Bitmap.H
+fl_dnd_x.o: ../FL/Fl_Cairo.H
 fl_dnd_x.o: ../FL/fl_casts.H
+fl_dnd_x.o: ../FL/fl_config.h
 fl_dnd_x.o: ../FL/Fl_Device.H
 fl_dnd_x.o: ../FL/Fl_Double_Window.H
 fl_dnd_x.o: ../FL/fl_draw.H
@@ -1364,11 +1423,12 @@ fl_dnd_x.o: drivers/X11/Fl_X11_Screen_Driver.H
 fl_dnd_x.o: flstring.h
 fl_dnd_x.o: Fl_Screen_Driver.H
 fl_dnd_x.o: Fl_Window_Driver.H
-Fl_Double_Window.o: ../FL/abi-version.h
 Fl_Double_Window.o: ../FL/Enumerations.H
 Fl_Double_Window.o: ../FL/Fl.H
 Fl_Double_Window.o: ../FL/Fl_Bitmap.H
+Fl_Double_Window.o: ../FL/Fl_Cairo.H
 Fl_Double_Window.o: ../FL/fl_casts.H
+Fl_Double_Window.o: ../FL/fl_config.h
 Fl_Double_Window.o: ../FL/Fl_Double_Window.H
 Fl_Double_Window.o: ../FL/fl_draw.H
 Fl_Double_Window.o: ../FL/Fl_Export.H
@@ -1383,10 +1443,11 @@ Fl_Double_Window.o: ../FL/platform.H
 Fl_Double_Window.o: ../FL/platform_types.h
 Fl_Double_Window.o: Fl_Window_Driver.H
 fl_draw.o: ../config.h
-fl_draw.o: ../FL/abi-version.h
 fl_draw.o: ../FL/Enumerations.H
 fl_draw.o: ../FL/Fl.H
+fl_draw.o: ../FL/Fl_Cairo.H
 fl_draw.o: ../FL/fl_casts.H
+fl_draw.o: ../FL/fl_config.h
 fl_draw.o: ../FL/fl_draw.H
 fl_draw.o: ../FL/Fl_Export.H
 fl_draw.o: ../FL/Fl_Image.H
@@ -1397,11 +1458,12 @@ fl_draw.o: ../FL/platform.H
 fl_draw.o: ../FL/platform_types.h
 fl_draw.o: flstring.h
 fl_draw_pixmap.o: ../config.h
-fl_draw_pixmap.o: ../FL/abi-version.h
 fl_draw_pixmap.o: ../FL/Enumerations.H
 fl_draw_pixmap.o: ../FL/filename.H
 fl_draw_pixmap.o: ../FL/Fl.H
+fl_draw_pixmap.o: ../FL/Fl_Cairo.H
 fl_draw_pixmap.o: ../FL/fl_casts.H
+fl_draw_pixmap.o: ../FL/fl_config.h
 fl_draw_pixmap.o: ../FL/fl_draw.H
 fl_draw_pixmap.o: ../FL/Fl_Export.H
 fl_draw_pixmap.o: ../FL/Fl_Preferences.H
@@ -1412,11 +1474,12 @@ fl_draw_pixmap.o: ../FL/platform_types.h
 fl_draw_pixmap.o: flstring.h
 fl_draw_pixmap.o: Fl_System_Driver.H
 fl_encoding_latin1.o: ../config.h
-fl_encoding_latin1.o: ../FL/abi-version.h
 fl_encoding_latin1.o: ../FL/Enumerations.H
 fl_encoding_latin1.o: ../FL/filename.H
 fl_encoding_latin1.o: ../FL/Fl.H
+fl_encoding_latin1.o: ../FL/Fl_Cairo.H
 fl_encoding_latin1.o: ../FL/fl_casts.H
+fl_encoding_latin1.o: ../FL/fl_config.h
 fl_encoding_latin1.o: ../FL/fl_draw.H
 fl_encoding_latin1.o: ../FL/Fl_Export.H
 fl_encoding_latin1.o: ../FL/Fl_Preferences.H
@@ -1426,11 +1489,12 @@ fl_encoding_latin1.o: ../FL/platform_types.h
 fl_encoding_latin1.o: flstring.h
 fl_encoding_latin1.o: Fl_System_Driver.H
 fl_encoding_mac_roman.o: ../config.h
-fl_encoding_mac_roman.o: ../FL/abi-version.h
 fl_encoding_mac_roman.o: ../FL/Enumerations.H
 fl_encoding_mac_roman.o: ../FL/filename.H
 fl_encoding_mac_roman.o: ../FL/Fl.H
+fl_encoding_mac_roman.o: ../FL/Fl_Cairo.H
 fl_encoding_mac_roman.o: ../FL/fl_casts.H
+fl_encoding_mac_roman.o: ../FL/fl_config.h
 fl_encoding_mac_roman.o: ../FL/fl_draw.H
 fl_encoding_mac_roman.o: ../FL/Fl_Export.H
 fl_encoding_mac_roman.o: ../FL/Fl_Preferences.H
@@ -1439,10 +1503,11 @@ fl_encoding_mac_roman.o: ../FL/fl_utf8.h
 fl_encoding_mac_roman.o: ../FL/platform_types.h
 fl_encoding_mac_roman.o: flstring.h
 fl_encoding_mac_roman.o: Fl_System_Driver.H
-fl_engraved_label.o: ../FL/abi-version.h
 fl_engraved_label.o: ../FL/Enumerations.H
 fl_engraved_label.o: ../FL/Fl.H
+fl_engraved_label.o: ../FL/Fl_Cairo.H
 fl_engraved_label.o: ../FL/fl_casts.H
+fl_engraved_label.o: ../FL/fl_config.h
 fl_engraved_label.o: ../FL/fl_draw.H
 fl_engraved_label.o: ../FL/Fl_Export.H
 fl_engraved_label.o: ../FL/fl_types.h
@@ -1450,12 +1515,13 @@ fl_engraved_label.o: ../FL/fl_utf8.h
 fl_engraved_label.o: ../FL/Fl_Widget.H
 fl_engraved_label.o: ../FL/platform_types.h
 Fl_File_Browser.o: ../config.h
-Fl_File_Browser.o: ../FL/abi-version.h
 Fl_File_Browser.o: ../FL/Enumerations.H
 Fl_File_Browser.o: ../FL/filename.H
 Fl_File_Browser.o: ../FL/Fl.H
 Fl_File_Browser.o: ../FL/Fl_Browser.H
+Fl_File_Browser.o: ../FL/Fl_Cairo.H
 Fl_File_Browser.o: ../FL/fl_casts.H
+Fl_File_Browser.o: ../FL/fl_config.h
 Fl_File_Browser.o: ../FL/fl_draw.H
 Fl_File_Browser.o: ../FL/Fl_Export.H
 Fl_File_Browser.o: ../FL/Fl_File_Browser.H
@@ -1469,7 +1535,6 @@ Fl_File_Browser.o: ../FL/Fl_Widget.H
 Fl_File_Browser.o: ../FL/platform_types.h
 Fl_File_Browser.o: flstring.h
 Fl_File_Browser.o: Fl_System_Driver.H
-Fl_File_Chooser.o: ../FL/abi-version.h
 Fl_File_Chooser.o: ../FL/Enumerations.H
 Fl_File_Chooser.o: ../FL/filename.H
 Fl_File_Chooser.o: ../FL/Fl.H
@@ -1479,9 +1544,11 @@ Fl_File_Chooser.o: ../FL/Fl_Bitmap.H
 Fl_File_Chooser.o: ../FL/Fl_Box.H
 Fl_File_Chooser.o: ../FL/Fl_Browser.H
 Fl_File_Chooser.o: ../FL/Fl_Button.H
+Fl_File_Chooser.o: ../FL/Fl_Cairo.H
 Fl_File_Chooser.o: ../FL/fl_casts.H
 Fl_File_Chooser.o: ../FL/Fl_Check_Button.H
 Fl_File_Chooser.o: ../FL/Fl_Choice.H
+Fl_File_Chooser.o: ../FL/fl_config.h
 Fl_File_Chooser.o: ../FL/Fl_Double_Window.H
 Fl_File_Chooser.o: ../FL/fl_draw.H
 Fl_File_Chooser.o: ../FL/Fl_Export.H
@@ -1507,7 +1574,6 @@ Fl_File_Chooser.o: ../FL/Fl_Widget.H
 Fl_File_Chooser.o: ../FL/Fl_Window.H
 Fl_File_Chooser.o: ../FL/platform_types.h
 Fl_File_Chooser2.o: ../config.h
-Fl_File_Chooser2.o: ../FL/abi-version.h
 Fl_File_Chooser2.o: ../FL/Enumerations.H
 Fl_File_Chooser2.o: ../FL/filename.H
 Fl_File_Chooser2.o: ../FL/Fl.H
@@ -1516,9 +1582,11 @@ Fl_File_Chooser2.o: ../FL/fl_attr.h
 Fl_File_Chooser2.o: ../FL/Fl_Box.H
 Fl_File_Chooser2.o: ../FL/Fl_Browser.H
 Fl_File_Chooser2.o: ../FL/Fl_Button.H
+Fl_File_Chooser2.o: ../FL/Fl_Cairo.H
 Fl_File_Chooser2.o: ../FL/fl_casts.H
 Fl_File_Chooser2.o: ../FL/Fl_Check_Button.H
 Fl_File_Chooser2.o: ../FL/Fl_Choice.H
+Fl_File_Chooser2.o: ../FL/fl_config.h
 Fl_File_Chooser2.o: ../FL/Fl_Double_Window.H
 Fl_File_Chooser2.o: ../FL/fl_draw.H
 Fl_File_Chooser2.o: ../FL/Fl_Export.H
@@ -1549,7 +1617,6 @@ Fl_File_Chooser2.o: ../FL/platform_types.h
 Fl_File_Chooser2.o: flstring.h
 Fl_File_Chooser2.o: Fl_System_Driver.H
 fl_file_dir.o: ../config.h
-fl_file_dir.o: ../FL/abi-version.h
 fl_file_dir.o: ../FL/Enumerations.H
 fl_file_dir.o: ../FL/filename.H
 fl_file_dir.o: ../FL/Fl.H
@@ -1558,9 +1625,11 @@ fl_file_dir.o: ../FL/fl_attr.h
 fl_file_dir.o: ../FL/Fl_Box.H
 fl_file_dir.o: ../FL/Fl_Browser.H
 fl_file_dir.o: ../FL/Fl_Button.H
+fl_file_dir.o: ../FL/Fl_Cairo.H
 fl_file_dir.o: ../FL/fl_casts.H
 fl_file_dir.o: ../FL/Fl_Check_Button.H
 fl_file_dir.o: ../FL/Fl_Choice.H
+fl_file_dir.o: ../FL/fl_config.h
 fl_file_dir.o: ../FL/Fl_Double_Window.H
 fl_file_dir.o: ../FL/Fl_Export.H
 fl_file_dir.o: ../FL/Fl_File_Browser.H
@@ -1586,11 +1655,12 @@ fl_file_dir.o: ../FL/Fl_Window.H
 fl_file_dir.o: ../FL/platform_types.h
 fl_file_dir.o: flstring.h
 Fl_File_Icon.o: ../config.h
-Fl_File_Icon.o: ../FL/abi-version.h
 Fl_File_Icon.o: ../FL/Enumerations.H
 Fl_File_Icon.o: ../FL/filename.H
 Fl_File_Icon.o: ../FL/Fl.H
+Fl_File_Icon.o: ../FL/Fl_Cairo.H
 Fl_File_Icon.o: ../FL/fl_casts.H
+Fl_File_Icon.o: ../FL/fl_config.h
 Fl_File_Icon.o: ../FL/fl_draw.H
 Fl_File_Icon.o: ../FL/Fl_Export.H
 Fl_File_Icon.o: ../FL/Fl_File_Icon.H
@@ -1604,6 +1674,7 @@ Fl_File_Icon.o: Fl_System_Driver.H
 Fl_File_Icon2.o: ../config.h
 Fl_File_Icon2.o: ../FL/filename.H
 Fl_File_Icon2.o: ../FL/Fl.H
+Fl_File_Icon2.o: ../FL/fl_config.h
 Fl_File_Icon2.o: ../FL/fl_draw.H
 Fl_File_Icon2.o: ../FL/Fl_Export.H
 Fl_File_Icon2.o: ../FL/Fl_File_Icon.H
@@ -1615,12 +1686,13 @@ Fl_File_Icon2.o: ../FL/math.h
 Fl_File_Icon2.o: ../FL/platform_types.h
 Fl_File_Icon2.o: flstring.h
 Fl_File_Input.o: ../config.h
-Fl_File_Input.o: ../FL/abi-version.h
 Fl_File_Input.o: ../FL/Enumerations.H
 Fl_File_Input.o: ../FL/filename.H
 Fl_File_Input.o: ../FL/Fl.H
 Fl_File_Input.o: ../FL/Fl_Bitmap.H
+Fl_File_Input.o: ../FL/Fl_Cairo.H
 Fl_File_Input.o: ../FL/fl_casts.H
+Fl_File_Input.o: ../FL/fl_config.h
 Fl_File_Input.o: ../FL/fl_draw.H
 Fl_File_Input.o: ../FL/Fl_Export.H
 Fl_File_Input.o: ../FL/Fl_File_Input.H
@@ -1637,15 +1709,17 @@ Fl_File_Input.o: ../FL/platform_types.h
 Fl_File_Input.o: flstring.h
 Fl_File_Input.o: Fl_System_Driver.H
 fl_font.o: ../config.h
+fl_font.o: ../FL/fl_config.h
 fl_font.o: ../FL/fl_draw.H
 fl_font.o: ../FL/Fl_Export.H
 fl_font.o: flstring.h
 Fl_get_key.o: ../config.h
-Fl_get_key.o: ../FL/abi-version.h
 Fl_get_key.o: ../FL/Enumerations.H
 Fl_get_key.o: ../FL/filename.H
 Fl_get_key.o: ../FL/Fl.H
+Fl_get_key.o: ../FL/Fl_Cairo.H
 Fl_get_key.o: ../FL/fl_casts.H
+Fl_get_key.o: ../FL/fl_config.h
 Fl_get_key.o: ../FL/Fl_Export.H
 Fl_get_key.o: ../FL/Fl_Preferences.H
 Fl_get_key.o: ../FL/fl_types.h
@@ -1656,12 +1730,13 @@ Fl_get_key.o: drivers/Posix/Fl_Posix_System_Driver.H
 Fl_get_key.o: drivers/X11/Fl_X11_System_Driver.H
 Fl_get_key.o: Fl_System_Driver.H
 Fl_get_system_colors.o: ../config.h
-Fl_get_system_colors.o: ../FL/abi-version.h
 Fl_get_system_colors.o: ../FL/Enumerations.H
 Fl_get_system_colors.o: ../FL/filename.H
 Fl_get_system_colors.o: ../FL/Fl.H
 Fl_get_system_colors.o: ../FL/Fl_Bitmap.H
+Fl_get_system_colors.o: ../FL/Fl_Cairo.H
 Fl_get_system_colors.o: ../FL/fl_casts.H
+Fl_get_system_colors.o: ../FL/fl_config.h
 Fl_get_system_colors.o: ../FL/Fl_Device.H
 Fl_get_system_colors.o: ../FL/fl_draw.H
 Fl_get_system_colors.o: ../FL/Fl_Export.H
@@ -1692,10 +1767,11 @@ Fl_get_system_colors.o: Fl_Screen_Driver.H
 Fl_get_system_colors.o: Fl_System_Driver.H
 Fl_get_system_colors.o: tile.xpm
 Fl_GIF_Image.o: ../config.h
-Fl_GIF_Image.o: ../FL/abi-version.h
 Fl_GIF_Image.o: ../FL/Enumerations.H
 Fl_GIF_Image.o: ../FL/Fl.H
+Fl_GIF_Image.o: ../FL/Fl_Cairo.H
 Fl_GIF_Image.o: ../FL/fl_casts.H
+Fl_GIF_Image.o: ../FL/fl_config.h
 Fl_GIF_Image.o: ../FL/Fl_Export.H
 Fl_GIF_Image.o: ../FL/Fl_GIF_Image.H
 Fl_GIF_Image.o: ../FL/Fl_Image.H
@@ -1705,20 +1781,22 @@ Fl_GIF_Image.o: ../FL/fl_utf8.h
 Fl_GIF_Image.o: ../FL/platform_types.h
 Fl_GIF_Image.o: flstring.h
 Fl_GIF_Image.o: Fl_Image_Reader.h
-fl_gleam.o: ../FL/abi-version.h
 fl_gleam.o: ../FL/Enumerations.H
 fl_gleam.o: ../FL/Fl.H
+fl_gleam.o: ../FL/Fl_Cairo.H
 fl_gleam.o: ../FL/fl_casts.H
+fl_gleam.o: ../FL/fl_config.h
 fl_gleam.o: ../FL/fl_draw.H
 fl_gleam.o: ../FL/Fl_Export.H
 fl_gleam.o: ../FL/fl_types.h
 fl_gleam.o: ../FL/fl_utf8.h
 fl_gleam.o: ../FL/platform_types.h
 Fl_Gl_Choice.o: ../config.h
-Fl_Gl_Choice.o: ../FL/abi-version.h
 Fl_Gl_Choice.o: ../FL/Enumerations.H
 Fl_Gl_Choice.o: ../FL/Fl.H
+Fl_Gl_Choice.o: ../FL/Fl_Cairo.H
 Fl_Gl_Choice.o: ../FL/fl_casts.H
+Fl_Gl_Choice.o: ../FL/fl_config.h
 Fl_Gl_Choice.o: ../FL/Fl_Export.H
 Fl_Gl_Choice.o: ../FL/Fl_Gl_Window.H
 Fl_Gl_Choice.o: ../FL/fl_types.h
@@ -1730,6 +1808,7 @@ Fl_Gl_Choice.o: ../FL/platform_types.h
 Fl_Gl_Choice.o: Fl_Gl_Choice.H
 Fl_Gl_Choice.o: Fl_Gl_Window_Driver.H
 Fl_Gl_Device_Plugin.o: ../config.h
+Fl_Gl_Device_Plugin.o: ../FL/fl_config.h
 Fl_Gl_Device_Plugin.o: ../FL/Fl_Device.H
 Fl_Gl_Device_Plugin.o: ../FL/Fl_Export.H
 Fl_Gl_Device_Plugin.o: ../FL/Fl_Gl_Window.H
@@ -1741,10 +1820,11 @@ Fl_Gl_Device_Plugin.o: ../FL/Fl_Window.H
 Fl_Gl_Device_Plugin.o: ../FL/platform_types.h
 Fl_Gl_Device_Plugin.o: drivers/OpenGL/Fl_OpenGL_Display_Device.H
 Fl_Gl_Overlay.o: ../config.h
-Fl_Gl_Overlay.o: ../FL/abi-version.h
 Fl_Gl_Overlay.o: ../FL/Enumerations.H
 Fl_Gl_Overlay.o: ../FL/Fl.H
+Fl_Gl_Overlay.o: ../FL/Fl_Cairo.H
 Fl_Gl_Overlay.o: ../FL/fl_casts.H
+Fl_Gl_Overlay.o: ../FL/fl_config.h
 Fl_Gl_Overlay.o: ../FL/Fl_Export.H
 Fl_Gl_Overlay.o: ../FL/Fl_Gl_Window.H
 Fl_Gl_Overlay.o: ../FL/fl_types.h
@@ -1754,11 +1834,12 @@ Fl_Gl_Overlay.o: ../FL/gl.h
 Fl_Gl_Overlay.o: ../FL/platform_types.h
 Fl_Gl_Overlay.o: Fl_Gl_Window_Driver.H
 Fl_Gl_Window.o: ../config.h
-Fl_Gl_Window.o: ../FL/abi-version.h
 Fl_Gl_Window.o: ../FL/Enumerations.H
 Fl_Gl_Window.o: ../FL/Fl.H
 Fl_Gl_Window.o: ../FL/Fl_Bitmap.H
+Fl_Gl_Window.o: ../FL/Fl_Cairo.H
 Fl_Gl_Window.o: ../FL/fl_casts.H
+Fl_Gl_Window.o: ../FL/fl_config.h
 Fl_Gl_Window.o: ../FL/Fl_Device.H
 Fl_Gl_Window.o: ../FL/Fl_Double_Window.H
 Fl_Gl_Window.o: ../FL/Fl_Export.H
@@ -1780,11 +1861,12 @@ Fl_Gl_Window.o: ../FL/platform_types.h
 Fl_Gl_Window.o: drivers/OpenGL/Fl_OpenGL_Display_Device.H
 Fl_Gl_Window.o: Fl_Gl_Window_Driver.H
 Fl_Gl_Window.o: Fl_Window_Driver.H
-Fl_grab.o: ../FL/abi-version.h
 Fl_grab.o: ../FL/Enumerations.H
 Fl_grab.o: ../FL/Fl.H
 Fl_grab.o: ../FL/Fl_Bitmap.H
+Fl_grab.o: ../FL/Fl_Cairo.H
 Fl_grab.o: ../FL/fl_casts.H
+Fl_grab.o: ../FL/fl_config.h
 Fl_grab.o: ../FL/Fl_Device.H
 Fl_grab.o: ../FL/fl_draw.H
 Fl_grab.o: ../FL/Fl_Export.H
@@ -1808,11 +1890,12 @@ Fl_grab.o: ../FL/Fl_Widget.H
 Fl_grab.o: ../FL/platform_types.h
 Fl_grab.o: Fl_Screen_Driver.H
 Fl_Graphics_Driver.o: ../config.h
-Fl_Graphics_Driver.o: ../FL/abi-version.h
 Fl_Graphics_Driver.o: ../FL/Enumerations.H
 Fl_Graphics_Driver.o: ../FL/Fl.H
 Fl_Graphics_Driver.o: ../FL/Fl_Bitmap.H
+Fl_Graphics_Driver.o: ../FL/Fl_Cairo.H
 Fl_Graphics_Driver.o: ../FL/fl_casts.H
+Fl_Graphics_Driver.o: ../FL/fl_config.h
 Fl_Graphics_Driver.o: ../FL/Fl_Device.H
 Fl_Graphics_Driver.o: ../FL/fl_draw.H
 Fl_Graphics_Driver.o: ../FL/Fl_Export.H
@@ -1841,11 +1924,12 @@ Fl_Graphics_Driver.o: ../FL/math.h
 Fl_Graphics_Driver.o: ../FL/platform.H
 Fl_Graphics_Driver.o: ../FL/platform_types.h
 Fl_Graphics_Driver.o: Fl_Screen_Driver.H
-Fl_Group.o: ../FL/abi-version.h
 Fl_Group.o: ../FL/Enumerations.H
 Fl_Group.o: ../FL/Fl.H
 Fl_Group.o: ../FL/Fl_Bitmap.H
+Fl_Group.o: ../FL/Fl_Cairo.H
 Fl_Group.o: ../FL/fl_casts.H
+Fl_Group.o: ../FL/fl_config.h
 Fl_Group.o: ../FL/Fl_Double_Window.H
 Fl_Group.o: ../FL/fl_draw.H
 Fl_Group.o: ../FL/Fl_Export.H
@@ -1859,17 +1943,17 @@ Fl_Group.o: ../FL/Fl_Widget.H
 Fl_Group.o: ../FL/Fl_Window.H
 Fl_Group.o: ../FL/platform_types.h
 Fl_Group.o: Fl_Window_Driver.H
-fl_gtk.o: ../FL/abi-version.h
 fl_gtk.o: ../FL/Enumerations.H
 fl_gtk.o: ../FL/Fl.H
+fl_gtk.o: ../FL/Fl_Cairo.H
 fl_gtk.o: ../FL/fl_casts.H
+fl_gtk.o: ../FL/fl_config.h
 fl_gtk.o: ../FL/fl_draw.H
 fl_gtk.o: ../FL/Fl_Export.H
 fl_gtk.o: ../FL/fl_types.h
 fl_gtk.o: ../FL/fl_utf8.h
 fl_gtk.o: ../FL/platform_types.h
 Fl_Help_Dialog.o: ../config.h
-Fl_Help_Dialog.o: ../FL/abi-version.h
 Fl_Help_Dialog.o: ../FL/Enumerations.H
 Fl_Help_Dialog.o: ../FL/filename.H
 Fl_Help_Dialog.o: ../FL/Fl.H
@@ -1878,7 +1962,9 @@ Fl_Help_Dialog.o: ../FL/fl_attr.h
 Fl_Help_Dialog.o: ../FL/Fl_Bitmap.H
 Fl_Help_Dialog.o: ../FL/Fl_Box.H
 Fl_Help_Dialog.o: ../FL/Fl_Button.H
+Fl_Help_Dialog.o: ../FL/Fl_Cairo.H
 Fl_Help_Dialog.o: ../FL/fl_casts.H
+Fl_Help_Dialog.o: ../FL/fl_config.h
 Fl_Help_Dialog.o: ../FL/Fl_Device.H
 Fl_Help_Dialog.o: ../FL/Fl_Double_Window.H
 Fl_Help_Dialog.o: ../FL/fl_draw.H
@@ -1907,12 +1993,13 @@ Fl_Help_Dialog.o: ../FL/Fl_Window.H
 Fl_Help_Dialog.o: ../FL/platform_types.h
 Fl_Help_Dialog.o: flstring.h
 Fl_Help_View.o: ../config.h
-Fl_Help_View.o: ../FL/abi-version.h
 Fl_Help_View.o: ../FL/Enumerations.H
 Fl_Help_View.o: ../FL/filename.H
 Fl_Help_View.o: ../FL/Fl.H
 Fl_Help_View.o: ../FL/Fl_Bitmap.H
+Fl_Help_View.o: ../FL/Fl_Cairo.H
 Fl_Help_View.o: ../FL/fl_casts.H
+Fl_Help_View.o: ../FL/fl_config.h
 Fl_Help_View.o: ../FL/Fl_Device.H
 Fl_Help_View.o: ../FL/fl_draw.H
 Fl_Help_View.o: ../FL/Fl_Export.H
@@ -1937,10 +2024,11 @@ Fl_Help_View.o: ../FL/Fl_Window.H
 Fl_Help_View.o: ../FL/platform_types.h
 Fl_Help_View.o: flstring.h
 Fl_Image.o: ../config.h
-Fl_Image.o: ../FL/abi-version.h
 Fl_Image.o: ../FL/Enumerations.H
 Fl_Image.o: ../FL/Fl.H
+Fl_Image.o: ../FL/Fl_Cairo.H
 Fl_Image.o: ../FL/fl_casts.H
+Fl_Image.o: ../FL/fl_config.h
 Fl_Image.o: ../FL/fl_draw.H
 Fl_Image.o: ../FL/Fl_Export.H
 Fl_Image.o: ../FL/Fl_Image.H
@@ -1951,10 +2039,10 @@ Fl_Image.o: ../FL/Fl_Widget.H
 Fl_Image.o: ../FL/platform_types.h
 Fl_Image.o: flstring.h
 fl_images_core.o: ../config.h
-fl_images_core.o: ../FL/abi-version.h
 fl_images_core.o: ../FL/Enumerations.H
 fl_images_core.o: ../FL/Fl.H
 fl_images_core.o: ../FL/Fl_BMP_Image.H
+fl_images_core.o: ../FL/fl_config.h
 fl_images_core.o: ../FL/Fl_Export.H
 fl_images_core.o: ../FL/Fl_GIF_Image.H
 fl_images_core.o: ../FL/Fl_Image.H
@@ -1974,11 +2062,12 @@ Fl_Image_Reader.o: ../FL/fl_string.h
 Fl_Image_Reader.o: ../FL/fl_types.h
 Fl_Image_Reader.o: ../FL/fl_utf8.h
 Fl_Image_Reader.o: Fl_Image_Reader.h
-Fl_Image_Surface.o: ../FL/abi-version.h
 Fl_Image_Surface.o: ../FL/Enumerations.H
 Fl_Image_Surface.o: ../FL/Fl.H
 Fl_Image_Surface.o: ../FL/Fl_Bitmap.H
+Fl_Image_Surface.o: ../FL/Fl_Cairo.H
 Fl_Image_Surface.o: ../FL/fl_casts.H
+Fl_Image_Surface.o: ../FL/fl_config.h
 Fl_Image_Surface.o: ../FL/Fl_Device.H
 Fl_Image_Surface.o: ../FL/fl_draw.H
 Fl_Image_Surface.o: ../FL/Fl_Export.H
@@ -1995,14 +2084,15 @@ Fl_Image_Surface.o: ../FL/Fl_Widget_Surface.H
 Fl_Image_Surface.o: ../FL/Fl_Window.H
 Fl_Image_Surface.o: ../FL/platform_types.h
 Fl_Input.o: ../config.h
-Fl_Input.o: ../FL/abi-version.h
 Fl_Input.o: ../FL/Enumerations.H
 Fl_Input.o: ../FL/filename.H
 Fl_Input.o: ../FL/Fl.H
 Fl_Input.o: ../FL/fl_ask.H
 Fl_Input.o: ../FL/fl_attr.h
 Fl_Input.o: ../FL/Fl_Bitmap.H
+Fl_Input.o: ../FL/Fl_Cairo.H
 Fl_Input.o: ../FL/fl_casts.H
+Fl_Input.o: ../FL/fl_config.h
 Fl_Input.o: ../FL/Fl_Device.H
 Fl_Input.o: ../FL/fl_draw.H
 Fl_Input.o: ../FL/Fl_Export.H
@@ -2039,13 +2129,14 @@ Fl_Input.o: flstring.h
 Fl_Input.o: Fl_Screen_Driver.H
 Fl_Input.o: Fl_System_Driver.H
 Fl_Input_.o: ../config.h
-Fl_Input_.o: ../FL/abi-version.h
 Fl_Input_.o: ../FL/Enumerations.H
 Fl_Input_.o: ../FL/Fl.H
 Fl_Input_.o: ../FL/fl_ask.H
 Fl_Input_.o: ../FL/fl_attr.h
 Fl_Input_.o: ../FL/Fl_Bitmap.H
+Fl_Input_.o: ../FL/Fl_Cairo.H
 Fl_Input_.o: ../FL/fl_casts.H
+Fl_Input_.o: ../FL/fl_config.h
 Fl_Input_.o: ../FL/Fl_Device.H
 Fl_Input_.o: ../FL/fl_draw.H
 Fl_Input_.o: ../FL/Fl_Export.H
@@ -2072,10 +2163,11 @@ Fl_Input_.o: ../FL/Fl_Window.H
 Fl_Input_.o: ../FL/platform_types.h
 Fl_Input_.o: flstring.h
 Fl_Input_.o: Fl_Screen_Driver.H
-Fl_Input_Choice.o: ../FL/abi-version.h
 Fl_Input_Choice.o: ../FL/Enumerations.H
 Fl_Input_Choice.o: ../FL/Fl.H
+Fl_Input_Choice.o: ../FL/Fl_Cairo.H
 Fl_Input_Choice.o: ../FL/fl_casts.H
+Fl_Input_Choice.o: ../FL/fl_config.h
 Fl_Input_Choice.o: ../FL/fl_draw.H
 Fl_Input_Choice.o: ../FL/Fl_Export.H
 Fl_Input_Choice.o: ../FL/Fl_Group.H
@@ -2091,10 +2183,11 @@ Fl_Input_Choice.o: ../FL/fl_utf8.h
 Fl_Input_Choice.o: ../FL/Fl_Widget.H
 Fl_Input_Choice.o: ../FL/platform_types.h
 Fl_JPEG_Image.o: ../config.h
-Fl_JPEG_Image.o: ../FL/abi-version.h
 Fl_JPEG_Image.o: ../FL/Enumerations.H
 Fl_JPEG_Image.o: ../FL/Fl.H
+Fl_JPEG_Image.o: ../FL/Fl_Cairo.H
 Fl_JPEG_Image.o: ../FL/fl_casts.H
+Fl_JPEG_Image.o: ../FL/fl_config.h
 Fl_JPEG_Image.o: ../FL/Fl_Export.H
 Fl_JPEG_Image.o: ../FL/Fl_Image.H
 Fl_JPEG_Image.o: ../FL/Fl_JPEG_Image.H
@@ -2102,10 +2195,11 @@ Fl_JPEG_Image.o: ../FL/Fl_Shared_Image.H
 Fl_JPEG_Image.o: ../FL/fl_types.h
 Fl_JPEG_Image.o: ../FL/fl_utf8.h
 Fl_JPEG_Image.o: ../FL/platform_types.h
-fl_labeltype.o: ../FL/abi-version.h
 fl_labeltype.o: ../FL/Enumerations.H
 fl_labeltype.o: ../FL/Fl.H
+fl_labeltype.o: ../FL/Fl_Cairo.H
 fl_labeltype.o: ../FL/fl_casts.H
+fl_labeltype.o: ../FL/fl_config.h
 fl_labeltype.o: ../FL/fl_draw.H
 fl_labeltype.o: ../FL/Fl_Export.H
 fl_labeltype.o: ../FL/Fl_Group.H
@@ -2116,11 +2210,12 @@ fl_labeltype.o: ../FL/fl_utf8.h
 fl_labeltype.o: ../FL/Fl_Widget.H
 fl_labeltype.o: ../FL/platform_types.h
 Fl_Light_Button.o: ../config.h
-Fl_Light_Button.o: ../FL/abi-version.h
 Fl_Light_Button.o: ../FL/Enumerations.H
 Fl_Light_Button.o: ../FL/Fl.H
 Fl_Light_Button.o: ../FL/Fl_Button.H
+Fl_Light_Button.o: ../FL/Fl_Cairo.H
 Fl_Light_Button.o: ../FL/fl_casts.H
+Fl_Light_Button.o: ../FL/fl_config.h
 Fl_Light_Button.o: ../FL/fl_draw.H
 Fl_Light_Button.o: ../FL/Fl_Export.H
 Fl_Light_Button.o: ../FL/Fl_Light_Button.H
@@ -2130,11 +2225,12 @@ Fl_Light_Button.o: ../FL/fl_utf8.h
 Fl_Light_Button.o: ../FL/platform_types.h
 Fl_Light_Button.o: flstring.h
 Fl_lock.o: ../config.h
-Fl_lock.o: ../FL/abi-version.h
 Fl_lock.o: ../FL/Enumerations.H
 Fl_lock.o: ../FL/filename.H
 Fl_lock.o: ../FL/Fl.H
+Fl_lock.o: ../FL/Fl_Cairo.H
 Fl_lock.o: ../FL/fl_casts.H
+Fl_lock.o: ../FL/fl_config.h
 Fl_lock.o: ../FL/Fl_Export.H
 Fl_lock.o: ../FL/Fl_Preferences.H
 Fl_lock.o: ../FL/fl_types.h
@@ -2142,11 +2238,12 @@ Fl_lock.o: ../FL/fl_utf8.h
 Fl_lock.o: ../FL/platform_types.h
 Fl_lock.o: Fl_System_Driver.H
 Fl_Menu.o: ../config.h
-Fl_Menu.o: ../FL/abi-version.h
 Fl_Menu.o: ../FL/Enumerations.H
 Fl_Menu.o: ../FL/filename.H
 Fl_Menu.o: ../FL/Fl.H
+Fl_Menu.o: ../FL/Fl_Cairo.H
 Fl_Menu.o: ../FL/fl_casts.H
+Fl_Menu.o: ../FL/fl_config.h
 Fl_Menu.o: ../FL/fl_draw.H
 Fl_Menu.o: ../FL/Fl_Export.H
 Fl_Menu.o: ../FL/Fl_Image.H
@@ -2163,10 +2260,11 @@ Fl_Menu.o: ../FL/platform_types.h
 Fl_Menu.o: flstring.h
 Fl_Menu.o: Fl_System_Driver.H
 Fl_Menu_.o: ../config.h
-Fl_Menu_.o: ../FL/abi-version.h
 Fl_Menu_.o: ../FL/Enumerations.H
 Fl_Menu_.o: ../FL/Fl.H
+Fl_Menu_.o: ../FL/Fl_Cairo.H
 Fl_Menu_.o: ../FL/fl_casts.H
+Fl_Menu_.o: ../FL/fl_config.h
 Fl_Menu_.o: ../FL/Fl_Export.H
 Fl_Menu_.o: ../FL/Fl_Image.H
 Fl_Menu_.o: ../FL/Fl_Menu_.H
@@ -2177,9 +2275,9 @@ 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/abi-version.h
 Fl_Menu_add.o: ../FL/Enumerations.H
 Fl_Menu_add.o: ../FL/Fl.H
+Fl_Menu_add.o: ../FL/fl_config.h
 Fl_Menu_add.o: ../FL/Fl_Export.H
 Fl_Menu_add.o: ../FL/Fl_Image.H
 Fl_Menu_add.o: ../FL/Fl_Menu_.H
@@ -2189,10 +2287,11 @@ Fl_Menu_add.o: ../FL/fl_types.h
 Fl_Menu_add.o: ../FL/Fl_Widget.H
 Fl_Menu_add.o: ../FL/platform_types.h
 Fl_Menu_add.o: flstring.h
-Fl_Menu_Bar.o: ../FL/abi-version.h
 Fl_Menu_Bar.o: ../FL/Enumerations.H
 Fl_Menu_Bar.o: ../FL/Fl.H
+Fl_Menu_Bar.o: ../FL/Fl_Cairo.H
 Fl_Menu_Bar.o: ../FL/fl_casts.H
+Fl_Menu_Bar.o: ../FL/fl_config.h
 Fl_Menu_Bar.o: ../FL/fl_draw.H
 Fl_Menu_Bar.o: ../FL/Fl_Export.H
 Fl_Menu_Bar.o: ../FL/Fl_Image.H
@@ -2203,10 +2302,11 @@ Fl_Menu_Bar.o: ../FL/fl_types.h
 Fl_Menu_Bar.o: ../FL/fl_utf8.h
 Fl_Menu_Bar.o: ../FL/Fl_Widget.H
 Fl_Menu_Bar.o: ../FL/platform_types.h
-Fl_Menu_Button.o: ../FL/abi-version.h
 Fl_Menu_Button.o: ../FL/Enumerations.H
 Fl_Menu_Button.o: ../FL/Fl.H
+Fl_Menu_Button.o: ../FL/Fl_Cairo.H
 Fl_Menu_Button.o: ../FL/fl_casts.H
+Fl_Menu_Button.o: ../FL/fl_config.h
 Fl_Menu_Button.o: ../FL/fl_draw.H
 Fl_Menu_Button.o: ../FL/Fl_Export.H
 Fl_Menu_Button.o: ../FL/Fl_Image.H
@@ -2217,10 +2317,11 @@ Fl_Menu_Button.o: ../FL/fl_types.h
 Fl_Menu_Button.o: ../FL/fl_utf8.h
 Fl_Menu_Button.o: ../FL/Fl_Widget.H
 Fl_Menu_Button.o: ../FL/platform_types.h
-Fl_Menu_global.o: ../FL/abi-version.h
 Fl_Menu_global.o: ../FL/Enumerations.H
 Fl_Menu_global.o: ../FL/Fl.H
+Fl_Menu_global.o: ../FL/Fl_Cairo.H
 Fl_Menu_global.o: ../FL/fl_casts.H
+Fl_Menu_global.o: ../FL/fl_config.h
 Fl_Menu_global.o: ../FL/Fl_Export.H
 Fl_Menu_global.o: ../FL/Fl_Image.H
 Fl_Menu_global.o: ../FL/Fl_Menu_.H
@@ -2229,11 +2330,12 @@ Fl_Menu_global.o: ../FL/fl_types.h
 Fl_Menu_global.o: ../FL/fl_utf8.h
 Fl_Menu_global.o: ../FL/Fl_Widget.H
 Fl_Menu_global.o: ../FL/platform_types.h
-Fl_Menu_Window.o: ../FL/abi-version.h
 Fl_Menu_Window.o: ../FL/Enumerations.H
 Fl_Menu_Window.o: ../FL/Fl.H
 Fl_Menu_Window.o: ../FL/Fl_Bitmap.H
+Fl_Menu_Window.o: ../FL/Fl_Cairo.H
 Fl_Menu_Window.o: ../FL/fl_casts.H
+Fl_Menu_Window.o: ../FL/fl_config.h
 Fl_Menu_Window.o: ../FL/Fl_Double_Window.H
 Fl_Menu_Window.o: ../FL/Fl_Export.H
 Fl_Menu_Window.o: ../FL/Fl_Group.H
@@ -2248,7 +2350,6 @@ Fl_Menu_Window.o: ../FL/Fl_Window.H
 Fl_Menu_Window.o: ../FL/platform_types.h
 Fl_Menu_Window.o: Fl_Window_Driver.H
 Fl_Message.o: ../config.h
-Fl_Message.o: ../FL/abi-version.h
 Fl_Message.o: ../FL/Enumerations.H
 Fl_Message.o: ../FL/Fl.H
 Fl_Message.o: ../FL/fl_ask.H
@@ -2256,7 +2357,9 @@ Fl_Message.o: ../FL/fl_attr.h
 Fl_Message.o: ../FL/Fl_Bitmap.H
 Fl_Message.o: ../FL/Fl_Box.H
 Fl_Message.o: ../FL/Fl_Button.H
+Fl_Message.o: ../FL/Fl_Cairo.H
 Fl_Message.o: ../FL/fl_casts.H
+Fl_Message.o: ../FL/fl_config.h
 Fl_Message.o: ../FL/fl_draw.H
 Fl_Message.o: ../FL/Fl_Export.H
 Fl_Message.o: ../FL/Fl_Group.H
@@ -2274,10 +2377,11 @@ Fl_Message.o: ../FL/Fl_Window.H
 Fl_Message.o: ../FL/platform_types.h
 Fl_Message.o: flstring.h
 Fl_Message.o: Fl_Message.h
-Fl_Multi_Label.o: ../FL/abi-version.h
 Fl_Multi_Label.o: ../FL/Enumerations.H
 Fl_Multi_Label.o: ../FL/Fl.H
+Fl_Multi_Label.o: ../FL/Fl_Cairo.H
 Fl_Multi_Label.o: ../FL/fl_casts.H
+Fl_Multi_Label.o: ../FL/fl_config.h
 Fl_Multi_Label.o: ../FL/Fl_Export.H
 Fl_Multi_Label.o: ../FL/Fl_Image.H
 Fl_Multi_Label.o: ../FL/Fl_Menu_Item.H
@@ -2286,7 +2390,6 @@ Fl_Multi_Label.o: ../FL/fl_types.h
 Fl_Multi_Label.o: ../FL/fl_utf8.h
 Fl_Multi_Label.o: ../FL/Fl_Widget.H
 Fl_Multi_Label.o: ../FL/platform_types.h
-Fl_Native_File_Chooser.o: ../FL/abi-version.h
 Fl_Native_File_Chooser.o: ../FL/Enumerations.H
 Fl_Native_File_Chooser.o: ../FL/filename.H
 Fl_Native_File_Chooser.o: ../FL/Fl.H
@@ -2295,9 +2398,11 @@ Fl_Native_File_Chooser.o: ../FL/fl_attr.h
 Fl_Native_File_Chooser.o: ../FL/Fl_Box.H
 Fl_Native_File_Chooser.o: ../FL/Fl_Browser.H
 Fl_Native_File_Chooser.o: ../FL/Fl_Button.H
+Fl_Native_File_Chooser.o: ../FL/Fl_Cairo.H
 Fl_Native_File_Chooser.o: ../FL/fl_casts.H
 Fl_Native_File_Chooser.o: ../FL/Fl_Check_Button.H
 Fl_Native_File_Chooser.o: ../FL/Fl_Choice.H
+Fl_Native_File_Chooser.o: ../FL/fl_config.h
 Fl_Native_File_Chooser.o: ../FL/Fl_Double_Window.H
 Fl_Native_File_Chooser.o: ../FL/Fl_Export.H
 Fl_Native_File_Chooser.o: ../FL/Fl_File_Browser.H
@@ -2322,7 +2427,6 @@ Fl_Native_File_Chooser.o: ../FL/fl_utf8.h
 Fl_Native_File_Chooser.o: ../FL/Fl_Widget.H
 Fl_Native_File_Chooser.o: ../FL/Fl_Window.H
 Fl_Native_File_Chooser.o: ../FL/platform_types.h
-Fl_Native_File_Chooser_FLTK.o: ../FL/abi-version.h
 Fl_Native_File_Chooser_FLTK.o: ../FL/Enumerations.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/filename.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl.H
@@ -2331,9 +2435,11 @@ Fl_Native_File_Chooser_FLTK.o: ../FL/fl_attr.h
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Box.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Browser.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Button.H
+Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Cairo.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/fl_casts.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Check_Button.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Choice.H
+Fl_Native_File_Chooser_FLTK.o: ../FL/fl_config.h
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Double_Window.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Export.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_File_Browser.H
@@ -2360,7 +2466,6 @@ Fl_Native_File_Chooser_FLTK.o: ../FL/Fl_Window.H
 Fl_Native_File_Chooser_FLTK.o: ../FL/platform_types.h
 Fl_Native_File_Chooser_FLTK.o: Fl_System_Driver.H
 Fl_Native_File_Chooser_GTK.o: ../config.h
-Fl_Native_File_Chooser_GTK.o: ../FL/abi-version.h
 Fl_Native_File_Chooser_GTK.o: ../FL/Enumerations.H
 Fl_Native_File_Chooser_GTK.o: ../FL/filename.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl.H
@@ -2370,9 +2475,11 @@ Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Bitmap.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Box.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Browser.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Button.H
+Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Cairo.H
 Fl_Native_File_Chooser_GTK.o: ../FL/fl_casts.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Check_Button.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Choice.H
+Fl_Native_File_Chooser_GTK.o: ../FL/fl_config.h
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Device.H
 Fl_Native_File_Chooser_GTK.o: ../FL/Fl_Double_Window.H
 Fl_Native_File_Chooser_GTK.o: ../FL/fl_draw.H
@@ -2410,7 +2517,6 @@ Fl_Native_File_Chooser_GTK.o: drivers/X11/Fl_X11_System_Driver.H
 Fl_Native_File_Chooser_GTK.o: Fl_Native_File_Chooser_Kdialog.H
 Fl_Native_File_Chooser_GTK.o: Fl_System_Driver.H
 Fl_Native_File_Chooser_Kdialog.o: ../config.h
-Fl_Native_File_Chooser_Kdialog.o: ../FL/abi-version.h
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Enumerations.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/filename.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl.H
@@ -2419,9 +2525,11 @@ Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_attr.h
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Box.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Browser.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Button.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Cairo.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_casts.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Check_Button.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Choice.H
+Fl_Native_File_Chooser_Kdialog.o: ../FL/fl_config.h
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Double_Window.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Export.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_File_Browser.H
@@ -2448,11 +2556,12 @@ Fl_Native_File_Chooser_Kdialog.o: ../FL/Fl_Window.H
 Fl_Native_File_Chooser_Kdialog.o: ../FL/platform_types.h
 Fl_Native_File_Chooser_Kdialog.o: Fl_Native_File_Chooser_Kdialog.H
 fl_open_uri.o: ../config.h
-fl_open_uri.o: ../FL/abi-version.h
 fl_open_uri.o: ../FL/Enumerations.H
 fl_open_uri.o: ../FL/filename.H
 fl_open_uri.o: ../FL/Fl.H
+fl_open_uri.o: ../FL/Fl_Cairo.H
 fl_open_uri.o: ../FL/fl_casts.H
+fl_open_uri.o: ../FL/fl_config.h
 fl_open_uri.o: ../FL/Fl_Export.H
 fl_open_uri.o: ../FL/Fl_Preferences.H
 fl_open_uri.o: ../FL/fl_types.h
@@ -2460,20 +2569,22 @@ fl_open_uri.o: ../FL/fl_utf8.h
 fl_open_uri.o: ../FL/platform_types.h
 fl_open_uri.o: flstring.h
 fl_open_uri.o: Fl_System_Driver.H
-fl_oval_box.o: ../FL/abi-version.h
 fl_oval_box.o: ../FL/Enumerations.H
 fl_oval_box.o: ../FL/Fl.H
+fl_oval_box.o: ../FL/Fl_Cairo.H
 fl_oval_box.o: ../FL/fl_casts.H
+fl_oval_box.o: ../FL/fl_config.h
 fl_oval_box.o: ../FL/fl_draw.H
 fl_oval_box.o: ../FL/Fl_Export.H
 fl_oval_box.o: ../FL/fl_types.h
 fl_oval_box.o: ../FL/fl_utf8.h
 fl_oval_box.o: ../FL/platform_types.h
-fl_overlay.o: ../FL/abi-version.h
 fl_overlay.o: ../FL/Enumerations.H
 fl_overlay.o: ../FL/Fl.H
 fl_overlay.o: ../FL/Fl_Bitmap.H
+fl_overlay.o: ../FL/Fl_Cairo.H
 fl_overlay.o: ../FL/fl_casts.H
+fl_overlay.o: ../FL/fl_config.h
 fl_overlay.o: ../FL/Fl_Device.H
 fl_overlay.o: ../FL/fl_draw.H
 fl_overlay.o: ../FL/Fl_Export.H
@@ -2497,11 +2608,12 @@ fl_overlay.o: ../FL/Fl_Widget.H
 fl_overlay.o: ../FL/platform.H
 fl_overlay.o: ../FL/platform_types.h
 fl_overlay.o: Fl_Screen_Driver.H
-Fl_Overlay_Window.o: ../FL/abi-version.h
 Fl_Overlay_Window.o: ../FL/Enumerations.H
 Fl_Overlay_Window.o: ../FL/Fl.H
 Fl_Overlay_Window.o: ../FL/Fl_Bitmap.H
+Fl_Overlay_Window.o: ../FL/Fl_Cairo.H
 Fl_Overlay_Window.o: ../FL/fl_casts.H
+Fl_Overlay_Window.o: ../FL/fl_config.h
 Fl_Overlay_Window.o: ../FL/Fl_Double_Window.H
 Fl_Overlay_Window.o: ../FL/Fl_Export.H
 Fl_Overlay_Window.o: ../FL/Fl_Group.H
@@ -2513,21 +2625,23 @@ Fl_Overlay_Window.o: ../FL/Fl_Widget.H
 Fl_Overlay_Window.o: ../FL/Fl_Window.H
 Fl_Overlay_Window.o: ../FL/platform_types.h
 Fl_Overlay_Window.o: Fl_Window_Driver.H
-Fl_own_colormap.o: ../FL/abi-version.h
 Fl_own_colormap.o: ../FL/Enumerations.H
 Fl_own_colormap.o: ../FL/filename.H
 Fl_own_colormap.o: ../FL/Fl.H
+Fl_own_colormap.o: ../FL/Fl_Cairo.H
 Fl_own_colormap.o: ../FL/fl_casts.H
+Fl_own_colormap.o: ../FL/fl_config.h
 Fl_own_colormap.o: ../FL/Fl_Export.H
 Fl_own_colormap.o: ../FL/Fl_Preferences.H
 Fl_own_colormap.o: ../FL/fl_types.h
 Fl_own_colormap.o: ../FL/fl_utf8.h
 Fl_own_colormap.o: ../FL/platform_types.h
 Fl_own_colormap.o: Fl_System_Driver.H
-Fl_Pack.o: ../FL/abi-version.h
 Fl_Pack.o: ../FL/Enumerations.H
 Fl_Pack.o: ../FL/Fl.H
+Fl_Pack.o: ../FL/Fl_Cairo.H
 Fl_Pack.o: ../FL/fl_casts.H
+Fl_Pack.o: ../FL/fl_config.h
 Fl_Pack.o: ../FL/fl_draw.H
 Fl_Pack.o: ../FL/Fl_Export.H
 Fl_Pack.o: ../FL/Fl_Group.H
@@ -2535,11 +2649,12 @@ Fl_Pack.o: ../FL/Fl_Pack.H
 Fl_Pack.o: ../FL/fl_types.h
 Fl_Pack.o: ../FL/fl_utf8.h
 Fl_Pack.o: ../FL/platform_types.h
-Fl_Paged_Device.o: ../FL/abi-version.h
 Fl_Paged_Device.o: ../FL/Enumerations.H
 Fl_Paged_Device.o: ../FL/Fl.H
 Fl_Paged_Device.o: ../FL/Fl_Bitmap.H
+Fl_Paged_Device.o: ../FL/Fl_Cairo.H
 Fl_Paged_Device.o: ../FL/fl_casts.H
+Fl_Paged_Device.o: ../FL/fl_config.h
 Fl_Paged_Device.o: ../FL/Fl_Device.H
 Fl_Paged_Device.o: ../FL/fl_draw.H
 Fl_Paged_Device.o: ../FL/Fl_Export.H
@@ -2555,10 +2670,11 @@ Fl_Paged_Device.o: ../FL/Fl_Widget_Surface.H
 Fl_Paged_Device.o: ../FL/Fl_Window.H
 Fl_Paged_Device.o: ../FL/platform_types.h
 Fl_Pixmap.o: ../config.h
-Fl_Pixmap.o: ../FL/abi-version.h
 Fl_Pixmap.o: ../FL/Enumerations.H
 Fl_Pixmap.o: ../FL/Fl.H
+Fl_Pixmap.o: ../FL/Fl_Cairo.H
 Fl_Pixmap.o: ../FL/fl_casts.H
+Fl_Pixmap.o: ../FL/fl_config.h
 Fl_Pixmap.o: ../FL/fl_draw.H
 Fl_Pixmap.o: ../FL/Fl_Export.H
 Fl_Pixmap.o: ../FL/Fl_Image.H
@@ -2571,10 +2687,11 @@ Fl_Pixmap.o: ../FL/platform.H
 Fl_Pixmap.o: ../FL/platform_types.h
 Fl_Pixmap.o: flstring.h
 fl_plastic.o: ../config.h
-fl_plastic.o: ../FL/abi-version.h
 fl_plastic.o: ../FL/Enumerations.H
 fl_plastic.o: ../FL/Fl.H
+fl_plastic.o: ../FL/Fl_Cairo.H
 fl_plastic.o: ../FL/fl_casts.H
+fl_plastic.o: ../FL/fl_config.h
 fl_plastic.o: ../FL/fl_draw.H
 fl_plastic.o: ../FL/Fl_Export.H
 fl_plastic.o: ../FL/fl_types.h
@@ -2582,11 +2699,12 @@ fl_plastic.o: ../FL/fl_utf8.h
 fl_plastic.o: ../FL/platform_types.h
 fl_plastic.o: flstring.h
 Fl_PNG_Image.o: ../config.h
-Fl_PNG_Image.o: ../FL/abi-version.h
 Fl_PNG_Image.o: ../FL/Enumerations.H
 Fl_PNG_Image.o: ../FL/filename.H
 Fl_PNG_Image.o: ../FL/Fl.H
+Fl_PNG_Image.o: ../FL/Fl_Cairo.H
 Fl_PNG_Image.o: ../FL/fl_casts.H
+Fl_PNG_Image.o: ../FL/fl_config.h
 Fl_PNG_Image.o: ../FL/Fl_Export.H
 Fl_PNG_Image.o: ../FL/Fl_Image.H
 Fl_PNG_Image.o: ../FL/Fl_PNG_Image.H
@@ -2597,10 +2715,11 @@ Fl_PNG_Image.o: ../FL/fl_utf8.h
 Fl_PNG_Image.o: ../FL/platform_types.h
 Fl_PNG_Image.o: Fl_System_Driver.H
 Fl_PNM_Image.o: ../config.h
-Fl_PNM_Image.o: ../FL/abi-version.h
 Fl_PNM_Image.o: ../FL/Enumerations.H
 Fl_PNM_Image.o: ../FL/Fl.H
+Fl_PNM_Image.o: ../FL/Fl_Cairo.H
 Fl_PNM_Image.o: ../FL/fl_casts.H
+Fl_PNM_Image.o: ../FL/fl_config.h
 Fl_PNM_Image.o: ../FL/Fl_Export.H
 Fl_PNM_Image.o: ../FL/Fl_Image.H
 Fl_PNM_Image.o: ../FL/Fl_PNM_Image.H
@@ -2608,10 +2727,11 @@ Fl_PNM_Image.o: ../FL/fl_types.h
 Fl_PNM_Image.o: ../FL/fl_utf8.h
 Fl_PNM_Image.o: ../FL/platform_types.h
 Fl_PNM_Image.o: flstring.h
-Fl_Positioner.o: ../FL/abi-version.h
 Fl_Positioner.o: ../FL/Enumerations.H
 Fl_Positioner.o: ../FL/Fl.H
+Fl_Positioner.o: ../FL/Fl_Cairo.H
 Fl_Positioner.o: ../FL/fl_casts.H
+Fl_Positioner.o: ../FL/fl_config.h
 Fl_Positioner.o: ../FL/fl_draw.H
 Fl_Positioner.o: ../FL/Fl_Export.H
 Fl_Positioner.o: ../FL/Fl_Positioner.H
@@ -2620,11 +2740,12 @@ Fl_Positioner.o: ../FL/fl_utf8.h
 Fl_Positioner.o: ../FL/Fl_Widget.H
 Fl_Positioner.o: ../FL/platform_types.h
 Fl_Preferences.o: ../config.h
-Fl_Preferences.o: ../FL/abi-version.h
 Fl_Preferences.o: ../FL/Enumerations.H
 Fl_Preferences.o: ../FL/filename.H
 Fl_Preferences.o: ../FL/Fl.H
+Fl_Preferences.o: ../FL/Fl_Cairo.H
 Fl_Preferences.o: ../FL/fl_casts.H
+Fl_Preferences.o: ../FL/fl_config.h
 Fl_Preferences.o: ../FL/Fl_Export.H
 Fl_Preferences.o: ../FL/Fl_Plugin.H
 Fl_Preferences.o: ../FL/Fl_Preferences.H
@@ -2635,11 +2756,12 @@ Fl_Preferences.o: ../FL/platform_types.h
 Fl_Preferences.o: flstring.h
 Fl_Preferences.o: Fl_System_Driver.H
 Fl_Printer.o: ../config.h
-Fl_Printer.o: ../FL/abi-version.h
 Fl_Printer.o: ../FL/Enumerations.H
 Fl_Printer.o: ../FL/Fl.H
 Fl_Printer.o: ../FL/Fl_Bitmap.H
+Fl_Printer.o: ../FL/Fl_Cairo.H
 Fl_Printer.o: ../FL/fl_casts.H
+Fl_Printer.o: ../FL/fl_config.h
 Fl_Printer.o: ../FL/Fl_Device.H
 Fl_Printer.o: ../FL/Fl_Export.H
 Fl_Printer.o: ../FL/Fl_Group.H
@@ -2654,10 +2776,11 @@ Fl_Printer.o: ../FL/Fl_Widget.H
 Fl_Printer.o: ../FL/Fl_Widget_Surface.H
 Fl_Printer.o: ../FL/Fl_Window.H
 Fl_Printer.o: ../FL/platform_types.h
-Fl_Progress.o: ../FL/abi-version.h
 Fl_Progress.o: ../FL/Enumerations.H
 Fl_Progress.o: ../FL/Fl.H
+Fl_Progress.o: ../FL/Fl_Cairo.H
 Fl_Progress.o: ../FL/fl_casts.H
+Fl_Progress.o: ../FL/fl_config.h
 Fl_Progress.o: ../FL/fl_draw.H
 Fl_Progress.o: ../FL/Fl_Export.H
 Fl_Progress.o: ../FL/Fl_Progress.H
@@ -2665,11 +2788,12 @@ Fl_Progress.o: ../FL/fl_types.h
 Fl_Progress.o: ../FL/fl_utf8.h
 Fl_Progress.o: ../FL/Fl_Widget.H
 Fl_Progress.o: ../FL/platform_types.h
-fl_read_image.o: ../FL/abi-version.h
 fl_read_image.o: ../FL/Enumerations.H
 fl_read_image.o: ../FL/Fl.H
 fl_read_image.o: ../FL/Fl_Bitmap.H
+fl_read_image.o: ../FL/Fl_Cairo.H
 fl_read_image.o: ../FL/fl_casts.H
+fl_read_image.o: ../FL/fl_config.h
 fl_read_image.o: ../FL/Fl_Device.H
 fl_read_image.o: ../FL/fl_draw.H
 fl_read_image.o: ../FL/Fl_Export.H
@@ -2693,10 +2817,10 @@ fl_read_image.o: ../FL/Fl_Widget.H
 fl_read_image.o: ../FL/platform.H
 fl_read_image.o: ../FL/platform_types.h
 fl_read_image.o: Fl_Screen_Driver.H
-fl_rect.o: ../FL/abi-version.h
 fl_rect.o: ../FL/Enumerations.H
 fl_rect.o: ../FL/Fl.H
 fl_rect.o: ../FL/Fl_Bitmap.H
+fl_rect.o: ../FL/fl_config.h
 fl_rect.o: ../FL/Fl_Device.H
 fl_rect.o: ../FL/Fl_Export.H
 fl_rect.o: ../FL/Fl_Graphics_Driver.H
@@ -2709,31 +2833,34 @@ fl_rect.o: ../FL/fl_types.h
 fl_rect.o: ../FL/Fl_Widget.H
 fl_rect.o: ../FL/platform.H
 fl_rect.o: ../FL/platform_types.h
-Fl_Repeat_Button.o: ../FL/abi-version.h
 Fl_Repeat_Button.o: ../FL/Enumerations.H
 Fl_Repeat_Button.o: ../FL/Fl.H
 Fl_Repeat_Button.o: ../FL/Fl_Button.H
+Fl_Repeat_Button.o: ../FL/Fl_Cairo.H
 Fl_Repeat_Button.o: ../FL/fl_casts.H
+Fl_Repeat_Button.o: ../FL/fl_config.h
 Fl_Repeat_Button.o: ../FL/Fl_Export.H
 Fl_Repeat_Button.o: ../FL/Fl_Repeat_Button.H
 Fl_Repeat_Button.o: ../FL/fl_types.h
 Fl_Repeat_Button.o: ../FL/fl_utf8.h
 Fl_Repeat_Button.o: ../FL/platform_types.h
-Fl_Return_Button.o: ../FL/abi-version.h
 Fl_Return_Button.o: ../FL/Enumerations.H
 Fl_Return_Button.o: ../FL/Fl.H
 Fl_Return_Button.o: ../FL/Fl_Button.H
+Fl_Return_Button.o: ../FL/Fl_Cairo.H
 Fl_Return_Button.o: ../FL/fl_casts.H
+Fl_Return_Button.o: ../FL/fl_config.h
 Fl_Return_Button.o: ../FL/fl_draw.H
 Fl_Return_Button.o: ../FL/Fl_Export.H
 Fl_Return_Button.o: ../FL/Fl_Return_Button.H
 Fl_Return_Button.o: ../FL/fl_types.h
 Fl_Return_Button.o: ../FL/fl_utf8.h
 Fl_Return_Button.o: ../FL/platform_types.h
-Fl_Roller.o: ../FL/abi-version.h
 Fl_Roller.o: ../FL/Enumerations.H
 Fl_Roller.o: ../FL/Fl.H
+Fl_Roller.o: ../FL/Fl_Cairo.H
 Fl_Roller.o: ../FL/fl_casts.H
+Fl_Roller.o: ../FL/fl_config.h
 Fl_Roller.o: ../FL/fl_draw.H
 Fl_Roller.o: ../FL/Fl_Export.H
 Fl_Roller.o: ../FL/Fl_Roller.H
@@ -2741,29 +2868,32 @@ Fl_Roller.o: ../FL/fl_types.h
 Fl_Roller.o: ../FL/fl_utf8.h
 Fl_Roller.o: ../FL/Fl_Valuator.H
 Fl_Roller.o: ../FL/platform_types.h
-fl_rounded_box.o: ../FL/abi-version.h
 fl_rounded_box.o: ../FL/Enumerations.H
 fl_rounded_box.o: ../FL/Fl.H
+fl_rounded_box.o: ../FL/Fl_Cairo.H
 fl_rounded_box.o: ../FL/fl_casts.H
+fl_rounded_box.o: ../FL/fl_config.h
 fl_rounded_box.o: ../FL/fl_draw.H
 fl_rounded_box.o: ../FL/Fl_Export.H
 fl_rounded_box.o: ../FL/fl_types.h
 fl_rounded_box.o: ../FL/fl_utf8.h
 fl_rounded_box.o: ../FL/platform_types.h
-fl_round_box.o: ../FL/abi-version.h
 fl_round_box.o: ../FL/Enumerations.H
 fl_round_box.o: ../FL/Fl.H
+fl_round_box.o: ../FL/Fl_Cairo.H
 fl_round_box.o: ../FL/fl_casts.H
+fl_round_box.o: ../FL/fl_config.h
 fl_round_box.o: ../FL/fl_draw.H
 fl_round_box.o: ../FL/Fl_Export.H
 fl_round_box.o: ../FL/fl_types.h
 fl_round_box.o: ../FL/fl_utf8.h
 fl_round_box.o: ../FL/platform_types.h
-Fl_Round_Button.o: ../FL/abi-version.h
 Fl_Round_Button.o: ../FL/Enumerations.H
 Fl_Round_Button.o: ../FL/Fl.H
 Fl_Round_Button.o: ../FL/Fl_Button.H
+Fl_Round_Button.o: ../FL/Fl_Cairo.H
 Fl_Round_Button.o: ../FL/fl_casts.H
+Fl_Round_Button.o: ../FL/fl_config.h
 Fl_Round_Button.o: ../FL/Fl_Export.H
 Fl_Round_Button.o: ../FL/Fl_Light_Button.H
 Fl_Round_Button.o: ../FL/Fl_Radio_Round_Button.H
@@ -2771,12 +2901,13 @@ Fl_Round_Button.o: ../FL/Fl_Round_Button.H
 Fl_Round_Button.o: ../FL/fl_types.h
 Fl_Round_Button.o: ../FL/fl_utf8.h
 Fl_Round_Button.o: ../FL/platform_types.h
-Fl_Screen_Driver.o: ../FL/abi-version.h
 Fl_Screen_Driver.o: ../FL/Enumerations.H
 Fl_Screen_Driver.o: ../FL/Fl.H
 Fl_Screen_Driver.o: ../FL/Fl_Bitmap.H
 Fl_Screen_Driver.o: ../FL/Fl_Box.H
+Fl_Screen_Driver.o: ../FL/Fl_Cairo.H
 Fl_Screen_Driver.o: ../FL/fl_casts.H
+Fl_Screen_Driver.o: ../FL/fl_config.h
 Fl_Screen_Driver.o: ../FL/Fl_Device.H
 Fl_Screen_Driver.o: ../FL/Fl_Double_Window.H
 Fl_Screen_Driver.o: ../FL/fl_draw.H
@@ -2809,10 +2940,11 @@ Fl_Screen_Driver.o: ../FL/Fl_Window.H
 Fl_Screen_Driver.o: ../FL/platform_types.h
 Fl_Screen_Driver.o: Fl_Screen_Driver.H
 Fl_Screen_Driver.o: Fl_Window_Driver.H
-Fl_Scroll.o: ../FL/abi-version.h
 Fl_Scroll.o: ../FL/Enumerations.H
 Fl_Scroll.o: ../FL/Fl.H
+Fl_Scroll.o: ../FL/Fl_Cairo.H
 Fl_Scroll.o: ../FL/fl_casts.H
+Fl_Scroll.o: ../FL/fl_config.h
 Fl_Scroll.o: ../FL/fl_draw.H
 Fl_Scroll.o: ../FL/Fl_Export.H
 Fl_Scroll.o: ../FL/Fl_Group.H
@@ -2827,10 +2959,11 @@ Fl_Scroll.o: ../FL/Fl_Valuator.H
 Fl_Scroll.o: ../FL/Fl_Widget.H
 Fl_Scroll.o: ../FL/platform_types.h
 Fl_Scrollbar.o: ../config.h
-Fl_Scrollbar.o: ../FL/abi-version.h
 Fl_Scrollbar.o: ../FL/Enumerations.H
 Fl_Scrollbar.o: ../FL/Fl.H
+Fl_Scrollbar.o: ../FL/Fl_Cairo.H
 Fl_Scrollbar.o: ../FL/fl_casts.H
+Fl_Scrollbar.o: ../FL/fl_config.h
 Fl_Scrollbar.o: ../FL/fl_draw.H
 Fl_Scrollbar.o: ../FL/Fl_Export.H
 Fl_Scrollbar.o: ../FL/Fl_Scrollbar.H
@@ -2840,11 +2973,12 @@ Fl_Scrollbar.o: ../FL/fl_utf8.h
 Fl_Scrollbar.o: ../FL/Fl_Valuator.H
 Fl_Scrollbar.o: ../FL/platform_types.h
 Fl_Scrollbar.o: flstring.h
-fl_scroll_area.o: ../FL/abi-version.h
 fl_scroll_area.o: ../FL/Enumerations.H
 fl_scroll_area.o: ../FL/Fl.H
 fl_scroll_area.o: ../FL/Fl_Bitmap.H
+fl_scroll_area.o: ../FL/Fl_Cairo.H
 fl_scroll_area.o: ../FL/fl_casts.H
+fl_scroll_area.o: ../FL/fl_config.h
 fl_scroll_area.o: ../FL/Fl_Double_Window.H
 fl_scroll_area.o: ../FL/fl_draw.H
 fl_scroll_area.o: ../FL/Fl_Export.H
@@ -2858,11 +2992,12 @@ fl_scroll_area.o: ../FL/Fl_Window.H
 fl_scroll_area.o: ../FL/platform_types.h
 fl_scroll_area.o: Fl_Window_Driver.H
 fl_set_font.o: ../config.h
-fl_set_font.o: ../FL/abi-version.h
 fl_set_font.o: ../FL/Enumerations.H
 fl_set_font.o: ../FL/Fl.H
 fl_set_font.o: ../FL/Fl_Bitmap.H
+fl_set_font.o: ../FL/Fl_Cairo.H
 fl_set_font.o: ../FL/fl_casts.H
+fl_set_font.o: ../FL/fl_config.h
 fl_set_font.o: ../FL/Fl_Device.H
 fl_set_font.o: ../FL/fl_draw.H
 fl_set_font.o: ../FL/Fl_Export.H
@@ -2887,21 +3022,23 @@ fl_set_font.o: ../FL/platform.H
 fl_set_font.o: ../FL/platform_types.h
 fl_set_font.o: flstring.h
 fl_set_font.o: Fl_Screen_Driver.H
-fl_shadow_box.o: ../FL/abi-version.h
 fl_shadow_box.o: ../FL/Enumerations.H
 fl_shadow_box.o: ../FL/Fl.H
+fl_shadow_box.o: ../FL/Fl_Cairo.H
 fl_shadow_box.o: ../FL/fl_casts.H
+fl_shadow_box.o: ../FL/fl_config.h
 fl_shadow_box.o: ../FL/fl_draw.H
 fl_shadow_box.o: ../FL/Fl_Export.H
 fl_shadow_box.o: ../FL/fl_types.h
 fl_shadow_box.o: ../FL/fl_utf8.h
 fl_shadow_box.o: ../FL/platform_types.h
 Fl_Shared_Image.o: ../config.h
-Fl_Shared_Image.o: ../FL/abi-version.h
 Fl_Shared_Image.o: ../FL/Enumerations.H
 Fl_Shared_Image.o: ../FL/Fl.H
 Fl_Shared_Image.o: ../FL/Fl_Bitmap.H
+Fl_Shared_Image.o: ../FL/Fl_Cairo.H
 Fl_Shared_Image.o: ../FL/fl_casts.H
+Fl_Shared_Image.o: ../FL/fl_config.h
 Fl_Shared_Image.o: ../FL/fl_draw.H
 Fl_Shared_Image.o: ../FL/Fl_Export.H
 Fl_Shared_Image.o: ../FL/Fl_Image.H
@@ -2916,12 +3053,13 @@ Fl_Shared_Image.o: ../FL/Fl_XPM_Image.H
 Fl_Shared_Image.o: ../FL/platform_types.h
 Fl_Shared_Image.o: flstring.h
 fl_shortcut.o: ../config.h
-fl_shortcut.o: ../FL/abi-version.h
 fl_shortcut.o: ../FL/Enumerations.H
 fl_shortcut.o: ../FL/filename.H
 fl_shortcut.o: ../FL/Fl.H
 fl_shortcut.o: ../FL/Fl_Button.H
+fl_shortcut.o: ../FL/Fl_Cairo.H
 fl_shortcut.o: ../FL/fl_casts.H
+fl_shortcut.o: ../FL/fl_config.h
 fl_shortcut.o: ../FL/fl_draw.H
 fl_shortcut.o: ../FL/Fl_Export.H
 fl_shortcut.o: ../FL/Fl_Preferences.H
@@ -2932,10 +3070,11 @@ fl_shortcut.o: ../FL/platform_types.h
 fl_shortcut.o: flstring.h
 fl_shortcut.o: Fl_System_Driver.H
 fl_show_colormap.o: ../config.h
-fl_show_colormap.o: ../FL/abi-version.h
 fl_show_colormap.o: ../FL/Enumerations.H
 fl_show_colormap.o: ../FL/Fl.H
+fl_show_colormap.o: ../FL/Fl_Cairo.H
 fl_show_colormap.o: ../FL/fl_casts.H
+fl_show_colormap.o: ../FL/fl_config.h
 fl_show_colormap.o: ../FL/fl_draw.H
 fl_show_colormap.o: ../FL/Fl_Export.H
 fl_show_colormap.o: ../FL/fl_show_colormap.H
@@ -2945,11 +3084,12 @@ fl_show_colormap.o: ../FL/fl_utf8.h
 fl_show_colormap.o: ../FL/Fl_Window.H
 fl_show_colormap.o: ../FL/platform_types.h
 Fl_Simple_Terminal.o: ../config.h
-Fl_Simple_Terminal.o: ../FL/abi-version.h
 Fl_Simple_Terminal.o: ../FL/Enumerations.H
 Fl_Simple_Terminal.o: ../FL/Fl.H
 Fl_Simple_Terminal.o: ../FL/Fl_Bitmap.H
+Fl_Simple_Terminal.o: ../FL/Fl_Cairo.H
 Fl_Simple_Terminal.o: ../FL/fl_casts.H
+Fl_Simple_Terminal.o: ../FL/fl_config.h
 Fl_Simple_Terminal.o: ../FL/Fl_Device.H
 Fl_Simple_Terminal.o: ../FL/fl_draw.H
 Fl_Simple_Terminal.o: ../FL/Fl_Export.H
@@ -2975,10 +3115,11 @@ Fl_Simple_Terminal.o: flstring.h
 Fl_Single_Window.o: ../FL/Fl_Single_Window.H
 Fl_Single_Window.o: ../FL/Fl_Window.H
 Fl_Slider.o: ../config.h
-Fl_Slider.o: ../FL/abi-version.h
 Fl_Slider.o: ../FL/Enumerations.H
 Fl_Slider.o: ../FL/Fl.H
+Fl_Slider.o: ../FL/Fl_Cairo.H
 Fl_Slider.o: ../FL/fl_casts.H
+Fl_Slider.o: ../FL/fl_config.h
 Fl_Slider.o: ../FL/fl_draw.H
 Fl_Slider.o: ../FL/Fl_Export.H
 Fl_Slider.o: ../FL/Fl_Fill_Slider.H
@@ -3000,11 +3141,12 @@ Fl_Spinner.o: ../FL/Fl_Input.H
 Fl_Spinner.o: ../FL/Fl_Input_.H
 Fl_Spinner.o: ../FL/Fl_Repeat_Button.H
 Fl_Spinner.o: ../FL/Fl_Spinner.H
-fl_string.o: ../FL/abi-version.h
 fl_string.o: ../FL/Enumerations.H
 fl_string.o: ../FL/filename.H
 fl_string.o: ../FL/Fl.H
+fl_string.o: ../FL/Fl_Cairo.H
 fl_string.o: ../FL/fl_casts.H
+fl_string.o: ../FL/fl_config.h
 fl_string.o: ../FL/Fl_Export.H
 fl_string.o: ../FL/Fl_Preferences.H
 fl_string.o: ../FL/fl_string.h
@@ -3014,11 +3156,12 @@ fl_string.o: ../FL/platform_types.h
 fl_string.o: Fl_System_Driver.H
 Fl_String_class.o: ../FL/Fl_String_class.H
 Fl_SVG_Image.o: ../config.h
-Fl_SVG_Image.o: ../FL/abi-version.h
 Fl_SVG_Image.o: ../FL/Enumerations.H
 Fl_SVG_Image.o: ../FL/Fl.H
 Fl_SVG_Image.o: ../FL/Fl_Bitmap.H
+Fl_SVG_Image.o: ../FL/Fl_Cairo.H
 Fl_SVG_Image.o: ../FL/fl_casts.H
+Fl_SVG_Image.o: ../FL/fl_config.h
 Fl_SVG_Image.o: ../FL/Fl_Device.H
 Fl_SVG_Image.o: ../FL/fl_draw.H
 Fl_SVG_Image.o: ../FL/Fl_Export.H
@@ -3046,10 +3189,11 @@ Fl_SVG_Image.o: ../nanosvg/nanosvg.h
 Fl_SVG_Image.o: ../nanosvg/nanosvgrast.h
 Fl_SVG_Image.o: Fl_Screen_Driver.H
 fl_symbols.o: ../config.h
-fl_symbols.o: ../FL/abi-version.h
 fl_symbols.o: ../FL/Enumerations.H
 fl_symbols.o: ../FL/Fl.H
+fl_symbols.o: ../FL/Fl_Cairo.H
 fl_symbols.o: ../FL/fl_casts.H
+fl_symbols.o: ../FL/fl_config.h
 fl_symbols.o: ../FL/fl_draw.H
 fl_symbols.o: ../FL/Fl_Export.H
 fl_symbols.o: ../FL/fl_types.h
@@ -3058,11 +3202,12 @@ fl_symbols.o: ../FL/math.h
 fl_symbols.o: ../FL/platform_types.h
 fl_symbols.o: flstring.h
 Fl_System_Driver.o: ../config.h
-Fl_System_Driver.o: ../FL/abi-version.h
 Fl_System_Driver.o: ../FL/Enumerations.H
 Fl_System_Driver.o: ../FL/filename.H
 Fl_System_Driver.o: ../FL/Fl.H
+Fl_System_Driver.o: ../FL/Fl_Cairo.H
 Fl_System_Driver.o: ../FL/fl_casts.H
+Fl_System_Driver.o: ../FL/fl_config.h
 Fl_System_Driver.o: ../FL/Fl_Export.H
 Fl_System_Driver.o: ../FL/Fl_File_Icon.H
 Fl_System_Driver.o: ../FL/Fl_Preferences.H
@@ -3072,11 +3217,12 @@ Fl_System_Driver.o: ../FL/platform_types.h
 Fl_System_Driver.o: flstring.h
 Fl_System_Driver.o: Fl_System_Driver.H
 Fl_Sys_Menu_Bar.o: ../config.h
-Fl_Sys_Menu_Bar.o: ../FL/abi-version.h
 Fl_Sys_Menu_Bar.o: ../FL/Enumerations.H
 Fl_Sys_Menu_Bar.o: ../FL/filename.H
 Fl_Sys_Menu_Bar.o: ../FL/Fl.H
+Fl_Sys_Menu_Bar.o: ../FL/Fl_Cairo.H
 Fl_Sys_Menu_Bar.o: ../FL/fl_casts.H
+Fl_Sys_Menu_Bar.o: ../FL/fl_config.h
 Fl_Sys_Menu_Bar.o: ../FL/Fl_Export.H
 Fl_Sys_Menu_Bar.o: ../FL/Fl_Image.H
 Fl_Sys_Menu_Bar.o: ../FL/Fl_Menu_.H
@@ -3091,10 +3237,11 @@ Fl_Sys_Menu_Bar.o: ../FL/platform.H
 Fl_Sys_Menu_Bar.o: ../FL/platform_types.h
 Fl_Sys_Menu_Bar.o: Fl_System_Driver.H
 Fl_Sys_Menu_Bar.o: Fl_Sys_Menu_Bar_Driver.H
-Fl_Table.o: ../FL/abi-version.h
 Fl_Table.o: ../FL/Enumerations.H
 Fl_Table.o: ../FL/Fl.H
+Fl_Table.o: ../FL/Fl_Cairo.H
 Fl_Table.o: ../FL/fl_casts.H
+Fl_Table.o: ../FL/fl_config.h
 Fl_Table.o: ../FL/fl_draw.H
 Fl_Table.o: ../FL/Fl_Export.H
 Fl_Table.o: ../FL/Fl_Group.H
@@ -3107,10 +3254,11 @@ Fl_Table.o: ../FL/fl_utf8.h
 Fl_Table.o: ../FL/Fl_Valuator.H
 Fl_Table.o: ../FL/Fl_Widget.H
 Fl_Table.o: ../FL/platform_types.h
-Fl_Table_Row.o: ../FL/abi-version.h
 Fl_Table_Row.o: ../FL/Enumerations.H
 Fl_Table_Row.o: ../FL/Fl.H
+Fl_Table_Row.o: ../FL/Fl_Cairo.H
 Fl_Table_Row.o: ../FL/fl_casts.H
+Fl_Table_Row.o: ../FL/fl_config.h
 Fl_Table_Row.o: ../FL/fl_draw.H
 Fl_Table_Row.o: ../FL/Fl_Export.H
 Fl_Table_Row.o: ../FL/Fl_Group.H
@@ -3124,10 +3272,11 @@ Fl_Table_Row.o: ../FL/fl_utf8.h
 Fl_Table_Row.o: ../FL/Fl_Valuator.H
 Fl_Table_Row.o: ../FL/Fl_Widget.H
 Fl_Table_Row.o: ../FL/platform_types.h
-Fl_Tabs.o: ../FL/abi-version.h
 Fl_Tabs.o: ../FL/Enumerations.H
 Fl_Tabs.o: ../FL/Fl.H
+Fl_Tabs.o: ../FL/Fl_Cairo.H
 Fl_Tabs.o: ../FL/fl_casts.H
+Fl_Tabs.o: ../FL/fl_config.h
 Fl_Tabs.o: ../FL/fl_draw.H
 Fl_Tabs.o: ../FL/Fl_Export.H
 Fl_Tabs.o: ../FL/Fl_Group.H
@@ -3138,12 +3287,13 @@ Fl_Tabs.o: ../FL/fl_utf8.h
 Fl_Tabs.o: ../FL/Fl_Widget.H
 Fl_Tabs.o: ../FL/platform_types.h
 Fl_Text_Buffer.o: ../config.h
-Fl_Text_Buffer.o: ../FL/abi-version.h
 Fl_Text_Buffer.o: ../FL/Enumerations.H
 Fl_Text_Buffer.o: ../FL/Fl.H
 Fl_Text_Buffer.o: ../FL/fl_ask.H
 Fl_Text_Buffer.o: ../FL/fl_attr.h
+Fl_Text_Buffer.o: ../FL/Fl_Cairo.H
 Fl_Text_Buffer.o: ../FL/fl_casts.H
+Fl_Text_Buffer.o: ../FL/fl_config.h
 Fl_Text_Buffer.o: ../FL/Fl_Export.H
 Fl_Text_Buffer.o: ../FL/fl_string.h
 Fl_Text_Buffer.o: ../FL/Fl_String_class.H
@@ -3153,11 +3303,12 @@ Fl_Text_Buffer.o: ../FL/fl_utf8.h
 Fl_Text_Buffer.o: ../FL/platform_types.h
 Fl_Text_Buffer.o: flstring.h
 Fl_Text_Display.o: ../config.h
-Fl_Text_Display.o: ../FL/abi-version.h
 Fl_Text_Display.o: ../FL/Enumerations.H
 Fl_Text_Display.o: ../FL/Fl.H
 Fl_Text_Display.o: ../FL/Fl_Bitmap.H
+Fl_Text_Display.o: ../FL/Fl_Cairo.H
 Fl_Text_Display.o: ../FL/fl_casts.H
+Fl_Text_Display.o: ../FL/fl_config.h
 Fl_Text_Display.o: ../FL/Fl_Device.H
 Fl_Text_Display.o: ../FL/fl_draw.H
 Fl_Text_Display.o: ../FL/Fl_Export.H
@@ -3185,13 +3336,14 @@ Fl_Text_Display.o: ../FL/platform_types.h
 Fl_Text_Display.o: flstring.h
 Fl_Text_Display.o: Fl_Screen_Driver.H
 Fl_Text_Editor.o: ../config.h
-Fl_Text_Editor.o: ../FL/abi-version.h
 Fl_Text_Editor.o: ../FL/Enumerations.H
 Fl_Text_Editor.o: ../FL/Fl.H
 Fl_Text_Editor.o: ../FL/fl_ask.H
 Fl_Text_Editor.o: ../FL/fl_attr.h
 Fl_Text_Editor.o: ../FL/Fl_Bitmap.H
+Fl_Text_Editor.o: ../FL/Fl_Cairo.H
 Fl_Text_Editor.o: ../FL/fl_casts.H
+Fl_Text_Editor.o: ../FL/fl_config.h
 Fl_Text_Editor.o: ../FL/Fl_Device.H
 Fl_Text_Editor.o: ../FL/fl_draw.H
 Fl_Text_Editor.o: ../FL/Fl_Export.H
@@ -3217,11 +3369,12 @@ Fl_Text_Editor.o: ../FL/Fl_Window.H
 Fl_Text_Editor.o: ../FL/platform_types.h
 Fl_Text_Editor.o: flstring.h
 Fl_Text_Editor.o: Fl_Screen_Driver.H
-Fl_Tile.o: ../FL/abi-version.h
 Fl_Tile.o: ../FL/Enumerations.H
 Fl_Tile.o: ../FL/Fl.H
 Fl_Tile.o: ../FL/Fl_Bitmap.H
+Fl_Tile.o: ../FL/Fl_Cairo.H
 Fl_Tile.o: ../FL/fl_casts.H
+Fl_Tile.o: ../FL/fl_config.h
 Fl_Tile.o: ../FL/Fl_Export.H
 Fl_Tile.o: ../FL/Fl_Group.H
 Fl_Tile.o: ../FL/Fl_Image.H
@@ -3232,11 +3385,12 @@ Fl_Tile.o: ../FL/fl_utf8.h
 Fl_Tile.o: ../FL/Fl_Widget.H
 Fl_Tile.o: ../FL/Fl_Window.H
 Fl_Tile.o: ../FL/platform_types.h
-Fl_Tiled_Image.o: ../FL/abi-version.h
 Fl_Tiled_Image.o: ../FL/Enumerations.H
 Fl_Tiled_Image.o: ../FL/Fl.H
 Fl_Tiled_Image.o: ../FL/Fl_Bitmap.H
+Fl_Tiled_Image.o: ../FL/Fl_Cairo.H
 Fl_Tiled_Image.o: ../FL/fl_casts.H
+Fl_Tiled_Image.o: ../FL/fl_config.h
 Fl_Tiled_Image.o: ../FL/fl_draw.H
 Fl_Tiled_Image.o: ../FL/Fl_Export.H
 Fl_Tiled_Image.o: ../FL/Fl_Group.H
@@ -3247,11 +3401,12 @@ Fl_Tiled_Image.o: ../FL/fl_utf8.h
 Fl_Tiled_Image.o: ../FL/Fl_Widget.H
 Fl_Tiled_Image.o: ../FL/Fl_Window.H
 Fl_Tiled_Image.o: ../FL/platform_types.h
-Fl_Tooltip.o: ../FL/abi-version.h
 Fl_Tooltip.o: ../FL/Enumerations.H
 Fl_Tooltip.o: ../FL/filename.H
 Fl_Tooltip.o: ../FL/Fl.H
+Fl_Tooltip.o: ../FL/Fl_Cairo.H
 Fl_Tooltip.o: ../FL/fl_casts.H
+Fl_Tooltip.o: ../FL/fl_config.h
 Fl_Tooltip.o: ../FL/fl_draw.H
 Fl_Tooltip.o: ../FL/Fl_Export.H
 Fl_Tooltip.o: ../FL/Fl_Menu_Window.H
@@ -3265,10 +3420,11 @@ Fl_Tooltip.o: ../FL/Fl_Widget.H
 Fl_Tooltip.o: ../FL/Fl_Window.H
 Fl_Tooltip.o: ../FL/platform_types.h
 Fl_Tooltip.o: Fl_System_Driver.H
-Fl_Tree.o: ../FL/abi-version.h
 Fl_Tree.o: ../FL/Enumerations.H
 Fl_Tree.o: ../FL/Fl.H
+Fl_Tree.o: ../FL/Fl_Cairo.H
 Fl_Tree.o: ../FL/fl_casts.H
+Fl_Tree.o: ../FL/fl_config.h
 Fl_Tree.o: ../FL/fl_draw.H
 Fl_Tree.o: ../FL/Fl_Export.H
 Fl_Tree.o: ../FL/Fl_Group.H
@@ -3286,10 +3442,11 @@ Fl_Tree.o: ../FL/fl_utf8.h
 Fl_Tree.o: ../FL/Fl_Valuator.H
 Fl_Tree.o: ../FL/Fl_Widget.H
 Fl_Tree.o: ../FL/platform_types.h
-Fl_Tree_Item.o: ../FL/abi-version.h
 Fl_Tree_Item.o: ../FL/Enumerations.H
 Fl_Tree_Item.o: ../FL/Fl.H
+Fl_Tree_Item.o: ../FL/Fl_Cairo.H
 Fl_Tree_Item.o: ../FL/fl_casts.H
+Fl_Tree_Item.o: ../FL/fl_config.h
 Fl_Tree_Item.o: ../FL/fl_draw.H
 Fl_Tree_Item.o: ../FL/Fl_Export.H
 Fl_Tree_Item.o: ../FL/Fl_Group.H
@@ -3306,10 +3463,11 @@ Fl_Tree_Item.o: ../FL/fl_utf8.h
 Fl_Tree_Item.o: ../FL/Fl_Valuator.H
 Fl_Tree_Item.o: ../FL/Fl_Widget.H
 Fl_Tree_Item.o: ../FL/platform_types.h
-Fl_Tree_Item_Array.o: ../FL/abi-version.h
 Fl_Tree_Item_Array.o: ../FL/Enumerations.H
 Fl_Tree_Item_Array.o: ../FL/Fl.H
+Fl_Tree_Item_Array.o: ../FL/Fl_Cairo.H
 Fl_Tree_Item_Array.o: ../FL/fl_casts.H
+Fl_Tree_Item_Array.o: ../FL/fl_config.h
 Fl_Tree_Item_Array.o: ../FL/fl_draw.H
 Fl_Tree_Item_Array.o: ../FL/Fl_Export.H
 Fl_Tree_Item_Array.o: ../FL/Fl_Image.H
@@ -3321,11 +3479,12 @@ Fl_Tree_Item_Array.o: ../FL/fl_utf8.h
 Fl_Tree_Item_Array.o: ../FL/Fl_Widget.H
 Fl_Tree_Item_Array.o: ../FL/platform_types.h
 Fl_Tree_Prefs.o: ../config.h
-Fl_Tree_Prefs.o: ../FL/abi-version.h
 Fl_Tree_Prefs.o: ../FL/Enumerations.H
 Fl_Tree_Prefs.o: ../FL/filename.H
 Fl_Tree_Prefs.o: ../FL/Fl.H
+Fl_Tree_Prefs.o: ../FL/Fl_Cairo.H
 Fl_Tree_Prefs.o: ../FL/fl_casts.H
+Fl_Tree_Prefs.o: ../FL/fl_config.h
 Fl_Tree_Prefs.o: ../FL/Fl_Export.H
 Fl_Tree_Prefs.o: ../FL/Fl_Image.H
 Fl_Tree_Prefs.o: ../FL/Fl_Pixmap.H
@@ -3335,11 +3494,12 @@ Fl_Tree_Prefs.o: ../FL/fl_types.h
 Fl_Tree_Prefs.o: ../FL/fl_utf8.h
 Fl_Tree_Prefs.o: ../FL/platform_types.h
 Fl_Tree_Prefs.o: Fl_System_Driver.H
-fl_utf8.o: ../FL/abi-version.h
 fl_utf8.o: ../FL/Enumerations.H
 fl_utf8.o: ../FL/filename.H
 fl_utf8.o: ../FL/Fl.H
+fl_utf8.o: ../FL/Fl_Cairo.H
 fl_utf8.o: ../FL/fl_casts.H
+fl_utf8.o: ../FL/fl_config.h
 fl_utf8.o: ../FL/Fl_Export.H
 fl_utf8.o: ../FL/Fl_Preferences.H
 fl_utf8.o: ../FL/fl_types.h
@@ -3349,10 +3509,11 @@ fl_utf8.o: Fl_System_Driver.H
 fl_utf8.o: utf8_internal.h
 fl_utf8.o: xutf8/mk_wcwidth.c
 Fl_Valuator.o: ../config.h
-Fl_Valuator.o: ../FL/abi-version.h
 Fl_Valuator.o: ../FL/Enumerations.H
 Fl_Valuator.o: ../FL/Fl.H
+Fl_Valuator.o: ../FL/Fl_Cairo.H
 Fl_Valuator.o: ../FL/fl_casts.H
+Fl_Valuator.o: ../FL/fl_config.h
 Fl_Valuator.o: ../FL/Fl_Export.H
 Fl_Valuator.o: ../FL/fl_types.h
 Fl_Valuator.o: ../FL/fl_utf8.h
@@ -3361,10 +3522,11 @@ Fl_Valuator.o: ../FL/Fl_Widget.H
 Fl_Valuator.o: ../FL/math.h
 Fl_Valuator.o: ../FL/platform_types.h
 Fl_Valuator.o: flstring.h
-Fl_Value_Input.o: ../FL/abi-version.h
 Fl_Value_Input.o: ../FL/Enumerations.H
 Fl_Value_Input.o: ../FL/Fl.H
+Fl_Value_Input.o: ../FL/Fl_Cairo.H
 Fl_Value_Input.o: ../FL/fl_casts.H
+Fl_Value_Input.o: ../FL/fl_config.h
 Fl_Value_Input.o: ../FL/Fl_Export.H
 Fl_Value_Input.o: ../FL/Fl_Group.H
 Fl_Value_Input.o: ../FL/Fl_Input.H
@@ -3375,10 +3537,11 @@ Fl_Value_Input.o: ../FL/Fl_Valuator.H
 Fl_Value_Input.o: ../FL/Fl_Value_Input.H
 Fl_Value_Input.o: ../FL/math.h
 Fl_Value_Input.o: ../FL/platform_types.h
-Fl_Value_Output.o: ../FL/abi-version.h
 Fl_Value_Output.o: ../FL/Enumerations.H
 Fl_Value_Output.o: ../FL/Fl.H
+Fl_Value_Output.o: ../FL/Fl_Cairo.H
 Fl_Value_Output.o: ../FL/fl_casts.H
+Fl_Value_Output.o: ../FL/fl_config.h
 Fl_Value_Output.o: ../FL/fl_draw.H
 Fl_Value_Output.o: ../FL/Fl_Export.H
 Fl_Value_Output.o: ../FL/fl_types.h
@@ -3386,10 +3549,11 @@ Fl_Value_Output.o: ../FL/fl_utf8.h
 Fl_Value_Output.o: ../FL/Fl_Valuator.H
 Fl_Value_Output.o: ../FL/Fl_Value_Output.H
 Fl_Value_Output.o: ../FL/platform_types.h
-Fl_Value_Slider.o: ../FL/abi-version.h
 Fl_Value_Slider.o: ../FL/Enumerations.H
 Fl_Value_Slider.o: ../FL/Fl.H
+Fl_Value_Slider.o: ../FL/Fl_Cairo.H
 Fl_Value_Slider.o: ../FL/fl_casts.H
+Fl_Value_Slider.o: ../FL/fl_config.h
 Fl_Value_Slider.o: ../FL/fl_draw.H
 Fl_Value_Slider.o: ../FL/Fl_Export.H
 Fl_Value_Slider.o: ../FL/Fl_Hor_Value_Slider.H
@@ -3399,11 +3563,12 @@ Fl_Value_Slider.o: ../FL/fl_utf8.h
 Fl_Value_Slider.o: ../FL/Fl_Valuator.H
 Fl_Value_Slider.o: ../FL/Fl_Value_Slider.H
 Fl_Value_Slider.o: ../FL/platform_types.h
-fl_vertex.o: ../FL/abi-version.h
 fl_vertex.o: ../FL/Enumerations.H
 fl_vertex.o: ../FL/Fl.H
 fl_vertex.o: ../FL/Fl_Bitmap.H
+fl_vertex.o: ../FL/Fl_Cairo.H
 fl_vertex.o: ../FL/fl_casts.H
+fl_vertex.o: ../FL/fl_config.h
 fl_vertex.o: ../FL/Fl_Device.H
 fl_vertex.o: ../FL/Fl_Export.H
 fl_vertex.o: ../FL/Fl_Graphics_Driver.H
@@ -3417,11 +3582,12 @@ fl_vertex.o: ../FL/fl_utf8.h
 fl_vertex.o: ../FL/Fl_Widget.H
 fl_vertex.o: ../FL/math.h
 fl_vertex.o: ../FL/platform_types.h
-Fl_visual.o: ../FL/abi-version.h
 Fl_visual.o: ../FL/Enumerations.H
 Fl_visual.o: ../FL/Fl.H
 Fl_visual.o: ../FL/Fl_Bitmap.H
+Fl_visual.o: ../FL/Fl_Cairo.H
 Fl_visual.o: ../FL/fl_casts.H
+Fl_visual.o: ../FL/fl_config.h
 Fl_visual.o: ../FL/Fl_Device.H
 Fl_visual.o: ../FL/fl_draw.H
 Fl_visual.o: ../FL/Fl_Export.H
@@ -3445,10 +3611,11 @@ Fl_visual.o: ../FL/Fl_Widget.H
 Fl_visual.o: ../FL/platform_types.h
 Fl_visual.o: Fl_Screen_Driver.H
 Fl_Widget.o: ../config.h
-Fl_Widget.o: ../FL/abi-version.h
 Fl_Widget.o: ../FL/Enumerations.H
 Fl_Widget.o: ../FL/Fl.H
+Fl_Widget.o: ../FL/Fl_Cairo.H
 Fl_Widget.o: ../FL/fl_casts.H
+Fl_Widget.o: ../FL/fl_config.h
 Fl_Widget.o: ../FL/fl_draw.H
 Fl_Widget.o: ../FL/Fl_Export.H
 Fl_Widget.o: ../FL/Fl_Group.H
@@ -3459,11 +3626,12 @@ Fl_Widget.o: ../FL/fl_utf8.h
 Fl_Widget.o: ../FL/Fl_Widget.H
 Fl_Widget.o: ../FL/platform_types.h
 Fl_Widget.o: flstring.h
-Fl_Widget_Surface.o: ../FL/abi-version.h
 Fl_Widget_Surface.o: ../FL/Enumerations.H
 Fl_Widget_Surface.o: ../FL/Fl.H
 Fl_Widget_Surface.o: ../FL/Fl_Bitmap.H
+Fl_Widget_Surface.o: ../FL/Fl_Cairo.H
 Fl_Widget_Surface.o: ../FL/fl_casts.H
+Fl_Widget_Surface.o: ../FL/fl_config.h
 Fl_Widget_Surface.o: ../FL/Fl_Device.H
 Fl_Widget_Surface.o: ../FL/Fl_Double_Window.H
 Fl_Widget_Surface.o: ../FL/fl_draw.H
@@ -3493,11 +3661,12 @@ Fl_Widget_Surface.o: ../FL/platform_types.h
 Fl_Widget_Surface.o: Fl_Screen_Driver.H
 Fl_Widget_Surface.o: Fl_Window_Driver.H
 Fl_Window.o: ../config.h
-Fl_Window.o: ../FL/abi-version.h
 Fl_Window.o: ../FL/Enumerations.H
 Fl_Window.o: ../FL/Fl.H
 Fl_Window.o: ../FL/Fl_Bitmap.H
+Fl_Window.o: ../FL/Fl_Cairo.H
 Fl_Window.o: ../FL/fl_casts.H
+Fl_Window.o: ../FL/fl_config.h
 Fl_Window.o: ../FL/Fl_Device.H
 Fl_Window.o: ../FL/Fl_Double_Window.H
 Fl_Window.o: ../FL/fl_draw.H
@@ -3528,11 +3697,12 @@ Fl_Window.o: ../FL/platform_types.h
 Fl_Window.o: flstring.h
 Fl_Window.o: Fl_Screen_Driver.H
 Fl_Window.o: Fl_Window_Driver.H
-Fl_Window_Driver.o: ../FL/abi-version.h
 Fl_Window_Driver.o: ../FL/Enumerations.H
 Fl_Window_Driver.o: ../FL/Fl.H
 Fl_Window_Driver.o: ../FL/Fl_Bitmap.H
+Fl_Window_Driver.o: ../FL/Fl_Cairo.H
 Fl_Window_Driver.o: ../FL/fl_casts.H
+Fl_Window_Driver.o: ../FL/fl_config.h
 Fl_Window_Driver.o: ../FL/Fl_Double_Window.H
 Fl_Window_Driver.o: ../FL/fl_draw.H
 Fl_Window_Driver.o: ../FL/Fl_Export.H
@@ -3546,11 +3716,12 @@ Fl_Window_Driver.o: ../FL/Fl_Window.H
 Fl_Window_Driver.o: ../FL/platform.H
 Fl_Window_Driver.o: ../FL/platform_types.h
 Fl_Window_Driver.o: Fl_Window_Driver.H
-Fl_Window_fullscreen.o: ../FL/abi-version.h
 Fl_Window_fullscreen.o: ../FL/Enumerations.H
 Fl_Window_fullscreen.o: ../FL/Fl.H
 Fl_Window_fullscreen.o: ../FL/Fl_Bitmap.H
+Fl_Window_fullscreen.o: ../FL/Fl_Cairo.H
 Fl_Window_fullscreen.o: ../FL/fl_casts.H
+Fl_Window_fullscreen.o: ../FL/fl_config.h
 Fl_Window_fullscreen.o: ../FL/Fl_Double_Window.H
 Fl_Window_fullscreen.o: ../FL/Fl_Export.H
 Fl_Window_fullscreen.o: ../FL/Fl_Group.H
@@ -3562,11 +3733,12 @@ Fl_Window_fullscreen.o: ../FL/Fl_Widget.H
 Fl_Window_fullscreen.o: ../FL/Fl_Window.H
 Fl_Window_fullscreen.o: ../FL/platform_types.h
 Fl_Window_fullscreen.o: Fl_Window_Driver.H
-Fl_Window_hotspot.o: ../FL/abi-version.h
 Fl_Window_hotspot.o: ../FL/Enumerations.H
 Fl_Window_hotspot.o: ../FL/Fl.H
 Fl_Window_hotspot.o: ../FL/Fl_Bitmap.H
+Fl_Window_hotspot.o: ../FL/Fl_Cairo.H
 Fl_Window_hotspot.o: ../FL/fl_casts.H
+Fl_Window_hotspot.o: ../FL/fl_config.h
 Fl_Window_hotspot.o: ../FL/Fl_Double_Window.H
 Fl_Window_hotspot.o: ../FL/Fl_Export.H
 Fl_Window_hotspot.o: ../FL/Fl_Group.H
@@ -3578,11 +3750,12 @@ Fl_Window_hotspot.o: ../FL/Fl_Widget.H
 Fl_Window_hotspot.o: ../FL/Fl_Window.H
 Fl_Window_hotspot.o: ../FL/platform_types.h
 Fl_Window_hotspot.o: Fl_Window_Driver.H
-Fl_Window_iconize.o: ../FL/abi-version.h
 Fl_Window_iconize.o: ../FL/Enumerations.H
 Fl_Window_iconize.o: ../FL/Fl.H
 Fl_Window_iconize.o: ../FL/Fl_Bitmap.H
+Fl_Window_iconize.o: ../FL/Fl_Cairo.H
 Fl_Window_iconize.o: ../FL/fl_casts.H
+Fl_Window_iconize.o: ../FL/fl_config.h
 Fl_Window_iconize.o: ../FL/Fl_Double_Window.H
 Fl_Window_iconize.o: ../FL/Fl_Export.H
 Fl_Window_iconize.o: ../FL/Fl_Group.H
@@ -3594,11 +3767,12 @@ Fl_Window_iconize.o: ../FL/Fl_Widget.H
 Fl_Window_iconize.o: ../FL/Fl_Window.H
 Fl_Window_iconize.o: ../FL/platform_types.h
 Fl_Window_iconize.o: Fl_Window_Driver.H
-Fl_Wizard.o: ../FL/abi-version.h
 Fl_Wizard.o: ../FL/Enumerations.H
 Fl_Wizard.o: ../FL/Fl.H
 Fl_Wizard.o: ../FL/Fl_Bitmap.H
+Fl_Wizard.o: ../FL/Fl_Cairo.H
 Fl_Wizard.o: ../FL/fl_casts.H
+Fl_Wizard.o: ../FL/fl_config.h
 Fl_Wizard.o: ../FL/fl_draw.H
 Fl_Wizard.o: ../FL/Fl_Export.H
 Fl_Wizard.o: ../FL/Fl_Group.H
@@ -3610,6 +3784,7 @@ Fl_Wizard.o: ../FL/Fl_Window.H
 Fl_Wizard.o: ../FL/Fl_Wizard.H
 Fl_Wizard.o: ../FL/platform_types.h
 fl_write_png.o: ../config.h
+fl_write_png.o: ../FL/fl_config.h
 fl_write_png.o: ../FL/Fl_Export.H
 fl_write_png.o: ../FL/Fl_Image.H
 fl_write_png.o: ../FL/Fl_PNG_Image.H
@@ -3618,14 +3793,15 @@ fl_write_png.o: ../FL/fl_string.h
 fl_write_png.o: ../FL/fl_types.h
 fl_write_png.o: ../FL/fl_utf8.h
 Fl_x.o: ../config.h
-Fl_x.o: ../FL/abi-version.h
 Fl_x.o: ../FL/Enumerations.H
 Fl_x.o: ../FL/filename.H
 Fl_x.o: ../FL/Fl.H
 Fl_x.o: ../FL/fl_ask.H
 Fl_x.o: ../FL/fl_attr.h
 Fl_x.o: ../FL/Fl_Bitmap.H
+Fl_x.o: ../FL/Fl_Cairo.H
 Fl_x.o: ../FL/fl_casts.H
+Fl_x.o: ../FL/fl_config.h
 Fl_x.o: ../FL/Fl_Device.H
 Fl_x.o: ../FL/Fl_Double_Window.H
 Fl_x.o: ../FL/fl_draw.H
@@ -3667,11 +3843,12 @@ Fl_x.o: Fl_System_Driver.H
 Fl_x.o: Fl_Window_Driver.H
 Fl_x.o: Xutf8.h
 Fl_XBM_Image.o: ../config.h
-Fl_XBM_Image.o: ../FL/abi-version.h
 Fl_XBM_Image.o: ../FL/Enumerations.H
 Fl_XBM_Image.o: ../FL/Fl.H
 Fl_XBM_Image.o: ../FL/Fl_Bitmap.H
+Fl_XBM_Image.o: ../FL/Fl_Cairo.H
 Fl_XBM_Image.o: ../FL/fl_casts.H
+Fl_XBM_Image.o: ../FL/fl_config.h
 Fl_XBM_Image.o: ../FL/Fl_Export.H
 Fl_XBM_Image.o: ../FL/Fl_Image.H
 Fl_XBM_Image.o: ../FL/fl_types.h
@@ -3681,10 +3858,11 @@ Fl_XBM_Image.o: ../FL/Fl_XBM_Image.H
 Fl_XBM_Image.o: ../FL/platform_types.h
 Fl_XBM_Image.o: flstring.h
 Fl_XPM_Image.o: ../config.h
-Fl_XPM_Image.o: ../FL/abi-version.h
 Fl_XPM_Image.o: ../FL/Enumerations.H
 Fl_XPM_Image.o: ../FL/Fl.H
+Fl_XPM_Image.o: ../FL/Fl_Cairo.H
 Fl_XPM_Image.o: ../FL/fl_casts.H
+Fl_XPM_Image.o: ../FL/fl_config.h
 Fl_XPM_Image.o: ../FL/Fl_Export.H
 Fl_XPM_Image.o: ../FL/Fl_Image.H
 Fl_XPM_Image.o: ../FL/Fl_Pixmap.H
@@ -3693,7 +3871,6 @@ Fl_XPM_Image.o: ../FL/fl_utf8.h
 Fl_XPM_Image.o: ../FL/Fl_XPM_Image.H
 Fl_XPM_Image.o: ../FL/platform_types.h
 Fl_XPM_Image.o: flstring.h
-forms_bitmap.o: ../FL/abi-version.h
 forms_bitmap.o: ../FL/Enumerations.H
 forms_bitmap.o: ../FL/filename.H
 forms_bitmap.o: ../FL/Fl.H
@@ -3703,11 +3880,13 @@ forms_bitmap.o: ../FL/Fl_Bitmap.H
 forms_bitmap.o: ../FL/Fl_Box.H
 forms_bitmap.o: ../FL/Fl_Browser.H
 forms_bitmap.o: ../FL/Fl_Button.H
+forms_bitmap.o: ../FL/Fl_Cairo.H
 forms_bitmap.o: ../FL/fl_casts.H
 forms_bitmap.o: ../FL/Fl_Chart.H
 forms_bitmap.o: ../FL/Fl_Check_Button.H
 forms_bitmap.o: ../FL/Fl_Choice.H
 forms_bitmap.o: ../FL/Fl_Clock.H
+forms_bitmap.o: ../FL/fl_config.h
 forms_bitmap.o: ../FL/Fl_Counter.H
 forms_bitmap.o: ../FL/Fl_Device.H
 forms_bitmap.o: ../FL/Fl_Dial.H
@@ -3751,7 +3930,6 @@ forms_bitmap.o: ../FL/Fl_Widget.H
 forms_bitmap.o: ../FL/Fl_Window.H
 forms_bitmap.o: ../FL/forms.H
 forms_bitmap.o: ../FL/platform_types.h
-forms_compatibility.o: ../FL/abi-version.h
 forms_compatibility.o: ../FL/Enumerations.H
 forms_compatibility.o: ../FL/filename.H
 forms_compatibility.o: ../FL/Fl.H
@@ -3761,11 +3939,13 @@ forms_compatibility.o: ../FL/Fl_Bitmap.H
 forms_compatibility.o: ../FL/Fl_Box.H
 forms_compatibility.o: ../FL/Fl_Browser.H
 forms_compatibility.o: ../FL/Fl_Button.H
+forms_compatibility.o: ../FL/Fl_Cairo.H
 forms_compatibility.o: ../FL/fl_casts.H
 forms_compatibility.o: ../FL/Fl_Chart.H
 forms_compatibility.o: ../FL/Fl_Check_Button.H
 forms_compatibility.o: ../FL/Fl_Choice.H
 forms_compatibility.o: ../FL/Fl_Clock.H
+forms_compatibility.o: ../FL/fl_config.h
 forms_compatibility.o: ../FL/Fl_Counter.H
 forms_compatibility.o: ../FL/Fl_Device.H
 forms_compatibility.o: ../FL/Fl_Dial.H
@@ -3810,10 +3990,11 @@ forms_compatibility.o: ../FL/Fl_Widget.H
 forms_compatibility.o: ../FL/Fl_Window.H
 forms_compatibility.o: ../FL/forms.H
 forms_compatibility.o: ../FL/platform_types.h
-forms_free.o: ../FL/abi-version.h
 forms_free.o: ../FL/Enumerations.H
 forms_free.o: ../FL/Fl.H
+forms_free.o: ../FL/Fl_Cairo.H
 forms_free.o: ../FL/fl_casts.H
+forms_free.o: ../FL/fl_config.h
 forms_free.o: ../FL/Fl_Export.H
 forms_free.o: ../FL/Fl_Free.H
 forms_free.o: ../FL/fl_types.h
@@ -3821,7 +4002,6 @@ forms_free.o: ../FL/fl_utf8.h
 forms_free.o: ../FL/Fl_Widget.H
 forms_free.o: ../FL/platform_types.h
 forms_fselect.o: ../config.h
-forms_fselect.o: ../FL/abi-version.h
 forms_fselect.o: ../FL/Enumerations.H
 forms_fselect.o: ../FL/filename.H
 forms_fselect.o: ../FL/Fl.H
@@ -3831,11 +4011,13 @@ forms_fselect.o: ../FL/Fl_Bitmap.H
 forms_fselect.o: ../FL/Fl_Box.H
 forms_fselect.o: ../FL/Fl_Browser.H
 forms_fselect.o: ../FL/Fl_Button.H
+forms_fselect.o: ../FL/Fl_Cairo.H
 forms_fselect.o: ../FL/fl_casts.H
 forms_fselect.o: ../FL/Fl_Chart.H
 forms_fselect.o: ../FL/Fl_Check_Button.H
 forms_fselect.o: ../FL/Fl_Choice.H
 forms_fselect.o: ../FL/Fl_Clock.H
+forms_fselect.o: ../FL/fl_config.h
 forms_fselect.o: ../FL/Fl_Counter.H
 forms_fselect.o: ../FL/Fl_Device.H
 forms_fselect.o: ../FL/Fl_Dial.H
@@ -3880,7 +4062,6 @@ forms_fselect.o: ../FL/Fl_Window.H
 forms_fselect.o: ../FL/forms.H
 forms_fselect.o: ../FL/platform_types.h
 forms_fselect.o: flstring.h
-forms_pixmap.o: ../FL/abi-version.h
 forms_pixmap.o: ../FL/Enumerations.H
 forms_pixmap.o: ../FL/filename.H
 forms_pixmap.o: ../FL/Fl.H
@@ -3890,11 +4071,13 @@ forms_pixmap.o: ../FL/Fl_Bitmap.H
 forms_pixmap.o: ../FL/Fl_Box.H
 forms_pixmap.o: ../FL/Fl_Browser.H
 forms_pixmap.o: ../FL/Fl_Button.H
+forms_pixmap.o: ../FL/Fl_Cairo.H
 forms_pixmap.o: ../FL/fl_casts.H
 forms_pixmap.o: ../FL/Fl_Chart.H
 forms_pixmap.o: ../FL/Fl_Check_Button.H
 forms_pixmap.o: ../FL/Fl_Choice.H
 forms_pixmap.o: ../FL/Fl_Clock.H
+forms_pixmap.o: ../FL/fl_config.h
 forms_pixmap.o: ../FL/Fl_Counter.H
 forms_pixmap.o: ../FL/Fl_Device.H
 forms_pixmap.o: ../FL/Fl_Dial.H
@@ -3938,7 +4121,6 @@ forms_pixmap.o: ../FL/Fl_Widget.H
 forms_pixmap.o: ../FL/Fl_Window.H
 forms_pixmap.o: ../FL/forms.H
 forms_pixmap.o: ../FL/platform_types.h
-forms_timer.o: ../FL/abi-version.h
 forms_timer.o: ../FL/Enumerations.H
 forms_timer.o: ../FL/filename.H
 forms_timer.o: ../FL/Fl.H
@@ -3948,11 +4130,13 @@ forms_timer.o: ../FL/Fl_Bitmap.H
 forms_timer.o: ../FL/Fl_Box.H
 forms_timer.o: ../FL/Fl_Browser.H
 forms_timer.o: ../FL/Fl_Button.H
+forms_timer.o: ../FL/Fl_Cairo.H
 forms_timer.o: ../FL/fl_casts.H
 forms_timer.o: ../FL/Fl_Chart.H
 forms_timer.o: ../FL/Fl_Check_Button.H
 forms_timer.o: ../FL/Fl_Choice.H
 forms_timer.o: ../FL/Fl_Clock.H
+forms_timer.o: ../FL/fl_config.h
 forms_timer.o: ../FL/Fl_Counter.H
 forms_timer.o: ../FL/Fl_Device.H
 forms_timer.o: ../FL/Fl_Dial.H
@@ -3997,9 +4181,9 @@ forms_timer.o: ../FL/Fl_Window.H
 forms_timer.o: ../FL/forms.H
 forms_timer.o: ../FL/platform_types.h
 forms_timer.o: Fl_System_Driver.H
-freeglut_geometry.o: ../FL/abi-version.h
 freeglut_geometry.o: ../FL/Enumerations.H
 freeglut_geometry.o: ../FL/Fl.H
+freeglut_geometry.o: ../FL/fl_config.h
 freeglut_geometry.o: ../FL/Fl_Export.H
 freeglut_geometry.o: ../FL/Fl_Gl_Window.H
 freeglut_geometry.o: ../FL/fl_types.h
@@ -4008,9 +4192,9 @@ freeglut_geometry.o: ../FL/gl.h
 freeglut_geometry.o: ../FL/glut.H
 freeglut_geometry.o: ../FL/math.h
 freeglut_geometry.o: ../FL/platform_types.h
-freeglut_stroke_mono_roman.o: ../FL/abi-version.h
 freeglut_stroke_mono_roman.o: ../FL/Enumerations.H
 freeglut_stroke_mono_roman.o: ../FL/Fl.H
+freeglut_stroke_mono_roman.o: ../FL/fl_config.h
 freeglut_stroke_mono_roman.o: ../FL/Fl_Export.H
 freeglut_stroke_mono_roman.o: ../FL/Fl_Gl_Window.H
 freeglut_stroke_mono_roman.o: ../FL/fl_types.h
@@ -4018,9 +4202,9 @@ freeglut_stroke_mono_roman.o: ../FL/Fl_Window.H
 freeglut_stroke_mono_roman.o: ../FL/gl.h
 freeglut_stroke_mono_roman.o: ../FL/glut.H
 freeglut_stroke_mono_roman.o: ../FL/platform_types.h
-freeglut_stroke_roman.o: ../FL/abi-version.h
 freeglut_stroke_roman.o: ../FL/Enumerations.H
 freeglut_stroke_roman.o: ../FL/Fl.H
+freeglut_stroke_roman.o: ../FL/fl_config.h
 freeglut_stroke_roman.o: ../FL/Fl_Export.H
 freeglut_stroke_roman.o: ../FL/Fl_Gl_Window.H
 freeglut_stroke_roman.o: ../FL/fl_types.h
@@ -4028,9 +4212,9 @@ freeglut_stroke_roman.o: ../FL/Fl_Window.H
 freeglut_stroke_roman.o: ../FL/gl.h
 freeglut_stroke_roman.o: ../FL/glut.H
 freeglut_stroke_roman.o: ../FL/platform_types.h
-freeglut_teapot.o: ../FL/abi-version.h
 freeglut_teapot.o: ../FL/Enumerations.H
 freeglut_teapot.o: ../FL/Fl.H
+freeglut_teapot.o: ../FL/fl_config.h
 freeglut_teapot.o: ../FL/Fl_Export.H
 freeglut_teapot.o: ../FL/Fl_Gl_Window.H
 freeglut_teapot.o: ../FL/fl_types.h
@@ -4040,11 +4224,12 @@ freeglut_teapot.o: ../FL/glut.H
 freeglut_teapot.o: ../FL/platform_types.h
 freeglut_teapot.o: freeglut_teapot_data.h
 glut_compatibility.o: ../config.h
-glut_compatibility.o: ../FL/abi-version.h
 glut_compatibility.o: ../FL/Enumerations.H
 glut_compatibility.o: ../FL/Fl.H
 glut_compatibility.o: ../FL/Fl_Bitmap.H
+glut_compatibility.o: ../FL/Fl_Cairo.H
 glut_compatibility.o: ../FL/fl_casts.H
+glut_compatibility.o: ../FL/fl_config.h
 glut_compatibility.o: ../FL/Fl_Device.H
 glut_compatibility.o: ../FL/fl_draw.H
 glut_compatibility.o: ../FL/Fl_Export.H
@@ -4075,9 +4260,9 @@ glut_compatibility.o: flstring.h
 glut_compatibility.o: Fl_Gl_Window_Driver.H
 glut_compatibility.o: Fl_Screen_Driver.H
 glut_font.o: ../config.h
-glut_font.o: ../FL/abi-version.h
 glut_font.o: ../FL/Enumerations.H
 glut_font.o: ../FL/Fl.H
+glut_font.o: ../FL/fl_config.h
 glut_font.o: ../FL/Fl_Export.H
 glut_font.o: ../FL/Fl_Gl_Window.H
 glut_font.o: ../FL/fl_types.h
@@ -4086,11 +4271,12 @@ glut_font.o: ../FL/gl.h
 glut_font.o: ../FL/glut.H
 glut_font.o: ../FL/platform_types.h
 gl_draw.o: ../config.h
-gl_draw.o: ../FL/abi-version.h
 gl_draw.o: ../FL/Enumerations.H
 gl_draw.o: ../FL/Fl.H
 gl_draw.o: ../FL/Fl_Bitmap.H
+gl_draw.o: ../FL/Fl_Cairo.H
 gl_draw.o: ../FL/fl_casts.H
+gl_draw.o: ../FL/fl_config.h
 gl_draw.o: ../FL/Fl_Device.H
 gl_draw.o: ../FL/fl_draw.H
 gl_draw.o: ../FL/Fl_Export.H
@@ -4114,11 +4300,12 @@ gl_draw.o: ../FL/math.h
 gl_draw.o: ../FL/platform_types.h
 gl_draw.o: Fl_Gl_Window_Driver.H
 gl_start.o: ../config.h
-gl_start.o: ../FL/abi-version.h
 gl_start.o: ../FL/Enumerations.H
 gl_start.o: ../FL/Fl.H
 gl_start.o: ../FL/Fl_Bitmap.H
+gl_start.o: ../FL/Fl_Cairo.H
 gl_start.o: ../FL/fl_casts.H
+gl_start.o: ../FL/fl_config.h
 gl_start.o: ../FL/fl_draw.H
 gl_start.o: ../FL/Fl_Export.H
 gl_start.o: ../FL/Fl_Gl_Window.H
@@ -4135,12 +4322,14 @@ numericsort.o: ../FL/filename.H
 numericsort.o: ../FL/Fl_Export.H
 numericsort.o: ../FL/platform_types.h
 scandir_posix.o: ../config.h
+scandir_posix.o: ../FL/fl_config.h
 screen_xywh.o: ../config.h
-screen_xywh.o: ../FL/abi-version.h
 screen_xywh.o: ../FL/Enumerations.H
 screen_xywh.o: ../FL/Fl.H
 screen_xywh.o: ../FL/Fl_Bitmap.H
+screen_xywh.o: ../FL/Fl_Cairo.H
 screen_xywh.o: ../FL/fl_casts.H
+screen_xywh.o: ../FL/fl_config.h
 screen_xywh.o: ../FL/Fl_Device.H
 screen_xywh.o: ../FL/fl_draw.H
 screen_xywh.o: ../FL/Fl_Export.H
@@ -4165,6 +4354,7 @@ screen_xywh.o: ../FL/platform.H
 screen_xywh.o: ../FL/platform_types.h
 screen_xywh.o: Fl_Screen_Driver.H
 vsnprintf.o: ../config.h
+vsnprintf.o: ../FL/fl_config.h
 vsnprintf.o: ../FL/Fl_Export.H
 vsnprintf.o: flstring.h
 xutf8/case.o: utf8_internal.h
diff --git src/scandir_posix.c src/scandir_posix.c
index e83a120..7cdf3cb 100644
--- src/scandir_posix.c
+++ src/scandir_posix.c
@@ -31,7 +31,7 @@
  */
 
 #include <config.h>
-#if defined(USE_X11) && !defined(HAVE_SCANDIR)
+#if defined(FLTK_USE_X11) && !defined(HAVE_SCANDIR)
 
 #ifndef HAVE_PTHREAD
    /* Switch system headers into POSIX.1-1990 mode */
@@ -217,11 +217,11 @@ fl_scandir(const char *dir, struct dirent ***namelist,
   return result;
 }
 
-#else /* defined(USE_X11) && !defined(HAVE_SCANDIR) */
+#else /* defined(FLTK_USE_X11) && !defined(HAVE_SCANDIR) */
 
 /* avoid (gcc) compiler warning [-Wpedantic]
    "ISO C forbids an empty translation unit" */
 
 typedef int dummy;
 
-#endif /* defined(USE_X11) && !defined(HAVE_SCANDIR) */
+#endif /* defined(FLTK_USE_X11) && !defined(HAVE_SCANDIR) */
diff --git src/xutf8/utf8Input.c src/xutf8/utf8Input.c
index e270adf..e882e47 100644
--- src/xutf8/utf8Input.c
+++ src/xutf8/utf8Input.c
@@ -1,6 +1,7 @@
 /*
  * Author: Jean-Marc Lienher ( http://oksid.ch )
  * Copyright 2000-2003 by O'ksi'D.
+ * Copyright 2004-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
@@ -15,7 +16,7 @@
 
 #include <config.h>
 
-#if defined(USE_X11)
+#if defined(FLTK_USE_X11)
 
 #include "../Xutf8.h"
 #include <X11/X.h>
diff --git test/cairo_test.cxx test/cairo_test.cxx
index d2808e8..1fbdb0c 100644
--- test/cairo_test.cxx
+++ 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 test/color_chooser.cxx test/color_chooser.cxx
index 67881f2..257e2a8 100644
--- test/color_chooser.cxx
+++ 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 test/image.cxx test/image.cxx
index d90421a..cb6f424 100644
--- test/image.cxx
+++ 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 test/list_visuals.cxx test/list_visuals.cxx
index 77dce30..18b9804 100644
--- test/list_visuals.cxx
+++ 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 test/makedepend test/makedepend
index 001c381..2e2f306 100644
--- test/makedepend
+++ 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 test/sudoku.cxx test/sudoku.cxx
index 2a1a143..28437fb 100644
--- test/sudoku.cxx
+++ 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 test/tiled_image.cxx test/tiled_image.cxx
index 1ab2754..54e4043 100644
--- test/tiled_image.cxx
+++ 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);
Direct Link to Message ]
 
     
Previous Message ]Next Message ]
 
 

Comments are owned by the poster. All other content is copyright 1998-2024 by Bill Spitzak and others. This project is hosted by The FLTK Team. Please report site problems to 'erco@seriss.com'.