diff --git a/.gitignore b/.gitignore
index d40bc08..3507b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ Makefile.in
 config.status
 config
 configure
+aclocal.m4
diff --git a/Makefile.am b/Makefile.am
index 77580dd..231aaeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -fPIC
+AM_CFLAGS = -fPIC -I./include
 lib_LIBRARIES = libkvspool.a
 libkvspool_a_SOURCES = kvspool.c kvspoolw.c kvspoolr.c kvspool_attrition.c tpl.c
 include_HEADERS = kvspool.h
diff --git a/README b/README
index c8899db..53be721 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
 kvspool data streaming utilities
 
-License: See LICENSE file
-See also: the TODO file
+http://troydhanson.github.com/kvspool
 
diff --git a/tpl.h b/include/tpl.h
similarity index 100%
rename from tpl.h
rename to include/tpl.h
diff --git a/utarray.h b/include/utarray.h
similarity index 100%
rename from utarray.h
rename to include/utarray.h
diff --git a/uthash.h b/include/uthash.h
similarity index 100%
rename from uthash.h
rename to include/uthash.h
diff --git a/utstring.h b/include/utstring.h
similarity index 100%
rename from utstring.h
rename to include/utstring.h
diff --git a/kvperl/Makefile.PL b/kvperl/Makefile.PL
index ff94491..77196d7 100644
--- a/kvperl/Makefile.PL
+++ b/kvperl/Makefile.PL
@@ -12,7 +12,7 @@ WriteMakefile(
        AUTHOR         => 'A. U. Thor <adamstr1@>') : ()),
     LIBS              => ['-L.. -lkvspool'], # e.g., '-lm'
     DEFINE            => '', # e.g., '-DHAVE_SOMETHING'
-    INC               => '-I. -I..', # e.g., '-I. -I/usr/include/other'
+    INC               => '-I. -I../include -I..', # e.g., '-I. -I/usr/include/other'
 	# Un-comment this if you add C files to link with later:
     # OBJECT            => '$(O_FILES)', # link all the C files too
 );
diff --git a/utils/Makefile.am b/utils/Makefile.am
index dc42e63..853f0e4 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,4 +1,4 @@
-AM_CFLAGS = -I..
+AM_CFLAGS = -I.. -I../include
 LDADD = -L.. -lkvspool
 bin_PROGRAMS = kvsp-spr kvsp-spw kvsp-tee kvsp-size kvsp-status \
                kvsp-speed kvsp-mod kvsp-reset