Unbreak build
Another step towards proper header ordering