diff --git a/ios/RetroArch.xcodeproj/project.pbxproj b/ios/RetroArch.xcodeproj/project.pbxproj
index c476742ef5..692bf771cd 100644
--- a/ios/RetroArch.xcodeproj/project.pbxproj
+++ b/ios/RetroArch.xcodeproj/project.pbxproj
@@ -37,8 +37,6 @@
 		96AFAE4016C1D4EA009DE44C /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 96AFAE3F16C1D4EA009DE44C /* Default.png */; };
 		96AFAE4216C1D4EA009DE44C /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96AFAE4116C1D4EA009DE44C /* Default@2x.png */; };
 		96AFAE4416C1D4EA009DE44C /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 96AFAE4316C1D4EA009DE44C /* Default-568h@2x.png */; };
-		96AFAE4E16C1D4EA009DE44C /* ViewController_iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = 96AFAE4C16C1D4EA009DE44C /* ViewController_iPhone.xib */; };
-		96AFAE5116C1D4EA009DE44C /* ViewController_iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = 96AFAE4F16C1D4EA009DE44C /* ViewController_iPad.xib */; };
 		96AFAECA16C1D9A9009DE44C /* autosave.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAE9D16C1D9A9009DE44C /* autosave.c */; };
 		96AFAECB16C1D9A9009DE44C /* cheats.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAEA016C1D9A9009DE44C /* cheats.c */; };
 		96AFAECC16C1D9A9009DE44C /* command.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAEA216C1D9A9009DE44C /* command.c */; };
@@ -59,7 +57,6 @@
 		96AFAEDC16C1D9A9009DE44C /* settings.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAEC716C1D9A9009DE44C /* settings.c */; };
 		96AFAEDD16C1D9A9009DE44C /* thread.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAEC816C1D9A9009DE44C /* thread.c */; };
 		96AFAEE416C1DBDB009DE44C /* config_file.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAEE116C1DBDB009DE44C /* config_file.c */; };
-		96AFAF0B16C1DC73009DE44C /* null.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAEEE16C1DC73009DE44C /* null.c */; };
 		96AFAF1816C1DC73009DE44C /* utils.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAEFD16C1DC73009DE44C /* utils.c */; };
 		96AFAF2216C1DF88009DE44C /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 96AFAF2116C1DF88009DE44C /* libz.dylib */; };
 		96AFAF2D16C1DFC8009DE44C /* compat.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAF2416C1DFC8009DE44C /* compat.c */; };
@@ -74,7 +71,6 @@
 		96AFAF9916C1E00A009DE44C /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAF5A16C1E00A009DE44C /* image.c */; };
 		96AFAF9A16C1E00A009DE44C /* matrix.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAF5D16C1E00A009DE44C /* matrix.c */; };
 		96AFAF9B16C1E00A009DE44C /* matrix_3x3.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAF5F16C1E00A009DE44C /* matrix_3x3.c */; };
-		96AFAF9C16C1E00A009DE44C /* null.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAF6116C1E00A009DE44C /* null.c */; };
 		96AFAF9F16C1E00A009DE44C /* rpng.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAF6716C1E00A009DE44C /* rpng.c */; };
 		96AFAFA116C1E00A009DE44C /* filter.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAF6B16C1E00A009DE44C /* filter.c */; };
 		96AFAFA216C1E00A009DE44C /* pixconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAF6D16C1E00A009DE44C /* pixconv.c */; };
@@ -84,7 +80,6 @@
 		96AFAFAC16C1E279009DE44C /* state_tracker.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAF7B16C1E00A009DE44C /* state_tracker.c */; };
 		96AFAFAD16C1EEE9009DE44C /* sinc.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAEF716C1DC73009DE44C /* sinc.c */; };
 		96AFAFD416C1FBC0009DE44C /* input_common.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAFC916C1FBC0009DE44C /* input_common.c */; };
-		96AFAFD716C1FBC0009DE44C /* null.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAFCD16C1FBC0009DE44C /* null.c */; };
 		96CF015016C2C0B700ABF9C9 /* overlay.c in Sources */ = {isa = PBXBuildFile; fileRef = 96AFAFCE16C1FBC0009DE44C /* overlay.c */; };
 		96CF015C16C2F72900ABF9C9 /* ios_input.c in Sources */ = {isa = PBXBuildFile; fileRef = 96CF015B16C2F72900ABF9C9 /* ios_input.c */; };
 /* End PBXBuildFile section */
@@ -124,8 +119,6 @@
 		96AFAE3F16C1D4EA009DE44C /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
 		96AFAE4116C1D4EA009DE44C /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
 		96AFAE4316C1D4EA009DE44C /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
