Moved some headers from protected to public as they should have been in the first place