diff --git a/src/blob.c b/src/blob.c
index 28d48da2a..c5a7143f0 100644
--- a/src/blob.c
+++ b/src/blob.c
@@ -23,9 +23,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "git/common.h"
-#include "git/object.h"
-#include "git/repository.h"
+#include "git2/common.h"
+#include "git2/object.h"
+#include "git2/repository.h"
 
 #include "common.h"
 #include "blob.h"
diff --git a/src/blob.h b/src/blob.h
index db37d2c24..febc296fe 100644
--- a/src/blob.h
+++ b/src/blob.h
@@ -1,7 +1,7 @@
 #ifndef INCLUDE_blob_h__
 #define INCLUDE_blob_h__
 
-#include "git/blob.h"
+#include "git2/blob.h"
 #include "repository.h"
 #include "fileops.h"
 
diff --git a/src/commit.c b/src/commit.c
index 9e3cd3301..ef3d80b51 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -23,9 +23,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "git/common.h"
-#include "git/object.h"
-#include "git/repository.h"
+#include "git2/common.h"
+#include "git2/object.h"
+#include "git2/repository.h"
 
 #include "common.h"
 #include "commit.h"
diff --git a/src/commit.h b/src/commit.h
index 617d237f9..eca566ddf 100644
--- a/src/commit.h
+++ b/src/commit.h
@@ -1,7 +1,7 @@
 #ifndef INCLUDE_commit_h__
 #define INCLUDE_commit_h__
 
-#include "git/commit.h"
+#include "git2/commit.h"
 #include "tree.h"
 #include "repository.h"
 #include "vector.h"
diff --git a/src/common.h b/src/common.h
index ff87c872c..821ee8844 100644
--- a/src/common.h
+++ b/src/common.h
@@ -8,7 +8,7 @@
 #define GIT_WIN32 1
 #endif
 
-#include "git/thread-utils.h"
+#include "git2/thread-utils.h"
 #include "cc-compat.h"
 
 #ifdef GIT_HAS_PTHREAD
@@ -46,7 +46,7 @@ typedef SSIZE_T ssize_t;
 
 #endif
 
-#include "git/common.h"
+#include "git2/common.h"
 #include "util.h"
 #include "thread-utils.h"
 #include "errors.h"
diff --git a/src/delta-apply.c b/src/delta-apply.c
index 769e97344..16f26be44 100644
--- a/src/delta-apply.c
+++ b/src/delta-apply.c
@@ -1,5 +1,5 @@
 #include "common.h"
-#include "git/odb.h"
+#include "git2/odb.h"
 #include "delta-apply.h"
 
 /*
diff --git a/src/errors.h b/src/errors.h
index 94093ddb4..d22a03b33 100644
--- a/src/errors.h
+++ b/src/errors.h
@@ -1,7 +1,7 @@
 #ifndef INCLUDE_errors_h__
 #define INCLUDE_errors_h__
 
-#include "git/errors.h"
+#include "git2/errors.h"
 
 /* convenience functions */
 GIT_INLINE(int) git_int_error(int code)
diff --git a/src/git.h b/src/git2.h
similarity index 78%
rename from src/git.h
rename to src/git2.h
index 02ccf77d1..dbf5a9961 100644
--- a/src/git.h
+++ b/src/git2.h
@@ -26,24 +26,24 @@
 #ifndef INCLUDE_git_git_h__
 #define INCLUDE_git_git_h__
 
-#include "git/common.h"
-#include "git/errors.h"
-#include "git/zlib.h"
+#include "git2/common.h"
+#include "git2/errors.h"
+#include "git2/zlib.h"
 
-#include "git/types.h"
+#include "git2/types.h"
 
-#include "git/oid.h"
-#include "git/odb.h"
+#include "git2/oid.h"
+#include "git2/odb.h"
 
-#include "git/repository.h"
-#include "git/revwalk.h"
+#include "git2/repository.h"
+#include "git2/revwalk.h"
 
-#include "git/object.h"
-#include "git/blob.h"
-#include "git/commit.h"
-#include "git/tag.h"
-#include "git/tree.h"
+#include "git2/object.h"
+#include "git2/blob.h"
+#include "git2/commit.h"
+#include "git2/tag.h"
+#include "git2/tree.h"
 
