diff --git a/include/asm-sandbox/bitops.h b/arch/sandbox/include/asm/bitops.h
similarity index 100%
rename from include/asm-sandbox/bitops.h
rename to arch/sandbox/include/asm/bitops.h
diff --git a/include/asm-sandbox/byteorder.h b/arch/sandbox/include/asm/byteorder.h
similarity index 100%
rename from include/asm-sandbox/byteorder.h
rename to arch/sandbox/include/asm/byteorder.h
diff --git a/include/asm-sandbox/common.h b/arch/sandbox/include/asm/common.h
similarity index 100%
rename from include/asm-sandbox/common.h
rename to arch/sandbox/include/asm/common.h
diff --git a/include/asm-sandbox/elf.h b/arch/sandbox/include/asm/elf.h
similarity index 100%
rename from include/asm-sandbox/elf.h
rename to arch/sandbox/include/asm/elf.h
diff --git a/include/asm-sandbox/global_data.h b/arch/sandbox/include/asm/global_data.h
similarity index 100%
rename from include/asm-sandbox/global_data.h
rename to arch/sandbox/include/asm/global_data.h
diff --git a/include/asm-sandbox/posix_types.h b/arch/sandbox/include/asm/posix_types.h
similarity index 100%
rename from include/asm-sandbox/posix_types.h
rename to arch/sandbox/include/asm/posix_types.h
diff --git a/include/asm-sandbox/processor.h b/arch/sandbox/include/asm/processor.h
similarity index 100%
rename from include/asm-sandbox/processor.h
rename to arch/sandbox/include/asm/processor.h
diff --git a/include/asm-sandbox/ptrace.h b/arch/sandbox/include/asm/ptrace.h
similarity index 100%
rename from include/asm-sandbox/ptrace.h
rename to arch/sandbox/include/asm/ptrace.h
diff --git a/include/asm-sandbox/string.h b/arch/sandbox/include/asm/string.h
similarity index 100%
rename from include/asm-sandbox/string.h
rename to arch/sandbox/include/asm/string.h
diff --git a/include/asm-sandbox/types.h b/arch/sandbox/include/asm/types.h
similarity index 100%
rename from include/asm-sandbox/types.h
rename to arch/sandbox/include/asm/types.h
diff --git a/include/asm-sandbox/u-boot.h b/arch/sandbox/include/asm/u-boot.h
similarity index 100%
rename from include/asm-sandbox/u-boot.h
rename to arch/sandbox/include/asm/u-boot.h