Merge branch 'cw/compat-util-header-cleanup'

Further shuffling of declarations across header files to streamline
file dependencies.

* cw/compat-util-header-cleanup:
  git-compat-util: move alloc macros to git-compat-util.h
  treewide: remove unnecessary includes for wrapper.h
  kwset: move translation table from ctype
  sane-ctype.h: create header for sane-ctype macros
  git-compat-util: move wrapper.c funcs to its header
  git-compat-util: move strbuf.c funcs to its header

diff --cc add-patch.c
Simple merge

diff --cc alias.c
Simple merge

diff --cc apply.c
Simple merge

diff --cc archive-tar.c
Simple merge

diff --cc attr.c
Simple merge

diff --cc builtin/am.c
Simple merge

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/branch.c
Simple merge

diff --cc builtin/cat-file.c
Simple merge

diff --cc builtin/clone.c
Simple merge

diff --cc builtin/config.c
Simple merge

diff --cc builtin/difftool.c
Simple merge

diff --cc builtin/fsmonitor--daemon.c
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc builtin/index-pack.c
Simple merge

diff --cc builtin/log.c
Simple merge

diff --cc builtin/merge.c
Simple merge

diff --cc builtin/pack-objects.c
Simple merge

diff --cc builtin/rebase.c
Simple merge

diff --cc builtin/receive-pack.c
Simple merge

diff --cc builtin/repack.c
Simple merge

diff --cc builtin/submodule--helper.c
Simple merge

diff --cc builtin/worktree.c
Simple merge

diff --cc config.c
Simple merge

diff --cc convert.c
Simple merge

diff --cc daemon.c
Simple merge

diff --cc delta-islands.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc fetch-pack.c
Simple merge

diff --cc fmt-merge-msg.c
Simple merge

diff --cc fsck.c
Simple merge

diff --cc git-compat-util.h
Simple merge

diff --cc gpg-interface.c
index f7c1d385c1f6ec068da2886395aba78d8d8a8e5b,cb171a853ba58681dbc334c6d2aa70ad474b2121..48f43c5a21d34569bdc966eefd652da38003d157
--- 1/gpg-interface.c
--- 2/gpg-interface.c
+++ b/gpg-interface.c
@@@ -12,11 -12,8 +12,10 @@@
  #include "sigchain.h"
  #include "tempfile.h"
  #include "alias.h"
- #include "wrapper.h"
 +#include "environment.h"
  
 -static int git_gpg_config(const char *, const char *, void *);
 +static int git_gpg_config(const char *, const char *,
 +                        const struct config_context *, void *);
  
  static void gpg_interface_lazy_init(void)
  {

diff --cc grep.c
Simple merge

diff --cc help.c
Simple merge

diff --cc imap-send.c
Simple merge

diff --cc merge-ll.c
Simple merge

diff --cc path.c
Simple merge

diff --cc pkt-line.c
Simple merge

diff --cc pretty.c
Simple merge

diff --cc read-cache.c
Simple merge

diff --cc rebase-interactive.c
Simple merge

diff --cc ref-filter.c
Simple merge

diff --cc remote-curl.c
Simple merge

diff --cc remote.c
Simple merge

diff --cc revision.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc setup.c
Simple merge

diff --cc strbuf.c
index b41d343ed0cbf1112cadde2c6c8ab63bcc26fb36,5d06ff026e4f316348e2aab341d38844d6d177db..f65d7bee4cd47b1c37663adcbd65f493f30bc023
--- 1/strbuf.c
--- 2/strbuf.c
+++ b/strbuf.c
@@@ -1,8 -1,12 +1,7 @@@
  #include "git-compat-util.h"
- #include "alloc.h"
 -#include "abspath.h"
 -#include "environment.h"
  #include "gettext.h"
  #include "hex.h"
 -#include "object-name.h"
 -#include "refs.h"
 -#include "path.h"
 -#include "repository.h"
 +#include "strbuf.h"
  #include "string-list.h"
  #include "utf8.h"
  #include "date.h"

diff --cc strbuf.h
Simple merge

diff --cc submodule-config.c
Simple merge

diff --cc tempfile.c
Simple merge

diff --cc trailer.c
Simple merge

diff --cc upload-pack.c
Simple merge

diff --cc worktree.c
Simple merge