#include "cache.h"
#include "abspath.h"
#include "alloc.h"
+#include "base85.h"
#include "config.h"
#include "object-store.h"
#include "blob.h"
#include "xdiff-interface.h"
#include "ll-merge.h"
#include "lockfile.h"
+#include "name-hash.h"
#include "object-name.h"
#include "object-file.h"
#include "parse-options.h"
#include "apply.h"
#include "entry.h"
#include "setup.h"
+#include "symlinks.h"
+#include "ws.h"
#include "wrapper.h"
struct gitdiff_data {