-		96AFAE4D16C1D4EA009DE44C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController_iPhone.xib; sourceTree = "<group>"; };
-		96AFAE5016C1D4EA009DE44C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController_iPad.xib; sourceTree = "<group>"; };
 		96AFAE9D16C1D9A9009DE44C /* autosave.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = autosave.c; path = ../autosave.c; sourceTree = "<group>"; };
 		96AFAE9E16C1D9A9009DE44C /* autosave.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = autosave.h; path = ../autosave.h; sourceTree = "<group>"; };
 		96AFAE9F16C1D9A9009DE44C /* boolean.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = boolean.h; path = ../boolean.h; sourceTree = "<group>"; };
@@ -156,7 +149,6 @@
 		96AFAEB816C1D9A9009DE44C /* movie.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = movie.c; path = ../movie.c; sourceTree = "<group>"; };
 		96AFAEB916C1D9A9009DE44C /* movie.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = movie.h; path = ../movie.h; sourceTree = "<group>"; };
 		96AFAEBA16C1D9A9009DE44C /* netplay_compat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = netplay_compat.h; path = ../netplay_compat.h; sourceTree = "<group>"; };
-		96AFAEBB16C1D9A9009DE44C /* netplay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = netplay.c; path = ../netplay.c; sourceTree = "<group>"; };
 		96AFAEBC16C1D9A9009DE44C /* netplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = netplay.h; path = ../netplay.h; sourceTree = "<group>"; };
 		96AFAEBD16C1D9A9009DE44C /* patch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = patch.c; path = ../patch.c; sourceTree = "<group>"; };
 		96AFAEBE16C1D9A9009DE44C /* patch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = patch.h; path = ../patch.h; sourceTree = "<group>"; };
@@ -174,74 +166,32 @@
 		96AFAEE116C1DBDB009DE44C /* config_file.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = config_file.c; sourceTree = "<group>"; };
 		96AFAEE216C1DBDB009DE44C /* config_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config_file.h; sourceTree = "<group>"; };
 		96AFAEE316C1DBDB009DE44C /* config_file_macros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config_file_macros.h; sourceTree = "<group>"; };
-		96AFAEE616C1DC73009DE44C /* alsa.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alsa.c; sourceTree = "<group>"; };
-		96AFAEE716C1DC73009DE44C /* alsathread.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = alsathread.c; sourceTree = "<group>"; };
 		96AFAEE816C1DC73009DE44C /* coreaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = coreaudio.c; sourceTree = "<group>"; };
-		96AFAEE916C1DC73009DE44C /* dsound.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dsound.c; sourceTree = "<group>"; };
 		96AFAEEB16C1DC73009DE44C /* rarch_dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rarch_dsp.h; sourceTree = "<group>"; };
 		96AFAEEC16C1DC73009DE44C /* hermite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = hermite.c; sourceTree = "<group>"; };
-		96AFAEED16C1DC73009DE44C /* jack.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = jack.c; sourceTree = "<group>"; };
-		96AFAEEE16C1DC73009DE44C /* null.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = null.c; sourceTree = "<group>"; };
-		96AFAEEF16C1DC73009DE44C /* openal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = openal.c; sourceTree = "<group>"; };
-		96AFAEF016C1DC73009DE44C /* opensl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = opensl.c; sourceTree = "<group>"; };
-		96AFAEF116C1DC73009DE44C /* oss.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = oss.c; sourceTree = "<group>"; };
-		96AFAEF216C1DC73009DE44C /* pulse.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pulse.c; sourceTree = "<group>"; };
 		96AFAEF316C1DC73009DE44C /* resampler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = resampler.h; sourceTree = "<group>"; };
-		96AFAEF416C1DC73009DE44C /* roar.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = roar.c; sourceTree = "<group>"; };
-		96AFAEF516C1DC73009DE44C /* rsound.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rsound.c; sourceTree = "<group>"; };
-		96AFAEF616C1DC73009DE44C /* sdl_audio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_audio.c; sourceTree = "<group>"; };
 		96AFAEF716C1DC73009DE44C /* sinc.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sinc.c; sourceTree = "<group>"; };
 		96AFAEF816C1DC73009DE44C /* sinc_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = sinc_neon.S; sourceTree = "<group>"; };
-		96AFAEFA16C1DC73009DE44C /* main.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = main.c; sourceTree = "<group>"; };
-		96AFAEFB16C1DC73009DE44C /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
-		96AFAEFC16C1DC73009DE44C /* snr.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = snr.c; sourceTree = "<group>"; };
 		96AFAEFD16C1DC73009DE44C /* utils.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = utils.c; sourceTree = "<group>"; };
 		96AFAEFE16C1DC73009DE44C /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
 		96AFAEFF16C1DC73009DE44C /* utils_neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = utils_neon.S; sourceTree = "<group>"; };
-		96AFAF0116C1DC73009DE44C /* xaudio-c.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "xaudio-c.cpp"; sourceTree = "<group>"; };
-		96AFAF0216C1DC73009DE44C /* xaudio-c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "xaudio-c.h"; sourceTree = "<group>"; };
-		96AFAF0316C1DC73009DE44C /* xaudio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xaudio.h; sourceTree = "<group>"; };
-		96AFAF0416C1DC73009DE44C /* xaudio.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xaudio.c; sourceTree = "<group>"; };
 		96AFAF2116C1DF88009DE44C /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		96AFAF2416C1DFC8009DE44C /* compat.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = compat.c; sourceTree = "<group>"; };
 		96AFAF2516C1DFC8009DE44C /* getopt_rarch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = getopt_rarch.h; sourceTree = "<group>"; };
 		96AFAF2616C1DFC8009DE44C /* posix_string.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = posix_string.h; sourceTree = "<group>"; };
-		96AFAF2816C1DFC8009DE44C /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		96AFAF2916C1DFC8009DE44C /* rxml.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rxml.c; sourceTree = "<group>"; };
 		96AFAF2A16C1DFC8009DE44C /* rxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rxml.h; sourceTree = "<group>"; };
-		96AFAF2B16C1DFC8009DE44C /* rxml_test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rxml_test.c; sourceTree = "<group>"; };
 		96AFAF2C16C1DFC8009DE44C /* strl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strl.h; sourceTree = "<group>"; };
-		96AFAF3316C1E00A009DE44C /* androidegl_ctx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = androidegl_ctx.c; sourceTree = "<group>"; };
-		96AFAF3416C1E00A009DE44C /* drm_egl_ctx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = drm_egl_ctx.c; sourceTree = "<group>"; };
-		96AFAF3516C1E00A009DE44C /* glx_ctx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = glx_ctx.c; sourceTree = "<group>"; };
-		96AFAF3616C1E00A009DE44C /* ps3_ctx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ps3_ctx.c; sourceTree = "<group>"; };
-		96AFAF3716C1E00A009DE44C /* sdl_ctx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_ctx.c; sourceTree = "<group>"; };
-		96AFAF3816C1E00A009DE44C /* vc_egl_ctx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vc_egl_ctx.c; sourceTree = "<group>"; };
-		96AFAF3916C1E00A009DE44C /* wgl_ctx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = wgl_ctx.c; sourceTree = "<group>"; };
-		96AFAF3A16C1E00A009DE44C /* x11_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x11_common.c; sourceTree = "<group>"; };
-		96AFAF3B16C1E00A009DE44C /* x11_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = x11_common.h; sourceTree = "<group>"; };
-		96AFAF3C16C1E00A009DE44C /* xdk_ctx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xdk_ctx.c; sourceTree = "<group>"; };
-		96AFAF3D16C1E00A009DE44C /* xegl_ctx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xegl_ctx.c; sourceTree = "<group>"; };
-		96AFAF3F16C1E00A009DE44C /* config_file.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = config_file.hpp; sourceTree = "<group>"; };
-		96AFAF4016C1E00A009DE44C /* d3d9.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = d3d9.cpp; sourceTree = "<group>"; };
-		96AFAF4116C1E00A009DE44C /* d3d9.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = d3d9.hpp; sourceTree = "<group>"; };
-		96AFAF4216C1E00A009DE44C /* render_chain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = render_chain.cpp; sourceTree = "<group>"; };
-		96AFAF4316C1E00A009DE44C /* render_chain.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = render_chain.hpp; sourceTree = "<group>"; };
 		96AFAF4516C1E00A009DE44C /* bitmap.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; path = bitmap.bin; sourceTree = "<group>"; };
 		96AFAF4616C1E00A009DE44C /* bitmap.bmp */ = {isa = PBXFileReference; lastKnownFileType = image.bmp; path = bitmap.bmp; sourceTree = "<group>"; };
 		96AFAF4716C1E00A009DE44C /* bitmap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = bitmap.h; sourceTree = "<group>"; };
 		96AFAF4816C1E00A009DE44C /* bitmapfont.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = bitmapfont.c; sourceTree = "<group>"; };
-		96AFAF4916C1E00A009DE44C /* d3d_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = d3d_font.c; sourceTree = "<group>"; };
-		96AFAF4A16C1E00A009DE44C /* d3d_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = d3d_font.h; sourceTree = "<group>"; };
 		96AFAF4B16C1E00A009DE44C /* fonts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fonts.c; sourceTree = "<group>"; };
 		96AFAF4C16C1E00A009DE44C /* fonts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fonts.h; sourceTree = "<group>"; };
 		96AFAF4D16C1E00A009DE44C /* freetype.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = freetype.c; sourceTree = "<group>"; };
 		96AFAF4E16C1E00A009DE44C /* gl_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gl_font.c; sourceTree = "<group>"; };
 		96AFAF4F16C1E00A009DE44C /* gl_font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gl_font.h; sourceTree = "<group>"; };
 		96AFAF5016C1E00A009DE44C /* gl_raster_font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gl_raster_font.c; sourceTree = "<group>"; };
-		96AFAF5116C1E00A009DE44C /* ps_libdbgfont.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ps_libdbgfont.c; sourceTree = "<group>"; };
-		96AFAF5216C1E00A009DE44C /* xdk1_xfonts.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xdk1_xfonts.c; sourceTree = "<group>"; };
-		96AFAF5316C1E00A009DE44C /* xdk360_fonts.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xdk360_fonts.cpp; sourceTree = "<group>"; };
 		96AFAF5416C1E00A009DE44C /* gfx_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gfx_common.c; sourceTree = "<group>"; };
 		96AFAF5516C1E00A009DE44C /* gfx_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gfx_common.h; sourceTree = "<group>"; };
 		96AFAF5616C1E00A009DE44C /* gfx_context.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = gfx_context.c; sourceTree = "<group>"; };
@@ -254,13 +204,8 @@
 		96AFAF5E16C1E00A009DE44C /* matrix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = matrix.h; sourceTree = "<group>"; };
 		96AFAF5F16C1E00A009DE44C /* matrix_3x3.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = matrix_3x3.c; sourceTree = "<group>"; };
 		96AFAF6016C1E00A009DE44C /* matrix_3x3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = matrix_3x3.h; sourceTree = "<group>"; };
-		96AFAF6116C1E00A009DE44C /* null.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = null.c; sourceTree = "<group>"; };
-		96AFAF6316C1E00A009DE44C /* py_state.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = py_state.c; sourceTree = "<group>"; };
-		96AFAF6416C1E00A009DE44C /* py_state.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = py_state.h; sourceTree = "<group>"; };
-		96AFAF6616C1E00A009DE44C /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
 		96AFAF6716C1E00A009DE44C /* rpng.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rpng.c; sourceTree = "<group>"; };
 		96AFAF6816C1E00A009DE44C /* rpng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rpng.h; sourceTree = "<group>"; };
-		96AFAF6916C1E00A009DE44C /* rpng_test.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = rpng_test.c; sourceTree = "<group>"; };
 		96AFAF6B16C1E00A009DE44C /* filter.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = filter.c; sourceTree = "<group>"; };
 		96AFAF6C16C1E00A009DE44C /* filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = filter.h; sourceTree = "<group>"; };
 		96AFAF6D16C1E00A009DE44C /* pixconv.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = pixconv.c; sourceTree = "<group>"; };
@@ -269,29 +214,15 @@
 		96AFAF7016C1E00A009DE44C /* scaler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scaler.h; sourceTree = "<group>"; };
 		96AFAF7116C1E00A009DE44C /* scaler_int.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = scaler_int.c; sourceTree = "<group>"; };
 		96AFAF7216C1E00A009DE44C /* scaler_int.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = scaler_int.h; sourceTree = "<group>"; };
-		96AFAF7316C1E00A009DE44C /* sdl_gfx.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_gfx.c; sourceTree = "<group>"; };
-		96AFAF7416C1E00A009DE44C /* shader_cg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shader_cg.c; sourceTree = "<group>"; };
-		96AFAF7516C1E00A009DE44C /* shader_cg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shader_cg.h; sourceTree = "<group>"; };
 		96AFAF7616C1E00A009DE44C /* shader_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shader_common.h; sourceTree = "<group>"; };
 		96AFAF7716C1E00A009DE44C /* shader_glsl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shader_glsl.c; sourceTree = "<group>"; };
 		96AFAF7816C1E00A009DE44C /* shader_glsl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shader_glsl.h; sourceTree = "<group>"; };
-		96AFAF7916C1E00A009DE44C /* shader_hlsl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = shader_hlsl.c; sourceTree = "<group>"; };
-		96AFAF7A16C1E00A009DE44C /* shader_hlsl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = shader_hlsl.h; sourceTree = "<group>"; };
 		96AFAF7B16C1E00A009DE44C /* state_tracker.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = state_tracker.c; sourceTree = "<group>"; };
 		96AFAF7C16C1E00A009DE44C /* state_tracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = state_tracker.h; sourceTree = "<group>"; };
-		96AFAF7D16C1E00A009DE44C /* vg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = vg.c; sourceTree = "<group>"; };
-		96AFAF7E16C1E00A009DE44C /* xvideo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xvideo.c; sourceTree = "<group>"; };
-		96AFAFC816C1FBC0009DE44C /* dinput.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = dinput.c; sourceTree = "<group>"; };
 		96AFAFC916C1FBC0009DE44C /* input_common.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = input_common.c; sourceTree = "<group>"; };
 		96AFAFCA16C1FBC0009DE44C /* input_common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = input_common.h; sourceTree = "<group>"; };
-		96AFAFCB16C1FBC0009DE44C /* linuxraw_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linuxraw_input.c; sourceTree = "<group>"; };
-		96AFAFCC16C1FBC0009DE44C /* linuxraw_joypad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = linuxraw_joypad.c; sourceTree = "<group>"; };
-		96AFAFCD16C1FBC0009DE44C /* null.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = null.c; sourceTree = "<group>"; };
 		96AFAFCE16C1FBC0009DE44C /* overlay.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = overlay.c; sourceTree = "<group>"; };
 		96AFAFCF16C1FBC0009DE44C /* overlay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = overlay.h; sourceTree = "<group>"; };
-		96AFAFD016C1FBC0009DE44C /* sdl_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_input.c; sourceTree = "<group>"; };
-		96AFAFD116C1FBC0009DE44C /* sdl_joypad.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sdl_joypad.c; sourceTree = "<group>"; };
-		96AFAFD216C1FBC0009DE44C /* x11_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = x11_input.c; sourceTree = "<group>"; };
 		96CF015B16C2F72900ABF9C9 /* ios_input.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = ios_input.c; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -319,8 +250,8 @@
 			children = (
 				963F5ABC16CC522F009BBD19 /* RAButtonGetter.m */,
 				963F5ABD16CC522F009BBD19 /* RASettingEnumerationList.m */,
