diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index d3fc029f05..59bc4d4edd 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -101,9 +101,9 @@ qemu_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
 	  --mode=server qemu QEMU $(QEMU_PROTOCOL) \
 	  > $(srcdir)/qemu_dispatch.h
 
-admin_dispatch.h: $(srcdir)/../src/rpc/gendispatch.pl \
+admin_dispatch.h: $(top_srcdir)/src/rpc/gendispatch.pl \
 		$(ADMIN_PROTOCOL)
-	$(AM_V_GEN)$(PERL) -w $(srcdir)/../src/rpc/gendispatch.pl \
+	$(AM_V_GEN)$(PERL) -w $(top_srcdir)/src/rpc/gendispatch.pl \
 	  --mode=server admin ADMIN $(ADMIN_PROTOCOL) \
 	  > $(srcdir)/admin_dispatch.h
 
diff --git a/src/admin/admin_protocol.x b/src/admin/admin_protocol.x
index 1a2e94ee86..cfc92ff748 100644
--- a/src/admin/admin_protocol.x
+++ b/src/admin/admin_protocol.x
@@ -22,18 +22,16 @@
  * Author: Martin Kletzander <mkletzan@redhat.com>
  */
 
-%#include "remote_protocol.h"
-
 /*----- Data types. -----*/
 
 /* Length of long, but not unbounded, strings.
  * This is an arbitrary limit designed to stop the decoder from trying
  * to allocate unbounded amounts of memory when fed with a bad message.
  */
-const REMOTE_STRING_MAX = 4194304;
+const ADMIN_STRING_MAX = 4194304;
 
 /* A long string, which may NOT be NULL. */
-typedef string admin_nonnull_string<REMOTE_STRING_MAX>;
+typedef string admin_nonnull_string<ADMIN_STRING_MAX>;
 
 /* A long string, which may be NULL. */
 typedef admin_nonnull_string *admin_string;