diff --git a/.gitignore b/.gitignore
index a6a1a6fa1..5213c6928 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /apidocs
-/include/git/config.h
+/src/git/config.h
 *.o
 *.a
 *.exe
diff --git a/Makefile b/Makefile
index 2cb057eea..5e78a5bc1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,16 +5,18 @@ DOXYGEN = doxygen
 CFLAGS = -g -O2 -Wall
 OS     = unix
 
-BASIC_CFLAGS := -Iinclude
+BASIC_CFLAGS := -Isrc
 BASIC_CFLAGS += -DGIT__PRIVATE
 BASIC_CFLAGS += -fvisibility=hidden
 
 OBJS = $(patsubst %.c,%.o,$(wildcard src/*.c))
-HDRS = $(wildcard include/git/*.h)
+HDRS = $(wildcard src/*.h)
+PUBLIC_HEADERS = $(wildcard src/git/*.h)
+HDRS += $(PUBLIC_HEADERS)
 
 OBJS += src/os/$(OS).o
-HDRS += include/git/config.h
-HDRS += include/git/os/$(OS).h
+HDRS += src/git/config.h
+HDRS += src/git/os/$(OS).h
 
 GIT_LIB = libgit2.a
 
@@ -29,7 +31,7 @@ clean:
 	rm -f $(GIT_LIB)
 	rm -f src/*.o
 	rm -f tests/*.o tests/*.exe tests/*.toc
-	rm -f include/git/config.h
+	rm -f src/git/config.h
 	rm -rf apidocs
 
 apidocs:
@@ -41,7 +43,7 @@ test: $(TEST_RUN)
 .c.o:
 	$(CC) $(BASIC_CFLAGS) $(CFLAGS) -c $< -o $@
 
-include/git/config.h: include/git/config.h.in
+src/git/config.h: src/git/config.h.in
 	sed 's/@@OS@@/$(OS)/g' $< >$@+
 	mv $@+ $@
 
@@ -62,12 +64,12 @@ $(patsubst %.exe,%.toc,$(TEST_EXE)): tests/%.toc: tests/%.c
 	mv $@+ $@
 
 $(TEST_OBJ): tests/%.o: tests/%.c
-	$(CC) -Iinclude $(CFLAGS) -c $< -o $@
+	$(CC) -Isrc $(CFLAGS) -c $< -o $@
 
 $(patsubst %.exe,%_main.o,$(TEST_EXE)): tests/%_main.o: $(HDRS)
 $(patsubst %.exe,%_main.o,$(TEST_EXE)): tests/%_main.o: $(T_MAIN_C)
 $(patsubst %.exe,%_main.o,$(TEST_EXE)): tests/%_main.o: tests/%.toc
-	$(CC) -Iinclude -I. '-DTEST_TOC="$<"' \
+	$(CC) -Isrc -I. '-DTEST_TOC="$<"' \
 		-c $(T_MAIN_C) \
 		-o $@
 
diff --git a/include/git/commit.h b/src/git/commit.h
similarity index 100%
rename from include/git/commit.h
rename to src/git/commit.h
diff --git a/include/git/common.h b/src/git/common.h
similarity index 100%
rename from include/git/common.h
rename to src/git/common.h
diff --git a/include/git/config.h.in b/src/git/config.h.in
similarity index 100%
rename from include/git/config.h.in
rename to src/git/config.h.in
diff --git a/include/git/odb.h b/src/git/odb.h
similarity index 100%
rename from include/git/odb.h
rename to src/git/odb.h
diff --git a/include/git/oid.h b/src/git/oid.h
similarity index 100%
rename from include/git/oid.h
rename to src/git/oid.h
diff --git a/include/git/os/unix.h b/src/git/os/unix.h
similarity index 100%
rename from include/git/os/unix.h
rename to src/git/os/unix.h
diff --git a/include/git/revwalk.h b/src/git/revwalk.h
similarity index 100%
rename from include/git/revwalk.h
rename to src/git/revwalk.h
diff --git a/include/git/zlib.h b/src/git/zlib.h
similarity index 97%
rename from include/git/zlib.h
rename to src/git/zlib.h
index 621dbe638..7e44c57fb 100644
--- a/include/git/zlib.h
+++ b/src/git/zlib.h
@@ -46,7 +46,7 @@ GIT_BEGIN_DECL
  * deflateBound() implementation itself.
  *
  * @param stream the stream pointer.
- * @param s total length of the source data (in bytes). 
+ * @param s total length of the source data (in bytes).
  * @return maximum length of the compressed data.
  */
 GIT_INLINE(size_t) deflateBound(z_streamp stream, size_t s)