environment.h: move declarations for environment.c functions from cache.h

[thirdparty/git.git] / merge-ort.c

diff --git a/merge-ort.c b/merge-ort.c
index d1611ca400a40b05914a14759a009bf16d76f5ce..f3d7c202f5211020118cdf1a844784b383513c3f 100644 (file)
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -26,6 +26,9 @@
 #include "diff.h"
 #include "diffcore.h"
 #include "dir.h"
+#include "environment.h"
+#include "gettext.h"
+#include "hex.h"
 #include "entry.h"
 #include "ll-merge.h"
 #include "object-store.h"