Renamed libretro-sdk to libretro-common

Makefile.common

@@ -39,7 +39,7 @@ ifeq ($(REENTRANT_TEST), 1)
    OBJ += console/test.o
 endif
 
-CFLAGS += -I./libretro-sdk/include
+CFLAGS += -I./libretro-common/include
 
 # Switches
 
@@ -96,12 +96,12 @@ OBJ += frontend/frontend.o \
 		retroarch.o \
 		runloop.o \
 		content.o \
-		libretro-sdk/file/file_list.o \
-		libretro-sdk/file/dir_list.o \
-		libretro-sdk/string/string_list.o \
+		libretro-common/file/file_list.o \
+		libretro-common/file/dir_list.o \
+		libretro-common/string/string_list.o \
 		file_ops.o \
-		libretro-sdk/file//nbio/nbio_stdio.o \
-		libretro-sdk/file/file_path.o \
+		libretro-common/file//nbio/nbio_stdio.o \
+		libretro-common/file/file_path.o \
 		hash.o \
 		audio/audio_driver.o \
 		audio/audio_monitor.o \
@@ -119,7 +119,7 @@ OBJ += frontend/frontend.o \
 		settings_data.o \
 		dynamic.o \
 		dynamic_dummy.o \
-		libretro-sdk/queues/message_queue.o \
+		libretro-common/queues/message_queue.o \
 		rewind.o \
 		gfx/drivers_font_renderer/bitmapfont.o \
 		input/input_autodetect.o \
@@ -132,22 +132,22 @@ OBJ += frontend/frontend.o \
 		input/keyboard_line.o \
 		input/input_overlay.o \
 		patch.o \
-		libretro-sdk/queues/fifo_buffer.o \
+		libretro-common/queues/fifo_buffer.o \
 		core_options.o \
-		libretro-sdk/compat/compat.o \
-		libretro-sdk/compat/compat_fnmatch.o \
+		libretro-common/compat/compat.o \
+		libretro-common/compat/compat_fnmatch.o \
 		cheats.o \
 		core_info.o \
-		libretro-sdk/file/config_file.o \
-		libretro-sdk/file/config_file_userdata.o \
+		libretro-common/file/config_file.o \
+		libretro-common/file/config_file_userdata.o \
 		screenshot.o \
-		libretro-sdk/gfx/scaler/scaler.o \
+		libretro-common/gfx/scaler/scaler.o \
 		gfx/drivers_shader/shader_null.o \
 		gfx/video_shader_driver.o \
 		gfx/video_shader_parse.o \
-		libretro-sdk/gfx/scaler/pixconv.o \
-		libretro-sdk/gfx/scaler/scaler_int.o \
-		libretro-sdk/gfx/scaler/scaler_filter.o \
+		libretro-common/gfx/scaler/pixconv.o \
+		libretro-common/gfx/scaler/scaler_int.o \
+		libretro-common/gfx/scaler/scaler_filter.o \
 		gfx/image/image_rpng.o \
 		gfx/font_renderer_driver.o \
 		gfx/video_filter.o \
@@ -322,7 +322,7 @@ ifeq ($(HAVE_FREETYPE), 1)
 endif
 
 ifeq ($(HAVE_THREADS), 1)
-   OBJ += autosave.o libretro-sdk/rthreads/rthreads.o gfx/video_thread_wrapper.o audio/audio_thread_wrapper.o
+   OBJ += autosave.o libretro-common/rthreads/rthreads.o gfx/video_thread_wrapper.o audio/audio_thread_wrapper.o
    DEFINES += -DHAVE_THREADS
    ifeq ($(findstring Haiku,$(OS)),)
       LIBS += -lpthread
@@ -387,9 +387,9 @@ ifeq ($(HAVE_OPENGL), 1)
 			 gfx/drivers_context/gfx_null_ctx.o \
 			 gfx/font_gl_driver.o \
 			 gfx/drivers_font/gl_raster_font.o \
