diff --git a/src/blob.c b/src/blob.c
index c21ce07..ec760ce 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -27,9 +27,9 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/utils.h>
-#include <pygit2/object.h>
-#include <pygit2/blob.h>
+#include "utils.h"
+#include "object.h"
+#include "blob.h"
 
 
 PyDoc_STRVAR(Blob_size__doc__, "Size.");
diff --git a/include/pygit2/blob.h b/src/blob.h
similarity index 98%
rename from include/pygit2/blob.h
rename to src/blob.h
index 2edbb68..5de1dee 100644
--- a/include/pygit2/blob.h
+++ b/src/blob.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 PyObject* Blob_get_size(Blob *self);
 
diff --git a/src/commit.c b/src/commit.c
index 7d2e2fc..139c8fd 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -27,10 +27,10 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/error.h>
-#include <pygit2/utils.h>
-#include <pygit2/signature.h>
-#include <pygit2/commit.h>
+#include "error.h"
+#include "utils.h"
+#include "signature.h"
+#include "commit.h"
 
 extern PyTypeObject TreeType;
 
diff --git a/include/pygit2/commit.h b/src/commit.h
similarity index 100%
rename from include/pygit2/commit.h
rename to src/commit.h
diff --git a/src/config.c b/src/config.c
index b06c557..52a43c2 100644
--- a/src/config.c
+++ b/src/config.c
@@ -27,10 +27,10 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/error.h>
-#include <pygit2/types.h>
-#include <pygit2/utils.h>
-#include <pygit2/config.h>
+#include "error.h"
+#include "types.h"
+#include "utils.h"
+#include "config.h"
 
 extern PyTypeObject ConfigType;
 
diff --git a/include/pygit2/config.h b/src/config.h
similarity index 100%
rename from include/pygit2/config.h
rename to src/config.h
diff --git a/src/diff.c b/src/diff.c
index f2cb21e..d7c2b69 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -28,10 +28,10 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <structmember.h>
-#include <pygit2/error.h>
-#include <pygit2/types.h>
-#include <pygit2/utils.h>
-#include <pygit2/diff.h>
+#include "error.h"
+#include "types.h"
+#include "utils.h"
+#include "diff.h"
 
 extern PyObject *GitError;
 
diff --git a/include/pygit2/diff.h b/src/diff.h
similarity index 98%
rename from include/pygit2/diff.h
rename to src/diff.h
index 202bff3..b045593 100644
--- a/include/pygit2/diff.h
+++ b/src/diff.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 #define DIFF_CHECK_TYPES(_x, _y, _type_x, _type_y) \
                   PyObject_TypeCheck(_x, _type_x) && \
diff --git a/src/error.c b/src/error.c
index a7912fd..730c526 100644
--- a/src/error.c
+++ b/src/error.c
@@ -25,7 +25,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <pygit2/error.h>
+#include "error.h"
 
 PyObject *GitError;
 
diff --git a/include/pygit2/error.h b/src/error.h
similarity index 100%
rename from include/pygit2/error.h
rename to src/error.h
diff --git a/src/index.c b/src/index.c
index fed0c73..fc10116 100644
--- a/src/index.c
+++ b/src/index.c
@@ -27,11 +27,11 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/error.h>
-#include <pygit2/types.h>
-#include <pygit2/utils.h>
-#include <pygit2/oid.h>
-#include <pygit2/index.h>
+#include "error.h"
+#include "types.h"
+#include "utils.h"
+#include "oid.h"
+#include "index.h"
 
 extern PyTypeObject IndexType;
 extern PyTypeObject TreeType;
diff --git a/include/pygit2/index.h b/src/index.h
similarity index 100%
rename from include/pygit2/index.h
rename to src/index.h
diff --git a/src/note.c b/src/note.c
index c887036..73dc90a 100644
--- a/src/note.c
+++ b/src/note.c
@@ -28,11 +28,11 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <structmember.h>
-#include <pygit2/error.h>
-#include <pygit2/utils.h>
-#include <pygit2/types.h>
-#include <pygit2/oid.h>
-#include <pygit2/note.h>
+#include "error.h"
+#include "utils.h"
+#include "types.h"
+#include "oid.h"
+#include "note.h"
 
 extern PyTypeObject SignatureType;
 
diff --git a/include/pygit2/note.h b/src/note.h
similarity index 100%
rename from include/pygit2/note.h
rename to src/note.h
diff --git a/src/object.c b/src/object.c
index c3a33fa..fc7922f 100644
--- a/src/object.c
+++ b/src/object.c
@@ -27,12 +27,12 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/error.h>
-#include <pygit2/types.h>
-#include <pygit2/utils.h>
-#include <pygit2/oid.h>
-#include <pygit2/repository.h>
-#include <pygit2/object.h>
+#include "error.h"
+#include "types.h"
+#include "utils.h"
+#include "oid.h"
+#include "repository.h"
+#include "object.h"
 
 extern PyTypeObject TreeType;
 extern PyTypeObject CommitType;
