Limit publicly exposed headers

[anokfireball]

There is a small amount of headers that are publicly exposed without any need to, see #300 (comment).
These should be refactored such that they are not exposed.