Some C++ cleanup for header_rewrite

(cherry picked from commit 477b9b2fff47418a02c4b52e3eef247e74dc6dc0)
14 files changed