Replace amd64 with x64 in 32 bit header, which means that some macros are in wrong place!