-			 libretro-sdk/gfx/math/matrix_4x4.o \
+			 libretro-common/gfx/math/matrix_4x4.o \
 			 gfx/video_state_tracker.o \
-			 libretro-sdk/glsym/rglgen.o
+			 libretro-common/glsym/rglgen.o
 
    ifeq ($(HAVE_KMS), 1)
       OBJ += gfx/drivers_context/drm_egl_ctx.o
@@ -442,10 +442,10 @@ ifeq ($(HAVE_OPENGL), 1)
       ifeq ($(HAVE_GLES3), 1)
          DEFINES += -DHAVE_OPENGLES3
       endif
-      OBJ += libretro-sdk/glsym/glsym_es2.o
+      OBJ += libretro-common/glsym/glsym_es2.o
    else
       DEFINES += -DHAVE_GL_SYNC
-      OBJ += libretro-sdk/glsym/glsym_gl.o
+      OBJ += libretro-common/glsym/glsym_gl.o
       ifeq ($(OSX), 1)
          LIBS += -framework OpenGL
       else ifneq ($(findstring Win32,$(OS)),)
@@ -500,7 +500,7 @@ ifeq ($(HAVE_EXYNOS), 1)
 endif
 
 ifeq ($(HAVE_VG), 1)
-   OBJ += gfx/drivers/vg.o libretro-sdk/gfx/math/matrix_3x3.o
+   OBJ += gfx/drivers/vg.o libretro-common/gfx/math/matrix_3x3.o
    DEFINES += $(VG_CFLAGS)
    LIBS += $(VG_LIBS)
 endif
@@ -536,7 +536,7 @@ endif
    #LIBS += $(LIBXML2_LIBS)
    #DEFINES += $(LIBXML2_CFLAGS)
 #else
-   #OBJ += libretro-sdk/formats/xml/rxml.o
+   #OBJ += libretro-common/formats/xml/rxml.o
 #endif
 
 # Compression/Archive
@@ -566,7 +566,7 @@ endif
 
 ifeq ($(HAVE_ZLIB), 1)
    ZLIB_OBJS =	decompress/zip_support.o 
-   OBJ += libretro-sdk/formats/png/rpng.o file_extract.o
+   OBJ += libretro-common/formats/png/rpng.o file_extract.o
    OBJ += $(ZLIB_OBJS)
    DEFINES += -DHAVE_ZLIB
    HAVE_COMPRESSION = 1 

Makefile.emscripten

@@ -46,7 +46,7 @@ else
    CFLAGS += -O2
 endif
 
-CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-sdk/include -std=gnu99
+CFLAGS += -Wall -Wno-unused-result -Wno-unused-variable -I. -Ilibretro-common/include -std=gnu99
 
 all: $(TARGET)
 
