Fix public headers (I think)