diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 2e0ddeb7772a71f9688e8b057ac0332f7ea06d6f..3b812585b76f58d83dd640e5493fd21a7dea4f4c 100644
--- a/drivers/net/mcffec.c
+++ b/drivers/net/mcffec.c
@@ -27,15 +27,15 @@
 #include <common.h>
 #include <malloc.h>
 
+#ifdef CONFIG_MCFFEC
+
 #include <asm/fec.h>
 #include <asm/immap.h>
 
 #include <command.h>
-#include <config.h>
 #include <net.h>
 #include <miiphy.h>
 
-#ifdef CONFIG_MCFFEC
 #undef	ET_DEBUG
 #undef	MII_DEBUG
 
diff --git a/drivers/serial/mcfuart.c b/drivers/serial/mcfuart.c
index bc7077de79e5d0d82c71a496e0d7bf5aa93d135d..88f3eb10abf8f3b4b67d5459b503cb3b6f8e7830 100644
--- a/drivers/serial/mcfuart.c
+++ b/drivers/serial/mcfuart.c
@@ -28,12 +28,14 @@
  */
 
 #include <common.h>
+
+#ifdef CONFIG_MCFUART
+
 #include <asm/immap.h>
 #include <asm/uart.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_MCFUART
 extern void uart_port_conf(void);
 
 int serial_init(void)
diff --git a/rtc/mcfrtc.c b/rtc/mcfrtc.c
index 76bb5107f6a32dbe2f3bb6eaff3301dd4702ca21..27386e586a6bed91850d0aaf0baec2fee97fdb46 100644
--- a/rtc/mcfrtc.c
+++ b/rtc/mcfrtc.c
@@ -22,14 +22,14 @@
  */
 
 #include <common.h>
+
+#if defined(CONFIG_MCFRTC) && defined(CONFIG_CMD_DATE)
+
 #include <command.h>
 #include <rtc.h>
-
 #include <asm/immap.h>
 #include <asm/rtc.h>
 
-#if defined(CONFIG_MCFRTC) && defined(CONFIG_CMD_DATE)
-
 #undef RTC_DEBUG
 
 #ifndef CFG_MCFRTC_BASE