Tidy up the include directives (i386)
Tidy up the include directives (amd64)
copyright headers