diff --git a/help/reference/libdocument/meson.build b/help/reference/libdocument/meson.build
index 6f4720a4..fcb84877 100644
--- a/help/reference/libdocument/meson.build
+++ b/help/reference/libdocument/meson.build
@@ -7,22 +7,16 @@ version_xml = configure_file(
   configuration: version_conf,
 )
 
-libdoc_doc_deps = declare_dependency(
-    include_directories: [libdoc_include, include_directories('.')],
-    link_with: libdocument,
-    dependencies: libdocument_deps,
-)
-
 gnome.gtkdoc(
     'libxreaderdocument',
     mode: 'xml',
     main_xml: 'libxreaderdocument-docs.xml',
     gobject_typesfile: files('libxreaderdocument.types'),
     src_dir: [
-        join_paths(meson.source_root(), 'libdocument'),
+        join_paths(meson.build_root(), 'libdocument'),
     ],
     ignore_headers: [libdocument_private_headers],
-    dependencies: libdoc_doc_deps,
+    dependencies: libdocument_dep,
     mkdb_args: ['--xml-mode', '--output-format=xml', '--name-space=ev'],
     fixxref_args: fixref_args,
     install: true,
diff --git a/help/reference/libview/meson.build b/help/reference/libview/meson.build
index 1ab82419..e37600cf 100644
--- a/help/reference/libview/meson.build
+++ b/help/reference/libview/meson.build
@@ -7,24 +7,18 @@ version_xml = configure_file(
   configuration: version_conf,
 )
 
-libview_doc_deps = declare_dependency(
-    include_directories: [include_root, libdoc_include, libview_include, include_directories('.')],
-    link_with: libview,
-    dependencies: libdoc_deps,
-)
-
 gnome.gtkdoc(
     'libxreaderview',
     mode: 'xml',
     main_xml: 'libxreaderview-docs.xml',
     gobject_typesfile: files('libxreaderview.types'),
     src_dir: [
-        join_paths(meson.source_root(), 'libview'),
+        join_paths(meson.build_root(), 'libview'),
     ],
     ignore_headers: [libview_private_headers],
-    dependencies: libview_doc_deps,
+    dependencies: libview_dep,
     mkdb_args: ['--xml-mode', '--output-format=xml', '--name-space=ev'],
-    cflags: '-DXREADER_COMPILATION',
+    c_args: '-DXREADER_COMPILATION',
     fixxref_args: fixref_args,
     install: true,
     install_dir: 'libxreaderview-' + api_version,
diff --git a/help/reference/shell/meson.build b/help/reference/shell/meson.build
index ce0b51cb..b27569f1 100644
--- a/help/reference/shell/meson.build
+++ b/help/reference/shell/meson.build
@@ -8,9 +8,7 @@ version_xml = configure_file(
 )
 
 xreader_doc_deps = declare_dependency(
-    include_directories: [include_root, libdoc_include, libview_include, include_directories('.')],
-    link_with: [libdocument, libview],
-    dependencies: xreader_deps,
+    link_with: libshell.get_shared_lib(),
 )
 
 gnome.gtkdoc(
@@ -19,12 +17,12 @@ gnome.gtkdoc(
     main_xml: 'xreader-docs.xml',
     gobject_typesfile: files('xreader.types'),
     src_dir: [
-        join_paths(meson.source_root(), 'libview'),
+        join_paths(meson.source_root(), 'shell'),
+        join_paths(meson.source_root(), 'libmisc'),
     ],
-    ignore_headers: [libview_private_headers],
     dependencies: xreader_doc_deps,
     mkdb_args: ['--xml-mode', '--output-format=xml', '--name-space=ev'],
-    cflags: '-DXREADER_COMPILATION',
+    c_args: '-DXREADER_COMPILATION',
     fixxref_args: fixref_args,
     install: true,
     install_dir: meson.project_name(),
diff --git a/libview/meson.build b/libview/meson.build
index 77c7f023..5bb7077f 100644
--- a/libview/meson.build
+++ b/libview/meson.build
@@ -1,23 +1,23 @@
 libview_private_headers = [
-    'ev-annotation-window.h',
     'ev-link-accessible.h',
-    'ev-loading-window.h',
-    'ev-page-cache.h',
-    'ev-pixbuf-cache.h',
     'ev-timeline.h',
     'ev-transition-animation.h',
     'ev-view-accessible.h',
-    'ev-view-cursor.h',
     'ev-view-private.h',
 ]
 
 libview_headers = [
+    'ev-annotation-window.h',
     'ev-document-model.h',
     'ev-jobs.h',
     'ev-job-scheduler.h',
+    'ev-loading-window.h',
+    'ev-page-cache.h',
+    'ev-pixbuf-cache.h',
     'ev-print-operation.h',
     'ev-stock-icons.h',
     'ev-view.h',
+    'ev-view-cursor.h',
     'ev-web-view.h',
     'ev-view-presentation.h',
 ]
diff --git a/shell/meson.build b/shell/meson.build
index 4060ceec..808512fe 100644
--- a/shell/meson.build
+++ b/shell/meson.build
@@ -141,7 +141,7 @@ libshell_deps = [
     libephyzoom_dep,
 ]
 
-libshell = static_library(
+libshell = both_libraries(
     'shell',
     shell_sources,
     dependencies: libshell_deps,
@@ -149,7 +149,7 @@ libshell = static_library(
 )
 
 libshell_dep = declare_dependency(
-  link_whole: libshell,  # Need the whole lib for gresource lookup
+  link_whole: libshell.get_static_lib(),  # Need the whole lib for gresource lookup
   dependencies: libshell_deps,
   include_directories: include_dirs,
 )