diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 81c02a5e43..2842f195c9 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -25,6 +25,7 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  frontend/drivers/platform_null.c \
 				  libretro-common/file/file_path.c \
 				  libretro-common/file/dir_list.c \
+				  libretro-common/file/retro_dirent.c \
 				  libretro-common/hash/rhash.c \
 				  libretro-common/string/string_list.c \
 				  libretro-common/compat/compat.c \
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index fa44cc85ff..28208574c1 100644
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@@ -38,6 +38,7 @@ OBJS = frontend/frontend_salamander.o \
 		 libretro-common/file/file_path.o \
 		 libretro-common/string/string_list.o \
 		 libretro-common/file/dir_list.o \
+		 libretro-common/file/retro_dirent.o \
 		 libretro-common/compat/compat.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/hash/rhash.o \
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index c5cf4c4ee6..af395708f5 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -39,7 +39,19 @@ LIBS := -lfat -lwiiuse -logc -lbte
 
 APP_BOOTER_DIR = wii/app_booter
 
-OBJ = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_gx.o frontend/drivers/platform_wii.o frontend/drivers/platform_null.o libretro-common/file/file_path.o libretro-common/hash/rhash.o libretro-common/string/string_list.o libretro-common/file/dir_list.o libretro-common/compat/compat.o libretro-common/file/config_file.o $(APP_BOOTER_DIR)/app_booter.binobj
+OBJ = frontend/frontend_salamander.o \
+		frontend/frontend_driver.o \
+		frontend/drivers/platform_gx.o \
+		frontend/drivers/platform_wii.o \
+		frontend/drivers/platform_null.o \
+		libretro-common/file/file_path.o \
+		libretro-common/hash/rhash.o \
+		libretro-common/string/string_list.o \
+		libretro-common/file/dir_list.o \
+		libretro-common/file/retro_dirent.o \
+		libretro-common/compat/compat.o \
+		libretro-common/file/config_file.o \
+		$(APP_BOOTER_DIR)/app_booter.binobj
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER
diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c
index 7f96808efe..ccba119a57 100644
--- a/libretro-common/file/retro_dirent.c
+++ b/libretro-common/file/retro_dirent.c
@@ -130,8 +130,6 @@ bool retro_dirent_is_dir(struct RDIR *rdir, const char *path)
 #elif defined(VITA)
    return PSP2_S_ISDIR(entry->d_stat.st_mode);
 #endif
-#elif defined(__CELLOS_LV2__)
-   return S_ISDIR(entry->d_stat.st_mode);
 #elif defined(DT_DIR)
    const struct dirent *entry = (const struct dirent*)rdir->entry;
    if (entry->d_type == DT_DIR)
diff --git a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
index 2600de7daf..0c4658ff43 100644
--- a/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
+++ b/msvc/RetroArch-360-Salamander/RetroArch-Salamander.vcxproj
@@ -286,6 +286,14 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
     </ClCompile>
+    <ClCompile Include="..\..\libretro-common\file\retro_dirent.c">
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Profile_FastCap|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Xbox 360'">CompileAsC</CompileAs>
+      <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release_LTCG|Xbox 360'">CompileAsC</CompileAs>
+    </ClCompile>
     <ClCompile Include="..\..\libretro-common\file\file_path.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='CodeAnalysis|Xbox 360'">CompileAsC</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Xbox 360'">CompileAsC</CompileAs>
diff --git a/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj b/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj
index f1335c8f13..6c51523bb7 100644
--- a/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj
+++ b/msvc/RetroArch-Xbox1-Salamander/RetroArch-Salamander.vcproj
@@ -423,6 +423,39 @@
 								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
 						</FileConfiguration>
 					</File>
+					<File
+						RelativePath="..\..\libretro-common\file\retro_dirent.c">
+						<FileConfiguration
+							Name="Debug|Xbox">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Profile|Xbox">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Profile_FastCap|Xbox">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release|Xbox">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+						<FileConfiguration
+							Name="Release_LTCG|Xbox">
+							<Tool
+								Name="VCCLCompilerTool"
+								ObjectFile="$(IntDir)/$(InputName)1.obj"/>
+						</FileConfiguration>
+					</File>
 					<File
 						RelativePath="..\..\libretro-common\file\file_path.c">
 						<FileConfiguration