diff --git a/include/asm-ia64/Kbuild b/arch/ia64/include/asm/Kbuild
similarity index 100%
rename from include/asm-ia64/Kbuild
rename to arch/ia64/include/asm/Kbuild
diff --git a/include/asm-ia64/a.out.h b/arch/ia64/include/asm/a.out.h
similarity index 100%
rename from include/asm-ia64/a.out.h
rename to arch/ia64/include/asm/a.out.h
diff --git a/include/asm-ia64/acpi-ext.h b/arch/ia64/include/asm/acpi-ext.h
similarity index 100%
rename from include/asm-ia64/acpi-ext.h
rename to arch/ia64/include/asm/acpi-ext.h
diff --git a/include/asm-ia64/acpi.h b/arch/ia64/include/asm/acpi.h
similarity index 99%
rename from include/asm-ia64/acpi.h
rename to arch/ia64/include/asm/acpi.h
index fcfad32..0f82cc2 100644
--- a/include/asm-ia64/acpi.h
+++ b/arch/ia64/include/asm/acpi.h
@@ -1,6 +1,4 @@
 /*
- *  asm-ia64/acpi.h
- *
  *  Copyright (C) 1999 VA Linux Systems
  *  Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
  *  Copyright (C) 2000,2001 J.I. Lee <jung-ik.lee@intel.com>
diff --git a/include/asm-ia64/agp.h b/arch/ia64/include/asm/agp.h
similarity index 100%
rename from include/asm-ia64/agp.h
rename to arch/ia64/include/asm/agp.h
diff --git a/include/asm-ia64/asmmacro.h b/arch/ia64/include/asm/asmmacro.h
similarity index 100%
rename from include/asm-ia64/asmmacro.h
rename to arch/ia64/include/asm/asmmacro.h
diff --git a/include/asm-ia64/atomic.h b/arch/ia64/include/asm/atomic.h
similarity index 100%
rename from include/asm-ia64/atomic.h
rename to arch/ia64/include/asm/atomic.h
diff --git a/include/asm-ia64/auxvec.h b/arch/ia64/include/asm/auxvec.h
similarity index 100%
rename from include/asm-ia64/auxvec.h
rename to arch/ia64/include/asm/auxvec.h
diff --git a/include/asm-ia64/bitops.h b/arch/ia64/include/asm/bitops.h
similarity index 100%
rename from include/asm-ia64/bitops.h
rename to arch/ia64/include/asm/bitops.h
diff --git a/include/asm-ia64/break.h b/arch/ia64/include/asm/break.h
similarity index 100%
rename from include/asm-ia64/break.h
rename to arch/ia64/include/asm/break.h
diff --git a/include/asm-ia64/bug.h b/arch/ia64/include/asm/bug.h
similarity index 100%
rename from include/asm-ia64/bug.h
rename to arch/ia64/include/asm/bug.h
diff --git a/include/asm-ia64/bugs.h b/arch/ia64/include/asm/bugs.h
similarity index 100%
rename from include/asm-ia64/bugs.h
rename to arch/ia64/include/asm/bugs.h
diff --git a/include/asm-ia64/byteorder.h b/arch/ia64/include/asm/byteorder.h
similarity index 100%
rename from include/asm-ia64/byteorder.h
rename to arch/ia64/include/asm/byteorder.h
diff --git a/include/asm-ia64/cache.h b/arch/ia64/include/asm/cache.h
similarity index 100%
rename from include/asm-ia64/cache.h
rename to arch/ia64/include/asm/cache.h
diff --git a/include/asm-ia64/cacheflush.h b/arch/ia64/include/asm/cacheflush.h
similarity index 100%
rename from include/asm-ia64/cacheflush.h
rename to arch/ia64/include/asm/cacheflush.h
diff --git a/include/asm-ia64/checksum.h b/arch/ia64/include/asm/checksum.h
similarity index 100%
rename from include/asm-ia64/checksum.h
rename to arch/ia64/include/asm/checksum.h
diff --git a/include/asm-ia64/compat.h b/arch/ia64/include/asm/compat.h
similarity index 100%
rename from include/asm-ia64/compat.h
rename to arch/ia64/include/asm/compat.h
diff --git a/include/asm-ia64/cpu.h b/arch/ia64/include/asm/cpu.h
similarity index 100%
rename from include/asm-ia64/cpu.h
rename to arch/ia64/include/asm/cpu.h
diff --git a/include/asm-ia64/cputime.h b/arch/ia64/include/asm/cputime.h
similarity index 96%
rename from include/asm-ia64/cputime.h
rename to arch/ia64/include/asm/cputime.h
index f9abdec..d20b998 100644
--- a/include/asm-ia64/cputime.h
+++ b/arch/ia64/include/asm/cputime.h
@@ -1,6 +1,5 @@
 /*
- * include/asm-ia64/cputime.h:
- *		Definitions for measuring cputime on ia64 machines.
+ * Definitions for measuring cputime on ia64 machines.
  *
  * Based on <asm-powerpc/cputime.h>.
  *
diff --git a/include/asm-ia64/current.h b/arch/ia64/include/asm/current.h
similarity index 100%
rename from include/asm-ia64/current.h
rename to arch/ia64/include/asm/current.h
diff --git a/include/asm-ia64/cyclone.h b/arch/ia64/include/asm/cyclone.h
similarity index 100%
rename from include/asm-ia64/cyclone.h
rename to arch/ia64/include/asm/cyclone.h
diff --git a/include/asm-ia64/delay.h b/arch/ia64/include/asm/delay.h
similarity index 100%
rename from include/asm-ia64/delay.h
rename to arch/ia64/include/asm/delay.h
diff --git a/include/asm-ia64/device.h b/arch/ia64/include/asm/device.h
similarity index 100%
rename from include/asm-ia64/device.h
rename to arch/ia64/include/asm/device.h
diff --git a/include/asm-ia64/div64.h b/arch/ia64/include/asm/div64.h
similarity index 100%
rename from include/asm-ia64/div64.h
rename to arch/ia64/include/asm/div64.h
diff --git a/include/asm-ia64/dma-mapping.h b/arch/ia64/include/asm/dma-mapping.h
similarity index 100%
rename from include/asm-ia64/dma-mapping.h
rename to arch/ia64/include/asm/dma-mapping.h
diff --git a/include/asm-ia64/dma.h b/arch/ia64/include/asm/dma.h
similarity index 100%
rename from include/asm-ia64/dma.h
rename to arch/ia64/include/asm/dma.h
diff --git a/include/asm-ia64/dmi.h b/arch/ia64/include/asm/dmi.h
similarity index 100%
rename from include/asm-ia64/dmi.h
rename to arch/ia64/include/asm/dmi.h
diff --git a/include/asm-ia64/elf.h b/arch/ia64/include/asm/elf.h
similarity index 100%
rename from include/asm-ia64/elf.h
rename to arch/ia64/include/asm/elf.h
diff --git a/include/asm-ia64/emergency-restart.h b/arch/ia64/include/asm/emergency-restart.h
similarity index 100%
rename from include/asm-ia64/emergency-restart.h
rename to arch/ia64/include/asm/emergency-restart.h
diff --git a/include/asm-ia64/errno.h b/arch/ia64/include/asm/errno.h
similarity index 100%
rename from include/asm-ia64/errno.h
rename to arch/ia64/include/asm/errno.h
diff --git a/include/asm-ia64/esi.h b/arch/ia64/include/asm/esi.h
similarity index 100%
rename from include/asm-ia64/esi.h
rename to arch/ia64/include/asm/esi.h
diff --git a/include/asm-ia64/fb.h b/arch/ia64/include/asm/fb.h
similarity index 100%
rename from include/asm-ia64/fb.h
rename to arch/ia64/include/asm/fb.h
diff --git a/include/asm-ia64/fcntl.h b/arch/ia64/include/asm/fcntl.h
similarity index 100%
rename from include/asm-ia64/fcntl.h
rename to arch/ia64/include/asm/fcntl.h
diff --git a/include/asm-ia64/fpswa.h b/arch/ia64/include/asm/fpswa.h
similarity index 100%
rename from include/asm-ia64/fpswa.h
rename to arch/ia64/include/asm/fpswa.h
diff --git a/include/asm-ia64/fpu.h b/arch/ia64/include/asm/fpu.h
similarity index 100%
rename from include/asm-ia64/fpu.h
rename to arch/ia64/include/asm/fpu.h
diff --git a/include/asm-ia64/futex.h b/arch/ia64/include/asm/futex.h
similarity index 100%
rename from include/asm-ia64/futex.h
rename to arch/ia64/include/asm/futex.h
diff --git a/include/asm-ia64/gcc_intrin.h b/arch/ia64/include/asm/gcc_intrin.h
similarity index 100%
rename from include/asm-ia64/gcc_intrin.h
rename to arch/ia64/include/asm/gcc_intrin.h
diff --git a/include/asm-ia64/hardirq.h b/arch/ia64/include/asm/hardirq.h
similarity index 100%
rename from include/asm-ia64/hardirq.h
rename to arch/ia64/include/asm/hardirq.h
diff --git a/include/asm-ia64/hpsim.h b/arch/ia64/include/asm/hpsim.h
similarity index 100%
rename from include/asm-ia64/hpsim.h
rename to arch/ia64/include/asm/hpsim.h
diff --git a/include/asm-ia64/hugetlb.h b/arch/ia64/include/asm/hugetlb.h
similarity index 100%
rename from include/asm-ia64/hugetlb.h
rename to arch/ia64/include/asm/hugetlb.h
diff --git a/include/asm-ia64/hw_irq.h b/arch/ia64/include/asm/hw_irq.h
similarity index 100%
rename from include/asm-ia64/hw_irq.h
rename to arch/ia64/include/asm/hw_irq.h
diff --git a/include/asm-ia64/ia32.h b/arch/ia64/include/asm/ia32.h
similarity index 100%
rename from include/asm-ia64/ia32.h
rename to arch/ia64/include/asm/ia32.h
diff --git a/include/asm-ia64/ia64regs.h b/arch/ia64/include/asm/ia64regs.h
similarity index 100%
rename from include/asm-ia64/ia64regs.h
rename to arch/ia64/include/asm/ia64regs.h
diff --git a/include/asm-ia64/intel_intrin.h b/arch/ia64/include/asm/intel_intrin.h
similarity index 100%
rename from include/asm-ia64/intel_intrin.h
rename to arch/ia64/include/asm/intel_intrin.h
diff --git a/include/asm-ia64/intrinsics.h b/arch/ia64/include/asm/intrinsics.h
similarity index 100%
rename from include/asm-ia64/intrinsics.h
rename to arch/ia64/include/asm/intrinsics.h
diff --git a/include/asm-ia64/io.h b/arch/ia64/include/asm/io.h
similarity index 100%
rename from include/asm-ia64/io.h
rename to arch/ia64/include/asm/io.h
diff --git a/include/asm-ia64/ioctl.h b/arch/ia64/include/asm/ioctl.h
similarity index 100%
rename from include/asm-ia64/ioctl.h
rename to arch/ia64/include/asm/ioctl.h
diff --git a/include/asm-ia64/ioctls.h b/arch/ia64/include/asm/ioctls.h
similarity index 100%
rename from include/asm-ia64/ioctls.h
rename to arch/ia64/include/asm/ioctls.h
diff --git a/include/asm-ia64/iosapic.h b/arch/ia64/include/asm/iosapic.h
similarity index 100%
rename from include/asm-ia64/iosapic.h
rename to arch/ia64/include/asm/iosapic.h
diff --git a/include/asm-ia64/ipcbuf.h b/arch/ia64/include/asm/ipcbuf.h
similarity index 100%
rename from include/asm-ia64/ipcbuf.h
rename to arch/ia64/include/asm/ipcbuf.h
diff --git a/include/asm-ia64/irq.h b/arch/ia64/include/asm/irq.h
similarity index 100%
rename from include/asm-ia64/irq.h
rename to arch/ia64/include/asm/irq.h
diff --git a/include/asm-ia64/irq_regs.h b/arch/ia64/include/asm/irq_regs.h
similarity index 100%
rename from include/asm-ia64/irq_regs.h
rename to arch/ia64/include/asm/irq_regs.h
diff --git a/include/asm-ia64/kdebug.h b/arch/ia64/include/asm/kdebug.h
similarity index 97%
rename from include/asm-ia64/kdebug.h
rename to arch/ia64/include/asm/kdebug.h
index 35e4940..d11a6985 100644
--- a/include/asm-ia64/kdebug.h
+++ b/arch/ia64/include/asm/kdebug.h
@@ -1,8 +1,6 @@
 #ifndef _IA64_KDEBUG_H
 #define _IA64_KDEBUG_H 1
 /*
- * include/asm-ia64/kdebug.h
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
diff --git a/include/asm-ia64/kexec.h b/arch/ia64/include/asm/kexec.h
similarity index 100%
rename from include/asm-ia64/kexec.h
rename to arch/ia64/include/asm/kexec.h
diff --git a/include/asm-ia64/kmap_types.h b/arch/ia64/include/asm/kmap_types.h
similarity index 100%
rename from include/asm-ia64/kmap_types.h
rename to arch/ia64/include/asm/kmap_types.h
diff --git a/include/asm-ia64/kprobes.h b/arch/ia64/include/asm/kprobes.h
similarity index 98%
rename from include/asm-ia64/kprobes.h
rename to arch/ia64/include/asm/kprobes.h
index ef71b57..dbf83fb 100644
--- a/include/asm-ia64/kprobes.h
+++ b/arch/ia64/include/asm/kprobes.h
@@ -2,7 +2,6 @@
 #define _ASM_KPROBES_H
 /*
  *  Kernel Probes (KProbes)
- *  include/asm-ia64/kprobes.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/include/asm-ia64/kregs.h b/arch/ia64/include/asm/kregs.h
similarity index 100%
rename from include/asm-ia64/kregs.h
rename to arch/ia64/include/asm/kregs.h
diff --git a/include/asm-ia64/kvm.h b/arch/ia64/include/asm/kvm.h
similarity index 98%
rename from include/asm-ia64/kvm.h
rename to arch/ia64/include/asm/kvm.h
index 3f6a090..f38472a 100644
--- a/include/asm-ia64/kvm.h
+++ b/arch/ia64/include/asm/kvm.h
@@ -2,7 +2,7 @@
 #define __ASM_IA64_KVM_H
 
 /*
- * asm-ia64/kvm.h: kvm structure definitions  for ia64
+ * kvm structure definitions  for ia64
  *
  * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
  *
diff --git a/include/asm-ia64/kvm_host.h b/arch/ia64/include/asm/kvm_host.h
similarity index 100%
rename from include/asm-ia64/kvm_host.h
rename to arch/ia64/include/asm/kvm_host.h
diff --git a/include/asm-ia64/kvm_para.h b/arch/ia64/include/asm/kvm_para.h
similarity index 96%
rename from include/asm-ia64/kvm_para.h
rename to arch/ia64/include/asm/kvm_para.h
index 9f9796bb..0d6d8ca 100644
--- a/include/asm-ia64/kvm_para.h
+++ b/arch/ia64/include/asm/kvm_para.h
@@ -2,8 +2,6 @@
 #define __IA64_KVM_PARA_H
 
 /*
- * asm-ia64/kvm_para.h
- *
  * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
  *
  * This program is free software; you can redistribute it and/or modify it
diff --git a/include/asm-ia64/libata-portmap.h b/arch/ia64/include/asm/libata-portmap.h
similarity index 100%
rename from include/asm-ia64/libata-portmap.h
rename to arch/ia64/include/asm/libata-portmap.h
diff --git a/include/asm-ia64/linkage.h b/arch/ia64/include/asm/linkage.h
similarity index 100%
rename from include/asm-ia64/linkage.h
rename to arch/ia64/include/asm/linkage.h
diff --git a/include/asm-ia64/local.h b/arch/ia64/include/asm/local.h
similarity index 100%
rename from include/asm-ia64/local.h
rename to arch/ia64/include/asm/local.h
diff --git a/include/asm-ia64/machvec.h b/arch/ia64/include/asm/machvec.h
similarity index 99%
rename from include/asm-ia64/machvec.h
rename to arch/ia64/include/asm/machvec.h
index a6d50c7..2b850cc 100644
--- a/include/asm-ia64/machvec.h
+++ b/arch/ia64/include/asm/machvec.h
@@ -290,7 +290,7 @@
 extern void machvec_init_from_cmdline(const char *cmdline);
 
 # else
-#  error Unknown configuration.  Update asm-ia64/machvec.h.
+#  error Unknown configuration.  Update arch/ia64/include/asm/machvec.h.
 # endif /* CONFIG_IA64_GENERIC */
 
 /*
diff --git a/include/asm-ia64/machvec_dig.h b/arch/ia64/include/asm/machvec_dig.h
similarity index 100%
rename from include/asm-ia64/machvec_dig.h
rename to arch/ia64/include/asm/machvec_dig.h
diff --git a/include/asm-ia64/machvec_hpsim.h b/arch/ia64/include/asm/machvec_hpsim.h
similarity index 100%
rename from include/asm-ia64/machvec_hpsim.h
rename to arch/ia64/include/asm/machvec_hpsim.h
diff --git a/include/asm-ia64/machvec_hpzx1.h b/arch/ia64/include/asm/machvec_hpzx1.h
similarity index 100%
rename from include/asm-ia64/machvec_hpzx1.h
rename to arch/ia64/include/asm/machvec_hpzx1.h
diff --git a/include/asm-ia64/machvec_hpzx1_swiotlb.h b/arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
similarity index 100%
rename from include/asm-ia64/machvec_hpzx1_swiotlb.h
rename to arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
diff --git a/include/asm-ia64/machvec_init.h b/arch/ia64/include/asm/machvec_init.h
similarity index 100%
rename from include/asm-ia64/machvec_init.h
rename to arch/ia64/include/asm/machvec_init.h
diff --git a/include/asm-ia64/machvec_sn2.h b/arch/ia64/include/asm/machvec_sn2.h
similarity index 100%
rename from include/asm-ia64/machvec_sn2.h
rename to arch/ia64/include/asm/machvec_sn2.h
diff --git a/include/asm-ia64/machvec_uv.h b/arch/ia64/include/asm/machvec_uv.h
similarity index 100%
rename from include/asm-ia64/machvec_uv.h
rename to arch/ia64/include/asm/machvec_uv.h
diff --git a/include/asm-ia64/mc146818rtc.h b/arch/ia64/include/asm/mc146818rtc.h
similarity index 100%
rename from include/asm-ia64/mc146818rtc.h
rename to arch/ia64/include/asm/mc146818rtc.h
diff --git a/include/asm-ia64/mca.h b/arch/ia64/include/asm/mca.h
similarity index 100%
rename from include/asm-ia64/mca.h
rename to arch/ia64/include/asm/mca.h
diff --git a/include/asm-ia64/mca_asm.h b/arch/ia64/include/asm/mca_asm.h
similarity index 100%
rename from include/asm-ia64/mca_asm.h
rename to arch/ia64/include/asm/mca_asm.h
diff --git a/include/asm-ia64/meminit.h b/arch/ia64/include/asm/meminit.h
similarity index 100%
rename from include/asm-ia64/meminit.h
rename to arch/ia64/include/asm/meminit.h
diff --git a/include/asm-ia64/mman.h b/arch/ia64/include/asm/mman.h
similarity index 100%
rename from include/asm-ia64/mman.h
rename to arch/ia64/include/asm/mman.h
diff --git a/include/asm-ia64/mmu.h b/arch/ia64/include/asm/mmu.h
similarity index 100%
rename from include/asm-ia64/mmu.h
rename to arch/ia64/include/asm/mmu.h
diff --git a/include/asm-ia64/mmu_context.h b/arch/ia64/include/asm/mmu_context.h
similarity index 100%
rename from include/asm-ia64/mmu_context.h
rename to arch/ia64/include/asm/mmu_context.h
diff --git a/include/asm-ia64/mmzone.h b/arch/ia64/include/asm/mmzone.h
similarity index 100%
rename from include/asm-ia64/mmzone.h
rename to arch/ia64/include/asm/mmzone.h
diff --git a/include/asm-ia64/module.h b/arch/ia64/include/asm/module.h
similarity index 100%
rename from include/asm-ia64/module.h
rename to arch/ia64/include/asm/module.h
diff --git a/include/asm-ia64/msgbuf.h b/arch/ia64/include/asm/msgbuf.h
similarity index 100%
rename from include/asm-ia64/msgbuf.h
rename to arch/ia64/include/asm/msgbuf.h
diff --git a/include/asm-ia64/mutex.h b/arch/ia64/include/asm/mutex.h
similarity index 100%
rename from include/asm-ia64/mutex.h
rename to arch/ia64/include/asm/mutex.h
diff --git a/include/asm-ia64/native/inst.h b/arch/ia64/include/asm/native/inst.h
similarity index 98%
rename from include/asm-ia64/native/inst.h
rename to arch/ia64/include/asm/native/inst.h
index c953a2c..c8efbf7 100644
--- a/include/asm-ia64/native/inst.h
+++ b/arch/ia64/include/asm/native/inst.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * include/asm-ia64/native/inst.h
+ * arch/ia64/include/asm/native/inst.h
  *
  * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
  *                    VA Linux Systems Japan K.K.
diff --git a/include/asm-ia64/native/irq.h b/arch/ia64/include/asm/native/irq.h
similarity index 93%
rename from include/asm-ia64/native/irq.h
rename to arch/ia64/include/asm/native/irq.h
index efe9ff7..887a228 100644
--- a/include/asm-ia64/native/irq.h
+++ b/arch/ia64/include/asm/native/irq.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- * include/asm-ia64/native/irq.h
+ * arch/ia64/include/asm/native/irq.h
  *
  * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
  *                    VA Linux Systems Japan K.K.
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * moved from linux/include/asm-ia64/irq.h.
  */
 
 #ifndef _ASM_IA64_NATIVE_IRQ_H
