diff --git a/include/git2/revwalk.h b/include/git2/revwalk.h
index 4b5ea8e06..f3e0152d4 100644
--- a/include/git2/revwalk.h
+++ b/include/git2/revwalk.h
@@ -27,7 +27,7 @@
 
 #include "common.h"
 #include "types.h"
-#include "object.h"
+#include "oid.h"
 
 /**
  * @file git2/revwalk.h
diff --git a/src/commit.c b/src/commit.c
index 1c5cddf7a..8da170cad 100644
--- a/src/commit.c
+++ b/src/commit.c
@@ -30,7 +30,6 @@
 
 #include "common.h"
 #include "commit.h"
-#include "revwalk.h"
 #include "signature.h"
 
 #define COMMIT_BASIC_PARSE 0x0
diff --git a/src/revwalk.c b/src/revwalk.c
index a2fc092d5..3b7ad34e6 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -25,10 +25,11 @@
 
 #include "common.h"
 #include "commit.h"
-#include "revwalk.h"
 #include "hashtable.h"
 #include "pqueue.h"
 
+#include "git2/revwalk.h"
+
 typedef struct commit_object {
 	git_oid oid;
 	uint32_t time;
diff --git a/src/revwalk.h b/src/revwalk.h
deleted file mode 100644
index 2970d773c..000000000
--- a/src/revwalk.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef INCLUDE_revwalk_h__
-#define INCLUDE_revwalk_h__
-
-#include "git2/common.h"
-#include "git2/revwalk.h"
-
-#include "commit.h"
-#include "repository.h"
-#include "hashtable.h"
-
-#endif /* INCLUDE_revwalk_h__ */
diff --git a/src/tag.c b/src/tag.c
index 1379425a1..0489e7e4a 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -27,7 +27,6 @@
 #include "commit.h"
 #include "tag.h"
 #include "signature.h"
-#include "revwalk.h"
 #include "git2/object.h"
 #include "git2/repository.h"
 #include "git2/signature.h"
diff --git a/src/tree.c b/src/tree.c
index 702cccbce..307d41b0d 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -25,7 +25,6 @@
 
 #include "common.h"
 #include "commit.h"
-#include "revwalk.h"
 #include "tree.h"
 #include "git2/repository.h"
 #include "git2/object.h"
diff --git a/tests/t05-revwalk.c b/tests/t05-revwalk.c
index 0460d4c08..cfcf01066 100644
--- a/tests/t05-revwalk.c
+++ b/tests/t05-revwalk.c
@@ -25,8 +25,6 @@
 #include "test_lib.h"
 #include "test_helpers.h"
 
-#include "revwalk.h"
-
 /*
 	$ git log --oneline --graph --decorate
 	*   a4a7dce (HEAD, br2) Merge branch 'master' into br2