moving around header definitons and getting x86 closer