@@ -85,7 +85,7 @@ clean:
 	rm -f record/*.o
 	rm -f input/*.o
 	rm -f tools/*.o
-	rm -f libretro-sdk/*/*.o
+	rm -f libretro-common/*/*.o
 	rm -f $(TARGET)
 	rm -f *.d
 

Makefile.griffin

@@ -139,7 +139,7 @@ CFLAGS += -Wall -std=gnu99 $(MACHDEP) $(INCLUDE)
 
 OBJ = griffin/griffin.o  $(PLATOBJS)
 
-INCLUDE += -I./libretro-sdk/include
+INCLUDE += -I./libretro-common/include
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER

Makefile.ps3

@@ -34,7 +34,7 @@ EBOOT_PATH		= ps3/pkg/USRDIR/EBOOT.BIN
 CORE_PATH		= ps3/pkg/USRDIR/cores/CORE.SELF
 
 LDDIRS = -L. -L$(CELL_SDK)/target/ppu/lib/PSGL/RSX/ultra-opt
-INCDIRS = -I. -Ips3 -Icommon -Ideps/rzlib -Ilibretro-sdk/include
+INCDIRS = -I. -Ips3 -Icommon -Ideps/rzlib -Ilibretro-common/include
 
 # system platform
 system_platform = unix

Makefile.ps3.rgl

@@ -16,7 +16,7 @@ include $(CELL_MK_DIR)/sdk.makedef.mk
 PPU_LIB_TARGET		= librgl_ps3.a
 
 LDDIRS = -L.
-INCDIRS = -I. -Ips3/gcmgl/include -Ilibretro-sdk/include
+INCDIRS = -I. -Ips3/gcmgl/include -Ilibretro-common/include
 
 RGL_DIR = ps3/gcmgl/src
 

Makefile.ps3.salamander

@@ -18,8 +18,8 @@ endif
 
 STRIP			= $(CELL_SDK)/host-win32/ppu/bin/ppu-lv2-strip.exe
 
-PPU_CFLAGS		+= -I. -Ilibretro-sdk/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
-PPU_SRCS		= frontend/frontend_salamander.c frontend/frontend_driver.c frontend/drivers/platform_ps3.c frontend/drivers/platform_null.c libretro-sdk/file/file_path.c libretro-sdk/file/dir_list.c libretro-sdk/string/string_list.c libretro-sdk/compat/compat.c libretro-sdk/file/config_file.c
+PPU_CFLAGS		+= -I. -Ilibretro-common/include -D__CELLOS_LV2__ -DIS_SALAMANDER -DRARCH_CONSOLE -DHAVE_SYSUTILS -DHAVE_SYSMODULES -DHAVE_RARCH_EXEC
+PPU_SRCS		= frontend/frontend_salamander.c frontend/frontend_driver.c frontend/drivers/platform_ps3.c frontend/drivers/platform_null.c libretro-common/file/file_path.c libretro-common/file/dir_list.c libretro-common/string/string_list.c libretro-common/compat/compat.c libretro-common/file/config_file.c
 
 ifeq ($(HAVE_LOGGER), 1)
 PPU_CFLAGS		+= -DHAVE_LOGGER -Ilogger/netlogger

Makefile.psp1

@@ -19,7 +19,7 @@ ifeq ($(WHOLE_ARCHIVE_LINK), 1)
    WHOLE_END := -Wl,--no-whole-archive
 endif
 
-INCDIR = $(PSPPATH)/include libretro-sdk/include
+INCDIR = $(PSPPATH)/include libretro-common/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)
 

Makefile.psp1.salamander

@@ -10,7 +10,7 @@ else
    OPTIMIZE_LV	:= -O2 -g
 endif
 
-INCDIR = $(PSPPATH)/include libretro-sdk/include
+INCDIR = $(PSPPATH)/include libretro-common/include
 CFLAGS = $(OPTIMIZE_LV) -G0 -std=gnu99 -ffast-math
 ASFLAGS = $(CFLAGS)
 
@@ -31,7 +31,7 @@ PSP_EBOOT_TITLE = RetroArch
 PSP_EBOOT_ICON = psp1/ICON0.PNG
 PSP_EBOOT_PIC1 = psp1/PIC1.PNG
 
-OBJS = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_psp.o frontend/drivers/platform_null.o libretro-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/file/config_file.o psp1/kernel_functions.o 
+OBJS = frontend/frontend_salamander.o frontend/frontend_driver.o frontend/drivers/platform_psp.o frontend/drivers/platform_null.o libretro-common/file/file_path.o libretro-common/string/string_list.o libretro-common/file/dir_list.o libretro-common/compat/compat.o libretro-common/file/config_file.o psp1/kernel_functions.o 
 
 PSPSDK=$(shell psp-config --pspsdk-path)
 include $(PSPSDK)/lib/build.mak

Makefile.wii.salamander

@@ -29,7 +29,7 @@ ELF2DOL = $(DEVKITPPC)/bin/elf2dol$(EXE_EXT)
 DOL_TARGET := retroarch-salamander_wii.dol
 ELF_TARGET := retroarch-salamander_wii.elf
 
-INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-sdk/include
+INCLUDE := -I. -I$(DEVKITPRO)/libogc/include -Ilibretro-common/include
 LIBDIRS := -L$(DEVKITPRO)/libogc/lib/wii -L.
 
 MACHDEP := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float
@@ -39,7 +39,7 @@ 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-sdk/file/file_path.o libretro-sdk/string/string_list.o libretro-sdk/file/dir_list.o libretro-sdk/compat/compat.o libretro-sdk/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/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
 
 ifeq ($(HAVE_LOGGER), 1)
 CFLAGS		+= -DHAVE_LOGGER

Makefile.win

@@ -85,7 +85,7 @@ OBJ              :=
 JOYCONFIG_OBJ    :=
 LIBS             := -lm
 JOYCONFIG_LIBS   :=
-DEFINES          := -I. -Ilibretro-sdk/include -DRARCH_INTERNAL -DHAVE_OVERLAY
+DEFINES          := -I. -Ilibretro-common/include -DRARCH_INTERNAL -DHAVE_OVERLAY
 LDFLAGS          := -L. -static-libgcc
 
 include Makefile.common

android/phoenix/jni/Android.mk

@@ -5,9 +5,9 @@ LOCAL_MODULE := retroarch-jni
 RARCH_DIR := ../../..
 LOCAL_CFLAGS += -std=gnu99 -Wall -DHAVE_LOGGER -DRARCH_DUMMY_LOG -DHAVE_ZLIB -DHAVE_MMAP -DRARCH_INTERNAL
 LOCAL_LDLIBS := -llog -lz
-LOCAL_SRC_FILES := apk-extract/apk-extract.c $(RARCH_DIR)/file_extract.c $(RARCH_DIR)/libretro-sdk/file/file_path.c $(RARCH_DIR)/file_ops.c $(RARCH_DIR)/libretro-sdk/string/string_list.c $(RARCH_DIR)/libretro-sdk/compat/compat.c
+LOCAL_SRC_FILES := apk-extract/apk-extract.c $(RARCH_DIR)/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
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-sdk/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -64,7 +64,7 @@ LOCAL_CFLAGS += -DHAVE_7ZIP
 LOCAL_CFLAGS += -O2
 
 LOCAL_LDLIBS	:= -L$(SYSROOT)/usr/lib -landroid -lEGL $(GLES_LIB) $(LOGGER_LDLIBS) -ldl
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-sdk/include/
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(RARCH_DIR)/libretro-common/include/
 
 LOCAL_CFLAGS += -DHAVE_SL
 LOCAL_LDLIBS += -lOpenSLES -lz

apple/OSXPPC/RetroArch_OSX.xcodeproj/project.pbxproj

@@ -263,7 +263,7 @@
 			buildSettings = {
 				ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)";
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/../../libretro-sdk/include",
+					"$(SRCROOT)/../../libretro-common/include",
 					"$(SRCROOT)/..",
 				);
 				ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH)";
@@ -277,7 +277,7 @@
 				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
 				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/../../libretro-sdk/include",
+					"$(SRCROOT)/../../libretro-common/include",
 					"$(SRCROOT)/..",
 				);
 				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";

apple/RetroArch_OSX.xcodeproj/project.pbxproj

@@ -364,7 +364,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/..",
 					"$(SRCROOT)/../gfx/inc",
-					"$(SRCROOT)/../libretro-sdk/include",
+					"$(SRCROOT)/../libretro-common/include",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/OSX/RetroArch-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
@@ -418,7 +418,7 @@
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/..",
 					"$(SRCROOT)/../gfx/inc",
-					"$(SRCROOT)/../libretro-sdk/include",
+					"$(SRCROOT)/../libretro-common/include",
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/OSX/RetroArch-Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";

apple/iOS/Makefile

@@ -27,7 +27,7 @@ COMMON_FLAGS := -DIOS -DHAVE_GRIFFIN -DHAVE_LOCATION -DHAVE_NETPLAY -DHAVE_RGUI
 COMMON_FLAGS += -DHAVE_CAMERA
 COMMON_IOS_FLAGS := -Wno-deprecated-declarations -Wno-error
 COMMON_IOS_OBJCFLAGS := -fobjc-arc 
-INCFLAGS       := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-sdk/include
+INCFLAGS       := -I$(SRC_DIR) -I$(SRC_DIR)/libretro-common/include
 ${APPLICATION_NAME}_CFLAGS  += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCFLAGS)
 ${APPLICATION_NAME}_CCFLAGS += $(COMMON_FLAGS) $(COMMON_IOS_FLAGS) $(COMMON_IOS_OBJCFLAGS) $(INCFLAGS)
 

apple/iOS/RetroArch_iOS.xcodeproj/project.pbxproj

@@ -495,7 +495,7 @@
 				GCC_PREFIX_HEADER = "";
 				HEADER_SEARCH_PATHS = (
 					../,
-					"../../libretro-sdk/include",
+					"../../libretro-common/include",
 					../../,
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/iOS/RetroArch-Info.plist";
@@ -558,7 +558,7 @@
 				GCC_PREFIX_HEADER = "";
 				HEADER_SEARCH_PATHS = (
 					../,
-					"../../libretro-sdk/include",
+					"../../libretro-common/include",
 					../../,
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/iOS/RetroArch-Info.plist";

audio/test/Makefile

@@ -13,7 +13,7 @@ TESTS := test-sinc-lowest \
 
 CFLAGS += -O3 -ffast-math -g -Wall -pedantic -march=native -std=gnu99
 CFLAGS += -DRESAMPLER_TEST -DRARCH_DUMMY_LOG
-CFLAGS += -I../../libretro-sdk/include -I../../
+CFLAGS += -I../../libretro-common/include -I../../
 
 LDFLAGS += -lm
 

gfx/video_filters/Makefile

@@ -56,8 +56,8 @@ DYLIB = dll
 endif
 
 CC      := $(compiler)
-CXX     := $(subst CC,++,$(compiler)) -std=gnu++0x
-flags   := -fPIC $(extra_flags) -I../../libretro-sdk/include
+CXX     := $(subst CC,++,$(compiler))
+flags   := -fPIC $(extra_flags) -I../../libretro-common/include
 asflags := -fPIC  $(extra_flags)
 objects :=
 flags   += -std=c99

griffin/griffin.c

@@ -66,7 +66,7 @@ PERFORMANCE
 COMPATIBILITY
 ============================================================ */
 #include "../compat/compat.c"
