diff --git a/libsdhcdrivers/plat_include/exynos4/sdhc/plat/sdio.h b/libsdhcdrivers/plat_include/exynos4/sdhc/plat/sdio.h
index 361f9ac..eded579 100644
--- a/libsdhcdrivers/plat_include/exynos4/sdhc/plat/sdio.h
+++ b/libsdhcdrivers/plat_include/exynos4/sdhc/plat/sdio.h
@@ -12,6 +12,24 @@
 
 #pragma once
 
+#define SDHC0_PADDR 0x12510000
+#define SDHC1_PADDR 0x12520000
+#define SDHC2_PADDR 0x12530000
+#define SDHC3_PADDR 0x12540000
+#define SDHC4_PADDR 0x12550000
+
+#define SDHC0_SIZE  0x1000
+#define SDHC1_SIZE  0x1000
+#define SDHC2_SIZE  0x1000
+#define SDHC3_SIZE  0x1000
+#define SDHC4_SIZE  0x1000
+
+#define SDHC0_IRQ   105
+#define SDHC1_IRQ   106
+#define SDHC2_IRQ   107
+#define SDHC3_IRQ   108
+#define SDHC4_IRQ   109
+
 enum sdio_id {
     SDHC0,
     SDHC1,
diff --git a/libsdhcdrivers/plat_include/imx6/sdhc/plat/sdio.h b/libsdhcdrivers/plat_include/imx6/sdhc/plat/sdio.h
index f551fdb..972fb1f 100644
--- a/libsdhcdrivers/plat_include/imx6/sdhc/plat/sdio.h
+++ b/libsdhcdrivers/plat_include/imx6/sdhc/plat/sdio.h
@@ -12,6 +12,21 @@
 
 #pragma once
 
+#define SDHC1_PADDR 0x02190000
+#define SDHC2_PADDR 0x02194000
+#define SDHC3_PADDR 0x02198000
+#define SDHC4_PADDR 0x0219C000
+
+#define SDHC1_SIZE  0x1000
+#define SDHC2_SIZE  0x1000
+#define SDHC3_SIZE  0x1000
+#define SDHC4_SIZE  0x1000
+
+#define SDHC1_IRQ   54
+#define SDHC2_IRQ   55
+#define SDHC3_IRQ   56
+#define SDHC4_IRQ   57
+
 enum sdio_id {
     SDHC1,
     SDHC2,
diff --git a/libsdhcdrivers/src/plat/exynos4/sdio.c b/libsdhcdrivers/src/plat/exynos4/sdio.c
index a46e385..106bdf1 100644
--- a/libsdhcdrivers/src/plat/exynos4/sdio.c
+++ b/libsdhcdrivers/src/plat/exynos4/sdio.c
@@ -13,24 +13,6 @@
 #include "../../sdhc.h"
 #include "../../services.h"
 
-#define SDHC0_PADDR 0x12510000
-#define SDHC1_PADDR 0x12520000
-#define SDHC2_PADDR 0x12530000
-#define SDHC3_PADDR 0x12540000
-#define SDHC4_PADDR 0x12550000
-
-#define SDHC0_SIZE  0x1000
-#define SDHC1_SIZE  0x1000
-#define SDHC2_SIZE  0x1000
-#define SDHC3_SIZE  0x1000
-#define SDHC4_SIZE  0x1000
-
-#define SDHC0_IRQ   105
-#define SDHC1_IRQ   106
-#define SDHC2_IRQ   107
-#define SDHC3_IRQ   108
-#define SDHC4_IRQ   109
-
 static const int
 _sdhc_irq_table[] = {
     [SDHC0] = SDHC0_IRQ,
@@ -40,7 +22,8 @@
     [SDHC4] = SDHC4_IRQ
 };
 
-enum sdio_id sdio_default_id(void) {
+enum sdio_id sdio_default_id(void)
+{
     return SDHC_DEFAULT;
 }
 
diff --git a/libsdhcdrivers/src/plat/imx6/sdio.c b/libsdhcdrivers/src/plat/imx6/sdio.c
index ac4bbc1..a5d1b2b 100644
--- a/libsdhcdrivers/src/plat/imx6/sdio.c
+++ b/libsdhcdrivers/src/plat/imx6/sdio.c
@@ -13,21 +13,6 @@
 #include "../../sdhc.h"
 #include "../../services.h"
 
-#define SDHC1_PADDR 0x02190000
-#define SDHC2_PADDR 0x02194000
-#define SDHC3_PADDR 0x02198000
-#define SDHC4_PADDR 0x0219C000
-
-#define SDHC1_SIZE  0x1000
-#define SDHC2_SIZE  0x1000
-#define SDHC3_SIZE  0x1000
-#define SDHC4_SIZE  0x1000
-
-#define SDHC1_IRQ   54
-#define SDHC2_IRQ   55
-#define SDHC3_IRQ   56
-#define SDHC4_IRQ   57
-
 static const int
 _sdhc_irq_table[] = {
     [SDHC1] = SDHC1_IRQ,
@@ -36,7 +21,8 @@
     [SDHC4] = SDHC4_IRQ
 };
 
-enum sdio_id sdio_default_id(void) {
+enum sdio_id sdio_default_id(void)
+{
     return SDHC_DEFAULT;
 }