[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Xen-changelog] [xen master] xen/include: Remove explicit xen/config.h includes



commit d89f48f58ee5568fc58c574690b06cb10e2ed7f7
Author:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
AuthorDate: Wed Feb 15 17:45:47 2017 +0000
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Thu Feb 16 14:15:25 2017 +0000

    xen/include: Remove explicit xen/config.h includes
    
    This file is included automatically via CFLAGS.
    
    Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Acked-by: Julien Grall <julien.grall@xxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
---
 xen/arch/arm/alternative.c                 | 1 -
 xen/arch/arm/arm32/asm-offsets.c           | 1 -
 xen/arch/arm/arm32/domain.c                | 1 -
 xen/arch/arm/arm32/domctl.c                | 1 -
 xen/arch/arm/arm32/entry.S                 | 1 -
 xen/arch/arm/arm32/lib/bitops.h            | 1 -
 xen/arch/arm/arm32/lib/changebit.S         | 2 --
 xen/arch/arm/arm32/lib/clearbit.S          | 3 ---
 xen/arch/arm/arm32/lib/div64.S             | 2 --
 xen/arch/arm/arm32/lib/findbit.S           | 3 ---
 xen/arch/arm/arm32/lib/lib1funcs.S         | 1 -
 xen/arch/arm/arm32/lib/lshrdi3.S           | 1 -
 xen/arch/arm/arm32/lib/memchr.S            | 3 ---
 xen/arch/arm/arm32/lib/memcpy.S            | 2 --
 xen/arch/arm/arm32/lib/memmove.S           | 3 ---
 xen/arch/arm/arm32/lib/memset.S            | 3 ---
 xen/arch/arm/arm32/lib/memzero.S           | 3 ---
 xen/arch/arm/arm32/lib/setbit.S            | 1 -
 xen/arch/arm/arm32/lib/strchr.S            | 1 -
 xen/arch/arm/arm32/lib/strrchr.S           | 3 ---
 xen/arch/arm/arm32/lib/testchangebit.S     | 1 -
 xen/arch/arm/arm32/lib/testclearbit.S      | 1 -
 xen/arch/arm/arm32/lib/testsetbit.S        | 1 -
 xen/arch/arm/arm32/traps.c                 | 1 -
 xen/arch/arm/arm64/asm-offsets.c           | 1 -
 xen/arch/arm/arm64/domain.c                | 1 -
 xen/arch/arm/arm64/domctl.c                | 1 -
 xen/arch/arm/arm64/entry.S                 | 1 -
 xen/arch/arm/arm64/insn.c                  | 1 -
 xen/arch/arm/arm64/lib/bitops.S            | 2 --
 xen/arch/arm/arm64/lib/clear_page.S        | 2 --
 xen/arch/arm/arm64/lib/find_next_bit.c     | 1 -
 xen/arch/arm/arm64/lib/memchr.S            | 1 -
 xen/arch/arm/arm64/lib/memcmp.S            | 1 -
 xen/arch/arm/arm64/lib/memcpy.S            | 1 -
 xen/arch/arm/arm64/lib/memmove.S           | 1 -
 xen/arch/arm/arm64/lib/memset.S            | 1 -
 xen/arch/arm/arm64/lib/strchr.S            | 1 -
 xen/arch/arm/arm64/lib/strcmp.S            | 2 --
 xen/arch/arm/arm64/lib/strlen.S            | 2 --
 xen/arch/arm/arm64/lib/strncmp.S           | 1 -
 xen/arch/arm/arm64/lib/strnlen.S           | 1 -
 xen/arch/arm/arm64/lib/strrchr.S           | 2 --
 xen/arch/arm/arm64/traps.c                 | 1 -
 xen/arch/arm/bootfdt.c                     | 1 -
 xen/arch/arm/cpu.c                         | 1 -
 xen/arch/arm/cpuerrata.c                   | 1 -
 xen/arch/arm/cpufeature.c                  | 1 -
 xen/arch/arm/domain.c                      | 1 -
 xen/arch/arm/domain_build.c                | 1 -
 xen/arch/arm/domctl.c                      | 1 -
 xen/arch/arm/early_printk.c                | 1 -
 xen/arch/arm/gic-v2.c                      | 1 -
 xen/arch/arm/gic-v3.c                      | 1 -
 xen/arch/arm/gic.c                         | 1 -
 xen/arch/arm/hvm.c                         | 1 -
 xen/arch/arm/io.c                          | 1 -
 xen/arch/arm/irq.c                         | 1 -
 xen/arch/arm/kernel.c                      | 1 -
 xen/arch/arm/mem_access.c                  | 1 -
 xen/arch/arm/mm.c                          | 1 -
 xen/arch/arm/p2m.c                         | 1 -
 xen/arch/arm/percpu.c                      | 1 -
 xen/arch/arm/physdev.c                     | 1 -
 xen/arch/arm/platform_hypercall.c          | 1 -
 xen/arch/arm/platforms/exynos5.c           | 1 -
 xen/arch/arm/platforms/omap5.c             | 1 -
 xen/arch/arm/platforms/xgene-storm.c       | 1 -
 xen/arch/arm/setup.c                       | 1 -
 xen/arch/arm/shutdown.c                    | 1 -
 xen/arch/arm/smp.c                         | 1 -
 xen/arch/arm/sysctl.c                      | 1 -
 xen/arch/arm/time.c                        | 1 -
 xen/arch/arm/traps.c                       | 1 -
 xen/arch/arm/vgic-v2.c                     | 1 -
 xen/arch/arm/vgic-v3.c                     | 1 -
 xen/arch/arm/vgic.c                        | 1 -
 xen/arch/arm/vtimer.c                      | 1 -
 xen/arch/arm/vuart.c                       | 3 ---
 xen/arch/arm/xen.lds.S                     | 1 -
 xen/arch/x86/acpi/boot.c                   | 1 -
 xen/arch/x86/acpi/cpu_idle.c               | 1 -
 xen/arch/x86/acpi/cpuidle_menu.c           | 1 -
 xen/arch/x86/acpi/lib.c                    | 1 -
 xen/arch/x86/acpi/power.c                  | 1 -
 xen/arch/x86/acpi/suspend.c                | 1 -
 xen/arch/x86/acpi/wakeup_prot.S            | 1 -
 xen/arch/x86/apic.c                        | 1 -
 xen/arch/x86/boot/head.S                   | 1 -
 xen/arch/x86/clear_page.S                  | 1 -
 xen/arch/x86/copy_page.S                   | 1 -
 xen/arch/x86/cpu/amd.c                     | 1 -
 xen/arch/x86/cpu/centaur.c                 | 1 -
 xen/arch/x86/cpu/common.c                  | 1 -
 xen/arch/x86/cpu/intel.c                   | 1 -
 xen/arch/x86/cpu/intel_cacheinfo.c         | 1 -
 xen/arch/x86/cpu/mcheck/amd_nonfatal.c     | 1 -
 xen/arch/x86/cpu/mcheck/mce.c              | 1 -
 xen/arch/x86/cpu/mcheck/mctelem.c          | 1 -
 xen/arch/x86/cpu/mcheck/non-fatal.c        | 1 -
 xen/arch/x86/cpu/mtrr/main.c               | 1 -
 xen/arch/x86/cpu/vpmu.c                    | 1 -
 xen/arch/x86/cpu/vpmu_amd.c                | 1 -
 xen/arch/x86/cpu/vpmu_intel.c              | 1 -
 xen/arch/x86/debug.c                       | 1 -
 xen/arch/x86/delay.c                       | 1 -
 xen/arch/x86/dmi_scan.c                    | 1 -
 xen/arch/x86/domain.c                      | 1 -
 xen/arch/x86/domain_build.c                | 1 -
 xen/arch/x86/domctl.c                      | 1 -
 xen/arch/x86/e820.c                        | 1 -
 xen/arch/x86/efi/relocs-dummy.S            | 1 -
 xen/arch/x86/flushtlb.c                    | 1 -
 xen/arch/x86/genapic/bigsmp.c              | 1 -
 xen/arch/x86/genapic/default.c             | 1 -
 xen/arch/x86/genapic/delivery.c            | 1 -
 xen/arch/x86/genapic/probe.c               | 1 -
 xen/arch/x86/genapic/x2apic.c              | 1 -
 xen/arch/x86/hpet.c                        | 1 -
 xen/arch/x86/hvm/asid.c                    | 1 -
 xen/arch/x86/hvm/emulate.c                 | 1 -
 xen/arch/x86/hvm/hvm.c                     | 1 -
 xen/arch/x86/hvm/i8254.c                   | 1 -
 xen/arch/x86/hvm/intercept.c               | 1 -
 xen/arch/x86/hvm/io.c                      | 1 -
 xen/arch/x86/hvm/ioreq.c                   | 1 -
 xen/arch/x86/hvm/irq.c                     | 1 -
 xen/arch/x86/hvm/quirks.c                  | 1 -
 xen/arch/x86/hvm/stdvga.c                  | 1 -
 xen/arch/x86/hvm/svm/asid.c                | 1 -
 xen/arch/x86/hvm/svm/entry.S               | 1 -
 xen/arch/x86/hvm/svm/intr.c                | 1 -
 xen/arch/x86/hvm/svm/svm.c                 | 1 -
 xen/arch/x86/hvm/svm/vmcb.c                | 1 -
 xen/arch/x86/hvm/vioapic.c                 | 1 -
 xen/arch/x86/hvm/vlapic.c                  | 1 -
 xen/arch/x86/hvm/vmsi.c                    | 1 -
 xen/arch/x86/hvm/vmx/entry.S               | 1 -
 xen/arch/x86/hvm/vmx/intr.c                | 1 -
 xen/arch/x86/hvm/vmx/realmode.c            | 1 -
 xen/arch/x86/hvm/vmx/vmcs.c                | 1 -
 xen/arch/x86/hvm/vmx/vmx.c                 | 1 -
 xen/arch/x86/hvm/vmx/vvmx.c                | 1 -
 xen/arch/x86/hvm/vpic.c                    | 1 -
 xen/arch/x86/i387.c                        | 1 -
 xen/arch/x86/i8259.c                       | 1 -
 xen/arch/x86/io_apic.c                     | 1 -
 xen/arch/x86/ioport_emulate.c              | 1 -
 xen/arch/x86/irq.c                         | 1 -
 xen/arch/x86/microcode.c                   | 1 -
 xen/arch/x86/microcode_amd.c               | 1 -
 xen/arch/x86/microcode_intel.c             | 1 -
 xen/arch/x86/mm.c                          | 1 -
 xen/arch/x86/mm/hap/guest_walk.c           | 1 -
 xen/arch/x86/mm/hap/hap.c                  | 1 -
 xen/arch/x86/mm/p2m-ept.c                  | 1 -
 xen/arch/x86/mm/shadow/common.c            | 1 -
 xen/arch/x86/mpparse.c                     | 1 -
 xen/arch/x86/msi.c                         | 1 -
 xen/arch/x86/nmi.c                         | 1 -
 xen/arch/x86/percpu.c                      | 1 -
 xen/arch/x86/physdev.c                     | 1 -
 xen/arch/x86/platform_hypercall.c          | 1 -
 xen/arch/x86/setup.c                       | 1 -
 xen/arch/x86/shutdown.c                    | 1 -
 xen/arch/x86/smp.c                         | 1 -
 xen/arch/x86/smpboot.c                     | 1 -
 xen/arch/x86/string.c                      | 1 -
 xen/arch/x86/sysctl.c                      | 1 -
 xen/arch/x86/tboot.c                       | 1 -
 xen/arch/x86/time.c                        | 2 --
 xen/arch/x86/trace.c                       | 1 -
 xen/arch/x86/traps.c                       | 1 -
 xen/arch/x86/x86_64/acpi_mmcfg.c           | 1 -
 xen/arch/x86/x86_64/asm-offsets.c          | 1 -
 xen/arch/x86/x86_64/compat/entry.S         | 1 -
 xen/arch/x86/x86_64/cpufreq.c              | 1 -
 xen/arch/x86/x86_64/domain.c               | 1 -
 xen/arch/x86/x86_64/entry.S                | 1 -
 xen/arch/x86/x86_64/gpr_switch.S           | 1 -
 xen/arch/x86/x86_64/kexec_reloc.S          | 1 -
 xen/arch/x86/x86_64/mmconfig-shared.c      | 1 -
 xen/arch/x86/x86_64/mmconfig_64.c          | 1 -
 xen/arch/x86/x86_64/traps.c                | 1 -
 xen/arch/x86/xen.lds.S                     | 1 -
 xen/common/bitmap.c                        | 1 -
 xen/common/compat/tmem_xen.c               | 1 -
 xen/common/cpu.c                           | 1 -
 xen/common/decompress.c                    | 1 -
 xen/common/decompress.h                    | 1 -
 xen/common/device_tree.c                   | 1 -
 xen/common/domain.c                        | 1 -
 xen/common/domctl.c                        | 1 -
 xen/common/earlycpio.c                     | 1 -
 xen/common/event_2l.c                      | 1 -
 xen/common/event_channel.c                 | 1 -
 xen/common/event_fifo.c                    | 1 -
 xen/common/guestcopy.c                     | 1 -
 xen/common/hvm/save.c                      | 1 -
 xen/common/irq.c                           | 1 -
 xen/common/kimage.c                        | 1 -
 xen/common/memory.c                        | 1 -
 xen/common/multicall.c                     | 1 -
 xen/common/notifier.c                      | 1 -
 xen/common/page_alloc.c                    | 1 -
 xen/common/pdx.c                           | 1 -
 xen/common/radix-tree.c                    | 1 -
 xen/common/rbtree.c                        | 1 -
 xen/common/sched_arinc653.c                | 1 -
 xen/common/sched_credit.c                  | 1 -
 xen/common/sched_credit2.c                 | 1 -
 xen/common/sched_rt.c                      | 1 -
 xen/common/schedule.c                      | 1 -
 xen/common/shutdown.c                      | 1 -
 xen/common/softirq.c                       | 1 -
 xen/common/spinlock.c                      | 1 -
 xen/common/stop_machine.c                  | 1 -
 xen/common/symbols-dummy.c                 | 1 -
 xen/common/symbols.c                       | 1 -
 xen/common/sysctl.c                        | 1 -
 xen/common/tasklet.c                       | 1 -
 xen/common/timer.c                         | 1 -
 xen/common/trace.c                         | 1 -
 xen/common/wait.c                          | 1 -
 xen/common/xmalloc_tlsf.c                  | 1 -
 xen/crypto/rijndael.c                      | 1 -
 xen/crypto/vmac.c                          | 1 -
 xen/drivers/acpi/hwregs.c                  | 1 -
 xen/drivers/acpi/numa.c                    | 1 -
 xen/drivers/acpi/osl.c                     | 1 -
 xen/drivers/acpi/pmstat.c                  | 1 -
 xen/drivers/acpi/reboot.c                  | 1 -
 xen/drivers/acpi/tables/tbfadt.c           | 1 -
 xen/drivers/acpi/tables/tbutils.c          | 1 -
 xen/drivers/acpi/tables/tbxface.c          | 1 -
 xen/drivers/acpi/tables/tbxfroot.c         | 1 -
 xen/drivers/acpi/utilities/utglobal.c      | 1 -
 xen/drivers/acpi/utilities/utmisc.c        | 1 -
 xen/drivers/char/cadence-uart.c            | 1 -
 xen/drivers/char/ehci-dbgp.c               | 1 -
 xen/drivers/char/exynos4210-uart.c         | 1 -
 xen/drivers/char/ns16550.c                 | 1 -
 xen/drivers/char/omap-uart.c               | 1 -
 xen/drivers/char/pl011.c                   | 1 -
 xen/drivers/char/scif-uart.c               | 1 -
 xen/drivers/char/serial.c                  | 1 -
 xen/drivers/passthrough/amd/iommu_acpi.c   | 1 -
 xen/drivers/passthrough/amd/iommu_detect.c | 1 -
 xen/drivers/passthrough/amd/iommu_init.c   | 1 -
 xen/drivers/passthrough/amd/iommu_map.c    | 1 -
 xen/drivers/passthrough/arm/smmu.c         | 1 -
 xen/drivers/video/arm_hdlcd.c              | 1 -
 xen/drivers/video/lfb.c                    | 1 -
 xen/drivers/video/vesa.c                   | 1 -
 xen/drivers/video/vga.c                    | 1 -
 xen/include/acpi/platform/aclinux.h        | 1 -
 xen/include/asm-arm/alternative.h          | 1 -
 xen/include/asm-arm/arm64/insn.h           | 1 -
 xen/include/asm-arm/atomic.h               | 1 -
 xen/include/asm-arm/cache.h                | 1 -
 xen/include/asm-arm/cpuerrata.h            | 1 -
 xen/include/asm-arm/current.h              | 1 -
 xen/include/asm-arm/domain.h               | 1 -
 xen/include/asm-arm/early_printk.h         | 1 -
 xen/include/asm-arm/hardirq.h              | 1 -
 xen/include/asm-arm/irq.h                  | 1 -
 xen/include/asm-arm/mm.h                   | 1 -
 xen/include/asm-arm/page.h                 | 1 -
 xen/include/asm-arm/smp.h                  | 1 -
 xen/include/asm-arm/string.h               | 1 -
 xen/include/asm-arm/types.h                | 1 -
 xen/include/asm-x86/acpi.h                 | 1 -
 xen/include/asm-x86/apic.h                 | 1 -
 xen/include/asm-x86/atomic.h               | 1 -
 xen/include/asm-x86/bzimage.h              | 1 -
 xen/include/asm-x86/cache.h                | 1 -
 xen/include/asm-x86/current.h              | 1 -
 xen/include/asm-x86/domain.h               | 1 -
 xen/include/asm-x86/fixmap.h               | 1 -
 xen/include/asm-x86/flushtlb.h             | 1 -
 xen/include/asm-x86/hardirq.h              | 1 -
 xen/include/asm-x86/hvm/asid.h             | 1 -
 xen/include/asm-x86/hvm/emulate.h          | 1 -
 xen/include/asm-x86/hvm/svm/asid.h         | 1 -
 xen/include/asm-x86/hvm/svm/vmcb.h         | 1 -
 xen/include/asm-x86/hvm/vioapic.h          | 1 -
 xen/include/asm-x86/hvm/vpt.h              | 1 -
 xen/include/asm-x86/io_apic.h              | 1 -
 xen/include/asm-x86/irq.h                  | 1 -
 xen/include/asm-x86/mm.h                   | 1 -
 xen/include/asm-x86/nops.h                 | 2 --
 xen/include/asm-x86/p2m.h                  | 1 -
 xen/include/asm-x86/processor.h            | 1 -
 xen/include/asm-x86/smp.h                  | 1 -
 xen/include/asm-x86/string.h               | 2 --
 xen/include/asm-x86/types.h                | 2 --
 xen/include/asm-x86/uaccess.h              | 1 -
 xen/include/asm-x86/x86_64/page.h          | 1 -
 xen/include/asm-x86/x86_emulate.h          | 1 -
 xen/include/xen/libfdt/libfdt_env.h        | 1 -
 300 files changed, 328 deletions(-)