-#include "../libretro-sdk/compat/compat_fnmatch.c"
+#include "../libretro-common/compat/compat_fnmatch.c"
 
 /*============================================================
 CONFIG FILE
@@ -77,8 +77,8 @@ CONFIG FILE
 #undef strcasecmp
 #endif
 
-#include "../libretro-sdk/file/config_file.c"
-#include "../libretro-sdk/file/config_file_userdata.c"
+#include "../libretro-common/file/config_file.c"
+#include "../libretro-common/file/config_file_userdata.c"
 #include "../core_options.c"
 
 /*============================================================
@@ -180,14 +180,14 @@ VIDEO IMAGE
 #include "../gfx/image/image_rpng.c"
 #endif
 
-#include "../libretro-sdk/formats/png/rpng.c"
+#include "../libretro-common/formats/png/rpng.c"
 
 /*============================================================
 VIDEO DRIVER
 ============================================================ */
 
 #if defined(HAVE_OPENGL)
-#include "../libretro-sdk/gfx/math/matrix_4x4.c"
+#include "../libretro-common/gfx/math/matrix_4x4.c"
 #elif defined(GEKKO)
 #ifdef HW_RVL
 #include "../wii/vi_encoder.c"
@@ -197,7 +197,7 @@ VIDEO DRIVER
 
 #ifdef HAVE_VG
 #include "../gfx/drivers/vg.c"
