Remove unnecessary includes of builtin.h

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/diff-no-index.c b/diff-no-index.c
index 05fafd0019b6d5acc7295b999a8a46c92e1a649e..a3cf358baf0c1e24417c57094d80e3e3ce838808 100644 (file)
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -13,7 +13,6 @@
 #include "diffcore.h"
 #include "revision.h"
 #include "log-tree.h"
-#include "builtin.h"
 #include "parse-options.h"
 #include "string-list.h"
 #include "dir.h"

diff --git a/merge-recursive.c b/merge-recursive.c
index ee144676b76133fa846e6421486dd56f71e0f311..89731f40908e484d2a6e1b1f715c193f64d8bc74 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -10,7 +10,6 @@
 #include "alloc.h"
 #include "attr.h"
 #include "blob.h"
-#include "builtin.h"
 #include "cache-tree.h"
 #include "commit.h"
 #include "commit-reach.h"

diff --git a/send-pack.c b/send-pack.c
index 954104673f3150d6345344eab8fd25568ed19ab7..423a5cfe22d140026474695340488ae1423a6317 100644 (file)
--- a/send-pack.c
+++ b/send-pack.c
@@ -1,4 +1,4 @@
-#include "builtin.h"
+#include "git-compat-util.h"
 #include "config.h"
 #include "commit.h"
 #include "hex.h"