diff --git a/xen/arch/arm/alternative.c b/xen/arch/arm/alternative.c
index b9c2b3a..1d10f51 100644
--- a/xen/arch/arm/alternative.c
+++ b/xen/arch/arm/alternative.c
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/kernel.h>
diff --git a/xen/arch/arm/arm32/asm-offsets.c b/xen/arch/arm/arm32/asm-offsets.c
index cd1dff7..f8e6b53 100644
--- a/xen/arch/arm/arm32/asm-offsets.c
+++ b/xen/arch/arm/arm32/asm-offsets.c
@@ -5,7 +5,6 @@
  */
 #define COMPILE_OFFSETS
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/sched.h>
 #include <xen/bitops.h>
diff --git a/xen/arch/arm/arm32/domain.c b/xen/arch/arm/arm32/domain.c
index f357db4..2ca1bf0 100644
--- a/xen/arch/arm/arm32/domain.c
+++ b/xen/arch/arm/arm32/domain.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/sched.h>
 
 #include <asm/domain.h>
diff --git a/xen/arch/arm/arm32/domctl.c b/xen/arch/arm/arm32/domctl.c
index c2ca4d3..fbf9d3b 100644
--- a/xen/arch/arm/arm32/domctl.c
+++ b/xen/arch/arm/arm32/domctl.c
@@ -4,7 +4,6 @@
  * Copyright (c) 2013, Citrix Systems
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S
index 4b47f9b..2a6f4f0 100644
--- a/xen/arch/arm/arm32/entry.S
+++ b/xen/arch/arm/arm32/entry.S
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <asm/asm_defns.h>
 #include <asm/regs.h>
 #include <public/xen.h>
diff --git a/xen/arch/arm/arm32/lib/bitops.h b/xen/arch/arm/arm32/lib/bitops.h
index a167c2d..d5e1347 100644
--- a/xen/arch/arm/arm32/lib/bitops.h
+++ b/xen/arch/arm/arm32/lib/bitops.h
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 
 #if __LINUX_ARM_ARCH__ >= 6
        .macro  bitop, name, instr
diff --git a/xen/arch/arm/arm32/lib/changebit.S 
b/xen/arch/arm/arm32/lib/changebit.S
index 11f41d2..6e4ae75 100644
--- a/xen/arch/arm/arm32/lib/changebit.S
+++ b/xen/arch/arm/arm32/lib/changebit.S
@@ -7,8 +7,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <xen/config.h>
-
 #include "assembler.h"
 #include "bitops.h"
                 .text
diff --git a/xen/arch/arm/arm32/lib/clearbit.S 
b/xen/arch/arm/arm32/lib/clearbit.S
index 1b6a569..fda553f 100644
--- a/xen/arch/arm/arm32/lib/clearbit.S
+++ b/xen/arch/arm/arm32/lib/clearbit.S
@@ -7,9 +7,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
-#include <xen/config.h>
-
 #include "assembler.h"
 #include "bitops.h"
                 .text
diff --git a/xen/arch/arm/arm32/lib/div64.S b/xen/arch/arm/arm32/lib/div64.S
index 83a5f22..58a52a7 100644
--- a/xen/arch/arm/arm32/lib/div64.S
+++ b/xen/arch/arm/arm32/lib/div64.S
@@ -11,8 +11,6 @@
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  */
-
-#include <xen/config.h>
 #include "assembler.h"
        
 #ifdef __ARMEB__
diff --git a/xen/arch/arm/arm32/lib/findbit.S b/xen/arch/arm/arm32/lib/findbit.S
index 2fbcc82..b4e219a 100644
--- a/xen/arch/arm/arm32/lib/findbit.S
+++ b/xen/arch/arm/arm32/lib/findbit.S
@@ -13,9 +13,6 @@
  *   also call with zero size.
  * Reworked by rmk.
  */
-
-#include <xen/config.h>
-
 #include "assembler.h"
                 .text
 
diff --git a/xen/arch/arm/arm32/lib/lib1funcs.S 
b/xen/arch/arm/arm32/lib/lib1funcs.S
index 1a2e6d2..f1278bd 100644
--- a/xen/arch/arm/arm32/lib/lib1funcs.S
+++ b/xen/arch/arm/arm32/lib/lib1funcs.S
@@ -31,7 +31,6 @@ You should have received a copy of the GNU General Public 
License
 along with this program; see the file COPYING.  If not, see 
