This commit adds a few missing private headers, and cleans up some irregularities in the existing ones