Add some version(X86) blocks for arch-dependent definitions