-#include "../libretro-sdk/gfx/math/matrix_3x3.c"
+#include "../libretro-common/gfx/math/matrix_3x3.c"
 #endif
 
 #ifdef HAVE_OMAP
@@ -213,11 +213,11 @@ VIDEO DRIVER
 #include "../gfx/gl_common.c"
 
 #ifndef HAVE_PSGL
-#include "../libretro-sdk/glsym/rglgen.c"
+#include "../libretro-common/glsym/rglgen.c"
 #ifdef HAVE_OPENGLES2
-#include "../libretro-sdk/glsym/glsym_es2.c"
+#include "../libretro-common/glsym/glsym_es2.c"
 #else
-#include "../libretro-sdk/glsym/glsym_gl.c"
+#include "../libretro-common/glsym/glsym_gl.c"
 #endif
 #endif
 
@@ -412,7 +412,7 @@ STATE TRACKER
 /*============================================================
 FIFO BUFFER
 ============================================================ */
-#include "../libretro-sdk/queues/fifo_buffer.c"
+#include "../libretro-common/queues/fifo_buffer.c"
 
 /*============================================================
 AUDIO RESAMPLER
@@ -519,10 +519,10 @@ DRIVERS
 /*============================================================
 SCALERS
 ============================================================ */
-#include "../libretro-sdk/gfx/scaler/scaler_filter.c"
-#include "../libretro-sdk/gfx/scaler/pixconv.c"
-#include "../libretro-sdk/gfx/scaler/scaler.c"
-#include "../libretro-sdk/gfx/scaler/scaler_int.c"
+#include "../libretro-common/gfx/scaler/scaler_filter.c"
+#include "../libretro-common/gfx/scaler/pixconv.c"
+#include "../libretro-common/gfx/scaler/scaler.c"
+#include "../libretro-common/gfx/scaler/scaler_int.c"
 
 /*============================================================
 FILTERS
@@ -562,17 +562,17 @@ DYNAMIC
 FILE
 ============================================================ */
 #include "../content.c"
