diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
index 175b711881..9fa00f3c4d 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-18	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* irq/irq.c: Reflect changed to <rtems/score/cpu.h>.
+	* irq/irq_asm.S: Ditto.
+	* vectors/vectors.S: Ditto.
+	* vectors/vectors_init.c: Include <rtems/bspIo.h>.
+
 2002-04-16	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* irq/irq.c: Define loopCounter iff DISPATCH_HANDLER_STAT is set.
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.c b/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.c
index 4af972883d..2ecdf633d9 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.c
+++ b/c/src/lib/libbsp/powerpc/eth_comm/irq/irq.c
@@ -11,13 +11,13 @@
  *  $Id$
  */
   
+#include <rtems/system.h>
 #include <bsp.h>
 #include <bsp/irq.h>
 #include <rtems/score/thread.h>
 #include <rtems/score/apiext.h>
 #include <libcpu/raw_exception.h>
 #include <bsp/vectors.h>
-#include <libcpu/cpu.h>
 #include <bsp/8xx_immap.h>
 #include <bsp/commproc.h>
 
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/eth_comm/irq/irq_asm.S
index 914ab67a4d..9a44367deb 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/irq/irq_asm.S
+++ b/c/src/lib/libbsp/powerpc/eth_comm/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/eth_comm/vectors/vectors.S b/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors.S
index a056fab3ce..302fce2df8 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors.S
+++ b/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors.S
@@ -10,10 +10,9 @@
 	
 
 
+#include <asm.h>
+#include <rtems/score/cpu.h>
 #include <bsp/vectors.h>
-#include <libcpu/cpu.h>
-#include <rtems/score/targopts.h>
-#include "asm.h"
 	
 
 #define SYNC \
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors_init.c b/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors_init.c
index 864aac71a4..2153a1d557 100644
--- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors_init.c
+++ b/c/src/lib/libbsp/powerpc/eth_comm/vectors/vectors_init.c
@@ -12,9 +12,11 @@
  *
  *  $Id$
  */
+
 #include <bsp/vectors.h>
 #include <libcpu/raw_exception.h>
 #include <bsp.h>
+#include <rtems/bspIo.h>
 
 static rtems_raw_except_global_settings exception_config;
 static rtems_raw_except_connect_data    exception_table[LAST_VALID_EXC + 1];