diff --git a/Makefile.in b/Makefile.in
index 0b47c60d..ca044455 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -406,9 +406,8 @@ WINE_SOURCE_ARGS = \
   --exclude dlls/ntdll/ntsyscalls.h \
   --exclude dlls/win32u/win32syscalls.h \
   --exclude include/wine/server_protocol.h \
-  --exclude server/request.h \
   --exclude server/request_handlers.h \
-  --exclude server/trace.c \
+  --exclude server/request_trace.h \
 
 WINE_CONFIGURE_ARGS = \
   --enable-werror \
diff --git a/make/rules-wine-requests.mk b/make/rules-wine-requests.mk
index b63ba7c3..27199c1f 100644
--- a/make/rules-wine-requests.mk
+++ b/make/rules-wine-requests.mk
@@ -6,27 +6,24 @@ define create-rules-wine-requests
 $$($(2)_SRC)/include/wine/server_protocol.h: | $$(OBJ)/.$(1)-post-source
 $$($(2)_SRC)/include/wine/server_protocol.h: $$($(2)_ORIGIN)/include/wine/server_protocol.h
 	cp -a $$< $$@
-$$($(2)_SRC)/server/request.h: | $$(OBJ)/.$(1)-post-source
-$$($(2)_SRC)/server/request.h: $$($(2)_ORIGIN)/server/request.h
-	cp -a $$< $$@
 $$($(2)_SRC)/server/request_handlers.h: | $$(OBJ)/.$(1)-post-source
 $$($(2)_SRC)/server/request_handlers.h: $$($(2)_ORIGIN)/server/request_handlers.h
 	cp -a $$< $$@
-$$($(2)_SRC)/server/trace.c: | $$(OBJ)/.$(1)-post-source
-$$($(2)_SRC)/server/trace.c: $$($(2)_ORIGIN)/server/trace.c
+$$($(2)_SRC)/server/request_trace.h: | $$(OBJ)/.$(1)-post-source
+$$($(2)_SRC)/server/request_trace.h: $$($(2)_ORIGIN)/server/request_trace.h
 	cp -a $$< $$@
 
 $$(OBJ)/.$(1)-configure32: $$($(2)_SRC)/include/wine/server_protocol.h
-$$(OBJ)/.$(1)-configure32: $$($(2)_SRC)/server/request.h
-$$(OBJ)/.$(1)-configure32: $$($(2)_SRC)/server/trace.c
+$$(OBJ)/.$(1)-configure32: $$($(2)_SRC)/server/request_handlers.h
+$$(OBJ)/.$(1)-configure32: $$($(2)_SRC)/server/request_trace.h
 
 $$(OBJ)/.$(1)-configure64: $$($(2)_SRC)/include/wine/server_protocol.h
-$$(OBJ)/.$(1)-configure64: $$($(2)_SRC)/server/request.h
-$$(OBJ)/.$(1)-configure64: $$($(2)_SRC)/server/trace.c
+$$(OBJ)/.$(1)-configure64: $$($(2)_SRC)/server/request_handlers.h
+$$(OBJ)/.$(1)-configure64: $$($(2)_SRC)/server/request_trace.h
 
 $$(OBJ)/.$(1)-wine-requests: $$($(2)_SRC)/include/wine/server_protocol.h
-$$(OBJ)/.$(1)-wine-requests: $$($(2)_SRC)/server/request.h
-$$(OBJ)/.$(1)-wine-requests: $$($(2)_SRC)/server/trace.c
+$$(OBJ)/.$(1)-wine-requests: $$($(2)_SRC)/server/request_handlers.h
+$$(OBJ)/.$(1)-wine-requests: $$($(2)_SRC)/server/request_trace.h
 $$(OBJ)/.$(1)-wine-requests: $$($(2)_ORIGIN)/server/protocol.def
 $$(OBJ)/.$(1)-wine-requests: $$($(2)_ORIGIN)/tools/make_requests
 $$(OBJ)/.$(1)-wine-requests: | $$(OBJ)/.$(1)-post-source