-#include "git/index.h"
+#include "git2/index.h"
 
 #endif
diff --git a/src/git/blob.h b/src/git2/blob.h
similarity index 100%
rename from src/git/blob.h
rename to src/git2/blob.h
diff --git a/src/git/commit.h b/src/git2/commit.h
similarity index 100%
rename from src/git/commit.h
rename to src/git2/commit.h
diff --git a/src/git/common.h b/src/git2/common.h
similarity index 100%
rename from src/git/common.h
rename to src/git2/common.h
diff --git a/src/git/errors.h b/src/git2/errors.h
similarity index 100%
rename from src/git/errors.h
rename to src/git2/errors.h
diff --git a/src/git/index.h b/src/git2/index.h
similarity index 100%
rename from src/git/index.h
rename to src/git2/index.h
diff --git a/src/git/object.h b/src/git2/object.h
similarity index 100%
rename from src/git/object.h
rename to src/git2/object.h
diff --git a/src/git/odb.h b/src/git2/odb.h
similarity index 100%
rename from src/git/odb.h
rename to src/git2/odb.h
diff --git a/src/git/odb_backend.h b/src/git2/odb_backend.h
similarity index 100%
rename from src/git/odb_backend.h
rename to src/git2/odb_backend.h
diff --git a/src/git/oid.h b/src/git2/oid.h
similarity index 100%
rename from src/git/oid.h
rename to src/git2/oid.h
diff --git a/src/git/repository.h b/src/git2/repository.h
similarity index 100%
rename from src/git/repository.h
rename to src/git2/repository.h
diff --git a/src/git/revwalk.h b/src/git2/revwalk.h
similarity index 100%
rename from src/git/revwalk.h
rename to src/git2/revwalk.h
diff --git a/src/git/tag.h b/src/git2/tag.h
similarity index 100%
rename from src/git/tag.h
rename to src/git2/tag.h
diff --git a/src/git/thread-utils.h b/src/git2/thread-utils.h
similarity index 100%
rename from src/git/thread-utils.h
rename to src/git2/thread-utils.h
diff --git a/src/git/tree.h b/src/git2/tree.h
similarity index 100%
rename from src/git/tree.h
rename to src/git2/tree.h
diff --git a/src/git/types.h b/src/git2/types.h
similarity index 100%
rename from src/git/types.h
rename to src/git2/types.h
diff --git a/src/git/zlib.h b/src/git2/zlib.h
similarity index 100%
rename from src/git/zlib.h
rename to src/git2/zlib.h
diff --git a/src/hash.h b/src/hash.h
index b371c056b..2b769a4c9 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -4,7 +4,7 @@
 #ifndef INCLUDE_hash_h__
 #define INCLUDE_hash_h__
 
-#include "git/oid.h"
+#include "git2/oid.h"
 
 typedef struct git_hash_ctx git_hash_ctx;
 
diff --git a/src/hashtable.h b/src/hashtable.h
index cd390b9e9..69535040d 100644
--- a/src/hashtable.h
+++ b/src/hashtable.h
@@ -1,9 +1,9 @@
 #ifndef INCLUDE_hashtable_h__
 #define INCLUDE_hashtable_h__
 
-#include "git/common.h"
-#include "git/oid.h"
-#include "git/odb.h"
+#include "git2/common.h"
+#include "git2/oid.h"
+#include "git2/odb.h"
 
 
 typedef uint32_t (*git_hash_ptr)(const void *);
diff --git a/src/index.c b/src/index.c
index da22f7065..3c2bbf8cf 100644
--- a/src/index.c
+++ b/src/index.c
@@ -29,8 +29,8 @@
 #include "repository.h"
 #include "index.h"
 #include "hash.h"
-#include "git/odb.h"
-#include "git/blob.h"
+#include "git2/odb.h"
+#include "git2/blob.h"
 
 #define entry_padding(type, len) (8 - ((offsetof(type, path) + (len)) & 0x7))
 #define short_entry_padding(len) entry_padding(struct entry_short, len)
