1 files changed, 7 insertions, 1 deletions
diff --git a/merge.c b/merge.c
index 445b4f19aa..b60925459c 100644
--- a/merge.c
+++ b/merge.c
@@ -1,10 +1,16 @@
-#include "cache.h"
+#include "git-compat-util.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "gettext.h"
+#include "hash.h"
+#include "hex.h"
 #include "lockfile.h"
+#include "merge.h"
 #include "commit.h"
+#include "repository.h"
 #include "run-command.h"
 #include "resolve-undo.h"
+#include "tree.h"
 #include "tree-walk.h"
 #include "unpack-trees.h"
 #include "dir.h"