-#include "../libretro-sdk/file/file_path.c"
-#include "../libretro-sdk/file/dir_list.c"
-#include "../libretro-sdk/string/string_list.c"
+#include "../libretro-common/file/file_path.c"
+#include "../libretro-common/file/dir_list.c"
+#include "../libretro-common/string/string_list.c"
 #include "../file_ops.c"
-#include "../libretro-sdk/file/nbio/nbio_stdio.c"
-#include "../libretro-sdk/file/file_list.c"
+#include "../libretro-common/file/nbio/nbio_stdio.c"
+#include "../libretro-common/file/file_list.c"
 
 /*============================================================
 MESSAGE
 ============================================================ */
-#include "../libretro-sdk/queues/message_queue.c"
+#include "../libretro-common/queues/message_queue.c"
 
 /*============================================================
 PATCH
@@ -645,7 +645,7 @@ THREAD
 #if defined(HAVE_THREADS) && defined(XENON)
 #include "../thread/xenon_sdl_threads.c"
 #elif defined(HAVE_THREADS)
-#include "../libretro-sdk/rthreads/rthreads.c"
+#include "../libretro-common/rthreads/rthreads.c"
 #include "../gfx/video_thread_wrapper.c"
 #include "../audio/audio_thread_wrapper.c"
 #include "../autosave.c"
@@ -780,7 +780,7 @@ XML
 #if 0
 #ifndef HAVE_LIBXML2
 #define RXML_LIBXML2_COMPAT
-#include "../libretro-sdk/formats/xml/rxml.c"
+#include "../libretro-common/formats/xml/rxml.c"
 #endif
 #endif