-				963F5ABE16CC522F009BBD19 /* RASettingsSubList.m */,
 				963F5ABF16CC522F009BBD19 /* RASettingsList.m */,
+				963F5ABE16CC522F009BBD19 /* RASettingsSubList.m */,
 				96366C7216CAF62200D64A22 /* settings.h */,
 			);
 			path = settings;
@@ -367,18 +298,16 @@
 		96AFAE3316C1D4EA009DE44C /* RetroArch */ = {
 			isa = PBXGroup;
 			children = (
-				96096DD716D1ABAF00BF4499 /* RAModuleInfoList.m */,
-				963F5AC416CC523B009BBD19 /* RADirectoryList.m */,
-				963F5AC516CC523B009BBD19 /* RAGameView.m */,
-				963F5AC616CC523B009BBD19 /* RAModuleList.m */,
 				96366C6F16CAF62200D64A22 /* settings */,
-				96297A0D16C5ADDA00E6DCE0 /* views.h */,
-				96297A0A16C5AD8D00E6DCE0 /* RetroArch_iOS.h */,
-				96297A0B16C5AD8D00E6DCE0 /* RetroArch_iOS.m */,
-				96AFAE4C16C1D4EA009DE44C /* ViewController_iPhone.xib */,
-				96AFAE4F16C1D4EA009DE44C /* ViewController_iPad.xib */,
 				96AFAE3416C1D4EA009DE44C /* Supporting Files */,
 				96CF015B16C2F72900ABF9C9 /* ios_input.c */,
+				963F5AC416CC523B009BBD19 /* RADirectoryList.m */,
+				963F5AC516CC523B009BBD19 /* RAGameView.m */,
+				96096DD716D1ABAF00BF4499 /* RAModuleInfoList.m */,
+				963F5AC616CC523B009BBD19 /* RAModuleList.m */,
+				96297A0A16C5AD8D00E6DCE0 /* RetroArch_iOS.h */,
+				96297A0B16C5AD8D00E6DCE0 /* RetroArch_iOS.m */,
+				96297A0D16C5ADDA00E6DCE0 /* views.h */,
 			);
 			path = RetroArch;
 			sourceTree = "<group>";
@@ -386,13 +315,13 @@
 		96AFAE3416C1D4EA009DE44C /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
-				96297A0E16C5AEA100E6DCE0 /* main.m */,
-				96AFAE3516C1D4EA009DE44C /* RetroArch-Info.plist */,
-				96AFAE3616C1D4EA009DE44C /* InfoPlist.strings */,
-				96AFAE3B16C1D4EA009DE44C /* RetroArch-Prefix.pch */,
+				96AFAE4316C1D4EA009DE44C /* Default-568h@2x.png */,
 				96AFAE3F16C1D4EA009DE44C /* Default.png */,
 				96AFAE4116C1D4EA009DE44C /* Default@2x.png */,
-				96AFAE4316C1D4EA009DE44C /* Default-568h@2x.png */,
+				96AFAE3616C1D4EA009DE44C /* InfoPlist.strings */,
+				96297A0E16C5AEA100E6DCE0 /* main.m */,
+				96AFAE3516C1D4EA009DE44C /* RetroArch-Info.plist */,
+				96AFAE3B16C1D4EA009DE44C /* RetroArch-Prefix.pch */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -400,11 +329,11 @@
 		96AFAE9C16C1D976009DE44C /* core */ = {
 			isa = PBXGroup;
 			children = (
-				96AFAFC716C1FBB3009DE44C /* input */,
-				96AFAF3116C1E00A009DE44C /* gfx */,
-				96AFAF2316C1DFC8009DE44C /* compat */,
 				96AFAEE516C1DC73009DE44C /* audio */,
+				96AFAF2316C1DFC8009DE44C /* compat */,
 				96AFAEE016C1DBDB009DE44C /* conf */,
+				96AFAF3116C1E00A009DE44C /* gfx */,
+				96AFAFC716C1FBB3009DE44C /* input */,
 				96AFAE9D16C1D9A9009DE44C /* autosave.c */,
 				96AFAE9E16C1D9A9009DE44C /* autosave.h */,
 				96AFAE9F16C1D9A9009DE44C /* boolean.h */,
@@ -414,18 +343,18 @@
 				96AFAEA316C1D9A9009DE44C /* command.h */,
 				96AFAEA416C1D9A9009DE44C /* config.def.h */,
 				96AFAEA516C1D9A9009DE44C /* config.features.h */,
-				96AFAEA616C1D9A9009DE44C /* driver_funcs.h */,
 				96AFAEA716C1D9A9009DE44C /* driver.c */,
 				96AFAEA816C1D9A9009DE44C /* driver.h */,
+				96AFAEA616C1D9A9009DE44C /* driver_funcs.h */,
 				96AFAEA916C1D9A9009DE44C /* dynamic.c */,
 				96AFAEAA16C1D9A9009DE44C /* dynamic.h */,
 				96AFAEAB16C1D9A9009DE44C /* fifo_buffer.c */,
 				96AFAEAC16C1D9A9009DE44C /* fifo_buffer.h */,
+				96AFAEB016C1D9A9009DE44C /* file.c */,
+				96AFAEB116C1D9A9009DE44C /* file.h */,
 				96AFAEAD16C1D9A9009DE44C /* file_extract.c */,
 				96AFAEAE16C1D9A9009DE44C /* file_extract.h */,
 				96AFAEAF16C1D9A9009DE44C /* file_path.c */,
-				96AFAEB016C1D9A9009DE44C /* file.c */,
-				96AFAEB116C1D9A9009DE44C /* file.h */,
 				96AFAEB216C1D9A9009DE44C /* general.h */,
 				96AFAEB316C1D9A9009DE44C /* hash.c */,
 				96AFAEB416C1D9A9009DE44C /* hash.h */,
@@ -434,15 +363,14 @@
 				96AFAEB716C1D9A9009DE44C /* message.h */,
 				96AFAEB816C1D9A9009DE44C /* movie.c */,
 				96AFAEB916C1D9A9009DE44C /* movie.h */,
-				96AFAEBA16C1D9A9009DE44C /* netplay_compat.h */,
-				96AFAEBB16C1D9A9009DE44C /* netplay.c */,
 				96AFAEBC16C1D9A9009DE44C /* netplay.h */,
+				96AFAEBA16C1D9A9009DE44C /* netplay_compat.h */,
 				96AFAEBD16C1D9A9009DE44C /* patch.c */,
 				96AFAEBE16C1D9A9009DE44C /* patch.h */,
 				96AFAEBF16C1D9A9009DE44C /* performance.c */,
 				96AFAEC016C1D9A9009DE44C /* performance.h */,
-				96AFAEC116C1D9A9009DE44C /* retroarch_logger.h */,
 				96AFAEC216C1D9A9009DE44C /* retroarch.c */,
+				96AFAEC116C1D9A9009DE44C /* retroarch_logger.h */,
 				96AFAEC316C1D9A9009DE44C /* rewind.c */,
 				96AFAEC416C1D9A9009DE44C /* rewind.h */,
 				96AFAEC516C1D9A9009DE44C /* screenshot.c */,
@@ -468,31 +396,16 @@
 		96AFAEE516C1DC73009DE44C /* audio */ = {
 			isa = PBXGroup;
 			children = (
-				96366C4F16C9A4E100D64A22 /* resampler.c */,
-				96AFAEE616C1DC73009DE44C /* alsa.c */,
-				96AFAEE716C1DC73009DE44C /* alsathread.c */,
-				96AFAEE816C1DC73009DE44C /* coreaudio.c */,
-				96AFAEE916C1DC73009DE44C /* dsound.c */,
 				96AFAEEA16C1DC73009DE44C /* ext */,
+				96AFAEE816C1DC73009DE44C /* coreaudio.c */,
 				96AFAEEC16C1DC73009DE44C /* hermite.c */,
-				96AFAEED16C1DC73009DE44C /* jack.c */,
-				96AFAEEE16C1DC73009DE44C /* null.c */,
-				96AFAEEF16C1DC73009DE44C /* openal.c */,
-				96AFAEF016C1DC73009DE44C /* opensl.c */,
-				96AFAEF116C1DC73009DE44C /* oss.c */,
-				96AFAEF216C1DC73009DE44C /* pulse.c */,
+				96366C4F16C9A4E100D64A22 /* resampler.c */,
 				96AFAEF316C1DC73009DE44C /* resampler.h */,
-				96AFAEF416C1DC73009DE44C /* roar.c */,
-				96AFAEF516C1DC73009DE44C /* rsound.c */,
-				96AFAEF616C1DC73009DE44C /* sdl_audio.c */,
 				96AFAEF716C1DC73009DE44C /* sinc.c */,
 				96AFAEF816C1DC73009DE44C /* sinc_neon.S */,
-				96AFAEF916C1DC73009DE44C /* test */,
 				96AFAEFD16C1DC73009DE44C /* utils.c */,
 				96AFAEFE16C1DC73009DE44C /* utils.h */,
 				96AFAEFF16C1DC73009DE44C /* utils_neon.S */,
-				96AFAF0016C1DC73009DE44C /* xaudio-c */,
-				96AFAF0416C1DC73009DE44C /* xaudio.c */,
 			);
 			name = audio;
 			path = ../audio;
@@ -506,33 +419,13 @@
 			path = ext;
 			sourceTree = "<group>";
 		};
-		96AFAEF916C1DC73009DE44C /* test */ = {
-			isa = PBXGroup;
-			children = (
-				96AFAEFA16C1DC73009DE44C /* main.c */,
-				96AFAEFB16C1DC73009DE44C /* Makefile */,
-				96AFAEFC16C1DC73009DE44C /* snr.c */,
-			);
-			path = test;
-			sourceTree = "<group>";
-		};
-		96AFAF0016C1DC73009DE44C /* xaudio-c */ = {
-			isa = PBXGroup;
-			children = (
-				96AFAF0116C1DC73009DE44C /* xaudio-c.cpp */,
-				96AFAF0216C1DC73009DE44C /* xaudio-c.h */,
-				96AFAF0316C1DC73009DE44C /* xaudio.h */,
-			);
-			path = "xaudio-c";
-			sourceTree = "<group>";
-		};
 		96AFAF2316C1DFC8009DE44C /* compat */ = {
 			isa = PBXGroup;
 			children = (
+				96AFAF2716C1DFC8009DE44C /* rxml */,
 				96AFAF2416C1DFC8009DE44C /* compat.c */,
 				96AFAF2516C1DFC8009DE44C /* getopt_rarch.h */,
 				96AFAF2616C1DFC8009DE44C /* posix_string.h */,
-				96AFAF2716C1DFC8009DE44C /* rxml */,
 				96AFAF2C16C1DFC8009DE44C /* strl.h */,
 			);
 			name = compat;
@@ -542,10 +435,8 @@
 		96AFAF2716C1DFC8009DE44C /* rxml */ = {
 			isa = PBXGroup;
 			children = (
-				96AFAF2816C1DFC8009DE44C /* Makefile */,
 				96AFAF2916C1DFC8009DE44C /* rxml.c */,
 				96AFAF2A16C1DFC8009DE44C /* rxml.h */,
-				96AFAF2B16C1DFC8009DE44C /* rxml_test.c */,
 			);
 			path = rxml;
 			sourceTree = "<group>";
@@ -554,8 +445,10 @@
 			isa = PBXGroup;
 			children = (
 				96AFAF3216C1E00A009DE44C /* context */,
-				96AFAF3E16C1E00A009DE44C /* d3d9 */,
 				96AFAF4416C1E00A009DE44C /* fonts */,
+				96AFAF5C16C1E00A009DE44C /* math */,
+				96AFAF6516C1E00A009DE44C /* rpng */,
+				96AFAF6A16C1E00A009DE44C /* scaler */,
 				96AFAF5416C1E00A009DE44C /* gfx_common.c */,
 				96AFAF5516C1E00A009DE44C /* gfx_common.h */,
 				96AFAF5616C1E00A009DE44C /* gfx_context.c */,
@@ -564,23 +457,11 @@
 				96AFAF5916C1E00A009DE44C /* gl_common.h */,
 				96AFAF5A16C1E00A009DE44C /* image.c */,
 				96AFAF5B16C1E00A009DE44C /* image.h */,
-				96AFAF5C16C1E00A009DE44C /* math */,
-				96AFAF6116C1E00A009DE44C /* null.c */,
-				96AFAF6216C1E00A009DE44C /* py_state */,
-				96AFAF6516C1E00A009DE44C /* rpng */,
-				96AFAF6A16C1E00A009DE44C /* scaler */,
-				96AFAF7316C1E00A009DE44C /* sdl_gfx.c */,
-				96AFAF7416C1E00A009DE44C /* shader_cg.c */,
-				96AFAF7516C1E00A009DE44C /* shader_cg.h */,
 				96AFAF7616C1E00A009DE44C /* shader_common.h */,
 				96AFAF7716C1E00A009DE44C /* shader_glsl.c */,
 				96AFAF7816C1E00A009DE44C /* shader_glsl.h */,
-				96AFAF7916C1E00A009DE44C /* shader_hlsl.c */,
-				96AFAF7A16C1E00A009DE44C /* shader_hlsl.h */,
 				96AFAF7B16C1E00A009DE44C /* state_tracker.c */,
 				96AFAF7C16C1E00A009DE44C /* state_tracker.h */,
-				96AFAF7D16C1E00A009DE44C /* vg.c */,
-				96AFAF7E16C1E00A009DE44C /* xvideo.c */,
 			);
 			name = gfx;
 			path = ../gfx;
@@ -590,33 +471,10 @@
 			isa = PBXGroup;
 			children = (
 				962979EE16C3EA3E00E6DCE0 /* ioseagl_ctx.c */,
-				96AFAF3316C1E00A009DE44C /* androidegl_ctx.c */,
-				96AFAF3416C1E00A009DE44C /* drm_egl_ctx.c */,
-				96AFAF3516C1E00A009DE44C /* glx_ctx.c */,
-				96AFAF3616C1E00A009DE44C /* ps3_ctx.c */,
-				96AFAF3716C1E00A009DE44C /* sdl_ctx.c */,
-				96AFAF3816C1E00A009DE44C /* vc_egl_ctx.c */,
-				96AFAF3916C1E00A009DE44C /* wgl_ctx.c */,
-				96AFAF3A16C1E00A009DE44C /* x11_common.c */,
-				96AFAF3B16C1E00A009DE44C /* x11_common.h */,
-				96AFAF3C16C1E00A009DE44C /* xdk_ctx.c */,
-				96AFAF3D16C1E00A009DE44C /* xegl_ctx.c */,
 			);
 			path = context;
 			sourceTree = "<group>";
 		};
-		96AFAF3E16C1E00A009DE44C /* d3d9 */ = {
-			isa = PBXGroup;
-			children = (
-				96AFAF3F16C1E00A009DE44C /* config_file.hpp */,
-				96AFAF4016C1E00A009DE44C /* d3d9.cpp */,
-				96AFAF4116C1E00A009DE44C /* d3d9.hpp */,
-				96AFAF4216C1E00A009DE44C /* render_chain.cpp */,
-				96AFAF4316C1E00A009DE44C /* render_chain.hpp */,
-			);
-			path = d3d9;
-			sourceTree = "<group>";
-		};
 		96AFAF4416C1E00A009DE44C /* fonts */ = {
 			isa = PBXGroup;
 			children = (
@@ -624,17 +482,12 @@
 				96AFAF4616C1E00A009DE44C /* bitmap.bmp */,
 				96AFAF4716C1E00A009DE44C /* bitmap.h */,
 				96AFAF4816C1E00A009DE44C /* bitmapfont.c */,
-				96AFAF4916C1E00A009DE44C /* d3d_font.c */,
-				96AFAF4A16C1E00A009DE44C /* d3d_font.h */,
 				96AFAF4B16C1E00A009DE44C /* fonts.c */,
 				96AFAF4C16C1E00A009DE44C /* fonts.h */,
 				96AFAF4D16C1E00A009DE44C /* freetype.c */,
 				96AFAF4E16C1E00A009DE44C /* gl_font.c */,
 				96AFAF4F16C1E00A009DE44C /* gl_font.h */,
 				96AFAF5016C1E00A009DE44C /* gl_raster_font.c */,
-				96AFAF5116C1E00A009DE44C /* ps_libdbgfont.c */,
-				96AFAF5216C1E00A009DE44C /* xdk1_xfonts.c */,
-				96AFAF5316C1E00A009DE44C /* xdk360_fonts.cpp */,
 			);
 			path = fonts;
 			sourceTree = "<group>";
@@ -650,22 +503,11 @@
 			path = math;
 			sourceTree = "<group>";
 		};
-		96AFAF6216C1E00A009DE44C /* py_state */ = {
-			isa = PBXGroup;
-			children = (
-				96AFAF6316C1E00A009DE44C /* py_state.c */,
-				96AFAF6416C1E00A009DE44C /* py_state.h */,
-			);
-			path = py_state;
-			sourceTree = "<group>";
-		};
 		96AFAF6516C1E00A009DE44C /* rpng */ = {
 			isa = PBXGroup;
 			children = (
-				96AFAF6616C1E00A009DE44C /* Makefile */,
 				96AFAF6716C1E00A009DE44C /* rpng.c */,
 				96AFAF6816C1E00A009DE44C /* rpng.h */,
-				96AFAF6916C1E00A009DE44C /* rpng_test.c */,
 			);
 			path = rpng;
 			sourceTree = "<group>";
@@ -688,17 +530,10 @@
 		96AFAFC716C1FBB3009DE44C /* input */ = {
 			isa = PBXGroup;
 			children = (
-				96AFAFC816C1FBC0009DE44C /* dinput.c */,
 				96AFAFC916C1FBC0009DE44C /* input_common.c */,
-				96AFAFCB16C1FBC0009DE44C /* linuxraw_input.c */,
 				96AFAFCA16C1FBC0009DE44C /* input_common.h */,
-				96AFAFCC16C1FBC0009DE44C /* linuxraw_joypad.c */,
-				96AFAFCD16C1FBC0009DE44C /* null.c */,
 				96AFAFCE16C1FBC0009DE44C /* overlay.c */,
 				96AFAFCF16C1FBC0009DE44C /* overlay.h */,
-				96AFAFD016C1FBC0009DE44C /* sdl_input.c */,
-				96AFAFD116C1FBC0009DE44C /* sdl_joypad.c */,
-				96AFAFD216C1FBC0009DE44C /* x11_input.c */,
 			);
 			name = input;
 			path = ../input;
@@ -760,8 +595,6 @@
 				96AFAE4016C1D4EA009DE44C /* Default.png in Resources */,
 				96AFAE4216C1D4EA009DE44C /* Default@2x.png in Resources */,
 				96AFAE4416C1D4EA009DE44C /* Default-568h@2x.png in Resources */,
-				96AFAE4E16C1D4EA009DE44C /* ViewController_iPhone.xib in Resources */,
-				96AFAE5116C1D4EA009DE44C /* ViewController_iPad.xib in Resources */,
 				962979F616C43B9500E6DCE0 /* ic_dir.png in Resources */,
 				962979F716C43B9500E6DCE0 /* ic_file.png in Resources */,
 				96297A2416C818FF00E6DCE0 /* Icon-72.png in Resources */,
@@ -796,7 +629,6 @@
 				96AFAEDC16C1D9A9009DE44C /* settings.c in Sources */,
 				96AFAEDD16C1D9A9009DE44C /* thread.c in Sources */,
 				96AFAEE416C1DBDB009DE44C /* config_file.c in Sources */,
-				96AFAF0B16C1DC73009DE44C /* null.c in Sources */,
 				96AFAF1816C1DC73009DE44C /* utils.c in Sources */,
 				96AFAF2D16C1DFC8009DE44C /* compat.c in Sources */,
 				96AFAF2F16C1DFC8009DE44C /* rxml.c in Sources */,
@@ -810,7 +642,6 @@
 				96AFAF9916C1E00A009DE44C /* image.c in Sources */,
 				96AFAF9A16C1E00A009DE44C /* matrix.c in Sources */,
 				96AFAF9B16C1E00A009DE44C /* matrix_3x3.c in Sources */,
-				96AFAF9C16C1E00A009DE44C /* null.c in Sources */,
 				96AFAF9F16C1E00A009DE44C /* rpng.c in Sources */,
 				96AFAFA116C1E00A009DE44C /* filter.c in Sources */,
 				96AFAFA216C1E00A009DE44C /* pixconv.c in Sources */,
@@ -820,7 +651,6 @@
 				96AFAFAC16C1E279009DE44C /* state_tracker.c in Sources */,
 				96AFAFAD16C1EEE9009DE44C /* sinc.c in Sources */,
 				96AFAFD416C1FBC0009DE44C /* input_common.c in Sources */,
-				96AFAFD716C1FBC0009DE44C /* null.c in Sources */,
 				96CF015016C2C0B700ABF9C9 /* overlay.c in Sources */,
 				96CF015C16C2F72900ABF9C9 /* ios_input.c in Sources */,
 				962979EF16C3EA3E00E6DCE0 /* ioseagl_ctx.c in Sources */,
@@ -851,22 +681,6 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		96AFAE4C16C1D4EA009DE44C /* ViewController_iPhone.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				96AFAE4D16C1D4EA009DE44C /* en */,
-			);
-			name = ViewController_iPhone.xib;
-			sourceTree = "<group>";
-		};
-		96AFAE4F16C1D4EA009DE44C /* ViewController_iPad.xib */ = {
-			isa = PBXVariantGroup;
-			children = (
-				96AFAE5016C1D4EA009DE44C /* en */,
-			);
-			name = ViewController_iPad.xib;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
diff --git a/ios/RetroArch/en.lproj/ViewController_iPad.xib b/ios/RetroArch/en.lproj/ViewController_iPad.xib
deleted file mode 100644
index 103cc68cb7..0000000000
--- a/ios/RetroArch/en.lproj/ViewController_iPad.xib
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">12A206j</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2519</string>
-		<string key="IBDocument.AppKitVersion">1172.1</string>
-		<string key="IBDocument.HIToolboxVersion">613.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1856</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrame">{{0, 20}, {768, 1004}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
-					<int key="IBUIStatusBarStyle">2</int>
-				</object>
-				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">ViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="1.CustomClassName">GLKView</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">3</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBIPadFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<bool key="IBDocument.UseAutolayout">YES</bool>
-		<string key="IBCocoaTouchPluginVersion">1856</string>
-	</data>
-</archive>
diff --git a/ios/RetroArch/en.lproj/ViewController_iPhone.xib b/ios/RetroArch/en.lproj/ViewController_iPhone.xib
deleted file mode 100644
index 6b89ba8f0a..0000000000
--- a/ios/RetroArch/en.lproj/ViewController_iPhone.xib
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1536</int>
-		<string key="IBDocument.SystemVersion">12A269</string>
-		<string key="IBDocument.InterfaceBuilderVersion">2835</string>
-		<string key="IBDocument.AppKitVersion">1187</string>
-		<string key="IBDocument.HIToolboxVersion">624.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">1919</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="841351856">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="371349661">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="184854543">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrameSize">{320, 568}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-				<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-				<object class="IBUIScreenMetrics" key="IBUISimulatedDestinationMetrics">
-					<string key="IBUISimulatedSizeMetricsClass">IBUIScreenMetrics</string>
-					<object class="NSMutableDictionary" key="IBUINormalizedOrientationToSizeMap">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<array key="dict.sortedKeys">
-							<integer value="1"/>
-							<integer value="3"/>
-						</array>
-						<array key="dict.values">
-							<string>{320, 568}</string>
-							<string>{568, 320}</string>
-						</array>
-					</object>
-					<string key="IBUITargetRuntime">IBCocoaTouchFramework</string>
-					<string key="IBUIDisplayName">Retina 4 Full Screen</string>
-					<int key="IBUIType">2</int>
-				</object>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="841351856"/>
-						<reference key="destination" ref="184854543"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="841351856"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="371349661"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2</int>
-						<reference key="object" ref="184854543"/>
-						<reference key="parent" ref="0"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">ViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="2.CustomClassName">GLKView</string>
-				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">4</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<bool key="IBDocument.UseAutolayout">YES</bool>
-		<string key="IBCocoaTouchPluginVersion">1919</string>
-	</data>
-</archive>