diff --git a/drivers/net/mcffec.c b/drivers/net/mcffec.c
index 2e0ddeb77..3b812585b 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 bc7077de7..88f3eb10a 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 76bb5107f..27386e586 100644
--- a/rtc/mcfrtc.c
+++ b/rtc/mcfrtc.c
@@ -22,14 +22,14 @@
  */
 
 #include <common.h>
-#include <command.h>
-#include <rtc.h>
-
-#include <asm/immap.h>
-#include <asm/rtc.h>
 
 #if defined(CONFIG_MCFRTC) && defined(CONFIG_CMD_DATE)
 
+#include <command.h>
+#include <rtc.h>
+#include <asm/immap.h>
+#include <asm/rtc.h>
+
 #undef RTC_DEBUG
 
 #ifndef CFG_MCFRTC_BASE