<http://www.gnu.org/licenses/>.  */
 
 
-#include <xen/config.h>
 #include "assembler.h"
 
 .macro ARM_DIV_BODY dividend, divisor, result, curbit
diff --git a/xen/arch/arm/arm32/lib/lshrdi3.S b/xen/arch/arm/arm32/lib/lshrdi3.S
index 35bd4d1..88b9655 100644
--- a/xen/arch/arm/arm32/lib/lshrdi3.S
+++ b/xen/arch/arm/arm32/lib/lshrdi3.S
@@ -24,7 +24,6 @@ You should have received a copy of the GNU General Public 
License
 along with this program; see the file COPYING.  If not, see 
<http://www.gnu.org/licenses/>.  */
 
 
-#include <xen/config.h>
 #include "assembler.h"
 
 #ifdef __ARMEB__
diff --git a/xen/arch/arm/arm32/lib/memchr.S b/xen/arch/arm/arm32/lib/memchr.S
index fd64ed8..7dae4ab 100644
--- a/xen/arch/arm/arm32/lib/memchr.S
+++ b/xen/arch/arm/arm32/lib/memchr.S
@@ -9,9 +9,6 @@
  *
  *  ASM optimised string functions
  */
-
-#include <xen/config.h>
-
 #include "assembler.h"
 
        .text
diff --git a/xen/arch/arm/arm32/lib/memcpy.S b/xen/arch/arm/arm32/lib/memcpy.S
index d1ab9fb..cc99be8 100644
--- a/xen/arch/arm/arm32/lib/memcpy.S
+++ b/xen/arch/arm/arm32/lib/memcpy.S
@@ -9,8 +9,6 @@
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  */
-
-#include <xen/config.h>
 #include "assembler.h"
 
 #define LDR1W_SHIFT    0
diff --git a/xen/arch/arm/arm32/lib/memmove.S b/xen/arch/arm/arm32/lib/memmove.S
index 18634c3..15352db 100644
--- a/xen/arch/arm/arm32/lib/memmove.S
+++ b/xen/arch/arm/arm32/lib/memmove.S
@@ -9,9 +9,6 @@
  *  it under the terms of the GNU General Public License version 2 as
  *  published by the Free Software Foundation.
  */
-
-#include <xen/config.h>
-
 #include "assembler.h"
 
                .text
diff --git a/xen/arch/arm/arm32/lib/memset.S b/xen/arch/arm/arm32/lib/memset.S
index c8ab257..5a1dadf 100644
--- a/xen/arch/arm/arm32/lib/memset.S
+++ b/xen/arch/arm/arm32/lib/memset.S
@@ -9,9 +9,6 @@
  *
  *  ASM optimised string functions
  */
-
-#include <xen/config.h>
-
 #include "assembler.h"
 
        .text
diff --git a/xen/arch/arm/arm32/lib/memzero.S b/xen/arch/arm/arm32/lib/memzero.S
index ce25aca..dca5867 100644
--- a/xen/arch/arm/arm32/lib/memzero.S
+++ b/xen/arch/arm/arm32/lib/memzero.S
@@ -7,9 +7,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-
-#include <xen/config.h>
-
 #include "assembler.h"
 
        .text
diff --git a/xen/arch/arm/arm32/lib/setbit.S b/xen/arch/arm/arm32/lib/setbit.S
index 1f4ef56..d52f0ab 100644
--- a/xen/arch/arm/arm32/lib/setbit.S
+++ b/xen/arch/arm/arm32/lib/setbit.S
@@ -7,7 +7,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <xen/config.h>
 
 #include "assembler.h"
 #include "bitops.h"
diff --git a/xen/arch/arm/arm32/lib/strchr.S b/xen/arch/arm/arm32/lib/strchr.S
index 2f89c01..fa53ad8 100644
--- a/xen/arch/arm/arm32/lib/strchr.S
+++ b/xen/arch/arm/arm32/lib/strchr.S
@@ -10,7 +10,6 @@
  *  ASM optimised string functions
  */
 
-#include <xen/config.h>
 
 #include "assembler.h"
 
diff --git a/xen/arch/arm/arm32/lib/strrchr.S b/xen/arch/arm/arm32/lib/strrchr.S
index 7d534b1..ec4d40d 100644
--- a/xen/arch/arm/arm32/lib/strrchr.S
+++ b/xen/arch/arm/arm32/lib/strrchr.S
@@ -9,9 +9,6 @@
  *
  *  ASM optimised string functions
  */
-
-#include <xen/config.h>
-
 #include "assembler.h"
 
                .text
diff --git a/xen/arch/arm/arm32/lib/testchangebit.S 
b/xen/arch/arm/arm32/lib/testchangebit.S
index 7f4635c..d83b04c 100644
--- a/xen/arch/arm/arm32/lib/testchangebit.S
+++ b/xen/arch/arm/arm32/lib/testchangebit.S
@@ -7,7 +7,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <xen/config.h>
 
 #include "assembler.h"
 #include "bitops.h"
diff --git a/xen/arch/arm/arm32/lib/testclearbit.S 
b/xen/arch/arm/arm32/lib/testclearbit.S
index 4d4152f..6f5b7b9 100644
--- a/xen/arch/arm/arm32/lib/testclearbit.S
+++ b/xen/arch/arm/arm32/lib/testclearbit.S
@@ -7,7 +7,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <xen/config.h>
 
 #include "assembler.h"
 #include "bitops.h"
diff --git a/xen/arch/arm/arm32/lib/testsetbit.S 
b/xen/arch/arm/arm32/lib/testsetbit.S
index 54f48f9..30425a8 100644
--- a/xen/arch/arm/arm32/lib/testsetbit.S
+++ b/xen/arch/arm/arm32/lib/testsetbit.S
@@ -7,7 +7,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <xen/config.h>
 
 #include "assembler.h"
 #include "bitops.h"
diff --git a/xen/arch/arm/arm32/traps.c b/xen/arch/arm/arm32/traps.c
index 7bfc5ff..4176f0e 100644
--- a/xen/arch/arm/arm32/traps.c
+++ b/xen/arch/arm/arm32/traps.c
@@ -16,7 +16,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/kernel.h>
 
diff --git a/xen/arch/arm/arm64/asm-offsets.c b/xen/arch/arm/arm64/asm-offsets.c
index a3ce816..69ea92a 100644
--- a/xen/arch/arm/arm64/asm-offsets.c
+++ b/xen/arch/arm/arm64/asm-offsets.c
@@ -5,7 +5,6 @@
  */
 #define COMPILE_OFFSETS
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/sched.h>
 #include <xen/bitops.h>
diff --git a/xen/arch/arm/arm64/domain.c b/xen/arch/arm/arm64/domain.c
index ccba21f..dd19098 100644
--- a/xen/arch/arm/arm64/domain.c
+++ b/xen/arch/arm/arm64/domain.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/sched.h>
 
 #include <asm/domain.h>
diff --git a/xen/arch/arm/arm64/domctl.c b/xen/arch/arm/arm64/domctl.c
index c0ff248..44e1e7b 100644
--- a/xen/arch/arm/arm64/domctl.c
+++ b/xen/arch/arm/arm64/domctl.c
@@ -4,7 +4,6 @@
  * Copyright (c) 2013, Citrix Systems
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S
index 1840659..c181b5e 100644
--- a/xen/arch/arm/arm64/entry.S
+++ b/xen/arch/arm/arm64/entry.S
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <asm/asm_defns.h>
 #include <asm/regs.h>
 #include <public/xen.h>
diff --git a/xen/arch/arm/arm64/insn.c b/xen/arch/arm/arm64/insn.c
index c5f7e93..73c1821 100644
--- a/xen/arch/arm/arm64/insn.c
+++ b/xen/arch/arm/arm64/insn.c
@@ -18,7 +18,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/arm/arm64/lib/bitops.S b/xen/arch/arm/arm64/lib/bitops.S
index e1ad239..6471dd1 100644
--- a/xen/arch/arm/arm64/lib/bitops.S
+++ b/xen/arch/arm/arm64/lib/bitops.S
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
-
 /*
  * x0: bits 4:0  bit offset
  *     bits 31:5 word offset
diff --git a/xen/arch/arm/arm64/lib/clear_page.S 
b/xen/arch/arm/arm64/lib/clear_page.S
index 8d5cadb..9f8a680 100644
--- a/xen/arch/arm/arm64/lib/clear_page.S
+++ b/xen/arch/arm/arm64/lib/clear_page.S
@@ -14,8 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
-
 /*
  * Clear page @dest
  *
diff --git a/xen/arch/arm/arm64/lib/find_next_bit.c 
b/xen/arch/arm/arm64/lib/find_next_bit.c
index aea69c2..17cb176 100644
--- a/xen/arch/arm/arm64/lib/find_next_bit.c
+++ b/xen/arch/arm/arm64/lib/find_next_bit.c
@@ -8,7 +8,6 @@
  * as published by the Free Software Foundation; either version
  * 2 of the License, or (at your option) any later version.
  */
-#include <xen/config.h>
 #include <xen/bitops.h>
 #include <asm/types.h>
 #include <asm/byteorder.h>
