diff --git a/Makefile.ctr b/Makefile.ctr
index 574ce21541..cb1aa30512 100644
--- a/Makefile.ctr
+++ b/Makefile.ctr
@@ -42,7 +42,7 @@ ifeq ($(GRIFFIN_BUILD), 1)
 else
 	OBJS += libretro-common/file/file_extract.o
 	OBJS += performance.o
-	OBJS += libretro-common/compat/compat.o
+	OBJS += libretro-common/compat/compat_strl.o
 	OBJS += libretro-common/compat/compat_fnmatch.o
 	OBJS += libretro-common/memmap/memalign.o
 	OBJS += libretro-common/file/config_file.o
diff --git a/Makefile.ps3.salamander b/Makefile.ps3.salamander
index 62922783c3..746fc53a4a 100644
--- a/Makefile.ps3.salamander
+++ b/Makefile.ps3.salamander
@@ -29,7 +29,7 @@ PPU_SRCS		= frontend/frontend_salamander.c \
 				  libretro-common/file/retro_stat.c \
 				  libretro-common/hash/rhash.c \
 				  libretro-common/string/string_list.c \
-				  libretro-common/compat/compat.c \
+				  libretro-common/compat/compat_strl.c \
 				  libretro-common/file/retro_file.c \
 				  libretro-common/file/config_file.c
 
diff --git a/Makefile.psp1.salamander b/Makefile.psp1.salamander
index c9799487b2..9c8b6725ba 100644
--- a/Makefile.psp1.salamander
+++ b/Makefile.psp1.salamander
@@ -39,7 +39,7 @@ OBJS = frontend/frontend_salamander.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/compat/compat_strl.o \
 		 libretro-common/file/config_file.o \
 		 libretro-common/file/retro_file.o \
 		 libretro-common/file/retro_stat.o \
diff --git a/Makefile.wii.salamander b/Makefile.wii.salamander
index 530e20341a..76a0d5c5fc 100644
--- a/Makefile.wii.salamander
+++ b/Makefile.wii.salamander
@@ -51,7 +51,7 @@ OBJ = frontend/frontend_salamander.o \
 		libretro-common/file/retro_file.o \
 		libretro-common/file/retro_dirent.o \
 		libretro-common/file/retro_stat.o \
-		libretro-common/compat/compat.o \
+		libretro-common/compat/compat_strl.o \
 		libretro-common/file/config_file.o \
 		$(APP_BOOTER_DIR)/app_booter.binobj
 
diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk
index 4c185f350a..0a207b69b6 100644
--- a/pkg/android/phoenix/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@@ -5,7 +5,14 @@ LOCAL_MODULE := retroarch-jni
 RARCH_DIR := ../../../..
 LOCAL_CFLAGS += -std=gnu99 -Wall -DRARCH_DUMMY_LOG -DHAVE_ZLIB -DHAVE_MMAP -DRARCH_INTERNAL
 LOCAL_LDLIBS := -llog -lz
-LOCAL_SRC_FILES := apk-extract/apk-extract.c $(RARCH_DIR)/libretro-common/file/file_extract.c $(RARCH_DIR)/libretro-common/file/file_path.c $(RARCH_DIR)/file_ops.c $(RARCH_DIR)/libretro-common/string/string_list.c $(RARCH_DIR)/libretro-common/compat/compat.c $(RARCH_DIR)/libretro-common/file/retro_file.c $(RARCH_DIR)/libretro-common/file/retro_stat.c
+LOCAL_SRC_FILES := apk-extract/apk-extract.c \
+					 	$(RARCH_DIR)/libretro-common/file/file_extract.c \
+						$(RARCH_DIR)/libretro-common/file/file_path.c \
+						$(RARCH_DIR)/file_ops.c \
+						$(RARCH_DIR)/libretro-common/string/string_list.c \
+						$(RARCH_DIR)/libretro-common/compat/compat_strl.c \
+						$(RARCH_DIR)/libretro-common/file/retro_file.c \
+						$(RARCH_DIR)/libretro-common/file/retro_stat.c
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/