diff --git a/src/attr.c b/src/attr.c
index a6a87afee..de714a697 100644
--- a/src/attr.c
+++ b/src/attr.c
@@ -1,6 +1,7 @@
 #include "repository.h"
 #include "fileops.h"
 #include "config.h"
+#include "git2/oid.h"
 #include <ctype.h>
 
 GIT__USE_STRMAP;
diff --git a/src/cache.c b/src/cache.c
index f8d89403b..3aa14f012 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -11,6 +11,7 @@
 #include "thread-utils.h"
 #include "util.h"
 #include "cache.h"
+#include "git2/oid.h"
 
 int git_cache_init(git_cache *cache, size_t size, git_cached_obj_freeptr free_ptr)
 {
diff --git a/src/diff.c b/src/diff.c
index 2b1529d63..a5bf07a65 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -6,6 +6,7 @@
  */
 #include "common.h"
 #include "git2/diff.h"
+#include "git2/oid.h"
 #include "diff.h"
 #include "fileops.h"
 #include "config.h"
diff --git a/src/diff_output.c b/src/diff_output.c
index 9f8779787..bd8e8edda 100644
--- a/src/diff_output.c
+++ b/src/diff_output.c
@@ -8,6 +8,7 @@
 #include "git2/diff.h"
 #include "git2/attr.h"
 #include "git2/blob.h"
+#include "git2/oid.h"
 #include "xdiff/xdiff.h"
 #include <ctype.h>
 #include "diff.h"
diff --git a/src/index.c b/src/index.c
index e021a4036..b6b1b779e 100644
--- a/src/index.c
+++ b/src/index.c
@@ -14,6 +14,7 @@
 #include "tree-cache.h"
 #include "hash.h"
 #include "git2/odb.h"
+#include "git2/oid.h"
 #include "git2/blob.h"
 #include "git2/config.h"
 
diff --git a/src/odb.c b/src/odb.c
index 97b389893..d5902840d 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -14,6 +14,7 @@
 #include "delta-apply.h"
 
 #include "git2/odb_backend.h"
+#include "git2/oid.h"
 
 #define GIT_ALTERNATES_FILE "info/alternates"
 
diff --git a/src/refs.c b/src/refs.c
index c602d1b18..cf55a6fd5 100644
--- a/src/refs.c
+++ b/src/refs.c
@@ -14,6 +14,7 @@
 
 #include <git2/tag.h>
 #include <git2/object.h>
+#include <git2/oid.h>
 
 GIT__USE_STRMAP;
 
diff --git a/src/remote.c b/src/remote.c
index fc1a2ecc1..fe026b175 100644
--- a/src/remote.c
+++ b/src/remote.c
@@ -7,6 +7,7 @@
 
 #include "git2/config.h"
 #include "git2/types.h"
+#include "git2/oid.h"
 
 #include "config.h"
 #include "repository.h"