diff --git a/src/index.h b/src/index.h
index f548c7b68..9e45a6372 100644
--- a/src/index.h
+++ b/src/index.h
@@ -4,8 +4,8 @@
 #include "fileops.h"
 #include "filelock.h"
 #include "vector.h"
-#include "git/odb.h"
-#include "git/index.h"
+#include "git2/odb.h"
+#include "git2/index.h"
 
 struct git_index_tree {
 	char *name;
diff --git a/src/odb.c b/src/odb.c
index 1595e5f9f..9dbe1ccd8 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -24,14 +24,14 @@
  */
 
 #include "common.h"
-#include "git/zlib.h"
-#include "git/object.h"
+#include "git2/zlib.h"
+#include "git2/object.h"
 #include "fileops.h"
 #include "hash.h"
 #include "odb.h"
 #include "delta-apply.h"
 
-#include "git/odb_backend.h"
+#include "git2/odb_backend.h"
 
 static int format_object_header(char *hdr, size_t n, git_rawobj *obj)
 {
diff --git a/src/odb.h b/src/odb.h
index 72f0ea2b3..65f73ed30 100644
--- a/src/odb.h
+++ b/src/odb.h
@@ -1,8 +1,8 @@
 #ifndef INCLUDE_odb_h__
 #define INCLUDE_odb_h__
 
-#include <git/odb.h>
-#include <git/oid.h>
+#include "git2/odb.h"
+#include "git2/oid.h"
 
 #include "vector.h"
 
diff --git a/src/odb_loose.c b/src/odb_loose.c
index a7d0d5c8a..b031bde3f 100644
--- a/src/odb_loose.c
+++ b/src/odb_loose.c
@@ -24,14 +24,14 @@
  */
 
 #include "common.h"
-#include "git/zlib.h"
-#include "git/object.h"
+#include "git2/zlib.h"
+#include "git2/object.h"
 #include "fileops.h"
 #include "hash.h"
 #include "odb.h"
 #include "delta-apply.h"
 
-#include "git/odb_backend.h"
+#include "git2/odb_backend.h"
 
 typedef struct {  /* object header data */
 	git_otype type;  /* object type */
diff --git a/src/odb_pack.c b/src/odb_pack.c
index 82b8f147a..d59c419a5 100644
--- a/src/odb_pack.c
+++ b/src/odb_pack.c
@@ -24,14 +24,14 @@
  */
 
 #include "common.h"
-#include "git/zlib.h"
-#include "git/repository.h"
+#include "git2/zlib.h"
+#include "git2/repository.h"
 #include "fileops.h"
 #include "hash.h"
 #include "odb.h"
 #include "delta-apply.h"
 
-#include "git/odb_backend.h"
+#include "git2/odb_backend.h"
 
 /** First 4 bytes of a pack-*.idx file header.
  *
diff --git a/src/oid.c b/src/oid.c
index f40dd14ec..698d0f927 100644
--- a/src/oid.c
+++ b/src/oid.c
@@ -24,7 +24,7 @@
  */
 
 #include "common.h"
-#include "git/oid.h"
+#include "git2/oid.h"
 #include "repository.h"
 #include <string.h>
 
diff --git a/src/person.c b/src/person.c
index 9410913a7..e93e1b827 100644
--- a/src/person.c
+++ b/src/person.c
@@ -26,7 +26,7 @@
 #include "common.h"
 #include "person.h"
 #include "repository.h"
-#include "git/common.h"
+#include "git2/common.h"
 
 void git_person__free(git_person *person)
 {
diff --git a/src/person.h b/src/person.h
index 334b184eb..7a9fcb75b 100644
--- a/src/person.h
+++ b/src/person.h
@@ -1,7 +1,7 @@
 #ifndef INCLUDE_person_h__
 #define INCLUDE_person_h__
 
-#include "git/common.h"
+#include "git2/common.h"
 #include "repository.h"
 #include <time.h>
 
diff --git a/src/repository.c b/src/repository.c
index 9a3563710..b28c4ac9b 100644
--- a/src/repository.c
+++ b/src/repository.c
@@ -24,7 +24,7 @@
  */
 #include <stdarg.h>
 
-#include "git/object.h"
+#include "git2/object.h"
 
 #include "common.h"
 #include "repository.h"
diff --git a/src/repository.h b/src/repository.h
index ca76d4558..1ac307c61 100644
--- a/src/repository.h
+++ b/src/repository.h
@@ -1,10 +1,10 @@
 #ifndef INCLUDE_repository_h__
 #define INCLUDE_repository_h__
 
-#include "git/common.h"
-#include "git/oid.h"
-#include "git/odb.h"
-#include "git/repository.h"
+#include "git2/common.h"
+#include "git2/oid.h"
+#include "git2/odb.h"
+#include "git2/repository.h"
 
 #include "hashtable.h"
 #include "index.h"
diff --git a/src/revwalk.h b/src/revwalk.h
index d97e5ce8c..7b69ccd63 100644
--- a/src/revwalk.h
+++ b/src/revwalk.h
@@ -1,8 +1,8 @@
 #ifndef INCLUDE_revwalk_h__
 #define INCLUDE_revwalk_h__
 
-#include "git/common.h"
-#include "git/revwalk.h"
+#include "git2/common.h"
+#include "git2/revwalk.h"
 
 #include "commit.h"
 #include "repository.h"
diff --git a/src/tag.c b/src/tag.c
index 23542999d..b5b8b9fc3 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -28,8 +28,8 @@
 #include "tag.h"
 #include "person.h"
 #include "revwalk.h"
-#include "git/object.h"
-#include "git/repository.h"
+#include "git2/object.h"
+#include "git2/repository.h"
 
 void git_tag__free(git_tag *tag)
 {
diff --git a/src/tag.h b/src/tag.h
index fbf520868..dd84ff69b 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -1,7 +1,7 @@
 #ifndef INCLUDE_tag_h__
 #define INCLUDE_tag_h__
 
-#include "git/tag.h"
+#include "git2/tag.h"
 #include "repository.h"
 
 struct git_tag {
diff --git a/src/tree.c b/src/tree.c
index 0fc309209..4655dc760 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -27,8 +27,8 @@
 #include "commit.h"
 #include "revwalk.h"
 #include "tree.h"
-#include "git/repository.h"
-#include "git/object.h"
+#include "git2/repository.h"
+#include "git2/object.h"
 
 int entry_search_cmp(const void *key, const void *array_member)
 {
diff --git a/src/tree.h b/src/tree.h
index 84d02222f..5f532f887 100644
--- a/src/tree.h
+++ b/src/tree.h
@@ -1,7 +1,7 @@
 #ifndef INCLUDE_tree_h__
 #define INCLUDE_tree_h__
 
-#include <git/tree.h>
+#include "git2/tree.h"
 #include "repository.h"
 #include "vector.h"
 
diff --git a/src/vector.h b/src/vector.h
index 8239abade..305927a72 100644
--- a/src/vector.h
+++ b/src/vector.h
@@ -1,7 +1,7 @@
 #ifndef INCLUDE_vector_h__
 #define INCLUDE_vector_h__
 
-#include "git/common.h"
+#include "git2/common.h"
 
 
 typedef int (*git_vector_cmp)(const void *, const void *);
diff --git a/tests/t0101-hash.c b/tests/t0101-hash.c
index 6e9df7119..84f15f725 100644
--- a/tests/t0101-hash.c
+++ b/tests/t0101-hash.c
@@ -1,6 +1,6 @@
 #include "test_lib.h"
 #include "hash.h"
-#include <git/oid.h>
+#include <git2/oid.h>
 
 static char *hello_id = "22596363b3de40b06f981fb85d82312e8c0ed511";
 static char *hello_text = "hello world\n";
diff --git a/tests/t0101-oid.c b/tests/t0101-oid.c
index 3f61a7570..8341c7b45 100644
--- a/tests/t0101-oid.c
+++ b/tests/t0101-oid.c
@@ -1,5 +1,5 @@
 #include "test_lib.h"
-#include <git/oid.h>
+#include <git2/oid.h>
 
 BEGIN_TEST(oid_szs)
 	git_oid out;
diff --git a/tests/t0102-objtype.c b/tests/t0102-objtype.c
index ec4e15d44..8398e83e8 100644
--- a/tests/t0102-objtype.c
+++ b/tests/t0102-objtype.c
@@ -1,7 +1,7 @@
 
 #include "test_lib.h"
-#include <git/odb.h>
-#include <git/object.h>
+#include <git2/odb.h>
+#include <git2/object.h>
 
 BEGIN_TEST(type_to_string)
 	must_be_true(!strcmp(git_object_type2string(GIT_OBJ_BAD), ""));
diff --git a/tests/t0103-objhash.c b/tests/t0103-objhash.c
index 94c5e85af..58e7d06f2 100644
--- a/tests/t0103-objhash.c
+++ b/tests/t0103-objhash.c
@@ -1,6 +1,6 @@
 
 #include "test_lib.h"
-#include <git/odb.h>
+#include <git2/odb.h>
 
 static char *commit_id = "3d7f8a6af076c8c3f20071a8935cdbe8228594d1";
 
diff --git a/tests/t0201-existsloose.c b/tests/t0201-existsloose.c
index 0c7fda8e4..4836c8576 100644
--- a/tests/t0201-existsloose.c
+++ b/tests/t0201-existsloose.c
@@ -1,6 +1,6 @@
 #include "test_lib.h"
 #include "test_helpers.h"
-#include <git/odb.h>
+#include <git2/odb.h>
 
 static char *odb_dir = "test-objects";
 
diff --git a/tests/t0202-readloose.c b/tests/t0202-readloose.c
index 9956b3cd9..c822c6687 100644
--- a/tests/t0202-readloose.c
+++ b/tests/t0202-readloose.c
@@ -1,7 +1,7 @@
 
 #include "test_lib.h"
 #include "test_helpers.h"
-#include <git/odb.h>
+#include <git2/odb.h>
 
 /*
  * read loose objects from the object directory. The objects are
diff --git a/tests/t0203-readloose.c b/tests/t0203-readloose.c
index 3b1728b5a..86a57cb94 100644
--- a/tests/t0203-readloose.c
+++ b/tests/t0203-readloose.c
@@ -1,7 +1,7 @@
 
 #include "test_lib.h"
 #include "test_helpers.h"
-#include <git/odb.h>
+#include <git2/odb.h>
 
 /*
  * read loose objects from the object directory. The objects are
diff --git a/tests/t0204-readpack.c b/tests/t0204-readpack.c
index a7c8db7e0..0e386d7b3 100644
--- a/tests/t0204-readpack.c
+++ b/tests/t0204-readpack.c
@@ -1,6 +1,6 @@
 #include "test_lib.h"
 #include "test_helpers.h"
-#include <git/odb.h>
+#include <git2/odb.h>
 
 static const char *packed_objects[] = {
 	"0266163a49e280c4f5ed1e08facd36a2bd716bcf",
diff --git a/tests/t0205-readheader.c b/tests/t0205-readheader.c
index f82e57c44..d8a185e8d 100644
--- a/tests/t0205-readheader.c
+++ b/tests/t0205-readheader.c
@@ -1,6 +1,6 @@
 #include "test_lib.h"
 #include "test_helpers.h"
-#include <git/odb.h>
+#include <git2/odb.h>
 
 static const char *packed_objects[] = {
 	"0266163a49e280c4f5ed1e08facd36a2bd716bcf",
diff --git a/tests/t0301-write.c b/tests/t0301-write.c
index e0bbae1b8..d66b24aff 100644
--- a/tests/t0301-write.c
+++ b/tests/t0301-write.c
@@ -1,6 +1,6 @@
 
 #include "test_lib.h"
-#include <git/odb.h>
+#include <git2/odb.h>
 #include "fileops.h"
 
 static char *odb_dir = "test-objects";
diff --git a/tests/t0401-parse.c b/tests/t0401-parse.c
index fc5aeff7b..b82a9b168 100644
--- a/tests/t0401-parse.c
+++ b/tests/t0401-parse.c
@@ -2,9 +2,9 @@
 #include "test_helpers.h"
 #include "commit.h"
 #include "person.h"
-#include <git/odb.h>
-#include <git/commit.h>
-#include <git/revwalk.h>
+#include <git2/odb.h>
+#include <git2/commit.h>
+#include <git2/revwalk.h>
 
 static char *test_commits_broken[] = {
 
diff --git a/tests/t0402-details.c b/tests/t0402-details.c
index d97917a44..489b3ff67 100644
--- a/tests/t0402-details.c
+++ b/tests/t0402-details.c
@@ -3,9 +3,9 @@
 #include "commit.h"
 #include "person.h"
 
-#include <git/odb.h>
-#include <git/commit.h>
-#include <git/revwalk.h>
+#include <git2/odb.h>
+#include <git2/commit.h>
+#include <git2/revwalk.h>
 
 static const char *commit_ids[] = {
 	"a4a7dce85cf63874e984719f4fdd239f5145052f", /* 0 */
diff --git a/tests/t0403-write.c b/tests/t0403-write.c
index dfafca6f6..8b29b05ea 100644
--- a/tests/t0403-write.c
+++ b/tests/t0403-write.c
@@ -3,9 +3,9 @@
 #include "commit.h"
 #include "person.h"
 
-#include <git/odb.h>
-#include <git/commit.h>
-#include <git/revwalk.h>
+#include <git2/odb.h>
+#include <git2/commit.h>
+#include <git2/revwalk.h>
 
 static const char *commit_ids[] = {
 	"a4a7dce85cf63874e984719f4fdd239f5145052f", /* 0 */
diff --git a/tests/t0501-walk.c b/tests/t0501-walk.c
index 4b90e07e5..ae56e561c 100644
--- a/tests/t0501-walk.c
+++ b/tests/t0501-walk.c
@@ -2,9 +2,9 @@
 #include "test_helpers.h"
 #include "commit.h"
 
-#include <git/odb.h>
-#include <git/commit.h>
-#include <git/revwalk.h>
+#include <git2/odb.h>
+#include <git2/commit.h>
+#include <git2/revwalk.h>
 
 /*
 	$ git log --oneline --graph --decorate
diff --git a/tests/t0502-list.c b/tests/t0502-list.c
index 830809961..04427f51a 100644
--- a/tests/t0502-list.c
+++ b/tests/t0502-list.c
@@ -2,8 +2,8 @@
 #include "test_helpers.h"
 #include "commit.h"
 #include "revwalk.h"
-#include <git/odb.h>
-#include <git/commit.h>
+#include <git2/odb.h>
+#include <git2/commit.h>
 
 BEGIN_TEST(list_timesort_test)
 
diff --git a/tests/t0601-read.c b/tests/t0601-read.c
index 6ddb5fba8..0aaa6e39f 100644
--- a/tests/t0601-read.c
+++ b/tests/t0601-read.c
@@ -2,8 +2,8 @@
 #include "test_helpers.h"
 #include "index.h"
 
-#include <git/odb.h>
-#include <git/index.h>
+#include <git2/odb.h>
+#include <git2/index.h>
 
 #define TEST_INDEX_PATH "../resources/testrepo.git/index"
 #define TEST_INDEX2_PATH "../resources/gitgit.index"
diff --git a/tests/t0602-write.c b/tests/t0602-write.c
index 6463773fb..247aae9e2 100644
--- a/tests/t0602-write.c
+++ b/tests/t0602-write.c
@@ -2,8 +2,8 @@
 #include "test_helpers.h"
 #include "index.h"
 
-#include <git/odb.h>
-#include <git/index.h>
+#include <git2/odb.h>
+#include <git2/index.h>
 
 #define TEST_INDEX_PATH "../resources/testrepo.git/index"
 
diff --git a/tests/t0603-sort.c b/tests/t0603-sort.c
index 954394f19..1b32a5da5 100644
--- a/tests/t0603-sort.c
+++ b/tests/t0603-sort.c
@@ -2,8 +2,8 @@
 #include "test_helpers.h"
 #include "index.h"
 
-#include <git/odb.h>
-#include <git/index.h>
+#include <git2/odb.h>
+#include <git2/index.h>
 
 #define TEST_INDEX_PATH "../t0600-objects/index"
 
diff --git a/tests/t0801-readtag.c b/tests/t0801-readtag.c
index 8314304bd..5d079890e 100644
--- a/tests/t0801-readtag.c
+++ b/tests/t0801-readtag.c
@@ -2,9 +2,9 @@
 #include "test_helpers.h"
 #include "commit.h"
 
-#include <git/odb.h>
-#include <git/commit.h>
-#include <git/tag.h>
+#include <git2/odb.h>
+#include <git2/commit.h>
+#include <git2/tag.h>
 
 static const char *tag1_id = "b25fa35b38051e4ae45d4222e795f9df2e43f1d1";
 static const char *tag2_id = "7b4384978d2493e851f9cca7858815fac9b10980";
diff --git a/tests/t0802-write.c b/tests/t0802-write.c
index 8dd8de5ea..6364b96ff 100644
--- a/tests/t0802-write.c
+++ b/tests/t0802-write.c
@@ -2,9 +2,9 @@
 #include "test_helpers.h"
 #include "commit.h"
 
-#include <git/odb.h>
-#include <git/tag.h>
-#include <git/revwalk.h>
+#include <git2/odb.h>
+#include <git2/tag.h>
+#include <git2/revwalk.h>
 
 static const char *tag_id = "b25fa35b38051e4ae45d4222e795f9df2e43f1d1";
 
diff --git a/tests/t0901-readtree.c b/tests/t0901-readtree.c
index c14f5fd1f..c1b970413 100644
--- a/tests/t0901-readtree.c
+++ b/tests/t0901-readtree.c
@@ -2,9 +2,9 @@
 #include "test_helpers.h"
 #include "commit.h"
 
-#include <git/odb.h>
-#include <git/commit.h>
-#include <git/revwalk.h>
+#include <git2/odb.h>
+#include <git2/commit.h>
+#include <git2/revwalk.h>
 
 static const char *tree_oid = "1810dff58d8a660512d4832e740f692884338ccd";
 
diff --git a/tests/t0902-modify.c b/tests/t0902-modify.c
index a83349df9..893b9b30b 100644
--- a/tests/t0902-modify.c
+++ b/tests/t0902-modify.c
@@ -2,9 +2,9 @@
 #include "test_helpers.h"
 #include "commit.h"
 
-#include <git/odb.h>
-#include <git/commit.h>
-#include <git/revwalk.h>
+#include <git2/odb.h>
+#include <git2/commit.h>
+#include <git2/revwalk.h>
 
 static const char *tree_oid = "1810dff58d8a660512d4832e740f692884338ccd";
 
diff --git a/tests/test_helpers.h b/tests/test_helpers.h
index d6d32140e..6574e39b3 100644
--- a/tests/test_helpers.h
+++ b/tests/test_helpers.h
@@ -27,7 +27,7 @@
 #define INCLUDE_test_helpers_h__
 
 #include "test_lib.h"
-#include <git.h>
+#include <git2.h>
 
 #define ODB_FOLDER "../resources/testrepo.git/objects/"
 #define REPOSITORY_FOLDER "../resources/testrepo.git/"
diff --git a/tests/test_lib.h b/tests/test_lib.h
index 78f992332..77c62924d 100644
--- a/tests/test_lib.h
+++ b/tests/test_lib.h
@@ -24,7 +24,7 @@
  */
 
 #include "common.h"
-#include <git/common.h>
+#include <git2/common.h>
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/wscript b/wscript
index db41dbf53..6e0c8e645 100644
--- a/wscript
+++ b/wscript
@@ -131,8 +131,8 @@ def build_library(bld, lib_str):
 		)
 
 	# Install headers
-	bld.install_files('${PREFIX}/include', directory.find_node('src/git.h'))
-	bld.install_files('${PREFIX}/include/git', directory.ant_glob('src/git/*.h'))
+	bld.install_files('${PREFIX}/include', directory.find_node('src/git2.h'))
+	bld.install_files('${PREFIX}/include/git2', directory.ant_glob('src/git2/*.h'))
 
 def grep_test_header(text, test_file):
 	return '\n'.join(l for l in test_file.read().splitlines() if text in l)