diff --git a/include/pygit2/object.h b/src/object.h
similarity index 98%
rename from include/pygit2/object.h
rename to src/object.h
index 314c55a..7ab68a4 100644
--- a/include/pygit2/object.h
+++ b/src/object.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 PyObject* Object_get_oid(Object *self);
 PyObject* Object_get_hex(Object *self);
diff --git a/src/oid.c b/src/oid.c
index d391a84..c073403 100644
--- a/src/oid.c
+++ b/src/oid.c
@@ -28,9 +28,9 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/utils.h>
-#include <pygit2/error.h>
-#include <pygit2/oid.h>
+#include "utils.h"
+#include "error.h"
+#include "oid.h"
 
 int
 py_str_to_git_oid(PyObject *py_str, git_oid *oid)
diff --git a/include/pygit2/oid.h b/src/oid.h
similarity index 100%
rename from include/pygit2/oid.h
rename to src/oid.h
diff --git a/src/pygit2.c b/src/pygit2.c
index bbe3e4f..ef41275 100644
--- a/src/pygit2.c
+++ b/src/pygit2.c
@@ -28,12 +28,12 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <osdefs.h>
-#include <pygit2/error.h>
-#include <pygit2/types.h>
-#include <pygit2/utils.h>
-#include <pygit2/repository.h>
-#include <pygit2/oid.h>
 #include <git2.h>
+#include "error.h"
+#include "types.h"
+#include "utils.h"
+#include "repository.h"
+#include "oid.h"
 
 extern PyObject *GitError;
 
diff --git a/src/reference.c b/src/reference.c
index 35dc30d..1c3ded8 100644
--- a/src/reference.c
+++ b/src/reference.c
@@ -29,12 +29,12 @@
 #include <Python.h>
 #include <string.h>
 #include <structmember.h>
-#include <pygit2/error.h>
-#include <pygit2/types.h>
-#include <pygit2/utils.h>
-#include <pygit2/oid.h>
-#include <pygit2/signature.h>
-#include <pygit2/reference.h>
+#include "error.h"
+#include "types.h"
+#include "utils.h"
+#include "oid.h"
+#include "signature.h"
+#include "reference.h"
 
 
 extern PyObject *GitError;
diff --git a/include/pygit2/reference.h b/src/reference.h
similarity index 100%
rename from include/pygit2/reference.h
rename to src/reference.h
diff --git a/src/remote.c b/src/remote.c
index a01f798..df238a3 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -28,10 +28,10 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <structmember.h>
-#include <pygit2/error.h>
-#include <pygit2/utils.h>
-#include <pygit2/types.h>
-#include <pygit2/remote.h>
+#include "error.h"
+#include "utils.h"
+#include "types.h"
+#include "remote.h"
 
 extern PyObject *GitError;
 extern PyTypeObject RepositoryType;
diff --git a/include/pygit2/remote.h b/src/remote.h
similarity index 100%
rename from include/pygit2/remote.h
rename to src/remote.h
diff --git a/src/repository.c b/src/repository.c
index f0b5d67..62d1906 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -27,15 +27,15 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/error.h>
-#include <pygit2/types.h>
-#include <pygit2/reference.h>
-#include <pygit2/utils.h>
-#include <pygit2/object.h>
-#include <pygit2/oid.h>
-#include <pygit2/note.h>
-#include <pygit2/repository.h>
-#include <pygit2/remote.h>
+#include "error.h"
+#include "types.h"
+#include "reference.h"
+#include "utils.h"
+#include "object.h"
+#include "oid.h"
+#include "note.h"
+#include "repository.h"
+#include "remote.h"
 
 extern PyObject *GitError;
 
diff --git a/include/pygit2/repository.h b/src/repository.h
similarity index 99%
rename from include/pygit2/repository.h
rename to src/repository.h
index 6d2d31a..4cb7d8a 100644
--- a/include/pygit2/repository.h
+++ b/src/repository.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 int  Repository_init(Repository *self, PyObject *args, PyObject *kwds);
 int  Repository_traverse(Repository *self, visitproc visit, void *arg);
diff --git a/src/signature.c b/src/signature.c
index 982713e..31da0bd 100644
--- a/src/signature.c
+++ b/src/signature.c
@@ -27,11 +27,11 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/error.h>
-#include <pygit2/types.h>
-#include <pygit2/utils.h>
-#include <pygit2/oid.h>
-#include <pygit2/signature.h>
+#include "error.h"
+#include "types.h"
+#include "utils.h"
+#include "oid.h"
+#include "signature.h"
 
 int
 Signature_init(Signature *self, PyObject *args, PyObject *kwds)
