docs: Migrate from gtk-doc to gi-docgen

gtk-doc has been slowly dying for the past few years; with gi-docgen we have a nice successor. This also makes sure the C documentation also uses the GIR file, which in turn means faster build times (since all the C code doesn't have to be parsed and recompiled again), and has a clear dependency graph. See the [gi-docgen tutorial] for more info on how the system works. [gi-docgen tutorial]: https://gnome.pages.gitlab.gnome.org/gi-docgen/tutorial.html
2025-07-04 09:53:25 +00:00 · 2021-11-28 19:36:07 +01:00 · 2021-11-28 19:36:07 +01:00 · 92e80d12e8
commit 92e80d12e8
parent 3fe01513e7
134 changed files with 546 additions and 25972 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -70,7 +70,8 @@ build-image:
    - echo "FROM debian:testing" > Dockerfile
    - echo "RUN apt-get update" >> Dockerfile
    - echo "RUN apt-get install -y --no-install-recommends \\" >> Dockerfile
-    - echo "at-spi2-core build-essential desktop-file-utils ffmpeg ghostscript git glib-networking gobject-introspection graphviz graphviz-dev gtk-doc-tools hicolor-icon-theme intltool iso-codes libappstream-glib-dev libbz2-dev libdbus-glib-1-dev libexif-dev libgexiv2-dev libgirepository1.0-dev libgtk-3-bin libgtk-3-dev libgudev-1.0-dev libjson-glib-dev liblcms2-dev liblzma-dev libmng-dev libmypaint-dev libopenexr-dev libpoppler-glib-dev libraw-dev libraw20 librsvg2-dev libspiro-dev libsuitesparse-dev libtiff-dev libtiff5-dev libtool libumfpack5 libwebp-dev libwmf-dev libxmu-dev libxpm-dev luajit meson mypaint-brushes poppler-data python3 valac xauth xvfb" >> Dockerfile
+    - echo "at-spi2-core build-essential desktop-file-utils ffmpeg ghostscript git glib-networking gobject-introspection graphviz graphviz-dev hicolor-icon-theme intltool iso-codes libappstream-glib-dev libbz2-dev libdbus-glib-1-dev libexif-dev libgexiv2-dev libgirepository1.0-dev libgtk-3-bin libgtk-3-dev libgudev-1.0-dev libjson-glib-dev liblcms2-dev liblzma-dev libmng-dev libmypaint-dev libopenexr-dev libpoppler-glib-dev libraw-dev libraw20 librsvg2-dev libspiro-dev libsuitesparse-dev libtiff-dev libtiff5-dev libtool libumfpack5 libwebp-dev libwmf-dev libxmu-dev libxpm-dev luajit meson mypaint-brushes poppler-data python3 python3-pip valac xauth xsltproc xvfb" >> Dockerfile
    - echo "RUN pip3 install --no-cache-dir gi-docgen jinja2 Markdown markupsafe pygments toml typogrify" >> Dockerfile
    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:build-debian-latest --cache=true --cache-ttl=120h
@ -210,7 +211,7 @@ gimp-distcheck-debian:
    - ../autogen.sh
        --prefix="${INSTALL_PREFIX}"
        --enable-debug
-        --enable-gtk-doc
+        --enable-gi-docgen
        --enable-windows-installer
    - make -j "$(nproc)"
    - make -j "$(nproc)" check
@ -487,7 +488,7 @@ gimp-win64:
    - export PATH="`pwd`/.local/bin:$PATH"
    - mkdir _build && cd _build
    - echo 'crossroad meson ..
-              -Dgtk-doc=false && ninja && ninja install &&
+              -Dgi-docgen=false && ninja && ninja install &&
            cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
            ' |
      crossroad w64 gimp --run="-"
@ -552,7 +553,7 @@ gimp-win32:
    - export PATH="`pwd`/.local/bin:$PATH"
    - mkdir _build && cd _build
    - echo 'crossroad meson ..
-              -Dwmf=disabled  -Dmng=disabled -Dgtk-doc=false && ninja && ninja install &&
+              -Dwmf=disabled  -Dmng=disabled -Dgi_docgen=false && ninja && ninja install &&
            cp -fr $CROSSROAD_PREFIX/ ../gimp-prefix/
            ' |
      crossroad w32 gimp --run="-"
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@ -645,8 +645,8 @@ which often revamp their design, breaking URLs, etc.).
 #### Public API Documentation
 All public APIs (i.e. any function exported in a header inside
-`libgimp*/` folders) **MUST** have proper gtk-doc comments. For
+`libgimp*/` folders) **MUST** have proper GObject-introspection (GIR) comments.
-functions, these should be placed in the source file directly above.
+For functions, these should be placed in the source file directly above.
 These annotations are also relevant for [GObject
 Introspection](https://gi.readthedocs.io/en/latest/annotations/giannotations.html)
--- a/3
+++ b/3
@ -20,9 +20,6 @@ Beta software can be found at alpha.gnu.org.
    * pkg-config 0.16.0 (or preferably a newer version)
        - https://www.freedesktop.org/software/pkgconfig/
    * gtkdocize
        - https://ftp.gnome.org/pub/GNOME/sources/gtk-doc/
    * xsltproc
        - ftp://ftp.gnome.org/pub/GNOME/sources/libxslt/1.1/
--- a/Makefile.am
+++ b/Makefile.am
@ -86,11 +86,10 @@ EXTRA_DIST = \
 	authors.xsl		\
 	config.h.win32		\
 	gimp-zip.in		\
-	git-version.h		\
+	git-version.h
 	gtk-doc.make
-AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --with-python=force --with-javascript=force --with-lua=force
+AM_DISTCHECK_CONFIGURE_FLAGS = --enable-gi-docgen --with-python=force --with-javascript=force --with-lua=force
 check-defs:
--- a/autogen.sh
+++ b/autogen.sh
@ -110,35 +110,6 @@ if test x$LIBTOOLIZE != x; then
    check_version $VER $LIBTOOL_REQUIRED_VERSION
 fi
 # check if gtk-doc is explicitly disabled
 for ag_option in $AUTOGEN_CONFIGURE_ARGS $@
 do
  case $ag_option in
    -disable-gtk-doc | --disable-gtk-doc)
    enable_gtk_doc=no
  ;;
  esac
 done
 if test x$enable_gtk_doc = xno; then
  echo "skipping test for gtkdocize"
 else
  printf "checking for gtkdocize ... "
  if (gtkdocize --version) < /dev/null > /dev/null 2>&1; then
      echo "yes"
  else
      echo
      echo "  You must have gtk-doc installed to compile $PROJECT."
      echo "  Install the appropriate package for your distribution,"
      echo "  or get the source tarball at"
      echo "  https://ftp.gnome.org/pub/GNOME/sources/gtk-doc/"
      echo "  You can also use the option --disable-gtk-doc to skip"
      echo "  this test but then you will not be able to generate a"
      echo "  configure script that can build the API documentation."
      DIE=1
  fi
 fi
 printf "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... "
 if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1; then
    VER=`$AUTOCONF --version | head -n 1 \
@ -279,19 +250,6 @@ fi
 $LIBTOOLIZE --force || exit $?
 if test x$enable_gtk_doc = xno; then
    if test -f gtk-doc.make; then :; else
       echo "EXTRA_DIST = missing-gtk-doc" > gtk-doc.make
       echo "CLEANFILES = " >> gtk-doc.make
    fi
    echo "WARNING: You have disabled gtk-doc."
    echo "         As a result, you will not be able to generate the API"
    echo "         documentation and 'make dist' will not work."
    echo
 else
    gtkdocize || exit $?
 fi
 # optionally feature autoheader
 ($AUTOHEADER --version)  < /dev/null > /dev/null 2>&1 && $AUTOHEADER || exit 1
--- a/build/flatpak/org.gimp.GIMP-nightly.json
+++ b/build/flatpak/org.gimp.GIMP-nightly.json
@ -36,7 +36,6 @@
        "/share/aclocal",
        "/man",
        "/share/man",
        "/share/gtk-doc",
        "/share/vala",
        "*.la",
        "*.a"
@ -802,7 +801,7 @@
        {
            "name": "gimp",
            "config-opts": [
-                "-Dgtk-doc=false",
+                "-Dgi-docgen=false",
                "-Dicc-directory=/run/host/usr/share/color/icc/",
                "-Dbuild-id=org.gimp.GIMP.flatpak.nightly",
                "-Dcheck-update=no"
--- a/configure.ac
+++ b/configure.ac
@ -2748,22 +2748,20 @@ if test "x$platform_osx" = "xno" &&
  AC_MSG_RESULT([$with_icc_directory])
 fi
-######################################
+########################################
-# Checks for gtk-doc and docbook-tools
+# Check for gi-docgen
-######################################
+########################################
-# Check for GTK_DOC_CHECK availability. The GTK_DOC_CHECK invocation
+AC_ARG_ENABLE(gi-docgen, [  --enable-gi-docgen       build gi-docgen documentation (default=yes)], , enable_gi_docgen=yes)
 # must be on its own line, gtkdocize relies on it
 m4_ifdef([GTK_DOC_CHECK], [
 GTK_DOC_CHECK([1.0])
 ])
-# NOTE: We need to use a separate automake conditional for this
+if test "x$enable_gi_docgen" = xyes; then
-#       to make this work with the tarballs.
+  AC_PATH_PROG(GI_DOCGEN, gi-docgen, no)
-AM_CONDITIONAL(ENABLE_GTK_DOC, test "x$enable_gtk_doc" = xyes)
+  if test "x$GI_DOCGEN" = xno; then
    add_deps_error([gi-docgen], [Could not find gi-docgen in your PATH.])
  fi
 fi
-AC_ARG_ENABLE(gtk-doc-app, [  --enable-gtk-doc-app    build developer documentation for app (default=no)], , enable_gtk_doc_app=no)
+AM_CONDITIONAL(ENABLE_GI_DOCGEN, test "x$enable_gi_docgen" = xyes)
 AM_CONDITIONAL(ENABLE_GTK_DOC_APP, test "x$enable_gtk_doc_app" = xyes)
 ########################################
 # Checks for gir-doc-tool and yelp-build
@ -3109,19 +3107,11 @@ plug-ins/twain/Makefile
 plug-ins/common/Makefile
 modules/Makefile
 devel-docs/Makefile
 devel-docs/version
 devel-docs/app/Makefile
 devel-docs/g-ir-docs/Makefile
-devel-docs/libgimp/Makefile
+devel-docs/reference/Makefile
-devel-docs/libgimpbase/Makefile
+devel-docs/reference/gimp-ui/Makefile
-devel-docs/libgimpconfig/Makefile
+devel-docs/reference/gimp/Makefile
 devel-docs/libgimpcolor/Makefile
 devel-docs/libgimpmath/Makefile
 devel-docs/libgimpmodule/Makefile
 devel-docs/libgimpthumb/Makefile
 devel-docs/libgimpwidgets/Makefile
 devel-docs/performance-logs/Makefile
 devel-docs/tools/Makefile
 docs/Makefile
 menus/Makefile
 cursors/Makefile
--- a/data/images/meson.build
+++ b/data/images/meson.build
@ -1,3 +1,4 @@
 gimp_logo_dir = meson.current_source_dir()
 images = [
  'gimp-splash.png',
--- a/devel-docs/Makefile.am
+++ b/devel-docs/Makefile.am
@ -1,27 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 if ENABLE_GTK_DOC_APP
 app = app
 endif
 SUBDIRS = \
 	g-ir-docs	\
-	tools		\
+	reference	\
 	libgimpbase	\
 	libgimpcolor	\
 	libgimpconfig	\
 	libgimpmath	\
 	libgimpmodule	\
 	libgimpthumb	\
 	libgimpwidgets	\
 	libgimp		\
 	$(app)		\
 	\
 	performance-logs
 EXTRA_DIST = \
 	README				\
 	README.gtkdoc			\
 	contexts.txt			\
 	debug-plug-ins.txt		\
 	exif-handling.txt		\
@ -43,20 +29,3 @@ EXTRA_DIST = \
 	vbr.txt				\
 	xcf.txt				\
 	version.in
 # require gtk-doc when making dist
 #
 if ENABLE_GTK_DOC
 dist-check-gtk-doc:
 if ENABLE_GTK_DOC_APP
 	@echo "*** gtk-doc-app must be disabled in order to make dist"
 	@false
 endif
 else
 dist-check-gtk-doc:
 	@echo "*** gtk-doc must be enabled in order to make dist"
 	@false
 endif
 dist-hook: dist-check-gtk-doc
--- a/devel-docs/README.gtkdoc
+++ b/devel-docs/README.gtkdoc
@ -1,128 +0,0 @@
 Developers documentation using gtk-doc
 --------------------------------------
 The goal is to provide useful source documentation. Right now this is
 limited to libgimp since that is the part that is used by third-party
 coders (plug-in developers). Other parts of the code may follow later,
 but not before libgimp is properly documented.
 Principle
 ---------
 The documentation is extracted out of the source using gtk-doc (see
 http://www.gtk.org/gtk-doc/). We use a combination of comment blocks
 embedded into the source and additional information added manually
 into SGML template files.
 Requirements
 ------------
 GIMP release tarballs contain a complete set of precompiled HTML files
 as well as DocBook XML files to create other formats. You only need
 gtk-doc if you want to work on the documentation itself.  In that case
 you will need the following utilities:
 Perl v5 - Most of the scripts used are written in Perl.
 libxslt & libxml2 (version >= 2.3.6)
    This is used to convert the XML templates to HTML.
    http://xmlsoft.org/
 DocBook XML DTD v4.1.2
    http://www.docbook.org/
 gtk-doc (version >= 1.0)
    This package automatically generates DocBook documentation from
    source and is able to convert it into HTML (and other formats).
    ftp://ftp.gtk.org/pub/gtk-doc/
 You need to have all this properly setup. This includes the
 availability of an XML catalog (/etc/xml/catalog) that tells the
 XSLT processor where to look for locally installed DTDs. If that
 file is missing, the XSLT processor will try to access the DTDs
 online which will either fail or take forever. For this reason,
 the docs are not built by default. If you think you have a working
 setup, pass '--enable-gtk-doc' to configure.
 How it works
 ------------
 The following lines will only give you hints about how our system
 works. You should have understood the principles of gtk-doc before you
 touch it.
 The system is already set up, so unless there are substantial changes
 to the source e.g. new files were added, functions were added, renamed
 or removed or parameters changed, there is no need to touch the
 Makefile or any other files in the toplevel directory.
 In most cases you will work on the documentation by adding or editing
 comment blocks in the C source and by editing the template XML files
 in the tmpl directory.
 After you've done any changes to the documentation, running 'make'
 should rebuild the documentation. This will however only work if
 configure was called with the option '--enable-gtk-doc' and gtk-doc
 was successfully found. If everything was set up correctly, running
 'make' should do the trick and generate the XML and HTML files for
 you. Since the dependencies are not perfect, you sometimes need to
 call 'make clean; make' to force regeneration.
 How to write proper gtk-doc comments
 ------------------------------------
 Here are some hints on writing proper gtk-doc comments. They are based
 on the gtk-doc documentation which comes with the gtk-doc source tree:
 These are the comment blocks used in GIMP source files to document
 functions (and macros, signals and properties, if you want).
 /**
 * function_name:
 * @par1:  description of parameter 1. These can extend over more than
 *         one line.
 * @par2:  description of parameter 2
 *
 * The function description goes here. You can use @par1 to refer to
 * parameters so that they are highlighted in the output. You can also
 * use %constant for constants, function_name2() for functions and
 * #GtkWidget for links to other declarations (which may be documented
 * elsewhere).
 * 
 * Returns: an integer.
 **/
 The block starts with '/**'.
 Each line starts with ' * '.
 The second line is the function name, followed by a ':'. In order to
 document signals in inline comments, use a name of the form
 class::signal, e.g. GtkWidget::notify-child. For properties, use a
 name of the form class:property, e.g. GtkAlignment:top-padding. Note
 that gtk-doc expects the signal and property names to be spelled with
 hyphens, not underlines.
 Following the function name are the parameters, e.g. '@par1:' above.
 A blank line MUST be used to separate parameter descriptions from the
 main description (otherwise it is assumed to be a continuation of the
 parameter description.)
 After the main description is a 'Return value:' line to describe the
 returned value of the function (if it is not void).
 More information
 ----------------
 Using the system as described above, you can write documentation
 without any knowledge of DocBook XML, but when editing the templates
 you will sometimes want to do a little extra structuring or
 markup. The best source for information about DocBook seems to be
 "DocBook: The Definitive Guide" which is available online at
 http://www.docbook.org/tdg/html/.
--- a/devel-docs/app/.gitignore
+++ b/devel-docs/app/.gitignore
@ -1,20 +0,0 @@
 /Makefile
 /Makefile.in
 /.libs
 /deprecated
 /app.args
 /app.hierarchy
 /app.interfaces
 /app.prerequisites
 /app.signals
 /app-decl.txt
 /app-decl-list.txt
 /app-unused.txt
 /app-undeclared.txt
 /app-undocumented.txt
 /html
 /tmpl
 /xml
 /version
 /*.bak
 /*.stamp
--- a/devel-docs/app/Makefile.am
+++ b/devel-docs/app/Makefile.am
@ -1,128 +0,0 @@
 ## Process this file with automake to produce Makefile.in
 # The name of the module.
 DOC_MODULE = app
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code.
 DOC_SOURCE_DIR = $(top_srcdir)/$(DOC_MODULE)
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS =
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS =
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpconfig/html --extra-dir=../libgimpmath/html --extra-dir=../libgimpwidgets/html
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES = \
 	gimp-intl.h			\
 	gimpdbusservice-glue.h		\
 	gimpimage-convert-data.h	\
 	gimpimage-convert-fsdither.h	\
 	gimphelp-ids.h			\
 	gimprc-blurbs.h
 # Images to copy into HTML directory
 HTML_IMAGES =
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	-g		\
 	-I$(top_srcdir)	\
 	$(GTK_CFLAGS)	\
 	-I$(includedir)	\
 	-UGTK_DISABLE_SINGLE_INCLUDES
 if OS_WIN32
 else
 libm = -lm
 endif
 GTKDOC_LIBS = \
 	-Wl,-u,$(SYMPREFIX)xcf_init		   			     \
 	-Wl,-u,$(SYMPREFIX)internal_procs_init 				     \
 	-Wl,-u,$(SYMPREFIX)gimp_coords_mix	   			     \
 	-Wl,-u,$(SYMPREFIX)gimp_plug_in_manager_restore			     \
 	-Wl,-u,$(SYMPREFIX)gimp_lebl_dialog				     \
 	-Wl,-u,$(SYMPREFIX)gimp_config_param_spec_duplicate			     \
 	$(top_builddir)/app/app.o					     \
        $(top_builddir)/app/batch.o					     \
        $(top_builddir)/app/errors.o					     \
        $(top_builddir)/app/language.o					     \
        $(top_builddir)/app/sanity.o					     \
        $(top_builddir)/app/units.o					     \
 	$(top_builddir)/app/gimp-debug.o				     \
 	$(top_builddir)/app/gimp-log.o					     \
        $(top_builddir)/app/gui/libappgui.a				     \
 	$(top_builddir)/app/actions/libappactions.a			     \
        $(top_builddir)/app/dialogs/libappdialogs.a			     \
        $(top_builddir)/app/menus/libappmenus.a				     \
        $(top_builddir)/app/tools/libapptools.a				     \
        $(top_builddir)/app/display/libappdisplay.a			     \
        $(top_builddir)/app/propgui/libapppropgui.a			     \
        $(top_builddir)/app/widgets/libappwidgets.a			     \
 	$(top_builddir)/app/pdb/libappinternal-procs.a			     \
        $(top_builddir)/app/xcf/libappxcf.a				     \
        $(top_builddir)/app/file/libappfile.a				     \
        $(top_builddir)/app/plug-in/libappplug-in.a			     \
        $(top_builddir)/app/pdb/libapppdb.a				     \
        $(top_builddir)/app/core/libappcore.a				     \
        $(top_builddir)/app/vectors/libappvectors.a			     \
        $(top_builddir)/app/paint/libapppaint.a				     \
        $(top_builddir)/app/text/libapptext.a				     \
        $(top_builddir)/app/config/libappconfig.a			     \
        $(top_builddir)/app/gegl/libappgegl.a				     \
        $(top_builddir)/app/operations/libappoperations.a		     \
        $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la \
        $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la   \
        $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la     \
        $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la     \
        $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la       \
        $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la   \
        $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la       \
        $(GTK_LIBS)                                                          \
        $(LIBART_LIBS)                                                       \
        $(PANGOFT2_LIBS)                                                     \
        $(FONTCONFIG_LIBS)                                                   \
        $(FREETYPE_LIBS)                                                     \
        $(HARFBUZZ_LIBS)                                                     \
 	$(GEGL_LIBS)							     \
 	$(RT_LIBS)							     \
 	$(INTLLIBS)							     \
 	$(libm)
 if ENABLE_GTK_DOC_APP
 include $(top_srcdir)/gtk-doc.make
 else
 EXTRA_DIST = \
 	$(DOC_MODULE)-docs.sgml		\
 	$(DOC_MODULE)-overrides.txt	\
 	$(DOC_MODULE)-sections.txt
 endif
 # Other files to distribute
 EXTRA_DIST += \
 	$(DOC_MODULE).types
--- a/devel-docs/app/app-docs.sgml
+++ b/devel-docs/app/app-docs.sgml
--- a/devel-docs/app/app-overrides.txt
+++ b/devel-docs/app/app-overrides.txt
--- a/devel-docs/app/app-sections.txt
+++ b/devel-docs/app/app-sections.txt
--- a/devel-docs/app/app.types
+++ b/devel-docs/app/app.types
@ -1,442 +0,0 @@
 #include <gtk/gtk.h>
 #include "libgimpwidgets/gimpwidgets.h"
 gimp_action_editor_get_type
 gimp_action_factory_get_type
 gimp_action_get_type
 gimp_action_group_get_type
 gimp_action_view_get_type
 gimp_airbrush_get_type
 gimp_airbrush_options_get_type
 gimp_airbrush_tool_get_type
 gimp_align_options_get_type
 gimp_align_tool_get_type
 gimp_anchor_get_type
 gimp_bezier_stroke_get_type
 gimp_blend_options_get_type
 gimp_blend_tool_get_type
 gimp_blob_editor_get_type
 gimp_brightness_contrast_config_get_type
 gimp_brightness_contrast_tool_get_type
 gimp_brush_clipboard_get_type
 gimp_brush_core_get_type
 gimp_brush_editor_get_type
 gimp_brush_factory_view_get_type
 gimp_brush_generated_get_type
 gimp_brush_get_type
 gimp_brush_pipe_get_type
 gimp_brush_select_get_type
 gimp_brush_tool_get_type
 gimp_bucket_fill_options_get_type
 gimp_bucket_fill_tool_get_type
 gimp_buffer_get_type
 gimp_buffer_view_get_type
 gimp_by_color_select_tool_get_type
 gimp_cage_config_get_type
 gimp_cage_options_get_type
 gimp_cage_tool_get_type
 gimp_canvas_arc_get_type
 gimp_canvas_boundary_get_type
 gimp_canvas_corner_get_type
 gimp_canvas_cursor_get_type
 gimp_canvas_get_type
 gimp_canvas_grid_get_type
 gimp_canvas_group_get_type
 gimp_canvas_guide_get_type
 gimp_canvas_handle_get_type
 gimp_canvas_item_get_type
 gimp_canvas_layer_boundary_get_type
 gimp_canvas_line_get_type
 gimp_canvas_passe_partout_get_type
 gimp_canvas_path_get_type
 gimp_canvas_pen_get_type
 gimp_canvas_polygon_get_type
 gimp_canvas_progress_get_type
 gimp_canvas_proxy_group_get_type
 gimp_canvas_rectangle_get_type
 gimp_canvas_rectangle_guides_get_type
 gimp_canvas_sample_point_get_type
 gimp_canvas_text_cursor_get_type
 gimp_canvas_transform_guides_get_type
 gimp_canvas_transform_preview_get_type
 gimp_cell_renderer_dashes_get_type
 gimp_cell_renderer_viewable_get_type
 gimp_channel_get_type
 gimp_channel_prop_undo_get_type
 gimp_channel_tree_view_get_type
 gimp_channel_undo_get_type
 gimp_clone_get_type
 gimp_clone_options_get_type
 gimp_clone_tool_get_type
 gimp_color_balance_config_get_type
 gimp_color_balance_tool_get_type
 gimp_color_bar_get_type
 gimp_color_dialog_get_type
 gimp_color_display_editor_get_type
 gimp_color_editor_get_type
 gimp_color_frame_get_type
 gimp_color_options_get_type
 gimp_color_panel_get_type
 gimp_color_picker_options_get_type
 gimp_color_picker_tool_get_type
 gimp_color_selector_palette_get_type
 gimp_color_tool_get_type
 gimp_colorize_config_get_type
 gimp_colorize_tool_get_type
 gimp_colormap_editor_get_type
 gimp_combo_tag_entry_get_type
 gimp_component_editor_get_type
 gimp_container_box_get_type
 gimp_container_combo_box_get_type
 gimp_container_editor_get_type
 gimp_container_entry_get_type
 gimp_container_get_type
 gimp_container_grid_view_get_type
 gimp_container_popup_get_type
 gimp_container_tree_view_get_type
 gimp_container_view_interface_get_type
 gimp_context_get_type
 gimp_controller_editor_get_type
 gimp_controller_info_get_type
 gimp_controller_keyboard_get_type
 gimp_controller_list_get_type
 gimp_controller_mouse_get_type
 gimp_controller_wheel_get_type
 gimp_convolve_get_type
 gimp_convolve_options_get_type
 gimp_convolve_tool_get_type
 gimp_core_config_get_type
 gimp_crop_options_get_type
 gimp_crop_tool_get_type
 gimp_cursor_view_get_type
 gimp_curve_get_type
 gimp_curve_view_get_type
 gimp_curves_config_get_type
 gimp_curves_tool_get_type
 gimp_dash_editor_get_type
 gimp_data_editor_get_type
 gimp_data_factory_get_type
 gimp_data_factory_view_get_type
 gimp_data_get_type
 gimp_dbus_service_get_type
 gimp_desaturate_config_get_type
 gimp_desaturate_tool_get_type
 gimp_device_info_get_type
 gimp_device_manager_get_type
 gimp_device_status_get_type
 gimp_dialog_factory_get_type
 gimp_display_config_get_type
 gimp_display_get_type
 gimp_display_options_fullscreen_get_type
 gimp_display_options_get_type
 gimp_display_options_no_image_get_type
 gimp_display_shell_get_type
 gimp_dock_columns_get_type
 gimp_dock_container_interface_get_type
 gimp_dock_get_type
 gimp_dock_window_get_type
 gimp_dockable_get_type
 gimp_dockbook_get_type
 gimp_docked_interface_get_type
 gimp_document_list_get_type
 gimp_document_view_get_type
 gimp_dodge_burn_get_type
 gimp_dodge_burn_options_get_type
 gimp_dodge_burn_tool_get_type
 gimp_draw_tool_get_type
 gimp_drawable_get_type
 gimp_drawable_mod_undo_get_type
 gimp_drawable_stack_get_type
 gimp_drawable_tree_view_get_type
 gimp_drawable_undo_get_type
 gimp_dynamics_get_type
 gimp_dynamics_output_get_type
 gimp_edit_selection_tool_get_type
 gimp_editor_get_type
 gimp_ellipse_select_tool_get_type
 gimp_enum_action_get_type
 gimp_environ_table_get_type
 gimp_eraser_get_type
 gimp_eraser_options_get_type
 gimp_eraser_tool_get_type
 gimp_error_console_get_type
 gimp_error_dialog_get_type
 gimp_fg_bg_editor_get_type
 gimp_fg_bg_view_get_type
 gimp_file_dialog_get_type
 gimp_file_proc_view_get_type
 gimp_fill_editor_get_type
 gimp_fill_options_get_type
 gimp_filtered_container_get_type
 gimp_flip_options_get_type
 gimp_flip_tool_get_type
 gimp_floating_sel_undo_get_type
 gimp_font_get_type
 gimp_font_list_get_type
 gimp_font_select_get_type
 gimp_font_view_get_type
 gimp_free_select_tool_get_type
 gimp_fuzzy_select_tool_get_type
 gimp_gegl_tool_get_type
 gimp_get_type
 gimp_gradient_editor_get_type
 gimp_gradient_get_type
 gimp_gradient_select_get_type
 gimp_grid_editor_get_type
 gimp_grid_get_type
 gimp_group_layer_get_type
 gimp_group_layer_undo_get_type
 gimp_gui_config_get_type
 gimp_guide_get_type
 gimp_guide_undo_get_type
 gimp_handle_bar_get_type
 gimp_heal_get_type
 gimp_heal_tool_get_type
 gimp_histogram_box_get_type
 gimp_histogram_editor_get_type
 gimp_histogram_options_get_type
 gimp_histogram_view_get_type
 gimp_hue_saturation_config_get_type
 gimp_hue_saturation_tool_get_type
 gimp_id_table_get_type
 gimp_image_comment_editor_get_type
 gimp_image_editor_get_type
 gimp_image_get_type
 gimp_image_map_config_get_type
 gimp_image_map_get_type
 gimp_image_map_options_get_type
 gimp_image_map_tool_get_type
 gimp_image_parasite_view_get_type
 gimp_image_profile_view_get_type
 gimp_image_prop_view_get_type
 gimp_image_undo_get_type
 gimp_image_view_get_type
 gimp_image_window_get_type
 gimp_imagefile_get_type
 gimp_ink_get_type
 gimp_ink_options_get_type
 gimp_ink_tool_get_type
 gimp_ink_undo_get_type
 gimp_interpreter_db_get_type
 gimp_item_get_type
 gimp_item_prop_undo_get_type
 gimp_item_stack_get_type
 gimp_item_tree_get_type
 gimp_item_tree_view_get_type
 gimp_item_undo_get_type
 gimp_language_combo_box_get_type
 gimp_language_entry_get_type
 gimp_language_store_get_type
 gimp_layer_get_type
 gimp_layer_mask_get_type
 gimp_layer_mask_prop_undo_get_type
 gimp_layer_mask_undo_get_type
 gimp_layer_prop_undo_get_type
 gimp_layer_tree_view_get_type
 gimp_layer_undo_get_type
 gimp_levels_config_get_type
 gimp_levels_tool_get_type
 gimp_list_get_type
 gimp_magnify_options_get_type
 gimp_magnify_tool_get_type
 gimp_mask_undo_get_type
 gimp_measure_options_get_type
 gimp_measure_tool_get_type
 gimp_menu_dock_get_type
 gimp_menu_factory_get_type
 gimp_message_box_get_type
 gimp_message_dialog_get_type
 gimp_move_options_get_type
 gimp_move_tool_get_type
 gimp_multi_window_strategy_get_type
 gimp_navigation_editor_get_type
 gimp_navigation_view_get_type
 gimp_object_get_type
 gimp_operation_color_balance_get_type
 gimp_operation_colorize_get_type
 gimp_operation_curves_get_type
 gimp_operation_desaturate_get_type
 gimp_operation_hue_saturation_get_type
 gimp_operation_levels_get_type
 gimp_operation_point_filter_get_type
 gimp_operation_point_layer_mode_get_type
 gimp_operation_posterize_get_type
 gimp_operation_threshold_get_type
 gimp_operation_addition_mode_get_type
 gimp_operation_anti_erase_mode_get_type
 gimp_operation_behind_mode_get_type
 gimp_operation_burn_mode_get_type
 gimp_operation_cage_coef_calc_get_type
 gimp_operation_cage_transform_get_type
 gimp_operation_color_erase_mode_get_type
 gimp_operation_color_mode_get_type
 gimp_operation_darken_only_mode_get_type
 gimp_operation_difference_mode_get_type
 gimp_operation_dissolve_mode_get_type
 gimp_operation_divide_mode_get_type
 gimp_operation_dodge_mode_get_type
 gimp_operation_erase_mode_get_type
 gimp_operation_grain_extract_mode_get_type
 gimp_operation_grain_merge_mode_get_type
 gimp_operation_hardlight_mode_get_type
 gimp_operation_hue_mode_get_type
 gimp_operation_lighten_only_mode_get_type
 gimp_operation_multiply_mode_get_type
 gimp_operation_overlay_mode_get_type
 gimp_operation_replace_mode_get_type
 gimp_operation_saturation_mode_get_type
 gimp_operation_screen_mode_get_type
 gimp_operation_softlight_mode_get_type
 gimp_operation_subtract_mode_get_type
 gimp_operation_value_mode_get_type
 gimp_overlay_box_get_type
 gimp_overlay_dialog_get_type
 gimp_overlay_frame_get_type
 gimp_paint_core_get_type
 gimp_paint_info_get_type
 gimp_paint_options_get_type
 gimp_paint_tool_get_type
 gimp_paintbrush_get_type
 gimp_paintbrush_tool_get_type
 gimp_palette_editor_get_type
 gimp_palette_get_type
 gimp_palette_select_get_type
 gimp_palette_view_get_type
 gimp_paned_box_get_type
 gimp_parasite_list_get_type
 gimp_pattern_clipboard_get_type
 gimp_pattern_factory_view_get_type
 gimp_pattern_get_type
 gimp_pattern_select_get_type
 gimp_pdb_dialog_get_type
 gimp_pdb_get_type
 gimp_pdb_progress_get_type
 gimp_pencil_get_type
 gimp_pencil_options_get_type
 gimp_pencil_tool_get_type
 gimp_perspective_clone_get_type
 gimp_perspective_clone_options_get_type
 gimp_perspective_clone_tool_get_type
 gimp_perspective_tool_get_type
 gimp_pickable_interface_get_type
 gimp_plug_in_action_get_type
 gimp_plug_in_def_get_type
 gimp_plug_in_get_type
 gimp_plug_in_manager_get_type
 gimp_plug_in_procedure_get_type
 gimp_plugin_config_get_type
 gimp_posterize_config_get_type
 gimp_posterize_tool_get_type
 gimp_procedure_get_type
 gimp_profile_chooser_dialog_get_type
 gimp_progress_box_get_type
 gimp_progress_dialog_get_type
 gimp_progress_interface_get_type
 gimp_projectable_interface_get_type
 gimp_projection_get_type
 gimp_radio_action_get_type
 gimp_rc_get_type
 gimp_rectangle_options_interface_get_type
 gimp_rectangle_select_options_get_type
 gimp_rectangle_select_tool_get_type
 gimp_rectangle_tool_interface_get_type
 gimp_region_select_options_get_type
 gimp_region_select_tool_get_type
 gimp_rotate_tool_get_type
 gimp_sample_point_editor_get_type
 gimp_sample_point_undo_get_type
 gimp_scale_button_get_type
 gimp_scale_combo_box_get_type
 gimp_scale_tool_get_type
 gimp_selection_editor_get_type
 gimp_selection_get_type
 gimp_selection_options_get_type
 gimp_selection_tool_get_type
 gimp_session_info_get_type
 gimp_session_managed_interface_get_type
 gimp_settings_box_get_type
 gimp_settings_editor_get_type
 gimp_shear_tool_get_type
 gimp_single_window_strategy_get_type
 gimp_size_box_get_type
 gimp_smudge_get_type
 gimp_smudge_options_get_type
 gimp_smudge_tool_get_type
 gimp_source_core_get_type
 gimp_source_options_get_type
 gimp_source_tool_get_type
 gimp_spin_scale_get_type
 gimp_statusbar_get_type
 gimp_string_action_get_type
 gimp_stroke_editor_get_type
 gimp_stroke_get_type
 gimp_stroke_options_get_type
 gimp_sub_progress_get_type
 gimp_tag_cache_get_type
 gimp_tag_entry_get_type
 gimp_tag_get_type
 gimp_tag_popup_get_type
 gimp_tagged_interface_get_type
 gimp_template_editor_get_type
 gimp_template_get_type
 gimp_template_view_get_type
 gimp_temporary_procedure_get_type
 gimp_text_buffer_get_type
 gimp_text_editor_get_type
 gimp_text_get_type
 gimp_text_layer_get_type
 gimp_text_layout_get_type
 gimp_text_options_get_type
 gimp_text_proxy_get_type
 gimp_text_style_editor_get_type
 gimp_text_tool_get_type
 gimp_text_undo_get_type
 gimp_threshold_config_get_type
 gimp_threshold_tool_get_type
 gimp_thumb_box_get_type
 gimp_toggle_action_get_type
 gimp_tool_control_get_type
 gimp_tool_dialog_get_type
 gimp_tool_editor_get_type
 gimp_tool_get_type
 gimp_tool_info_get_type
 gimp_tool_options_editor_get_type
 gimp_tool_options_get_type
 gimp_tool_palette_get_type
 gimp_tool_preset_get_type
 gimp_toolbox_get_type
 gimp_transform_options_get_type
 gimp_transform_tool_get_type
 gimp_transform_tool_undo_get_type
 gimp_tree_handler_get_type
 gimp_ui_manager_get_type
 gimp_undo_editor_get_type
 gimp_undo_get_type
 gimp_undo_stack_get_type
 gimp_unit_combo_box_get_type
 gimp_unit_store_get_type
 gimp_vector_options_get_type
 gimp_vector_tool_get_type
 gimp_vectors_get_type
 gimp_vectors_mod_undo_get_type
 gimp_vectors_prop_undo_get_type
 gimp_vectors_tree_view_get_type
 gimp_vectors_undo_get_type
 gimp_view_get_type
 gimp_view_renderer_brush_get_type
 gimp_view_renderer_buffer_get_type
 gimp_view_renderer_drawable_get_type
 gimp_view_renderer_get_type
 gimp_view_renderer_gradient_get_type
 gimp_view_renderer_image_get_type
 gimp_view_renderer_imagefile_get_type
 gimp_view_renderer_layer_get_type
 gimp_view_renderer_palette_get_type
 gimp_view_renderer_vectors_get_type
 gimp_viewable_button_get_type
 gimp_viewable_dialog_get_type
 gimp_viewable_get_type
 gimp_window_get_type
 gimp_window_strategy_interface_get_type
 gtk_hwrap_box_get_type
 gtk_wrap_box_get_type
--- a/devel-docs/app/meson.build
+++ b/devel-docs/app/meson.build
@ -1,98 +0,0 @@
 module_name = 'app'
 app_libs = shared_library('app',
  include_directories: [ rootInclude, rootAppInclude, configInclude, ],
  link_whole: [
    libappconfig,
    libappcore,
    libappfile,
    libappfiledata,
    libappgegl,
    libappinternalprocs,
    libapplayermodes,
    libapplayermodeslegacy,
    libappoperations,
    libapppaint,
    libapppdb,
    libappplugin,
    libapptext,
    libappvectors,
    libappxcf,
    libappactions,
    libappdialogs,
    libappdisplay,
    libappgui,
    libappmenus,
    libapppropgui,
    libapptools,
    libappwidgets,
  ],
  link_with: [
    libgimpbase,
    libgimpcolor,
    libgimpconfig,
    libgimpmath,
    libgimpmodule,
    libgimpthumb,
    libgimpwidgets,
  ],
  dependencies: [
    gegl, gdk_pixbuf, gtk3,
  ],
 )
 gnome.gtkdoc(module_name,
  main_sgml: module_name + '-docs.sgml',
  gobject_typesfile: files(module_name + '.types'),
  src_dir: meson.source_root() / 'app',
  content_files: [],
  ignore_headers: [
    'gimp-intl.h',
    'gimpdbusservice-glue.h',
    'gimphelp-ids.h',
    'gimpimage-convert-data.h',
    'gimpimage-convert-fsdither.h',
    'gimprc-blurbs.h',
  ],
  dependencies: [
    fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
    gegl,
    declare_dependency(
      include_directories: rootInclude,
      link_with: [
      app_libs,
      libgimpbase,
      libgimpcolor,
      libgimpconfig,
      libgimpmath,
      libgimpmodule,
      libgimpthumb,
      libgimpwidgets,
    ])
  ],
  scan_args: scan_args_common,
  mkdb_args: mkdb_args_common,
  c_args: [
    '-UGTK_DISABLE_SINGLE_INCLUDES',
    '-fdiagnostics-color=always',
  ],
  fixxref_args:  [
    '--extra-dir=' + devel_docs_build_root / 'libgimpbase'    / 'html',
    '--extra-dir=' + devel_docs_build_root / 'libgimpcolor'   / 'html',
    '--extra-dir=' + devel_docs_build_root / 'libgimpconfig'  / 'html',
    '--extra-dir=' + devel_docs_build_root / 'libgimpmath'    / 'html',
    '--extra-dir=' + devel_docs_build_root / 'libgimpwidgets' / 'html',
  ],
  install: true,
 )
--- a/devel-docs/libgimp/Makefile.am
+++ b/devel-docs/libgimp/Makefile.am
@ -1,85 +0,0 @@
 ## Process this file with automake to produce Makefile.in
 # The name of the module.
 DOC_MODULE = libgimp3
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code.
 DOC_SOURCE_DIR = $(top_srcdir)/libgimp
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS =
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS = \
 	--extra-dir=../libgimpbase/html		\
 	--extra-dir=../libgimpcolor/html	\
 	--extra-dir=../libgimpconfig/html	\
 	--extra-dir=../libgimpmath/html		\
 	--extra-dir=../libgimpwidgets/html
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES = \
 	gimp-debug.h			\
 	gimp-private.h			\
 	gimp-shm.h			\
 	gimppdb-private.h		\
 	gimppdbprocedure.h		\
 	gimpgpparams.h			\
 	gimppixbuf.h			\
 	gimpplugin-private.h		\
 	gimpprocedure-private.h		\
 	gimpprocedureconfig-private.h	\
 	gimptilebackendplugin.h		\
 	gimpunit_pdb.h			\
 	gimpunitcache.h			\
 	libgimp-intl.h			\
 	stdplugins-intl.h
 # Images to copy into HTML directory
 HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =
 # Other files to distribute
 extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	@CFLAGS@		\
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
 	@GEGL_CFLAGS@		\
 	@GTK_CFLAGS@
 GTKDOC_LIBS = \
 	$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la		\
 	$(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la	\
 	$(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la		\
 	$(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la	\
 	$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la	\
 	$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la			\
 	$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la		\
 	@GEGL_LIBS@								\
 	@GTK_LIBS@
 include $(top_srcdir)/gtk-doc.make
 # This is a hack. The entire commit must be reverted once
 # this file gets removed by gtk-doc.make
 CLEANFILES += $(DOC_MODULE).actions
--- a/devel-docs/libgimp/libgimp3-docs.sgml
+++ b/devel-docs/libgimp/libgimp3-docs.sgml
@ -1,182 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                      'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
 <book lang="en" id="libgimp-libgimpui" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
    <title>GIMP 3 Library Reference Manual</title>
    <releaseinfo>
      for GIMP <xi:include href="../version" parse="text"/>
    </releaseinfo>
  </bookinfo>
  <part id="libgimp">
    <title>GIMP Library</title>
    <partintro id="libgimp-introduction">
      <para>
 	GIMP's Procedural Database (PDB) offers an interface to core
 	functions and to functionality provided by plug-ins. The role
 	of libgimp is to provide C bindings for this interface.
      </para>
    </partintro>
    <chapter id="libgimp-general">
      <title>Functions not Related to Specific Images</title>
      <xi:include href="xml/gimp.xml" />
      <xi:include href="xml/gimpenums.xml" />
      <xi:include href="xml/gimpbuffer.xml" />
      <xi:include href="xml/gimpcontext.xml" />
      <xi:include href="xml/gimpgimprc.xml" />
      <xi:include href="xml/gimphelp.xml" />
      <xi:include href="xml/gimpmessage.xml" />
      <xi:include href="xml/gimpplugin.xml" />
      <xi:include href="xml/gimppdb.xml" />
      <xi:include href="xml/gimpprocedure.xml" />
      <xi:include href="xml/gimpprocedure-params.xml" />
      <xi:include href="xml/gimpimageprocedure.xml" />
      <xi:include href="xml/gimpfileprocedure.xml" />
      <xi:include href="xml/gimploadprocedure.xml" />
      <xi:include href="xml/gimpthumbnailprocedure.xml" />
      <xi:include href="xml/gimpsaveprocedure.xml" />
      <xi:include href="xml/gimpprocedureconfig.xml" />
      <xi:include href="xml/gimpparamspecs.xml" />
      <xi:include href="xml/gimpprogress.xml" />
      <xi:include href="xml/gimpdebug.xml" />
    </chapter>
    <chapter id="libgimp-image">
      <title>Manipulating Images and their Properties</title>
      <xi:include href="xml/gimpchannel.xml" />
      <xi:include href="xml/gimpdisplay.xml" />
      <xi:include href="xml/gimpdrawable.xml" />
      <xi:include href="xml/gimpdrawablecolor.xml" />
      <xi:include href="xml/gimpdrawableedit.xml" />
      <xi:include href="xml/gimpedit.xml" />
      <xi:include href="xml/gimpfile.xml" />
      <xi:include href="xml/gimpfloatingsel.xml" />
      <xi:include href="xml/gimpimage.xml" />
      <xi:include href="xml/gimpimagecolorprofile.xml" />
      <xi:include href="xml/gimpimageconvert.xml" />
      <xi:include href="xml/gimpimagegrid.xml" />
      <xi:include href="xml/gimpimageguides.xml" />
      <xi:include href="xml/gimpimagesamplepoints.xml" />
      <xi:include href="xml/gimpimageselect.xml" />
      <xi:include href="xml/gimpimagetransform.xml" />
      <xi:include href="xml/gimpimageundo.xml" />
      <xi:include href="xml/gimpmetadata.xml" />
      <xi:include href="xml/gimpitem.xml" />
      <xi:include href="xml/gimpitemtransform.xml" />
      <xi:include href="xml/gimplayer.xml" />
      <xi:include href="xml/gimplayermask.xml" />
      <xi:include href="xml/gimpselection.xml" />
      <xi:include href="xml/gimptextlayer.xml" />
      <xi:include href="xml/gimptexttool.xml" />
      <xi:include href="xml/gimppainttools.xml" />
      <xi:include href="xml/gimpvectors.xml" />
    </chapter>
    <chapter id="libgimp-data">
      <title>Data Objects</title>
      <xi:include href="xml/gimpbrush.xml" />
      <xi:include href="xml/gimpbrushes.xml" />
      <xi:include href="xml/gimpdynamics.xml" />
      <xi:include href="xml/gimpfonts.xml" />
      <xi:include href="xml/gimpgradient.xml" />
      <xi:include href="xml/gimpgradients.xml" />
      <xi:include href="xml/gimppalette.xml" />
      <xi:include href="xml/gimppalettes.xml" />
      <xi:include href="xml/gimppattern.xml" />
      <xi:include href="xml/gimppatterns.xml" />
    </chapter>
    <chapter id="libgimp-selectors">
      <title>Controlling the Core's Selection Dialogs</title>
      <xi:include href="xml/gimpselectbutton.xml" />
      <xi:include href="xml/gimpbrushselectbutton.xml" />
      <xi:include href="xml/gimpfontselectbutton.xml" />
      <xi:include href="xml/gimpgradientselectbutton.xml" />
      <xi:include href="xml/gimppaletteselectbutton.xml" />
      <xi:include href="xml/gimppatternselectbutton.xml" />
      <xi:include href="xml/gimpbrushselect.xml" />
      <xi:include href="xml/gimpfontselect.xml" />
      <xi:include href="xml/gimpgradientselect.xml" />
      <xi:include href="xml/gimppaletteselect.xml" />
      <xi:include href="xml/gimppatternselect.xml" />
    </chapter>
  </part>
  <part id="libgimpui">
    <title>GIMP User Interface Library</title>
    <chapter id="libgimpui-hierarchy">
      <title>Object Hierarchy</title>
      <xi:include href="xml/tree_index.sgml" />
    </chapter>
    <xi:include href="xml/gimpui.xml" />
    <xi:include href="xml/gimpexport.xml" />
    <xi:include href="xml/gimpdrawablepreview.xml" />
    <xi:include href="xml/gimpaspectpreview.xml" />
    <xi:include href="xml/gimpzoompreview.xml" />
    <xi:include href="xml/gimpitemcombobox.xml" />
    <xi:include href="xml/gimpimagecombobox.xml" />
    <xi:include href="xml/gimpprogressbar.xml" />
    <xi:include href="xml/gimpprocbrowserdialog.xml" />
    <xi:include href="xml/gimpproceduredialog.xml" />
    <xi:include href="xml/gimpprocview.xml" />
  </part>
  <index id="api-index-full">
    <title>Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.2" id="api-index-2-2">
    <title>Index of new symbols in GIMP 2.2</title>
    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.4" id="api-index-2-4">
    <title>Index of new symbols in GIMP 2.4</title>
    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.6" id="api-index-2-6">
    <title>Index of new symbols in GIMP 2.6</title>
    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.8" id="api-index-2-8">
    <title>Index of new symbols in GIMP 2.8</title>
    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10" id="api-index-2-10">
    <title>Index of new symbols in GIMP 2.10</title>
    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.2" id="api-index-2-10-2">
    <title>Index of new symbols in GIMP 2.10.2</title>
    <xi:include href="xml/api-index-2.10.2.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.4" id="api-index-2-10-4">
    <title>Index of new symbols in GIMP 2.10.4</title>
    <xi:include href="xml/api-index-2.10.4.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.6" id="api-index-2-10-6">
    <title>Index of new symbols in GIMP 2.10.6</title>
    <xi:include href="xml/api-index-2.10.6.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.14" id="api-index-2-10-14">
    <title>Index of new symbols in GIMP 2.10.14</title>
    <xi:include href="xml/api-index-2.10.14.xml"><xi:fallback /></xi:include>
  </index>
  <index role="3.0" id="api-index-3-0">
    <title>Index of new symbols in GIMP 3.0</title>
    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
  </index>
  <index role="deprecated" id="api-index-deprecated">
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/devel-docs/libgimp/libgimp3-include.c
+++ b/devel-docs/libgimp/libgimp3-include.c
@ -1,15 +0,0 @@
 /*
 *   gtk-doc can't build libgimp-scan.c without PLUG_IN_INFO being defined
 *   so we include this file as a workaround
 */
 #include <glib.h>
 #include <libgimp/gimp.h>
 GimpPlugInInfo PLUG_IN_INFO =
 {
  NULL,
  NULL,
  NULL,
  NULL,
 };
--- a/devel-docs/libgimp/libgimp3-overrides.txt
+++ b/devel-docs/libgimp/libgimp3-overrides.txt
--- a/devel-docs/libgimp/libgimp3-sections.txt
+++ b/devel-docs/libgimp/libgimp3-sections.txt
--- a/devel-docs/libgimp/libgimp3.types
+++ b/devel-docs/libgimp/libgimp3.types
@ -1,39 +0,0 @@
 #include <gtk/gtk.h>
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 gimp_aspect_preview_get_type
 gimp_brush_select_button_get_type
 gimp_channel_combo_box_get_type
 gimp_channel_get_type
 gimp_display_get_type
 gimp_drawable_combo_box_get_type
 gimp_drawable_get_type
 gimp_drawable_preview_get_type
 gimp_file_procedure_get_type
 gimp_font_select_button_get_type
 gimp_gradient_select_button_get_type
 gimp_image_combo_box_get_type
 gimp_image_get_type
 gimp_image_procedure_get_type
 gimp_layer_combo_box_get_type
 gimp_layer_get_type
 gimp_layer_mask_get_type
 gimp_load_procedure_get_type
 gimp_palette_select_button_get_type
 gimp_pattern_select_button_get_type
 gimp_pdb_get_type
 gimp_plug_in_get_type
 gimp_proc_browser_dialog_get_type
 gimp_procedure_get_type
 gimp_procedure_config_get_type
 gimp_procedure_dialog_get_type
 gimp_progress_bar_get_type
 gimp_save_procedure_get_type
 gimp_select_button_get_type
 gimp_selection_get_type
 gimp_thumbnail_procedure_get_type
 gimp_vectors_combo_box_get_type
 gimp_vectors_get_type
 gimp_zoom_preview_get_type
--- a/devel-docs/libgimp/meson.build
+++ b/devel-docs/libgimp/meson.build
@ -1,54 +0,0 @@
 module_name = 'libgimp3'
 gnome.gtkdoc(module_name,
  main_sgml: module_name + '-docs.sgml',
  gobject_typesfile: files(module_name + '.types'),
  src_dir: meson.source_root() / 'libgimp',
  ignore_headers: [
    'gimp-debug.h',
    'gimp-private.h',
    'gimp-shm.h',
    'gimppdb-private.h',
    'gimppdbprocedure.h',
    'gimpgpparams.h',
    'gimppixbuf.h',
    'gimpplugin-private.h',
    'gimpprocedure-private.h',
    'gimpprocedureconfig-private.h',
    'gimptilebackendplugin.h',
    'gimpunit_pdb.h',
    'gimpunitcache.h',
    'libgimp-intl.h',
    'stdplugins-intl.h',
  ],
  dependencies: [
    fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
    declare_dependency(
      include_directories: rootInclude,
      link_with: [
        libgimp,
        libgimpui,
        libgimpbase,
        libgimpcolor,
        libgimpconfig,
        libgimpmath,
        libgimpui,
        libgimpwidgets,
      ]
    )
  ],
  scan_args: scan_args_common,
  mkdb_args: mkdb_args_common,
  fixxref_args:  [
    '--extra-dir='+ devel_docs_build_root / 'libgimpbase'    / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpcolor'   / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpconfig'  / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpmath'    / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpwidgets' / 'html',
  ],
 )
--- a/devel-docs/libgimpbase/.gitignore
+++ b/devel-docs/libgimpbase/.gitignore
@ -1,21 +0,0 @@
 /.deps
 /.libs
 /Makefile
 /Makefile.in
 /deprecated
 /libgimpbase3.actions
 /libgimpbase3.args
 /libgimpbase3-decl.txt
 /libgimpbase3-decl-list.txt
 /libgimpbase3.hierarchy
 /libgimpbase3.interfaces
 /libgimpbase3.prerequisites
 /libgimpbase3.signals
 /libgimpbase3-unused.txt
 /libgimpbase3-undeclared.txt
 /libgimpbase3-undocumented.txt
 /html
 /tmpl
 /xml
 /*.bak
 /*.stamp
--- a/devel-docs/libgimpbase/Makefile.am
+++ b/devel-docs/libgimpbase/Makefile.am
@ -1,65 +0,0 @@
 ## Process this file with automake to produce Makefile.in
 # The name of the module.
 DOC_MODULE = libgimpbase3
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code.
 DOC_SOURCE_DIR = $(top_srcdir)/libgimpbase
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS =
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS =
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES = \
 	gimpbase.h		\
 	gimpbase-private.h	\
 	gimpcompatenums.h	\
 	gimpprotocol.h		\
 	gimpreloc.h		\
 	gimpwire.h		\
 	gimpwin32-io.h
 # Images to copy into HTML directory
 HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =
 # Other files to distribute
 extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	@CFLAGS@		\
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
 	@GEGL_CFLAGS@
 GTKDOC_LIBS = \
 	$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la		\
 	$(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la	\
 	@GEGL_LIBS@
 include $(top_srcdir)/gtk-doc.make
 # This is a hack. The entire commit must be reverted once
 # this file gets removed by gtk-doc.make
 CLEANFILES += $(DOC_MODULE).actions
--- a/devel-docs/libgimpbase/libgimpbase3-docs.sgml
+++ b/devel-docs/libgimpbase/libgimpbase3-docs.sgml
@ -1,69 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                      'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
 <book lang="en" id="libgimpbase" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
    <title>GIMP 3 Base Library Reference Manual</title>
    <releaseinfo>
      for GIMP <xi:include href="../version" parse="text"/>
    </releaseinfo>
  </bookinfo>
  <part>
    <title>GIMP Base Library</title>
    <xi:include href="xml/gimpbaseenums.xml" />
    <xi:include href="xml/gimpbasetypes.xml" />
    <xi:include href="xml/gimpversion.xml" />
    <xi:include href="xml/gimplimits.xml" />
    <xi:include href="xml/gimpparamspecs.xml" />
    <xi:include href="xml/gimpchecks.xml" />
    <xi:include href="xml/gimpcpuaccel.xml" />
    <xi:include href="xml/gimpenv.xml" />
    <xi:include href="xml/gimpmemsize.xml" />
    <xi:include href="xml/gimpmetadata.xml" />
    <xi:include href="xml/gimprectangle.xml" />
    <xi:include href="xml/gimpparasite.xml" />
    <xi:include href="xml/gimpparasiteio.xml" />
    <xi:include href="xml/gimpsignal.xml" />
    <xi:include href="xml/gimpunit.xml" />
    <xi:include href="xml/gimputils.xml" />
    <xi:include href="xml/gimpvaluearray.xml" />
  </part>
  <index id="api-index-full">
    <title id="index-all">Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.2" id="api-index-2-2">
    <title>Index of new symbols in GIMP 2.2</title>
    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.4" id="api-index-2-4">
    <title>Index of new symbols in GIMP 2.4</title>
    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.8" id="api-index-2-8">
    <title>Index of new symbols in GIMP 2.8</title>
    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10" id="api-index-2-10">
    <title>Index of new symbols in GIMP 2.10</title>
    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.10" id="api-index-2-10-10">
    <title>Index of new symbols in GIMP 2.10.10</title>
    <xi:include href="xml/api-index-2.10.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="3.0" id="api-index-3-0">
    <title>Index of new symbols in GIMP 3.0</title>
    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
  </index>
  <index role="deprecated" id="api-index-deprecated">
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/devel-docs/libgimpbase/libgimpbase3-overrides.txt
+++ b/devel-docs/libgimpbase/libgimpbase3-overrides.txt
--- a/devel-docs/libgimpbase/libgimpbase3-sections.txt
+++ b/devel-docs/libgimpbase/libgimpbase3-sections.txt
@ -1,552 +0,0 @@
 <SECTION>
 <FILE>gimpbasetypes</FILE>
 GIMP_DEPRECATED
 GIMP_DEPRECATED_FOR
 GIMP_UNAVAILABLE
 GimpEnumDesc
 GimpFlagsDesc
 gimp_type_set_translation_domain
 gimp_type_get_translation_domain
 gimp_type_set_translation_context
 gimp_type_get_translation_context
 gimp_enum_set_value_descriptions
 gimp_enum_get_value_descriptions
 gimp_flags_get_value_descriptions
 gimp_flags_set_value_descriptions
 </SECTION>
 <SECTION>
 <FILE>gimpbaseenums</FILE>
 GimpAddMaskType
 GimpBrushGeneratedShape
 GimpCapStyle
 GimpChannelOps
 GimpChannelType
 GimpCheckSize
 GimpCheckType
 GimpCloneType
 GimpColorTag
 GimpComponentType
 GimpConvertPaletteType
 GimpConvolveType
 GimpDesaturateMode
 GimpDodgeBurnType
 GimpFillType
 GimpForegroundExtractMode
 GimpGradientBlendColorSpace
 GimpGradientSegmentColor
 GimpGradientSegmentType
 GimpGradientType
 GimpGridStyle
 GimpHueRange
 GimpIconType
 GimpImageBaseType
 GimpImageType
 GimpInkBlobType
 GimpInterpolationType
 GimpJoinStyle
 GimpMaskApplyMode
 GimpMergeType
 GimpMessageHandlerType
 GimpOffsetType
 GimpOrientationType
 GimpPDBErrorHandler
 GimpPDBProcType
 GimpPDBStatusType
 GimpPaintApplicationMode
 GimpPrecision
 GimpProgressCommand
 GimpRepeatMode
 GimpRotationType
 GimpRunMode
 GimpSelectCriterion
 GimpSizeType
 GimpStackTraceMode
 GimpStrokeMethod
 GimpTextDirection
 GimpTextHintStyle
 GimpTextJustification
 GimpTransferMode
 GimpTransformDirection
 GimpTransformResize
 GimpVectorsStrokeType
 <SUBSECTION Standard>
 GIMP_TYPE_ADD_MASK_TYPE
 GIMP_TYPE_BRUSH_GENERATED_SHAPE
 GIMP_TYPE_CAP_STYLE
 GIMP_TYPE_CHANNEL_OPS
 GIMP_TYPE_CHANNEL_TYPE
 GIMP_TYPE_CHECK_SIZE
 GIMP_TYPE_CHECK_TYPE
 GIMP_TYPE_CLONE_TYPE
 GIMP_TYPE_COLOR_TAG
 GIMP_TYPE_COMPONENT_TYPE
 GIMP_TYPE_CONVERT_PALETTE_TYPE
 GIMP_TYPE_CONVOLVE_TYPE
 GIMP_TYPE_DESATURATE_MODE
 GIMP_TYPE_DODGE_BURN_TYPE
 GIMP_TYPE_FILL_TYPE
 GIMP_TYPE_FOREGROUND_EXTRACT_MODE
 GIMP_TYPE_GRADIENT_BLEND_COLOR_SPACE
 GIMP_TYPE_GRADIENT_SEGMENT_COLOR
 GIMP_TYPE_GRADIENT_SEGMENT_TYPE
 GIMP_TYPE_GRADIENT_TYPE
 GIMP_TYPE_GRID_STYLE
 GIMP_TYPE_HUE_RANGE
 GIMP_TYPE_ICON_TYPE
 GIMP_TYPE_IMAGE_BASE_TYPE
 GIMP_TYPE_IMAGE_TYPE
 GIMP_TYPE_INK_BLOB_TYPE
 GIMP_TYPE_INTERPOLATION_TYPE
 GIMP_TYPE_JOIN_STYLE
 GIMP_TYPE_MASK_APPLY_MODE
 GIMP_TYPE_MERGE_TYPE
 GIMP_TYPE_MESSAGE_HANDLER_TYPE
 GIMP_TYPE_OFFSET_TYPE
 GIMP_TYPE_ORIENTATION_TYPE
 GIMP_TYPE_PAINT_APPLICATION_MODE
 GIMP_TYPE_PDB_ERROR_HANDLER
 GIMP_TYPE_PDB_PROC_TYPE
 GIMP_TYPE_PDB_STATUS_TYPE
 GIMP_TYPE_PRECISION
 GIMP_TYPE_PROGRESS_COMMAND
 GIMP_TYPE_REPEAT_MODE
 GIMP_TYPE_ROTATION_TYPE
 GIMP_TYPE_RUN_MODE
 GIMP_TYPE_SELECT_CRITERION
 GIMP_TYPE_SIZE_TYPE
 GIMP_TYPE_STACK_TRACE_MODE
 GIMP_TYPE_STROKE_METHOD
 GIMP_TYPE_TEXT_DIRECTION
 GIMP_TYPE_TEXT_HINT_STYLE
 GIMP_TYPE_TEXT_JUSTIFICATION
 GIMP_TYPE_TRANSFER_MODE
 GIMP_TYPE_TRANSFORM_DIRECTION
 GIMP_TYPE_TRANSFORM_RESIZE
 GIMP_TYPE_VECTORS_STROKE_TYPE
 gimp_add_mask_type_get_type
 gimp_brush_generated_shape_get_type
 gimp_cap_style_get_type
 gimp_component_type_get_type
 gimp_convert_palette_type_get_type
 gimp_convolve_type_get_type
 gimp_fill_type_get_type
 gimp_gradient_blend_color_space_get_type
 gimp_gradient_segment_color_get_type
 gimp_gradient_segment_type_get_type
 gimp_hue_range_get_type
 gimp_ink_blob_type_get_type
 gimp_join_style_get_type
 gimp_mask_apply_mode_get_type
 gimp_merge_type_get_type
 gimp_offset_type_get_type
 gimp_orientation_type_get_type
 gimp_precision_get_type
 gimp_rotation_type_get_type
 gimp_select_criterion_get_type
 gimp_channel_ops_get_type
 gimp_channel_type_get_type
 gimp_check_size_get_type
 gimp_check_type_get_type
 gimp_clone_type_get_type
 gimp_color_tag_get_type
 gimp_desaturate_mode_get_type
 gimp_dodge_burn_type_get_type
 gimp_foreground_extract_mode_get_type
 gimp_gradient_type_get_type
 gimp_grid_style_get_type
 gimp_icon_type_get_type
 gimp_image_base_type_get_type
 gimp_image_type_get_type
 gimp_interpolation_type_get_type
 gimp_message_handler_type_get_type
 gimp_paint_application_mode_get_type
 gimp_pdb_error_handler_get_type
 gimp_pdb_proc_type_get_type
 gimp_pdb_status_type_get_type
 gimp_progress_command_get_type
 gimp_repeat_mode_get_type
 gimp_run_mode_get_type
 gimp_size_type_get_type
 gimp_stack_trace_mode_get_type
 gimp_stroke_method_get_type
 gimp_text_direction_get_type
 gimp_text_hint_style_get_type
 gimp_text_justification_get_type
 gimp_transfer_mode_get_type
 gimp_transform_direction_get_type
 gimp_transform_resize_get_type
 gimp_vectors_stroke_type_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpchecks</FILE>
 GIMP_CHECK_SIZE
 GIMP_CHECK_SIZE_SM
 GIMP_CHECK_DARK
 GIMP_CHECK_LIGHT
 gimp_checks_get_shades
 </SECTION>
 <SECTION>
 <FILE>gimpcpuaccel</FILE>
 GimpCpuAccelFlags
 gimp_cpu_accel_get_support
 gimp_cpu_accel_set_use
 </SECTION>
 <SECTION>
 <FILE>gimpenv</FILE>
 gimp_env_init
 gimp_directory
 gimp_installation_directory
 gimp_data_directory
 gimp_locale_directory
 gimp_sysconf_directory
 gimp_plug_in_directory
 gimp_cache_directory
 gimp_temp_directory
 gimp_directory_file
 gimp_installation_directory_file
 gimp_data_directory_file
 gimp_locale_directory_file
 gimp_sysconf_directory_file
 gimp_plug_in_directory_file
 gimp_path_parse
 gimp_path_to_str
 gimp_path_free
 gimp_path_get_user_writable_dir
 </SECTION>
 <SECTION>
 <FILE>gimplimits</FILE>
 GIMP_MIN_IMAGE_SIZE
 GIMP_MAX_IMAGE_SIZE
 GIMP_MIN_RESOLUTION
 GIMP_MAX_RESOLUTION
 GIMP_MAX_MEMSIZE
 </SECTION>
 <SECTION>
 <FILE>gimpmemsize</FILE>
 gimp_memsize_serialize
 gimp_memsize_deserialize
 GIMP_TYPE_MEMSIZE
 GIMP_TYPE_PARAM_MEMSIZE
 GIMP_IS_PARAM_SPEC_MEMSIZE
 gimp_param_spec_memsize
 GIMP_VALUE_HOLDS_MEMSIZE
 <SUBSECTION Standard>
 gimp_memsize_get_type
 gimp_param_memsize_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpmetadata</FILE>
 GimpMetadata
 GimpMetadataLoadFlags
 GimpMetadataSaveFlags
 GimpMetadataColorspace
 gimp_metadata_new
 gimp_metadata_duplicate
 gimp_metadata_deserialize
 gimp_metadata_serialize
 gimp_metadata_get_guid
 gimp_metadata_add_xmp_history
 gimp_metadata_load_from_file
 gimp_metadata_save_to_file
 gimp_metadata_set_from_exif
 gimp_metadata_set_from_iptc
 gimp_metadata_set_from_xmp
 gimp_metadata_set_pixel_size
 gimp_metadata_set_bits_per_sample
 gimp_metadata_get_resolution
 gimp_metadata_set_resolution
 gimp_metadata_get_colorspace
 gimp_metadata_set_colorspace
 gimp_metadata_is_tag_supported
 <SUBSECTION Standard>
 GIMP_IS_METADATA
 GIMP_IS_METADATA_CLASS
 GIMP_METADATA
 GIMP_METADATA_CLASS
 GIMP_METADATA_GET_CLASS
 GIMP_TYPE_METADATA
 gimp_metadata_get_type
 </SECTION>
 <SECTION>
 <FILE>gimprectangle</FILE>
 gimp_rectangle_intersect
 gimp_rectangle_union
 </SECTION>
 <SECTION>
 <FILE>gimpparamspecs</FILE>
 GIMP_PARAM_NO_VALIDATE
 GIMP_PARAM_STATIC_STRINGS
 GIMP_PARAM_READABLE
 GIMP_PARAM_WRITABLE
 GIMP_PARAM_READWRITE
 GimpArray
 gimp_array_new
 gimp_array_copy
 gimp_array_free
 gimp_param_spec_array
 gimp_param_spec_uint8_array
 gimp_value_get_uint8_array
 gimp_value_dup_uint8_array
 gimp_value_set_uint8_array
 gimp_value_set_static_uint8_array
 gimp_value_take_uint8_array
 gimp_param_spec_int32_array
 gimp_value_get_int32_array
 gimp_value_dup_int32_array
 gimp_value_set_int32_array
 gimp_value_set_static_int32_array
 gimp_value_take_int32_array
 gimp_param_spec_float_array
 gimp_value_get_float_array
 gimp_value_dup_float_array
 gimp_value_set_float_array
 gimp_value_set_static_float_array
 gimp_value_take_float_array
 GimpStringArray
 gimp_string_array_new
 gimp_string_array_copy
 gimp_string_array_free
 gimp_param_spec_string_array
 gimp_value_get_string_array
 gimp_value_dup_string_array
 gimp_value_set_string_array
 gimp_value_set_static_string_array
 gimp_value_take_string_array
 gimp_param_spec_rgb_array
 gimp_value_get_rgb_array
 gimp_value_dup_rgb_array
 gimp_value_set_rgb_array
 gimp_value_set_static_rgb_array
 gimp_value_take_rgb_array
 GimpObjectArray
 gimp_object_array_new
 gimp_object_array_copy
 gimp_object_array_free
 gimp_param_spec_object_array
 gimp_value_get_object_array
 gimp_value_dup_object_array
 gimp_value_set_object_array
 gimp_value_set_static_object_array
 gimp_value_take_object_array
 <SUBSECTION Standard>
 GIMP_IS_PARAM_SPEC_ARRAY
 GIMP_IS_PARAM_SPEC_FLOAT_ARRAY
 GIMP_IS_PARAM_SPEC_INT32_ARRAY
 GIMP_IS_PARAM_SPEC_OBJECT_ARRAY
 GIMP_IS_PARAM_SPEC_UINT8_ARRAY
 GIMP_IS_PARAM_SPEC_RGB_ARRAY
 GIMP_IS_PARAM_SPEC_STRING
 GIMP_IS_PARAM_SPEC_STRING_ARRAY
 GIMP_PARAM_SPEC_ARRAY
 GIMP_PARAM_SPEC_FLOAT_ARRAY
 GIMP_PARAM_SPEC_INT32_ARRAY
 GIMP_PARAM_SPEC_OBJECT_ARRAY
 GIMP_PARAM_SPEC_UINT8_ARRAY
 GIMP_PARAM_SPEC_RGB_ARRAY
 GIMP_PARAM_SPEC_STRING
 GIMP_PARAM_SPEC_STRING_ARRAY
 GIMP_TYPE_ARRAY
 GIMP_TYPE_FLOAT_ARRAY
 GIMP_TYPE_INT32_ARRAY
 GIMP_TYPE_OBJECT_ARRAY
 GIMP_TYPE_UINT8_ARRAY
 GIMP_TYPE_PARAM_ARRAY
 GIMP_TYPE_PARAM_FLOAT_ARRAY
 GIMP_TYPE_PARAM_INT32_ARRAY
 GIMP_TYPE_PARAM_OBJECT_ARRAY
 GIMP_TYPE_PARAM_UINT8_ARRAY
 GIMP_TYPE_PARAM_RGB_ARRAY
 GIMP_TYPE_PARAM_STRING
 GIMP_TYPE_PARAM_STRING_ARRAY
 GIMP_TYPE_RGB_ARRAY
 GIMP_TYPE_STRING_ARRAY
 GIMP_VALUE_HOLDS_ARRAY
 GIMP_VALUE_HOLDS_FLOAT_ARRAY
 GIMP_VALUE_HOLDS_INT32_ARRAY
 GIMP_VALUE_HOLDS_OBJECT_ARRAY
 GIMP_VALUE_HOLDS_UINT8_ARRAY
 GIMP_VALUE_HOLDS_RGB_ARRAY
 GIMP_VALUE_HOLDS_STRING_ARRAY
 GimpParamSpecArray
 GimpParamSpecFloatArray
 GimpParamSpecInt32Array
 GimpParamSpecObjectArray
 GimpParamSpecUInt8Array
 GimpParamSpecRGBArray
 GimpParamSpecStringArray
 gimp_array_get_type
 gimp_float_array_get_type
 gimp_int32_array_get_type
 gimp_object_array_get_type
 gimp_uint8_array_get_type
 gimp_param_array_get_type
 gimp_param_float_array_get_type
 gimp_param_int32_array_get_type
 gimp_param_object_array_get_type
 gimp_param_uint8_array_get_type
 gimp_param_rgb_array_get_type
 gimp_param_string_array_get_type
 gimp_param_string_get_type
 gimp_rgb_array_get_type
 gimp_string_array_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpparasite</FILE>
 GimpParasite
 gimp_parasite_new
 gimp_parasite_free
 gimp_parasite_copy
 gimp_parasite_compare
 gimp_parasite_is_type
 gimp_parasite_is_persistent
 gimp_parasite_is_undoable
 gimp_parasite_has_flag
 gimp_parasite_get_flags
 gimp_parasite_get_name
 gimp_parasite_data
 gimp_parasite_data_size
 GIMP_PARASITE_PERSISTENT
 GIMP_PARASITE_UNDOABLE
 GIMP_PARASITE_ATTACH_PARENT
 GIMP_PARASITE_PARENT_PERSISTENT
 GIMP_PARASITE_PARENT_UNDOABLE
 GIMP_PARASITE_ATTACH_GRANDPARENT
 GIMP_PARASITE_GRANDPARENT_PERSISTENT
 GIMP_PARASITE_GRANDPARENT_UNDOABLE
 GIMP_TYPE_PARASITE
 GIMP_TYPE_PARAM_PARASITE
 GIMP_IS_PARAM_SPEC_PARASITE
 gimp_param_spec_parasite
 GIMP_VALUE_HOLDS_PARASITE
 <SUBSECTION Standard>
 GimpParamSpecParasite
 gimp_parasite_get_type
 gimp_param_parasite_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpparasiteio</FILE>
 GIMP_PIXPIPE_MAXDIM
 GimpPixPipeParams
 gimp_pixpipe_params_init
 gimp_pixpipe_params_parse
 gimp_pixpipe_params_build
 gimp_pixpipe_params_free
 </SECTION>
 <SECTION>
 <FILE>gimpsignal</FILE>
 GimpSignalHandlerFunc
 gimp_signal_private
 </SECTION>
 <SECTION>
 <FILE>gimpunit</FILE>
 GimpUnit
 gimp_unit_get_number_of_units
 gimp_unit_get_number_of_built_in_units
 gimp_unit_new
 gimp_unit_get_deletion_flag
 gimp_unit_set_deletion_flag
 gimp_unit_get_factor
 gimp_unit_get_digits
 gimp_unit_get_scaled_digits
 gimp_unit_get_identifier
 gimp_unit_get_symbol
 gimp_unit_get_abbreviation
 gimp_unit_get_singular
 gimp_unit_get_plural
 gimp_unit_format_string 
 gimp_pixels_to_units
 gimp_units_to_pixels
 gimp_units_to_points
 gimp_unit_is_metric
 GIMP_TYPE_PARAM_UNIT
 gimp_param_spec_unit
 <SUBSECTION Standard>
 GIMP_IS_PARAM_SPEC_UNIT
 GIMP_PARAM_SPEC_UNIT
 GIMP_TYPE_UNIT
 GIMP_VALUE_HOLDS_UNIT
 GimpParamSpecUnit
 gimp_unit_get_type
 gimp_param_unit_get_type
 </SECTION>
 <SECTION>
 <FILE>gimputils</FILE>
 gimp_any_to_utf8
 gimp_filename_to_utf8
 gimp_file_get_utf8_name
 gimp_file_has_extension
 gimp_file_show_in_file_manager
 gimp_utf8_strtrim
 gimp_escape_uline
 gimp_strip_uline
 gimp_is_canonical_identifier
 gimp_canonicalize_identifier
 gimp_enum_get_desc
 gimp_enum_get_value
 gimp_enum_value_get_desc
 gimp_enum_value_get_help
 gimp_enum_value_get_abbrev
 gimp_flags_get_first_desc
 gimp_flags_get_first_value
 gimp_flags_value_get_desc
 gimp_flags_value_get_help
 gimp_flags_value_get_abbrev
 gimp_stack_trace_available
 gimp_stack_trace_print
 gimp_stack_trace_query
 </SECTION>
 <SECTION>
 <FILE>gimpvaluearray</FILE>
 GimpValueArray
 gimp_value_array_new
 gimp_value_array_new_from_types
 gimp_value_array_new_from_types_valist
 gimp_value_array_new_from_values
 gimp_value_array_ref
 gimp_value_array_unref
 gimp_value_array_length
 gimp_value_array_index
 gimp_value_array_prepend
 gimp_value_array_append
 gimp_value_array_insert
 gimp_value_array_remove
 gimp_value_array_truncate
 GimpParamSpecValueArray
 gimp_param_spec_value_array
 <SUBSECTION Standard>
 GIMP_IS_PARAM_SPEC_VALUE_ARRAY
 GIMP_PARAM_SPEC_VALUE_ARRAY
 GIMP_TYPE_PARAM_VALUE_ARRAY
 GIMP_TYPE_VALUE_ARRAY
 gimp_param_value_array_get_type
 gimp_value_array_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpversion</FILE>
 GIMP_MAJOR_VERSION
 GIMP_MINOR_VERSION
 GIMP_MICRO_VERSION
 GIMP_VERSION
 GIMP_API_VERSION
 GIMP_CHECK_VERSION
 GIMPVAR
 gimp_major_version
 gimp_minor_version
 gimp_micro_version
 </SECTION>
--- a/devel-docs/libgimpbase/libgimpbase3.types
+++ b/devel-docs/libgimpbase/libgimpbase3.types
@ -1,17 +0,0 @@
 gimp_array_get_type
 gimp_float_array_get_type
 gimp_int32_array_get_type
 gimp_uint8_array_get_type
 gimp_memsize_get_type
 gimp_metadata_get_type
 gimp_param_array_get_type
 gimp_param_float_array_get_type
 gimp_param_int32_array_get_type
 gimp_param_uint8_array_get_type
 gimp_param_rgb_array_get_type
 gimp_param_string_array_get_type
 gimp_parasite_get_type
 gimp_rgb_array_get_type
 gimp_string_array_get_type
 gimp_unit_get_type
 gimp_value_array_get_type
--- a/devel-docs/libgimpbase/meson.build
+++ b/devel-docs/libgimpbase/meson.build
@ -1,39 +0,0 @@
 module_name = 'libgimpbase3'
 gnome.gtkdoc(module_name,
  main_sgml: module_name + '-docs.sgml',
  gobject_typesfile: files(module_name + '.types'),
  src_dir: meson.source_root() / 'libgimpbase',
  content_files: [
  ],
  ignore_headers: [
    'gimpbase-private.h',
    'gimpbase.h',
    'gimpcompatenums.h',
    'gimpprotocol.h',
    'gimpreloc.h',
    'gimpwin32-io.h',
    'gimpwire.h',
  ],
  dependencies: [
    fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
    declare_dependency(link_with: [
      libgimpbase,
    ]),
  ],
  scanobjs_args: [
  ],
  scan_args: scan_args_common,
  mkdb_args: mkdb_args_common,
  fixxref_args:  [
  ],
  html_assets: [
  ],
  html_args: [
  ],
 )
--- a/devel-docs/libgimpcolor/.gitignore
+++ b/devel-docs/libgimpcolor/.gitignore
@ -1,20 +0,0 @@
 /Makefile
 /Makefile.in
 /deprecated
 /libgimpcolor3.actions
 /libgimpcolor3.args
 /libgimpcolor3-decl.txt
 /libgimpcolor3-decl-list.txt
 /libgimpcolor3.hierarchy
 /libgimpcolor3.interfaces
 /libgimpcolor3.prerequisites
 /libgimpcolor3.signals
 /libgimpcolor3-unused.txt
 /libgimpcolor3-undeclared.txt
 /libgimpcolor3-undocumented.txt
 /html
 /tmpl
 /xml
 /.libs
 /*.bak
 /*.stamp
--- a/devel-docs/libgimpcolor/Makefile.am
+++ b/devel-docs/libgimpcolor/Makefile.am
@ -1,58 +0,0 @@
 ## Process this file with automake to produce Makefile.in
 # The name of the module.
 DOC_MODULE = libgimpcolor3
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code.
 DOC_SOURCE_DIR = $(top_srcdir)/libgimpcolor
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS =
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS =
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES = gimpcolor.h
 # Images to copy into HTML directory
 HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =
 # Other files to distribute
 extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	@CFLAGS@		\
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
 	@GLIB_CFLAGS@
 GTKDOC_LIBS = \
        $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la \
        $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la \
 	@GLIB_LIBS@
 include $(top_srcdir)/gtk-doc.make
 # This is a hack. The entire commit must be reverted once
 # this file gets removed by gtk-doc.make
 CLEANFILES += $(DOC_MODULE).actions
--- a/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml
+++ b/devel-docs/libgimpcolor/libgimpcolor3-docs.sgml
@ -1,67 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                      'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
 <book lang="en" id="libgimpcolor" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
    <title>GIMP 3 Color Library Reference Manual</title>
    <releaseinfo>
      for GIMP <xi:include href="../version" parse="text"/>
    </releaseinfo>
  </bookinfo>
  <part>
    <title>GIMP Color Library</title>
    <xi:include href="xml/gimprgb.xml" />
    <xi:include href="xml/gimphsv.xml" />
    <xi:include href="xml/gimpcmyk.xml" />
    <xi:include href="xml/gimpcolorspace.xml" />
    <xi:include href="xml/gimpcolormanaged.xml" />
    <xi:include href="xml/gimpcolorprofile.xml" />
    <xi:include href="xml/gimpcolortransform.xml" />
    <xi:include href="xml/gimpadaptivesupersample.xml" />
    <xi:include href="xml/gimpbilinear.xml" />
    <xi:include href="xml/gimpcairo.xml" />
    <xi:include href="xml/gimppixbuf.xml" />
  </part>
  <index id="api-index-full">
    <title>Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.2" id="api-index-2-2">
    <title>Index of new symbols in GIMP 2.2</title>
    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.4" id="api-index-2-4">
    <title>Index of new symbols in GIMP 2.4</title>
    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.6" id="api-index-2-6">
    <title>Index of new symbols in GIMP 2.6</title>
    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.8" id="api-index-2-8">
    <title>Index of new symbols in GIMP 2.8</title>
    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10" id="api-index-2-10">
    <title>Index of new symbols in GIMP 2.10</title>
    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.6" id="api-index-2-10-6">
    <title>Index of new symbols in GIMP 2.10.6</title>
    <xi:include href="xml/api-index-2.10.6.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.14" id="api-index-2-10-14">
    <title>Index of new symbols in GIMP 2.10.6</title>
    <xi:include href="xml/api-index-2.10.14.xml"><xi:fallback /></xi:include>
  </index>
  <index role="deprecated" id="api-index-deprecated">
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/devel-docs/libgimpcolor/libgimpcolor3-overrides.txt
+++ b/devel-docs/libgimpcolor/libgimpcolor3-overrides.txt
--- a/devel-docs/libgimpcolor/libgimpcolor3-sections.txt
+++ b/devel-docs/libgimpcolor/libgimpcolor3-sections.txt
@ -1,212 +0,0 @@
 <SECTION>
 <FILE>gimpcmyk</FILE>
 GimpCMYK
 gimp_cmyk_set
 gimp_cmyk_set_uchar
 gimp_cmyk_get_uchar
 gimp_cmyka_set
 gimp_cmyka_set_uchar
 gimp_cmyka_get_uchar
 GIMP_TYPE_CMYK
 <SUBSECTION Standard>
 gimp_cmyk_get_type
 </SECTION>
 <SECTION>
 <FILE>gimphsv</FILE>
 GimpHSV
 GimpHSL
 gimp_hsv_set
 gimp_hsv_clamp
 gimp_hsva_set
 gimp_hsl_set
 gimp_hsl_set_alpha
 GIMP_TYPE_HSV
 GIMP_TYPE_HSL
 <SUBSECTION Standard>
 gimp_hsv_get_type
 gimp_hsl_get_type
 </SECTION>
 <SECTION>
 <FILE>gimppixbuf</FILE>
 gimp_pixbuf_get_format
 gimp_pixbuf_create_buffer
 gimp_pixbuf_get_icc_profile
 </SECTION>
 <SECTION>
 <FILE>gimprgb</FILE>
 GimpRGB
 GimpRGBCompositeMode
 gimp_rgb_set
 gimp_rgb_set_alpha
 gimp_rgb_set_pixel
 gimp_rgb_get_pixel
 gimp_rgb_set_uchar
 gimp_rgb_get_uchar
 gimp_rgb_parse_name
 gimp_rgb_parse_hex
 gimp_rgb_parse_css
 gimp_rgb_list_names
 gimp_rgb_add
 gimp_rgb_subtract
 gimp_rgb_multiply
 gimp_rgb_distance
 gimp_rgb_max
 gimp_rgb_min
 gimp_rgb_clamp
 gimp_rgb_gamma
 gimp_rgb_luminance
 gimp_rgb_luminance_uchar
 gimp_rgb_composite
 gimp_rgba_set
 gimp_rgba_set_pixel
 gimp_rgba_get_pixel
 gimp_rgba_set_uchar
 gimp_rgba_get_uchar
 gimp_rgba_parse_css
 gimp_rgba_add
 gimp_rgba_subtract
 gimp_rgba_multiply
 gimp_rgba_distance
 GIMP_RGB_LUMINANCE
 GIMP_RGB_LUMINANCE_RED
 GIMP_RGB_LUMINANCE_GREEN
 GIMP_RGB_LUMINANCE_BLUE
 GIMP_TYPE_RGB
 GIMP_TYPE_PARAM_RGB
 gimp_param_spec_rgb
 gimp_param_spec_rgb_get_default
 gimp_param_spec_rgb_has_alpha
 GIMP_VALUE_HOLDS_RGB
 gimp_value_get_rgb
 gimp_value_set_rgb
 <SUBSECTION Standard>
 GimpParamSpecRGB
 GIMP_IS_PARAM_SPEC_RGB
 gimp_param_rgb_get_type
 gimp_rgb_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpcolorspace</FILE>
 <TITLE>GimpColorSpace</TITLE>
 gimp_rgb_to_hsv
 gimp_rgb_to_hsl
 gimp_rgb_to_cmyk
 gimp_hsv_to_rgb
 gimp_hsl_to_rgb
 gimp_cmyk_to_rgb
 </SECTION>
 <SECTION>
 <FILE>gimpcolormanaged</FILE>
 GimpColorManaged
 GimpColorManagedInterface
 gimp_color_managed_get_icc_profile
 gimp_color_managed_get_color_profile
 gimp_color_managed_profile_changed
 <SUBSECTION Standard>
 GIMP_COLOR_MANAGED
 GIMP_IS_COLOR_MANAGED
 GIMP_TYPE_COLOR_MANAGED
 GIMP_COLOR_MANAGED_GET_IFACE
 gimp_color_managed_get_type
 gimp_color_managed_interface_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpcolorprofile</FILE>
 GimpColorProfile
 gimp_color_profile_new_rgb_srgb
 gimp_color_profile_new_rgb_srgb_linear
 gimp_color_profile_new_rgb_adobe
 gimp_color_profile_new_d65_gray_srgb_trc
 gimp_color_profile_new_d65_gray_linear
 gimp_color_profile_new_d50_gray_lab_trc
 gimp_color_profile_new_srgb_trc_from_color_profile
 gimp_color_profile_new_linear_from_color_profile
 gimp_color_profile_new_from_file
 gimp_color_profile_new_from_icc_profile
 gimp_color_profile_new_from_lcms_profile
 gimp_color_profile_save_to_file
 gimp_color_profile_get_icc_profile
 gimp_color_profile_get_lcms_profile
 gimp_color_profile_get_description
 gimp_color_profile_get_manufacturer
 gimp_color_profile_get_model
 gimp_color_profile_get_copyright
 gimp_color_profile_get_label
 gimp_color_profile_get_summary
 gimp_color_profile_is_equal
 gimp_color_profile_is_rgb
 gimp_color_profile_is_gray
 gimp_color_profile_is_cmyk
 gimp_color_profile_is_linear
 gimp_color_profile_get_space
 gimp_color_profile_get_format
 gimp_color_profile_get_lcms_format
 <SUBSECTION Standard>
 GIMP_COLOR_PROFILE
 GIMP_COLOR_PROFILE_CLASS
 GIMP_COLOR_PROFILE_GET_CLASS
 GIMP_IS_COLOR_PROFILE
 GIMP_IS_COLOR_PROFILE_CLASS
 GIMP_TYPE_COLOR_PROFILE
 GimpColorProfileClass
 GimpColorProfilePrivate
 gimp_color_profile_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpcolortransform</FILE>
 GimpColorTransformFlags
 GimpColorTransform
 gimp_color_transform_new
 gimp_color_transform_new_proofing
 gimp_color_transform_process_pixels
 gimp_color_transform_process_buffer
 gimp_color_transform_can_gegl_copy
 <SUBSECTION Standard>
 GIMP_COLOR_TRANSFORM
 GIMP_COLOR_TRANSFORM_CLASS
 GIMP_COLOR_TRANSFORM_GET_CLASS
 GIMP_IS_COLOR_TRANSFORM
 GIMP_IS_COLOR_TRANSFORM_CLASS
 GIMP_TYPE_COLOR_TRANSFORM
 GimpColorTransformClass
 GimpColorTransformPrivate
 gimp_color_transform_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpadaptivesupersample</FILE>
 GimpProgressFunc
 GimpPutPixelFunc
 GimpRenderFunc
 gimp_adaptive_supersample_area
 </SECTION>
 <SECTION>
 <FILE>gimpbilinear</FILE>
 gimp_bilinear
 gimp_bilinear_8
 gimp_bilinear_16
 gimp_bilinear_32
 gimp_bilinear_rgb
 gimp_bilinear_rgba
 </SECTION>
 <SECTION>
 <FILE>gimpcairo</FILE>
 gimp_cairo_set_source_rgb
 gimp_cairo_set_source_rgba
 gimp_cairo_checkerboard_create
 gimp_cairo_surface_get_format
 gimp_cairo_surface_create_buffer
 GIMP_CAIRO_RGB24_SET_PIXEL
 GIMP_CAIRO_RGB24_GET_PIXEL
 GIMP_CAIRO_ARGB32_SET_PIXEL
 GIMP_CAIRO_ARGB32_GET_PIXEL
 </SECTION>
--- a/devel-docs/libgimpcolor/libgimpcolor3.types
+++ b/devel-docs/libgimpcolor/libgimpcolor3.types
@ -1,3 +0,0 @@
 gimp_color_managed_get_type
 gimp_color_profile_get_type
 gimp_color_transform_get_type
--- a/devel-docs/libgimpcolor/meson.build
+++ b/devel-docs/libgimpcolor/meson.build
@ -1,21 +0,0 @@
 module_name = 'libgimpcolor3'
 gnome.gtkdoc(module_name,
  main_sgml: module_name + '-docs.sgml',
  gobject_typesfile: files(module_name + '.types'),
  src_dir: meson.source_root() / 'libgimpcolor',
  ignore_headers: [
  ],
  dependencies: [
    fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
    declare_dependency(link_with: [
      libgimpbase,
      libgimpcolor,
    ]),
  ],
  scan_args: scan_args_common,
  mkdb_args: mkdb_args_common,
 )
--- a/devel-docs/libgimpconfig/.gitignore
+++ b/devel-docs/libgimpconfig/.gitignore
@ -1,20 +0,0 @@
 /Makefile
 /Makefile.in
 /deprecated
 /libgimpconfig3.actions
 /libgimpconfig3.args
 /libgimpconfig3-decl.txt
 /libgimpconfig3-decl-list.txt
 /libgimpconfig3.hierarchy
 /libgimpconfig3.interfaces
 /libgimpconfig3.prerequisites
 /libgimpconfig3.signals
 /libgimpconfig3-unused.txt
 /libgimpconfig3-undeclared.txt
 /libgimpconfig3-undocumented.txt
 /html
 /tmpl
 /xml
 /.libs
 /*.bak
 /*.stamp
--- a/devel-docs/libgimpconfig/Makefile.am
+++ b/devel-docs/libgimpconfig/Makefile.am
@ -1,64 +0,0 @@
 ## Process this file with automake to produce Makefile.in
 # The name of the module.
 DOC_MODULE = libgimpconfig3
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code.
 DOC_SOURCE_DIR = $(top_srcdir)/libgimpconfig
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS =
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS = \
 	--extra-dir=../libgimpbase/html		\
 	--extra-dir=../libgimpcolor/html	\
 	--extra-dir=../libgimpmath/html
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES = \
 	gimpconfig.h
 # Images to copy into HTML directory
 HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =
 # Other files to distribute
 extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	@CFLAGS@		\
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
 	@GLIB_CFLAGS@
 GTKDOC_LIBS = \
        $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la \
        $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la \
        $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la \
        $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la \
 	@GLIB_LIBS@
 include $(top_srcdir)/gtk-doc.make
 # This is a hack. The entire commit must be reverted once
 # this file gets removed by gtk-doc.make
 CLEANFILES += $(DOC_MODULE).actions
--- a/devel-docs/libgimpconfig/libgimpconfig3-docs.sgml
+++ b/devel-docs/libgimpconfig/libgimpconfig3-docs.sgml
@ -1,69 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                      'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
 <book lang="en" id="libgimpconfig" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
    <title>GIMP 3 Config Library Reference Manual</title>
    <releaseinfo>
      for GIMP <xi:include href="../version" parse="text"/>
    </releaseinfo>
  </bookinfo>
  <part>
    <title>GIMP Config Library</title>
    <chapter id="libgimpconfig-hierarchy">
      <title>Object Hierarchy</title>
      <xi:include href="xml/tree_index.sgml" />
    </chapter>
    <xi:include href="xml/gimpconfig-iface.xml" />
    <xi:include href="xml/gimpconfig-deserialize.xml" />
    <xi:include href="xml/gimpconfig-serialize.xml" />
    <xi:include href="xml/gimpconfig-error.xml" />
    <xi:include href="xml/gimpconfig-params.xml" />
    <xi:include href="xml/gimpconfig-path.xml" />
    <xi:include href="xml/gimpconfig-register.xml" />
    <xi:include href="xml/gimpconfig-utils.xml" />
    <xi:include href="xml/gimpconfigwriter.xml" />
    <xi:include href="xml/gimpscanner.xml" />
    <xi:include href="xml/gimpcolorconfig.xml" />
  </part>
  <index id="api-index-full">
    <title>Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.4" id="api-index-2-4">
    <title>Index of new symbols in GIMP 2.4</title>
    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.6" id="api-index-2-6">
    <title>Index of new symbols in GIMP 2.6</title>
    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.8" id="api-index-2-8">
    <title>Index of new symbols in GIMP 2.8</title>
    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10" id="api-index-2-10">
    <title>Index of new symbols in GIMP 2.10</title>
    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.6" id="api-index-2-10-6">
    <title>Index of new symbols in GIMP 2.10.6</title>
    <xi:include href="xml/api-index-2.10.6.xml"><xi:fallback /></xi:include>
  </index>
  <index role="3.0" id="api-index-3-0">
    <title>Index of new symbols in GIMP 3.0</title>
    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
  </index>
  <index role="deprecated" id="api-index-deprecated">
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/devel-docs/libgimpconfig/libgimpconfig3-overrides.txt
+++ b/devel-docs/libgimpconfig/libgimpconfig3-overrides.txt
--- a/devel-docs/libgimpconfig/libgimpconfig3-sections.txt
+++ b/devel-docs/libgimpconfig/libgimpconfig3-sections.txt
@ -1,206 +0,0 @@
 <SECTION>
 <FILE>gimpconfig-iface</FILE>
 <TITLE>GimpConfig</TITLE>
 GimpConfig
 GimpConfigInterface
 gimp_config_serialize
 gimp_config_serialize_to_file
 gimp_config_serialize_to_stream
 gimp_config_serialize_to_fd
 gimp_config_serialize_to_string
 gimp_config_serialize_to_parasite
 gimp_config_deserialize
 gimp_config_deserialize_file
 gimp_config_deserialize_stream
 gimp_config_deserialize_string
 gimp_config_deserialize_parasite
 gimp_config_deserialize_return
 gimp_config_duplicate
 gimp_config_is_equal_to
 gimp_config_reset
 gimp_config_copy
 <SUBSECTION Standard>
 GIMP_CONFIG
 GIMP_IS_CONFIG
 GIMP_TYPE_CONFIG
 GIMP_CONFIG_GET_IFACE
 gimp_config_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpconfig-deserialize</FILE>
 gimp_config_deserialize_properties
 gimp_config_deserialize_property
 </SECTION>
 <SECTION>
 <FILE>gimpconfig-error</FILE>
 <TITLE>GimpConfigError</TITLE>
 GimpConfigError
 GIMP_CONFIG_ERROR
 gimp_config_error_quark
 </SECTION>
 <SECTION>
 <FILE>gimpconfig-params</FILE>
 GIMP_CONFIG_PARAM_SERIALIZE
 GIMP_CONFIG_PARAM_AGGREGATE
 GIMP_CONFIG_PARAM_RESTART
 GIMP_CONFIG_PARAM_CONFIRM
 GIMP_CONFIG_PARAM_DEFAULTS
 GIMP_CONFIG_PARAM_IGNORE
 GIMP_CONFIG_PARAM_FLAGS
 GIMP_CONFIG_PROP_BOOLEAN
 GIMP_CONFIG_PROP_BOXED
 GIMP_CONFIG_PROP_DOUBLE
 GIMP_CONFIG_PROP_ENUM
 GIMP_CONFIG_PROP_INT
 GIMP_CONFIG_PROP_INT64
 GIMP_CONFIG_PROP_MATRIX2
 GIMP_CONFIG_PROP_MEMSIZE
 GIMP_CONFIG_PROP_OBJECT
 GIMP_CONFIG_PROP_PATH
 GIMP_CONFIG_PROP_POINTER
 GIMP_CONFIG_PROP_RESOLUTION
 GIMP_CONFIG_PROP_RGB
 GIMP_CONFIG_PROP_STRING
 GIMP_CONFIG_PROP_UINT64
 GIMP_CONFIG_PROP_UINT
 GIMP_CONFIG_PROP_UNIT
 gimp_config_param_spec_duplicate
 </SECTION>
 <SECTION>
 <FILE>gimpconfig-path</FILE>
 GimpConfigPath
 GimpConfigPathType
 gimp_param_spec_config_path
 gimp_param_spec_config_path_type
 gimp_config_path_expand
 gimp_config_path_expand_to_files
 gimp_config_path_unexpand
 gimp_file_new_for_config_path
 gimp_file_get_config_path
 gimp_config_build_data_path
 gimp_config_build_writable_path
 gimp_config_build_plug_in_path
 gimp_config_build_system_path
 GIMP_VALUE_HOLDS_CONFIG_PATH
 <SUBSECTION Standard>
 GIMP_TYPE_CONFIG_PATH
 GIMP_TYPE_PARAM_CONFIG_PATH
 GIMP_IS_PARAM_SPEC_CONFIG_PATH
 gimp_config_path_get_type
 gimp_param_config_path_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpconfig-register</FILE>
 gimp_config_type_register
 </SECTION>
 <SECTION>
 <FILE>gimpconfig-serialize</FILE>
 gimp_config_serialize_properties
 gimp_config_serialize_changed_properties
 gimp_config_serialize_property
 gimp_config_serialize_property_by_name
 gimp_config_serialize_value
 </SECTION>
 <SECTION>
 <FILE>gimpconfig-utils</FILE>
 gimp_config_diff
 gimp_config_sync
 gimp_config_reset_properties
 gimp_config_reset_property
 gimp_config_string_append_escaped
 </SECTION>
 <SECTION>
 <FILE>gimpconfigwriter</FILE>
 <TITLE>GimpConfigWriter</TITLE>
 GimpConfigWriter
 gimp_config_writer_new_from_file
 gimp_config_writer_new_from_stream
 gimp_config_writer_new_from_fd
 gimp_config_writer_new_from_string
 gimp_config_writer_ref
 gimp_config_writer_unref
 gimp_config_writer_open
 gimp_config_writer_comment_mode
 gimp_config_writer_print
 gimp_config_writer_printf
 gimp_config_writer_identifier
 gimp_config_writer_string
 gimp_config_writer_data
 gimp_config_writer_comment
 gimp_config_writer_linefeed
 gimp_config_writer_revert
 gimp_config_writer_close
 gimp_config_writer_finish
 <SUBSECTION Standard>
 GIMP_TYPE_CONFIG_WRITER
 gimp_config_writer_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpscanner</FILE>
 <TITLE>GimpScanner</TITLE>
 gimp_scanner_new_file
 gimp_scanner_new_stream
 gimp_scanner_new_string
 gimp_scanner_ref
 gimp_scanner_unref
 gimp_scanner_parse_token
 gimp_scanner_parse_identifier
 gimp_scanner_parse_string
 gimp_scanner_parse_string_no_validate
 gimp_scanner_parse_data
 gimp_scanner_parse_int
 gimp_scanner_parse_int64
 gimp_scanner_parse_float
 gimp_scanner_parse_boolean
 gimp_scanner_parse_color
 gimp_scanner_parse_matrix2
 <SUBSECTION Standard>
 GimpScanner
 GIMP_TYPE_SCANNER
 gimp_scanner_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpcolorconfig</FILE>
 <TITLE>GimpColorConfig</TITLE>
 GimpColorManagementMode
 GimpColorRenderingIntent
 GimpColorConfig
 gimp_color_config_get_mode
 gimp_color_config_get_display_intent
 gimp_color_config_get_display_bpc
 gimp_color_config_get_display_optimize
 gimp_color_config_get_display_profile_from_gdk
 gimp_color_config_get_simulation_intent
 gimp_color_config_get_simulation_bpc
 gimp_color_config_get_simulation_optimize
 gimp_color_config_get_simulation_gamut_check
 gimp_color_config_get_out_of_gamut_color
 gimp_color_config_get_rgb_color_profile
 gimp_color_config_get_gray_color_profile
 gimp_color_config_get_cmyk_color_profile
 gimp_color_config_get_display_color_profile
 gimp_color_config_get_simulation_color_profile
 <SUBSECTION Standard>
 GimpColorConfigClass
 GimpColorConfigPrivate
 GIMP_COLOR_CONFIG
 GIMP_IS_COLOR_CONFIG
 GIMP_TYPE_COLOR_CONFIG
 gimp_color_config_get_type
 GIMP_COLOR_CONFIG_CLASS
 GIMP_IS_COLOR_CONFIG_CLASS
 GIMP_TYPE_COLOR_MANAGEMENT_MODE
 gimp_color_management_mode_get_type
 GIMP_TYPE_COLOR_RENDERING_INTENT
 gimp_color_rendering_intent_get_type
 </SECTION>
--- a/devel-docs/libgimpconfig/libgimpconfig3.types
+++ b/devel-docs/libgimpconfig/libgimpconfig3.types
@ -1,7 +0,0 @@
 #include <gio/gio.h>
 #include <libgimpconfig/gimpconfig.h>
 gimp_config_get_type
 gimp_color_config_get_type
 gimp_config_writer_get_type
 gimp_scanner_get_type
--- a/devel-docs/libgimpconfig/meson.build
+++ b/devel-docs/libgimpconfig/meson.build
@ -1,30 +0,0 @@
 module_name = 'libgimpconfig3'
 gnome.gtkdoc(module_name,
  main_sgml: module_name + '-docs.sgml',
  gobject_typesfile: files(module_name + '.types'),
  src_dir: meson.source_root() / 'libgimpconfig',
  ignore_headers: [
  ],
  dependencies: [
    fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
    declare_dependency(
      include_directories: rootInclude,
      link_with: [
      libgimpbase,
      libgimpcolor,
      libgimpmath,
      libgimpconfig,
    ]),
  ],
  scan_args: scan_args_common,
  mkdb_args: mkdb_args_common,
  fixxref_args:  [
    '--extra-dir='+ devel_docs_build_root / 'libgimpbase'  / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpcolor' / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpmath'  / 'html',
  ],
 )
--- a/devel-docs/libgimpmath/.gitignore
+++ b/devel-docs/libgimpmath/.gitignore
@ -1,19 +0,0 @@
 /Makefile
 /Makefile.in
 /deprecated
 /libgimpmath3.args
 /libgimpmath3-decl.txt
 /libgimpmath3-decl-list.txt
 /libgimpmath3.hierarchy
 /libgimpmath3.interfaces
 /libgimpmath3.prerequisites
 /libgimpmath3.signals
 /libgimpmath3-unused.txt
 /libgimpmath3-undeclared.txt
 /libgimpmath3-undocumented.txt
 /html
 /tmpl
 /xml
 /.libs
 /*.bak
 /*.stamp
--- a/devel-docs/libgimpmath/Makefile.am
+++ b/devel-docs/libgimpmath/Makefile.am
@ -1,50 +0,0 @@
 ## Process this file with automake to produce Makefile.in
 # The name of the module.
 DOC_MODULE = libgimpmath3
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code.
 DOC_SOURCE_DIR = $(top_srcdir)/libgimpmath
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS =
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS =
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS =
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES =
 # Images to copy into HTML directory
 HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =
 # Other files to distribute
 extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS =
 GTKDOC_LIBS =
 include $(top_srcdir)/gtk-doc.make
 # This is a hack. The entire commit must be reverted once
 # this file gets removed by gtk-doc.make
 CLEANFILES += $(DOC_MODULE).actions
--- a/devel-docs/libgimpmath/libgimpmath3-docs.sgml
+++ b/devel-docs/libgimpmath/libgimpmath3-docs.sgml
@ -1,47 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                      'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
 <book lang="en" id="libgimpmath" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
    <title>GIMP 3 Math Library Reference Manual</title>
    <releaseinfo>
      for GIMP <xi:include href="../version" parse="text"/>
    </releaseinfo>
  </bookinfo>
  <part>
    <title>GIMP Math Library</title>
    <xi:include href="xml/gimpmath.xml" />
    <xi:include href="xml/gimpmatrix.xml" />
    <xi:include href="xml/gimpvector.xml" />
  </part>
  <index id="api-index-full">
    <title>Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.4" id="api-index-2-4">
    <title>Index of new symbols in GIMP 2.4</title>
    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.8" id="api-index-2-8">
    <title>Index of new symbols in GIMP 2.8</title>
    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10" id="api-index-2-10">
    <title>Index of new symbols in GIMP 2.10</title>
    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.16" id="api-index-2-10-16">
    <title>Index of new symbols in GIMP 2.10.16</title>
    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="deprecated" id="api-index-deprecated">
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/devel-docs/libgimpmath/libgimpmath3-overrides.txt
+++ b/devel-docs/libgimpmath/libgimpmath3-overrides.txt
--- a/devel-docs/libgimpmath/libgimpmath3-sections.txt
+++ b/devel-docs/libgimpmath/libgimpmath3-sections.txt
@ -1,119 +0,0 @@
 <SECTION>
 <FILE>gimpmath</FILE>
 <TITLE>GimpMath</TITLE>
 RINT
 ROUND
 SIGNED_ROUND
 SQR
 MAX255
 CLAMP0255
 SAFE_CLAMP
 gimp_deg_to_rad
 gimp_rad_to_deg
 </SECTION>
 <SECTION>
 <FILE>gimpmatrix</FILE>
 <TITLE>GimpMatrix</TITLE>
 GimpMatrix2
 GimpMatrix3
 GimpMatrix4
 gimp_matrix2_identity
 gimp_matrix2_mult
 gimp_matrix2_determinant
 gimp_matrix2_invert
 gimp_matrix2_transform_point
 gimp_matrix3_identity
 gimp_matrix3_mult
 gimp_matrix3_translate
 gimp_matrix3_scale
 gimp_matrix3_rotate
 gimp_matrix3_xshear
 gimp_matrix3_yshear
 gimp_matrix3_affine
 gimp_matrix3_transform_point
 gimp_matrix3_determinant
 gimp_matrix3_invert
 gimp_matrix3_is_identity
 gimp_matrix3_is_diagonal
 gimp_matrix3_is_affine
 gimp_matrix3_is_simple
 gimp_matrix3_equal
 gimp_matrix4_identity
 gimp_matrix4_mult
 gimp_matrix4_to_deg
 gimp_matrix4_transform_point
 GIMP_TYPE_MATRIX2
 GIMP_TYPE_PARAM_MATRIX2
 GIMP_IS_PARAM_SPEC_MATRIX2
 gimp_param_spec_matrix2
 GIMP_VALUE_HOLDS_MATRIX2
 GIMP_TYPE_MATRIX3
 GIMP_TYPE_PARAM_MATRIX3
 GIMP_IS_PARAM_SPEC_MATRIX3
 gimp_param_spec_matrix3
 GIMP_VALUE_HOLDS_MATRIX3
 <SUBSECTION Standard>
 gimp_matrix2_get_type
 gimp_param_matrix2_get_type
 gimp_matrix3_get_type
 gimp_param_matrix3_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpvector</FILE>
 <TITLE>GimpVector</TITLE>
 GimpVector2
 GimpVector3
 GimpVector4
 gimp_vector2_new
 gimp_vector2_set
 gimp_vector2_length
 gimp_vector2_length_val
 gimp_vector2_mul
 gimp_vector2_mul_val
 gimp_vector2_normal
 gimp_vector2_normal_val
 gimp_vector2_normalize
 gimp_vector2_normalize_val
 gimp_vector2_neg
 gimp_vector2_neg_val
 gimp_vector2_add
 gimp_vector2_add_val
 gimp_vector2_sub
 gimp_vector2_sub_val
 gimp_vector2_inner_product
 gimp_vector2_inner_product_val
 gimp_vector2_cross_product
 gimp_vector2_cross_product_val
 gimp_vector2_rotate
 gimp_vector2_rotate_val
 gimp_vector3_new
 gimp_vector3_set
 gimp_vector3_length
 gimp_vector3_length_val
 gimp_vector3_mul
 gimp_vector3_mul_val
 gimp_vector3_normalize
 gimp_vector3_normalize_val
 gimp_vector3_neg
 gimp_vector3_neg_val
 gimp_vector3_add
 gimp_vector3_add_val
 gimp_vector3_sub
 gimp_vector3_sub_val
 gimp_vector3_inner_product
 gimp_vector3_inner_product_val
 gimp_vector3_cross_product
 gimp_vector3_cross_product_val
 gimp_vector3_rotate
 gimp_vector3_rotate_val
 gimp_vector_2d_to_3d
 gimp_vector_2d_to_3d_val
 gimp_vector_3d_to_2d
 <SUBSECTION Standard>
 GIMP_TYPE_VECTOR2
 GIMP_TYPE_VECTOR3
 gimp_vector2_get_type
 gimp_vector3_get_type
 </SECTION>
--- a/devel-docs/libgimpmath/libgimpmath3.types
+++ b/devel-docs/libgimpmath/libgimpmath3.types
--- a/devel-docs/libgimpmath/meson.build
+++ b/devel-docs/libgimpmath/meson.build
@ -1,14 +0,0 @@
 module_name = 'libgimpmath3'
 gnome.gtkdoc(module_name,
  main_sgml: module_name + '-docs.sgml',
  gobject_typesfile: files(module_name + '.types'),
  src_dir: meson.source_root() / 'libgimpmath',
  dependencies: [
    fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
  ],
  scan_args: scan_args_common,
  mkdb_args: mkdb_args_common,
 )
--- a/devel-docs/libgimpmodule/.gitignore
+++ b/devel-docs/libgimpmodule/.gitignore
@ -1,20 +0,0 @@
 /Makefile
 /Makefile.in
 /deprecated
 /libgimpmodule3.actions
 /libgimpmodule3.args
 /libgimpmodule3.hierarchy
 /libgimpmodule3.interfaces
 /libgimpmodule3.prerequisites
 /libgimpmodule3.signals
 /libgimpmodule3-decl.txt
 /libgimpmodule3-decl-list.txt
 /libgimpmodule3-unused.txt
 /libgimpmodule3-undeclared.txt
 /libgimpmodule3-undocumented.txt
 /html
 /tmpl
 /xml
 /.libs
 /*.bak
 /*.stamp
--- a/devel-docs/libgimpmodule/Makefile.am
+++ b/devel-docs/libgimpmodule/Makefile.am
@ -1,59 +0,0 @@
 ## Process this file with automake to produce Makefile.in
 # The name of the module.
 DOC_MODULE = libgimpmodule3
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code.
 DOC_SOURCE_DIR = $(top_srcdir)/libgimpmodule
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS =
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS =
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES =
 # Images to copy into HTML directory
 HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =
 # Other files to distribute
 extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	@CFLAGS@		\
 	-I$(top_srcdir)		\
 	-I$(top_builddir)	\
 	@GIO_CFLAGS@		\
 	@GMODULE_NO_EXPORT_CFLAGS@
 GTKDOC_LIBS = \
 	$(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la \
 	@GIO_LIBS@	\
 	@GMODULE_NO_EXPORT_LIBS@
 include $(top_srcdir)/gtk-doc.make
 # This is a hack. The entire commit must be reverted once
 # this file gets removed by gtk-doc.make
 CLEANFILES += $(DOC_MODULE).actions
--- a/devel-docs/libgimpmodule/libgimpmodule3-docs.sgml
+++ b/devel-docs/libgimpmodule/libgimpmodule3-docs.sgml
@ -1,38 +0,0 @@
 <?xml version="1.0"?>
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                      'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
 <book lang="en" id="libgimpmodule" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
    <title>GIMP 3 Module Library Reference Manual</title>
    <releaseinfo>
      for GIMP <xi:include href="../version" parse="text"/>
    </releaseinfo>
  </bookinfo>
  <part>
    <title>GIMP Module Library</title>
    <xi:include href="xml/gimpmodule.xml" />
    <xi:include href="xml/gimpmoduledb.xml" />
  </part>
  <index id="api-index-full">
    <title>Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.8" id="api-index-2-8">
    <title>Index of new symbols in GIMP 2.8</title>
    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
  </index>
  <index role="3.0" id="api-index-3-0">
    <title>Index of new symbols in GIMP 3.0</title>
    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
  </index>
  <index role="deprecated" id="api-index-deprecated">
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/devel-docs/libgimpmodule/libgimpmodule3-overrides.txt
+++ b/devel-docs/libgimpmodule/libgimpmodule3-overrides.txt
--- a/devel-docs/libgimpmodule/libgimpmodule3-sections.txt
+++ b/devel-docs/libgimpmodule/libgimpmodule3-sections.txt
@ -1,57 +0,0 @@
 <SECTION>
 <FILE>gimpmodule</FILE>
 GimpModuleInfo
 GimpModuleState
 GimpModuleQueryFunc
 GimpModuleRegisterFunc
 GIMP_MODULE_ERROR
 GimpModuleError
 GIMP_MODULE_ABI_VERSION
 <TITLE>GimpModule</TITLE>
 gimp_module_new
 gimp_module_query_module
 gimp_module_get_file
 gimp_module_get_auto_load
 gimp_module_set_auto_load
 gimp_module_is_loaded
 gimp_module_is_on_disk
 gimp_module_get_info
 gimp_module_get_last_error
 gimp_module_get_state
 gimp_module_error_quark
 <SUBSECTION Standard>
 GimpModule
 GimpModuleClass
 GimpModulePrivate
 GIMP_MODULE
 GIMP_IS_MODULE
 GIMP_TYPE_MODULE
 gimp_module_get_type
 GIMP_MODULE_CLASS
 GIMP_IS_MODULE_CLASS
 GIMP_MODULE_GET_CLASS
 </SECTION>
 <SECTION>
 <FILE>gimpmoduledb</FILE>
 <TITLE>GimpModuleDB</TITLE>
 gimp_module_db_new
 gimp_module_db_get_modules
 gimp_module_db_get_verbose
 gimp_module_db_set_verbose
 gimp_module_db_set_load_inhibit
 gimp_module_db_get_load_inhibit
 gimp_module_db_load
 gimp_module_db_refresh
 <SUBSECTION Standard>
 GimpModuleDB
 GimpModuleDBClass
 GimpModuleDBPrivate
 GIMP_MODULE_DB
 GIMP_IS_MODULE_DB
 GIMP_TYPE_MODULE_DB
 gimp_module_db_get_type
 GIMP_MODULE_DB_CLASS
 GIMP_IS_MODULE_DB_CLASS
 GIMP_MODULE_DB_GET_CLASS
 </SECTION>
--- a/devel-docs/libgimpmodule/libgimpmodule3.types
+++ b/devel-docs/libgimpmodule/libgimpmodule3.types
@ -1,6 +0,0 @@
 #include <gio/gio.h>
 #include <libgimpmodule/gimpmodule.h>
 gimp_module_get_type
 gimp_module_db_get_type
--- a/devel-docs/libgimpmodule/meson.build
+++ b/devel-docs/libgimpmodule/meson.build
@ -1,23 +0,0 @@
 module_name = 'libgimpmodule3'
 gnome.gtkdoc(module_name,
  main_sgml: module_name + '-docs.sgml',
  gobject_typesfile: files(module_name + '.types'),
  src_dir: meson.source_root() / 'libgimpmodule',
  dependencies: [
    fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
    declare_dependency(
      include_directories: rootInclude,
      link_with: [
        libgimpmodule,
      ],
    )
  ],
  scan_args: scan_args_common + [
    '--deprecated-guards="GIMP_DISABLE_DEPRECATED"'
  ],
  mkdb_args: mkdb_args_common,
 )
--- a/devel-docs/libgimpthumb/.gitignore
+++ b/devel-docs/libgimpthumb/.gitignore
@ -1,20 +0,0 @@
 /Makefile
 /Makefile.in
 /deprecated
 /libgimpthumb3.actions
 /libgimpthumb3.args
 /libgimpthumb3.hierarchy
 /libgimpthumb3.interfaces
 /libgimpthumb3.prerequisites
 /libgimpthumb3.signals
 /libgimpthumb3-decl.txt
 /libgimpthumb3-decl-list.txt
 /libgimpthumb3-unused.txt
 /libgimpthumb3-undeclared.txt
 /libgimpthumb3-undocumented.txt
 /html
 /tmpl
 /xml
 /.libs
 /*.bak
 /*.stamp
--- a/devel-docs/libgimpthumb/Makefile.am
+++ b/devel-docs/libgimpthumb/Makefile.am
@ -1,59 +0,0 @@
 ## Process this file with automake to produce Makefile.in
 # The name of the module.
 DOC_MODULE = libgimpthumb3
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code.
 DOC_SOURCE_DIR = $(top_srcdir)/libgimpthumb
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS =
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS =
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS = \
 	--extra-dir=../libgimpmath/html
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES = libgimpthumb.h
 # Images to copy into HTML directory
 HTML_IMAGES =
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =
 # Other files to distribute
 extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	@CFLAGS@		\
 	-I$(top_srcdir) 	\
 	-I$(top_builddir) 	\
 	@GDK_PIXBUF_CFLAGS@
 GTKDOC_LIBS = \
        $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la   \
        $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la \
 	@GDK_PIXBUF_LIBS@
 include $(top_srcdir)/gtk-doc.make
 # This is a hack. The entire commit must be reverted once
 # this file gets removed by gtk-doc.make
 CLEANFILES += $(DOC_MODULE).actions
--- a/devel-docs/libgimpthumb/libgimpthumb3-docs.sgml
+++ b/devel-docs/libgimpthumb/libgimpthumb3-docs.sgml
@ -1,40 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                      'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
 <book lang="en" id="libgimpthumb" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
    <title>GIMP 3 Thumbnail Library Reference Manual</title>
    <releaseinfo>
      for GIMP <xi:include href="../version" parse="text"/>
    </releaseinfo>
  </bookinfo>
  <part>
    <title>GIMP Thumbnail Library</title>
    <xi:include href="xml/gimpthumbnail.xml" />
    <xi:include href="xml/gimpthumb-utils.xml" />
    <xi:include href="xml/gimpthumb-enums.xml" />
    <xi:include href="xml/gimpthumb-error.xml" />
  </part>
  <index id="api-index-full">
    <title>Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.2" id="api-index-2-2">
    <title>Index of new symbols in GIMP 2.2</title>
    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10" id="api-index-2-10">
    <title>Index of new symbols in GIMP 2.10</title>
    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="deprecated" id="api-index-deprecated">
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/devel-docs/libgimpthumb/libgimpthumb3-overrides.txt
+++ b/devel-docs/libgimpthumb/libgimpthumb3-overrides.txt
--- a/devel-docs/libgimpthumb/libgimpthumb3-sections.txt
+++ b/devel-docs/libgimpthumb/libgimpthumb3-sections.txt
@ -1,67 +0,0 @@
 <SECTION>
 <FILE>gimpthumbnail</FILE>
 <TITLE>GimpThumbnail</TITLE>
 GimpThumbnail
 gimp_thumbnail_new
 gimp_thumbnail_set_uri
 gimp_thumbnail_set_filename
 gimp_thumbnail_set_from_thumb
 gimp_thumbnail_peek_image
 gimp_thumbnail_peek_thumb
 gimp_thumbnail_check_thumb
 gimp_thumbnail_load_thumb
 gimp_thumbnail_save_thumb
 gimp_thumbnail_save_thumb_local
 gimp_thumbnail_save_failure
 gimp_thumbnail_delete_failure
 gimp_thumbnail_delete_others
 gimp_thumbnail_has_failed
 <SUBSECTION Standard>
 GimpThumbnailClass
 GimpThumbnailPrivate
 GIMP_THUMBNAIL
 GIMP_IS_THUMBNAIL
 GIMP_TYPE_THUMBNAIL
 gimp_thumbnail_get_type
 GIMP_THUMBNAIL_CLASS
 GIMP_IS_THUMBNAIL_CLASS
 GIMP_THUMBNAIL_GET_CLASS
 </SECTION>
 <SECTION>
 <FILE>gimpthumb-utils</FILE>
 gimp_thumb_init
 gimp_thumb_get_thumb_base_dir
 gimp_thumb_find_thumb
 gimp_thumb_file_test
 gimp_thumb_name_from_uri
 gimp_thumb_ensure_thumb_dir
 gimp_thumb_get_thumb_dir
 gimp_thumbs_delete_for_uri
 gimp_thumb_name_from_uri_local
 gimp_thumb_ensure_thumb_dir_local
 gimp_thumb_get_thumb_dir_local
 gimp_thumbs_delete_for_uri_local
 </SECTION>
 <SECTION>
 <FILE>gimpthumb-enums</FILE>
 GimpThumbFileType
 GimpThumbSize
 GimpThumbState
 <SUBSECTION Standard>
 GIMP_TYPE_THUMB_SIZE
 gimp_thumb_file_type_get_type
 GIMP_TYPE_THUMB_FILE_TYPE
 gimp_thumb_size_get_type
 GIMP_TYPE_THUMB_STATE
 gimp_thumb_state_get_type
 </SECTION>
 <SECTION>
 <FILE>gimpthumb-error</FILE>
 GimpThumbError
 GIMP_THUMB_ERROR
 gimp_thumb_error_quark
 </SECTION>
--- a/devel-docs/libgimpthumb/libgimpthumb3.types
+++ b/devel-docs/libgimpthumb/libgimpthumb3.types
@ -1,4 +0,0 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <libgimpthumb/gimpthumb.h>
 gimp_thumbnail_get_type
--- a/devel-docs/libgimpthumb/meson.build
+++ b/devel-docs/libgimpthumb/meson.build
@ -1,28 +0,0 @@
 module_name = 'libgimpthumb3'
 gnome.gtkdoc(module_name,
  main_sgml: module_name + '-docs.sgml',
  gobject_typesfile: files(module_name + '.types'),
  src_dir:  meson.source_root() / 'libgimpthumb',
  ignore_headers: [
    'libgimpthumb.h',
  ],
  dependencies: [
    fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
    declare_dependency(
    include_directories: rootInclude,
    link_with: [
      libgimpmath,
      libgimpthumb,
    ]),
  ],
  scan_args: scan_args_common,
  mkdb_args: mkdb_args_common,
  fixxref_args:  [
    '--extra-dir='+ devel_docs_build_root / 'libgimpmath' / 'html',
  ],
 )
--- a/devel-docs/libgimpwidgets/.gitignore
+++ b/devel-docs/libgimpwidgets/.gitignore
@ -1,19 +0,0 @@
 /Makefile
 /Makefile.in
 /deprecated
 /libgimpwidgets3.actions
 /libgimpwidgets3.args
 /libgimpwidgets3.hierarchy
 /libgimpwidgets3.interfaces
 /libgimpwidgets3.prerequisites
 /libgimpwidgets3.signals
 /libgimpwidgets3-decl.txt
 /libgimpwidgets3-decl-list.txt
 /libgimpwidgets3-unused.txt
 /libgimpwidgets3-undeclared.txt
 /libgimpwidgets3-undocumented.txt
 /html
 /xml
 /.libs
 /*.bak
 /*.stamp
--- a/devel-docs/libgimpwidgets/Makefile.am
+++ b/devel-docs/libgimpwidgets/Makefile.am
@ -1,89 +0,0 @@
 ## Process this file with automake to produce Makefile.in
 # The name of the module.
 DOC_MODULE = libgimpwidgets3
 # The top-level SGML file.
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
 # The directory containing the source code.
 DOC_SOURCE_DIR = $(top_srcdir)/libgimpwidgets
 # Extra options to pass to gtkdoc-scangobj
 # make sure babl is initialized, otherwise we segfault.
 SCANGOBJ_OPTIONS = --type-init-func="do { void babl_init (void); babl_init (); } while (0)"
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS = --deprecated-guards="GIMP_DISABLE_DEPRECATED"
 # Extra options to supply to gtkdoc-mkdb
 MKDB_OPTIONS = --sgml-mode --output-format=xml --name-space=gimp
 # Extra options to supply to gtkdoc-fixref
 FIXXREF_OPTIONS = \
 	--extra-dir=../libgimpbase/html		\
 	--extra-dir=../libgimpcolor/html	\
 	--extra-dir=../libgimpconfig/html	\
 	--extra-dir=../libgimpmath/html		\
 	--extra-dir=../libgimp/html
 # Used for dependencies
 HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
 CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
 # Header files to ignore when scanning
 IGNORE_HFILES = \
 	gimp-icon-pixbufs.h		\
 	gimp-color-picker-cursors.h	\
 	gimpcolorprofilestore-private.h	\
 	gimpeevl.h			\
 	gimpwidgets-private.h
 # Images to copy into HTML directory
 HTML_IMAGES = \
 	$(top_srcdir)/icons/Color/12/gimp-*.png		\
 	$(top_srcdir)/icons/Color/16/gimp-*.png		\
 	$(top_srcdir)/icons/Color/18/gimp-*.png		\
 	$(top_srcdir)/icons/Color/20/gimp-*.png		\
 	$(top_srcdir)/icons/Color/22/gimp-*.png		\
 	$(top_srcdir)/icons/Color/24/gimp-*.png		\
 	$(top_srcdir)/icons/Color/32/gimp-*.png		\
 	$(top_srcdir)/icons/Color/48/gimp-*.png		\
 	$(top_srcdir)/icons/Color/64/gimp-*.png		\
 	$(top_srcdir)/icons/Color/128/gimp-*.png	\
 	$(top_srcdir)/icons/Color/192/gimp-*.png	\
 	$(top_srcdir)/icons/Color/256/gimp-*.png	\
 	$(srcdir)/images/gimp-widget-*.png
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files = visual-index.xml
 # Other files to distribute
 extra_files =
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
 GTKDOC_CFLAGS = \
 	@CFLAGS@					\
 	-I$(top_srcdir) 				\
 	-I$(top_builddir) 				\
 	@GEGL_CFLAGS@					\
 	@GTK_CFLAGS@					\
 	-DGIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION	\
 	-UGIMP_DISABLE_DEPRECATED
 GTKDOC_LIBS = \
 	$(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la		\
 	$(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la	\
 	$(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la		\
 	$(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la	\
 	$(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la	\
 	@GEGL_LIBS@								\
 	@GTK_LIBS@
 include $(top_srcdir)/gtk-doc.make
 # This is a hack. The entire commit must be reverted once
 # this file gets removed by gtk-doc.make
 CLEANFILES += $(DOC_MODULE).actions
--- a/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml
+++ b/devel-docs/libgimpwidgets/libgimpwidgets3-docs.sgml
@ -1,151 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE book PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN'
                      'http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd'>
 <book lang="en" id="libgimpwidgets" xmlns:xi="http://www.w3.org/2003/XInclude">
  <bookinfo>
    <title>GIMP 3 Widgets Library Reference Manual</title>
    <releaseinfo>
      for GIMP <xi:include href="../version" parse="text"/>
    </releaseinfo>
  </bookinfo>
  <part id="libgimpwidgets-widgets">
    <title>GIMP Widgets</title>
    <chapter id="libgimpwidgets-hierarchy">
      <title>Object Hierarchy</title>
      <xi:include href="xml/tree_index.sgml" />
    </chapter>
    <chapter id="libgimpwidgets-gallery">
      <title>Widget Gallery</title>
      <xi:include href="visual-index.xml" />
    </chapter>
    <xi:include href="xml/gimpbrowser.xml" />
    <xi:include href="xml/gimpbusybox.xml" />
    <xi:include href="xml/gimpbutton.xml" />
    <xi:include href="xml/gimpchainbutton.xml" />
    <xi:include href="xml/gimpcolorarea.xml" />
    <xi:include href="xml/gimpcolorbutton.xml" />
    <xi:include href="xml/gimpcolorhexentry.xml" />
    <xi:include href="xml/gimpcolorscale.xml" />
    <xi:include href="xml/gimpcolorselection.xml" />
    <xi:include href="xml/gimpcolorprofilechooserdialog.xml" />
    <xi:include href="xml/gimpcolorprofilestore.xml" />
    <xi:include href="xml/gimpcolorprofilecombobox.xml" />
    <xi:include href="xml/gimpcolorprofileview.xml" />
    <xi:include href="xml/gimpdialog.xml" />
    <xi:include href="xml/gimpenumstore.xml" />
    <xi:include href="xml/gimpenumcombobox.xml" />
    <xi:include href="xml/gimpenumlabel.xml" />
    <xi:include href="xml/gimpfileentry.xml" />
    <xi:include href="xml/gimpframe.xml" />
    <xi:include href="xml/gimphintbox.xml" />
    <xi:include href="xml/gimpintcombobox.xml" />
    <xi:include href="xml/gimpintstore.xml" />
    <xi:include href="xml/gimpmemsizeentry.xml" />
    <xi:include href="xml/gimpnumberpairentry.xml" />
    <xi:include href="xml/gimpoffsetarea.xml" />
    <xi:include href="xml/gimppageselector.xml" />
    <xi:include href="xml/gimppatheditor.xml" />
    <xi:include href="xml/gimppickbutton.xml" />
    <xi:include href="xml/gimppreviewarea.xml" />
    <xi:include href="xml/gimppreview.xml" />
    <xi:include href="xml/gimpruler.xml" />
    <xi:include href="xml/gimpscrolledpreview.xml" />
    <xi:include href="xml/gimpsizeentry.xml" />
    <xi:include href="xml/gimpstringcombobox.xml" />
    <xi:include href="xml/gimpunitstore.xml" />
    <xi:include href="xml/gimpunitcombobox.xml" />
    <xi:include href="xml/gimpzoommodel.xml" />
  </part>
  <part id="libgimpwidgets-cell-renderers">
    <title>Cell Renderers for GtkTreeView</title>
    <xi:include href="xml/gimpcellrenderercolor.xml" />
    <xi:include href="xml/gimpcellrenderertoggle.xml" />
  </part>
  <part id="libgimpwidgets-colordisplay">
    <title>GIMP Display Filters</title>
    <xi:include href="xml/gimpcolordisplay.xml" />
    <xi:include href="xml/gimpcolordisplaystack.xml" />
  </part>
  <part id="libgimpwidgets-colorselector">
    <title>GIMP Color Selectors</title>
    <xi:include href="xml/gimpcolorselector.xml" />
    <xi:include href="xml/gimpcolornotebook.xml" />
    <xi:include href="xml/gimpcolorscales.xml" />
    <xi:include href="xml/gimpcolorselect.xml" />
  </part>
  <part id="libgimpwidgets-controller">
    <title>GIMP Controllers</title>
    <para>
      Note that the controller API is work in progress.
    </para>
    <xi:include href="xml/gimpcontroller.xml" />
  </part>
  <part id="libgimpwidgets-utils">
    <title>GIMP Widgets Utilities</title>
    <xi:include href="xml/gimpcairo-utils.xml" />
    <xi:include href="xml/gimphelpui.xml" />
    <xi:include href="xml/gimpquerybox.xml" />
    <xi:include href="xml/gimpicons.xml" />
    <xi:include href="xml/gimpenumwidgets.xml" />
    <xi:include href="xml/gimppropwidgets.xml" />
    <xi:include href="xml/gimpwidgets.xml" />
    <xi:include href="xml/gimpwidgetsutils.xml" />
  </part>
  <index id="api-index-full">
    <title>Index</title>
    <xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.0" id="api-index-2-0">
    <title>Index of new symbols in GIMP 2.0</title>
    <xi:include href="xml/api-index-2.0.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.2" id="api-index-2-2">
    <title>Index of new symbols in GIMP 2.2</title>
    <xi:include href="xml/api-index-2.2.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.4" id="api-index-2-4">
    <title>Index of new symbols in GIMP 2.4</title>
    <xi:include href="xml/api-index-2.4.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.6" id="api-index-2-6">
    <title>Index of new symbols in GIMP 2.6</title>
    <xi:include href="xml/api-index-2.6.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.8" id="api-index-2-8">
    <title>Index of new symbols in GIMP 2.8</title>
    <xi:include href="xml/api-index-2.8.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10" id="api-index-2-10">
    <title>Index of new symbols in GIMP 2.10</title>
    <xi:include href="xml/api-index-2.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.4" id="api-index-2-10-4">
    <title>Index of new symbols in GIMP 2.10.4</title>
    <xi:include href="xml/api-index-2.10.4.xml"><xi:fallback /></xi:include>
  </index>
  <index role="2.10.10" id="api-index-2-10-10">
    <title>Index of new symbols in GIMP 2.10.10</title>
    <xi:include href="xml/api-index-2.10.10.xml"><xi:fallback /></xi:include>
  </index>
  <index role="3.0" id="api-index-3-0">
    <title>Index of new symbols in GIMP 3.0</title>
    <xi:include href="xml/api-index-3.0.xml"><xi:fallback /></xi:include>
  </index>
  <index role="deprecated" id="api-index-deprecated">
    <title>Index of deprecated symbols</title>
    <xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
  </index>
  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
 </book>
--- a/devel-docs/libgimpwidgets/libgimpwidgets3-overrides.txt
+++ b/devel-docs/libgimpwidgets/libgimpwidgets3-overrides.txt
--- a/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
+++ b/devel-docs/libgimpwidgets/libgimpwidgets3-sections.txt
--- a/devel-docs/libgimpwidgets/libgimpwidgets3.types
+++ b/devel-docs/libgimpwidgets/libgimpwidgets3.types
@ -1,52 +0,0 @@
 #include <gegl.h>
 #include <gtk/gtk.h>
 #include <libgimpwidgets/gimpwidgets.h>
 #include <libgimpwidgets/gimpcontroller.h>
 gimp_browser_get_type
 gimp_busy_box_get_type
 gimp_button_get_type
 gimp_cell_renderer_color_get_type
 gimp_cell_renderer_toggle_get_type
 gimp_chain_button_get_type
 gimp_color_area_get_type
 gimp_color_button_get_type
 gimp_color_display_get_type
 gimp_color_display_stack_get_type
 gimp_color_hex_entry_get_type
 gimp_color_notebook_get_type
 gimp_color_profile_chooser_dialog_get_type
 gimp_color_profile_store_get_type
 gimp_color_profile_combo_box_get_type
 gimp_color_profile_view_get_type
 gimp_color_scale_get_type
 gimp_color_scales_get_type
 gimp_color_selector_get_type
 gimp_color_select_get_type
 gimp_color_selection_get_type
 gimp_controller_get_type
 gimp_dialog_get_type
 gimp_enum_combo_box_get_type
 gimp_enum_label_get_type
 gimp_enum_store_get_type
 gimp_file_entry_get_type
 gimp_frame_get_type
 gimp_hint_box_get_type
 gimp_int_combo_box_get_type
 gimp_int_store_get_type
 gimp_memsize_entry_get_type
 gimp_number_pair_entry_get_type
 gimp_offset_area_get_type
 gimp_page_selector_get_type
 gimp_path_editor_get_type
 gimp_pick_button_get_type
 gimp_preview_area_get_type
 gimp_preview_get_type
 gimp_ruler_get_type
 gimp_scrolled_preview_get_type
 gimp_size_entry_get_type
 gimp_spin_button_get_type
 gimp_string_combo_box_get_type
 gimp_unit_combo_box_get_type
 gimp_unit_store_get_type
 gimp_zoom_model_get_type
--- a/devel-docs/libgimpwidgets/meson.build
+++ b/devel-docs/libgimpwidgets/meson.build
@ -1,81 +0,0 @@
 module_name = 'libgimpwidgets3'
 gnome.gtkdoc(module_name,
  main_sgml: module_name + '-docs.sgml',
  gobject_typesfile: files(module_name + '.types'),
  src_dir: meson.source_root() / 'libgimpwidgets',
  content_files: [
    'visual-index.xml'
  ],
  ignore_headers: [
    'gimp-color-picker-cursors.h',
    'gimp-icon-pixbufs.h',
    'gimpcolorprofilestore-private.h',
    'gimpeevl.h',
    'gimpwidgets-private.h',
  ],
  dependencies: [
    fontconfig, freetype2, gtk3, harfbuzz, pangocairo,
    declare_dependency(
      include_directories: rootInclude,
      link_with: [
      libgimpbase,
      libgimpcolor,
      libgimpmath,
      libgimpconfig,
      libgimpwidgets,
    ]),
  ],
  scanobjs_args: [
    '--type-init-func=do { void babl_init (void); babl_init (); } while (0)',
  ],
  c_args: [
    '-DGIMP_ENABLE_CONTROLLER_UNDER_CONSTRUCTION',
    '-UGIMP_DISABLE_DEPRECATED',
  ],
  scan_args: scan_args_common,
  mkdb_args: mkdb_args_common,
  fixxref_args:  [
    '--extra-dir='+ devel_docs_build_root / 'libgimp'       / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpbase'   / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpcolor'  / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpconfig' / 'html',
    '--extra-dir='+ devel_docs_build_root / 'libgimpmath'   / 'html',
  ],
  html_assets: [
    'images' / 'gimp-widget-browser.png',
    'images' / 'gimp-widget-busy-box.png',
    'images' / 'gimp-widget-button.png',
    'images' / 'gimp-widget-chain-button.png',
    'images' / 'gimp-widget-color-area.png',
    'images' / 'gimp-widget-color-button.png',
    'images' / 'gimp-widget-color-hex-entry.png',
    'images' / 'gimp-widget-color-notebook.png',
    'images' / 'gimp-widget-color-profile-combo-box.png',
    'images' / 'gimp-widget-color-profile-view.png',
    'images' / 'gimp-widget-color-scale.png',
    'images' / 'gimp-widget-color-scales.png',
    'images' / 'gimp-widget-color-select.png',
    'images' / 'gimp-widget-color-selection.png',
    'images' / 'gimp-widget-dialog.png',
    'images' / 'gimp-widget-enum-combo-box.png',
    'images' / 'gimp-widget-enum-label.png',
    'images' / 'gimp-widget-file-entry.png',
    'images' / 'gimp-widget-frame.png',
    'images' / 'gimp-widget-hint-box.png',
    'images' / 'gimp-widget-int-combo-box.png',
    'images' / 'gimp-widget-memsize-entry.png',
    'images' / 'gimp-widget-number-pair-entry.png',
    'images' / 'gimp-widget-offset-area.png',
    'images' / 'gimp-widget-page-selector.png',
    'images' / 'gimp-widget-path-editor.png',
    'images' / 'gimp-widget-pick-button.png',
    'images' / 'gimp-widget-preview-area.png',
    'images' / 'gimp-widget-ruler.png',
    'images' / 'gimp-widget-string-combo-box.png',
    'images' / 'gimp-widget-unit-combo-box.png',
  ],
 )
--- a/devel-docs/libgimpwidgets/tmpl/.gitignore
+++ b/devel-docs/libgimpwidgets/tmpl/.gitignore
@ -1,58 +0,0 @@
 /libgimpwidgets-unused.sgml
 /*.bak
 /gimp3migration.sgml
 /gimpbrowser.sgml
 /gimpbutton.sgml
 /gimpcairo-utils.sgml
 /gimpcellrenderercolor.sgml
 /gimpcellrenderertoggle.sgml
 /gimpchainbutton.sgml
 /gimpcolorarea.sgml
 /gimpcolorbutton.sgml
 /gimpcolordisplay.sgml
 /gimpcolordisplaystack.sgml
 /gimpcolorhexentry.sgml
 /gimpcolornotebook.sgml
 /gimpcolorprofilechooserdialog.sgml
 /gimpcolorprofilecombobox.sgml
 /gimpcolorprofilestore.sgml
 /gimpcolorprofileview.sgml
 /gimpcolorscale.sgml
 /gimpcolorscales.sgml
 /gimpcolorselect.sgml
 /gimpcolorselection.sgml
 /gimpcolorselector.sgml
 /gimpcontroller.sgml
 /gimpdialog.sgml
 /gimpenumcombobox.sgml
 /gimpenumlabel.sgml
 /gimpenumstore.sgml
 /gimpenumwidgets.sgml
 /gimpfileentry.sgml
 /gimpframe.sgml
 /gimphelpui.sgml
 /gimphintbox.sgml
 /gimpintcombobox.sgml
 /gimpintstore.sgml
 /gimpmemsizeentry.sgml
 /gimpnumberpairentry.sgml
 /gimpoffsetarea.sgml
 /gimpoldwidgets.sgml
 /gimppageselector.sgml
 /gimppatheditor.sgml
 /gimppickbutton.sgml
 /gimppixmap.sgml
 /gimppreview.sgml
 /gimppreviewarea.sgml
 /gimppropwidgets.sgml
 /gimpquerybox.sgml
 /gimpruler.sgml
 /gimpscrolledpreview.sgml
 /gimpsizeentry.sgml
 /gimpstringcombobox.sgml
 /gimpunitcombobox.sgml
 /gimpunitmenu.sgml
 /gimpunitstore.sgml
 /gimpwidgets.sgml
 /gimpwidgetsutils.sgml
 /gimpzoommodel.sgml
--- a/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml
+++ b/devel-docs/libgimpwidgets/tmpl/gimpstock.sgml
--- a/devel-docs/libgimpwidgets/visual-index.xml
+++ b/devel-docs/libgimpwidgets/visual-index.xml
@ -1,100 +0,0 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
 <para role="gallery" xml:base="visual-index.xml">
  <link linkend="GimpBrowser">
    <inlinegraphic fileref="gimp-widget-browser.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpButton">
    <inlinegraphic fileref="gimp-widget-button.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpBusyBox">
    <inlinegraphic fileref="gimp-widget-busy-box.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpChainButton">
    <inlinegraphic fileref="gimp-widget-chain-button.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorArea">
    <inlinegraphic fileref="gimp-widget-color-area.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorButton">
    <inlinegraphic fileref="gimp-widget-color-button.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorHexEntry">
    <inlinegraphic fileref="gimp-widget-color-hex-entry.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorNotebook">
    <inlinegraphic fileref="gimp-widget-color-notebook.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorScale">
    <inlinegraphic fileref="gimp-widget-color-scale.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorScales">
    <inlinegraphic fileref="gimp-widget-color-scales.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorSelect">
    <inlinegraphic fileref="gimp-widget-color-select.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorSelection">
    <inlinegraphic fileref="gimp-widget-color-selection.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorProfileComboBox">
    <inlinegraphic fileref="gimp-widget-color-profile-combo-box.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpColorProfileView">
    <inlinegraphic fileref="gimp-widget-color-profile-view.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpDialog">
    <inlinegraphic fileref="gimp-widget-dialog.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpEnumComboBox">
    <inlinegraphic fileref="gimp-widget-enum-combo-box.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpEnumLabel">
    <inlinegraphic fileref="gimp-widget-enum-label.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpFileEntry">
    <inlinegraphic fileref="gimp-widget-file-entry.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpFrame">
    <inlinegraphic fileref="gimp-widget-frame.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpHintBox">
    <inlinegraphic fileref="gimp-widget-hint-box.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpIntComboBox">
    <inlinegraphic fileref="gimp-widget-int-combo-box.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpMemsizeEntry">
    <inlinegraphic fileref="gimp-widget-memsize-entry.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpNumberPairEntry">
    <inlinegraphic fileref="gimp-widget-number-pair-entry.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpOffsetArea">
    <inlinegraphic fileref="gimp-widget-offset-area.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpPageSelector">
    <inlinegraphic fileref="gimp-widget-page-selector.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpPathEditor">
    <inlinegraphic fileref="gimp-widget-path-editor.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpPickButton">
    <inlinegraphic fileref="gimp-widget-pick-button.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpPreviewArea">
    <inlinegraphic fileref="gimp-widget-preview-area.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpRuler">
    <inlinegraphic fileref="gimp-widget-ruler.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpStringComboBox">
    <inlinegraphic fileref="gimp-widget-string-combo-box.png" format="PNG"></inlinegraphic>
  </link>
  <link linkend="GimpUnitComboBox">
    <inlinegraphic fileref="gimp-widget-unit-combo-box.png" format="PNG"></inlinegraphic>
  </link>
 </para>
--- a/devel-docs/meson.build
+++ b/devel-docs/meson.build
@ -17,20 +17,8 @@ mkdb_args_common = [
 ]
-if get_option('gtk-doc')
+if get_option('gi-docgen')
-  if get_option('gtk-doc-app')
+  subdir('reference')
    subdir('app')
  endif
  subdir('libgimp')
  subdir('libgimpbase')
  subdir('libgimpcolor')
  subdir('libgimpconfig')
  subdir('libgimpmath')
  subdir('libgimpmodule')
  subdir('libgimpthumb')
  subdir('libgimpwidgets')
  subdir('tools')
 endif
 if get_option('g-ir-doc')
--- a/devel-docs/reference/.gitignore
+++ b/devel-docs/reference/.gitignore
--- a/devel-docs/reference/Makefile.am
+++ b/devel-docs/reference/Makefile.am
@ -0,0 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 if ENABLE_GI_DOCGEN
 SUBDIRS = gimp gimp-ui
 endif
--- a/devel-docs/reference/gimp-ui/Makefile.am
+++ b/devel-docs/reference/gimp-ui/Makefile.am
@ -0,0 +1,26 @@
 ## Process this file with automake to produce Makefile.in
 GIMP_DOC_LOGO = $(abs_top_srcdir)/data/images/gimp-logo.ong
 gimp-ui-3.0.toml: gimp-ui-3.0.toml.in
 	$(AM_V_GEN) sed \
 		-e 's/@GIMP_VERSION[@]/$(GIMP_VERSION)/' \
 		-e 's/@GIMP_LOGO[@]/$(GIMP_DOC_LOGO)/' \
 		$< $@
 # Markdown content files
 content_files = \
 	widget-gallery.md \
 	$(NULL)
 GimpUi-reference: $(top_builddir)/libgimp/GimpUi-@GIMP_API_VERSION@.gir $(top_builddir)/libgimp/Gimp-@GIMP_API_VERSION@.gir $(content_files) gimp-ui-3.0.toml
 	$(GI_DOCGEN) \
 	generate \
 	--quiet \
 	--fatal-warnings \
 	--config=gimp-ui-3.0.toml \
 	--output-dir=$(abs_builddir)/Gimp-3.0 \
 	--no-namespace-dir \
 	--content-dir=$(abs_srcdir) \
    --add-include-path=$(top_abs_builddir)/gimp \
 	$<
--- a/devel-docs/reference/gimp-ui/gimp-ui-3.0.toml.in
+++ b/devel-docs/reference/gimp-ui/gimp-ui-3.0.toml.in
@ -0,0 +1,108 @@
 [library]
 namespace = "GimpUi"
 version = "@GIMP_VERSION@"
 browse_url = "https://gitlab.gnome.org/GNOME/gimp/"
 repository_url = "https://gitlab.gnome.org/GNOME/gimp.git"
 website_url = "https://www.gimp.org"
 authors = "GIMP contributors"
 logo_url = "@GIMP_LOGO@"
 license = "GPL-3.0-or-later"
 description = "GIMP UI library"
 dependencies = [
  'Babl-0.1',
  'GLib-2.0',
  'GObject-2.0',
  'GdkPixbuf-2.0',
  'Gegl-0.4',
  'Gio-2.0',
  'Gtk-3.0',
  'cairo-1.0',
 ]
 devhelp = true
 search_index = true
  [dependencies."Babl-0.1"]
  name = "Babl"
  description = "Pixel encoding and color space conversion engine"
  docs_url = "https://gegl.org/babl"
  [dependencies."GLib-2.0"]
  name = "GLib"
  description = "C Utility Library"
  docs_url = "https://developer.gnome.org/glib/stable"
  [dependencies."GObject-2.0"]
  name = "GObject"
  description = "The base type system library"
  docs_url = "https://developer.gnome.org/gobject/stable"
  [dependencies."GdkPixbuf-2.0"]
  name = "GdkPixbuf"
  description = "Image loading and scaling"
  docs_url = "https://docs.gtk.org/gdk-pixbuf/"
  [dependencies."Gegl-0.4"]
  name = "Gegl"
  description = "Generic Graphics Library"
  docs_url = "https://gegl.org/"
  [dependencies."Gio-2.0"]
  name = "Gio"
  description = "GObject interfaces and objects"
  docs_url = "https://developer.gnome.org/gio/stable"
  [dependencies."Gtk-3.0"]
  name = "GTK"
  description = "The GTK toolkit"
  docs_url = "https://developer.gnome.org/gtk3/stable"
  [dependencies."cairo-1.0"]
  name = "Cairo"
  description = "A 2D graphics library with support for multiple output devices"
  docs_url = "https://www.cairographics.org/manual/"
 [theme]
 name = "basic"
 show_index_summary = true
 show_class_hierarchy = true
 [source-location]
 base_url = "https://gitlab.gnome.org/GNOME/gimp/-/blob/master/"
 [extra]
 content_files = [
  'widget-gallery.md',
 ]
 content_images = [
  'images/browser.png',
  'images/busy-box.png',
  'images/button.png',
  'images/chain-button.png',
  'images/color-area.png',
  'images/color-button.png',
  'images/color-hex-entry.png',
  'images/color-notebook.png',
  'images/color-profile-combo-box.png',
  'images/color-profile-view.png',
  'images/color-scale.png',
  'images/color-scales.png',
  'images/color-select.png',
  'images/color-selection.png',
  'images/dialog.png',
  'images/enum-combo-box.png',
  'images/enum-label.png',
  'images/file-entry.png',
  'images/frame.png',
  'images/hint-box.png',
  'images/int-combo-box.png',
  'images/memsize-entry.png',
  'images/number-pair-entry.png',
  'images/offset-area.png',
  'images/page-selector.png',
  'images/path-editor.png',
  'images/pick-button.png',
  'images/preview-area.png',
  'images/ruler.png',
  'images/string-combo-box.png',
  'images/unit-combo-box.png',
 ]
--- a/devel-docs/libgimpwidgets/images/gimp-widget-browser.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-browser.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-busy-box.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-busy-box.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-button.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-button.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-chain-button.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-chain-button.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-area.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-area.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-button.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-button.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-hex-entry.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-hex-entry.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-notebook.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-notebook.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-profile-combo-box.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-profile-combo-box.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-profile-view.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-profile-view.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-scale.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-scale.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-scales.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-scales.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-select.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-select.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-color-selection.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-color-selection.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-dialog.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-dialog.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-enum-combo-box.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-enum-combo-box.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-enum-label.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-enum-label.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-file-entry.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-file-entry.png
--- a/devel-docs/libgimpwidgets/images/gimp-widget-frame.png
+++ b/devel-docs/libgimpwidgets/images/gimp-widget-frame.png
--- a/Show more
+++ b/Show more