Revert "Merge branch 'en/header-split-cache-h-part-3' into next"

This reverts commit 76ebce0b7a,
reversing changes made to 62e19d66fb,
in preparation for redoing the topic to make it buildable from the
source.

builtin/upload-pack.c

@@ -1,9 +1,9 @@
+#include "cache.h"
 #include "builtin.h"
 #include "exec-cmd.h"
 #include "gettext.h"
 #include "pkt-line.h"
 #include "parse-options.h"
-#include "path.h"
 #include "protocol.h"
 #include "replace-object.h"
 #include "upload-pack.h"