diff --git a/docs/cpml/meson.build b/docs/cpml/meson.build
index 1b6e679f..b7c1e82b 100644
--- a/docs/cpml/meson.build
+++ b/docs/cpml/meson.build
@@ -1,17 +1,21 @@
 bookinfo_xml = configure_file(
     input:         'bookinfo.xml.in',
     output:        '@BASENAME@',
     configuration: data
 )
 
 gnome.gtkdoc('cpml',
     namespace: 'cpml',
     src_dir: cpml_directories,
+    ignore_headers: cpml_internal_names,
     dependencies: cpml_dep,
     main_xml: 'cpml-docs.xml',
     content_files: bookinfo_xml,
+    scan_args: [
+        '--rebuild-sections',
+    ],
     mkdb_args: [
         '--default-includes=cpml.h',
     ],
     install_dir: 'cpml-' + metadata['api']
 )
diff --git a/src/cpml/meson.build b/src/cpml/meson.build
index 5385734e..8ab5394a 100644
--- a/src/cpml/meson.build
+++ b/src/cpml/meson.build
@@ -1,94 +1,93 @@
 cpml_directories = include_directories('.')
 
 
 cpml_c_files = files([
     'cpml-arc.c',
     'cpml-curve.c',
     'cpml-extents.c',
     'cpml-gobject.c',
     'cpml-line.c',
     'cpml-pair.c',
     'cpml-primitive.c',
     'cpml-segment.c',
     'cpml-utils.c',
 ])
 
 cpml_h_files = files([
     'cpml-arc.h',
     'cpml-curve.h',
     'cpml-extents.h',
     'cpml-gobject.h',
     'cpml-internal.h',
     'cpml-pair.h',
     'cpml-primitive.h',
     'cpml-segment.h',
     'cpml-utils.h',
 ])
 
-cpml_internals = files([
+cpml_internal_names = [
     'cpml-primitive-private.h',
-])
+]
 
 
+cpml_internal_files = files(cpml_internal_names)
+
 # Build the CPML library
 cpml_deps = [
     m_dep,
     gobject_dep,
     cairogobject_dep,
     cairo_dep,
 ]
 
 cpml_soversion = '@0@.@1@.@2@'.format(
     cpml_current - cpml_age,
     cpml_age,
     cpml_revision
 )
 
-cpml_headers = cpml_h_files + [ cpml_h ]
-cpml_sources = cpml_c_files + cpml_headers + cpml_internals
-
 cpml = library('cpml-' + metadata['api'],
-    sources:      cpml_sources,
+    sources:      cpml_c_files + cpml_h_files + cpml_internal_files,
     dependencies: cpml_deps,
     version:      cpml_soversion,
     install:      true
 )
 
 cpml_dep = declare_dependency(
-    sources:             cpml_headers,
     dependencies:        cpml_deps,
     link_with:           cpml,
     include_directories: src_directories
 )
 
 install_headers(cpml_h_files, subdir: 'cpml')
 
 
 # pkg-config support for CPML library
 pkgconfig.generate(cpml,
     name:        'CPML',
     filebase:    'cpml-' + metadata['api'],
     description: 'Cairo Path Manipulation Library',
     url:         metadata['homepage'],
     subdirs:     pkgdir,
     version:     meson.project_version()
 )
 
 
 # GObject introspection support for CPML library
 if introspection_dep.found()
     cpml_gir = gnome.generate_gir(cpml,
-        sources:           cpml_c_files + [ cpml_h ] + cpml_h_files,
+        sources:           [ cpml_h ] + cpml_h_files + cpml_c_files,
         namespace:         'Cpml',
         nsversion:         metadata['api'],
         identifier_prefix: 'Cpml',
         symbol_prefix:     'cpml',
         includes:          [ 'cairo-1.0' ],
         header:            'cpml.h',
         install:           true,
         extra_args: [
             '--quiet',
             '--sources-top-dirs=' + meson.current_source_dir(),
+            '--sources-top-dirs=' + meson.current_build_dir(),
         ]
     )
 endif