diff --git a/Makefile.am b/Makefile.am
index 1f79d82c..ac43ad1c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -213,8 +213,7 @@ pwdx_LDADD= $(CYGWINFLAGS)
 sysctl_SOURCES = \
 	sysctl.c \
 	lib/fileutils.c \
-	procio.c \
-	procio.h
+	lib/procio.c
 sysctl_LDADD=
 endif
 tload_SOURCES = tload.c lib/strutils.c lib/fileutils.c
diff --git a/include/Makefile.am b/include/Makefile.am
index f2b6f1d3..84fe3a6c 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -2,6 +2,7 @@ dist_noinst_HEADERS = \
 	c.h \
 	fileutils.h \
 	nls.h \
+	procio.h \
 	rpmatch.h \
 	signals.h \
 	strutils.h \
diff --git a/proc/procio.h b/include/procio.h
similarity index 100%
rename from proc/procio.h
rename to include/procio.h
diff --git a/proc/procio.3 b/lib/procio.3
similarity index 100%
rename from proc/procio.3
rename to lib/procio.3
diff --git a/procio.c b/lib/procio.c
similarity index 100%
rename from procio.c
rename to lib/procio.c
diff --git a/sysctl.c b/sysctl.c
index bd6e42f0..9dfdba39 100644
--- a/sysctl.c
+++ b/sysctl.c
@@ -45,7 +45,7 @@
 #include "fileutils.h"
 #include "nls.h"
 #include "xalloc.h"
-#include "proc/procio.h"
+#include "procio.h"
 
 /*
  *    Globals...