x86: Move some variable declarations below the appropriat #ifdef.