4 files changed, 5 insertions, 4 deletions
diff --git a/src/commonlib/storage/pci_sdhci.c b/src/commonlib/storage/pci_sdhci.c
index 2bba084d11..a2d30949b3 100644
--- a/src/commonlib/storage/pci_sdhci.c
+++ b/src/commonlib/storage/pci_sdhci.c
@@ -22,8 +22,10 @@
 #include <commonlib/sdhci.h>
 #include <device/pci.h>
 #include <device/pci_ops.h>
-#include "sd_mmc.h"
 #include <stdint.h>
+#include <string.h>
+
+#include "sd_mmc.h"
 #include "storage.h"
 
 /* Initialize an SDHCI port */
diff --git a/src/commonlib/storage/sd.c b/src/commonlib/storage/sd.c
index bd23b7f70c..1389ffb409 100644
--- a/src/commonlib/storage/sd.c
+++ b/src/commonlib/storage/sd.c
@@ -26,7 +26,6 @@
 #include <endian.h>
 #include "sd_mmc.h"
 #include "storage.h"
-#include <string.h>
 #include <timer.h>
 
 int sd_send_if_cond(struct storage_media *media)
diff --git a/src/commonlib/storage/sdhci.c b/src/commonlib/storage/sdhci.c
index 06dffb1c0c..1370a91a14 100644
--- a/src/commonlib/storage/sdhci.c
+++ b/src/commonlib/storage/sdhci.c
@@ -27,7 +27,6 @@
 #include "sdhci.h"
 #include "sd_mmc.h"
 #include "storage.h"
-#include <string.h>
 #include <timer.h>
 #include <commonlib/stdlib.h>
 
diff --git a/src/commonlib/storage/storage_write.c b/src/commonlib/storage/storage_write.c
index aef8624127..d21cc293db 100644
--- a/src/commonlib/storage/storage_write.c
+++ b/src/commonlib/storage/storage_write.c
@@ -19,9 +19,10 @@
  * GNU General Public License for more details.
  */
 
+#include <stdlib.h>
+
 #include "sd_mmc.h"
 #include "storage.h"
-#include <string.h>
 
 static uint32_t storage_write(struct storage_media *media, uint32_t start,
 	uint64_t block_count, const void *src)