diff --git a/include/asm-ia64/nodedata.h b/arch/ia64/include/asm/nodedata.h
similarity index 100%
rename from include/asm-ia64/nodedata.h
rename to arch/ia64/include/asm/nodedata.h
diff --git a/include/asm-ia64/numa.h b/arch/ia64/include/asm/numa.h
similarity index 100%
rename from include/asm-ia64/numa.h
rename to arch/ia64/include/asm/numa.h
diff --git a/include/asm-ia64/page.h b/arch/ia64/include/asm/page.h
similarity index 100%
rename from include/asm-ia64/page.h
rename to arch/ia64/include/asm/page.h
diff --git a/include/asm-ia64/pal.h b/arch/ia64/include/asm/pal.h
similarity index 100%
rename from include/asm-ia64/pal.h
rename to arch/ia64/include/asm/pal.h
diff --git a/include/asm-ia64/param.h b/arch/ia64/include/asm/param.h
similarity index 100%
rename from include/asm-ia64/param.h
rename to arch/ia64/include/asm/param.h
diff --git a/include/asm-ia64/paravirt.h b/arch/ia64/include/asm/paravirt.h
similarity index 98%
rename from include/asm-ia64/paravirt.h
rename to arch/ia64/include/asm/paravirt.h
index 1b4df12..660cab0 100644
--- a/include/asm-ia64/paravirt.h
+++ b/arch/ia64/include/asm/paravirt.h
@@ -1,6 +1,4 @@
 /******************************************************************************
- * include/asm-ia64/paravirt.h
- *
  * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
  *                    VA Linux Systems Japan K.K.
  *
diff --git a/include/asm-ia64/paravirt_privop.h b/arch/ia64/include/asm/paravirt_privop.h
similarity index 98%
rename from include/asm-ia64/paravirt_privop.h
rename to arch/ia64/include/asm/paravirt_privop.h
index 52482e6..d577aac 100644
--- a/include/asm-ia64/paravirt_privop.h
+++ b/arch/ia64/include/asm/paravirt_privop.h
@@ -1,6 +1,4 @@
 /******************************************************************************
- * include/asm-ia64/paravirt_privops.h
- *
  * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
  *                    VA Linux Systems Japan K.K.
  *
diff --git a/include/asm-ia64/parport.h b/arch/ia64/include/asm/parport.h
similarity index 100%
rename from include/asm-ia64/parport.h
rename to arch/ia64/include/asm/parport.h
diff --git a/include/asm-ia64/patch.h b/arch/ia64/include/asm/patch.h
similarity index 100%
rename from include/asm-ia64/patch.h
rename to arch/ia64/include/asm/patch.h
diff --git a/include/asm-ia64/pci.h b/arch/ia64/include/asm/pci.h
similarity index 100%
rename from include/asm-ia64/pci.h
rename to arch/ia64/include/asm/pci.h
diff --git a/include/asm-ia64/percpu.h b/arch/ia64/include/asm/percpu.h
similarity index 100%
rename from include/asm-ia64/percpu.h
rename to arch/ia64/include/asm/percpu.h
diff --git a/include/asm-ia64/perfmon.h b/arch/ia64/include/asm/perfmon.h
similarity index 100%
rename from include/asm-ia64/perfmon.h
rename to arch/ia64/include/asm/perfmon.h
diff --git a/include/asm-ia64/perfmon_default_smpl.h b/arch/ia64/include/asm/perfmon_default_smpl.h
similarity index 100%
rename from include/asm-ia64/perfmon_default_smpl.h
rename to arch/ia64/include/asm/perfmon_default_smpl.h
diff --git a/include/asm-ia64/pgalloc.h b/arch/ia64/include/asm/pgalloc.h
similarity index 100%
rename from include/asm-ia64/pgalloc.h
rename to arch/ia64/include/asm/pgalloc.h
diff --git a/include/asm-ia64/pgtable.h b/arch/ia64/include/asm/pgtable.h
similarity index 100%
rename from include/asm-ia64/pgtable.h
rename to arch/ia64/include/asm/pgtable.h
diff --git a/include/asm-ia64/poll.h b/arch/ia64/include/asm/poll.h
similarity index 100%
rename from include/asm-ia64/poll.h
rename to arch/ia64/include/asm/poll.h
diff --git a/include/asm-ia64/posix_types.h b/arch/ia64/include/asm/posix_types.h
similarity index 100%
rename from include/asm-ia64/posix_types.h
rename to arch/ia64/include/asm/posix_types.h
diff --git a/include/asm-ia64/processor.h b/arch/ia64/include/asm/processor.h
similarity index 100%
rename from include/asm-ia64/processor.h
rename to arch/ia64/include/asm/processor.h
diff --git a/include/asm-ia64/ptrace.h b/arch/ia64/include/asm/ptrace.h
similarity index 100%
rename from include/asm-ia64/ptrace.h
rename to arch/ia64/include/asm/ptrace.h
diff --git a/include/asm-ia64/ptrace_offsets.h b/arch/ia64/include/asm/ptrace_offsets.h
similarity index 100%
rename from include/asm-ia64/ptrace_offsets.h
rename to arch/ia64/include/asm/ptrace_offsets.h
diff --git a/include/asm-ia64/resource.h b/arch/ia64/include/asm/resource.h
similarity index 100%
rename from include/asm-ia64/resource.h
rename to arch/ia64/include/asm/resource.h
diff --git a/include/asm-ia64/rse.h b/arch/ia64/include/asm/rse.h
similarity index 100%
rename from include/asm-ia64/rse.h
rename to arch/ia64/include/asm/rse.h
diff --git a/include/asm-ia64/rwsem.h b/arch/ia64/include/asm/rwsem.h
similarity index 98%
rename from include/asm-ia64/rwsem.h
rename to arch/ia64/include/asm/rwsem.h
index 8aba06a..fbee74b 100644
--- a/include/asm-ia64/rwsem.h
+++ b/arch/ia64/include/asm/rwsem.h
@@ -1,5 +1,5 @@
 /*
- * asm-ia64/rwsem.h: R/W semaphores for ia64
+ * R/W semaphores for ia64
  *
  * Copyright (C) 2003 Ken Chen <kenneth.w.chen@intel.com>
  * Copyright (C) 2003 Asit Mallick <asit.k.mallick@intel.com>
diff --git a/include/asm-ia64/sal.h b/arch/ia64/include/asm/sal.h
similarity index 100%
rename from include/asm-ia64/sal.h
rename to arch/ia64/include/asm/sal.h
diff --git a/include/asm-ia64/scatterlist.h b/arch/ia64/include/asm/scatterlist.h
similarity index 100%
rename from include/asm-ia64/scatterlist.h
rename to arch/ia64/include/asm/scatterlist.h
diff --git a/include/asm-ia64/sections.h b/arch/ia64/include/asm/sections.h
similarity index 100%
rename from include/asm-ia64/sections.h
rename to arch/ia64/include/asm/sections.h
diff --git a/include/asm-ia64/segment.h b/arch/ia64/include/asm/segment.h
similarity index 100%
rename from include/asm-ia64/segment.h
rename to arch/ia64/include/asm/segment.h
diff --git a/include/asm-ia64/sembuf.h b/arch/ia64/include/asm/sembuf.h
similarity index 100%
rename from include/asm-ia64/sembuf.h
rename to arch/ia64/include/asm/sembuf.h
diff --git a/include/asm-ia64/serial.h b/arch/ia64/include/asm/serial.h
similarity index 92%
rename from include/asm-ia64/serial.h
rename to arch/ia64/include/asm/serial.h
index 0c7a2f3..068be11 100644
--- a/include/asm-ia64/serial.h
+++ b/arch/ia64/include/asm/serial.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-ia64/serial.h
- *
  * Derived from the i386 version.
  */
 
