Put public headers in a more reasonable location.