diff --git a/lib/construct.h b/lib/include/construct.h
similarity index 100%
rename from lib/construct.h
rename to lib/include/construct.h
diff --git a/lib/desugar.h b/lib/include/desugar.h
similarity index 100%
rename from lib/desugar.h
rename to lib/include/desugar.h
diff --git a/lib/fsa.h b/lib/include/fsa.h
similarity index 100%
rename from lib/fsa.h
rename to lib/include/fsa.h
diff --git a/lib/parse.h b/lib/include/parse.h
similarity index 100%
rename from lib/parse.h
rename to lib/include/parse.h
diff --git a/lib/regex.h b/lib/include/regex.h
similarity index 100%
rename from lib/regex.h
rename to lib/include/regex.h
diff --git a/scripts/build.sh b/scripts/build.sh
index 254102f..bbf7bd7 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -9,21 +9,21 @@ CFLAGS="$CFLAGS -O0 -ggdb"
 if [ ! -e build ]; then mkdir build; else rm build/*; fi
 
 # Build library
-clang $CFLAGS -Ilib -c lib/parse.c -o build/parse.o
-clang $CFLAGS -Ilib -c lib/desugar.c -o build/desugar.o
-clang $CFLAGS -Ilib -c lib/regex.c -o build/regex.o
-clang $CFLAGS -Ilib -c lib/fsa.c -o build/fsa.o
-clang $CFLAGS -Ilib -c lib/construct.c -o build/construct.o
+clang $CFLAGS -Ilib/include -c lib/parse.c -o build/parse.o
+clang $CFLAGS -Ilib/include -c lib/desugar.c -o build/desugar.o
+clang $CFLAGS -Ilib/include -c lib/regex.c -o build/regex.o
+clang $CFLAGS -Ilib/include -c lib/fsa.c -o build/fsa.o
+clang $CFLAGS -Ilib/include -c lib/construct.c -o build/construct.o
 ar -crs build/lib.a build/parse.o build/desugar.o build/regex.o \
    build/fsa.o build/construct.o
 
 # Build tests
-clang $CFLAGS -Itests -c tests/testing.c -o build/testing.o
-clang $CFLAGS -Ilib -Itests -o build/parse_tests \
+clang $CFLAGS -Itests/include -c tests/testing.c -o build/testing.o
+clang $CFLAGS -Ilib/include -Itests/include -o build/parse_tests \
 	  tests/parse_tests.c build/testing.o build/lib.a
-clang $CFLAGS -Ilib -Itests -o build/desugar_tests \
+clang $CFLAGS -Ilib/include -Itests/include -o build/desugar_tests \
 	  tests/desugar_tests.c build/testing.o build/lib.a
-clang $CFLAGS -Ilib -Itests -o build/fsa_tests \
+clang $CFLAGS -Ilib/include -Itests/include -o build/fsa_tests \
 	  tests/fsa_tests.c build/testing.o build/lib.a
-clang $CFLAGS -Ilib -Itests -o build/construct_tests \
+clang $CFLAGS -Ilib/include -Itests/include -o build/construct_tests \
 	  tests/construct_tests.c build/testing.o build/lib.a
diff --git a/tests/testing.h b/tests/include/testing.h
similarity index 100%
rename from tests/testing.h
rename to tests/include/testing.h