summaryrefslogtreecommitdiff
path: root/rerere.c
diff options
context:
space:
mode:
Diffstat (limited to 'rerere.c')
-rw-r--r--rerere.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/rerere.c b/rerere.c
index 5516e336d0..e968d413d6 100644
--- a/rerere.c
+++ b/rerere.c
@@ -1,7 +1,8 @@
-#include "git-compat-util.h"
+#include "cache.h"
#include "abspath.h"
#include "alloc.h"
#include "config.h"
+#include "copy.h"
#include "gettext.h"
#include "hex.h"
#include "lockfile.h"
@@ -13,6 +14,7 @@
#include "ll-merge.h"
#include "attr.h"
#include "pathspec.h"
+#include "object-file.h"
#include "object-store.h"
#include "hash-lookup.h"
#include "strmap.h"