* limitations under the License.
*/
-#include <stdlib.h>
-#include <string.h>
+#include <cstdlib>
+#include <cstring>
#include "dbg.h"
-#include "i18n.h"
+#include <AppCommon.h>
#include "common.h"
-#include <media_content.h>
-
-#include "ExtNameInfo.h"
#include "DirectoryInfo.h"