Make include order error messages even more clear on how to fix.
Rename align defines and remove unused align defines.