diff --git a/dom0/qubes_rpc/Makefile b/dom0/qubes_rpc/Makefile
index a956fc33..91f20f30 100644
--- a/dom0/qubes_rpc/Makefile
+++ b/dom0/qubes_rpc/Makefile
@@ -1,4 +1,4 @@
 CC=gcc
-CFLAGS=-g -Wall -I../../qubes_rpc -fPIC -pie
-qfile-dom0-unpacker: qfile-dom0-unpacker.o ../../qubes_rpc/ioall.o ../../qubes_rpc/copy_file.o ../../qubes_rpc/unpack.o ../../qubes_rpc/crc32.o
+CFLAGS=-g -I. -Wall -fPIC -pie
+qfile-dom0-unpacker: qfile-dom0-unpacker.o ioall.o copy_file.o unpack.o crc32.o
 	$(CC) -pie -g -o $@ $^
diff --git a/qubes_rpc/copy_file.c b/dom0/qubes_rpc/copy_file.c
similarity index 100%
rename from qubes_rpc/copy_file.c
rename to dom0/qubes_rpc/copy_file.c
diff --git a/qubes_rpc/crc32.c b/dom0/qubes_rpc/crc32.c
similarity index 100%
rename from qubes_rpc/crc32.c
rename to dom0/qubes_rpc/crc32.c
diff --git a/qubes_rpc/crc32.h b/dom0/qubes_rpc/crc32.h
similarity index 100%
rename from qubes_rpc/crc32.h
rename to dom0/qubes_rpc/crc32.h
diff --git a/qubes_rpc/filecopy.h b/dom0/qubes_rpc/filecopy.h
similarity index 100%
rename from qubes_rpc/filecopy.h
rename to dom0/qubes_rpc/filecopy.h
diff --git a/qubes_rpc/ioall.c b/dom0/qubes_rpc/ioall.c
similarity index 100%
rename from qubes_rpc/ioall.c
rename to dom0/qubes_rpc/ioall.c
diff --git a/qubes_rpc/ioall.h b/dom0/qubes_rpc/ioall.h
similarity index 100%
rename from qubes_rpc/ioall.h
rename to dom0/qubes_rpc/ioall.h
diff --git a/qubes_rpc/unpack.c b/dom0/qubes_rpc/unpack.c
similarity index 100%
rename from qubes_rpc/unpack.c
rename to dom0/qubes_rpc/unpack.c