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.

object.c

@@ -1,4 +1,4 @@
-#include "git-compat-util.h"
+#include "cache.h"
 #include "gettext.h"
 #include "hex.h"
 #include "object.h"
@@ -6,7 +6,6 @@
 #include "object-file.h"
 #include "object-store.h"
 #include "blob.h"
-#include "statinfo.h"
 #include "tree.h"
 #include "commit.h"
 #include "tag.h"