diff --git a/src/revwalk.c b/src/revwalk.c
index 91822c50e..81d3ab652 100644
--- a/src/revwalk.c
+++ b/src/revwalk.c
@@ -23,14 +23,9 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include "git/revwalk.h"
-#include <stdlib.h>
+#include "revwalk.h"
 
-struct git_revpool {
-	git_odb *db;
-};
-
-git_revpool *git_revpool_alloc(git_odb *db)
+git_revpool *gitrp_alloc(git_odb *db)
 {
 	git_revpool *walk = malloc(sizeof(*walk));
 	if (!walk)
@@ -40,7 +35,7 @@ git_revpool *git_revpool_alloc(git_odb *db)
 	return walk;
 }
 
-void git_revpool_free(git_revpool *walk)
+void gitrp_free(git_revpool *walk)
 {
 	free(walk);
 }
diff --git a/src/revwalk.h b/src/revwalk.h
new file mode 100644
index 000000000..dea66ba25
--- /dev/null
+++ b/src/revwalk.h
@@ -0,0 +1,12 @@
+#ifndef INCLUDE_revwalk_h__
+#define INCLUDE_revwalk_h__
+
+#include "git/common.h"
+#include "git/revwalk.h"
+#include <stdlib.h>
+
+struct git_revpool {
+	git_odb *db;
+};
+
+#endif /* INCLUDE_revwalk_h__ */