diff --git a/.gitignore b/.gitignore
index 38d6637c1c..2d6e3e3194 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,4 @@ Makefile.in
 # libvirt related ignores
 /build/
 /ci/scratch/
-/src/remote/*_client_bodies.h
-/src/remote/*_stubs.h
 tags
diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index 392fc34320..ab9ba33c9c 100644
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -1976,8 +1976,6 @@ po_file ?= $(srcdir)/po/POTFILES.in
 generated_files = \
   $(builddir)/src/*.[ch] \
   $(builddir)/src/*/*.[ch] \
-  $(srcdir)/src/*/{remote,qemu,lxc}_daemon_dispatch_stubs.h \
-  $(srcdir)/src/remote/*_client_bodies.h \
   $(srcdir)/gnulib/lib/*.[ch]
 
 _gl_translatable_string_re ?= \b(N?_|gettext *)\([^)"]*("|$$)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ebd86a6cd3..de6e5ec0d9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,8 @@
 @BUILDDIR@/src/access/viraccessapicheckqemu.c
 @BUILDDIR@/src/admin/admin_client.h
 @BUILDDIR@/src/admin/admin_server_dispatch_stubs.h
+@BUILDDIR@/src/remote/remote_client_bodies.h
+@BUILDDIR@/src/remote/remote_daemon_dispatch_stubs.h
 @SRCDIR@/gnulib/lib/gai_strerror.c
 @SRCDIR@/gnulib/lib/regcomp.c
 @SRCDIR@/src/access/viraccessdriverpolkit.c
@@ -167,11 +169,9 @@
 @SRCDIR@/src/qemu/qemu_tpm.c
 @SRCDIR@/src/qemu/qemu_vhost_user.c
 @SRCDIR@/src/qemu/qemu_vhost_user_gpu.c
-@SRCDIR@/src/remote/remote_client_bodies.h
 @SRCDIR@/src/remote/remote_daemon.c
 @SRCDIR@/src/remote/remote_daemon_config.c
 @SRCDIR@/src/remote/remote_daemon_dispatch.c
-@SRCDIR@/src/remote/remote_daemon_dispatch_stubs.h
 @SRCDIR@/src/remote/remote_daemon_stream.c
 @SRCDIR@/src/remote/remote_driver.c
 @SRCDIR@/src/rpc/virkeepalive.c
diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
index 7361d02cf4..242eb3ed2d 100644
--- a/src/remote/Makefile.inc.am
+++ b/src/remote/Makefile.inc.am
@@ -427,37 +427,37 @@ remote/remote_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
 		$(REMOTE_PROTOCOL) Makefile.am
 	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \
 	  remote REMOTE $(REMOTE_PROTOCOL) \
-	  > $(srcdir)/remote/remote_client_bodies.h
+	  > remote/remote_client_bodies.h
 
 remote/lxc_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
 		$(LXC_PROTOCOL) Makefile.am
 	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \
 	  lxc LXC $(LXC_PROTOCOL) \
-	  > $(srcdir)/remote/lxc_client_bodies.h
+	  > remote/lxc_client_bodies.h
 
 remote/qemu_client_bodies.h: $(srcdir)/rpc/gendispatch.pl \
 		$(QEMU_PROTOCOL) Makefile.am
 	$(AM_V_GEN)$(PERL) -w $(srcdir)/rpc/gendispatch.pl --mode=client \
 	  qemu QEMU $(QEMU_PROTOCOL) \
-	  > $(srcdir)/remote/qemu_client_bodies.h
+	  > remote/qemu_client_bodies.h
 
 remote/remote_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \
 		$(REMOTE_PROTOCOL) Makefile.am
 	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
 	  --mode=server remote REMOTE $(REMOTE_PROTOCOL) \
-	  > $(srcdir)/remote/remote_daemon_dispatch_stubs.h
+	  > remote/remote_daemon_dispatch_stubs.h
 
 remote/lxc_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \
 		$(LXC_PROTOCOL) Makefile.am
 	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
 	  --mode=server lxc LXC $(LXC_PROTOCOL) \
-	  > $(srcdir)/remote/lxc_daemon_dispatch_stubs.h
+	  > remote/lxc_daemon_dispatch_stubs.h
 
 remote/qemu_daemon_dispatch_stubs.h: $(srcdir)/rpc/gendispatch.pl \
 		$(QEMU_PROTOCOL) Makefile.am
 	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
 	  --mode=server qemu QEMU $(QEMU_PROTOCOL) \
-	  > $(srcdir)/remote/qemu_daemon_dispatch_stubs.h
+	  > remote/qemu_daemon_dispatch_stubs.h
 
 libvirtd.8.in: remote/libvirtd.pod
 	$(AM_V_GEN)$(POD2MAN) --section=8 $< $@-t1 && \