Compiles again, post headerpocalypse.