Clean up public headers.