diff --git a/xen/arch/arm/arm64/lib/memchr.S b/xen/arch/arm/arm64/lib/memchr.S
index b04590c..81f113b 100644
--- a/xen/arch/arm/arm64/lib/memchr.S
+++ b/xen/arch/arm/arm64/lib/memchr.S
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include "assembler.h"
 
 /*
diff --git a/xen/arch/arm/arm64/lib/memcmp.S b/xen/arch/arm/arm64/lib/memcmp.S
index 9aad925..2eb8156 100644
--- a/xen/arch/arm/arm64/lib/memcmp.S
+++ b/xen/arch/arm/arm64/lib/memcmp.S
@@ -22,7 +22,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include "assembler.h"
 
 /*
diff --git a/xen/arch/arm/arm64/lib/memcpy.S b/xen/arch/arm/arm64/lib/memcpy.S
index 7cc885d..d90d20e 100644
--- a/xen/arch/arm/arm64/lib/memcpy.S
+++ b/xen/arch/arm/arm64/lib/memcpy.S
@@ -22,7 +22,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <asm/cache.h>
 #include "assembler.h"
 
diff --git a/xen/arch/arm/arm64/lib/memmove.S b/xen/arch/arm/arm64/lib/memmove.S
index f4065b9..a49de84 100644
--- a/xen/arch/arm/arm64/lib/memmove.S
+++ b/xen/arch/arm/arm64/lib/memmove.S
@@ -22,7 +22,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <asm/cache.h>
 #include "assembler.h"
 
diff --git a/xen/arch/arm/arm64/lib/memset.S b/xen/arch/arm/arm64/lib/memset.S
index 4ee714d..5bf7515 100644
--- a/xen/arch/arm/arm64/lib/memset.S
+++ b/xen/arch/arm/arm64/lib/memset.S
@@ -22,7 +22,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <asm/cache.h>
 #include "assembler.h"
 
diff --git a/xen/arch/arm/arm64/lib/strchr.S b/xen/arch/arm/arm64/lib/strchr.S
index 9e265e4..0506b0f 100644
--- a/xen/arch/arm/arm64/lib/strchr.S
+++ b/xen/arch/arm/arm64/lib/strchr.S
@@ -17,7 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 
 /*
  * Find the first occurrence of a character in a string.
diff --git a/xen/arch/arm/arm64/lib/strcmp.S b/xen/arch/arm/arm64/lib/strcmp.S
index bdcf7b0..c6f42dd 100644
--- a/xen/arch/arm/arm64/lib/strcmp.S
+++ b/xen/arch/arm/arm64/lib/strcmp.S
@@ -22,8 +22,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
-
 #include "assembler.h"
 
 /*
diff --git a/xen/arch/arm/arm64/lib/strlen.S b/xen/arch/arm/arm64/lib/strlen.S
index ee055a2..fb6aaf1 100644
--- a/xen/arch/arm/arm64/lib/strlen.S
+++ b/xen/arch/arm/arm64/lib/strlen.S
@@ -22,8 +22,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
-
 #include "assembler.h"
 
 
diff --git a/xen/arch/arm/arm64/lib/strncmp.S b/xen/arch/arm/arm64/lib/strncmp.S
index ca2e4a6..a4a0f77 100644
--- a/xen/arch/arm/arm64/lib/strncmp.S
+++ b/xen/arch/arm/arm64/lib/strncmp.S
@@ -22,7 +22,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 
 #include "assembler.h"
 
diff --git a/xen/arch/arm/arm64/lib/strnlen.S b/xen/arch/arm/arm64/lib/strnlen.S
index 8aa5bbf..81c8e8b 100644
--- a/xen/arch/arm/arm64/lib/strnlen.S
+++ b/xen/arch/arm/arm64/lib/strnlen.S
@@ -22,7 +22,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 
 #include "assembler.h"
 
diff --git a/xen/arch/arm/arm64/lib/strrchr.S b/xen/arch/arm/arm64/lib/strrchr.S
index 3791754..0705998 100644
--- a/xen/arch/arm/arm64/lib/strrchr.S
+++ b/xen/arch/arm/arm64/lib/strrchr.S
@@ -17,8 +17,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
-
 /*
  * Find the last occurrence of a character in a string.
  *
diff --git a/xen/arch/arm/arm64/traps.c b/xen/arch/arm/arm64/traps.c
index 5a90cfa..8e89376 100644
--- a/xen/arch/arm/arm64/traps.c
+++ b/xen/arch/arm/arm64/traps.c
@@ -16,7 +16,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 
 #include <asm/system.h>
diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c
index cae6f83..ea188a0 100644
--- a/xen/arch/arm/bootfdt.c
+++ b/xen/arch/arm/bootfdt.c
@@ -7,7 +7,6 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/kernel.h>
diff --git a/xen/arch/arm/cpu.c b/xen/arch/arm/cpu.c
index d21651c..9595f1d 100644
--- a/xen/arch/arm/cpu.c
+++ b/xen/arch/arm/cpu.c
@@ -10,7 +10,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/arch/arm/cpuerrata.c b/xen/arch/arm/cpuerrata.c
index a3e8dda..f89c0ab 100644
--- a/xen/arch/arm/cpuerrata.c
+++ b/xen/arch/arm/cpuerrata.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <asm/cpufeature.h>
 #include <asm/cpuerrata.h>
 
diff --git a/xen/arch/arm/cpufeature.c b/xen/arch/arm/cpufeature.c
index 088625b..479c9fb 100644
--- a/xen/arch/arm/cpufeature.c
+++ b/xen/arch/arm/cpufeature.c
@@ -16,7 +16,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/init.h>
 #include <xen/smp.h>
diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c
index 7e43691..0010b8f 100644
--- a/xen/arch/arm/domain.c
+++ b/xen/arch/arm/domain.c
@@ -9,7 +9,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#include <xen/config.h>
 #include <xen/hypercall.h>
 #include <xen/init.h>
 #include <xen/lib.h>
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index c97a1f5..048eb39 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/compile.h>
 #include <xen/lib.h>
diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c
index c5d1c33..971caec 100644
--- a/xen/arch/arm/domctl.c
+++ b/xen/arch/arm/domctl.c
@@ -4,7 +4,6 @@
  * Copyright (c) 2012, Citrix Systems
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/arm/early_printk.c b/xen/arch/arm/early_printk.c
index c85db69..97466a1 100644
--- a/xen/arch/arm/early_printk.c
+++ b/xen/arch/arm/early_printk.c
@@ -8,7 +8,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/stdarg.h>
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index cd8e504..270a136 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/mm.h>
diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c
index bb1861e..695f01f 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -21,7 +21,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/cpu.h>
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index a5348f2..9522c6c 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/mm.h>
diff --git a/xen/arch/arm/hvm.c b/xen/arch/arm/hvm.c
index d999bde..a56b3fe 100644
--- a/xen/arch/arm/hvm.c
+++ b/xen/arch/arm/hvm.c
@@ -16,7 +16,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c
index e8aa7fa..e216128 100644
--- a/xen/arch/arm/io.c
+++ b/xen/arch/arm/io.c
@@ -16,7 +16,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/spinlock.h>
 #include <xen/sched.h>
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index dd62ba6..f3f20a6 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/spinlock.h>
 #include <xen/irq.h>
diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c
index 3f6cce3..e2512c4 100644
--- a/xen/arch/arm/kernel.c
+++ b/xen/arch/arm/kernel.c
@@ -3,7 +3,6 @@
  *
  * Copyright (C) 2011 Citrix Systems, Inc.
  */
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/init.h>
 #include <xen/lib.h>
diff --git a/xen/arch/arm/mem_access.c b/xen/arch/arm/mem_access.c
index a6e5bcd..03b20c4 100644
--- a/xen/arch/arm/mem_access.c
+++ b/xen/arch/arm/mem_access.c
@@ -16,7 +16,6 @@
  * License along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/mem_access.h>
 #include <xen/monitor.h>
 #include <xen/sched.h>
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index fbeed0e..2d96423 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/compile.h>
 #include <xen/types.h>
 #include <xen/device_tree.h>
diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c
index d762b11..5e8f6cd 100644
--- a/xen/arch/arm/p2m.c
+++ b/xen/arch/arm/p2m.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/sched.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/arm/percpu.c b/xen/arch/arm/percpu.c
index e545024..25442c4 100644
--- a/xen/arch/arm/percpu.c
+++ b/xen/arch/arm/percpu.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/percpu.h>
 #include <xen/cpu.h>
 #include <xen/init.h>
diff --git a/xen/arch/arm/physdev.c b/xen/arch/arm/physdev.c
index 27bbbda..e91355f 100644
--- a/xen/arch/arm/physdev.c
+++ b/xen/arch/arm/physdev.c
@@ -4,7 +4,6 @@
  * Copyright (c) 2012, Citrix Systems
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/arm/platform_hypercall.c 
b/xen/arch/arm/platform_hypercall.c
index b708711..5aab856 100644
--- a/xen/arch/arm/platform_hypercall.c
+++ b/xen/arch/arm/platform_hypercall.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2015, Citrix
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/sched.h>
 #include <xen/guest_access.h>
diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c
index 9edd866..492cd3e 100644
--- a/xen/arch/arm/platforms/exynos5.c
+++ b/xen/arch/arm/platforms/exynos5.c
@@ -18,7 +18,6 @@
  */
 
 #include <asm/p2m.h>
-#include <xen/config.h>
 #include <xen/device_tree.h>
 #include <xen/domain_page.h>
 #include <xen/mm.h>
diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c
index 539588e..eadc4f8 100644
--- a/xen/arch/arm/platforms/omap5.c
+++ b/xen/arch/arm/platforms/omap5.c
@@ -18,7 +18,6 @@
  */
 
 #include <asm/p2m.h>
-#include <xen/config.h>
 #include <asm/platform.h>
 #include <asm/platforms/omap5.h>
 #include <xen/mm.h>
diff --git a/xen/arch/arm/platforms/xgene-storm.c 
b/xen/arch/arm/platforms/xgene-storm.c
index c795a95..3b007fe 100644
--- a/xen/arch/arm/platforms/xgene-storm.c
+++ b/xen/arch/arm/platforms/xgene-storm.c
@@ -18,7 +18,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <asm/platform.h>
 #include <xen/vmap.h>
 #include <xen/device_tree.h>
diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index 41aa1dd..2bf4363 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/compile.h>
 #include <xen/device_tree.h>
 #include <xen/domain_page.h>
diff --git a/xen/arch/arm/shutdown.c b/xen/arch/arm/shutdown.c
index e53ec97..b32f07e 100644
--- a/xen/arch/arm/shutdown.c
+++ b/xen/arch/arm/shutdown.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/console.h>
 #include <xen/cpu.h>
 #include <xen/delay.h>
diff --git a/xen/arch/arm/smp.c b/xen/arch/arm/smp.c
index 917d490..e7df087 100644
--- a/xen/arch/arm/smp.c
+++ b/xen/arch/arm/smp.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <asm/system.h>
 #include <asm/smp.h>
 #include <asm/cpregs.h>
diff --git a/xen/arch/arm/sysctl.c b/xen/arch/arm/sysctl.c
index 98bab6a..72fc120 100644
--- a/xen/arch/arm/sysctl.c
+++ b/xen/arch/arm/sysctl.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2012, Citrix Systems
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 7dae28b..105c741 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/console.h>
 #include <xen/device_tree.h>
 #include <xen/init.h>
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 92b1d80..718e820 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -16,7 +16,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/string.h>
 #include <xen/version.h>
diff --git a/xen/arch/arm/vgic-v2.c b/xen/arch/arm/vgic-v2.c
index 3dbcfe89..697764d 100644
--- a/xen/arch/arm/vgic-v2.c
+++ b/xen/arch/arm/vgic-v2.c
@@ -18,7 +18,6 @@
  */
 
 #include <xen/bitops.h>
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/softirq.h>
diff --git a/xen/arch/arm/vgic-v3.c b/xen/arch/arm/vgic-v3.c
index d61479d..12d36eb 100644
--- a/xen/arch/arm/vgic-v3.c
+++ b/xen/arch/arm/vgic-v3.c
@@ -19,7 +19,6 @@
  */
 
 #include <xen/bitops.h>
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/softirq.h>
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 364d5f0..f729c2f 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -18,7 +18,6 @@
  */
 
 #include <xen/bitops.h>
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/softirq.h>
diff --git a/xen/arch/arm/vtimer.c b/xen/arch/arm/vtimer.c
index 4ec3b95..32ac127 100644
--- a/xen/arch/arm/vtimer.c
+++ b/xen/arch/arm/vtimer.c
@@ -17,7 +17,6 @@
  * GNU General Public License for more details.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/timer.h>
 #include <xen/sched.h>
diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c
index b5c9288..80d4755 100644
--- a/xen/arch/arm/vuart.c
+++ b/xen/arch/arm/vuart.c
@@ -30,9 +30,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-
-
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
 #include <xen/errno.h>
diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S
index 94b7049..44bd3bf 100644
--- a/xen/arch/arm/xen.lds.S
+++ b/xen/arch/arm/xen.lds.S
@@ -2,7 +2,6 @@
 /* Modified for i386/x86-64 Xen by Keir Fraser */
 /* Modified for ARM Xen by Ian Campbell */
 
-#include <xen/config.h>
 #include <xen/cache.h>
 #include <asm/page.h>
 #include <asm/percpu.h>
diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index a2db18c..33c9133 100644
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -22,7 +22,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/init.h>
 #include <xen/acpi.h>
diff --git a/xen/arch/x86/acpi/cpu_idle.c b/xen/arch/x86/acpi/cpu_idle.c
index f36b184..e2be474 100644
--- a/xen/arch/x86/acpi/cpu_idle.c
+++ b/xen/arch/x86/acpi/cpu_idle.c
@@ -30,7 +30,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/lib.h>
 #include <xen/types.h>
diff --git a/xen/arch/x86/acpi/cpuidle_menu.c b/xen/arch/x86/acpi/cpuidle_menu.c
index 0218b38..20f4f5f 100644
--- a/xen/arch/x86/acpi/cpuidle_menu.c
+++ b/xen/arch/x86/acpi/cpuidle_menu.c
@@ -22,7 +22,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/lib.h>
 #include <xen/types.h>
