Merge branch 'cb/maint-merge-recursive-fix' into cb/merge-recursive-fix

diff --git a/archive-zip.c b/archive-zip.c
index fb12398b0f56fecaf75b85ea4cace5173214bb5b..cf285044e3576d0127c3215cb1253443d67517dc 100644 (file)
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -2,11 +2,6 @@
  * Copyright (c) 2006 Rene Scharfe
  */
 #include "cache.h"
-#include "commit.h"
-#include "blob.h"
-#include "tree.h"
-#include "quote.h"
-#include "builtin.h"
 #include "archive.h"
 
 static int zip_date;