diff --git a/model/storage/Makefile b/model/storage/Makefile
index 3f445033053e3a64500b815e3de010e675ac3751..ca3879d79b35c465d229869f818c98a3a6a1089c 100644
--- a/model/storage/Makefile
+++ b/model/storage/Makefile
@@ -12,10 +12,11 @@
 STORAGE_ROOT_DIR = ../../../../../framework/model/storage
 
 obj-$(CONFIG_DRIVERS_HDF_STORAGE) += \
-               $(STORAGE_ROOT_DIR)/src/common/storage_block.o \
-               ./storage_block_linux.o
+               $(STORAGE_ROOT_DIR)/src/mmc/mmc_block.o \
+               ./mmc_block_linux.o
 
-ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/storage/include/common \
+ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/storage/include/mmc \
+            -I$(srctree)/drivers/hdf/framework/model/storage/include/mtd \
             -I$(srctree)/drivers/hdf/framework/include/core \
             -I$(srctree)/drivers/hdf/framework/core/common/include/host \
             -I$(srctree)/drivers/hdf/framework/include/utils \
@@ -24,6 +25,7 @@ ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/storage/include/common \
             -I$(srctree)/drivers/hdf/framework/ability/sbuf/include \
             -I$(srctree)/drivers/hdf/framework/include/platform \
             -I$(srctree)/drivers/hdf/framework/support/platform/include/common \
+            -I$(srctree)/drivers/hdf/framework/support/platform/include/mmc \
             -I$(srctree)/drivers/hdf/framework/include/config \
             -I$(srctree)/drivers/hdf/khdf/osal/include \
             -I$(srctree)/bounds_checking_function/include
diff --git a/model/storage/storage_block_linux.c b/model/storage/mmc_block_linux.c
similarity index 78%
rename from model/storage/storage_block_linux.c
rename to model/storage/mmc_block_linux.c
index e5a75bdc80853e11b43027b3fa89296eeccd1ec8..a55c1870478b6fcdbf677f6a563cfaaa1aec2025 100644
--- a/model/storage/storage_block_linux.c
+++ b/model/storage/mmc_block_linux.c
@@ -16,15 +16,15 @@
  *
  */
 
-#include "storage_block.h"
+#include "mmc_block.h"
 
-int32_t StorageBlockOsInit(struct StorageBlock *sb)
+int32_t MmcBlockOsInit(struct MmcDevice *mmcDevice)
 {
-    (void)sb;
+    (void)mmcDevice;
     return HDF_SUCCESS;
 }
 
-void StorageBlockOsUninit(struct StorageBlock *sb)
+void MmcBlockOsUninit(struct MmcDevice *mmcDevice)
 {
-    (void)sb;
+    (void)mmcDevice;
 }
diff --git a/platform/mmc/Makefile b/platform/mmc/Makefile
index b3e64947eaf39951e4b7a7908bc202acba00595e..014ecb110f9ef2eec3f9c1a4b222acaf9ce3bb54 100644
--- a/platform/mmc/Makefile
+++ b/platform/mmc/Makefile
@@ -19,5 +19,4 @@ obj-y  += $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/mmc/mmc_core.o \
           $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/mmc/mmc_sdio.o \
           $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/mmc/mmc_dispatch.o \
 	  $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/mmc/mmc_if.o \
-	  $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/mmc/mmc_block.o \
 	  $(HDF_PLATFORM_FRAMEWORKS_ROOT)/src/mmc/mmc_protocol.o
diff --git a/platform/platform.mk b/platform/platform.mk
index de551c35611b3104f793b70a185a9127439ad7e0..06773cf5a101c049f531889c92cc9af0cb9fb127 100644
--- a/platform/platform.mk
+++ b/platform/platform.mk
@@ -17,7 +17,9 @@ ccflags-$(CONFIG_DRIVERS_HDF_PLATFORM) +=-I$(srctree)/drivers/hdf/framework/incl
    -I$(srctree)/drivers/hdf/framework/support/platform/include \
    -I$(srctree)/drivers/hdf/framework/support/platform/include/mmc \
    -I$(srctree)/drivers/hdf/framework/support/platform/include/common \
-   -I$(srctree)/drivers/hdf/framework/model/storage/include/common \
+   -I$(srctree)/drivers/hdf/framework/model/storage/include \
+   -I$(srctree)/drivers/hdf/framework/model/storage/include/mmc \
+   -I$(srctree)/drivers/hdf/framework/model/storage/include/mtd \
    -I$(srctree)/include/hdf \
    -I$(srctree)/include/hdf/osal \
    -I$(srctree)/include/hdf/utils \