Rename header consistently with its source file
x86: prune some stupid, redundant code