diff --git a/csum-file.c b/csum-file.c
index 2d22f80d901..82ae2973d30 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -7,7 +7,7 @@
  * files. Useful when you write a file that you want to be
  * able to verify hasn't been messed with afterwards.
  */
-#include "cache.h"
+#include "git-compat-util.h"
 #include "progress.h"
 #include "csum-file.h"
 #include "wrapper.h"
diff --git a/gettext.c b/gettext.c
index 85d3d3424eb..5f348708300 100644
--- a/gettext.c
+++ b/gettext.c
@@ -2,7 +2,7 @@
  * Copyright (c) 2010 Ævar Arnfjörð Bjarmason
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "abspath.h"
 #include "environment.h"
 #include "exec-cmd.h"
diff --git a/ls-refs.c b/ls-refs.c
index 12cbb40a198..b9f3e08ec3d 100644
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"
diff --git a/notes-utils.c b/notes-utils.c
index 8797271faf1..86552f31c4a 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "commit.h"
 #include "environment.h"
diff --git a/prompt.c b/prompt.c
index ba10813b313..3baa33f63d8 100644
--- a/prompt.c
+++ b/prompt.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "environment.h"
 #include "run-command.h"
diff --git a/prune-packed.c b/prune-packed.c
index 5a57072a7ac..58412b4fb91 100644
--- a/prune-packed.c
+++ b/prune-packed.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "environment.h"
 #include "gettext.h"
 #include "object-store.h"
diff --git a/reachable.c b/reachable.c
index b0f85046e9c..55bb1143530 100644
--- a/reachable.c
+++ b/reachable.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "gettext.h"
 #include "hex.h"
 #include "refs.h"
diff --git a/t/helper/test-bitmap.c b/t/helper/test-bitmap.c
index ff35f5999b3..5bb489882da 100644
--- a/t/helper/test-bitmap.c
+++ b/t/helper/test-bitmap.c
@@ -1,5 +1,5 @@
 #include "test-tool.h"
-#include "cache.h"
+#include "git-compat-util.h"
 #include "pack-bitmap.h"
 
 static int bitmap_list_commits(void)
diff --git a/trailer.c b/trailer.c
index 6a5091a3c46..a2c3ed6f28c 100644
--- a/trailer.c
+++ b/trailer.c
@@ -1,4 +1,4 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "alloc.h"
 #include "config.h"
 #include "environment.h"