diff --git a/devel-docs/libgimpbase/.gitignore b/devel-docs/libgimpbase/.gitignore
index 9e029b2475..a96d2154f6 100644
--- a/devel-docs/libgimpbase/.gitignore
+++ b/devel-docs/libgimpbase/.gitignore
@@ -1,16 +1,16 @@
 /Makefile
 /Makefile.in
 /deprecated
-/libgimpbase.args
-/libgimpbase-decl.txt
-/libgimpbase-decl-list.txt
-/libgimpbase.hierarchy
-/libgimpbase.interfaces
-/libgimpbase.prerequisites
-/libgimpbase.signals
-/libgimpbase-unused.txt
-/libgimpbase-undeclared.txt
-/libgimpbase-undocumented.txt
+/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
diff --git a/devel-docs/libgimpbase/Makefile.am b/devel-docs/libgimpbase/Makefile.am
index 012dd79f14..9ef31c17db 100644
--- a/devel-docs/libgimpbase/Makefile.am
+++ b/devel-docs/libgimpbase/Makefile.am
@@ -1,13 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 
 # The name of the module.
-DOC_MODULE = libgimpbase
+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)/$(DOC_MODULE)
+DOC_SOURCE_DIR = $(top_srcdir)/libgimpbase
 
 # Extra options to pass to gtkdoc-scangobj
 SCANGOBJ_OPTIONS =
diff --git a/devel-docs/libgimpbase/libgimpbase-docs.sgml b/devel-docs/libgimpbase/libgimpbase3-docs.sgml
similarity index 86%
rename from devel-docs/libgimpbase/libgimpbase-docs.sgml
rename to devel-docs/libgimpbase/libgimpbase3-docs.sgml
index 10e439c790..2ed8a07fac 100644
--- a/devel-docs/libgimpbase/libgimpbase-docs.sgml
+++ b/devel-docs/libgimpbase/libgimpbase3-docs.sgml
@@ -20,7 +20,6 @@
     <xi:include href="xml/gimpparam.xml" />
     <xi:include href="xml/gimpchecks.xml" />
     <xi:include href="xml/gimpcpuaccel.xml" />
-    <xi:include href="xml/gimpdatafiles.xml" />
     <xi:include href="xml/gimpenv.xml" />
     <xi:include href="xml/gimpmemsize.xml" />
     <xi:include href="xml/gimpmetadata.xml" />
@@ -53,6 +52,14 @@
     <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>
diff --git a/devel-docs/libgimpbase/libgimpbase-overrides.txt b/devel-docs/libgimpbase/libgimpbase3-overrides.txt
similarity index 100%
rename from devel-docs/libgimpbase/libgimpbase-overrides.txt
rename to devel-docs/libgimpbase/libgimpbase3-overrides.txt
diff --git a/devel-docs/libgimpbase/libgimpbase-sections.txt b/devel-docs/libgimpbase/libgimpbase3-sections.txt
similarity index 96%
rename from devel-docs/libgimpbase/libgimpbase-sections.txt
rename to devel-docs/libgimpbase/libgimpbase3-sections.txt
index 0bb8ae7ab9..5ceaf8db49 100644
--- a/devel-docs/libgimpbase/libgimpbase-sections.txt
+++ b/devel-docs/libgimpbase/libgimpbase3-sections.txt
@@ -20,7 +20,6 @@ gimp_flags_set_value_descriptions
 GimpAddMaskType
 GimpBlendMode
 GimpBrushGeneratedShape
-GimpBucketFillMode
 GimpCapStyle
 GimpChannelOps
 GimpChannelType
@@ -78,7 +77,6 @@ GimpVectorsStrokeType
 GIMP_TYPE_ADD_MASK_TYPE
 GIMP_TYPE_BLEND_MODE
 GIMP_TYPE_BRUSH_GENERATED_SHAPE
-GIMP_TYPE_BUCKET_FILL_MODE
 GIMP_TYPE_CAP_STYLE
 GIMP_TYPE_CHANNEL_OPS
 GIMP_TYPE_CHANNEL_TYPE
@@ -130,7 +128,6 @@ GIMP_TYPE_TEXT_JUSTIFICATION
 GIMP_TYPE_TRANSFER_MODE
 GIMP_TYPE_TRANSFORM_DIRECTION
 GIMP_TYPE_TRANSFORM_RESIZE
-GIMP_TYPE_USER_DIRECTORY
 GIMP_TYPE_VECTORS_STROKE_TYPE
 gimp_add_mask_type_get_type
 gimp_brush_generated_shape_get_type
@@ -153,7 +150,6 @@ gimp_precision_get_type
 gimp_rotation_type_get_type
 gimp_select_criterion_get_type
 gimp_blend_mode_get_type
-gimp_bucket_fill_mode_get_type
 gimp_channel_ops_get_type
 gimp_channel_type_get_type
 gimp_check_size_get_type
@@ -187,7 +183,6 @@ gimp_text_justification_get_type
 gimp_transfer_mode_get_type
 gimp_transform_direction_get_type
 gimp_transform_resize_get_type
-gimp_user_directory_get_type
 gimp_vectors_stroke_type_get_type
 </SECTION>
 
@@ -214,9 +209,12 @@ gimp_directory
 gimp_installation_directory
 gimp_data_directory
 gimp_locale_directory
-gimp_plug_in_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
@@ -243,7 +241,6 @@ GIMP_MAX_MEMSIZE
 <FILE>gimpmemsize</FILE>
 gimp_memsize_serialize
 gimp_memsize_deserialize
-gimp_memsize_to_string
 GIMP_TYPE_MEMSIZE
 GIMP_TYPE_PARAM_MEMSIZE
 GIMP_IS_PARAM_SPEC_MEMSIZE
@@ -342,6 +339,7 @@ GimpPixPipeParams
 gimp_pixpipe_params_init
 gimp_pixpipe_params_parse
 gimp_pixpipe_params_build
+gimp_pixpipe_params_free
 </SECTION>
 
 <SECTION>
@@ -444,11 +442,3 @@ gimp_major_version
 gimp_minor_version
 gimp_micro_version
 </SECTION>
-
-<SECTION>
-<FILE>gimpdatafiles</FILE>
-GimpDatafileData
-GimpDatafileLoaderFunc
-gimp_datafiles_check_extension
-gimp_datafiles_read_directories
-</SECTION>
diff --git a/devel-docs/libgimpbase/libgimpbase.types b/devel-docs/libgimpbase/libgimpbase3.types
similarity index 100%
rename from devel-docs/libgimpbase/libgimpbase.types
rename to devel-docs/libgimpbase/libgimpbase3.types