diff --git a/cpu/74xx_7xx/traps.c b/cpu/74xx_7xx/traps.c
index 24e28e212..1d5dd017e 100644
--- a/cpu/74xx_7xx/traps.c
+++ b/cpu/74xx_7xx/traps.c
@@ -34,6 +34,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 
 #ifdef CONFIG_AMIGAONEG3SE
diff --git a/cpu/mpc512x/traps.c b/cpu/mpc512x/traps.c
index 8000fabd4..786f4a5a7 100644
--- a/cpu/mpc512x/traps.c
+++ b/cpu/mpc512x/traps.c
@@ -28,6 +28,7 @@
  */
 
 #include <common.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cpu/mpc5xx/traps.c b/cpu/mpc5xx/traps.c
index cc8e09135..6882c21a4 100644
--- a/cpu/mpc5xx/traps.c
+++ b/cpu/mpc5xx/traps.c
@@ -34,6 +34,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 
 #if defined(CONFIG_CMD_BEDBUG)
diff --git a/cpu/mpc5xxx/traps.c b/cpu/mpc5xxx/traps.c
index 2a0915351..934a2f2ab 100644
--- a/cpu/mpc5xxx/traps.c
+++ b/cpu/mpc5xxx/traps.c
@@ -35,6 +35,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 
 /* Returns 0 if exception not found and fixup otherwise.  */
diff --git a/cpu/mpc8220/traps.c b/cpu/mpc8220/traps.c
index f98d40f00..456578001 100644
--- a/cpu/mpc8220/traps.c
+++ b/cpu/mpc8220/traps.c
@@ -35,6 +35,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 
 /* Returns 0 if exception not found and fixup otherwise.  */
diff --git a/cpu/mpc8260/traps.c b/cpu/mpc8260/traps.c
index f9f4dea93..d216f71f9 100644
--- a/cpu/mpc8260/traps.c
+++ b/cpu/mpc8260/traps.c
@@ -34,6 +34,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 #include <asm/m8260_pci.h>
 
diff --git a/cpu/mpc83xx/traps.c b/cpu/mpc83xx/traps.c
index 3b09a62ac..9d71b8b73 100644
--- a/cpu/mpc83xx/traps.c
+++ b/cpu/mpc83xx/traps.c
@@ -27,6 +27,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 #include <asm/mpc8349_pci.h>
 
diff --git a/cpu/mpc85xx/traps.c b/cpu/mpc85xx/traps.c
index 241ebd565..10108d86e 100644
--- a/cpu/mpc85xx/traps.c
+++ b/cpu/mpc85xx/traps.c
@@ -38,6 +38,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cpu/mpc86xx/traps.c b/cpu/mpc86xx/traps.c
index ad005c3af..406403e51 100644
--- a/cpu/mpc86xx/traps.c
+++ b/cpu/mpc86xx/traps.c
@@ -32,6 +32,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/cpu/mpc8xx/traps.c b/cpu/mpc8xx/traps.c
index f357c8d6b..6efe8e0ea 100644
--- a/cpu/mpc8xx/traps.c
+++ b/cpu/mpc8xx/traps.c
@@ -34,6 +34,7 @@
 
 #include <common.h>
 #include <command.h>
+#include <kgdb.h>
 #include <asm/processor.h>
 
 #if defined(CONFIG_CMD_BEDBUG)