Added what should be the correct public headers.