diff --git a/lib/libc/include/i386-linux-gnu/bits/a.out.h b/lib/libc/include/x86-linux-gnu/bits/a.out.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/a.out.h
rename to lib/libc/include/x86-linux-gnu/bits/a.out.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/endianness.h b/lib/libc/include/x86-linux-gnu/bits/endianness.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/endianness.h
rename to lib/libc/include/x86-linux-gnu/bits/endianness.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/environments.h b/lib/libc/include/x86-linux-gnu/bits/environments.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/environments.h
rename to lib/libc/include/x86-linux-gnu/bits/environments.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/epoll.h b/lib/libc/include/x86-linux-gnu/bits/epoll.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/epoll.h
rename to lib/libc/include/x86-linux-gnu/bits/epoll.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/fcntl.h b/lib/libc/include/x86-linux-gnu/bits/fcntl.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/fcntl.h
rename to lib/libc/include/x86-linux-gnu/bits/fcntl.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/fenv.h b/lib/libc/include/x86-linux-gnu/bits/fenv.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/fenv.h
rename to lib/libc/include/x86-linux-gnu/bits/fenv.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/floatn.h b/lib/libc/include/x86-linux-gnu/bits/floatn.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/floatn.h
rename to lib/libc/include/x86-linux-gnu/bits/floatn.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/flt-eval-method.h b/lib/libc/include/x86-linux-gnu/bits/flt-eval-method.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/flt-eval-method.h
rename to lib/libc/include/x86-linux-gnu/bits/flt-eval-method.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/fp-logb.h b/lib/libc/include/x86-linux-gnu/bits/fp-logb.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/fp-logb.h
rename to lib/libc/include/x86-linux-gnu/bits/fp-logb.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/indirect-return.h b/lib/libc/include/x86-linux-gnu/bits/indirect-return.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/indirect-return.h
rename to lib/libc/include/x86-linux-gnu/bits/indirect-return.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/ipctypes.h b/lib/libc/include/x86-linux-gnu/bits/ipctypes.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/ipctypes.h
rename to lib/libc/include/x86-linux-gnu/bits/ipctypes.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/iscanonical.h b/lib/libc/include/x86-linux-gnu/bits/iscanonical.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/iscanonical.h
rename to lib/libc/include/x86-linux-gnu/bits/iscanonical.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/link.h b/lib/libc/include/x86-linux-gnu/bits/link.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/link.h
rename to lib/libc/include/x86-linux-gnu/bits/link.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/long-double.h b/lib/libc/include/x86-linux-gnu/bits/long-double.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/long-double.h
rename to lib/libc/include/x86-linux-gnu/bits/long-double.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/math-vector.h b/lib/libc/include/x86-linux-gnu/bits/math-vector.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/math-vector.h
rename to lib/libc/include/x86-linux-gnu/bits/math-vector.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/mman.h b/lib/libc/include/x86-linux-gnu/bits/mman.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/mman.h
rename to lib/libc/include/x86-linux-gnu/bits/mman.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/procfs-id.h b/lib/libc/include/x86-linux-gnu/bits/procfs-id.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/procfs-id.h
rename to lib/libc/include/x86-linux-gnu/bits/procfs-id.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/procfs.h b/lib/libc/include/x86-linux-gnu/bits/procfs.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/procfs.h
rename to lib/libc/include/x86-linux-gnu/bits/procfs.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/pthreadtypes-arch.h b/lib/libc/include/x86-linux-gnu/bits/pthreadtypes-arch.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/pthreadtypes-arch.h
rename to lib/libc/include/x86-linux-gnu/bits/pthreadtypes-arch.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/setjmp.h b/lib/libc/include/x86-linux-gnu/bits/setjmp.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/setjmp.h
rename to lib/libc/include/x86-linux-gnu/bits/setjmp.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/sigcontext.h b/lib/libc/include/x86-linux-gnu/bits/sigcontext.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/sigcontext.h
rename to lib/libc/include/x86-linux-gnu/bits/sigcontext.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/siginfo-arch.h b/lib/libc/include/x86-linux-gnu/bits/siginfo-arch.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/siginfo-arch.h
rename to lib/libc/include/x86-linux-gnu/bits/siginfo-arch.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/struct_mutex.h b/lib/libc/include/x86-linux-gnu/bits/struct_mutex.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/struct_mutex.h
rename to lib/libc/include/x86-linux-gnu/bits/struct_mutex.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/struct_rwlock.h b/lib/libc/include/x86-linux-gnu/bits/struct_rwlock.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/struct_rwlock.h
rename to lib/libc/include/x86-linux-gnu/bits/struct_rwlock.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/struct_stat.h b/lib/libc/include/x86-linux-gnu/bits/struct_stat.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/struct_stat.h
rename to lib/libc/include/x86-linux-gnu/bits/struct_stat.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/timesize.h b/lib/libc/include/x86-linux-gnu/bits/timesize.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/timesize.h
rename to lib/libc/include/x86-linux-gnu/bits/timesize.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/types/struct_semid_ds.h b/lib/libc/include/x86-linux-gnu/bits/types/struct_semid_ds.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/types/struct_semid_ds.h
rename to lib/libc/include/x86-linux-gnu/bits/types/struct_semid_ds.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/typesizes.h b/lib/libc/include/x86-linux-gnu/bits/typesizes.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/typesizes.h
rename to lib/libc/include/x86-linux-gnu/bits/typesizes.h
diff --git a/lib/libc/include/i386-linux-gnu/bits/wordsize.h b/lib/libc/include/x86-linux-gnu/bits/wordsize.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/bits/wordsize.h
rename to lib/libc/include/x86-linux-gnu/bits/wordsize.h
diff --git a/lib/libc/include/i386-linux-gnu/finclude/math-vector-fortran.h b/lib/libc/include/x86-linux-gnu/finclude/math-vector-fortran.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/finclude/math-vector-fortran.h
rename to lib/libc/include/x86-linux-gnu/finclude/math-vector-fortran.h
diff --git a/lib/libc/include/i386-linux-gnu/fpu_control.h b/lib/libc/include/x86-linux-gnu/fpu_control.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/fpu_control.h
rename to lib/libc/include/x86-linux-gnu/fpu_control.h
diff --git a/lib/libc/include/i386-linux-gnu/gnu/lib-names.h b/lib/libc/include/x86-linux-gnu/gnu/lib-names.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/gnu/lib-names.h
rename to lib/libc/include/x86-linux-gnu/gnu/lib-names.h
diff --git a/lib/libc/include/i386-linux-gnu/gnu/stubs.h b/lib/libc/include/x86-linux-gnu/gnu/stubs.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/gnu/stubs.h
rename to lib/libc/include/x86-linux-gnu/gnu/stubs.h
diff --git a/lib/libc/include/i386-linux-gnu/sys/elf.h b/lib/libc/include/x86-linux-gnu/sys/elf.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/sys/elf.h
rename to lib/libc/include/x86-linux-gnu/sys/elf.h
diff --git a/lib/libc/include/i386-linux-gnu/sys/ptrace.h b/lib/libc/include/x86-linux-gnu/sys/ptrace.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/sys/ptrace.h
rename to lib/libc/include/x86-linux-gnu/sys/ptrace.h
diff --git a/lib/libc/include/i386-linux-gnu/sys/ucontext.h b/lib/libc/include/x86-linux-gnu/sys/ucontext.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/sys/ucontext.h
rename to lib/libc/include/x86-linux-gnu/sys/ucontext.h
diff --git a/lib/libc/include/i386-linux-gnu/sys/user.h b/lib/libc/include/x86-linux-gnu/sys/user.h
similarity index 100%
rename from lib/libc/include/i386-linux-gnu/sys/user.h
rename to lib/libc/include/x86-linux-gnu/sys/user.h