Move remaining headers to public section. Required during linking as subproject