This commit adds a few missing private headers, and cleans up some irregularities in the existing ones
gcc has optimizations for include guards that only work if they are outermost in the the header. https://bugzilla.gnome.org/show_bug.cgi?id=689810
Add a 'private' suffix to all newly introduced private headers.