diff --git a/include/pygit2/signature.h b/src/signature.h
similarity index 98%
rename from include/pygit2/signature.h
rename to src/signature.h
index fe69b98..a0028a9 100644
--- a/include/pygit2/signature.h
+++ b/src/signature.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 PyObject* Signature_get_encoding(Signature *self);
 PyObject* Signature_get_raw_name(Signature *self);
diff --git a/src/tag.c b/src/tag.c
index 2a9ba82..4edbde1 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -27,12 +27,12 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/error.h>
-#include <pygit2/types.h>
-#include <pygit2/utils.h>
-#include <pygit2/signature.h>
-#include <pygit2/oid.h>
-#include <pygit2/tag.h>
+#include "error.h"
+#include "types.h"
+#include "utils.h"
+#include "signature.h"
+#include "oid.h"
+#include "tag.h"
 
 
 PyDoc_STRVAR(Tag_target__doc__, "Tagged object.");
diff --git a/include/pygit2/tag.h b/src/tag.h
similarity index 98%
rename from include/pygit2/tag.h
rename to src/tag.h
index 8ac5fd7..04d3a10 100644
--- a/include/pygit2/tag.h
+++ b/src/tag.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 PyObject* Tag_get_target(Tag *self);
 PyObject* Tag_get_name(Tag *self);
diff --git a/src/tree.c b/src/tree.c
index d2e5deb..6959a04 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -28,11 +28,11 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <string.h>
-#include <pygit2/error.h>
-#include <pygit2/utils.h>
-#include <pygit2/repository.h>
-#include <pygit2/oid.h>
-#include <pygit2/tree.h>
+#include "error.h"
+#include "utils.h"
+#include "repository.h"
+#include "oid.h"
+#include "tree.h"
 
 extern PyTypeObject TreeType;
 extern PyTypeObject DiffType;
diff --git a/include/pygit2/tree.h b/src/tree.h
similarity index 98%
rename from include/pygit2/tree.h
rename to src/tree.h
index 0e503fd..fef1fac 100644
--- a/include/pygit2/tree.h
+++ b/src/tree.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 PyObject* TreeEntry_get_filemode(TreeEntry *self);
 PyObject* TreeEntry_get_name(TreeEntry *self);
diff --git a/src/treebuilder.c b/src/treebuilder.c
index d7205bc..30712aa 100644
--- a/src/treebuilder.c
+++ b/src/treebuilder.c
@@ -28,10 +28,10 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <string.h>
-#include <pygit2/error.h>
-#include <pygit2/utils.h>
-#include <pygit2/oid.h>
-#include <pygit2/treebuilder.h>
+#include "error.h"
+#include "utils.h"
+#include "oid.h"
+#include "treebuilder.h"
 
 
 void
diff --git a/include/pygit2/treebuilder.h b/src/treebuilder.h
similarity index 98%
rename from include/pygit2/treebuilder.h
rename to src/treebuilder.h
index 322efe6..ad000df 100644
--- a/include/pygit2/treebuilder.h
+++ b/src/treebuilder.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 PyObject* TreeBuilder_insert(TreeBuilder *self, PyObject *args);
 PyObject* TreeBuilder_write(TreeBuilder *self);
diff --git a/include/pygit2/types.h b/src/types.h
similarity index 100%
rename from include/pygit2/types.h
rename to src/types.h
diff --git a/src/utils.c b/src/utils.c
index 488ffa1..01a24c3 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -27,8 +27,8 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/error.h>
-#include <pygit2/utils.h>
+#include "error.h"
+#include "utils.h"
 
 extern PyTypeObject ReferenceType;
 
diff --git a/include/pygit2/utils.h b/src/utils.h
similarity index 99%
rename from include/pygit2/utils.h
rename to src/utils.h
index 3045144..0b0913a 100644
--- a/include/pygit2/utils.h
+++ b/src/utils.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 /* Python 2 support */
 #if PY_MAJOR_VERSION == 2
diff --git a/src/walker.c b/src/walker.c
index 9e483f7..2799feb 100644
--- a/src/walker.c
+++ b/src/walker.c
@@ -27,11 +27,11 @@
 
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
-#include <pygit2/error.h>
-#include <pygit2/utils.h>
-#include <pygit2/oid.h>
-#include <pygit2/tree.h>
-#include <pygit2/walker.h>
+#include "error.h"
+#include "utils.h"
+#include "oid.h"
+#include "tree.h"
+#include "walker.h"
 
 extern PyTypeObject CommitType;
 
diff --git a/include/pygit2/walker.h b/src/walker.h
similarity index 98%
rename from include/pygit2/walker.h
rename to src/walker.h
index 3a86bda..9742ea9 100644
--- a/include/pygit2/walker.h
+++ b/src/walker.h
@@ -31,7 +31,7 @@
 #define PY_SSIZE_T_CLEAN
 #include <Python.h>
 #include <git2.h>
-#include <pygit2/types.h>
+#include "types.h"
 
 void Walker_dealloc(Walker *self);
 PyObject* Walker_hide(Walker *self, PyObject *py_hex);