diff --git a/media/jni/mediaeditor/VideoEditorClasses.cpp b/media/jni/mediaeditor/VideoEditorClasses.cpp
index bfbdd776d2a3e..5696433614fe0 100755
--- a/media/jni/mediaeditor/VideoEditorClasses.cpp
+++ b/media/jni/mediaeditor/VideoEditorClasses.cpp
@@ -28,7 +28,6 @@ extern "C" {
 #include <M4OSA_FileWriter.h>
 #include <M4OSA_Memory.h>
 #include <M4OSA_Debug.h>
-#include <M4OSA_String.h>
 #include <M4OSA_Thread.h>
 #include <M4VSS3GPP_API.h>
 #include <M4xVSS_API.h>
diff --git a/media/jni/mediaeditor/VideoEditorMain.cpp b/media/jni/mediaeditor/VideoEditorMain.cpp
index 0376806cf0fda..c95a0c25c13a0 100755
--- a/media/jni/mediaeditor/VideoEditorMain.cpp
+++ b/media/jni/mediaeditor/VideoEditorMain.cpp
@@ -41,15 +41,12 @@ extern "C" {
 #include <M4OSA_FileCommon.h>
 #include <M4OSA_FileReader.h>
 #include <M4OSA_FileWriter.h>
-#include <M4OSA_FileExtra.h>
 #include <M4OSA_Memory.h>
-#include <M4OSA_String.h>
 #include <M4OSA_Thread.h>
 #include <M4xVSS_API.h>
 #include <M4VSS3GPP_ErrorCodes.h>
 #include <M4MCS_API.h>
 #include <M4MCS_ErrorCodes.h>
-#include <M4MDP_API.h>
 #include <M4READER_Common.h>
 #include <M4WRITER_common.h>
 };
diff --git a/media/jni/mediaeditor/VideoEditorOsal.cpp b/media/jni/mediaeditor/VideoEditorOsal.cpp
index 616c2fe4aa1e7..53e7de176ae45 100755
--- a/media/jni/mediaeditor/VideoEditorOsal.cpp
+++ b/media/jni/mediaeditor/VideoEditorOsal.cpp
@@ -25,7 +25,6 @@ extern "C" {
 #include <M4OSA_FileReader.h>
 #include <M4OSA_FileWriter.h>
 #include <M4OSA_Memory.h>
-#include <M4OSA_String.h>
 #include <M4OSA_Thread.h>
 #include <M4xVSS_API.h>
 #include <M4VSS3GPP_ErrorCodes.h>
@@ -82,14 +81,6 @@ static const VideoEdit_Osal_Result gkRESULTS[] =
     VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_FILE_BAD_MODE_ACCESS                             ),
     VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_FILE_INVALID_POSITION                            ),
 
-    // M4OSA_String.h
-    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_STR_BAD_STRING                                   ),
-    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_STR_CONV_FAILED                                  ),
-    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_STR_OVERFLOW                                     ),
-    VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_STR_BAD_ARGS                                     ),
-    VIDEOEDIT_OSAL_RESULT_INIT(M4WAR_STR_OVERFLOW                                     ),
-    VIDEOEDIT_OSAL_RESULT_INIT(M4WAR_STR_NOT_FOUND                                    ),
-
     // M4OSA_Thread.h
     VIDEOEDIT_OSAL_RESULT_INIT(M4ERR_THREAD_NOT_STARTED                               ),
 
diff --git a/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp b/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp
index 39221f3071ef0..9de720768c404 100755
--- a/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp
+++ b/media/jni/mediaeditor/VideoEditorPropertiesMain.cpp
@@ -34,13 +34,11 @@ extern "C" {
 #include <M4OSA_FileReader.h>
 #include <M4OSA_FileWriter.h>
 #include <M4OSA_Memory.h>
-#include <M4OSA_String.h>
 #include <M4OSA_Thread.h>
 #include <M4VSS3GPP_API.h>
 #include <M4VSS3GPP_ErrorCodes.h>
 #include <M4MCS_API.h>
 #include <M4MCS_ErrorCodes.h>
-#include <M4MDP_API.h>
 #include <M4READER_Common.h>
 #include <M4WRITER_common.h>
 #include <M4DECODER_Common.h>