Minor fixes in head include