Fix public headers (really this time).