Moved headers to public
Merge branch 'refs/heads/public-headers'