Merge branch 'rs/clean-includes'

Clean up redundant includes of header files.

* rs/clean-includes:
  remove duplicate includes

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/log.c
Simple merge

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

diff --cc commit.c
Simple merge

diff --cc setup.c
Simple merge