3 files changed, 5 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq.c b/c/src/lib/libbsp/powerpc/shared/irq/irq.c
index 4c2226a48f..b2c97de842 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq.c
@@ -11,6 +11,7 @@
  *  $Id$
  */
   
+#include <rtems/system.h>
 #include <bsp.h>
 #include <bsp/irq.h>
 #include <bsp/openpic.h>
@@ -18,7 +19,6 @@
 #include <rtems/score/apiext.h>
 #include <libcpu/raw_exception.h>
 #include <bsp/vectors.h>
-#include <libcpu/cpu.h>
 
 #define RAVEN_INTR_ACK_REG 0xfeff0030
 
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
index 914ab67a4d..9a44367deb 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
@@ -13,11 +13,10 @@
  * $Id$
  */
   	
+#include <asm.h>
+#include <rtems/score/cpu.h>
 #include <bsp/vectors.h>
-#include <libcpu/cpu.h>
 #include <libcpu/raw_exception.h>
-#include <rtems/score/cpuopts.h>  /* for PPC_HAS_FPU */
-#include "asm.h"
 	
 
 #define SYNC \
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
index 1dd30bc583..00ad78b319 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_init.c
@@ -14,6 +14,7 @@
  *
  *  $Id$
  */
+
 #include <bsp/consoleIo.h>
 #include <libcpu/io.h>
 #include <libcpu/spr.h>
@@ -24,6 +25,7 @@
 #include <bsp.h>
 #include <libcpu/raw_exception.h>
 #include <bsp/motorola.h>
+#include <rtems/bspIo.h>
 
 /*
 #define SHOW_ISA_PCI_BRIDGE_SETTINGS