diff --git a/introspection/meson.build b/introspection/meson.build
index 82c1dd6bb2..7d495f7af3 100644
--- a/introspection/meson.build
+++ b/introspection/meson.build
@@ -57,8 +57,6 @@ sources = []
 introspection_files = []
 headers = []
 
-# FIXME?: DBUS_INTERFACE_DOCS/docbook files are generated in
-# "meson.current_build_dir()" instead of "meson.source_root()/docs/api"
 foreach iface: ifaces
   iface_xml = iface + '.xml'
   ifaces_xmls += files(iface_xml)
@@ -99,12 +97,12 @@ libnmdbus = static_library(
   'nmdbus',
   sources: sources,
   include_directories: top_inc,
-  dependencies: glib_dep,
   c_args: introspection_extra_cflags,
+  dependencies: glib_dep,
 )
 
 libnmdbus_dep = declare_dependency(
   sources: headers,
-  include_directories: include_directories('.'),
-  link_with: libnmdbus,
+  include_directories: top_inc,
+  dependencies: glib_dep,
 )
diff --git a/src/libnm-client-impl/tests/meson.build b/src/libnm-client-impl/tests/meson.build
index 3f7bf3a067..58e0bbb98a 100644
--- a/src/libnm-client-impl/tests/meson.build
+++ b/src/libnm-client-impl/tests/meson.build
@@ -22,6 +22,7 @@ foreach test_unit: test_units
       libnm_client_impl,
       libnm_client_test,
       libnm_base,
+      libnmdbus,
     ],
   )