1 files changed, 3 insertions, 1 deletions
diff --git a/ll-merge.c b/ll-merge.c
index 8be38d3bd4..1993530688 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -4,13 +4,15 @@
  * Copyright (c) 2007 Junio C Hamano
  */
 
-#include "cache.h"
+#include "git-compat-util.h"
 #include "config.h"
+#include "convert.h"
 #include "attr.h"
 #include "xdiff-interface.h"
 #include "run-command.h"
 #include "ll-merge.h"
 #include "quote.h"
+#include "strbuf.h"
 #include "wrapper.h"
 
 struct ll_merge_driver;