Trying to fix the public headers