diff --git a/src/commonlib/storage/bouncebuf.c b/src/commonlib/storage/bouncebuf.c
index c8125aaa42..6ddfb70af5 100644
--- a/src/commonlib/storage/bouncebuf.c
+++ b/src/commonlib/storage/bouncebuf.c
@@ -16,7 +16,6 @@
  */
 
 #include <arch/cache.h>
-#include <console/console.h>
 #include "bouncebuf.h"
 #include <halt.h>
 #include "storage.h"
diff --git a/src/commonlib/storage/mmc.c b/src/commonlib/storage/mmc.c
index ca067054e0..d88e469291 100644
--- a/src/commonlib/storage/mmc.c
+++ b/src/commonlib/storage/mmc.c
@@ -20,7 +20,6 @@
  */
 
 #include <commonlib/storage.h>
-#include <console/console.h>
 #include <delay.h>
 #include "sd_mmc.h"
 #include "mmc.h"
diff --git a/src/commonlib/storage/pci_sdhci.c b/src/commonlib/storage/pci_sdhci.c
index c53ab001a9..329b652abb 100644
--- a/src/commonlib/storage/pci_sdhci.c
+++ b/src/commonlib/storage/pci_sdhci.c
@@ -20,7 +20,6 @@
 
 #include <assert.h>
 #include <commonlib/sdhci.h>
-#include <console/console.h>
 #include <device/pci.h>
 #include "sd_mmc.h"
 #include "storage.h"
diff --git a/src/commonlib/storage/sd_mmc.h b/src/commonlib/storage/sd_mmc.h
index d54bbc7537..b9aea46b5d 100644
--- a/src/commonlib/storage/sd_mmc.h
+++ b/src/commonlib/storage/sd_mmc.h
@@ -18,6 +18,7 @@
 #include <commonlib/sd_mmc_ctrlr.h>
 #include <commonlib/storage.h>
 #include <stddef.h>
+#include <console/console.h>
 
 #define SD_MMC_IO_RETRIES	1000
 
diff --git a/src/commonlib/storage/sdhci.c b/src/commonlib/storage/sdhci.c
index a5508ee032..158e28b648 100644
--- a/src/commonlib/storage/sdhci.c
+++ b/src/commonlib/storage/sdhci.c
@@ -19,7 +19,6 @@
 
 #include <assert.h>
 #include "bouncebuf.h"
-#include <console/console.h>
 #include <commonlib/sd_mmc_ctrlr.h>
 #include <commonlib/sdhci.h>
 #include <commonlib/storage.h>
diff --git a/src/commonlib/storage/sdhci_display.c b/src/commonlib/storage/sdhci_display.c
index d05e35a8d7..68747f4b86 100644
--- a/src/commonlib/storage/sdhci_display.c
+++ b/src/commonlib/storage/sdhci_display.c
@@ -20,7 +20,6 @@
 #include <commonlib/sd_mmc_ctrlr.h>
 #include <commonlib/sdhci.h>
 #include <commonlib/storage.h>
-#include <console/console.h>
 #include "sdhci.h"
 #include "sd_mmc.h"
 #include "storage.h"
diff --git a/src/commonlib/storage/storage_erase.c b/src/commonlib/storage/storage_erase.c
index 004a200154..8e97755238 100644
--- a/src/commonlib/storage/storage_erase.c
+++ b/src/commonlib/storage/storage_erase.c
@@ -19,7 +19,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include "sd_mmc.h"
 #include "storage.h"
 
diff --git a/src/commonlib/storage/storage_write.c b/src/commonlib/storage/storage_write.c
index ae9fbc2c5e..ba60b41306 100644
--- a/src/commonlib/storage/storage_write.c
+++ b/src/commonlib/storage/storage_write.c
@@ -19,7 +19,6 @@
  * GNU General Public License for more details.
  */
 
-#include <console/console.h>
 #include "sd_mmc.h"
 #include "storage.h"
 #include <string.h>