also replace the "inverted" header guards by their canonical
counterparts to make that possible