Fixed public headers