Moved some headers to public