diff --git a/cursor/meson.build b/cursor/meson.build
index ae85ed9b..24d639c5 100644
--- a/cursor/meson.build
+++ b/cursor/meson.build
@@ -11,7 +11,7 @@ wayland_cursor = library(
 		'xcursor.c',
 	],
 	version: '0.0.0',
-	dependencies: [ wayland_client_dep ],
+	dependencies: [ wayland_client_dep, wayland_core_protocols_dep ],
 	c_args: [ '-DICONDIR="@0@"'.format(icondir) ],
 	install: true,
 )
diff --git a/src/meson.build b/src/meson.build
index a5d74109..cee45040 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -151,12 +151,24 @@ if get_option('libraries')
 		output: 'wayland-protocol.c'
 	)
 
+	wayland_core_protocols = library(
+		'wayland-core-protocols',
+		sources: [
+			wayland_protocol_c
+		],
+		version: '0.1.0',
+		include_directories: root_inc,
+		install: true
+	)
+	wayland_core_protocols_dep = declare_dependency(
+		link_with: wayland_core_protocols
+	)
+
 	wayland_server = library(
 		'wayland-server',
 		sources: [
 			wayland_server_protocol_core_h,
 			wayland_server_protocol_h,
-			wayland_protocol_c,
 			'wayland-server.c',
 			'wayland-shm.c',
 			'event-loop.c'
@@ -165,6 +177,7 @@ if get_option('libraries')
 		dependencies: [
 			epoll_dep,
 			ffi_dep,
+			wayland_core_protocols_dep,
 			wayland_private_dep,
 			wayland_util_dep,
 			mathlib_dep,
@@ -191,6 +204,7 @@ if get_option('libraries')
 		description: 'Server side implementation of the Wayland protocol',
 		version: meson.project_version(),
 		filebase: 'wayland-server',
+		libraries: '-lwayland-core-protocols',
 		variables: [
 			'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
 			'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name())
@@ -202,13 +216,13 @@ if get_option('libraries')
 		sources: [
 			wayland_client_protocol_core_h,
 			wayland_client_protocol_h,
-			wayland_protocol_c,
 			'wayland-client.c'
 		],
 		version: '0.3.0',
 		dependencies: [
 			epoll_dep,
 			ffi_dep,
+			wayland_core_protocols_dep,
 			wayland_private_dep,
 			wayland_util_dep,
 			mathlib_dep,
@@ -224,6 +238,7 @@ if get_option('libraries')
 		description: 'Wayland client side library',
 		version: meson.project_version(),
 		filebase: 'wayland-client',
+		libraries: '-lwayland-core-protocols',
 		variables: [
 			'datarootdir=' + join_paths('${prefix}', get_option('datadir')),
 			'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name())
diff --git a/tests/meson.build b/tests/meson.build
index 58794e7d..14905f49 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -23,7 +23,8 @@ test_runner_dep = declare_dependency(
 	include_directories: [ src_inc ],
 	dependencies: [
 		dependency('threads'),
-		cc.find_library('dl', required: false)
+		cc.find_library('dl', required: false),
+		wayland_core_protocols_dep
 	]
 )