Most of this can be trivially moved to a private header as well.
Signed-off-by: NJ. Bruce Fields <bfields@citi.umich.edu>