diff --git a/xen/arch/x86/acpi/lib.c b/xen/arch/x86/acpi/lib.c
index c21912d..7d7c718 100644
--- a/xen/arch/x86/acpi/lib.c
+++ b/xen/arch/x86/acpi/lib.c
@@ -19,7 +19,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/init.h>
 #include <xen/acpi.h>
diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c
index 2cb3d13..506f54d 100644
--- a/xen/arch/x86/acpi/power.c
+++ b/xen/arch/x86/acpi/power.c
@@ -10,7 +10,6 @@
  * Slimmed with Xen specific support.
  */
 
-#include <xen/config.h>
 #include <asm/io.h>
 #include <xen/acpi.h>
 #include <xen/errno.h>
diff --git a/xen/arch/x86/acpi/suspend.c b/xen/arch/x86/acpi/suspend.c
index d5c67ee..015e10e 100644
--- a/xen/arch/x86/acpi/suspend.c
+++ b/xen/arch/x86/acpi/suspend.c
@@ -4,7 +4,6 @@
  *  Copyright (c) 2001 Patrick Mochel <mochel@xxxxxxxx>
  */
 
-#include <xen/config.h>
 #include <xen/acpi.h>
 #include <xen/smp.h>
 #include <asm/processor.h>
diff --git a/xen/arch/x86/acpi/wakeup_prot.S b/xen/arch/x86/acpi/wakeup_prot.S
index def86d2..7228637 100644
--- a/xen/arch/x86/acpi/wakeup_prot.S
+++ b/xen/arch/x86/acpi/wakeup_prot.S
@@ -1,6 +1,5 @@
         .text
 
-#include <xen/config.h>
 #include <xen/multiboot.h>
 #include <public/xen.h>
 #include <asm/asm_defns.h>
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index 3fb9a82..e32dcd7 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -16,7 +16,6 @@
  *    Mikael Pettersson    :    PM converted to driver model.
  */
 
-#include <xen/config.h>
 #include <xen/perfc.h>
 #include <xen/errno.h>
 #include <xen/init.h>
diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S
index 126e2e2..0aa4efa 100644
--- a/xen/arch/x86/boot/head.S
+++ b/xen/arch/x86/boot/head.S
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/multiboot.h>
 #include <public/xen.h>
 #include <asm/asm_defns.h>
diff --git a/xen/arch/x86/clear_page.S b/xen/arch/x86/clear_page.S
index 96315ad..959c821 100644
--- a/xen/arch/x86/clear_page.S
+++ b/xen/arch/x86/clear_page.S
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <asm/page.h>
 
 #define ptr_reg %rdi
diff --git a/xen/arch/x86/copy_page.S b/xen/arch/x86/copy_page.S
index ac83655..f925a39 100644
--- a/xen/arch/x86/copy_page.S
+++ b/xen/arch/x86/copy_page.S
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <asm/page.h>
 
 #define src_reg %rsi
diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index 4ff0b54..5f36ac7 100644
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/bitops.h>
 #include <xen/mm.h>
diff --git a/xen/arch/x86/cpu/centaur.c b/xen/arch/x86/cpu/centaur.c
index b137d55..1c760be 100644
--- a/xen/arch/x86/cpu/centaur.c
+++ b/xen/arch/x86/cpu/centaur.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/bitops.h>
diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 56a2331..0040fa3 100644
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/string.h>
 #include <xen/delay.h>
diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c
index d0e380c..2e20327 100644
--- a/xen/arch/x86/cpu/intel.c
+++ b/xen/arch/x86/cpu/intel.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/kernel.h>
 #include <xen/string.h>
diff --git a/xen/arch/x86/cpu/intel_cacheinfo.c 
b/xen/arch/x86/cpu/intel_cacheinfo.c
index b3b0c18..101e297 100644
--- a/xen/arch/x86/cpu/intel_cacheinfo.c
+++ b/xen/arch/x86/cpu/intel_cacheinfo.c
@@ -7,7 +7,6 @@
  *     Andi Kleen / Andreas Herrmann   : CPUID4 emulation on AMD.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c 
b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c
index 8a80a9f..c6a9c89 100644
--- a/xen/arch/x86/cpu/mcheck/amd_nonfatal.c
+++ b/xen/arch/x86/cpu/mcheck/amd_nonfatal.c
@@ -50,7 +50,6 @@
  * 
http://www.amd.com/us-en/assets/content_type/white_papers_and_tech_docs/32559.pdf
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/kernel.h>
diff --git a/xen/arch/x86/cpu/mcheck/mce.c b/xen/arch/x86/cpu/mcheck/mce.c
index 2695b0c..894db5c 100644
--- a/xen/arch/x86/cpu/mcheck/mce.c
+++ b/xen/arch/x86/cpu/mcheck/mce.c
@@ -6,7 +6,6 @@
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/kernel.h>
-#include <xen/config.h>
 #include <xen/smp.h>
 #include <xen/errno.h>
 #include <xen/console.h>
diff --git a/xen/arch/x86/cpu/mcheck/mctelem.c 
b/xen/arch/x86/cpu/mcheck/mctelem.c
index 95e83c5..f26f13d 100644
--- a/xen/arch/x86/cpu/mcheck/mctelem.c
+++ b/xen/arch/x86/cpu/mcheck/mctelem.c
@@ -15,7 +15,6 @@
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/kernel.h>
-#include <xen/config.h>
 #include <xen/smp.h>
 #include <xen/errno.h>
 #include <xen/sched.h>
diff --git a/xen/arch/x86/cpu/mcheck/non-fatal.c 
b/xen/arch/x86/cpu/mcheck/non-fatal.c
index da5cae9..d12e8f2 100644
--- a/xen/arch/x86/cpu/mcheck/non-fatal.c
+++ b/xen/arch/x86/cpu/mcheck/non-fatal.c
@@ -7,7 +7,6 @@
  *
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/kernel.h>
diff --git a/xen/arch/x86/cpu/mtrr/main.c b/xen/arch/x86/cpu/mtrr/main.c
index 47d44d7..56f71a6 100644
--- a/xen/arch/x86/cpu/mtrr/main.c
+++ b/xen/arch/x86/cpu/mtrr/main.c
@@ -30,7 +30,6 @@
     System Programming Guide; Section 9.11. (1997 edition - PPro).
 */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/smp.h>
diff --git a/xen/arch/x86/cpu/vpmu.c b/xen/arch/x86/cpu/vpmu.c
index 35a9403..b271c2c 100644
--- a/xen/arch/x86/cpu/vpmu.c
+++ b/xen/arch/x86/cpu/vpmu.c
@@ -17,7 +17,6 @@
  *
  * Author: Haitao Shan <haitao.shan@xxxxxxxxx>
  */
-#include <xen/config.h>
 #include <xen/sched.h>
 #include <xen/xenoprof.h>
 #include <xen/event.h>
diff --git a/xen/arch/x86/cpu/vpmu_amd.c b/xen/arch/x86/cpu/vpmu_amd.c
index 43ade13..e0acbf4 100644
--- a/xen/arch/x86/cpu/vpmu_amd.c
+++ b/xen/arch/x86/cpu/vpmu_amd.c
@@ -21,7 +21,6 @@
  *
  */
 
-#include <xen/config.h>
 #include <xen/xenoprof.h>
 #include <xen/hvm/save.h>
 #include <xen/sched.h>
diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c
index 16e5afb..0ce68f1 100644
--- a/xen/arch/x86/cpu/vpmu_intel.c
+++ b/xen/arch/x86/cpu/vpmu_intel.c
@@ -18,7 +18,6 @@
  * Author: Haitao Shan <haitao.shan@xxxxxxxxx>
  */
 
-#include <xen/config.h>
 #include <xen/sched.h>
 #include <xen/xenoprof.h>
 #include <xen/irq.h>
diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c
index 259b8c4..13d4ad7 100644
--- a/xen/arch/x86/debug.c
+++ b/xen/arch/x86/debug.c
@@ -14,7 +14,6 @@
  * License along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/sched.h>
 #include <xen/compile.h>
 #include <xen/mm.h>
diff --git a/xen/arch/x86/delay.c b/xen/arch/x86/delay.c
index 86b6265..2662c26 100644
--- a/xen/arch/x86/delay.c
+++ b/xen/arch/x86/delay.c
@@ -10,7 +10,6 @@
  * we have to worry about.
  */
 
-#include <xen/config.h>
 #include <xen/delay.h>
 #include <xen/time.h>
 #include <asm/msr.h>
diff --git a/xen/arch/x86/dmi_scan.c b/xen/arch/x86/dmi_scan.c
index 8dcb640..8564a77 100644
--- a/xen/arch/x86/dmi_scan.c
+++ b/xen/arch/x86/dmi_scan.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/kernel.h>
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 71c0e3c..3c93195 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -11,7 +11,6 @@
  *  Gareth Hughes <gareth@xxxxxxxxxxx>, May 2000
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 0134428..0c8a269 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -4,7 +4,6 @@
  * Copyright (c) 2002-2005, K A Fraser
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/ctype.h>
diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 8e5259f..3b5c3c9 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -4,7 +4,6 @@
  * Copyright (c) 2002-2006, K A Fraser
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
diff --git a/xen/arch/x86/e820.c b/xen/arch/x86/e820.c
index f4c07e0..76537ea 100644
--- a/xen/arch/x86/e820.c
+++ b/xen/arch/x86/e820.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
diff --git a/xen/arch/x86/efi/relocs-dummy.S b/xen/arch/x86/efi/relocs-dummy.S
index b14c499..d928a82 100644
--- a/xen/arch/x86/efi/relocs-dummy.S
+++ b/xen/arch/x86/efi/relocs-dummy.S
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 
        .section .reloc, "a", @progbits
        .balign 4
diff --git a/xen/arch/x86/flushtlb.c b/xen/arch/x86/flushtlb.c
index ee61aab..f6d7ad1 100644
--- a/xen/arch/x86/flushtlb.c
+++ b/xen/arch/x86/flushtlb.c
@@ -7,7 +7,6 @@
  * Copyright (c) 2003-2006, K A Fraser
  */
 
-#include <xen/config.h>
 #include <xen/sched.h>
 #include <xen/softirq.h>
 #include <asm/flushtlb.h>
diff --git a/xen/arch/x86/genapic/bigsmp.c b/xen/arch/x86/genapic/bigsmp.c
index 411ddcf..c250c8e 100644
--- a/xen/arch/x86/genapic/bigsmp.c
+++ b/xen/arch/x86/genapic/bigsmp.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/cpumask.h>
 #include <asm/current.h>
 #include <asm/mpspec.h>
diff --git a/xen/arch/x86/genapic/default.c b/xen/arch/x86/genapic/default.c
index dbab88f..4d1a06f 100644
--- a/xen/arch/x86/genapic/default.c
+++ b/xen/arch/x86/genapic/default.c
@@ -1,7 +1,6 @@
 /* 
  * Default generic APIC driver. This handles upto 8 CPUs.
  */
-#include <xen/config.h>
 #include <xen/cpumask.h>
 #include <asm/current.h>
 #include <asm/mpspec.h>
diff --git a/xen/arch/x86/genapic/delivery.c b/xen/arch/x86/genapic/delivery.c
index 94eb857..23ac361 100644
--- a/xen/arch/x86/genapic/delivery.c
+++ b/xen/arch/x86/genapic/delivery.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/irq.h>
 #include <xen/sched.h>
 #include <asm/current.h>
diff --git a/xen/arch/x86/genapic/probe.c b/xen/arch/x86/genapic/probe.c
index 860201e..9a147ff 100644
--- a/xen/arch/x86/genapic/probe.c
+++ b/xen/arch/x86/genapic/probe.c
@@ -3,7 +3,6 @@
  * 
  * Generic x86 APIC driver probe layer.
  */  
-#include <xen/config.h>
 #include <xen/cpumask.h>
 #include <xen/string.h>
 #include <xen/kernel.h>
diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c
index d894a98..5fffb31 100644
--- a/xen/arch/x86/genapic/x2apic.c
+++ b/xen/arch/x86/genapic/x2apic.c
@@ -16,7 +16,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/cpu.h>
 #include <xen/cpumask.h>
diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c
index f78054d..7e8b438 100644
--- a/xen/arch/x86/hpet.c
+++ b/xen/arch/x86/hpet.c
@@ -4,7 +4,6 @@
  * HPET management.
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/time.h>
 #include <xen/timer.h>
diff --git a/xen/arch/x86/hvm/asid.c b/xen/arch/x86/hvm/asid.c
index 24f2f00..beca8ec 100644
--- a/xen/arch/x86/hvm/asid.c
+++ b/xen/arch/x86/hvm/asid.c
@@ -16,7 +16,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c
index fed8801..14f9b43 100644
--- a/xen/arch/x86/hvm/emulate.c
+++ b/xen/arch/x86/hvm/emulate.c
@@ -9,7 +9,6 @@
  *    Keir Fraser <keir@xxxxxxx>
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 266f708..3f5c4bf 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -18,7 +18,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/ctype.h>
 #include <xen/init.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/hvm/i8254.c b/xen/arch/x86/hvm/i8254.c
index 577b43c..992f08d 100644
--- a/xen/arch/x86/hvm/i8254.c
+++ b/xen/arch/x86/hvm/i8254.c
@@ -24,7 +24,6 @@
  * IN THE SOFTWARE.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/mm.h>
 #include <xen/xmalloc.h>
diff --git a/xen/arch/x86/hvm/intercept.c b/xen/arch/x86/hvm/intercept.c
index 5157e9e..e51efd5 100644
--- a/xen/arch/x86/hvm/intercept.c
+++ b/xen/arch/x86/hvm/intercept.c
@@ -17,7 +17,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/sched.h>
 #include <asm/regs.h>
diff --git a/xen/arch/x86/hvm/io.c b/xen/arch/x86/hvm/io.c
index 8c02e82..205fb68 100644
--- a/xen/arch/x86/hvm/io.c
+++ b/xen/arch/x86/hvm/io.c
@@ -18,7 +18,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/hvm/ioreq.c b/xen/arch/x86/hvm/ioreq.c
index 899ba64..ebb3eca 100644
--- a/xen/arch/x86/hvm/ioreq.c
+++ b/xen/arch/x86/hvm/ioreq.c
@@ -16,7 +16,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/ctype.h>
 #include <xen/init.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/hvm/irq.c b/xen/arch/x86/hvm/irq.c
index 265a620..ff7d288 100644
--- a/xen/arch/x86/hvm/irq.c
+++ b/xen/arch/x86/hvm/irq.c
@@ -18,7 +18,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/event.h>
 #include <xen/sched.h>
diff --git a/xen/arch/x86/hvm/quirks.c b/xen/arch/x86/hvm/quirks.c
index efe666a..a298ccd 100644
--- a/xen/arch/x86/hvm/quirks.c
+++ b/xen/arch/x86/hvm/quirks.c
@@ -14,7 +14,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/init.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/hvm/stdvga.c b/xen/arch/x86/hvm/stdvga.c
index 47bb8fd..088fbdf 100644
--- a/xen/arch/x86/hvm/stdvga.c
+++ b/xen/arch/x86/hvm/stdvga.c
@@ -27,7 +27,6 @@
  *  can have side effects.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/sched.h>
 #include <xen/domain_page.h>
diff --git a/xen/arch/x86/hvm/svm/asid.c b/xen/arch/x86/hvm/svm/asid.c
index b65be66..5ca8f0e 100644
--- a/xen/arch/x86/hvm/svm/asid.c
+++ b/xen/arch/x86/hvm/svm/asid.c
@@ -15,7 +15,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/perfc.h>
diff --git a/xen/arch/x86/hvm/svm/entry.S b/xen/arch/x86/hvm/svm/entry.S
index 759c184..a4ab40a 100644
--- a/xen/arch/x86/hvm/svm/entry.S
+++ b/xen/arch/x86/hvm/svm/entry.S
@@ -17,7 +17,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/types.h>
diff --git a/xen/arch/x86/hvm/svm/intr.c b/xen/arch/x86/hvm/svm/intr.c
index bd94731..8511ff0 100644
--- a/xen/arch/x86/hvm/svm/intr.c
+++ b/xen/arch/x86/hvm/svm/intr.c
@@ -16,7 +16,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index ca2785c..f9bfbdd 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -16,7 +16,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/trace.h>
diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c
index 70d75e7..696cf99 100644
--- a/xen/arch/x86/hvm/svm/vmcb.c
+++ b/xen/arch/x86/hvm/svm/vmcb.c
@@ -17,7 +17,6 @@
  *
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/keyhandler.h>
diff --git a/xen/arch/x86/hvm/vioapic.c b/xen/arch/x86/hvm/vioapic.c
index 611be87..fdbb21f 100644
--- a/xen/arch/x86/hvm/vioapic.c
+++ b/xen/arch/x86/hvm/vioapic.c
@@ -24,7 +24,6 @@
  *  Ported to xen by using virtual IRQ line.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/mm.h>
 #include <xen/xmalloc.h>
diff --git a/xen/arch/x86/hvm/vlapic.c b/xen/arch/x86/hvm/vlapic.c
index 1d5d287..3fa3727 100644
--- a/xen/arch/x86/hvm/vlapic.c
+++ b/xen/arch/x86/hvm/vlapic.c
@@ -17,7 +17,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/mm.h>
 #include <xen/xmalloc.h>
diff --git a/xen/arch/x86/hvm/vmsi.c b/xen/arch/x86/hvm/vmsi.c
index d81c5d4..25f5756 100644
--- a/xen/arch/x86/hvm/vmsi.c
+++ b/xen/arch/x86/hvm/vmsi.c
@@ -24,7 +24,6 @@
  * Will be merged it with virtual IOAPIC logic, since most is the same
 */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/mm.h>
 #include <xen/xmalloc.h>
diff --git a/xen/arch/x86/hvm/vmx/entry.S b/xen/arch/x86/hvm/vmx/entry.S
index 3d98ee2..9f1755b 100644
--- a/xen/arch/x86/hvm/vmx/entry.S
+++ b/xen/arch/x86/hvm/vmx/entry.S
@@ -16,7 +16,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/types.h>
diff --git a/xen/arch/x86/hvm/vmx/intr.c b/xen/arch/x86/hvm/vmx/intr.c
index 1e17c4e..41a14d6 100644
--- a/xen/arch/x86/hvm/vmx/intr.c
+++ b/xen/arch/x86/hvm/vmx/intr.c
@@ -16,7 +16,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/hvm/vmx/realmode.c b/xen/arch/x86/hvm/vmx/realmode.c
index 40efad2..dad34d6 100644
--- a/xen/arch/x86/hvm/vmx/realmode.c
+++ b/xen/arch/x86/hvm/vmx/realmode.c
@@ -9,7 +9,6 @@
  *    Keir Fraser <keir@xxxxxxx>
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index 454d444..92c5867 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -15,7 +15,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 42f4fbd..5808953 100644
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -15,7 +15,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/trace.h>
diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c
index ec3b946..f6a25a6 100644
--- a/xen/arch/x86/hvm/vmx/vvmx.c
+++ b/xen/arch/x86/hvm/vmx/vvmx.c
@@ -19,7 +19,6 @@
  *
  */
 
-#include <xen/config.h>
 #include <asm/types.h>
 #include <asm/mtrr.h>
 #include <asm/p2m.h>
diff --git a/xen/arch/x86/hvm/vpic.c b/xen/arch/x86/hvm/vpic.c
index 6a2e87b..e160bbd 100644
--- a/xen/arch/x86/hvm/vpic.c
+++ b/xen/arch/x86/hvm/vpic.c
@@ -24,7 +24,6 @@
  * IN THE SOFTWARE.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/event.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/i387.c b/xen/arch/x86/i387.c
index 86b098d..9a172db 100644
--- a/xen/arch/x86/i387.c
+++ b/xen/arch/x86/i387.c
@@ -8,7 +8,6 @@
  *  Gareth Hughes <gareth@xxxxxxxxxxx>, May 2000
  */
 
-#include <xen/config.h>
 #include <xen/sched.h>
 #include <asm/current.h>
 #include <asm/processor.h>
diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index 98bf7c7..07465aa 100644
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -5,7 +5,6 @@
  * tables for IO APICS as well as uniprocessor 8259-alikes.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <asm/regs.h>
diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index f989978..24ee431 100644
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -20,7 +20,6 @@
  *     Paul Diefenbaugh        :       Added full ACPI support
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/irq.h>
diff --git a/xen/arch/x86/ioport_emulate.c b/xen/arch/x86/ioport_emulate.c
index 4ade751..58d2b53 100644
--- a/xen/arch/x86/ioport_emulate.c
+++ b/xen/arch/x86/ioport_emulate.c
@@ -4,7 +4,6 @@
  * Handle I/O port access quirks of various platforms.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/sched.h>
 #include <xen/dmi.h>
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index 8c1545a..676ba52 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -5,7 +5,6 @@
  *  Copyright (C) 1992, 1998 Linus Torvalds, Ingo Molnar
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/delay.h>
 #include <xen/errno.h>
diff --git a/xen/arch/x86/microcode.c b/xen/arch/x86/microcode.c
index c20bde6..30a0806 100644
--- a/xen/arch/x86/microcode.c
+++ b/xen/arch/x86/microcode.c
@@ -21,7 +21,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <xen/config.h>
 #include <xen/cpu.h>
 #include <xen/lib.h>
 #include <xen/kernel.h>
diff --git a/xen/arch/x86/microcode_amd.c b/xen/arch/x86/microcode_amd.c
index a61c926..4759911 100644
--- a/xen/arch/x86/microcode_amd.c
+++ b/xen/arch/x86/microcode_amd.c
@@ -14,7 +14,6 @@
  *  License version 2. See file COPYING for details.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/kernel.h>
 #include <xen/init.h>
diff --git a/xen/arch/x86/microcode_intel.c b/xen/arch/x86/microcode_intel.c
index 93d9d0f..62c2932 100644
--- a/xen/arch/x86/microcode_intel.c
+++ b/xen/arch/x86/microcode_intel.c
@@ -21,7 +21,6 @@
  * 2 of the License, or (at your option) any later version.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/kernel.h>
 #include <xen/init.h>
diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c
index f87c08f..75bdbc3 100644
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -83,7 +83,6 @@
  * an application-supplied buffer).
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/kernel.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/mm/hap/guest_walk.c b/xen/arch/x86/mm/hap/guest_walk.c
index 1b1a15d..b38b851 100644
--- a/xen/arch/x86/mm/hap/guest_walk.c
+++ b/xen/arch/x86/mm/hap/guest_walk.c
@@ -23,7 +23,6 @@ asm(".file \"" __OBJECT_FILE__ "\"");
 
 #include <xen/domain_page.h>
 #include <xen/paging.h>
-#include <xen/config.h>
 #include <xen/sched.h>
 #include "private.h" /* for hap_gva_to_gfn_* */
 
diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c
index 6dbb3cc..b5870bf 100644
--- a/xen/arch/x86/mm/hap/hap.c
+++ b/xen/arch/x86/mm/hap/hap.c
@@ -19,7 +19,6 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/mm.h>
 #include <xen/trace.h>
diff --git a/xen/arch/x86/mm/p2m-ept.c b/xen/arch/x86/mm/p2m-ept.c
index ef93404..ea614b0 100644
--- a/xen/arch/x86/mm/p2m-ept.c
+++ b/xen/arch/x86/mm/p2m-ept.c
@@ -15,7 +15,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/domain_page.h>
 #include <xen/sched.h>
 #include <asm/current.h>
diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index a619d65..1c9d9b9 100644
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -20,7 +20,6 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/mm.h>
 #include <xen/trace.h>
diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index c3d5bdc..1eb7c99 100644
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -13,7 +13,6 @@
  *             Paul Diefenbaugh:       Added full ACPI support
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/irq.h>
 #include <xen/init.h>
diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c
index 6756a14..a868007 100644
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -6,7 +6,6 @@
  * Copyright (C) Tom Long Nguyen (tom.l.nguyen@xxxxxxxxx)
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/init.h>
 #include <xen/irq.h>
diff --git a/xen/arch/x86/nmi.c b/xen/arch/x86/nmi.c
index efc21b2..410cfa1 100644
--- a/xen/arch/x86/nmi.c
+++ b/xen/arch/x86/nmi.c
@@ -13,7 +13,6 @@
  *  Mikael Pettersson : PM converted to driver model. Disable/enable API.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
diff --git a/xen/arch/x86/percpu.c b/xen/arch/x86/percpu.c
index 1c1dad9..1d3bc2e 100644
--- a/xen/arch/x86/percpu.c
+++ b/xen/arch/x86/percpu.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/percpu.h>
 #include <xen/cpu.h>
 #include <xen/init.h>
diff --git a/xen/arch/x86/physdev.c b/xen/arch/x86/physdev.c
index 5a49796..018f8b5 100644
--- a/xen/arch/x86/physdev.c
+++ b/xen/arch/x86/physdev.c
@@ -1,5 +1,4 @@
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/types.h>
diff --git a/xen/arch/x86/platform_hypercall.c 
b/xen/arch/x86/platform_hypercall.c
index 0879e19..10e7bcc 100644
--- a/xen/arch/x86/platform_hypercall.c
+++ b/xen/arch/x86/platform_hypercall.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2002-2006, K Fraser
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 48fd955..5f55abe 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/err.h>
diff --git a/xen/arch/x86/shutdown.c b/xen/arch/x86/shutdown.c
index 3d669d1..f63b8a6 100644
--- a/xen/arch/x86/shutdown.c
+++ b/xen/arch/x86/shutdown.c
@@ -4,7 +4,6 @@
  * x86-specific shutdown handling.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/arch/x86/smp.c b/xen/arch/x86/smp.c
index 4abb16f..70de53d 100644
--- a/xen/arch/x86/smp.c
+++ b/xen/arch/x86/smp.c
@@ -8,7 +8,6 @@
  *     later.
  */
 
-#include <xen/config.h>
 #include <xen/irq.h>
 #include <xen/sched.h>
 #include <xen/delay.h>
diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c
index 9b390b8..82559ed 100644
--- a/xen/arch/x86/smpboot.c
+++ b/xen/arch/x86/smpboot.c
@@ -19,7 +19,6 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/kernel.h>
 #include <xen/mm.h>
diff --git a/xen/arch/x86/string.c b/xen/arch/x86/string.c
index 043ae66..1387dfb 100644
--- a/xen/arch/x86/string.c
+++ b/xen/arch/x86/string.c
@@ -5,7 +5,6 @@
  * against.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 
 #undef memcpy
diff --git a/xen/arch/x86/sysctl.c b/xen/arch/x86/sysctl.c
index b8c30d4..2f7056e 100644
--- a/xen/arch/x86/sysctl.c
+++ b/xen/arch/x86/sysctl.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2002-2006, K Fraser
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c
index e5d7c42..4a573b0 100644
--- a/xen/arch/x86/tboot.c
+++ b/xen/arch/x86/tboot.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/time.c b/xen/arch/x86/time.c
index 803e154..3ad2ab0 100644
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -9,12 +9,10 @@
  * Copyright (c) 1991, 1992, 1995  Linus Torvalds
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/event.h>
 #include <xen/sched.h>
 #include <xen/lib.h>
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/time.h>
 #include <xen/timer.h>
diff --git a/xen/arch/x86/trace.c b/xen/arch/x86/trace.c
index 58624ac..4a953c5 100644
--- a/xen/arch/x86/trace.c
+++ b/xen/arch/x86/trace.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/kernel.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c
index 691c9a2..ab5febc 100644
--- a/xen/arch/x86/traps.c
+++ b/xen/arch/x86/traps.c
@@ -24,7 +24,6 @@
  * Gareth Hughes <gareth@xxxxxxxxxxx>, May 2000
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/sched.h>
 #include <xen/lib.h>
diff --git a/xen/arch/x86/x86_64/acpi_mmcfg.c b/xen/arch/x86/x86_64/acpi_mmcfg.c
index 3ce85c9..a96d5e0 100644
--- a/xen/arch/x86/x86_64/acpi_mmcfg.c
+++ b/xen/arch/x86/x86_64/acpi_mmcfg.c
@@ -24,7 +24,6 @@
  * copied from Linux
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/init.h>
 #include <xen/acpi.h>
diff --git a/xen/arch/x86/x86_64/asm-offsets.c 
b/xen/arch/x86/x86_64/asm-offsets.c
index 0e1f09d..33a6b30 100644
--- a/xen/arch/x86/x86_64/asm-offsets.c
+++ b/xen/arch/x86/x86_64/asm-offsets.c
@@ -5,7 +5,6 @@
  */
 #define COMPILE_OFFSETS
 
-#include <xen/config.h>
 #include <xen/perfc.h>
 #include <xen/sched.h>
 #include <xen/bitops.h>
diff --git a/xen/arch/x86/x86_64/compat/entry.S 
b/xen/arch/x86/x86_64/compat/entry.S
index 474ffbc..fb72464 100644
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -2,7 +2,6 @@
  * Compatibility hypercall routines.
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/asm_defns.h>
diff --git a/xen/arch/x86/x86_64/cpufreq.c b/xen/arch/x86/x86_64/cpufreq.c
index 30df44f..e018b5e 100644
--- a/xen/arch/x86/x86_64/cpufreq.c
+++ b/xen/arch/x86/x86_64/cpufreq.c
@@ -20,7 +20,6 @@
  *
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  */
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/xmalloc.h>
 #include <xen/guest_access.h>
diff --git a/xen/arch/x86/x86_64/domain.c b/xen/arch/x86/x86_64/domain.c
index 2096b2c..c46dccc 100644
--- a/xen/arch/x86/x86_64/domain.c
+++ b/xen/arch/x86/x86_64/domain.c
@@ -3,7 +3,6 @@
  *
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/guest_access.h>
 #include <xen/hypercall.h>
diff --git a/xen/arch/x86/x86_64/entry.S b/xen/arch/x86/x86_64/entry.S
index 85f1a4b..1af7d91 100644
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -4,7 +4,6 @@
  * Copyright (c) 2005, K A Fraser
  */
 
-#include <xen/config.h>
 #include <xen/errno.h>
 #include <xen/softirq.h>
 #include <asm/asm_defns.h>
diff --git a/xen/arch/x86/x86_64/gpr_switch.S b/xen/arch/x86/x86_64/gpr_switch.S
index 306d09c..217812b 100644
--- a/xen/arch/x86/x86_64/gpr_switch.S
+++ b/xen/arch/x86/x86_64/gpr_switch.S
@@ -5,7 +5,6 @@
  * Copyright (c) 2006, Novell, Inc.
  */
 
-#include <xen/config.h>
 #include <asm/asm_defns.h>
 
 ENTRY(host_to_guest_gpr_switch)
diff --git a/xen/arch/x86/x86_64/kexec_reloc.S 
b/xen/arch/x86/x86_64/kexec_reloc.S
index 85ab602..0b1f9a0 100644
--- a/xen/arch/x86/x86_64/kexec_reloc.S
+++ b/xen/arch/x86/x86_64/kexec_reloc.S
@@ -10,7 +10,6 @@
  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
  */
-#include <xen/config.h>
 #include <xen/kimage.h>
 
 #include <asm/asm_defns.h>
diff --git a/xen/arch/x86/x86_64/mmconfig-shared.c 
b/xen/arch/x86/x86_64/mmconfig-shared.c
index a7592c6..488470b 100644
--- a/xen/arch/x86/x86_64/mmconfig-shared.c
+++ b/xen/arch/x86/x86_64/mmconfig-shared.c
@@ -12,7 +12,6 @@
  * Author: Allen Kay <allen.m.kay@xxxxxxxxx> -  adapted to xen from Linux
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/acpi.h>
diff --git a/xen/arch/x86/x86_64/mmconfig_64.c 
b/xen/arch/x86/x86_64/mmconfig_64.c
index 7618d67..e84a67d 100644
--- a/xen/arch/x86/x86_64/mmconfig_64.c
+++ b/xen/arch/x86/x86_64/mmconfig_64.c
@@ -7,7 +7,6 @@
  * copied from Linux
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/acpi.h>
diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c
index fc8cde6..8d5f901 100644
--- a/xen/arch/x86/x86_64/traps.c
+++ b/xen/arch/x86/x86_64/traps.c
@@ -1,5 +1,4 @@
 
-#include <xen/config.h>
 #include <xen/version.h>
 #include <xen/init.h>
 #include <xen/sched.h>
diff --git a/xen/arch/x86/xen.lds.S b/xen/arch/x86/xen.lds.S
index 7676de9..3368086 100644
--- a/xen/arch/x86/xen.lds.S
+++ b/xen/arch/x86/xen.lds.S
@@ -1,7 +1,6 @@
 /* Excerpts written by Martin Mares <mj@xxxxxxxxxxxxxxxxxxxxxxxx> */
 /* Modified for i386/x86-64 Xen by Keir Fraser */
 
-#include <xen/config.h>
 #include <xen/cache.h>
 #include <asm/page.h>
 #include <asm/percpu.h>
diff --git a/xen/common/bitmap.c b/xen/common/bitmap.c
index 61d1ea4..f498ee6 100644
--- a/xen/common/bitmap.c
+++ b/xen/common/bitmap.c
@@ -5,7 +5,6 @@
  * This source code is licensed under the GNU General Public License,
  * Version 2.  See the file COPYING for more details.
  */
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/errno.h>
 #include <xen/bitmap.h>
diff --git a/xen/common/compat/tmem_xen.c b/xen/common/compat/tmem_xen.c
index db08005..5111fd8 100644
--- a/xen/common/compat/tmem_xen.c
+++ b/xen/common/compat/tmem_xen.c
@@ -3,7 +3,6 @@
  *
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
 #include <xen/domain.h>
diff --git a/xen/common/cpu.c b/xen/common/cpu.c
index 497e0cb..6350f15 100644
--- a/xen/common/cpu.c
+++ b/xen/common/cpu.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/cpumask.h>
 #include <xen/cpu.h>
 #include <xen/event.h>
diff --git a/xen/common/decompress.c b/xen/common/decompress.c
index 5f86af9..9d6e0c4 100644
--- a/xen/common/decompress.c
+++ b/xen/common/decompress.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/string.h>
diff --git a/xen/common/decompress.h b/xen/common/decompress.h
index 61e83e5..647b7b1 100644
--- a/xen/common/decompress.h
+++ b/xen/common/decompress.h
@@ -1,6 +1,5 @@
 #ifdef __XEN__
 
-#include <xen/config.h>
 #include <xen/cache.h>
 #include <xen/decompress.h>
 #include <xen/init.h>
diff --git a/xen/common/device_tree.c b/xen/common/device_tree.c
index 1be074b..7b009ea 100644
--- a/xen/common/device_tree.c
+++ b/xen/common/device_tree.c
@@ -10,7 +10,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/init.h>
 #include <xen/guest_access.h>
diff --git a/xen/common/domain.c b/xen/common/domain.c
index 05130e2..40d583f 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -4,7 +4,6 @@
  * Generic domain-handling functions.
  */
 
