diff --git a/demos/meson.build b/demos/meson.build
index 30b70bde..062002c4 100644
--- a/demos/meson.build
+++ b/demos/meson.build
@@ -1,5 +1,5 @@
 demo_vkd3d_deps = [
-  threads_dep, vkd3d_headers_dep
+  threads_dep, vkd3d_common_dep
 ]
 
 if vkd3d_platform != 'windows'
diff --git a/include/meson.build b/include/meson.build
index f6ee1726..83a09173 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -13,7 +13,3 @@ vkd3d_idl = [
 ]
 
 vkd3d_header_files = idl_generator.process(vkd3d_idl)
-vkd3d_headers_lib  = static_library('vkd3d-headers', vkd3d_header_files)
-vkd3d_headers_dep  = declare_dependency(
-  link_with           : vkd3d_headers_lib,
-  include_directories : vkd3d_headers_lib.private_dir_include())
diff --git a/libs/vkd3d-common/meson.build b/libs/vkd3d-common/meson.build
index 5754110d..2fca0afd 100644
--- a/libs/vkd3d-common/meson.build
+++ b/libs/vkd3d-common/meson.build
@@ -5,10 +5,10 @@ vkd3d_common_src = [
   'profiling.c'
 ]
 
-vkd3d_common_lib = static_library('vkd3d_common', vkd3d_common_src,
+vkd3d_common_lib = static_library('vkd3d_common', vkd3d_common_src, vkd3d_header_files,
   include_directories : vkd3d_private_includes,
   override_options    : [ 'c_std='+vkd3d_c_std ])
 
 vkd3d_common_dep = declare_dependency(
   link_with           : vkd3d_common_lib,
-  include_directories : vkd3d_public_includes)
+  include_directories : [ vkd3d_public_includes, vkd3d_common_lib.private_dir_include() ])
diff --git a/libs/vkd3d-shader/meson.build b/libs/vkd3d-shader/meson.build
index ca0abc62..84156037 100644
--- a/libs/vkd3d-shader/meson.build
+++ b/libs/vkd3d-shader/meson.build
@@ -8,11 +8,11 @@ vkd3d_shader_src = [
 ]
 
 vkd3d_shader_lib = static_library('vkd3d-shader', vkd3d_shader_src,
-  dependencies        : [ vkd3d_common_dep, dxil_spirv_dep, vkd3d_headers_dep ],
+  dependencies        : [ vkd3d_common_dep, dxil_spirv_dep ],
   include_directories : vkd3d_private_includes,
   override_options    : [ 'c_std='+vkd3d_c_std ])
 
 vkd3d_shader_dep = declare_dependency(
   link_with           : vkd3d_shader_lib,
-  dependencies        : vkd3d_headers_dep,
+  dependencies        : vkd3d_common_dep,
   include_directories : vkd3d_public_includes)
\ No newline at end of file
diff --git a/libs/vkd3d/meson.build b/libs/vkd3d/meson.build
index eb59596c..6ae5d103 100644
--- a/libs/vkd3d/meson.build
+++ b/libs/vkd3d/meson.build
@@ -46,7 +46,7 @@ endif
 
 if not enable_standalone_d3d12
   vkd3d_lib = shared_library('vkd3d-proton', vkd3d_src, glsl_generator.process(vkd3d_shaders), vkd3d_build, vkd3d_version,
-    dependencies        : [ vkd3d_common_dep, vkd3d_shader_dep, vkd3d_headers_dep ] + vkd3d_extra_libs,
+    dependencies        : [ vkd3d_common_dep, vkd3d_shader_dep ] + vkd3d_extra_libs,
     include_directories : vkd3d_private_includes,
     install             : true,
     version             : '2.0.0',
@@ -54,12 +54,12 @@ if not enable_standalone_d3d12
     override_options    : [ 'c_std='+vkd3d_c_std ])
 else
   vkd3d_lib = static_library('vkd3d-proton', vkd3d_src, glsl_generator.process(vkd3d_shaders), vkd3d_build, vkd3d_version,
-    dependencies        : [ vkd3d_common_dep, vkd3d_shader_dep, vkd3d_headers_dep ] + vkd3d_extra_libs,
+    dependencies        : [ vkd3d_common_dep, vkd3d_shader_dep ] + vkd3d_extra_libs,
     include_directories : vkd3d_private_includes,
     override_options    : [ 'c_std='+vkd3d_c_std ])
 endif
 
 vkd3d_dep = declare_dependency(
   link_with           : [ vkd3d_lib, vkd3d_common_lib ],
-  dependencies        : [ vkd3d_extra_libs, vkd3d_headers_dep ],
+  dependencies        : [ vkd3d_extra_libs, vkd3d_common_dep ],
   include_directories : vkd3d_public_includes)
diff --git a/tests/meson.build b/tests/meson.build
index 0e8874e9..78748563 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -2,7 +2,7 @@
 vkd3d_test_flags = []
 if vkd3d_platform == 'windows'
   if enable_standalone_d3d12
-    vkd3d_test_deps = [ lib_d3d12, lib_dxgi, vkd3d_headers_dep ]
+    vkd3d_test_deps = [ lib_d3d12, lib_dxgi, vkd3d_common_dep ]
   else
     vkd3d_test_deps = [ vkd3d_dep, vkd3d_utils_dep ]
     vkd3d_test_flags = ['-DVKD3D_FORCE_UTILS_WRAPPER=1']