diff --git a/tests/meson.build b/tests/meson.build
index c28a2a39..f1af7b4a 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -69,7 +69,7 @@ test(
 	executable(
 		'cpp-compile-test',
 		'cpp-compile-test.cpp',
-		wayland_server_protocol_core_h,
+		wayland_server_protocol_h,
 		include_directories: src_inc
 	)
 )
@@ -91,17 +91,25 @@ tests = {
 	'array-test': [],
 	'client-test': [ wayland_server_protocol_h ],
 	'display-test': [
+		wayland_client_protocol_h,
+		wayland_server_protocol_h,
 		tests_server_protocol_h,
 		tests_client_protocol_c,
 		tests_protocol_c,
 	],
-	'connection-test': [ wayland_server_protocol_h ],
+	'connection-test': [
+		wayland_client_protocol_h,
+		wayland_server_protocol_h,
+	],
 	'event-loop-test': [ wayland_server_protocol_h ],
 	'fixed-test': [],
 	'interface-test': [ wayland_client_protocol_h ],
 	'list-test': [],
 	'map-test': [],
-	'sanity-test' : [ wayland_server_protocol_h ],
+	'sanity-test' : [
+		wayland_client_protocol_h,
+		wayland_server_protocol_h,
+	],
 	'socket-test': [
 		wayland_client_protocol_h,
 		wayland_server_protocol_h,
@@ -116,7 +124,7 @@ tests = {
 		files('../src/wayland-server.c'),
 		wayland_server_protocol_h,
 	],
-	'resources-test': [ wayland_server_protocol_core_h ],
+	'resources-test': [ wayland_server_protocol_h ],
 	'message-test': [
 		wayland_client_protocol_h,
 		wayland_server_protocol_h,
@@ -126,14 +134,16 @@ tests = {
 		wayland_server_protocol_h,
 	],
 	'protocol-logger-test': [
-		wayland_server_protocol_core_h,
-		wayland_client_protocol_core_h,
+		wayland_client_protocol_h,
+		wayland_server_protocol_h,
 	],
 	'headers-test': [
+		wayland_client_protocol_h,
+		wayland_server_protocol_h,
 		'headers-protocol-test.c',
-		'headers-protocol-core-test.c',
-		wayland_server_protocol_core_h,
 		wayland_client_protocol_core_h,
+		wayland_server_protocol_core_h,
+		'headers-protocol-core-test.c',
 	],
 	'os-wrappers-test': [],
 }