-#include <xen/config.h>
 #include <xen/compat.h>
 #include <xen/init.h>
 #include <xen/lib.h>
diff --git a/xen/common/domctl.c b/xen/common/domctl.c
index 12cf4a9..93e3029 100644
--- a/xen/common/domctl.c
+++ b/xen/common/domctl.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2002-2006, K A Fraser
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/err.h>
diff --git a/xen/common/earlycpio.c b/xen/common/earlycpio.c
index f6b1a9e..4bcf32a 100644
--- a/xen/common/earlycpio.c
+++ b/xen/common/earlycpio.c
@@ -25,7 +25,6 @@
  * separate file or part of the same file.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/string.h>
diff --git a/xen/common/event_2l.c b/xen/common/event_2l.c
index 5837ae8..3b990ff 100644
--- a/xen/common/event_2l.c
+++ b/xen/common/event_2l.c
@@ -7,7 +7,6 @@
  * Version 2 or later.  See the file COPYING for more details.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/common/event_channel.c b/xen/common/event_channel.c
index 638dc5e..144d48e 100644
--- a/xen/common/event_channel.c
+++ b/xen/common/event_channel.c
@@ -14,7 +14,6 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/common/event_fifo.c b/xen/common/event_fifo.c
index 45583e5..197074c 100644
--- a/xen/common/event_fifo.c
+++ b/xen/common/event_fifo.c
@@ -7,7 +7,6 @@
  * Version 2 or later.  See the file COPYING for more details.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/errno.h>
diff --git a/xen/common/guestcopy.c b/xen/common/guestcopy.c
index 6ae1815..6d38eef 100644
--- a/xen/common/guestcopy.c
+++ b/xen/common/guestcopy.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/guest_access.h>
 #include <xen/err.h>
diff --git a/xen/common/hvm/save.c b/xen/common/hvm/save.c
index dd2c547..78706f5 100644
--- a/xen/common/hvm/save.c
+++ b/xen/common/hvm/save.c
@@ -20,7 +20,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/version.h>
 #include <public/version.h>
diff --git a/xen/common/irq.c b/xen/common/irq.c
index 3e55dfa..f42512d 100644
--- a/xen/common/irq.c
+++ b/xen/common/irq.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/irq.h>
 #include <xen/errno.h>
 
diff --git a/xen/common/kimage.c b/xen/common/kimage.c
index dcc010e..cf624d1 100644
--- a/xen/common/kimage.c
+++ b/xen/common/kimage.c
@@ -11,7 +11,6 @@
  * Version 2.  See the file COPYING for more details.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/init.h>
 #include <xen/kernel.h>
diff --git a/xen/common/memory.c b/xen/common/memory.c
index 21797ca..ad29b7b 100644
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -7,7 +7,6 @@
  * Copyright (c) 2003-2005, K A Fraser
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
diff --git a/xen/common/multicall.c b/xen/common/multicall.c
index 524c9bf..f7880a8 100644
--- a/xen/common/multicall.c
+++ b/xen/common/multicall.c
@@ -2,7 +2,6 @@
  * multicall.c
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
diff --git a/xen/common/notifier.c b/xen/common/notifier.c
index 5924b56..34488a8 100644
--- a/xen/common/notifier.c
+++ b/xen/common/notifier.c
@@ -7,7 +7,6 @@
  * Original code from Linux kernel 2.6.27 (Alan Cox <Alan.Cox@xxxxxxxxx>)
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/notifier.h>
 
diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index 915e1f7..bbd7bc6 100644
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -120,7 +120,6 @@
  *   regions within it.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/lib.h>
diff --git a/xen/common/pdx.c b/xen/common/pdx.c
index 90136c0..4baffd4 100644
--- a/xen/common/pdx.c
+++ b/xen/common/pdx.c
@@ -15,7 +15,6 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/bitops.h>
diff --git a/xen/common/radix-tree.c b/xen/common/radix-tree.c
index 5e33f09..2384655 100644
--- a/xen/common/radix-tree.c
+++ b/xen/common/radix-tree.c
@@ -18,7 +18,6 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/radix-tree.h>
 #include <xen/errno.h>
diff --git a/xen/common/rbtree.c b/xen/common/rbtree.c
index 1812c0a..3328960 100644
--- a/xen/common/rbtree.c
+++ b/xen/common/rbtree.c
@@ -19,7 +19,6 @@
   linux/lib/rbtree.c
 */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/rbtree.h>
 
diff --git a/xen/common/sched_arinc653.c b/xen/common/sched_arinc653.c
index ebd2090..0b1b849 100644
--- a/xen/common/sched_arinc653.c
+++ b/xen/common/sched_arinc653.c
@@ -24,7 +24,6 @@
  * Copyright (c) 2010, DornerWorks, Ltd. <DornerWorks.com>
  */
 
-#include <xen/config.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
 #include <xen/sched-if.h>
diff --git a/xen/common/sched_credit.c b/xen/common/sched_credit.c
index 7c0ff47..4649e64 100644
--- a/xen/common/sched_credit.c
+++ b/xen/common/sched_credit.c
@@ -8,7 +8,6 @@
  * Description: Credit-based SMP CPU scheduler
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index b482990..b12d038 100644
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -10,7 +10,6 @@
  * Based on an earlier verson by Emmanuel Ackaouy.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c
index f2d979c..1b30014 100644
--- a/xen/common/sched_rt.c
+++ b/xen/common/sched_rt.c
@@ -11,7 +11,6 @@
  * based on the code of credit Scheduler
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/common/schedule.c b/xen/common/schedule.c
index e4320f3..36bbd94 100644
--- a/xen/common/schedule.c
+++ b/xen/common/schedule.c
@@ -14,7 +14,6 @@
  */
 
 #ifndef COMPAT
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/common/shutdown.c b/xen/common/shutdown.c
index 03a8641..009a70c 100644
--- a/xen/common/shutdown.c
+++ b/xen/common/shutdown.c
@@ -1,4 +1,3 @@
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/lib.h>
 #include <xen/sched.h>
diff --git a/xen/common/softirq.c b/xen/common/softirq.c
index 11e3345..ac12cf8 100644
--- a/xen/common/softirq.c
+++ b/xen/common/softirq.c
@@ -9,7 +9,6 @@
  * Copyright (c) 1992, Linus Torvalds
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/mm.h>
 #include <xen/preempt.h>
diff --git a/xen/common/spinlock.c b/xen/common/spinlock.c
index 017bdf3..2a06406 100644
--- a/xen/common/spinlock.c
+++ b/xen/common/spinlock.c
@@ -1,5 +1,4 @@
 #include <xen/lib.h>
-#include <xen/config.h>
 #include <xen/irq.h>
 #include <xen/smp.h>
 #include <xen/time.h>
diff --git a/xen/common/stop_machine.c b/xen/common/stop_machine.c
index cf109ba..304b783 100644
--- a/xen/common/stop_machine.c
+++ b/xen/common/stop_machine.c
@@ -19,7 +19,6 @@
  * this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/sched.h>
 #include <xen/spinlock.h>
diff --git a/xen/common/symbols-dummy.c b/xen/common/symbols-dummy.c
index 044dfd3..03cf623 100644
--- a/xen/common/symbols-dummy.c
+++ b/xen/common/symbols-dummy.c
@@ -3,7 +3,6 @@
  *                  link of the hypervisor image.
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/symbols.h>
 
diff --git a/xen/common/symbols.c b/xen/common/symbols.c
index 12765d3..9377f41 100644
--- a/xen/common/symbols.c
+++ b/xen/common/symbols.c
@@ -10,7 +10,6 @@
  *      compression (see tools/symbols.c for a more complete description)
  */
 
-#include <xen/config.h>
 #include <xen/symbols.h>
 #include <xen/kernel.h>
 #include <xen/init.h>
diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c
index 03cca5c..ae58a0f 100644
--- a/xen/common/sysctl.c
+++ b/xen/common/sysctl.c
@@ -6,7 +6,6 @@
  * Copyright (c) 2002-2006, K Fraser
  */
 
-#include <xen/config.h>
 #include <xen/types.h>
 #include <xen/lib.h>
 #include <xen/mm.h>
diff --git a/xen/common/tasklet.c b/xen/common/tasklet.c
index 4e42fa7..365a777 100644
--- a/xen/common/tasklet.c
+++ b/xen/common/tasklet.c
@@ -13,7 +13,6 @@
  *    Keir Fraser <keir@xxxxxxx>
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/sched.h>
 #include <xen/softirq.h>
diff --git a/xen/common/timer.c b/xen/common/timer.c
index 29a60a9..d9ff669 100644
--- a/xen/common/timer.c
+++ b/xen/common/timer.c
@@ -5,7 +5,6 @@
  * Copyright (c) 2002-2005 K A Fraser
  */
 
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/errno.h>
diff --git a/xen/common/trace.c b/xen/common/trace.c
index 2f4ecca..4fedc26 100644
--- a/xen/common/trace.c
+++ b/xen/common/trace.c
@@ -16,7 +16,6 @@
  * it's possible to reconstruct a chronological record of trace events.
  */
 
-#include <xen/config.h>
 #include <asm/types.h>
 #include <asm/io.h>
 #include <xen/lib.h>
diff --git a/xen/common/wait.c b/xen/common/wait.c
index 89cfc06..9490a17 100644
--- a/xen/common/wait.c
+++ b/xen/common/wait.c
@@ -19,7 +19,6 @@
  * along with this program; If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <xen/config.h>
 #include <xen/sched.h>
 #include <xen/wait.h>
 #include <xen/errno.h>
diff --git a/xen/common/xmalloc_tlsf.c b/xen/common/xmalloc_tlsf.c
index 6c1b882..b256dc5 100644
--- a/xen/common/xmalloc_tlsf.c
+++ b/xen/common/xmalloc_tlsf.c
@@ -23,7 +23,6 @@
  * Adapted for Xen by Dan Magenheimer (dan.magenheimer@xxxxxxxxxx)
  */
 
-#include <xen/config.h>
 #include <xen/irq.h>
 #include <xen/mm.h>
 #include <xen/pfn.h>
diff --git a/xen/crypto/rijndael.c b/xen/crypto/rijndael.c
index 9de0992..4cdb74a 100644
--- a/xen/crypto/rijndael.c
+++ b/xen/crypto/rijndael.c
@@ -27,7 +27,6 @@
  */
 
 /* start for Xen */
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/lib.h>
diff --git a/xen/crypto/vmac.c b/xen/crypto/vmac.c
index f3f2743..294dd16 100644
--- a/xen/crypto/vmac.c
+++ b/xen/crypto/vmac.c
@@ -7,7 +7,6 @@
  * ----------------------------------------------------------------------- */
 
 /* start for Xen */
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/lib.h>
diff --git a/xen/drivers/acpi/hwregs.c b/xen/drivers/acpi/hwregs.c
index 164fd61..958d374 100644
--- a/xen/drivers/acpi/hwregs.c
+++ b/xen/drivers/acpi/hwregs.c
@@ -44,7 +44,6 @@
  */
 
 #include <asm/io.h>
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/errno.h>
diff --git a/xen/drivers/acpi/numa.c b/xen/drivers/acpi/numa.c
index 50bf9f8..85f8917 100644
--- a/xen/drivers/acpi/numa.c
+++ b/xen/drivers/acpi/numa.c
@@ -21,7 +21,6 @@
  * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  *
  */
-#include <xen/config.h>
 #include <xen/init.h>
 #include <xen/types.h>
 #include <xen/errno.h>
diff --git a/xen/drivers/acpi/osl.c b/xen/drivers/acpi/osl.c
index 930e2d9..f75dfb7 100644
--- a/xen/drivers/acpi/osl.c
+++ b/xen/drivers/acpi/osl.c
@@ -24,7 +24,6 @@
  *

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog

 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.