diff --git a/arch/ppc64/kernel/udbg.c b/arch/ppc64/kernel/udbg.c
index 2f82e7d7902b..07164020f3a9 100644
--- a/arch/ppc64/kernel/udbg.c
+++ b/arch/ppc64/kernel/udbg.c
@@ -13,12 +13,9 @@
 #define WANT_PPCDBG_TAB /* Only defined here */
 #include <linux/config.h>
 #include <linux/types.h>
+#include <linux/sched.h>
 #include <asm/ppcdebug.h>
 #include <asm/processor.h>
-#include <asm/uaccess.h>
-#include <asm/machdep.h>
-#include <asm/io.h>
-#include <asm/prom.h>
 
 void (*udbg_putc)(unsigned char c);
 unsigned char (*udbg_getc)(void);
diff --git a/arch/ppc64/kernel/udbg_16550.c b/arch/ppc64/kernel/udbg_16550.c
index ffe19dbecd97..9313574ab935 100644
--- a/arch/ppc64/kernel/udbg_16550.c
+++ b/arch/ppc64/kernel/udbg_16550.c
@@ -10,13 +10,8 @@
  */
 #include <linux/config.h>
 #include <linux/types.h>
-#include <asm/ppcdebug.h>
-#include <asm/processor.h>
-#include <asm/naca.h>
-#include <asm/uaccess.h>
-#include <asm/machdep.h>
+#include <asm/udbg.h>
 #include <asm/io.h>
-#include <asm/prom.h>
 
 extern u8 real_readb(volatile u8 __iomem  *addr);
 extern void real_writeb(u8 data, volatile u8 __iomem *addr);
diff --git a/arch/ppc64/kernel/udbg_scc.c b/arch/ppc64/kernel/udbg_scc.c
index c8ba8ac287f0..c47fd6c63531 100644
--- a/arch/ppc64/kernel/udbg_scc.c
+++ b/arch/ppc64/kernel/udbg_scc.c
@@ -10,11 +10,9 @@
  */
 #include <linux/config.h>
 #include <linux/types.h>
-#include <asm/ppcdebug.h>
+#include <asm/udbg.h>
 #include <asm/processor.h>
 #include <asm/naca.h>
-#include <asm/uaccess.h>
-#include <asm/machdep.h>
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/pmac_feature.h>