Moved more headers to public