diff --git a/Makefile b/Makefile
index e9dbdf7f..d0f16dfc 100644
--- a/Makefile
+++ b/Makefile
@@ -51,6 +51,12 @@ clean:
 	rm -f $(ALL_LIBS) lib/*
 	rm -f $(ALL_TOOLS)
 	rm -f $(GENH) 
+	rm -f include/bits
+
+include/bits:
+	ln -sf ../arch/$(ARCH)/bits $@
+
+include/bits/alltypes.h.sh: include/bits
 
 include/bits/alltypes.h: include/bits/alltypes.h.sh
 	sh $< > $@
diff --git a/include/bits/alltypes.h.sh b/arch/i386/bits/alltypes.h.sh
similarity index 100%
rename from include/bits/alltypes.h.sh
rename to arch/i386/bits/alltypes.h.sh
diff --git a/include/bits/endian.h b/arch/i386/bits/endian.h
similarity index 100%
rename from include/bits/endian.h
rename to arch/i386/bits/endian.h
diff --git a/include/bits/errno.h b/arch/i386/bits/errno.h
similarity index 100%
rename from include/bits/errno.h
rename to arch/i386/bits/errno.h
diff --git a/include/bits/fcntl.h b/arch/i386/bits/fcntl.h
similarity index 100%
rename from include/bits/fcntl.h
rename to arch/i386/bits/fcntl.h
diff --git a/include/bits/fenv.h b/arch/i386/bits/fenv.h
similarity index 100%
rename from include/bits/fenv.h
rename to arch/i386/bits/fenv.h
diff --git a/include/bits/float.h b/arch/i386/bits/float.h
similarity index 100%
rename from include/bits/float.h
rename to arch/i386/bits/float.h
diff --git a/include/bits/in.h b/arch/i386/bits/in.h
similarity index 100%
rename from include/bits/in.h
rename to arch/i386/bits/in.h
diff --git a/include/bits/ioctl.h b/arch/i386/bits/ioctl.h
similarity index 100%
rename from include/bits/ioctl.h
rename to arch/i386/bits/ioctl.h
diff --git a/include/bits/ipc.h b/arch/i386/bits/ipc.h
similarity index 100%
rename from include/bits/ipc.h
rename to arch/i386/bits/ipc.h
diff --git a/include/bits/limits.h b/arch/i386/bits/limits.h
similarity index 100%
rename from include/bits/limits.h
rename to arch/i386/bits/limits.h
diff --git a/include/bits/mman.h b/arch/i386/bits/mman.h
similarity index 100%
rename from include/bits/mman.h
rename to arch/i386/bits/mman.h
diff --git a/include/bits/posix.h b/arch/i386/bits/posix.h
similarity index 100%
rename from include/bits/posix.h
rename to arch/i386/bits/posix.h
diff --git a/include/bits/pthread.h b/arch/i386/bits/pthread.h
similarity index 100%
rename from include/bits/pthread.h
rename to arch/i386/bits/pthread.h
diff --git a/include/bits/reg.h b/arch/i386/bits/reg.h
similarity index 100%
rename from include/bits/reg.h
rename to arch/i386/bits/reg.h
diff --git a/include/bits/setjmp.h b/arch/i386/bits/setjmp.h
similarity index 100%
rename from include/bits/setjmp.h
rename to arch/i386/bits/setjmp.h
diff --git a/include/bits/shm.h b/arch/i386/bits/shm.h
similarity index 100%
rename from include/bits/shm.h
rename to arch/i386/bits/shm.h
diff --git a/include/bits/signal.h b/arch/i386/bits/signal.h
similarity index 100%
rename from include/bits/signal.h
rename to arch/i386/bits/signal.h
diff --git a/include/bits/socket.h b/arch/i386/bits/socket.h
similarity index 100%
rename from include/bits/socket.h
rename to arch/i386/bits/socket.h
diff --git a/include/bits/stat.h b/arch/i386/bits/stat.h
similarity index 100%
rename from include/bits/stat.h
rename to arch/i386/bits/stat.h
diff --git a/include/bits/statfs.h b/arch/i386/bits/statfs.h
similarity index 100%
rename from include/bits/statfs.h
rename to arch/i386/bits/statfs.h
diff --git a/include/bits/stdint.h b/arch/i386/bits/stdint.h
similarity index 100%
rename from include/bits/stdint.h
rename to arch/i386/bits/stdint.h
diff --git a/include/bits/stdio.h b/arch/i386/bits/stdio.h
similarity index 100%
rename from include/bits/stdio.h
rename to arch/i386/bits/stdio.h
diff --git a/include/bits/sysmacros.h b/arch/i386/bits/sysmacros.h
similarity index 100%
rename from include/bits/sysmacros.h
rename to arch/i386/bits/sysmacros.h
diff --git a/include/bits/tcp.h b/arch/i386/bits/tcp.h
similarity index 100%
rename from include/bits/tcp.h
rename to arch/i386/bits/tcp.h
diff --git a/include/bits/termios.h b/arch/i386/bits/termios.h
similarity index 100%
rename from include/bits/termios.h
rename to arch/i386/bits/termios.h
diff --git a/include/bits/user.h b/arch/i386/bits/user.h
similarity index 100%
rename from include/bits/user.h
rename to arch/i386/bits/user.h
diff --git a/include/bits/wait.h b/arch/i386/bits/wait.h
similarity index 100%
rename from include/bits/wait.h
rename to arch/i386/bits/wait.h
diff --git a/include/bits/wexitstatus.h b/arch/i386/bits/wexitstatus.h
similarity index 100%
rename from include/bits/wexitstatus.h
rename to arch/i386/bits/wexitstatus.h