diff --git a/Makefile.am b/Makefile.am
index 46046f6..eca2822 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,7 +10,7 @@ GLOBALHDR += include/image_entry.h include/pkgio.h
 
 MAIN = main/pkg.c main/util.c main/compressor.c main/command.c main/pkgreader.c
 MAIN += main/pkgwriter.c main/image_entry.c main/image_entry_sort.c
-MAIN += main/mkdir_p.c main/pkgio_rd_image_entry.c
+MAIN += main/mkdir_p.c main/pkgio_rd_image_entry.c main/pkg_unpack.c
 
 pkg_SOURCES = $(GLOBALHDR) $(MAIN)
 pkg_CFLAGS = $(AM_CFLAGS)
@@ -35,7 +35,6 @@ pkg_SOURCES += main/cmd/dump/dump_header.c
 
 # unpack command
 pkg_SOURCES += main/cmd/unpack/unpack.c main/cmd/unpack/unpack.h
-pkg_SOURCES += main/cmd/unpack/pkg_unpack.c
 
 # help command
 pkg_SOURCES += main/cmd/help.c
diff --git a/include/pkgio.h b/include/pkgio.h
index edb5ae4..4104819 100644
--- a/include/pkgio.h
+++ b/include/pkgio.h
@@ -4,6 +4,13 @@
 #include "pkgreader.h"
 #include "image_entry.h"
 
+enum {
+	UNPACK_NO_CHOWN = 0x01,
+	UNPACK_NO_CHMOD = 0x02,
+};
+
+int pkg_unpack(int rootfd, int flags, pkg_reader_t *rd);
+
 image_entry_t *image_entry_list_from_package(pkg_reader_t *pkg);
 
 #endif /* PKGIO_H */
diff --git a/main/cmd/unpack/unpack.h b/main/cmd/unpack/unpack.h
index c7e4f65..f18d8a0 100644
--- a/main/cmd/unpack/unpack.h
+++ b/main/cmd/unpack/unpack.h
@@ -17,13 +17,4 @@
 #include "pkgio.h"
 #include "util.h"
 
-enum {
-	UNPACK_NO_CHOWN = 0x01,
-	UNPACK_NO_CHMOD = 0x02,
-};
-
-int mkdir_p(const char *path);
-
-int pkg_unpack(int rootfd, int flags, pkg_reader_t *rd);
-
 #endif /* UNPACK_H */
diff --git a/main/cmd/unpack/pkg_unpack.c b/main/pkg_unpack.c
similarity index 95%
rename from main/cmd/unpack/pkg_unpack.c
rename to main/pkg_unpack.c
index b948f2d..d5b44cd 100644
--- a/main/cmd/unpack/pkg_unpack.c
+++ b/main/pkg_unpack.c
@@ -1,4 +1,13 @@
-#include "unpack.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+#include <fcntl.h>
+
+#include "pkgio.h"
+#include "util.h"
 
 static int create_hierarchy(int dirfd, image_entry_t *list)
 {