Rearrange includes a bit, prepare for amalgamation file.
Merge branch 'master' of https://github.com/lgov/MockHTTPinC