diff --git a/include/asm-ia64/setup.h b/arch/ia64/include/asm/setup.h
similarity index 100%
rename from include/asm-ia64/setup.h
rename to arch/ia64/include/asm/setup.h
diff --git a/include/asm-ia64/shmbuf.h b/arch/ia64/include/asm/shmbuf.h
similarity index 100%
rename from include/asm-ia64/shmbuf.h
rename to arch/ia64/include/asm/shmbuf.h
diff --git a/include/asm-ia64/shmparam.h b/arch/ia64/include/asm/shmparam.h
similarity index 100%
rename from include/asm-ia64/shmparam.h
rename to arch/ia64/include/asm/shmparam.h
diff --git a/include/asm-ia64/sigcontext.h b/arch/ia64/include/asm/sigcontext.h
similarity index 100%
rename from include/asm-ia64/sigcontext.h
rename to arch/ia64/include/asm/sigcontext.h
diff --git a/include/asm-ia64/siginfo.h b/arch/ia64/include/asm/siginfo.h
similarity index 100%
rename from include/asm-ia64/siginfo.h
rename to arch/ia64/include/asm/siginfo.h
diff --git a/include/asm-ia64/signal.h b/arch/ia64/include/asm/signal.h
similarity index 100%
rename from include/asm-ia64/signal.h
rename to arch/ia64/include/asm/signal.h
diff --git a/include/asm-ia64/smp.h b/arch/ia64/include/asm/smp.h
similarity index 100%
rename from include/asm-ia64/smp.h
rename to arch/ia64/include/asm/smp.h
diff --git a/include/asm-ia64/sn/acpi.h b/arch/ia64/include/asm/sn/acpi.h
similarity index 100%
rename from include/asm-ia64/sn/acpi.h
rename to arch/ia64/include/asm/sn/acpi.h
diff --git a/include/asm-ia64/sn/addrs.h b/arch/ia64/include/asm/sn/addrs.h
similarity index 100%
rename from include/asm-ia64/sn/addrs.h
rename to arch/ia64/include/asm/sn/addrs.h
diff --git a/include/asm-ia64/sn/arch.h b/arch/ia64/include/asm/sn/arch.h
similarity index 100%
rename from include/asm-ia64/sn/arch.h
rename to arch/ia64/include/asm/sn/arch.h
diff --git a/include/asm-ia64/sn/bte.h b/arch/ia64/include/asm/sn/bte.h
similarity index 100%
rename from include/asm-ia64/sn/bte.h
rename to arch/ia64/include/asm/sn/bte.h
diff --git a/include/asm-ia64/sn/clksupport.h b/arch/ia64/include/asm/sn/clksupport.h
similarity index 100%
rename from include/asm-ia64/sn/clksupport.h
rename to arch/ia64/include/asm/sn/clksupport.h
diff --git a/include/asm-ia64/sn/geo.h b/arch/ia64/include/asm/sn/geo.h
similarity index 100%
rename from include/asm-ia64/sn/geo.h
rename to arch/ia64/include/asm/sn/geo.h
diff --git a/include/asm-ia64/sn/intr.h b/arch/ia64/include/asm/sn/intr.h
similarity index 100%
rename from include/asm-ia64/sn/intr.h
rename to arch/ia64/include/asm/sn/intr.h
diff --git a/include/asm-ia64/sn/io.h b/arch/ia64/include/asm/sn/io.h
similarity index 100%
rename from include/asm-ia64/sn/io.h
rename to arch/ia64/include/asm/sn/io.h
diff --git a/include/asm-ia64/sn/ioc3.h b/arch/ia64/include/asm/sn/ioc3.h
similarity index 100%
rename from include/asm-ia64/sn/ioc3.h
rename to arch/ia64/include/asm/sn/ioc3.h
diff --git a/include/asm-ia64/sn/klconfig.h b/arch/ia64/include/asm/sn/klconfig.h
similarity index 100%
rename from include/asm-ia64/sn/klconfig.h
rename to arch/ia64/include/asm/sn/klconfig.h
diff --git a/include/asm-ia64/sn/l1.h b/arch/ia64/include/asm/sn/l1.h
similarity index 100%
rename from include/asm-ia64/sn/l1.h
rename to arch/ia64/include/asm/sn/l1.h
diff --git a/include/asm-ia64/sn/leds.h b/arch/ia64/include/asm/sn/leds.h
similarity index 100%
rename from include/asm-ia64/sn/leds.h
rename to arch/ia64/include/asm/sn/leds.h
diff --git a/include/asm-ia64/sn/module.h b/arch/ia64/include/asm/sn/module.h
similarity index 100%
rename from include/asm-ia64/sn/module.h
rename to arch/ia64/include/asm/sn/module.h
diff --git a/include/asm-ia64/sn/mspec.h b/arch/ia64/include/asm/sn/mspec.h
similarity index 100%
rename from include/asm-ia64/sn/mspec.h
rename to arch/ia64/include/asm/sn/mspec.h
diff --git a/include/asm-ia64/sn/nodepda.h b/arch/ia64/include/asm/sn/nodepda.h
similarity index 100%
rename from include/asm-ia64/sn/nodepda.h
rename to arch/ia64/include/asm/sn/nodepda.h
diff --git a/include/asm-ia64/sn/pcibr_provider.h b/arch/ia64/include/asm/sn/pcibr_provider.h
similarity index 100%
rename from include/asm-ia64/sn/pcibr_provider.h
rename to arch/ia64/include/asm/sn/pcibr_provider.h
diff --git a/include/asm-ia64/sn/pcibus_provider_defs.h b/arch/ia64/include/asm/sn/pcibus_provider_defs.h
similarity index 100%
rename from include/asm-ia64/sn/pcibus_provider_defs.h
rename to arch/ia64/include/asm/sn/pcibus_provider_defs.h
diff --git a/include/asm-ia64/sn/pcidev.h b/arch/ia64/include/asm/sn/pcidev.h
similarity index 100%
rename from include/asm-ia64/sn/pcidev.h
rename to arch/ia64/include/asm/sn/pcidev.h
diff --git a/include/asm-ia64/sn/pda.h b/arch/ia64/include/asm/sn/pda.h
similarity index 100%
rename from include/asm-ia64/sn/pda.h
rename to arch/ia64/include/asm/sn/pda.h
diff --git a/include/asm-ia64/sn/pic.h b/arch/ia64/include/asm/sn/pic.h
similarity index 100%
rename from include/asm-ia64/sn/pic.h
rename to arch/ia64/include/asm/sn/pic.h
diff --git a/include/asm-ia64/sn/rw_mmr.h b/arch/ia64/include/asm/sn/rw_mmr.h
similarity index 100%
rename from include/asm-ia64/sn/rw_mmr.h
rename to arch/ia64/include/asm/sn/rw_mmr.h
diff --git a/include/asm-ia64/sn/shub_mmr.h b/arch/ia64/include/asm/sn/shub_mmr.h
similarity index 100%
rename from include/asm-ia64/sn/shub_mmr.h
rename to arch/ia64/include/asm/sn/shub_mmr.h
diff --git a/include/asm-ia64/sn/shubio.h b/arch/ia64/include/asm/sn/shubio.h
similarity index 100%
rename from include/asm-ia64/sn/shubio.h
rename to arch/ia64/include/asm/sn/shubio.h
diff --git a/include/asm-ia64/sn/simulator.h b/arch/ia64/include/asm/sn/simulator.h
similarity index 100%
rename from include/asm-ia64/sn/simulator.h
rename to arch/ia64/include/asm/sn/simulator.h
diff --git a/include/asm-ia64/sn/sn2/sn_hwperf.h b/arch/ia64/include/asm/sn/sn2/sn_hwperf.h
similarity index 100%
rename from include/asm-ia64/sn/sn2/sn_hwperf.h
rename to arch/ia64/include/asm/sn/sn2/sn_hwperf.h
diff --git a/include/asm-ia64/sn/sn_cpuid.h b/arch/ia64/include/asm/sn/sn_cpuid.h
similarity index 100%
rename from include/asm-ia64/sn/sn_cpuid.h
rename to arch/ia64/include/asm/sn/sn_cpuid.h
diff --git a/include/asm-ia64/sn/sn_feature_sets.h b/arch/ia64/include/asm/sn/sn_feature_sets.h
similarity index 100%
rename from include/asm-ia64/sn/sn_feature_sets.h
rename to arch/ia64/include/asm/sn/sn_feature_sets.h
diff --git a/include/asm-ia64/sn/sn_sal.h b/arch/ia64/include/asm/sn/sn_sal.h
similarity index 99%
rename from include/asm-ia64/sn/sn_sal.h
rename to arch/ia64/include/asm/sn/sn_sal.h
index 676b31a..57e649d 100644
--- a/include/asm-ia64/sn/sn_sal.h
+++ b/arch/ia64/include/asm/sn/sn_sal.h
@@ -1094,7 +1094,7 @@
 /*
  * This is the access point to the Altix PROM hardware performance
  * and status monitoring interface. For info on using this, see
- * include/asm-ia64/sn/sn2/sn_hwperf.h
+ * arch/ia64/include/asm/sn/sn2/sn_hwperf.h
  */
 static inline int
 ia64_sn_hwperf_op(nasid_t nasid, u64 opcode, u64 a0, u64 a1, u64 a2,
diff --git a/include/asm-ia64/sn/tioca.h b/arch/ia64/include/asm/sn/tioca.h
similarity index 100%
rename from include/asm-ia64/sn/tioca.h
rename to arch/ia64/include/asm/sn/tioca.h
diff --git a/include/asm-ia64/sn/tioca_provider.h b/arch/ia64/include/asm/sn/tioca_provider.h
similarity index 100%
rename from include/asm-ia64/sn/tioca_provider.h
rename to arch/ia64/include/asm/sn/tioca_provider.h
diff --git a/include/asm-ia64/sn/tioce.h b/arch/ia64/include/asm/sn/tioce.h
similarity index 100%
rename from include/asm-ia64/sn/tioce.h
rename to arch/ia64/include/asm/sn/tioce.h
diff --git a/include/asm-ia64/sn/tioce_provider.h b/arch/ia64/include/asm/sn/tioce_provider.h
similarity index 100%
rename from include/asm-ia64/sn/tioce_provider.h
rename to arch/ia64/include/asm/sn/tioce_provider.h
diff --git a/include/asm-ia64/sn/tiocp.h b/arch/ia64/include/asm/sn/tiocp.h
similarity index 100%
rename from include/asm-ia64/sn/tiocp.h
rename to arch/ia64/include/asm/sn/tiocp.h
diff --git a/include/asm-ia64/sn/tiocx.h b/arch/ia64/include/asm/sn/tiocx.h
similarity index 100%
rename from include/asm-ia64/sn/tiocx.h
rename to arch/ia64/include/asm/sn/tiocx.h
diff --git a/include/asm-ia64/sn/types.h b/arch/ia64/include/asm/sn/types.h
similarity index 100%
rename from include/asm-ia64/sn/types.h
rename to arch/ia64/include/asm/sn/types.h
diff --git a/include/asm-ia64/socket.h b/arch/ia64/include/asm/socket.h
similarity index 100%
rename from include/asm-ia64/socket.h
rename to arch/ia64/include/asm/socket.h
diff --git a/include/asm-ia64/sockios.h b/arch/ia64/include/asm/sockios.h
similarity index 100%
rename from include/asm-ia64/sockios.h
rename to arch/ia64/include/asm/sockios.h
diff --git a/include/asm-ia64/sparsemem.h b/arch/ia64/include/asm/sparsemem.h
similarity index 100%
rename from include/asm-ia64/sparsemem.h
rename to arch/ia64/include/asm/sparsemem.h
diff --git a/include/asm-ia64/spinlock.h b/arch/ia64/include/asm/spinlock.h
similarity index 100%
rename from include/asm-ia64/spinlock.h
rename to arch/ia64/include/asm/spinlock.h
diff --git a/include/asm-ia64/spinlock_types.h b/arch/ia64/include/asm/spinlock_types.h
similarity index 100%
rename from include/asm-ia64/spinlock_types.h
rename to arch/ia64/include/asm/spinlock_types.h
diff --git a/include/asm-ia64/stat.h b/arch/ia64/include/asm/stat.h
similarity index 100%
rename from include/asm-ia64/stat.h
rename to arch/ia64/include/asm/stat.h
diff --git a/include/asm-ia64/statfs.h b/arch/ia64/include/asm/statfs.h
similarity index 100%
rename from include/asm-ia64/statfs.h
rename to arch/ia64/include/asm/statfs.h
diff --git a/include/asm-ia64/string.h b/arch/ia64/include/asm/string.h
similarity index 100%
rename from include/asm-ia64/string.h
rename to arch/ia64/include/asm/string.h
diff --git a/include/asm-ia64/suspend.h b/arch/ia64/include/asm/suspend.h
similarity index 100%
rename from include/asm-ia64/suspend.h
rename to arch/ia64/include/asm/suspend.h
diff --git a/include/asm-ia64/system.h b/arch/ia64/include/asm/system.h
similarity index 100%
rename from include/asm-ia64/system.h
rename to arch/ia64/include/asm/system.h
diff --git a/include/asm-ia64/termbits.h b/arch/ia64/include/asm/termbits.h
similarity index 100%
rename from include/asm-ia64/termbits.h
rename to arch/ia64/include/asm/termbits.h
diff --git a/include/asm-ia64/termios.h b/arch/ia64/include/asm/termios.h
similarity index 100%
rename from include/asm-ia64/termios.h
rename to arch/ia64/include/asm/termios.h
diff --git a/include/asm-ia64/thread_info.h b/arch/ia64/include/asm/thread_info.h
similarity index 100%
rename from include/asm-ia64/thread_info.h
rename to arch/ia64/include/asm/thread_info.h
diff --git a/include/asm-ia64/timex.h b/arch/ia64/include/asm/timex.h
similarity index 100%
rename from include/asm-ia64/timex.h
rename to arch/ia64/include/asm/timex.h
diff --git a/include/asm-ia64/tlb.h b/arch/ia64/include/asm/tlb.h
similarity index 100%
rename from include/asm-ia64/tlb.h
rename to arch/ia64/include/asm/tlb.h
diff --git a/include/asm-ia64/tlbflush.h b/arch/ia64/include/asm/tlbflush.h
similarity index 100%
rename from include/asm-ia64/tlbflush.h
rename to arch/ia64/include/asm/tlbflush.h
diff --git a/include/asm-ia64/topology.h b/arch/ia64/include/asm/topology.h
similarity index 98%
rename from include/asm-ia64/topology.h
rename to arch/ia64/include/asm/topology.h
index 32863b3..35bcb64 100644
--- a/include/asm-ia64/topology.h
+++ b/arch/ia64/include/asm/topology.h
@@ -1,6 +1,4 @@
 /*
- * linux/include/asm-ia64/topology.h
- *
  * Copyright (C) 2002, Erich Focht, NEC
  *
  * All rights reserved.
diff --git a/include/asm-ia64/types.h b/arch/ia64/include/asm/types.h
similarity index 100%
rename from include/asm-ia64/types.h
rename to arch/ia64/include/asm/types.h
diff --git a/include/asm-ia64/uaccess.h b/arch/ia64/include/asm/uaccess.h
similarity index 100%
rename from include/asm-ia64/uaccess.h
rename to arch/ia64/include/asm/uaccess.h
diff --git a/include/asm-ia64/ucontext.h b/arch/ia64/include/asm/ucontext.h
similarity index 100%
rename from include/asm-ia64/ucontext.h
rename to arch/ia64/include/asm/ucontext.h
diff --git a/include/asm-ia64/unaligned.h b/arch/ia64/include/asm/unaligned.h
similarity index 100%
rename from include/asm-ia64/unaligned.h
rename to arch/ia64/include/asm/unaligned.h
diff --git a/include/asm-ia64/uncached.h b/arch/ia64/include/asm/uncached.h
similarity index 100%
rename from include/asm-ia64/uncached.h
rename to arch/ia64/include/asm/uncached.h
diff --git a/include/asm-ia64/unistd.h b/arch/ia64/include/asm/unistd.h
similarity index 100%
rename from include/asm-ia64/unistd.h
rename to arch/ia64/include/asm/unistd.h
diff --git a/include/asm-ia64/unwind.h b/arch/ia64/include/asm/unwind.h
similarity index 100%
rename from include/asm-ia64/unwind.h
rename to arch/ia64/include/asm/unwind.h
diff --git a/include/asm-ia64/user.h b/arch/ia64/include/asm/user.h
similarity index 100%
rename from include/asm-ia64/user.h
rename to arch/ia64/include/asm/user.h
diff --git a/include/asm-ia64/ustack.h b/arch/ia64/include/asm/ustack.h
similarity index 100%
rename from include/asm-ia64/ustack.h
rename to arch/ia64/include/asm/ustack.h
diff --git a/include/asm-ia64/uv/uv_hub.h b/arch/ia64/include/asm/uv/uv_hub.h
similarity index 100%
rename from include/asm-ia64/uv/uv_hub.h
rename to arch/ia64/include/asm/uv/uv_hub.h
diff --git a/include/asm-ia64/uv/uv_mmrs.h b/arch/ia64/include/asm/uv/uv_mmrs.h
similarity index 100%
rename from include/asm-ia64/uv/uv_mmrs.h
rename to arch/ia64/include/asm/uv/uv_mmrs.h
diff --git a/include/asm-ia64/vga.h b/arch/ia64/include/asm/vga.h
similarity index 100%
rename from include/asm-ia64/vga.h
rename to arch/ia64/include/asm/vga.h
diff --git a/include/asm-ia64/xor.h b/arch/ia64/include/asm/xor.h
similarity index 97%
rename from include/asm-ia64/xor.h
rename to arch/ia64/include/asm/xor.h
index 41fb874..a349e23de 100644
--- a/include/asm-ia64/xor.h
+++ b/arch/ia64/include/asm/xor.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-ia64/xor.h
- *
  * Optimized RAID-5 checksumming functions for IA-64.
  *
  * This program is free software; you can redistribute it and/or modify
diff --git a/arch/ia64/kernel/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index c64a55a..94c44b1 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -10,11 +10,11 @@
 #include <linux/pid.h>
 #include <linux/clocksource.h>
 #include <linux/kbuild.h>
-#include <asm-ia64/processor.h>
-#include <asm-ia64/ptrace.h>
-#include <asm-ia64/siginfo.h>
-#include <asm-ia64/sigcontext.h>
-#include <asm-ia64/mca.h>
+#include <asm/processor.h>
+#include <asm/ptrace.h>
+#include <asm/siginfo.h>
+#include <asm/sigcontext.h>
+#include <asm/mca.h>
 
 #include "../kernel/sigframe.h"
 #include "../kernel/fsyscall_gtod_data.h"
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index db540e5..41c7129 100644
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -1123,7 +1123,7 @@
 	 *   p15    - used to track flag status.
 	 *
 	 * If you patch this code to use more registers, do not forget to update
-	 * the clobber lists for spin_lock() in include/asm-ia64/spinlock.h.
+	 * the clobber lists for spin_lock() in arch/ia64/include/asm/spinlock.h.
 	 */
 
 #if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 3bc2fa6..5c4674a 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -69,7 +69,7 @@
  *     systems, we use one-to-one mapping between IA-64 vector and IRQ.  A
  *     platform can implement platform_irq_to_vector(irq) and
  *     platform_local_vector_to_irq(vector) APIs to differentiate the mapping.
- *     Please see also include/asm-ia64/hw_irq.h for those APIs.
+ *     Please see also arch/ia64/include/asm/hw_irq.h for those APIs.
  *
  * To sum up, there are three levels of mappings involved:
  *
diff --git a/arch/ia64/kernel/jprobes.S b/arch/ia64/kernel/jprobes.S
index 6216302..f69389c 100644
--- a/arch/ia64/kernel/jprobes.S
+++ b/arch/ia64/kernel/jprobes.S
@@ -45,7 +45,7 @@
  * to the correct location.
  */
 #include <asm/asmmacro.h>
-#include <asm-ia64/break.h>
+#include <asm/break.h>
 
 	/*
 	 * void jprobe_break(void)
diff --git a/arch/ia64/kernel/nr-irqs.c b/arch/ia64/kernel/nr-irqs.c
index 1ae0491..8273afc 100644
--- a/arch/ia64/kernel/nr-irqs.c
+++ b/arch/ia64/kernel/nr-irqs.c
@@ -9,7 +9,7 @@
 
 #include <linux/kbuild.h>
 #include <linux/threads.h>
-#include <asm-ia64/native/irq.h>
+#include <asm/native/irq.h>
 
 void foo(void)
 {
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index e5c2de9..593279f 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -314,7 +314,7 @@
  *
  * Setup the reserved memory areas set aside for the boot parameters,
  * initrd, etc.  There are currently %IA64_MAX_RSVD_REGIONS defined,
- * see include/asm-ia64/meminit.h if you need to define more.
+ * see arch/ia64/include/asm/meminit.h if you need to define more.
  */
 void __init
 reserve_memory (void)
diff --git a/arch/ia64/sn/kernel/iomv.c b/arch/ia64/sn/kernel/iomv.c
index ab7e2fd..c77ebdf 100644
--- a/arch/ia64/sn/kernel/iomv.c
+++ b/arch/ia64/sn/kernel/iomv.c
@@ -63,7 +63,7 @@
 /**
  * __sn_mmiowb - I/O space memory barrier
  *
- * See include/asm-ia64/io.h and Documentation/DocBook/deviceiobook.tmpl
+ * See arch/ia64/include/asm/io.h and Documentation/DocBook/deviceiobook.tmpl
  * for details.
  *
  * On SN2, we wait for the PIO_WRITE_STATUS SHub register to clear.