diff --git a/libretro-common/audio/audio_mix.c b/libretro-common/audio/audio_mix.c
deleted file mode 100644
index ac1dc1e..0000000
--- a/libretro-common/audio/audio_mix.c
+++ /dev/null
@@ -1,314 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (audio_mix.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <audio/audio_mix.h>
-
-#if defined(__SSE2__)
-#include <emmintrin.h>
-#elif defined(__ALTIVEC__)
-#include <altivec.h>
-#endif
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <memalign.h>
-#include <retro_miscellaneous.h>
-#include <audio/audio_mix.h>
-#include <streams/file_stream.h>
-#include <audio/conversion/float_to_s16.h>
-#include <audio/conversion/s16_to_float.h>
-
-void audio_mix_volume_C(float *out, const float *in, float vol, size_t samples)
-{
-   size_t i;
-   for (i = 0; i < samples; i++)
-      out[i] += in[i] * vol;
-}
-
-#ifdef __SSE2__
-void audio_mix_volume_SSE2(float *out, const float *in, float vol, size_t samples)
-{
-   size_t i;
-   __m128 volume = _mm_set1_ps(vol);
-
-   for (i = 0; i + 16 <= samples; i += 16, out += 16, in += 16)
-   {
-      unsigned j;
-      __m128 input[4];
-      __m128 additive[4];
-      
-      input[0]    = _mm_loadu_ps(out +  0);
-      input[1]    = _mm_loadu_ps(out +  4);
-      input[2]    = _mm_loadu_ps(out +  8);
-      input[3]    = _mm_loadu_ps(out + 12);
-
-      additive[0] = _mm_mul_ps(volume, _mm_loadu_ps(in +  0));
-      additive[1] = _mm_mul_ps(volume, _mm_loadu_ps(in +  4));
-      additive[2] = _mm_mul_ps(volume, _mm_loadu_ps(in +  8));
-      additive[3] = _mm_mul_ps(volume, _mm_loadu_ps(in + 12));
-
-      for (j = 0; j < 4; j++)
-         _mm_storeu_ps(out + 4 * j, _mm_add_ps(input[j], additive[j]));
-   }
-
-   audio_mix_volume_C(out, in, vol, samples - i);
-}
-#endif
-
-void audio_mix_free_chunk(audio_chunk_t *chunk)
-{
-   if (!chunk)
-      return;
-
-   if (chunk->rwav && chunk->rwav->samples)
-   {
-      /* rwav_free only frees the samples */
-      rwav_free(chunk->rwav);
-      free(chunk->rwav);
-   }
-
-   if (chunk->buf)
-      free(chunk->buf);
-
-   if (chunk->upsample_buf)
-      memalign_free(chunk->upsample_buf);
-
-   if (chunk->float_buf)
-      memalign_free(chunk->float_buf);
-
-   if (chunk->float_resample_buf)
-      memalign_free(chunk->float_resample_buf);
-
-   if (chunk->resample_buf)
-      memalign_free(chunk->resample_buf);
-
-   if (chunk->resampler && chunk->resampler_data)
-      chunk->resampler->free(chunk->resampler_data);
-
-   free(chunk);
-}
-
-audio_chunk_t* audio_mix_load_wav_file(const char *path, int sample_rate)
-{
-   int sample_size;
-   audio_chunk_t *chunk = (audio_chunk_t*)calloc(1, sizeof(*chunk));
-
-   if (!chunk)
-      return NULL;
-
-   chunk->sample_rate = sample_rate;
-
-   if (!filestream_read_file(path, &chunk->buf, &chunk->len))
-   {
-      printf("Could not open WAV file for reading.\n");
-      goto error;
-   }
-
-   chunk->rwav = (rwav_t*)malloc(sizeof(rwav_t));
-
-   if (rwav_load(chunk->rwav, chunk->buf, chunk->len) == RWAV_ITERATE_ERROR)
-   {
-      printf("error: could not load WAV file\n");
-      goto error;
-   }
-
-   /* numsamples does not know or care about 
-    * multiple channels, but we need space for 2 */
-   chunk->upsample_buf = (int16_t*)memalign_alloc(128,
-         chunk->rwav->numsamples * 2 * sizeof(int16_t));
-
-   sample_size = chunk->rwav->bitspersample / 8;
-
-   if (sample_size == 1)
-   {
-      unsigned i;
-
-     for (i = 0; i < chunk->rwav->numsamples; i++)
-     {
-        uint8_t *sample                     = (
-              (uint8_t*)chunk->rwav->samples) +
-           (i * chunk->rwav->numchannels);
-
-        chunk->upsample_buf[i * 2]          = (int16_t)((sample[0] - 128) << 8);
-
-        if (chunk->rwav->numchannels == 1)
-           chunk->upsample_buf[(i * 2) + 1] = (int16_t)((sample[0] - 128) << 8);
-        else if (chunk->rwav->numchannels == 2)
-           chunk->upsample_buf[(i * 2) + 1] = (int16_t)((sample[1] - 128) << 8);
-     }
-   }
-   else if (sample_size == 2)
-   {
-      if (chunk->rwav->numchannels == 1)
-      {
-         unsigned i;
-
-         for (i = 0; i < chunk->rwav->numsamples; i++)
-         {
-            int16_t sample                   = ((int16_t*)chunk->rwav->samples)[i];
-
-            chunk->upsample_buf[i * 2]       = sample;
-            chunk->upsample_buf[(i * 2) + 1] = sample;
-         }
-      }
-      else if (chunk->rwav->numchannels == 2)
-         memcpy(chunk->upsample_buf, chunk->rwav->samples, chunk->rwav->subchunk2size);
-   }
-   else if (sample_size != 2)
-   {
-      /* we don't support any other sample size besides 8 and 16-bit yet */
-      printf("error: we don't support a sample size of %d\n", sample_size);
-      goto error;
-   }
-
-   if (sample_rate != chunk->rwav->samplerate)
-   {
-      chunk->resample = true;
-      chunk->ratio = (double)sample_rate / chunk->rwav->samplerate;
-
-      retro_resampler_realloc(&chunk->resampler_data,
-            &chunk->resampler,
-            NULL,
-            chunk->ratio);
-
-      if (chunk->resampler && chunk->resampler_data)
-      {
-         struct resampler_data info;
-
-         chunk->float_buf = (float*)memalign_alloc(128, chunk->rwav->numsamples * 2 * chunk->ratio * sizeof(float));
-
-         /* why is *3 needed instead of just *2? does the sinc driver require more space than we know about? */
-         chunk->float_resample_buf = (float*)memalign_alloc(128, chunk->rwav->numsamples * 3 * chunk->ratio * sizeof(float));
-
-         convert_s16_to_float(chunk->float_buf, chunk->upsample_buf, chunk->rwav->numsamples * 2, 1.0);
-
-         info.data_in       = (const float*)chunk->float_buf;
-         info.data_out      = chunk->float_resample_buf;
-         /* a 'frame' consists of two channels, so we set this 
-          * to the number of samples irrespective of channel count */
-         info.input_frames  = chunk->rwav->numsamples;
-         info.output_frames = 0;
-         info.ratio         = chunk->ratio;
-
-         chunk->resampler->process(chunk->resampler_data, &info);
-
-         /* number of output_frames does not increase with multiple channels, but assume we need space for 2 */
-         chunk->resample_buf = (int16_t*)memalign_alloc(128, info.output_frames * 2 * sizeof(int16_t));
-         chunk->resample_len = info.output_frames;
-         convert_float_to_s16(chunk->resample_buf, chunk->float_resample_buf, info.output_frames * 2);
-      }
-   }
-
-   return chunk;
-
-error:
-   audio_mix_free_chunk(chunk);
-   return NULL;
-}
-
-size_t audio_mix_get_chunk_num_samples(audio_chunk_t *chunk)
-{
-   if (!chunk)
-      return 0;
-
-   if (chunk->rwav)
-   {
-      if (chunk->resample)
-         return chunk->resample_len;
-      return chunk->rwav->numsamples;
-   }
-
-   /* no other filetypes supported yet */
-   return 0;
-}
-
-/**
- * audio_mix_get_chunk_sample:
- * @chunk              : audio chunk instance
- * @channel            : channel of the sample (0=left, 1=right)
- * @index              : index of the sample
- *
- * Get a sample from an audio chunk.
- *
- * Returns: A signed 16-bit audio sample.
- **/
-int16_t audio_mix_get_chunk_sample(audio_chunk_t *chunk, unsigned channel, size_t index)
-{
-   if (!chunk)
-      return 0;
-
-   if (chunk->rwav)
-   {
-      int sample_size    = chunk->rwav->bitspersample / 8;
-      int16_t sample_out = 0;
-
-      /* 0 is the first/left channel */
-      uint8_t *sample    = NULL;
-
-      if (chunk->resample)
-         sample = (uint8_t*)chunk->resample_buf +
-            (sample_size * index * chunk->rwav->numchannels) + (channel * sample_size);
-      else
-         sample = (uint8_t*)chunk->upsample_buf +
-            (sample_size * index * chunk->rwav->numchannels) + (channel * sample_size);
-
-      sample_out = (int16_t)*sample;
-
-      return sample_out;
-   }
-
-   /* no other filetypes supported yet */
-   return 0;
-}
-
-int16_t* audio_mix_get_chunk_samples(audio_chunk_t *chunk)
-{
-   if (!chunk)
-      return 0;
-
-   if (chunk->rwav)
-   {
-      int16_t *sample;
-
-      if (chunk->resample)
-         sample = chunk->resample_buf;
-      else
-         sample = chunk->upsample_buf;
-
-      return sample;
-   }
-
-   return NULL;
-}
-
-int audio_mix_get_chunk_num_channels(audio_chunk_t *chunk)
-{
-   if (!chunk)
-      return 0;
-
-   if (chunk->rwav)
-      return chunk->rwav->numchannels;
-
-   /* don't support other formats yet */
-   return 0;
-}
diff --git a/libretro-common/audio/audio_mixer.c b/libretro-common/audio/audio_mixer.c
deleted file mode 100644
index 8afea64..0000000
--- a/libretro-common/audio/audio_mixer.c
+++ /dev/null
@@ -1,652 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (audio_mixer.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <audio/audio_mixer.h>
-#include <audio/audio_resampler.h>
-
-#include <formats/rwav.h>
-#include <memalign.h>
-
-#ifdef HAVE_THREADS
-#include <rthreads/rthreads.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../../config.h"
-#endif
-
-#ifdef HAVE_STB_VORBIS
-#define STB_VORBIS_NO_PUSHDATA_API
-#define STB_VORBIS_NO_STDIO
-#define STB_VORBIS_NO_CRT
-
-#include "../../deps/stb/stb_vorbis.h"
-#endif
-
-#define AUDIO_MIXER_MAX_VOICES      8
-#define AUDIO_MIXER_TEMP_OGG_BUFFER 8192
-
-struct audio_mixer_sound
-{
-   enum audio_mixer_type type;
-   
-   union
-   {
-      struct
-      {
-         /* wav */
-         unsigned frames;
-         const float* pcm;
-      } wav;
-      
-#ifdef HAVE_STB_VORBIS
-      struct
-      {
-         /* ogg */
-         unsigned size;
-         const void* data;
-      } ogg;
-#endif
-   } types;
-};
-
-struct audio_mixer_voice
-{
-   bool     repeat;
-   unsigned type;
-   float    volume;
-   audio_mixer_sound_t *sound;
-   audio_mixer_stop_cb_t stop_cb;
-   
-   union
-   {
-      struct
-      {
-         /* wav */
-         unsigned position;
-      } wav;
-      
-#ifdef HAVE_STB_VORBIS
-      struct
-      {
-         /* ogg */
-         unsigned    position;
-         unsigned    samples;
-         unsigned    buf_samples;
-         float*      buffer;
-         float       ratio;
-         stb_vorbis *stream;
-         void       *resampler_data;
-         const retro_resampler_t *resampler;
-      } ogg;
-#endif
-   } types;
-};
-
-static struct audio_mixer_voice s_voices[AUDIO_MIXER_MAX_VOICES];
-static unsigned s_rate = 0;
-
-#ifdef HAVE_THREADS
-static slock_t* s_locker = NULL;
-#endif
-
-static bool wav2float(const rwav_t* wav, float** pcm, size_t samples_out)
-{
-   size_t i;
-   /* Allocate on a 16-byte boundary, and pad to a multiple of 16 bytes */
-   float *f           = (float*)memalign_alloc(16,
-         ((samples_out + 15) & ~15) * sizeof(float));
-   
-   if (!f)
-      return false;
-   
-   *pcm = f;
-   
-   if (wav->bitspersample == 8)
-   {
-      float sample      = 0.0f;
-      const uint8_t *u8 = (const uint8_t*)wav->samples;
-
-      if (wav->numchannels == 1)
-      {
-         for (i = wav->numsamples; i != 0; i--)
-         {
-            sample = (float)*u8++ / 255.0f;
-            sample = sample * 2.0f - 1.0f;
-            *f++   = sample;
-            *f++   = sample;
-         }
-      }
-      else if (wav->numchannels == 2)
-      {
-         for (i = wav->numsamples; i != 0; i--)
-         {
-            sample = (float)*u8++ / 255.0f;
-            sample = sample * 2.0f - 1.0f;
-            *f++   = sample;
-            sample = (float)*u8++ / 255.0f;
-            sample = sample * 2.0f - 1.0f;
-            *f++   = sample;
-         }
-      }
-   }
-   else
-   {
-      /* TODO/FIXME note to leiradel - can we use audio/conversion/s16_to_float
-       * functions here? */
-
-      float sample       = 0.0f;
-      const int16_t *s16 = (const int16_t*)wav->samples;
-
-      if (wav->numchannels == 1)
-      {
-         for (i = wav->numsamples; i != 0; i--)
-         {
-            sample = (float)((int)*s16++ + 32768) / 65535.0f;
-            sample = sample * 2.0f - 1.0f;
-            *f++   = sample;
-            *f++   = sample;
-         }
-      }
-      else if (wav->numchannels == 2)
-      {
-         for (i = wav->numsamples; i != 0; i--)
-         {
-            sample = (float)((int)*s16++ + 32768) / 65535.0f;
-            sample = sample * 2.0f - 1.0f;
-            *f++   = sample;
-            sample = (float)((int)*s16++ + 32768) / 65535.0f;
-            sample = sample * 2.0f - 1.0f;
-            *f++   = sample;
-         }
-      }
-   }
-
-   return true;
-}
-
-static bool one_shot_resample(const float* in, size_t samples_in,
-      unsigned rate, float** out, size_t* samples_out)
-{
-   struct resampler_data info;
-   void* data                         = NULL;
-   const retro_resampler_t* resampler = NULL;
-   float ratio                        = (double)s_rate / (double)rate;
-
-   if (!retro_resampler_realloc(&data, &resampler, NULL, ratio))
-      return false;
-   
-   /*
-    * Allocate on a 16-byte boundary, and pad to a multiple of 16 bytes. We
-    * add four more samples in the formula below just as safeguard, because
-    * resampler->process sometimes reports more output samples than the
-    * formula below calculates. Ideally, audio resamplers should have a
-    * function to return the number of samples they will output given a
-    * count of input samples.
-    */
-   *samples_out                       = samples_in * ratio + 4;
-   *out                               = (float*)memalign_alloc(16,
-         ((*samples_out + 15) & ~15) * sizeof(float));
-   
-   if (*out == NULL)
-      return false;
-
-   info.data_in                       = in;
-   info.data_out                      = *out;
-   info.input_frames                  = samples_in / 2;
-   info.output_frames                 = 0;
-   info.ratio                         = ratio;
-
-   resampler->process(data, &info);
-   resampler->free(data);
-   return true;
-}
-
-void audio_mixer_init(unsigned rate)
-{
-   unsigned i;
-   
-   s_rate = rate;
-   
-   for (i = 0; i < AUDIO_MIXER_MAX_VOICES; i++)
-      s_voices[i].type = AUDIO_MIXER_TYPE_NONE;
-   
-#ifdef HAVE_THREADS
-   s_locker = slock_new();
-#endif
-}
-
-void audio_mixer_done(void)
-{
-   unsigned i;
-   
-#ifdef HAVE_THREADS
-   /* Dont call audio mixer functions after this point */
-   slock_free(s_locker);
-   s_locker = NULL;
-#endif
-   
-   for (i = 0; i < AUDIO_MIXER_MAX_VOICES; i++)
-      s_voices[i].type = AUDIO_MIXER_TYPE_NONE;
-}
-
-audio_mixer_sound_t* audio_mixer_load_wav(void *buffer, int32_t size)
-{
-   /* WAV data */
-   rwav_t wav;
-   /* WAV samples converted to float */
-   float* pcm                 = NULL;
-   size_t samples             = 0;
-   /* Result */
-   audio_mixer_sound_t* sound = NULL;
-   enum rwav_state rwav_ret   = rwav_load(&wav, buffer, size);
-
-   if (rwav_ret != RWAV_ITERATE_DONE)
-      return NULL;
-   
-   samples       = wav.numsamples * 2;
-   
-   if (!wav2float(&wav, &pcm, samples))
-      return NULL;
-   
-   if (wav.samplerate != s_rate)
-   {
-      float* resampled           = NULL;
-
-      if (!one_shot_resample(pcm, samples,
-               wav.samplerate, &resampled, &samples))
-         return NULL;
-      
-      memalign_free((void*)pcm);
-      pcm = resampled;
-   }
-   
-   sound = (audio_mixer_sound_t*)calloc(1, sizeof(*sound));
-   
-   if (!sound)
-   {
-      memalign_free((void*)pcm);
-      return NULL;
-   }
-   
-   sound->type             = AUDIO_MIXER_TYPE_WAV;
-   sound->types.wav.frames = (unsigned)(samples / 2);
-   sound->types.wav.pcm    = pcm;
-   
-   rwav_free(&wav);
-
-   return sound;
-}
-
-audio_mixer_sound_t* audio_mixer_load_ogg(void *buffer, int32_t size)
-{
-#ifdef HAVE_STB_VORBIS
-   audio_mixer_sound_t* sound = (audio_mixer_sound_t*)calloc(1, sizeof(*sound));
-   
-   if (!sound)
-      return NULL;
-
-   sound->type           = AUDIO_MIXER_TYPE_OGG;
-   sound->types.ogg.size = size;
-   sound->types.ogg.data = buffer;
-   
-   return sound;
-#else
-   return NULL;
-#endif
-}
-
-void audio_mixer_destroy(audio_mixer_sound_t* sound)
-{
-   void *handle = NULL;
-   if (!sound)
-      return;
-
-   switch (sound->type)
-   {
-      case AUDIO_MIXER_TYPE_WAV:
-         handle = (void*)sound->types.wav.pcm;
-         if (handle)
-            memalign_free(handle);
-         break;
-      case AUDIO_MIXER_TYPE_OGG:
-#ifdef HAVE_STB_VORBIS
-         handle = (void*)sound->types.ogg.data;
-         if (handle)
-            free(handle);
-#endif
-         break;
-      case AUDIO_MIXER_TYPE_NONE:
-         break;
-   }
-   
-   free(sound);
-}
-
-static bool audio_mixer_play_wav(audio_mixer_sound_t* sound,
-      audio_mixer_voice_t* voice, bool repeat, float volume,
-      audio_mixer_stop_cb_t stop_cb)
-{
-   voice->types.wav.position = 0;
-   return true;
-}
-
-#ifdef HAVE_STB_VORBIS
-static bool audio_mixer_play_ogg(
-      audio_mixer_sound_t* sound,
-      audio_mixer_voice_t* voice,
-      bool repeat, float volume,
-      audio_mixer_stop_cb_t stop_cb)
-{
-   stb_vorbis_info info;
-   int res                         = 0;
-   float ratio                     = 0.0f;
-   unsigned samples                = 0;
-   void *ogg_buffer                = NULL;
-   void *resampler_data            = NULL;
-   const retro_resampler_t* resamp = NULL;
-   stb_vorbis *stb_vorbis          = stb_vorbis_open_memory(
-         (const unsigned char*)sound->types.ogg.data,
-         sound->types.ogg.size, &res, NULL);
-
-   if (!stb_vorbis)
-      return false;
-
-   info                    = stb_vorbis_get_info(stb_vorbis);
-   
-   if (info.sample_rate != s_rate)
-   {
-      ratio = (double)s_rate / (double)info.sample_rate;
-      
-      if (!retro_resampler_realloc(&resampler_data,
-               &resamp, NULL, ratio))
-         goto error;
-   }
-
-   samples                         = (unsigned)(AUDIO_MIXER_TEMP_OGG_BUFFER * ratio);
-   ogg_buffer                      = (float*)memalign_alloc(16,
-         ((samples + 15) & ~15) * sizeof(float));
-
-   if (!ogg_buffer)
-   {
-      resamp->free(resampler_data);
-      goto error;
-   }
-
-   voice->types.ogg.resampler      = resamp;
-   voice->types.ogg.resampler_data = resampler_data;
-   voice->types.ogg.buffer         = (float*)ogg_buffer;
-   voice->types.ogg.buf_samples    = samples;
-   voice->types.ogg.ratio          = ratio;
-   voice->types.ogg.stream         = stb_vorbis;
-   voice->types.ogg.position       = 0;
-   voice->types.ogg.samples        = 0;
-
-   return true;
-
-error:
-   stb_vorbis_close(stb_vorbis);
-   return false;
-}
-#endif
-
-audio_mixer_voice_t* audio_mixer_play(audio_mixer_sound_t* sound, bool repeat,
-      float volume, audio_mixer_stop_cb_t stop_cb)
-{
-   unsigned i;
-   bool res                   = false;
-   audio_mixer_voice_t* voice = s_voices;
-
-   if (!sound)
-      return NULL;
-   
-#ifdef HAVE_THREADS
-   slock_lock(s_locker);
-#endif
-
-   for (i = 0; i < AUDIO_MIXER_MAX_VOICES; i++, voice++)
-   {
-      if (voice->type != AUDIO_MIXER_TYPE_NONE)
-         continue;
-
-      switch (sound->type)
-      {
-         case AUDIO_MIXER_TYPE_WAV:
-            res = audio_mixer_play_wav(sound, voice, repeat, volume, stop_cb);
-            break;
-         case AUDIO_MIXER_TYPE_OGG:
-#ifdef HAVE_STB_VORBIS
-            res = audio_mixer_play_ogg(sound, voice, repeat, volume, stop_cb);
-#endif
-            break;
-         case AUDIO_MIXER_TYPE_NONE:
-            break;
-      }
-
-      break;
-   }
-   
-   if (res)
-   {
-      voice->type     = sound->type;
-      voice->repeat   = repeat;
-      voice->volume   = volume;
-      voice->sound    = sound;
-      voice->stop_cb  = stop_cb;
-   }
-   else
-      voice = NULL;
-
-#ifdef HAVE_THREADS
-   slock_unlock(s_locker);
-#endif
-
-   return voice;
-}
-
-void audio_mixer_stop(audio_mixer_voice_t* voice)
-{
-   audio_mixer_stop_cb_t stop_cb = NULL;
-   audio_mixer_sound_t* sound    = NULL;
-   
-   if (voice)
-   {
-      stop_cb = voice->stop_cb;
-      sound   = voice->sound;
-      
-#ifdef HAVE_THREADS
-      slock_lock(s_locker);
-#endif
-
-      voice->type = AUDIO_MIXER_TYPE_NONE;
-      
-#ifdef HAVE_THREADS
-      slock_unlock(s_locker);
-#endif
-      
-      if (stop_cb)
-         stop_cb(sound, AUDIO_MIXER_SOUND_STOPPED);
-   }
-}
-
-static void audio_mixer_mix_wav(float* buffer, size_t num_frames,
-      audio_mixer_voice_t* voice,
-      float volume)
-{
-   int i;
-   unsigned buf_free                = (unsigned)(num_frames * 2);
-   const audio_mixer_sound_t* sound = voice->sound;
-   unsigned pcm_available           = sound->types.wav.frames 
-      * 2 - voice->types.wav.position;
-   const float* pcm                 = sound->types.wav.pcm + 
-      voice->types.wav.position;
-   
-again:
-   if (pcm_available < buf_free)
-   {
-      for (i = pcm_available; i != 0; i--)
-         *buffer++ += *pcm++ * volume;
-
-      if (voice->repeat)
-      {
-         if (voice->stop_cb)
-            voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_REPEATED);
-
-         buf_free                  -= pcm_available;
-         pcm_available              = sound->types.wav.frames * 2;
-         pcm                        = sound->types.wav.pcm;
-         voice->types.wav.position  = 0;
-         goto again;
-      }
-
-      if (voice->stop_cb)
-         voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_FINISHED);
-
-      voice->type = AUDIO_MIXER_TYPE_NONE;
-   }
-   else
-   {
-      for (i = buf_free; i != 0; i--)
-         *buffer++ += *pcm++ * volume;
-
-      voice->types.wav.position += buf_free;
-   }
-}
-
-#ifdef HAVE_STB_VORBIS
-static void audio_mixer_mix_ogg(float* buffer, size_t num_frames,
-      audio_mixer_voice_t* voice,
-      float volume)
-{
-   int i;
-   struct resampler_data info;
-   float temp_buffer[AUDIO_MIXER_TEMP_OGG_BUFFER];
-   unsigned buf_free                = num_frames * 2;
-   unsigned temp_samples            = 0;
-   float* pcm                       = NULL;
-   
-   if (voice->types.ogg.position == voice->types.ogg.samples)
-   {
-again:
-      temp_samples = stb_vorbis_get_samples_float_interleaved(
-            voice->types.ogg.stream, 2, temp_buffer,
-            AUDIO_MIXER_TEMP_OGG_BUFFER) * 2;
-
-      if (temp_samples == 0)
-      {
-         if (voice->repeat)
-         {
-            if (voice->stop_cb)
-               voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_REPEATED);
-
-            stb_vorbis_seek_start(voice->types.ogg.stream);
-            goto again;
-         }
-         else
-         {
-            if (voice->stop_cb)
-               voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_FINISHED);
-
-            voice->type = AUDIO_MIXER_TYPE_NONE;
-            return;
-         }
-      }
-
-      info.data_in              = temp_buffer;
-      info.data_out             = voice->types.ogg.buffer;
-      info.input_frames         = temp_samples / 2;
-      info.output_frames        = 0;
-      info.ratio                = voice->types.ogg.ratio;
-
-      voice->types.ogg.resampler->process(voice->types.ogg.resampler_data, &info);
-      voice->types.ogg.position = 0;
-      voice->types.ogg.samples  = voice->types.ogg.buf_samples;
-   }
-
-   pcm = voice->types.ogg.buffer + voice->types.ogg.position;
-
-   if (voice->types.ogg.samples < buf_free)
-   {
-      for (i = voice->types.ogg.samples; i != 0; i--)
-         *buffer++ += *pcm++ * volume;
-
-      buf_free -= voice->types.ogg.samples;
-      goto again;
-   }
-   else
-   {
-      int i;
-      for (i = buf_free; i != 0; --i )
-         *buffer++ += *pcm++ * volume;
-
-      voice->types.ogg.position += buf_free;
-      voice->types.ogg.samples  -= buf_free;
-   }
-}
-#endif
-
-void audio_mixer_mix(float* buffer, size_t num_frames, float volume_override, bool override)
-{
-   unsigned i;
-   size_t j                   = 0;
-   float* sample              = NULL;
-   audio_mixer_voice_t* voice = s_voices;
-   
-#ifdef HAVE_THREADS
-   slock_lock(s_locker);
-#endif
-   
-   for (i = 0; i < AUDIO_MIXER_MAX_VOICES; i++, voice++)
-   {
-      float volume = (override) ? volume_override : voice->volume;
-
-      switch (voice->type)
-      {
-         case AUDIO_MIXER_TYPE_WAV:
-            audio_mixer_mix_wav(buffer, num_frames, voice, volume);
-            break;
-         case AUDIO_MIXER_TYPE_OGG:
-#ifdef HAVE_STB_VORBIS
-            audio_mixer_mix_ogg(buffer, num_frames, voice, volume);
-#endif
-            break;
-         case AUDIO_MIXER_TYPE_NONE:
-            break;
-      }
-   }
-   
-#ifdef HAVE_THREADS
-   slock_unlock(s_locker);
-#endif
-   
-   for (j = 0, sample = buffer; j < num_frames; j++, sample++)
-   {
-      if (*sample < -1.0f)
-         *sample = -1.0f;
-      else if (*sample > 1.0f)
-         *sample = 1.0f;
-   }
-}
diff --git a/libretro-common/audio/conversion/float_to_s16.c b/libretro-common/audio/conversion/float_to_s16.c
deleted file mode 100644
index 3010cb7..0000000
--- a/libretro-common/audio/conversion/float_to_s16.c
+++ /dev/null
@@ -1,160 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (float_to_s16.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#include <stdint.h>
-#include <stddef.h>
-
-#if defined(__SSE2__)
-#include <emmintrin.h>
-#elif defined(__ALTIVEC__)
-#include <altivec.h>
-#endif
-
-#include <features/features_cpu.h>
-#include <audio/conversion/float_to_s16.h>
-
-#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
-static bool float_to_s16_neon_enabled = false;
-void convert_float_s16_asm(int16_t *out, const float *in, size_t samples);
-#endif
-
-/**
- * convert_float_to_s16:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- *
- * Converts floating point 
- * to signed integer 16-bit.
- *
- * C implementation callback function.
- **/
-void convert_float_to_s16(int16_t *out,
-      const float *in, size_t samples)
-{
-   size_t i      = 0;
-#if defined(__SSE2__)
-   __m128 factor = _mm_set1_ps((float)0x8000);
-
-   for (i = 0; i + 8 <= samples; i += 8, in += 8, out += 8)
-   {
-      __m128 input_l = _mm_loadu_ps(in + 0);
-      __m128 input_r = _mm_loadu_ps(in + 4);
-      __m128 res_l   = _mm_mul_ps(input_l, factor);
-      __m128 res_r   = _mm_mul_ps(input_r, factor);
-      __m128i ints_l = _mm_cvtps_epi32(res_l);
-      __m128i ints_r = _mm_cvtps_epi32(res_r);
-      __m128i packed = _mm_packs_epi32(ints_l, ints_r);
-
-      _mm_storeu_si128((__m128i *)out, packed);
-   }
-
-   samples = samples - i;
-   i       = 0;
-#elif defined(__ALTIVEC__)
-   int samples_in = samples;
-
-   /* Unaligned loads/store is a bit expensive, 
-    * so we optimize for the good path (very likely). */
-   if (((uintptr_t)out & 15) + ((uintptr_t)in & 15) == 0)
-   {
-      size_t i;
-      for (i = 0; i + 8 <= samples; i += 8, in += 8, out += 8)
-      {
-         vector float       input0 = vec_ld( 0, in);
-         vector float       input1 = vec_ld(16, in);
-         vector signed int result0 = vec_cts(input0, 15);
-         vector signed int result1 = vec_cts(input1, 15);
-         vec_st(vec_packs(result0, result1), 0, out);
-      }
-
-      samples_in -= i;
-   }
-
-   samples = samples_in;
-   i       = 0;
-#elif defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
-   if (float_to_s16_neon_enabled)
-   {
-      size_t aligned_samples = samples & ~7;
-      if (aligned_samples)
-         convert_float_s16_asm(out, in, aligned_samples);
-
-      out     = out     + aligned_samples;
-      in      = in      + aligned_samples;
-      samples = samples - aligned_samples;
-      i       = 0;
-   }
-#elif defined(_MIPS_ARCH_ALLEGREX)
-
-#ifdef DEBUG
-   /* Make sure the buffers are 16 byte aligned, this should be 
-    * the default behaviour of malloc in the PSPSDK.
-    * Assume alignment. */
-   retro_assert(((uintptr_t)in  & 0xf) == 0);
-   retro_assert(((uintptr_t)out & 0xf) == 0);
-#endif
-
-   for (i = 0; i + 8 <= samples; i += 8)
-   {
-      __asm__ (
-            ".set    push                 \n"
-            ".set    noreorder            \n"
-
-            "lv.q    c100,  0(%0)         \n"
-            "lv.q    c110,  16(%0)        \n"
-
-            "vf2in.q c100, c100, 31       \n"
-            "vf2in.q c110, c110, 31       \n"
-            "vi2s.q  c100, c100           \n"
-            "vi2s.q  c102, c110           \n"
-
-            "sv.q    c100,  0(%1)         \n"
-
-            ".set    pop                  \n"
-            :: "r"(in + i), "r"(out + i));
-   }
-
-#endif
-
-   for (; i < samples; i++)
-   {
-      int32_t val = (int32_t)(in[i] * 0x8000);
-      out[i]      = (val > 0x7FFF) ? 0x7FFF :
-         (val < -0x8000 ? -0x8000 : (int16_t)val);
-   }
-}
-
-/**
- * convert_float_to_s16_init_simd:
- *
- * Sets up function pointers for conversion
- * functions based on CPU features.
- **/
-void convert_float_to_s16_init_simd(void)
-{
-#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
-   unsigned cpu = cpu_features_get();
-
-   if (cpu & RETRO_SIMD_NEON)
-      float_to_s16_neon_enabled = true;
-#endif
-}
diff --git a/libretro-common/audio/conversion/float_to_s16_neon.S b/libretro-common/audio/conversion/float_to_s16_neon.S
deleted file mode 100644
index aa9e565..0000000
--- a/libretro-common/audio/conversion/float_to_s16_neon.S
+++ /dev/null
@@ -1,69 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (float_to_s16_neon.S).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#if defined(__ARM_NEON__)
-
-#ifndef __MACH__
-.arm
-#endif
-
-.align 4
-.globl convert_float_s16_asm
-#ifndef __MACH__
-.type convert_float_s16_asm, %function
-#endif
-.globl _convert_float_s16_asm
-#ifndef __MACH__
-.type _convert_float_s16_asm, %function
-#endif
-# convert_float_s16_asm(int16_t *out, const float *in, size_t samples)
-convert_float_s16_asm:
-_convert_float_s16_asm:
-   # Hacky way to get a constant of 2^15.
-   # ((2^4)^2)^2 * 0.5 = 2^15
-   vmov.f32 q8, #16.0
-   vmov.f32 q9, #0.5
-   vmul.f32 q8, q8, q8
-   vmul.f32 q8, q8, q8
-   vmul.f32 q8, q8, q9
-
-1:
-   # Preload here?
-   vld1.f32 {q0-q1}, [r1]!
-
-   vmul.f32 q0, q0, q8
-   vmul.f32 q1, q1, q8
-
-   vcvt.s32.f32 q0, q0
-   vcvt.s32.f32 q1, q1
-
-   vqmovn.s32 d4, q0
-   vqmovn.s32 d5, q1
-
-   vst1.f32 {d4-d5}, [r0]!
-
-   # Guaranteed to get samples in multiples of 8.
-   subs r2, r2, #8
-   bne 1b
-
-   bx lr
-
-#endif
diff --git a/libretro-common/audio/conversion/float_to_s16_neon.c b/libretro-common/audio/conversion/float_to_s16_neon.c
deleted file mode 100644
index 342f497..0000000
--- a/libretro-common/audio/conversion/float_to_s16_neon.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (float_to_s16_neon.S).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#if defined(__ARM_NEON__)
-
-#if defined(__thumb__)
-#define DECL_ARMMODE(x) "  .align 2\n" "  .global " x "\n" "  .thumb\n" "  .thumb_func\n" "  .type " x ", %function\n" x ":\n"
-#else
-#define DECL_ARMMODE(x) "  .align 4\n" "  .global " x "\n" "  .arm\n" x ":\n"
-#endif
-
-asm(
-    DECL_ARMMODE("convert_float_s16_asm")
-    DECL_ARMMODE("_convert_float_s16_asm")
-    "# convert_float_s16_asm(int16_t *out, const float *in, size_t samples)\n"
-    "   # Hacky way to get a constant of 2^15.\n"
-    "   # ((2^4)^2)^2 * 0.5 = 2^15\n"
-    "   vmov.f32 q8, #16.0\n"
-    "   vmov.f32 q9, #0.5\n"
-    "   vmul.f32 q8, q8, q8\n"
-    "   vmul.f32 q8, q8, q8\n"
-    "   vmul.f32 q8, q8, q9\n"
-    "\n"
-    "1:\n"
-    "   # Preload here?\n"
-    "   vld1.f32 {q0-q1}, [r1]!\n"
-    "\n"
-    "   vmul.f32 q0, q0, q8\n"
-    "   vmul.f32 q1, q1, q8\n"
-    "\n"
-    "   vcvt.s32.f32 q0, q0\n"
-    "   vcvt.s32.f32 q1, q1\n"
-    "\n"
-    "   vqmovn.s32 d4, q0\n"
-    "   vqmovn.s32 d5, q1\n"
-    "\n"
-    "   vst1.f32 {d4-d5}, [r0]!\n"
-    "\n"
-    "   # Guaranteed to get samples in multiples of 8.\n"
-    "   subs r2, r2, #8\n"
-    "   bne 1b\n"
-    "\n"
-    "   bx lr\n"
-    "\n"
-    );
-#endif
diff --git a/libretro-common/audio/conversion/s16_to_float.c b/libretro-common/audio/conversion/s16_to_float.c
deleted file mode 100644
index ff72791..0000000
--- a/libretro-common/audio/conversion/s16_to_float.c
+++ /dev/null
@@ -1,189 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (s16_to_float.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#if defined(__SSE2__)
-#include <emmintrin.h>
-#elif defined(__ALTIVEC__)
-#include <altivec.h>
-#endif
-
-#include <boolean.h>
-#include <features/features_cpu.h>
-#include <audio/conversion/s16_to_float.h>
-
-#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
-static bool s16_to_float_neon_enabled = false;
-
-/* Avoid potential hard-float/soft-float ABI issues. */
-void convert_s16_float_asm(float *out, const int16_t *in,
-      size_t samples, const float *gain);
-#endif
-
-/**
- * convert_s16_to_float:
- * @out               : output buffer
- * @in                : input buffer
- * @samples           : size of samples to be converted
- * @gain              : gain applied (.e.g. audio volume)
- *
- * Converts from signed integer 16-bit
- * to floating point.
- **/
-void convert_s16_to_float(float *out,
-      const int16_t *in, size_t samples, float gain)
-{
-   size_t i      = 0;
-
-#if defined(__SSE2__)
-   float fgain   = gain / UINT32_C(0x80000000);
-   __m128 factor = _mm_set1_ps(fgain);
-
-   for (i = 0; i + 8 <= samples; i += 8, in += 8, out += 8)
-   {
-      __m128i input    = _mm_loadu_si128((const __m128i *)in);
-      __m128i regs_l   = _mm_unpacklo_epi16(_mm_setzero_si128(), input);
-      __m128i regs_r   = _mm_unpackhi_epi16(_mm_setzero_si128(), input);
-      __m128 output_l  = _mm_mul_ps(_mm_cvtepi32_ps(regs_l), factor);
-      __m128 output_r  = _mm_mul_ps(_mm_cvtepi32_ps(regs_r), factor);
-
-      _mm_storeu_ps(out + 0, output_l);
-      _mm_storeu_ps(out + 4, output_r);
-   }
-
-   samples = samples - i;
-   i       = 0;
-#elif defined(__ALTIVEC__)
-   size_t samples_in = samples;
-
-   /* Unaligned loads/store is a bit expensive, so we 
-    * optimize for the good path (very likely). */
-   if (((uintptr_t)out & 15) + ((uintptr_t)in & 15) == 0)
-   {
-      size_t i;
-      const vector float gain_vec = { gain, gain , gain, gain };
-      const vector float zero_vec = { 0.0f, 0.0f, 0.0f, 0.0f};
-
-      for (i = 0; i + 8 <= samples; i += 8, in += 8, out += 8)
-      {
-         vector signed short input = vec_ld(0, in);
-         vector signed int hi      = vec_unpackh(input);
-         vector signed int lo      = vec_unpackl(input);
-         vector float out_hi       = vec_madd(vec_ctf(hi, 15), gain_vec, zero_vec);
-         vector float out_lo       = vec_madd(vec_ctf(lo, 15), gain_vec, zero_vec);
-
-         vec_st(out_hi,  0, out);
-         vec_st(out_lo, 16, out);
-      }
-
-      samples_in -= i;
-   }
-
-   samples = samples_in;
-   i       = 0;
-
-#elif defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
-   if (s16_to_float_neon_enabled)
-   {
-      size_t aligned_samples = samples & ~7;
-      if (aligned_samples)
-         convert_s16_float_asm(out, in, aligned_samples, &gain);
-
-      /* Could do all conversion in ASM, but keep it simple for now. */
-      out     = out + aligned_samples;
-      in      = in  + aligned_samples;
-      samples = samples - aligned_samples;
-      i       = 0;
-   }
-
-#elif defined(_MIPS_ARCH_ALLEGREX)
-#ifdef DEBUG
-   /* Make sure the buffer is 16 byte aligned, this should be the 
-    * default behaviour of malloc in the PSPSDK.
-    * Only the output buffer can be assumed to be 16-byte aligned. */
-   retro_assert(((uintptr_t)out & 0xf) == 0);
-#endif
-
-   gain = gain / 0x8000;
-   __asm__ (
-         ".set    push                    \n"
-         ".set    noreorder               \n"
-         "mtv     %0, s200                \n"
-         ".set    pop                     \n"
-         ::"r"(gain));
-
-   for (i = 0; i + 16 <= samples; i += 16)
-   {
-      __asm__ (
-            ".set    push                 \n"
-            ".set    noreorder            \n"
-
-            "lv.s    s100,  0(%0)         \n"
-            "lv.s    s101,  4(%0)         \n"
-            "lv.s    s110,  8(%0)         \n"
-            "lv.s    s111, 12(%0)         \n"
-            "lv.s    s120, 16(%0)         \n"
-            "lv.s    s121, 20(%0)         \n"
-            "lv.s    s130, 24(%0)         \n"
-            "lv.s    s131, 28(%0)         \n"
-
-            "vs2i.p  c100, c100           \n"
-            "vs2i.p  c110, c110           \n"
-            "vs2i.p  c120, c120           \n"
-            "vs2i.p  c130, c130           \n"
-
-            "vi2f.q  c100, c100, 16       \n"
-            "vi2f.q  c110, c110, 16       \n"
-            "vi2f.q  c120, c120, 16       \n"
-            "vi2f.q  c130, c130, 16       \n"
-
-            "vmscl.q e100, e100, s200     \n"
-
-            "sv.q    c100,  0(%1)         \n"
-            "sv.q    c110, 16(%1)         \n"
-            "sv.q    c120, 32(%1)         \n"
-            "sv.q    c130, 48(%1)         \n"
-
-            ".set    pop                  \n"
-            :: "r"(in + i), "r"(out + i));
-   }
-
-#endif
-   gain    = gain / 0x8000;
-
-   for (; i < samples; i++)
-      out[i] = (float)in[i] * gain; 
-}
-
-/**
- * convert_s16_to_float_init_simd:
- *
- * Sets up function pointers for conversion
- * functions based on CPU features.
- **/
-void convert_s16_to_float_init_simd(void)
-{
-#if defined(__ARM_NEON__) && !defined(DONT_WANT_ARM_OPTIMIZATIONS)
-   unsigned cpu = cpu_features_get();
-
-   if (cpu & RETRO_SIMD_NEON)
-      s16_to_float_neon_enabled = true;
-#endif
-}
diff --git a/libretro-common/audio/conversion/s16_to_float_neon.S b/libretro-common/audio/conversion/s16_to_float_neon.S
deleted file mode 100644
index b744924..0000000
--- a/libretro-common/audio/conversion/s16_to_float_neon.S
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (s16_to_float_neon.S).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#if defined(__ARM_NEON__)
-
-#ifndef __MACH__
-.arm
-#endif
-
-.align 4
-.globl convert_s16_float_asm
-#ifndef __MACH__
-.type convert_s16_float_asm, %function
-#endif
-.globl _convert_s16_float_asm
-#ifndef __MACH__
-.type _convert_s16_float_asm, %function
-#endif
-# convert_s16_float_asm(float *out, const int16_t *in, size_t samples, const float *gain)
-convert_s16_float_asm:
-_convert_s16_float_asm:
-   # Hacky way to get a constant of 2^-15.
-   # Might be faster to just load a constant from memory.
-   # It's just done once however ...
-   vmov.f32 q8, #0.25
-   vmul.f32 q8, q8, q8
-   vmul.f32 q8, q8, q8
-   vmul.f32 q8, q8, q8
-   vadd.f32 q8, q8, q8
-
-   # Apply gain
-   vld1.f32 {d6[0]}, [r3]
-   vmul.f32 q8, q8, d6[0]
-
-1:
-   # Preload here?
-   vld1.s16 {q0}, [r1]!
-
-   # Widen to 32-bit
-   vmovl.s16 q1, d0
-   vmovl.s16 q2, d1
-
-   # Convert to float
-   vcvt.f32.s32 q1, q1
-   vcvt.f32.s32 q2, q2
-
-   vmul.f32 q1, q1, q8
-   vmul.f32 q2, q2, q8
-
-   vst1.f32 {q1-q2}, [r0]!
-
-   # Guaranteed to get samples in multiples of 8.
-   subs r2, r2, #8
-   bne 1b
-
-   bx lr
-
-#endif
diff --git a/libretro-common/audio/conversion/s16_to_float_neon.c b/libretro-common/audio/conversion/s16_to_float_neon.c
deleted file mode 100644
index 464e40f..0000000
--- a/libretro-common/audio/conversion/s16_to_float_neon.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (s16_to_float_neon.S).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-#if defined(__ARM_NEON__)
-
-#if defined(__thumb__)
-#define DECL_ARMMODE(x) "  .align 2\n" "  .global " x "\n" "  .thumb\n" "  .thumb_func\n" "  .type " x ", %function\n" x ":\n"
-#else
-#define DECL_ARMMODE(x) "  .align 4\n" "  .global " x "\n" "  .arm\n" x ":\n"
-#endif
-
-asm(
-    DECL_ARMMODE("convert_s16_float_asm")
-    DECL_ARMMODE("_convert_s16_float_asm")
-    "# convert_s16_float_asm(float *out, const int16_t *in, size_t samples, const float *gain)\n"
-    "   # Hacky way to get a constant of 2^-15.\n"
-    "   # Might be faster to just load a constant from memory.\n"
-    "   # It's just done once however ...\n"
-    "   vmov.f32 q8, #0.25\n"
-    "   vmul.f32 q8, q8, q8\n"
-    "   vmul.f32 q8, q8, q8\n"
-    "   vmul.f32 q8, q8, q8\n"
-    "   vadd.f32 q8, q8, q8\n"
-    "\n"
-    "   # Apply gain\n"
-    "   vld1.f32 {d6[0]}, [r3]\n"
-    "   vmul.f32 q8, q8, d6[0]\n"
-    "\n"
-    "1:\n"
-    "   # Preload here?\n"
-    "   vld1.s16 {q0}, [r1]!\n"
-    "\n"
-    "   # Widen to 32-bit\n"
-    "   vmovl.s16 q1, d0\n"
-    "   vmovl.s16 q2, d1\n"
-    "\n"
-    "   # Convert to float\n"
-    "   vcvt.f32.s32 q1, q1\n"
-    "   vcvt.f32.s32 q2, q2\n"
-    "\n"
-    "   vmul.f32 q1, q1, q8\n"
-    "   vmul.f32 q2, q2, q8\n"
-    "\n"
-    "   vst1.f32 {q1-q2}, [r0]!\n"
-    "\n"
-    "   # Guaranteed to get samples in multiples of 8.\n"
-    "   subs r2, r2, #8\n"
-    "   bne 1b\n"
-    "\n"
-    "   bx lr\n"
-    "\n"
-    );
-#endif
diff --git a/libretro-common/audio/dsp_filter.c b/libretro-common/audio/dsp_filter.c
deleted file mode 100644
index 7ff162f..0000000
--- a/libretro-common/audio/dsp_filter.c
+++ /dev/null
@@ -1,324 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (dsp_filter.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-
-#include <retro_miscellaneous.h>
-
-#include <compat/posix_string.h>
-#include <dynamic/dylib.h>
-
-#include <file/file_path.h>
-#include <file/config_file_userdata.h>
-#include <features/features_cpu.h>
-#include <lists/string_list.h>
-#include <string/stdstring.h>
-#include <libretro_dspfilter.h>
-
-#include <audio/dsp_filter.h>
-
-struct retro_dsp_plug
-{
-#ifdef HAVE_DYLIB
-   dylib_t lib;
-#endif
-   const struct dspfilter_implementation *impl;
-};
-
-struct retro_dsp_instance
-{
-   const struct dspfilter_implementation *impl;
-   void *impl_data;
-};
-
-struct retro_dsp_filter
-{
-   config_file_t *conf;
-
-   struct retro_dsp_plug *plugs;
-   unsigned num_plugs;
-
-   struct retro_dsp_instance *instances;
-   unsigned num_instances;
-};
-
-static const struct dspfilter_implementation *find_implementation(
-      retro_dsp_filter_t *dsp, const char *ident)
-{
-   unsigned i;
-   for (i = 0; i < dsp->num_plugs; i++)
-   {
-      if (string_is_equal(dsp->plugs[i].impl->short_ident, ident))
-         return dsp->plugs[i].impl;
-   }
-
-   return NULL;
-}
-
-static const struct dspfilter_config dspfilter_config = {
-   config_userdata_get_float,
-   config_userdata_get_int,
-   config_userdata_get_float_array,
-   config_userdata_get_int_array,
-   config_userdata_get_string,
-   config_userdata_free,
-};
-
-static bool create_filter_graph(retro_dsp_filter_t *dsp, float sample_rate)
-{
-   unsigned i;
-   struct retro_dsp_instance *instances = NULL;
-   unsigned filters                     = 0;
-
-   if (!config_get_uint(dsp->conf, "filters", &filters))
-      return false;
-
-   instances = (struct retro_dsp_instance*)calloc(filters, sizeof(*instances));
-   if (!instances)
-      return false;
-
-   dsp->instances     = instances;
-   dsp->num_instances = filters;
-
-   for (i = 0; i < filters; i++)
-   {
-      struct config_file_userdata userdata;
-      struct dspfilter_info info;
-      char key[64];
-      char name[64];
-
-      key[0] = name[0] = '\0';
-
-      info.input_rate  = sample_rate;
-
-      snprintf(key, sizeof(key), "filter%u", i);
-
-      if (!config_get_array(dsp->conf, key, name, sizeof(name)))
-         return false;
-
-      dsp->instances[i].impl = find_implementation(dsp, name);
-      if (!dsp->instances[i].impl)
-         return false;
-
-      userdata.conf = dsp->conf;
-      /* Index-specific configs take priority over ident-specific. */
-      userdata.prefix[0] = key;
-      userdata.prefix[1] = dsp->instances[i].impl->short_ident;
-
-      dsp->instances[i].impl_data = dsp->instances[i].impl->init(&info,
-            &dspfilter_config, &userdata);
-      if (!dsp->instances[i].impl_data)
-         return false;
-   }
-
-   return true;
-}
-
-#if defined(HAVE_FILTERS_BUILTIN)
-extern const struct dspfilter_implementation *panning_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
-extern const struct dspfilter_implementation *iir_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
-extern const struct dspfilter_implementation *echo_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
-extern const struct dspfilter_implementation *phaser_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
-extern const struct dspfilter_implementation *wahwah_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
-extern const struct dspfilter_implementation *eq_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
-extern const struct dspfilter_implementation *chorus_dspfilter_get_implementation(dspfilter_simd_mask_t mask);
-
-static const dspfilter_get_implementation_t dsp_plugs_builtin[] = {
-   panning_dspfilter_get_implementation,
-   iir_dspfilter_get_implementation,
-   echo_dspfilter_get_implementation,
-   phaser_dspfilter_get_implementation,
-   wahwah_dspfilter_get_implementation,
-   eq_dspfilter_get_implementation,
-   chorus_dspfilter_get_implementation,
-};
-
-static bool append_plugs(retro_dsp_filter_t *dsp, struct string_list *list)
-{
-   unsigned i;
-   dspfilter_simd_mask_t mask   = (dspfilter_simd_mask_t)cpu_features_get();
-   struct retro_dsp_plug *plugs = (struct retro_dsp_plug*)
-      calloc(ARRAY_SIZE(dsp_plugs_builtin), sizeof(*plugs));
-
-   if (!plugs)
-      return false;
-
-   dsp->plugs     = plugs;
-   dsp->num_plugs = ARRAY_SIZE(dsp_plugs_builtin);
-
-   for (i = 0; i < ARRAY_SIZE(dsp_plugs_builtin); i++)
-   {
-      dsp->plugs[i].impl = dsp_plugs_builtin[i](mask);
-      if (!dsp->plugs[i].impl)
-         return false;
-   }
-
-   return true;
-}
-#elif defined(HAVE_DYLIB)
-static bool append_plugs(retro_dsp_filter_t *dsp, struct string_list *list)
-{
-   unsigned i;
-   dspfilter_simd_mask_t mask = cpu_features_get();
-
-   for (i = 0; i < list->size; i++)
-   {
-      dspfilter_get_implementation_t cb;
-      const struct dspfilter_implementation *impl = NULL;
-      struct retro_dsp_plug *new_plugs            = NULL;
-      dylib_t lib                                 = 
-         dylib_load(list->elems[i].data);
-
-      if (!lib)
-         continue;
-
-      cb = (dspfilter_get_implementation_t)dylib_proc(lib, "dspfilter_get_implementation");
-      if (!cb)
-      {
-         dylib_close(lib);
-         continue;
-      }
-
-      impl = cb(mask);
-      if (!impl)
-      {
-         dylib_close(lib);
-         continue;
-      }
-
-      if (impl->api_version != DSPFILTER_API_VERSION)
-      {
-         dylib_close(lib);
-         continue;
-      }
-
-      new_plugs = (struct retro_dsp_plug*)
-         realloc(dsp->plugs, sizeof(*dsp->plugs) * (dsp->num_plugs + 1));
-      if (!new_plugs)
-      {
-         dylib_close(lib);
-         return false;
-      }
-
-      /* Found plug. */
-      
-      dsp->plugs = new_plugs;
-      dsp->plugs[dsp->num_plugs].lib = lib;
-      dsp->plugs[dsp->num_plugs].impl = impl;
-      dsp->num_plugs++;
-   }
-
-   return true;
-}
-#endif
-
-retro_dsp_filter_t *retro_dsp_filter_new(
-      const char *filter_config, 
-      void *string_data,
-      float sample_rate)
-{
-   config_file_t *conf           = NULL;
-   struct string_list *plugs     = NULL;
-   retro_dsp_filter_t *dsp       = (retro_dsp_filter_t*)calloc(1, sizeof(*dsp));
-
-   if (!dsp)
-      return NULL;
-
-   conf = config_file_new(filter_config);
-   if (!conf)   /* Did not find config. */
-      goto error;
-
-   dsp->conf = conf;
-
-   if (string_data)
-      plugs = (struct string_list*)string_data;
-
-#if defined(HAVE_DYLIB) || defined(HAVE_FILTERS_BUILTIN)
-   if (!append_plugs(dsp, plugs))
-      goto error;
-#endif
-
-   if (plugs)
-      string_list_free(plugs);
-   plugs = NULL;
-
-   if (!create_filter_graph(dsp, sample_rate))
-      goto error;
-
-   return dsp;
-
-error:
-   if (plugs)
-      string_list_free(plugs);
-   retro_dsp_filter_free(dsp);
-   return NULL;
-}
-
-void retro_dsp_filter_free(retro_dsp_filter_t *dsp)
-{
-   unsigned i;
-   if (!dsp)
-      return;
-
-   for (i = 0; i < dsp->num_instances; i++)
-   {
-      if (dsp->instances[i].impl_data && dsp->instances[i].impl)
-         dsp->instances[i].impl->free(dsp->instances[i].impl_data);
-   }
-   free(dsp->instances);
-
-#ifdef HAVE_DYLIB
-   for (i = 0; i < dsp->num_plugs; i++)
-   {
-      if (dsp->plugs[i].lib)
-         dylib_close(dsp->plugs[i].lib);
-   }
-   free(dsp->plugs);
-#endif
-
-   if (dsp->conf)
-      config_file_free(dsp->conf);
-
-   free(dsp);
-}
-
-void retro_dsp_filter_process(retro_dsp_filter_t *dsp,
-      struct retro_dsp_data *data)
-{
-   unsigned i;
-   struct dspfilter_output output = {0};
-   struct dspfilter_input input   = {0};
-
-   output.samples = data->input;
-   output.frames  = data->input_frames;
-
-   for (i = 0; i < dsp->num_instances; i++)
-   {
-      input.samples = output.samples;
-      input.frames  = output.frames;
-      dsp->instances[i].impl->process(
-            dsp->instances[i].impl_data, &output, &input);
-   }
-
-   data->output        = output.samples;
-   data->output_frames = output.frames;
-}
diff --git a/libretro-common/audio/dsp_filters/BassBoost.dsp b/libretro-common/audio/dsp_filters/BassBoost.dsp
deleted file mode 100644
index db98905..0000000
--- a/libretro-common/audio/dsp_filters/BassBoost.dsp
+++ /dev/null
@@ -1,12 +0,0 @@
-filters = 2
-filter0 = iir
-filter1 = panning
-
-iir_gain = 10.0
-iir_type = BBOOST
-iir_frequency = 200.0
-
-# Avoids clipping.
-panning_left_mix = "0.3 0.0"
-panning_right_mix = "0.0 0.3"
-
diff --git a/libretro-common/audio/dsp_filters/ChipTuneEnhance.dsp b/libretro-common/audio/dsp_filters/ChipTuneEnhance.dsp
deleted file mode 100644
index d45db3c..0000000
--- a/libretro-common/audio/dsp_filters/ChipTuneEnhance.dsp
+++ /dev/null
@@ -1,22 +0,0 @@
-filters = 4
-filter0 = eq
-filter1 = reverb
-filter2 = iir
-filter3 = panning
-
-eq_frequencies = "32 64 125 250 500 1000 2000 4000 8000 16000 20000"
-eq_gains = "6 9 12 7 6 5 7 9 11 6 0"
-
-# Reverb - slight reverb
- reverb_drytime = 0.5
- reverb_wettime = 0.15
- reverb_damping = 0.8
- reverb_roomwidth = 0.25
- reverb_roomsize = 0.25
- 
-# IIR - filters out some harsh sounds on the upper end
-iir_type = RIAA_CD
-
-# Panning - cut the volume a bit
-panning_left_mix = "0.75 0.0"
-panning_right_mix = "0.0 0.75"
diff --git a/libretro-common/audio/dsp_filters/Chorus.dsp b/libretro-common/audio/dsp_filters/Chorus.dsp
deleted file mode 100644
index f48b3c3..0000000
--- a/libretro-common/audio/dsp_filters/Chorus.dsp
+++ /dev/null
@@ -1,14 +0,0 @@
-filters = 1
-filter0 = chorus
-
-# Controls the base delay of the chorus (milliseconds).
-# chorus_delay_ms = 25.0
-#
-# Controls the depth of the delay. The delay will vary between delay_ms +/- depth_ms.
-# chorus_depth_ms = 1.0
-#
-# Frequency of LFO which controls delay.
-# chorus_lfo_freq = 0.5
-#
-# Controls dry/wet-ness of effect. 1.0 = full chorus, 0.0 = no chorus.
-# chorus_drywet = 0.8
diff --git a/libretro-common/audio/dsp_filters/EQ.dsp b/libretro-common/audio/dsp_filters/EQ.dsp
deleted file mode 100644
index 5a69a68..0000000
--- a/libretro-common/audio/dsp_filters/EQ.dsp
+++ /dev/null
@@ -1,41 +0,0 @@
-filters = 1
-filter0 = eq
-
-# Defaults
-
-# Beta factor for Kaiser window.
-# Lower values will allow better frequency resolution, but more ripple.
-# eq_window_beta = 4.0
-
-# The block size on which FFT is done.
-# Too high value requires more processing as well as longer latency but
-# allows finer-grained control over the spectrum.
-# eq_block_size_log2 = 8
-
-# An array of which frequencies to control.
-# You can create an arbitrary amount of these sampling points.
-# The EQ will try to create a frequency response which fits well to these points.
-# The filter response is linearly interpolated between sampling points here.
-#
-# It is implied that 0 Hz (DC) and Nyquist have predefined gains of 0 dB which are interpolated against.
-# If you want a "peak" in the spectrum or similar, you have to define close points to say, 0 dB.
-#
-# E.g.: A boost of 3 dB at 1 kHz can be expressed as.
-# eq_frequencies = "500 1000 2000"
-# eq_gains = "0 3 0"
-# Due to frequency domain smearing, you will not get exactly +3 dB at 1 kHz.
-
-# By default, this filter has a flat frequency response.
-
-# Dumps the impulse response generated by the EQ as a plain-text file
-# with one coefficient per line.
-# eq_impulse_response_output = "eq_impulse.txt"
-#
-# Using GNU Octave or Matlab, you can plot the response with:
-#
-# f = fopen('/path/to/eq_impulse.txt');
-# l = textscan(f, '%f');
-# res = l{1};
-# freqz(res, 1, 4096, 48000);
-#
-# It will give the response in Hz; 48000 is the default Output Rate of RetroArch
diff --git a/libretro-common/audio/dsp_filters/Echo.dsp b/libretro-common/audio/dsp_filters/Echo.dsp
deleted file mode 100644
index b92bdcc..0000000
--- a/libretro-common/audio/dsp_filters/Echo.dsp
+++ /dev/null
@@ -1,19 +0,0 @@
-filters = 1
-filter0 = echo
-
-# Somewhat fancy Echo filter. Can take any number of echo channels with varying delays (ms) and feedback factors.
-# Echo output from all channels can be fed back into each other to create a somewhat reverb-like effect if desired.
-
-# Defaults, 200 ms delay echo with feedback:
-# Delay in ms. Takes an array with multiple channels.
-# echo_delay = "200"
-# Feedback factor for echo.
-# echo_feedback = "0.5"
-# Overall echo amplification. If too high, the echo becomes unstable due to feedback.
-# echo_amp = "0.2"
-
-# Reverby preset.
-# echo_delay    = " 60  80 120 172 200 320 380"
-# echo_feedback = "0.5 0.5 0.4 0.3 0.5 0.3 0.2"
-
-# echo_amp = "0.12"
diff --git a/libretro-common/audio/dsp_filters/EchoReverb.dsp b/libretro-common/audio/dsp_filters/EchoReverb.dsp
deleted file mode 100644
index 502effe..0000000
--- a/libretro-common/audio/dsp_filters/EchoReverb.dsp
+++ /dev/null
@@ -1,12 +0,0 @@
-filters = 2
-filter0 = echo
-filter1 = reverb
-
-echo_delay = "200"
-echo_feedback = "0.6"
-echo_amp = "0.25"
-
-reverb_roomwidth = 0.75
-reverb_roomsize = 0.75
-reverb_damping = 1.0
-reverb_wettime = 0.3
diff --git a/libretro-common/audio/dsp_filters/HighShelfDampen.dsp b/libretro-common/audio/dsp_filters/HighShelfDampen.dsp
deleted file mode 100644
index 5768f36..0000000
--- a/libretro-common/audio/dsp_filters/HighShelfDampen.dsp
+++ /dev/null
@@ -1,7 +0,0 @@
-filters = 1
-filter0 = iir
-
-iir_gain = -12.0
-iir_type = HSH
-iir_frequency = 8000.0
-
diff --git a/libretro-common/audio/dsp_filters/IIR.dsp b/libretro-common/audio/dsp_filters/IIR.dsp
deleted file mode 100644
index bfeecb2..0000000
--- a/libretro-common/audio/dsp_filters/IIR.dsp
+++ /dev/null
@@ -1,23 +0,0 @@
-filters = 1
-filter0 = iir
-
-# Defaults.
-#iir_frequency = 1024.0
-#iir_quality = 0.707
-#iir_gain = 0.0
-#iir_type = LPF
-
-# Filter types:
-# LPF: Low-pass
-# HPF: High-pass
-# BPCSGF: Band-pass #1
-# BPZPGF: Band-pass #2
-# APF: Allpass
-# NOTCH: Notch filter
-# RIAA_phono: RIAA record/tape deemphasis
-# PEQ: peaking band EQ
-# BBOOST: Bassboost
-# LSH: Low-shelf
-# HSH: High-shelf
-# RIAA_CD: CD de-emphasis
-
diff --git a/libretro-common/audio/dsp_filters/LowPassCPS.dsp b/libretro-common/audio/dsp_filters/LowPassCPS.dsp
deleted file mode 100644
index ae42e15..0000000
--- a/libretro-common/audio/dsp_filters/LowPassCPS.dsp
+++ /dev/null
@@ -1,47 +0,0 @@
-filters = 1
-filter0 = eq
-
-eq_frequencies = "8000 10000 12500 16000 20000"
-eq_gains = "0 -30 -30 -30 -30"
-
-# Low pass filter for the QSound chip from CPS-1/2.
-# Some games have aliasing due low quality samples, so you can hear some annoying noisy near 11 kHz
-
-# Defaults
-
-# Beta factor for Kaiser window.
-# Lower values will allow better frequency resolution, but more ripple.
-# eq_window_beta = 4.0
-
-# The block size on which FFT is done.
-# Too high value requires more processing as well as longer latency but
-# allows finer-grained control over the spectrum.
-# eq_block_size_log2 = 8
-
-# An array of which frequencies to control.
-# You can create an arbitrary amount of these sampling points.
-# The EQ will try to create a frequency response which fits well to these points.
-# The filter response is linearly interpolated between sampling points here.
-#
-# It is implied that 0 Hz (DC) and Nyquist have predefined gains of 0 dB which are interpolated against.
-# If you want a "peak" in the spectrum or similar, you have to define close points to say, 0 dB.
-#
-# E.g.: A boost of 3 dB at 1 kHz can be expressed as.
-# eq_frequencies = "500 1000 2000"
-# eq_gains = "0 3 0"
-# Due to frequency domain smearing, you will not get exactly +3 dB at 1 kHz.
-
-# By default, this filter has a low pass response with cuttof frequency at ~8600 Hz.
-
-# Dumps the impulse response generated by the EQ as a plain-text file
-# with one coefficient per line.
-# eq_impulse_response_output = "eq_impulse.txt"
-#
-# Using GNU Octave or Matlab, you can plot the response with:
-#
-# f = fopen('/path/to/eq_impulse.txt');
-# l = textscan(f, '%f');
-# res = l{1};
-# freqz(res, 1, 4096, 48000);
-#
-# It will give the response in Hz; 48000 is the default Output Rate of RetroArch
diff --git a/libretro-common/audio/dsp_filters/Makefile b/libretro-common/audio/dsp_filters/Makefile
deleted file mode 100644
index e19930c..0000000
--- a/libretro-common/audio/dsp_filters/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-compiler    := gcc
-extra_flags :=
-use_neon    := 0
-build       = release
-DYLIB	      := so
-
-ifeq ($(platform),)
-   platform = unix
-   ifeq ($(shell uname -a),)
-      platform = win
-   else ifneq ($(findstring MINGW,$(shell uname -a)),)
-      platform = win
-   else ifneq ($(findstring Darwin,$(shell uname -a)),)
-      platform = osx
-      arch = intel
-      ifeq ($(shell uname -p),powerpc)
-         arch = ppc
-      endif
-   else ifneq ($(findstring win,$(shell uname -a)),)
-      platform = win
-   endif
-endif
-
-ifeq ($(platform),gcc)
-   extra_rules_gcc := $(shell $(compiler) -dumpmachine)
-endif
-
-ifneq (,$(findstring armv7,$(extra_rules_gcc)))
-   extra_flags += -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon
-   use_neon := 1
-endif
-
-ifneq (,$(findstring hardfloat,$(extra_rules_gcc)))
-   extra_flags += -mfloat-abi=hard
-endif
-
-ifeq (release,$(build))
-   extra_flags += -O2
-endif
-
-ifeq (debug,$(build))
-   extra_flags += -O0 -g
-endif
-
-ldflags := $(LDFLAGS) -shared -lm -Wl,--version-script=link.T
-
-ifeq ($(platform), unix)
-   DYLIB = so
-else ifeq ($(platform), osx)
-   compiler := $(CC)
-   DYLIB = dylib
-   ldflags := -dynamiclib
-else
-   extra_flags += -static-libgcc -static-libstdc++
-   DYLIB = dll
-endif
-
-CC      := $(compiler) -Wall
-CXX     := $(subst CC,++,$(compiler)) -std=gnu++0x -Wall
-flags   := $(CPPFLAGS) $(CFLAGS) -fPIC $(extra_flags) -I../../include
-asflags := $(ASFLAGS) -fPIC  $(extra_flags)
-objects :=
-
-ifeq (1,$(use_neon))
-   ASMFLAGS := -INEON/asm 
-   asflags += -mfpu=neon
-endif
-
-plugs := $(wildcard *.c)
-objects := $(plugs:.c=.o)
-targets := $(objects:.o=.$(DYLIB))
-
-all: build;
-
-%.o: %.S
-	$(CC) -c -o $@ $(asflags)  $(ASMFLAGS)  $<
-
-%.o: %.c
-	$(CC) -c -o $@ $(flags) $<
-
-%.$(DYLIB): %.o
-	$(CC) -o $@ $(ldflags) $(flags) $^
-
-build: $(targets)
-
-clean:
-	rm -f *.o
-	rm -f *.$(DYLIB)
-
-strip:
-	strip -s *.$(DYLIB)
diff --git a/libretro-common/audio/dsp_filters/Mono.dsp b/libretro-common/audio/dsp_filters/Mono.dsp
deleted file mode 100644
index bef96cf..0000000
--- a/libretro-common/audio/dsp_filters/Mono.dsp
+++ /dev/null
@@ -1,12 +0,0 @@
-filters = 1
-filter0 = panning
-
-# Gains are linear.
-
-# Stereo Mono:
- panning_left_mix = "0.5 0.5"
- panning_right_mix = "0.5 0.5"
-
-# Mono on one speaker:
-# panning_left_mix = "0.5 0.5"
-# panning_right_mix = "0.0 0.0"
diff --git a/libretro-common/audio/dsp_filters/Panning.dsp b/libretro-common/audio/dsp_filters/Panning.dsp
deleted file mode 100644
index 411345f..0000000
--- a/libretro-common/audio/dsp_filters/Panning.dsp
+++ /dev/null
@@ -1,23 +0,0 @@
-filters = 1
-filter0 = panning
-
-# Gains are linear.
-
-# The default. Left and right channels map to each other.
-panning_left_mix = "1.0 0.0"
-panning_right_mix = "0.0 1.0"
-
-# Some examples:
-#
-# Mono:
-# panning_left_mix = "0.5 0.5"
-# panning_right_mix = "0.5 0.5"
-
-# Swap left and right channels:
-# panning_left_mix = "0.0 1.0"
-# panning_right_mix = "1.0 0.0"
-#
-# Mono on one speaker:
-# panning_left_mix = "0.5 0.5"
-# panning_right_mix = "0.0 0.0"
-
diff --git a/libretro-common/audio/dsp_filters/Phaser.dsp b/libretro-common/audio/dsp_filters/Phaser.dsp
deleted file mode 100644
index 80b209d..0000000
--- a/libretro-common/audio/dsp_filters/Phaser.dsp
+++ /dev/null
@@ -1,11 +0,0 @@
-filters = 1
-filter0 = phaser
-
-# Defaults.
-# phaser_lfo_freq = 0.4
-# phaser_lfo_start_phase = 0.0
-# phaser_feedback = 0.0
-# phaser_depth = 0.4
-# phaser_dry_wet = 0.5
-# phaser_stages = 2
-
diff --git a/libretro-common/audio/dsp_filters/Reverb.dsp b/libretro-common/audio/dsp_filters/Reverb.dsp
deleted file mode 100644
index 0f0d53f..0000000
--- a/libretro-common/audio/dsp_filters/Reverb.dsp
+++ /dev/null
@@ -1,10 +0,0 @@
-filters = 1
-filter0 = reverb
-
-# Defaults.
-# reverb_drytime = 0.43
-# reverb_wettime = 0.4
-# reverb_damping = 0.8
-# reverb_roomwidth = 0.56
-# reverb_roomsize = 0.56
-
diff --git a/libretro-common/audio/dsp_filters/WahWah.dsp b/libretro-common/audio/dsp_filters/WahWah.dsp
deleted file mode 100644
index 4d5bceb..0000000
--- a/libretro-common/audio/dsp_filters/WahWah.dsp
+++ /dev/null
@@ -1,10 +0,0 @@
-filters = 1
-filter0 = wahwah
-
-# Defaults.
-# wahwah_lfo_freq = 1.5
-# wahwah_lfo_start_phase = 0.0
-# wahwah_freq_offset = 0.3
-# wahwah_depth = 0.7
-# wahwah_resonance = 2.5
-
diff --git a/libretro-common/audio/dsp_filters/chorus.c b/libretro-common/audio/dsp_filters/chorus.c
deleted file mode 100644
index d48c346..0000000
--- a/libretro-common/audio/dsp_filters/chorus.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (chorus.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_miscellaneous.h>
-#include <libretro_dspfilter.h>
-
-#define CHORUS_MAX_DELAY 4096
-#define CHORUS_DELAY_MASK (CHORUS_MAX_DELAY - 1)
-
-struct chorus_data
-{
-   float old[2][CHORUS_MAX_DELAY];
-   unsigned old_ptr;
-
-   float delay;
-   float depth;
-   float input_rate;
-   float mix_dry;
-   float mix_wet;
-   unsigned lfo_ptr;
-   unsigned lfo_period;
-};
-
-static void chorus_free(void *data)
-{
-   if (data)
-      free(data);
-}
-
-static void chorus_process(void *data, struct dspfilter_output *output,
-      const struct dspfilter_input *input)
-{
-   unsigned i;
-   float *out             = NULL;
-   struct chorus_data *ch = (struct chorus_data*)data;
-
-   output->samples        = input->samples;
-   output->frames         = input->frames;
-   out                    = output->samples;
-
-   for (i = 0; i < input->frames; i++, out += 2)
-   {
-      unsigned delay_int;
-      float delay_frac, l_a, l_b, r_a, r_b;
-      float chorus_l, chorus_r;
-      float in[2] = { out[0], out[1] };
-      float delay = ch->delay + ch->depth * sin((2.0 * M_PI * ch->lfo_ptr++) / ch->lfo_period);
-
-      delay *= ch->input_rate;
-      if (ch->lfo_ptr >= ch->lfo_period)
-         ch->lfo_ptr = 0;
-
-      delay_int = (unsigned)delay;
-
-      if (delay_int >= CHORUS_MAX_DELAY - 1)
-         delay_int = CHORUS_MAX_DELAY - 2;
-
-      delay_frac = delay - delay_int;
-
-      ch->old[0][ch->old_ptr] = in[0];
-      ch->old[1][ch->old_ptr] = in[1];
-
-      l_a         = ch->old[0][(ch->old_ptr - delay_int - 0) & CHORUS_DELAY_MASK];
-      l_b         = ch->old[0][(ch->old_ptr - delay_int - 1) & CHORUS_DELAY_MASK];
-      r_a         = ch->old[1][(ch->old_ptr - delay_int - 0) & CHORUS_DELAY_MASK];
-      r_b         = ch->old[1][(ch->old_ptr - delay_int - 1) & CHORUS_DELAY_MASK];
-
-      /* Lerp introduces aliasing of the chorus component, 
-       * but doing full polyphase here is probably overkill. */
-      chorus_l    = l_a * (1.0f - delay_frac) + l_b * delay_frac;
-      chorus_r    = r_a * (1.0f - delay_frac) + r_b * delay_frac;
-
-      out[0]      = ch->mix_dry * in[0] + ch->mix_wet * chorus_l;
-      out[1]      = ch->mix_dry * in[1] + ch->mix_wet * chorus_r;
-
-      ch->old_ptr = (ch->old_ptr + 1) & CHORUS_DELAY_MASK;
-   }
-}
-
-static void *chorus_init(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata)
-{
-   float delay, depth, lfo_freq, drywet;
-   struct chorus_data *ch = (struct chorus_data*)calloc(1, sizeof(*ch));
-   if (!ch)
-      return NULL;
-
-   config->get_float(userdata, "delay_ms", &delay, 25.0f);
-   config->get_float(userdata, "depth_ms", &depth, 1.0f);
-   config->get_float(userdata, "lfo_freq", &lfo_freq, 0.5f);
-   config->get_float(userdata, "drywet", &drywet, 0.8f);
-
-   delay /= 1000.0f;
-   depth /= 1000.0f;
-
-   if (depth > delay)
-      depth = delay;
-
-   if (drywet < 0.0f)
-      drywet = 0.0f;
-   else if (drywet > 1.0f)
-      drywet = 1.0f;
-
-   ch->mix_dry = 1.0f - 0.5f * drywet;
-   ch->mix_wet = 0.5f * drywet;
-
-   ch->delay = delay;
-   ch->depth = depth;
-   ch->lfo_period = (1.0f / lfo_freq) * info->input_rate;
-   ch->input_rate = info->input_rate;
-   if (!ch->lfo_period)
-      ch->lfo_period = 1;
-   return ch;
-}
-
-static const struct dspfilter_implementation chorus_plug = {
-   chorus_init,
-   chorus_process,
-   chorus_free,
-
-   DSPFILTER_API_VERSION,
-   "Chorus",
-   "chorus",
-};
-
-#ifdef HAVE_FILTERS_BUILTIN
-#define dspfilter_get_implementation chorus_dspfilter_get_implementation
-#endif
-
-const struct dspfilter_implementation *
-dspfilter_get_implementation(dspfilter_simd_mask_t mask)
-{
-   (void)mask;
-   return &chorus_plug;
-}
-
-#undef dspfilter_get_implementation
-
diff --git a/libretro-common/audio/dsp_filters/echo.c b/libretro-common/audio/dsp_filters/echo.c
deleted file mode 100644
index 4b0c6cc..0000000
--- a/libretro-common/audio/dsp_filters/echo.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (echo.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-
-#include <retro_miscellaneous.h>
-#include <libretro_dspfilter.h>
-
-struct echo_channel
-{
-   float *buffer;
-   unsigned ptr;
-   unsigned frames;
-   float feedback;
-};
-
-struct echo_data
-{
-   struct echo_channel *channels;
-   unsigned num_channels;
-   float amp;
-};
-
-static void echo_free(void *data)
-{
-   unsigned i;
-   struct echo_data *echo = (struct echo_data*)data;
-
-   for (i = 0; i < echo->num_channels; i++)
-      free(echo->channels[i].buffer);
-   free(echo->channels);
-   free(echo);
-}
-
-static void echo_process(void *data, struct dspfilter_output *output,
-      const struct dspfilter_input *input)
-{
-   unsigned i, c;
-   float *out             = NULL;
-   struct echo_data *echo = (struct echo_data*)data;
-
-   output->samples        = input->samples;
-   output->frames         = input->frames;
-
-   out                    = output->samples;
-
-   for (i = 0; i < input->frames; i++, out += 2)
-   {
-      float left, right;
-      float echo_left  = 0.0f;
-      float echo_right = 0.0f;
-
-      for (c = 0; c < echo->num_channels; c++)
-      {
-         echo_left  += echo->channels[c].buffer[(echo->channels[c].ptr << 1) + 0];
-         echo_right += echo->channels[c].buffer[(echo->channels[c].ptr << 1) + 1];
-      }
-
-      echo_left  *= echo->amp;
-      echo_right *= echo->amp;
-
-      left        = out[0] + echo_left;
-      right       = out[1] + echo_right;
-
-      for (c = 0; c < echo->num_channels; c++)
-      {
-         float feedback_left  = out[0] + echo->channels[c].feedback * echo_left;
-         float feedback_right = out[1] + echo->channels[c].feedback * echo_right;
-
-         echo->channels[c].buffer[(echo->channels[c].ptr << 1) + 0] = feedback_left;
-         echo->channels[c].buffer[(echo->channels[c].ptr << 1) + 1] = feedback_right;
-
-         echo->channels[c].ptr = (echo->channels[c].ptr + 1) % echo->channels[c].frames;
-      }
-
-      out[0] = left;
-      out[1] = right;
-   }
-}
-
-static void *echo_init(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata)
-{
-   unsigned i, channels;
-   struct echo_channel *echo_channels    = NULL;
-   float *delay                          = NULL;
-   float *feedback                       = NULL;
-   unsigned num_delay                    = 0;
-   unsigned num_feedback                 = 0;
-
-   static const float default_delay[]    = { 200.0f };
-   static const float default_feedback[] = { 0.5f };
-   struct echo_data *echo                = (struct echo_data*)
-      calloc(1, sizeof(*echo));
-
-   if (!echo)
-      return NULL;
-
-   config->get_float_array(userdata, "delay", &delay,
-         &num_delay, default_delay, 1);
-   config->get_float_array(userdata, "feedback", &feedback,
-         &num_feedback, default_feedback, 1);
-   config->get_float(userdata, "amp", &echo->amp, 0.2f);
-
-   channels       = num_feedback = num_delay = MIN(num_delay, num_feedback);
-
-   echo_channels = (struct echo_channel*)calloc(channels,
-         sizeof(*echo_channels));
-
-   if (!echo_channels)
-      goto error;
-
-   echo->channels     = echo_channels;
-   echo->num_channels = channels;
-
-   for (i = 0; i < channels; i++)
-   {
-      unsigned frames = (unsigned)(delay[i] * info->input_rate / 1000.0f + 0.5f);
-      if (!frames)
-         goto error;
-
-      echo->channels[i].buffer = (float*)calloc(frames, 2 * sizeof(float));
-      if (!echo->channels[i].buffer)
-         goto error;
-
-      echo->channels[i].frames = frames;
-      echo->channels[i].feedback = feedback[i];
-   }
-
-   config->free(delay);
-   config->free(feedback);
-   return echo;
-
-error:
-   config->free(delay);
-   config->free(feedback);
-   echo_free(echo);
-   return NULL;
-}
-
-
-static const struct dspfilter_implementation echo_plug = {
-   echo_init,
-   echo_process,
-   echo_free,
-
-   DSPFILTER_API_VERSION,
-   "Multi-Echo",
-   "echo",
-};
-
-#ifdef HAVE_FILTERS_BUILTIN
-#define dspfilter_get_implementation echo_dspfilter_get_implementation
-#endif
-
-const struct dspfilter_implementation *dspfilter_get_implementation(dspfilter_simd_mask_t mask)
-{
-   (void)mask;
-   return &echo_plug;
-}
-
-#undef dspfilter_get_implementation
-
diff --git a/libretro-common/audio/dsp_filters/eq.c b/libretro-common/audio/dsp_filters/eq.c
deleted file mode 100644
index 4033aa6..0000000
--- a/libretro-common/audio/dsp_filters/eq.c
+++ /dev/null
@@ -1,352 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (eq.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_inline.h>
-#include <retro_miscellaneous.h>
-#include <filters.h>
-#include <libretro_dspfilter.h>
-
-#include "fft/fft.c"
-
-struct eq_data
-{
-   fft_t *fft;
-   float buffer[8 * 1024];
-
-   float *save;
-   float *block;
-   fft_complex_t *filter;
-   fft_complex_t *fftblock;
-   unsigned block_size;
-   unsigned block_ptr;
-};
-
-struct eq_gain
-{
-   float freq;
-   float gain; /* Linear. */
-};
-
-static void eq_free(void *data)
-{
-   struct eq_data *eq = (struct eq_data*)data;
-   if (!eq)
-      return;
-
-   fft_free(eq->fft);
-   free(eq->save);
-   free(eq->block);
-   free(eq->fftblock);
-   free(eq->filter);
-   free(eq);
-}
-
-static void eq_process(void *data, struct dspfilter_output *output,
-      const struct dspfilter_input *input)
-{
-   float *out;
-   const float *in;
-   unsigned input_frames;
-   struct eq_data *eq = (struct eq_data*)data;
-
-   output->samples    = eq->buffer;
-   output->frames     = 0;
-
-   out                = eq->buffer;
-   in                 = input->samples;
-   input_frames       = input->frames;
-
-   while (input_frames)
-   {
-      unsigned write_avail = eq->block_size - eq->block_ptr;
-
-      if (input_frames < write_avail)
-         write_avail = input_frames;
-
-      memcpy(eq->block + eq->block_ptr * 2, in, write_avail * 2 * sizeof(float));
-
-      in += write_avail * 2;
-      input_frames -= write_avail;
-      eq->block_ptr += write_avail;
-
-      // Convolve a new block.
-      if (eq->block_ptr == eq->block_size)
-      {
-         unsigned i, c;
-
-         for (c = 0; c < 2; c++)
-         {
-            fft_process_forward(eq->fft, eq->fftblock, eq->block + c, 2);
-            for (i = 0; i < 2 * eq->block_size; i++)
-               eq->fftblock[i] = fft_complex_mul(eq->fftblock[i], eq->filter[i]);
-            fft_process_inverse(eq->fft, out + c, eq->fftblock, 2);
-         }
-
-         // Overlap add method, so add in saved block now.
-         for (i = 0; i < 2 * eq->block_size; i++)
-            out[i] += eq->save[i];
-
-         // Save block for later.
-         memcpy(eq->save, out + 2 * eq->block_size, 2 * eq->block_size * sizeof(float));
-
-         out += eq->block_size * 2;
-         output->frames += eq->block_size;
-         eq->block_ptr = 0;
-      }
-   }
-}
-
-static int gains_cmp(const void *a_, const void *b_)
-{
-   const struct eq_gain *a = (const struct eq_gain*)a_;
-   const struct eq_gain *b = (const struct eq_gain*)b_;
-   if (a->freq < b->freq)
-      return -1;
-   if (a->freq > b->freq)
-      return 1;
-   return 0;
-}
-
-static void generate_response(fft_complex_t *response,
-      const struct eq_gain *gains, unsigned num_gains, unsigned samples)
-{
-   unsigned i;
-
-   float start_freq = 0.0f;
-   float start_gain = 1.0f;
-
-   float end_freq   = 1.0f;
-   float end_gain   = 1.0f;
-
-   if (num_gains)
-   {
-      end_freq = gains->freq;
-      end_gain = gains->gain;
-      num_gains--;
-      gains++;
-   }
-
-   /* Create a response by linear interpolation between 
-    * known frequency sample points. */
-   for (i = 0; i <= samples; i++)
-   {
-      float gain;
-      float lerp = 0.5f;
-      float freq = (float)i / samples;
-
-      while (freq >= end_freq)
-      {
-         if (num_gains)
-         {
-            start_freq = end_freq;
-            start_gain = end_gain;
-            end_freq = gains->freq;
-            end_gain = gains->gain;
-
-            gains++;
-            num_gains--;
-         }
-         else
-         {
-            start_freq = end_freq;
-            start_gain = end_gain;
-            end_freq = 1.0f;
-            end_gain = 1.0f;
-            break;
-         }
-      }
-
-      /* Edge case where i == samples. */
-      if (end_freq > start_freq)
-         lerp = (freq - start_freq) / (end_freq - start_freq);
-      gain = (1.0f - lerp) * start_gain + lerp * end_gain;
-
-      response[i].real = gain;
-      response[i].imag = 0.0f;
-      response[2 * samples - i].real = gain;
-      response[2 * samples - i].imag = 0.0f;
-   }
-}
-
-static void create_filter(struct eq_data *eq, unsigned size_log2,
-      struct eq_gain *gains, unsigned num_gains, double beta, const char *filter_path)
-{
-   int i;
-   int half_block_size = eq->block_size >> 1;
-   double window_mod = 1.0 / kaiser_window_function(0.0, beta);
-
-   fft_t *fft = fft_new(size_log2);
-   float *time_filter = (float*)calloc(eq->block_size * 2 + 1, sizeof(*time_filter));
-   if (!fft || !time_filter)
-      goto end;
-
-   /* Make sure bands are in correct order. */
-   qsort(gains, num_gains, sizeof(*gains), gains_cmp);
-
-   /* Compute desired filter response. */
-   generate_response(eq->filter, gains, num_gains, half_block_size);
-
-   /* Get equivalent time-domain filter. */
-   fft_process_inverse(fft, time_filter, eq->filter, 1);
-
-   /* ifftshift() to create the correct linear phase filter.
-    * The filter response was designed with zero phase, which 
-    * won't work unless we compensate
-    * for the repeating property of the FFT here 
-    * by flipping left and right blocks. */
-   for (i = 0; i < half_block_size; i++)
-   {
-      float tmp = time_filter[i + half_block_size];
-      time_filter[i + half_block_size] = time_filter[i];
-      time_filter[i] = tmp;
-   }
-
-   /* Apply a window to smooth out the frequency repsonse. */
-   for (i = 0; i < (int)eq->block_size; i++)
-   {
-      /* Kaiser window. */
-      double phase = (double)i / eq->block_size;
-      phase = 2.0 * (phase - 0.5);
-      time_filter[i] *= window_mod * kaiser_window_function(phase, beta);
-   }
-
-   /* Debugging. */
-   if (filter_path)
-   {
-      FILE *file = fopen(filter_path, "w");
-      if (file)
-      {
-         for (i = 0; i < (int)eq->block_size - 1; i++)
-            fprintf(file, "%.8f\n", time_filter[i + 1]);
-         fclose(file);
-      }
-   }
-
-   /* Padded FFT to create our FFT filter.
-    * Make our even-length filter odd by discarding the first coefficient.
-    * For some interesting reason, this allows us to design an odd-length linear phase filter.
-    */
-   fft_process_forward(eq->fft, eq->filter, time_filter + 1, 1);
-
-end:
-   fft_free(fft);
-   free(time_filter);
-}
-
-static void *eq_init(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata)
-{
-   float *frequencies, *gain;
-   unsigned num_freq, num_gain, i, size;
-   int size_log2;
-   float beta;
-   struct eq_gain *gains = NULL;
-   char *filter_path = NULL;
-   const float default_freq[] = { 0.0f, info->input_rate };
-   const float default_gain[] = { 0.0f, 0.0f };
-   struct eq_data *eq = (struct eq_data*)calloc(1, sizeof(*eq));
-   if (!eq)
-      return NULL;
-
-
-   config->get_float(userdata, "window_beta", &beta, 4.0f);
-
-   config->get_int(userdata, "block_size_log2", &size_log2, 8);
-   size = 1 << size_log2;
-
-   config->get_float_array(userdata, "frequencies", &frequencies, &num_freq, default_freq, 2);
-   config->get_float_array(userdata, "gains", &gain, &num_gain, default_gain, 2);
-
-   if (!config->get_string(userdata, "impulse_response_output", &filter_path, ""))
-   {
-      config->free(filter_path);
-      filter_path = NULL;
-   }
-
-   num_gain = num_freq = MIN(num_gain, num_freq);
-
-   gains = (struct eq_gain*)calloc(num_gain, sizeof(*gains));
-   if (!gains)
-      goto error;
-
-   for (i = 0; i < num_gain; i++)
-   {
-      gains[i].freq = frequencies[i] / (0.5f * info->input_rate);
-      gains[i].gain = pow(10.0, gain[i] / 20.0);
-   }
-   config->free(frequencies);
-   config->free(gain);
-
-   eq->block_size = size;
-
-   eq->save     = (float*)calloc(    size, 2 * sizeof(*eq->save));
-   eq->block    = (float*)calloc(2 * size, 2 * sizeof(*eq->block));
-   eq->fftblock = (fft_complex_t*)calloc(2 * size, sizeof(*eq->fftblock));
-   eq->filter   = (fft_complex_t*)calloc(2 * size, sizeof(*eq->filter));
-
-   /* Use an FFT which is twice the block size with zero-padding
-    * to make circular convolution => proper convolution.
-    */
-   eq->fft = fft_new(size_log2 + 1);
-
-   if (!eq->fft || !eq->fftblock || !eq->save || !eq->block || !eq->filter)
-      goto error;
-
-   create_filter(eq, size_log2, gains, num_gain, beta, filter_path);
-   config->free(filter_path);
-   filter_path = NULL;
-
-   free(gains);
-   return eq;
-
-error:
-   free(gains);
-   eq_free(eq);
-   return NULL;
-}
-
-static const struct dspfilter_implementation eq_plug = {
-   eq_init,
-   eq_process,
-   eq_free,
-
-   DSPFILTER_API_VERSION,
-   "Linear-Phase FFT Equalizer",
-   "eq",
-};
-
-#ifdef HAVE_FILTERS_BUILTIN
-#define dspfilter_get_implementation eq_dspfilter_get_implementation
-#endif
-
-const struct dspfilter_implementation *dspfilter_get_implementation(dspfilter_simd_mask_t mask)
-{
-   (void)mask;
-   return &eq_plug;
-}
-
-#undef dspfilter_get_implementation
-
diff --git a/libretro-common/audio/dsp_filters/fft/fft.c b/libretro-common/audio/dsp_filters/fft/fft.c
deleted file mode 100644
index cc6b958..0000000
--- a/libretro-common/audio/dsp_filters/fft/fft.c
+++ /dev/null
@@ -1,205 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (fft.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <math.h>
-#include <stdlib.h>
-
-#include "fft.h"
-
-#include <retro_miscellaneous.h>
-
-struct fft
-{
-   fft_complex_t *interleave_buffer;
-   fft_complex_t *phase_lut;
-   unsigned *bitinverse_buffer;
-   unsigned size;
-};
-
-static unsigned bitswap(unsigned x, unsigned size_log2)
-{
-   unsigned i;
-   unsigned ret = 0;
-   for (i = 0; i < size_log2; i++)
-      ret |= ((x >> i) & 1) << (size_log2 - i - 1);
-   return ret;
-}
-
-static void build_bitinverse(unsigned *bitinverse, unsigned size_log2)
-{
-   unsigned i;
-   unsigned size = 1 << size_log2;
-   for (i = 0; i < size; i++)
-      bitinverse[i] = bitswap(i, size_log2);
-}
-
-static fft_complex_t exp_imag(double phase)
-{
-   fft_complex_t out = { cos(phase), sin(phase) };
-   return out;
-}
-
-static void build_phase_lut(fft_complex_t *out, int size)
-{
-   int i;
-   out += size;
-   for (i = -size; i <= size; i++)
-      out[i] = exp_imag((M_PI * i) / size);
-}
-
-static void interleave_complex(const unsigned *bitinverse,
-      fft_complex_t *out, const fft_complex_t *in,
-      unsigned samples, unsigned step)
-{
-   unsigned i;
-   for (i = 0; i < samples; i++, in += step)
-      out[bitinverse[i]] = *in;
-}
-
-static void interleave_float(const unsigned *bitinverse,
-      fft_complex_t *out, const float *in,
-      unsigned samples, unsigned step)
-{
-   unsigned i;
-   for (i = 0; i < samples; i++, in += step)
-   {
-      unsigned inv_i = bitinverse[i];
-      out[inv_i].real = *in;
-      out[inv_i].imag = 0.0f;
-   }
-}
-
-static void resolve_float(float *out, const fft_complex_t *in, unsigned samples,
-      float gain, unsigned step)
-{
-   unsigned i;
-   for (i = 0; i < samples; i++, in++, out += step)
-      *out = gain * in->real;
-}
-
-fft_t *fft_new(unsigned block_size_log2)
-{
-   fft_t *fft = (fft_t*)calloc(1, sizeof(*fft));
-   if (!fft)
-      return NULL;
-
-   unsigned size = 1 << block_size_log2;
-
-   fft->interleave_buffer = (fft_complex_t*)calloc(size, sizeof(*fft->interleave_buffer));
-   fft->bitinverse_buffer = (unsigned*)calloc(size, sizeof(*fft->bitinverse_buffer));
-   fft->phase_lut         = (fft_complex_t*)calloc(2 * size + 1, sizeof(*fft->phase_lut));
-
-   if (!fft->interleave_buffer || !fft->bitinverse_buffer || !fft->phase_lut)
-      goto error;
-
-   fft->size = size;
-
-   build_bitinverse(fft->bitinverse_buffer, block_size_log2);
-   build_phase_lut(fft->phase_lut, size);
-   return fft;
-
-error:
-   fft_free(fft);
-   return NULL;
-}
-
-void fft_free(fft_t *fft)
-{
-   if (!fft)
-      return;
-
-   free(fft->interleave_buffer);
-   free(fft->bitinverse_buffer);
-   free(fft->phase_lut);
-   free(fft);
-}
-
-static void butterfly(fft_complex_t *a, fft_complex_t *b, fft_complex_t mod)
-{
-   mod = fft_complex_mul(mod, *b);
-   *b  = fft_complex_sub(*a, mod);
-   *a  = fft_complex_add(*a, mod);
-}
-
-static void butterflies(fft_complex_t *butterfly_buf,
-      const fft_complex_t *phase_lut,
-      int phase_dir, unsigned step_size, unsigned samples)
-{
-   unsigned i, j;
-   for (i = 0; i < samples; i += step_size << 1)
-   {
-      int phase_step = (int)samples * phase_dir / (int)step_size;
-      for (j = i; j < i + step_size; j++)
-         butterfly(&butterfly_buf[j], &butterfly_buf[j + step_size],
-               phase_lut[phase_step * (int)(j - i)]);
-   }
-}
-
-void fft_process_forward_complex(fft_t *fft,
-      fft_complex_t *out, const fft_complex_t *in, unsigned step)
-{
-   unsigned step_size;
-   unsigned samples = fft->size;
-   interleave_complex(fft->bitinverse_buffer, out, in, samples, step);
-
-   for (step_size = 1; step_size < samples; step_size <<= 1)
-   {
-      butterflies(out,
-            fft->phase_lut + samples,
-            -1, step_size, samples);
-   }
-}
-
-void fft_process_forward(fft_t *fft,
-      fft_complex_t *out, const float *in, unsigned step)
-{
-   unsigned step_size;
-   unsigned samples = fft->size;
-   interleave_float(fft->bitinverse_buffer, out, in, samples, step);
-
-   for (step_size = 1; step_size < fft->size; step_size <<= 1)
-   {
-      butterflies(out,
-            fft->phase_lut + samples,
-            -1, step_size, samples);
-   }
-}
-
-void fft_process_inverse(fft_t *fft,
-      float *out, const fft_complex_t *in, unsigned step)
-{
-   unsigned step_size;
-   unsigned samples = fft->size;
-
-   interleave_complex(fft->bitinverse_buffer, fft->interleave_buffer,
-         in, samples, 1);
-
-   for (step_size = 1; step_size < samples; step_size <<= 1)
-   {
-      butterflies(fft->interleave_buffer,
-            fft->phase_lut + samples,
-            1, step_size, samples);
-   }
-
-   resolve_float(out, fft->interleave_buffer, samples, 1.0f / samples, step);
-}
-
diff --git a/libretro-common/audio/dsp_filters/fft/fft.h b/libretro-common/audio/dsp_filters/fft/fft.h
deleted file mode 100644
index 8a16c6c..0000000
--- a/libretro-common/audio/dsp_filters/fft/fft.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (fft.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef RARCH_FFT_H__
-#define RARCH_FFT_H__
-
-#include <retro_inline.h>
-#include <math/complex.h>
-
-typedef struct fft fft_t;
-
-fft_t *fft_new(unsigned block_size_log2);
-
-void fft_free(fft_t *fft);
-
-void fft_process_forward_complex(fft_t *fft,
-      fft_complex_t *out, const fft_complex_t *in, unsigned step);
-
-void fft_process_forward(fft_t *fft,
-      fft_complex_t *out, const float *in, unsigned step);
-
-void fft_process_inverse(fft_t *fft,
-      float *out, const fft_complex_t *in, unsigned step);
-
-
-#endif
-
diff --git a/libretro-common/audio/dsp_filters/iir.c b/libretro-common/audio/dsp_filters/iir.c
deleted file mode 100644
index 801e908..0000000
--- a/libretro-common/audio/dsp_filters/iir.c
+++ /dev/null
@@ -1,372 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (iir.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_miscellaneous.h>
-#include <libretro_dspfilter.h>
-#include <string/stdstring.h>
-
-#define sqr(a) ((a) * (a))
-
-/* filter types */
-enum IIRFilter
-{
-   LPF,        /* low pass filter */
-   HPF,        /* High pass filter */
-   BPCSGF,     /* band pass filter 1 */
-   BPZPGF,     /* band pass filter 2 */
-   APF,        /* Allpass filter*/
-   NOTCH,      /* Notch Filter */
-   RIAA_phono, /* RIAA record/tape deemphasis */
-   PEQ,        /* Peaking band EQ filter */
-   BBOOST,     /* Bassboost filter */
-   LSH,        /* Low shelf filter */
-   HSH,        /* High shelf filter */
-   RIAA_CD     /* CD de-emphasis */
-};
-
-struct iir_data
-{
-   float b0, b1, b2;
-   float a0, a1, a2;
-
-   struct
-   {
-      float xn1, xn2;
-      float yn1, yn2;
-   } l, r;
-};
-
-static void iir_free(void *data)
-{
-   free(data);
-}
-
-static void iir_process(void *data, struct dspfilter_output *output,
-      const struct dspfilter_input *input)
-{
-   unsigned i;
-   struct iir_data *iir = (struct iir_data*)data;
-   float *out           = output->samples;
-
-   float b0             = iir->b0;
-   float b1             = iir->b1;
-   float b2             = iir->b2;
-   float a0             = iir->a0;
-   float a1             = iir->a1;
-   float a2             = iir->a2;
-
-   float xn1_l          = iir->l.xn1;
-   float xn2_l          = iir->l.xn2;
-   float yn1_l          = iir->l.yn1;
-   float yn2_l          = iir->l.yn2;
-
-   float xn1_r          = iir->r.xn1;
-   float xn2_r          = iir->r.xn2;
-   float yn1_r          = iir->r.yn1;
-   float yn2_r          = iir->r.yn2;
-
-   output->samples      = input->samples;
-   output->frames       = input->frames;
-
-   for (i = 0; i < input->frames; i++, out += 2)
-   {
-      float in_l = out[0];
-      float in_r = out[1];
-
-      float l    = (b0 * in_l + b1 * xn1_l + b2 * xn2_l - a1 * yn1_l - a2 * yn2_l) / a0;
-      float r    = (b0 * in_r + b1 * xn1_r + b2 * xn2_r - a1 * yn1_r - a2 * yn2_r) / a0;
-
-      xn2_l      = xn1_l;
-      xn1_l      = in_l;
-      yn2_l      = yn1_l;
-      yn1_l      = l;
-
-      xn2_r      = xn1_r;
-      xn1_r      = in_r;
-      yn2_r      = yn1_r;
-      yn1_r      = r;
-
-      out[0]     = l;
-      out[1]     = r;
-   }
-
-   iir->l.xn1 = xn1_l;
-   iir->l.xn2 = xn2_l;
-   iir->l.yn1 = yn1_l;
-   iir->l.yn2 = yn2_l;
-
-   iir->r.xn1 = xn1_r;
-   iir->r.xn2 = xn2_r;
-   iir->r.yn1 = yn1_r;
-   iir->r.yn2 = yn2_r;
-}
-
-#define CHECK(x) if (string_is_equal(str, #x)) return x
-static enum IIRFilter str_to_type(const char *str)
-{
-   CHECK(LPF);
-   CHECK(HPF);
-   CHECK(BPCSGF);
-   CHECK(BPZPGF);
-   CHECK(APF);
-   CHECK(NOTCH);
-   CHECK(RIAA_phono);
-   CHECK(PEQ);
-   CHECK(BBOOST);
-   CHECK(LSH);
-   CHECK(HSH);
-   CHECK(RIAA_CD);
-
-   return LPF; /* Fallback. */
-}
-
-static void make_poly_from_roots(
-      const double *roots, unsigned num_roots, float *poly)
-{
-   unsigned i, j;
-
-   poly[0] = 1;
-   poly[1] = -roots[0];
-   memset(poly + 2, 0, (num_roots + 1 - 2) * sizeof(*poly));
-
-   for (i = 1; i < num_roots; i++)
-      for (j = num_roots; j > 0; j--)
-         poly[j] -= poly[j - 1] * roots[i];
-}
-
-static void iir_filter_init(struct iir_data *iir,
-      float sample_rate, float freq, float qual, float gain, enum IIRFilter filter_type)
-{
-	double omega = 2.0 * M_PI * freq / sample_rate;
-   double cs    = cos(omega);
-   double sn    = sin(omega);
-   double a1pha = sn / (2.0 * qual);
-   double A     = exp(log(10.0) * gain / 40.0);
-   double beta  = sqrt(A + A);
-
-   float b0     = 0.0, b1 = 0.0, b2 = 0.0, a0 = 0.0, a1 = 0.0, a2 = 0.0;
-
-   /* Set up filter coefficients according to type */
-   switch (filter_type)
-   {
-      case LPF:
-         b0 =  (1.0 - cs) / 2.0;
-         b1 =   1.0 - cs ;
-         b2 =  (1.0 - cs) / 2.0;
-         a0 =   1.0 + a1pha;
-         a1 =  -2.0 * cs;
-         a2 =   1.0 - a1pha;
-         break;
-      case HPF:
-         b0 =  (1.0 + cs) / 2.0;
-         b1 = -(1.0 + cs);
-         b2 =  (1.0 + cs) / 2.0;
-         a0 =   1.0 + a1pha;
-         a1 =  -2.0 * cs;
-         a2 =   1.0 - a1pha;
-         break;
-      case APF:
-         b0 =  1.0 - a1pha;
-         b1 = -2.0 * cs;
-         b2 =  1.0 + a1pha;
-         a0 =  1.0 + a1pha;
-         a1 = -2.0 * cs;
-         a2 =  1.0 - a1pha;
-         break;
-      case BPZPGF:
-         b0 =  a1pha;
-         b1 =  0.0;
-         b2 = -a1pha;
-         a0 =  1.0 + a1pha;
-         a1 = -2.0 * cs;
-         a2 =  1.0 - a1pha;
-         break;
-      case BPCSGF:
-         b0 =  sn / 2.0;
-         b1 =  0.0;
-         b2 = -sn / 2.0;
-         a0 =  1.0 + a1pha;
-         a1 = -2.0 * cs;
-         a2 =  1.0 - a1pha;
-         break;
-      case NOTCH: 
-         b0 =  1.0;
-         b1 = -2.0 * cs;
-         b2 =  1.0;
-         a0 =  1.0 + a1pha;
-         a1 = -2.0 * cs;
-         a2 =  1.0 - a1pha;
-         break;
-      case RIAA_phono: /* http://www.dsprelated.com/showmessage/73300/3.php */
-      {
-         double y, b_re, a_re, b_im, a_im, g;
-         float b[3], a[3];
-
-         if ((int)sample_rate == 44100)
-         {
-            static const double zeros[] = {-0.2014898, 0.9233820};
-            static const double poles[] = {0.7083149, 0.9924091};
-            make_poly_from_roots(zeros, 2, b);
-            make_poly_from_roots(poles, 2, a);
-         }
-         else if ((int)sample_rate == 48000)
-         {
-            static const double zeros[] = {-0.1766069, 0.9321590};
-            static const double poles[] = {0.7396325, 0.9931330};
-            make_poly_from_roots(zeros, 2, b);
-            make_poly_from_roots(poles, 2, a);
-         }
-         else if ((int)sample_rate == 88200)
-         {
-            static const double zeros[] = {-0.1168735, 0.9648312};
-            static const double poles[] = {0.8590646, 0.9964002};
-            make_poly_from_roots(zeros, 2, b);
-            make_poly_from_roots(poles, 2, a);
-         }
-         else if ((int)sample_rate == 96000)
-         {
-            static const double zeros[] = {-0.1141486, 0.9676817};
-            static const double poles[] = {0.8699137, 0.9966946};
-            make_poly_from_roots(zeros, 2, b);
-            make_poly_from_roots(poles, 2, a);
-         }
-         
-         b0    = b[0];
-         b1    = b[1];
-         b2    = b[2];
-         a0    = a[0];
-         a1    = a[1];
-         a2    = a[2];
-
-
-         /* Normalise to 0dB at 1kHz (Thanks to Glenn Davis) */
-         y     = 2.0 * M_PI * 1000.0 / sample_rate;
-         b_re  = b0 + b1 * cos(-y) + b2 * cos(-2.0 * y);
-         a_re  = a0 + a1 * cos(-y) + a2 * cos(-2.0 * y);
-         b_im  = b1 * sin(-y) + b2 * sin(-2.0 * y);
-         a_im  = a1 * sin(-y) + a2 * sin(-2.0 * y);
-         g     = 1.0 / sqrt((sqr(b_re) + sqr(b_im)) / (sqr(a_re) + sqr(a_im)));
-         b0   *= g; b1 *= g; b2 *= g;
-         break;
-      }
-      case PEQ: 
-         b0 =  1.0 + a1pha * A;
-         b1 = -2.0 * cs;
-         b2 =  1.0 - a1pha * A;
-         a0 =  1.0 + a1pha / A;
-         a1 = -2.0 * cs;
-         a2 =  1.0 - a1pha / A;
-         break; 
-      case BBOOST:       
-         beta = sqrt((A * A + 1) / 1.0 - (pow((A - 1), 2)));
-         b0 = A * ((A + 1) - (A - 1) * cs + beta * sn);
-         b1 = 2 * A * ((A - 1) - (A + 1) * cs);
-         b2 = A * ((A + 1) - (A - 1) * cs - beta * sn);
-         a0 = ((A + 1) + (A - 1) * cs + beta * sn);
-         a1 = -2 * ((A - 1) + (A + 1) * cs);
-         a2 = (A + 1) + (A - 1) * cs - beta * sn;
-         break;
-      case LSH:
-         b0 = A * ((A + 1) - (A - 1) * cs + beta * sn);
-         b1 = 2 * A * ((A - 1) - (A + 1) * cs);
-         b2 = A * ((A + 1) - (A - 1) * cs - beta * sn);
-         a0 = (A + 1) + (A - 1) * cs + beta * sn;
-         a1 = -2 * ((A - 1) + (A + 1) * cs);
-         a2 = (A + 1) + (A - 1) * cs - beta * sn;
-         break;
-      case RIAA_CD:
-         omega = 2.0 * M_PI * 5283.0 / sample_rate;
-         cs = cos(omega);
-         sn = sin(omega);
-         a1pha = sn / (2.0 * 0.4845);
-         A = exp(log(10.0) * -9.477 / 40.0);
-         beta = sqrt(A + A);
-         (void)a1pha;
-      case HSH:
-         b0 = A * ((A + 1.0) + (A - 1.0) * cs + beta * sn);
-         b1 = -2.0 * A * ((A - 1.0) + (A + 1.0) * cs);
-         b2 = A * ((A + 1.0) + (A - 1.0) * cs - beta * sn);
-         a0 = (A + 1.0) - (A - 1.0) * cs + beta * sn;
-         a1 = 2.0 * ((A - 1.0) - (A + 1.0) * cs);
-         a2 = (A + 1.0) - (A - 1.0) * cs - beta * sn;
-         break;
-      default:
-         break;
-   }
-
-   iir->b0 = b0;
-   iir->b1 = b1;
-   iir->b2 = b2;
-   iir->a0 = a0;
-   iir->a1 = a1;
-   iir->a2 = a2;
-}
-
-static void *iir_init(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata)
-{
-   float freq, qual, gain;
-   enum IIRFilter filter  = LPF;
-   char           *type   = NULL;
-   struct iir_data *iir   = (struct iir_data*)calloc(1, sizeof(*iir));
-   if (!iir)
-      return NULL;
-
-   config->get_float(userdata, "frequency", &freq, 1024.0f);
-   config->get_float(userdata, "quality", &qual, 0.707f);
-   config->get_float(userdata, "gain", &gain, 0.0f);
-
-   config->get_string(userdata, "type", &type, "LPF");
-
-   filter = str_to_type(type);
-   config->free(type);
-
-   iir_filter_init(iir, info->input_rate, freq, qual, gain, filter);
-   return iir;
-}
-
-static const struct dspfilter_implementation iir_plug = {
-   iir_init,
-   iir_process,
-   iir_free,
-
-   DSPFILTER_API_VERSION,
-   "IIR",
-   "iir",
-};
-
-#ifdef HAVE_FILTERS_BUILTIN
-#define dspfilter_get_implementation iir_dspfilter_get_implementation
-#endif
-
-const struct dspfilter_implementation *dspfilter_get_implementation(dspfilter_simd_mask_t mask)
-{
-   (void)mask;
-   return &iir_plug;
-}
-
-#undef dspfilter_get_implementation
-
diff --git a/libretro-common/audio/dsp_filters/link.T b/libretro-common/audio/dsp_filters/link.T
deleted file mode 100644
index bd9ad79..0000000
--- a/libretro-common/audio/dsp_filters/link.T
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  global: dspfilter_get_implementation;
-  local: *;
-};
diff --git a/libretro-common/audio/dsp_filters/panning.c b/libretro-common/audio/dsp_filters/panning.c
deleted file mode 100644
index 52935bb..0000000
--- a/libretro-common/audio/dsp_filters/panning.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (panning.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <libretro_dspfilter.h>
-
-struct panning_data
-{
-   float left[2];
-   float right[2];
-};
-
-static void panning_free(void *data)
-{
-   free(data);
-}
-
-static void panning_process(void *data, struct dspfilter_output *output,
-      const struct dspfilter_input *input)
-{
-   unsigned i;
-   struct panning_data *pan = (struct panning_data*)data;
-   float *out               = output->samples;
-
-   output->samples          = input->samples;
-   output->frames           = input->frames;
-
-   for (i = 0; i < input->frames; i++, out += 2)
-   {
-      float left  = out[0];
-      float right = out[1];
-      out[0]      = left * pan->left[0]  + right * pan->left[1];
-      out[1]      = left * pan->right[0] + right * pan->right[1];
-   }
-}
-
-static void *panning_init(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata)
-{
-   static const float default_left[]  = { 1.0f, 0.0f };
-   static const float default_right[] = { 0.0f, 1.0f };
-   float *left                        = NULL;
-   float *right                       = NULL;
-   unsigned num_left                  = 0;
-   unsigned num_right                 = 0;
-   struct panning_data *pan           = (struct panning_data*)
-      calloc(1, sizeof(*pan));
-
-   if (!pan)
-      return NULL;
-
-   config->get_float_array(userdata, "left_mix",
-         &left, &num_left, default_left, 2);
-   config->get_float_array(userdata, "right_mix",
-         &right, &num_right, default_right, 2);
-
-   memcpy(pan->left,  (num_left  == 2) ? 
-         left :  default_left,  sizeof(pan->left));
-   memcpy(pan->right, (num_right == 2) ?
-         right : default_right, sizeof(pan->right));
-
-   config->free(left);
-   config->free(right);
-
-   return pan;
-}
-
-static const struct dspfilter_implementation panning = {
-   panning_init,
-   panning_process,
-   panning_free,
-
-   DSPFILTER_API_VERSION,
-   "Panning",
-   "panning",
-};
-
-#ifdef HAVE_FILTERS_BUILTIN
-#define dspfilter_get_implementation panning_dspfilter_get_implementation
-#endif
-
-const struct dspfilter_implementation *
-dspfilter_get_implementation(dspfilter_simd_mask_t mask)
-{
-   (void)mask;
-   return &panning;
-}
-
-#undef dspfilter_get_implementation
-
diff --git a/libretro-common/audio/dsp_filters/phaser.c b/libretro-common/audio/dsp_filters/phaser.c
deleted file mode 100644
index 7c165e1..0000000
--- a/libretro-common/audio/dsp_filters/phaser.c
+++ /dev/null
@@ -1,146 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (phaser.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_miscellaneous.h>
-#include <libretro_dspfilter.h>
-
-#define phaserlfoshape 4.0
-#define phaserlfoskipsamples 20
-
-struct phaser_data
-{
-   float freq;
-   float startphase;
-   float fb;
-   float depth;
-   float drywet;
-   float old[2][24];
-   float gain;
-   float fbout[2];
-   float lfoskip;
-   float phase;
-
-   int stages;
-   unsigned long skipcount;
-};
-
-static void phaser_free(void *data)
-{
-   free(data);
-}
-
-static void phaser_process(void *data, struct dspfilter_output *output,
-      const struct dspfilter_input *input)
-{
-   unsigned i, c;
-   int s;
-   float m[2], tmp[2];
-   struct phaser_data *ph = (struct phaser_data*)data;
-   float *out             = output->samples;
-
-   output->samples        = input->samples;
-   output->frames         = input->frames;
-
-   for (i = 0; i < input->frames; i++, out += 2)
-   {
-      float in[2] = { out[0], out[1] };
-
-      for (c = 0; c < 2; c++)
-         m[c] = in[c] + ph->fbout[c] * ph->fb * 0.01f;
-
-      if ((ph->skipcount++ % phaserlfoskipsamples) == 0)
-      {
-         ph->gain = 0.5 * (1.0 + cos(ph->skipcount * ph->lfoskip + ph->phase));
-         ph->gain = (exp(ph->gain * phaserlfoshape) - 1.0) / (exp(phaserlfoshape) - 1);
-         ph->gain = 1.0 - ph->gain * ph->depth;
-      }
-
-      for (s = 0; s < ph->stages; s++)
-      {
-         for (c = 0; c < 2; c++)
-         {
-            tmp[c] = ph->old[c][s];
-            ph->old[c][s] = ph->gain * tmp[c] + m[c];
-            m[c] = tmp[c] - ph->gain * ph->old[c][s];
-         }
-      }
-
-      for (c = 0; c < 2; c++)
-      {
-         ph->fbout[c] = m[c];
-         out[c] = m[c] * ph->drywet + in[c] * (1.0f - ph->drywet);
-      }
-   }
-}
-
-static void *phaser_init(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata)
-{
-   float lfo_freq, lfo_start_phase;
-   struct phaser_data *ph = (struct phaser_data*)calloc(1, sizeof(*ph));
-   if (!ph)
-      return NULL;
-
-   config->get_float(userdata, "lfo_freq", &lfo_freq, 0.4f);
-   config->get_float(userdata, "lfo_start_phase", &lfo_start_phase, 0.0f);
-   config->get_float(userdata, "feedback", &ph->fb, 0.0f);
-   config->get_float(userdata, "depth", &ph->depth, 0.4f);
-   config->get_float(userdata, "dry_wet", &ph->drywet, 0.5f);
-   config->get_int(userdata, "stages", &ph->stages, 2);
-
-   if (ph->stages < 1)
-      ph->stages = 1;
-   else if (ph->stages > 24)
-      ph->stages = 24;
-
-   ph->lfoskip = lfo_freq * 2.0 * M_PI / info->input_rate;
-   ph->phase   = lfo_start_phase * M_PI / 180.0;
-
-   return ph;
-}
-
-static const struct dspfilter_implementation phaser_plug = {
-   phaser_init,
-   phaser_process,
-   phaser_free,
-
-   DSPFILTER_API_VERSION,
-   "Phaser",
-   "phaser",
-};
-
-#ifdef HAVE_FILTERS_BUILTIN
-#define dspfilter_get_implementation phaser_dspfilter_get_implementation
-#endif
-
-const struct dspfilter_implementation *dspfilter_get_implementation(dspfilter_simd_mask_t mask)
-{
-   (void)mask;
-   return &phaser_plug;
-}
-
-#undef dspfilter_get_implementation
-
diff --git a/libretro-common/audio/dsp_filters/reverb.c b/libretro-common/audio/dsp_filters/reverb.c
deleted file mode 100644
index e81d859..0000000
--- a/libretro-common/audio/dsp_filters/reverb.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (reverb.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_inline.h>
-#include <libretro_dspfilter.h>
-
-struct comb
-{
-   float *buffer;
-   unsigned bufsize;
-   unsigned bufidx;
-
-   float feedback;
-   float filterstore;
-   float damp1, damp2;
-};
-
-struct allpass
-{
-   float *buffer;
-   float feedback;
-   unsigned bufsize;
-   unsigned bufidx;
-};
-
-static INLINE float comb_process(struct comb *c, float input)
-{
-   float output         = c->buffer[c->bufidx];
-   c->filterstore       = (output * c->damp2) + (c->filterstore * c->damp1);
-
-   c->buffer[c->bufidx] = input + (c->filterstore * c->feedback);
-
-   c->bufidx++;
-   if (c->bufidx >= c->bufsize)
-      c->bufidx = 0;
-
-   return output;
-}
-
-
-static INLINE float allpass_process(struct allpass *a, float input)
-{
-   float bufout         = a->buffer[a->bufidx];
-   float output         = -input + bufout;
-   a->buffer[a->bufidx] = input + bufout * a->feedback;
-
-   a->bufidx++;
-   if (a->bufidx >= a->bufsize)
-      a->bufidx = 0;
-
-   return output;
-}
-
-#define numcombs 8
-#define numallpasses 4
-static const float muted = 0;
-static const float fixedgain = 0.015f;
-static const float scalewet = 3;
-static const float scaledry = 2;
-static const float scaledamp = 0.4f;
-static const float scaleroom = 0.28f;
-static const float offsetroom = 0.7f;
-static const float initialroom = 0.5f;
-static const float initialdamp = 0.5f;
-static const float initialwet = 1.0f / 3.0f;
-static const float initialdry = 0;
-static const float initialwidth = 1;
-static const float initialmode = 0;
-static const float freezemode = 0.5f;
-
-#define combtuningL1 1116
-#define combtuningL2 1188
-#define combtuningL3 1277
-#define combtuningL4 1356
-#define combtuningL5 1422
-#define combtuningL6 1491
-#define combtuningL7 1557
-#define combtuningL8 1617
-#define allpasstuningL1 556
-#define allpasstuningL2 441
-#define allpasstuningL3 341
-#define allpasstuningL4 225
-
-struct revmodel
-{
-   struct comb combL[numcombs];
-   struct allpass allpassL[numallpasses];
-
-   float bufcombL1[combtuningL1];
-   float bufcombL2[combtuningL2];
-   float bufcombL3[combtuningL3];
-   float bufcombL4[combtuningL4];
-   float bufcombL5[combtuningL5];
-   float bufcombL6[combtuningL6];
-   float bufcombL7[combtuningL7];
-   float bufcombL8[combtuningL8];
-
-   float bufallpassL1[allpasstuningL1];
-   float bufallpassL2[allpasstuningL2];
-   float bufallpassL3[allpasstuningL3];
-   float bufallpassL4[allpasstuningL4];
-
-   float gain;
-   float roomsize, roomsize1;
-   float damp, damp1;
-   float wet, wet1, wet2;
-   float dry;
-   float width;
-   float mode;
-};
-
-static float revmodel_process(struct revmodel *rev, float in)
-{
-   int i;
-   float mono_out = 0.0f;
-   float mono_in  = in;
-   float input    = mono_in * rev->gain;
-
-   for (i = 0; i < numcombs; i++)
-      mono_out += comb_process(&rev->combL[i], input);
-
-   for (i = 0; i < numallpasses; i++)
-      mono_out = allpass_process(&rev->allpassL[i], mono_out);
-
-   return mono_in * rev->dry + mono_out * rev->wet1;
-}
-
-static void revmodel_update(struct revmodel *rev)
-{
-   int i;
-   rev->wet1 = rev->wet * (rev->width / 2.0f + 0.5f);
-
-   if (rev->mode >= freezemode)
-   {
-      rev->roomsize1 = 1.0f;
-      rev->damp1 = 0.0f;
-      rev->gain = muted;
-   }
-   else
-   {
-      rev->roomsize1 = rev->roomsize;
-      rev->damp1 = rev->damp;
-      rev->gain = fixedgain;
-   }
-
-   for (i = 0; i < numcombs; i++)
-   {
-      rev->combL[i].feedback = rev->roomsize1;
-      rev->combL[i].damp1 = rev->damp1;
-      rev->combL[i].damp2 = 1.0f - rev->damp1;
-   }
-}
-
-static void revmodel_setroomsize(struct revmodel *rev, float value)
-{
-   rev->roomsize = value * scaleroom + offsetroom;
-   revmodel_update(rev);
-}
-
-static void revmodel_setdamp(struct revmodel *rev, float value)
-{
-   rev->damp = value * scaledamp;
-   revmodel_update(rev);
-}
-
-static void revmodel_setwet(struct revmodel *rev, float value)
-{
-   rev->wet = value * scalewet;
-   revmodel_update(rev);
-}
-
-static void revmodel_setdry(struct revmodel *rev, float value)
-{
-   rev->dry = value * scaledry;
-   revmodel_update(rev);
-}
-
-static void revmodel_setwidth(struct revmodel *rev, float value)
-{
-   rev->width = value;
-   revmodel_update(rev);
-}
-
-static void revmodel_setmode(struct revmodel *rev, float value)
-{
-   rev->mode = value;
-   revmodel_update(rev);
-}
-
-static void revmodel_init(struct revmodel *rev)
-{
-   rev->combL[0].buffer      = rev->bufcombL1; rev->combL[0].bufsize = combtuningL1;
-   rev->combL[1].buffer      = rev->bufcombL2; rev->combL[1].bufsize = combtuningL2;
-   rev->combL[2].buffer      = rev->bufcombL3; rev->combL[2].bufsize = combtuningL3;
-   rev->combL[3].buffer      = rev->bufcombL4; rev->combL[3].bufsize = combtuningL4;
-   rev->combL[4].buffer      = rev->bufcombL5; rev->combL[4].bufsize = combtuningL5;
-   rev->combL[5].buffer      = rev->bufcombL6; rev->combL[5].bufsize = combtuningL6;
-   rev->combL[6].buffer      = rev->bufcombL7; rev->combL[6].bufsize = combtuningL7;
-   rev->combL[7].buffer      = rev->bufcombL8; rev->combL[7].bufsize = combtuningL8;
-
-   rev->allpassL[0].buffer   = rev->bufallpassL1; rev->allpassL[0].bufsize = allpasstuningL1;
-   rev->allpassL[1].buffer   = rev->bufallpassL2; rev->allpassL[1].bufsize = allpasstuningL2;
-   rev->allpassL[2].buffer   = rev->bufallpassL3; rev->allpassL[2].bufsize = allpasstuningL3;
-   rev->allpassL[3].buffer   = rev->bufallpassL4; rev->allpassL[3].bufsize = allpasstuningL4;
-
-   rev->allpassL[0].feedback = 0.5f;
-   rev->allpassL[1].feedback = 0.5f;
-   rev->allpassL[2].feedback = 0.5f;
-   rev->allpassL[3].feedback = 0.5f;
-
-   revmodel_setwet(rev, initialwet);
-   revmodel_setroomsize(rev, initialroom);
-   revmodel_setdry(rev, initialdry);
-   revmodel_setdamp(rev, initialdamp);
-   revmodel_setwidth(rev, initialwidth);
-   revmodel_setmode(rev, initialmode);
-}
-
-struct reverb_data
-{
-   struct revmodel left, right;
-};
-
-static void reverb_free(void *data)
-{
-   free(data);
-}
-
-static void reverb_process(void *data, struct dspfilter_output *output,
-      const struct dspfilter_input *input)
-{
-   unsigned i;
-   float *out;
-   struct reverb_data *rev = (struct reverb_data*)data;
-
-   output->samples         = input->samples;
-   output->frames          = input->frames;
-   out                     = output->samples;
-
-   for (i = 0; i < input->frames; i++, out += 2)
-   {
-      float in[2] = { out[0], out[1] };
-
-      out[0] = revmodel_process(&rev->left, in[0]);
-      out[1] = revmodel_process(&rev->right, in[1]);
-   }
-}
-
-static void *reverb_init(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata)
-{
-   float drytime, wettime, damping, roomwidth, roomsize;
-   struct reverb_data *rev = (struct reverb_data*)
-      calloc(1, sizeof(*rev));
-   if (!rev)
-      return NULL;
-
-   config->get_float(userdata, "drytime", &drytime, 0.43f);
-   config->get_float(userdata, "wettime", &wettime, 0.4f);
-   config->get_float(userdata, "damping", &damping, 0.8f);
-   config->get_float(userdata, "roomwidth", &roomwidth, 0.56f);
-   config->get_float(userdata, "roomsize", &roomsize, 0.56f);
-
-   revmodel_init(&rev->left);
-   revmodel_init(&rev->right);
-
-   revmodel_setdamp(&rev->left, damping);
-   revmodel_setdry(&rev->left, drytime);
-   revmodel_setwet(&rev->left, wettime);
-   revmodel_setwidth(&rev->left, roomwidth);
-   revmodel_setroomsize(&rev->left, roomsize);
-
-   revmodel_setdamp(&rev->right, damping);
-   revmodel_setdry(&rev->right, drytime);
-   revmodel_setwet(&rev->right, wettime);
-   revmodel_setwidth(&rev->right, roomwidth);
-   revmodel_setroomsize(&rev->right, roomsize);
-
-   return rev;
-}
-
-static const struct dspfilter_implementation reverb_plug = {
-   reverb_init,
-   reverb_process,
-   reverb_free,
-
-   DSPFILTER_API_VERSION,
-   "Reverb",
-   "reverb",
-};
-
-#ifdef HAVE_FILTERS_BUILTIN
-#define dspfilter_get_implementation reverb_dspfilter_get_implementation
-#endif
-
-const struct dspfilter_implementation *dspfilter_get_implementation(dspfilter_simd_mask_t mask)
-{
-   (void)mask;
-   return &reverb_plug;
-}
-
-#undef dspfilter_get_implementation
-
-
diff --git a/libretro-common/audio/dsp_filters/wahwah.c b/libretro-common/audio/dsp_filters/wahwah.c
deleted file mode 100644
index f4e8133..0000000
--- a/libretro-common/audio/dsp_filters/wahwah.c
+++ /dev/null
@@ -1,148 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (wahwah.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_miscellaneous.h>
-#include <libretro_dspfilter.h>
-
-#define WAHWAH_LFO_SKIP_SAMPLES 30
-
-struct wahwah_data
-{
-   float phase;
-   float lfoskip;
-   float b0, b1, b2, a0, a1, a2;
-   float freq, startphase;
-   float depth, freqofs, res;
-   unsigned long skipcount;
-
-   struct
-   {
-      float xn1, xn2, yn1, yn2;
-   } l, r;
-};
-
-static void wahwah_free(void *data)
-{
-   if (data)
-      free(data);
-}
-
-static void wahwah_process(void *data, struct dspfilter_output *output,
-      const struct dspfilter_input *input)
-{
-   unsigned i;
-   struct wahwah_data *wah = (struct wahwah_data*)data;
-   float *out              = output->samples;
-
-   output->samples         = input->samples;
-   output->frames          = input->frames;
-
-   for (i = 0; i < input->frames; i++, out += 2)
-   {
-      float out_l, out_r;
-      float in[2] = { out[0], out[1] };
-
-      if ((wah->skipcount++ % WAHWAH_LFO_SKIP_SAMPLES) == 0)
-      {
-         float omega, sn, cs, alpha;
-         float frequency = (1.0 + cos(wah->skipcount * wah->lfoskip + wah->phase)) / 2.0;
-
-         frequency = frequency * wah->depth * (1.0 - wah->freqofs) + wah->freqofs;
-         frequency = exp((frequency - 1.0) * 6.0);
-
-         omega     = M_PI * frequency;
-         sn        = sin(omega);
-         cs        = cos(omega);
-         alpha     = sn / (2.0 * wah->res);
-
-         wah->b0   = (1.0 - cs) / 2.0;
-         wah->b1   = 1.0 - cs;
-         wah->b2   = (1.0 - cs) / 2.0;
-         wah->a0   = 1.0 + alpha;
-         wah->a1   = -2.0 * cs;
-         wah->a2   = 1.0 - alpha;
-      }
-
-      out_l      = (wah->b0 * in[0] + wah->b1 * wah->l.xn1 + wah->b2 * wah->l.xn2 - wah->a1 * wah->l.yn1 - wah->a2 * wah->l.yn2) / wah->a0;
-      out_r      = (wah->b0 * in[1] + wah->b1 * wah->r.xn1 + wah->b2 * wah->r.xn2 - wah->a1 * wah->r.yn1 - wah->a2 * wah->r.yn2) / wah->a0;
-
-      wah->l.xn2 = wah->l.xn1;
-      wah->l.xn1 = in[0];
-      wah->l.yn2 = wah->l.yn1;
-      wah->l.yn1 = out_l;
-
-      wah->r.xn2 = wah->r.xn1;
-      wah->r.xn1 = in[1];
-      wah->r.yn2 = wah->r.yn1;
-      wah->r.yn1 = out_r;
-
-      out[0]     = out_l;
-      out[1]     = out_r;
-   }
-}
-
-static void *wahwah_init(const struct dspfilter_info *info,
-      const struct dspfilter_config *config, void *userdata)
-{
-   struct wahwah_data *wah = (struct wahwah_data*)calloc(1, sizeof(*wah));
-   if (!wah)
-      return NULL;
-
-   config->get_float(userdata, "lfo_freq", &wah->freq, 1.5f);
-   config->get_float(userdata, "lfo_start_phase", &wah->startphase, 0.0f);
-   config->get_float(userdata, "freq_offset", &wah->freqofs, 0.3f);
-   config->get_float(userdata, "depth", &wah->depth, 0.7f);
-   config->get_float(userdata, "resonance", &wah->res, 2.5f);
-
-   wah->lfoskip = wah->freq * 2.0 * M_PI / info->input_rate;
-   wah->phase   = wah->startphase * M_PI / 180.0;
-
-   return wah;
-}
-
-static const struct dspfilter_implementation wahwah_plug = {
-   wahwah_init,
-   wahwah_process,
-   wahwah_free,
-
-   DSPFILTER_API_VERSION,
-   "Wah-Wah",
-   "wahwah",
-};
-
-#ifdef HAVE_FILTERS_BUILTIN
-#define dspfilter_get_implementation wahwah_dspfilter_get_implementation
-#endif
-
-const struct dspfilter_implementation *
-dspfilter_get_implementation(dspfilter_simd_mask_t mask)
-{
-   (void)mask;
-   return &wahwah_plug;
-}
-
-#undef dspfilter_get_implementation
-
diff --git a/libretro-common/audio/resampler/audio_resampler.c b/libretro-common/audio/resampler/audio_resampler.c
deleted file mode 100644
index 06dad76..0000000
--- a/libretro-common/audio/resampler/audio_resampler.c
+++ /dev/null
@@ -1,170 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (audio_resampler.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <string.h>
-
-#include <string/stdstring.h>
-#include <features/features_cpu.h>
-#include <file/config_file_userdata.h>
-
-#include <audio/audio_resampler.h>
-
-static const retro_resampler_t *resampler_drivers[] = {
-   &sinc_resampler,
-#ifdef HAVE_CC_RESAMPLER
-   &CC_resampler,
-#endif
-   &nearest_resampler,
-   &null_resampler,
-   NULL,
-};
-
-static const struct resampler_config resampler_config = {
-   config_userdata_get_float,
-   config_userdata_get_int,
-   config_userdata_get_float_array,
-   config_userdata_get_int_array,
-   config_userdata_get_string,
-   config_userdata_free,
-};
-
-/**
- * find_resampler_driver_index:
- * @ident                      : Identifier of resampler driver to find.
- *
- * Finds resampler driver index by @ident name.
- *
- * Returns: resampler driver index if resampler driver was found, otherwise
- * -1.
- **/
-static int find_resampler_driver_index(const char *ident)
-{
-   unsigned i;
-
-   for (i = 0; resampler_drivers[i]; i++)
-      if (string_is_equal_noncase(ident, resampler_drivers[i]->ident))
-         return i;
-   return -1;
-}
-
-/**
- * audio_resampler_driver_find_handle:
- * @idx                : index of driver to get handle to.
- *
- * Returns: handle to audio resampler driver at index. Can be NULL
- * if nothing found.
- **/
-const void *audio_resampler_driver_find_handle(int idx)
-{
-   const void *drv = resampler_drivers[idx];
-   if (!drv)
-      return NULL;
-   return drv;
-}
-
-/**
- * audio_resampler_driver_find_ident:
- * @idx                : index of driver to get handle to.
- *
- * Returns: Human-readable identifier of audio resampler driver at index.
- * Can be NULL if nothing found.
- **/
-const char *audio_resampler_driver_find_ident(int idx)
-{
-   const retro_resampler_t *drv = resampler_drivers[idx];
-   if (!drv)
-      return NULL;
-   return drv->ident;
-}
-
-/**
- * find_resampler_driver:
- * @ident                      : Identifier of resampler driver to find.
- *
- * Finds resampler by @ident name.
- *
- * Returns: resampler driver if resampler driver was found, otherwise
- * NULL.
- **/
-static const retro_resampler_t *find_resampler_driver(const char *ident)
-{
-   int i = find_resampler_driver_index(ident);
-
-   if (i >= 0)
-      return resampler_drivers[i];
-
-   return resampler_drivers[0];
-}
-
-/**
- * resampler_append_plugs:
- * @re                         : Resampler handle
- * @backend                    : Resampler backend that is about to be set.
- * @bw_ratio                   : Bandwidth ratio.
- *
- * Initializes resampler driver based on queried CPU features.
- *
- * Returns: true (1) if successfully initialized, otherwise false (0).
- **/
-static bool resampler_append_plugs(void **re,
-      const retro_resampler_t **backend,
-      double bw_ratio)
-{
-   resampler_simd_mask_t mask = (resampler_simd_mask_t)cpu_features_get();
-
-   *re = (*backend)->init(&resampler_config, bw_ratio, mask);
-
-   if (!*re)
-      return false;
-   return true;
-}
-
-/**
- * retro_resampler_realloc:
- * @re                         : Resampler handle
- * @backend                    : Resampler backend that is about to be set.
- * @ident                      : Identifier name for resampler we want.
- * @bw_ratio                   : Bandwidth ratio.
- *
- * Reallocates resampler. Will free previous handle before 
- * allocating a new one. If ident is NULL, first resampler will be used.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool retro_resampler_realloc(void **re, const retro_resampler_t **backend,
-      const char *ident, double bw_ratio)
-{
-   if (*re && *backend)
-      (*backend)->free(*re);
-
-   *re      = NULL;
-   *backend = find_resampler_driver(ident);
-
-   if (!resampler_append_plugs(re, backend, bw_ratio))
-   {
-      if (!*re)
-         *backend = NULL;
-      return false;
-   }
-
-   return true;
-}
diff --git a/libretro-common/audio/resampler/drivers/nearest_resampler.c b/libretro-common/audio/resampler/drivers/nearest_resampler.c
deleted file mode 100644
index c524485..0000000
--- a/libretro-common/audio/resampler/drivers/nearest_resampler.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (nearest_resampler.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
- 
-#include <audio/audio_resampler.h>
-
-typedef struct rarch_nearest_resampler
-{
-   float fraction;
-} rarch_nearest_resampler_t;
- 
-static void resampler_nearest_process(
-      void *re_, struct resampler_data *data)
-{
-   rarch_nearest_resampler_t *re = (rarch_nearest_resampler_t*)re_;
-   audio_frame_float_t  *inp     = (audio_frame_float_t*)data->data_in;
-   audio_frame_float_t  *inp_max = (audio_frame_float_t*)inp + data->input_frames;
-   audio_frame_float_t  *outp    = (audio_frame_float_t*)data->data_out;
-   float                   ratio = 1.0 / data->ratio;
- 
-   while(inp != inp_max)
-   {
-      while(re->fraction > 1)
-      {
-         *outp++ = *inp;
-         re->fraction -= ratio;
-      }
-      re->fraction++;
-      inp++;      
-   }
-   
-   data->output_frames = (outp - (audio_frame_float_t*)data->data_out);
-}
- 
-static void resampler_nearest_free(void *re_)
-{
-   rarch_nearest_resampler_t *re = (rarch_nearest_resampler_t*)re_;
-   if (re)
-      free(re);
-}
- 
-static void *resampler_nearest_init(const struct resampler_config *config,
-      double bandwidth_mod, resampler_simd_mask_t mask)
-{
-   rarch_nearest_resampler_t *re = (rarch_nearest_resampler_t*)
-      calloc(1, sizeof(rarch_nearest_resampler_t));
-
-   (void)config;
-   (void)mask;
-
-   if (!re)
-      return NULL;
-   
-   re->fraction = 0;
-   
-   return re;
-}
- 
-retro_resampler_t nearest_resampler = {
-   resampler_nearest_init,
-   resampler_nearest_process,
-   resampler_nearest_free,
-   RESAMPLER_API_VERSION,
-   "nearest",
-   "nearest"
-};
diff --git a/libretro-common/audio/resampler/drivers/null_resampler.c b/libretro-common/audio/resampler/drivers/null_resampler.c
deleted file mode 100644
index e5fe598..0000000
--- a/libretro-common/audio/resampler/drivers/null_resampler.c
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (null_resampler.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
- 
-#include <audio/audio_resampler.h>
-
-typedef struct rarch_null_resampler
-{
-   void *empty;
-} rarch_null_resampler_t;
- 
-static void resampler_null_process(
-      void *re_, struct resampler_data *data)
-{
-}
- 
-static void resampler_null_free(void *re_)
-{
-}
- 
-static void *resampler_null_init(const struct resampler_config *config,
-      double bandwidth_mod, resampler_simd_mask_t mask)
-{
-   return (void*)0;
-}
- 
-retro_resampler_t null_resampler = {
-   resampler_null_init,
-   resampler_null_process,
-   resampler_null_free,
-   RESAMPLER_API_VERSION,
-   "null",
-   "null"
-};
diff --git a/libretro-common/audio/resampler/drivers/sinc_resampler.c b/libretro-common/audio/resampler/drivers/sinc_resampler.c
deleted file mode 100644
index e7ce152..0000000
--- a/libretro-common/audio/resampler/drivers/sinc_resampler.c
+++ /dev/null
@@ -1,589 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (sinc_resampler.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* Bog-standard windowed SINC implementation. */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-#include <retro_inline.h>
-#include <filters.h>
-#include <memalign.h>
-
-#include <audio/audio_resampler.h>
-#include <filters.h>
-
-#ifdef __SSE__
-#include <xmmintrin.h>
-#endif
-
-#if defined(__AVX__) && ENABLE_AVX
-#include <immintrin.h>
-#endif
-
-/* Rough SNR values for upsampling:
- * LOWEST: 40 dB
- * LOWER: 55 dB
- * NORMAL: 70 dB
- * HIGHER: 110 dB
- * HIGHEST: 140 dB
- */
-
-/* TODO, make all this more configurable. */
-#if defined(SINC_LOWEST_QUALITY)
-#define SINC_WINDOW_LANCZOS
-#define CUTOFF 0.98
-#define PHASE_BITS 12
-#define SINC_COEFF_LERP 0
-#define SUBPHASE_BITS 10
-#define SIDELOBES 2
-#define ENABLE_AVX 0
-#elif defined(SINC_LOWER_QUALITY)
-#define SINC_WINDOW_LANCZOS
-#define CUTOFF 0.98
-#define PHASE_BITS 12
-#define SUBPHASE_BITS 10
-#define SINC_COEFF_LERP 0
-#define SIDELOBES 4
-#define ENABLE_AVX 0
-#elif defined(SINC_HIGHER_QUALITY)
-#define SINC_WINDOW_KAISER
-#define SINC_WINDOW_KAISER_BETA 10.5
-#define CUTOFF 0.90
-#define PHASE_BITS 10
-#define SUBPHASE_BITS 14
-#define SINC_COEFF_LERP 1
-#define SIDELOBES 32
-#define ENABLE_AVX 1
-#elif defined(SINC_HIGHEST_QUALITY)
-#define SINC_WINDOW_KAISER
-#define SINC_WINDOW_KAISER_BETA 14.5
-#define CUTOFF 0.962
-#define PHASE_BITS 10
-#define SUBPHASE_BITS 14
-#define SINC_COEFF_LERP 1
-#define SIDELOBES 128
-#define ENABLE_AVX 1
-#else
-#define SINC_WINDOW_KAISER
-#define SINC_WINDOW_KAISER_BETA 5.5
-#define CUTOFF 0.825
-#define PHASE_BITS 8
-#define SUBPHASE_BITS 16
-#define SINC_COEFF_LERP 1
-#define SIDELOBES 8
-#define ENABLE_AVX 0
-#endif
-
-#if SINC_COEFF_LERP
-#define TAPS_MULT 2
-#else
-#define TAPS_MULT 1
-#endif
-
-#if defined(SINC_WINDOW_LANCZOS)
-#define window_function(idx)  (lanzcos_window_function(idx))
-#elif defined(SINC_WINDOW_KAISER)
-#define window_function(idx)  (kaiser_window_function(idx, SINC_WINDOW_KAISER_BETA))
-#else
-#error "No SINC window function defined."
-#endif
-
-/* For the little amount of taps we're using,
- * SSE1 is faster than AVX for some reason.
- * AVX code is kept here though as by increasing number
- * of sinc taps, the AVX code is clearly faster than SSE1.
- */
-
-#define PHASES (1 << (PHASE_BITS + SUBPHASE_BITS))
-
-#define TAPS (SIDELOBES * 2)
-#define SUBPHASE_MASK ((1 << SUBPHASE_BITS) - 1)
-#define SUBPHASE_MOD (1.0f / (1 << SUBPHASE_BITS))
-
-typedef struct rarch_sinc_resampler
-{
-   float *phase_table;
-   float *buffer_l;
-   float *buffer_r;
-
-   unsigned taps;
-
-   unsigned ptr;
-   uint32_t time;
-
-   /* A buffer for phase_table, buffer_l and buffer_r 
-    * are created in a single calloc().
-    * Ensure that we get as good cache locality as we can hope for. */
-   float *main_buffer;
-} rarch_sinc_resampler_t;
-
-#if defined(__ARM_NEON__) && !defined(SINC_COEFF_LERP)
-/* Assumes that taps >= 8, and that taps is a multiple of 8. */
-void process_sinc_neon_asm(float *out, const float *left, 
-      const float *right, const float *coeff, unsigned taps);
-
-static void resampler_sinc_process_neon(void *re_, struct resampler_data *data)
-{
-   rarch_sinc_resampler_t *resamp = (rarch_sinc_resampler_t*)re_;
-
-   uint32_t ratio                 = PHASES / data->ratio;
-   const float *input             = data->data_in;
-   float *output                  = data->data_out;
-   size_t frames                  = data->input_frames;
-   size_t out_frames              = 0;
-
-   while (frames)
-   {
-      while (frames && resamp->time >= PHASES)
-      {
-         /* Push in reverse to make filter more obvious. */
-         if (!resamp->ptr)
-            resamp->ptr = resamp->taps;
-         resamp->ptr--;
-
-         resamp->buffer_l[resamp->ptr + resamp->taps] = 
-         resamp->buffer_l[resamp->ptr]                = *input++;
-
-         resamp->buffer_r[resamp->ptr + resamp->taps] = 
-         resamp->buffer_r[resamp->ptr]                = *input++;
-
-         resamp->time                                -= PHASES;
-         frames--;
-      }
-
-      while (resamp->time < PHASES)
-      {
-         unsigned i;
-         const float *buffer_l    = resamp->buffer_l + resamp->ptr;
-         const float *buffer_r    = resamp->buffer_r + resamp->ptr;
-         unsigned taps            = resamp->taps;
-         unsigned phase           = resamp->time >> SUBPHASE_BITS;
-         const float *phase_table = resamp->phase_table + phase * taps;
-
-         process_sinc_neon_asm(output, buffer_l, buffer_r, phase_table, taps);
-
-         output += 2;
-         out_frames++;
-         resamp->time += ratio;
-      }
-   }
-
-   data->output_frames = out_frames;
-}
-#endif
-
-#if defined(__AVX__) && ENABLE_AVX
-static void resampler_sinc_process_avx(void *re_, struct resampler_data *data)
-{
-   rarch_sinc_resampler_t *resamp = (rarch_sinc_resampler_t*)re_;
-
-   uint32_t ratio                 = PHASES / data->ratio;
-   const float *input             = data->data_in;
-   float *output                  = data->data_out;
-   size_t frames                  = data->input_frames;
-   size_t out_frames              = 0;
-
-   while (frames)
-   {
-      while (frames && resamp->time >= PHASES)
-      {
-         /* Push in reverse to make filter more obvious. */
-         if (!resamp->ptr)
-            resamp->ptr = resamp->taps;
-         resamp->ptr--;
-
-         resamp->buffer_l[resamp->ptr + resamp->taps] = 
-         resamp->buffer_l[resamp->ptr]                = *input++;
-
-         resamp->buffer_r[resamp->ptr + resamp->taps] = 
-         resamp->buffer_r[resamp->ptr]                = *input++;
-
-         resamp->time                                -= PHASES;
-         frames--;
-      }
-
-      while (resamp->time < PHASES)
-      {
-         unsigned i;
-         const float *buffer_l    = resamp->buffer_l + resamp->ptr;
-         const float *buffer_r    = resamp->buffer_r + resamp->ptr;
-         unsigned taps            = resamp->taps;
-         unsigned phase           = resamp->time >> SUBPHASE_BITS;
-         const float *phase_table = resamp->phase_table + phase * taps * TAPS_MULT;
-#if SINC_COEFF_LERP
-         const float *delta_table = phase_table + taps;
-         __m256 delta             = _mm256_set1_ps((float)
-               (resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD);
-#endif
-
-         __m256 sum_l             = _mm256_setzero_ps();
-         __m256 sum_r             = _mm256_setzero_ps();
-
-         for (i = 0; i < taps; i += 8)
-         {
-            __m256 buf_l  = _mm256_loadu_ps(buffer_l + i);
-            __m256 buf_r  = _mm256_loadu_ps(buffer_r + i);
-
-#if SINC_COEFF_LERP
-            __m256 deltas = _mm256_load_ps(delta_table + i);
-            __m256 sinc   = _mm256_add_ps(_mm256_load_ps(phase_table + i),
-                  _mm256_mul_ps(deltas, delta));
-#else
-            __m256 sinc   = _mm256_load_ps(phase_table + i);
-#endif
-            sum_l         = _mm256_add_ps(sum_l, _mm256_mul_ps(buf_l, sinc));
-            sum_r         = _mm256_add_ps(sum_r, _mm256_mul_ps(buf_r, sinc));
-         }
-
-         /* hadd on AVX is weird, and acts on low-lanes 
-          * and high-lanes separately. */
-         __m256 res_l = _mm256_hadd_ps(sum_l, sum_l);
-         __m256 res_r = _mm256_hadd_ps(sum_r, sum_r);
-         res_l        = _mm256_hadd_ps(res_l, res_l);
-         res_r        = _mm256_hadd_ps(res_r, res_r);
-         res_l        = _mm256_add_ps(_mm256_permute2f128_ps(res_l, res_l, 1), res_l);
-         res_r        = _mm256_add_ps(_mm256_permute2f128_ps(res_r, res_r, 1), res_r);
-
-         /* This is optimized to mov %xmmN, [mem].
-          * There doesn't seem to be any _mm256_store_ss intrinsic. */
-         _mm_store_ss(output + 0, _mm256_extractf128_ps(res_l, 0));
-         _mm_store_ss(output + 1, _mm256_extractf128_ps(res_r, 0));
-
-         output += 2;
-         out_frames++;
-         resamp->time += ratio;
-      }
-   }
-
-   data->output_frames = out_frames;
-}
-#endif
-
-#if defined(__SSE__)
-static void resampler_sinc_process_sse(void *re_, struct resampler_data *data)
-{
-   rarch_sinc_resampler_t *resamp = (rarch_sinc_resampler_t*)re_;
-
-   uint32_t ratio                 = PHASES / data->ratio;
-   const float *input             = data->data_in;
-   float *output                  = data->data_out;
-   size_t frames                  = data->input_frames;
-   size_t out_frames              = 0;
-
-   while (frames)
-   {
-      while (frames && resamp->time >= PHASES)
-      {
-         /* Push in reverse to make filter more obvious. */
-         if (!resamp->ptr)
-            resamp->ptr = resamp->taps;
-         resamp->ptr--;
-
-         resamp->buffer_l[resamp->ptr + resamp->taps] = 
-         resamp->buffer_l[resamp->ptr]                = *input++;
-
-         resamp->buffer_r[resamp->ptr + resamp->taps] = 
-         resamp->buffer_r[resamp->ptr]                = *input++;
-
-         resamp->time                                -= PHASES;
-         frames--;
-      }
-
-      while (resamp->time < PHASES)
-      {
-         unsigned i;
-         __m128 sum;
-         const float *buffer_l    = resamp->buffer_l + resamp->ptr;
-         const float *buffer_r    = resamp->buffer_r + resamp->ptr;
-         unsigned taps            = resamp->taps;
-         unsigned phase           = resamp->time >> SUBPHASE_BITS;
-         const float *phase_table = resamp->phase_table + phase * taps * TAPS_MULT;
-#if SINC_COEFF_LERP
-         const float *delta_table = phase_table + taps;
-         __m128 delta             = _mm_set1_ps((float)
-               (resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD);
-#endif
-
-         __m128 sum_l             = _mm_setzero_ps();
-         __m128 sum_r             = _mm_setzero_ps();
-
-         for (i = 0; i < taps; i += 4)
-         {
-            __m128 buf_l = _mm_loadu_ps(buffer_l + i);
-            __m128 buf_r = _mm_loadu_ps(buffer_r + i);
-
-#if SINC_COEFF_LERP
-            __m128 deltas = _mm_load_ps(delta_table + i);
-            __m128 _sinc  = _mm_add_ps(_mm_load_ps(phase_table + i),
-                  _mm_mul_ps(deltas, delta));
-#else
-            __m128 _sinc = _mm_load_ps(phase_table + i);
-#endif
-            sum_l        = _mm_add_ps(sum_l, _mm_mul_ps(buf_l, _sinc));
-            sum_r        = _mm_add_ps(sum_r, _mm_mul_ps(buf_r, _sinc));
-         }
-
-         /* Them annoying shuffles.
-          * sum_l = { l3, l2, l1, l0 }
-          * sum_r = { r3, r2, r1, r0 }
-          */
-
-         sum = _mm_add_ps(_mm_shuffle_ps(sum_l, sum_r,
-                  _MM_SHUFFLE(1, 0, 1, 0)),
-               _mm_shuffle_ps(sum_l, sum_r, _MM_SHUFFLE(3, 2, 3, 2)));
-
-         /* sum   = { r1, r0, l1, l0 } + { r3, r2, l3, l2 }
-          * sum   = { R1, R0, L1, L0 }
-          */
-
-         sum = _mm_add_ps(_mm_shuffle_ps(sum, sum, _MM_SHUFFLE(3, 3, 1, 1)), sum);
-
-         /* sum   = {R1, R1, L1, L1 } + { R1, R0, L1, L0 }
-          * sum   = { X,  R,  X,  L } 
-          */
-
-         /* Store L */
-         _mm_store_ss(output + 0, sum);
-
-         /* movehl { X, R, X, L } == { X, R, X, R } */
-         _mm_store_ss(output + 1, _mm_movehl_ps(sum, sum));
-
-         output += 2;
-         out_frames++;
-         resamp->time += ratio;
-      }
-   }
-
-   data->output_frames = out_frames;
-}
-#endif
-
-static void resampler_sinc_process_c(void *re_, struct resampler_data *data)
-{
-   rarch_sinc_resampler_t *resamp = (rarch_sinc_resampler_t*)re_;
-
-   uint32_t ratio                 = PHASES / data->ratio;
-   const float *input             = data->data_in;
-   float *output                  = data->data_out;
-   size_t frames                  = data->input_frames;
-   size_t out_frames              = 0;
-
-   while (frames)
-   {
-      while (frames && resamp->time >= PHASES)
-      {
-         /* Push in reverse to make filter more obvious. */
-         if (!resamp->ptr)
-            resamp->ptr = resamp->taps;
-         resamp->ptr--;
-
-         resamp->buffer_l[resamp->ptr + resamp->taps] = 
-            resamp->buffer_l[resamp->ptr]                = *input++;
-
-         resamp->buffer_r[resamp->ptr + resamp->taps] = 
-            resamp->buffer_r[resamp->ptr]                = *input++;
-
-         resamp->time                                -= PHASES;
-         frames--;
-      }
-
-      while (resamp->time < PHASES)
-      {
-         unsigned i;
-         const float *buffer_l    = resamp->buffer_l + resamp->ptr;
-         const float *buffer_r    = resamp->buffer_r + resamp->ptr;
-         unsigned taps            = resamp->taps;
-         unsigned phase           = resamp->time >> SUBPHASE_BITS;
-         const float *phase_table = resamp->phase_table + phase * taps * TAPS_MULT; 
-#if SINC_COEFF_LERP
-         const float *delta_table = phase_table + taps;
-         float delta              = (float)
-            (resamp->time & SUBPHASE_MASK) * SUBPHASE_MOD;
-#endif
-         float sum_l              = 0.0f;
-         float sum_r              = 0.0f;
-
-         for (i = 0; i < taps; i++)
-         {
-#if SINC_COEFF_LERP
-            float sinc_val = phase_table[i] + delta_table[i] * delta;
-#else
-            float sinc_val = phase_table[i];
-#endif
-            sum_l         += buffer_l[i] * sinc_val;
-            sum_r         += buffer_r[i] * sinc_val;
-         }
-
-         output[0] = sum_l;
-         output[1] = sum_r;
-
-         output += 2;
-         out_frames++;
-         resamp->time += ratio;
-      }
-
-   }
-
-   data->output_frames = out_frames;
-}
-
-static void sinc_init_table(rarch_sinc_resampler_t *resamp, double cutoff,
-      float *phase_table, int phases, int taps, bool calculate_delta)
-{
-   int i, j;
-   double    window_mod = window_function(0.0); /* Need to normalize w(0) to 1.0. */
-   int           stride = calculate_delta ? 2 : 1;
-   double     sidelobes = taps / 2.0;
-
-   for (i = 0; i < phases; i++)
-   {
-      for (j = 0; j < taps; j++)
-      {
-         double sinc_phase;
-         float val;
-         int               n = j * phases + i;
-         double window_phase = (double)n / (phases * taps); /* [0, 1). */
-         window_phase        = 2.0 * window_phase - 1.0; /* [-1, 1) */
-         sinc_phase          = sidelobes * window_phase;
-         val                 = cutoff * sinc(M_PI * sinc_phase * cutoff) * 
-            window_function(window_phase) / window_mod;
-         phase_table[i * stride * taps + j] = val;
-      }
-   }
-
-   if (calculate_delta)
-   {
-      int phase;
-      int p;
-
-      for (p = 0; p < phases - 1; p++)
-      {
-         for (j = 0; j < taps; j++)
-         {
-            float delta = phase_table[(p + 1) * stride * taps + j] - 
-               phase_table[p * stride * taps + j];
-            phase_table[(p * stride + 1) * taps + j] = delta;
-         }
-      }
-
-      phase = phases - 1;
-      for (j = 0; j < taps; j++)
-      {
-         float val, delta;
-         double sinc_phase;
-         int n               = j * phases + (phase + 1);
-         double window_phase = (double)n / (phases * taps); /* (0, 1]. */
-         window_phase        = 2.0 * window_phase - 1.0; /* (-1, 1] */
-         sinc_phase          = sidelobes * window_phase;
-
-         val                 = cutoff * sinc(M_PI * sinc_phase * cutoff) * 
-            window_function(window_phase) / window_mod;
-         delta = (val - phase_table[phase * stride * taps + j]);
-         phase_table[(phase * stride + 1) * taps + j] = delta;
-      }
-   }
-}
-
-static void resampler_sinc_free(void *data)
-{
-   rarch_sinc_resampler_t *resamp = (rarch_sinc_resampler_t*)data;
-   if (resamp)
-      memalign_free(resamp->main_buffer);
-   free(resamp);
-}
-
-static void *resampler_sinc_new(const struct resampler_config *config,
-      double bandwidth_mod, resampler_simd_mask_t mask)
-{
-   double cutoff;
-   size_t phase_elems, elems;
-   rarch_sinc_resampler_t *re = (rarch_sinc_resampler_t*)
-      calloc(1, sizeof(*re));
-
-   if (!re)
-      return NULL;
-
-   (void)config;
-
-   re->taps = TAPS;
-   cutoff   = CUTOFF;
-
-   /* Downsampling, must lower cutoff, and extend number of 
-    * taps accordingly to keep same stopband attenuation. */
-   if (bandwidth_mod < 1.0)
-   {
-      cutoff *= bandwidth_mod;
-      re->taps = (unsigned)ceil(re->taps / bandwidth_mod);
-   }
-
-   /* Be SIMD-friendly. */
-#if (defined(__AVX__) && ENABLE_AVX) || (defined(__ARM_NEON__))
-   re->taps     = (re->taps + 7) & ~7;
-#else
-   re->taps     = (re->taps + 3) & ~3;
-#endif
-
-   phase_elems  = ((1 << PHASE_BITS) * re->taps) * TAPS_MULT;
-   elems        = phase_elems + 4 * re->taps;
-
-   re->main_buffer = (float*)memalign_alloc(128, sizeof(float) * elems);
-   if (!re->main_buffer)
-      goto error;
-
-   re->phase_table = re->main_buffer;
-   re->buffer_l    = re->main_buffer + phase_elems;
-   re->buffer_r    = re->buffer_l + 2 * re->taps;
-
-   sinc_init_table(re, cutoff, re->phase_table,
-         1 << PHASE_BITS, re->taps, SINC_COEFF_LERP);
-
-   sinc_resampler.process = resampler_sinc_process_c;
-
-#if defined(__AVX__) && ENABLE_AVX
-   if (mask & RESAMPLER_SIMD_AVX)
-      sinc_resampler.process = resampler_sinc_process_avx;
-#elif defined(__SSE__)
-   if (mask & RESAMPLER_SIMD_SSE)
-      sinc_resampler.process = resampler_sinc_process_sse;
-#elif defined(__ARM_NEON__) && !defined(SINC_COEFF_LERP)
-   if (mask & RESAMPLER_SIMD_NEON)
-      sinc_resampler.process = resampler_sinc_process_neon;
-#endif
-
-   return re;
-
-error:
-   resampler_sinc_free(re);
-   return NULL;
-}
-
-retro_resampler_t sinc_resampler = {
-   resampler_sinc_new,
-   resampler_sinc_process_c,
-   resampler_sinc_free,
-   RESAMPLER_API_VERSION,
-   "sinc",
-   "sinc"
-};
diff --git a/libretro-common/audio/resampler/drivers/sinc_resampler_neon.S b/libretro-common/audio/resampler/drivers/sinc_resampler_neon.S
deleted file mode 100644
index 033104e..0000000
--- a/libretro-common/audio/resampler/drivers/sinc_resampler_neon.S
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (sinc_resampler_neon.S).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#if defined(__ARM_NEON__)
-
-#ifndef __MACH__
-.arm
-#endif
-.align 4
-.globl process_sinc_neon_asm
-#ifndef __MACH__
-.type process_sinc_neon_asm, %function
-#endif
-.globl _process_sinc_neon_asm
-#ifndef __MACH__
-.type _process_sinc_neon_asm, %function
-#endif
-# void process_sinc_neon(float *out, const float *left, const float *right, const float *coeff, unsigned taps)
-# Assumes taps is >= 8, and a multiple of 8.
-process_sinc_neon_asm:
-_process_sinc_neon_asm:
-
-   push {r4, lr}   
-   vmov.f32 q0, #0.0
-   vmov.f32 q8, #0.0
-
-   # Taps argument (r4) goes on stack in armeabi.
-   ldr r4, [sp, #8]
-
-1:
-   # Left
-   vld1.f32 {q2-q3}, [r1]!
-   # Right
-   vld1.f32 {q10-q11}, [r2]!
-   # Coeff
-   vld1.f32 {q12-q13}, [r3, :128]!
-
-   # Left / Right
-   vmla.f32 q0, q2, q12
-   vmla.f32 q8, q10, q12
-   vmla.f32 q0, q3, q13
-   vmla.f32 q8, q11, q13
-
-   subs r4, r4, #8
-   bne 1b
-
-   # Add everything together
-   vadd.f32 d0, d0, d1
-   vadd.f32 d16, d16, d17
-   vpadd.f32 d0, d0, d16
-   vst1.f32 d0, [r0]
-   
-   pop {r4, pc}
-
-#endif
diff --git a/libretro-common/compat/compat_fnmatch.c b/libretro-common/compat/compat_fnmatch.c
deleted file mode 100644
index 110f451..0000000
--- a/libretro-common/compat/compat_fnmatch.c
+++ /dev/null
@@ -1,159 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (compat_fnmatch.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#if __TEST_FNMATCH__
-#include <assert.h>
-#endif
-#include <stddef.h>
-
-#include <compat/fnmatch.h>
-
-/* Implemnentation of fnmatch(3) so it can be 
- * distributed to non *nix platforms.
- *
- * No flags are implemented ATM. 
- * We don't use them. Add flags as needed. */
-
-int rl_fnmatch(const char *pattern, const char *string, int flags)
-{
-   int rv;
-   const char *c = NULL;
-   int charmatch = 0;
-
-   for (c = pattern; *c != '\0'; c++)
-   {
-      /* String ended before pattern */
-      if ((*c != '*') && (*string == '\0'))
-         return FNM_NOMATCH;
-
-      switch (*c)
-      {
-         /* Match any number of unknown chars */
-         case '*':
-            /* Find next node in the pattern 
-             * ignoring multiple asterixes
-             */
-            do {
-               c++;
-               if (*c == '\0')
-                  return 0;
-            } while (*c == '*');
-
-            /* Match the remaining pattern 
-             * ignoring more and more characters. */
-            do {
-               /* We reached the end of the string without a
-                * match. There is a way to optimize this by
-                * calculating the minimum chars needed to
-                * match the remaining pattern but I don't
-                * think it is worth the work ATM.
-                */
-               if (*string == '\0')
-                  return FNM_NOMATCH;
-
-               rv = rl_fnmatch(c, string, flags);
-               string++;
-            } while (rv != 0);
-
-            return 0;
-            /* Match char from list */
-         case '[':
-            charmatch = 0;
-            for (c++; *c != ']'; c++)
-            {
-               /* Bad format */
-               if (*c == '\0')
-                  return FNM_NOMATCH;
-
-               /* Match already found */
-               if (charmatch)
-                  continue;
-
-               if (*c == *string)
-                  charmatch = 1;
-            }
-
-            /* No match in list */
-            if (!charmatch)
-               return FNM_NOMATCH;
-
-            string++;
-            break;
-            /* Has any character */
-         case '?':
-            string++;
-            break;
-            /* Match following character verbatim */
-         case '\\':
-            c++;
-            /* Dangling escape at end of pattern.
-             * FIXME: Was c == '\0' (makes no sense).
-             * Not sure if c == NULL or *c == '\0' 
-             * is intended. Assuming *c due to c++ right before. */
-            if (*c == '\0') 
-               return FNM_NOMATCH;
-         default:
-            if (*c != *string)
-               return FNM_NOMATCH;
-            string++;
-      }
-   }
-
-   /* End of string and end of pattend */
-   if (*string == '\0')
-      return 0;
-   return FNM_NOMATCH;
-}
-
-#if __TEST_FNMATCH__
-int main(void)
-{
-   assert(rl_fnmatch("TEST", "TEST", 0) == 0);
-   assert(rl_fnmatch("TE?T", "TEST", 0) == 0);
-   assert(rl_fnmatch("TE[Ssa]T", "TEST", 0) == 0);
-   assert(rl_fnmatch("TE[Ssda]T", "TEsT", 0) == 0);
-   assert(rl_fnmatch("TE[Ssda]T", "TEdT", 0) == 0);
-   assert(rl_fnmatch("TE[Ssda]T", "TEaT", 0) == 0);
-   assert(rl_fnmatch("TEST*", "TEST", 0) == 0);
-   assert(rl_fnmatch("TEST**", "TEST", 0) == 0);
-   assert(rl_fnmatch("TE*ST*", "TEST", 0) == 0);
-   assert(rl_fnmatch("TE**ST*", "TEST", 0) == 0);
-   assert(rl_fnmatch("TE**ST*", "TExST", 0) == 0);
-   assert(rl_fnmatch("TE**ST", "TEST", 0) == 0);
-   assert(rl_fnmatch("TE**ST", "TExST", 0) == 0);
-   assert(rl_fnmatch("TE\\**ST", "TE*xST", 0) == 0);
-   assert(rl_fnmatch("*.*", "test.jpg", 0) == 0);
-   assert(rl_fnmatch("*.jpg", "test.jpg", 0) == 0);
-   assert(rl_fnmatch("*.[Jj][Pp][Gg]", "test.jPg", 0) == 0);
-   assert(rl_fnmatch("*.[Jj]*[Gg]", "test.jPg", 0) == 0);
-   assert(rl_fnmatch("TEST?", "TEST", 0) == FNM_NOMATCH);
-   assert(rl_fnmatch("TES[asd", "TEST", 0) == FNM_NOMATCH);
-   assert(rl_fnmatch("TEST\\", "TEST", 0) == FNM_NOMATCH);
-   assert(rl_fnmatch("TEST*S", "TEST", 0) == FNM_NOMATCH);
-   assert(rl_fnmatch("TE**ST", "TExT", 0) == FNM_NOMATCH);
-   assert(rl_fnmatch("TE\\*T", "TExT", 0) == FNM_NOMATCH);
-   assert(rl_fnmatch("TES?", "TES", 0) == FNM_NOMATCH);
-   assert(rl_fnmatch("TE", "TEST", 0) == FNM_NOMATCH);
-   assert(rl_fnmatch("TEST!", "TEST", 0) == FNM_NOMATCH);
-   assert(rl_fnmatch("DSAD", "TEST", 0) == FNM_NOMATCH);
-}
-#endif
diff --git a/libretro-common/compat/compat_getopt.c b/libretro-common/compat/compat_getopt.c
deleted file mode 100644
index c32c858..0000000
--- a/libretro-common/compat/compat_getopt.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (compat_getopt.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <ctype.h>
-
-#include <string.h>
-#include <boolean.h>
-#include <stddef.h>
-#include <stdlib.h>
-
-#include <retro_miscellaneous.h>
-
-#include <compat/getopt.h>
-#include <compat/strl.h>
-#include <compat/strcasestr.h>
-#include <compat/posix_string.h>
-
-#include <retro_assert.h>
-
-char *optarg;
-int optind, opterr, optopt;
-
-static bool is_short_option(const char *str)
-{
-   return str[0] == '-' && str[1] != '-';
-}
-
-static bool is_long_option(const char *str)
-{
-   return str[0] == '-' && str[1] == '-';
-}
-
-static int find_short_index(char * const *argv)
-{
-   int idx;
-   for (idx = 0; argv[idx]; idx++)
-   {
-      if (is_short_option(argv[idx]))
-         return idx;
-   }
-
-   return -1;
-}
-
-static int find_long_index(char * const *argv)
-{
-   int idx;
-   for (idx = 0; argv[idx]; idx++)
-   {
-      if (is_long_option(argv[idx]))
-         return idx;
-   }
-
-   return -1;
-}
-
-static int parse_short(const char *optstring, char * const *argv)
-{
-   bool extra_opt, takes_arg, embedded_arg;
-   const char *opt = NULL;
-   char        arg = argv[0][1];
-
-   if (arg == ':')
-      return '?';
-
-   opt = strchr(optstring, arg);
-   if (!opt)
-      return '?';
-
-   extra_opt = argv[0][2];
-   takes_arg = opt[1] == ':';
-
-   /* If we take an argument, and we see additional characters,
-    * this is in fact the argument (i.e. -cfoo is same as -c foo). */
-   embedded_arg = extra_opt && takes_arg;
-
-   if (takes_arg)
-   {
-      if (embedded_arg)
-      {
-         optarg = argv[0] + 2;
-         optind++;
-      }
-      else
-      {
-         optarg = argv[1];
-         optind += 2;
-      }
-
-      return optarg ? opt[0] : '?';
-   }
-
-   if (embedded_arg)
-   {
-      /* If we see additional characters, 
-       * and they don't take arguments, this 
-       * means we have multiple flags in one. */
-      memmove(&argv[0][1], &argv[0][2], strlen(&argv[0][2]) + 1);
-      return opt[0];
-   }
-
-   optind++;
-   return opt[0];
-}
-
-static int parse_long(const struct option *longopts, char * const *argv)
-{
-   size_t indice;
-   const struct option *opt = NULL;
-   for (indice = 0; longopts[indice].name; indice++)
-   {
-      if (!strcmp(longopts[indice].name, &argv[0][2]))
-      {
-         opt = &longopts[indice];
-         break;
-      }
-   }
-
-   if (!opt)
-      return '?';
-   
-   /* getopt_long has an "optional" arg, but we don't bother with that. */
-   if (opt->has_arg && !argv[1])
-      return '?';
-
-   if (opt->has_arg)
-   {
-      optarg = argv[1];
-      optind += 2;
-   }
-   else
-      optind++;
-
-   if (opt->flag)
-   {
-      *opt->flag = opt->val;
-      return 0;
-   }
-
-   return opt->val;
-}
-
-static void shuffle_block(char **begin, char **last, char **end)
-{
-   ptrdiff_t    len = last - begin;
-   const char **tmp = (const char**)calloc(len, sizeof(const char*));
-
-   retro_assert(tmp);
-
-   memcpy((void*)tmp, begin, len * sizeof(const char*));
-   memmove(begin, last, (end - last) * sizeof(const char*));
-   memcpy(end - len, tmp, len * sizeof(const char*));
-
-   free((void*)tmp);
-}
-
-int getopt_long(int argc, char *argv[],
-      const char *optstring, const struct option *longopts, int *longindex)
-{
-   int short_index, long_index;
-
-   (void)longindex;
-
-   if (optind == 0)
-      optind = 1;
-
-   if (argc == 1)
-      return -1;
-
-   short_index = find_short_index(&argv[optind]);
-   long_index  = find_long_index(&argv[optind]);
-
-   /* We're done here. */
-   if (short_index == -1 && long_index == -1)
-      return -1;
-
-   /* Reorder argv so that non-options come last.
-    * Non-POSIXy, but that's what getopt does by default. */
-   if ((short_index > 0) && ((short_index < long_index) || (long_index == -1)))
-   {
-      shuffle_block(&argv[optind], &argv[optind + short_index], &argv[argc]);
-      short_index = 0;
-   }
-   else if ((long_index > 0) && ((long_index < short_index)
-            || (short_index == -1)))
-   {
-      shuffle_block(&argv[optind], &argv[optind + long_index], &argv[argc]);
-      long_index = 0;
-   }
-
-   retro_assert(short_index == 0 || long_index == 0);
-
-   if (short_index == 0)
-      return parse_short(optstring, &argv[optind]);
-   if (long_index == 0)
-      return parse_long(longopts, &argv[optind]);
-
-   return '?';
-}
diff --git a/libretro-common/compat/compat_ifaddrs.c b/libretro-common/compat/compat_ifaddrs.c
deleted file mode 100644
index 40f4da0..0000000
--- a/libretro-common/compat/compat_ifaddrs.c
+++ /dev/null
@@ -1,619 +0,0 @@
-/*
-Copyright (c) 2013, Kenneth MacKay
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
- * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <compat/ifaddrs.h>
-
-#include <string.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netpacket/packet.h>
-#include <net/if_arp.h>
-#include <netinet/in.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-
-typedef struct NetlinkList
-{
-    struct NetlinkList *m_next;
-    struct nlmsghdr *m_data;
-    unsigned int m_size;
-} NetlinkList;
-
-static int netlink_socket(void)
-{
-   struct sockaddr_nl l_addr;
-   int l_socket = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-
-   if(l_socket < 0)
-      return -1;
-
-   memset(&l_addr, 0, sizeof(l_addr));
-   l_addr.nl_family = AF_NETLINK;
-   if(bind(l_socket, (struct sockaddr *)&l_addr, sizeof(l_addr)) < 0)
-   {
-      close(l_socket);
-      return -1;
-   }
-
-   return l_socket;
-}
-
-static int netlink_send(int p_socket, int p_request)
-{
-   struct
-   {
-      struct nlmsghdr m_hdr;
-      struct rtgenmsg m_msg;
-   } l_data;
-   struct sockaddr_nl l_addr;
-
-   memset(&l_data, 0, sizeof(l_data));
-
-   l_data.m_hdr.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg));
-   l_data.m_hdr.nlmsg_type = p_request;
-   l_data.m_hdr.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
-   l_data.m_hdr.nlmsg_pid = 0;
-   l_data.m_hdr.nlmsg_seq = p_socket;
-   l_data.m_msg.rtgen_family = AF_UNSPEC;
-
-   memset(&l_addr, 0, sizeof(l_addr));
-   l_addr.nl_family = AF_NETLINK;
-   return (sendto(p_socket, &l_data.m_hdr, l_data.m_hdr.nlmsg_len, 0, (struct sockaddr *)&l_addr, sizeof(l_addr)));
-}
-
-static int netlink_recv(int p_socket, void *p_buffer, size_t p_len)
-{
-   struct msghdr l_msg;
-   struct iovec l_iov = { p_buffer, p_len };
-   struct sockaddr_nl l_addr;
-
-   for(;;)
-   {
-      l_msg.msg_name = (void *)&l_addr;
-      l_msg.msg_namelen = sizeof(l_addr);
-      l_msg.msg_iov = &l_iov;
-      l_msg.msg_iovlen = 1;
-      l_msg.msg_control = NULL;
-      l_msg.msg_controllen = 0;
-      l_msg.msg_flags = 0;
-      int l_result = recvmsg(p_socket, &l_msg, 0);
-
-      if(l_result < 0)
-      {
-         if(errno == EINTR)
-            continue;
-         return -2;
-      }
-
-      if(l_msg.msg_flags & MSG_TRUNC) /* buffer too small */
-         return -1;
-      return l_result;
-   }
-}
-
-static struct nlmsghdr *getNetlinkResponse(int p_socket, int *p_size, int *p_done)
-{
-   size_t l_size = 4096;
-   void *l_buffer = NULL;
-
-   for(;;)
-   {
-      free(l_buffer);
-      l_buffer = malloc(l_size);
-      if (l_buffer == NULL)
-         return NULL;
-
-      int l_read = netlink_recv(p_socket, l_buffer, l_size);
-      *p_size = l_read;
-
-      if(l_read == -2)
-      {
-         free(l_buffer);
-         return NULL;
-      }
-
-      if(l_read >= 0)
-      {
-         pid_t l_pid = getpid();
-         struct nlmsghdr *l_hdr;
-         for(l_hdr = (struct nlmsghdr *)l_buffer; NLMSG_OK(l_hdr, (unsigned int)l_read); l_hdr = (struct nlmsghdr *)NLMSG_NEXT(l_hdr, l_read))
-         {
-            if((pid_t)l_hdr->nlmsg_pid != l_pid || (int)l_hdr->nlmsg_seq != p_socket)
-               continue;
-
-            if(l_hdr->nlmsg_type == NLMSG_DONE)
-            {
-               *p_done = 1;
-               break;
-            }
-
-            if(l_hdr->nlmsg_type == NLMSG_ERROR)
-            {
-               free(l_buffer);
-               return NULL;
-            }
-         }
-         return l_buffer;
-      }
-
-      l_size *= 2;
-   }
-}
-
-static NetlinkList *newListItem(struct nlmsghdr *p_data, unsigned int p_size)
-{
-   NetlinkList *l_item = malloc(sizeof(NetlinkList));
-   if (l_item == NULL)
-      return NULL;
-
-   l_item->m_next = NULL;
-   l_item->m_data = p_data;
-   l_item->m_size = p_size;
-   return l_item;
-}
-
-static void freeResultList(NetlinkList *p_list)
-{
-   NetlinkList *l_cur;
-   while(p_list)
-   {
-      l_cur = p_list;
-      p_list = p_list->m_next;
-      free(l_cur->m_data);
-      free(l_cur);
-   }
-}
-
-static NetlinkList *getResultList(int p_socket, int p_request)
-{
-   if(netlink_send(p_socket, p_request) < 0)
-      return NULL;
-
-   NetlinkList *l_list = NULL;
-   NetlinkList *l_end = NULL;
-   int l_size;
-   int l_done = 0;
-   while(!l_done)
-   {
-      NetlinkList *l_item    = NULL;
-      struct nlmsghdr *l_hdr = getNetlinkResponse(p_socket, &l_size, &l_done);
-      if(!l_hdr)
-         goto error;
-
-      l_item = newListItem(l_hdr, l_size);
-      if (!l_item)
-         goto error;
-
-      if(!l_list)
-         l_list = l_item;
-      else
-         l_end->m_next = l_item;
-      l_end = l_item;
-   }
-
-   return l_list;
-
-error:
-   freeResultList(l_list);
-   return NULL;
-}
-
-static size_t maxSize(size_t a, size_t b)
-{
-   return (a > b ? a : b);
-}
-
-static size_t calcAddrLen(sa_family_t p_family, int p_dataSize)
-{
-   switch(p_family)
-   {
-      case AF_INET:
-         return sizeof(struct sockaddr_in);
-      case AF_INET6:
-         return sizeof(struct sockaddr_in6);
-      case AF_PACKET:
-         return maxSize(sizeof(struct sockaddr_ll), offsetof(struct sockaddr_ll, sll_addr) + p_dataSize);
-      default:
-         break;
-   }
-
-   return maxSize(sizeof(struct sockaddr), offsetof(struct sockaddr, sa_data) + p_dataSize);
-}
-
-static void makeSockaddr(sa_family_t p_family, struct sockaddr *p_dest, void *p_data, size_t p_size)
-{
-   switch(p_family)
-   {
-      case AF_INET:
-         memcpy(&((struct sockaddr_in*)p_dest)->sin_addr, p_data, p_size);
-         break;
-      case AF_INET6:
-         memcpy(&((struct sockaddr_in6*)p_dest)->sin6_addr, p_data, p_size);
-         break;
-      case AF_PACKET:
-         memcpy(((struct sockaddr_ll*)p_dest)->sll_addr, p_data, p_size);
-         ((struct sockaddr_ll*)p_dest)->sll_halen = p_size;
-         break;
-      default:
-         memcpy(p_dest->sa_data, p_data, p_size);
-         break;
-   }
-   p_dest->sa_family = p_family;
-}
-
-static void addToEnd(struct ifaddrs **p_resultList, struct ifaddrs *p_entry)
-{
-   if(!*p_resultList)
-      *p_resultList = p_entry;
-   else
-   {
-      struct ifaddrs *l_cur = *p_resultList;
-      while(l_cur->ifa_next)
-         l_cur = l_cur->ifa_next;
-      l_cur->ifa_next = p_entry;
-   }
-}
-
-static int interpretLink(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList)
-{
-   struct ifaddrs *l_entry  = NULL;
-   struct rtattr *l_rta     = NULL;
-   struct ifinfomsg *l_info = (struct ifinfomsg *)NLMSG_DATA(p_hdr);
-   size_t l_nameSize        = 0;
-   size_t l_addrSize        = 0;
-   size_t l_dataSize        = 0;
-   size_t l_rtaSize         = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifinfomsg));
-
-   for(l_rta = IFLA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
-   {
-      size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
-      switch(l_rta->rta_type)
-      {
-         case IFLA_ADDRESS:
-         case IFLA_BROADCAST:
-            l_addrSize += NLMSG_ALIGN(calcAddrLen(AF_PACKET, l_rtaDataSize));
-            break;
-         case IFLA_IFNAME:
-            l_nameSize += NLMSG_ALIGN(l_rtaSize + 1);
-            break;
-         case IFLA_STATS:
-            l_dataSize += NLMSG_ALIGN(l_rtaSize);
-            break;
-         default:
-            break;
-      }
-   }
-
-   l_entry = malloc(sizeof(struct ifaddrs) + sizeof(int) + l_nameSize + l_addrSize + l_dataSize);
-   if (l_entry == NULL)
-      return -1;
-
-   memset(l_entry, 0, sizeof(struct ifaddrs));
-   l_entry->ifa_name = "";
-
-   char *l_index = ((char *)l_entry) + sizeof(struct ifaddrs);
-   char *l_name = l_index + sizeof(int);
-   char *l_addr = l_name + l_nameSize;
-   char *l_data = l_addr + l_addrSize;
-
-   // save the interface index so we can look it up when handling the addresses.
-   memcpy(l_index, &l_info->ifi_index, sizeof(int));
-
-   l_entry->ifa_flags = l_info->ifi_flags;
-
-   l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifinfomsg));
-   for(l_rta = IFLA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
-   {
-      void *l_rtaData = RTA_DATA(l_rta);
-      size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
-      switch(l_rta->rta_type)
-      {
-         case IFLA_ADDRESS:
-         case IFLA_BROADCAST:
-            {
-               size_t l_addrLen = calcAddrLen(AF_PACKET, l_rtaDataSize);
-               makeSockaddr(AF_PACKET, (struct sockaddr *)l_addr, l_rtaData, l_rtaDataSize);
-               ((struct sockaddr_ll *)l_addr)->sll_ifindex = l_info->ifi_index;
-               ((struct sockaddr_ll *)l_addr)->sll_hatype = l_info->ifi_type;
-               if(l_rta->rta_type == IFLA_ADDRESS)
-                  l_entry->ifa_addr = (struct sockaddr *)l_addr;
-               else
-                  l_entry->ifa_broadaddr = (struct sockaddr *)l_addr;
-               l_addr += NLMSG_ALIGN(l_addrLen);
-               break;
-            }
-         case IFLA_IFNAME:
-            strncpy(l_name, l_rtaData, l_rtaDataSize);
-            l_name[l_rtaDataSize] = '\0';
-            l_entry->ifa_name = l_name;
-            break;
-         case IFLA_STATS:
-            memcpy(l_data, l_rtaData, l_rtaDataSize);
-            l_entry->ifa_data = l_data;
-            break;
-         default:
-            break;
-      }
-   }
-
-   addToEnd(p_resultList, l_entry);
-   return 0;
-}
-
-static struct ifaddrs *findInterface(int p_index, struct ifaddrs **p_links, int p_numLinks)
-{
-   int l_num = 0;
-   struct ifaddrs *l_cur = *p_links;
-   while(l_cur && l_num < p_numLinks)
-   {
-      int l_index;
-      char *l_indexPtr = ((char *)l_cur) + sizeof(struct ifaddrs);
-
-      memcpy(&l_index, l_indexPtr, sizeof(int));
-      if(l_index == p_index)
-         return l_cur;
-
-      l_cur = l_cur->ifa_next;
-      ++l_num;
-   }
-   return NULL;
-}
-
-static int interpretAddr(struct nlmsghdr *p_hdr, struct ifaddrs **p_resultList, int p_numLinks)
-{
-   size_t l_nameSize = 0;
-   size_t l_addrSize = 0;
-   int l_addedNetmask = 0;
-   struct ifaddrmsg *l_info = (struct ifaddrmsg *)NLMSG_DATA(p_hdr);
-   struct ifaddrs *l_interface = findInterface(l_info->ifa_index, p_resultList, p_numLinks);
-
-   if(l_info->ifa_family == AF_PACKET)
-      return 0;
-
-   size_t l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifaddrmsg));
-   struct rtattr *l_rta;
-
-   for(l_rta = IFA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
-   {
-      size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
-
-      switch(l_rta->rta_type)
-      {
-         case IFA_ADDRESS:
-         case IFA_LOCAL:
-            if((l_info->ifa_family == AF_INET || l_info->ifa_family == AF_INET6) && !l_addedNetmask)
-            {
-               /* make room for netmask */
-               l_addrSize += NLMSG_ALIGN(calcAddrLen(l_info->ifa_family, l_rtaDataSize));
-               l_addedNetmask = 1;
-            }
-         case IFA_BROADCAST:
-            l_addrSize += NLMSG_ALIGN(calcAddrLen(l_info->ifa_family, l_rtaDataSize));
-            break;
-         case IFA_LABEL:
-            l_nameSize += NLMSG_ALIGN(l_rtaSize + 1);
-            break;
-         default:
-            break;
-      }
-   }
-
-   struct ifaddrs *l_entry = malloc(sizeof(struct ifaddrs) + l_nameSize + l_addrSize);
-   if (l_entry == NULL)
-      return -1;
-
-   memset(l_entry, 0, sizeof(struct ifaddrs));
-   l_entry->ifa_name = (l_interface ? l_interface->ifa_name : "");
-
-   char *l_name = ((char *)l_entry) + sizeof(struct ifaddrs);
-   char *l_addr = l_name + l_nameSize;
-
-   l_entry->ifa_flags = l_info->ifa_flags;
-   if(l_interface)
-      l_entry->ifa_flags |= l_interface->ifa_flags;
-
-   l_rtaSize = NLMSG_PAYLOAD(p_hdr, sizeof(struct ifaddrmsg));
-   for(l_rta = IFA_RTA(l_info); RTA_OK(l_rta, l_rtaSize); l_rta = RTA_NEXT(l_rta, l_rtaSize))
-   {
-      void *l_rtaData = RTA_DATA(l_rta);
-      size_t l_rtaDataSize = RTA_PAYLOAD(l_rta);
-      switch(l_rta->rta_type)
-      {
-         case IFA_ADDRESS:
-         case IFA_BROADCAST:
-         case IFA_LOCAL:
-            {
-               size_t l_addrLen = calcAddrLen(l_info->ifa_family, l_rtaDataSize);
-               makeSockaddr(l_info->ifa_family, (struct sockaddr *)l_addr, l_rtaData, l_rtaDataSize);
-               if(l_info->ifa_family == AF_INET6)
-               {
-                  if(IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)l_rtaData) || IN6_IS_ADDR_MC_LINKLOCAL((struct in6_addr *)l_rtaData))
-                     ((struct sockaddr_in6 *)l_addr)->sin6_scope_id = l_info->ifa_index;
-               }
-
-               if(l_rta->rta_type == IFA_ADDRESS)
-               {
-                  /* apparently in a point-to-point network IFA_ADDRESS 
-                   * contains the dest address and IFA_LOCAL contains the local address */
-                  if(l_entry->ifa_addr)
-                     l_entry->ifa_dstaddr = (struct sockaddr *)l_addr;
-                  else
-                     l_entry->ifa_addr = (struct sockaddr *)l_addr;
-               }
-               else if(l_rta->rta_type == IFA_LOCAL)
-               {
-                  if(l_entry->ifa_addr)
-                     l_entry->ifa_dstaddr = l_entry->ifa_addr;
-                  l_entry->ifa_addr = (struct sockaddr *)l_addr;
-               }
-               else
-                  l_entry->ifa_broadaddr = (struct sockaddr *)l_addr;
-               l_addr += NLMSG_ALIGN(l_addrLen);
-               break;
-            }
-         case IFA_LABEL:
-            strncpy(l_name, l_rtaData, l_rtaDataSize);
-            l_name[l_rtaDataSize] = '\0';
-            l_entry->ifa_name = l_name;
-            break;
-         default:
-            break;
-      }
-   }
-
-   if(l_entry->ifa_addr && 
-         (   l_entry->ifa_addr->sa_family == AF_INET 
-          || l_entry->ifa_addr->sa_family == AF_INET6))
-   {
-      unsigned i;
-      char l_mask[16];
-      unsigned l_maxPrefix = (l_entry->ifa_addr->sa_family == AF_INET 
-            ? 32 : 128);
-      unsigned l_prefix    = (l_info->ifa_prefixlen > l_maxPrefix 
-            ? l_maxPrefix : l_info->ifa_prefixlen);
-
-      l_mask[0] = '\0';
-
-      for(i=0; i<(l_prefix/8); ++i)
-         l_mask[i] = 0xff;
-      if(l_prefix % 8)
-         l_mask[i] = 0xff << (8 - (l_prefix % 8));
-
-      makeSockaddr(l_entry->ifa_addr->sa_family,
-            (struct sockaddr *)l_addr, l_mask, l_maxPrefix / 8);
-      l_entry->ifa_netmask = (struct sockaddr *)l_addr;
-   }
-
-   addToEnd(p_resultList, l_entry);
-   return 0;
-}
-
-static int interpretLinks(int p_socket, NetlinkList *p_netlinkList,
-      struct ifaddrs **p_resultList)
-{
-   int l_numLinks = 0;
-   pid_t l_pid = getpid();
-   for(; p_netlinkList; p_netlinkList = p_netlinkList->m_next)
-   {
-      struct nlmsghdr *l_hdr = NULL;
-      unsigned int l_nlsize  = p_netlinkList->m_size;
-
-      for(l_hdr = p_netlinkList->m_data; NLMSG_OK(l_hdr, l_nlsize); l_hdr = NLMSG_NEXT(l_hdr, l_nlsize))
-      {
-         if((pid_t)l_hdr->nlmsg_pid != l_pid || (int)l_hdr->nlmsg_seq != p_socket)
-            continue;
-
-         if(l_hdr->nlmsg_type == NLMSG_DONE)
-            break;
-
-         if(l_hdr->nlmsg_type == RTM_NEWLINK)
-         {
-            if(interpretLink(l_hdr, p_resultList) == -1)
-               return -1;
-            ++l_numLinks;
-         }
-      }
-   }
-   return l_numLinks;
-}
-
-static int interpretAddrs(int p_socket, NetlinkList *p_netlinkList,
-      struct ifaddrs **p_resultList, int p_numLinks)
-{
-   pid_t l_pid = getpid();
-   for(; p_netlinkList; p_netlinkList = p_netlinkList->m_next)
-   {
-      struct nlmsghdr *l_hdr = NULL;
-      unsigned int l_nlsize  = p_netlinkList->m_size;
-
-      for(l_hdr = p_netlinkList->m_data; NLMSG_OK(l_hdr, l_nlsize); l_hdr = NLMSG_NEXT(l_hdr, l_nlsize))
-      {
-         if((pid_t)l_hdr->nlmsg_pid != l_pid || (int)l_hdr->nlmsg_seq != p_socket)
-            continue;
-
-         if(l_hdr->nlmsg_type == NLMSG_DONE)
-            break;
-
-         if(l_hdr->nlmsg_type == RTM_NEWADDR)
-         {
-            if (interpretAddr(l_hdr, p_resultList, p_numLinks) == -1)
-               return -1;
-         }
-      }
-   }
-   return 0;
-}
-
-int getifaddrs(struct ifaddrs **ifap)
-{
-   int l_socket = 0;
-   int l_result = 0;
-   if(!ifap)
-      return -1;
-   *ifap = NULL;
-
-   l_socket = netlink_socket();
-   if(l_socket < 0)
-      return -1;
-
-   NetlinkList *l_linkResults = getResultList(l_socket, RTM_GETLINK);
-   if(!l_linkResults)
-   {
-      close(l_socket);
-      return -1;
-   }
-
-   NetlinkList *l_addrResults = getResultList(l_socket, RTM_GETADDR);
-   if(!l_addrResults)
-   {
-      close(l_socket);
-      freeResultList(l_linkResults);
-      return -1;
-   }
-
-   int l_numLinks = interpretLinks(l_socket, l_linkResults, ifap);
-
-   if(l_numLinks == -1 || interpretAddrs(l_socket, l_addrResults, ifap, l_numLinks) == -1)
-      l_result = -1;
-
-   freeResultList(l_linkResults);
-   freeResultList(l_addrResults);
-   close(l_socket);
-   return l_result;
-}
-
-void freeifaddrs(struct ifaddrs *ifa)
-{
-   struct ifaddrs *l_cur = NULL;
-
-   while(ifa)
-   {
-      l_cur = ifa;
-      ifa = ifa->ifa_next;
-      free(l_cur);
-   }
-}
diff --git a/libretro-common/compat/compat_posix_string.c b/libretro-common/compat/compat_posix_string.c
deleted file mode 100644
index 71b9f8e..0000000
--- a/libretro-common/compat/compat_posix_string.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (compat_posix_string.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <ctype.h>
-
-#include <compat/posix_string.h>
-
-#include <retro_assert.h>
-
-#ifdef _WIN32
-
-#undef strcasecmp
-#undef strdup
-#undef isblank
-#undef strtok_r
-#include <ctype.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <compat/strl.h>
-
-#include <string.h>
-
-int retro_strcasecmp__(const char *a, const char *b)
-{
-   while (*a && *b)
-   {
-      int a_ = tolower(*a);
-      int b_ = tolower(*b);
-
-      if (a_ != b_)
-         return a_ - b_;
-
-      a++;
-      b++;
-   }
-
-   return tolower(*a) - tolower(*b);
-}
-
-char *retro_strdup__(const char *orig)
-{
-   size_t len = strlen(orig) + 1;
-   char *ret  = (char*)malloc(len);
-   if (!ret)
-      return NULL;
-
-   strlcpy(ret, orig, len);
-   return ret;
-}
-
-int retro_isblank__(int c)
-{
-   return (c == ' ') || (c == '\t');
-}
-
-char *retro_strtok_r__(char *str, const char *delim, char **saveptr)
-{
-   char *first = NULL;
-   if (!saveptr || !delim)
-      return NULL;
-
-   if (str)
-      *saveptr = str;
-
-   do
-   {
-      char *ptr = NULL;
-      first = *saveptr;
-      while (*first && strchr(delim, *first))
-         *first++ = '\0';
-
-      if (*first == '\0')
-         return NULL;
-
-      ptr = first + 1;
-
-      while (*ptr && !strchr(delim, *ptr))
-         ptr++;
-
-      *saveptr = ptr + (*ptr ? 1 : 0);
-      *ptr     = '\0';
-   } while (strlen(first) == 0);
-
-   return first;
-}
-
-#endif
diff --git a/libretro-common/compat/compat_snprintf.c b/libretro-common/compat/compat_snprintf.c
deleted file mode 100644
index 17b453e..0000000
--- a/libretro-common/compat/compat_snprintf.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (compat_snprintf.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* THIS FILE HAS NOT BEEN VALIDATED ON PLATFORMS BESIDES MSVC */
-
-#include <retro_common.h>
-
-#include <stdio.h>
-#include <stdarg.h>
-
-/* http://stackoverflow.com/questions/2915672/snprintf-and-visual-studio-2010 */
-
-int c99_vsnprintf_retro__(char *outBuf, size_t size, const char *format, va_list ap)
-{
-   int count = -1;
-
-   if (size != 0)
-#if (_MSC_VER <= 1310)
-       count = _vsnprintf(outBuf, size, format, ap);
-#else
-       count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
-#endif
-   if (count == -1)
-       count = _vscprintf(format, ap);
-
-   return count;
-}
-
-int c99_snprintf_retro__(char *outBuf, size_t size, const char *format, ...)
-{
-   int count;
-   va_list ap;
-
-   va_start(ap, format);
-   count = c99_vsnprintf_retro__(outBuf, size, format, ap);
-   va_end(ap);
-
-   return count;
-}
diff --git a/libretro-common/compat/compat_strcasestr.c b/libretro-common/compat/compat_strcasestr.c
deleted file mode 100644
index 163c50f..0000000
--- a/libretro-common/compat/compat_strcasestr.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (compat_strcasestr.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <ctype.h>
-
-#include <compat/strcasestr.h>
-#include <retro_assert.h>
-
-/* Pretty much strncasecmp. */
-static int casencmp(const char *a, const char *b, size_t n)
-{
-   size_t i;
-
-   for (i = 0; i < n; i++)
-   {
-      int a_lower = tolower(a[i]);
-      int b_lower = tolower(b[i]);
-      if (a_lower != b_lower)
-         return a_lower - b_lower;
-   }
-
-   return 0;
-}
-
-char *strcasestr_retro__(const char *haystack, const char *needle)
-{
-   size_t i, search_off;
-   size_t hay_len    = strlen(haystack);
-   size_t needle_len = strlen(needle);
-
-   if (needle_len > hay_len)
-      return NULL;
-
-   search_off = hay_len - needle_len;
-   for (i = 0; i <= search_off; i++)
-      if (!casencmp(haystack + i, needle, needle_len))
-         return (char*)haystack + i;
-
-   return NULL;
-}
diff --git a/libretro-common/compat/compat_strl.c b/libretro-common/compat/compat_strl.c
deleted file mode 100644
index 188fd72..0000000
--- a/libretro-common/compat/compat_strl.c
+++ /dev/null
@@ -1,64 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (compat_strl.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <ctype.h>
-
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-
-#include <retro_assert.h>
-
-/* Implementation of strlcpy()/strlcat() based on OpenBSD. */
-
-#ifndef __MACH__
-
-size_t strlcpy(char *dest, const char *source, size_t size)
-{
-   size_t src_size = 0;
-   size_t        n = size;
-
-   if (n)
-      while (--n && (*dest++ = *source++)) src_size++;
-
-   if (!n)
-   {
-      if (size) *dest = '\0';
-      while (*source++) src_size++;
-   }
-
-   return src_size;
-}
-
-size_t strlcat(char *dest, const char *source, size_t size)
-{
-   size_t len = strlen(dest);
-
-   dest += len;
-
-   if (len > size)
-      size = 0;
-   else
-      size -= len;
-
-   return len + strlcpy(dest, source, size);
-}
-#endif
diff --git a/libretro-common/crt/include/string.h b/libretro-common/crt/include/string.h
deleted file mode 100644
index 25fbfc4..0000000
--- a/libretro-common/crt/include/string.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __LIBRETRO_SDK_CRT_STRING_H_
-#define __LIBRETRO_SDK_CRT_STRING_H_
-
-#include <stdio.h>
-
-void *memcpy(void *dst, const void *src, size_t len);
-
-void *memset(void *b, int c, size_t len);
-
-#endif
diff --git a/libretro-common/crt/string.c b/libretro-common/crt/string.c
deleted file mode 100644
index 4114de1..0000000
--- a/libretro-common/crt/string.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifdef _MSC_VER
-#include <cruntime.h>
-#endif
-#include <stdio.h>
-#include <string.h>
-
-void *memset(void *dst, int val, size_t count)
-{
-   void *start = dst;
-
-#if defined(_M_IA64) || defined (_M_AMD64) || defined(_M_ALPHA) || defined (_M_PPC)
-   extern void RtlFillMemory(void *, size_t count, char);
-
-   RtlFillMemory(dst, count, (char)val);
-#else
-   while (count--)
-   {
-      *(char*)dst = (char)val;
-      dst = (char*)dst + 1;
-   }
-#endif
-
-   return start;
-}
-
-void *memcpy(void *dst, const void *src, size_t len)
-{
-   size_t i;
-
-   for (i = 0; i < len; i++)
-      ((unsigned char *)dst)[i] = ((unsigned char *)src)[i];
-
-   return dst;
-}
diff --git a/libretro-common/dynamic/dylib.c b/libretro-common/dynamic/dylib.c
deleted file mode 100644
index ab10226..0000000
--- a/libretro-common/dynamic/dylib.c
+++ /dev/null
@@ -1,150 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (dylib.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <dynamic/dylib.h>
-
-#ifdef NEED_DYNAMIC
-
-#ifdef _WIN32
-#include <compat/posix_string.h>
-#include <windows.h>
-#else
-#include <dlfcn.h>
-#endif
-
-#ifdef _WIN32
-static char last_dyn_error[512];
-
-static void set_dl_error(void)
-{
-   DWORD err = GetLastError();
-
-   if (FormatMessage(FORMAT_MESSAGE_IGNORE_INSERTS |
-            FORMAT_MESSAGE_FROM_SYSTEM,
-            NULL,
-            err,
-            MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT),
-            last_dyn_error,
-            sizeof(last_dyn_error) - 1,
-            NULL) == 0)
-      snprintf(last_dyn_error, sizeof(last_dyn_error) - 1,
-            "unknown error %lu", err);
-}
-#endif
-
-/**
- * dylib_load:
- * @path                         : Path to libretro core library.
- *
- * Platform independent dylib loading.
- *
- * Returns: library handle on success, otherwise NULL.
- **/
-dylib_t dylib_load(const char *path)
-{
-#ifdef _WIN32
-   int prevmode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
-   dylib_t lib  = LoadLibrary(path);
-
-   SetErrorMode(prevmode);
-
-   if (!lib)
-   {
-      set_dl_error();
-      return NULL;
-   }
-   last_dyn_error[0] = 0;
-#else
-   dylib_t lib = dlopen(path, RTLD_LAZY);
-#endif
-   return lib;
-}
-
-char *dylib_error(void)
-{
-#ifdef _WIN32
-   if (last_dyn_error[0])
-      return last_dyn_error;
-   return NULL;
-#else
-   return (char*)dlerror();
-#endif
-}
-
-function_t dylib_proc(dylib_t lib, const char *proc)
-{
-   function_t sym;
-
-#ifdef _WIN32
-   sym = (function_t)GetProcAddress(lib ?
-         (HMODULE)lib : GetModuleHandle(NULL), proc);
-   if (!sym)
-   {
-      set_dl_error();
-      return NULL;
-   }
-   last_dyn_error[0] = 0;
-#else
-   void *ptr_sym = NULL;
-
-   if (lib)
-      ptr_sym = dlsym(lib, proc);
-   else
-   {
-      void *handle = dlopen(NULL, RTLD_LAZY);
-      if (handle)
-      {
-         ptr_sym = dlsym(handle, proc);
-         dlclose(handle);
-      }
-   }
-
-   /* Dirty hack to workaround the non-legality of
-    * (void*) -> fn-pointer casts. */
-   memcpy(&sym, &ptr_sym, sizeof(void*));
-#endif
-
-   return sym;
-}
-
-/**
- * dylib_close:
- * @lib                          : Library handle.
- *
- * Frees library handle.
- **/
-void dylib_close(dylib_t lib)
-{
-#ifdef _WIN32
-   if (!FreeLibrary((HMODULE)lib))
-      set_dl_error();
-   last_dyn_error[0] = 0;
-#else
-#ifndef NO_DLCLOSE
-   dlclose(lib);
-#endif
-#endif
-}
-
-#endif
diff --git a/libretro-common/encodings/encoding_crc32.c b/libretro-common/encodings/encoding_crc32.c
deleted file mode 100644
index aa10d1a..0000000
--- a/libretro-common/encodings/encoding_crc32.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (encoding_crc32.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stddef.h>
-
-static const uint32_t crc32_table[256] = {
-  0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
-  0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
-  0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
-  0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
-  0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
-  0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
-  0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
-  0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
-  0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
-  0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
-  0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
-  0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
-  0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
-  0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
-  0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
-  0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
-  0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
-  0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
-  0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
-  0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
-  0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
-  0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
-  0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
-  0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
-  0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
-  0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
-  0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
-  0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
-  0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
-  0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
-  0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
-  0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
-  0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
-  0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
-  0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
-  0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
-  0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
-  0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
-  0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
-  0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
-  0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
-  0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
-  0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
-  0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
-  0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
-  0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
-  0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
-  0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
-  0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
-  0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
-  0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
-  0x2d02ef8dL
-};
-
-uint32_t encoding_crc32(uint32_t crc, const uint8_t *buf, size_t len)
-{
-   crc = crc ^ 0xffffffff;
-
-   while (len--)
-      crc = crc32_table[(crc ^ (*buf++)) & 0xff] ^ (crc >> 8);
-
-   return crc ^ 0xffffffff;
-}
diff --git a/libretro-common/encodings/encoding_utf.c b/libretro-common/encodings/encoding_utf.c
deleted file mode 100644
index c4ec8fd..0000000
--- a/libretro-common/encodings/encoding_utf.c
+++ /dev/null
@@ -1,260 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (encoding_utf.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <stddef.h>
-#include <string.h>
-
-#include <boolean.h>
-#include <compat/strl.h>
-#include <retro_inline.h>
-
-static INLINE unsigned leading_ones(uint8_t c)
-{
-   unsigned ones = 0;
-   while (c & 0x80)
-   {
-      ones++;
-      c <<= 1;
-   }
-
-   return ones;
-}
-
-/* Simple implementation. Assumes the sequence is
- * properly synchronized and terminated. */
-
-size_t utf8_conv_utf32(uint32_t *out, size_t out_chars,
-      const char *in, size_t in_size)
-{
-   unsigned i;
-   size_t ret = 0;
-   while (in_size && out_chars)
-   {
-      unsigned extra, shift;
-      uint32_t c;
-      uint8_t first = *in++;
-      unsigned ones = leading_ones(first);
-
-      if (ones > 6 || ones == 1) /* Invalid or desync. */
-         break;
-
-      extra = ones ? ones - 1 : ones;
-      if (1 + extra > in_size) /* Overflow. */
-         break;
-
-      shift = (extra - 1) * 6;
-      c     = (first & ((1 << (7 - ones)) - 1)) << (6 * extra);
-
-      for (i = 0; i < extra; i++, in++, shift -= 6)
-         c |= (*in & 0x3f) << shift;
-
-      *out++ = c;
-      in_size -= 1 + extra;
-      out_chars--;
-      ret++;
-   }
-
-   return ret;
-}
-
-bool utf16_conv_utf8(uint8_t *out, size_t *out_chars,
-     const uint16_t *in, size_t in_size)
-{
-   static uint8_t kUtf8Limits[5] = { 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
-   size_t out_pos = 0;
-   size_t in_pos  = 0;
-
-   for (;;)
-   {
-      unsigned numAdds;
-      uint32_t value;
-
-      if (in_pos == in_size)
-      {
-         *out_chars = out_pos;
-         return true;
-      }
-      value = in[in_pos++];
-      if (value < 0x80)
-      {
-         if (out)
-            out[out_pos] = (char)value;
-         out_pos++;
-         continue;
-      }
-
-      if (value >= 0xD800 && value < 0xE000)
-      {
-         uint32_t c2;
-
-         if (value >= 0xDC00 || in_pos == in_size)
-            break;
-         c2 = in[in_pos++];
-         if (c2 < 0xDC00 || c2 >= 0xE000)
-            break;
-         value = (((value - 0xD800) << 10) | (c2 - 0xDC00)) + 0x10000;
-      }
-
-      for (numAdds = 1; numAdds < 5; numAdds++)
-         if (value < (((uint32_t)1) << (numAdds * 5 + 6)))
-            break;
-      if (out)
-         out[out_pos] = (char)(kUtf8Limits[numAdds - 1]
-               + (value >> (6 * numAdds)));
-      out_pos++;
-      do
-      {
-         numAdds--;
-         if (out)
-            out[out_pos] = (char)(0x80
-                  + ((value >> (6 * numAdds)) & 0x3F));
-         out_pos++;
-      }while (numAdds != 0);
-   }
-
-   *out_chars = out_pos;
-   return false;
-}
-
-/* Acts mostly like strlcpy.
- *
- * Copies the given number of UTF-8 characters,
- * but at most d_len bytes.
- *
- * Always NULL terminates.
- * Does not copy half a character.
- *
- * Returns number of bytes. 's' is assumed valid UTF-8.
- * Use only if 'chars' is considerably less than 'd_len'. */
-size_t utf8cpy(char *d, size_t d_len, const char *s, size_t chars)
-{
-   const uint8_t *sb     = (const uint8_t*)s;
-   const uint8_t *sb_org = sb;
-
-   while (*sb && chars-- > 0)
-   {
-      sb++;
-      while ((*sb&0xC0) == 0x80) sb++;
-   }
-
-   if ((size_t)(sb - sb_org) > d_len-1 /* NUL */)
-   {
-      sb = sb_org + d_len-1;
-      while ((*sb&0xC0) == 0x80) sb--;
-   }
-
-   memcpy(d, sb_org, sb-sb_org);
-   d[sb-sb_org] = '\0';
-
-   return sb-sb_org;
-}
-
-const char *utf8skip(const char *str, size_t chars)
-{
-   const uint8_t *strb = (const uint8_t*)str;
-   if (!chars)
-      return str;
-   do
-   {
-      strb++;
-      while ((*strb&0xC0)==0x80) strb++;
-      chars--;
-   } while(chars);
-   return (const char*)strb;
-}
-
-size_t utf8len(const char *string)
-{
-   size_t ret = 0;
-   while (*string)
-   {
-      if ((*string & 0xC0) != 0x80)
-         ret++;
-      string++;
-   }
-   return ret;
-}
-
-static INLINE uint8_t utf8_walkbyte(const char **string)
-{
-   return *((*string)++);
-}
-
-/* Does not validate the input, returns garbage if it's not UTF-8. */
-uint32_t utf8_walk(const char **string)
-{
-   uint8_t first = utf8_walkbyte(string);
-   uint32_t ret;
-
-   if (first<128)
-      return first;
-
-   ret = 0;
-   ret = (ret<<6) | (utf8_walkbyte(string)    & 0x3F);
-   if (first >= 0xE0)
-      ret = (ret<<6) | (utf8_walkbyte(string) & 0x3F);
-   if (first >= 0xF0)
-      ret = (ret<<6) | (utf8_walkbyte(string) & 0x3F);
-
-   if (first >= 0xF0)
-      return ret | (first&7)<<18;
-   if (first >= 0xE0)
-      return ret | (first&15)<<12;
-   return ret | (first&31)<<6;
-}
-
-static bool utf16_to_char(uint8_t **utf_data,
-      size_t *dest_len, const uint16_t *in)
-{
-   unsigned len    = 0;
-
-   while (in[len] != '\0')
-      len++;
-
-   utf16_conv_utf8(NULL, dest_len, in, len);
-   *dest_len  += 1;
-   *utf_data   = (uint8_t*)malloc(*dest_len);
-   if (*utf_data == 0)
-      return false;
-
-   return utf16_conv_utf8(*utf_data, dest_len, in, len);
-}
-
-bool utf16_to_char_string(const uint16_t *in, char *s, size_t len)
-{
-   size_t     dest_len  = 0;
-   uint8_t *utf16_data  = NULL;
-   bool            ret  = utf16_to_char(&utf16_data, &dest_len, in);
-
-   if (ret)
-   {
-      utf16_data[dest_len] = 0;
-      strlcpy(s, (const char*)utf16_data, len);
-   }
-
-   free(utf16_data);
-   utf16_data = NULL;
-
-   return ret;
-}
diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c
deleted file mode 100644
index 86f1209..0000000
--- a/libretro-common/features/features_cpu.c
+++ /dev/null
@@ -1,773 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (features_cpu.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#if defined(_WIN32)
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-
-#include <compat/strl.h>
-#include <streams/file_stream.h>
-#include <libretro.h>
-#include <features/features_cpu.h>
-
-#if defined(_WIN32) && !defined(_XBOX)
-#include <windows.h>
-#endif
-
-#if defined(__CELLOS_LV2__)
-#ifndef _PPU_INTRINSICS_H
-#include <ppu_intrinsics.h>
-#endif
-#elif defined(_XBOX360)
-#include <PPCIntrinsics.h>
-#elif defined(_POSIX_MONOTONIC_CLOCK) || defined(ANDROID) || defined(__QNX__) || defined(DJGPP)
-/* POSIX_MONOTONIC_CLOCK is not being defined in Android headers despite support being present. */
-#include <time.h>
-#endif
-
-#if defined(__QNX__) && !defined(CLOCK_MONOTONIC)
-#define CLOCK_MONOTONIC 2
-#endif
-
-#if defined(PSP)
-#include <sys/time.h>
-#include <psprtc.h>
-#endif
-
-#if defined(VITA)
-#include <psp2/kernel/processmgr.h>
-#include <psp2/rtc.h>
-#endif
-
-#if defined(__PSL1GHT__)
-#include <sys/time.h>
-#elif defined(__CELLOS_LV2__)
-#include <sys/sys_time.h>
-#endif
-
-#ifdef GEKKO
-#include <ogc/lwp_watchdog.h>
-#endif
-
-#ifdef WIIU
-#include <wiiu/os/time.h>
-#endif
-
-#if defined(_3DS)
-#include <3ds/svc.h>
-#include <3ds/os.h>
-#endif
-
-/* iOS/OSX specific. Lacks clock_gettime(), so implement it. */
-#ifdef __MACH__
-#include <sys/time.h>
-
-#ifndef CLOCK_MONOTONIC
-#define CLOCK_MONOTONIC 0
-#endif
-
-#ifndef CLOCK_REALTIME
-#define CLOCK_REALTIME 0
-#endif
-
-/* this function is part of iOS 10 now */
-static int ra_clock_gettime(int clk_ik, struct timespec *t)
-{
-   struct timeval now;
-   int rv = gettimeofday(&now, NULL);
-   if (rv)
-      return rv;
-   t->tv_sec  = now.tv_sec;
-   t->tv_nsec = now.tv_usec * 1000;
-   return 0;
-}
-#endif
-
-#if defined(__MACH__) && __IPHONE_OS_VERSION_MIN_REQUIRED < 100000
-#else
-#define ra_clock_gettime clock_gettime
-#endif
-
-
-#ifdef EMSCRIPTEN
-#include <emscripten.h>
-#endif
-
-#if defined(BSD) || defined(__APPLE__)
-#include <sys/sysctl.h>
-#endif
-
-#include <string.h>
-
-/**
- * cpu_features_get_perf_counter:
- *
- * Gets performance counter.
- *
- * Returns: performance counter.
- **/
-retro_perf_tick_t cpu_features_get_perf_counter(void)
-{
-   retro_perf_tick_t time_ticks = 0;
-#if defined(_WIN32)
-   long tv_sec, tv_usec;
-   static const unsigned __int64 epoch = 11644473600000000ULL;
-   FILETIME file_time;
-   SYSTEMTIME system_time;
-   ULARGE_INTEGER ularge;
-
-   GetSystemTime(&system_time);
-   SystemTimeToFileTime(&system_time, &file_time);
-   ularge.LowPart  = file_time.dwLowDateTime;
-   ularge.HighPart = file_time.dwHighDateTime;
-
-   tv_sec     = (long)((ularge.QuadPart - epoch) / 10000000L);
-   tv_usec    = (long)(system_time.wMilliseconds * 1000);
-   time_ticks = (1000000 * tv_sec + tv_usec);
-#elif defined(__linux__) || defined(__QNX__) || defined(__MACH__)
-   struct timespec tv = {0};
-   if (ra_clock_gettime(CLOCK_MONOTONIC, &tv) == 0)
-      time_ticks = (retro_perf_tick_t)tv.tv_sec * 1000000000 +
-         (retro_perf_tick_t)tv.tv_nsec;
-
-#elif defined(__GNUC__) && defined(__i386__) || defined(__i486__) || defined(__i686__)
-   __asm__ volatile ("rdtsc" : "=A" (time_ticks));
-#elif defined(__GNUC__) && defined(__x86_64__)
-   unsigned a, d;
-   __asm__ volatile ("rdtsc" : "=a" (a), "=d" (d));
-   time_ticks = (retro_perf_tick_t)a | ((retro_perf_tick_t)d << 32);
-#elif defined(__ARM_ARCH_6__)
-   __asm__ volatile( "mrc p15, 0, %0, c9, c13, 0" : "=r"(time_ticks) );
-#elif defined(__CELLOS_LV2__) || defined(_XBOX360) || defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__)
-   time_ticks = __mftb();
-#elif defined(GEKKO)
-   time_ticks = gettime();
-#elif defined(PSP) 
-   sceRtcGetCurrentTick((uint64_t*)&time_ticks);
-#elif defined(VITA)
-   sceRtcGetCurrentTick((SceRtcTick*)&time_ticks);
-#elif defined(_3DS)
-   time_ticks = svcGetSystemTick();
-#elif defined(WIIU)
-   time_ticks = OSGetSystemTime();
-#elif defined(__mips__)
-   struct timeval tv;
-   gettimeofday(&tv,NULL);
-   time_ticks = (1000000 * tv.tv_sec + tv.tv_usec);
-#endif
-
-   return time_ticks;
-}
-
-/**
- * cpu_features_get_time_usec:
- *
- * Gets time in microseconds.
- *
- * Returns: time in microseconds.
- **/
-retro_time_t cpu_features_get_time_usec(void)
-{
-#if defined(_WIN32)
-   static LARGE_INTEGER freq;
-   LARGE_INTEGER count;
-
-   /* Frequency is guaranteed to not change. */
-   if (!freq.QuadPart && !QueryPerformanceFrequency(&freq))
-      return 0;
-
-   if (!QueryPerformanceCounter(&count))
-      return 0;
-   return count.QuadPart * 1000000 / freq.QuadPart;
-#elif defined(__CELLOS_LV2__)
-   return sys_time_get_system_time();
-#elif defined(GEKKO)
-   return ticks_to_microsecs(gettime());
-#elif defined(_POSIX_MONOTONIC_CLOCK) || defined(__QNX__) || defined(ANDROID) || defined(__MACH__)
-   struct timespec tv = {0};
-   if (ra_clock_gettime(CLOCK_MONOTONIC, &tv) < 0)
-      return 0;
-   return tv.tv_sec * INT64_C(1000000) + (tv.tv_nsec + 500) / 1000;
-#elif defined(EMSCRIPTEN)
-   return emscripten_get_now() * 1000;
-#elif defined(__mips__) || defined(DJGPP)
-   struct timeval tv;
-   gettimeofday(&tv,NULL);
-   return (1000000 * tv.tv_sec + tv.tv_usec);
-#elif defined(_3DS)
-   return osGetTime() * 1000;
-#elif defined(VITA)
-   return sceKernelGetProcessTimeWide();
-#elif defined(WIIU)
-   return ticks_to_us(OSGetSystemTime());
-#else
-#error "Your platform does not have a timer function implemented in cpu_features_get_time_usec(). Cannot continue."
-#endif
-}
-
-#if defined(__x86_64__) || defined(__i386__) || defined(__i486__) || defined(__i686__)
-#define CPU_X86
-#endif
-
-#if defined(_MSC_VER) && !defined(_XBOX)
-#if (_MSC_VER > 1310)
-#include <intrin.h>
-#endif
-#endif
-
-#if defined(CPU_X86) && !defined(__MACH__)
-void x86_cpuid(int func, int flags[4])
-{
-   /* On Android, we compile RetroArch with PIC, and we
-    * are not allowed to clobber the ebx register. */
-#ifdef __x86_64__
-#define REG_b "rbx"
-#define REG_S "rsi"
-#else
-#define REG_b "ebx"
-#define REG_S "esi"
-#endif
-
-#if defined(__GNUC__)
-   __asm__ volatile (
-         "mov %%" REG_b ", %%" REG_S "\n"
-         "cpuid\n"
-         "xchg %%" REG_b ", %%" REG_S "\n"
-         : "=a"(flags[0]), "=S"(flags[1]), "=c"(flags[2]), "=d"(flags[3])
-         : "a"(func));
-#elif defined(_MSC_VER)
-   __cpuid(flags, func);
-#else
-   printf("Unknown compiler. Cannot check CPUID with inline assembly.\n");
-   memset(flags, 0, 4 * sizeof(int));
-#endif
-}
-
-/* Only runs on i686 and above. Needs to be conditionally run. */
-static uint64_t xgetbv_x86(uint32_t idx)
-{
-#if defined(__GNUC__)
-   uint32_t eax, edx;
-   __asm__ volatile (
-         /* Older GCC versions (Apple's GCC for example) do
-          * not understand xgetbv instruction.
-          * Stamp out the machine code directly.
-          */
-         ".byte 0x0f, 0x01, 0xd0\n"
-         : "=a"(eax), "=d"(edx) : "c"(idx));
-   return ((uint64_t)edx << 32) | eax;
-#elif _MSC_FULL_VER >= 160040219
-   /* Intrinsic only works on 2010 SP1 and above. */
-   return _xgetbv(idx);
-#else
-   printf("Unknown compiler. Cannot check xgetbv bits.\n");
-   return 0;
-#endif
-}
-#endif
-
-#if defined(__ARM_NEON__)
-static void arm_enable_runfast_mode(void)
-{
-   /* RunFast mode. Enables flush-to-zero and some
-    * floating point optimizations. */
-   static const unsigned x = 0x04086060;
-   static const unsigned y = 0x03000000;
-   int r;
-   __asm__ volatile(
-         "fmrx	%0, fpscr   \n\t" /* r0 = FPSCR */
-         "and	%0, %0, %1  \n\t" /* r0 = r0 & 0x04086060 */
-         "orr	%0, %0, %2  \n\t" /* r0 = r0 | 0x03000000 */
-         "fmxr	fpscr, %0   \n\t" /* FPSCR = r0 */
-         : "=r"(r)
-         : "r"(x), "r"(y)
-        );
-}
-#endif
-
-#if defined(__linux__) && !defined(CPU_X86)
-static unsigned char check_arm_cpu_feature(const char* feature)
-{
-   char line[1024];
-   unsigned char status = 0;
-   RFILE *fp = filestream_open("/proc/cpuinfo", RFILE_MODE_READ_TEXT, -1);
-
-   if (!fp)
-      return 0;
-
-   while (filestream_gets(fp, line, sizeof(line)) != NULL)
-   {
-      if (strncmp(line, "Features\t: ", 11))
-         continue;
-
-      if (strstr(line + 11, feature) != NULL)
-         status = 1;
-
-      break;
-   }
-
-   filestream_close(fp);
-
-   return status;
-}
-
-#if !defined(_SC_NPROCESSORS_ONLN)
-/* Parse an decimal integer starting from 'input', but not going further
- * than 'limit'. Return the value into '*result'.
- *
- * NOTE: Does not skip over leading spaces, or deal with sign characters.
- * NOTE: Ignores overflows.
- *
- * The function returns NULL in case of error (bad format), or the new
- * position after the decimal number in case of success (which will always
- * be <= 'limit').
- */
-static const char *parse_decimal(const char* input,
-      const char* limit, int* result)
-{
-    const char* p = input;
-    int       val = 0;
-
-    while (p < limit)
-    {
-        int d = (*p - '0');
-        if ((unsigned)d >= 10U)
-            break;
-        val = val*10 + d;
-        p++;
-    }
-    if (p == input)
-        return NULL;
-
-    *result = val;
-    return p;
-}
-
-/* Parse a textual list of cpus and store the result inside a CpuList object.
- * Input format is the following:
- * - comma-separated list of items (no spaces)
- * - each item is either a single decimal number (cpu index), or a range made
- *   of two numbers separated by a single dash (-). Ranges are inclusive.
- *
- * Examples:   0
- *             2,4-127,128-143
- *             0-1
- */
-static void cpulist_parse(CpuList* list, char **buf, ssize_t length)
-{
-   const char* p   = (const char*)buf;
-   const char* end = p + length;
-
-   /* NOTE: the input line coming from sysfs typically contains a
-    * trailing newline, so take care of it in the code below
-    */
-   while (p < end && *p != '\n')
-   {
-      int val, start_value, end_value;
-      /* Find the end of current item, and put it into 'q' */
-      const char *q = (const char*)memchr(p, ',', end-p);
-
-      if (!q)
-         q = end;
-
-      /* Get first value */
-      p = parse_decimal(p, q, &start_value);
-      if (p == NULL)
-         return;
-
-      end_value = start_value;
-
-      /* If we're not at the end of the item, expect a dash and
-       * and integer; extract end value.
-       */
-      if (p < q && *p == '-')
-      {
-         p = parse_decimal(p+1, q, &end_value);
-         if (p == NULL)
-            return;
-      }
-
-      /* Set bits CPU list bits */
-      for (val = start_value; val <= end_value; val++)
-      {
-         if ((unsigned)val < 32)
-            list->mask |= (uint32_t)(1U << val);
-      }
-
-      /* Jump to next item */
-      p = q;
-      if (p < end)
-         p++;
-   }
-}
-
-/* Read a CPU list from one sysfs file */
-static void cpulist_read_from(CpuList* list, const char* filename)
-{
-   ssize_t length;
-   char *buf  = NULL;
-
-   list->mask = 0;
-
-   if (filestream_read_file(filename, (void**)&buf, &length) != 1)
-      return;
-
-   cpulist_parse(list, &buf, length);
-   if (buf)
-      free(buf);
-   buf = NULL;
-}
-#endif
-
-#endif
-
-/**
- * cpu_features_get_core_amount:
- *
- * Gets the amount of available CPU cores.
- *
- * Returns: amount of CPU cores available.
- **/
-unsigned cpu_features_get_core_amount(void)
-{
-#if defined(_WIN32) && !defined(_XBOX)
-   /* Win32 */
-   SYSTEM_INFO sysinfo;
-   GetSystemInfo(&sysinfo);
-   return sysinfo.dwNumberOfProcessors;
-#elif defined(GEKKO)
-   return 1;
-#elif defined(PSP)
-   return 1;
-#elif defined(VITA)
-   return 4;
-#elif defined(_3DS)
-   return 1;
-#elif defined(WIIU)
-   return 3;
-#elif defined(_SC_NPROCESSORS_ONLN)
-   /* Linux, most UNIX-likes. */
-   long ret = sysconf(_SC_NPROCESSORS_ONLN);
-   if (ret <= 0)
-      return (unsigned)1;
-   return (unsigned)ret;
-#elif defined(BSD) || defined(__APPLE__)
-   /* BSD */
-   /* Copypasta from stackoverflow, dunno if it works. */
-   int num_cpu = 0;
-   int mib[4];
-   size_t len = sizeof(num_cpu);
-
-   mib[0] = CTL_HW;
-   mib[1] = HW_AVAILCPU;
-   sysctl(mib, 2, &num_cpu, &len, NULL, 0);
-   if (num_cpu < 1)
-   {
-      mib[1] = HW_NCPU;
-      sysctl(mib, 2, &num_cpu, &len, NULL, 0);
-      if (num_cpu < 1)
-         num_cpu = 1;
-   }
-   return num_cpu;
-#elif defined(__linux__)
-   CpuList  cpus_present[1];
-   CpuList  cpus_possible[1];
-   int amount = 0;
-
-   cpulist_read_from(cpus_present, "/sys/devices/system/cpu/present");
-   cpulist_read_from(cpus_possible, "/sys/devices/system/cpu/possible");
-
-   /* Compute the intersection of both sets to get the actual number of
-    * CPU cores that can be used on this device by the kernel.
-    */
-   cpus_present->mask &= cpus_possible->mask;
-   amount              = __builtin_popcount(cpus_present->mask);
-
-   if (amount == 0)
-      return 1;
-   return amount;
-#elif defined(_XBOX360)
-   return 3;
-#else
-   /* No idea, assume single core. */
-   return 1;
-#endif
-}
-
-/* According to http://en.wikipedia.org/wiki/CPUID */
-#define VENDOR_INTEL_b  0x756e6547
-#define VENDOR_INTEL_c  0x6c65746e
-#define VENDOR_INTEL_d  0x49656e69
-
-/**
- * cpu_features_get:
- *
- * Gets CPU features..
- *
- * Returns: bitmask of all CPU features available.
- **/
-uint64_t cpu_features_get(void)
-{
-   int flags[4];
-   int vendor_shuffle[3];
-   char vendor[13];
-   size_t len          = 0;
-   uint64_t cpu_flags  = 0;
-   uint64_t cpu        = 0;
-   unsigned max_flag   = 0;
-#if defined(CPU_X86) && !defined(__MACH__)
-   int vendor_is_intel = 0;
-   const int avx_flags = (1 << 27) | (1 << 28);
-#endif
-
-   char buf[sizeof(" MMX MMXEXT SSE SSE2 SSE3 SSSE3 SS4 SSE4.2 AES AVX AVX2 NEON VMX VMX128 VFPU PS")];
-
-   memset(buf, 0, sizeof(buf));
-
-   (void)len;
-   (void)cpu_flags;
-   (void)flags;
-   (void)max_flag;
-   (void)vendor;
-   (void)vendor_shuffle;
-
-#if defined(__MACH__)
-   len     = sizeof(size_t);
-   if (sysctlbyname("hw.optional.mmx", NULL, &len, NULL, 0) == 0)
-   {
-      cpu |= RETRO_SIMD_MMX;
-      cpu |= RETRO_SIMD_MMXEXT;
-   }
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.floatingpoint", NULL, &len, NULL, 0) == 0)
-   {
-      cpu |= RETRO_SIMD_CMOV;
-   }
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse2", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE2;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse3", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE3;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.supplementalsse3", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSSE3;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse4_1", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE4;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.sse4_2", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_SSE42;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.aes", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_AES;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.avx1_0", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_AVX;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.avx2_0", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_AVX2;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.altivec", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_VMX;
-
-   len            = sizeof(size_t);
-   if (sysctlbyname("hw.optional.neon", NULL, &len, NULL, 0) == 0)
-      cpu |= RETRO_SIMD_NEON;
-
-#elif defined(CPU_X86)
-   (void)avx_flags;
-
-   x86_cpuid(0, flags);
-   vendor_shuffle[0] = flags[1];
-   vendor_shuffle[1] = flags[3];
-   vendor_shuffle[2] = flags[2];
-
-   vendor[0]         = '\0';
-   memcpy(vendor, vendor_shuffle, sizeof(vendor_shuffle));
-
-   /* printf("[CPUID]: Vendor: %s\n", vendor); */
-
-   vendor_is_intel = (
-         flags[1] == VENDOR_INTEL_b &&
-         flags[2] == VENDOR_INTEL_c &&
-         flags[3] == VENDOR_INTEL_d);
-
-   max_flag = flags[0];
-   if (max_flag < 1) /* Does CPUID not support func = 1? (unlikely ...) */
-      return 0;
-
-   x86_cpuid(1, flags);
-
-   if (flags[3] & (1 << 15))
-      cpu |= RETRO_SIMD_CMOV;
-
-   if (flags[3] & (1 << 23))
-      cpu |= RETRO_SIMD_MMX;
-
-   if (flags[3] & (1 << 25))
-   {
-      /* SSE also implies MMXEXT (according to FFmpeg source). */
-      cpu |= RETRO_SIMD_SSE;
-      cpu |= RETRO_SIMD_MMXEXT;
-   }
-
-
-   if (flags[3] & (1 << 26))
-      cpu |= RETRO_SIMD_SSE2;
-
-   if (flags[2] & (1 << 0))
-      cpu |= RETRO_SIMD_SSE3;
-
-   if (flags[2] & (1 << 9))
-      cpu |= RETRO_SIMD_SSSE3;
-
-   if (flags[2] & (1 << 19))
-      cpu |= RETRO_SIMD_SSE4;
-
-   if (flags[2] & (1 << 20))
-      cpu |= RETRO_SIMD_SSE42;
-
-   if ((flags[2] & (1 << 23)))
-      cpu |= RETRO_SIMD_POPCNT;
-
-   if (vendor_is_intel && (flags[2] & (1 << 22)))
-      cpu |= RETRO_SIMD_MOVBE;
-
-   if (flags[2] & (1 << 25))
-      cpu |= RETRO_SIMD_AES;
-
-
-   /* Must only perform xgetbv check if we have
-    * AVX CPU support (guaranteed to have at least i686). */
-   if (((flags[2] & avx_flags) == avx_flags)
-         && ((xgetbv_x86(0) & 0x6) == 0x6))
-      cpu |= RETRO_SIMD_AVX;
-
-   if (max_flag >= 7)
-   {
-      x86_cpuid(7, flags);
-      if (flags[1] & (1 << 5))
-         cpu |= RETRO_SIMD_AVX2;
-   }
-
-   x86_cpuid(0x80000000, flags);
-   max_flag = flags[0];
-   if (max_flag >= 0x80000001u)
-   {
-      x86_cpuid(0x80000001, flags);
-      if (flags[3] & (1 << 23))
-         cpu |= RETRO_SIMD_MMX;
-      if (flags[3] & (1 << 22))
-         cpu |= RETRO_SIMD_MMXEXT;
-   }
-#elif defined(__linux__)
-   if (check_arm_cpu_feature("neon"))
-   {
-      cpu |= RETRO_SIMD_NEON;
-#ifdef __ARM_NEON__
-      arm_enable_runfast_mode();
-#endif
-   }
-
-   if (check_arm_cpu_feature("vfpv3"))
-      cpu |= RETRO_SIMD_VFPV3;
-
-   if (check_arm_cpu_feature("vfpv4"))
-      cpu |= RETRO_SIMD_VFPV4;
-
-   if (check_arm_cpu_feature("asimd"))
-   {
-      cpu |= RETRO_SIMD_ASIMD;
-#ifdef __ARM_NEON__
-      cpu |= RETRO_SIMD_NEON;
-      arm_enable_runfast_mode();
-#endif
-   }
-
-#if 0
-    check_arm_cpu_feature("swp");
-    check_arm_cpu_feature("half");
-    check_arm_cpu_feature("thumb");
-    check_arm_cpu_feature("fastmult");
-    check_arm_cpu_feature("vfp");
-    check_arm_cpu_feature("edsp");
-    check_arm_cpu_feature("thumbee");
-    check_arm_cpu_feature("tls");
-    check_arm_cpu_feature("idiva");
-    check_arm_cpu_feature("idivt");
-#endif
-
-#elif defined(__ARM_NEON__)
-   cpu |= RETRO_SIMD_NEON;
-   arm_enable_runfast_mode();
-#elif defined(__ALTIVEC__)
-   cpu |= RETRO_SIMD_VMX;
-#elif defined(XBOX360)
-   cpu |= RETRO_SIMD_VMX128;
-#elif defined(PSP)
-   cpu |= RETRO_SIMD_VFPU;
-#elif defined(GEKKO)
-   cpu |= RETRO_SIMD_PS;
-#endif
-
-   if (cpu & RETRO_SIMD_MMX)    strlcat(buf, " MMX", sizeof(buf));
-   if (cpu & RETRO_SIMD_MMXEXT) strlcat(buf, " MMXEXT", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE)    strlcat(buf, " SSE", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE2)   strlcat(buf, " SSE2", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE3)   strlcat(buf, " SSE3", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSSE3)  strlcat(buf, " SSSE3", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE4)   strlcat(buf, " SSE4", sizeof(buf));
-   if (cpu & RETRO_SIMD_SSE42)  strlcat(buf, " SSE4.2", sizeof(buf));
-   if (cpu & RETRO_SIMD_AES)    strlcat(buf, " AES", sizeof(buf));
-   if (cpu & RETRO_SIMD_AVX)    strlcat(buf, " AVX", sizeof(buf));
-   if (cpu & RETRO_SIMD_AVX2)   strlcat(buf, " AVX2", sizeof(buf));
-   if (cpu & RETRO_SIMD_NEON)   strlcat(buf, " NEON", sizeof(buf));
-   if (cpu & RETRO_SIMD_VFPV3)  strlcat(buf, " VFPv3", sizeof(buf));
-   if (cpu & RETRO_SIMD_VFPV4)  strlcat(buf, " VFPv4", sizeof(buf));
-   if (cpu & RETRO_SIMD_VMX)    strlcat(buf, " VMX", sizeof(buf));
-   if (cpu & RETRO_SIMD_VMX128) strlcat(buf, " VMX128", sizeof(buf));
-   if (cpu & RETRO_SIMD_VFPU)   strlcat(buf, " VFPU", sizeof(buf));
-   if (cpu & RETRO_SIMD_PS)     strlcat(buf, " PS", sizeof(buf));
-   if (cpu & RETRO_SIMD_ASIMD)  strlcat(buf, " ASIMD", sizeof(buf));
-
-   return cpu;
-}
diff --git a/libretro-common/file/archive_file.c b/libretro-common/file/archive_file.c
deleted file mode 100644
index 4a11045..0000000
--- a/libretro-common/file/archive_file.c
+++ /dev/null
@@ -1,897 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (archive_file.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_MMAP
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
-
-#include <sys/mman.h>
-#include <sys/stat.h>
-#endif
-
-#include <compat/strl.h>
-#include <file/archive_file.h>
-#include <file/file_path.h>
-#include <streams/file_stream.h>
-#include <retro_miscellaneous.h>
-#include <lists/string_list.h>
-#include <string/stdstring.h>
-
-struct file_archive_file_data
-{
-#ifdef HAVE_MMAP
-   int fd;
-#endif
-   void *data;
-   size_t size;
-};
-
-static size_t file_archive_size(file_archive_file_data_t *data)
-{
-   if (!data)
-      return 0;
-   return data->size;
-}
-
-static const uint8_t *file_archive_data(file_archive_file_data_t *data)
-{
-   if (!data)
-      return NULL;
-   return (const uint8_t*)data->data;
-}
-
-#ifdef HAVE_MMAP
-/* Closes, unmaps and frees. */
-static void file_archive_free(file_archive_file_data_t *data)
-{
-   if (!data)
-      return;
-
-   if (data->data)
-      munmap(data->data, data->size);
-   if (data->fd >= 0)
-      close(data->fd);
-   free(data);
-}
-
-static file_archive_file_data_t* file_archive_open(const char *path)
-{
-   file_archive_file_data_t *data = (file_archive_file_data_t*)calloc(1, sizeof(*data));
-
-   if (!data)
-      return NULL;
-
-   data->fd = open(path, O_RDONLY);
-
-   /* Failed to open archive. */
-   if (data->fd < 0)
-      goto error;
-
-   data->size = path_get_size(path);
-   if (!data->size)
-      return data;
-
-   data->data = mmap(NULL, data->size, PROT_READ, MAP_SHARED, data->fd, 0);
-   if (data->data == MAP_FAILED)
-   {
-      data->data = NULL;
-
-      /* Failed to mmap() file */
-      goto error;
-   }
-
-   return data;
-
-error:
-   file_archive_free(data);
-   return NULL;
-}
-#else
-
-/* Closes, unmaps and frees. */
-static void file_archive_free(file_archive_file_data_t *data)
-{
-   if (!data)
-      return;
-   if(data->data)
-      free(data->data);
-   free(data);
-}
-
-static file_archive_file_data_t* file_archive_open(const char *path)
-{
-   ssize_t ret            = -1;
-   bool read_from_file    = false;
-   file_archive_file_data_t *data = (file_archive_file_data_t*)
-      calloc(1, sizeof(*data));
-
-   if (!data)
-      return NULL;
-
-   read_from_file = filestream_read_file(path, &data->data, &ret);
-
-   /* Failed to open archive? */
-   if (!read_from_file || ret < 0)
-      goto error;
-
-   data->size = ret;
-   return data;
-
-error:
-   file_archive_free(data);
-   return NULL;
-}
-#endif
-
-static int file_archive_get_file_list_cb(
-      const char *path,
-      const char *valid_exts,
-      const uint8_t *cdata,
-      unsigned cmode,
-      uint32_t csize,
-      uint32_t size,
-      uint32_t checksum,
-      struct archive_extract_userdata *userdata)
-{
-   union string_list_elem_attr attr;
-   int ret                      = 0;
-   struct string_list *ext_list = NULL;
-   size_t path_len              = strlen(path);
-
-   (void)cdata;
-   (void)cmode;
-   (void)csize;
-   (void)size;
-   (void)checksum;
-
-   attr.i = 0;
-
-   if (!path_len)
-      return 0;
-
-   if (valid_exts)
-      ext_list = string_split(valid_exts, "|");
-
-   if (ext_list)
-   {
-      const char *file_ext         = NULL;
-      /* Checks if this entry is a directory or a file. */
-      char last_char = path[path_len-1];
-
-      /* Skip if directory. */
-      if (last_char == '/' || last_char == '\\' )
-         goto error;
-
-      file_ext = path_get_extension(path);
-
-      if (!file_ext)
-         goto error;
-      
-      if (!string_list_find_elem_prefix(ext_list, ".", file_ext))
-      {
-         /* keep iterating */
-         ret = -1;
-         goto error;
-      }
-
-      attr.i = RARCH_COMPRESSED_FILE_IN_ARCHIVE;
-      string_list_free(ext_list);
-   }
-
-   return string_list_append(userdata->list, path, attr);
-
-error:
-   string_list_free(ext_list);
-   return ret;
-}
-
-static int file_archive_extract_cb(const char *name, const char *valid_exts,
-      const uint8_t *cdata,
-      unsigned cmode, uint32_t csize, uint32_t size,
-      uint32_t checksum, struct archive_extract_userdata *userdata)
-{
-   const char *ext                   = path_get_extension(name);
-
-   /* Extract first file that matches our list. */
-   if (ext && string_list_find_elem(userdata->ext, ext))
-   {
-      char new_path[PATH_MAX_LENGTH];
-      char wanted_file[PATH_MAX_LENGTH];
-      const char *delim                 = NULL;
-
-      new_path[0] = wanted_file[0]      = '\0';
-
-      if (userdata->extraction_directory)
-         fill_pathname_join(new_path, userdata->extraction_directory,
-               path_basename(name), sizeof(new_path));
-      else
-         fill_pathname_resolve_relative(new_path, userdata->archive_path,
-               path_basename(name), sizeof(new_path));
-
-      userdata->first_extracted_file_path = strdup(new_path);
-
-      delim = path_get_archive_delim(userdata->archive_path);
-
-      if (delim)
-      {
-         strlcpy(wanted_file, delim + 1, sizeof(wanted_file));
-
-         if (!string_is_equal_noncase(userdata->extracted_file_path,
-                   wanted_file))
-           return 1; /* keep searching for the right file */
-      }
-      else
-         strlcpy(wanted_file, userdata->archive_path, sizeof(wanted_file));
-
-      if (file_archive_perform_mode(new_path,
-                valid_exts, cdata, cmode, csize, size,
-                0, userdata))
-         userdata->found_file = true;
-
-      return 0;
-   }
-
-   return 1;
-}
-
-static int file_archive_parse_file_init(file_archive_transfer_t *state,
-      const char *file)
-{
-   char path[PATH_MAX_LENGTH];
-   char *last                 = NULL;
-
-   path[0] = '\0';
-
-   strlcpy(path, file, sizeof(path));
-
-   last = (char*)path_get_archive_delim(path);
-
-   if (last)
-      *last = '\0';
-
-   state->backend = file_archive_get_file_backend(path);
-   if (!state->backend)
-      return -1;
-
-   state->handle = file_archive_open(path);
-   if (!state->handle)
-      return -1;
-
-   state->archive_size = (int32_t)file_archive_size(state->handle);
-   state->data         = file_archive_data(state->handle);
-   state->footer       = 0;
-   state->directory    = 0;
-
-   return state->backend->archive_parse_file_init(state, path);
-}
-
-/**
- * file_archive_decompress_data_to_file:
- * @path                        : filename path of archive.
- * @valid_exts                  : Valid extensions of archive to be parsed.
- *                                If NULL, allow all.
- * @cdata                       : input data.
- * @csize                       : size of input data.
- * @size                        : output file size
- * @checksum                    : CRC32 checksum from input data.
- *
- * Decompress data to file.
- *
- * Returns: true (1) on success, otherwise false (0).
- **/
-static int file_archive_decompress_data_to_file(
-      file_archive_file_handle_t *handle,
-      int ret,
-      const char *path,
-      const char *valid_exts,
-      const uint8_t *cdata,
-      uint32_t csize,
-      uint32_t size,
-      uint32_t checksum)
-{
-   if (!handle || ret == -1)
-   {
-      ret = 0;
-      goto end;
-   }
-
-#if 0
-   handle->real_checksum = handle->backend->stream_crc_calculate(
-         0, handle->data, size);
-   if (handle->real_checksum != checksum)
-   {
-      /* File CRC difers from archive CRC. */
-      printf("File CRC differs from archive CRC. File: 0x%x, Archive: 0x%x.\n",
-            (unsigned)handle->real_checksum, (unsigned)checksum);
-   }
-#endif
-
-   if (!filestream_write_file(path, handle->data, size))
-   {
-      ret = false;
-      goto end;
-   }
-
-end:
-
-   if (handle)
-   {
-      if (handle->backend)
-      {
-         if (handle->backend->stream_free)
-            handle->backend->stream_free(handle->stream);
-      }
-
-      if (handle->data)
-         free(handle->data);
-   }
-
-   return ret;
-}
-
-void file_archive_parse_file_iterate_stop(file_archive_transfer_t *state)
-{
-   if (!state || !state->handle)
-      return;
-
-   state->type = ARCHIVE_TRANSFER_DEINIT;
-   file_archive_parse_file_iterate(state, NULL, NULL, NULL, NULL, NULL);
-}
-
-int file_archive_parse_file_iterate(
-      file_archive_transfer_t *state,
-      bool *returnerr,
-      const char *file,
-      const char *valid_exts,
-      file_archive_file_cb file_cb,
-      struct archive_extract_userdata *userdata)
-{
-   if (!state)
-      return -1;
-
-   switch (state->type)
-   {
-      case ARCHIVE_TRANSFER_NONE:
-         break;
-      case ARCHIVE_TRANSFER_INIT:
-         if (file_archive_parse_file_init(state, file) == 0)
-         {
-            if (userdata)
-            {
-               userdata->context = state->stream;
-               strlcpy(userdata->archive_path, file,
-                     sizeof(userdata->archive_path));
-            }
-            state->type = ARCHIVE_TRANSFER_ITERATE;
-         }
-         else
-            state->type = ARCHIVE_TRANSFER_DEINIT_ERROR;
-         break;
-      case ARCHIVE_TRANSFER_ITERATE:
-         if (file_archive_get_file_backend(file))
-         {
-            const struct file_archive_file_backend *backend =
-               file_archive_get_file_backend(file);
-            int ret                                         = 
-               backend->archive_parse_file_iterate_step(state,
-                  valid_exts, userdata, file_cb);
-
-            if (ret != 1)
-               state->type = ARCHIVE_TRANSFER_DEINIT;
-            if (ret == -1)
-               state->type = ARCHIVE_TRANSFER_DEINIT_ERROR;
-
-            /* early return to prevent deinit from never firing */
-            return 0;
-         }
-         return -1;
-      case ARCHIVE_TRANSFER_DEINIT_ERROR:
-         *returnerr = false;
-      case ARCHIVE_TRANSFER_DEINIT:
-         if (state->handle)
-         {
-            file_archive_free(state->handle);
-            state->handle = NULL;
-         }
-
-         if (state->stream && state->backend)
-         {
-            if (state->backend->stream_free)
-               state->backend->stream_free(state->stream);
-
-            if (state->stream)
-               free(state->stream);
-
-            state->stream = NULL;
-
-            if (userdata)
-               userdata->context = NULL;
-         }
-         break;
-   }
-
-   if (  state->type == ARCHIVE_TRANSFER_DEINIT ||
-         state->type == ARCHIVE_TRANSFER_DEINIT_ERROR)
-      return -1;
-
-   return 0;
-}
-
-/**
- * file_archive_walk:
- * @file                        : filename path of archive
- * @valid_exts                  : Valid extensions of archive to be parsed.
- *                                If NULL, allow all.
- * @file_cb                     : file_cb function pointer
- * @userdata                    : userdata to pass to file_cb function pointer.
- *
- * Low-level file parsing. Enumerates over all files and calls
- * file_cb with userdata.
- *
- * Returns: true (1) on success, otherwise false (0).
- **/
-static bool file_archive_walk(const char *file, const char *valid_exts,
-      file_archive_file_cb file_cb, struct archive_extract_userdata *userdata)
-{
-   file_archive_transfer_t state;
-   bool returnerr                = true;
-
-   state.type                    = ARCHIVE_TRANSFER_INIT;
-   state.archive_size            = 0;
-   state.handle                  = NULL;
-   state.stream                  = NULL;
-   state.footer                  = NULL;
-   state.directory               = NULL;
-   state.data                    = NULL;
-   state.backend                 = NULL;
-
-   for (;;)
-   {
-      if (file_archive_parse_file_iterate(&state, &returnerr, file,
-            valid_exts, file_cb, userdata) != 0)
-         break;
-   }
-
-   return returnerr;
-}
-
-int file_archive_parse_file_progress(file_archive_transfer_t *state)
-{
-   /* FIXME: this estimate is worse than before */
-   ptrdiff_t delta = 0;
-
-   if (!state || state->archive_size == 0)
-      return 0;
-
-   delta = state->directory - state->data;
-
-   return (int)(delta * 100 / state->archive_size);
-}
-
-/**
- * file_archive_extract_file:
- * @archive_path                    : filename path to archive.
- * @archive_path_size               : size of archive.
- * @valid_exts                  : valid extensions for the file.
- * @extraction_directory        : the directory to extract temporary
- *                                file to.
- *
- * Extract file from archive. If no file inside the archive is
- * specified, the first file found will be used.
- *
- * Returns : true (1) on success, otherwise false (0).
- **/
-bool file_archive_extract_file(
-      char *archive_path,
-      size_t archive_path_size,
-      const char *valid_exts,
-      const char *extraction_directory,
-      char *out_path, size_t len)
-{
-   struct archive_extract_userdata userdata;
-   bool ret                                 = true;
-   struct string_list *list                 = string_split(valid_exts, "|");
-
-   userdata.archive_path[0]                 = '\0';
-   userdata.first_extracted_file_path       = NULL;
-   userdata.extracted_file_path             = NULL;
-   userdata.extraction_directory            = extraction_directory;
-   userdata.archive_path_size               = archive_path_size;
-   userdata.ext                             = list;
-   userdata.list                            = NULL;
-   userdata.found_file                      = false;
-   userdata.list_only                       = false;
-   userdata.context                         = NULL;
-   userdata.archive_name[0]                 = '\0';
-   userdata.crc                             = 0;
-   userdata.dec                             = NULL;
-
-   userdata.decomp_state.opt_file           = NULL;
-   userdata.decomp_state.needle             = NULL;
-   userdata.decomp_state.size               = 0;
-   userdata.decomp_state.found              = NULL;
-
-   if (!list)
-   {
-      ret = false;
-      goto end;
-   }
-
-   if (!file_archive_walk(archive_path, valid_exts,
-            file_archive_extract_cb, &userdata))
-   {
-      /* Parsing file archive failed. */
-      ret = false;
-      goto end;
-   }
-
-   if (!userdata.found_file)
-   {
-      /* Didn't find any file that matched valid extensions
-       * for libretro implementation. */
-      ret = false;
-      goto end;
-   }
-
-   if (!string_is_empty(userdata.first_extracted_file_path))
-      strlcpy(out_path, userdata.first_extracted_file_path, len);
-
-end:
-   if (userdata.first_extracted_file_path)
-      free(userdata.first_extracted_file_path);
-   if (list)
-      string_list_free(list);
-   return ret;
-}
-
-/**
- * file_archive_get_file_list:
- * @path                        : filename path of archive
- *
- * Returns: string listing of files from archive on success, otherwise NULL.
- **/
-struct string_list *file_archive_get_file_list(const char *path,
-      const char *valid_exts)
-{
-   int ret;
-   struct archive_extract_userdata userdata;
-
-   strlcpy(userdata.archive_path, path, sizeof(userdata.archive_path));
-   userdata.first_extracted_file_path       = NULL;
-   userdata.extracted_file_path             = NULL;
-   userdata.extraction_directory            = NULL;
-   userdata.archive_path_size               = 0;
-   userdata.ext                             = NULL;
-   userdata.list                            = string_list_new();
-   userdata.found_file                      = false;
-   userdata.list_only                       = true;
-   userdata.context                         = NULL;
-   userdata.archive_name[0]                 = '\0';
-   userdata.crc                             = 0;
-   userdata.dec                             = NULL;
-
-   userdata.decomp_state.opt_file           = NULL;
-   userdata.decomp_state.needle             = NULL;
-   userdata.decomp_state.size               = 0;
-   userdata.decomp_state.found              = NULL;
-
-   if (!userdata.list)
-      goto error;
-
-   ret = file_archive_walk(path, valid_exts,
-         file_archive_get_file_list_cb, &userdata);
-
-   if (ret <= 0)
-   {
-      if (ret != -1)
-         goto error;
-   }
-
-   return userdata.list;
-
-error:
-   if (userdata.list)
-      string_list_free(userdata.list);
-   return NULL;
-}
-
-bool file_archive_perform_mode(const char *path, const char *valid_exts,
-      const uint8_t *cdata, unsigned cmode, uint32_t csize, uint32_t size,
-      uint32_t crc32, struct archive_extract_userdata *userdata)
-{
-   switch (cmode)
-   {
-      case ARCHIVE_MODE_UNCOMPRESSED:
-         if (!filestream_write_file(path, cdata, size))
-            goto error;
-         break;
-
-      case ARCHIVE_MODE_COMPRESSED:
-         {
-            int ret = 0;
-            file_archive_file_handle_t handle;
-
-            handle.stream        = userdata->context;
-            handle.data          = NULL;
-            handle.real_checksum = 0;
-            handle.backend       = file_archive_get_file_backend(userdata->archive_path);
-
-            if (!handle.backend)
-               goto error;
-
-            if (!handle.backend->stream_decompress_data_to_file_init(&handle,
-                     cdata, csize, size))
-               goto error;
-
-            do
-            {
-               ret = handle.backend->stream_decompress_data_to_file_iterate(
-                     handle.stream);
-            }while(ret == 0);
-
-            if (!file_archive_decompress_data_to_file(&handle,
-                     ret, path, valid_exts,
-                     cdata, csize, size, crc32))
-               goto error;
-         }
-         break;
-      default:
-         goto error;
-   }
-
-   return true;
-
-error:
-   return false;
-}
-
-/**
- * file_archive_filename_split:
- * @str              : filename to turn into a string list
- *
- * Creates a new string list based on filename @path, delimited by a hash (#).
- *
- * Returns: new string list if successful, otherwise NULL.
- */
-static struct string_list *file_archive_filename_split(const char *path)
-{
-   union string_list_elem_attr attr;
-   struct string_list *list = string_list_new();
-   const char *delim        = path_get_archive_delim(path);
-
-   attr.i = 0;
-
-   if (delim)
-   {
-      /* add archive path to list first */
-      if (!string_list_append_n(list, path, (unsigned)(delim - path), attr))
-         goto error;
-
-      /* now add the path within the archive */
-      delim++;
-
-      if (*delim)
-      {
-         if (!string_list_append(list, delim, attr))
-            goto error;
-      }
-   }
-   else
-      if (!string_list_append(list, path, attr))
-         goto error;
-
-   return list;
-
-error:
-   string_list_free(list);
-   return NULL;
-}
-
-/* Generic compressed file loader.
- * Extracts to buf, unless optional_filename != 0
- * Then extracts to optional_filename and leaves buf alone.
- */
-int file_archive_compressed_read(
-      const char * path, void **buf,
-      const char* optional_filename, ssize_t *length)
-{
-   const struct file_archive_file_backend *backend = NULL;
-   int ret                            = 0;
-   struct string_list *str_list       = file_archive_filename_split(path);
-
-   /* Safety check.
-    * If optional_filename and optional_filename
-    * exists, we simply return 0,
-    * hoping that optional_filename is the
-    * same as requested.
-    */
-   if (optional_filename && path_file_exists(optional_filename))
-   {
-      *length = 0;
-      string_list_free(str_list);
-      return 1;
-   }
-
-   /* We assure that there is something after the '#' symbol.
-    *
-    * This error condition happens for example, when
-    * path = /path/to/file.7z, or
-    * path = /path/to/file.7z#
-    */
-   if (str_list->size <= 1)
-      goto error;
-
-   backend = file_archive_get_file_backend(str_list->elems[0].data);
-
-   *length = backend->compressed_file_read(str_list->elems[0].data,
-         str_list->elems[1].data, buf, optional_filename);
-
-   if (*length != -1)
-      ret = 1;
-
-   string_list_free(str_list);
-   return ret;
-
-error:
-   /* could not extract string and substring. */
-   string_list_free(str_list);
-   *length = 0;
-   return 0;
-}
-
-const struct file_archive_file_backend *file_archive_get_zlib_file_backend(void)
-{
-#ifdef HAVE_ZLIB
-   return &zlib_backend;
-#else
-   return NULL;
-#endif
-}
-
-const struct file_archive_file_backend *file_archive_get_7z_file_backend(void)
-{
-#ifdef HAVE_7ZIP
-   return &sevenzip_backend;
-#else
-   return NULL;
-#endif
-}
-
-const struct file_archive_file_backend* file_archive_get_file_backend(const char *path)
-{
-   char newpath[PATH_MAX_LENGTH];
-   const char *file_ext          = NULL;
-   char *last                    = NULL;
-
-   newpath[0] = '\0';
-
-   strlcpy(newpath, path, sizeof(newpath));
-
-   last = (char*)path_get_archive_delim(newpath);
-
-   if (last)
-      *last = '\0';
-
-   file_ext = path_get_extension(newpath);
-
-#ifdef HAVE_7ZIP
-   if (string_is_equal_noncase(file_ext, "7z"))
-      return &sevenzip_backend;
-#endif
-
-#ifdef HAVE_ZLIB
-   if (     string_is_equal_noncase(file_ext, "zip")
-         || string_is_equal_noncase(file_ext, "apk")
-      )
-      return &zlib_backend;
-#endif
-
-   return NULL;
-}
-
-/**
- * file_archive_get_file_crc32:
- * @path                         : filename path of archive
- *
- * Returns: CRC32 of the specified file in the archive, otherwise 0.
- * If no path within the archive is specified, the first
- * file found inside is used.
- **/
-uint32_t file_archive_get_file_crc32(const char *path)
-{
-   file_archive_transfer_t state;
-   const struct file_archive_file_backend *backend = file_archive_get_file_backend(path);
-   struct archive_extract_userdata userdata        = {{0}};
-   bool returnerr                                  = false;
-   bool contains_compressed                        = false;
-   const char *archive_path                        = NULL;
-
-   if (!backend)
-      return 0;
-
-   contains_compressed = path_contains_compressed_file(path);
-
-   if (contains_compressed)
-   {
-      archive_path = path_get_archive_delim(path);
-
-      /* move pointer right after the delimiter to give us the path */
-      if (archive_path)
-         archive_path += 1;
-   }
-
-   state.type          = ARCHIVE_TRANSFER_INIT;
-   state.archive_size  = 0;
-   state.handle        = NULL;
-   state.stream        = NULL;
-   state.footer        = NULL;
-   state.directory     = NULL;
-   state.data          = NULL;
-   state.backend       = NULL;
-
-   /* Initialize and open archive first.
-      Sets next state type to ITERATE. */
-   file_archive_parse_file_iterate(&state,
-            &returnerr, path, NULL, NULL,
-            &userdata);
-
-   for (;;)
-   {
-      /* Now find the first file in the archive. */
-      if (state.type == ARCHIVE_TRANSFER_ITERATE)
-         file_archive_parse_file_iterate(&state,
-                  &returnerr, path, NULL, NULL,
-                  &userdata);
-
-      /* If no path specified within archive, stop after
-       * finding the first file.
-       */
-      if (!contains_compressed)
-         break;
-
-      /* Stop when the right file in the archive is found. */
-      if (archive_path)
-      {
-         if (string_is_equal(userdata.extracted_file_path, archive_path))
-            break;
-      }
-      else
-         break;
-   }
-
-   file_archive_parse_file_iterate_stop(&state);
-
-   if (userdata.crc)
-      return userdata.crc;
-
-   return 0;
-}
diff --git a/libretro-common/file/archive_file_7z.c b/libretro-common/file/archive_file_7z.c
deleted file mode 100644
index 99f3e66..0000000
--- a/libretro-common/file/archive_file_7z.c
+++ /dev/null
@@ -1,471 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (archive_file_sevenzip.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-
-#include <file/archive_file.h>
-#include <streams/file_stream.h>
-#include <retro_miscellaneous.h>
-#include <encodings/utf.h>
-#include <encodings/crc32.h>
-#include <string/stdstring.h>
-#include <lists/string_list.h>
-#include <file/file_path.h>
-#include <compat/strl.h>
-#include "../../deps/7zip/7z.h"
-#include "../../deps/7zip/7zCrc.h"
-#include "../../deps/7zip/7zFile.h"
-
-#define SEVENZIP_MAGIC "7z\xBC\xAF\x27\x1C"
-#define SEVENZIP_MAGIC_LEN 6
-
-struct sevenzip_context_t {
-   CFileInStream archiveStream;
-   CLookToRead lookStream;
-   ISzAlloc allocImp;
-   ISzAlloc allocTempImp;
-   CSzArEx db;
-   size_t temp_size;
-   uint32_t block_index;
-   uint32_t index;
-   uint32_t packIndex;
-   uint8_t *output;
-   file_archive_file_handle_t *handle;
-};
-
-static void *sevenzip_stream_alloc_impl(void *p, size_t size)
-{
-   if (size == 0)
-      return 0;
-   return malloc(size);
-}
-
-static void sevenzip_stream_free_impl(void *p, void *address)
-{
-   (void)p;
-   free(address);
-}
-
-static void *sevenzip_stream_alloc_tmp_impl(void *p, size_t size)
-{
-   (void)p;
-   if (size == 0)
-      return 0;
-   return malloc(size);
-}
-
-static void* sevenzip_stream_new(void)
-{
-   struct sevenzip_context_t *sevenzip_context =
-         (struct sevenzip_context_t*)calloc(1, sizeof(struct sevenzip_context_t));
-
-   /* These are the allocation routines - currently using
-    * the non-standard 7zip choices. */
-   sevenzip_context->allocImp.Alloc     = sevenzip_stream_alloc_impl;
-   sevenzip_context->allocImp.Free      = sevenzip_stream_free_impl;
-   sevenzip_context->allocTempImp.Alloc = sevenzip_stream_alloc_tmp_impl;
-   sevenzip_context->allocTempImp.Free  = sevenzip_stream_free_impl;
-   sevenzip_context->block_index        = 0xFFFFFFFF;
-   sevenzip_context->output             = NULL;
-   sevenzip_context->handle             = NULL;
-
-   return sevenzip_context;
-}
-
-static void sevenzip_stream_free(void *data)
-{
-   struct sevenzip_context_t *sevenzip_context = (struct sevenzip_context_t*)data;
-
-   if (!sevenzip_context)
-      return;
-
-   if (sevenzip_context->output)
-   {
-      IAlloc_Free(&sevenzip_context->allocImp, sevenzip_context->output);
-      sevenzip_context->output       = NULL;
-      sevenzip_context->handle->data = NULL;
-   }
-
-   SzArEx_Free(&sevenzip_context->db, &sevenzip_context->allocImp);
-   File_Close(&sevenzip_context->archiveStream.file);
-}
-
-/* Extract the relative path (needle) from a 7z archive
- * (path) and allocate a buf for it to write it in.
- * If optional_outfile is set, extract to that instead
- * and don't allocate buffer.
- */
-static int sevenzip_file_read(
-      const char *path,
-      const char *needle, void **buf,
-      const char *optional_outfile)
-{
-   CFileInStream archiveStream;
-   CLookToRead lookStream;
-   ISzAlloc allocImp;
-   ISzAlloc allocTempImp;
-   CSzArEx db;
-   uint8_t *output      = 0;
-   long outsize         = -1;
-
-   /*These are the allocation routines.
-    * Currently using the non-standard 7zip choices. */
-   allocImp.Alloc       = sevenzip_stream_alloc_impl;
-   allocImp.Free        = sevenzip_stream_free_impl;
-   allocTempImp.Alloc   = sevenzip_stream_alloc_tmp_impl;
-   allocTempImp.Free    = sevenzip_stream_free_impl;
-
-   /* Could not open 7zip archive? */
-   if (InFile_Open(&archiveStream.file, path))
-      return -1;
-
-   FileInStream_CreateVTable(&archiveStream);
-   LookToRead_CreateVTable(&lookStream, False);
-   lookStream.realStream = &archiveStream.s;
-   LookToRead_Init(&lookStream);
-   CrcGenerateTable();
-
-   db.db.PackSizes               = NULL;
-   db.db.PackCRCsDefined         = NULL;
-   db.db.PackCRCs                = NULL;
-   db.db.Folders                 = NULL;
-   db.db.Files                   = NULL;
-   db.db.NumPackStreams          = 0;
-   db.db.NumFolders              = 0;
-   db.db.NumFiles                = 0;
-   db.startPosAfterHeader        = 0;
-   db.dataPos                    = 0;
-   db.FolderStartPackStreamIndex = NULL;
-   db.PackStreamStartPositions   = NULL;
-   db.FolderStartFileIndex       = NULL;
-   db.FileIndexToFolderIndexMap  = NULL;
-   db.FileNameOffsets            = NULL;
-   db.FileNames.data             = NULL;
-   db.FileNames.size             = 0;
-
-   SzArEx_Init(&db);
-
-   if (SzArEx_Open(&db, &lookStream.s, &allocImp, &allocTempImp) == SZ_OK)
-   {
-      uint32_t i;
-      bool file_found      = false;
-      uint16_t *temp       = NULL;
-      size_t temp_size     = 0;
-      uint32_t block_index = 0xFFFFFFFF;
-      SRes res             = SZ_OK;
-
-      for (i = 0; i < db.db.NumFiles; i++)
-      {
-         size_t len;
-         char infile[PATH_MAX_LENGTH];
-         size_t offset                = 0;
-         size_t outSizeProcessed      = 0;
-         const CSzFileItem    *f      = db.db.Files + i;
-
-         /* We skip over everything which is not a directory.
-          * FIXME: Why continue then if f->IsDir is true?*/
-         if (f->IsDir)
-            continue;
-
-         len = SzArEx_GetFileNameUtf16(&db, i, NULL);
-
-         if (len > temp_size)
-         {
-            if (temp)
-               free(temp);
-            temp_size = len;
-            temp = (uint16_t *)malloc(temp_size * sizeof(temp[0]));
-
-            if (temp == 0)
-            {
-               res = SZ_ERROR_MEM;
-               break;
-            }
-         }
-
-         SzArEx_GetFileNameUtf16(&db, i, temp);
-         res       = SZ_ERROR_FAIL;
-         infile[0] = '\0';
-
-         if (temp)
-            res = utf16_to_char_string(temp, infile, sizeof(infile))
-               ? SZ_OK : SZ_ERROR_FAIL;
-
-         if (string_is_equal(infile, needle))
-         {
-            size_t output_size   = 0;
-
-            /*RARCH_LOG_OUTPUT("Opened archive %s. Now trying to extract %s\n",
-                  path, needle);*/
-
-            /* C LZMA SDK does not support chunked extraction - see here:
-             * sourceforge.net/p/sevenzip/discussion/45798/thread/6fb59aaf/
-             * */
-            file_found = true;
-            res = SzArEx_Extract(&db, &lookStream.s, i, &block_index,
-                  &output, &output_size, &offset, &outSizeProcessed,
-                  &allocImp, &allocTempImp);
-
-            if (res != SZ_OK)
-               break; /* This goes to the error section. */
-
-            outsize = outSizeProcessed;
-
-            if (optional_outfile != NULL)
-            {
-               const void *ptr = (const void*)(output + offset);
-
-               if (!filestream_write_file(optional_outfile, ptr, outsize))
-               {
-                  /*RARCH_ERR("Could not open outfilepath %s.\n",
-                        optional_outfile);*/
-                  res        = SZ_OK;
-                  file_found = true;
-                  outsize    = -1;
-               }
-            }
-            else
-            {
-               /*We could either use the 7Zip allocated buffer,
-                * or create our own and use it.
-                * We would however need to realloc anyways, because RetroArch
-                * expects a \0 at the end, therefore we allocate new,
-                * copy and free the old one. */
-               *buf = malloc(outsize + 1);
-               ((char*)(*buf))[outsize] = '\0';
-               memcpy(*buf,output + offset,outsize);
-            }
-            break;
-         }
-      }
-
-      if (temp)
-         free(temp);
-      IAlloc_Free(&allocImp, output);
-
-      if (!(file_found && res == SZ_OK))
-      {
-         /* Error handling
-          *
-          * Failed to open compressed file inside 7zip archive.
-          */
-
-         outsize    = -1;
-      }
-   }
-
-   SzArEx_Free(&db, &allocImp);
-   File_Close(&archiveStream.file);
-
-   return (int)outsize;
-}
-
-static bool sevenzip_stream_decompress_data_to_file_init(
-      file_archive_file_handle_t *handle,
-      const uint8_t *cdata,  uint32_t csize, uint32_t size)
-{
-   struct sevenzip_context_t *sevenzip_context =
-         (struct sevenzip_context_t*)handle->stream;
-
-   if (!sevenzip_context)
-      return false;
-
-   sevenzip_context->handle = handle;
-
-   return true;
-}
-
-static int sevenzip_stream_decompress_data_to_file_iterate(void *data)
-{
-   struct sevenzip_context_t *sevenzip_context =
-         (struct sevenzip_context_t*)data;
-
-   SRes res                = SZ_ERROR_FAIL;
-   size_t output_size      = 0;
-   size_t offset           = 0;
-   size_t outSizeProcessed = 0;
-
-   res = SzArEx_Extract(&sevenzip_context->db,
-         &sevenzip_context->lookStream.s, sevenzip_context->index,
-         &sevenzip_context->block_index, &sevenzip_context->output,
-         &output_size, &offset, &outSizeProcessed,
-         &sevenzip_context->allocImp, &sevenzip_context->allocTempImp);
-
-   if (res != SZ_OK)
-      return 0;
-
-   if (sevenzip_context->handle)
-      sevenzip_context->handle->data = sevenzip_context->output + offset;
-
-   return 1;
-}
-
-static int sevenzip_parse_file_init(file_archive_transfer_t *state,
-      const char *file)
-{
-   struct sevenzip_context_t *sevenzip_context =
-         (struct sevenzip_context_t*)sevenzip_stream_new();
-
-   if (state->archive_size < SEVENZIP_MAGIC_LEN)
-      goto error;
-
-   if (string_is_not_equal_fast(state->data, SEVENZIP_MAGIC, SEVENZIP_MAGIC_LEN))
-      goto error;
-
-   state->stream = sevenzip_context;
-
-   /* could not open 7zip archive? */
-   if (InFile_Open(&sevenzip_context->archiveStream.file, file))
-      goto error;
-
-   FileInStream_CreateVTable(&sevenzip_context->archiveStream);
-   LookToRead_CreateVTable(&sevenzip_context->lookStream, False);
-   sevenzip_context->lookStream.realStream = &sevenzip_context->archiveStream.s;
-   LookToRead_Init(&sevenzip_context->lookStream);
-   CrcGenerateTable();
-   SzArEx_Init(&sevenzip_context->db);
-
-   if (SzArEx_Open(&sevenzip_context->db, &sevenzip_context->lookStream.s,
-         &sevenzip_context->allocImp, &sevenzip_context->allocTempImp) != SZ_OK)
-      goto error;
-
-   return 0;
-
-error:
-   if (sevenzip_context)
-      sevenzip_stream_free(sevenzip_context);
-   return -1;
-}
-
-static int sevenzip_parse_file_iterate_step_internal(
-      file_archive_transfer_t *state, char *filename,
-      const uint8_t **cdata, unsigned *cmode,
-      uint32_t *size, uint32_t *csize, uint32_t *checksum,
-      unsigned *payback, struct archive_extract_userdata *userdata)
-{
-   struct sevenzip_context_t *sevenzip_context = (struct sevenzip_context_t*)state->stream;
-   const CSzFileItem *file = sevenzip_context->db.db.Files + sevenzip_context->index;
-
-   if (sevenzip_context->index < sevenzip_context->db.db.NumFiles)
-   {
-      size_t len = SzArEx_GetFileNameUtf16(&sevenzip_context->db,
-            sevenzip_context->index, NULL);
-      uint64_t compressed_size = 0;
-
-      if (sevenzip_context->packIndex < sevenzip_context->db.db.NumPackStreams)
-      {
-         compressed_size = sevenzip_context->db.db.PackSizes[sevenzip_context->packIndex];
-         sevenzip_context->packIndex++;
-      }
-
-      if (len < PATH_MAX_LENGTH && !file->IsDir)
-      {
-         char infile[PATH_MAX_LENGTH];
-         SRes res                     = SZ_ERROR_FAIL;
-         uint16_t *temp               = (uint16_t*)malloc(len * sizeof(uint16_t));
-
-         if (!temp)
-            return -1;
-
-         infile[0] = '\0';
-
-         SzArEx_GetFileNameUtf16(&sevenzip_context->db, sevenzip_context->index,
-               temp);
-
-         if (temp)
-         {
-            res  = utf16_to_char_string(temp, infile, sizeof(infile))
-               ? SZ_OK : SZ_ERROR_FAIL;
-            free(temp);
-         }
-
-         if (res != SZ_OK)
-            return -1;
-
-         strlcpy(filename, infile, PATH_MAX_LENGTH);
-
-         *cmode    = ARCHIVE_MODE_COMPRESSED;
-         *checksum = file->Crc;
-         *size     = (uint32_t)file->Size;
-         *csize    = (uint32_t)compressed_size;
-      }
-   }
-
-   *payback = 1;
-
-   return 1;
-}
-
-static int sevenzip_parse_file_iterate_step(file_archive_transfer_t *state,
-      const char *valid_exts,
-      struct archive_extract_userdata *userdata, file_archive_file_cb file_cb)
-{
-   char filename[PATH_MAX_LENGTH];
-   const uint8_t *cdata = NULL;
-   uint32_t checksum    = 0;
-   uint32_t size        = 0;
-   uint32_t csize       = 0;
-   unsigned cmode       = 0;
-   unsigned payload     = 0;
-   struct sevenzip_context_t *sevenzip_context = NULL;
-   int ret;
-
-   filename[0]                   = '\0';
-
-   ret = sevenzip_parse_file_iterate_step_internal(state, filename,
-         &cdata, &cmode, &size, &csize,
-         &checksum, &payload, userdata);
-
-   if (ret != 1)
-      return ret;
-
-   userdata->extracted_file_path = filename;
-   userdata->crc                 = checksum;
-
-   if (file_cb && !file_cb(filename, valid_exts, cdata, cmode,
-            csize, size, checksum, userdata))
-      return 0;
-
-   sevenzip_context = (struct sevenzip_context_t*)state->stream;
-
-   sevenzip_context->index += payload;
-
-   return 1;
-}
-
-static uint32_t sevenzip_stream_crc32_calculate(uint32_t crc,
-      const uint8_t *data, size_t length)
-{
-   return encoding_crc32(crc, data, length);
-}
-
-const struct file_archive_file_backend sevenzip_backend = {
-   sevenzip_stream_new,
-   sevenzip_stream_free,
-   sevenzip_stream_decompress_data_to_file_init,
-   sevenzip_stream_decompress_data_to_file_iterate,
-   sevenzip_stream_crc32_calculate,
-   sevenzip_file_read,
-   sevenzip_parse_file_init,
-   sevenzip_parse_file_iterate_step,
-   "7z"
-};
diff --git a/libretro-common/file/archive_file_zlib.c b/libretro-common/file/archive_file_zlib.c
deleted file mode 100644
index 2ccb2ef..0000000
--- a/libretro-common/file/archive_file_zlib.c
+++ /dev/null
@@ -1,378 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (archive_file_zlib.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-
-#include <file/archive_file.h>
-#include <streams/file_stream.h>
-#include <streams/trans_stream.h>
-#include <string.h>
-#include <retro_miscellaneous.h>
-#include <encodings/crc32.h>
-
-/* Only for MAX_WBITS */
-#include <compat/zlib.h>
-
-#ifndef CENTRAL_FILE_HEADER_SIGNATURE
-#define CENTRAL_FILE_HEADER_SIGNATURE 0x02014b50
-#endif
-
-#ifndef END_OF_CENTRAL_DIR_SIGNATURE
-#define END_OF_CENTRAL_DIR_SIGNATURE 0x06054b50
-#endif
-
-static void *zlib_stream_new(void)
-{
-   return zlib_inflate_backend.stream_new();
-}
-
-static void zlib_stream_free(void *stream)
-{
-   zlib_inflate_backend.stream_free(stream);
-}
-
-static bool zlib_stream_decompress_data_to_file_init(
-      file_archive_file_handle_t *handle,
-      const uint8_t *cdata,  uint32_t csize, uint32_t size)
-{
-   if (!handle)
-      return false;
-
-   handle->stream = zlib_inflate_backend.stream_new();
-
-   if (!handle->stream)
-      goto error;
-
-   if (zlib_inflate_backend.define)
-      zlib_inflate_backend.define(handle->stream, "window_bits", (uint32_t)-MAX_WBITS);
-
-   handle->data = (uint8_t*)malloc(size);
-
-   if (!handle->data)
-      goto error;
-
-   zlib_inflate_backend.set_in(handle->stream, 
-         (const uint8_t*)cdata, csize);
-   zlib_inflate_backend.set_out(handle->stream,
-         handle->data, size);
-
-   return true;
-
-error:
-   if (handle->stream)
-      zlib_inflate_backend.stream_free(handle->stream);
-   if (handle->data)
-      free(handle->data);
-
-   return false;
-}
-
-static int zlib_stream_decompress_data_to_file_iterate(void *stream)
-{
-   bool zstatus;
-   uint32_t rd, wn;
-   enum trans_stream_error terror;
-
-   if (!stream)
-      return -1;
-
-   zstatus = zlib_inflate_backend.trans(stream, false, &rd, &wn, &terror);
-
-   if (!zstatus && terror != TRANS_STREAM_ERROR_BUFFER_FULL)
-      return -1;
-
-   if (zstatus && !terror)
-      return 1;
-
-   return 0;
-}
-
-static uint32_t zlib_stream_crc32_calculate(uint32_t crc,
-      const uint8_t *data, size_t length)
-{
-   return encoding_crc32(crc, data, length);
-}
-
-static bool zip_file_decompressed_handle(
-      file_archive_file_handle_t *handle,
-      const uint8_t *cdata, uint32_t csize,
-      uint32_t size, uint32_t crc32)
-{
-   int ret   = 0;
-
-   handle->backend = &zlib_backend;
-
-   if (!handle->backend->stream_decompress_data_to_file_init(
-            handle, cdata, csize, size))
-      return false;
-
-   do
-   {
-      ret = handle->backend->stream_decompress_data_to_file_iterate(
-            handle->stream);
-   }while(ret == 0);
-
-#if 0
-   handle->real_checksum = handle->backend->stream_crc_calculate(0,
-         handle->data, size);
-
-   if (handle->real_checksum != crc32)
-      goto error;
-#endif
-
-   if (handle->stream)
-      free(handle->stream);
-
-   return true;
-#if 0
-error:
-   if (handle->stream)
-      free(handle->stream);
-   if (handle->data)
-      free(handle->data);
-
-   handle->stream = NULL;
-   handle->data   = NULL;
-   return false;
-#endif
-}
-
-/* Extract the relative path (needle) from a
- * ZIP archive (path) and allocate a buffer for it to write it in.
- *
- * optional_outfile if not NULL will be used to extract the file to.
- * buf will be 0 then.
- */
-
-static int zip_file_decompressed(
-      const char *name, const char *valid_exts,
-      const uint8_t *cdata, unsigned cmode,
-      uint32_t csize, uint32_t size,
-      uint32_t crc32, struct archive_extract_userdata *userdata)
-{
-   /* Ignore directories. */
-   if (name[strlen(name) - 1] == '/' || name[strlen(name) - 1] == '\\')
-      return 1;
-
-#if 0
-   RARCH_LOG("[deflate] Path: %s, CRC32: 0x%x\n", name, crc32);
-#endif
-
-   if (strstr(name, userdata->decomp_state.needle))
-   {
-      bool goto_error = false;
-      file_archive_file_handle_t handle = {0};
-
-      userdata->decomp_state.found = true;
-
-      if (zip_file_decompressed_handle(&handle,
-               cdata, csize, size, crc32))
-      {
-         if (userdata->decomp_state.opt_file != 0)
-         {
-            /* Called in case core has need_fullpath enabled. */
-            char *buf       = (char*)malloc(size);
-
-            if (buf)
-            {
-               /*RARCH_LOG("%s: %s\n",
-                     msg_hash_to_str(MSG_EXTRACTING_FILE),
-                     userdata->decomp_state.opt_file);*/
-               memcpy(buf, handle.data, size);
-
-               if (!filestream_write_file(userdata->decomp_state.opt_file, buf, size))
-                  goto_error = true;
-            }
-
-            free(buf);
-
-            userdata->decomp_state.size = 0;
-         }
-         else
-         {
-            /* Called in case core has need_fullpath disabled.
-             * Will copy decompressed content directly into
-             * RetroArch's ROM buffer. */
-            *userdata->decomp_state.buf = malloc(size);
-            memcpy(*userdata->decomp_state.buf, handle.data, size);
-
-            userdata->decomp_state.size = size;
-         }
-      }
-
-      if (handle.data)
-         free(handle.data);
-
-      if (goto_error)
-         return 0;
-   }
-
-   return 1;
-}
-
-static int zip_file_read(
-      const char *path,
-      const char *needle, void **buf,
-      const char *optional_outfile)
-{
-   file_archive_transfer_t zlib;
-   struct archive_extract_userdata userdata = {{0}};
-   bool returnerr                    = true;
-   int ret                           = 0;
-
-   zlib.type                         = ARCHIVE_TRANSFER_INIT;
-
-   userdata.decomp_state.needle      = NULL;
-   userdata.decomp_state.opt_file    = NULL;
-   userdata.decomp_state.found       = false;
-   userdata.decomp_state.buf         = buf;
-
-   if (needle)
-      userdata.decomp_state.needle   = strdup(needle);
-   if (optional_outfile)
-      userdata.decomp_state.opt_file = strdup(optional_outfile);
-
-   do
-   {
-      ret = file_archive_parse_file_iterate(&zlib, &returnerr, path,
-            "", zip_file_decompressed, &userdata);
-      if (!returnerr)
-         break;
-   }while(ret == 0 && !userdata.decomp_state.found);
-
-   file_archive_parse_file_iterate_stop(&zlib);
-
-   if (userdata.decomp_state.opt_file)
-      free(userdata.decomp_state.opt_file);
-   if (userdata.decomp_state.needle)
-      free(userdata.decomp_state.needle);
-
-   if (!userdata.decomp_state.found)
-      return -1;
-
-   return (int)userdata.decomp_state.size;
-}
-
-static int zip_parse_file_init(file_archive_transfer_t *state,
-      const char *file)
-{
-   if (state->archive_size < 22)
-      return -1;
-
-   state->footer = state->data + state->archive_size - 22;
-
-   for (;; state->footer--)
-   {
-      if (state->footer <= state->data + 22)
-         return -1;
-      if (read_le(state->footer, 4) == END_OF_CENTRAL_DIR_SIGNATURE)
-      {
-         unsigned comment_len = read_le(state->footer + 20, 2);
-         if (state->footer + 22 + comment_len == state->data + state->archive_size)
-            break;
-      }
-   }
-
-   state->directory = state->data + read_le(state->footer + 16, 4);
-
-   return 0;
-}
-
-static int zip_parse_file_iterate_step_internal(
-      file_archive_transfer_t *state, char *filename,
-      const uint8_t **cdata,
-      unsigned *cmode, uint32_t *size, uint32_t *csize,
-      uint32_t *checksum, unsigned *payback)
-{
-   uint32_t offset;
-   uint32_t namelength, extralength, commentlength,
-            offsetNL, offsetEL;
-   uint32_t signature = read_le(state->directory + 0, 4);
-
-   if (signature != CENTRAL_FILE_HEADER_SIGNATURE)
-      return 0;
-
-   *cmode         = read_le(state->directory + 10, 2); /* compression mode, 0 = store, 8 = deflate */
-   *checksum      = read_le(state->directory + 16, 4); /* CRC32 */
-   *csize         = read_le(state->directory + 20, 4); /* compressed size */
-   *size          = read_le(state->directory + 24, 4); /* uncompressed size */
-
-   namelength     = read_le(state->directory + 28, 2); /* file name length */
-   extralength    = read_le(state->directory + 30, 2); /* extra field length */
-   commentlength  = read_le(state->directory + 32, 2); /* file comment length */
-
-   if (namelength >= PATH_MAX_LENGTH)
-      return -1;
-
-   memcpy(filename, state->directory + 46, namelength); /* file name */
-
-   offset         = read_le(state->directory + 42, 4); /* relative offset of local file header */
-   offsetNL       = read_le(state->data + offset + 26, 2); /* file name length */
-   offsetEL       = read_le(state->data + offset + 28, 2); /* extra field length */
-
-   *cdata         = state->data + offset + 30 + offsetNL + offsetEL;
-
-   *payback       = 46 + namelength + extralength + commentlength;
-
-   return 1;
-}
-
-static int zip_parse_file_iterate_step(file_archive_transfer_t *state,
-      const char *valid_exts, struct archive_extract_userdata *userdata,
-      file_archive_file_cb file_cb)
-{
-   char filename[PATH_MAX_LENGTH] = {0};
-   const uint8_t *cdata           = NULL;
-   uint32_t checksum              = 0;
-   uint32_t size                  = 0;
-   uint32_t csize                 = 0;
-   unsigned cmode                 = 0;
-   unsigned payload               = 0;
-   int ret                        = zip_parse_file_iterate_step_internal(
-         state, filename, &cdata, &cmode, &size, &csize, &checksum, &payload);
-
-   if (ret != 1)
-      return ret;
-
-   userdata->extracted_file_path = filename;
-   userdata->crc = checksum;
-
-   if (file_cb && !file_cb(filename, valid_exts, cdata, cmode,
-            csize, size, checksum, userdata))
-      return 0;
-
-   state->directory += payload;
-
-   return 1;
-}
-
-const struct file_archive_file_backend zlib_backend = {
-   zlib_stream_new,
-   zlib_stream_free,
-   zlib_stream_decompress_data_to_file_init,
-   zlib_stream_decompress_data_to_file_iterate,
-   zlib_stream_crc32_calculate,
-   zip_file_read,
-   zip_parse_file_init,
-   zip_parse_file_iterate_step,
-   "zlib"
-};
diff --git a/libretro-common/file/config_file.c b/libretro-common/file/config_file.c
deleted file mode 100644
index db5c87c..0000000
--- a/libretro-common/file/config_file.c
+++ /dev/null
@@ -1,978 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (config_file.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
-
-#if !defined(_WIN32) && !defined(__CELLOS_LV2__) && !defined(_XBOX)
-#include <sys/param.h> /* PATH_MAX */
-#elif defined(_WIN32) && !defined(_XBOX)
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#elif defined(_XBOX)
-#include <xtl.h>
-#endif
-
-#include <retro_miscellaneous.h>
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-#include <compat/msvc.h>
-#include <file/config_file.h>
-#include <file/file_path.h>
-#include <lists/string_list.h>
-#include <string/stdstring.h>
-#include <rhash.h>
-
-#define MAX_INCLUDE_DEPTH 16
-
-struct config_entry_list
-{
-   /* If we got this from an #include,
-    * do not allow overwrite. */
-   bool readonly;
-   char *key;
-   char *value;
-   uint32_t key_hash;
-
-   struct config_entry_list *next;
-};
-
-struct config_include_list
-{
-   char *path;
-   struct config_include_list *next;
-};
-
-struct config_file
-{
-   char *path;
-   struct config_entry_list *entries;
-   struct config_entry_list *tail;
-   unsigned include_depth;
-
-   struct config_include_list *includes;
-};
-
-static config_file_t *config_file_new_internal(
-      const char *path, unsigned depth);
-
-static char *getaline(FILE *file)
-{
-   char* newline     = (char*)malloc(9);
-   char* newline_tmp = NULL;
-   size_t cur_size   = 8;
-   size_t idx        = 0;
-   int in            = getc(file);
-
-   if (!newline)
-      return NULL;
-
-   while (in != EOF && in != '\n')
-   {
-      if (idx == cur_size)
-      {
-         cur_size *= 2;
-         newline_tmp = (char*)realloc(newline, cur_size + 1);
-
-         if (!newline_tmp)
-         {
-            free(newline);
-            return NULL;
-         }
-
-         newline = newline_tmp;
-      }
-
-      newline[idx++] = in;
-      in = getc(file);
-   }
-   newline[idx] = '\0';
-   return newline; 
-}
-
-static char *strip_comment(char *str)
-{
-   /* Remove everything after comment.
-    * Keep #s inside string literals. */
-   char *string_end = str + strlen(str);
-   bool cut_comment = true;
-
-   while (!string_is_empty(str))
-   {
-      char *comment = NULL;
-      char *literal = strchr(str, '\"');
-      if (!literal)
-         literal = string_end;
-      comment = (char*)strchr(str, '#');
-      if (!comment)
-         comment = string_end;
-
-      if (cut_comment && literal < comment)
-      {
-         cut_comment = false;
-         str = literal + 1;
-      }
-      else if (!cut_comment && literal)
-      {
-         cut_comment = true;
-         str = literal + 1;
-      }
-      else if (comment)
-      {
-         *comment = '\0';
-         str = comment;
-      }
-      else
-         str = string_end;
-   }
-
-   return str;
-}
-
-static char *extract_value(char *line, bool is_value)
-{
-   char *save = NULL;
-   char *tok  = NULL;
-
-   if (is_value)
-   {
-      while (isspace((int)*line))
-         line++;
-
-      /* If we don't have an equal sign here,
-       * we've got an invalid string. */
-      if (*line != '=')
-         return NULL;
-
-      line++;
-   }
-
-   while (isspace((int)*line))
-      line++;
-
-   /* We have a full string. Read until next ". */
-   if (*line == '"')
-   {
-      line++;
-      tok = strtok_r(line, "\"", &save);
-      if (!tok)
-         return NULL;
-      return strdup(tok);
-   }
-   else if (*line == '\0') /* Nothing */
-      return NULL;
-
-   /* We don't have that. Read until next space. */
-   tok = strtok_r(line, " \n\t\f\r\v", &save);
-   if (tok)
-      return strdup(tok);
-   return NULL;
-}
-
-static void add_include_list(config_file_t *conf, const char *path)
-{
-   struct config_include_list *head = conf->includes;
-   struct config_include_list *node = (struct config_include_list*)calloc(1, sizeof(*node));
-
-   if (!node)
-      return;
-
-   node->path = strdup(path);
-
-   if (head)
-   {
-      while (head->next)
-         head = head->next;
-
-      head->next = node;
-   }
-   else
-      conf->includes = node;
-}
-
-static void set_list_readonly(struct config_entry_list *list)
-{
-   while (list)
-   {
-      list->readonly = true;
-      list = list->next;
-   }
-}
-
-/* Move semantics? */
-static void add_child_list(config_file_t *parent, config_file_t *child)
-{
-   if (parent->entries)
-   {
-      struct config_entry_list *head = parent->entries;
-      while (head->next)
-         head = head->next;
-
-      set_list_readonly(child->entries);
-      head->next = child->entries;
-   }
-   else
-   {
-      set_list_readonly(child->entries);
-      parent->entries = child->entries;
-   }
-
-   child->entries = NULL;
-
-   /* Rebase tail. */
-   if (parent->entries)
-   {
-      struct config_entry_list *head = 
-         (struct config_entry_list*)parent->entries;
-
-      while (head->next)
-         head = head->next;
-      parent->tail = head;
-   }
-   else
-      parent->tail = NULL;
-}
-
-static void add_sub_conf(config_file_t *conf, char *line)
-{
-   char real_path[PATH_MAX_LENGTH];
-   config_file_t         *sub_conf = NULL;
-   char                      *path = extract_value(line, false);
-
-   if (!path)
-      return;
-
-   add_include_list(conf, path);
-
-   real_path[0] = '\0';
-
-#ifdef _WIN32
-   if (!string_is_empty(conf->path))
-      fill_pathname_resolve_relative(real_path, conf->path,
-            path, sizeof(real_path));
-#else
-#ifndef __CELLOS_LV2__
-   if (*path == '~')
-   {
-      const char *home = getenv("HOME");
-      strlcpy(real_path, home ? home : "", sizeof(real_path));
-      strlcat(real_path, path + 1, sizeof(real_path));
-   }
-   else
-#endif
-      if (!string_is_empty(conf->path))
-         fill_pathname_resolve_relative(real_path, conf->path,
-               path, sizeof(real_path));
-#endif
-
-   sub_conf = (config_file_t*)
-      config_file_new_internal(real_path, conf->include_depth + 1);
-   if (!sub_conf)
-   {
-      free(path);
-      return;
-   }
-
-   /* Pilfer internal list. */
-   add_child_list(conf, sub_conf);
-   config_file_free(sub_conf);
-   free(path);
-}
-
-static bool parse_line(config_file_t *conf,
-      struct config_entry_list *list, char *line)
-{
-   char *comment   = NULL;
-   char *key_tmp   = NULL;
-   size_t cur_size = 8;
-   size_t idx      = 0;
-   char *key       = (char*)malloc(9);
-
-   if (!key)
-      return false;
-
-   if (!line || !*line)
-   {
-      free(key);
-      return false;
-   }
-
-   comment = strip_comment(line);
-
-   /* Starting line with # and include includes config files. */
-   if ((comment == line) && (conf->include_depth < MAX_INCLUDE_DEPTH))
-   {
-      comment++;
-      if (strstr(comment, "include ") == comment)
-      {
-         add_sub_conf(conf, comment + strlen("include "));
-         free(key);
-         return false;
-      }
-   }
-   else if (conf->include_depth >= MAX_INCLUDE_DEPTH)
-   {
-      fprintf(stderr, "!!! #include depth exceeded for config. Might be a cycle.\n");
-   }
-
-   /* Skips to first character. */
-   while (isspace((int)*line))
-      line++;
-
-   while (isgraph((int)*line))
-   {
-      if (idx == cur_size)
-      {
-         cur_size *= 2;
-         key_tmp = (char*)realloc(key, cur_size + 1);
-
-         if (!key_tmp)
-         {
-            free(key);
-            return false;
-         }
-
-         key = key_tmp;
-      }
-
-      key[idx++] = *line++;
-   }
-   key[idx] = '\0';
-   list->key = key;
-   list->key_hash = djb2_calculate(key);
-
-   list->value = extract_value(line, true);
-   if (!list->value)
-   {
-      list->key = NULL;
-      free(key);
-      return false;
-   }
-
-   return true;
-}
-
-static config_file_t *config_file_new_internal(
-      const char *path, unsigned depth)
-{
-   FILE *file = NULL;
-   struct config_file *conf = (struct config_file*)calloc(1, sizeof(*conf));
-   if (!conf)
-      return NULL;
-
-   if (!path || !*path)
-      return conf;
-
-   if (path_is_directory(path))
-      goto error;
-
-   conf->path = strdup(path);
-   if (!conf->path)
-      goto error;
-
-   conf->include_depth = depth;
-   file = fopen(path, "r");
-
-   if (!file)
-   {
-      free(conf->path);
-      goto error;
-   }
-   setvbuf(file, NULL, _IOFBF, 0x4000);
-
-   while (!feof(file))
-   {
-      struct config_entry_list *list = (struct config_entry_list*)
-         calloc(1, sizeof(*list));
-      char *line = NULL;
-
-      if (!list)
-      {
-         config_file_free(conf);
-         fclose(file);
-         return NULL;
-      }
-
-      line = getaline(file);
-
-      if (!line)
-      {
-         free(list);
-         continue;
-      }
-
-      if (parse_line(conf, list, line))
-      {
-         if (conf->entries)
-            conf->tail->next = list;
-         else
-            conf->entries = list;
-
-         conf->tail = list;
-      }
-
-      free(line);
-
-      if (list != conf->tail)
-         free(list);
-   }
-
-   fclose(file);
-
-   return conf;
-
-error:
-   free(conf);
-
-   return NULL;
-}
-
-void config_file_free(config_file_t *conf)
-{
-   struct config_include_list *inc_tmp = NULL;
-   struct config_entry_list *tmp       = NULL;
-   if (!conf)
-      return;
-
-   tmp = conf->entries;
-   while (tmp)
-   {
-      struct config_entry_list *hold = NULL;
-      if (tmp->key)
-         free(tmp->key);
-      if (tmp->value)
-         free(tmp->value);
-
-      tmp->value = NULL;
-      tmp->key   = NULL;
-
-      hold       = tmp;
-      tmp        = tmp->next;
-
-      if (hold)
-         free(hold);
-   }
-
-   inc_tmp = (struct config_include_list*)conf->includes;
-   while (inc_tmp)
-   {
-      struct config_include_list *hold = NULL;
-      free(inc_tmp->path);
-      hold = (struct config_include_list*)inc_tmp;
-      inc_tmp = inc_tmp->next;
-      free(hold);
-   }
-
-   if (conf->path)
-      free(conf->path);
-   free(conf);
-}
-
-bool config_append_file(config_file_t *conf, const char *path)
-{
-   config_file_t *new_conf = config_file_new(path);
-   if (!new_conf)
-      return false;
-
-   if (new_conf->tail)
-   {
-      new_conf->tail->next = conf->entries;
-      conf->entries        = new_conf->entries; /* Pilfer. */
-      new_conf->entries    = NULL;
-   }
-
-   config_file_free(new_conf);
-   return true;
-}
-
-
-config_file_t *config_file_new_from_string(const char *from_string)
-{
-   size_t i;
-   struct string_list *lines = NULL;
-   struct config_file *conf = (struct config_file*)calloc(1, sizeof(*conf));
-   if (!conf)
-      return NULL;
-
-   if (!from_string)
-      return conf;
-
-   conf->path = NULL;
-   conf->include_depth = 0;
-   
-   lines = string_split(from_string, "\n");
-   if (!lines)
-      return conf;
-
-   for (i = 0; i < lines->size; i++)
-   {
-      struct config_entry_list *list = (struct config_entry_list*)
-         calloc(1, sizeof(*list));
-      char* line = lines->elems[i].data;
-
-      if (!list)
-      {
-         string_list_free(lines);
-         config_file_free(conf);
-         return NULL;
-      }
-
-      if (line && conf)
-      {
-         if (parse_line(conf, list, line))
-         {
-            if (conf->entries)
-               conf->tail->next = list;
-            else
-               conf->entries = list;
-
-            conf->tail = list;
-         }
-      }
-
-      if (list != conf->tail)
-         free(list);
-   }
-
-   string_list_free(lines);
-
-   return conf;
-}
-
-config_file_t *config_file_new(const char *path)
-{
-   return config_file_new_internal(path, 0);
-}
-
-
-static struct config_entry_list *config_get_entry(const config_file_t *conf,
-      const char *key, struct config_entry_list **prev)
-{
-   struct config_entry_list *entry;
-   struct config_entry_list *previous = NULL;
-
-   uint32_t hash = djb2_calculate(key);
-
-   if (prev)
-      previous = *prev;
-
-   for (entry = conf->entries; entry; entry = entry->next)
-   {
-      if (hash == entry->key_hash && string_is_equal(key, entry->key))
-         return entry;
-
-      previous = entry;
-   }
-
-   if (prev)
-      *prev = previous;
-
-   return NULL;
-}
-
-bool config_get_double(config_file_t *conf, const char *key, double *in)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-
-   if (entry)
-      *in = strtod(entry->value, NULL);
-
-   return entry != NULL;
-}
-
-bool config_get_float(config_file_t *conf, const char *key, float *in)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-
-   if (entry)
-   {
-      /* strtof() is C99/POSIX. Just use the more portable kind. */
-      *in = (float)strtod(entry->value, NULL);
-   }
-
-   return entry != NULL;
-}
-
-bool config_get_int(config_file_t *conf, const char *key, int *in)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-   errno = 0;
-
-   if (entry)
-   {
-      int val = (int)strtol(entry->value, NULL, 0);
-
-      if (errno == 0)
-         *in = val;
-   }
-
-   return entry != NULL && errno == 0;
-}
-
-#if defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
-bool config_get_uint64(config_file_t *conf, const char *key, uint64_t *in)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-   errno = 0;
-
-   if (entry)
-   {
-      uint64_t val = strtoull(entry->value, NULL, 0);
-
-      if (errno == 0)
-         *in = val;
-   }
-
-   return entry != NULL && errno == 0;
-}
-#endif
-
-bool config_get_uint(config_file_t *conf, const char *key, unsigned *in)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-   errno = 0;
-
-   if (entry)
-   {
-      unsigned val = (unsigned)strtoul(entry->value, NULL, 0);
-
-      if (errno == 0)
-         *in = val;
-   }
-
-   return entry != NULL && errno == 0;
-}
-
-bool config_get_hex(config_file_t *conf, const char *key, unsigned *in)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-   errno = 0;
-
-   if (entry)
-   {
-      unsigned val = (unsigned)strtoul(entry->value, NULL, 16);
-
-      if (errno == 0)
-         *in = val;
-   }
-
-   return entry != NULL && errno == 0;
-}
-
-bool config_get_char(config_file_t *conf, const char *key, char *in)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-
-   if (entry)
-   {
-      if (entry->value[0] && entry->value[1])
-         return false;
-
-      *in = *entry->value;
-   }
-
-   return entry != NULL;
-}
-
-bool config_get_string(config_file_t *conf, const char *key, char **str)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-
-   if (entry)
-      *str = strdup(entry->value);
-
-   return entry != NULL;
-}
-
-bool config_get_config_path(config_file_t *conf, char *s, size_t len)
-{
-   if (!conf)
-      return false;
-
-   return strlcpy(s, conf->path, len);
-}
-
-bool config_get_array(config_file_t *conf, const char *key,
-      char *buf, size_t size)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-
-   if (entry)
-      return strlcpy(buf, entry->value, size) < size;
-
-   return entry != NULL;
-}
-
-bool config_get_path(config_file_t *conf, const char *key,
-      char *buf, size_t size)
-{
-#if defined(RARCH_CONSOLE)
-   return config_get_array(conf, key, buf, size);
-#else
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-
-   if (entry)
-      fill_pathname_expand_special(buf, entry->value, size);
-
-   return entry != NULL;
-#endif
-}
-
-bool config_get_bool(config_file_t *conf, const char *key, bool *in)
-{
-   const struct config_entry_list *entry = config_get_entry(conf, key, NULL);
-
-   if (entry)
-   {
-      if (string_is_equal_fast(entry->value, "true", 4))
-         *in = true;
-      else if (string_is_equal_fast(entry->value, "1", 1))
-         *in = true;
-      else if (string_is_equal_fast(entry->value, "false", 5))
-         *in = false;
-      else if (string_is_equal_fast(entry->value, "0", 1))
-         *in = false;
-      else
-         return false;
-   }
-
-   return entry != NULL;
-}
-
-void config_set_string(config_file_t *conf, const char *key, const char *val)
-{
-   struct config_entry_list *last  = conf->entries;
-   struct config_entry_list *entry = config_get_entry(conf, key, &last);
-
-   if (entry && !entry->readonly)
-   {
-      free(entry->value);
-      entry->value = strdup(val);
-      return;
-   }
-
-   if (!val) return;
-
-   entry = (struct config_entry_list*)calloc(1, sizeof(*entry));
-   if (!entry) return;
-
-   entry->key   = strdup(key);
-   entry->value = strdup(val);
-
-   if (last)
-      last->next = entry;
-   else
-      conf->entries = entry;
-}
-
-void config_unset(config_file_t *conf, const char *key)
-{
-   struct config_entry_list *last  = conf->entries;
-   struct config_entry_list *entry = config_get_entry(conf, key, &last);
-
-   if (!entry)
-      return;
-
-   entry->key   = NULL;
-   entry->value = NULL;
-   free(entry->key);
-   free(entry->value);
-}
-
-void config_set_path(config_file_t *conf, const char *entry, const char *val)
-{
-#if defined(RARCH_CONSOLE)
-   config_set_string(conf, entry, val);
-#else
-   char buf[PATH_MAX_LENGTH];
-
-   buf[0] = '\0';
-   fill_pathname_abbreviate_special(buf, val, sizeof(buf));
-   config_set_string(conf, entry, buf);
-#endif
-}
-
-void config_set_double(config_file_t *conf, const char *key, double val)
-{
-   char buf[128];
-
-   buf[0] = '\0';
-#ifdef __cplusplus
-   snprintf(buf, sizeof(buf), "%f", (float)val);
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__>=199901L
-   snprintf(buf, sizeof(buf), "%lf", val);
-#else
-   snprintf(buf, sizeof(buf), "%f", (float)val);
-#endif
-   config_set_string(conf, key, buf);
-}
-
-void config_set_float(config_file_t *conf, const char *key, float val)
-{
-   char buf[128];
-
-   buf[0] = '\0';
-   snprintf(buf, sizeof(buf), "%f", val);
-   config_set_string(conf, key, buf);
-}
-
-void config_set_int(config_file_t *conf, const char *key, int val)
-{
-   char buf[128];
-
-   buf[0] = '\0';
-   snprintf(buf, sizeof(buf), "%d", val);
-   config_set_string(conf, key, buf);
-}
-
-void config_set_hex(config_file_t *conf, const char *key, unsigned val)
-{
-   char buf[128];
-
-   buf[0] = '\0';
-   snprintf(buf, sizeof(buf), "%x", val);
-   config_set_string(conf, key, buf);
-}
-
-void config_set_uint64(config_file_t *conf, const char *key, uint64_t val)
-{
-   char buf[128];
-
-   buf[0] = '\0';
-#ifdef _WIN32
-   snprintf(buf, sizeof(buf), "%I64u", val);
-#else
-   snprintf(buf, sizeof(buf), "%llu", (long long unsigned)val);
-#endif
-   config_set_string(conf, key, buf);
-}
-
-void config_set_char(config_file_t *conf, const char *key, char val)
-{
-   char buf[2];
-
-   buf[0] = '\0';
-   snprintf(buf, sizeof(buf), "%c", val);
-   config_set_string(conf, key, buf);
-}
-
-void config_set_bool(config_file_t *conf, const char *key, bool val)
-{
-   config_set_string(conf, key, val ? "true" : "false");
-}
-
-bool config_file_write(config_file_t *conf, const char *path)
-{
-   FILE *file;
-
-   if (path)
-   {
-      file = fopen(path, "w");
-      if (!file)
-         return false;
-      setvbuf(file, NULL, _IOFBF, 0x4000);
-   }
-   else
-      file = stdout;
-
-   config_file_dump(conf, file);
-
-   if (path)
-      fclose(file);
-
-   return true;
-}
-
-void config_file_dump(config_file_t *conf, FILE *file)
-{
-   struct config_entry_list       *list = NULL;
-   struct config_include_list *includes = conf->includes;
-
-   while (includes)
-   {
-      fprintf(file, "#include \"%s\"\n", includes->path);
-      includes = includes->next;
-   }
-
-   list = (struct config_entry_list*)conf->entries;
-
-   while (list)
-   {
-      if (!list->readonly && list->key)
-         fprintf(file, "%s = \"%s\"\n", list->key, list->value);
-      list = list->next;
-   }
-}
-
-bool config_entry_exists(config_file_t *conf, const char *entry)
-{
-   struct config_entry_list *list = conf->entries;
-
-   while (list)
-   {
-      if (string_is_equal(entry, list->key))
-         return true;
-      list = list->next;
-   }
-
-   return false;
-}
-
-bool config_get_entry_list_head(config_file_t *conf,
-      struct config_file_entry *entry)
-{
-   const struct config_entry_list *head = conf->entries;
-
-   if (!head)
-      return false;
-
-   entry->key   = head->key;
-   entry->value = head->value;
-   entry->next  = head->next;
-   return true;
-}
-
-bool config_get_entry_list_next(struct config_file_entry *entry)
-{
-   const struct config_entry_list *next = entry->next;
-
-   if (!next)
-      return false;
-
-   entry->key   = next->key;
-   entry->value = next->value;
-   entry->next  = next->next;
-   return true;
-}
-
-bool config_file_exists(const char *path)
-{
-   config_file_t *config = config_file_new(path);
-   if (!config)
-      return false;
-
-   config_file_free(config);
-   return true;
-}
diff --git a/libretro-common/file/config_file_userdata.c b/libretro-common/file/config_file_userdata.c
deleted file mode 100644
index 022715a..0000000
--- a/libretro-common/file/config_file_userdata.c
+++ /dev/null
@@ -1,149 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (config_file_userdata.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <file/file_path.h>
-#include <lists/string_list.h>
-
-#include <file/config_file_userdata.h>
-
-int config_userdata_get_float(void *userdata, const char *key_str,
-      float *value, float default_value)
-{
-   bool got;
-   char key[2][256];
-   struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
-
-   fill_pathname_join_delim(key[0], usr->prefix[0], key_str, '_', sizeof(key[0]));
-   fill_pathname_join_delim(key[1], usr->prefix[1], key_str, '_', sizeof(key[1]));
-
-   got = config_get_float  (usr->conf, key[0], value);
-   got = got || config_get_float(usr->conf, key[1], value);
-
-   if (!got)
-      *value = default_value;
-   return got;
-}
-
-int config_userdata_get_int(void *userdata, const char *key_str,
-      int *value, int default_value)
-{
-   bool got;
-   char key[2][256];
-   struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
-
-   fill_pathname_join_delim(key[0], usr->prefix[0], key_str, '_', sizeof(key[0]));
-   fill_pathname_join_delim(key[1], usr->prefix[1], key_str, '_', sizeof(key[1]));
-
-   got = config_get_int  (usr->conf, key[0], value);
-   got = got || config_get_int(usr->conf, key[1], value);
-
-   if (!got)
-      *value = default_value;
-   return got;
-}
-
-int config_userdata_get_float_array(void *userdata, const char *key_str,
-      float **values, unsigned *out_num_values,
-      const float *default_values, unsigned num_default_values)
-{
-   char key[2][256];
-   struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
-   char *str = NULL;
-
-   fill_pathname_join_delim(key[0], usr->prefix[0], key_str, '_', sizeof(key[0]));
-   fill_pathname_join_delim(key[1], usr->prefix[1], key_str, '_', sizeof(key[1]));
-
-   if (  config_get_string(usr->conf, key[0], &str) ||
-         config_get_string(usr->conf, key[1], &str))
-   {
-      unsigned i;
-      struct string_list *list = string_split(str, " ");
-      *values = (float*)calloc(list->size, sizeof(float));
-      for (i = 0; i < list->size; i++)
-         (*values)[i] = (float)strtod(list->elems[i].data, NULL);
-      *out_num_values = (unsigned)list->size;
-      string_list_free(list);
-      free(str);
-      return true;
-   }
-
-   *values = (float*)calloc(num_default_values, sizeof(float));
-   memcpy(*values, default_values, sizeof(float) * num_default_values); 
-   *out_num_values = num_default_values; 
-   return false; 
-}
-
-int config_userdata_get_int_array(void *userdata, const char *key_str,
-      int **values, unsigned *out_num_values,
-      const int *default_values, unsigned num_default_values)
-{
-   char key[2][256];
-   struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
-   char *str = NULL;
-   fill_pathname_join_delim(key[0], usr->prefix[0], key_str, '_', sizeof(key[0]));
-   fill_pathname_join_delim(key[1], usr->prefix[1], key_str, '_', sizeof(key[1]));
-
-   if (  config_get_string(usr->conf, key[0], &str) ||
-         config_get_string(usr->conf, key[1], &str))
-   {
-      unsigned i;
-      struct string_list *list = string_split(str, " ");
-      *values = (int*)calloc(list->size, sizeof(int));
-      for (i = 0; i < list->size; i++)
-         (*values)[i] = (int)strtod(list->elems[i].data, NULL);
-      *out_num_values = (unsigned)list->size;
-      string_list_free(list);
-      free(str);
-      return true;
-   }
-
-   *values = (int*)calloc(num_default_values, sizeof(int));
-   memcpy(*values, default_values, sizeof(int) * num_default_values);
-   *out_num_values = num_default_values;
-   return false;
-}
-
-int config_userdata_get_string(void *userdata, const char *key_str,
-      char **output, const char *default_output)
-{
-   char key[2][256];
-   struct config_file_userdata *usr = (struct config_file_userdata*)userdata;
-   char *str = NULL;
-   fill_pathname_join_delim(key[0], usr->prefix[0], key_str, '_', sizeof(key[0]));
-   fill_pathname_join_delim(key[1], usr->prefix[1], key_str, '_', sizeof(key[1]));
-
-   if (  config_get_string(usr->conf, key[0], &str) ||
-         config_get_string(usr->conf, key[1], &str))
-   {
-      *output = str;
-      return true; 
-   }
-
-   *output = strdup(default_output);
-   return false;
-}
-
-void config_userdata_free(void *ptr)
-{
-   if (ptr)
-      free(ptr);
-}
diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
deleted file mode 100644
index 42ff0eb..0000000
--- a/libretro-common/file/file_path.c
+++ /dev/null
@@ -1,896 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_path.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <errno.h>
-
-#include <sys/stat.h>
-
-#include <boolean.h>
-#include <file/file_path.h>
-
-#ifndef __MACH__
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-#endif
-#include <compat/strcasestr.h>
-#include <retro_assert.h>
-#include <retro_miscellaneous.h>
-#include <string/stdstring.h>
-
-#if defined(_WIN32)
-#ifdef _MSC_VER
-#define setmode _setmode
-#endif
-#include <sys/stat.h>
-#ifdef _XBOX
-#include <xtl.h>
-#define INVALID_FILE_ATTRIBUTES -1
-#else
-#include <io.h>
-#include <fcntl.h>
-#include <direct.h>
-#include <windows.h>
-#endif
-#elif defined(VITA)
-#define SCE_ERROR_ERRNO_EEXIST 0x80010011
-#include <psp2/io/fcntl.h>
-#include <psp2/io/dirent.h>
-#include <psp2/io/stat.h>
-#else
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#endif
-
-#if defined(PSP)
-#include <pspkernel.h>
-#endif
-
-#ifdef __HAIKU__
-#include <kernel/image.h>
-#endif
-
-#if defined(__CELLOS_LV2__)
-#include <cell/cell_fs.h>
-#endif
-
-#if defined(VITA)
-#define FIO_S_ISDIR SCE_S_ISDIR
-#endif
-
-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
-#include <unistd.h> /* stat() is defined here */
-#endif
-
-enum stat_mode
-{
-   IS_DIRECTORY = 0,
-   IS_CHARACTER_SPECIAL,
-   IS_VALID
-};
-
-static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
-{
-#if defined(VITA) || defined(PSP)
-   SceIoStat buf;
-   char *tmp  = strdup(path);
-   size_t len = strlen(tmp);
-   if (tmp[len-1] == '/')
-      tmp[len-1]='\0';
-
-   if (sceIoGetstat(tmp, &buf) < 0)
-   {
-      free(tmp);
-      return false;
-   }
-   free(tmp);
-
-#elif defined(__CELLOS_LV2__)
-    CellFsStat buf;
-    if (cellFsStat(path, &buf) < 0)
-       return false;
-#elif defined(_WIN32)
-   struct _stat buf;
-   DWORD file_info = GetFileAttributes(path);
-
-   _stat(path, &buf);
-
-   if (file_info == INVALID_FILE_ATTRIBUTES)
-      return false;
-#else
-   struct stat buf;
-   if (stat(path, &buf) < 0)
-      return false;
-#endif
-
-   if (size)
-      *size = (int32_t)buf.st_size;
-
-   switch (mode)
-   {
-      case IS_DIRECTORY:
-#if defined(VITA) || defined(PSP)
-         return FIO_S_ISDIR(buf.st_mode);
-#elif defined(__CELLOS_LV2__)
-         return ((buf.st_mode & S_IFMT) == S_IFDIR);
-#elif defined(_WIN32)
-         return (file_info & FILE_ATTRIBUTE_DIRECTORY);
-#else
-         return S_ISDIR(buf.st_mode);
-#endif
-      case IS_CHARACTER_SPECIAL:
-#if defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__) || defined(_WIN32)
-         return false;
-#else
-         return S_ISCHR(buf.st_mode);
-#endif
-      case IS_VALID:
-         return true;
-   }
-
-   return false;
-}
-
-/**
- * path_is_directory:
- * @path               : path
- *
- * Checks if path is a directory.
- *
- * Returns: true (1) if path is a directory, otherwise false (0).
- */
-bool path_is_directory(const char *path)
-{
-   return path_stat(path, IS_DIRECTORY, NULL);
-}
-
-bool path_is_character_special(const char *path)
-{
-   return path_stat(path, IS_CHARACTER_SPECIAL, NULL);
-}
-
-bool path_is_valid(const char *path)
-{
-   return path_stat(path, IS_VALID, NULL);
-}
-
-int32_t path_get_size(const char *path)
-{
-   int32_t filesize = 0;
-   if (path_stat(path, IS_VALID, &filesize))
-      return filesize;
-
-   return -1;
-}
-
-/**
- * path_mkdir_norecurse:
- * @dir                : directory
- *
- * Create directory on filesystem.
- *
- * Returns: true (1) if directory could be created, otherwise false (0).
- **/
-static bool mkdir_norecurse(const char *dir)
-{
-#if defined(_WIN32)
-   int ret = _mkdir(dir);
-#elif defined(IOS)
-   int ret = mkdir(dir, 0755);
-#elif defined(VITA) || defined(PSP)
-   int ret = sceIoMkdir(dir, 0777);
-#elif defined(__QNX__)
-   int ret = mkdir(dir, 0777);
-#else
-   int ret = mkdir(dir, 0750);
-#endif
-
-   /* Don't treat this as an error. */
-#if defined(VITA)
-   if ((ret == SCE_ERROR_ERRNO_EEXIST) && path_is_directory(dir))
-      ret = 0;
-#elif defined(PSP) || defined(_3DS) || defined(WIIU)
-   if ((ret == -1) && path_is_directory(dir))
-      ret = 0;
-#else 
-   if (ret < 0 && errno == EEXIST && path_is_directory(dir))
-      ret = 0;
-#endif
-   if (ret < 0)
-      printf("mkdir(%s) error: %s.\n", dir, strerror(errno));
-   return ret == 0;
-}
-
-/**
- * path_mkdir:
- * @dir                : directory
- *
- * Create directory on filesystem.
- *
- * Returns: true (1) if directory could be created, otherwise false (0).
- **/
-bool path_mkdir(const char *dir)
-{
-   const char *target = NULL;
-   /* Use heap. Real chance of stack overflow if we recurse too hard. */
-   char     *basedir = strdup(dir);
-   bool          ret = false;
-
-   if (!basedir)
-      return false;
-
-   path_parent_dir(basedir);
-   if (!*basedir || string_is_equal(basedir, dir))
-      goto end;
-
-   if (path_is_directory(basedir))
-   {
-      target = dir;
-      ret    = mkdir_norecurse(dir);
-   }
-   else
-   {
-      target = basedir;
-      ret    = path_mkdir(basedir);
-
-      if (ret)
-      {
-         target = dir;
-         ret    = mkdir_norecurse(dir);
-      }
-   }
-
-end:
-   if (target && !ret)
-      printf("Failed to create directory: \"%s\".\n", target);
-   free(basedir);
-   return ret;
-}
-
-/**
- * path_get_archive_delim:
- * @path               : path
- *
- * Find delimiter of an archive file. Only the first '#'
- * after a compression extension is considered.
- *
- * Returns: pointer to the delimiter in the path if it contains
- * a path inside a compressed file, otherwise NULL.
- */
-const char *path_get_archive_delim(const char *path)
-{
-   const char *last  = find_last_slash(path);
-   const char *delim = NULL;
-
-   if (last)
-   {
-      delim = strcasestr(last, ".zip#");
-
-      if (!delim)
-         delim = strcasestr(last, ".apk#");
-   }
-
-   if (delim)
-      return delim + 4;
-
-   if (last)
-      delim = strcasestr(last, ".7z#");
-
-   if (delim)
-      return delim + 3;
-
-   return NULL;
-}
-
-/**
- * path_get_extension:
- * @path               : path
- *
- * Gets extension of file. Only '.'s
- * after the last slash are considered.
- *
- * Returns: extension part from the path.
- */
-const char *path_get_extension(const char *path)
-{
-   const char *ext = strrchr(path_basename(path), '.');
-   if (!ext)
-      return "";
-   return ext + 1;
-}
-
-/**
- * path_remove_extension:
- * @path               : path
- *
- * Removes the extension from the path and returns the result.
- * Removes all text after and including the last '.'.
- * Only '.'s after the last slash are considered.
- *
- * Returns: path with the extension part removed.
- */
-char *path_remove_extension(char *path)
-{
-   char *last = (char*)strrchr(path_basename(path), '.');
-   if (!last)
-      return NULL;
-   if (*last)
-      *last = '\0';
-   return last;
-}
-
-/**
- * path_is_compressed_file:
- * @path               : path
- *
- * Checks if path is a compressed file.
- *
- * Returns: true (1) if path is a compressed file, otherwise false (0).
- **/
-bool path_is_compressed_file(const char* path)
-{
-   const char *ext = path_get_extension(path);
-
-   if (     string_is_equal_noncase(ext, "zip") 
-         || string_is_equal_noncase(ext, "apk")
-         || string_is_equal_noncase(ext, "7z"))
-      return true;
-
-   return false;
-}
-
-/**
- * path_file_exists:
- * @path               : path
- *
- * Checks if a file already exists at the specified path (@path).
- *
- * Returns: true (1) if file already exists, otherwise false (0).
- */
-bool path_file_exists(const char *path)
-{
-   FILE *dummy = fopen(path, "rb");
-
-   if (!dummy)
-      return false;
-
-   fclose(dummy);
-   return true;
-}
-
-/**
- * fill_pathname:
- * @out_path           : output path
- * @in_path            : input  path
- * @replace            : what to replace
- * @size               : buffer size of output path
- *
- * FIXME: Verify
- *
- * Replaces filename extension with 'replace' and outputs result to out_path.
- * The extension here is considered to be the string from the last '.'
- * to the end.
- *
- * Only '.'s after the last slash are considered as extensions.
- * If no '.' is present, in_path and replace will simply be concatenated.
- * 'size' is buffer size of 'out_path'.
- * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ".asm" =>
- * out_path = "/foo/bar/baz/boo.asm"
- * E.g.: in_path = "/foo/bar/baz/boo.c", replace = ""     =>
- * out_path = "/foo/bar/baz/boo"
- */
-void fill_pathname(char *out_path, const char *in_path,
-      const char *replace, size_t size)
-{
-   char tmp_path[PATH_MAX_LENGTH];
-   char *tok                      = NULL;
-
-   tmp_path[0] = '\0';
-
-   retro_assert(strlcpy(tmp_path, in_path,
-            sizeof(tmp_path)) < sizeof(tmp_path));
-   if ((tok = (char*)strrchr(path_basename(tmp_path), '.')))
-      *tok = '\0';
-
-   fill_pathname_noext(out_path, tmp_path, replace, size);
-}
-
-/**
- * fill_pathname_noext:
- * @out_path           : output path
- * @in_path            : input  path
- * @replace            : what to replace
- * @size               : buffer size of output path
- *
- * Appends a filename extension 'replace' to 'in_path', and outputs
- * result in 'out_path'.
- *
- * Assumes in_path has no extension. If an extension is still
- * present in 'in_path', it will be ignored.
- *
- */
-void fill_pathname_noext(char *out_path, const char *in_path,
-      const char *replace, size_t size)
-{
-   retro_assert(strlcpy(out_path, in_path, size) < size);
-   retro_assert(strlcat(out_path, replace, size) < size);
-}
-
-char *find_last_slash(const char *str)
-{
-   const char *slash     = strrchr(str, '/');
-#ifdef _WIN32
-   const char *backslash = strrchr(str, '\\');
-
-   if (backslash && ((slash && backslash > slash) || !slash))
-      slash = backslash;
-#endif
-
-   return (char*)slash;
-}
-
-/**
- * fill_pathname_slash:
- * @path               : path
- * @size               : size of path
- *
- * Assumes path is a directory. Appends a slash
- * if not already there.
- **/
-void fill_pathname_slash(char *path, size_t size)
-{
-   size_t path_len = strlen(path);
-   const char *last_slash = find_last_slash(path);
-
-   /* Try to preserve slash type. */
-   if (last_slash && (last_slash != (path + path_len - 1)))
-   {
-      char join_str[2];
-
-      join_str[0] = '\0';
-
-      strlcpy(join_str, last_slash, sizeof(join_str));
-      retro_assert(strlcat(path, join_str, size) < size);
-   }
-   else if (!last_slash)
-      retro_assert(strlcat(path, path_default_slash(), size) < size);
-}
-
-/**
- * fill_pathname_dir:
- * @in_dir             : input directory path
- * @in_basename        : input basename to be appended to @in_dir
- * @replace            : replacement to be appended to @in_basename
- * @size               : size of buffer
- *
- * Appends basename of 'in_basename', to 'in_dir', along with 'replace'.
- * Basename of in_basename is the string after the last '/' or '\\',
- * i.e the filename without directories.
- *
- * If in_basename has no '/' or '\\', the whole 'in_basename' will be used.
- * 'size' is buffer size of 'in_dir'.
- *
- * E.g..: in_dir = "/tmp/some_dir", in_basename = "/some_content/foo.c",
- * replace = ".asm" => in_dir = "/tmp/some_dir/foo.c.asm"
- **/
-void fill_pathname_dir(char *in_dir, const char *in_basename,
-      const char *replace, size_t size)
-{
-   const char *base = NULL;
-
-   fill_pathname_slash(in_dir, size);
-   base = path_basename(in_basename);
-   retro_assert(strlcat(in_dir, base, size) < size);
-   retro_assert(strlcat(in_dir, replace, size) < size);
-}
-
-/**
- * fill_pathname_base:
- * @out                : output path
- * @in_path            : input path
- * @size               : size of output path
- *
- * Copies basename of @in_path into @out_path.
- **/
-void fill_pathname_base(char *out, const char *in_path, size_t size)
-{
-   const char     *ptr = path_basename(in_path);
-
-   if (!ptr)
-      ptr = in_path;
-
-   retro_assert(strlcpy(out, ptr, size) < size);
-}
-
-void fill_pathname_base_noext(char *out, const char *in_path, size_t size)
-{
-   fill_pathname_base(out, in_path, size);
-   path_remove_extension(out);
-}
-
-void fill_pathname_base_ext(char *out, const char *in_path, const char *ext,
-      size_t size)
-{
-   fill_pathname_base_noext(out, in_path, size);
-   strlcat(out, ext, size);
-}
-
-/**
- * fill_pathname_basedir:
- * @out_dir            : output directory
- * @in_path            : input path
- * @size               : size of output directory
- *
- * Copies base directory of @in_path into @out_path.
- * If in_path is a path without any slashes (relative current directory),
- * @out_path will get path "./".
- **/
-void fill_pathname_basedir(char *out_dir,
-      const char *in_path, size_t size)
-{
-   if (out_dir != in_path)
-      retro_assert(strlcpy(out_dir, in_path, size) < size);
-   path_basedir(out_dir);
-}
-
-void fill_pathname_basedir_noext(char *out_dir,
-      const char *in_path, size_t size)
-{
-   fill_pathname_basedir(out_dir, in_path, size);
-   path_remove_extension(out_dir);
-}
-
-/**
- * fill_pathname_parent_dir:
- * @out_dir            : output directory
- * @in_dir             : input directory
- * @size               : size of output directory
- *
- * Copies parent directory of @in_dir into @out_dir.
- * Assumes @in_dir is a directory. Keeps trailing '/'.
- **/
-void fill_pathname_parent_dir(char *out_dir,
-      const char *in_dir, size_t size)
-{
-   if (out_dir != in_dir)
-      retro_assert(strlcpy(out_dir, in_dir, size) < size);
-   path_parent_dir(out_dir);
-}
-
-/**
- * fill_dated_filename:
- * @out_filename       : output filename
- * @ext                : extension of output filename
- * @size               : buffer size of output filename
- *
- * Creates a 'dated' filename prefixed by 'RetroArch', and
- * concatenates extension (@ext) to it.
- *
- * E.g.:
- * out_filename = "RetroArch-{month}{day}-{Hours}{Minutes}.{@ext}"
- **/
-void fill_dated_filename(char *out_filename,
-      const char *ext, size_t size)
-{
-   time_t cur_time = time(NULL);
-
-   strftime(out_filename, size,
-         "RetroArch-%m%d-%H%M%S.", localtime(&cur_time));
-   strlcat(out_filename, ext, size);
-}
-
-/**
- * fill_str_dated_filename:
- * @out_filename       : output filename
- * @in_str             : input string
- * @ext                : extension of output filename
- * @size               : buffer size of output filename
- *
- * Creates a 'dated' filename prefixed by the string @in_str, and
- * concatenates extension (@ext) to it.
- *
- * E.g.:
- * out_filename = "RetroArch-{year}{month}{day}-{Hour}{Minute}{Second}.{@ext}"
- **/
-void fill_str_dated_filename(char *out_filename,
-      const char *in_str, const char *ext, size_t size)
-{
-   char format[256];
-   time_t cur_time = time(NULL);
-
-   format[0] = '\0';
-
-   strftime(format, sizeof(format), "-%y%m%d-%H%M%S.", localtime(&cur_time));
-   strlcpy(out_filename, in_str, size);
-   strlcat(out_filename, format, size);
-   strlcat(out_filename, ext, size);
-}
-
-/**
- * path_basedir:
- * @path               : path
- *
- * Extracts base directory by mutating path.
- * Keeps trailing '/'.
- **/
-void path_basedir(char *path)
-{
-   char *last = NULL;
-   if (strlen(path) < 2)
-      return;
-
-   last = find_last_slash(path);
-
-   if (last)
-      last[1] = '\0';
-   else
-      snprintf(path, 3, ".%s", path_default_slash());
-}
-
-/**
- * path_parent_dir:
- * @path               : path
- *
- * Extracts parent directory by mutating path.
- * Assumes that path is a directory. Keeps trailing '/'.
- **/
-void path_parent_dir(char *path)
-{
-   size_t len = strlen(path);
-   if (len && path_char_is_slash(path[len - 1]))
-      path[len - 1] = '\0';
-   path_basedir(path);
-}
-
-/**
- * path_basename:
- * @path               : path
- *
- * Get basename from @path.
- *
- * Returns: basename from path.
- **/
-const char *path_basename(const char *path)
-{
-   /* We cut either at the first compression-related hash 
-    * or the last slash; whichever comes last */
-   const char *last  = find_last_slash(path);
-   const char *delim = path_get_archive_delim(path);
-
-   if (delim)
-      return delim + 1;
-
-   if (last)
-      return last + 1;
-
-   return path;
-}
-
-/**
- * path_is_absolute:
- * @path               : path
- *
- * Checks if @path is an absolute path or a relative path.
- *
- * Returns: true if path is absolute, false if path is relative.
- **/
-bool path_is_absolute(const char *path)
-{
-   if (path[0] == '/')
-      return true;
-#ifdef _WIN32
-   /* Many roads lead to Rome ... */
-   if ((    strstr(path, "\\\\") == path)
-         || strstr(path, ":/") 
-         || strstr(path, ":\\") 
-         || strstr(path, ":\\\\"))
-      return true;
-#endif
-   return false;
-}
-
-/**
- * path_resolve_realpath:
- * @buf                : buffer for path
- * @size               : size of buffer
- *
- * Turns relative paths into absolute path.
- * If relative, rebases on current working dir.
- **/
-void path_resolve_realpath(char *buf, size_t size)
-{
-#ifndef RARCH_CONSOLE
-   char tmp[PATH_MAX_LENGTH];
-
-   tmp[0] = '\0';
-
-   strlcpy(tmp, buf, sizeof(tmp));
-
-#ifdef _WIN32
-   if (!_fullpath(buf, tmp, size))
-      strlcpy(buf, tmp, size);
-#else
-   retro_assert(size >= PATH_MAX_LENGTH);
-
-   /* NOTE: realpath() expects at least PATH_MAX_LENGTH bytes in buf.
-    * Technically, PATH_MAX_LENGTH needn't be defined, but we rely on it anyways.
-    * POSIX 2008 can automatically allocate for you,
-    * but don't rely on that. */
-   if (!realpath(tmp, buf))
-      strlcpy(buf, tmp, size);
-#endif
-#endif
-}
-
-/**
- * fill_pathname_resolve_relative:
- * @out_path           : output path
- * @in_refpath         : input reference path
- * @in_path            : input path
- * @size               : size of @out_path
- *
- * Joins basedir of @in_refpath together with @in_path.
- * If @in_path is an absolute path, out_path = in_path.
- * E.g.: in_refpath = "/foo/bar/baz.a", in_path = "foobar.cg",
- * out_path = "/foo/bar/foobar.cg".
- **/
-void fill_pathname_resolve_relative(char *out_path,
-      const char *in_refpath, const char *in_path, size_t size)
-{
-   if (path_is_absolute(in_path))
-   {
-      retro_assert(strlcpy(out_path, in_path, size) < size);
-      return;
-   }
-
-   fill_pathname_basedir(out_path, in_refpath, size);
-   retro_assert(strlcat(out_path, in_path, size) < size);
-}
-
-/**
- * fill_pathname_join:
- * @out_path           : output path
- * @dir                : directory
- * @path               : path
- * @size               : size of output path
- *
- * Joins a directory (@dir) and path (@path) together.
- * Makes sure not to get  two consecutive slashes
- * between directory and path.
- **/
-void fill_pathname_join(char *out_path,
-      const char *dir, const char *path, size_t size)
-{
-   if (out_path != dir)
-      retro_assert(strlcpy(out_path, dir, size) < size);
-
-   if (*out_path)
-      fill_pathname_slash(out_path, size);
-
-   retro_assert(strlcat(out_path, path, size) < size);
-}
-
-static void fill_string_join(char *out_path,
-      const char *append, size_t size)
-{
-   if (*out_path)
-      fill_pathname_slash(out_path, size);
-
-   retro_assert(strlcat(out_path, append, size) < size);
-}
-
-void fill_pathname_join_special_ext(char *out_path,
-      const char *dir,  const char *path,
-      const char *last, const char *ext,
-      size_t size)
-{
-   fill_pathname_join(out_path, dir, path, size);
-   fill_string_join(out_path, last, size);
-   strlcat(out_path, ext, size);
-}
-
-void fill_pathname_join_concat(char *out_path,
-      const char *dir, const char *path,
-      const char *concat,
-      size_t size)
-{
-   fill_pathname_join(out_path, dir, path, size);
-   strlcat(out_path, concat, size);
-}
-
-void fill_pathname_join_noext(char *out_path,
-      const char *dir, const char *path, size_t size)
-{
-   fill_pathname_join(out_path, dir, path, size);
-   path_remove_extension(out_path);
-}
-
-
-/**
- * fill_pathname_join_delim:
- * @out_path           : output path
- * @dir                : directory
- * @path               : path
- * @delim              : delimiter
- * @size               : size of output path
- *
- * Joins a directory (@dir) and path (@path) together
- * using the given delimiter (@delim).
- **/
-void fill_pathname_join_delim(char *out_path, const char *dir,
-      const char *path, const char delim, size_t size)
-{
-   size_t copied = strlcpy(out_path, dir, size);
-   retro_assert(copied < size+1);
-
-   out_path[copied]   = delim;
-   out_path[copied+1] = '\0';
-
-   retro_assert(strlcat(out_path, path, size) < size);
-}
-
-void fill_pathname_join_delim_concat(char *out_path, const char *dir,
-      const char *path, const char delim, const char *concat,
-      size_t size)
-{
-   fill_pathname_join_delim(out_path, dir, path, delim, size);
-   strlcat(out_path, concat, size);
-}
-
-/**
- * fill_short_pathname_representation:
- * @out_rep            : output representation
- * @in_path            : input path
- * @size               : size of output representation
- *
- * Generates a short representation of path. It should only
- * be used for displaying the result; the output representation is not
- * binding in any meaningful way (for a normal path, this is the same as basename)
- * In case of more complex URLs, this should cut everything except for
- * the main image file.
- *
- * E.g.: "/path/to/game.img" -> game.img
- *       "/path/to/myarchive.7z#folder/to/game.img" -> game.img
- */
-void fill_short_pathname_representation(char* out_rep,
-      const char *in_path, size_t size)
-{
-   char path_short[PATH_MAX_LENGTH];
-
-   path_short[0] = '\0';
-
-   fill_pathname(path_short, path_basename(in_path), "",
-            sizeof(path_short));
-
-   strlcpy(out_rep, path_short, size);
-}
-
-void fill_short_pathname_representation_noext(char* out_rep,
-      const char *in_path, size_t size)
-{
-   fill_short_pathname_representation(out_rep, in_path, size);
-   path_remove_extension(out_rep);
-}
diff --git a/libretro-common/file/nbio/nbio_stdio.c b/libretro-common/file/nbio/nbio_stdio.c
deleted file mode 100644
index 826d7a4..0000000
--- a/libretro-common/file/nbio/nbio_stdio.c
+++ /dev/null
@@ -1,205 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <file/nbio.h>
-
-struct nbio_t
-{
-   FILE* f;
-   void* data;
-   size_t progress;
-   size_t len;
-   /*
-    * possible values:
-    * NBIO_READ, NBIO_WRITE - obvious
-    * -1 - currently doing nothing
-    * -2 - the pointer was reallocated since the last operation
-    */
-   signed char op;
-   signed char mode;
-};
-
-static const char * modes[]={ "rb", "wb", "r+b", "rb", "wb", "r+b" };
-
-struct nbio_t* nbio_open(const char * filename, unsigned mode)
-{
-   void *buf             = NULL;
-   struct nbio_t* handle = NULL;
-   size_t len            = 0;
-   FILE* f               = fopen(filename, modes[mode]);
-   if (!f)
-      return NULL;
-
-   handle                = (struct nbio_t*)malloc(sizeof(struct nbio_t));
-
-   if (!handle)
-      goto error;
-
-   handle->f             = f;
-
-   switch (mode)
-   {
-      case NBIO_WRITE:
-      case BIO_WRITE:
-         break;
-      default:
-         fseek(handle->f, 0, SEEK_END);
-         len = ftell(handle->f);
-         break;
-   }
-
-   handle->mode          = mode;
-
-   if (len)
-      buf                = malloc(len);
-
-   if (!buf)
-      goto error;
-
-   handle->data          = buf;
-   handle->len           = len;
-   handle->progress      = handle->len;
-   handle->op            = -2;
-
-   return handle;
-
-error:
-   if (handle)
-      free(handle);
-   fclose(f);
-   return NULL;
-}
-
-void nbio_begin_read(struct nbio_t* handle)
-{
-   if (!handle)
-      return;
-
-   if (handle->op >= 0)
-   {
-      puts("ERROR - attempted file read operation while busy");
-      abort();
-   }
-
-   fseek(handle->f, 0, SEEK_SET);
-
-   handle->op       = NBIO_READ;
-   handle->progress = 0;
-}
-
-void nbio_begin_write(struct nbio_t* handle)
-{
-   if (!handle)
-      return;
-
-   if (handle->op >= 0)
-   {
-      puts("ERROR - attempted file write operation while busy");
-      abort();
-   }
-
-   fseek(handle->f, 0, SEEK_SET);
-   handle->op = NBIO_WRITE;
-   handle->progress = 0;
-}
-
-bool nbio_iterate(struct nbio_t* handle)
-{
-   size_t amount = 65536;
-
-   if (!handle)
-      return false;
-
-   if (amount > handle->len - handle->progress)
-      amount = handle->len - handle->progress;
-
-   switch (handle->op)
-   {
-      case NBIO_READ:
-         if (handle->mode == BIO_READ)
-         {
-            amount = handle->len;
-            fread((char*)handle->data, 1, amount, handle->f);
-         }
-         else
-            fread((char*)handle->data + handle->progress, 1, amount, handle->f);
-         break;
-      case NBIO_WRITE:
-         if (handle->mode == BIO_WRITE)
-         {
-            size_t written = 0;
-            amount = handle->len;
-            written = fwrite((char*)handle->data, 1, amount, handle->f);
-            if (written != amount)
-               return false;
-         }
-         else
-            fwrite((char*)handle->data + handle->progress, 1, amount, handle->f);
-         break;
-   }
-
-   handle->progress += amount;
-
-   if (handle->progress == handle->len)
-      handle->op = -1;
-   return (handle->op < 0);
-}
-
-void nbio_resize(struct nbio_t* handle, size_t len)
-{
-   if (!handle)
-      return;
-
-   if (handle->op >= 0)
-   {
-      puts("ERROR - attempted file resize operation while busy");
-      abort();
-   }
-   if (len < handle->len)
-   {
-      puts("ERROR - attempted file shrink operation, not implemented");
-      abort();
-   }
-
-   handle->len  = len;
-   handle->data = realloc(handle->data, handle->len);
-   handle->op   = -1;
-   handle->progress = handle->len;
-}
-
-void* nbio_get_ptr(struct nbio_t* handle, size_t* len)
-{
-   if (!handle)
-      return NULL;
-   if (len)
-      *len = handle->len;
-   if (handle->op == -1)
-      return handle->data;
-   return NULL;
-}
-
-void nbio_cancel(struct nbio_t* handle)
-{
-   if (!handle)
-      return;
-
-   handle->op = -1;
-   handle->progress = handle->len;
-}
-
-void nbio_free(struct nbio_t* handle)
-{
-   if (!handle)
-      return;
-   if (handle->op >= 0)
-   {
-      puts("ERROR - attempted free() while busy");
-      abort();
-   }
-   fclose(handle->f);
-   free(handle->data);
-
-   handle->f    = NULL;
-   handle->data = NULL;
-   free(handle);
-}
diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c
deleted file mode 100644
index 6afa37e..0000000
--- a/libretro-common/file/retro_dirent.c
+++ /dev/null
@@ -1,163 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (retro_dirent.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-
-#include <retro_common.h>
-
-#include <boolean.h>
-#include <file/file_path.h>
-#include <retro_dirent.h>
-#include <encodings/utf.h>
-
-struct RDIR *retro_opendir(const char *name)
-{
-#if defined(_WIN32)
-   char path_buf[1024];
-#endif
-   struct RDIR *rdir = (struct RDIR*)calloc(1, sizeof(*rdir));
-
-   if (!rdir)
-      return NULL;
-
-#if defined(_WIN32)
-   path_buf[0] = '\0';
-   snprintf(path_buf, sizeof(path_buf), "%s\\*", name);
-   rdir->directory = FindFirstFile(path_buf, &rdir->entry);
-#elif defined(VITA) || defined(PSP)
-   rdir->directory = sceIoDopen(name);
-#elif defined(_3DS)
-   rdir->directory = (name && *name)? opendir(name) : NULL;
-   rdir->entry     = NULL;
-#elif defined(__CELLOS_LV2__)
-   rdir->error = cellFsOpendir(name, &rdir->directory);
-#else
-   rdir->directory = opendir(name);
-   rdir->entry     = NULL;
-#endif
-
-   return rdir;
-}
-
-bool retro_dirent_error(struct RDIR *rdir)
-{
-#if defined(_WIN32)
-   return (rdir->directory == INVALID_HANDLE_VALUE);
-#elif defined(VITA) || defined(PSP)
-   return (rdir->directory < 0);
-#elif defined(__CELLOS_LV2__)
-   return (rdir->error != CELL_FS_SUCCEEDED);
-#else
-   return !(rdir->directory);
-#endif
-}
-
-int retro_readdir(struct RDIR *rdir)
-{
-#if defined(_WIN32)
-   if(rdir->next)
-      return (FindNextFile(rdir->directory, &rdir->entry) != 0);
-
-   rdir->next = true;
-   return (rdir->directory != INVALID_HANDLE_VALUE);
-#elif defined(VITA) || defined(PSP)
-   return (sceIoDread(rdir->directory, &rdir->entry) > 0);
-#elif defined(__CELLOS_LV2__)
-   uint64_t nread;
-   rdir->error = cellFsReaddir(rdir->directory, &rdir->entry, &nread);
-   return (nread != 0);
-#else
-   return ((rdir->entry = readdir(rdir->directory)) != NULL);
-#endif
-}
-
-const char *retro_dirent_get_name(struct RDIR *rdir)
-{
-#if defined(_WIN32)
-   return rdir->entry.cFileName;
-#elif defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__)
-   return rdir->entry.d_name;
-#else
-   return rdir->entry->d_name;
-#endif
-}
-
-/**
- *
- * retro_dirent_is_dir:
- * @rdir         : pointer to the directory entry.
- * @path         : path to the directory entry.
- *
- * Is the directory listing entry a directory?
- *
- * Returns: true if directory listing entry is
- * a directory, false if not.
- */
-bool retro_dirent_is_dir(struct RDIR *rdir, const char *path)
-{
-#if defined(_WIN32)
-   const WIN32_FIND_DATA *entry = (const WIN32_FIND_DATA*)&rdir->entry;
-   return entry->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY;
-#elif defined(PSP) || defined(VITA)
-   const SceIoDirent *entry = (const SceIoDirent*)&rdir->entry;
-#if defined(PSP)
-   return (entry->d_stat.st_attr & FIO_SO_IFDIR) == FIO_SO_IFDIR;
-#elif defined(VITA)
-   return SCE_S_ISDIR(entry->d_stat.st_mode);
-#endif
-#elif defined(__CELLOS_LV2__)
-   CellFsDirent *entry = (CellFsDirent*)&rdir->entry;
-   return (entry->d_type == CELL_FS_TYPE_DIRECTORY);
-#elif defined(DT_DIR)
-   const struct dirent *entry = (const struct dirent*)rdir->entry;
-   if (entry->d_type == DT_DIR)
-      return true;
-   /* This can happen on certain file systems. */
-   if (entry->d_type == DT_UNKNOWN || entry->d_type == DT_LNK)
-      return path_is_directory(path);
-   return false;
-#else
-   /* dirent struct doesn't have d_type, do it the slow way ... */
-   return path_is_directory(path);
-#endif
-}
-
-void retro_closedir(struct RDIR *rdir)
-{
-   if (!rdir)
-      return;
-
-#if defined(_WIN32)
-   if (rdir->directory != INVALID_HANDLE_VALUE)
-      FindClose(rdir->directory);
-#elif defined(VITA) || defined(PSP)
-   sceIoDclose(rdir->directory);
-#elif defined(__CELLOS_LV2__)
-   rdir->error = cellFsClosedir(rdir->directory);
-#else
-   if (rdir->directory)
-      closedir(rdir->directory);
-#endif
-
-   free(rdir);
-}
diff --git a/libretro-common/formats/bmp/rbmp.c b/libretro-common/formats/bmp/rbmp.c
deleted file mode 100644
index cbc2743..0000000
--- a/libretro-common/formats/bmp/rbmp.c
+++ /dev/null
@@ -1,626 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rbmp.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* Modified version of stb_image's BMP sources. */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h> /* ptrdiff_t on osx */
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_assert.h>
-#include <retro_inline.h>
-
-#include <formats/image.h>
-#include <formats/rbmp.h>
-
-/* truncate int to byte without warnings */
-#define RBMP__BYTECAST(x)  ((unsigned char) ((x) & 255))  
-
-#define RBMP_COMPUTE_Y(r, g, b) ((unsigned char) ((((r) * 77) + ((g) * 150) +  (29 * (b))) >> 8))
-
-typedef struct
-{
-   uint32_t img_x;
-   uint32_t img_y;
-   int img_n;
-   int img_out_n;
-
-   int buflen;
-   unsigned char buffer_start[128];
-
-   unsigned char *img_buffer;
-   unsigned char *img_buffer_end;
-   unsigned char *img_buffer_original;
-} rbmp__context;
-
-struct rbmp
-{
-   uint8_t *buff_data;
-   uint32_t *output_image;
-};
-
-static INLINE unsigned char rbmp__get8(rbmp__context *s)
-{
-   if (s->img_buffer < s->img_buffer_end)
-      return *s->img_buffer++;
-
-   return 0;
-}
-
-static void rbmp__skip(rbmp__context *s, int n)
-{
-   if (n < 0)
-   {
-      s->img_buffer = s->img_buffer_end;
-      return;
-   }
-
-   s->img_buffer += n;
-}
-
-static int rbmp__get16le(rbmp__context *s)
-{
-   int z = rbmp__get8(s);
-   return z + (rbmp__get8(s) << 8);
-}
-
-static uint32_t rbmp__get32le(rbmp__context *s)
-{
-   uint32_t z = rbmp__get16le(s);
-   return z + (rbmp__get16le(s) << 16);
-}
-
-static unsigned char *rbmp__convert_format(
-      unsigned char *data,
-      int img_n,
-      int req_comp,
-      unsigned int x,
-      unsigned int y)
-{
-   int i,j;
-   unsigned char *good = (unsigned char *)malloc(req_comp * x * y);
-
-   if (!good)
-      return NULL;
-
-   for (j=0; j < (int) y; ++j)
-   {
-      unsigned char *src  = data + j * x * img_n   ;
-      unsigned char *dest = good + j * x * req_comp;
-
-      switch (((img_n)*8+(req_comp)))
-      {
-         case ((1)*8+(2)):
-            for(i=x-1; i >= 0; --i, src += 1, dest += 2)
-               dest[0]=src[0], dest[1]=255;
-            break;
-         case ((1)*8+(3)):
-            for(i=x-1; i >= 0; --i, src += 1, dest += 3)
-               dest[0]=dest[1]=dest[2]=src[0];
-            break;
-         case ((1)*8+(4)):
-            for(i=x-1; i >= 0; --i, src += 1, dest += 4)
-               dest[0]=dest[1]=dest[2]=src[0], dest[3]=255;
-            break;
-         case ((2)*8+(1)):
-            for(i=x-1; i >= 0; --i, src += 2, dest += 1)
-               dest[0]=src[0];
-            break;
-         case ((2)*8+(3)):
-            for(i=x-1; i >= 0; --i, src += 2, dest += 3)
-               dest[0]=dest[1]=dest[2]=src[0];
-            break;
-         case ((2)*8+(4)):
-            for(i=x-1; i >= 0; --i, src += 2, dest += 4)
-               dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1];
-            break;
-         case ((3)*8+(4)):
-            for(i=x-1; i >= 0; --i, src += 3, dest += 4)
-               dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255;
-            break;
-         case ((3)*8+(1)):
-            for(i=x-1; i >= 0; --i, src += 3, dest += 1)
-               dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]);
-            break;
-         case ((3)*8+(2)):
-            for(i=x-1; i >= 0; --i, src += 3, dest += 2)
-               dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]), dest[1] = 255;
-            break;
-         case ((4)*8+(1)):
-            for(i=x-1; i >= 0; --i, src += 4, dest += 1)
-               dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]);
-            break;
-         case ((4)*8+(2)):
-            for(i=x-1; i >= 0; --i, src += 4, dest += 2)
-               dest[0] = RBMP_COMPUTE_Y(src[0],src[1],src[2]), dest[1] = src[3];
-            break;
-         case ((4)*8+(3)):
-            for(i=x-1; i >= 0; --i, src += 4, dest += 3)
-               dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];
-            break;
-         default: 
-            retro_assert(0);
-            break;
-      }
-
-   }
-
-   return good;
-}
-
-/* Microsoft/Windows BMP image */
-
-/* returns 0..31 for the highest set bit */
-static int rbmp__high_bit(unsigned int z)
-{
-   int n=0;
-   if (z == 0)
-      return -1;
-   if (z >= 0x10000) n += 16, z >>= 16;
-   if (z >= 0x00100) n +=  8, z >>=  8;
-   if (z >= 0x00010) n +=  4, z >>=  4;
-   if (z >= 0x00004) n +=  2, z >>=  2;
-   if (z >= 0x00002) n +=  1, z >>=  1;
-   return n;
-}
-
-static int rbmp__bitcount(unsigned int a)
-{
-   a = (a & 0x55555555) + ((a >>  1) & 0x55555555); /* max 2 */
-   a = (a & 0x33333333) + ((a >>  2) & 0x33333333); /* max 4 */
-   a = (a + (a >> 4)) & 0x0f0f0f0f; /* max 8 per 4, now 8 bits */
-   a = (a + (a >> 8));              /* max 16 per 8 bits */
-   a = (a + (a >> 16));             /* max 32 per 8 bits */
-   return a & 0xff;
-}
-
-static int rbmp__shiftsigned(int v, int shift, int bits)
-{
-   int result;
-   int z=0;
-
-   if (shift < 0)
-      v <<= -shift;
-   else
-      v >>= shift;
-
-   result = v;
-   z      = bits;
-
-   while (z < 8)
-   {
-      result += v >> z;
-      z += bits;
-   }
-   return result;
-}
-
-static unsigned char *rbmp__bmp_load(rbmp__context *s, unsigned *x, unsigned *y,
-      int *comp, int req_comp)
-{
-   unsigned char *out;
-   int bpp, flip_vertically, pad, target, offset, hsz;
-   int psize=0,i,j,width;
-   unsigned int mr=0,mg=0,mb=0,ma=0;
-
-   /* Corrupt BMP? */
-   if (rbmp__get8(s) != 'B' || rbmp__get8(s) != 'M')
-      return 0;
-
-   rbmp__get32le(s); /* discard filesize */
-   rbmp__get16le(s); /* discard reserved */
-   rbmp__get16le(s); /* discard reserved */
-   offset = rbmp__get32le(s);
-   hsz = rbmp__get32le(s);
-
-   /* BMP type not supported? */
-   if (hsz != 12 && hsz != 40 && hsz != 56 && hsz != 108 && hsz != 124)
-      return 0;
-
-   if (hsz == 12)
-   {
-      s->img_x = rbmp__get16le(s);
-      s->img_y = rbmp__get16le(s);
-   }
-   else
-   {
-      s->img_x = rbmp__get32le(s);
-      s->img_y = rbmp__get32le(s);
-   }
-
-   /* Bad BMP? */
-   if (rbmp__get16le(s) != 1)
-      return 0;
-
-   bpp = rbmp__get16le(s);
-
-   /* BMP 1-bit type not supported? */
-   if (bpp == 1)
-      return 0;
-
-   flip_vertically = ((int) s->img_y) > 0;
-   s->img_y        = abs((int) s->img_y);
-
-   if (hsz == 12)
-   {
-      if (bpp < 24)
-         psize = (offset - 14 - 24) / 3;
-   }
-   else
-   {
-      int compress = rbmp__get32le(s);
-
-      /* BMP RLE type not supported? */
-      if (compress == 1 || compress == 2)
-         return 0;
-
-      rbmp__get32le(s); /* discard sizeof */
-      rbmp__get32le(s); /* discard hres */
-      rbmp__get32le(s); /* discard vres */
-      rbmp__get32le(s); /* discard colors used */
-      rbmp__get32le(s); /* discard max important */
-
-      if (hsz == 40 || hsz == 56)
-      {
-         if (hsz == 56)
-         {
-            rbmp__get32le(s);
-            rbmp__get32le(s);
-            rbmp__get32le(s);
-            rbmp__get32le(s);
-         }
-         if (bpp == 16 || bpp == 32)
-         {
-            switch (compress)
-            {
-               case 0:
-#if 0
-                  if (bpp == 32)
-                  {
-                     mr = 0xffu << 16;
-                     mg = 0xffu <<  8;
-                     mb = 0xffu <<  0;
-                     ma = 0xffu << 24;
-                  }
-                  else
-                  {
-                     mr = 31u << 10;
-                     mg = 31u <<  5;
-                     mb = 31u <<  0;
-                  }
-#endif
-                  break;
-               case 3:
-                  mr = rbmp__get32le(s);
-                  mg = rbmp__get32le(s);
-                  mb = rbmp__get32le(s);
-                  /* not documented, but generated by 
-                   * Photoshop and handled by MS Paint */
-                  /* Bad BMP ?*/
-                  if (mr == mg && mg == mb)
-                     return 0;
-                  break;
-               default:
-#if 0
-                  mr = mg = mb = 0;
-#endif
-                  break;
-            }
-
-            /* Bad BMP? */
-            return 0;
-         }
-      }
-      else
-      {
-         retro_assert(hsz == 108 || hsz == 124);
-         mr = rbmp__get32le(s);
-         mg = rbmp__get32le(s);
-         mb = rbmp__get32le(s);
-         ma = rbmp__get32le(s);
-         rbmp__get32le(s); /* Discard color space */
-         for (i=0; i < 12; ++i)
-            rbmp__get32le(s); /* Discard color space parameters */
-         if (hsz == 124)
-         {
-            rbmp__get32le(s); /* Discard rendering intent */
-            rbmp__get32le(s); /* Discard offset of profile data */
-            rbmp__get32le(s); /* Discard size of profile data */
-            rbmp__get32le(s); /* Discard reserved */
-         }
-      }
-      if (bpp < 16)
-         psize = (offset - 14 - hsz) >> 2;
-   }
-   s->img_n = ma ? 4 : 3;
-   if (req_comp && req_comp >= 3) /* We can directly decode 3 or 4 */
-      target = req_comp;
-   else
-      target = s->img_n; /* If they want monochrome, we'll post-convert */
-
-   out = (unsigned char *) malloc(target * s->img_x * s->img_y);
-
-   if (!out)
-      return 0;
-
-   if (bpp < 16)
-   {
-      unsigned char pal[256][4];
-      int z=0;
-
-      /* Corrupt BMP? */
-      if (psize == 0 || psize > 256)
-      {
-         free(out);
-         return 0;
-      }
-
-      for (i=0; i < psize; ++i)
-      {
-         pal[i][2] = rbmp__get8(s);
-         pal[i][1] = rbmp__get8(s);
-         pal[i][0] = rbmp__get8(s);
-         if (hsz != 12) rbmp__get8(s);
-         pal[i][3] = 255;
-      }
-
-      rbmp__skip(s, offset - 14 - hsz - psize * (hsz == 12 ? 3 : 4));
-      if (bpp == 4)
-         width = (s->img_x + 1) >> 1;
-      else if (bpp == 8)
-         width = s->img_x;
-      else
-      {
-         /* Corrupt BMP */
-         free(out);
-         return 0;
-      }
-
-      pad = (-width)&3;
-      for (j=0; j < (int) s->img_y; ++j)
-      {
-         for (i=0; i < (int) s->img_x; i += 2)
-         {
-            int v=rbmp__get8(s),v2=0;
-            if (bpp == 4)
-            {
-               v2 = v & 15;
-               v >>= 4;
-            }
-            out[z++] = pal[v][0];
-            out[z++] = pal[v][1];
-            out[z++] = pal[v][2];
-            if (target == 4)
-               out[z++] = 255;
-
-            if (i+1 == (int)s->img_x)
-               break;
-
-            v = (bpp == 8) ? rbmp__get8(s) : v2;
-            out[z++] = pal[v][0];
-            out[z++] = pal[v][1];
-            out[z++] = pal[v][2];
-
-            if (target == 4)
-               out[z++] = 255;
-         }
-         rbmp__skip(s, pad);
-      }
-   }
-   else
-   {
-      int rshift=0;
-      int gshift=0;
-      int bshift=0;
-      int ashift=0;
-      int rcount=0;
-      int gcount=0;
-      int bcount=0;
-      int acount=0;
-      int z = 0;
-      int easy=0;
-
-      rbmp__skip(s, offset - 14 - hsz);
-
-      if (bpp == 24)
-         width = 3 * s->img_x;
-      else if (bpp == 16)
-         width = 2*s->img_x;
-      else /* bpp = 32 and pad = 0 */
-         width=0;
-
-      pad = (-width) & 3;
-
-      switch (bpp)
-      {
-         case 24:
-            easy = 1;
-            break;
-         case 32:
-            if (mb == 0xff && mg == 0xff00 && mr == 0x00ff0000 && ma == 0xff000000)
-               easy = 2;
-            break;
-         default:
-            break;
-      }
-
-      if (!easy)
-      {
-         /* Corrupt BMP? */
-         if (!mr || !mg || !mb)
-         {
-            free(out);
-            return 0;
-         }
-
-         /* right shift amt to put high bit in position #7 */
-         rshift = rbmp__high_bit(mr)-7;
-         rcount = rbmp__bitcount(mr);
-         gshift = rbmp__high_bit(mg)-7;
-         gcount = rbmp__bitcount(mg);
-         bshift = rbmp__high_bit(mb)-7;
-         bcount = rbmp__bitcount(mb);
-         ashift = rbmp__high_bit(ma)-7;
-         acount = rbmp__bitcount(ma);
-      }
-      for (j=0; j < (int) s->img_y; ++j)
-      {
-         if (easy)
-         {
-            for (i=0; i < (int) s->img_x; ++i)
-            {
-               unsigned char a;
-               out[z+2] = rbmp__get8(s);
-               out[z+1] = rbmp__get8(s);
-               out[z+0] = rbmp__get8(s);
-               z += 3;
-               a = (easy == 2 ? rbmp__get8(s) : 255);
-               if (target == 4)
-                  out[z++] = a;
-            }
-         }
-         else
-         {
-            for (i=0; i < (int) s->img_x; ++i)
-            {
-               uint32_t v = (bpp == 16 ? (uint32_t) rbmp__get16le(s) : rbmp__get32le(s));
-               int a;
-               out[z++] = RBMP__BYTECAST(rbmp__shiftsigned(v & mr, rshift, rcount));
-               out[z++] = RBMP__BYTECAST(rbmp__shiftsigned(v & mg, gshift, gcount));
-               out[z++] = RBMP__BYTECAST(rbmp__shiftsigned(v & mb, bshift, bcount));
-               a = (ma ? rbmp__shiftsigned(v & ma, ashift, acount) : 255);
-               if (target == 4)
-                  out[z++] = RBMP__BYTECAST(a);
-            }
-         }
-         rbmp__skip(s, pad);
-      }
-   }
-
-   if (flip_vertically)
-   {
-      unsigned char t;
-      for (j=0; j < (int) s->img_y>>1; ++j)
-      {
-         unsigned char *p1 = out +      j     *s->img_x*target;
-         unsigned char *p2 = out + (s->img_y-1-j)*s->img_x*target;
-         for (i=0; i < (int) s->img_x*target; ++i)
-         {
-            t = p1[i], p1[i] = p2[i], p2[i] = t;
-         }
-      }
-   }
-   
-   if (
-            req_comp
-         && (req_comp >= 1 && req_comp <= 4)
-         && (req_comp != target))
-   {
-      unsigned char *tmp = rbmp__convert_format(out, target, req_comp, s->img_x, s->img_y);
-
-      free(out);
-      out = NULL;
-
-      if (!tmp)
-         return NULL;
-
-      out = tmp;
-   }
-
-   *x = s->img_x;
-   *y = s->img_y;
-
-   if (comp)
-      *comp = s->img_n;
-
-   return out;
-}
-
-static unsigned char *rbmp_load_from_memory(unsigned char const *buffer, int len,
-      unsigned *x, unsigned *y, int *comp, int req_comp)
-{
-   rbmp__context s;
-
-   s.img_buffer          = (unsigned char*)buffer;
-   s.img_buffer_original = (unsigned char*)buffer;
-   s.img_buffer_end      = (unsigned char*)buffer+len;
-
-   return rbmp__bmp_load(&s,x,y,comp,req_comp);
-}
-
-static void rbmp_convert_frame(uint32_t *frame, unsigned width, unsigned height)
-{
-   uint32_t *end = frame + (width * height * sizeof(uint32_t))/4;
-
-   while(frame < end)
-   {
-      uint32_t pixel = *frame;
-      *frame = (pixel & 0xff00ff00) | ((pixel << 16) & 0x00ff0000) | ((pixel >> 16) & 0xff);
-      frame++;
-   }
-}
-
-int rbmp_process_image(rbmp_t *rbmp, void **buf_data,
-      size_t size, unsigned *width, unsigned *height)
-{
-   int comp;
-
-   if (!rbmp)
-      return IMAGE_PROCESS_ERROR;
-
-   rbmp->output_image   = (uint32_t*)rbmp_load_from_memory(rbmp->buff_data,
-                           (int)size, width, height, &comp, 4);
-   *buf_data             = rbmp->output_image;
-
-   rbmp_convert_frame(rbmp->output_image, *width, *height);
-
-   return IMAGE_PROCESS_END;
-}
-
-bool rbmp_set_buf_ptr(rbmp_t *rbmp, void *data)
-{
-   if (!rbmp)
-      return false;
-
-   rbmp->buff_data = (uint8_t*)data;
-
-   return true;
-}
-
-void rbmp_free(rbmp_t *rbmp)
-{
-   if (!rbmp)
-      return;
-
-   free(rbmp);
-}
-
-rbmp_t *rbmp_alloc(void)
-{
-   rbmp_t *rbmp = (rbmp_t*)calloc(1, sizeof(*rbmp));
-   if (!rbmp)
-      return NULL;
-   return rbmp;
-}
diff --git a/libretro-common/formats/bmp/rbmp_encode.c b/libretro-common/formats/bmp/rbmp_encode.c
deleted file mode 100644
index 9c2e199..0000000
--- a/libretro-common/formats/bmp/rbmp_encode.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rbmp_encode.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <streams/file_stream.h>
-#include <formats/rbmp.h>
-
-static bool write_header_bmp(RFILE *file, unsigned width, unsigned height, bool is32bpp)
-{
-   uint8_t header[54];
-   unsigned line_size  = (width * (is32bpp?4:3) + 3) & ~3;
-   unsigned size       = line_size * height + 54;
-   unsigned size_array = line_size * height;
-
-   /* Generic BMP stuff. */
-
-   /* signature */
-   header[0] = 'B';
-   header[1] = 'M';
-   /* file size */
-   header[2] = (uint8_t)(size >> 0);
-   header[3] = (uint8_t)(size >> 8);
-   header[4] = (uint8_t)(size >> 16);
-   header[5] = (uint8_t)(size >> 24);
-   /* reserved */
-   header[6] = 0;
-   header[7] = 0;
-   header[8] = 0;
-   header[9] = 0;
-   /* offset */
-   header[10] = 54;
-   header[11] = 0;
-   header[12] = 0;
-   header[13] = 0;
-   /* DIB size */
-   header[14] = 40;
-   header[15] = 0;
-   header[16] = 0;
-   header[17] = 0;
-   /* Width */
-   header[18] = (uint8_t)(width >> 0);
-   header[19] = (uint8_t)(width >> 8);
-   header[20] = (uint8_t)(width >> 16);
-   header[21] = (uint8_t)(width >> 24);
-   /* Height */
-   header[22] = (uint8_t)(height >> 0);
-   header[23] = (uint8_t)(height >> 8);
-   header[24] = (uint8_t)(height >> 16);
-   header[25] = (uint8_t)(height >> 24);
-   /* Color planes */
-   header[26] = 1;
-   header[27] = 0;
-   /* Bits per pixel */
-   header[28] = is32bpp?32:24;
-   header[29] = 0;
-   /* Compression method */
-   header[30] = 0;
-   header[31] = 0;
-   header[32] = 0;
-   header[33] = 0;
-   /* Image data size */
-   header[34] = (uint8_t)(size_array >> 0);
-   header[35] = (uint8_t)(size_array >> 8);
-   header[36] = (uint8_t)(size_array >> 16);
-   header[37] = (uint8_t)(size_array >> 24);
-   /* Horizontal resolution */
-   header[38] = 19;
-   header[39] = 11;
-   header[40] = 0;
-   header[41] = 0;
-   /* Vertical resolution */
-   header[42] = 19;
-   header[43] = 11;
-   header[44] = 0;
-   header[45] = 0;
-   /* Palette size */
-   header[46] = 0;
-   header[47] = 0;
-   header[48] = 0;
-   header[49] = 0;
-   /* Important color count */
-   header[50] = 0;
-   header[51] = 0;
-   header[52] = 0;
-   header[53] = 0;
-
-   return filestream_write(file, header, sizeof(header)) == sizeof(header);
-}
-
-static void dump_line_565_to_24(uint8_t *line, const uint16_t *src, unsigned width)
-{
-   unsigned i;
-
-   for (i = 0; i < width; i++)
-   {
-      uint16_t pixel = *src++;
-      uint8_t b = (pixel >>  0) & 0x1f;
-      uint8_t g = (pixel >>  5) & 0x3f;
-      uint8_t r = (pixel >> 11) & 0x1f;
-      *line++   = (b << 3) | (b >> 2);
-      *line++   = (g << 2) | (g >> 4);
-      *line++   = (r << 3) | (r >> 2);
-   }
-}
-
-static void dump_line_32_to_24(uint8_t *line, const uint32_t *src, unsigned width)
-{
-   unsigned i;
-
-   for (i = 0; i < width; i++)
-   {
-      uint32_t pixel = *src++;
-      *line++ = (pixel >>  0) & 0xff;
-      *line++ = (pixel >>  8) & 0xff;
-      *line++ = (pixel >> 16) & 0xff;
-   }
-}
-
-static void dump_content(RFILE *file, const void *frame,
-      int width, int height, int pitch, enum rbmp_source_type type)
-{
-   int j;
-   size_t line_size;
-   uint8_t *line       = NULL;
-   int bytes_per_pixel = (type==RBMP_SOURCE_TYPE_ARGB8888?4:3);
-   union
-   {
-      const uint8_t *u8;
-      const uint16_t *u16;
-      const uint32_t *u32;
-   } u;
-
-   u.u8      = (const uint8_t*)frame;
-   line_size = (width * bytes_per_pixel + 3) & ~3;
-
-   switch (type)
-   {
-      case RBMP_SOURCE_TYPE_BGR24:
-         {
-            /* BGR24 byte order input matches output. Can directly copy, but... need to make sure we pad it. */
-            uint32_t zeros = 0;
-            int pad        = (int)(line_size-pitch);
-            for (j = 0; j < height; j++, u.u8 += pitch)
-            {
-               filestream_write(file, u.u8, pitch);
-               if(pad != 0)
-                  filestream_write(file, &zeros, pad);
-            }
-         }
-         break;
-      case RBMP_SOURCE_TYPE_ARGB8888:
-         /* ARGB8888 byte order input matches output. Can directly copy. */
-         for (j = 0; j < height; j++, u.u8 += pitch)
-            filestream_write(file, u.u8, line_size);
-         return;
-      default:
-         break;
-   }
-
-   /* allocate line buffer, and initialize the final four bytes to zero, for deterministic padding */
-   line = (uint8_t*)malloc(line_size);
-   if (!line)
-      return;
-   *(uint32_t*)(line + line_size - 4) = 0;
-
-   switch (type)
-   {
-      case RBMP_SOURCE_TYPE_XRGB888:
-         for (j = 0; j < height; j++, u.u8 += pitch)
-         {
-            dump_line_32_to_24(line, u.u32, width);
-            filestream_write(file, line, line_size);
-         }
-         break;
-      case RBMP_SOURCE_TYPE_RGB565:
-         for (j = 0; j < height; j++, u.u8 += pitch)
-         {
-            dump_line_565_to_24(line, u.u16, width);
-            filestream_write(file, line, line_size);
-         }
-         break;
-      default:
-         break;
-   }
-
-   /* Free allocated line buffer */
-   free(line);
-}
-
-bool rbmp_save_image(
-      const char *filename,
-      const void *frame,
-      unsigned width, unsigned height,
-      unsigned pitch, enum rbmp_source_type type)
-{
-   bool ret    = false;
-   RFILE *file = filestream_open(filename, RFILE_MODE_WRITE, -1);
-   if (!file)
-      return false;
-
-   ret = write_header_bmp(file, width, height, type==RBMP_SOURCE_TYPE_ARGB8888);
-
-   if (ret)
-      dump_content(file, frame, width, height, pitch, type);
-
-   filestream_close(file);
-
-   return ret;
-}
diff --git a/libretro-common/formats/image_texture.c b/libretro-common/formats/image_texture.c
deleted file mode 100644
index 0f24004..0000000
--- a/libretro-common/formats/image_texture.c
+++ /dev/null
@@ -1,315 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (image_texture.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stddef.h>
-
-#include <boolean.h>
-#include <formats/image.h>
-#include <file/nbio.h>
-
-enum video_image_format
-{
-   IMAGE_FORMAT_NONE = 0,
-   IMAGE_FORMAT_TGA,
-   IMAGE_FORMAT_PNG,
-   IMAGE_FORMAT_JPEG,
-   IMAGE_FORMAT_BMP
-};
-
-bool image_texture_set_color_shifts(
-      unsigned *r_shift, unsigned *g_shift, unsigned *b_shift,
-      unsigned *a_shift,
-      struct texture_image *out_img
-      )
-{
-   *a_shift             = 24;
-   *r_shift             = 16;
-   *g_shift             = 8;
-   *b_shift             = 0;
-
-   if (out_img->supports_rgba)
-   {
-      *r_shift = 0;
-      *b_shift = 16;
-      return true;
-   }
-
-   return false;
-}
-
-bool image_texture_color_convert(unsigned r_shift,
-      unsigned g_shift, unsigned b_shift, unsigned a_shift,
-      struct texture_image *out_img)
-{
-   /* This is quite uncommon. */
-   if (a_shift != 24 || r_shift != 16 || g_shift != 8 || b_shift != 0)
-   {
-      uint32_t i;
-      uint32_t num_pixels = out_img->width * out_img->height;
-      uint32_t *pixels    = (uint32_t*)out_img->pixels;
-
-      for (i = 0; i < num_pixels; i++)
-      {
-         uint32_t col = pixels[i];
-         uint8_t a    = (uint8_t)(col >> 24);
-         uint8_t r    = (uint8_t)(col >> 16);
-         uint8_t g    = (uint8_t)(col >>  8);
-         uint8_t b    = (uint8_t)(col >>  0);
-         pixels[i]    = (a << a_shift) |
-            (r << r_shift) | (g << g_shift) | (b << b_shift);
-      }
-
-      return true;
-   }
-
-   return false;
-}
-
-#ifdef GEKKO
-
-#define GX_BLIT_LINE_32(off) \
-{ \
-   unsigned x; \
-   const uint16_t *tmp_src = src; \
-   uint16_t       *tmp_dst = dst; \
-   for (x = 0; x < width2 >> 3; x++, tmp_src += 8, tmp_dst += 32) \
-   { \
-      tmp_dst[  0 + off] = tmp_src[0]; \
-      tmp_dst[ 16 + off] = tmp_src[1]; \
-      tmp_dst[  1 + off] = tmp_src[2]; \
-      tmp_dst[ 17 + off] = tmp_src[3]; \
-      tmp_dst[  2 + off] = tmp_src[4]; \
-      tmp_dst[ 18 + off] = tmp_src[5]; \
-      tmp_dst[  3 + off] = tmp_src[6]; \
-      tmp_dst[ 19 + off] = tmp_src[7]; \
-   } \
-   src += tmp_pitch; \
-}
-
-static bool image_texture_internal_gx_convert_texture32(
-      struct texture_image *image)
-{
-   unsigned tmp_pitch, width2, i;
-   const uint16_t *src = NULL;
-   uint16_t *dst       = NULL;
-   /* Memory allocation in libogc is extremely primitive so try 
-    * to avoid gaps in memory when converting by copying over to 
-    * a temporary buffer first, then converting over into 
-    * main buffer again. */
-   void *tmp           = malloc(image->width 
-         * image->height * sizeof(uint32_t));
-
-   if (!tmp)
-      return false;
-
-   memcpy(tmp, image->pixels, image->width 
-         * image->height * sizeof(uint32_t));
-   tmp_pitch = (image->width * sizeof(uint32_t)) >> 1;
-
-   image->width       &= ~3;
-   image->height      &= ~3;
-   width2              = image->width << 1;
-   src                 = (uint16_t*)tmp;
-   dst                 = (uint16_t*)image->pixels;
-
-   for (i = 0; i < image->height; i += 4, dst += 4 * width2)
-   {
-      GX_BLIT_LINE_32(0)
-      GX_BLIT_LINE_32(4)
-      GX_BLIT_LINE_32(8)
-      GX_BLIT_LINE_32(12)
-   }
-
-   free(tmp);
-   return true;
-}
-#endif
-
-static bool image_texture_load_internal(
-      enum image_type_enum type,
-      void *ptr,
-      size_t len,
-      struct texture_image *out_img,
-      unsigned a_shift, unsigned r_shift,
-      unsigned g_shift, unsigned b_shift)
-{
-   int ret;
-   bool success = false;
-   void *img    = image_transfer_new(type);
-
-   if (!img)
-      goto end;
-
-   image_transfer_set_buffer_ptr(img, type, (uint8_t*)ptr);
-
-   if (!image_transfer_start(img, type))
-      goto end;
-
-   while (image_transfer_iterate(img, type));
-
-   if (!image_transfer_is_valid(img, type))
-      goto end;
-
-   do
-   {
-      ret = image_transfer_process(img, type,
-            (uint32_t**)&out_img->pixels, len, &out_img->width,
-            &out_img->height);
-   }while(ret == IMAGE_PROCESS_NEXT);
-
-   if (ret == IMAGE_PROCESS_ERROR || ret == IMAGE_PROCESS_ERROR_END)
-      goto end;
-
-   image_texture_color_convert(r_shift, g_shift, b_shift,
-         a_shift, out_img);
-
-#ifdef GEKKO
-   if (!image_texture_internal_gx_convert_texture32(out_img))
-   {
-      image_texture_free(out_img);
-      goto end;
-   }
-#endif
-
-   success = true;
-
-end:
-   if (img)
-      image_transfer_free(img, type);
-
-   return success;
-}
-
-
-void image_texture_free(struct texture_image *img)
-{
-   if (!img)
-      return;
-
-   if (img->pixels)
-      free(img->pixels);
-   img->width  = 0;
-   img->height = 0;
-   img->pixels = NULL;
-}
-
-static enum video_image_format image_texture_get_type(const char *path)
-{
-#ifdef HAVE_RTGA
-   if (strstr(path, ".tga"))
-      return IMAGE_FORMAT_TGA;
-#endif
-#ifdef HAVE_RPNG
-   if (strstr(path, ".png"))
-      return IMAGE_FORMAT_PNG;
-#endif
-#ifdef HAVE_RJPEG
-   if (strstr(path, ".jpg") || strstr(path, ".jpeg"))
-      return IMAGE_FORMAT_JPEG;
-#endif
-#ifdef HAVE_RBMP
-   if (strstr(path, ".bmp"))
-      return IMAGE_FORMAT_BMP;
-#endif
-   return IMAGE_FORMAT_NONE;
-}
-
-static enum image_type_enum image_texture_convert_fmt_to_type(enum video_image_format fmt)
-{
-   switch (fmt)
-   {
-#ifdef HAVE_RPNG
-      case IMAGE_FORMAT_PNG:
-         return IMAGE_TYPE_PNG;
-#endif
-#ifdef HAVE_RJPEG
-      case IMAGE_FORMAT_JPEG:
-         return IMAGE_TYPE_JPEG;
-#endif
-#ifdef HAVE_RBMP
-      case IMAGE_FORMAT_BMP:
-         return IMAGE_TYPE_BMP;
-#endif
-#ifdef HAVE_RTGA
-      case IMAGE_FORMAT_TGA:
-         return IMAGE_TYPE_TGA;
-#endif
-      case IMAGE_FORMAT_NONE:
-      default:
-         break;
-   }
-
-   return IMAGE_TYPE_NONE;
-}
-
-bool image_texture_load(struct texture_image *out_img, 
-      const char *path)
-{
-   unsigned r_shift, g_shift, b_shift, a_shift;
-   size_t file_len             = 0;
-   struct nbio_t      *handle  = NULL;
-   void                   *ptr = NULL;
-   enum video_image_format fmt = image_texture_get_type(path);
-
-   image_texture_set_color_shifts(&r_shift, &g_shift, &b_shift,
-         &a_shift, out_img);
-
-   if (fmt != IMAGE_FORMAT_NONE)
-   {
-      handle = (struct nbio_t*)nbio_open(path, NBIO_READ);
-      if (!handle)
-         goto error;
-      nbio_begin_read(handle);
-
-      while (!nbio_iterate(handle));
-
-      ptr = nbio_get_ptr(handle, &file_len);
-
-      if (!ptr)
-         goto error;
-
-      if (image_texture_load_internal(
-               image_texture_convert_fmt_to_type(fmt),
-               ptr, file_len, out_img,
-               a_shift, r_shift, g_shift, b_shift))
-         goto success;
-   }
-
-error:
-   out_img->supports_rgba = false;
-   out_img->pixels        = NULL;
-   out_img->width         = 0;
-   out_img->height        = 0;
-   if (handle)
-      nbio_free(handle);
-
-   return false;
-
-success:
-   if (handle)
-      nbio_free(handle);
-
-   return true;
-}
diff --git a/libretro-common/formats/image_transfer.c b/libretro-common/formats/image_transfer.c
deleted file mode 100644
index 1bb80b1..0000000
--- a/libretro-common/formats/image_transfer.c
+++ /dev/null
@@ -1,282 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (image_transfer.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <string.h>
-#include <errno.h>
-
-#ifdef HAVE_RPNG
-#include <formats/rpng.h>
-#endif
-#ifdef HAVE_RJPEG
-#include <formats/rjpeg.h>
-#endif
-#ifdef HAVE_RTGA
-#include <formats/rtga.h>
-#endif
-#ifdef HAVE_RBMP
-#include <formats/rbmp.h>
-#endif
-
-#include <formats/image.h>
-
-void image_transfer_free(void *data, enum image_type_enum type)
-{
-   switch (type)
-   {
-      case IMAGE_TYPE_TGA:
-#ifdef HAVE_RTGA
-         rtga_free((rtga_t*)data);
-#endif
-         break;
-      case IMAGE_TYPE_PNG:
-#ifdef HAVE_RPNG
-         rpng_free((rpng_t*)data);
-#endif
-         break;
-      case IMAGE_TYPE_JPEG:
-#ifdef HAVE_RJPEG
-         rjpeg_free((rjpeg_t*)data);
-#endif
-         break;
-      case IMAGE_TYPE_BMP:
-#ifdef HAVE_RBMP
-         rbmp_free((rbmp_t*)data);
-#endif
-         break;
-      case IMAGE_TYPE_NONE:
-         break;
-   }
-}
-
-void *image_transfer_new(enum image_type_enum type)
-{
-   switch (type)
-   {
-      case IMAGE_TYPE_PNG:
-#ifdef HAVE_RPNG
-         return rpng_alloc();
-#else
-         break;
-#endif
-      case IMAGE_TYPE_JPEG:
-#ifdef HAVE_RJPEG
-         return rjpeg_alloc();
-#else
-         break;
-#endif
-      case IMAGE_TYPE_TGA:
-#ifdef HAVE_RTGA
-         return rtga_alloc();
-#else
-         break;
-#endif
-      case IMAGE_TYPE_BMP:
-#ifdef HAVE_RBMP
-         return rbmp_alloc();
-#else
-         break;
-#endif
-      default:
-         break;
-   }
-
-   return NULL;
-}
-
-bool image_transfer_start(void *data, enum image_type_enum type)
-{
-
-   switch (type)
-   {
-      case IMAGE_TYPE_PNG:
-#ifdef HAVE_RPNG
-         if (!rpng_start((rpng_t*)data))
-            break;
-         return true;
-#else
-         break;
-#endif
-      case IMAGE_TYPE_JPEG:
-#ifdef HAVE_RJPEG
-         return true;
-#else
-         break;
-#endif
-      case IMAGE_TYPE_TGA:
-#ifdef HAVE_RTGA
-         return true;
-#else
-         break;
-#endif
-      case IMAGE_TYPE_BMP:
-         return true;
-      case IMAGE_TYPE_NONE:
-         break;
-   }
-
-   return false;
-}
-
-bool image_transfer_is_valid(
-      void *data,
-      enum image_type_enum type)
-{
-   switch (type)
-   {
-      case IMAGE_TYPE_PNG:
-#ifdef HAVE_RPNG
-         return rpng_is_valid((rpng_t*)data);
-#else
-         break;
-#endif
-      case IMAGE_TYPE_JPEG:
-#ifdef HAVE_RJPEG
-         return true;
-#else
-         break;
-#endif
-      case IMAGE_TYPE_TGA:
-#ifdef HAVE_RTGA
-         return true;
-#else
-         break;
-#endif
-      case IMAGE_TYPE_BMP:
-         return true;
-      case IMAGE_TYPE_NONE:
-         break;
-   }
-
-   return false;
-}
-
-void image_transfer_set_buffer_ptr(
-      void *data,
-      enum image_type_enum type,
-      void *ptr)
-{
-   switch (type)
-   {
-      case IMAGE_TYPE_PNG:
-#ifdef HAVE_RPNG
-         rpng_set_buf_ptr((rpng_t*)data, (uint8_t*)ptr);
-#endif
-         break;
-      case IMAGE_TYPE_JPEG:
-#ifdef HAVE_RJPEG
-         rjpeg_set_buf_ptr((rjpeg_t*)data, (uint8_t*)ptr);
-#endif
-         break;
-      case IMAGE_TYPE_TGA:
-#ifdef HAVE_RTGA
-         rtga_set_buf_ptr((rtga_t*)data, (uint8_t*)ptr);
-#endif
-         break;
-      case IMAGE_TYPE_BMP:
-#ifdef HAVE_RBMP
-         rbmp_set_buf_ptr((rbmp_t*)data, (uint8_t*)ptr);
-#endif
-         break;
-      case IMAGE_TYPE_NONE:
-         break;
-   }
-}
-
-int image_transfer_process(
-      void *data,
-      enum image_type_enum type,
-      uint32_t **buf, size_t len,
-      unsigned *width, unsigned *height)
-{
-   switch (type)
-   {
-      case IMAGE_TYPE_PNG:
-#ifdef HAVE_RPNG
-         if (!rpng_is_valid((rpng_t*)data))
-            return IMAGE_PROCESS_ERROR;
-
-         return rpng_process_image(
-               (rpng_t*)data,
-               (void**)buf, len, width, height);
-#else
-         break;
-#endif
-      case IMAGE_TYPE_JPEG:
-#ifdef HAVE_RJPEG
-         return rjpeg_process_image((rjpeg_t*)data,
-               (void**)buf, len, width, height);
-#else
-         break;
-#endif
-      case IMAGE_TYPE_TGA:
-#ifdef HAVE_RTGA
-         return rtga_process_image((rtga_t*)data,
-               (void**)buf, len, width, height);
-#else
-         break;
-#endif
-      case IMAGE_TYPE_BMP:
-#ifdef HAVE_RBMP
-         return rbmp_process_image((rbmp_t*)data,
-               (void**)buf, len, width, height);
-#else
-         break;
-#endif
-      case IMAGE_TYPE_NONE:
-         break;
-   }
-
-   return 0;
-}
-
-bool image_transfer_iterate(void *data, enum image_type_enum type)
-{
-   
-   switch (type)
-   {
-      case IMAGE_TYPE_PNG:
-#ifdef HAVE_RPNG
-         if (!rpng_iterate_image((rpng_t*)data))
-            return false;
-#endif
-         break;
-      case IMAGE_TYPE_JPEG:
-#ifdef HAVE_RJPEG
-         return false;
-#else
-         break;
-#endif
-      case IMAGE_TYPE_TGA:
-#ifdef HAVE_RTGA
-         return false;
-#else
-         break;
-#endif
-      case IMAGE_TYPE_BMP:
-         return false;
-      case IMAGE_TYPE_NONE:
-         return false;
-   }
-
-   return true;
-}
diff --git a/libretro-common/formats/jpeg/rjpeg.c b/libretro-common/formats/jpeg/rjpeg.c
deleted file mode 100644
index 6755c62..0000000
--- a/libretro-common/formats/jpeg/rjpeg.c
+++ /dev/null
@@ -1,2626 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rjpeg.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* Modified version of stb_image's JPEG sources. */
-
-#include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h> /* ptrdiff_t on osx */
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_assert.h>
-#include <retro_inline.h>
-#include <boolean.h>
-#include <formats/image.h>
-#include <formats/rjpeg.h>
-#include <features/features_cpu.h>
-
-enum
-{
-   RJPEG_DEFAULT = 0, /* only used for req_comp */
-   RJPEG_GREY,
-   RJPEG_GREY_ALPHA,
-   RJPEG_RGB,
-   RJPEG_RGB_ALPHA
-};
-
-enum
-{
-   RJPEG_SCAN_LOAD = 0,
-   RJPEG_SCAN_TYPE,
-   RJPEG_SCAN_HEADER
-};
-
-typedef uint8_t *(*rjpeg_resample_row_func)(uint8_t *out, uint8_t *in0, uint8_t *in1,
-                                    int w, int hs);
-
-typedef struct
-{
-   rjpeg_resample_row_func resample;
-   uint8_t *line0;
-   uint8_t *line1;
-   int hs,vs;   /* expansion factor in each axis */
-   int w_lores; /* horizontal pixels pre-expansion */
-   int ystep;   /* how far through vertical expansion we are */
-   int ypos;    /* which pre-expansion row we're on */
-} rjpeg__resample;
-
-struct rjpeg
-{
-   uint8_t *buff_data;
-};
-
-#ifdef _MSC_VER
-#define RJPEG_HAS_LROTL
-#endif
-
-#ifdef RJPEG_HAS_LROTL
-   #define rjpeg_lrot(x,y)  _lrotl(x,y)
-#else
-   #define rjpeg_lrot(x,y)  (((x) << (y)) | ((x) >> (32 - (y))))
-#endif
-
-/* x86/x64 detection */
-#if defined(__x86_64__) || defined(_M_X64)
-#define RJPEG__X64_TARGET
-#elif defined(__i386) || defined(_M_IX86)
-#define RJPEG__X86_TARGET
-#endif
-
-#if defined(__GNUC__) && (defined(RJPEG__X86_TARGET) || defined(RJPEG__X64_TARGET)) && !defined(__SSE2__) && !defined(RJPEG_NO_SIMD)
-/* NOTE: not clear do we actually need this for the 64-bit path?
- * gcc doesn't support sse2 intrinsics unless you compile with -msse2,
- * (but compiling with -msse2 allows the compiler to use SSE2 everywhere;
- * this is just broken and gcc are jerks for not fixing it properly
- * http://www.virtualdub.org/blog/pivot/entry.php?id=363 )
- */
-#define RJPEG_NO_SIMD
-#endif
-
-#if defined(__MINGW32__) && defined(RJPEG__X86_TARGET) && !defined(RJPEG_MINGW_ENABLE_SSE2) && !defined(RJPEG_NO_SIMD)
-/* Note that __MINGW32__ doesn't actually mean 32-bit, so we have to avoid RJPEG__X64_TARGET
- *
- * 32-bit MinGW wants ESP to be 16-byte aligned, but this is not in the
- * Windows ABI and VC++ as well as Windows DLLs don't maintain that invariant.
- * As a result, enabling SSE2 on 32-bit MinGW is dangerous when not
- * simultaneously enabling "-mstackrealign".
- *
- * See https://github.com/nothings/stb/issues/81 for more information.
- *
- * So default to no SSE2 on 32-bit MinGW. If you've read this far and added
- * -mstackrealign to your build settings, feel free to #define RJPEG_MINGW_ENABLE_SSE2.
- */
-#define RJPEG_NO_SIMD
-#endif
-
-#if defined(__SSE2__)
-#include <emmintrin.h>
-
-#ifdef _MSC_VER
-#define RJPEG_SIMD_ALIGN(type, name) __declspec(align(16)) type name
-#else
-#define RJPEG_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
-#endif
-
-#endif
-
-/* ARM NEON */
-#if defined(RJPEG_NO_SIMD) && defined(RJPEG_NEON)
-#undef RJPEG_NEON
-#endif
-
-#ifdef RJPEG_NEON
-#include <arm_neon.h>
-/* assume GCC or Clang on ARM targets */
-#define RJPEG_SIMD_ALIGN(type, name) type name __attribute__((aligned(16)))
-#endif
-
-#ifndef RJPEG_SIMD_ALIGN
-#define RJPEG_SIMD_ALIGN(type, name) type name
-#endif
-
-typedef struct
-{
-   uint32_t img_x;
-   uint32_t img_y;
-   int      img_n;
-   int      img_out_n;
-
-   int      buflen;
-   uint8_t  buffer_start[128];
-
-   uint8_t *img_buffer;
-   uint8_t *img_buffer_end;
-   uint8_t *img_buffer_original;
-} rjpeg__context;
-
-static INLINE uint8_t rjpeg__get8(rjpeg__context *s)
-{
-   if (s->img_buffer < s->img_buffer_end)
-      return *s->img_buffer++;
-
-   return 0;
-}
-
-#define RJPEG__AT_EOF(s)    ((s)->img_buffer >= (s)->img_buffer_end)
-
-#define RJPEG__GET16BE(s)   ((rjpeg__get8((s)) << 8) + rjpeg__get8((s)))
-
-#define RJPEG__BYTECAST(x)  ((uint8_t) ((x) & 255))  /* truncate int to byte without warnings */
-
-/* huffman decoding acceleration */
-#define FAST_BITS   9  /* larger handles more cases; smaller stomps less cache */
-
-typedef struct
-{
-   uint8_t  fast[1 << FAST_BITS];
-   /* weirdly, repacking this into AoS is a 10% speed loss, instead of a win */
-   uint16_t code[256];
-   uint8_t  values[256];
-   uint8_t  size[257];
-   unsigned int maxcode[18];
-   int    delta[17];   /* old 'firstsymbol' - old 'firstcode' */
-} rjpeg__huffman;
-
-typedef struct
-{
-   rjpeg__context *s;
-   rjpeg__huffman huff_dc[4];
-   rjpeg__huffman huff_ac[4];
-   uint8_t dequant[4][64];
-   int16_t fast_ac[4][1 << FAST_BITS];
-
-   /* sizes for components, interleaved MCUs */
-   int img_h_max, img_v_max;
-   int img_mcu_x, img_mcu_y;
-   int img_mcu_w, img_mcu_h;
-
-   /* definition of jpeg image component */
-   struct
-   {
-      int id;
-      int h,v;
-      int tq;
-      int hd,ha;
-      int dc_pred;
-
-      int x,y,w2,h2;
-      uint8_t *data;
-      void *raw_data, *raw_coeff;
-      uint8_t *linebuf;
-      short   *coeff;            /* progressive only */
-      int      coeff_w;          /* number of 8x8 coefficient blocks */
-      int      coeff_h;          /* number of 8x8 coefficient blocks */
-   } img_comp[4];
-
-   uint32_t       code_buffer;   /* jpeg entropy-coded buffer */
-   int            code_bits;     /* number of valid bits */
-   unsigned char  marker;        /* marker seen while filling entropy buffer */
-   int            nomore;        /* flag if we saw a marker so must stop */
-
-   int            progressive;
-   int            spec_start;
-   int            spec_end;
-   int            succ_high;
-   int            succ_low;
-   int            eob_run;
-
-   int scan_n, order[4];
-   int restart_interval, todo;
-
-   /* kernels */
-   void (*idct_block_kernel)(uint8_t *out, int out_stride, short data[64]);
-   void (*YCbCr_to_RGB_kernel)(uint8_t *out, const uint8_t *y, const uint8_t *pcb,
-         const uint8_t *pcr, int count, int step);
-   uint8_t *(*resample_row_hv_2_kernel)(uint8_t *out, uint8_t *in_near,
-         uint8_t *in_far, int w, int hs);
-} rjpeg__jpeg;
-
-#define rjpeg__f2f(x)  ((int) (((x) * 4096 + 0.5)))
-#define rjpeg__fsh(x)  ((x) << 12)
-
-#define RJPEG__MARKER_NONE  0xff
-/* if there's a pending marker from the entropy stream, return that
- * otherwise, fetch from the stream and get a marker. if there's no
- * marker, return 0xff, which is never a valid marker value
- */
-
-/* in each scan, we'll have scan_n components, and the order
- * of the components is specified by order[]
- */
-#define RJPEG__RESTART(x)     ((x) >= 0xd0 && (x) <= 0xd7)
-
-#define JPEG_MARKER           0xFF
-#define JPEG_MARKER_SOI       0xD8
-#define JPEG_MARKER_SOS       0xDA
-#define JPEG_MARKER_EOI       0xD9
-#define JPEG_MARKER_APP1      0xE1
-#define JPEG_MARKER_APP2      0xE2
-
-/* use comparisons since in some cases we handle more than one case (e.g. SOF) */
-#define rjpeg__SOF(x)         ((x) == 0xc0 || (x) == 0xc1 || (x) == 0xc2)
-
-#define rjpeg__SOF_progressive(x)   ((x) == 0xc2)
-#define rjpeg__div4(x)              ((uint8_t) ((x) >> 2))
-#define rjpeg__div16(x)             ((uint8_t) ((x) >> 4))
-
-static int rjpeg__build_huffman(rjpeg__huffman *h, int *count)
-{
-   int i,j,k=0,code;
-
-   /* build size list for each symbol (from JPEG spec) */
-   for (i=0; i < 16; ++i)
-      for (j=0; j < count[i]; ++j)
-         h->size[k++] = (uint8_t) (i+1);
-
-   h->size[k] = 0;
-   /* compute actual symbols (from jpeg spec) */
-   code       = 0;
-   k          = 0;
-
-   for(j=1; j <= 16; ++j)
-   {
-      /* compute delta to add to code to compute symbol id */
-      h->delta[j] = k - code;
-      if (h->size[k] == j)
-      {
-         while (h->size[k] == j)
-            h->code[k++] = (uint16_t) (code++);
-
-         /* Bad code lengths, corrupt JPEG? */
-         if (code-1 >= (1 << j))
-            return 0;
-      }
-      /* compute largest code + 1 for this size, preshifted as needed later */
-      h->maxcode[j] = code << (16-j);
-      code <<= 1;
-   }
-   h->maxcode[j] = 0xffffffff;
-
-   /* build non-spec acceleration table; 255 is flag for not-accelerated */
-   memset(h->fast, 255, 1 << FAST_BITS);
-   for (i=0; i < k; ++i)
-   {
-      int s = h->size[i];
-      if (s <= FAST_BITS)
-      {
-         int c = h->code[i] << (FAST_BITS-s);
-         int m = 1 << (FAST_BITS-s);
-         for (j=0; j < m; ++j)
-            h->fast[c+j] = (uint8_t) i;
-      }
-   }
-   return 1;
-}
-
-/* build a table that decodes both magnitude and value of small ACs in
- * one go. */
-static void rjpeg__build_fast_ac(int16_t *fast_ac, rjpeg__huffman *h)
-{
-   int i;
-
-   for (i=0; i < (1 << FAST_BITS); ++i)
-   {
-      uint8_t fast = h->fast[i];
-
-      fast_ac[i] = 0;
-
-      if (fast < 255)
-      {
-         int rs      = h->values[fast];
-         int run     = (rs >> 4) & 15;
-         int magbits = rs & 15;
-         int len     = h->size[fast];
-
-         if (magbits && len + magbits <= FAST_BITS)
-         {
-            /* magnitude code followed by receive_extend code */
-            int k = ((i << len) & ((1 << FAST_BITS) - 1)) >> (FAST_BITS - magbits);
-            int m = 1 << (magbits - 1);
-            if (k < m)
-               k += (-1 << magbits) + 1;
-
-            /* if the result is small enough, we can fit it in fast_ac table */
-            if (k >= -128 && k <= 127)
-               fast_ac[i] = (int16_t) ((k << 8) + (run << 4) + (len + magbits));
-         }
-      }
-   }
-}
-
-static void rjpeg__grow_buffer_unsafe(rjpeg__jpeg *j)
-{
-   do
-   {
-      int b = j->nomore ? 0 : rjpeg__get8(j->s);
-      if (b == 0xff)
-      {
-         int c = rjpeg__get8(j->s);
-
-         if (c != 0)
-         {
-            j->marker = (unsigned char) c;
-            j->nomore = 1;
-            return;
-         }
-      }
-      j->code_buffer |= b << (24 - j->code_bits);
-      j->code_bits   += 8;
-   } while (j->code_bits <= 24);
-}
-
-/* (1 << n) - 1 */
-static uint32_t rjpeg__bmask[17]={0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535};
-
-/* decode a JPEG huffman value from the bitstream */
-static INLINE int rjpeg__jpeg_huff_decode(rjpeg__jpeg *j, rjpeg__huffman *h)
-{
-   unsigned int temp;
-   int c,k;
-
-   if (j->code_bits < 16)
-      rjpeg__grow_buffer_unsafe(j);
-
-   /* look at the top FAST_BITS and determine what symbol ID it is,
-    * if the code is <= FAST_BITS */
-   c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
-   k = h->fast[c];
-
-   if (k < 255)
-   {
-      int s = h->size[k];
-      if (s > j->code_bits)
-         return -1;
-      j->code_buffer <<= s;
-      j->code_bits -= s;
-      return h->values[k];
-   }
-
-   /* naive test is to shift the code_buffer down so k bits are
-    * valid, then test against maxcode. To speed this up, we've
-    * preshifted maxcode left so that it has (16-k) 0s at the
-    * end; in other words, regardless of the number of bits, it
-    * wants to be compared against something shifted to have 16;
-    * that way we don't need to shift inside the loop. */
-   temp = j->code_buffer >> 16;
-   for (k=FAST_BITS+1 ; ; ++k)
-      if (temp < h->maxcode[k])
-         break;
-
-   if (k == 17)
-   {
-      /* error! code not found */
-      j->code_bits -= 16;
-      return -1;
-   }
-
-   if (k > j->code_bits)
-      return -1;
-
-   /* convert the huffman code to the symbol id */
-   c = ((j->code_buffer >> (32 - k)) & rjpeg__bmask[k]) + h->delta[k];
-   assert((((j->code_buffer) >> (32 - h->size[c])) & rjpeg__bmask[h->size[c]]) == h->code[c]);
-
-   /* convert the id to a symbol */
-   j->code_bits -= k;
-   j->code_buffer <<= k;
-   return h->values[c];
-}
-
-/* bias[n] = (-1<<n) + 1 */
-static int const rjpeg__jbias[16] = {0,-1,-3,-7,-15,-31,-63,-127,-255,-511,-1023,-2047,-4095,-8191,-16383,-32767};
-
-/* combined JPEG 'receive' and JPEG 'extend', since baseline
- * always extends everything it receives. */
-static INLINE int rjpeg__extend_receive(rjpeg__jpeg *j, int n)
-{
-   unsigned int k;
-   int sgn;
-   if (j->code_bits < n)
-      rjpeg__grow_buffer_unsafe(j);
-
-   sgn = (int32_t)j->code_buffer >> 31; /* sign bit is always in MSB */
-   k = rjpeg_lrot(j->code_buffer, n);
-   assert(n >= 0 && n < (int) (sizeof(rjpeg__bmask)/sizeof(*rjpeg__bmask)));
-   j->code_buffer = k & ~rjpeg__bmask[n];
-   k &= rjpeg__bmask[n];
-   j->code_bits -= n;
-   return k + (rjpeg__jbias[n] & ~sgn);
-}
-
-/* get some unsigned bits */
-static INLINE int rjpeg__jpeg_get_bits(rjpeg__jpeg *j, int n)
-{
-   unsigned int k;
-   if (j->code_bits < n)
-      rjpeg__grow_buffer_unsafe(j);
-   k = rjpeg_lrot(j->code_buffer, n);
-   j->code_buffer = k & ~rjpeg__bmask[n];
-   k &= rjpeg__bmask[n];
-   j->code_bits -= n;
-   return k;
-}
-
-static INLINE int rjpeg__jpeg_get_bit(rjpeg__jpeg *j)
-{
-   unsigned int k;
-   if (j->code_bits < 1)
-      rjpeg__grow_buffer_unsafe(j);
-
-   k = j->code_buffer;
-   j->code_buffer <<= 1;
-   --j->code_bits;
-   return k & 0x80000000;
-}
-
-/* given a value that's at position X in the zigzag stream,
- * where does it appear in the 8x8 matrix coded as row-major? */
-static uint8_t rjpeg__jpeg_dezigzag[64+15] =
-{
-    0,  1,  8, 16,  9,  2,  3, 10,
-   17, 24, 32, 25, 18, 11,  4,  5,
-   12, 19, 26, 33, 40, 48, 41, 34,
-   27, 20, 13,  6,  7, 14, 21, 28,
-   35, 42, 49, 56, 57, 50, 43, 36,
-   29, 22, 15, 23, 30, 37, 44, 51,
-   58, 59, 52, 45, 38, 31, 39, 46,
-   53, 60, 61, 54, 47, 55, 62, 63,
-   /* let corrupt input sample past end */
-   63, 63, 63, 63, 63, 63, 63, 63,
-   63, 63, 63, 63, 63, 63, 63
-};
-
-/* decode one 64-entry block-- */
-static int rjpeg__jpeg_decode_block(
-      rjpeg__jpeg *j, short data[64],
-      rjpeg__huffman *hdc,
-      rjpeg__huffman *hac,
-      int16_t *fac,
-      int b,
-      uint8_t *dequant)
-{
-   int diff,dc,k;
-   int t;
-
-   if (j->code_bits < 16)
-      rjpeg__grow_buffer_unsafe(j);
-   t = rjpeg__jpeg_huff_decode(j, hdc);
-
-   /* Bad huffman code. Corrupt JPEG? */
-   if (t < 0)
-      return 0;
-
-   /* 0 all the ac values now so we can do it 32-bits at a time */
-   memset(data,0,64*sizeof(data[0]));
-
-   diff = t ? rjpeg__extend_receive(j, t) : 0;
-   dc = j->img_comp[b].dc_pred + diff;
-   j->img_comp[b].dc_pred = dc;
-   data[0] = (short) (dc * dequant[0]);
-
-   /* decode AC components, see JPEG spec */
-   k = 1;
-   do
-   {
-      unsigned int zig;
-      int c,r,s;
-      if (j->code_bits < 16)
-         rjpeg__grow_buffer_unsafe(j);
-      c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
-      r = fac[c];
-      if (r)
-      {
-         /* fast-AC path */
-         k += (r >> 4) & 15; /* run */
-         s = r & 15;         /* combined length */
-         j->code_buffer <<= s;
-         j->code_bits -= s;
-         /* decode into unzigzag'd location */
-         zig = rjpeg__jpeg_dezigzag[k++];
-         data[zig] = (short) ((r >> 8) * dequant[zig]);
-      }
-      else
-      {
-         int rs = rjpeg__jpeg_huff_decode(j, hac);
-
-         /* Bad huffman code. Corrupt JPEG? */
-         if (rs < 0)
-            return 0;
-
-         s = rs & 15;
-         r = rs >> 4;
-         if (s == 0)
-         {
-            if (rs != 0xf0)
-               break; /* end block */
-            k += 16;
-         }
-         else
-         {
-            k += r;
-            /* decode into unzigzag'd location */
-            zig = rjpeg__jpeg_dezigzag[k++];
-            data[zig] = (short) (rjpeg__extend_receive(j,s) * dequant[zig]);
-         }
-      }
-   } while (k < 64);
-   return 1;
-}
-
-static int rjpeg__jpeg_decode_block_prog_dc(
-      rjpeg__jpeg *j,
-      short data[64],
-      rjpeg__huffman *hdc,
-      int b)
-{
-   /* Can't merge DC and AC. Corrupt JPEG? */
-   if (j->spec_end != 0)
-      return 0;
-
-   if (j->code_bits < 16)
-      rjpeg__grow_buffer_unsafe(j);
-
-   if (j->succ_high == 0)
-   {
-      int t;
-      int diff,dc;
-
-      /* first scan for DC coefficient, must be first */
-      memset(data,0,64*sizeof(data[0])); /* 0 all the ac values now */
-      t = rjpeg__jpeg_huff_decode(j, hdc);
-      diff = t ? rjpeg__extend_receive(j, t) : 0;
-
-      dc = j->img_comp[b].dc_pred + diff;
-      j->img_comp[b].dc_pred = dc;
-      data[0] = (short) (dc << j->succ_low);
-   }
-   else
-   {
-      /* refinement scan for DC coefficient */
-      if (rjpeg__jpeg_get_bit(j))
-         data[0] += (short) (1 << j->succ_low);
-   }
-   return 1;
-}
-
-static int rjpeg__jpeg_decode_block_prog_ac(
-      rjpeg__jpeg *j,
-      short data[64],
-      rjpeg__huffman *hac,
-      int16_t *fac)
-{
-   int k;
-
-   /* Can't merge DC and AC. Corrupt JPEG? */
-   if (j->spec_start == 0)
-      return 0;
-
-   if (j->succ_high == 0)
-   {
-      int shift = j->succ_low;
-
-      if (j->eob_run)
-      {
-         --j->eob_run;
-         return 1;
-      }
-
-      k = j->spec_start;
-      do
-      {
-         unsigned int zig;
-         int c,r,s;
-         if (j->code_bits < 16) rjpeg__grow_buffer_unsafe(j);
-         c = (j->code_buffer >> (32 - FAST_BITS)) & ((1 << FAST_BITS)-1);
-         r = fac[c];
-         if (r)
-         { /* fast-AC path */
-            k += (r >> 4) & 15; /* run */
-            s = r & 15;         /* combined length */
-            j->code_buffer <<= s;
-            j->code_bits -= s;
-            zig = rjpeg__jpeg_dezigzag[k++];
-            data[zig] = (short) ((r >> 8) << shift);
-         }
-         else
-         {
-            int rs = rjpeg__jpeg_huff_decode(j, hac);
-
-            /* Bad huffman code. Corrupt JPEG? */
-            if (rs < 0)
-               return 0;
-
-            s = rs & 15;
-            r = rs >> 4;
-            if (s == 0)
-            {
-               if (r < 15)
-               {
-                  j->eob_run = (1 << r);
-                  if (r)
-                     j->eob_run += rjpeg__jpeg_get_bits(j, r);
-                  --j->eob_run;
-                  break;
-               }
-               k += 16;
-            }
-            else
-            {
-               k += r;
-               zig = rjpeg__jpeg_dezigzag[k++];
-               data[zig] = (short) (rjpeg__extend_receive(j,s) << shift);
-            }
-         }
-      } while (k <= j->spec_end);
-   }
-   else
-   {
-      /* refinement scan for these AC coefficients */
-
-      short bit = (short) (1 << j->succ_low);
-
-      if (j->eob_run)
-      {
-         --j->eob_run;
-         for (k = j->spec_start; k <= j->spec_end; ++k)
-         {
-            short *p = &data[rjpeg__jpeg_dezigzag[k]];
-            if (*p != 0)
-               if (rjpeg__jpeg_get_bit(j))
-                  if ((*p & bit)==0)
-                  {
-                     if (*p > 0)
-                        *p += bit;
-                     else
-                        *p -= bit;
-                  }
-         }
-      }
-      else
-      {
-         k = j->spec_start;
-         do
-         {
-            int r,s;
-            int rs = rjpeg__jpeg_huff_decode(j, hac);
-
-            /* Bad huffman code. Corrupt JPEG? */
-            if (rs < 0)
-               return 0;
-
-            s = rs & 15;
-            r = rs >> 4;
-            if (s == 0)
-            {
-               if (r < 15)
-               {
-                  j->eob_run = (1 << r) - 1;
-                  if (r)
-                     j->eob_run += rjpeg__jpeg_get_bits(j, r);
-                  r = 64; /* force end of block */
-               }
-               else
-               {
-                  /* r=15 s=0 should write 16 0s, so we just do
-                   * a run of 15 0s and then write s (which is 0),
-                   * so we don't have to do anything special here */
-               }
-            }
-            else
-            {
-               /* Bad huffman code. Corrupt JPEG? */
-               if (s != 1)
-                  return 0;
-
-               /* sign bit */
-               if (rjpeg__jpeg_get_bit(j))
-                  s = bit;
-               else
-                  s = -bit;
-            }
-
-            /* advance by r */
-            while (k <= j->spec_end)
-            {
-               short *p = &data[rjpeg__jpeg_dezigzag[k++]];
-               if (*p != 0)
-               {
-                  if (rjpeg__jpeg_get_bit(j))
-                     if ((*p & bit)==0)
-                     {
-                        if (*p > 0)
-                           *p += bit;
-                        else
-                           *p -= bit;
-                     }
-               }
-               else
-               {
-                  if (r == 0)
-                  {
-                     *p = (short) s;
-                     break;
-                  }
-                  --r;
-               }
-            }
-         } while (k <= j->spec_end);
-      }
-   }
-   return 1;
-}
-
-/* take a -128..127 value and rjpeg__clamp it and convert to 0..255 */
-static INLINE uint8_t rjpeg__clamp(int x)
-{
-   /* trick to use a single test to catch both cases */
-   if ((unsigned int) x > 255)
-      return 255;
-   return (uint8_t) x;
-}
-
-
-/* derived from jidctint -- DCT_ISLOW */
-#define RJPEG__IDCT_1D(s0,s1,s2,s3,s4,s5,s6,s7) \
-   int t0,t1,t2,t3,p1,p2,p3,p4,p5,x0,x1,x2,x3; \
-   p2 = s2;                                    \
-   p3 = s6;                                    \
-   p1 = (p2+p3) * rjpeg__f2f(0.5411961f);       \
-   t2 = p1 + p3*rjpeg__f2f(-1.847759065f);      \
-   t3 = p1 + p2*rjpeg__f2f( 0.765366865f);      \
-   p2 = s0;                                    \
-   p3 = s4;                                    \
-   t0 = rjpeg__fsh(p2+p3);                      \
-   t1 = rjpeg__fsh(p2-p3);                      \
-   x0 = t0+t3;                                 \
-   x3 = t0-t3;                                 \
-   x1 = t1+t2;                                 \
-   x2 = t1-t2;                                 \
-   t0 = s7;                                    \
-   t1 = s5;                                    \
-   t2 = s3;                                    \
-   t3 = s1;                                    \
-   p3 = t0+t2;                                 \
-   p4 = t1+t3;                                 \
-   p1 = t0+t3;                                 \
-   p2 = t1+t2;                                 \
-   p5 = (p3+p4)*rjpeg__f2f( 1.175875602f);      \
-   t0 = t0*rjpeg__f2f( 0.298631336f);           \
-   t1 = t1*rjpeg__f2f( 2.053119869f);           \
-   t2 = t2*rjpeg__f2f( 3.072711026f);           \
-   t3 = t3*rjpeg__f2f( 1.501321110f);           \
-   p1 = p5 + p1*rjpeg__f2f(-0.899976223f);      \
-   p2 = p5 + p2*rjpeg__f2f(-2.562915447f);      \
-   p3 = p3*rjpeg__f2f(-1.961570560f);           \
-   p4 = p4*rjpeg__f2f(-0.390180644f);           \
-   t3 += p1+p4;                                \
-   t2 += p2+p3;                                \
-   t1 += p2+p4;                                \
-   t0 += p1+p3;
-
-static void rjpeg__idct_block(uint8_t *out, int out_stride, short data[64])
-{
-   int i,val[64],*v=val;
-   uint8_t   *o = NULL;
-   int16_t   *d = data;
-
-   /* columns */
-   for (i=0; i < 8; ++i,++d, ++v)
-   {
-      /* if all zeroes, shortcut -- this avoids dequantizing 0s and IDCTing */
-      if (d[ 8]==0 && d[16]==0 && d[24]==0 && d[32]==0
-           && d[40]==0 && d[48]==0 && d[56]==0)
-      {
-         /*    no shortcut                 0     seconds
-          *    (1|2|3|4|5|6|7)==0          0     seconds
-          *    all separate               -0.047 seconds
-          *    1 && 2|3 && 4|5 && 6|7:    -0.047 seconds */
-         int dcterm = d[0] << 2;
-         v[0] = v[8] = v[16] = v[24] = v[32] = v[40] = v[48] = v[56] = dcterm;
-      }
-      else
-      {
-         RJPEG__IDCT_1D(d[ 0],d[ 8],d[16],d[24],d[32],d[40],d[48],d[56])
-         /* constants scaled things up by 1<<12; let's bring them back
-          * down, but keep 2 extra bits of precision */
-         x0 += 512; x1 += 512; x2 += 512; x3 += 512;
-         v[ 0] = (x0+t3) >> 10;
-         v[56] = (x0-t3) >> 10;
-         v[ 8] = (x1+t2) >> 10;
-         v[48] = (x1-t2) >> 10;
-         v[16] = (x2+t1) >> 10;
-         v[40] = (x2-t1) >> 10;
-         v[24] = (x3+t0) >> 10;
-         v[32] = (x3-t0) >> 10;
-      }
-   }
-
-   for (i=0, v=val, o=out; i < 8; ++i,v+=8,o+=out_stride)
-   {
-      /* no fast case since the first 1D IDCT spread components out */
-      RJPEG__IDCT_1D(v[0],v[1],v[2],v[3],v[4],v[5],v[6],v[7])
-         /* constants scaled things up by 1<<12, plus we had 1<<2 from first
-          * loop, plus horizontal and vertical each scale by sqrt(8) so together
-          * we've got an extra 1<<3, so 1<<17 total we need to remove.
-          * so we want to round that, which means adding 0.5 * 1<<17,
-          * aka 65536. Also, we'll end up with -128 to 127 that we want
-          * to encode as 0..255 by adding 128, so we'll add that before the shift */
-         x0 += 65536 + (128<<17);
-      x1 += 65536 + (128<<17);
-      x2 += 65536 + (128<<17);
-      x3 += 65536 + (128<<17);
-      /* tried computing the shifts into temps, or'ing the temps to see
-       * if any were out of range, but that was slower */
-      o[0] = rjpeg__clamp((x0+t3) >> 17);
-      o[7] = rjpeg__clamp((x0-t3) >> 17);
-      o[1] = rjpeg__clamp((x1+t2) >> 17);
-      o[6] = rjpeg__clamp((x1-t2) >> 17);
-      o[2] = rjpeg__clamp((x2+t1) >> 17);
-      o[5] = rjpeg__clamp((x2-t1) >> 17);
-      o[3] = rjpeg__clamp((x3+t0) >> 17);
-      o[4] = rjpeg__clamp((x3-t0) >> 17);
-   }
-}
-
-#if defined(__SSE2__)
-/* sse2 integer IDCT. not the fastest possible implementation but it
- * produces bit-identical results to the generic C version so it's
- * fully "transparent".
- */
-static void rjpeg__idct_simd(uint8_t *out, int out_stride, short data[64])
-{
-   /* This is constructed to match our regular (generic) integer IDCT exactly. */
-   __m128i row0, row1, row2, row3, row4, row5, row6, row7;
-   __m128i tmp;
-
-   /* dot product constant: even elems=x, odd elems=y */
-   #define dct_const(x,y)  _mm_setr_epi16((x),(y),(x),(y),(x),(y),(x),(y))
-
-   /* out(0) = c0[even]*x + c0[odd]*y   (c0, x, y 16-bit, out 32-bit)
-    * out(1) = c1[even]*x + c1[odd]*y
-    */
-   #define dct_rot(out0,out1, x,y,c0,c1) \
-      __m128i c0##lo = _mm_unpacklo_epi16((x),(y)); \
-      __m128i c0##hi = _mm_unpackhi_epi16((x),(y)); \
-      __m128i out0##_l = _mm_madd_epi16(c0##lo, c0); \
-      __m128i out0##_h = _mm_madd_epi16(c0##hi, c0); \
-      __m128i out1##_l = _mm_madd_epi16(c0##lo, c1); \
-      __m128i out1##_h = _mm_madd_epi16(c0##hi, c1)
-
-   /* out = in << 12  (in 16-bit, out 32-bit) */
-   #define dct_widen(out, in) \
-      __m128i out##_l = _mm_srai_epi32(_mm_unpacklo_epi16(_mm_setzero_si128(), (in)), 4); \
-      __m128i out##_h = _mm_srai_epi32(_mm_unpackhi_epi16(_mm_setzero_si128(), (in)), 4)
-
-   /* wide add */
-   #define dct_wadd(out, a, b) \
-      __m128i out##_l = _mm_add_epi32(a##_l, b##_l); \
-      __m128i out##_h = _mm_add_epi32(a##_h, b##_h)
-
-   /* wide sub */
-   #define dct_wsub(out, a, b) \
-      __m128i out##_l = _mm_sub_epi32(a##_l, b##_l); \
-      __m128i out##_h = _mm_sub_epi32(a##_h, b##_h)
-
-   /* butterfly a/b, add bias, then shift by "s" and pack */
-   #define dct_bfly32o(out0, out1, a,b,bias,s) \
-      { \
-         __m128i abiased_l = _mm_add_epi32(a##_l, bias); \
-         __m128i abiased_h = _mm_add_epi32(a##_h, bias); \
-         dct_wadd(sum, abiased, b); \
-         dct_wsub(dif, abiased, b); \
-         out0 = _mm_packs_epi32(_mm_srai_epi32(sum_l, s), _mm_srai_epi32(sum_h, s)); \
-         out1 = _mm_packs_epi32(_mm_srai_epi32(dif_l, s), _mm_srai_epi32(dif_h, s)); \
-      }
-
-   /* 8-bit interleave step (for transposes) */
-   #define dct_interleave8(a, b) \
-      tmp = a; \
-      a = _mm_unpacklo_epi8(a, b); \
-      b = _mm_unpackhi_epi8(tmp, b)
-
-   /* 16-bit interleave step (for transposes) */
-   #define dct_interleave16(a, b) \
-      tmp = a; \
-      a = _mm_unpacklo_epi16(a, b); \
-      b = _mm_unpackhi_epi16(tmp, b)
-
-   #define dct_pass(bias,shift) \
-      { \
-         /* even part */ \
-         dct_rot(t2e,t3e, row2,row6, rot0_0,rot0_1); \
-         __m128i sum04 = _mm_add_epi16(row0, row4); \
-         __m128i dif04 = _mm_sub_epi16(row0, row4); \
-         dct_widen(t0e, sum04); \
-         dct_widen(t1e, dif04); \
-         dct_wadd(x0, t0e, t3e); \
-         dct_wsub(x3, t0e, t3e); \
-         dct_wadd(x1, t1e, t2e); \
-         dct_wsub(x2, t1e, t2e); \
-         /* odd part */ \
-         dct_rot(y0o,y2o, row7,row3, rot2_0,rot2_1); \
-         dct_rot(y1o,y3o, row5,row1, rot3_0,rot3_1); \
-         __m128i sum17 = _mm_add_epi16(row1, row7); \
-         __m128i sum35 = _mm_add_epi16(row3, row5); \
-         dct_rot(y4o,y5o, sum17,sum35, rot1_0,rot1_1); \
-         dct_wadd(x4, y0o, y4o); \
-         dct_wadd(x5, y1o, y5o); \
-         dct_wadd(x6, y2o, y5o); \
-         dct_wadd(x7, y3o, y4o); \
-         dct_bfly32o(row0,row7, x0,x7,bias,shift); \
-         dct_bfly32o(row1,row6, x1,x6,bias,shift); \
-         dct_bfly32o(row2,row5, x2,x5,bias,shift); \
-         dct_bfly32o(row3,row4, x3,x4,bias,shift); \
-      }
-
-   __m128i rot0_0 = dct_const(rjpeg__f2f(0.5411961f), rjpeg__f2f(0.5411961f) + rjpeg__f2f(-1.847759065f));
-   __m128i rot0_1 = dct_const(rjpeg__f2f(0.5411961f) + rjpeg__f2f( 0.765366865f), rjpeg__f2f(0.5411961f));
-   __m128i rot1_0 = dct_const(rjpeg__f2f(1.175875602f) + rjpeg__f2f(-0.899976223f), rjpeg__f2f(1.175875602f));
-   __m128i rot1_1 = dct_const(rjpeg__f2f(1.175875602f), rjpeg__f2f(1.175875602f) + rjpeg__f2f(-2.562915447f));
-   __m128i rot2_0 = dct_const(rjpeg__f2f(-1.961570560f) + rjpeg__f2f( 0.298631336f), rjpeg__f2f(-1.961570560f));
-   __m128i rot2_1 = dct_const(rjpeg__f2f(-1.961570560f), rjpeg__f2f(-1.961570560f) + rjpeg__f2f( 3.072711026f));
-   __m128i rot3_0 = dct_const(rjpeg__f2f(-0.390180644f) + rjpeg__f2f( 2.053119869f), rjpeg__f2f(-0.390180644f));
-   __m128i rot3_1 = dct_const(rjpeg__f2f(-0.390180644f), rjpeg__f2f(-0.390180644f) + rjpeg__f2f( 1.501321110f));
-
-   /* rounding biases in column/row passes, see rjpeg__idct_block for explanation. */
-   __m128i bias_0 = _mm_set1_epi32(512);
-   __m128i bias_1 = _mm_set1_epi32(65536 + (128<<17));
-
-   /* load */
-   row0 = _mm_load_si128((const __m128i *) (data + 0*8));
-   row1 = _mm_load_si128((const __m128i *) (data + 1*8));
-   row2 = _mm_load_si128((const __m128i *) (data + 2*8));
-   row3 = _mm_load_si128((const __m128i *) (data + 3*8));
-   row4 = _mm_load_si128((const __m128i *) (data + 4*8));
-   row5 = _mm_load_si128((const __m128i *) (data + 5*8));
-   row6 = _mm_load_si128((const __m128i *) (data + 6*8));
-   row7 = _mm_load_si128((const __m128i *) (data + 7*8));
-
-   /* column pass */
-   dct_pass(bias_0, 10);
-
-   {
-      /* 16bit 8x8 transpose pass 1 */
-      dct_interleave16(row0, row4);
-      dct_interleave16(row1, row5);
-      dct_interleave16(row2, row6);
-      dct_interleave16(row3, row7);
-
-      /* transpose pass 2 */
-      dct_interleave16(row0, row2);
-      dct_interleave16(row1, row3);
-      dct_interleave16(row4, row6);
-      dct_interleave16(row5, row7);
-
-      /* transpose pass 3 */
-      dct_interleave16(row0, row1);
-      dct_interleave16(row2, row3);
-      dct_interleave16(row4, row5);
-      dct_interleave16(row6, row7);
-   }
-
-   /* row pass */
-   dct_pass(bias_1, 17);
-
-   {
-      /* pack */
-      __m128i p0 = _mm_packus_epi16(row0, row1); /* a0a1a2a3...a7b0b1b2b3...b7 */
-      __m128i p1 = _mm_packus_epi16(row2, row3);
-      __m128i p2 = _mm_packus_epi16(row4, row5);
-      __m128i p3 = _mm_packus_epi16(row6, row7);
-
-      /* 8bit 8x8 transpose pass 1 */
-      dct_interleave8(p0, p2); /* a0e0a1e1... */
-      dct_interleave8(p1, p3); /* c0g0c1g1... */
-
-      /* transpose pass 2 */
-      dct_interleave8(p0, p1); /* a0c0e0g0... */
-      dct_interleave8(p2, p3); /* b0d0f0h0... */
-
-      /* transpose pass 3 */
-      dct_interleave8(p0, p2); /* a0b0c0d0... */
-      dct_interleave8(p1, p3); /* a4b4c4d4... */
-
-      /* store */
-      _mm_storel_epi64((__m128i *) out, p0); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p0, 0x4e)); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, p2); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p2, 0x4e)); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, p1); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p1, 0x4e)); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, p3); out += out_stride;
-      _mm_storel_epi64((__m128i *) out, _mm_shuffle_epi32(p3, 0x4e));
-   }
-
-#undef dct_const
-#undef dct_rot
-#undef dct_widen
-#undef dct_wadd
-#undef dct_wsub
-#undef dct_bfly32o
-#undef dct_interleave8
-#undef dct_interleave16
-#undef dct_pass
-}
-
-#endif
-
-#ifdef RJPEG_NEON
-
-/* NEON integer IDCT. should produce bit-identical
- * results to the generic C version. */
-static void rjpeg__idct_simd(uint8_t *out, int out_stride, short data[64])
-{
-   int16x8_t row0, row1, row2, row3, row4, row5, row6, row7;
-
-   int16x4_t rot0_0 = vdup_n_s16(rjpeg__f2f(0.5411961f));
-   int16x4_t rot0_1 = vdup_n_s16(rjpeg__f2f(-1.847759065f));
-   int16x4_t rot0_2 = vdup_n_s16(rjpeg__f2f( 0.765366865f));
-   int16x4_t rot1_0 = vdup_n_s16(rjpeg__f2f( 1.175875602f));
-   int16x4_t rot1_1 = vdup_n_s16(rjpeg__f2f(-0.899976223f));
-   int16x4_t rot1_2 = vdup_n_s16(rjpeg__f2f(-2.562915447f));
-   int16x4_t rot2_0 = vdup_n_s16(rjpeg__f2f(-1.961570560f));
-   int16x4_t rot2_1 = vdup_n_s16(rjpeg__f2f(-0.390180644f));
-   int16x4_t rot3_0 = vdup_n_s16(rjpeg__f2f( 0.298631336f));
-   int16x4_t rot3_1 = vdup_n_s16(rjpeg__f2f( 2.053119869f));
-   int16x4_t rot3_2 = vdup_n_s16(rjpeg__f2f( 3.072711026f));
-   int16x4_t rot3_3 = vdup_n_s16(rjpeg__f2f( 1.501321110f));
-
-#define dct_long_mul(out, inq, coeff) \
-   int32x4_t out##_l = vmull_s16(vget_low_s16(inq), coeff); \
-   int32x4_t out##_h = vmull_s16(vget_high_s16(inq), coeff)
-
-#define dct_long_mac(out, acc, inq, coeff) \
-   int32x4_t out##_l = vmlal_s16(acc##_l, vget_low_s16(inq), coeff); \
-   int32x4_t out##_h = vmlal_s16(acc##_h, vget_high_s16(inq), coeff)
-
-#define dct_widen(out, inq) \
-   int32x4_t out##_l = vshll_n_s16(vget_low_s16(inq), 12); \
-   int32x4_t out##_h = vshll_n_s16(vget_high_s16(inq), 12)
-
-/* wide add */
-#define dct_wadd(out, a, b) \
-   int32x4_t out##_l = vaddq_s32(a##_l, b##_l); \
-   int32x4_t out##_h = vaddq_s32(a##_h, b##_h)
-
-/* wide sub */
-#define dct_wsub(out, a, b) \
-   int32x4_t out##_l = vsubq_s32(a##_l, b##_l); \
-   int32x4_t out##_h = vsubq_s32(a##_h, b##_h)
-
-/* butterfly a/b, then shift using "shiftop" by "s" and pack */
-#define dct_bfly32o(out0,out1, a,b,shiftop,s) \
-   { \
-      dct_wadd(sum, a, b); \
-      dct_wsub(dif, a, b); \
-      out0 = vcombine_s16(shiftop(sum_l, s), shiftop(sum_h, s)); \
-      out1 = vcombine_s16(shiftop(dif_l, s), shiftop(dif_h, s)); \
-   }
-
-#define dct_pass(shiftop, shift) \
-   { \
-      /* even part */ \
-      int16x8_t sum26 = vaddq_s16(row2, row6); \
-      dct_long_mul(p1e, sum26, rot0_0); \
-      dct_long_mac(t2e, p1e, row6, rot0_1); \
-      dct_long_mac(t3e, p1e, row2, rot0_2); \
-      int16x8_t sum04 = vaddq_s16(row0, row4); \
-      int16x8_t dif04 = vsubq_s16(row0, row4); \
-      dct_widen(t0e, sum04); \
-      dct_widen(t1e, dif04); \
-      dct_wadd(x0, t0e, t3e); \
-      dct_wsub(x3, t0e, t3e); \
-      dct_wadd(x1, t1e, t2e); \
-      dct_wsub(x2, t1e, t2e); \
-      /* odd part */ \
-      int16x8_t sum15 = vaddq_s16(row1, row5); \
-      int16x8_t sum17 = vaddq_s16(row1, row7); \
-      int16x8_t sum35 = vaddq_s16(row3, row5); \
-      int16x8_t sum37 = vaddq_s16(row3, row7); \
-      int16x8_t sumodd = vaddq_s16(sum17, sum35); \
-      dct_long_mul(p5o, sumodd, rot1_0); \
-      dct_long_mac(p1o, p5o, sum17, rot1_1); \
-      dct_long_mac(p2o, p5o, sum35, rot1_2); \
-      dct_long_mul(p3o, sum37, rot2_0); \
-      dct_long_mul(p4o, sum15, rot2_1); \
-      dct_wadd(sump13o, p1o, p3o); \
-      dct_wadd(sump24o, p2o, p4o); \
-      dct_wadd(sump23o, p2o, p3o); \
-      dct_wadd(sump14o, p1o, p4o); \
-      dct_long_mac(x4, sump13o, row7, rot3_0); \
-      dct_long_mac(x5, sump24o, row5, rot3_1); \
-      dct_long_mac(x6, sump23o, row3, rot3_2); \
-      dct_long_mac(x7, sump14o, row1, rot3_3); \
-      dct_bfly32o(row0,row7, x0,x7,shiftop,shift); \
-      dct_bfly32o(row1,row6, x1,x6,shiftop,shift); \
-      dct_bfly32o(row2,row5, x2,x5,shiftop,shift); \
-      dct_bfly32o(row3,row4, x3,x4,shiftop,shift); \
-   }
-
-   /* load */
-   row0 = vld1q_s16(data + 0*8);
-   row1 = vld1q_s16(data + 1*8);
-   row2 = vld1q_s16(data + 2*8);
-   row3 = vld1q_s16(data + 3*8);
-   row4 = vld1q_s16(data + 4*8);
-   row5 = vld1q_s16(data + 5*8);
-   row6 = vld1q_s16(data + 6*8);
-   row7 = vld1q_s16(data + 7*8);
-
-   /* add DC bias */
-   row0 = vaddq_s16(row0, vsetq_lane_s16(1024, vdupq_n_s16(0), 0));
-
-   /* column pass */
-   dct_pass(vrshrn_n_s32, 10);
-
-   /* 16bit 8x8 transpose */
-   {
-/* these three map to a single VTRN.16, VTRN.32, and VSWP, respectively.
- * whether compilers actually get this is another story, sadly. */
-#define dct_trn16(x, y) { int16x8x2_t t = vtrnq_s16(x, y); x = t.val[0]; y = t.val[1]; }
-#define dct_trn32(x, y) { int32x4x2_t t = vtrnq_s32(vreinterpretq_s32_s16(x), vreinterpretq_s32_s16(y)); x = vreinterpretq_s16_s32(t.val[0]); y = vreinterpretq_s16_s32(t.val[1]); }
-#define dct_trn64(x, y) { int16x8_t x0 = x; int16x8_t y0 = y; x = vcombine_s16(vget_low_s16(x0), vget_low_s16(y0)); y = vcombine_s16(vget_high_s16(x0), vget_high_s16(y0)); }
-
-      /* pass 1 */
-      dct_trn16(row0, row1); /* a0b0a2b2a4b4a6b6 */
-      dct_trn16(row2, row3);
-      dct_trn16(row4, row5);
-      dct_trn16(row6, row7);
-
-      /* pass 2 */
-      dct_trn32(row0, row2); /* a0b0c0d0a4b4c4d4 */
-      dct_trn32(row1, row3);
-      dct_trn32(row4, row6);
-      dct_trn32(row5, row7);
-
-      /* pass 3 */
-      dct_trn64(row0, row4); /* a0b0c0d0e0f0g0h0 */
-      dct_trn64(row1, row5);
-      dct_trn64(row2, row6);
-      dct_trn64(row3, row7);
-
-#undef dct_trn16
-#undef dct_trn32
-#undef dct_trn64
-   }
-
-   /* row pass
-    * vrshrn_n_s32 only supports shifts up to 16, we need
-    * 17. so do a non-rounding shift of 16 first then follow
-    * up with a rounding shift by 1. */
-   dct_pass(vshrn_n_s32, 16);
-
-   {
-      /* pack and round */
-      uint8x8_t p0 = vqrshrun_n_s16(row0, 1);
-      uint8x8_t p1 = vqrshrun_n_s16(row1, 1);
-      uint8x8_t p2 = vqrshrun_n_s16(row2, 1);
-      uint8x8_t p3 = vqrshrun_n_s16(row3, 1);
-      uint8x8_t p4 = vqrshrun_n_s16(row4, 1);
-      uint8x8_t p5 = vqrshrun_n_s16(row5, 1);
-      uint8x8_t p6 = vqrshrun_n_s16(row6, 1);
-      uint8x8_t p7 = vqrshrun_n_s16(row7, 1);
-
-      /* again, these can translate into one instruction, but often don't. */
-#define dct_trn8_8(x, y) { uint8x8x2_t t = vtrn_u8(x, y); x = t.val[0]; y = t.val[1]; }
-#define dct_trn8_16(x, y) { uint16x4x2_t t = vtrn_u16(vreinterpret_u16_u8(x), vreinterpret_u16_u8(y)); x = vreinterpret_u8_u16(t.val[0]); y = vreinterpret_u8_u16(t.val[1]); }
-#define dct_trn8_32(x, y) { uint32x2x2_t t = vtrn_u32(vreinterpret_u32_u8(x), vreinterpret_u32_u8(y)); x = vreinterpret_u8_u32(t.val[0]); y = vreinterpret_u8_u32(t.val[1]); }
-
-      /* sadly can't use interleaved stores here since we only write
-       * 8 bytes to each scan line! */
-
-      /* 8x8 8-bit transpose pass 1 */
-      dct_trn8_8(p0, p1);
-      dct_trn8_8(p2, p3);
-      dct_trn8_8(p4, p5);
-      dct_trn8_8(p6, p7);
-
-      /* pass 2 */
-      dct_trn8_16(p0, p2);
-      dct_trn8_16(p1, p3);
-      dct_trn8_16(p4, p6);
-      dct_trn8_16(p5, p7);
-
-      /* pass 3 */
-      dct_trn8_32(p0, p4);
-      dct_trn8_32(p1, p5);
-      dct_trn8_32(p2, p6);
-      dct_trn8_32(p3, p7);
-
-      /* store */
-      vst1_u8(out, p0); out += out_stride;
-      vst1_u8(out, p1); out += out_stride;
-      vst1_u8(out, p2); out += out_stride;
-      vst1_u8(out, p3); out += out_stride;
-      vst1_u8(out, p4); out += out_stride;
-      vst1_u8(out, p5); out += out_stride;
-      vst1_u8(out, p6); out += out_stride;
-      vst1_u8(out, p7);
-
-#undef dct_trn8_8
-#undef dct_trn8_16
-#undef dct_trn8_32
-   }
-
-#undef dct_long_mul
-#undef dct_long_mac
-#undef dct_widen
-#undef dct_wadd
-#undef dct_wsub
-#undef dct_bfly32o
-#undef dct_pass
-}
-
-#endif /* RJPEG_NEON */
-
-static uint8_t rjpeg__get_marker(rjpeg__jpeg *j)
-{
-   uint8_t x;
-
-   if (j->marker != RJPEG__MARKER_NONE)
-   {
-      x = j->marker;
-      j->marker = RJPEG__MARKER_NONE;
-      return x;
-   }
-
-   x = rjpeg__get8(j->s);
-   if (x != 0xff)
-      return RJPEG__MARKER_NONE;
-   while (x == 0xff)
-      x = rjpeg__get8(j->s);
-   return x;
-}
-
-
-/* after a restart interval, rjpeg__jpeg_reset the entropy decoder and
- * the dc prediction
- */
-static void rjpeg__jpeg_reset(rjpeg__jpeg *j)
-{
-   j->code_bits           = 0;
-   j->code_buffer         = 0;
-   j->nomore              = 0;
-   j->img_comp[0].dc_pred = 0;
-   j->img_comp[1].dc_pred = 0;
-   j->img_comp[2].dc_pred = 0;
-   j->marker              = RJPEG__MARKER_NONE;
-   j->todo                = j->restart_interval ? j->restart_interval : 0x7fffffff;
-   j->eob_run             = 0;
-
-   /* no more than 1<<31 MCUs if no restart_interal? that's plenty safe,
-    * since we don't even allow 1<<30 pixels */
-}
-
-static int rjpeg__parse_entropy_coded_data(rjpeg__jpeg *z)
-{
-   rjpeg__jpeg_reset(z);
-
-   if (z->scan_n == 1)
-   {
-      int i,j;
-      int n = z->order[0];
-      int w = (z->img_comp[n].x+7) >> 3;
-      int h = (z->img_comp[n].y+7) >> 3;
-
-      /* non-interleaved data, we just need to process one block at a time,
-       * in trivial scanline order
-       * number of blocks to do just depends on how many actual "pixels" this
-       * component has, independent of interleaved MCU blocking and such */
-
-      if (z->progressive)
-      {
-         for (j=0; j < h; ++j)
-         {
-            for (i=0; i < w; ++i)
-            {
-               short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
-
-               if (z->spec_start == 0)
-               {
-                  if (!rjpeg__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
-                     return 0;
-               }
-               else
-               {
-                  int ha = z->img_comp[n].ha;
-                  if (!rjpeg__jpeg_decode_block_prog_ac(z, data, &z->huff_ac[ha], z->fast_ac[ha]))
-                     return 0;
-               }
-
-               /* every data block is an MCU, so countdown the restart interval */
-               if (--z->todo <= 0)
-               {
-                  if (z->code_bits < 24)
-                     rjpeg__grow_buffer_unsafe(z);
-
-                  if (!RJPEG__RESTART(z->marker))
-                     return 1;
-                  rjpeg__jpeg_reset(z);
-               }
-            }
-         }
-      }
-      else
-      {
-         RJPEG_SIMD_ALIGN(short, data[64]);
-
-         for (j=0; j < h; ++j)
-         {
-            for (i=0; i < w; ++i)
-            {
-               int ha = z->img_comp[n].ha;
-               if (!rjpeg__jpeg_decode_block(z, data, z->huff_dc+z->img_comp[n].hd,
-                        z->huff_ac+ha, z->fast_ac[ha], n, z->dequant[z->img_comp[n].tq]))
-                  return 0;
-
-               z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8,
-                     z->img_comp[n].w2, data);
-
-               /* every data block is an MCU, so countdown the restart interval */
-               if (--z->todo <= 0)
-               {
-                  if (z->code_bits < 24)
-                     rjpeg__grow_buffer_unsafe(z);
-
-                  /* if it's NOT a restart, then just bail, 
-                   * so we get corrupt data rather than no data */
-                  if (!RJPEG__RESTART(z->marker))
-                     return 1;
-                  rjpeg__jpeg_reset(z);
-               }
-            }
-         }
-      }
-   }
-   else
-   {
-      /* interleaved */
-      int i,j,k,x,y;
-
-      if (z->progressive)
-      {
-         for (j=0; j < z->img_mcu_y; ++j)
-         {
-            for (i=0; i < z->img_mcu_x; ++i)
-            {
-               /* scan an interleaved MCU... process scan_n components in order */
-               for (k=0; k < z->scan_n; ++k)
-               {
-                  int n = z->order[k];
-                  /* scan out an MCU's worth of this component; that's just determined
-                   * by the basic H and V specified for the component */
-                  for (y=0; y < z->img_comp[n].v; ++y)
-                  {
-                     for (x=0; x < z->img_comp[n].h; ++x)
-                     {
-                        int x2 = (i*z->img_comp[n].h + x);
-                        int y2 = (j*z->img_comp[n].v + y);
-                        short *data = z->img_comp[n].coeff + 64 * (x2 + y2 * z->img_comp[n].coeff_w);
-                        if (!rjpeg__jpeg_decode_block_prog_dc(z, data, &z->huff_dc[z->img_comp[n].hd], n))
-                           return 0;
-                     }
-                  }
-               }
-
-               /* after all interleaved components, that's an interleaved MCU,
-                * so now count down the restart interval */
-               if (--z->todo <= 0)
-               {
-                  if (z->code_bits < 24)
-                     rjpeg__grow_buffer_unsafe(z);
-                  if (!RJPEG__RESTART(z->marker))
-                     return 1;
-                  rjpeg__jpeg_reset(z);
-               }
-            }
-         }
-      }
-      else
-      {
-         RJPEG_SIMD_ALIGN(short, data[64]);
-
-         for (j=0; j < z->img_mcu_y; ++j)
-         {
-            for (i=0; i < z->img_mcu_x; ++i)
-            {
-               /* scan an interleaved MCU... process scan_n components in order */
-               for (k=0; k < z->scan_n; ++k)
-               {
-                  int n = z->order[k];
-                  /* scan out an MCU's worth of this component; that's just determined
-                   * by the basic H and V specified for the component */
-                  for (y=0; y < z->img_comp[n].v; ++y)
-                  {
-                     for (x=0; x < z->img_comp[n].h; ++x)
-                     {
-                        int x2 = (i*z->img_comp[n].h + x)*8;
-                        int y2 = (j*z->img_comp[n].v + y)*8;
-                        int ha = z->img_comp[n].ha;
-
-                        if (!rjpeg__jpeg_decode_block(z, data,
-                                 z->huff_dc+z->img_comp[n].hd,
-                                 z->huff_ac+ha, z->fast_ac[ha],
-                                 n, z->dequant[z->img_comp[n].tq]))
-                           return 0;
-
-                        z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*y2+x2,
-                              z->img_comp[n].w2, data);
-                     }
-                  }
-               }
-
-               /* after all interleaved components, that's an interleaved MCU,
-                * so now count down the restart interval */
-               if (--z->todo <= 0)
-               {
-                  if (z->code_bits < 24)
-                     rjpeg__grow_buffer_unsafe(z);
-                  if (!RJPEG__RESTART(z->marker))
-                     return 1;
-                  rjpeg__jpeg_reset(z);
-               }
-            }
-         }
-      }
-   }
-
-   return 1;
-}
-
-static void rjpeg__jpeg_dequantize(short *data, uint8_t *dequant)
-{
-   int i;
-   for (i=0; i < 64; ++i)
-      data[i] *= dequant[i];
-}
-
-static void rjpeg__jpeg_finish(rjpeg__jpeg *z)
-{
-   int i,j,n;
-
-   if (!z->progressive)
-      return;
-
-   /* dequantize and IDCT the data */
-   for (n=0; n < z->s->img_n; ++n)
-   {
-      int w = (z->img_comp[n].x+7) >> 3;
-      int h = (z->img_comp[n].y+7) >> 3;
-      for (j=0; j < h; ++j)
-      {
-         for (i=0; i < w; ++i)
-         {
-            short *data = z->img_comp[n].coeff + 64 * (i + j * z->img_comp[n].coeff_w);
-            rjpeg__jpeg_dequantize(data, z->dequant[z->img_comp[n].tq]);
-            z->idct_block_kernel(z->img_comp[n].data+z->img_comp[n].w2*j*8+i*8,
-                  z->img_comp[n].w2, data);
-         }
-      }
-   }
-}
-
-static int rjpeg__process_marker(rjpeg__jpeg *z, int m)
-{
-   int L;
-   switch (m)
-   {
-      case RJPEG__MARKER_NONE: /* no marker found */
-         /* Expected marker. Corrupt JPEG? */
-         return 0;
-
-      case 0xDD: /* DRI - specify restart interval */
-
-         /* Bad DRI length. Corrupt JPEG? */
-         if (RJPEG__GET16BE(z->s) != 4)
-            return 0;
-
-         z->restart_interval = RJPEG__GET16BE(z->s);
-         return 1;
-
-      case 0xDB: /* DQT - define quantization table */
-         L = RJPEG__GET16BE(z->s)-2;
-         while (L > 0)
-         {
-            int q = rjpeg__get8(z->s);
-            int p = q >> 4;
-            int t = q & 15,i;
-
-            /* Bad DQT type. Corrupt JPEG? */
-            if (p != 0)
-               return 0;
-
-            /* Bad DQT table. Corrupt JPEG? */
-            if (t > 3)
-               return 0;
-
-            for (i=0; i < 64; ++i)
-               z->dequant[t][rjpeg__jpeg_dezigzag[i]] = rjpeg__get8(z->s);
-            L -= 65;
-         }
-         return L==0;
-
-      case 0xC4: /* DHT - define huffman table */
-         L = RJPEG__GET16BE(z->s)-2;
-         while (L > 0)
-         {
-            int sizes[16],i,n=0;
-            uint8_t *v = NULL;
-            int q      = rjpeg__get8(z->s);
-            int tc     = q >> 4;
-            int th     = q & 15;
-
-            /* Bad DHT header. Corrupt JPEG? */
-            if (tc > 1 || th > 3)
-               return 0;
-
-            for (i=0; i < 16; ++i)
-            {
-               sizes[i] = rjpeg__get8(z->s);
-               n += sizes[i];
-            }
-            L -= 17;
-
-            if (tc == 0)
-            {
-               if (!rjpeg__build_huffman(z->huff_dc+th, sizes))
-                  return 0;
-               v = z->huff_dc[th].values;
-            }
-            else
-            {
-               if (!rjpeg__build_huffman(z->huff_ac+th, sizes))
-                  return 0;
-               v = z->huff_ac[th].values;
-            }
-            for (i=0; i < n; ++i)
-               v[i] = rjpeg__get8(z->s);
-            if (tc != 0)
-               rjpeg__build_fast_ac(z->fast_ac[th], z->huff_ac + th);
-            L -= n;
-         }
-         return L==0;
-   }
-
-   /* check for comment block or APP blocks */
-   if ((m >= 0xE0 && m <= 0xEF) || m == 0xFE)
-   {
-      int n = RJPEG__GET16BE(z->s)-2;
-
-      if (n < 0)
-         z->s->img_buffer = z->s->img_buffer_end;
-      else
-         z->s->img_buffer += n;
-
-      return 1;
-   }
-   return 0;
-}
-
-/* after we see SOS */
-static int rjpeg__process_scan_header(rjpeg__jpeg *z)
-{
-   int i;
-   int aa;
-   int Ls    = RJPEG__GET16BE(z->s);
-
-   z->scan_n = rjpeg__get8(z->s);
-
-   /* Bad SOS component count. Corrupt JPEG? */
-   if (z->scan_n < 1 || z->scan_n > 4 || z->scan_n > (int) z->s->img_n)
-      return 0;
-
-   /* Bad SOS length. Corrupt JPEG? */
-   if (Ls != 6+2*z->scan_n)
-      return 0;
-
-   for (i=0; i < z->scan_n; ++i)
-   {
-      int which;
-      int id = rjpeg__get8(z->s);
-      int q  = rjpeg__get8(z->s);
-
-      for (which = 0; which < z->s->img_n; ++which)
-         if (z->img_comp[which].id == id)
-            break;
-      if (which == z->s->img_n)
-         return 0; /* no match */
-
-      /* Bad DC huff. Corrupt JPEG? */
-      z->img_comp[which].hd = q >> 4;   if (z->img_comp[which].hd > 3)
-         return 0;
-
-      /* Bad AC huff. Corrupt JPEG? */
-      z->img_comp[which].ha = q & 15;   if (z->img_comp[which].ha > 3)
-         return 0;
-
-      z->order[i] = which;
-   }
-
-   z->spec_start = rjpeg__get8(z->s);
-   z->spec_end   = rjpeg__get8(z->s); /* should be 63, but might be 0 */
-   aa            = rjpeg__get8(z->s);
-   z->succ_high  = (aa >> 4);
-   z->succ_low   = (aa & 15);
-
-   if (z->progressive)
-   {
-      /* Bad SOS. Corrupt JPEG? */
-      if (  z->spec_start > 63 || 
-            z->spec_end > 63   || 
-            z->spec_start > z->spec_end || 
-            z->succ_high > 13           || 
-            z->succ_low > 13)
-         return 0;
-   }
-   else
-   {
-      /* Bad SOS. Corrupt JPEG? */
-      if (z->spec_start != 0)
-         return 0;
-      if (z->succ_high != 0 || z->succ_low != 0)
-         return 0;
-
-      z->spec_end = 63;
-   }
-
-   return 1;
-}
-
-static int rjpeg__process_frame_header(rjpeg__jpeg *z, int scan)
-{
-   rjpeg__context *s = z->s;
-   int Lf,p,i,q, h_max=1,v_max=1,c;
-   Lf = RJPEG__GET16BE(s);
-   
-   /* JPEG */
-
-   /* Bad SOF len. Corrupt JPEG? */
-   if (Lf < 11)
-      return 0;
-
-   p  = rjpeg__get8(s);
-
-   /* JPEG baseline */
-
-   /* Only 8-bit. JPEG format not supported? */
-   if (p != 8)
-      return 0;
-
-   s->img_y = RJPEG__GET16BE(s);
-
-   /* Legal, but we don't handle it--but neither does IJG */
-
-   /* No header height, JPEG format not supported? */
-   if (s->img_y == 0)
-      return 0;
-
-   s->img_x = RJPEG__GET16BE(s);
-  
-   /* No header width. Corrupt JPEG? */
-   if (s->img_x == 0)
-      return 0;
-
-   c = rjpeg__get8(s);
-
-   /* JFIF requires */
-
-   /* Bad component count. Corrupt JPEG? */
-   if (c != 3 && c != 1)
-      return 0;
-
-   s->img_n = c;
-
-   for (i=0; i < c; ++i)
-   {
-      z->img_comp[i].data = NULL;
-      z->img_comp[i].linebuf = NULL;
-   }
-
-   /* Bad SOF length. Corrupt JPEG? */
-   if (Lf != 8+3*s->img_n)
-      return 0;
-
-   for (i=0; i < s->img_n; ++i)
-   {
-      z->img_comp[i].id = rjpeg__get8(s);
-      if (z->img_comp[i].id != i+1)   /* JFIF requires */
-         if (z->img_comp[i].id != i)  /* some version of jpegtran outputs non-JFIF-compliant files! */
-            return 0;
-
-      q = rjpeg__get8(s);
-      z->img_comp[i].h = (q >> 4);
-
-      /* Bad H. Corrupt JPEG? */
-      if (!z->img_comp[i].h || z->img_comp[i].h > 4)
-         return 0;
-
-      z->img_comp[i].v = q & 15;
-
-      /* Bad V. Corrupt JPEG? */
-      if (!z->img_comp[i].v || z->img_comp[i].v > 4)
-         return 0;
-
-      z->img_comp[i].tq = rjpeg__get8(s);
-
-      /* Bad TQ. Corrupt JPEG? */
-      if (z->img_comp[i].tq > 3)
-         return 0;
-   }
-
-   if (scan != RJPEG_SCAN_LOAD)
-      return 1;
-
-   /* Image too large to decode? */
-   if ((1 << 30) / s->img_x / s->img_n < s->img_y)
-      return 0;
-
-   for (i=0; i < s->img_n; ++i)
-   {
-      if (z->img_comp[i].h > h_max)
-         h_max = z->img_comp[i].h;
-      if (z->img_comp[i].v > v_max)
-         v_max = z->img_comp[i].v;
-   }
-
-   /* compute interleaved MCU info */
-   z->img_h_max = h_max;
-   z->img_v_max = v_max;
-   z->img_mcu_w = h_max * 8;
-   z->img_mcu_h = v_max * 8;
-   z->img_mcu_x = (s->img_x + z->img_mcu_w-1) / z->img_mcu_w;
-   z->img_mcu_y = (s->img_y + z->img_mcu_h-1) / z->img_mcu_h;
-
-   if (z->progressive)
-   {
-      for (i=0; i < s->img_n; ++i)
-      {
-         /* number of effective pixels (e.g. for non-interleaved MCU) */
-         z->img_comp[i].x        = (s->img_x * z->img_comp[i].h + h_max-1) / h_max;
-         z->img_comp[i].y        = (s->img_y * z->img_comp[i].v + v_max-1) / v_max;
-
-         /* to simplify generation, we'll allocate enough memory to decode
-          * the bogus oversized data from using interleaved MCUs and their
-          * big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't
-          * discard the extra data until colorspace conversion */
-         z->img_comp[i].w2       = z->img_mcu_x * z->img_comp[i].h * 8;
-         z->img_comp[i].h2       = z->img_mcu_y * z->img_comp[i].v * 8;
-         z->img_comp[i].raw_data = malloc(z->img_comp[i].w2 * z->img_comp[i].h2+15);
-
-         /* Out of memory? */
-         if (z->img_comp[i].raw_data == NULL)
-         {
-            for(--i; i >= 0; --i)
-            {
-               free(z->img_comp[i].raw_data);
-               z->img_comp[i].data = NULL;
-            }
-
-            return 0;
-         }
-
-         /* align blocks for IDCT using MMX/SSE */
-         z->img_comp[i].data      = (uint8_t*) (((size_t) z->img_comp[i].raw_data + 15) & ~15);
-         z->img_comp[i].linebuf   = NULL;
-         z->img_comp[i].coeff_w   = (z->img_comp[i].w2 + 7) >> 3;
-         z->img_comp[i].coeff_h   = (z->img_comp[i].h2 + 7) >> 3;
-         z->img_comp[i].raw_coeff = malloc(z->img_comp[i].coeff_w * 
-                                    z->img_comp[i].coeff_h * 64 * sizeof(short) + 15);
-         z->img_comp[i].coeff     = (short*) (((size_t) z->img_comp[i].raw_coeff + 15) & ~15);
-      }
-   }
-   else
-   {
-      for (i=0; i < s->img_n; ++i)
-      {
-         /* number of effective pixels (e.g. for non-interleaved MCU) */
-         z->img_comp[i].x        = (s->img_x * z->img_comp[i].h + h_max-1) / h_max;
-         z->img_comp[i].y        = (s->img_y * z->img_comp[i].v + v_max-1) / v_max;
-
-         /* to simplify generation, we'll allocate enough memory to decode
-          * the bogus oversized data from using interleaved MCUs and their
-          * big blocks (e.g. a 16x16 iMCU on an image of width 33); we won't
-          * discard the extra data until colorspace conversion */
-         z->img_comp[i].w2       = z->img_mcu_x * z->img_comp[i].h * 8;
-         z->img_comp[i].h2       = z->img_mcu_y * z->img_comp[i].v * 8;
-         z->img_comp[i].raw_data = malloc(z->img_comp[i].w2 * z->img_comp[i].h2+15);
-
-         /* Out of memory? */
-         if (z->img_comp[i].raw_data == NULL)
-         {
-            for(--i; i >= 0; --i)
-            {
-               free(z->img_comp[i].raw_data);
-               z->img_comp[i].data = NULL;
-            }
-         }
-
-         /* align blocks for IDCT using MMX/SSE */
-         z->img_comp[i].data      = (uint8_t*) (((size_t) z->img_comp[i].raw_data + 15) & ~15);
-         z->img_comp[i].linebuf   = NULL;
-         z->img_comp[i].coeff     = 0;
-         z->img_comp[i].raw_coeff = 0;
-      }
-   }
-
-   return 1;
-}
-
-
-static int rjpeg__decode_jpeg_header(rjpeg__jpeg *z, int scan)
-{
-   int m;
-   z->marker = RJPEG__MARKER_NONE; /* initialize cached marker to empty */
-   m = rjpeg__get_marker(z);
-
-   /* No SOI. Corrupt JPEG? */
-   if (m != JPEG_MARKER_SOI)
-      return 0;
-
-   if (scan == RJPEG_SCAN_TYPE)
-      return 1;
-
-   m = rjpeg__get_marker(z);
-   while (!rjpeg__SOF(m))
-   {
-      if (!rjpeg__process_marker(z,m))
-         return 0;
-      m = rjpeg__get_marker(z);
-      while (m == RJPEG__MARKER_NONE)
-      {
-         /* some files have extra padding after their blocks, so ok, we'll scan */
-
-         /* No SOF. Corrupt JPEG? */
-         if (RJPEG__AT_EOF(z->s))
-            return 0;
-
-         m = rjpeg__get_marker(z);
-      }
-   }
-   z->progressive = rjpeg__SOF_progressive(m);
-   if (!rjpeg__process_frame_header(z, scan))
-      return 0;
-   return 1;
-}
-
-/* decode image to YCbCr format */
-static int rjpeg__decode_jpeg_image(rjpeg__jpeg *j)
-{
-   int m;
-   for (m = 0; m < 4; m++)
-   {
-      j->img_comp[m].raw_data = NULL;
-      j->img_comp[m].raw_coeff = NULL;
-   }
-   j->restart_interval = 0;
-   if (!rjpeg__decode_jpeg_header(j, RJPEG_SCAN_LOAD))
-      return 0;
-   m = rjpeg__get_marker(j);
-
-   while (m != JPEG_MARKER_EOI)
-   {
-      if (m == JPEG_MARKER_SOS)
-      {
-         if (!rjpeg__process_scan_header(j))
-            return 0;
-         if (!rjpeg__parse_entropy_coded_data(j))
-            return 0;
-
-         if (j->marker == RJPEG__MARKER_NONE )
-         {
-            /* handle 0s at the end of image data from IP Kamera 9060 */
-
-            while (!RJPEG__AT_EOF(j->s))
-            {
-               int x = rjpeg__get8(j->s);
-               if (x == 255)
-               {
-                  j->marker = rjpeg__get8(j->s);
-                  break;
-               }
-               else if (x != 0) /* Junk before marker. Corrupt JPEG? */
-                  return 0;
-            }
-
-            /* if we reach eof without hitting a marker, 
-             * rjpeg__get_marker() below will fail and we'll eventually return 0 */
-         }
-      }
-      else
-      {
-         if (!rjpeg__process_marker(j, m))
-            return 0;
-      }
-      m = rjpeg__get_marker(j);
-   }
-
-   if (j->progressive)
-      rjpeg__jpeg_finish(j);
-   return 1;
-}
-
-/* static jfif-centered resampling (across block boundaries) */
-
-static uint8_t *rjpeg_resample_row_1(uint8_t *out, uint8_t *in_near,
-      uint8_t *in_far, int w, int hs)
-{
-   (void)out;
-   (void)in_far;
-   (void)w;
-   (void)hs;
-   return in_near;
-}
-
-static uint8_t* rjpeg__resample_row_v_2(uint8_t *out, uint8_t *in_near,
-      uint8_t *in_far, int w, int hs)
-{
-   /* need to generate two samples vertically for every one in input */
-   int i;
-   (void)hs;
-   for (i=0; i < w; ++i)
-      out[i] = rjpeg__div4(3*in_near[i] + in_far[i] + 2);
-   return out;
-}
-
-static uint8_t*  rjpeg__resample_row_h_2(uint8_t *out, uint8_t *in_near,
-      uint8_t *in_far, int w, int hs)
-{
-   /* need to generate two samples horizontally for every one in input */
-   int i;
-   uint8_t *input = in_near;
-
-   if (w == 1)
-   {
-      /* if only one sample, can't do any interpolation */
-      out[0] = out[1] = input[0];
-      return out;
-   }
-
-   out[0] = input[0];
-   out[1] = rjpeg__div4(input[0]*3 + input[1] + 2);
-
-   for (i=1; i < w-1; ++i)
-   {
-      int n = 3*input[i]+2;
-      out[i*2+0] = rjpeg__div4(n+input[i-1]);
-      out[i*2+1] = rjpeg__div4(n+input[i+1]);
-   }
-   out[i*2+0] = rjpeg__div4(input[w-2]*3 + input[w-1] + 2);
-   out[i*2+1] = input[w-1];
-
-   (void)in_far;
-   (void)hs;
-
-   return out;
-}
-
-
-static uint8_t *rjpeg__resample_row_hv_2(uint8_t *out, uint8_t *in_near,
-      uint8_t *in_far, int w, int hs)
-{
-   /* need to generate 2x2 samples for every one in input */
-   int i,t0,t1;
-   if (w == 1)
-   {
-      out[0] = out[1] = rjpeg__div4(3*in_near[0] + in_far[0] + 2);
-      return out;
-   }
-
-   t1     = 3*in_near[0] + in_far[0];
-   out[0] = rjpeg__div4(t1+2);
-   for (i=1; i < w; ++i)
-   {
-      t0 = t1;
-      t1 = 3*in_near[i]+in_far[i];
-      out[i*2-1] = rjpeg__div16(3*t0 + t1 + 8);
-      out[i*2  ] = rjpeg__div16(3*t1 + t0 + 8);
-   }
-   out[w*2-1] = rjpeg__div4(t1+2);
-
-   (void)hs;
-
-   return out;
-}
-
-#if defined(__SSE2__) || defined(RJPEG_NEON)
-static uint8_t *rjpeg__resample_row_hv_2_simd(uint8_t *out, uint8_t *in_near,
-      uint8_t *in_far, int w, int hs)
-{
-   /* need to generate 2x2 samples for every one in input */
-   int i=0,t0,t1;
-
-   if (w == 1)
-   {
-      out[0] = out[1] = rjpeg__div4(3*in_near[0] + in_far[0] + 2);
-      return out;
-   }
-
-   t1 = 3*in_near[0] + in_far[0];
-   /* process groups of 8 pixels for as long as we can.
-    * note we can't handle the last pixel in a row in this loop
-    * because we need to handle the filter boundary conditions.
-    */
-   for (; i < ((w-1) & ~7); i += 8)
-   {
-#if defined(__SSE2__)
-      /* load and perform the vertical filtering pass
-       * this uses 3*x + y = 4*x + (y - x) */
-      __m128i zero  = _mm_setzero_si128();
-      __m128i farb  = _mm_loadl_epi64((__m128i *) (in_far + i));
-      __m128i nearb = _mm_loadl_epi64((__m128i *) (in_near + i));
-      __m128i farw  = _mm_unpacklo_epi8(farb, zero);
-      __m128i nearw = _mm_unpacklo_epi8(nearb, zero);
-      __m128i diff  = _mm_sub_epi16(farw, nearw);
-      __m128i nears = _mm_slli_epi16(nearw, 2);
-      __m128i curr  = _mm_add_epi16(nears, diff); /* current row */
-
-      /* horizontal filter works the same based on shifted vers of current
-       * row. "prev" is current row shifted right by 1 pixel; we need to
-       * insert the previous pixel value (from t1).
-       * "next" is current row shifted left by 1 pixel, with first pixel
-       * of next block of 8 pixels added in.
-       */
-      __m128i prv0 = _mm_slli_si128(curr, 2);
-      __m128i nxt0 = _mm_srli_si128(curr, 2);
-      __m128i prev = _mm_insert_epi16(prv0, t1, 0);
-      __m128i next = _mm_insert_epi16(nxt0, 3*in_near[i+8] + in_far[i+8], 7);
-
-      /* horizontal filter, polyphase implementation since it's convenient:
-       * even pixels = 3*cur + prev = cur*4 + (prev - cur)
-       * odd  pixels = 3*cur + next = cur*4 + (next - cur)
-       * note the shared term. */
-      __m128i bias = _mm_set1_epi16(8);
-      __m128i curs = _mm_slli_epi16(curr, 2);
-      __m128i prvd = _mm_sub_epi16(prev, curr);
-      __m128i nxtd = _mm_sub_epi16(next, curr);
-      __m128i curb = _mm_add_epi16(curs, bias);
-      __m128i even = _mm_add_epi16(prvd, curb);
-      __m128i odd  = _mm_add_epi16(nxtd, curb);
-
-      /* interleave even and odd pixels, then undo scaling. */
-      __m128i int0 = _mm_unpacklo_epi16(even, odd);
-      __m128i int1 = _mm_unpackhi_epi16(even, odd);
-      __m128i de0  = _mm_srli_epi16(int0, 4);
-      __m128i de1  = _mm_srli_epi16(int1, 4);
-
-      /* pack and write output */
-      __m128i outv = _mm_packus_epi16(de0, de1);
-      _mm_storeu_si128((__m128i *) (out + i*2), outv);
-#elif defined(RJPEG_NEON)
-      /* load and perform the vertical filtering pass
-       * this uses 3*x + y = 4*x + (y - x) */
-      uint8x8_t farb  = vld1_u8(in_far + i);
-      uint8x8_t nearb = vld1_u8(in_near + i);
-      int16x8_t diff  = vreinterpretq_s16_u16(vsubl_u8(farb, nearb));
-      int16x8_t nears = vreinterpretq_s16_u16(vshll_n_u8(nearb, 2));
-      int16x8_t curr  = vaddq_s16(nears, diff); /* current row */
-
-      /* horizontal filter works the same based on shifted vers of current
-       * row. "prev" is current row shifted right by 1 pixel; we need to
-       * insert the previous pixel value (from t1).
-       * "next" is current row shifted left by 1 pixel, with first pixel
-       * of next block of 8 pixels added in. */
-      int16x8_t prv0 = vextq_s16(curr, curr, 7);
-      int16x8_t nxt0 = vextq_s16(curr, curr, 1);
-      int16x8_t prev = vsetq_lane_s16(t1, prv0, 0);
-      int16x8_t next = vsetq_lane_s16(3*in_near[i+8] + in_far[i+8], nxt0, 7);
-
-      /* horizontal filter, polyphase implementation since it's convenient:
-       * even pixels = 3*cur + prev = cur*4 + (prev - cur)
-       * odd  pixels = 3*cur + next = cur*4 + (next - cur)
-       * note the shared term.
-       */
-      int16x8_t curs = vshlq_n_s16(curr, 2);
-      int16x8_t prvd = vsubq_s16(prev, curr);
-      int16x8_t nxtd = vsubq_s16(next, curr);
-      int16x8_t even = vaddq_s16(curs, prvd);
-      int16x8_t odd  = vaddq_s16(curs, nxtd);
-
-      /* undo scaling and round, then store with even/odd phases interleaved */
-      uint8x8x2_t o;
-      o.val[0] = vqrshrun_n_s16(even, 4);
-      o.val[1] = vqrshrun_n_s16(odd,  4);
-      vst2_u8(out + i*2, o);
-#endif
-
-      /* "previous" value for next iteration */
-      t1 = 3*in_near[i+7] + in_far[i+7];
-   }
-
-   t0       = t1;
-   t1       = 3*in_near[i] + in_far[i];
-   out[i*2] = rjpeg__div16(3*t1 + t0 + 8);
-
-   for (++i; i < w; ++i)
-   {
-      t0         = t1;
-      t1         = 3*in_near[i]+in_far[i];
-      out[i*2-1] = rjpeg__div16(3*t0 + t1 + 8);
-      out[i*2  ] = rjpeg__div16(3*t1 + t0 + 8);
-   }
-   out[w*2-1] = rjpeg__div4(t1+2);
-
-   (void)hs;
-
-   return out;
-}
-#endif
-
-static uint8_t *rjpeg__resample_row_generic(uint8_t *out,
-      uint8_t *in_near, uint8_t *in_far, int w, int hs)
-{
-   /* resample with nearest-neighbor */
-   int i,j;
-   (void)in_far;
-
-   for (i=0; i < w; ++i)
-      for (j=0; j < hs; ++j)
-         out[i*hs+j] = in_near[i];
-   return out;
-}
-
-/* this is a reduced-precision calculation of YCbCr-to-RGB introduced
- * to make sure the code produces the same results in both SIMD and scalar */
-#ifndef float2fixed
-#define float2fixed(x)  (((int) ((x) * 4096.0f + 0.5f)) << 8)
-#endif
-
-static void rjpeg__YCbCr_to_RGB_row(uint8_t *out, const uint8_t *y,
-      const uint8_t *pcb, const uint8_t *pcr, int count, int step)
-{
-   int i;
-   for (i=0; i < count; ++i)
-   {
-      int y_fixed = (y[i] << 20) + (1<<19); /* rounding */
-      int cr = pcr[i] - 128;
-      int cb = pcb[i] - 128;
-      int r = y_fixed +  cr* float2fixed(1.40200f);
-      int g = y_fixed + (cr*-float2fixed(0.71414f)) + ((cb*-float2fixed(0.34414f)) & 0xffff0000);
-      int b = y_fixed                               +   cb* float2fixed(1.77200f);
-      r >>= 20;
-      g >>= 20;
-      b >>= 20;
-      if ((unsigned) r > 255)
-         r = 255;
-      if ((unsigned) g > 255)
-         g = 255;
-      if ((unsigned) b > 255)
-         b = 255;
-      out[0] = (uint8_t)r;
-      out[1] = (uint8_t)g;
-      out[2] = (uint8_t)b;
-      out[3] = 255;
-      out += step;
-   }
-}
-
-#if defined(__SSE2__) || defined(RJPEG_NEON)
-static void rjpeg__YCbCr_to_RGB_simd(uint8_t *out, const uint8_t *y,
-      const uint8_t *pcb, const uint8_t *pcr, int count, int step)
-{
-   int i = 0;
-
-#if defined(__SSE2__)
-   /* step == 3 is pretty ugly on the final interleave, and i'm not convinced
-    * it's useful in practice (you wouldn't use it for textures, for example).
-    * so just accelerate step == 4 case.
-    */
-   if (step == 4)
-   {
-      /* this is a fairly straightforward implementation and not super-optimized. */
-      __m128i signflip  = _mm_set1_epi8(-0x80);
-      __m128i cr_const0 = _mm_set1_epi16(   (short) ( 1.40200f*4096.0f+0.5f));
-      __m128i cr_const1 = _mm_set1_epi16( - (short) ( 0.71414f*4096.0f+0.5f));
-      __m128i cb_const0 = _mm_set1_epi16( - (short) ( 0.34414f*4096.0f+0.5f));
-      __m128i cb_const1 = _mm_set1_epi16(   (short) ( 1.77200f*4096.0f+0.5f));
-      __m128i y_bias = _mm_set1_epi8((char) (unsigned char) 128);
-      __m128i xw = _mm_set1_epi16(255); /* alpha channel */
-
-      for (; i+7 < count; i += 8)
-      {
-         /* load */
-         __m128i y_bytes = _mm_loadl_epi64((__m128i *) (y+i));
-         __m128i cr_bytes = _mm_loadl_epi64((__m128i *) (pcr+i));
-         __m128i cb_bytes = _mm_loadl_epi64((__m128i *) (pcb+i));
-         __m128i cr_biased = _mm_xor_si128(cr_bytes, signflip); /* -128 */
-         __m128i cb_biased = _mm_xor_si128(cb_bytes, signflip); /* -128 */
-
-         /* unpack to short (and left-shift cr, cb by 8) */
-         __m128i yw  = _mm_unpacklo_epi8(y_bias, y_bytes);
-         __m128i crw = _mm_unpacklo_epi8(_mm_setzero_si128(), cr_biased);
-         __m128i cbw = _mm_unpacklo_epi8(_mm_setzero_si128(), cb_biased);
-
-         /* color transform */
-         __m128i yws = _mm_srli_epi16(yw, 4);
-         __m128i cr0 = _mm_mulhi_epi16(cr_const0, crw);
-         __m128i cb0 = _mm_mulhi_epi16(cb_const0, cbw);
-         __m128i cb1 = _mm_mulhi_epi16(cbw, cb_const1);
-         __m128i cr1 = _mm_mulhi_epi16(crw, cr_const1);
-         __m128i rws = _mm_add_epi16(cr0, yws);
-         __m128i gwt = _mm_add_epi16(cb0, yws);
-         __m128i bws = _mm_add_epi16(yws, cb1);
-         __m128i gws = _mm_add_epi16(gwt, cr1);
-
-         /* descale */
-         __m128i rw = _mm_srai_epi16(rws, 4);
-         __m128i bw = _mm_srai_epi16(bws, 4);
-         __m128i gw = _mm_srai_epi16(gws, 4);
-
-         /* back to byte, set up for transpose */
-         __m128i brb = _mm_packus_epi16(rw, bw);
-         __m128i gxb = _mm_packus_epi16(gw, xw);
-
-         /* transpose to interleave channels */
-         __m128i t0 = _mm_unpacklo_epi8(brb, gxb);
-         __m128i t1 = _mm_unpackhi_epi8(brb, gxb);
-         __m128i o0 = _mm_unpacklo_epi16(t0, t1);
-         __m128i o1 = _mm_unpackhi_epi16(t0, t1);
-
-         /* store */
-         _mm_storeu_si128((__m128i *) (out + 0), o0);
-         _mm_storeu_si128((__m128i *) (out + 16), o1);
-         out += 32;
-      }
-   }
-#endif
-
-#ifdef RJPEG_NEON
-   /* in this version, step=3 support would be easy to add. but is there demand? */
-   if (step == 4)
-   {
-      /* this is a fairly straightforward implementation and not super-optimized. */
-      uint8x8_t signflip = vdup_n_u8(0x80);
-      int16x8_t cr_const0 = vdupq_n_s16(   (short) ( 1.40200f*4096.0f+0.5f));
-      int16x8_t cr_const1 = vdupq_n_s16( - (short) ( 0.71414f*4096.0f+0.5f));
-      int16x8_t cb_const0 = vdupq_n_s16( - (short) ( 0.34414f*4096.0f+0.5f));
-      int16x8_t cb_const1 = vdupq_n_s16(   (short) ( 1.77200f*4096.0f+0.5f));
-
-      for (; i+7 < count; i += 8)
-      {
-         uint8x8x4_t o;
-
-         /* load */
-         uint8x8_t y_bytes  = vld1_u8(y + i);
-         uint8x8_t cr_bytes = vld1_u8(pcr + i);
-         uint8x8_t cb_bytes = vld1_u8(pcb + i);
-         int8x8_t cr_biased = vreinterpret_s8_u8(vsub_u8(cr_bytes, signflip));
-         int8x8_t cb_biased = vreinterpret_s8_u8(vsub_u8(cb_bytes, signflip));
-
-         /* expand to s16 */
-         int16x8_t yws = vreinterpretq_s16_u16(vshll_n_u8(y_bytes, 4));
-         int16x8_t crw = vshll_n_s8(cr_biased, 7);
-         int16x8_t cbw = vshll_n_s8(cb_biased, 7);
-
-         /* color transform */
-         int16x8_t cr0 = vqdmulhq_s16(crw, cr_const0);
-         int16x8_t cb0 = vqdmulhq_s16(cbw, cb_const0);
-         int16x8_t cr1 = vqdmulhq_s16(crw, cr_const1);
-         int16x8_t cb1 = vqdmulhq_s16(cbw, cb_const1);
-         int16x8_t rws = vaddq_s16(yws, cr0);
-         int16x8_t gws = vaddq_s16(vaddq_s16(yws, cb0), cr1);
-         int16x8_t bws = vaddq_s16(yws, cb1);
-
-         /* undo scaling, round, convert to byte */
-         o.val[0] = vqrshrun_n_s16(rws, 4);
-         o.val[1] = vqrshrun_n_s16(gws, 4);
-         o.val[2] = vqrshrun_n_s16(bws, 4);
-         o.val[3] = vdup_n_u8(255);
-
-         /* store, interleaving r/g/b/a */
-         vst4_u8(out, o);
-         out += 8*4;
-      }
-   }
-#endif
-
-   for (; i < count; ++i)
-   {
-      int y_fixed = (y[i] << 20) + (1<<19); /* rounding */
-      int cr      = pcr[i] - 128;
-      int cb      = pcb[i] - 128;
-      int r       = y_fixed + cr* float2fixed(1.40200f);
-      int g       = y_fixed + cr*-float2fixed(0.71414f) + ((cb*-float2fixed(0.34414f)) & 0xffff0000);
-      int b       = y_fixed                             +   cb* float2fixed(1.77200f);
-      r >>= 20;
-      g >>= 20;
-      b >>= 20;
-      if ((unsigned) r > 255)
-         r = 255;
-      if ((unsigned) g > 255)
-         g = 255;
-      if ((unsigned) b > 255)
-         b = 255;
-      out[0] = (uint8_t)r;
-      out[1] = (uint8_t)g;
-      out[2] = (uint8_t)b;
-      out[3] = 255;
-      out += step;
-   }
-}
-#endif
-
-/* set up the kernels */
-static void rjpeg__setup_jpeg(rjpeg__jpeg *j)
-{
-   uint64_t mask = cpu_features_get();
-
-   (void)mask;
-
-   j->idct_block_kernel        = rjpeg__idct_block;
-   j->YCbCr_to_RGB_kernel      = rjpeg__YCbCr_to_RGB_row;
-   j->resample_row_hv_2_kernel = rjpeg__resample_row_hv_2;
-
-
-#if defined(__SSE2__)
-   if (mask & RETRO_SIMD_SSE2)
-   {
-      j->idct_block_kernel        = rjpeg__idct_simd;
-      j->YCbCr_to_RGB_kernel      = rjpeg__YCbCr_to_RGB_simd;
-      j->resample_row_hv_2_kernel = rjpeg__resample_row_hv_2_simd;
-   }
-#endif
-
-#ifdef RJPEG_NEON
-   j->idct_block_kernel           = rjpeg__idct_simd;
-   j->YCbCr_to_RGB_kernel         = rjpeg__YCbCr_to_RGB_simd;
-   j->resample_row_hv_2_kernel    = rjpeg__resample_row_hv_2_simd;
-#endif
-}
-
-/* clean up the temporary component buffers */
-static void rjpeg__cleanup_jpeg(rjpeg__jpeg *j)
-{
-   int i;
-   for (i=0; i < j->s->img_n; ++i)
-   {
-      if (j->img_comp[i].raw_data)
-      {
-         free(j->img_comp[i].raw_data);
-         j->img_comp[i].raw_data = NULL;
-         j->img_comp[i].data = NULL;
-      }
-
-      if (j->img_comp[i].raw_coeff)
-      {
-         free(j->img_comp[i].raw_coeff);
-         j->img_comp[i].raw_coeff = 0;
-         j->img_comp[i].coeff = 0;
-      }
-
-      if (j->img_comp[i].linebuf)
-      {
-         free(j->img_comp[i].linebuf);
-         j->img_comp[i].linebuf = NULL;
-      }
-   }
-}
-
-static uint8_t *rjpeg_load_jpeg_image(rjpeg__jpeg *z,
-      unsigned *out_x, unsigned *out_y, int *comp, int req_comp)
-{
-   int n, decode_n;
-   int k;
-   unsigned int i,j;
-   rjpeg__resample res_comp[4];
-   uint8_t *coutput[4] = {0};
-   uint8_t *output     = NULL;
-   z->s->img_n         = 0; /* make rjpeg__cleanup_jpeg safe */
-
-   /* validate req_comp */
-
-   /* Internal error? */
-   if (req_comp < 0 || req_comp > 4)
-      return NULL;
-
-   /* load a jpeg image from whichever source, but leave in YCbCr format */
-   if (!rjpeg__decode_jpeg_image(z))
-      goto error;
-
-   /* determine actual number of components to generate */
-   n = req_comp ? req_comp : z->s->img_n;
-
-   if (z->s->img_n == 3 && n < 3)
-      decode_n = 1;
-   else
-      decode_n = z->s->img_n;
-
-   /* resample and color-convert */
-   for (k=0; k < decode_n; ++k)
-   {
-      rjpeg__resample *r = &res_comp[k];
-
-      /* allocate line buffer big enough for upsampling off the edges
-       * with upsample factor of 4 */
-      z->img_comp[k].linebuf = (uint8_t *) malloc(z->s->img_x + 3);
-      if (!z->img_comp[k].linebuf)
-         goto error;
-
-      r->hs       = z->img_h_max / z->img_comp[k].h;
-      r->vs       = z->img_v_max / z->img_comp[k].v;
-      r->ystep    = r->vs >> 1;
-      r->w_lores  = (z->s->img_x + r->hs-1) / r->hs;
-      r->ypos     = 0;
-      r->line0    = r->line1 = z->img_comp[k].data;
-      r->resample = rjpeg__resample_row_generic;
-
-      if      (r->hs == 1 && r->vs == 1)
-         r->resample = rjpeg_resample_row_1;
-      else if (r->hs == 1 && r->vs == 2)
-         r->resample = rjpeg__resample_row_v_2;
-      else if (r->hs == 2 && r->vs == 1)
-         r->resample = rjpeg__resample_row_h_2;
-      else if (r->hs == 2 && r->vs == 2)
-         r->resample = z->resample_row_hv_2_kernel;
-   }
-
-   /* can't error after this so, this is safe */
-   output = (uint8_t *) malloc(n * z->s->img_x * z->s->img_y + 1);
-
-   if (!output)
-      goto error;
-
-   /* now go ahead and resample */
-   for (j=0; j < z->s->img_y; ++j)
-   {
-      uint8_t *out = output + n * z->s->img_x * j;
-      for (k=0; k < decode_n; ++k)
-      {
-         rjpeg__resample *r = &res_comp[k];
-         int         y_bot  = r->ystep >= (r->vs >> 1);
-
-         coutput[k]         = r->resample(z->img_comp[k].linebuf,
-               y_bot ? r->line1 : r->line0,
-               y_bot ? r->line0 : r->line1,
-               r->w_lores, r->hs);
-
-         if (++r->ystep >= r->vs)
-         {
-            r->ystep = 0;
-            r->line0 = r->line1;
-            if (++r->ypos < z->img_comp[k].y)
-               r->line1 += z->img_comp[k].w2;
-         }
-      }
-
-      if (n >= 3)
-      {
-         uint8_t *y = coutput[0];
-         if (z->s->img_n == 3)
-            z->YCbCr_to_RGB_kernel(out, y, coutput[1], coutput[2], z->s->img_x, n);
-         else
-            for (i=0; i < z->s->img_x; ++i)
-            {
-               out[0] = out[1] = out[2] = y[i];
-               out[3] = 255; /* not used if n==3 */
-               out += n;
-            }
-      }
-      else
-      {
-         uint8_t *y = coutput[0];
-         if (n == 1)
-            for (i=0; i < z->s->img_x; ++i)
-               out[i] = y[i];
-         else
-            for (i=0; i < z->s->img_x; ++i)
-               *out++ = y[i], *out++ = 255;
-      }
-   }
-
-   rjpeg__cleanup_jpeg(z);
-   *out_x = z->s->img_x;
-   *out_y = z->s->img_y;
-
-   if (comp)
-      *comp  = z->s->img_n; /* report original components, not output */
-   return output;
-
-error:
-   rjpeg__cleanup_jpeg(z);
-   return NULL;
-}
-
-static uint8_t *rjpeg_load_from_memory(const uint8_t *buffer, int len,
-      unsigned *x, unsigned *y, int *comp, int req_comp)
-{
-   rjpeg__jpeg j;
-   rjpeg__context s;
-
-   s.img_buffer          = (uint8_t*)buffer;
-   s.img_buffer_original = (uint8_t*)buffer;
-   s.img_buffer_end      = (uint8_t*)buffer+len;
-
-   j.s                   = &s;
-   rjpeg__setup_jpeg(&j);
-
-   return rjpeg_load_jpeg_image(&j, x,y,comp,req_comp);
-}
-
-int rjpeg_process_image(rjpeg_t *rjpeg, void **buf_data,
-      size_t size, unsigned *width, unsigned *height)
-{
-   int comp;
-   uint32_t *img         = NULL;
-   uint32_t *pixels      = NULL;
-   unsigned size_tex     = 0;
-
-   if (!rjpeg)
-      return IMAGE_PROCESS_ERROR;
-
-   img   = (uint32_t*)rjpeg_load_from_memory(rjpeg->buff_data, (int)size, width, height, &comp, 4);
-
-   if (!img)
-      return IMAGE_PROCESS_ERROR;
-
-   size_tex = (*width) * (*height);
-   pixels   = (uint32_t*)malloc(size_tex * sizeof(uint32_t));
-
-   if (!pixels)
-   {
-      free(img);
-      return IMAGE_PROCESS_ERROR;
-   }
-
-   *buf_data = pixels;
-
-   /* Convert RGBA to ARGB */
-   while (size_tex--)
-   {
-      unsigned int texel = img[size_tex];
-      unsigned int A     = texel & 0xFF000000;
-      unsigned int B     = texel & 0x00FF0000;
-      unsigned int G     = texel & 0x0000FF00;
-      unsigned int R     = texel & 0x000000FF;
-      ((unsigned int*)pixels)[size_tex] = A | (R << 16) | G | (B >> 16);
-   }
-
-   free(img);
-
-   return IMAGE_PROCESS_END;
-}
-
-bool rjpeg_set_buf_ptr(rjpeg_t *rjpeg, void *data)
-{
-   if (!rjpeg)
-      return false;
-
-   rjpeg->buff_data = (uint8_t*)data;
-
-   return true;
-}
-
-void rjpeg_free(rjpeg_t *rjpeg)
-{
-   if (!rjpeg)
-      return;
-
-   free(rjpeg);
-}
-
-rjpeg_t *rjpeg_alloc(void)
-{
-   rjpeg_t *rjpeg = (rjpeg_t*)calloc(1, sizeof(*rjpeg));
-   if (!rjpeg)
-      return NULL;
-   return rjpeg;
-}
diff --git a/libretro-common/formats/json/jsonsax.c b/libretro-common/formats/json/jsonsax.c
deleted file mode 100644
index 1a7ac93..0000000
--- a/libretro-common/formats/json/jsonsax.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (jsonsax.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <setjmp.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <retro_inline.h>
-#include <formats/jsonsax.h>
-
-#ifdef JSONSAX_ERRORS
-const char* jsonsax_errors[] =
-{
-  "Ok",
-  "Interrupted",
-  "Missing key",
-  "Unterminated key",
-  "Missing value",
-  "Unterminated object",
-  "Unterminated array",
-  "Unterminated string",
-  "Invalid value"
-};
-#endif
-
-typedef struct
-{
-  const jsonsax_handlers_t* handlers;
-
-  const char* json;
-  void*       ud;
-  jmp_buf     env;
-}
-state_t;
-
-static INLINE void skip_spaces( state_t* state )
-{
-  while ( isspace( *state->json ) )
-    state->json++;
-}
-
-static INLINE void skip_digits( state_t* state )
-{
-  while ( isdigit( *state->json ) )
-    state->json++;
-}
-
-#define HANDLE_0( event ) \
-  do { \
-    if ( state->handlers->event && state->handlers->event( state->ud ) ) \
-      longjmp( state->env, JSONSAX_INTERRUPTED ); \
-  } while ( 0 )
-
-#define HANDLE_1( event, arg1 ) \
-  do { \
-    if ( state->handlers->event && state->handlers->event( state->ud, arg1 ) ) \
-      longjmp( state->env, JSONSAX_INTERRUPTED ); \
-  } while ( 0 )
-
-#define HANDLE_2( event, arg1, arg2 ) \
-  do { \
-    if ( state->handlers->event && state->handlers->event( state->ud, arg1, arg2 ) ) \
-      longjmp( state->env, JSONSAX_INTERRUPTED ); \
-  } while ( 0 )
-
-static void jsonx_parse_value(state_t* state);
-
-static void jsonx_parse_object( state_t* state )
-{
-   state->json++; /* we're sure the current character is a '{' */
-   skip_spaces( state );
-   HANDLE_0( start_object );
-
-   while ( *state->json != '}' )
-   {
-      const char *name = NULL;
-      if ( *state->json != '"' )
-         longjmp( state->env, JSONSAX_MISSING_KEY );
-
-      name = ++state->json;
-
-      for ( ;; )
-      {
-         const char* quote = strchr( state->json, '"' );
-
-         if ( !quote )
-            longjmp( state->env, JSONSAX_UNTERMINATED_KEY );
-
-         state->json = quote + 1;
-
-         if ( quote[ -1 ] != '\\' )
-            break;
-      }
-
-      HANDLE_2( key, name, state->json - name - 1 );
-      skip_spaces( state );
-
-      if ( *state->json != ':' )
-         longjmp( state->env, JSONSAX_MISSING_VALUE );
-
-      state->json++;
-      skip_spaces( state );
-      jsonx_parse_value( state );
-      skip_spaces( state );
-
-      if ( *state->json != ',' )
-         break;
-
-      state->json++;
-      skip_spaces( state );
-   }
-
-   if ( *state->json != '}' )
-      longjmp( state->env, JSONSAX_UNTERMINATED_OBJECT );
-
-   state->json++;
-   HANDLE_0( end_object );
-}
-
-static void jsonx_parse_array(state_t* state)
-{
-   unsigned int ndx = 0;
-
-   state->json++; /* we're sure the current character is a '[' */
-   skip_spaces( state );
-   HANDLE_0( start_array );
-
-   while ( *state->json != ']' )
-   {
-      HANDLE_1( array_index, ndx++ );
-      jsonx_parse_value( state );
-      skip_spaces( state );
-
-      if ( *state->json != ',' )
-         break;
-
-      state->json++;
-      skip_spaces( state );
-   }
-
-   if ( *state->json != ']' )
-      longjmp( state->env, JSONSAX_UNTERMINATED_ARRAY );
-
-   state->json++;
-   HANDLE_0( end_array );
-}
-
-static void jsonx_parse_string(state_t* state)
-{
-  const char* string = ++state->json;
-
-  for ( ;; )
-  {
-    const char* quote = strchr( state->json, '"' );
-
-    if ( !quote )
-      longjmp( state->env, JSONSAX_UNTERMINATED_STRING );
-
-    state->json = quote + 1;
-
-    if ( quote[ -1 ] != '\\' )
-      break;
-  }
-
-  HANDLE_2( string, string, state->json - string - 1 );
-}
-
-static void jsonx_parse_boolean(state_t* state)
-{
-   if ( !strncmp( state->json, "true", 4 ) )
-   {
-      state->json += 4;
-      HANDLE_1( boolean, 1 );
-   }
-   else if ( !strncmp( state->json, "false", 5 ) )
-   {
-      state->json += 5;
-      HANDLE_1( boolean, 0 );
-   }
-   else
-      longjmp( state->env, JSONSAX_INVALID_VALUE );
-}
-
-static void jsonx_parse_null(state_t* state)
-{
-   if ( !strncmp( state->json + 1, "ull", 3 ) ) /* we're sure the current character is a 'n' */
-   {
-      state->json += 4;
-      HANDLE_0( null );
-   }
-   else
-      longjmp( state->env, JSONSAX_INVALID_VALUE );
-}
-
-static void jsonx_parse_number(state_t* state)
-{
-   const char* number = state->json;
-
-   if ( *state->json == '-' )
-      state->json++;
-
-   if ( !isdigit( *state->json ) )
-      longjmp( state->env, JSONSAX_INVALID_VALUE );
-
-   skip_digits( state );
-
-   if ( *state->json == '.' )
-   {
-      state->json++;
-
-      if ( !isdigit( *state->json ) )
-         longjmp( state->env, JSONSAX_INVALID_VALUE );
-
-      skip_digits( state );
-   }
-
-   if ( *state->json == 'e' || *state->json == 'E' )
-   {
-      state->json++;
-
-      if ( *state->json == '-' || *state->json == '+' )
-         state->json++;
-
-      if ( !isdigit( *state->json ) )
-         longjmp( state->env, JSONSAX_INVALID_VALUE );
-
-      skip_digits( state );
-   }
-
-   HANDLE_2( number, number, state->json - number );
-}
-
-static void jsonx_parse_value(state_t* state)
-{
-   skip_spaces( state );
-
-   switch ( *state->json )
-   {
-      case '{':
-         jsonx_parse_object(state);
-         break;
-      case '[':
-         jsonx_parse_array( state );
-         break;
-      case '"':
-         jsonx_parse_string( state );
-         break;
-      case 't':
-      case 'f':
-         jsonx_parse_boolean( state );
-         break;
-      case 'n':
-         jsonx_parse_null( state );
-         break;
-      case '0':
-      case '1':
-      case '2':
-      case '3':
-      case '4':
-      case '5':
-      case '6':
-      case '7':
-      case '8':
-      case '9':
-      case '-':
-         jsonx_parse_number( state );
-         break;
-
-      default:
-         longjmp( state->env, JSONSAX_INVALID_VALUE );
-   }
-}
-
-int jsonsax_parse( const char* json, const jsonsax_handlers_t* handlers, void* userdata )
-{
-  state_t state;
-  int res;
-
-  state.json = json;
-  state.handlers = handlers;
-  state.ud = userdata;
-
-  if ( ( res = setjmp( state.env ) ) == 0 )
-  {
-    if ( handlers->start_document )
-      handlers->start_document( userdata );
-
-    jsonx_parse_value(&state);
-
-    if ( handlers->end_document )
-      handlers->end_document( userdata );
-
-    res = JSONSAX_OK;
-  }
-
-  return res;
-}
diff --git a/libretro-common/formats/json/jsonsax_full.c b/libretro-common/formats/json/jsonsax_full.c
deleted file mode 100644
index aab9b53..0000000
--- a/libretro-common/formats/json/jsonsax_full.c
+++ /dev/null
@@ -1,3931 +0,0 @@
-/*
-  Copyright (c) 2012 John-Anthony Owens
-
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of this software and associated documentation files (the "Software"),
-  to deal in the Software without restriction, including without limitation
-  the rights to use, copy, modify, merge, publish, distribute, sublicense,
-  and/or sell copies of the Software, and to permit persons to whom the
-  Software is furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included
-  in all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-  IN THE SOFTWARE.
-*/
-
-#include <stdlib.h>
-#include <string.h>
-
-/* Ensure uint32_t type (compiler-dependent). */
-#if defined(_MSC_VER)
-typedef unsigned __int32 uint32_t;
-#else
-#include <stdint.h>
-#endif
-
-/* Ensure SIZE_MAX defined. */
-#ifndef SIZE_MAX
-#define SIZE_MAX ((size_t)-1)
-#endif
-
-/* Mark APIs for export (as opposed to import) when we build this file. */
-#define JSON_BUILDING
-#include <formats/jsonsax_full.h>
-
-/* Default allocation constants. */
-#define DEFAULT_TOKEN_BYTES_LENGTH 64 /* MUST be a power of 2 */
-#define DEFAULT_SYMBOL_STACK_SIZE  32 /* MUST be a power of 2 */
-
-/* Types for readability. */
-typedef unsigned char byte;
-typedef uint32_t Codepoint;
-
-/* Especially-relevant Unicode codepoints. */
-#define U_(x) ((Codepoint)(x))
-#define NULL_CODEPOINT                  U_(0x0000)
-#define BACKSPACE_CODEPOINT             U_(0x0008)
-#define TAB_CODEPOINT                   U_(0x0009)
-#define LINE_FEED_CODEPOINT             U_(0x000A)
-#define FORM_FEED_CODEPOINT             U_(0x000C)
-#define CARRIAGE_RETURN_CODEPOINT       U_(0x000D)
-#define FIRST_NON_CONTROL_CODEPOINT     U_(0x0020)
-#define DELETE_CODEPOINT                U_(0x007F)
-#define FIRST_NON_ASCII_CODEPOINT       U_(0x0080)
-#define FIRST_2_BYTE_UTF8_CODEPOINT     U_(0x0080)
-#define FIRST_3_BYTE_UTF8_CODEPOINT     U_(0x0800)
-#define LINE_SEPARATOR_CODEPOINT        U_(0x2028)
-#define PARAGRAPH_SEPARATOR_CODEPOINT   U_(0x2029)
-#define BOM_CODEPOINT                   U_(0xFEFF)
-#define REPLACEMENT_CHARACTER_CODEPOINT U_(0xFFFD)
-#define FIRST_NON_BMP_CODEPOINT         U_(0x10000)
-#define FIRST_4_BYTE_UTF8_CODEPOINT     U_(0x10000)
-#define MAX_CODEPOINT                   U_(0x10FFFF)
-#define EOF_CODEPOINT                   U_(0xFFFFFFFF)
-
-/* Bit-masking macros. */
-#define BOTTOM_3_BITS(x) ((x) & 0x7)
-#define BOTTOM_4_BITS(x) ((x) & 0xF)
-#define BOTTOM_5_BITS(x) ((x) & 0x1F)
-#define BOTTOM_6_BITS(x) ((x) & 0x3F)
-
-/* Bit-flag macros. */
-#define GET_FLAGS(x, f)                  ((x) & (f))
-#define SET_FLAGS_ON(flagstype, x, f)    do { (x) |= (flagstype)(f); } while (0)
-#define SET_FLAGS_OFF(flagstype, x, f)   do { (x) &= (flagstype)~(f); } while (0)
-#define SET_FLAGS(flagstype, x, f, cond) do { if (cond) (x) |= (flagstype)(f); else (x) &= (flagstype)~(f); } while (0)
-
-/* UTF-8 byte-related macros. */
-#define IS_UTF8_SINGLE_BYTE(b)       (((b) & 0x80) == 0)
-#define IS_UTF8_CONTINUATION_BYTE(b) (((b) & 0xC0) == 0x80)
-#define IS_UTF8_FIRST_BYTE_OF_2(b)   (((b) & 0xE0) == 0xC0)
-#define IS_UTF8_FIRST_BYTE_OF_3(b)   (((b) & 0xF0) == 0xE0)
-#define IS_UTF8_FIRST_BYTE_OF_4(b)   (((b) & 0xF8) == 0xF0)
-
-/* Unicode codepoint-related macros. */
-#define IS_NONCHARACTER(c)               ((((c) & 0xFE) == 0xFE) || (((c) >= 0xFDD0) && ((c) <= 0xFDEF)))
-#define IS_SURROGATE(c)                  (((c) & 0xFFFFF800) == 0xD800)
-#define IS_LEADING_SURROGATE(c)          (((c) & 0xFFFFFC00) == 0xD800)
-#define IS_TRAILING_SURROGATE(c)         (((c) & 0xFFFFFC00) == 0xDC00)
-#define CODEPOINT_FROM_SURROGATES(hi_lo) ((((hi_lo) >> 16) << 10) + ((hi_lo) & 0xFFFF) + 0xFCA02400)
-#define SURROGATES_FROM_CODEPOINT(c)     ((((c) << 6) & 0x7FF0000) + ((c) & 0x3FF) + 0xD7C0DC00)
-#define SHORTEST_ENCODING_SEQUENCE(enc)  (1U << ((enc) >> 1))
-#define LONGEST_ENCODING_SEQUENCE        4
-
-/* Internal types that alias enum types in the public API.
-   By using byte to represent these values internally,
-   we can guarantee minimal storage size and avoid compiler
-   warnings when using values of the type in switch statements
-   that don't have (or need) a default case. */
-typedef byte Encoding;
-typedef byte Error;
-typedef byte TokenAttributes;
-
-/******************** Default Memory Suite ********************/
-
-static void* JSON_CALL DefaultReallocHandler(void* userData, void* ptr, size_t size)
-{
-   (void)userData; /* unused */
-   return realloc(ptr, size);
-}
-
-static void JSON_CALL DefaultFreeHandler(void* userData, void* ptr)
-{
-   (void)userData; /* unused */
-   free(ptr);
-}
-
-static const JSON_MemorySuite defaultMemorySuite = { NULL, &DefaultReallocHandler, &DefaultFreeHandler };
-
-static byte* DoubleBuffer(const JSON_MemorySuite* pMemorySuite, byte* pDefaultBuffer, byte* pBuffer, size_t length)
-{
-   size_t newLength = length * 2;
-   if (newLength < length)
-   {
-      pBuffer = NULL;
-   }
-   else if (pBuffer == pDefaultBuffer)
-   {
-      pBuffer = (byte*)pMemorySuite->realloc(pMemorySuite->userData, NULL, newLength);
-      if (pBuffer)
-      {
-         memcpy(pBuffer, pDefaultBuffer, length);
-      }
-   }
-   else
-   {
-      pBuffer = (byte*)pMemorySuite->realloc(pMemorySuite->userData, pBuffer, newLength);
-   }
-   return pBuffer;
-}
-
-/******************** Unicode Decoder ********************/
-
-/* Mutually-exclusive decoder states. */
-/* The bits of DecoderState are layed out as follows:
-
-   ---lllnn
-
-   - = unused (3 bits)
-   l = expected total sequence length (3 bits)
-   d = number of bytes decoded so far (2 bits)
-   */
-
-#define DECODER_RESET  0x00
-#define DECODED_1_OF_2 0x09 /* 00001001 */
-#define DECODED_1_OF_3 0x0D /* 00001101 */
-#define DECODED_2_OF_3 0x0E /* 00001110 */
-#define DECODED_1_OF_4 0x11 /* 00010001 */
-#define DECODED_2_OF_4 0x12 /* 00010010 */
-#define DECODED_3_OF_4 0x13 /* 00010011 */
-typedef byte DecoderState;
-
-#define DECODER_STATE_BYTES(s) (size_t)((s) & 0x3)
-
-/* Decoder data. */
-typedef struct tag_DecoderData
-{
-   DecoderState state;
-   uint32_t     bits;
-} DecoderData;
-typedef DecoderData* Decoder;
-
-/* The bits of DecoderOutput are layed out as follows:
-
-   ------rrlllccccccccccccccccccccc
-
-   - = unused (6 bits)
-   r = result code (2 bits)
-   l = sequence length (3 bits)
-   c = codepoint (21 bits)
-   */
-#define SEQUENCE_PENDING           0
-#define SEQUENCE_COMPLETE          1
-#define SEQUENCE_INVALID_INCLUSIVE 2
-#define SEQUENCE_INVALID_EXCLUSIVE 3
-typedef uint32_t DecoderResultCode;
-
-#define DECODER_OUTPUT(r, l, c)    (DecoderOutput)(((r) << 24) | ((l) << 21) | (c))
-#define DECODER_RESULT_CODE(o)     (DecoderResultCode)((DecoderOutput)(o) >> 24)
-#define DECODER_SEQUENCE_LENGTH(o) (size_t)(((DecoderOutput)(o) >> 21) & 0x7)
-#define DECODER_CODEPOINT(o)       (Codepoint)((DecoderOutput)(o) & 0x001FFFFF)
-typedef uint32_t DecoderOutput;
-
-/* Decoder functions. */
-
-static void Decoder_Reset(Decoder decoder)
-{
-   decoder->state = DECODER_RESET;
-   decoder->bits = 0;
-}
-
-static int Decoder_SequencePending(Decoder decoder)
-{
-   return decoder->state != DECODER_RESET;
-}
-
-static DecoderOutput Decoder_ProcessByte(Decoder decoder, Encoding encoding, byte b)
-{
-   DecoderOutput output = DECODER_OUTPUT(SEQUENCE_PENDING, 0, 0);
-   switch (encoding)
-   {
-      case JSON_UTF8:
-         /* When the input encoding is UTF-8, the decoded codepoint's bits are
-            recorded in the bottom 3 bytes of bits as they are decoded.
-            The top byte is not used. */
-         switch (decoder->state)
-         {
-            case DECODER_RESET:
-               if (IS_UTF8_SINGLE_BYTE(b))
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 1, b);
-               }
-               else if (IS_UTF8_FIRST_BYTE_OF_2(b))
-               {
-                  /* UTF-8 2-byte sequences that are overlong encodings can be
-                     detected from just the first byte (C0 or C1). */
-                  decoder->bits = (uint32_t)BOTTOM_5_BITS(b) << 6;
-                  if (decoder->bits < FIRST_2_BYTE_UTF8_CODEPOINT)
-                  {
-                     output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 1, 0);
-                  }
-                  else
-                  {
-                     decoder->state = DECODED_1_OF_2;
-                     goto noreset;
-                  }
-               }
-               else if (IS_UTF8_FIRST_BYTE_OF_3(b))
-               {
-                  decoder->bits = (uint32_t)BOTTOM_4_BITS(b) << 12;
-                  decoder->state = DECODED_1_OF_3;
-                  goto noreset;
-               }
-               else if (IS_UTF8_FIRST_BYTE_OF_4(b))
-               {
-                  /* Some UTF-8 4-byte sequences that encode out-of-range
-                     codepoints can be detected from the first byte (F5 - FF). */
-                  decoder->bits = (uint32_t)BOTTOM_3_BITS(b) << 18;
-                  if (decoder->bits > MAX_CODEPOINT)
-                  {
-                     output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 1, 0);
-                  }
-                  else
-                  {
-                     decoder->state = DECODED_1_OF_4;
-                     goto noreset;
-                  }
-               }
-               else
-               {
-                  /* The byte is of the form 11111xxx or 10xxxxxx, and is not
-                     a valid first byte for a UTF-8 sequence. */
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 1, 0);
-               }
-               break;
-
-            case DECODED_1_OF_2:
-               if (IS_UTF8_CONTINUATION_BYTE(b))
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 2, decoder->bits | BOTTOM_6_BITS(b));
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
-
-               }
-               break;
-
-            case DECODED_1_OF_3:
-               if (IS_UTF8_CONTINUATION_BYTE(b))
-               {
-                  /* UTF-8 3-byte sequences that are overlong encodings or encode
-                     surrogate codepoints can be detected after 2 bytes. */
-                  decoder->bits |= (uint32_t)BOTTOM_6_BITS(b) << 6;
-                  if ((decoder->bits < FIRST_3_BYTE_UTF8_CODEPOINT) || IS_SURROGATE(decoder->bits))
-                  {
-                     output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
-                  }
-                  else
-                  {
-                     decoder->state = DECODED_2_OF_3;
-                     goto noreset;
-                  }
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
-               }
-               break;
-
-            case DECODED_2_OF_3:
-               if (IS_UTF8_CONTINUATION_BYTE(b))
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 3, decoder->bits | BOTTOM_6_BITS(b));
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
-               }
-               break;
-
-            case DECODED_1_OF_4:
-               if (IS_UTF8_CONTINUATION_BYTE(b))
-               {
-                  /* UTF-8 4-byte sequences that are overlong encodings or encode
-                     out-of-range codepoints can be detected after 2 bytes. */
-                  decoder->bits |= (uint32_t)BOTTOM_6_BITS(b) << 12;
-                  if ((decoder->bits < FIRST_4_BYTE_UTF8_CODEPOINT) || (decoder->bits > MAX_CODEPOINT))
-                  {
-                     output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
-                  }
-                  else
-                  {
-                     decoder->state = DECODED_2_OF_4;
-                     goto noreset;
-                  }
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
-               }
-               break;
-
-            case DECODED_2_OF_4:
-               if (IS_UTF8_CONTINUATION_BYTE(b))
-               {
-                  decoder->bits |= (uint32_t)BOTTOM_6_BITS(b) << 6;
-                  decoder->state = DECODED_3_OF_4;
-                  goto noreset;
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
-               }
-               break;
-
-            case DECODED_3_OF_4:
-               if (IS_UTF8_CONTINUATION_BYTE(b))
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, decoder->bits | BOTTOM_6_BITS(b));
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 3, 0);
-               }
-               break;
-         }
-         break;
-
-      case JSON_UTF16LE:
-         /* When the input encoding is UTF-16, the decoded codepoint's bits are
-            recorded in the bottom 2 bytes of bits as they are decoded.
-            If those 2 bytes form a leading surrogate, the decoder treats the
-            surrogate pair as a single 4-byte sequence, shifts the leading
-            surrogate into the high 2 bytes of bits, and decodes the
-            trailing surrogate's bits in the bottom 2 bytes of bits. */
-         switch (decoder->state)
-         {
-            case DECODER_RESET:
-               decoder->bits = b;
-               decoder->state = DECODED_1_OF_2;
-               goto noreset;
-
-            case DECODED_1_OF_2:
-               decoder->bits |= (uint32_t)b << 8;
-               if (IS_TRAILING_SURROGATE(decoder->bits))
-               {
-                  /* A trailing surrogate cannot appear on its own. */
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 2, 0);
-               }
-               else if (IS_LEADING_SURROGATE(decoder->bits))
-               {
-                  /* A leading surrogate implies a 4-byte surrogate pair. */
-                  decoder->bits <<= 16;
-                  decoder->state = DECODED_2_OF_4;
-                  goto noreset;
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 2, decoder->bits);
-               }
-               break;
-
-            case DECODED_2_OF_4:
-               decoder->bits |= b;
-               decoder->state = DECODED_3_OF_4;
-               goto noreset;
-
-            case DECODED_3_OF_4:
-               decoder->bits |= (uint32_t)b << 8;
-               if (!IS_TRAILING_SURROGATE(decoder->bits & 0xFFFF))
-               {
-                  /* A leading surrogate must be followed by a trailing one.
-                     Treat the previous 3 bytes as an invalid 2-byte sequence
-                     followed by the first byte of a new sequence. */
-                  decoder->bits &= 0xFF;
-                  decoder->state = DECODED_1_OF_2;
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
-                  goto noreset;
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, CODEPOINT_FROM_SURROGATES(decoder->bits));
-               }
-               break;
-         }
-         break;
-
-      case JSON_UTF16BE:
-         /* When the input encoding is UTF-16, the decoded codepoint's bits are
-            recorded in the bottom 2 bytes of bits as they are decoded.
-            If those 2 bytes form a leading surrogate, the decoder treats the
-            surrogate pair as a single 4-byte sequence, shifts the leading
-            surrogate into the high 2 bytes of bits, and decodes the
-            trailing surrogate's bits in the bottom 2 bytes of bits. */
-         switch (decoder->state)
-         {
-            case DECODER_RESET:
-               decoder->bits = (uint32_t)b << 8;
-               decoder->state = DECODED_1_OF_2;
-               goto noreset;
-
-            case DECODED_1_OF_2:
-               decoder->bits |= b;
-               if (IS_TRAILING_SURROGATE(decoder->bits))
-               {
-                  /* A trailing surrogate cannot appear on its own. */
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 2, 0);
-               }
-               else if (IS_LEADING_SURROGATE(decoder->bits))
-               {
-                  /* A leading surrogate implies a 4-byte surrogate pair. */
-                  decoder->bits <<= 16;
-                  decoder->state = DECODED_2_OF_4;
-                  goto noreset;
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 2, decoder->bits);
-               }
-               break;
-
-            case DECODED_2_OF_4:
-               decoder->bits |= (uint32_t)b << 8;
-               decoder->state = DECODED_3_OF_4;
-               goto noreset;
-
-            case DECODED_3_OF_4:
-               decoder->bits |= b;
-               if (!IS_TRAILING_SURROGATE(decoder->bits & 0xFFFF))
-               {
-                  /* A leading surrogate must be followed by a trailing one.
-                     Treat the previous 3 bytes as an invalid 2-byte sequence
-                     followed by the first byte of a new sequence. */
-                  decoder->bits &= 0xFF00;
-                  decoder->state = DECODED_1_OF_2;
-                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
-                  goto noreset;
-               }
-               else
-               {
-                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, CODEPOINT_FROM_SURROGATES(decoder->bits));
-               }
-               break;
-         }
-         break;
-
-      case JSON_UTF32LE:
-         /* When the input encoding is UTF-32, the decoded codepoint's bits are
-            recorded in bits as they are decoded. */
-         switch (decoder->state)
-         {
-            case DECODER_RESET:
-               decoder->state = DECODED_1_OF_4;
-               decoder->bits = (uint32_t)b;
-               goto noreset;
-
-            case DECODED_1_OF_4:
-               decoder->state = DECODED_2_OF_4;
-               decoder->bits |= (uint32_t)b << 8;
-               goto noreset;
-
-            case DECODED_2_OF_4:
-               decoder->state = DECODED_3_OF_4;
-               decoder->bits |= (uint32_t)b << 16;
-               goto noreset;
-
-            case DECODED_3_OF_4:
-               decoder->bits |= (uint32_t)b << 24;
-               output = (IS_SURROGATE(decoder->bits) || (decoder->bits > MAX_CODEPOINT))
-                  ? DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 4, 0)
-                  : DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, decoder->bits);
-               break;
-         }
-         break;
-
-      case JSON_UTF32BE:
-         /* When the input encoding is UTF-32, the decoded codepoint's bits are
-            recorded in bits as they are decoded. */
-         switch (decoder->state)
-         {
-            case DECODER_RESET:
-               decoder->state = DECODED_1_OF_4;
-               decoder->bits = (uint32_t)b << 24;
-               goto noreset;
-
-            case DECODED_1_OF_4:
-               decoder->state = DECODED_2_OF_4;
-               decoder->bits |= (uint32_t)b << 16;
-               goto noreset;
-
-            case DECODED_2_OF_4:
-               decoder->state = DECODED_3_OF_4;
-               decoder->bits |= (uint32_t)b << 8;
-               goto noreset;
-
-            case DECODED_3_OF_4:
-               decoder->bits |= b;
-               output = (IS_SURROGATE(decoder->bits) || (decoder->bits > MAX_CODEPOINT))
-                  ? DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 4, 0)
-                  : DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, decoder->bits);
-               break;
-         }
-         break;
-   }
-
-   /* Reset the decoder for the next sequence. */
-   Decoder_Reset(decoder);
-
-noreset:
-   return output;
-}
-
-/******************** Unicode Encoder ********************/
-
-/* This function makes the following assumptions about its input:
-
-   1. The c argument is a valid codepoint (U+0000 - U+10FFFF).
-   2. The encoding argument is not JSON_UnknownEncoding.
-   3. The pBytes argument points to an array of at least 4 bytes.
-   */
-static size_t EncodeCodepoint(Codepoint c, Encoding encoding, byte* pBytes)
-{
-   size_t length = 0;
-   switch (encoding)
-   {
-      case JSON_UTF8:
-         if (c < FIRST_2_BYTE_UTF8_CODEPOINT)
-         {
-            pBytes[0] = (byte)c;
-            length = 1;
-         }
-         else if (c < FIRST_3_BYTE_UTF8_CODEPOINT)
-         {
-            pBytes[0] = (byte)(0xC0 | (c >> 6));
-            pBytes[1] = (byte)(0x80 | BOTTOM_6_BITS(c));
-            length = 2;
-         }
-         else if (c < FIRST_4_BYTE_UTF8_CODEPOINT)
-         {
-            pBytes[0] = (byte)(0xE0 | (c >> 12));
-            pBytes[1] = (byte)(0x80 | BOTTOM_6_BITS(c >> 6));
-            pBytes[2] = (byte)(0x80 | BOTTOM_6_BITS(c));
-            length = 3;
-         }
-         else
-         {
-            pBytes[0] = (byte)(0xF0 | (c >> 18));
-            pBytes[1] = (byte)(0x80 | BOTTOM_6_BITS(c >> 12));
-            pBytes[2] = (byte)(0x80 | BOTTOM_6_BITS(c >> 6));
-            pBytes[3] = (byte)(0x80 | BOTTOM_6_BITS(c));
-            length = 4;
-         }
-         break;
-
-      case JSON_UTF16LE:
-         if (c < FIRST_NON_BMP_CODEPOINT)
-         {
-            pBytes[0] = (byte)(c);
-            pBytes[1] = (byte)(c >> 8);
-            length = 2;
-         }
-         else
-         {
-            uint32_t surrogates = SURROGATES_FROM_CODEPOINT(c);
-
-            /* Leading surrogate. */
-            pBytes[0] = (byte)(surrogates >> 16);
-            pBytes[1] = (byte)(surrogates >> 24);
-
-            /* Trailing surrogate. */
-            pBytes[2] = (byte)(surrogates);
-            pBytes[3] = (byte)(surrogates >> 8);
-            length = 4;
-         }
-         break;
-
-      case JSON_UTF16BE:
-         if (c < FIRST_NON_BMP_CODEPOINT)
-         {
-            pBytes[1] = (byte)(c);
-            pBytes[0] = (byte)(c >> 8);
-            length = 2;
-         }
-         else
-         {
-            /* The codepoint requires a surrogate pair in UTF-16. */
-            uint32_t surrogates = SURROGATES_FROM_CODEPOINT(c);
-
-            /* Leading surrogate. */
-            pBytes[1] = (byte)(surrogates >> 16);
-            pBytes[0] = (byte)(surrogates >> 24);
-
-            /* Trailing surrogate. */
-            pBytes[3] = (byte)(surrogates);
-            pBytes[2] = (byte)(surrogates >> 8);
-            length = 4;
-         }
-         break;
-
-      case JSON_UTF32LE:
-         pBytes[0] = (byte)(c);
-         pBytes[1] = (byte)(c >> 8);
-         pBytes[2] = (byte)(c >> 16);
-         pBytes[3] = (byte)(c >> 24);
-         length = 4;
-         break;
-
-      case JSON_UTF32BE:
-         pBytes[3] = (byte)(c);
-         pBytes[2] = (byte)(c >> 8);
-         pBytes[1] = (byte)(c >> 16);
-         pBytes[0] = (byte)(c >> 24);
-         length = 4;
-         break;
-   }
-   return length;
-}
-
-/******************** JSON Lexer States ********************/
-
-/* Mutually-exclusive lexer states. */
-#define LEXING_WHITESPACE                                     0
-#define LEXING_LITERAL                                        1
-#define LEXING_STRING                                         2
-#define LEXING_STRING_ESCAPE                                  3
-#define LEXING_STRING_HEX_ESCAPE_BYTE_1                       4
-#define LEXING_STRING_HEX_ESCAPE_BYTE_2                       5
-#define LEXING_STRING_HEX_ESCAPE_BYTE_3                       6
-#define LEXING_STRING_HEX_ESCAPE_BYTE_4                       7
-#define LEXING_STRING_HEX_ESCAPE_BYTE_5                       8
-#define LEXING_STRING_HEX_ESCAPE_BYTE_6                       9
-#define LEXING_STRING_HEX_ESCAPE_BYTE_7                       10
-#define LEXING_STRING_HEX_ESCAPE_BYTE_8                       11
-#define LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_BACKSLASH 12
-#define LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_U         13
-#define LEXING_NUMBER_AFTER_MINUS                             14
-#define LEXING_NUMBER_AFTER_LEADING_ZERO                      15
-#define LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO             16
-#define LEXING_NUMBER_AFTER_X                                 17
-#define LEXING_NUMBER_HEX_DIGITS                              18
-#define LEXING_NUMBER_DECIMAL_DIGITS                          19
-#define LEXING_NUMBER_AFTER_DOT                               20
-#define LEXING_NUMBER_FRACTIONAL_DIGITS                       21
-#define LEXING_NUMBER_AFTER_E                                 22
-#define LEXING_NUMBER_AFTER_EXPONENT_SIGN                     23
-#define LEXING_NUMBER_EXPONENT_DIGITS                         24
-#define LEXING_COMMENT_AFTER_SLASH                            25
-#define LEXING_SINGLE_LINE_COMMENT                            26
-#define LEXING_MULTI_LINE_COMMENT                             27
-#define LEXING_MULTI_LINE_COMMENT_AFTER_STAR                  28
-#define LEXER_ERROR                                           255
-typedef byte LexerState;
-
-/******************** JSON Grammarian ********************/
-
-/* The JSON grammar comprises the following productions:
-
-   1.  VALUE => null
-   2.  VALUE => boolean
-   3.  VALUE => string
-   4.  VALUE => number
-   5.  VALUE => specialnumber
-   6.  VALUE => { MEMBERS }
-   7.  VALUE => [ ITEMS ]
-   8.  MEMBERS => MEMBER MORE_MEMBERS
-   9.  MEMBERS => e
-   10. MEMBER => string : VALUE
-   11. MORE_MEMBERS => , MEMBER MORE_MEMBERS
-   12. MORE_MEMBERS => e
-   13. ITEMS => ITEM MORE_ITEMS
-   14. ITEMS => e
-   15. ITEM => VALUE
-   16. MORE_ITEMS => , ITEM MORE_ITEMS
-   17. MORE_ITEMS => e
-
-   We implement a simple LL(1) parser based on this grammar, with events
-   emitted when certain non-terminals are replaced.
-   */
-
-/* Mutually-exclusive grammar tokens and non-terminals. The values are defined
-   so that the bottom 4 bits of a value can be used as an index into the
-   grammar production rule table. */
-#define T_NONE              0x00 /* tokens are in the form 0x0X */
-#define T_NULL              0x01
-#define T_TRUE              0x02
-#define T_FALSE             0x03
-#define T_STRING            0x04
-#define T_NUMBER            0x05
-#define T_NAN               0x06
-#define T_INFINITY          0x07
-#define T_NEGATIVE_INFINITY 0x08
-#define T_LEFT_CURLY        0x09
-#define T_RIGHT_CURLY       0x0A
-#define T_LEFT_SQUARE       0x0B
-#define T_RIGHT_SQUARE      0x0C
-#define T_COLON             0x0D
-#define T_COMMA             0x0E
-#define NT_VALUE            0x10 /* non-terminals are in the form 0x1X */
-#define NT_MEMBERS          0x11
-#define NT_MEMBER           0x12
-#define NT_MORE_MEMBERS     0x13
-#define NT_ITEMS            0x14
-#define NT_ITEM             0x15
-#define NT_MORE_ITEMS       0x16
-typedef byte Symbol;
-
-#define IS_NONTERMINAL(s) ((s) & 0x10)
-#define IS_TOKEN(s)       !IS_NONTERMINAL(s)
-
-/* Grammarian data. */
-typedef struct tag_GrammarianData
-{
-   Symbol* pStack; /* initially set to defaultStack */
-   size_t  stackSize;
-   size_t  stackUsed;
-   Symbol  defaultStack[DEFAULT_SYMBOL_STACK_SIZE];
-} GrammarianData;
-typedef GrammarianData* Grammarian;
-
-/* Mutually-exclusive result codes returned by the grammarian
-   after processing a token. */
-#define ACCEPTED_TOKEN    0
-#define REJECTED_TOKEN    1
-#define SYMBOL_STACK_FULL 2
-typedef uint32_t GrammarianResultCode;
-
-/* Events emitted by the grammarian as a result of processing a
-   token. Note that EMIT_ARRAY_ITEM always appears bitwise OR-ed
-   with one of the other values. */
-#define EMIT_NOTHING        0x00
-#define EMIT_NULL           0x01
-#define EMIT_BOOLEAN        0x02
-#define EMIT_STRING         0x03
-#define EMIT_NUMBER         0x04
-#define EMIT_SPECIAL_NUMBER 0x05
-#define EMIT_START_OBJECT   0x06
-#define EMIT_END_OBJECT     0x07
-#define EMIT_OBJECT_MEMBER  0x08
-#define EMIT_START_ARRAY    0x09
-#define EMIT_END_ARRAY      0x0A
-#define EMIT_ARRAY_ITEM     0x10 /* may be combined with other values */
-typedef byte GrammarEvent;
-
-/* The bits of GrammarianOutput are layed out as follows:
-
-   -rreeeee
-
-   - = unused (1 bit)
-   r = result code (2 bits)
-   e = event (5 bits)
-   */
-#define GRAMMARIAN_OUTPUT(r, e)   (GrammarianOutput)(((GrammarianResultCode)(r) << 5) | (GrammarEvent)(e))
-#define GRAMMARIAN_RESULT_CODE(o) (GrammarianResultCode)((GrammarianOutput)(o) >> 5)
-#define GRAMMARIAN_EVENT(o)       (GrammarEvent)((GrammarianOutput)(o) & 0x1F)
-typedef byte GrammarianOutput;
-
-/* Grammar rule used by the grammarian to process a token. */
-typedef struct tag_GrammarRule
-{
-   Symbol       symbolToPush1;
-   Symbol       symbolToPush2;
-   byte         reprocess;
-   GrammarEvent emit;
-} GrammarRule;
-
-/* Grammarian functions. */
-
-static void Grammarian_Reset(Grammarian grammarian, int isInitialized)
-{
-   /* When we reset the grammarian, we keep the symbol stack that has
-      already been allocated, if any. If the client wants to reclaim the
-      memory used by the that buffer, he needs to free the grammarian
-      and create a new one. */
-   if (!isInitialized)
-   {
-      grammarian->pStack = grammarian->defaultStack;
-      grammarian->stackSize = sizeof(grammarian->defaultStack);
-   }
-
-   /* The grammarian always starts with NT_VALUE on the symbol stack. */
-   grammarian->pStack[0] = NT_VALUE;
-   grammarian->stackUsed = 1;
-}
-
-static void Grammarian_FreeAllocations(Grammarian grammarian,
-      const JSON_MemorySuite* pMemorySuite)
-{
-   if (grammarian->pStack != grammarian->defaultStack)
-      pMemorySuite->free(pMemorySuite->userData, grammarian->pStack);
-}
-
-static int Grammarian_FinishedDocument(Grammarian grammarian)
-{
-   return !grammarian->stackUsed;
-}
-
-static GrammarianOutput Grammarian_ProcessToken(Grammarian grammarian,
-      Symbol token, const JSON_MemorySuite* pMemorySuite)
-{
-   /* The order and number of the rows and columns in this table must
-      match the defined token and non-terminal symbol values.
-
-      The row index is the incoming token's Symbol value.
-
-      The column index is the bottom 4 bits of Symbol value of
-      the non-terminal at the top of the processing stack.
-      Since non-terminal Symbol values start at 0x10, taking
-      the bottom 4 bits yields a 0-based index. */
-   static const byte ruleLookup[15][7] =
-   {
-      /*             V     MS    M     MM    IS    I     MI  */
-      /*  ----  */ { 0,    0,    0,    0,    0,    0,    0  },
-      /*  null  */ { 1,    0,    0,    0,    13,   15,   0  },
-      /*  true  */ { 2,    0,    0,    0,    13,   15,   0  },
-      /* false  */ { 2,    0,    0,    0,    13,   15,   0  },
-      /* string */ { 3,    8,    10,   0,    13,   15,   0  },
-      /* number */ { 4,    0,    0,    0,    13,   15,   0  },
-      /*  NaN   */ { 5,    0,    0,    0,    13,   15,   0  },
-      /*  Inf   */ { 5,    0,    0,    0,    13,   15,   0  },
-      /* -Inf   */ { 5,    0,    0,    0,    13,   15,   0  },
-      /*   {    */ { 6,    0,    0,    0,    13,   15,   0  },
-      /*   }    */ { 0,    9,    0,    12,   0,    0,    0  },
-      /*   [    */ { 7,    0,    0,    0,    13,   15,   0  },
-      /*   ]    */ { 0,    0,    0,    0,    14,   0,    17 },
-      /*   :    */ { 0,    0,    0,    0,    0,    0,    0  },
-      /*   ,    */ { 0,    0,    0,    11,   0,    0,    16 }
-   };
-
-   static const GrammarRule rules[17] =
-   {
-      /* 1.  */ { T_NONE,          T_NONE,      0, EMIT_NULL           },
-      /* 2.  */ { T_NONE,          T_NONE,      0, EMIT_BOOLEAN        },
-      /* 3.  */ { T_NONE,          T_NONE,      0, EMIT_STRING         },
-      /* 4.  */ { T_NONE,          T_NONE,      0, EMIT_NUMBER         },
-      /* 5.  */ { T_NONE,          T_NONE,      0, EMIT_SPECIAL_NUMBER },
-      /* 6.  */ { T_RIGHT_CURLY,   NT_MEMBERS,  0, EMIT_START_OBJECT   },
-      /* 7.  */ { T_RIGHT_SQUARE,  NT_ITEMS,    0, EMIT_START_ARRAY    },
-      /* 8.  */ { NT_MORE_MEMBERS, NT_MEMBER,   1, EMIT_NOTHING        },
-      /* 9.  */ { T_NONE,          T_NONE,      1, EMIT_END_OBJECT     },
-      /* 10. */ { NT_VALUE,        T_COLON,     0, EMIT_OBJECT_MEMBER  },
-      /* 11. */ { NT_MORE_MEMBERS, NT_MEMBER,   0, EMIT_NOTHING        },
-      /* 12. */ { T_NONE,          T_NONE,      1, EMIT_END_OBJECT     },
-      /* 13. */ { NT_MORE_ITEMS,   NT_ITEM,     1, EMIT_NOTHING        },
-      /* 14. */ { T_NONE,          T_NONE,      1, EMIT_END_ARRAY      },
-      /* 15. */ { NT_VALUE,        T_NONE,      1, EMIT_ARRAY_ITEM     },
-      /* 16. */ { NT_MORE_ITEMS,   NT_ITEM,     0, EMIT_NOTHING        },
-      /* 17. */ { T_NONE,          T_NONE,      1, EMIT_END_ARRAY      }
-   };
-
-   GrammarEvent emit = EMIT_NOTHING;
-
-   /* If the stack is empty, no more tokens were expected. */
-   if (Grammarian_FinishedDocument(grammarian))
-      return GRAMMARIAN_OUTPUT(REJECTED_TOKEN, EMIT_NOTHING);
-
-   for (;;)
-   {
-      Symbol topSymbol = grammarian->pStack[grammarian->stackUsed - 1];
-      if (IS_TOKEN(topSymbol))
-      {
-         if (topSymbol != token)
-            return GRAMMARIAN_OUTPUT(REJECTED_TOKEN, EMIT_NOTHING);
-         grammarian->stackUsed--;
-         break;
-      }
-      else
-      {
-         const GrammarRule* pRule = NULL;
-         byte ruleNumber          = ruleLookup[token][BOTTOM_4_BITS(topSymbol)];
-
-         if (ruleNumber == 0)
-            return GRAMMARIAN_OUTPUT(REJECTED_TOKEN, EMIT_NOTHING);
-
-         pRule = &rules[ruleNumber - 1];
-
-         /* The rule removes the top symbol and does not replace it. */
-         if (pRule->symbolToPush1 == T_NONE)
-            grammarian->stackUsed--;
-         else
-         {
-            /* The rule replaces the top symbol with 1 or 2 symbols. */
-            grammarian->pStack[grammarian->stackUsed - 1] = pRule->symbolToPush1;
-            if (pRule->symbolToPush2 != T_NONE)
-            {
-               /* The rule replaces the top symbol with 2 symbols.
-                  Make sure the stack has room for the second one. */
-               if (grammarian->stackUsed == grammarian->stackSize)
-               {
-                  Symbol* pBiggerStack = DoubleBuffer(pMemorySuite,
-                        grammarian->defaultStack, grammarian->pStack,
-                        grammarian->stackSize);
-
-                  if (!pBiggerStack)
-                     return GRAMMARIAN_OUTPUT(SYMBOL_STACK_FULL, EMIT_NOTHING);
-
-                  grammarian->pStack = pBiggerStack;
-                  grammarian->stackSize *= 2;
-               }
-               grammarian->pStack[grammarian->stackUsed] = pRule->symbolToPush2;
-               grammarian->stackUsed++;
-            }
-         }
-         emit |= pRule->emit;
-         if (!pRule->reprocess)
-            break;
-      }
-   }
-
-   return GRAMMARIAN_OUTPUT(ACCEPTED_TOKEN, emit);
-}
-
-/******************** JSON Parser ********************/
-
-#ifndef JSON_NO_PARSER
-
-/* Combinable parser state flags. */
-#define PARSER_RESET                 0x00
-#define PARSER_STARTED               0x01
-#define PARSER_FINISHED              0x02
-#define PARSER_IN_PROTECTED_API      0x04
-#define PARSER_IN_TOKEN_HANDLER      0x08
-#define PARSER_AFTER_CARRIAGE_RETURN 0x10
-typedef byte ParserState;
-
-/* Combinable parser settings flags. */
-#define PARSER_DEFAULT_FLAGS         0x00
-#define PARSER_ALLOW_BOM             0x01
-#define PARSER_ALLOW_COMMENTS        0x02
-#define PARSER_ALLOW_SPECIAL_NUMBERS 0x04
-#define PARSER_ALLOW_HEX_NUMBERS     0x08
-#define PARSER_REPLACE_INVALID       0x10
-#define PARSER_TRACK_OBJECT_MEMBERS  0x20
-#define PARSER_ALLOW_CONTROL_CHARS   0x40
-#define PARSER_EMBEDDED_DOCUMENT     0x80
-typedef byte ParserFlags;
-
-/* Sentinel value for parser error location offset. */
-#define ERROR_LOCATION_IS_TOKEN_START 0xFF
-
-/* An object member name stored in an unordered, singly-linked-list, used for
-   detecting duplicate member names. Note that the name string is not null-
-   terminated. */
-typedef struct tag_MemberName
-{
-   struct tag_MemberName* pNextName;
-   size_t                 length;
-   byte                   pBytes[1]; /* variable-size buffer */
-} MemberName;
-
-/* An object's list of member names, and a pointer to the object's
-   nearest ancestor object, if any. This is used as a stack. Because arrays
-   do not have named items, they do not need to be recorded in the stack. */
-typedef struct tag_MemberNames
-{
-   struct tag_MemberNames* pAncestor;
-   MemberName*             pFirstName;
-} MemberNames;
-
-/* A parser instance. */
-struct JSON_Parser_Data
-{
-   JSON_MemorySuite                    memorySuite;
-   void*                               userData;
-   ParserState                         state;
-   ParserFlags                         flags;
-   Encoding                            inputEncoding;
-   Encoding                            stringEncoding;
-   Encoding                            numberEncoding;
-   Symbol                              token;
-   TokenAttributes                     tokenAttributes;
-   Error                               error;
-   byte                                errorOffset;
-   LexerState                          lexerState;
-   uint32_t                            lexerBits;
-   size_t                              codepointLocationByte;
-   size_t                              codepointLocationLine;
-   size_t                              codepointLocationColumn;
-   size_t                              tokenLocationByte;
-   size_t                              tokenLocationLine;
-   size_t                              tokenLocationColumn;
-   size_t                              depth;
-   byte*                               pTokenBytes;
-   size_t                              tokenBytesLength;
-   size_t                              tokenBytesUsed;
-   size_t                              maxStringLength;
-   size_t                              maxNumberLength;
-   MemberNames*                        pMemberNames;
-   DecoderData                         decoderData;
-   GrammarianData                      grammarianData;
-   JSON_Parser_EncodingDetectedHandler encodingDetectedHandler;
-   JSON_Parser_NullHandler             nullHandler;
-   JSON_Parser_BooleanHandler          booleanHandler;
-   JSON_Parser_StringHandler           stringHandler;
-   JSON_Parser_NumberHandler           numberHandler;
-   JSON_Parser_SpecialNumberHandler    specialNumberHandler;
-   JSON_Parser_StartObjectHandler      startObjectHandler;
-   JSON_Parser_EndObjectHandler        endObjectHandler;
-   JSON_Parser_ObjectMemberHandler     objectMemberHandler;
-   JSON_Parser_StartArrayHandler       startArrayHandler;
-   JSON_Parser_EndArrayHandler         endArrayHandler;
-   JSON_Parser_ArrayItemHandler        arrayItemHandler;
-   byte                                defaultTokenBytes[DEFAULT_TOKEN_BYTES_LENGTH];
-};
-
-/* Parser internal functions. */
-
-static void JSON_Parser_SetErrorAtCodepoint(JSON_Parser parser, Error error)
-{
-   parser->error = error;
-}
-
-static void JSON_Parser_SetErrorAtStringEscapeSequenceStart(
-      JSON_Parser parser, Error error, int codepointsAgo)
-{
-   /* Note that backtracking from the current codepoint requires us to make
-      three assumptions, which are always valid in the context of a string
-      escape sequence:
-
-      1. The input encoding is not JSON_UnknownEncoding.
-
-      2 The codepoints we are backing up across are all in the range
-      U+0000 - U+007F, aka ASCII, so we can assume the number of
-      bytes comprising them based on the input encoding.
-
-      3. The codepoints we are backing up across do not include any
-      line breaks, so we can assume that the line number stays the
-      same and the column number can simply be decremented.
-      */
-   parser->error = error;
-   parser->errorOffset = (byte)codepointsAgo;
-}
-
-static void JSON_Parser_SetErrorAtToken(JSON_Parser parser, Error error)
-{
-   parser->error = error;
-   parser->errorOffset = ERROR_LOCATION_IS_TOKEN_START;
-}
-
-static JSON_Status JSON_Parser_PushMemberNameList(JSON_Parser parser)
-{
-   MemberNames* pNames = (MemberNames*)parser->memorySuite.realloc(
-         parser->memorySuite.userData, NULL, sizeof(MemberNames));
-
-   if (!pNames)
-   {
-      JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
-      return JSON_Failure;
-   }
-
-   pNames->pAncestor    = parser->pMemberNames;
-   pNames->pFirstName   = NULL;
-   parser->pMemberNames = pNames;
-   return JSON_Success;
-}
-
-static void JSON_Parser_PopMemberNameList(JSON_Parser parser)
-{
-   MemberNames* pAncestor = parser->pMemberNames->pAncestor;
-   while (parser->pMemberNames->pFirstName)
-   {
-      MemberName* pNextName = parser->pMemberNames->pFirstName->pNextName;
-      parser->memorySuite.free(parser->memorySuite.userData, parser->pMemberNames->pFirstName);
-      parser->pMemberNames->pFirstName = pNextName;
-   }
-   parser->memorySuite.free(parser->memorySuite.userData, parser->pMemberNames);
-   parser->pMemberNames = pAncestor;
-}
-
-static JSON_Status JSON_Parser_StartContainer(JSON_Parser parser, int isObject)
-{
-   if (isObject && GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS) &&
-         !JSON_Parser_PushMemberNameList(parser))
-   {
-      return JSON_Failure;
-   }
-   parser->depth++;
-   return JSON_Success;
-}
-
-static void JSON_Parser_EndContainer(JSON_Parser parser, int isObject)
-{
-   parser->depth--;
-   if (isObject && GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS))
-   {
-      JSON_Parser_PopMemberNameList(parser);
-   }
-}
-
-static JSON_Status JSON_Parser_AddMemberNameToList(JSON_Parser parser)
-{
-   if (GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS))
-   {
-      MemberName* pName;
-      for (pName = parser->pMemberNames->pFirstName; pName; pName = pName->pNextName)
-      {
-         if (pName->length == parser->tokenBytesUsed && !memcmp(pName->pBytes, parser->pTokenBytes, pName->length))
-         {
-            JSON_Parser_SetErrorAtToken(parser, JSON_Error_DuplicateObjectMember);
-            return JSON_Failure;
-         }
-      }
-      pName = (MemberName*)parser->memorySuite.realloc(parser->memorySuite.userData, NULL, sizeof(MemberName) + parser->tokenBytesUsed - 1);
-      if (!pName)
-      {
-         JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
-         return JSON_Failure;
-      }
-      pName->pNextName = parser->pMemberNames->pFirstName;
-      pName->length = parser->tokenBytesUsed;
-      memcpy(pName->pBytes, parser->pTokenBytes, parser->tokenBytesUsed);
-      parser->pMemberNames->pFirstName = pName;
-   }
-   return JSON_Success;
-}
-
-static void JSON_Parser_ResetData(JSON_Parser parser, int isInitialized)
-{
-   parser->userData                 = NULL;
-   parser->flags                    = PARSER_DEFAULT_FLAGS;
-   parser->inputEncoding            = JSON_UnknownEncoding;
-   parser->stringEncoding           = JSON_UTF8;
-   parser->numberEncoding           = JSON_UTF8;
-   parser->token                    = T_NONE;
-   parser->tokenAttributes          = 0;
-   parser->error                    = JSON_Error_None;
-   parser->errorOffset              = 0;
-   parser->lexerState               = LEXING_WHITESPACE;
-   parser->lexerBits                = 0;
-   parser->codepointLocationByte    = 0;
-   parser->codepointLocationLine    = 0;
-   parser->codepointLocationColumn  = 0;
-   parser->tokenLocationByte        = 0;
-   parser->tokenLocationLine        = 0;
-   parser->tokenLocationColumn      = 0;
-   parser->depth                    = 0;
-
-   if (!isInitialized)
-   {
-      parser->pTokenBytes      = parser->defaultTokenBytes;
-      parser->tokenBytesLength = sizeof(parser->defaultTokenBytes);
-   }
-   else
-   {
-      /* When we reset the parser, we keep the output buffer and the symbol
-         stack that have already been allocated, if any. If the client wants
-         to reclaim the memory used by the those buffers, he needs to free
-         the parser and create a new one. */
-   }
-   parser->tokenBytesUsed  = 0;
-   parser->maxStringLength = SIZE_MAX;
-   parser->maxNumberLength = SIZE_MAX;
-   if (!isInitialized)
-      parser->pMemberNames = NULL;
-   else
-   {
-      while (parser->pMemberNames)
-         JSON_Parser_PopMemberNameList(parser);
-   }
-   Decoder_Reset(&parser->decoderData);
-   Grammarian_Reset(&parser->grammarianData, isInitialized);
-   parser->encodingDetectedHandler = NULL;
-   parser->nullHandler = NULL;
-   parser->booleanHandler = NULL;
-   parser->stringHandler = NULL;
-   parser->numberHandler = NULL;
-   parser->specialNumberHandler = NULL;
-   parser->startObjectHandler = NULL;
-   parser->endObjectHandler = NULL;
-   parser->objectMemberHandler = NULL;
-   parser->startArrayHandler = NULL;
-   parser->endArrayHandler = NULL;
-   parser->arrayItemHandler = NULL;
-   parser->state = PARSER_RESET; /* do this last! */
-}
-
-static void JSON_Parser_NullTerminateToken(JSON_Parser parser)
-{
-   /* Because we always ensure that there are LONGEST_ENCODING_SEQUENCE bytes
-      available at the end of the token buffer when we record codepoints, we
-      can write the null terminator to the buffer with impunity. */
-   static const byte nullTerminatorBytes[LONGEST_ENCODING_SEQUENCE] = { 0 };
-   Encoding encoding = (Encoding)((parser->token == T_NUMBER) ? parser->numberEncoding : parser->stringEncoding);
-   memcpy(parser->pTokenBytes + parser->tokenBytesUsed, nullTerminatorBytes, SHORTEST_ENCODING_SEQUENCE(encoding));
-}
-
-static JSON_Status JSON_Parser_FlushParser(JSON_Parser parser)
-{
-   /* The symbol stack should be empty when parsing finishes. */
-   if (!Grammarian_FinishedDocument(&parser->grammarianData))
-   {
-      JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_ExpectedMoreTokens);
-      return JSON_Failure;
-   }
-   return JSON_Success;
-}
-
-typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_SimpleTokenHandler)(JSON_Parser parser);
-static JSON_Status JSON_Parser_CallSimpleTokenHandler(JSON_Parser parser, JSON_Parser_SimpleTokenHandler handler)
-{
-   if (handler)
-   {
-      JSON_Parser_HandlerResult result;
-      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-      result = handler(parser);
-      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-      if (result != JSON_Parser_Continue)
-      {
-         JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
-         return JSON_Failure;
-      }
-   }
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Parser_CallBooleanHandler(JSON_Parser parser)
-{
-   if (parser->booleanHandler)
-   {
-      JSON_Parser_HandlerResult result;
-      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-      result = parser->booleanHandler(parser, parser->token == T_TRUE ? JSON_True : JSON_False);
-      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-      if (result != JSON_Parser_Continue)
-      {
-         JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
-         return JSON_Failure;
-      }
-   }
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Parser_CallStringHandler(JSON_Parser parser, int isObjectMember)
-{
-   JSON_Parser_StringHandler handler = isObjectMember ? parser->objectMemberHandler : parser->stringHandler;
-   if (handler)
-   {
-      JSON_Parser_HandlerResult result;
-      JSON_Parser_NullTerminateToken(parser);
-      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-      result = handler(parser, (char*)parser->pTokenBytes, parser->tokenBytesUsed, parser->tokenAttributes);
-      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-
-      if (result != JSON_Parser_Continue)
-      {
-         JSON_Parser_SetErrorAtToken(parser,
-               (isObjectMember && result == JSON_Parser_TreatAsDuplicateObjectMember)
-               ? JSON_Error_DuplicateObjectMember 
-               : JSON_Error_AbortedByHandler);
-         return JSON_Failure;
-      }
-   }
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Parser_CallNumberHandler(JSON_Parser parser)
-{
-   if (parser->numberHandler)
-   {
-      JSON_Parser_HandlerResult result;
-      JSON_Parser_NullTerminateToken(parser);
-      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-      result = parser->numberHandler(parser, (char*)parser->pTokenBytes,
-            parser->tokenBytesUsed, parser->tokenAttributes);
-
-      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-
-      if (result != JSON_Parser_Continue)
-      {
-         JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
-         return JSON_Failure;
-      }
-   }
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Parser_CallSpecialNumberHandler(JSON_Parser parser)
-{
-   if (parser->specialNumberHandler)
-   {
-      JSON_Parser_HandlerResult result;
-      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-      result = parser->specialNumberHandler(parser, parser->token == T_NAN ? JSON_NaN :
-            (parser->token == T_INFINITY ? JSON_Infinity : JSON_NegativeInfinity));
-      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-
-      if (result != JSON_Parser_Continue)
-      {
-         JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
-         return JSON_Failure;
-      }
-   }
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Parser_HandleGrammarEvents(JSON_Parser parser, byte emit)
-{
-   if (GET_FLAGS(emit, EMIT_ARRAY_ITEM))
-   {
-      if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->arrayItemHandler))
-      {
-         return JSON_Failure;
-      }
-      SET_FLAGS_OFF(byte, emit, EMIT_ARRAY_ITEM);
-   }
-   switch (emit)
-   {
-      case EMIT_NULL:
-         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->nullHandler))
-            return JSON_Failure;
-         break;
-
-      case EMIT_BOOLEAN:
-         if (!JSON_Parser_CallBooleanHandler(parser))
-            return JSON_Failure;
-         break;
-
-      case EMIT_STRING:
-         if (!JSON_Parser_CallStringHandler(parser, 0/* isObjectMember */))
-            return JSON_Failure;
-         break;
-
-      case EMIT_NUMBER:
-         if (!JSON_Parser_CallNumberHandler(parser))
-            return JSON_Failure;
-         break;
-
-      case EMIT_SPECIAL_NUMBER:
-         if (!JSON_Parser_CallSpecialNumberHandler(parser))
-            return JSON_Failure;
-         break;
-
-      case EMIT_START_OBJECT:
-         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->startObjectHandler) ||
-               !JSON_Parser_StartContainer(parser, 1/*isObject*/))
-            return JSON_Failure;
-         break;
-
-      case EMIT_END_OBJECT:
-         JSON_Parser_EndContainer(parser, 1/*isObject*/);
-         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->endObjectHandler))
-            return JSON_Failure;
-         break;
-      case EMIT_OBJECT_MEMBER:
-         if (!JSON_Parser_AddMemberNameToList(parser) || /* will fail if member is duplicate */
-               !JSON_Parser_CallStringHandler(parser, 1 /* isObjectMember */))
-            return JSON_Failure;
-         break;
-
-      case EMIT_START_ARRAY:
-         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->startArrayHandler) ||
-               !JSON_Parser_StartContainer(parser, 0/*isObject*/))
-            return JSON_Failure;
-         break;
-
-      case EMIT_END_ARRAY:
-         JSON_Parser_EndContainer(parser, 0/*isObject*/);
-         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->endArrayHandler))
-            return JSON_Failure;
-         break;
-   }
-
-   if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT))
-   {
-      JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_StoppedAfterEmbeddedDocument);
-      return JSON_Failure;
-   }
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Parser_ProcessToken(JSON_Parser parser)
-{
-   GrammarianOutput output;
-   output = Grammarian_ProcessToken(&parser->grammarianData, parser->token, &parser->memorySuite);
-   switch (GRAMMARIAN_RESULT_CODE(output))
-   {
-      case ACCEPTED_TOKEN:
-         if (!JSON_Parser_HandleGrammarEvents(parser, GRAMMARIAN_EVENT(output)))
-            return JSON_Failure;
-         break;
-
-      case REJECTED_TOKEN:
-         JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnexpectedToken);
-         return JSON_Failure;
-
-      case SYMBOL_STACK_FULL:
-         JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
-         return JSON_Failure;
-   }
-
-   /* Reset the lexer to prepare for the next token. */
-   parser->lexerState = LEXING_WHITESPACE;
-   parser->lexerBits = 0;
-   parser->token = T_NONE;
-   parser->tokenAttributes = 0;
-   parser->tokenBytesUsed = 0;
-   return JSON_Success;
-}
-
-/* Lexer functions. */
-
-static const byte expectedLiteralChars[] = { 'u', 'l', 'l', 0, 'r', 'u', 'e', 0, 'a', 'l', 's', 'e', 0, 'a', 'N', 0, 'n', 'f', 'i', 'n', 'i', 't', 'y', 0  };
-
-#define NULL_LITERAL_EXPECTED_CHARS_START_INDEX     0
-#define TRUE_LITERAL_EXPECTED_CHARS_START_INDEX     4
-#define FALSE_LITERAL_EXPECTED_CHARS_START_INDEX    8
-#define NAN_LITERAL_EXPECTED_CHARS_START_INDEX      13
-#define INFINITY_LITERAL_EXPECTED_CHARS_START_INDEX 16
-
-/* Forward declaration. */
-static JSON_Status JSON_Parser_FlushLexer(JSON_Parser parser);
-static JSON_Status JSON_Parser_ProcessCodepoint(
-      JSON_Parser parser, Codepoint c, size_t encodedLength);
-
-static JSON_Status JSON_Parser_HandleInvalidEncodingSequence(
-      JSON_Parser parser, size_t encodedLength)
-{
-   if (parser->token == T_STRING && GET_FLAGS(parser->flags, PARSER_REPLACE_INVALID))
-   {
-      /* Since we're inside a string token, replacing the invalid sequence
-         with the Unicode replacement character as requested by the client
-         is a viable way to avoid a parse failure. Outside a string token,
-         such a replacement would simply trigger JSON_Error_UnknownToken
-         when we tried to process the replacement character, so it's less
-         confusing to stick with JSON_Error_InvalidEncodingSequence in that
-         case. */
-      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsReplacedCharacter);
-      return JSON_Parser_ProcessCodepoint(parser, REPLACEMENT_CHARACTER_CODEPOINT, encodedLength);
-   }
-   else if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT))
-   {
-      /* Since we're parsing the top-level value of an embedded
-         document, assume that the invalid encoding sequence we've
-         encountered does not actually belong to the document, and
-         finish parsing by pretending that we've encountered EOF
-         instead of an invalid sequence. If the content is valid,
-         this will fail with JSON_Error_StoppedAfterEmbeddedDocument;
-         otherwise, it will fail with an appropriate error. */
-      return (JSON_Status)(JSON_Parser_FlushLexer(parser) && JSON_Parser_FlushParser(parser));
-   }
-   JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_InvalidEncodingSequence);
-   return JSON_Failure;
-}
-
-static JSON_Status JSON_Parser_HandleInvalidNumber(JSON_Parser parser,
-      Codepoint c, int codepointsSinceValidNumber, TokenAttributes attributesToRemove)
-{
-   SET_FLAGS_OFF(TokenAttributes, parser->tokenAttributes, attributesToRemove);
-   if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT))
-   {
-      /* The invalid number is the top-level value of an embedded document,
-         and it has a prefix that can be interpreted as a valid number.
-         We want to backtrack so that we are at the end of that prefix,
-         and then process the valid token.
-
-         Note that backtracking requires us to make three assumptions, which
-         are always valid in the context of a number token:
-
-         1. The input encoding is not JSON_UnknownEncoding.
-
-         2 The codepoints we are backing up across are all in the range
-         U+0000 - U+007F, aka ASCII, so we can assume the number of
-         bytes comprising them based on the input encoding.
-
-         3. The codepoints we are backing up across do not include any
-         line breaks, so we can assume that the line number stays the
-         same and the column number can simply be decremented.
-
-         For example:
-
-         "01"     => "0"
-         "123.!"  => "123"
-         "123e!"  => "123"
-         "123e+!" => "123"
-         "123e-!" => "123"
-         "1.2e!"  => "1.2"
-         "1.2e+!" => "1.2"
-         "1.2e-!" => "1.2"
-         */
-      parser->codepointLocationByte -= (size_t)codepointsSinceValidNumber 
-         * SHORTEST_ENCODING_SEQUENCE(parser->inputEncoding);
-      parser->codepointLocationColumn -= (size_t)codepointsSinceValidNumber;
-      parser->tokenBytesUsed -= (size_t)codepointsSinceValidNumber 
-         * SHORTEST_ENCODING_SEQUENCE(parser->numberEncoding);
-      return JSON_Parser_ProcessToken(parser); /* always fails */
-   }
-   /* Allow JSON_Parser_FlushLexer() to fail. */
-   else if (c == EOF_CODEPOINT)
-      return JSON_Success;
-
-   JSON_Parser_SetErrorAtToken(parser, JSON_Error_InvalidNumber);
-   return JSON_Failure;
-}
-
-static void JSON_Parser_StartToken(JSON_Parser parser, Symbol token)
-{
-   parser->token               = token;
-   parser->tokenLocationByte   = parser->codepointLocationByte;
-   parser->tokenLocationLine   = parser->codepointLocationLine;
-   parser->tokenLocationColumn = parser->codepointLocationColumn;
-}
-
-static JSON_Status JSON_Parser_ProcessCodepoint(JSON_Parser parser, Codepoint c, size_t encodedLength)
-{
-   Encoding tokenEncoding;
-   size_t maxTokenLength;
-   int tokenFinished           = 0;
-   Codepoint codepointToRecord = EOF_CODEPOINT;
-
-   /* If the previous codepoint was U+000D (CARRIAGE RETURN), and the current
-      codepoint is U+000A (LINE FEED), then treat the 2 codepoints as a single
-      line break. */
-   if (GET_FLAGS(parser->state, PARSER_AFTER_CARRIAGE_RETURN))
-   {
-      if (c == LINE_FEED_CODEPOINT)
-         parser->codepointLocationLine--;
-      SET_FLAGS_OFF(ParserState, parser->state, PARSER_AFTER_CARRIAGE_RETURN);
-   }
-
-reprocess:
-
-   switch (parser->lexerState)
-   {
-      case LEXING_WHITESPACE:
-         if (c == '{')
-         {
-            JSON_Parser_StartToken(parser, T_LEFT_CURLY);
-            tokenFinished = 1;
-         }
-         else if (c == '}')
-         {
-            JSON_Parser_StartToken(parser, T_RIGHT_CURLY);
-            tokenFinished = 1;
-         }
-         else if (c == '[')
-         {
-            JSON_Parser_StartToken(parser, T_LEFT_SQUARE);
-            tokenFinished = 1;
-         }
-         else if (c == ']')
-         {
-            JSON_Parser_StartToken(parser, T_RIGHT_SQUARE);
-            tokenFinished = 1;
-         }
-         else if (c == ':')
-         {
-            JSON_Parser_StartToken(parser, T_COLON);
-            tokenFinished = 1;
-         }
-         else if (c == ',')
-         {
-            JSON_Parser_StartToken(parser, T_COMMA);
-            tokenFinished = 1;
-         }
-         else if (c == 'n')
-         {
-            JSON_Parser_StartToken(parser, T_NULL);
-            parser->lexerBits = NULL_LITERAL_EXPECTED_CHARS_START_INDEX;
-            parser->lexerState = LEXING_LITERAL;
-         }
-         else if (c == 't')
-         {
-            JSON_Parser_StartToken(parser, T_TRUE);
-            parser->lexerBits = TRUE_LITERAL_EXPECTED_CHARS_START_INDEX;
-            parser->lexerState = LEXING_LITERAL;
-         }
-         else if (c == 'f')
-         {
-            JSON_Parser_StartToken(parser, T_FALSE);
-            parser->lexerBits = FALSE_LITERAL_EXPECTED_CHARS_START_INDEX;
-            parser->lexerState = LEXING_LITERAL;
-         }
-         else if (c == '"')
-         {
-            JSON_Parser_StartToken(parser, T_STRING);
-            parser->lexerState = LEXING_STRING;
-         }
-         else if (c == '-')
-         {
-            JSON_Parser_StartToken(parser, T_NUMBER);
-            parser->tokenAttributes = JSON_IsNegative;
-            codepointToRecord = '-';
-            parser->lexerState = LEXING_NUMBER_AFTER_MINUS;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c == '0')
-         {
-            JSON_Parser_StartToken(parser, T_NUMBER);
-            codepointToRecord = '0';
-            parser->lexerState = LEXING_NUMBER_AFTER_LEADING_ZERO;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c >= '1' && c <= '9')
-         {
-            JSON_Parser_StartToken(parser, T_NUMBER);
-            codepointToRecord = c;
-            parser->lexerState = LEXING_NUMBER_DECIMAL_DIGITS;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c == ' ' || c == TAB_CODEPOINT || c == LINE_FEED_CODEPOINT ||
-               c == CARRIAGE_RETURN_CODEPOINT || c == EOF_CODEPOINT)
-         {
-            /* Ignore whitespace between tokens. */
-         }
-         else if (c == BOM_CODEPOINT && parser->codepointLocationByte == 0)
-         {
-            /* OK, we'll allow the BOM. */
-            if (GET_FLAGS(parser->flags, PARSER_ALLOW_BOM)) { }
-            else
-            {
-               JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_BOMNotAllowed);
-               return JSON_Failure;
-            }
-         }
-         else if (c == '/' && GET_FLAGS(parser->flags, PARSER_ALLOW_COMMENTS))
-         {
-            /* Comments are not real tokens, but we save the location
-               of the comment as the token location in case of an error. */
-            parser->tokenLocationByte = parser->codepointLocationByte;
-            parser->tokenLocationLine = parser->codepointLocationLine;
-            parser->tokenLocationColumn = parser->codepointLocationColumn;
-            parser->lexerState = LEXING_COMMENT_AFTER_SLASH;
-         }
-         else if (c == 'N' && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS))
-         {
-            JSON_Parser_StartToken(parser, T_NAN);
-            parser->lexerBits = NAN_LITERAL_EXPECTED_CHARS_START_INDEX;
-            parser->lexerState = LEXING_LITERAL;
-         }
-         else if (c == 'I' && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS))
-         {
-            JSON_Parser_StartToken(parser, T_INFINITY);
-            parser->lexerBits = INFINITY_LITERAL_EXPECTED_CHARS_START_INDEX;
-            parser->lexerState = LEXING_LITERAL;
-         }
-         else
-         {
-            JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_UnknownToken);
-            return JSON_Failure;
-         }
-         goto advance;
-
-      case LEXING_LITERAL:
-         /* While lexing a literal we store an index into expectedLiteralChars
-            in lexerBits. */
-         if (expectedLiteralChars[parser->lexerBits])
-         {
-            /* The codepoint should match the next character in the literal. */
-            if (c != expectedLiteralChars[parser->lexerBits])
-            {
-               JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
-               return JSON_Failure;
-            }
-            parser->lexerBits++;
-
-            /* If the literal is the top-level value of an embedded document,
-               process it as soon as we consume its last expected codepoint.
-               Normally we defer processing until the following codepoint
-               has been examined, so that we can treat sequences like "nullx"
-               as a single, unknown token rather than a null literal followed
-               by an unknown token. */
-            if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT) &&
-                  !expectedLiteralChars[parser->lexerBits])
-               tokenFinished = 1;
-         }
-         else
-         {
-            /* The literal should be finished, so the codepoint should not be
-               a plausible JSON literal character, but rather EOF, whitespace,
-               or the first character of the next token. */
-            if ((c >= 'A' && c <= 'Z') ||
-                  (c >= 'a' && c <= 'z') ||
-                  (c >= '0' && c <= '9') ||
-                  (c == '_'))
-            {
-               JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
-               return JSON_Failure;
-            }
-            if (!JSON_Parser_ProcessToken(parser))
-               return JSON_Failure;
-            goto reprocess;
-         }
-         goto advance;
-
-      case LEXING_STRING:
-         /* Allow JSON_Parser_FlushLexer() to fail. */
-         if (c == EOF_CODEPOINT) { }
-         else if (c == '"')
-            tokenFinished = 1;
-         else if (c == '\\')
-            parser->lexerState = LEXING_STRING_ESCAPE;
-         else if (c < 0x20 && !GET_FLAGS(parser->flags, PARSER_ALLOW_CONTROL_CHARS))
-         {
-            /* ASCII control characters (U+0000 - U+001F) are not allowed to
-               appear unescaped in string values unless specifically allowed. */
-            JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_UnescapedControlCharacter);
-            return JSON_Failure;
-         }
-         else
-         {
-            codepointToRecord = c;
-            goto recordStringCodepointAndAdvance;
-         }
-         goto advance;
-
-      case LEXING_STRING_ESCAPE:
-         if (c == EOF_CODEPOINT)
-         {
-            /* Allow JSON_Parser_FlushLexer() to fail. */
-         }
-         else
-         {
-            if (c == 'u')
-               parser->lexerState = LEXING_STRING_HEX_ESCAPE_BYTE_1;
-            else
-            {
-               if (c == '"' || c == '\\' || c == '/')
-                  codepointToRecord = c;
-               else if (c == 'b')
-                  codepointToRecord = BACKSPACE_CODEPOINT;
-               else if (c == 't')
-                  codepointToRecord = TAB_CODEPOINT;
-               else if (c == 'n')
-                  codepointToRecord = LINE_FEED_CODEPOINT;
-               else if (c == 'f')
-                  codepointToRecord = FORM_FEED_CODEPOINT;
-               else if (c == 'r')
-                  codepointToRecord = CARRIAGE_RETURN_CODEPOINT;
-               else
-               {
-                  /* The current codepoint location is the first character after
-                     the backslash that started the escape sequence. The error
-                     location should be the beginning of the escape sequence, 1
-                     character earlier. */
-                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(parser, JSON_Error_InvalidEscapeSequence, 1);
-                  return JSON_Failure;
-               }
-               parser->lexerState = LEXING_STRING;
-               goto recordStringCodepointAndAdvance;
-            }
-         }
-         goto advance;
-
-      case LEXING_STRING_HEX_ESCAPE_BYTE_1:
-      case LEXING_STRING_HEX_ESCAPE_BYTE_2:
-      case LEXING_STRING_HEX_ESCAPE_BYTE_3:
-      case LEXING_STRING_HEX_ESCAPE_BYTE_4:
-      case LEXING_STRING_HEX_ESCAPE_BYTE_5:
-      case LEXING_STRING_HEX_ESCAPE_BYTE_6:
-      case LEXING_STRING_HEX_ESCAPE_BYTE_7:
-      case LEXING_STRING_HEX_ESCAPE_BYTE_8:
-         /* Allow JSON_Parser_FlushLexer() to fail. */
-         if (c != EOF_CODEPOINT)
-         {
-            /* While lexing a string hex escape sequence we store the bytes
-               of the escaped codepoint in the low 2 bytes of lexerBits. If
-               the escape sequence represents a leading surrogate, we shift
-               the leading surrogate into the high 2 bytes and lex a second
-               hex escape sequence (which should be a trailing surrogate). */
-            int byteNumber = (parser->lexerState - LEXING_STRING_HEX_ESCAPE_BYTE_1) & 0x3;
-            uint32_t nibble;
-            if (c >= '0' && c <= '9')
-               nibble = c - '0';
-            else if (c >= 'A' && c <= 'F')
-               nibble = c - 'A' + 10;
-            else if (c >= 'a' && c <= 'f')
-               nibble = c - 'a' + 10;
-            else
-            {
-               /* The current codepoint location is one of the 4 hex digit
-                  character slots in the hex escape sequence. The error
-                  location should be the beginning of the hex escape
-                  sequence, between 2 and 5 bytes earlier. */
-               int codepointsAgo = 2 /* for "\u" */ + byteNumber;
-               JSON_Parser_SetErrorAtStringEscapeSequenceStart(
-                     parser, JSON_Error_InvalidEscapeSequence, codepointsAgo);
-               return JSON_Failure;
-            }
-            /* Store the hex digit's bits in the appropriate byte of lexerBits. */
-            nibble <<= (3 - byteNumber) * 4 /* shift left by 12, 8, 4, 0 */ ;
-            parser->lexerBits |= nibble;
-            if (parser->lexerState == LEXING_STRING_HEX_ESCAPE_BYTE_4)
-            {
-               /* The escape sequence is complete. We need to check whether
-                  it represents a leading surrogate (which implies that it
-                  will be immediately followed by a hex-escaped trailing
-                  surrogate), a trailing surrogate (which is invalid), or a
-                  valid codepoint (which should simply be appended to the
-                  string token value). */
-               if (IS_LEADING_SURROGATE(parser->lexerBits))
-               {
-                  /* Shift the leading surrogate into the high 2 bytes of
-                     lexerBits so that the trailing surrogate can be stored
-                     in the low 2 bytes. */
-                  parser->lexerBits <<= 16;
-                  parser->lexerState = LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_BACKSLASH;
-               }
-               else if (IS_TRAILING_SURROGATE(parser->lexerBits))
-               {
-                  /* The current codepoint location is the last hex digit
-                     of the hex escape sequence. The error location should
-                     be the beginning of the hex escape sequence, 5
-                     characters earlier. */
-                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(
-                        parser, JSON_Error_UnpairedSurrogateEscapeSequence, 5);
-                  return JSON_Failure;
-               }
-               else
-               {
-                  /* The escape sequence represents a BMP codepoint. */
-                  codepointToRecord = parser->lexerBits;
-                  parser->lexerBits = 0;
-                  parser->lexerState = LEXING_STRING;
-                  goto recordStringCodepointAndAdvance;
-               }
-            }
-            else if (parser->lexerState == LEXING_STRING_HEX_ESCAPE_BYTE_8)
-            {
-               /* The second hex escape sequence is complete. We need to
-                  check whether it represents a trailing surrogate as
-                  expected. If so, the surrogate pair represents a single
-                  non-BMP codepoint. */
-               if (!IS_TRAILING_SURROGATE(parser->lexerBits & 0xFFFF))
-               {
-                  /* The current codepoint location is the last hex digit of
-                     the second hex escape sequence. The error location
-                     should be the beginning of the leading surrogate
-                     hex escape sequence, 11 characters earlier. */
-                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(
-                        parser, JSON_Error_UnpairedSurrogateEscapeSequence, 11);
-                  return JSON_Failure;
-               }
-               /* The escape sequence represents a non-BMP codepoint. */
-               codepointToRecord = CODEPOINT_FROM_SURROGATES(parser->lexerBits);
-               parser->lexerBits = 0;
-               parser->lexerState = LEXING_STRING;
-               goto recordStringCodepointAndAdvance;
-            }
-            else
-               parser->lexerState++;
-         }
-         goto advance;
-
-      case LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_BACKSLASH:
-         if (c != EOF_CODEPOINT)
-         {
-            if (c != '\\')
-            {
-               /* The current codepoint location is the first character after
-                  the leading surrogate hex escape sequence. The error
-                  location should be the beginning of the leading surrogate
-                  hex escape sequence, 6 characters earlier. */
-               JSON_Parser_SetErrorAtStringEscapeSequenceStart(
-                     parser, JSON_Error_UnpairedSurrogateEscapeSequence, 6);
-               return JSON_Failure;
-            }
-            parser->lexerState = LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_U;
-         }
-         goto advance;
-
-      case LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_U:
-         if (c != EOF_CODEPOINT)
-         {
-            if (c != 'u')
-            {
-               /* Distinguish between a totally bogus escape sequence
-                  and a valid one that just isn't the hex escape kind
-                  that we require for a trailing surrogate. The current
-                  codepoint location is the first character after the
-                  backslash that should have introduced the trailing
-                  surrogate hex escape sequence. */
-               if (c == '"' || c == '\\' || c == '/' || c == 'b' ||
-                     c == 't' || c == 'n' || c == 'f' || c == 'r')
-               {
-                  /* The error location should be at that beginning of the
-                     leading surrogate's hex escape sequence, 7 characters
-                     earlier. */
-                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(
-                        parser, JSON_Error_UnpairedSurrogateEscapeSequence, 7);
-               }
-               else
-               {
-                  /* The error location should be at that backslash, 1
-                     character earlier. */
-                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(
-                        parser, JSON_Error_InvalidEscapeSequence, 1);
-               }
-               return JSON_Failure;
-            }
-            parser->lexerState = LEXING_STRING_HEX_ESCAPE_BYTE_5;
-         }
-         goto advance;
-
-      case LEXING_NUMBER_AFTER_MINUS:
-         if (c == EOF_CODEPOINT)
-         {
-            /* Allow JSON_Parser_FlushLexer() to fail. */
-         }
-         else if (c == 'I' && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS))
-         {
-            parser->token      = T_NEGATIVE_INFINITY; /* changing horses mid-stream, so to speak */
-            parser->lexerBits  = INFINITY_LITERAL_EXPECTED_CHARS_START_INDEX;
-            parser->lexerState = LEXING_LITERAL;
-         }
-         else
-         {
-            if (c == '0')
-            {
-               codepointToRecord  = '0';
-               parser->lexerState = LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO;
-               goto recordNumberCodepointAndAdvance;
-            }
-            else if (c >= '1' && c <= '9')
-            {
-               codepointToRecord  = c;
-               parser->lexerState = LEXING_NUMBER_DECIMAL_DIGITS;
-               goto recordNumberCodepointAndAdvance;
-            }
-            else
-            {
-               /* We trigger an unknown token error rather than an invalid number
-                  error so that "Foo" and "-Foo" trigger the same error. */
-               JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
-               return JSON_Failure;
-            }
-         }
-         goto advance;
-
-      case LEXING_NUMBER_AFTER_LEADING_ZERO:
-      case LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO:
-         if (c == '.')
-         {
-            codepointToRecord = '.';
-            SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsDecimalPoint);
-            parser->lexerState = LEXING_NUMBER_AFTER_DOT;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c == 'e' || c == 'E')
-         {
-            codepointToRecord = c;
-            SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsExponent);
-            parser->lexerState = LEXING_NUMBER_AFTER_E;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c >= '0' && c <= '9')
-         {
-            /* JSON does not allow the integer part of a number to have any
-               digits after a leading zero. */
-            if (!JSON_Parser_HandleInvalidNumber(parser, c, 0, 0))
-               return JSON_Failure;
-         }
-         else if ((c == 'x' || c == 'X') &&
-               parser->lexerState == LEXING_NUMBER_AFTER_LEADING_ZERO &&
-               GET_FLAGS(parser->flags, PARSER_ALLOW_HEX_NUMBERS))
-         {
-            codepointToRecord = c;
-            SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_IsHex);
-            parser->lexerState = LEXING_NUMBER_AFTER_X;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else
-         {
-            /* The number is finished. */
-            if (!JSON_Parser_ProcessToken(parser))
-               return JSON_Failure;
-            goto reprocess;
-         }
-         goto advance;
-
-      case LEXING_NUMBER_AFTER_X:
-         if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-         {
-            codepointToRecord = c;
-            parser->lexerState = LEXING_NUMBER_HEX_DIGITS;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (!JSON_Parser_HandleInvalidNumber(parser, c, 1, JSON_IsHex))
-            return JSON_Failure;
-         goto advance;
-
-      case LEXING_NUMBER_HEX_DIGITS:
-         if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-         {
-            codepointToRecord = c;
-            goto recordNumberCodepointAndAdvance;
-         }
-         /* The number is finished. */
-         if (!JSON_Parser_ProcessToken(parser))
-            return JSON_Failure;
-         goto reprocess;
-
-      case LEXING_NUMBER_DECIMAL_DIGITS:
-         if (c >= '0' && c <= '9')
-         {
-            codepointToRecord = c;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c == '.')
-         {
-            codepointToRecord = '.';
-            SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsDecimalPoint);
-            parser->lexerState = LEXING_NUMBER_AFTER_DOT;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c == 'e' || c == 'E')
-         {
-            codepointToRecord = c;
-            SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsExponent);
-            parser->lexerState = LEXING_NUMBER_AFTER_E;
-            goto recordNumberCodepointAndAdvance;
-         }
-         /* The number is finished. */
-         if (!JSON_Parser_ProcessToken(parser))
-            return JSON_Failure;
-         goto reprocess;
-
-      case LEXING_NUMBER_AFTER_DOT:
-         if (c >= '0' && c <= '9')
-         {
-            codepointToRecord = c;
-            parser->lexerState = LEXING_NUMBER_FRACTIONAL_DIGITS;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (!JSON_Parser_HandleInvalidNumber(parser, c, 1, JSON_ContainsDecimalPoint))
-            return JSON_Failure;
-         goto advance;
-
-      case LEXING_NUMBER_FRACTIONAL_DIGITS:
-         if (c >= '0' && c <= '9')
-         {
-            codepointToRecord = c;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c == 'e' || c == 'E')
-         {
-            codepointToRecord = c;
-            SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsExponent);
-            parser->lexerState = LEXING_NUMBER_AFTER_E;
-            goto recordNumberCodepointAndAdvance;
-         }
-         /* The number is finished. */
-         if (!JSON_Parser_ProcessToken(parser))
-            return JSON_Failure;
-         goto reprocess;
-
-      case LEXING_NUMBER_AFTER_E:
-         if (c == '+')
-         {
-            codepointToRecord = c;
-            parser->lexerState = LEXING_NUMBER_AFTER_EXPONENT_SIGN;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c == '-')
-         {
-            codepointToRecord = c;
-            SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNegativeExponent);
-            parser->lexerState = LEXING_NUMBER_AFTER_EXPONENT_SIGN;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (c >= '0' && c <= '9')
-         {
-            codepointToRecord = c;
-            parser->lexerState = LEXING_NUMBER_EXPONENT_DIGITS;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (!JSON_Parser_HandleInvalidNumber(parser, c, 1, JSON_ContainsExponent))
-            return JSON_Failure;
-         goto advance;
-
-      case LEXING_NUMBER_AFTER_EXPONENT_SIGN:
-         if (c >= '0' && c <= '9')
-         {
-            codepointToRecord = c;
-            parser->lexerState = LEXING_NUMBER_EXPONENT_DIGITS;
-            goto recordNumberCodepointAndAdvance;
-         }
-         else if (!JSON_Parser_HandleInvalidNumber(parser, c, 2, JSON_ContainsExponent | JSON_ContainsNegativeExponent))
-            return JSON_Failure;
-         goto advance;
-
-      case LEXING_NUMBER_EXPONENT_DIGITS:
-         if (c >= '0' && c <= '9')
-         {
-            codepointToRecord = c;
-            goto recordNumberCodepointAndAdvance;
-         }
-         /* The number is finished. */
-         if (!JSON_Parser_ProcessToken(parser))
-            return JSON_Failure;
-         goto reprocess;
-
-      case LEXING_COMMENT_AFTER_SLASH:
-         if (c == '/')
-            parser->lexerState = LEXING_SINGLE_LINE_COMMENT;
-         else if (c == '*')
-            parser->lexerState = LEXING_MULTI_LINE_COMMENT;
-         else
-         {
-            JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
-            return JSON_Failure;
-         }
-         goto advance;
-
-      case LEXING_SINGLE_LINE_COMMENT:
-         if (c == CARRIAGE_RETURN_CODEPOINT || c == LINE_FEED_CODEPOINT || c == EOF_CODEPOINT)
-            parser->lexerState = LEXING_WHITESPACE;
-         goto advance;
-
-      case LEXING_MULTI_LINE_COMMENT:
-         if (c == '*')
-            parser->lexerState = LEXING_MULTI_LINE_COMMENT_AFTER_STAR;
-         goto advance;
-
-      case LEXING_MULTI_LINE_COMMENT_AFTER_STAR:
-         if (c == '/')
-            parser->lexerState = LEXING_WHITESPACE;
-         else if (c != '*')
-            parser->lexerState = LEXING_MULTI_LINE_COMMENT;
-         goto advance;
-   }
-
-recordStringCodepointAndAdvance:
-
-   tokenEncoding  = parser->stringEncoding;
-   maxTokenLength = parser->maxStringLength;
-   if (!codepointToRecord)
-   {
-      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNullCharacter | JSON_ContainsControlCharacter);
-   }
-   else if (codepointToRecord < FIRST_NON_CONTROL_CODEPOINT)
-   {
-      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsControlCharacter);
-   }
-   else if (codepointToRecord >= FIRST_NON_BMP_CODEPOINT)
-   {
-      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNonASCIICharacter | JSON_ContainsNonBMPCharacter);
-   }
-   else if (codepointToRecord >= FIRST_NON_ASCII_CODEPOINT)
-   {
-      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNonASCIICharacter);
-   }
-   goto recordCodepointAndAdvance;
-
-recordNumberCodepointAndAdvance:
-
-   tokenEncoding = parser->numberEncoding;
-   maxTokenLength = parser->maxNumberLength;
-   goto recordCodepointAndAdvance;
-
-recordCodepointAndAdvance:
-
-   /* We always ensure that there are LONGEST_ENCODING_SEQUENCE bytes
-      available in the buffer for the next codepoint, so we don't have to
-      check whether there is room when we decode a new codepoint, and if
-      there isn't another codepoint, we have space already allocated for
-      the encoded null terminator.*/
-   parser->tokenBytesUsed += EncodeCodepoint(codepointToRecord, tokenEncoding, parser->pTokenBytes + parser->tokenBytesUsed);
-   if (parser->tokenBytesUsed > maxTokenLength)
-   {
-      JSON_Parser_SetErrorAtToken(parser, parser->token == T_NUMBER ? JSON_Error_TooLongNumber : JSON_Error_TooLongString);
-      return JSON_Failure;
-   }
-   if (parser->tokenBytesUsed > parser->tokenBytesLength - LONGEST_ENCODING_SEQUENCE)
-   {
-      byte* pBiggerBuffer = DoubleBuffer(&parser->memorySuite, parser->defaultTokenBytes, parser->pTokenBytes, parser->tokenBytesLength);
-      if (!pBiggerBuffer)
-      {
-         JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
-         return JSON_Failure;
-      }
-      parser->pTokenBytes = pBiggerBuffer;
-      parser->tokenBytesLength *= 2;
-   }
-   goto advance;
-
-advance:
-
-   /* The current codepoint has been accepted, so advance the codepoint
-      location counters accordingly. Note that the one time we don't
-      do this is when the codepoint is EOF, which doesn't actually
-      appear in the input stream. */
-   if (c == CARRIAGE_RETURN_CODEPOINT)
-   {
-      SET_FLAGS_ON(ParserState, parser->state, PARSER_AFTER_CARRIAGE_RETURN);
-   }
-   if (c != EOF_CODEPOINT)
-   {
-      parser->codepointLocationByte += encodedLength;
-      if (c == CARRIAGE_RETURN_CODEPOINT || c == LINE_FEED_CODEPOINT)
-      {
-         /* The next character will begin a new line. */
-         parser->codepointLocationLine++;
-         parser->codepointLocationColumn = 0;
-      }
-      else
-      {
-         /* The next character will be on the same line. */
-         parser->codepointLocationColumn++;
-      }
-   }
-
-   if (tokenFinished && !JSON_Parser_ProcessToken(parser))
-      return JSON_Failure;
-
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Parser_FlushLexer(JSON_Parser parser)
-{
-   /* Push the EOF codepoint to the lexer so that it can finish the pending
-      token, if any. The EOF codepoint is never emitted by the decoder
-      itself, since it is outside the Unicode range and therefore cannot
-      be encoded in any of the possible input encodings. */
-   if (!JSON_Parser_ProcessCodepoint(parser, EOF_CODEPOINT, 0))
-      return JSON_Failure;
-
-   /* The lexer should be idle when parsing finishes. */
-   if (parser->lexerState != LEXING_WHITESPACE)
-   {
-      JSON_Parser_SetErrorAtToken(parser, JSON_Error_IncompleteToken);
-      return JSON_Failure;
-   }
-   return JSON_Success;
-}
-
-/* Parser's decoder functions. */
-
-static JSON_Status JSON_Parser_CallEncodingDetectedHandler(JSON_Parser parser)
-{
-   if (parser->encodingDetectedHandler && parser->encodingDetectedHandler(parser) != JSON_Parser_Continue)
-   {
-      JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_AbortedByHandler);
-      return JSON_Failure;
-   }
-   return JSON_Success;
-}
-
-/* Forward declaration. */
-static JSON_Status JSON_Parser_ProcessInputBytes(JSON_Parser parser, const byte* pBytes, size_t length);
-
-static JSON_Status JSON_Parser_ProcessUnknownByte(JSON_Parser parser, byte b)
-{
-   /* When the input encoding is unknown, the first 4 bytes of input are
-      recorded in decoder.bits. */
-   byte bytes[LONGEST_ENCODING_SEQUENCE];
-
-   switch (parser->decoderData.state)
-   {
-      case DECODER_RESET:
-         parser->decoderData.state = DECODED_1_OF_4;
-         parser->decoderData.bits = (uint32_t)b << 24;
-         break;
-
-      case DECODED_1_OF_4:
-         parser->decoderData.state = DECODED_2_OF_4;
-         parser->decoderData.bits |= (uint32_t)b << 16;
-         break;
-
-      case DECODED_2_OF_4:
-         parser->decoderData.state = DECODED_3_OF_4;
-         parser->decoderData.bits |= (uint32_t)b << 8;
-         break;
-
-      case DECODED_3_OF_4:
-         bytes[0] = (byte)(parser->decoderData.bits >> 24);
-         bytes[1] = (byte)(parser->decoderData.bits >> 16);
-         bytes[2] = (byte)(parser->decoderData.bits >> 8);
-         bytes[3] = (byte)(b);
-
-         /* We try to match the following patterns in order, where .. is any
-            byte value and nz is any non-zero byte value:
-            EF BB BF .. => UTF-8 with BOM
-            FF FE 00 00 => UTF-32LE with BOM
-            FF FE nz 00 => UTF-16LE with BOM
-            00 00 FE FF -> UTF-32BE with BOM
-            FE FF .. .. => UTF-16BE with BOM
-            nz nz .. .. => UTF-8
-            nz 00 nz .. => UTF-16LE
-            nz 00 00 00 => UTF-32LE
-            00 nz .. .. => UTF-16BE
-            00 00 00 nz => UTF-32BE
-            .. .. .. .. => unknown encoding */
-         if (bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
-         {
-            /* EF BB BF .. */
-            parser->inputEncoding = JSON_UTF8;
-         }
-         else if (bytes[0] == 0xFF && bytes[1] == 0xFE && bytes[3] == 0x00)
-         {
-            /* FF FE 00 00 or
-               FF FE nz 00 */
-            parser->inputEncoding = (bytes[2] == 0x00) ? JSON_UTF32LE : JSON_UTF16LE;
-         }
-         else if (bytes[0] == 0x00 && bytes[1] == 0x00 && bytes[2] == 0xFE && bytes[3] == 0xFF)
-         {
-            /* 00 00 FE FF */
-            parser->inputEncoding = JSON_UTF32BE;
-         }
-         else if (bytes[0] == 0xFE && bytes[1] == 0xFF)
-         {
-            /* FE FF .. .. */
-            parser->inputEncoding = JSON_UTF16BE;
-         }
-         else if (bytes[0] != 0x00)
-         {
-            /* nz .. .. .. */
-            if (bytes[1] != 0x00)
-            {
-               /* nz nz .. .. */
-               parser->inputEncoding = JSON_UTF8;
-            }
-            else if (bytes[2] != 0x00)
-            {
-               /* nz 00 nz .. */
-               parser->inputEncoding = JSON_UTF16LE;
-            }
-            else if (bytes[3] == 0x00)
-            {
-               /* nz 00 00 00 */
-               parser->inputEncoding = JSON_UTF32LE;
-            }
-            else
-            {
-               /* nz 00 00 nz => error */
-            }
-         }
-         else if (bytes[1] != 0x00)
-         {
-            /* 00 nz .. .. */
-            parser->inputEncoding = JSON_UTF16BE;
-         }
-         else if (bytes[2] == 0x00 && bytes[3] != 0x00)
-         {
-            /* 00 00 00 nz */
-            parser->inputEncoding = JSON_UTF32BE;
-         }
-         else
-         {
-            /* 00 00 nz .. or
-               00 00 00 00 => error */
-         }
-
-         if (parser->inputEncoding == JSON_UnknownEncoding)
-            return JSON_Parser_HandleInvalidEncodingSequence(parser, 4);
-
-         if (!JSON_Parser_CallEncodingDetectedHandler(parser))
-            return JSON_Failure;
-
-         /* Reset the decoder before reprocessing the bytes. */
-         Decoder_Reset(&parser->decoderData);
-         return JSON_Parser_ProcessInputBytes(parser, bytes, 4);
-   }
-
-   /* We don't have 4 bytes yet. */
-   return JSON_Success;
-}
-
-JSON_Status JSON_Parser_ProcessInputBytes(JSON_Parser parser, const byte* pBytes, size_t length)
-{
-   /* Note that if length is 0, pBytes is allowed to be NULL. */
-   size_t i = 0;
-   while (parser->inputEncoding == JSON_UnknownEncoding && i < length)
-   {
-      if (!JSON_Parser_ProcessUnknownByte(parser, pBytes[i]))
-         return JSON_Failure;
-      i++;
-   }
-   while (i < length)
-   {
-      DecoderOutput output     = Decoder_ProcessByte(
-            &parser->decoderData, parser->inputEncoding, pBytes[i]);
-      DecoderResultCode result = DECODER_RESULT_CODE(output);
-      switch (result)
-      {
-         case SEQUENCE_PENDING:
-            i++;
-            break;
-
-         case SEQUENCE_COMPLETE:
-            if (!JSON_Parser_ProcessCodepoint(
-                     parser, DECODER_CODEPOINT(output),
-                     DECODER_SEQUENCE_LENGTH(output)))
-               return JSON_Failure;
-            i++;
-            break;
-
-         case SEQUENCE_INVALID_INCLUSIVE:
-            i++;
-            /* fallthrough */
-         case SEQUENCE_INVALID_EXCLUSIVE:
-            if (!JSON_Parser_HandleInvalidEncodingSequence(
-                     parser, DECODER_SEQUENCE_LENGTH(output)))
-               return JSON_Failure;
-            break;
-      }
-   }
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Parser_FlushDecoder(JSON_Parser parser)
-{
-   /* If the input was 1, 2, or 3 bytes long, and the input encoding was not
-      explicitly specified by the client, we can sometimes make a reasonable
-      guess. If the input was 1 or 3 bytes long, the only encoding that could
-      possibly be valid JSON is UF-8. If the input was 2 bytes long, we try
-      to match the following patterns in order, where .. is any byte value
-      and nz is any non-zero byte value:
-      FF FE => UTF-16LE with BOM
-      FE FF => UTF-16BE with BOM
-      nz nz => UTF-8
-      nz 00 => UTF-16LE
-      00 nz => UTF-16BE
-      .. .. => unknown encoding
-      */
-   if (parser->inputEncoding == JSON_UnknownEncoding &&
-         parser->decoderData.state != DECODER_RESET)
-   {
-      byte bytes[3];
-      size_t length = 0;
-      bytes[0] = (byte)(parser->decoderData.bits >> 24);
-      bytes[1] = (byte)(parser->decoderData.bits >> 16);
-      bytes[2] = (byte)(parser->decoderData.bits >> 8);
-
-      switch (parser->decoderData.state)
-      {
-         case DECODED_1_OF_4:
-            parser->inputEncoding = JSON_UTF8;
-            length = 1;
-            break;
-
-         case DECODED_2_OF_4:
-            /* FF FE */
-            if (bytes[0] == 0xFF && bytes[1] == 0xFE)
-               parser->inputEncoding = JSON_UTF16LE;
-            /* FE FF */
-            else if (bytes[0] == 0xFE && bytes[1] == 0xFF)
-               parser->inputEncoding = JSON_UTF16BE;
-            else if (bytes[0] != 0x00)
-            {
-               /* nz nz or
-                  nz 00 */
-               parser->inputEncoding = bytes[1] ? JSON_UTF8 : JSON_UTF16LE;
-            }
-            /* 00 nz */
-            else if (bytes[1] != 0x00)
-               parser->inputEncoding = JSON_UTF16BE;
-            /* 00 00 */
-            else
-               return JSON_Parser_HandleInvalidEncodingSequence(parser, 2);
-            length = 2;
-            break;
-
-         case DECODED_3_OF_4:
-            parser->inputEncoding = JSON_UTF8;
-            length = 3;
-            break;
-      }
-
-      if (!JSON_Parser_CallEncodingDetectedHandler(parser))
-         return JSON_Failure;
-
-      /* Reset the decoder before reprocessing the bytes. */
-      parser->decoderData.state = DECODER_RESET;
-      parser->decoderData.bits = 0;
-      if (!JSON_Parser_ProcessInputBytes(parser, bytes, length))
-         return JSON_Failure;
-   }
-
-   /* The decoder should be idle when parsing finishes. */
-   if (Decoder_SequencePending(&parser->decoderData))
-      return JSON_Parser_HandleInvalidEncodingSequence(
-            parser, DECODER_STATE_BYTES(parser->decoderData.state));
-   return JSON_Success;
-}
-
-/* Parser API functions. */
-
-JSON_Parser JSON_CALL JSON_Parser_Create(const JSON_MemorySuite* pMemorySuite)
-{
-   JSON_Parser parser;
-   JSON_MemorySuite memorySuite;
-
-   if (pMemorySuite)
-   {
-      memorySuite = *pMemorySuite;
-
-      /* The full memory suite must be specified. */
-      if (!memorySuite.realloc || !memorySuite.free)
-         return NULL;
-   }
-   else
-      memorySuite = defaultMemorySuite;
-
-   parser = (JSON_Parser)memorySuite.realloc(memorySuite.userData, NULL, sizeof(struct JSON_Parser_Data));
-
-   if (!parser)
-      return NULL;
-
-   parser->memorySuite = memorySuite;
-   JSON_Parser_ResetData(parser, 0/* isInitialized */);
-   return parser;
-}
-
-JSON_Status JSON_CALL JSON_Parser_Free(JSON_Parser parser)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_IN_PROTECTED_API))
-      return JSON_Failure;
-
-   SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_PROTECTED_API);
-
-   if (parser->pTokenBytes != parser->defaultTokenBytes)
-      parser->memorySuite.free(parser->memorySuite.userData, parser->pTokenBytes);
-
-   while (parser->pMemberNames)
-      JSON_Parser_PopMemberNameList(parser);
-
-   Grammarian_FreeAllocations(&parser->grammarianData, &parser->memorySuite);
-   parser->memorySuite.free(parser->memorySuite.userData, parser);
-   return JSON_Success;
-}
-
-JSON_Status JSON_CALL JSON_Parser_Reset(JSON_Parser parser)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_IN_PROTECTED_API))
-      return JSON_Failure;
-   SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_PROTECTED_API);
-   JSON_Parser_ResetData(parser, 1/* isInitialized */);
-   /* Note that JSON_Parser_ResetData() unset PARSER_IN_PROTECTED_API for us. */
-   return JSON_Success;
-}
-
-void* JSON_CALL JSON_Parser_GetUserData(JSON_Parser parser)
-{
-   return parser ? parser->userData : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetUserData(JSON_Parser parser, void* userData)
-{
-   if (!parser)
-      return JSON_Failure;
-   parser->userData = userData;
-   return JSON_Success;
-}
-
-JSON_Encoding JSON_CALL JSON_Parser_GetInputEncoding(JSON_Parser parser)
-{
-   return parser ? (JSON_Encoding)parser->inputEncoding : JSON_UnknownEncoding;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetInputEncoding(JSON_Parser parser, JSON_Encoding encoding)
-{
-   if (     !parser 
-         || encoding < JSON_UnknownEncoding 
-         || encoding > JSON_UTF32BE 
-         || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   parser->inputEncoding = (Encoding)encoding;
-   return JSON_Success;
-}
-
-JSON_Encoding JSON_CALL JSON_Parser_GetStringEncoding(JSON_Parser parser)
-{
-   return parser ? (JSON_Encoding)parser->stringEncoding : JSON_UTF8;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetStringEncoding(JSON_Parser parser, JSON_Encoding encoding)
-{
-   if (
-            !parser 
-         || encoding <= JSON_UnknownEncoding 
-         || encoding > JSON_UTF32BE 
-         || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   parser->stringEncoding = (Encoding)encoding;
-   return JSON_Success;
-}
-
-size_t JSON_CALL JSON_Parser_GetMaxStringLength(JSON_Parser parser)
-{
-   return parser ? parser->maxStringLength : SIZE_MAX;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetMaxStringLength(JSON_Parser parser, size_t maxLength)
-{
-   if (     !parser 
-         || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   parser->maxStringLength = maxLength;
-   return JSON_Success;
-}
-
-JSON_Encoding JSON_CALL JSON_Parser_GetNumberEncoding(JSON_Parser parser)
-{
-   return parser ? (JSON_Encoding)parser->numberEncoding : JSON_UTF8;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetNumberEncoding(JSON_Parser parser, JSON_Encoding encoding)
-{
-   if (!parser || encoding <= JSON_UnknownEncoding || encoding > JSON_UTF32BE || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   parser->numberEncoding = (Encoding)encoding;
-   return JSON_Success;
-}
-
-size_t JSON_CALL JSON_Parser_GetMaxNumberLength(JSON_Parser parser)
-{
-   return parser ? parser->maxNumberLength : SIZE_MAX;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetMaxNumberLength(JSON_Parser parser, size_t maxLength)
-{
-   if (     !parser 
-         || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   parser->maxNumberLength = maxLength;
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Parser_GetAllowBOM(JSON_Parser parser)
-{
-   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_BOM)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetAllowBOM(JSON_Parser parser, JSON_Boolean allowBOM)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_BOM, allowBOM);
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Parser_GetAllowComments(JSON_Parser parser)
-{
-   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_COMMENTS)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetAllowComments(JSON_Parser parser, JSON_Boolean allowComments)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_COMMENTS, allowComments);
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Parser_GetAllowSpecialNumbers(JSON_Parser parser)
-{
-   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetAllowSpecialNumbers(JSON_Parser parser, JSON_Boolean allowSpecialNumbers)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS, allowSpecialNumbers);
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Parser_GetAllowHexNumbers(JSON_Parser parser)
-{
-   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_HEX_NUMBERS)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetAllowHexNumbers(JSON_Parser parser, JSON_Boolean allowHexNumbers)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_HEX_NUMBERS, allowHexNumbers);
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Parser_GetAllowUnescapedControlCharacters(JSON_Parser parser)
-{
-   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_CONTROL_CHARS)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetAllowUnescapedControlCharacters(JSON_Parser parser, JSON_Boolean allowUnescapedControlCharacters)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_CONTROL_CHARS, allowUnescapedControlCharacters);
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Parser_GetReplaceInvalidEncodingSequences(JSON_Parser parser)
-{
-   return (parser && GET_FLAGS(parser->flags, PARSER_REPLACE_INVALID)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetReplaceInvalidEncodingSequences(
-      JSON_Parser parser, JSON_Boolean replaceInvalidEncodingSequences)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-      return JSON_Failure;
-   SET_FLAGS(ParserFlags, parser->flags, PARSER_REPLACE_INVALID, replaceInvalidEncodingSequences);
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Parser_GetTrackObjectMembers(JSON_Parser parser)
-{
-   return (parser && GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetTrackObjectMembers(JSON_Parser parser, JSON_Boolean trackObjectMembers)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-   {
-      return JSON_Failure;
-   }
-   SET_FLAGS(ParserFlags, parser->flags, PARSER_TRACK_OBJECT_MEMBERS, trackObjectMembers);
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Parser_GetStopAfterEmbeddedDocument(JSON_Parser parser)
-{
-   return (parser && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetStopAfterEmbeddedDocument(
-      JSON_Parser parser, JSON_Boolean stopAfterEmbeddedDocument)
-{
-   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-   {
-      return JSON_Failure;
-   }
-   SET_FLAGS(ParserFlags, parser->flags, PARSER_EMBEDDED_DOCUMENT, stopAfterEmbeddedDocument);
-   return JSON_Success;
-}
-
-JSON_Error JSON_CALL JSON_Parser_GetError(JSON_Parser parser)
-{
-   return parser ? (JSON_Error)parser->error : JSON_Error_None;
-}
-
-JSON_Status JSON_CALL JSON_Parser_GetErrorLocation(
-      JSON_Parser parser, JSON_Location* pLocation)
-{
-   if (!pLocation || !parser || parser->error == JSON_Error_None)
-      return JSON_Failure;
-
-   if (parser->errorOffset == ERROR_LOCATION_IS_TOKEN_START)
-   {
-      pLocation->byte = parser->tokenLocationByte;
-      pLocation->line = parser->tokenLocationLine;
-      pLocation->column = parser->tokenLocationColumn;
-   }
-   else
-   {
-      pLocation->byte = parser->codepointLocationByte - (SHORTEST_ENCODING_SEQUENCE(parser->inputEncoding) * parser->errorOffset);
-      pLocation->line = parser->codepointLocationLine;
-      pLocation->column = parser->codepointLocationColumn - parser->errorOffset;
-   }
-   pLocation->depth = parser->depth;
-   return JSON_Success;
-}
-
-JSON_Status JSON_CALL JSON_Parser_GetTokenLocation(
-      JSON_Parser parser, JSON_Location* pLocation)
-{
-   if (!parser || !pLocation || !GET_FLAGS(parser->state, PARSER_IN_TOKEN_HANDLER))
-      return JSON_Failure;
-
-   pLocation->byte = parser->tokenLocationByte;
-   pLocation->line = parser->tokenLocationLine;
-   pLocation->column = parser->tokenLocationColumn;
-   pLocation->depth = parser->depth;
-   return JSON_Success;
-}
-
-JSON_Status JSON_CALL JSON_Parser_GetAfterTokenLocation(
-      JSON_Parser parser, JSON_Location* pLocation)
-{
-   if (!parser || !pLocation || !GET_FLAGS(parser->state, PARSER_IN_TOKEN_HANDLER))
-      return JSON_Failure;
-
-   pLocation->byte = parser->codepointLocationByte;
-   pLocation->line = parser->codepointLocationLine;
-   pLocation->column = parser->codepointLocationColumn;
-   pLocation->depth = parser->depth;
-   return JSON_Success;
-}
-
-JSON_Parser_NullHandler JSON_CALL JSON_Parser_GetEncodingDetectedHandler(JSON_Parser parser)
-{
-   return parser ? parser->encodingDetectedHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetEncodingDetectedHandler(
-      JSON_Parser parser, JSON_Parser_EncodingDetectedHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->encodingDetectedHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_NullHandler JSON_CALL JSON_Parser_GetNullHandler(JSON_Parser parser)
-{
-   return parser ? parser->nullHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetNullHandler(
-      JSON_Parser parser, JSON_Parser_NullHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->nullHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_BooleanHandler JSON_CALL JSON_Parser_GetBooleanHandler(JSON_Parser parser)
-{
-   return parser ? parser->booleanHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetBooleanHandler(
-      JSON_Parser parser, JSON_Parser_BooleanHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->booleanHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_StringHandler JSON_CALL JSON_Parser_GetStringHandler(JSON_Parser parser)
-{
-   return parser ? parser->stringHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetStringHandler(
-      JSON_Parser parser, JSON_Parser_StringHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->stringHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_NumberHandler JSON_CALL JSON_Parser_GetNumberHandler(JSON_Parser parser)
-{
-   return parser ? parser->numberHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetNumberHandler(
-      JSON_Parser parser, JSON_Parser_NumberHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->numberHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_SpecialNumberHandler JSON_CALL JSON_Parser_GetSpecialNumberHandler(JSON_Parser parser)
-{
-   return parser ? parser->specialNumberHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetSpecialNumberHandler(
-      JSON_Parser parser, JSON_Parser_SpecialNumberHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-   parser->specialNumberHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_StartObjectHandler JSON_CALL JSON_Parser_GetStartObjectHandler(JSON_Parser parser)
-{
-   return parser ? parser->startObjectHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetStartObjectHandler(
-      JSON_Parser parser, JSON_Parser_StartObjectHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->startObjectHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_EndObjectHandler JSON_CALL JSON_Parser_GetEndObjectHandler(JSON_Parser parser)
-{
-   return parser ? parser->endObjectHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetEndObjectHandler(
-      JSON_Parser parser, JSON_Parser_EndObjectHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->endObjectHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_ObjectMemberHandler JSON_CALL JSON_Parser_GetObjectMemberHandler(JSON_Parser parser)
-{
-   return parser ? parser->objectMemberHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetObjectMemberHandler(
-      JSON_Parser parser, JSON_Parser_ObjectMemberHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->objectMemberHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_StartArrayHandler JSON_CALL JSON_Parser_GetStartArrayHandler(JSON_Parser parser)
-{
-   return parser ? parser->startArrayHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetStartArrayHandler(
-      JSON_Parser parser, JSON_Parser_StartArrayHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->startArrayHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_EndArrayHandler JSON_CALL JSON_Parser_GetEndArrayHandler(JSON_Parser parser)
-{
-   return parser ? parser->endArrayHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetEndArrayHandler(
-      JSON_Parser parser, JSON_Parser_EndArrayHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->endArrayHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Parser_ArrayItemHandler JSON_CALL JSON_Parser_GetArrayItemHandler(JSON_Parser parser)
-{
-   return parser ? parser->arrayItemHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Parser_SetArrayItemHandler(
-      JSON_Parser parser, JSON_Parser_ArrayItemHandler handler)
-{
-   if (!parser)
-      return JSON_Failure;
-
-   parser->arrayItemHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Status JSON_CALL JSON_Parser_Parse(JSON_Parser parser, const char* pBytes, size_t length, JSON_Boolean isFinal)
-{
-   JSON_Status status = JSON_Failure;
-   if (parser && (pBytes || !length) && !GET_FLAGS(parser->state, PARSER_FINISHED | PARSER_IN_PROTECTED_API))
-   {
-      int finishedParsing = 0;
-      SET_FLAGS_ON(ParserState, parser->state, PARSER_STARTED | PARSER_IN_PROTECTED_API);
-      if (JSON_Parser_ProcessInputBytes(parser, (const byte*)pBytes, length))
-      {
-         /* New input was parsed successfully. */
-         if (isFinal)
-         {
-            /* Make sure there is nothing pending in the decoder, lexer,
-               or parser. */
-            if (JSON_Parser_FlushDecoder(parser) &&
-                  JSON_Parser_FlushLexer(parser) &&
-                  JSON_Parser_FlushParser(parser))
-               status = JSON_Success;
-
-            finishedParsing = 1;
-         }
-         else
-            status = JSON_Success;
-      }
-      else
-      {
-         /* New input failed to parse. */
-         finishedParsing = 1;
-      }
-      if (finishedParsing)
-      {
-         SET_FLAGS_ON(ParserState, parser->state, PARSER_FINISHED);
-      }
-      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_PROTECTED_API);
-   }
-   return status;
-}
-
-#endif /* JSON_NO_PARSER */
-
-/******************** JSON Writer ********************/
-
-#ifndef JSON_NO_WRITER
-
-/* Combinable writer state flags. */
-#define WRITER_RESET            0x0
-#define WRITER_STARTED          0x1
-#define WRITER_IN_PROTECTED_API 0x2
-typedef byte WriterState;
-
-/* Combinable writer settings flags. */
-#define WRITER_DEFAULT_FLAGS    0x0
-#define WRITER_USE_CRLF         0x1
-#define WRITER_REPLACE_INVALID  0x2
-#define WRITER_ESCAPE_NON_ASCII 0x4
-typedef byte WriterFlags;
-
-/* A writer instance. */
-struct JSON_Writer_Data
-{
-   JSON_MemorySuite          memorySuite;
-   void*                     userData;
-   WriterState               state;
-   WriterFlags               flags;
-   Encoding                  outputEncoding;
-   Error                     error;
-   GrammarianData            grammarianData;
-   JSON_Writer_OutputHandler outputHandler;
-};
-
-/* Writer internal functions. */
-
-static void JSON_Writer_ResetData(JSON_Writer writer, int isInitialized)
-{
-   writer->userData = NULL;
-   writer->flags = WRITER_DEFAULT_FLAGS;
-   writer->outputEncoding = JSON_UTF8;
-   writer->error = JSON_Error_None;
-   Grammarian_Reset(&writer->grammarianData, isInitialized);
-   writer->outputHandler = NULL;
-   writer->state = WRITER_RESET; /* do this last! */
-}
-
-static void JSON_Writer_SetError(JSON_Writer writer, Error error)
-{
-   writer->error = error;
-}
-
-static JSON_Status JSON_Writer_ProcessToken(JSON_Writer writer, Symbol token)
-{
-   GrammarianOutput output = Grammarian_ProcessToken(&writer->grammarianData, token, &writer->memorySuite);
-   switch (GRAMMARIAN_RESULT_CODE(output))
-   {
-      case REJECTED_TOKEN:
-         JSON_Writer_SetError(writer, JSON_Error_UnexpectedToken);
-         return JSON_Failure;
-
-      case SYMBOL_STACK_FULL:
-         JSON_Writer_SetError(writer, JSON_Error_OutOfMemory);
-         return JSON_Failure;
-   }
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Writer_OutputBytes(JSON_Writer writer, const byte* pBytes, size_t length)
-{
-   if (writer->outputHandler && length)
-   {
-      if (writer->outputHandler(writer, (const char*)pBytes, length) != JSON_Writer_Continue)
-      {
-         JSON_Writer_SetError(writer, JSON_Error_AbortedByHandler);
-         return JSON_Failure;
-      }
-   }
-   return JSON_Success;
-}
-
-static Codepoint JSON_Writer_GetCodepointEscapeCharacter(JSON_Writer writer, Codepoint c)
-{
-   switch (c)
-   {
-      case BACKSPACE_CODEPOINT:
-         return 'b';
-
-      case TAB_CODEPOINT:
-         return 't';
-
-      case LINE_FEED_CODEPOINT:
-         return 'n';
-
-      case FORM_FEED_CODEPOINT:
-         return 'f';
-
-      case CARRIAGE_RETURN_CODEPOINT:
-         return 'r';
-
-      case '"':
-         return '"';
-
-      case '/':
-         return '/';
-
-      case '\\':
-         return '\\';
-
-      case DELETE_CODEPOINT:
-      case LINE_SEPARATOR_CODEPOINT:
-      case PARAGRAPH_SEPARATOR_CODEPOINT:
-         return 'u';
-
-      default:
-         if (c < FIRST_NON_CONTROL_CODEPOINT || IS_NONCHARACTER(c) ||
-               (GET_FLAGS(writer->flags, WRITER_ESCAPE_NON_ASCII) && c > FIRST_NON_ASCII_CODEPOINT))
-            return 'u';
-         break;
-   }
-   return 0;
-}
-
-typedef struct tag_WriteBufferData
-{
-   size_t used;
-   byte   bytes[256];
-} WriteBufferData;
-typedef WriteBufferData* WriteBuffer;
-
-static void WriteBuffer_Reset(WriteBuffer buffer)
-{
-   buffer->used = 0;
-}
-
-static JSON_Status WriteBuffer_Flush(WriteBuffer buffer, JSON_Writer writer)
-{
-   JSON_Status status = JSON_Writer_OutputBytes(writer, buffer->bytes, buffer->used);
-   buffer->used = 0;
-   return status;
-}
-
-static JSON_Status WriteBuffer_WriteBytes(WriteBuffer buffer, JSON_Writer writer, const byte* pBytes, size_t length)
-{
-   if (buffer->used + length > sizeof(buffer->bytes) &&
-         !WriteBuffer_Flush(buffer, writer))
-      return JSON_Failure;
-
-   memcpy(&buffer->bytes[buffer->used], pBytes, length);
-   buffer->used += length;
-   return JSON_Success;
-}
-
-static JSON_Status WriteBuffer_WriteCodepoint(WriteBuffer buffer, JSON_Writer writer, Codepoint c)
-{
-   if (buffer->used + LONGEST_ENCODING_SEQUENCE > sizeof(buffer->bytes) &&
-         !WriteBuffer_Flush(buffer, writer))
-      return JSON_Failure;
-
-   buffer->used += EncodeCodepoint(c, writer->outputEncoding, &buffer->bytes[buffer->used]);
-   return JSON_Success;
-}
-
-static JSON_Status WriteBuffer_WriteHexEscapeSequence(WriteBuffer buffer, JSON_Writer writer, Codepoint c)
-{
-   if (c >= FIRST_NON_BMP_CODEPOINT)
-   {
-      /* Non-BMP codepoints must be hex-escaped by escaping the UTF-16
-         surrogate pair for the codepoint. We put the leading surrogate
-         in the low 16 bits of c so that it gets written first, then
-         the second pass through the loop will write out the trailing
-         surrogate. x*/
-      c = SURROGATES_FROM_CODEPOINT(c);
-      c = (c << 16) | (c >> 16);
-   }
-   do
-   {
-      static const byte hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-      byte escapeSequence[6];
-      int i;
-      escapeSequence[0] = '\\';
-      escapeSequence[1] = 'u';
-      escapeSequence[2] = hexDigits[(c >> 12) & 0xF];
-      escapeSequence[3] = hexDigits[(c >> 8) & 0xF];
-      escapeSequence[4] = hexDigits[(c >> 4) & 0xF];
-      escapeSequence[5] = hexDigits[c & 0xF];
-      for (i = 0; i < sizeof(escapeSequence); i++)
-      {
-         if (!WriteBuffer_WriteCodepoint(buffer, writer, escapeSequence[i]))
-            return JSON_Failure;
-      }
-      c >>= 16;
-   } while (c);
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Writer_OutputString(JSON_Writer writer, const byte* pBytes, size_t length, Encoding encoding)
-{
-   static const byte quoteUTF[] = { 0, 0, 0, '"', 0, 0, 0 };
-   static const byte* const quoteEncodings[5] = { quoteUTF + 3, quoteUTF + 3, quoteUTF + 2, quoteUTF + 3, quoteUTF };
-
-   const byte* pQuoteEncoded = quoteEncodings[writer->outputEncoding - 1];
-   size_t minSequenceLength = SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
-   DecoderData decoderData;
-   WriteBufferData bufferData;
-   size_t i = 0;
-
-   WriteBuffer_Reset(&bufferData);
-
-   /* Start quote. */
-   if (!WriteBuffer_WriteBytes(&bufferData, writer, pQuoteEncoded, minSequenceLength))
-      return JSON_Failure;
-
-   /* String contents. */
-   Decoder_Reset(&decoderData);
-   while (i < length)
-   {
-      DecoderOutput output = Decoder_ProcessByte(&decoderData, encoding, pBytes[i]);
-      DecoderResultCode result = DECODER_RESULT_CODE(output);
-      Codepoint c;
-      Codepoint escapeCharacter;
-      switch (result)
-      {
-         case SEQUENCE_PENDING:
-            i++;
-            break;
-
-         case SEQUENCE_COMPLETE:
-            c = DECODER_CODEPOINT(output);
-            escapeCharacter = JSON_Writer_GetCodepointEscapeCharacter(writer, c);
-            switch (escapeCharacter)
-            {
-               case 0:
-                  /* Output the codepoint as a normal encoding sequence. */
-                  if (!WriteBuffer_WriteCodepoint(&bufferData, writer, c))
-                     return JSON_Failure;
-                  break;
-
-               case 'u':
-                  /* Output the codepoint as 1 or 2 hex escape sequences. */
-                  if (!WriteBuffer_WriteHexEscapeSequence(&bufferData, writer, c))
-                     return JSON_Failure;
-                  break;
-
-               default:
-                  /* Output the codepoint as a simple escape sequence. */
-                  if (!WriteBuffer_WriteCodepoint(&bufferData, writer, '\\') ||
-                        !WriteBuffer_WriteCodepoint(&bufferData, writer, escapeCharacter))
-                     return JSON_Failure;
-                  break;
-            }
-            i++;
-            break;
-
-         case SEQUENCE_INVALID_INCLUSIVE:
-            i++;
-            /* fallthrough */
-         case SEQUENCE_INVALID_EXCLUSIVE:
-            if (GET_FLAGS(writer->flags, WRITER_REPLACE_INVALID))
-            {
-               if (!WriteBuffer_WriteHexEscapeSequence(&bufferData, writer, REPLACEMENT_CHARACTER_CODEPOINT))
-                  return JSON_Failure;
-            }
-            else
-            {
-               /* Output whatever valid bytes we've accumulated before failing. */
-               if (WriteBuffer_Flush(&bufferData, writer))
-                  JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
-               return JSON_Failure;
-            }
-            break;
-      }
-   }
-   if (Decoder_SequencePending(&decoderData))
-   {
-      if (GET_FLAGS(writer->flags, WRITER_REPLACE_INVALID))
-      {
-         if (!WriteBuffer_WriteHexEscapeSequence(&bufferData, writer, REPLACEMENT_CHARACTER_CODEPOINT))
-            return JSON_Failure;
-      }
-      else
-      {
-         /* Output whatever valid bytes we've accumulated before failing. */
-         if (WriteBuffer_Flush(&bufferData, writer))
-            JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
-         return JSON_Failure;
-      }
-   }
-
-   /* End quote. */
-   if (!WriteBuffer_WriteBytes(&bufferData, writer, pQuoteEncoded, minSequenceLength) ||
-         !WriteBuffer_Flush(&bufferData, writer))
-      return JSON_Failure;
-   return JSON_Success;
-}
-
-static LexerState LexNumberCharacter(LexerState state, Codepoint c)
-{
-   switch (state)
-   {
-      case LEXING_WHITESPACE:
-         if (c == '-')
-            state = LEXING_NUMBER_AFTER_MINUS;
-         else if (c == '0')
-            state = LEXING_NUMBER_AFTER_LEADING_ZERO;
-         else if (c >= '1' && c <= '9')
-            state = LEXING_NUMBER_DECIMAL_DIGITS;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_AFTER_MINUS:
-         if (c == '0')
-            state = LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO;
-         else if (c >= '1' && c <= '9')
-            state = LEXING_NUMBER_DECIMAL_DIGITS;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_AFTER_LEADING_ZERO:
-      case LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO:
-         if (c == '.')
-            state = LEXING_NUMBER_AFTER_DOT;
-         else if (c == 'e' || c == 'E')
-            state = LEXING_NUMBER_AFTER_E;
-         else if ((c == 'x' || c == 'X') && state == LEXING_NUMBER_AFTER_LEADING_ZERO)
-            state = LEXING_NUMBER_AFTER_X;
-         else if (c == EOF_CODEPOINT)
-            state = LEXING_WHITESPACE;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_AFTER_X:
-         if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-            state = LEXING_NUMBER_HEX_DIGITS;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_HEX_DIGITS:
-         if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-         {
-            /* Still LEXING_NUMBER_HEX_DIGITS. */
-         }
-         else if (c == EOF_CODEPOINT)
-            state = LEXING_WHITESPACE;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_DECIMAL_DIGITS:
-         if (c >= '0' && c <= '9')
-         {
-            /* Still LEXING_NUMBER_DECIMAL_DIGITS. */
-         }
-         else if (c == '.')
-            state = LEXING_NUMBER_AFTER_DOT;
-         else if (c == 'e' || c == 'E')
-            state = LEXING_NUMBER_AFTER_E;
-         else if (c == EOF_CODEPOINT)
-            state = LEXING_WHITESPACE;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_AFTER_DOT:
-         if (c >= '0' && c <= '9')
-            state = LEXING_NUMBER_FRACTIONAL_DIGITS;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_FRACTIONAL_DIGITS:
-         if (c >= '0' && c <= '9')
-         {
-            /* Still LEXING_NUMBER_FRACTIONAL_DIGITS. */
-         }
-         else if (c == 'e' || c == 'E')
-            state = LEXING_NUMBER_AFTER_E;
-         else if (c == EOF_CODEPOINT)
-            state = LEXING_WHITESPACE;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_AFTER_E:
-         if (c == '+' || c == '-')
-            state = LEXING_NUMBER_AFTER_EXPONENT_SIGN;
-         else if (c >= '0' && c <= '9')
-            state = LEXING_NUMBER_EXPONENT_DIGITS;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_AFTER_EXPONENT_SIGN:
-         if (c >= '0' && c <= '9')
-            state = LEXING_NUMBER_EXPONENT_DIGITS;
-         else
-            state = LEXER_ERROR;
-         break;
-
-      case LEXING_NUMBER_EXPONENT_DIGITS:
-         if (c >= '0' && c <= '9')
-         {
-            /* Still LEXING_NUMBER_EXPONENT_DIGITS. */
-         }
-         else if (c == EOF_CODEPOINT)
-            state = LEXING_WHITESPACE;
-         else
-            state = LEXER_ERROR;
-         break;
-   }
-   return state;
-}
-
-static JSON_Status JSON_Writer_OutputNumber(JSON_Writer writer, const byte* pBytes, size_t length, Encoding encoding)
-{
-   DecoderData decoderData;
-   WriteBufferData bufferData;
-   LexerState lexerState = LEXING_WHITESPACE;
-   size_t i;
-   Decoder_Reset(&decoderData);
-   WriteBuffer_Reset(&bufferData);
-   for (i = 0; i < length; i++)
-   {
-      DecoderOutput output = Decoder_ProcessByte(&decoderData, encoding, pBytes[i]);
-      DecoderResultCode result = DECODER_RESULT_CODE(output);
-      Codepoint c;
-      switch (result)
-      {
-         case SEQUENCE_PENDING:
-            break;
-
-         case SEQUENCE_COMPLETE:
-            c = DECODER_CODEPOINT(output);
-            lexerState = LexNumberCharacter(lexerState, c);
-            if (lexerState == LEXER_ERROR)
-            {
-               /* Output whatever valid bytes we've accumulated before failing. */
-               if (WriteBuffer_Flush(&bufferData, writer))
-                  JSON_Writer_SetError(writer, JSON_Error_InvalidNumber);
-               return JSON_Failure;
-            }
-            if (!WriteBuffer_WriteCodepoint(&bufferData, writer, c))
-               return JSON_Failure;
-            break;
-
-         case SEQUENCE_INVALID_INCLUSIVE:
-         case SEQUENCE_INVALID_EXCLUSIVE:
-            /* Output whatever valid bytes we've accumulated before failing. */
-            if (WriteBuffer_Flush(&bufferData, writer))
-               JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
-            return JSON_Failure;
-      }
-   }
-   if (!WriteBuffer_Flush(&bufferData, writer))
-      return JSON_Failure;
-   if (Decoder_SequencePending(&decoderData))
-   {
-      JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
-      return JSON_Failure;
-   }
-   if (LexNumberCharacter(lexerState, EOF_CODEPOINT) == LEXER_ERROR)
-   {
-      JSON_Writer_SetError(writer, JSON_Error_InvalidNumber);
-      return JSON_Failure;
-   }
-   return JSON_Success;
-}
-
-#define SPACES_PER_CHUNK 8
-static JSON_Status JSON_Writer_OutputSpaces(JSON_Writer writer, size_t numberOfSpaces)
-{
-   static const byte spacesUTF8[SPACES_PER_CHUNK] = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' };
-   static const byte spacesUTF16[SPACES_PER_CHUNK * 2 + 1] = { 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0 };
-   static const byte spacesUTF32[SPACES_PER_CHUNK * 4 + 3] = { 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0 };
-   static const byte* const spacesEncodings[5] = { spacesUTF8, spacesUTF16 + 1, spacesUTF16, spacesUTF32 + 3, spacesUTF32 };
-
-   size_t encodedLength = SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
-   const byte* encoded = spacesEncodings[writer->outputEncoding - 1];
-   while (numberOfSpaces > SPACES_PER_CHUNK)
-   {
-      if (!JSON_Writer_OutputBytes(writer, encoded, SPACES_PER_CHUNK * encodedLength))
-         return JSON_Failure;
-      numberOfSpaces -= SPACES_PER_CHUNK;
-   }
-
-   if (!JSON_Writer_OutputBytes(writer, encoded, numberOfSpaces * encodedLength))
-      return JSON_Failure;
-   return JSON_Success;
-}
-
-static JSON_Status JSON_Writer_WriteSimpleToken(JSON_Writer writer, Symbol token, const byte* const* encodings, size_t length)
-{
-   JSON_Status status = JSON_Failure;
-   if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-   {
-      size_t encodedLength = length * SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
-      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-      if (JSON_Writer_ProcessToken(writer, token) &&
-            JSON_Writer_OutputBytes(writer, encodings[writer->outputEncoding - 1], encodedLength))
-         status = JSON_Success;
-      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-   }
-   return status;
-}
-
-/* Writer API functions. */
-
-JSON_Writer JSON_CALL JSON_Writer_Create(const JSON_MemorySuite* pMemorySuite)
-{
-   JSON_Writer writer;
-   JSON_MemorySuite memorySuite;
-   if (pMemorySuite)
-   {
-      memorySuite = *pMemorySuite;
-      /* The full memory suite must be specified. */
-      if (!memorySuite.realloc || !memorySuite.free)
-         return NULL;
-   }
-   else
-      memorySuite = defaultMemorySuite;
-
-   writer = (JSON_Writer)memorySuite.realloc(memorySuite.userData, NULL, sizeof(struct JSON_Writer_Data));
-
-   if (!writer)
-      return NULL;
-
-   writer->memorySuite = memorySuite;
-   JSON_Writer_ResetData(writer, 0/* isInitialized */);
-   return writer;
-}
-
-JSON_Status JSON_CALL JSON_Writer_Free(JSON_Writer writer)
-{
-   if (!writer || GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API))
-      return JSON_Failure;
-
-   SET_FLAGS_ON(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-   Grammarian_FreeAllocations(&writer->grammarianData, &writer->memorySuite);
-   writer->memorySuite.free(writer->memorySuite.userData, writer);
-   return JSON_Success;
-}
-
-JSON_Status JSON_CALL JSON_Writer_Reset(JSON_Writer writer)
-{
-   if (!writer || GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API))
-      return JSON_Failure;
-
-   SET_FLAGS_ON(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-   JSON_Writer_ResetData(writer, 1/* isInitialized */);
-   /* Note that JSON_Writer_ResetData() unset WRITER_IN_PROTECTED_API for us. */
-   return JSON_Success;
-}
-
-void* JSON_CALL JSON_Writer_GetUserData(JSON_Writer writer)
-{
-   return writer ? writer->userData : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Writer_SetUserData(JSON_Writer writer, void* userData)
-{
-   if (!writer)
-      return JSON_Failure;
-
-   writer->userData = userData;
-   return JSON_Success;
-}
-
-JSON_Encoding JSON_CALL JSON_Writer_GetOutputEncoding(JSON_Writer writer)
-{
-   return writer ? (JSON_Encoding)writer->outputEncoding : JSON_UTF8;
-}
-
-JSON_Status JSON_CALL JSON_Writer_SetOutputEncoding(JSON_Writer writer, JSON_Encoding encoding)
-{
-   if (!writer || GET_FLAGS(writer->state, WRITER_STARTED) || encoding <= JSON_UnknownEncoding || encoding > JSON_UTF32BE)
-      return JSON_Failure;
-
-   writer->outputEncoding = (Encoding)encoding;
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Writer_GetUseCRLF(JSON_Writer writer)
-{
-   return (writer && GET_FLAGS(writer->flags, WRITER_USE_CRLF)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Writer_SetUseCRLF(JSON_Writer writer, JSON_Boolean useCRLF)
-{
-   if (!writer || GET_FLAGS(writer->state, WRITER_STARTED))
-      return JSON_Failure;
-
-   SET_FLAGS(WriterFlags, writer->flags, WRITER_USE_CRLF, useCRLF);
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Writer_GetReplaceInvalidEncodingSequences(JSON_Writer writer)
-{
-   return (writer && GET_FLAGS(writer->flags, WRITER_REPLACE_INVALID)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Writer_SetReplaceInvalidEncodingSequences(JSON_Writer writer, JSON_Boolean replaceInvalidEncodingSequences)
-{
-   if (!writer || GET_FLAGS(writer->state, WRITER_STARTED))
-      return JSON_Failure;
-
-   SET_FLAGS(WriterFlags, writer->flags, WRITER_REPLACE_INVALID, replaceInvalidEncodingSequences);
-   return JSON_Success;
-}
-
-JSON_Boolean JSON_CALL JSON_Writer_GetEscapeAllNonASCIICharacters(JSON_Writer writer)
-{
-   return (writer && GET_FLAGS(writer->flags, WRITER_ESCAPE_NON_ASCII)) ? JSON_True : JSON_False;
-}
-
-JSON_Status JSON_CALL JSON_Writer_SetEscapeAllNonASCIICharacters(JSON_Writer writer, JSON_Boolean escapeAllNonASCIICharacters)
-{
-   if (!writer || GET_FLAGS(writer->state, WRITER_STARTED))
-      return JSON_Failure;
-
-   SET_FLAGS(WriterFlags, writer->flags, WRITER_ESCAPE_NON_ASCII, escapeAllNonASCIICharacters);
-   return JSON_Success;
-}
-
-JSON_Error JSON_CALL JSON_Writer_GetError(JSON_Writer writer)
-{
-   return writer ? (JSON_Error)writer->error : JSON_Error_None;
-}
-
-JSON_Writer_OutputHandler JSON_CALL JSON_Writer_GetOutputHandler(JSON_Writer writer)
-{
-   return writer ? writer->outputHandler : NULL;
-}
-
-JSON_Status JSON_CALL JSON_Writer_SetOutputHandler(JSON_Writer writer, JSON_Writer_OutputHandler handler)
-{
-   if (!writer)
-      return JSON_Failure;
-
-   writer->outputHandler = handler;
-   return JSON_Success;
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteNull(JSON_Writer writer)
-{
-   static const byte nullUTF8[] = { 'n', 'u', 'l', 'l' };
-   static const byte nullUTF16[] = { 0, 'n', 0, 'u', 0, 'l', 0, 'l', 0 };
-   static const byte nullUTF32[] = { 0, 0, 0, 'n', 0, 0, 0, 'u', 0, 0, 0, 'l', 0, 0, 0, 'l', 0, 0, 0 };
-   static const byte* const nullEncodings[5] = { nullUTF8, nullUTF16 + 1, nullUTF16, nullUTF32 + 3, nullUTF32 };
-
-   return JSON_Writer_WriteSimpleToken(writer, T_NULL, nullEncodings, sizeof(nullUTF8));
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteBoolean(JSON_Writer writer, JSON_Boolean value)
-{
-   static const byte trueUTF8[] = { 't', 'r', 'u', 'e' };
-   static const byte trueUTF16[] = { 0, 't', 0, 'r', 0, 'u', 0, 'e', 0 };
-   static const byte trueUTF32[] = { 0, 0, 0, 't', 0, 0, 0, 'r', 0, 0, 0, 'u', 0, 0, 0, 'e', 0, 0, 0 };
-   static const byte* const trueEncodings[5] = { trueUTF8, trueUTF16 + 1, trueUTF16, trueUTF32 + 3, trueUTF32 };
-
-   static const byte falseUTF8[] = { 'f', 'a', 'l', 's', 'e' };
-   static const byte falseUTF16[] = { 0, 'f', 0, 'a', 0, 'l', 0, 's', 0, 'e', 0 };
-   static const byte falseUTF32[] = { 0, 0, 0, 'f', 0, 0, 0, 'a', 0, 0, 0, 'l', 0, 0, 0, 's', 0, 0, 0, 'e', 0, 0, 0 };
-   static const byte* const falseEncodings[5] = { falseUTF8, falseUTF16 + 1, falseUTF16, falseUTF32 + 3, falseUTF32 };
-
-   Symbol token;
-   const byte* const* encodings;
-   size_t length;
-   if (value)
-   {
-      token = T_TRUE;
-      encodings = trueEncodings;
-      length = sizeof(trueUTF8);
-   }
-   else
-   {
-      token = T_FALSE;
-      encodings = falseEncodings;
-      length = sizeof(falseUTF8);
-   }
-   return JSON_Writer_WriteSimpleToken(writer, token, encodings, length);
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteString(JSON_Writer writer, const char* pValue, size_t length, JSON_Encoding encoding)
-{
-   JSON_Status status = JSON_Failure;
-   if (writer && (pValue || !length) && encoding > JSON_UnknownEncoding && encoding <= JSON_UTF32BE &&
-         !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-   {
-      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-      if (JSON_Writer_ProcessToken(writer, T_STRING))
-         status = JSON_Writer_OutputString(writer, (const byte*)pValue, length, (Encoding)encoding);
-
-      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-   }
-   return status;
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteNumber(JSON_Writer writer, const char* pValue, size_t length, JSON_Encoding encoding)
-{
-   JSON_Status status = JSON_Failure;
-   if (writer && pValue && length && encoding > JSON_UnknownEncoding && encoding <= JSON_UTF32BE &&
-         !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-   {
-      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-      if (JSON_Writer_ProcessToken(writer, T_NUMBER))
-         status = JSON_Writer_OutputNumber(writer, (const byte*)pValue, length, (Encoding)encoding);
-
-      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-   }
-   return status;
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteSpecialNumber(JSON_Writer writer, JSON_SpecialNumber value)
-{
-   static const byte nanUTF8[] = { 'N', 'a', 'N' };
-   static const byte nanUTF16[] = { 0, 'N', 0, 'a', 0, 'N', 0 };
-   static const byte nanUTF32[] = { 0, 0, 0, 'N', 0, 0, 0, 'a', 0, 0, 0, 'N', 0, 0, 0 };
-   static const byte* const nanEncodings[5] = { nanUTF8, nanUTF16 + 1, nanUTF16, nanUTF32 + 3, nanUTF32 };
-
-   static const byte ninfUTF8[] = { '-', 'I', 'n', 'f', 'i', 'n', 'i', 't', 'y' };
-   static const byte ninfUTF16[] = { 0, '-', 0, 'I', 0, 'n', 0, 'f', 0, 'i', 0, 'n', 0, 'i', 0, 't', 0, 'y', 0 };
-   static const byte ninfUTF32[] = { 0, 0, 0, '-', 0, 0, 0, 'I', 0, 0, 0, 'n', 0, 0, 0, 'f', 0, 0, 0, 'i', 0, 0, 0, 'n', 0, 0, 0, 'i', 0, 0, 0, 't', 0, 0, 0, 'y', 0, 0, 0 };
-   static const byte* const infinityEncodings[5] = { ninfUTF8 + 1, ninfUTF16 + 3, ninfUTF16 + 2, ninfUTF32 + 7, ninfUTF32 + 4 };
-   static const byte* const negativeInfinityEncodings[5] = { ninfUTF8, ninfUTF16 + 1, ninfUTF16, ninfUTF32 + 3, ninfUTF32 };
-
-   Symbol token;
-   const byte* const* encodings;
-   size_t length;
-   if (value == JSON_Infinity)
-   {
-      token = T_INFINITY;
-      encodings = infinityEncodings;
-      length = sizeof(ninfUTF8) - 1/* - */;
-   }
-   else if (value == JSON_NegativeInfinity)
-   {
-      token = T_NEGATIVE_INFINITY;
-      encodings = negativeInfinityEncodings;
-      length = sizeof(ninfUTF8);
-   }
-   else
-   {
-      token = T_NAN;
-      encodings = nanEncodings;
-      length = sizeof(nanUTF8);
-   }
-   return JSON_Writer_WriteSimpleToken(writer, token, encodings, length);
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteStartObject(JSON_Writer writer)
-{
-   static const byte utf[] = { 0, 0, 0, '{', 0, 0, 0 };
-   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
-
-   return JSON_Writer_WriteSimpleToken(writer, T_LEFT_CURLY, encodings, 1);
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteEndObject(JSON_Writer writer)
-{
-   static const byte utf[] = { 0, 0, 0, '}', 0, 0, 0 };
-   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
-
-   return JSON_Writer_WriteSimpleToken(writer, T_RIGHT_CURLY, encodings, 1);
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteStartArray(JSON_Writer writer)
-{
-   static const byte utf[] = { 0, 0, 0, '[', 0, 0, 0 };
-   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
-
-   return JSON_Writer_WriteSimpleToken(writer, T_LEFT_SQUARE, encodings, 1);
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteEndArray(JSON_Writer writer)
-{
-   static const byte utf[] = { 0, 0, 0, ']', 0, 0, 0 };
-   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
-
-   return JSON_Writer_WriteSimpleToken(writer, T_RIGHT_SQUARE, encodings, 1);
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteColon(JSON_Writer writer)
-{
-   static const byte utf[] = { 0, 0, 0, ':', 0, 0, 0 };
-   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
-
-   return JSON_Writer_WriteSimpleToken(writer, T_COLON, encodings, 1);
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteComma(JSON_Writer writer)
-{
-   static const byte utf[] = { 0, 0, 0, ',', 0, 0, 0 };
-   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
-
-   return JSON_Writer_WriteSimpleToken(writer, T_COMMA, encodings, 1);
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteSpace(JSON_Writer writer, size_t numberOfSpaces)
-{
-   JSON_Status status = JSON_Failure;
-   if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-   {
-      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-      status = JSON_Writer_OutputSpaces(writer, numberOfSpaces);
-      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-   }
-   return status;
-}
-
-JSON_Status JSON_CALL JSON_Writer_WriteNewLine(JSON_Writer writer)
-{
-   static const byte lfUTF[] = { 0, 0, 0, LINE_FEED_CODEPOINT, 0, 0, 0 };
-   static const byte* const lfEncodings[5] = { lfUTF + 3, lfUTF + 3, lfUTF + 2, lfUTF + 3, lfUTF };
-
-   static const byte crlfUTF8[] = { CARRIAGE_RETURN_CODEPOINT, LINE_FEED_CODEPOINT };
-   static const byte crlfUTF16[] = { 0, CARRIAGE_RETURN_CODEPOINT, 0, LINE_FEED_CODEPOINT, 0 };
-   static const byte crlfUTF32[] = { 0, 0, 0, CARRIAGE_RETURN_CODEPOINT, 0, 0, 0, LINE_FEED_CODEPOINT, 0, 0, 0 };
-   static const byte* const crlfEncodings[5] = { crlfUTF8, crlfUTF16 + 1, crlfUTF16, crlfUTF32 + 3, crlfUTF32 };
-
-   JSON_Status status = JSON_Failure;
-   if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-   {
-      const byte* const* encodings;
-      size_t length;
-      size_t encodedLength;
-      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-      if (GET_FLAGS(writer->flags, WRITER_USE_CRLF))
-      {
-         encodings = crlfEncodings;
-         length = 2;
-      }
-      else
-      {
-         encodings = lfEncodings;
-         length = 1;
-      }
-      encodedLength = length * SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
-      if (JSON_Writer_OutputBytes(writer, encodings[writer->outputEncoding - 1], encodedLength))
-      {
-         status = JSON_Success;
-      }
-      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-   }
-   return status;
-}
-
-#endif /* JSON_NO_WRITER */
-
-/******************** Miscellaneous API ********************/
-
-const JSON_Version* JSON_CALL JSON_LibraryVersion(void)
-{
-   static JSON_Version version = { JSON_MAJOR_VERSION, JSON_MINOR_VERSION, JSON_MICRO_VERSION };
-   return &version;
-}
-
-const char* JSON_CALL JSON_ErrorString(JSON_Error error)
-{
-   /* This array must match the order and number of the JSON_Error enum. */
-   static const char* errorStrings[] =
-   {
-      /* JSON_Error_None */                            "no error",
-      /* JSON_Error_OutOfMemory */                     "could not allocate enough memory",
-      /* JSON_Error_AbortedByHandler */                "the operation was aborted by a handler",
-      /* JSON_Error_BOMNotAllowed */                   "the input begins with a byte-order mark (BOM), which is not allowed by RFC 4627",
-      /* JSON_Error_InvalidEncodingSequence */         "the input contains a byte or sequence of bytes that is not valid for the input encoding",
-      /* JSON_Error_UnknownToken */                    "the input contains an unknown token",
-      /* JSON_Error_UnexpectedToken */                 "the input contains an unexpected token",
-      /* JSON_Error_IncompleteToken */                 "the input ends in the middle of a token",
-      /* JSON_Error_MoreTokensExpected */              "the input ends when more tokens are expected",
-      /* JSON_Error_UnescapedControlCharacter */       "the input contains a string containing an unescaped control character (U+0000 - U+001F)",
-      /* JSON_Error_InvalidEscapeSequence */           "the input contains a string containing an invalid escape sequence",
-      /* JSON_Error_UnpairedSurrogateEscapeSequence */ "the input contains a string containing an unmatched UTF-16 surrogate codepoint",
-      /* JSON_Error_TooLongString */                   "the input contains a string that is too long",
-      /* JSON_Error_InvalidNumber */                   "the input contains an invalid number",
-      /* JSON_Error_TooLongNumber */                   "the input contains a number that is too long",
-      /* JSON_Error_DuplicateObjectMember */           "the input contains an object with duplicate members",
-      /* JSON_Error_StoppedAfterEmbeddedDocument */    "the end of the embedded document was reached"
-   };
-   return ((unsigned int)error < (sizeof(errorStrings) / sizeof(errorStrings[0])))
-      ? errorStrings[error]
-      : "";
-}
-
-static const uint32_t endianEncodings = (((uint32_t)JSON_UTF32BE) << 24) | (((uint32_t)JSON_UTF16BE) << 16) | (((uint32_t)JSON_UTF16LE) << 8) | ((uint32_t)JSON_UTF32LE);
-
-JSON_Encoding JSON_CALL JSON_NativeUTF16Encoding(void)
-{
-   return (JSON_Encoding)(((byte*)&endianEncodings)[1]);
-}
-
-JSON_Encoding JSON_CALL JSON_NativeUTF32Encoding(void)
-{
-   return (JSON_Encoding)(((byte*)&endianEncodings)[0]);
-}
diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c
deleted file mode 100644
index 56c506d..0000000
--- a/libretro-common/formats/png/rpng.c
+++ /dev/null
@@ -1,1195 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rpng.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef GEKKO
-#include <malloc.h>
-#endif
-
-#include <boolean.h>
-#include <formats/image.h>
-#include <formats/rpng.h>
-#include <streams/trans_stream.h>
-#include <string/stdstring.h>
-
-#include "rpng_internal.h"
-
-enum png_ihdr_color_type
-{
-   PNG_IHDR_COLOR_GRAY       = 0,
-   PNG_IHDR_COLOR_RGB        = 2,
-   PNG_IHDR_COLOR_PLT        = 3,
-   PNG_IHDR_COLOR_GRAY_ALPHA = 4,
-   PNG_IHDR_COLOR_RGBA       = 6
-};
-
-enum png_line_filter
-{
-   PNG_FILTER_NONE = 0,
-   PNG_FILTER_SUB,
-   PNG_FILTER_UP,
-   PNG_FILTER_AVERAGE,
-   PNG_FILTER_PAETH
-};
-
-enum png_chunk_type
-{
-   PNG_CHUNK_NOOP = 0,
-   PNG_CHUNK_ERROR,
-   PNG_CHUNK_IHDR,
-   PNG_CHUNK_IDAT,
-   PNG_CHUNK_PLTE,
-   PNG_CHUNK_tRNS,
-   PNG_CHUNK_IEND
-};
-
-struct adam7_pass
-{
-   unsigned x;
-   unsigned y;
-   unsigned stride_x;
-   unsigned stride_y;
-};
-
-struct idat_buffer
-{
-   uint8_t *data;
-   size_t size;
-};
-
-struct png_chunk
-{
-   uint32_t size;
-   char type[4];
-   uint8_t *data;
-};
-
-struct rpng_process
-{
-   bool inflate_initialized;
-   bool adam7_pass_initialized;
-   bool pass_initialized;
-   uint32_t *data;
-   uint32_t *palette;
-   struct png_ihdr ihdr;
-   uint8_t *prev_scanline;
-   uint8_t *decoded_scanline;
-   uint8_t *inflate_buf;
-   size_t restore_buf_size;
-   size_t adam7_restore_buf_size;
-   size_t data_restore_buf_size;
-   size_t inflate_buf_size;
-   unsigned bpp;
-   unsigned pitch;
-   unsigned h;
-   struct
-   {
-      unsigned width;
-      unsigned height;
-      size_t   size;
-      unsigned pos;
-   } pass;
-   void *stream;
-   size_t avail_in, avail_out, total_out;
-   const struct trans_stream_backend *stream_backend;
-};
-
-struct rpng
-{
-   struct rpng_process *process;
-   bool has_ihdr;
-   bool has_idat;
-   bool has_iend;
-   bool has_plte;
-   bool has_trns;
-   struct idat_buffer idat_buf;
-   struct png_ihdr ihdr;
-   uint8_t *buff_data;
-   uint32_t palette[256];
-};
-
-static INLINE uint32_t dword_be(const uint8_t *buf)
-{
-   return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | (buf[3] << 0);
-}
-
-static enum png_chunk_type png_chunk_type(const struct png_chunk *chunk)
-{
-   unsigned i;
-   struct
-   {
-      const char *id;
-      enum png_chunk_type type;
-   } static const chunk_map[] = {
-      { "IHDR", PNG_CHUNK_IHDR },
-      { "IDAT", PNG_CHUNK_IDAT },
-      { "IEND", PNG_CHUNK_IEND },
-      { "PLTE", PNG_CHUNK_PLTE },
-      { "tRNS", PNG_CHUNK_tRNS },
-   };
-
-   for (i = 0; i < ARRAY_SIZE(chunk_map); i++)
-   {
-      if (string_is_equal_fast(chunk->type, chunk_map[i].id, 4))
-         return chunk_map[i].type;
-   }
-
-   return PNG_CHUNK_NOOP;
-}
-
-static bool png_process_ihdr(struct png_ihdr *ihdr)
-{
-   unsigned i;
-   bool ret = true;
-
-   switch (ihdr->color_type)
-   {
-      case PNG_IHDR_COLOR_RGB:
-      case PNG_IHDR_COLOR_GRAY_ALPHA:
-      case PNG_IHDR_COLOR_RGBA:
-         if (ihdr->depth != 8 && ihdr->depth != 16)
-            GOTO_END_ERROR();
-         break;
-      case PNG_IHDR_COLOR_GRAY:
-         {
-            static const unsigned valid_bpp[] = { 1, 2, 4, 8, 16 };
-            bool correct_bpp = false;
-
-            for (i = 0; i < ARRAY_SIZE(valid_bpp); i++)
-            {
-               if (valid_bpp[i] == ihdr->depth)
-               {
-                  correct_bpp = true;
-                  break;
-               }
-            }
-
-            if (!correct_bpp)
-               GOTO_END_ERROR();
-         }
-         break;
-      case PNG_IHDR_COLOR_PLT:
-         {
-            static const unsigned valid_bpp[] = { 1, 2, 4, 8 };
-            bool correct_bpp = false;
-
-            for (i = 0; i < ARRAY_SIZE(valid_bpp); i++)
-            {
-               if (valid_bpp[i] == ihdr->depth)
-               {
-                  correct_bpp = true;
-                  break;
-               }
-            }
-
-            if (!correct_bpp)
-               GOTO_END_ERROR();
-         }
-         break;
-      default:
-         GOTO_END_ERROR();
-   }
-
-#ifdef RPNG_TEST
-   fprintf(stderr, "IHDR: (%u x %u), bpc = %u, palette = %s, color = %s, alpha = %s, adam7 = %s.\n",
-         ihdr->width, ihdr->height,
-         ihdr->depth, (ihdr->color_type == PNG_IHDR_COLOR_PLT) ? "yes" : "no",
-         (ihdr->color_type & PNG_IHDR_COLOR_RGB) ? "yes" : "no",
-         (ihdr->color_type & PNG_IHDR_COLOR_GRAY_ALPHA) ? "yes" : "no",
-         ihdr->interlace == 1 ? "yes" : "no");
-#endif
-
-   if (ihdr->compression != 0)
-      GOTO_END_ERROR();
-
-end:
-   return ret;
-}
-
-static void png_reverse_filter_copy_line_rgb(uint32_t *data,
-      const uint8_t *decoded, unsigned width, unsigned bpp)
-{
-   unsigned i;
-
-   bpp /= 8;
-
-   for (i = 0; i < width; i++)
-   {
-      uint32_t r, g, b;
-
-      r        = *decoded;
-      decoded += bpp;
-      g        = *decoded;
-      decoded += bpp;
-      b        = *decoded;
-      decoded += bpp;
-      data[i]  = (0xffu << 24) | (r << 16) | (g << 8) | (b << 0);
-   }
-}
-
-static void png_reverse_filter_copy_line_rgba(uint32_t *data,
-      const uint8_t *decoded, unsigned width, unsigned bpp)
-{
-   unsigned i;
-
-   bpp /= 8;
-
-   for (i = 0; i < width; i++)
-   {
-      uint32_t r, g, b, a;
-      r        = *decoded;
-      decoded += bpp;
-      g        = *decoded;
-      decoded += bpp;
-      b        = *decoded;
-      decoded += bpp;
-      a        = *decoded;
-      decoded += bpp;
-      data[i]  = (a << 24) | (r << 16) | (g << 8) | (b << 0);
-   }
-}
-
-static void png_reverse_filter_copy_line_bw(uint32_t *data,
-      const uint8_t *decoded, unsigned width, unsigned depth)
-{
-   unsigned i, bit;
-   static const unsigned mul_table[] = { 0, 0xff, 0x55, 0, 0x11, 0, 0, 0, 0x01 };
-   unsigned mul, mask;
-   
-   if (depth == 16)
-   {
-      for (i = 0; i < width; i++)
-      {
-         uint32_t val = decoded[i << 1];
-         data[i]      = (val * 0x010101) | (0xffu << 24);
-      }
-      return;
-   }
-
-   mul  = mul_table[depth];
-   mask = (1 << depth) - 1;
-   bit  = 0;
-
-   for (i = 0; i < width; i++, bit += depth)
-   {
-      unsigned byte = bit >> 3;
-      unsigned val  = decoded[byte] >> (8 - depth - (bit & 7));
-
-      val          &= mask;
-      val          *= mul;
-      data[i]       = (val * 0x010101) | (0xffu << 24);
-   }
-}
-
-static void png_reverse_filter_copy_line_gray_alpha(uint32_t *data,
-      const uint8_t *decoded, unsigned width,
-      unsigned bpp)
-{
-   unsigned i;
-
-   bpp /= 8;
-
-   for (i = 0; i < width; i++)
-   {
-      uint32_t gray, alpha;
-
-      gray     = *decoded;
-      decoded += bpp;
-      alpha    = *decoded;
-      decoded += bpp;
-
-      data[i]  = (gray * 0x010101) | (alpha << 24);
-   }
-}
-
-static void png_reverse_filter_copy_line_plt(uint32_t *data,
-      const uint8_t *decoded, unsigned width,
-      unsigned depth, const uint32_t *palette)
-{
-   switch (depth)
-   {
-      case 1:
-         {
-            unsigned w = width / 8;
-            unsigned i;
-            
-            for (i = 0; i < w; i++, decoded++)
-            {
-               *data++ = palette[(*decoded >> 7) & 1];
-               *data++ = palette[(*decoded >> 6) & 1];
-               *data++ = palette[(*decoded >> 5) & 1];
-               *data++ = palette[(*decoded >> 4) & 1];
-               *data++ = palette[(*decoded >> 3) & 1];
-               *data++ = palette[(*decoded >> 2) & 1];
-               *data++ = palette[(*decoded >> 1) & 1];
-               *data++ = palette[*decoded & 1];
-            }
-            
-            switch (width & 7)
-            {
-               case 7:
-                  data[6] = palette[(*decoded >> 1) & 1];
-               case 6:
-                  data[5] = palette[(*decoded >> 2) & 1];
-               case 5:
-                  data[4] = palette[(*decoded >> 3) & 1];
-               case 4:
-                  data[3] = palette[(*decoded >> 4) & 1];
-               case 3:
-                  data[2] = palette[(*decoded >> 5) & 1];
-               case 2: 
-                  data[1] = palette[(*decoded >> 6) & 1];
-               case 1:
-                  data[0] = palette[(*decoded >> 7) & 1];
-                  break;
-            }
-         }
-         break;
-      
-      case 2:
-         {
-            unsigned w = width / 4;
-            unsigned i;
-            
-            for (i = 0; i < w; i++, decoded++)
-            {
-               *data++ = palette[(*decoded >> 6) & 3];
-               *data++ = palette[(*decoded >> 4) & 3];
-               *data++ = palette[(*decoded >> 2) & 3];
-               *data++ = palette[*decoded & 3];
-            }
-            
-            switch (width & 3)
-            {
-               case 3:
-                  data[2] = palette[(*decoded >> 2) & 3];
-               case 2: 
-                  data[1] = palette[(*decoded >> 4) & 3];
-               case 1:
-                  data[0] = palette[(*decoded >> 6) & 3];
-                  break;
-            }
-         }
-         break;
-      
-      case 4:
-         {
-            unsigned w = width / 2;
-            unsigned i;
-            
-            for (i = 0; i < w; i++, decoded++)
-            {
-               *data++ = palette[*decoded >> 4];
-               *data++ = palette[*decoded & 0x0f];
-            }
-            
-            if (width & 1)
-            {
-               *data = palette[*decoded >> 4];
-            }
-         }
-         break;
-      
-      case 8:
-         {
-            unsigned i;
-            
-            for (i = 0; i < width; i++, decoded++, data++)
-            {
-               *data = palette[*decoded];
-            }
-         }
-         break;
-   }
-}
-
-static void png_pass_geom(const struct png_ihdr *ihdr,
-      unsigned width, unsigned height,
-      unsigned *bpp_out, unsigned *pitch_out, size_t *pass_size)
-{
-   unsigned bpp;
-   unsigned pitch;
-
-   switch (ihdr->color_type)
-   {
-      case PNG_IHDR_COLOR_GRAY:
-         bpp   = (ihdr->depth + 7) / 8;
-         pitch = (ihdr->width * ihdr->depth + 7) / 8;
-         break;
-      case PNG_IHDR_COLOR_RGB:
-         bpp   = (ihdr->depth * 3 + 7) / 8;
-         pitch = (ihdr->width * ihdr->depth * 3 + 7) / 8;
-         break;
-      case PNG_IHDR_COLOR_PLT:
-         bpp   = (ihdr->depth + 7) / 8;
-         pitch = (ihdr->width * ihdr->depth + 7) / 8;
-         break;
-      case PNG_IHDR_COLOR_GRAY_ALPHA:
-         bpp   = (ihdr->depth * 2 + 7) / 8;
-         pitch = (ihdr->width * ihdr->depth * 2 + 7) / 8;
-         break;
-      case PNG_IHDR_COLOR_RGBA:
-         bpp   = (ihdr->depth * 4 + 7) / 8;
-         pitch = (ihdr->width * ihdr->depth * 4 + 7) / 8;
-         break;
-      default:
-         bpp = 0;
-         pitch = 0;
-         break;
-   }
-
-   if (pass_size)
-      *pass_size = (pitch + 1) * ihdr->height;
-   if (bpp_out)
-      *bpp_out = bpp;
-   if (pitch_out)
-      *pitch_out = pitch;
-}
-
-static void png_reverse_filter_adam7_deinterlace_pass(uint32_t *data,
-      const struct png_ihdr *ihdr,
-      const uint32_t *input, unsigned pass_width, unsigned pass_height,
-      const struct adam7_pass *pass)
-{
-   unsigned x, y;
-
-   data += pass->y * ihdr->width + pass->x;
-
-   for (y = 0; y < pass_height;
-         y++, data += ihdr->width * pass->stride_y, input += pass_width)
-   {
-      uint32_t *out = data;
-     
-      for (x = 0; x < pass_width; x++, out += pass->stride_x)
-         *out = input[x];
-   }
-}
-
-static void png_reverse_filter_deinit(struct rpng_process *pngp)
-{
-   if (pngp->decoded_scanline)
-      free(pngp->decoded_scanline);
-   pngp->decoded_scanline = NULL;
-   if (pngp->prev_scanline)
-      free(pngp->prev_scanline);
-   pngp->prev_scanline    = NULL;
-
-   pngp->pass_initialized = false;
-   pngp->h                = 0;
-}
-
-static const struct adam7_pass passes[] = {
-   { 0, 0, 8, 8 },
-   { 4, 0, 8, 8 },
-   { 0, 4, 4, 8 },
-   { 2, 0, 4, 4 },
-   { 0, 2, 2, 4 },
-   { 1, 0, 2, 2 },
-   { 0, 1, 1, 2 },
-};
-
-static int png_reverse_filter_init(const struct png_ihdr *ihdr,
-      struct rpng_process *pngp)
-{
-   size_t pass_size;
-
-   if (!pngp->adam7_pass_initialized && ihdr->interlace)
-   {
-      if (ihdr->width <= passes[pngp->pass.pos].x ||
-            ihdr->height <= passes[pngp->pass.pos].y) /* Empty pass */
-         return 1;
-
-      pngp->pass.width  = (ihdr->width - 
-            passes[pngp->pass.pos].x + passes[pngp->pass.pos].stride_x - 1) / passes[pngp->pass.pos].stride_x;
-      pngp->pass.height = (ihdr->height - passes[pngp->pass.pos].y + 
-            passes[pngp->pass.pos].stride_y - 1) / passes[pngp->pass.pos].stride_y;
-
-      pngp->data = (uint32_t*)malloc(
-            pngp->pass.width * pngp->pass.height * sizeof(uint32_t));
-
-      if (!pngp->data)
-         return -1;
-
-      pngp->ihdr        = *ihdr;
-      pngp->ihdr.width  = pngp->pass.width;
-      pngp->ihdr.height = pngp->pass.height;
-
-      png_pass_geom(&pngp->ihdr, pngp->pass.width,
-            pngp->pass.height, NULL, NULL, &pngp->pass.size);
-
-      if (pngp->pass.size > pngp->total_out)
-      {
-         free(pngp->data);
-         return -1;
-      }
-
-      pngp->adam7_pass_initialized = true;
-
-      return 0;
-   }
-
-   if (pngp->pass_initialized)
-      return 0;
-
-   png_pass_geom(ihdr, ihdr->width, ihdr->height, &pngp->bpp, &pngp->pitch, &pass_size);
-
-   if (pngp->total_out < pass_size)
-      return -1;
-
-   pngp->restore_buf_size      = 0;
-   pngp->data_restore_buf_size = 0;
-   pngp->prev_scanline    = (uint8_t*)calloc(1, pngp->pitch);
-   pngp->decoded_scanline = (uint8_t*)calloc(1, pngp->pitch);
-
-   if (!pngp->prev_scanline || !pngp->decoded_scanline)
-      goto error;
-
-   pngp->h = 0;
-   pngp->pass_initialized = true;
-
-   return 0;
-
-error:
-   png_reverse_filter_deinit(pngp);
-   return -1;
-}
-
-static int png_reverse_filter_copy_line(uint32_t *data, const struct png_ihdr *ihdr,
-      struct rpng_process *pngp, unsigned filter)
-{
-   unsigned i;
-
-   switch (filter)
-   {
-      case PNG_FILTER_NONE:
-         memcpy(pngp->decoded_scanline, pngp->inflate_buf, pngp->pitch);
-         break;
-      case PNG_FILTER_SUB:
-         for (i = 0; i < pngp->bpp; i++)
-            pngp->decoded_scanline[i] = pngp->inflate_buf[i];
-         for (i = pngp->bpp; i < pngp->pitch; i++)
-            pngp->decoded_scanline[i] = pngp->decoded_scanline[i - pngp->bpp] + pngp->inflate_buf[i];
-         break;
-      case PNG_FILTER_UP:
-         for (i = 0; i < pngp->pitch; i++)
-            pngp->decoded_scanline[i] = pngp->prev_scanline[i] + pngp->inflate_buf[i];
-         break;
-      case PNG_FILTER_AVERAGE:
-         for (i = 0; i < pngp->bpp; i++)
-         {
-            uint8_t avg = pngp->prev_scanline[i] >> 1;
-            pngp->decoded_scanline[i] = avg + pngp->inflate_buf[i];
-         }
-         for (i = pngp->bpp; i < pngp->pitch; i++)
-         {
-            uint8_t avg = (pngp->decoded_scanline[i - pngp->bpp] + pngp->prev_scanline[i]) >> 1;
-            pngp->decoded_scanline[i] = avg + pngp->inflate_buf[i];
-         }
-         break;
-      case PNG_FILTER_PAETH:
-         for (i = 0; i < pngp->bpp; i++)
-            pngp->decoded_scanline[i] = paeth(0, pngp->prev_scanline[i], 0) + pngp->inflate_buf[i];
-         for (i = pngp->bpp; i < pngp->pitch; i++)
-            pngp->decoded_scanline[i] = paeth(pngp->decoded_scanline[i - pngp->bpp],
-                  pngp->prev_scanline[i], pngp->prev_scanline[i - pngp->bpp]) + pngp->inflate_buf[i];
-         break;
-
-      default:
-         return IMAGE_PROCESS_ERROR_END;
-   }
-
-   switch (ihdr->color_type)
-   {
-      case PNG_IHDR_COLOR_GRAY:
-         png_reverse_filter_copy_line_bw(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
-         break;
-      case PNG_IHDR_COLOR_RGB:
-         png_reverse_filter_copy_line_rgb(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
-         break;
-      case PNG_IHDR_COLOR_PLT:
-         png_reverse_filter_copy_line_plt(data, pngp->decoded_scanline, ihdr->width,
-               ihdr->depth, pngp->palette);
-         break;
-      case PNG_IHDR_COLOR_GRAY_ALPHA:
-         png_reverse_filter_copy_line_gray_alpha(data, pngp->decoded_scanline, ihdr->width,
-               ihdr->depth);
-         break;
-      case PNG_IHDR_COLOR_RGBA:
-         png_reverse_filter_copy_line_rgba(data, pngp->decoded_scanline, ihdr->width, ihdr->depth);
-         break;
-   }
-
-   memcpy(pngp->prev_scanline, pngp->decoded_scanline, pngp->pitch);
-
-   return IMAGE_PROCESS_NEXT;
-}
-
-static int png_reverse_filter_regular_iterate(uint32_t **data, const struct png_ihdr *ihdr,
-      struct rpng_process *pngp)
-{
-   int ret = IMAGE_PROCESS_END;
-
-   if (pngp->h < ihdr->height)
-   {
-      unsigned filter = *pngp->inflate_buf++;
-      pngp->restore_buf_size += 1;
-      ret = png_reverse_filter_copy_line(*data,
-            ihdr, pngp, filter);
-   }
-
-   if (ret == IMAGE_PROCESS_END || ret == IMAGE_PROCESS_ERROR_END)
-      goto end;
-
-   pngp->h++;
-   pngp->inflate_buf           += pngp->pitch;
-   pngp->restore_buf_size      += pngp->pitch;
-
-   *data                       += ihdr->width;
-   pngp->data_restore_buf_size += ihdr->width;
-
-   return IMAGE_PROCESS_NEXT;
-
-end:
-   png_reverse_filter_deinit(pngp);
-
-   pngp->inflate_buf -= pngp->restore_buf_size;
-   *data             -= pngp->data_restore_buf_size;
-   pngp->data_restore_buf_size = 0;
-   return ret;
-}
-
-static int png_reverse_filter_adam7_iterate(uint32_t **data_,
-      const struct png_ihdr *ihdr,
-      struct rpng_process *pngp)
-{
-   int ret = 0;
-   bool to_next = pngp->pass.pos < ARRAY_SIZE(passes);
-   uint32_t *data = *data_;
-
-   if (!to_next)
-      return IMAGE_PROCESS_END;
-
-   ret = png_reverse_filter_init(ihdr, pngp);
-
-   if (ret == 1)
-      return IMAGE_PROCESS_NEXT;
-   if (ret == -1)
-      return IMAGE_PROCESS_ERROR_END;
-
-   if (png_reverse_filter_init(&pngp->ihdr, pngp) == -1)
-      return IMAGE_PROCESS_ERROR;
-
-   do{
-      ret = png_reverse_filter_regular_iterate(&pngp->data,
-            &pngp->ihdr, pngp);
-   }while(ret == IMAGE_PROCESS_NEXT);
-
-   if (ret == IMAGE_PROCESS_ERROR || ret == IMAGE_PROCESS_ERROR_END)
-      return IMAGE_PROCESS_ERROR;
-
-   pngp->inflate_buf            += pngp->pass.size;
-   pngp->adam7_restore_buf_size += pngp->pass.size;
-
-   pngp->total_out -= pngp->pass.size;
-
-   png_reverse_filter_adam7_deinterlace_pass(data,
-         ihdr, pngp->data, pngp->pass.width, pngp->pass.height, &passes[pngp->pass.pos]);
-
-   free(pngp->data);
-
-   pngp->pass.width  = 0;
-   pngp->pass.height = 0;
-   pngp->pass.size   = 0;
-   pngp->adam7_pass_initialized = false;
-
-   return IMAGE_PROCESS_NEXT;
-}
-
-static int png_reverse_filter_adam7(uint32_t **data_,
-      const struct png_ihdr *ihdr,
-      struct rpng_process *pngp)
-{
-   int ret = png_reverse_filter_adam7_iterate(data_,
-         ihdr, pngp);
-
-   switch (ret)
-   {
-      case IMAGE_PROCESS_ERROR_END:
-      case IMAGE_PROCESS_END:
-         break;
-      case IMAGE_PROCESS_NEXT:
-         pngp->pass.pos++;
-         return 0;
-      case IMAGE_PROCESS_ERROR:
-         if (pngp->data)
-            free(pngp->data);
-         pngp->inflate_buf -= pngp->adam7_restore_buf_size;
-         pngp->adam7_restore_buf_size = 0;
-         return -1;
-   }
-
-   pngp->inflate_buf -= pngp->adam7_restore_buf_size;
-   pngp->adam7_restore_buf_size = 0;
-   return ret;
-}
-
-static int png_reverse_filter_iterate(rpng_t *rpng, uint32_t **data)
-{
-   if (!rpng)
-      return false;
-
-   if (rpng->ihdr.interlace)
-      return png_reverse_filter_adam7(data, &rpng->ihdr, rpng->process);
-
-   return png_reverse_filter_regular_iterate(data, &rpng->ihdr, rpng->process);
-}
-
-static int rpng_load_image_argb_process_inflate_init(rpng_t *rpng,
-      uint32_t **data, unsigned *width, unsigned *height)
-{
-   bool zstatus;
-   enum trans_stream_error terror;
-   uint32_t rd, wn;
-   struct rpng_process *process = (struct rpng_process*)rpng->process;
-   bool to_continue        = (process->avail_in > 0
-         && process->avail_out > 0);
-
-   if (!to_continue)
-      goto end;
-
-   zstatus = process->stream_backend->trans(process->stream, false, &rd, &wn, &terror);
-
-   if (!zstatus && terror != TRANS_STREAM_ERROR_BUFFER_FULL)
-      goto error;
-
-   process->avail_in -= rd;
-   process->avail_out -= wn;
-   process->total_out += wn;
-
-   if (terror)
-      return 0;
-
-end:
-   process->stream_backend->stream_free(process->stream);
-   process->stream = NULL;
-
-   *width  = rpng->ihdr.width;
-   *height = rpng->ihdr.height;
-#ifdef GEKKO
-   /* we often use these in textures, make sure they're 32-byte aligned */
-   *data = (uint32_t*)memalign(32, rpng->ihdr.width * 
-         rpng->ihdr.height * sizeof(uint32_t));
-#else
-   *data = (uint32_t*)malloc(rpng->ihdr.width * 
-         rpng->ihdr.height * sizeof(uint32_t));
-#endif
-   if (!*data)
-      goto false_end;
-
-   process->adam7_restore_buf_size = 0;
-   process->restore_buf_size       = 0;
-   process->palette                = rpng->palette;
-
-   if (rpng->ihdr.interlace != 1)
-      if (png_reverse_filter_init(&rpng->ihdr, process) == -1)
-         goto false_end;
-
-   process->inflate_initialized = true;
-   return 1;
-
-error:
-false_end:
-   process->inflate_initialized = false;
-   return -1;
-}
-
-static bool png_read_plte(uint8_t *buf, 
-      uint32_t *buffer, unsigned entries)
-{
-   unsigned i;
-
-   for (i = 0; i < entries; i++)
-   {
-      uint32_t r = buf[3 * i + 0];
-      uint32_t g = buf[3 * i + 1];
-      uint32_t b = buf[3 * i + 2];
-      buffer[i] = (r << 16) | (g << 8) | (b << 0) | (0xffu << 24);
-   }
-
-   return true;
-}
-
-static bool png_read_trns(uint8_t *buf, uint32_t *palette, unsigned entries)
-{
-   unsigned i;
-
-   for (i = 0; i < entries; i++, buf++, palette++)
-   {
-      *palette = (*palette & 0x00ffffff) | *buf << 24;
-   }
-
-   return true;
-}
-
-bool png_realloc_idat(const struct png_chunk *chunk, struct idat_buffer *buf)
-{
-   uint8_t *new_buffer = (uint8_t*)realloc(buf->data, buf->size + chunk->size);
-
-   if (!new_buffer)
-      return false;
-
-   buf->data  = new_buffer;
-   return true;
-}
-
-static struct rpng_process *rpng_process_init(rpng_t *rpng, unsigned *width, unsigned *height)
-{
-   uint8_t *inflate_buf         = NULL;
-   struct rpng_process *process = (struct rpng_process*)calloc(1, sizeof(*process));
-
-   if (!process)
-      return NULL;
-
-   process->stream_backend = trans_stream_get_zlib_inflate_backend();
-
-   png_pass_geom(&rpng->ihdr, rpng->ihdr.width,
-         rpng->ihdr.height, NULL, NULL, &process->inflate_buf_size);
-   if (rpng->ihdr.interlace == 1) /* To be sure. */
-      process->inflate_buf_size *= 2;
-
-   process->stream = process->stream_backend->stream_new();
-
-   if (!process->stream)
-   {
-      free(process);
-      return NULL;
-   }
-
-   inflate_buf = (uint8_t*)malloc(process->inflate_buf_size);
-   if (!inflate_buf)
-      goto error;
-
-   process->inflate_buf = inflate_buf;
-   process->avail_in = rpng->idat_buf.size;
-   process->avail_out = process->inflate_buf_size;
-   process->total_out = 0;
-   process->stream_backend->set_in(
-         process->stream,
-         rpng->idat_buf.data,
-         (uint32_t)rpng->idat_buf.size);
-   process->stream_backend->set_out(
-         process->stream,
-         process->inflate_buf,
-         (uint32_t)process->inflate_buf_size);
-
-   return process;
-
-error:
-   if (process)
-   {
-      if (process->stream)
-         process->stream_backend->stream_free(process->stream);
-      free(process);
-   }
-   return NULL;
-}
-
-static bool read_chunk_header(uint8_t *buf, struct png_chunk *chunk)
-{
-   unsigned i;
-   uint8_t dword[4];
-
-   dword[0] = '\0';
-
-   for (i = 0; i < 4; i++)
-      dword[i] = buf[i];
-
-   chunk->size = dword_be(dword);
-
-   for (i = 0; i < 4; i++)
-      chunk->type[i] = buf[i + 4];
-
-   return true;
-}
-
-static bool png_parse_ihdr(uint8_t *buf,
-      struct png_ihdr *ihdr)
-{
-   buf += 4 + 4;
-
-   ihdr->width       = dword_be(buf + 0);
-   ihdr->height      = dword_be(buf + 4);
-   ihdr->depth       = buf[8];
-   ihdr->color_type  = buf[9];
-   ihdr->compression = buf[10];
-   ihdr->filter      = buf[11];
-   ihdr->interlace   = buf[12];
-
-   if (ihdr->width == 0 || ihdr->height == 0)
-      return false;
-
-   return true;
-}
-
-bool rpng_iterate_image(rpng_t *rpng)
-{
-   unsigned i;
-   struct png_chunk chunk;
-   uint8_t *buf           = (uint8_t*)rpng->buff_data;
-
-   chunk.size             = 0;
-   chunk.type[0]          = 0;
-   chunk.data             = NULL;
-
-   if (!read_chunk_header(buf, &chunk))
-      return false;
-
-   *buf += 8;
-
-#if 0
-   for (i = 0; i < 4; i++)
-   {
-      fprintf(stderr, "chunktype: %c\n", chunk.type[i]);
-   }
-#endif
-
-   switch (png_chunk_type(&chunk))
-   {
-      case PNG_CHUNK_NOOP:
-      default:
-         break;
-
-      case PNG_CHUNK_ERROR:
-         goto error;
-
-      case PNG_CHUNK_IHDR:
-         if (rpng->has_ihdr || rpng->has_idat || rpng->has_iend)
-            goto error;
-
-         if (chunk.size != 13)
-            goto error;
-
-         if (!png_parse_ihdr(buf, &rpng->ihdr))
-            goto error;
-
-         if (!png_process_ihdr(&rpng->ihdr))
-            goto error;
-
-         rpng->has_ihdr = true;
-         break;
-
-      case PNG_CHUNK_PLTE:
-         {
-            unsigned entries = chunk.size / 3;
-
-            if (!rpng->has_ihdr || rpng->has_plte || rpng->has_iend || rpng->has_idat || rpng->has_trns)
-               goto error;
-
-            if (chunk.size % 3)
-               goto error;
-
-            if (entries > 256)
-               goto error;
-
-            buf += 8;
-
-            if (!png_read_plte(buf, rpng->palette, entries))
-               goto error;
-
-            rpng->has_plte = true;
-         }
-         break;
-
-      case PNG_CHUNK_tRNS:
-         if (rpng->has_idat)
-            goto error;
-
-         if (rpng->ihdr.color_type == PNG_IHDR_COLOR_PLT)
-         {
-            /* we should compare with the number of palette entries */
-            if (chunk.size > 256)
-               goto error;
-
-            buf += 8;
-
-            if (!png_read_trns(buf, rpng->palette, chunk.size))
-               goto error;
-         }
-         /* TODO: support colorkey in grayscale and truecolor images */
-
-         rpng->has_trns = true;
-         break;
-
-      case PNG_CHUNK_IDAT:
-         if (!(rpng->has_ihdr) || rpng->has_iend || (rpng->ihdr.color_type == PNG_IHDR_COLOR_PLT && !(rpng->has_plte)))
-            goto error;
-
-         if (!png_realloc_idat(&chunk, &rpng->idat_buf))
-            goto error;
-
-         buf += 8;
-
-         for (i = 0; i < chunk.size; i++)
-            rpng->idat_buf.data[i + rpng->idat_buf.size] = buf[i];
-
-         rpng->idat_buf.size += chunk.size;
-
-         rpng->has_idat = true;
-         break;
-
-      case PNG_CHUNK_IEND:
-         if (!(rpng->has_ihdr) || !(rpng->has_idat))
-            goto error;
-
-         rpng->has_iend = true;
-         goto error;
-   }
-
-   rpng->buff_data += chunk.size + 12; 
-
-   return true;
-
-error:
-   return false;
-}
-
-int rpng_process_image(rpng_t *rpng,
-      void **_data, size_t size, unsigned *width, unsigned *height)
-{
-   uint32_t **data = (uint32_t**)_data;
-
-   (void)size;
-
-   if (!rpng->process)
-   {
-      struct rpng_process *process = rpng_process_init(
-            rpng, width, height);
-
-      if (!process)
-         goto error;
-
-      rpng->process = process;
-      return IMAGE_PROCESS_NEXT;
-   }
-
-   if (!rpng->process->inflate_initialized)
-   {
-      if (rpng_load_image_argb_process_inflate_init(rpng, data,
-               width, height) == -1)
-         goto error;
-      return IMAGE_PROCESS_NEXT;
-   }
-
-   return png_reverse_filter_iterate(rpng, data);
-
-error:
-   if (rpng->process)
-   {
-      if (rpng->process->inflate_buf)
-         free(rpng->process->inflate_buf);
-      if (rpng->process->stream)
-         rpng->process->stream_backend->stream_free(rpng->process->stream);
-      free(rpng->process);
-   }
-   return IMAGE_PROCESS_ERROR;
-}
-
-void rpng_free(rpng_t *rpng)
-{
-   if (!rpng)
-      return;
-
-   if (rpng->idat_buf.data)
-      free(rpng->idat_buf.data);
-   if (rpng->process)
-   {
-      if (rpng->process->inflate_buf)
-         free(rpng->process->inflate_buf);
-      if (rpng->process->stream)
-      {
-         if (rpng->process->stream_backend)
-            rpng->process->stream_backend->stream_free(rpng->process->stream);
-         else
-            free(rpng->process->stream);
-      }
-      free(rpng->process);
-   }
-
-   free(rpng);
-}
-
-bool rpng_start(rpng_t *rpng)
-{
-   unsigned i;
-   char header[8];
-
-   if (!rpng)
-      return false;
-
-   header[0] = '\0';
-   
-   for (i = 0; i < 8; i++)
-      header[i] = rpng->buff_data[i];
-
-   if (string_is_not_equal_fast(header, png_magic, sizeof(png_magic)))
-      return false;
-
-   rpng->buff_data += 8;
-
-   return true;
-}
-
-bool rpng_is_valid(rpng_t *rpng)
-{
-   if (!rpng)
-      return false;
-
-   if (rpng->has_ihdr)
-      return true;
-   if (rpng->has_idat)
-      return true;
-   if (rpng->has_iend)
-      return true;
-   return false;
-}
-
-bool rpng_set_buf_ptr(rpng_t *rpng, void *data)
-{
-   if (!rpng)
-      return false;
-
-   rpng->buff_data = (uint8_t*)data;
-
-   return true;
-}
-
-rpng_t *rpng_alloc(void)
-{
-   rpng_t *rpng = (rpng_t*)calloc(1, sizeof(rpng_t));
-   if (!rpng)
-      return NULL;
-   return rpng;
-}
diff --git a/libretro-common/formats/png/rpng_encode.c b/libretro-common/formats/png/rpng_encode.c
deleted file mode 100644
index fe46e03..0000000
--- a/libretro-common/formats/png/rpng_encode.c
+++ /dev/null
@@ -1,388 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rpng_encode.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <encodings/crc32.h>
-#include <streams/file_stream.h>
-#include <streams/trans_stream.h>
-
-#include "rpng_internal.h"
-
-#undef GOTO_END_ERROR
-#define GOTO_END_ERROR() do { \
-   fprintf(stderr, "[RPNG]: Error in line %d.\n", __LINE__); \
-   ret = false; \
-   goto end; \
-} while(0)
-
-static void dword_write_be(uint8_t *buf, uint32_t val)
-{
-   *buf++ = (uint8_t)(val >> 24);
-   *buf++ = (uint8_t)(val >> 16);
-   *buf++ = (uint8_t)(val >>  8);
-   *buf++ = (uint8_t)(val >>  0);
-}
-
-static bool png_write_crc(RFILE *file, const uint8_t *data, size_t size)
-{
-   uint8_t crc_raw[4] = {0};
-   uint32_t crc       = encoding_crc32(0, data, size);
-
-   dword_write_be(crc_raw, crc);
-   return filestream_write(file, crc_raw, sizeof(crc_raw)) == sizeof(crc_raw);
-}
-
-static bool png_write_ihdr(RFILE *file, const struct png_ihdr *ihdr)
-{
-   uint8_t ihdr_raw[21];
-   
-   ihdr_raw[0]  = '0';                 /* Size */
-   ihdr_raw[1]  = '0';
-   ihdr_raw[2]  = '0';
-   ihdr_raw[3]  = '0';
-   ihdr_raw[4]  = 'I';
-   ihdr_raw[5]  = 'H';
-   ihdr_raw[6]  = 'D';
-   ihdr_raw[7]  = 'R';
-   ihdr_raw[8]  =   0;                 /* Width */
-   ihdr_raw[9]  =   0;
-   ihdr_raw[10] =   0;
-   ihdr_raw[11] =   0;
-   ihdr_raw[12] =   0;                 /* Height */
-   ihdr_raw[13] =   0;
-   ihdr_raw[14] =   0;
-   ihdr_raw[15] =   0;
-   ihdr_raw[16] =   ihdr->depth;       /* Depth */
-   ihdr_raw[17] =   ihdr->color_type;
-   ihdr_raw[18] =   ihdr->compression;
-   ihdr_raw[19] =   ihdr->filter;
-   ihdr_raw[20] =   ihdr->interlace;
-
-   dword_write_be(ihdr_raw +  0, sizeof(ihdr_raw) - 8);
-   dword_write_be(ihdr_raw +  8, ihdr->width);
-   dword_write_be(ihdr_raw + 12, ihdr->height);
-   if (filestream_write(file, ihdr_raw, sizeof(ihdr_raw)) != sizeof(ihdr_raw))
-      return false;
-
-   if (!png_write_crc(file, ihdr_raw + sizeof(uint32_t),
-            sizeof(ihdr_raw) - sizeof(uint32_t)))
-      return false;
-
-   return true;
-}
-
-static bool png_write_idat(RFILE *file, const uint8_t *data, size_t size)
-{
-   if (filestream_write(file, data, size) != (ssize_t)size)
-      return false;
-
-   if (!png_write_crc(file, data + sizeof(uint32_t), size - sizeof(uint32_t)))
-      return false;
-
-   return true;
-}
-
-static bool png_write_iend(RFILE *file)
-{
-   const uint8_t data[] = {
-      0, 0, 0, 0,
-      'I', 'E', 'N', 'D',
-   };
-
-   if (filestream_write(file, data, sizeof(data)) != sizeof(data))
-      return false;
-
-   if (!png_write_crc(file, data + sizeof(uint32_t),
-            sizeof(data) - sizeof(uint32_t)))
-      return false;
-
-   return true;
-}
-
-static void copy_argb_line(uint8_t *dst, const uint32_t *src, unsigned width)
-{
-   unsigned i;
-   for (i = 0; i < width; i++)
-   {
-      uint32_t col = src[i];
-      *dst++ = (uint8_t)(col >> 16);
-      *dst++ = (uint8_t)(col >>  8);
-      *dst++ = (uint8_t)(col >>  0);
-      *dst++ = (uint8_t)(col >> 24);
-   }
-}
-
-static void copy_bgr24_line(uint8_t *dst, const uint8_t *src, unsigned width)
-{
-   unsigned i;
-   for (i = 0; i < width; i++, dst += 3, src += 3)
-   {
-      dst[2] = src[0];
-      dst[1] = src[1];
-      dst[0] = src[2];
-   }
-}
-
-static unsigned count_sad(const uint8_t *data, size_t size)
-{
-   size_t i;
-   unsigned cnt = 0;
-   for (i = 0; i < size; i++)
-      cnt += abs((int8_t)data[i]);
-   return cnt;
-}
-
-static unsigned filter_up(uint8_t *target, const uint8_t *line,
-      const uint8_t *prev, unsigned width, unsigned bpp)
-{
-   unsigned i;
-   width *= bpp;
-   for (i = 0; i < width; i++)
-      target[i] = line[i] - prev[i];
-
-   return count_sad(target, width);
-}
-
-static unsigned filter_sub(uint8_t *target, const uint8_t *line,
-      unsigned width, unsigned bpp)
-{
-   unsigned i;
-   width *= bpp;
-   for (i = 0; i < bpp; i++)
-      target[i] = line[i];
-   for (i = bpp; i < width; i++)
-      target[i] = line[i] - line[i - bpp];
-
-   return count_sad(target, width);
-}
-
-static unsigned filter_avg(uint8_t *target, const uint8_t *line,
-      const uint8_t *prev, unsigned width, unsigned bpp)
-{
-   unsigned i;
-   width *= bpp;
-   for (i = 0; i < bpp; i++)
-      target[i] = line[i] - (prev[i] >> 1);
-   for (i = bpp; i < width; i++)
-      target[i] = line[i] - ((line[i - bpp] + prev[i]) >> 1);
-
-   return count_sad(target, width);
-}
-
-static unsigned filter_paeth(uint8_t *target,
-      const uint8_t *line, const uint8_t *prev,
-      unsigned width, unsigned bpp)
-{
-   unsigned i;
-   width *= bpp;
-   for (i = 0; i < bpp; i++)
-      target[i] = line[i] - paeth(0, prev[i], 0);
-   for (i = bpp; i < width; i++)
-      target[i] = line[i] - paeth(line[i - bpp], prev[i], prev[i - bpp]);
-
-   return count_sad(target, width);
-}
-
-static bool rpng_save_image(const char *path,
-      const uint8_t *data,
-      unsigned width, unsigned height, unsigned pitch, unsigned bpp)
-{
-   unsigned h;
-   bool ret = true;
-   struct png_ihdr ihdr = {0};
-
-   const struct trans_stream_backend *stream_backend = NULL;
-   size_t encode_buf_size  = 0;
-   uint8_t *encode_buf     = NULL;
-   uint8_t *deflate_buf    = NULL;
-   uint8_t *rgba_line      = NULL;
-   uint8_t *up_filtered    = NULL;
-   uint8_t *sub_filtered   = NULL;
-   uint8_t *avg_filtered   = NULL;
-   uint8_t *paeth_filtered = NULL;
-   uint8_t *prev_encoded   = NULL;
-   uint8_t *encode_target  = NULL;
-   void *stream            = NULL;
-   uint32_t total_in       = 0;
-   uint32_t total_out      = 0;
-   RFILE *file             = filestream_open(path, RFILE_MODE_WRITE, -1);
-   if (!file)
-      GOTO_END_ERROR();
-
-   stream_backend = trans_stream_get_zlib_deflate_backend();
-
-   if (filestream_write(file, png_magic, sizeof(png_magic)) != sizeof(png_magic))
-      GOTO_END_ERROR();
-
-   ihdr.width = width;
-   ihdr.height = height;
-   ihdr.depth = 8;
-   ihdr.color_type = bpp == sizeof(uint32_t) ? 6 : 2; /* RGBA or RGB */
-   if (!png_write_ihdr(file, &ihdr))
-      GOTO_END_ERROR();
-
-   encode_buf_size = (width * bpp + 1) * height;
-   encode_buf = (uint8_t*)malloc(encode_buf_size);
-   if (!encode_buf)
-      GOTO_END_ERROR();
-
-   prev_encoded = (uint8_t*)calloc(1, width * bpp);
-   if (!prev_encoded)
-      GOTO_END_ERROR();
-
-   rgba_line      = (uint8_t*)malloc(width * bpp);
-   up_filtered    = (uint8_t*)malloc(width * bpp);
-   sub_filtered   = (uint8_t*)malloc(width * bpp);
-   avg_filtered   = (uint8_t*)malloc(width * bpp);
-   paeth_filtered = (uint8_t*)malloc(width * bpp);
-   if (!rgba_line || !up_filtered || !sub_filtered || !avg_filtered || !paeth_filtered)
-      GOTO_END_ERROR();
-
-   encode_target = encode_buf;
-   for (h = 0; h < height;
-         h++, encode_target += width * bpp, data += pitch)
-   {
-      if (bpp == sizeof(uint32_t))
-         copy_argb_line(rgba_line, (const uint32_t*)data, width);
-      else
-         copy_bgr24_line(rgba_line, data, width);
-
-      /* Try every filtering method, and choose the method
-       * which has most entries as zero.
-       *
-       * This is probably not very optimal, but it's very 
-       * simple to implement.
-       */
-      {
-         unsigned none_score  = count_sad(rgba_line, width * bpp);
-         unsigned up_score    = filter_up(up_filtered, rgba_line, prev_encoded, width, bpp);
-         unsigned sub_score   = filter_sub(sub_filtered, rgba_line, width, bpp);
-         unsigned avg_score   = filter_avg(avg_filtered, rgba_line, prev_encoded, width, bpp);
-         unsigned paeth_score = filter_paeth(paeth_filtered, rgba_line, prev_encoded, width, bpp);
-
-         uint8_t filter       = 0;
-         unsigned min_sad     = none_score;
-         const uint8_t *chosen_filtered = rgba_line;
-
-         if (sub_score < min_sad)
-         {
-            filter = 1;
-            chosen_filtered = sub_filtered;
-            min_sad = sub_score;
-         }
-
-         if (up_score < min_sad)
-         {
-            filter = 2;
-            chosen_filtered = up_filtered;
-            min_sad = up_score;
-         }
-
-         if (avg_score < min_sad)
-         {
-            filter = 3;
-            chosen_filtered = avg_filtered;
-            min_sad = avg_score;
-         }
-
-         if (paeth_score < min_sad)
-         {
-            filter = 4;
-            chosen_filtered = paeth_filtered;
-         }
-
-         *encode_target++ = filter;
-         memcpy(encode_target, chosen_filtered, width * bpp);
-
-         memcpy(prev_encoded, rgba_line, width * bpp);
-      }
-   }
-
-   deflate_buf = (uint8_t*)malloc(encode_buf_size * 2); /* Just to be sure. */
-   if (!deflate_buf)
-      GOTO_END_ERROR();
-
-   stream = stream_backend->stream_new();
-
-   if (!stream)
-      GOTO_END_ERROR();
-
-   stream_backend->set_in(
-         stream,
-         encode_buf,
-         (unsigned)encode_buf_size);
-   stream_backend->set_out(
-         stream,
-         deflate_buf + 8,
-         (unsigned)(encode_buf_size * 2));
-
-   if (!stream_backend->trans(stream, true, &total_in, &total_out, NULL))
-   {
-      GOTO_END_ERROR();
-   }
-
-   memcpy(deflate_buf + 4, "IDAT", 4);
-   dword_write_be(deflate_buf + 0,        ((uint32_t)total_out));
-   if (!png_write_idat(file, deflate_buf, ((size_t)total_out + 8)))
-      GOTO_END_ERROR();
-
-   if (!png_write_iend(file))
-      GOTO_END_ERROR();
-
-end:
-   filestream_close(file);
-   free(encode_buf);
-   free(deflate_buf);
-   free(rgba_line);
-   free(prev_encoded);
-   free(up_filtered);
-   free(sub_filtered);
-   free(avg_filtered);
-   free(paeth_filtered);
-
-   if (stream_backend)
-   {
-      if (stream)
-      {
-         if (stream_backend->stream_free)
-            stream_backend->stream_free(stream);
-      }
-   }
-   return ret;
-}
-
-bool rpng_save_image_argb(const char *path, const uint32_t *data,
-      unsigned width, unsigned height, unsigned pitch)
-{
-   return rpng_save_image(path, (const uint8_t*)data,
-         width, height, pitch, sizeof(uint32_t));
-}
-
-bool rpng_save_image_bgr24(const char *path, const uint8_t *data,
-      unsigned width, unsigned height, unsigned pitch)
-{
-   return rpng_save_image(path, (const uint8_t*)data,
-         width, height, pitch, 3);
-}
diff --git a/libretro-common/formats/png/rpng_internal.h b/libretro-common/formats/png/rpng_internal.h
deleted file mode 100644
index 440bd3d..0000000
--- a/libretro-common/formats/png/rpng_internal.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rpng_internal.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _RPNG_COMMON_H
-#define _RPNG_COMMON_H
-
-#include <stdint.h>
-#include <filters.h>
-#include <formats/rpng.h>
-
-#undef GOTO_END_ERROR
-#define GOTO_END_ERROR() do { \
-   fprintf(stderr, "[RPNG]: Error in line %d.\n", __LINE__); \
-   ret = false; \
-   goto end; \
-} while(0)
-
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-#endif
-
-static const uint8_t png_magic[8] = {
-   0x89, 'P', 'N', 'G', 0x0d, 0x0a, 0x1a, 0x0a,
-};
-
-struct png_ihdr
-{
-   uint32_t width;
-   uint32_t height;
-   uint8_t depth;
-   uint8_t color_type;
-   uint8_t compression;
-   uint8_t filter;
-   uint8_t interlace;
-};
-
-#endif
diff --git a/libretro-common/formats/tga/rtga.c b/libretro-common/formats/tga/rtga.c
deleted file mode 100644
index 87ed719..0000000
--- a/libretro-common/formats/tga/rtga.c
+++ /dev/null
@@ -1,447 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rtga.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* Modified version of stb_image's TGA sources. */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h> /* ptrdiff_t on osx */
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_assert.h>
-#include <retro_inline.h>
-
-#include <formats/image.h>
-#include <formats/rtga.h>
-
-#define RTGA_COMPUTE_Y(r, g, b) ((uint8_t)((((r) * 77) + ((g) * 150) +  (29 * (b))) >> 8))
-
-
-struct rtga
-{
-   uint8_t *buff_data;
-   uint32_t *output_image;
-};
-
-typedef struct
-{
-   uint32_t img_x, img_y;
-   int img_n, img_out_n;
-
-   int buflen;
-   uint8_t buffer_start[128];
-
-   uint8_t *img_buffer;
-   uint8_t *img_buffer_end;
-   uint8_t *img_buffer_original;
-} rtga__context;
-
-static INLINE uint8_t rtga__get8(rtga__context *s)
-{
-   if (s->img_buffer < s->img_buffer_end)
-      return *s->img_buffer++;
-   return 0;
-}
-
-static void rtga__skip(rtga__context *s, int n)
-{
-   if (n < 0)
-   {
-      s->img_buffer = s->img_buffer_end;
-      return;
-   }
-   s->img_buffer += n;
-}
-
-static int rtga__getn(rtga__context *s, uint8_t *buffer, int n)
-{
-   if (s->img_buffer+n <= s->img_buffer_end)
-   {
-      memcpy(buffer, s->img_buffer, n);
-      s->img_buffer += n;
-      return 1;
-   }
-
-   return 0;
-}
-
-static int rtga__get16le(rtga__context *s)
-{
-   int z = rtga__get8(s);
-   return z + (rtga__get8(s) << 8);
-}
-
-static unsigned char *rtga__convert_format(
-      unsigned char *data,
-      int img_n,
-      int req_comp,
-      unsigned int x,
-      unsigned int y)
-{
-   int i,j;
-   unsigned char *good = (unsigned char *) malloc(req_comp * x * y);
-
-   if (!good)
-   {
-      free(data);
-      return NULL;
-   }
-
-   for (j=0; j < (int) y; ++j)
-   {
-      unsigned char *src  = data + j * x * img_n   ;
-      unsigned char *dest = good + j * x * req_comp;
-
-      switch (((img_n)*8+(req_comp)))
-      {
-         case ((1)*8+(2)):
-            for(i=x-1; i >= 0; --i, src += 1, dest += 2)
-               dest[0]=src[0], dest[1]=255;
-            break;
-         case ((1)*8+(3)):
-            for(i=x-1; i >= 0; --i, src += 1, dest += 3)
-               dest[0]=dest[1]=dest[2]=src[0];
-            break;
-         case ((1)*8+(4)):
-            for(i=x-1; i >= 0; --i, src += 1, dest += 4)
-               dest[0]=dest[1]=dest[2]=src[0], dest[3]=255;
-            break;
-         case ((2)*8+(1)):
-            for(i=x-1; i >= 0; --i, src += 2, dest += 1)
-               dest[0]=src[0];
-            break;
-         case ((2)*8+(3)):
-            for(i=x-1; i >= 0; --i, src += 2, dest += 3)
-               dest[0]=dest[1]=dest[2]=src[0];
-            break;
-         case ((2)*8+(4)):
-            for(i=x-1; i >= 0; --i, src += 2, dest += 4)
-               dest[0]=dest[1]=dest[2]=src[0], dest[3]=src[1];
-            break;
-         case ((3)*8+(4)):
-            for(i=x-1; i >= 0; --i, src += 3, dest += 4)
-               dest[0]=src[0],dest[1]=src[1],dest[2]=src[2],dest[3]=255;
-            break;
-         case ((3)*8+(1)):
-            for(i=x-1; i >= 0; --i, src += 3, dest += 1)
-               dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]);
-            break;
-         case ((3)*8+(2)):
-            for(i=x-1; i >= 0; --i, src += 3, dest += 2)
-               dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]), dest[1] = 255;
-            break;
-         case ((4)*8+(1)):
-            for(i=x-1; i >= 0; --i, src += 4, dest += 1)
-               dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]);
-            break;
-         case ((4)*8+(2)):
-            for(i=x-1; i >= 0; --i, src += 4, dest += 2)
-               dest[0] = RTGA_COMPUTE_Y(src[0],src[1],src[2]), dest[1] = src[3];
-            break;
-         case ((4)*8+(3)):
-            for(i=x-1; i >= 0; --i, src += 4, dest += 3)
-               dest[0]=src[0],dest[1]=src[1],dest[2]=src[2];
-            break;
-         default: 
-            retro_assert(0);
-            break;
-      }
-   }
-
-   free(data);
-   return good;
-}
-
-static uint8_t *rtga__tga_load(rtga__context *s,
-      unsigned *x, unsigned *y, int *comp, int req_comp)
-{
-   /* Read in the TGA header stuff */
-   int tga_offset          = rtga__get8(s);
-   int tga_indexed         = rtga__get8(s);
-   int tga_image_type      = rtga__get8(s);
-   int tga_is_RLE          = 0;
-   int tga_palette_start   = rtga__get16le(s);
-   int tga_palette_len     = rtga__get16le(s);
-   int tga_palette_bits    = rtga__get8(s);
-   int tga_x_origin        = rtga__get16le(s);
-   int tga_y_origin        = rtga__get16le(s);
-   int tga_width           = rtga__get16le(s);
-   int tga_height          = rtga__get16le(s);
-   int tga_bits_per_pixel  = rtga__get8(s);
-   int tga_comp            = tga_bits_per_pixel / 8;
-   int tga_inverted        = rtga__get8(s);
-
-   /*   image data */
-   unsigned char *tga_data = NULL;
-    
-   (void)tga_palette_start;
-   (void)tga_x_origin;
-   (void)tga_y_origin;
-
-   /*   do a tiny bit of precessing */
-   if ( tga_image_type >= 8 )
-   {
-      tga_image_type -= 8;
-      tga_is_RLE = 1;
-   }
-
-   /* int tga_alpha_bits = tga_inverted & 15; */
-   tga_inverted = 1 - ((tga_inverted >> 5) & 1);
-
-   /*   error check */
-   if (
-         (tga_width < 1) || (tga_height < 1) ||
-         (tga_image_type < 1) || (tga_image_type > 3) ||
-         (
-          (tga_bits_per_pixel != 8)  && (tga_bits_per_pixel != 16) &&
-          (tga_bits_per_pixel != 24) && (tga_bits_per_pixel != 32)
-         )
-      )
-      return NULL; /* we don't report this as a bad TGA because we don't even know if it's TGA */
-
-   /*   If paletted, then we will use the number of bits from the palette */
-   if ( tga_indexed )
-      tga_comp = tga_palette_bits / 8;
-
-   /*   TGA info */
-   *x = tga_width;
-   *y = tga_height;
-   if (comp) *comp = tga_comp;
-
-   tga_data = (unsigned char*)malloc( (size_t)tga_width * tga_height * tga_comp );
-   if (!tga_data)
-      return NULL;
-
-   /* skip to the data's starting position (offset usually = 0) */
-   rtga__skip(s, tga_offset );
-
-   if ( !tga_indexed && !tga_is_RLE)
-   {
-      int i;
-      for (i=0; i < tga_height; ++i)
-      {
-         int y = tga_inverted ? tga_height -i - 1 : i;
-         uint8_t *tga_row = tga_data + y*tga_width*tga_comp;
-         rtga__getn(s, tga_row, tga_width * tga_comp);
-      }
-   }
-   else 
-   {
-      int i, j;
-      int RLE_repeating          = 0;
-      int RLE_count              = 0;
-      int read_next_pixel        = 1;
-      unsigned char raw_data[4]  = {0};
-      unsigned char *tga_palette = NULL;
-
-      /*   Do I need to load a palette? */
-      if ( tga_indexed)
-      {
-         /*   any data to skip? (offset usually = 0) */
-         rtga__skip(s, tga_palette_start );
-         /*   load the palette */
-         tga_palette = (unsigned char*)malloc( tga_palette_len * tga_palette_bits / 8 );
-
-         if (!tga_palette)
-         {
-            free(tga_data);
-            return NULL;
-         }
-
-         if (!rtga__getn(s, tga_palette, tga_palette_len * tga_palette_bits / 8 ))
-         {
-            free(tga_data);
-            free(tga_palette);
-            return NULL;
-         }
-      }
-
-      /*   load the data */
-      for (i=0; i < tga_width * tga_height; ++i)
-      {
-         /*   if I'm in RLE mode, do I need to get a RLE rtga__pngchunk? */
-         if ( tga_is_RLE )
-         {
-            if ( RLE_count == 0 )
-            {
-               /*   yep, get the next byte as a RLE command */
-               int RLE_cmd     = rtga__get8(s);
-               RLE_count       = 1 + (RLE_cmd & 127);
-               RLE_repeating   = RLE_cmd >> 7;
-               read_next_pixel = 1;
-            }
-            else if ( !RLE_repeating )
-               read_next_pixel = 1;
-         }
-         else
-            read_next_pixel = 1;
-
-         /*   OK, if I need to read a pixel, do it now */
-         if ( read_next_pixel )
-         {
-            /*   load however much data we did have */
-            if ( tga_indexed )
-            {
-               /*   read in 1 byte, then perform the lookup */
-               int pal_idx = rtga__get8(s);
-               if ( pal_idx >= tga_palette_len ) /* invalid index */
-                  pal_idx = 0;
-               pal_idx *= tga_bits_per_pixel / 8;
-               for (j = 0; j*8 < tga_bits_per_pixel; ++j)
-                  raw_data[j] = tga_palette[pal_idx+j];
-            }
-            else
-            {
-               /* read in the data raw */
-               for (j = 0; j*8 < tga_bits_per_pixel; ++j)
-                  raw_data[j] = rtga__get8(s);
-            }
-
-            /*   clear the reading flag for the next pixel */
-            read_next_pixel = 0;
-         } /* end of reading a pixel */
-
-         /* copy data */
-         for (j = 0; j < tga_comp; ++j)
-            tga_data[i*tga_comp+j] = raw_data[j];
-
-         /*   in case we're in RLE mode, keep counting down */
-         --RLE_count;
-      }
-
-      /*   do I need to invert the image? */
-      if ( tga_inverted )
-      {
-         for (j = 0; j*2 < tga_height; ++j)
-         {
-            int index1 = j * tga_width * tga_comp;
-            int index2 = (tga_height - 1 - j) * tga_width * tga_comp;
-
-            for (i = tga_width * tga_comp; i > 0; --i)
-            {
-               unsigned char temp = tga_data[index1];
-               tga_data[index1] = tga_data[index2];
-               tga_data[index2] = temp;
-               ++index1;
-               ++index2;
-            }
-         }
-      }
-
-      /* Clear my palette, if I had one */
-      if ( tga_palette != NULL )
-         free( tga_palette );
-   }
-
-   /* swap RGB */
-   if (tga_comp >= 3)
-   {
-      int i;
-      unsigned char* tga_pixel = tga_data;
-
-      for (i = 0; i < tga_width * tga_height; ++i)
-      {
-         unsigned char temp  = tga_pixel[0];
-         tga_pixel[0]        = tga_pixel[2];
-         tga_pixel[2]        = temp;
-         tga_pixel          += tga_comp;
-      }
-   }
-
-   /* convert to target component count */
-   if (     (req_comp)
-         && (req_comp >= 1 && req_comp <= 4)
-         && (req_comp != tga_comp))
-   {
-      tga_data = rtga__convert_format(tga_data, tga_comp, req_comp, tga_width, tga_height);
-   }
-
-   return tga_data;
-}
-
-static uint8_t *rtga_load_from_memory(uint8_t const *buffer, int len,
-      unsigned *x, unsigned *y, int *comp, int req_comp)
-{
-   rtga__context s;
-
-   s.img_buffer          = (uint8_t *)buffer;
-   s.img_buffer_original = (uint8_t *) buffer;
-   s.img_buffer_end      = (uint8_t *) buffer+len;
-
-   return rtga__tga_load(&s,x,y,comp,req_comp);
-}
-
-int rtga_process_image(rtga_t *rtga, void **buf_data,
-      size_t size, unsigned *width, unsigned *height)
-{
-   int comp;
-   unsigned size_tex     = 0;
-
-   if (!rtga)
-      return IMAGE_PROCESS_ERROR;
-
-   rtga->output_image   = (uint32_t*)rtga_load_from_memory(rtga->buff_data,
-                           (int)size, width, height, &comp, 4);
-   *buf_data             = rtga->output_image;
-   size_tex              = (*width) * (*height);
-
-   /* Convert RGBA to ARGB */
-   while(size_tex--)
-   {
-      unsigned int texel = rtga->output_image[size_tex];
-      unsigned int A     = texel & 0xFF000000;
-      unsigned int B     = texel & 0x00FF0000;
-      unsigned int G     = texel & 0x0000FF00;
-      unsigned int R     = texel & 0x000000FF;
-      ((unsigned int*)rtga->output_image)[size_tex] = A | (R << 16) | G | (B >> 16);
-   };
-
-   return IMAGE_PROCESS_END;
-}
-
-bool rtga_set_buf_ptr(rtga_t *rtga, void *data)
-{
-   if (!rtga)
-      return false;
-
-   rtga->buff_data = (uint8_t*)data;
-
-   return true;
-}
-
-void rtga_free(rtga_t *rtga)
-{
-   if (!rtga)
-      return;
-
-   free(rtga);
-}
-
-rtga_t *rtga_alloc(void)
-{
-   rtga_t *rtga = (rtga_t*)calloc(1, sizeof(*rtga));
-   if (!rtga)
-      return NULL;
-   return rtga;
-}
diff --git a/libretro-common/formats/wav/rwav.c b/libretro-common/formats/wav/rwav.c
deleted file mode 100644
index f2d082b..0000000
--- a/libretro-common/formats/wav/rwav.c
+++ /dev/null
@@ -1,186 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rwav.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h> /* ptrdiff_t on osx */
-#include <stdlib.h>
-#include <string.h>
-
-#include <formats/rwav.h>
-
-enum
-{
-   ITER_BEGIN,
-   ITER_COPY_SAMPLES,
-   ITER_COPY_SAMPLES_8,
-   ITER_COPY_SAMPLES_16
-};
-
-struct rwav_iterator
-{
-   rwav_t *out;
-   const uint8_t *data;
-   size_t size;
-   size_t i, j;
-   int step;
-};
-
-void rwav_init(rwav_iterator_t* iter, rwav_t* out, const void* buf, size_t size)
-{
-   iter->out    = out;
-   iter->data   = (const uint8_t*)buf;
-   iter->size   = size;
-   iter->step   = ITER_BEGIN;
-   
-   out->samples = NULL;
-}
-
-enum rwav_state rwav_iterate(rwav_iterator_t *iter)
-{
-   size_t s;
-   uint16_t *u16       = NULL;
-   void *samples       = NULL;
-   rwav_t *rwav        = iter->out;
-   const uint8_t *data = iter->data;
-   
-   switch (iter->step)
-   {
-      case ITER_BEGIN:
-         if (iter->size < 44)
-            return RWAV_ITERATE_ERROR; /* buffer is smaller than an empty wave file */
-
-         if (data[0] != 'R' || data[1] != 'I' || data[2] != 'F' || data[3] != 'F')
-            return RWAV_ITERATE_ERROR;
-
-         if (data[8] != 'W' || data[9] != 'A' || data[10] != 'V' || data[11] != 'E')
-            return RWAV_ITERATE_ERROR;
-
-         if (data[12] != 'f' || data[13] != 'm' || data[14] != 't' || data[15] != ' ')
-            return RWAV_ITERATE_ERROR; /* we don't support non-PCM or compressed data */
-
-         if (data[16] != 16 || data[17] != 0 || data[18] != 0 || data[19] != 0)
-            return RWAV_ITERATE_ERROR;
-
-         if (data[20] != 1 || data[21] != 0)
-            return RWAV_ITERATE_ERROR; /* we don't support non-PCM or compressed data */
-
-         if (data[36] != 'd' || data[37] != 'a' || data[38] != 't' || data[39] != 'a')
-            return RWAV_ITERATE_ERROR;
-
-         rwav->bitspersample = data[34] | data[35] << 8;
-
-         if (rwav->bitspersample != 8 && rwav->bitspersample != 16)
-            return RWAV_ITERATE_ERROR; /* we only support 8 and 16 bps */
-
-         rwav->subchunk2size = data[40] | data[41] << 8 | data[42] << 16 | data[43] << 24;
-
-         if (rwav->subchunk2size > iter->size - 44)
-            return RWAV_ITERATE_ERROR; /* too few bytes in buffer */
-
-         samples = malloc(rwav->subchunk2size);
-
-         if (samples == NULL)
-            return RWAV_ITERATE_ERROR;
-
-         rwav->numchannels = data[22] | data[23] << 8;
-         rwav->numsamples  = rwav->subchunk2size * 8 / rwav->bitspersample / rwav->numchannels;
-         rwav->samplerate  = data[24] | data[25] << 8 | data[26] << 16 | data[27] << 24;
-         rwav->samples     = samples;
-
-         iter->step = ITER_COPY_SAMPLES;
-         return RWAV_ITERATE_MORE;
-
-      case ITER_COPY_SAMPLES:
-         iter->i = 0;
-
-         if (rwav->bitspersample == 8)
-         {
-            iter->step = ITER_COPY_SAMPLES_8;
-
-            /* TODO/FIXME - what is going on here? */
-            case ITER_COPY_SAMPLES_8:
-            s = rwav->subchunk2size - iter->i;
-
-            if (s > RWAV_ITERATE_BUF_SIZE)
-               s = RWAV_ITERATE_BUF_SIZE;
-
-            memcpy((void*)((uint8_t*)rwav->samples + iter->i), (void *)(iter->data + 44 + iter->i), s);
-            iter->i += s;
-         }
-         else
-         {
-            iter->step = ITER_COPY_SAMPLES_16;
-            iter->j    = 0;
-
-            /* TODO/FIXME - what is going on here? */
-            case ITER_COPY_SAMPLES_16:
-            s = rwav->subchunk2size - iter->i;
-
-            if (s > RWAV_ITERATE_BUF_SIZE)
-               s = RWAV_ITERATE_BUF_SIZE;
-
-            u16 = (uint16_t *)rwav->samples;
-
-            while (s != 0)
-            {
-               u16[iter->j++] = iter->data[44 + iter->i] | iter->data[45 + iter->i] << 8;
-               iter->i += 2;
-               s -= 2;
-            }
-         }
-
-         if (iter->i < rwav->subchunk2size)
-            return RWAV_ITERATE_MORE;
-         return RWAV_ITERATE_DONE;
-   }
-   
-   return RWAV_ITERATE_ERROR;
-}
-
-enum rwav_state rwav_load(rwav_t* out, const void* buf, size_t size)
-{
-   enum rwav_state res;
-   rwav_iterator_t iter;
-
-   iter.out             = NULL;
-   iter.data            = NULL;
-   iter.size            = 0;
-   iter.i               = 0;
-   iter.j               = 0;
-   iter.step            = 0;
-
-   rwav_init(&iter, out, buf, size);
-
-   do
-   {
-      res = rwav_iterate(&iter);
-   }while (res == RWAV_ITERATE_MORE);
-
-   return res;
-}
-
-void rwav_free(rwav_t *rwav)
-{
-   free((void*)rwav->samples);
-}
diff --git a/libretro-common/formats/xml/rxml.c b/libretro-common/formats/xml/rxml.c
deleted file mode 100644
index c53ed92..0000000
--- a/libretro-common/formats/xml/rxml.c
+++ /dev/null
@@ -1,493 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rxml.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <ctype.h>
-
-#include <boolean.h>
-#include <streams/file_stream.h>
-#include <compat/posix_string.h>
-#include <string/stdstring.h>
-
-#include <formats/rxml.h>
-
-struct rxml_document
-{
-   struct rxml_node *root_node;
-};
-
-struct rxml_node *rxml_root_node(rxml_document_t *doc)
-{
-   if (doc)
-      return doc->root_node;
-   return NULL;
-}
-
-static void rxml_free_node(struct rxml_node *node)
-{
-   struct rxml_node *head = NULL;
-   struct rxml_attrib_node *attrib_node_head = NULL;
-
-   if (!node)
-      return;
-
-   for (head = node->children; head; )
-   {
-      struct rxml_node *next_node = (struct rxml_node*)head->next;
-      rxml_free_node(head);
-      head = next_node;
-   }
-
-   for (attrib_node_head = node->attrib; attrib_node_head; )
-   {
-      struct rxml_attrib_node *next_attrib = NULL;
-
-      if (!attrib_node_head)
-         continue;
-      
-      next_attrib = (struct rxml_attrib_node*)attrib_node_head->next;
-
-      if (!next_attrib)
-         continue;
-
-      if (attrib_node_head->attrib)
-         free(attrib_node_head->attrib);
-      if (attrib_node_head->value)
-         free(attrib_node_head->value);
-      if (attrib_node_head)
-         free(attrib_node_head);
-
-      attrib_node_head = next_attrib;
-   }
-
-   if (node->name)
-      free(node->name);
-   if (node->data)
-      free(node->data);
-   if (node)
-      free(node);
-}
-
-static bool validate_header(const char **ptr)
-{
-   if (memcmp(*ptr, "<?xml", 5) == 0)
-   {
-      const char *eol = strstr(*ptr, "?>\n");
-      if (!eol)
-         return false;
-
-      /* Always use UTF-8. Don't really care to check. */
-      *ptr = eol + 3;
-      return true;
-   }
-   return true;
-}
-
-static bool range_is_space(const char *begin, const char *end)
-{
-   for (; begin < end; begin++)
-      if (!isspace(*begin))
-         return false;
-
-   return true;
-}
-
-static void skip_spaces(const char **ptr_)
-{
-   const char *ptr = *ptr_;
-   while (isspace(*ptr))
-      ptr++;
-
-   *ptr_ = ptr;
-}
-
-static char *strdup_range(const char *begin, const char *end)
-{
-   ptrdiff_t len = end - begin;
-   char *ret = (char*)malloc(len + 1);
-
-   if (!ret)
-      return NULL;
-
-   memcpy(ret, begin, len);
-   ret[len] = '\0';
-   return ret;
-}
-
-static char *strdup_range_escape(const char *begin, const char *end)
-{
-   /* Escaping is ignored. Assume we don't deal with that. */
-   return strdup_range(begin, end);
-}
-
-static struct rxml_attrib_node *rxml_parse_attrs(const char *str)
-{
-   char *copy = strdup(str);
-   if (!copy)
-      return NULL;
-
-   char *last_char = copy + strlen(copy) - 1;
-   if (*last_char == '/')
-      *last_char = '\0';
-
-   struct rxml_attrib_node *list = NULL;
-   struct rxml_attrib_node *tail = NULL;
-
-   char *attrib = NULL;
-   char *value = NULL;
-   char *save;
-   const char *elem = strtok_r(copy, " \n\t\f\v\r", &save);
-   while (elem)
-   {
-      const char *eq = strstr(elem, "=\"");
-      if (!eq)
-         goto end;
-
-      const char *end = strrchr(eq + 2, '\"');
-      if (!end || end != (elem + strlen(elem) - 1))
-         goto end;
-
-      attrib = strdup_range_escape(elem, eq);
-      value  = strdup_range_escape(eq + 2, end);
-      if (!attrib || !value)
-         goto end;
-
-      struct rxml_attrib_node *new_node = 
-         (struct rxml_attrib_node*)calloc(1, sizeof(*new_node));
-      if (!new_node)
-         goto end;
-
-      new_node->attrib = attrib;
-      new_node->value  = value;
-      attrib = NULL;
-      value = NULL;
-
-      if (tail)
-      {
-         tail->next = new_node;
-         tail = new_node;
-      }
-      else
-         list = tail = new_node;
-
-      elem = strtok_r(NULL, " \n\t\f\v\r", &save);
-   }
-
-end:
-   if (copy)
-      free(copy);
-   if (attrib)
-      free(attrib);
-   if (value)
-      free(value);
-   return list;
-}
-
-static char *find_first_space(const char *str)
-{
-   while (*str && !isspace(*str))
-      str++;
-
-   return isspace(*str) ? (char*)str : NULL;
-}
-
-static bool rxml_parse_tag(struct rxml_node *node, const char *str)
-{
-   const char *str_ptr = str;
-   skip_spaces(&str_ptr);
-
-   const char *name_end = find_first_space(str_ptr);
-   if (name_end)
-   {
-      node->name = strdup_range(str_ptr, name_end);
-      if (!node->name || !*node->name)
-         return false;
-
-      node->attrib = rxml_parse_attrs(name_end);
-      return true;
-   }
-   else
-   {
-      node->name = strdup(str_ptr);
-      return node->name && *node->name;
-   }
-}
-
-static struct rxml_node *rxml_parse_node(const char **ptr_)
-{
-   const char *ptr     = NULL;
-   const char *closing = NULL;
-   char *str           = NULL;
-   bool is_closing     = false;
-
-   struct rxml_node *node = (struct rxml_node*)calloc(1, sizeof(*node));
-   if (!node)
-      return NULL;
-
-   skip_spaces(ptr_);
-
-   ptr = *ptr_;
-   if (*ptr != '<')
-      goto error;
-
-   closing = strchr(ptr, '>');
-   if (!closing)
-      goto error;
-
-   str = strdup_range(ptr + 1, closing);
-   if (!str)
-      goto error;
-
-   if (!rxml_parse_tag(node, str))
-      goto error;
-
-   /* Are spaces between / and > allowed? */
-   is_closing = strstr(ptr, "/>") + 1 == closing;
-
-   /* Look for more data. Either child nodes or data. */
-   if (!is_closing)
-   {
-      size_t closing_tag_size = strlen(node->name) + 4;
-      char *closing_tag = (char*)malloc(closing_tag_size);
-
-      const char *cdata_start = NULL;
-      const char *child_start = NULL;
-      const char *closing_start = NULL;
-
-      if (!closing_tag)
-         goto error;
-
-      snprintf(closing_tag, closing_tag_size, "</%s>", node->name);
-
-      cdata_start   = strstr(closing + 1, "<![CDATA[");
-      child_start   = strchr(closing + 1, '<');
-      closing_start = strstr(closing + 1, closing_tag);
-
-      if (!closing_start)
-      {
-         free(closing_tag);
-         goto error;
-      }
-
-      if (cdata_start && range_is_space(closing + 1, cdata_start))
-      {
-         /* CDATA section */
-         const char *cdata_end = strstr(cdata_start, "]]>");
-         if (!cdata_end)
-         {
-            free(closing_tag);
-            goto error;
-         }
-
-         node->data = strdup_range(cdata_start + 
-               strlen("<![CDATA["), cdata_end);
-      }
-      else if (closing_start && closing_start == child_start) /* Simple Data */
-         node->data = strdup_range(closing + 1, closing_start);
-      else
-      {
-         /* Parse all child nodes. */
-         struct rxml_node *list = NULL;
-         struct rxml_node *tail = NULL;
-         const char *first_start = NULL;
-         const char *first_closing = NULL;
-
-         ptr           = child_start;
-         first_start   = strchr(ptr, '<');
-         first_closing = strstr(ptr, "</");
-          
-         while (
-                first_start &&
-                first_closing &&
-                (first_start < first_closing)
-                )
-         {
-            struct rxml_node *new_node = rxml_parse_node(&ptr);
-             
-            if (!new_node)
-            {
-               free(closing_tag);
-               goto error;
-            }
-
-            if (tail)
-            {
-               tail->next = new_node;
-               tail = new_node;
-            }
-            else
-               list = tail = new_node;
-
-            first_start   = strchr(ptr, '<');
-            first_closing = strstr(ptr, "</");
-         }
-
-         node->children = list;
-
-         closing_start = strstr(ptr, closing_tag);
-         if (!closing_start)
-         {
-            free(closing_tag);
-            goto error;
-         }
-      }
-
-      *ptr_ = closing_start + strlen(closing_tag);
-      free(closing_tag);
-   }
-   else
-      *ptr_ = closing + 1;
-
-   if (str)
-      free(str);
-   return node;
-
-error:
-   if (str)
-      free(str);
-   rxml_free_node(node);
-   return NULL;
-}
-
-static char *purge_xml_comments(const char *str)
-{
-   size_t len = strlen(str);
-   char *new_str = (char*)malloc(len + 1);
-   if (!new_str)
-      return NULL;
-
-   new_str[len] = '\0';
-
-   char *copy_dest       = new_str;
-   const char *copy_src  = str;
-   for (;;)
-   {
-      ptrdiff_t copy_len;
-      const char *comment_start = strstr(copy_src, "<!--");
-      const char *comment_end   = strstr(copy_src, "-->");
-
-      if (!comment_start || !comment_end)
-         break;
-
-      copy_len = comment_start - copy_src;
-      memcpy(copy_dest, copy_src, copy_len);
-
-      copy_dest += copy_len;
-      copy_src   = comment_end + strlen("-->");
-   }
-
-   /* Avoid strcpy() as OpenBSD is anal and hates you 
-    * for using it even when it's perfectly safe. */
-   len = strlen(copy_src);
-   memcpy(copy_dest, copy_src, len);
-   copy_dest[len] = '\0';
-
-   return new_str;
-}
-
-rxml_document_t *rxml_load_document(const char *path)
-{
-#ifndef RXML_TEST
-   RARCH_WARN("Using RXML as drop in for libxml2. Behavior might be very buggy.\n");
-#endif
-
-   char *memory_buffer     = NULL;
-   char *new_memory_buffer = NULL;
-   const char *mem_ptr     = NULL;
-   long len                = 0;
-   RFILE *file             = filestream_open(path, RFILE_MODE_READ, -1);
-   if (!file)
-      return NULL;
-
-   rxml_document_t *doc = (rxml_document_t*)calloc(1, sizeof(*doc));
-   if (!doc)
-      goto error;
-
-   filestream_seek(file, 0, SEEK_END);
-   len = filestream_tell(file);
-   filestream_rewind(file);
-
-   memory_buffer = (char*)malloc(len + 1);
-   if (!memory_buffer)
-      goto error;
-
-   memory_buffer[len] = '\0';
-   if (filestream_read(file, memory_buffer, len) != (size_t)len)
-      goto error;
-
-   filestream_close(file);
-   file = NULL;
-
-   mem_ptr = memory_buffer;
-
-   if (!validate_header(&mem_ptr))
-      goto error;
-
-   new_memory_buffer = purge_xml_comments(mem_ptr);
-   if (!new_memory_buffer)
-      goto error;
-
-   free(memory_buffer);
-   mem_ptr = memory_buffer = new_memory_buffer;
-
-   doc->root_node = rxml_parse_node(&mem_ptr);
-   if (!doc->root_node)
-      goto error;
-
-   free(memory_buffer);
-   return doc;
-
-error:
-   free(memory_buffer);
-   filestream_close(file);
-   rxml_free_document(doc);
-   return NULL;
-}
-
-void rxml_free_document(rxml_document_t *doc)
-{
-   if (!doc)
-      return;
-
-   if (doc->root_node)
-      rxml_free_node(doc->root_node);
-
-   free(doc);
-}
-
-char *rxml_node_attrib(struct rxml_node *node, const char *attrib)
-{
-   struct rxml_attrib_node *attribs = NULL;
-   for (attribs = node->attrib; attribs; attribs = attribs->next)
-   {
-      if (string_is_equal(attrib, attribs->attrib))
-         return attribs->value;
-   }
-
-   return NULL;
-}
-
diff --git a/libretro-common/formats/xml/test/Makefile b/libretro-common/formats/xml/test/Makefile
deleted file mode 100644
index 3e2e3db..0000000
--- a/libretro-common/formats/xml/test/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-TARGET := rxml
-
-LIBRETRO_XML_DIR  := ..
-LIBRETRO_COMM_DIR := ../../..
-
-SOURCES := \
-	rxml_test.c \
-	$(LIBRETRO_XML_DIR)/rxml.c \
-	$(LIBRETRO_COMM_DIR)/streams/file_stream.c
-
-OBJS := $(SOURCES:.c=.o)
-
-CFLAGS += -DRXML_TEST -Wall -pedantic -std=gnu99 -g -I$(LIBRETRO_COMM_DIR)/include
-
-all: $(TARGET)
-
-%.o: %.c
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-$(TARGET): $(OBJS)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-clean:
-	rm -f $(TARGET) $(OBJS)
-
-.PHONY: clean
-
diff --git a/libretro-common/formats/xml/test/rxml_test.c b/libretro-common/formats/xml/test/rxml_test.c
deleted file mode 100644
index 8fac40c..0000000
--- a/libretro-common/formats/xml/test/rxml_test.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rxml_test.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <formats/rxml.h>
-#include <stdio.h>
-
-static void print_siblings(struct rxml_node *node, unsigned level)
-{
-   fprintf(stderr, "\n%*sName: %s\n", level * 4, "", node->name);
-   if (node->data)
-      fprintf(stderr, "%*sData: %s\n", level * 4, "", node->data);
-
-   for (const struct rxml_attrib_node *attrib = 
-         node->attrib; attrib; attrib = attrib->next)
-      fprintf(stderr, "%*s  Attrib: %s = %s\n", level * 4, "",
-            attrib->attrib, attrib->value);
-
-   if (node->children)
-      print_siblings(node->children, level + 1);
-
-   if (node->next)
-      print_siblings(node->next, level);
-}
-
-static void rxml_log_document(const char *path)
-{
-   rxml_document_t *doc = rxml_load_document(path);
-   if (!doc)
-   {
-      fprintf(stderr, "rxml: Failed to load document: %s\n", path);
-      return;
-   }
-
-   print_siblings(rxml_root_node(doc), 0);
-   rxml_free_document(doc);
-}
-
-int main(int argc, char *argv[])
-{
-   if (argc != 2)
-   {
-      fprintf(stderr, "Usage: %s <path>\n", argv[0]);
-      return 1;
-   }
-
-   rxml_log_document(argv[1]);
-}
-
diff --git a/libretro-common/gfx/gl_capabilities.c b/libretro-common/gfx/gl_capabilities.c
deleted file mode 100644
index 570d164..0000000
--- a/libretro-common/gfx/gl_capabilities.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (gl_capabilities.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <math.h>
-#include <string.h>
-
-#include <boolean.h>
-
-#include <glsym/glsym.h>
-
-#include <gfx/gl_capabilities.h>
-
-static bool gl_core_context       = false;
-
-bool gl_query_core_context_in_use(void)
-{
-   return gl_core_context;
-}
-
-void gl_query_core_context_set(bool set)
-{
-   gl_core_context     =  set;
-}
-
-void gl_query_core_context_unset(void)
-{
-   gl_core_context = false;
-}
-
-bool gl_query_extension(const char *ext)
-{
-   bool ret = false;
-
-   if (gl_query_core_context_in_use())
-   {
-#ifdef GL_NUM_EXTENSIONS
-      GLint i;
-      GLint exts = 0;
-      glGetIntegerv(GL_NUM_EXTENSIONS, &exts);
-      for (i = 0; i < exts; i++)
-      {
-         const char *str = (const char*)glGetStringi(GL_EXTENSIONS, i);
-         if (str && strstr(str, ext))
-         {
-            ret = true;
-            break;
-         }
-      }
-#endif
-   }
-   else
-   {
-      const char *str = (const char*)glGetString(GL_EXTENSIONS);
-      ret = str && strstr(str, ext);
-   }
-
-   return ret;
-}
-
-bool gl_check_error(char **error_string)
-{
-   int error = glGetError();
-   switch (error)
-   {
-      case GL_INVALID_ENUM:
-         *error_string = strdup("GL: Invalid enum.");
-         break;
-      case GL_INVALID_VALUE:
-         *error_string = strdup("GL: Invalid value.");
-         break;
-      case GL_INVALID_OPERATION:
-         *error_string = strdup("GL: Invalid operation.");
-         break;
-      case GL_OUT_OF_MEMORY:
-         *error_string = strdup("GL: Out of memory.");
-         break;
-      case GL_NO_ERROR:
-         return true;
-      default:
-         *error_string = strdup("Non specified GL error.");
-         break;
-   }
-
-   return false;
-}
-
-bool gl_check_capability(enum gl_capability_enum enum_idx)
-{
-   unsigned major       = 0;
-   unsigned minor       = 0;
-   const char *vendor   = (const char*)glGetString(GL_VENDOR);
-   const char *renderer = (const char*)glGetString(GL_RENDERER);
-   const char *version  = (const char*)glGetString(GL_VERSION);
-#ifdef HAVE_OPENGLES
-   if (version && sscanf(version, "OpenGL ES %u.%u", &major, &minor) != 2)
-#else
-   if (version && sscanf(version, "%u.%u", &major, &minor) != 2)
-#endif
-      major = minor = 0;
-
-   (void)vendor;
-   (void)renderer;
-
-   switch (enum_idx)
-   {
-      case GL_CAPS_GLES3_SUPPORTED:
-#if defined(HAVE_OPENGLES)
-         if (major >= 3)
-            return true;
-#endif
-         break;
-      case GL_CAPS_EGLIMAGE:
-#if defined(HAVE_EGL) && defined(HAVE_OPENGLES)
-         if (glEGLImageTargetTexture2DOES != NULL)
-            return true;
-#endif
-         break;
-      case GL_CAPS_SYNC:
-#ifdef HAVE_OPENGLES
-         if (major >= 3)
-            return true;
-#else
-         if (gl_query_extension("ARB_sync") &&
-               glFenceSync && glDeleteSync && glClientWaitSync)
-            return true;
-#endif
-         break;
-      case GL_CAPS_MIPMAP:
-         {
-            static bool extension_queried = false;
-            static bool extension         = false;
-
-            if (!extension_queried)
-            {
-               extension         = gl_query_extension("ARB_framebuffer_object");
-               extension_queried = true;
-            }
-
-            if (extension)
-               return true;
-         }
-         break;
-      case GL_CAPS_VAO:
-#ifndef HAVE_OPENGLES
-         if (!gl_query_core_context_in_use() && !gl_query_extension("ARB_vertex_array_object"))
-            return false;
-
-         if (glGenVertexArrays && glBindVertexArray && glDeleteVertexArrays)
-            return true;
-#endif
-         break;
-      case GL_CAPS_FBO:
-#if defined(HAVE_PSGL) || defined(HAVE_OPENGLES2) || defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1) || defined(HAVE_OPENGLES_3_2)
-         return true;
-#elif defined(HAVE_FBO)
-         if (!gl_query_core_context_in_use() && !gl_query_extension("ARB_framebuffer_object")
-               && !gl_query_extension("EXT_framebuffer_object"))
-            return false;
-
-         if (glGenFramebuffers
-               && glBindFramebuffer
-               && glFramebufferTexture2D
-               && glCheckFramebufferStatus
-               && glDeleteFramebuffers
-               && glGenRenderbuffers
-               && glBindRenderbuffer
-               && glFramebufferRenderbuffer
-               && glRenderbufferStorage
-               && glDeleteRenderbuffers)
-            return true;
-         break;
-#else
-         break;
-#endif
-      case GL_CAPS_ARGB8:
-#ifdef HAVE_OPENGLES
-         if (gl_query_extension("OES_rgb8_rgba8")
-               || gl_query_extension("ARM_rgba8")
-                  || major >= 3)
-            return true;
-#else
-         /* TODO/FIXME - implement this for non-GLES? */
-#endif
-         break;
-      case GL_CAPS_DEBUG:
-         if (gl_query_extension("KHR_debug"))
-            return true;
-#ifndef HAVE_OPENGLES
-         if (gl_query_extension("ARB_debug_output"))
-            return true;
-#endif
-         break;
-      case GL_CAPS_PACKED_DEPTH_STENCIL:
-         if (major >= 3)
-            return true;
-         if (gl_query_extension("OES_packed_depth_stencil"))
-            return true;
-         if (gl_query_extension("EXT_packed_depth_stencil"))
-            return true;
-         break;
-      case GL_CAPS_ES2_COMPAT:
-#ifndef HAVE_OPENGLES
-         /* ATI card detected, skipping check for GL_RGB565 support... */
-         if (vendor && renderer && (strstr(vendor, "ATI") || strstr(renderer, "ATI")))
-            return false;
-
-         if (gl_query_extension("ARB_ES2_compatibility"))
-            return true;
-#endif
-         break;
-      case GL_CAPS_UNPACK_ROW_LENGTH:
-#ifdef HAVE_OPENGLES
-         if (major >= 3)
-            return true;
-
-         /* Extension GL_EXT_unpack_subimage, can copy textures faster
-          * than using UNPACK_ROW_LENGTH */
-         if (gl_query_extension("GL_EXT_unpack_subimage"))
-            return true;
-#endif
-         break;
-      case GL_CAPS_FULL_NPOT_SUPPORT:
-         if (major >= 3)
-            return true;
-#ifdef HAVE_OPENGLES
-         if (gl_query_extension("ARB_texture_non_power_of_two") ||
-               gl_query_extension("OES_texture_npot"))
-            return true;
-#else
-         {
-            GLint max_texture_size = 0;
-            GLint max_native_instr = 0;
-            /* try to detect actual npot support. might fail for older cards. */
-            bool  arb_npot         = gl_query_extension("ARB_texture_non_power_of_two");
-            bool  arb_frag_program = gl_query_extension("ARB_fragment_program");
-
-            glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
-
-#ifdef GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB
-            if (arb_frag_program && glGetProgramivARB)
-               glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB,
-                     GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, &max_native_instr);
-#endif
-
-            if (arb_npot && arb_frag_program &&
-                  (max_texture_size >= 8192) && (max_native_instr >= 4096))
-               return true;
-         }
-#endif
-         break;
-      case GL_CAPS_SRGB_FBO_ES3:
-#ifdef HAVE_OPENGLES
-         if (major >= 3)
-            return true;
-#else
-         break;
-#endif
-      case GL_CAPS_SRGB_FBO:
-#if defined(HAVE_OPENGLES)
-         if (major >= 3 || gl_query_extension("EXT_sRGB"))
-            return true;
-#elif defined(HAVE_FBO)
-         if (gl_query_core_context_in_use() ||
-               (gl_query_extension("EXT_texture_sRGB")
-                && gl_query_extension("ARB_framebuffer_sRGB")))
-            return true;
-#endif
-         break;
-      case GL_CAPS_FP_FBO:
-         /* GLES - No extensions for float FBO currently. */
-#ifndef HAVE_OPENGLES
-#ifdef HAVE_FBO
-         /* Float FBO is core in 3.2. */
-         if (gl_query_core_context_in_use() || gl_query_extension("ARB_texture_float"))
-            return true;
-#endif
-#endif
-         break;
-      case GL_CAPS_BGRA8888:
-#ifdef HAVE_OPENGLES
-         /* There are both APPLE and EXT variants. */
-         if (gl_query_extension("BGRA8888"))
-            return true;
-#else
-         return true;
-#endif
-         break;
-      case GL_CAPS_TEX_STORAGE:
-#ifdef HAVE_OPENGLES
-         if (major >= 3)
-            return true;
-#else
-         if (strstr(vendor, "ATI Technologies"))
-            return false;
-         if (gl_query_extension("ARB_texture_storage"))
-            return true;
-#endif
-         break;
-      case GL_CAPS_TEX_STORAGE_EXT:
-         if (gl_query_extension("EXT_texture_storage"))
-            return true;
-         break;
-      case GL_CAPS_NONE:
-      default:
-         break;
-   }
-
-   return false;
-}
diff --git a/libretro-common/gfx/scaler/pixconv.c b/libretro-common/gfx/scaler/pixconv.c
deleted file mode 100644
index 7097952..0000000
--- a/libretro-common/gfx/scaler/pixconv.c
+++ /dev/null
@@ -1,817 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (pixconv.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_inline.h>
-
-#include <gfx/scaler/pixconv.h>
-
-#ifdef SCALER_NO_SIMD
-#undef __SSE2__
-#endif
-
-#if defined(__SSE2__)
-#include <emmintrin.h>
-#endif
-
-void conv_rgb565_0rgb1555(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h;
-   const uint16_t *input = (const uint16_t*)input_;
-   uint16_t *output = (uint16_t*)output_;
-
-#if defined(__SSE2_)
-   int max_width           = width - 7;
-   const __m128i hi_mask   = _mm_set1_epi16(0x7fe0);
-   const __m128i lo_mask   = _mm_set1_epi16(0x1f);
-#endif
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 1, input += in_stride >> 1)
-   {
-      int w = 0;
-#if defined(__SSE2_)
-      for (; w < max_width; w += 8)
-      {
-         const __m128i in = _mm_loadu_si128((const __m128i*)(input + w));
-         __m128i hi = _mm_and_si128(_mm_slli_epi16(in, 1), hi_mask);
-         __m128i lo = _mm_and_si128(in, lo_mask);
-         _mm_storeu_si128((__m128i*)(output + w), _mm_or_si128(hi, lo));
-      }
-#endif
-
-      for (; w < width; w++)
-      {
-         uint16_t col = input[w];
-         uint16_t hi  = (col >> 1) & 0x7fe0;
-         uint16_t lo  = col & 0x1f;
-         output[w]    = hi | lo;
-      }
-   }
-}
-
-void conv_0rgb1555_rgb565(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h;
-   const uint16_t *input   = (const uint16_t*)input_;
-   uint16_t *output        = (uint16_t*)output_;
-
-#if defined(__SSE2__)
-   int max_width           = width - 7;
-
-   const __m128i hi_mask   = _mm_set1_epi16(
-         (int16_t)((0x1f << 11) | (0x1f << 6)));
-   const __m128i lo_mask   = _mm_set1_epi16(0x1f);
-   const __m128i glow_mask = _mm_set1_epi16(1 << 5);
-#endif
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 1, input += in_stride >> 1)
-   {
-      int w = 0;
-#if defined(__SSE2__)
-      for (; w < max_width; w += 8)
-      {
-         const __m128i in = _mm_loadu_si128((const __m128i*)(input + w));
-         __m128i rg   = _mm_and_si128(_mm_slli_epi16(in, 1), hi_mask);
-         __m128i b    = _mm_and_si128(in, lo_mask);
-         __m128i glow = _mm_and_si128(_mm_srli_epi16(in, 4), glow_mask);
-         _mm_storeu_si128((__m128i*)(output + w),
-               _mm_or_si128(rg, _mm_or_si128(b, glow)));
-      }
-#endif
-
-      for (; w < width; w++)
-      {
-         uint16_t col  = input[w];
-         uint16_t rg   = (col << 1) & ((0x1f << 11) | (0x1f << 6));
-         uint16_t b    = col & 0x1f;
-         uint16_t glow = (col >> 4) & (1 << 5);
-         output[w]     = rg | b | glow;
-      }
-   }
-}
-
-void conv_0rgb1555_argb8888(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h;
-   const uint16_t *input = (const uint16_t*)input_;
-   uint32_t *output      = (uint32_t*)output_;
-
-#ifdef __SSE2__
-   const __m128i pix_mask_r  = _mm_set1_epi16(0x1f << 10);
-   const __m128i pix_mask_gb = _mm_set1_epi16(0x1f <<  5);
-   const __m128i mul15_mid   = _mm_set1_epi16(0x4200);
-   const __m128i mul15_hi    = _mm_set1_epi16(0x0210);
-   const __m128i a           = _mm_set1_epi16(0x00ff);
-
-   int max_width = width - 7;
-#endif
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 2, input += in_stride >> 1)
-   {
-      int w = 0;
-#ifdef __SSE2__
-      for (; w < max_width; w += 8)
-      {
-         __m128i res_lo_bg, res_hi_bg;
-         __m128i res_lo_ra, res_hi_ra;
-         __m128i res_lo, res_hi;
-         const __m128i in = _mm_loadu_si128((const __m128i*)(input + w));
-         __m128i r = _mm_and_si128(in, pix_mask_r);
-         __m128i g = _mm_and_si128(in, pix_mask_gb);
-         __m128i b = _mm_and_si128(_mm_slli_epi16(in, 5), pix_mask_gb);
-
-         r = _mm_mulhi_epi16(r, mul15_hi);
-         g = _mm_mulhi_epi16(g, mul15_mid);
-         b = _mm_mulhi_epi16(b, mul15_mid);
-
-         res_lo_bg = _mm_unpacklo_epi8(b, g);
-         res_hi_bg = _mm_unpackhi_epi8(b, g);
-         res_lo_ra = _mm_unpacklo_epi8(r, a);
-         res_hi_ra = _mm_unpackhi_epi8(r, a);
-
-         res_lo = _mm_or_si128(res_lo_bg,
-               _mm_slli_si128(res_lo_ra, 2));
-         res_hi = _mm_or_si128(res_hi_bg,
-               _mm_slli_si128(res_hi_ra, 2));
-
-         _mm_storeu_si128((__m128i*)(output + w + 0), res_lo);
-         _mm_storeu_si128((__m128i*)(output + w + 4), res_hi);
-      }
-#endif
-
-      for (; w < width; w++)
-      {
-         uint32_t col = input[w];
-         uint32_t r   = (col >> 10) & 0x1f;
-         uint32_t g   = (col >>  5) & 0x1f;
-         uint32_t b   = (col >>  0) & 0x1f;
-         r            = (r << 3) | (r >> 2);
-         g            = (g << 3) | (g >> 2);
-         b            = (b << 3) | (b >> 2);
-
-         output[w]    = (0xffu << 24) | (r << 16) | (g << 8) | (b << 0);
-      }
-   }
-}
-
-void conv_rgb565_argb8888(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h;
-   const uint16_t *input    = (const uint16_t*)input_;
-   uint32_t *output         = (uint32_t*)output_;
-
-#if defined(__SSE2__)
-   const __m128i pix_mask_r = _mm_set1_epi16(0x1f << 10);
-   const __m128i pix_mask_g = _mm_set1_epi16(0x3f <<  5);
-   const __m128i pix_mask_b = _mm_set1_epi16(0x1f <<  5);
-   const __m128i mul16_r    = _mm_set1_epi16(0x0210);
-   const __m128i mul16_g    = _mm_set1_epi16(0x2080);
-   const __m128i mul16_b    = _mm_set1_epi16(0x4200);
-   const __m128i a          = _mm_set1_epi16(0x00ff);
-
-   int max_width            = width - 7;
-#endif
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 2, input += in_stride >> 1)
-   {
-      int w = 0;
-#if defined(__SSE2__)
-      for (; w < max_width; w += 8)
-      {
-         __m128i res_lo, res_hi;
-         __m128i res_lo_bg, res_hi_bg, res_lo_ra, res_hi_ra;
-         const __m128i in = _mm_loadu_si128((const __m128i*)(input + w));
-         __m128i        r = _mm_and_si128(_mm_srli_epi16(in, 1), pix_mask_r);
-         __m128i        g = _mm_and_si128(in, pix_mask_g);
-         __m128i        b = _mm_and_si128(_mm_slli_epi16(in, 5), pix_mask_b);
-
-         r                = _mm_mulhi_epi16(r, mul16_r);
-         g                = _mm_mulhi_epi16(g, mul16_g);
-         b                = _mm_mulhi_epi16(b, mul16_b);
-
-         res_lo_bg        = _mm_unpacklo_epi8(b, g);
-         res_hi_bg        = _mm_unpackhi_epi8(b, g);
-         res_lo_ra        = _mm_unpacklo_epi8(r, a);
-         res_hi_ra        = _mm_unpackhi_epi8(r, a);
-
-         res_lo           = _mm_or_si128(res_lo_bg,
-               _mm_slli_si128(res_lo_ra, 2));
-         res_hi           = _mm_or_si128(res_hi_bg,
-               _mm_slli_si128(res_hi_ra, 2));
-
-         _mm_storeu_si128((__m128i*)(output + w + 0), res_lo);
-         _mm_storeu_si128((__m128i*)(output + w + 4), res_hi);
-      }
-#endif
-
-      for (; w < width; w++)
-      {
-         uint32_t col = input[w];
-         uint32_t r   = (col >> 11) & 0x1f;
-         uint32_t g   = (col >>  5) & 0x3f;
-         uint32_t b   = (col >>  0) & 0x1f;
-         r            = (r << 3) | (r >> 2);
-         g            = (g << 2) | (g >> 4);
-         b            = (b << 3) | (b >> 2);
-
-         output[w]    = (0xffu << 24) | (r << 16) | (g << 8) | (b << 0);
-      }
-   }
-}
-
-void conv_argb8888_rgba4444(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h, w;
-   const uint32_t *input = (const uint32_t*)input_;
-   uint16_t *output      = (uint16_t*)output_;
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 2, input += in_stride >> 1)
-   {
-      for (w = 0; w < width; w++)
-      {
-         uint32_t col = input[w];
-         uint32_t r   = (col >> 16) & 0xf;
-         uint32_t g   = (col >>  8) & 0xf;
-         uint32_t b   = (col) & 0xf;
-         uint32_t a   = (col >>  24) & 0xf;
-         r            = (r >> 4) | r;
-         g            = (g >> 4) | g;
-         b            = (b >> 4) | b;
-         a            = (a >> 4) | a;
-
-         output[w]    = (r << 12) | (g << 8) | (b << 4) | a;
-      }
-   }
-}
-
-void conv_rgba4444_argb8888(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h, w;
-   const uint16_t *input = (const uint16_t*)input_;
-   uint32_t *output      = (uint32_t*)output_;
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 2, input += in_stride >> 1)
-   {
-      for (w = 0; w < width; w++)
-      {
-         uint32_t col = input[w];
-         uint32_t r   = (col >> 12) & 0xf;
-         uint32_t g   = (col >>  8) & 0xf;
-         uint32_t b   = (col >>  4) & 0xf;
-         uint32_t a   = (col >>  0) & 0xf;
-         r            = (r << 4) | r;
-         g            = (g << 4) | g;
-         b            = (b << 4) | b;
-         a            = (a << 4) | a;
-
-         output[w]    = (a << 24) | (r << 16) | (g << 8) | (b << 0);
-      }
-   }
-}
-
-void conv_rgba4444_rgb565(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h, w;
-   const uint16_t *input = (const uint16_t*)input_;
-   uint16_t *output      = (uint16_t*)output_;
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 1, input += in_stride >> 1)
-   {
-      for (w = 0; w < width; w++)
-      {
-         uint32_t col = input[w];
-         uint32_t r   = (col >> 12) & 0xf;
-         uint32_t g   = (col >>  8) & 0xf;
-         uint32_t b   = (col >>  4) & 0xf;
-
-         output[w]    = (r << 12) | (g << 7) | (b << 1);
-      }
-   }
-}
-
-#if defined(__SSE2__)
-/* :( TODO: Make this saner. */
-static INLINE void store_bgr24_sse2(void *output, __m128i a,
-      __m128i b, __m128i c, __m128i d)
-{
-   const __m128i mask_0 = _mm_set_epi32(0, 0, 0, 0x00ffffff);
-   const __m128i mask_1 = _mm_set_epi32(0, 0, 0x00ffffff, 0);
-   const __m128i mask_2 = _mm_set_epi32(0, 0x00ffffff, 0, 0);
-   const __m128i mask_3 = _mm_set_epi32(0x00ffffff, 0, 0, 0);
-
-   __m128i a0 = _mm_and_si128(a, mask_0);
-   __m128i a1 = _mm_srli_si128(_mm_and_si128(a, mask_1),  1);
-   __m128i a2 = _mm_srli_si128(_mm_and_si128(a, mask_2),  2);
-   __m128i a3 = _mm_srli_si128(_mm_and_si128(a, mask_3),  3);
-   __m128i a4 = _mm_slli_si128(_mm_and_si128(b, mask_0), 12);
-   __m128i a5 = _mm_slli_si128(_mm_and_si128(b, mask_1), 11);
-
-   __m128i b0 = _mm_srli_si128(_mm_and_si128(b, mask_1), 5);
-   __m128i b1 = _mm_srli_si128(_mm_and_si128(b, mask_2), 6);
-   __m128i b2 = _mm_srli_si128(_mm_and_si128(b, mask_3), 7);
-   __m128i b3 = _mm_slli_si128(_mm_and_si128(c, mask_0), 8);
-   __m128i b4 = _mm_slli_si128(_mm_and_si128(c, mask_1), 7);
-   __m128i b5 = _mm_slli_si128(_mm_and_si128(c, mask_2), 6);
-
-   __m128i c0 = _mm_srli_si128(_mm_and_si128(c, mask_2), 10);
-   __m128i c1 = _mm_srli_si128(_mm_and_si128(c, mask_3), 11);
-   __m128i c2 = _mm_slli_si128(_mm_and_si128(d, mask_0),  4);
-   __m128i c3 = _mm_slli_si128(_mm_and_si128(d, mask_1),  3);
-   __m128i c4 = _mm_slli_si128(_mm_and_si128(d, mask_2),  2);
-   __m128i c5 = _mm_slli_si128(_mm_and_si128(d, mask_3),  1);
-
-   __m128i *out = (__m128i*)output;
-
-   _mm_storeu_si128(out + 0,
-         _mm_or_si128(a0, _mm_or_si128(a1, _mm_or_si128(a2,
-                  _mm_or_si128(a3, _mm_or_si128(a4, a5))))));
-
-   _mm_storeu_si128(out + 1,
-         _mm_or_si128(b0, _mm_or_si128(b1, _mm_or_si128(b2,
-                  _mm_or_si128(b3, _mm_or_si128(b4, b5))))));
-
-   _mm_storeu_si128(out + 2,
-         _mm_or_si128(c0, _mm_or_si128(c1, _mm_or_si128(c2,
-                  _mm_or_si128(c3, _mm_or_si128(c4, c5))))));
-}
-#endif
-
-void conv_0rgb1555_bgr24(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h;
-   const uint16_t *input     = (const uint16_t*)input_;
-   uint8_t *output           = (uint8_t*)output_;
-
-#if defined(__SSE2__)
-   const __m128i pix_mask_r  = _mm_set1_epi16(0x1f << 10);
-   const __m128i pix_mask_gb = _mm_set1_epi16(0x1f <<  5);
-   const __m128i mul15_mid   = _mm_set1_epi16(0x4200);
-   const __m128i mul15_hi    = _mm_set1_epi16(0x0210);
-   const __m128i a           = _mm_set1_epi16(0x00ff);
-
-   int max_width             = width - 15;
-#endif
-
-   for (h = 0; h < height;
-         h++, output += out_stride, input += in_stride >> 1)
-   {
-      uint8_t *out = output;
-      int   w = 0;
-
-#if defined(__SSE2__)
-      for (; w < max_width; w += 16, out += 48)
-      {
-         __m128i res_lo_bg0, res_lo_bg1, res_hi_bg0, res_hi_bg1,
-                 res_lo_ra0, res_lo_ra1, res_hi_ra0, res_hi_ra1,
-                 res_lo0, res_lo1, res_hi0, res_hi1;
-         const __m128i in0 = _mm_loadu_si128((const __m128i*)(input + w + 0));
-         const __m128i in1 = _mm_loadu_si128((const __m128i*)(input + w + 8));
-         __m128i r0        = _mm_and_si128(in0, pix_mask_r);
-         __m128i r1        = _mm_and_si128(in1, pix_mask_r);
-         __m128i g0        = _mm_and_si128(in0, pix_mask_gb);
-         __m128i g1        = _mm_and_si128(in1, pix_mask_gb);
-         __m128i b0        = _mm_and_si128(_mm_slli_epi16(in0, 5), pix_mask_gb);
-         __m128i b1        = _mm_and_si128(_mm_slli_epi16(in1, 5), pix_mask_gb);
-
-         r0                = _mm_mulhi_epi16(r0, mul15_hi);
-         r1                = _mm_mulhi_epi16(r1, mul15_hi);
-         g0                = _mm_mulhi_epi16(g0, mul15_mid);
-         g1                = _mm_mulhi_epi16(g1, mul15_mid);
-         b0                = _mm_mulhi_epi16(b0, mul15_mid);
-         b1                = _mm_mulhi_epi16(b1, mul15_mid);
-
-         res_lo_bg0        = _mm_unpacklo_epi8(b0, g0);
-         res_lo_bg1        = _mm_unpacklo_epi8(b1, g1);
-         res_hi_bg0        = _mm_unpackhi_epi8(b0, g0);
-         res_hi_bg1        = _mm_unpackhi_epi8(b1, g1);
-         res_lo_ra0        = _mm_unpacklo_epi8(r0, a);
-         res_lo_ra1        = _mm_unpacklo_epi8(r1, a);
-         res_hi_ra0        = _mm_unpackhi_epi8(r0, a);
-         res_hi_ra1        = _mm_unpackhi_epi8(r1, a);
-
-         res_lo0           = _mm_or_si128(res_lo_bg0,
-               _mm_slli_si128(res_lo_ra0, 2));
-         res_lo1           = _mm_or_si128(res_lo_bg1,
-               _mm_slli_si128(res_lo_ra1, 2));
-         res_hi0           = _mm_or_si128(res_hi_bg0,
-               _mm_slli_si128(res_hi_ra0, 2));
-         res_hi1           = _mm_or_si128(res_hi_bg1,
-               _mm_slli_si128(res_hi_ra1, 2));
-
-         /* Non-POT pixel sizes for the loss */
-         store_bgr24_sse2(out, res_lo0, res_hi0, res_lo1, res_hi1);
-      }
-#endif
-
-      for (; w < width; w++)
-      {
-         uint32_t col = input[w];
-         uint32_t b   = (col >>  0) & 0x1f;
-         uint32_t g   = (col >>  5) & 0x1f;
-         uint32_t r   = (col >> 10) & 0x1f;
-         b            = (b << 3) | (b >> 2);
-         g            = (g << 3) | (g >> 2);
-         r            = (r << 3) | (r >> 2);
-
-         *out++       = b;
-         *out++       = g;
-         *out++       = r;
-      }
-   }
-}
-
-void conv_rgb565_bgr24(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h;
-   const uint16_t *input    = (const uint16_t*)input_;
-   uint8_t *output          = (uint8_t*)output_;
-
-#if defined(__SSE2__)
-   const __m128i pix_mask_r = _mm_set1_epi16(0x1f << 10);
-   const __m128i pix_mask_g = _mm_set1_epi16(0x3f <<  5);
-   const __m128i pix_mask_b = _mm_set1_epi16(0x1f <<  5);
-   const __m128i mul16_r    = _mm_set1_epi16(0x0210);
-   const __m128i mul16_g    = _mm_set1_epi16(0x2080);
-   const __m128i mul16_b    = _mm_set1_epi16(0x4200);
-   const __m128i a          = _mm_set1_epi16(0x00ff);
-
-   int max_width            = width - 15;
-#endif
-
-   for (h = 0; h < height; h++, output += out_stride, input += in_stride >> 1)
-   {
-      uint8_t *out = output;
-      int        w = 0;
-#if defined(__SSE2__)
-      for (; w < max_width; w += 16, out += 48)
-      {
-         __m128i res_lo_bg0, res_hi_bg0, res_lo_ra0, res_hi_ra0;
-         __m128i res_lo_bg1, res_hi_bg1, res_lo_ra1, res_hi_ra1;
-         __m128i res_lo0, res_hi0, res_lo1, res_hi1;
-         const __m128i in0 = _mm_loadu_si128((const __m128i*)(input + w));
-         const __m128i in1 = _mm_loadu_si128((const __m128i*)(input + w + 8));
-         __m128i r0 = _mm_and_si128(_mm_srli_epi16(in0, 1), pix_mask_r);
-         __m128i g0 = _mm_and_si128(in0, pix_mask_g);
-         __m128i b0 = _mm_and_si128(_mm_slli_epi16(in0, 5), pix_mask_b);
-         __m128i r1 = _mm_and_si128(_mm_srli_epi16(in1, 1), pix_mask_r);
-         __m128i g1 = _mm_and_si128(in1, pix_mask_g);
-         __m128i b1 = _mm_and_si128(_mm_slli_epi16(in1, 5), pix_mask_b);
-
-         r0         = _mm_mulhi_epi16(r0, mul16_r);
-         g0         = _mm_mulhi_epi16(g0, mul16_g);
-         b0         = _mm_mulhi_epi16(b0, mul16_b);
-         r1         = _mm_mulhi_epi16(r1, mul16_r);
-         g1         = _mm_mulhi_epi16(g1, mul16_g);
-         b1         = _mm_mulhi_epi16(b1, mul16_b);
-
-         res_lo_bg0 = _mm_unpacklo_epi8(b0, g0);
-         res_hi_bg0 = _mm_unpackhi_epi8(b0, g0);
-         res_lo_ra0 = _mm_unpacklo_epi8(r0, a);
-         res_hi_ra0 = _mm_unpackhi_epi8(r0, a);
-         res_lo_bg1 = _mm_unpacklo_epi8(b1, g1);
-         res_hi_bg1 = _mm_unpackhi_epi8(b1, g1);
-         res_lo_ra1 = _mm_unpacklo_epi8(r1, a);
-         res_hi_ra1 = _mm_unpackhi_epi8(r1, a);
-
-         res_lo0    = _mm_or_si128(res_lo_bg0,
-               _mm_slli_si128(res_lo_ra0, 2));
-         res_hi0    = _mm_or_si128(res_hi_bg0,
-               _mm_slli_si128(res_hi_ra0, 2));
-         res_lo1    = _mm_or_si128(res_lo_bg1,
-               _mm_slli_si128(res_lo_ra1, 2));
-         res_hi1    = _mm_or_si128(res_hi_bg1,
-               _mm_slli_si128(res_hi_ra1, 2));
-
-         store_bgr24_sse2(out, res_lo0, res_hi0, res_lo1, res_hi1);
-      }
-#endif
-
-      for (; w < width; w++)
-      {
-         uint32_t col = input[w];
-         uint32_t r   = (col >> 11) & 0x1f;
-         uint32_t g   = (col >>  5) & 0x3f;
-         uint32_t b   = (col >>  0) & 0x1f;
-         r = (r << 3) | (r >> 2);
-         g = (g << 2) | (g >> 4);
-         b = (b << 3) | (b >> 2);
-
-         *out++ = b;
-         *out++ = g;
-         *out++ = r;
-      }
-   }
-}
-
-void conv_bgr24_argb8888(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h, w;
-   const uint8_t *input = (const uint8_t*)input_;
-   uint32_t *output     = (uint32_t*)output_;
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 2, input += in_stride)
-   {
-      const uint8_t *inp = input;
-      for (w = 0; w < width; w++)
-      {
-         uint32_t b = *inp++;
-         uint32_t g = *inp++;
-         uint32_t r = *inp++;
-         output[w]  = (0xffu << 24) | (r << 16) | (g << 8) | (b << 0);
-      }
-   }
-}
-
-void conv_argb8888_0rgb1555(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h, w;
-   const uint32_t *input = (const uint32_t*)input_;
-   uint16_t *output      = (uint16_t*)output_;
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 1, input += in_stride >> 2)
-   {
-      for (w = 0; w < width; w++)
-      {
-         uint32_t col = input[w];
-         uint16_t r   = (col >> 19) & 0x1f;
-         uint16_t g   = (col >> 11) & 0x1f;
-         uint16_t b   = (col >>  3) & 0x1f;
-         output[w]    = (r << 10) | (g << 5) | (b << 0);
-      }
-   }
-}
-
-void conv_argb8888_bgr24(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h;
-   const uint32_t *input = (const uint32_t*)input_;
-   uint8_t *output       = (uint8_t*)output_;
-
-#if defined(__SSE2__)
-   int max_width = width - 15;
-#endif
-
-   for (h = 0; h < height;
-         h++, output += out_stride, input += in_stride >> 2)
-   {
-      uint8_t *out = output;
-      int        w = 0;
-#if defined(__SSE2__)
-      for (; w < max_width; w += 16, out += 48)
-      {
-         store_bgr24_sse2(out,
-               _mm_loadu_si128((const __m128i*)(input + w +  0)),
-               _mm_loadu_si128((const __m128i*)(input + w +  4)),
-               _mm_loadu_si128((const __m128i*)(input + w +  8)),
-               _mm_loadu_si128((const __m128i*)(input + w + 12)));
-      }
-#endif
-
-      for (; w < width; w++)
-      {
-         uint32_t col = input[w];
-         *out++       = (uint8_t)(col >>  0);
-         *out++       = (uint8_t)(col >>  8);
-         *out++       = (uint8_t)(col >> 16);
-      }
-   }
-}
-
-void conv_argb8888_abgr8888(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h, w;
-   const uint32_t *input = (const uint32_t*)input_;
-   uint32_t *output      = (uint32_t*)output_;
-
-   for (h = 0; h < height;
-         h++, output += out_stride >> 2, input += in_stride >> 2)
-   {
-      for (w = 0; w < width; w++)
-      {
-         uint32_t col = input[w];
-         output[w]    = ((col << 16) & 0xff0000) | 
-            ((col >> 16) & 0xff) | (col & 0xff00ff00);
-      }
-   }
-}
-
-#define YUV_SHIFT 6
-#define YUV_OFFSET (1 << (YUV_SHIFT - 1))
-#define YUV_MAT_Y (1 << 6)
-#define YUV_MAT_U_G (-22)
-#define YUV_MAT_U_B (113)
-#define YUV_MAT_V_R (90)
-#define YUV_MAT_V_G (-46)
-
-void conv_yuyv_argb8888(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h;
-   const uint8_t *input        = (const uint8_t*)input_;
-   uint32_t *output            = (uint32_t*)output_;
-
-#if defined(__SSE2__)
-   const __m128i mask_y        = _mm_set1_epi16(0xffu);
-   const __m128i mask_u        = _mm_set1_epi32(0xffu << 8);
-   const __m128i mask_v        = _mm_set1_epi32(0xffu << 24);
-   const __m128i chroma_offset = _mm_set1_epi16(128);
-   const __m128i round_offset  = _mm_set1_epi16(YUV_OFFSET);
-
-   const __m128i yuv_mul       = _mm_set1_epi16(YUV_MAT_Y);
-   const __m128i u_g_mul       = _mm_set1_epi16(YUV_MAT_U_G);
-   const __m128i u_b_mul       = _mm_set1_epi16(YUV_MAT_U_B);
-   const __m128i v_r_mul       = _mm_set1_epi16(YUV_MAT_V_R);
-   const __m128i v_g_mul       = _mm_set1_epi16(YUV_MAT_V_G);
-   const __m128i a             = _mm_cmpeq_epi16(
-         _mm_setzero_si128(), _mm_setzero_si128());
-#endif
-
-   for (h = 0; h < height; h++, output += out_stride >> 2, input += in_stride)
-   {
-      const uint8_t *src = input;
-      uint32_t      *dst = output;
-      int              w = 0;
-
-#if defined(__SSE2__)
-      /* Each loop processes 16 pixels. */
-      for (; w + 16 <= width; w += 16, src += 32, dst += 16)
-      {
-         __m128i u, v, u0_g, u1_g, u0_b, u1_b, v0_r, v1_r, v0_g, v1_g,
-                 r0, g0, b0, r1, g1, b1;
-         __m128i res_lo_bg, res_hi_bg, res_lo_ra, res_hi_ra;
-         __m128i res0, res1, res2, res3;
-         __m128i yuv0 = _mm_loadu_si128((const __m128i*)(src +  0)); /* [Y0, U0, Y1, V0, Y2, U1, Y3, V1, ...] */
-         __m128i yuv1 = _mm_loadu_si128((const __m128i*)(src + 16)); /* [Y0, U0, Y1, V0, Y2, U1, Y3, V1, ...] */
-
-         __m128i _y0 = _mm_and_si128(yuv0, mask_y); /* [Y0, Y1, Y2, ...] (16-bit) */
-         __m128i u0 = _mm_and_si128(yuv0, mask_u); /* [0, U0, 0, 0, 0, U1, 0, 0, ...] */
-         __m128i v0 = _mm_and_si128(yuv0, mask_v); /* [0, 0, 0, V1, 0, , 0, V1, ...] */
-         __m128i _y1 = _mm_and_si128(yuv1, mask_y); /* [Y0, Y1, Y2, ...] (16-bit) */
-         __m128i u1 = _mm_and_si128(yuv1, mask_u); /* [0, U0, 0, 0, 0, U1, 0, 0, ...] */
-         __m128i v1 = _mm_and_si128(yuv1, mask_v); /* [0, 0, 0, V1, 0, , 0, V1, ...] */
-
-         /* Juggle around to get U and V in the same 16-bit format as Y. */
-         u0 = _mm_srli_si128(u0, 1);
-         v0 = _mm_srli_si128(v0, 3);
-         u1 = _mm_srli_si128(u1, 1);
-         v1 = _mm_srli_si128(v1, 3);
-         u = _mm_packs_epi32(u0, u1);
-         v = _mm_packs_epi32(v0, v1);
-
-         /* Apply YUV offsets (U, V) -= (-128, -128). */
-         u = _mm_sub_epi16(u, chroma_offset);
-         v = _mm_sub_epi16(v, chroma_offset);
-
-         /* Upscale chroma horizontally (nearest). */
-         u0 = _mm_unpacklo_epi16(u, u);
-         u1 = _mm_unpackhi_epi16(u, u);
-         v0 = _mm_unpacklo_epi16(v, v);
-         v1 = _mm_unpackhi_epi16(v, v);
-
-         /* Apply transformations. */
-         _y0 = _mm_mullo_epi16(_y0, yuv_mul);
-         _y1 = _mm_mullo_epi16(_y1, yuv_mul);
-         u0_g   = _mm_mullo_epi16(u0, u_g_mul);
-         u1_g   = _mm_mullo_epi16(u1, u_g_mul);
-         u0_b   = _mm_mullo_epi16(u0, u_b_mul);
-         u1_b   = _mm_mullo_epi16(u1, u_b_mul);
-         v0_r   = _mm_mullo_epi16(v0, v_r_mul);
-         v1_r   = _mm_mullo_epi16(v1, v_r_mul);
-         v0_g   = _mm_mullo_epi16(v0, v_g_mul);
-         v1_g   = _mm_mullo_epi16(v1, v_g_mul);
-
-         /* Add contibutions from the transformed components. */
-         r0 = _mm_srai_epi16(_mm_adds_epi16(_mm_adds_epi16(_y0, v0_r),
-                  round_offset), YUV_SHIFT);
-         g0 = _mm_srai_epi16(_mm_adds_epi16(
-                  _mm_adds_epi16(_mm_adds_epi16(_y0, v0_g), u0_g), round_offset), YUV_SHIFT);
-         b0 = _mm_srai_epi16(_mm_adds_epi16(
-                  _mm_adds_epi16(_y0, u0_b), round_offset), YUV_SHIFT);
-
-         r1 = _mm_srai_epi16(_mm_adds_epi16(
-                  _mm_adds_epi16(_y1, v1_r), round_offset), YUV_SHIFT);
-         g1 = _mm_srai_epi16(_mm_adds_epi16(
-                  _mm_adds_epi16(_mm_adds_epi16(_y1, v1_g), u1_g), round_offset), YUV_SHIFT);
-         b1 = _mm_srai_epi16(_mm_adds_epi16(
-                  _mm_adds_epi16(_y1, u1_b), round_offset), YUV_SHIFT);
-
-         /* Saturate into 8-bit. */
-         r0 = _mm_packus_epi16(r0, r1);
-         g0 = _mm_packus_epi16(g0, g1);
-         b0 = _mm_packus_epi16(b0, b1);
-
-         /* Interleave into ARGB. */
-         res_lo_bg = _mm_unpacklo_epi8(b0, g0);
-         res_hi_bg = _mm_unpackhi_epi8(b0, g0);
-         res_lo_ra = _mm_unpacklo_epi8(r0, a);
-         res_hi_ra = _mm_unpackhi_epi8(r0, a);
-         res0 = _mm_unpacklo_epi16(res_lo_bg, res_lo_ra);
-         res1 = _mm_unpackhi_epi16(res_lo_bg, res_lo_ra);
-         res2 = _mm_unpacklo_epi16(res_hi_bg, res_hi_ra);
-         res3 = _mm_unpackhi_epi16(res_hi_bg, res_hi_ra);
-
-         _mm_storeu_si128((__m128i*)(dst +  0), res0);
-         _mm_storeu_si128((__m128i*)(dst +  4), res1);
-         _mm_storeu_si128((__m128i*)(dst +  8), res2);
-         _mm_storeu_si128((__m128i*)(dst + 12), res3);
-      }
-#endif
-
-      /* Finish off the rest (if any) in C. */
-      for (; w < width; w += 2, src += 4, dst += 2)
-      {
-         int _y0    = src[0];
-         int  u     = src[1] - 128;
-         int _y1    = src[2];
-         int  v     = src[3] - 128;
-
-         uint8_t r0 = clamp_8bit((YUV_MAT_Y * _y0 +                   YUV_MAT_V_R * v + YUV_OFFSET) >> YUV_SHIFT);
-         uint8_t g0 = clamp_8bit((YUV_MAT_Y * _y0 + YUV_MAT_U_G * u + YUV_MAT_V_G * v + YUV_OFFSET) >> YUV_SHIFT);
-         uint8_t b0 = clamp_8bit((YUV_MAT_Y * _y0 + YUV_MAT_U_B * u                   + YUV_OFFSET) >> YUV_SHIFT);
-
-         uint8_t r1 = clamp_8bit((YUV_MAT_Y * _y1 +                   YUV_MAT_V_R * v + YUV_OFFSET) >> YUV_SHIFT);
-         uint8_t g1 = clamp_8bit((YUV_MAT_Y * _y1 + YUV_MAT_U_G * u + YUV_MAT_V_G * v + YUV_OFFSET) >> YUV_SHIFT);
-         uint8_t b1 = clamp_8bit((YUV_MAT_Y * _y1 + YUV_MAT_U_B * u                   + YUV_OFFSET) >> YUV_SHIFT);
-
-         dst[0]     = 0xff000000u | (r0 << 16) | (g0 << 8) | (b0 << 0);
-         dst[1]     = 0xff000000u | (r1 << 16) | (g1 << 8) | (b1 << 0);
-      }
-   }
-}
-
-void conv_copy(void *output_, const void *input_,
-      int width, int height,
-      int out_stride, int in_stride)
-{
-   int h;
-   int copy_len         = abs(out_stride);
-   const uint8_t *input = (const uint8_t*)input_;
-   uint8_t *output      = (uint8_t*)output_;
-
-   if (abs(in_stride) < copy_len)
-      copy_len          = abs(in_stride);
-
-   for (h = 0; h < height;
-         h++, output += out_stride, input += in_stride)
-      memcpy(output, input, copy_len);
-}
-
diff --git a/libretro-common/gfx/scaler/scaler.c b/libretro-common/gfx/scaler/scaler.c
deleted file mode 100644
index 930c2d6..0000000
--- a/libretro-common/gfx/scaler/scaler.c
+++ /dev/null
@@ -1,343 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (scaler.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <math.h>
-
-#include <gfx/scaler/scaler.h>
-#include <gfx/scaler/scaler_int.h>
-#include <gfx/scaler/filter.h>
-#include <gfx/scaler/pixconv.h>
-
-static bool allocate_frames(struct scaler_ctx *ctx)
-{
-   uint64_t *scaled_frame = NULL;
-   ctx->scaled.stride     = ((ctx->out_width + 7) & ~7) * sizeof(uint64_t);
-   ctx->scaled.width      = ctx->out_width;
-   ctx->scaled.height     = ctx->in_height;
-   scaled_frame           = (uint64_t*)calloc(sizeof(uint64_t),
-            (ctx->scaled.stride * ctx->scaled.height) >> 3);
-
-   if (!scaled_frame)
-      return false;
-
-   ctx->scaled.frame      = scaled_frame;
-
-   if (ctx->in_fmt != SCALER_FMT_ARGB8888)
-   {
-      uint32_t *input_frame = NULL;
-      ctx->input.stride     = ((ctx->in_width + 7) & ~7) * sizeof(uint32_t);
-      input_frame           = (uint32_t*)calloc(sizeof(uint32_t),
-               (ctx->input.stride * ctx->in_height) >> 2);
-
-      if (!input_frame)
-         return false;
-
-      ctx->input.frame      = input_frame;
-   }
-
-   if (ctx->out_fmt != SCALER_FMT_ARGB8888)
-   {
-      uint32_t *output_frame = NULL;
-      ctx->output.stride     = ((ctx->out_width + 7) & ~7) * sizeof(uint32_t);
-
-      output_frame           = (uint32_t*)calloc(sizeof(uint32_t),
-               (ctx->output.stride * ctx->out_height) >> 2);
-
-      if (!output_frame)
-         return false;
-
-      ctx->output.frame      = output_frame;
-   }
-
-   return true;
-}
-
-bool scaler_ctx_gen_filter(struct scaler_ctx *ctx)
-{
-   scaler_ctx_gen_reset(ctx);
-
-   ctx->scaler_special = NULL;
-   ctx->unscaled       = false;
-
-   if (!allocate_frames(ctx))
-      return false;
-
-   if (     ctx->in_width  == ctx->out_width 
-         && ctx->in_height == ctx->out_height)
-   {
-      ctx->unscaled     = true; /* Only pixel format conversion ... */
-
-      if (ctx->in_fmt == ctx->out_fmt)
-         ctx->direct_pixconv = conv_copy;
-      else
-      {
-         /* Bind a pixel converter callback function to the 
-          * 'direct_pixconv' function pointer of the scaler context object. */
-         switch (ctx->in_fmt)
-         {
-            case SCALER_FMT_0RGB1555:
-               switch (ctx->out_fmt)
-               {
-                  case SCALER_FMT_ARGB8888:
-                     ctx->direct_pixconv = conv_0rgb1555_argb8888;
-                     break;
-                  case SCALER_FMT_RGB565:
-                     ctx->direct_pixconv = conv_0rgb1555_rgb565;
-                     break;
-                  case SCALER_FMT_BGR24:
-                     ctx->direct_pixconv = conv_0rgb1555_bgr24;
-                     break;
-                  default:
-                     break;
-               }
-               break;
-            case SCALER_FMT_RGB565:
-               switch (ctx->out_fmt)
-               {
-                  case SCALER_FMT_ARGB8888:
-                     ctx->direct_pixconv = conv_rgb565_argb8888;
-                     break;
-                  case SCALER_FMT_BGR24:
-                     ctx->direct_pixconv = conv_rgb565_bgr24;
-                     break;
-                  case SCALER_FMT_0RGB1555:
-                     ctx->direct_pixconv = conv_rgb565_0rgb1555;
-                     break;
-                  default:
-                     break;
-               }
-               break;
-            case SCALER_FMT_BGR24:
-               switch (ctx->out_fmt)
-               {
-                  case SCALER_FMT_ARGB8888:
-                     ctx->direct_pixconv = conv_bgr24_argb8888;
-                     break;
-                  default:
-                     break;
-               }
-               break;
-            case SCALER_FMT_ARGB8888:
-               switch (ctx->out_fmt)
-               {
-                  case SCALER_FMT_0RGB1555:
-                     ctx->direct_pixconv = conv_argb8888_0rgb1555;
-                     break;
-                  case SCALER_FMT_BGR24:
-                     ctx->direct_pixconv = conv_argb8888_bgr24;
-                     break;
-                  case SCALER_FMT_ABGR8888:
-                     ctx->direct_pixconv = conv_argb8888_abgr8888;
-                     break;
-                  case SCALER_FMT_RGBA4444:
-                     ctx->direct_pixconv = conv_argb8888_rgba4444;
-                     break;
-                  default:
-                     break;
-               }
-               break;
-            case SCALER_FMT_YUYV:
-               switch (ctx->out_fmt)
-               {
-                  case SCALER_FMT_ARGB8888:
-                     ctx->direct_pixconv = conv_yuyv_argb8888;
-                     break;
-                  default:
-                     break;
-               }
-               break;
-            case SCALER_FMT_RGBA4444:
-               switch (ctx->out_fmt)
-               {
-                  case SCALER_FMT_ARGB8888:
-                     ctx->direct_pixconv = conv_rgba4444_argb8888;
-                     break;
-                  case SCALER_FMT_RGB565:
-                     ctx->direct_pixconv = conv_rgba4444_rgb565;
-                     break;
-                  default:
-                     break;
-               }
-               break;
-            case SCALER_FMT_ABGR8888:
-               /* FIXME/TODO */
-               break;
-         }
-
-         if (!ctx->direct_pixconv)
-            return false;
-      }
-   }
-   else
-   {
-      ctx->scaler_horiz = scaler_argb8888_horiz;
-      ctx->scaler_vert  = scaler_argb8888_vert;
-
-      switch (ctx->in_fmt)
-      {
-         case SCALER_FMT_ARGB8888:
-            /* No need to convert :D */
-            break;
-
-         case SCALER_FMT_0RGB1555:
-            ctx->in_pixconv = conv_0rgb1555_argb8888;
-            break;
-
-         case SCALER_FMT_RGB565:
-            ctx->in_pixconv = conv_rgb565_argb8888;
-            break;
-
-         case SCALER_FMT_BGR24:
-            ctx->in_pixconv = conv_bgr24_argb8888;
-            break;
-
-         case SCALER_FMT_RGBA4444:
-            ctx->in_pixconv = conv_rgba4444_argb8888;
-            break;
-
-         default:
-            return false;
-      }
-
-      switch (ctx->out_fmt)
-      {
-         case SCALER_FMT_ARGB8888:
-            /* No need to convert :D */
-            break;
-
-         case SCALER_FMT_RGBA4444:
-            ctx->out_pixconv = conv_argb8888_rgba4444;
-            break;
-
-         case SCALER_FMT_0RGB1555:
-            ctx->out_pixconv = conv_argb8888_0rgb1555;
-            break;
-
-         case SCALER_FMT_BGR24:
-            ctx->out_pixconv = conv_argb8888_bgr24;
-            break;
-
-         default:
-            return false;
-      }
-
-      if (!scaler_gen_filter(ctx))
-         return false;
-   }
-
-   return true;
-}
-
-void scaler_ctx_gen_reset(struct scaler_ctx *ctx)
-{
-   if (ctx->horiz.filter)
-      free(ctx->horiz.filter);
-   if (ctx->horiz.filter_pos)
-      free(ctx->horiz.filter_pos);
-   if (ctx->vert.filter)
-      free(ctx->vert.filter);
-   if (ctx->vert.filter_pos)
-      free(ctx->vert.filter_pos);
-   if (ctx->scaled.frame)
-      free(ctx->scaled.frame);
-   if (ctx->input.frame)
-      free(ctx->input.frame);
-   if (ctx->output.frame)
-      free(ctx->output.frame);
-
-   ctx->horiz.filter        = NULL;
-   ctx->horiz.filter_len    = 0;
-   ctx->horiz.filter_stride = 0;
-   ctx->horiz.filter_pos    = NULL;
-
-   ctx->vert.filter         = NULL;
-   ctx->vert.filter_len     = 0;
-   ctx->vert.filter_stride  = 0;
-   ctx->vert.filter_pos     = NULL;
-
-   ctx->scaled.frame        = NULL;
-   ctx->scaled.width        = 0;
-   ctx->scaled.height       = 0;
-   ctx->scaled.stride       = 0;
-
-   ctx->input.frame         = NULL;
-   ctx->input.stride        = 0;
-
-   ctx->output.frame        = NULL;
-   ctx->output.stride       = 0;
-}
-
-/**
- * scaler_ctx_scale:
- * @ctx          : pointer to scaler context object.
- * @output       : pointer to output image.
- * @input        : pointer to input image.
- *
- * Scales an input image to an output image.
- **/
-void scaler_ctx_scale(struct scaler_ctx *ctx,
-      void *output, const void *input)
-{
-   const void *input_frame = input;
-   void *output_frame      = output;
-   int input_stride        = ctx->in_stride;
-   int output_stride       = ctx->out_stride;
-
-   if (ctx->in_fmt != SCALER_FMT_ARGB8888)
-   {
-      ctx->in_pixconv(ctx->input.frame, input,
-            ctx->in_width, ctx->in_height,
-            ctx->input.stride, ctx->in_stride);
-
-      input_frame       = ctx->input.frame;
-      input_stride      = ctx->input.stride;
-   }
-
-   if (ctx->out_fmt != SCALER_FMT_ARGB8888)
-   {
-      output_frame  = ctx->output.frame;
-      output_stride = ctx->output.stride;
-   }
-
-   /* Take some special, and (hopefully) more optimized path. */
-   if (ctx->scaler_special)
-      ctx->scaler_special(ctx, output_frame, input_frame,
-            ctx->out_width, ctx->out_height,
-            ctx->in_width, ctx->in_height,
-            output_stride, input_stride);
-   else
-   {
-      /* Take generic filter path. */
-      if (ctx->scaler_horiz)
-         ctx->scaler_horiz(ctx, input_frame, input_stride);
-      if (ctx->scaler_vert)
-         ctx->scaler_vert (ctx, output, output_stride);
-   }
-
-   if (ctx->out_fmt != SCALER_FMT_ARGB8888)
-      ctx->out_pixconv(output, ctx->output.frame,
-            ctx->out_width, ctx->out_height,
-            ctx->out_stride, ctx->output.stride);
-}
diff --git a/libretro-common/gfx/scaler/scaler_filter.c b/libretro-common/gfx/scaler/scaler_filter.c
deleted file mode 100644
index cfdc34c..0000000
--- a/libretro-common/gfx/scaler/scaler_filter.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (scaler_filter.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <math.h>
-
-#include <gfx/scaler/filter.h>
-#include <gfx/scaler/scaler_int.h>
-#include <retro_miscellaneous.h>
-#include <retro_inline.h>
-#include <filters.h>
-
-#define FILTER_UNITY (1 << 14)
-
-static INLINE void gen_filter_point_sub(struct scaler_filter *filter,
-      int len, int pos, int step)
-{
-   int i;
-   for (i = 0; i < len; i++, pos += step)
-   {
-      filter->filter_pos[i] = pos >> 16;
-      filter->filter[i]     = FILTER_UNITY;
-   }
-}
-
-static INLINE void gen_filter_bilinear_sub(struct scaler_filter *filter,
-      int len, int pos, int step)
-{
-   int i;
-   for (i = 0; i < len; i++, pos += step)
-   {
-      filter->filter_pos[i]     = pos >> 16;
-      filter->filter[i * 2 + 1] = (pos & 0xffff) >> 2;
-      filter->filter[i * 2 + 0] = FILTER_UNITY - filter->filter[i * 2 + 1];
-   }
-}
-
-static INLINE void gen_filter_sinc_sub(struct scaler_filter *filter,
-      int len, int pos, int step, double phase_mul)
-{
-   int i, j;
-   const int sinc_size = filter->filter_len;
-
-   for (i = 0; i < len; i++, pos += step)
-   {
-      filter->filter_pos[i] = pos >> 16;
-
-      for (j = 0; j < sinc_size; j++)
-      {
-         double sinc_phase    = M_PI * ((double)((sinc_size << 15) + (pos & 0xffff)) / 0x10000 - j);
-         double lanczos_phase = sinc_phase / ((sinc_size >> 1));
-         int16_t sinc_val     = FILTER_UNITY * sinc(sinc_phase * phase_mul) * sinc(lanczos_phase) * phase_mul;
-
-         filter->filter[i * sinc_size + j] = sinc_val;
-      }
-   }
-}
-
-static bool validate_filter(struct scaler_ctx *ctx)
-{
-   int i;
-   int max_h_pos;
-   int max_w_pos = ctx->in_width - ctx->horiz.filter_len;
-
-   for (i = 0; i < ctx->out_width; i++)
-   {
-      if (ctx->horiz.filter_pos[i] > max_w_pos || ctx->horiz.filter_pos[i] < 0)
-      {
-         fprintf(stderr, "Out X = %d => In X = %d\n", i, ctx->horiz.filter_pos[i]); 
-         return false;
-      }
-   }
-
-   max_h_pos = ctx->in_height - ctx->vert.filter_len;
-
-   for (i = 0; i < ctx->out_height; i++)
-   {
-      if (ctx->vert.filter_pos[i] > max_h_pos || ctx->vert.filter_pos[i] < 0)
-      {
-         fprintf(stderr, "Out Y = %d => In Y = %d\n", i, ctx->vert.filter_pos[i]); 
-         return false;
-      }
-   }
-
-   return true;
-}
-
-static void fixup_filter_sub(struct scaler_filter *filter,
-      int out_len, int in_len)
-{
-   int i;
-   int max_pos = in_len - filter->filter_len;
-
-   for (i = 0; i < out_len; i++)
-   {
-      int postsample =  filter->filter_pos[i] - max_pos;
-      int presample  = -filter->filter_pos[i];
-
-      if (postsample > 0)
-      {
-         int16_t *base_filter   = NULL;
-
-         filter->filter_pos[i] -= postsample;
-
-         base_filter            = filter->filter + i * filter->filter_stride;
-
-         if (postsample > (int)filter->filter_len)
-            memset(base_filter, 0, filter->filter_len * sizeof(int16_t));
-         else
-         {
-            memmove(base_filter + postsample, base_filter,
-                  (filter->filter_len - postsample) * sizeof(int16_t));
-            memset(base_filter, 0, postsample * sizeof(int16_t));
-         }
-      }
-
-      if (presample > 0)
-      {
-         int16_t *base_filter   = NULL;
-
-         filter->filter_pos[i] += presample;
-         base_filter            = filter->filter + i * filter->filter_stride;
-
-         if (presample > (int)filter->filter_len)
-            memset(base_filter, 0, filter->filter_len * sizeof(int16_t));
-         else
-         {
-            memmove(base_filter, base_filter + presample,
-                  (filter->filter_len - presample) * sizeof(int16_t));
-            memset(base_filter + (filter->filter_len - presample),
-                  0, presample * sizeof(int16_t));
-         }
-      }
-   }
-}
-
-bool scaler_gen_filter(struct scaler_ctx *ctx)
-{
-   int x_pos, x_step, y_pos, y_step;
-   int sinc_size = 0;
-
-   switch (ctx->scaler_type)
-   {
-      case SCALER_TYPE_POINT:
-         ctx->horiz.filter_len    = 1;
-         ctx->horiz.filter_stride = 1;
-         ctx->vert.filter_len     = 1;
-         ctx->vert.filter_stride  = 1;
-         break;
-      case SCALER_TYPE_BILINEAR:
-         ctx->horiz.filter_len    = 2;
-         ctx->horiz.filter_stride = 2;
-         ctx->vert.filter_len     = 2;
-         ctx->vert.filter_stride  = 2;
-         break;
-      case SCALER_TYPE_SINC:
-         sinc_size                = 8 * ((ctx->in_width > ctx->out_width)
-               ? next_pow2(ctx->in_width / ctx->out_width) : 1);
-         ctx->horiz.filter_len    = sinc_size;
-         ctx->horiz.filter_stride = sinc_size;
-         ctx->vert.filter_len     = sinc_size;
-         ctx->vert.filter_stride  = sinc_size;
-         break;
-      case SCALER_TYPE_UNKNOWN:
-      default:
-         return false;
-   }
-
-   ctx->horiz.filter     = (int16_t*)calloc(sizeof(int16_t), ctx->horiz.filter_stride * ctx->out_width);
-   ctx->horiz.filter_pos = (int*)calloc(sizeof(int), ctx->out_width);
-
-   ctx->vert.filter      = (int16_t*)calloc(sizeof(int16_t), ctx->vert.filter_stride * ctx->out_height);
-   ctx->vert.filter_pos  = (int*)calloc(sizeof(int), ctx->out_height);
-
-   if (!ctx->horiz.filter || !ctx->vert.filter)
-      return false;
-
-   x_step = (1 << 16) * ctx->in_width / ctx->out_width;
-   y_step = (1 << 16) * ctx->in_height / ctx->out_height;
-
-   switch (ctx->scaler_type)
-   {
-      case SCALER_TYPE_POINT:
-         x_pos  = (1 << 15) * ctx->in_width / ctx->out_width   - (1 << 15);
-         y_pos  = (1 << 15) * ctx->in_height / ctx->out_height - (1 << 15);
-
-         gen_filter_point_sub(&ctx->horiz, ctx->out_width,  x_pos, x_step);
-         gen_filter_point_sub(&ctx->vert,  ctx->out_height, y_pos, y_step);
-
-         ctx->scaler_special = scaler_argb8888_point_special;
-         break;
-
-      case SCALER_TYPE_BILINEAR:
-         x_pos  = (1 << 15) * ctx->in_width / ctx->out_width   - (1 << 15);
-         y_pos  = (1 << 15) * ctx->in_height / ctx->out_height - (1 << 15);
-
-         gen_filter_bilinear_sub(&ctx->horiz, ctx->out_width,  x_pos, x_step);
-         gen_filter_bilinear_sub(&ctx->vert,  ctx->out_height, y_pos, y_step);
-         break;
-
-      case SCALER_TYPE_SINC:
-         /* Need to expand the filter when downsampling 
-          * to get a proper low-pass effect. */
-
-         x_pos  = (1 << 15) * ctx->in_width  / ctx->out_width  - (1 << 15) - (sinc_size << 15);
-         y_pos  = (1 << 15) * ctx->in_height / ctx->out_height - (1 << 15) - (sinc_size << 15);
-
-         gen_filter_sinc_sub(&ctx->horiz, ctx->out_width, x_pos, x_step,
-               ctx->in_width  > ctx->out_width  ? (double)ctx->out_width  / ctx->in_width  : 1.0);
-         gen_filter_sinc_sub(&ctx->vert, ctx->out_height, y_pos, y_step,
-               ctx->in_height > ctx->out_height ? (double)ctx->out_height / ctx->in_height : 1.0
-               );
-         break;
-      case SCALER_TYPE_UNKNOWN:
-         break;
-   }
-
-   /* Makes sure that we never sample outside our rectangle. */
-   fixup_filter_sub(&ctx->horiz, ctx->out_width, ctx->in_width);
-   fixup_filter_sub(&ctx->vert,  ctx->out_height, ctx->in_height);
-
-   return validate_filter(ctx);
-}
-
diff --git a/libretro-common/gfx/scaler/scaler_int.c b/libretro-common/gfx/scaler/scaler_int.c
deleted file mode 100644
index cc96042..0000000
--- a/libretro-common/gfx/scaler/scaler_int.c
+++ /dev/null
@@ -1,261 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (scaler_int.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <gfx/scaler/scaler_int.h>
-
-#include <retro_inline.h>
-
-#ifdef SCALER_NO_SIMD
-#undef __SSE2__
-#endif
-
-#if defined(__SSE2__)
-#include <emmintrin.h>
-#ifdef _WIN32
-#include <intrin.h>
-#endif
-#endif
-
-/* ARGB8888 scaler is split in two:
- *
- * First, horizontal scaler is applied.
- * Here, all 8-bit channels are expanded to 16-bit. Values are then shifted 7 
- * to left to occupy 15 bits.
- *
- * The sign bit is kept empty as we have to do signed multiplication for the 
- * filter.
- *
- * A mulhi [(a * b) >> 16] is applied which loses some precision, but is 
- * very efficient for SIMD.
- * It is accurate enough for 8-bit purposes.
- *
- * The fixed point 1.0 for filter is (1 << 14). After horizontal scale, 
- * the output is kept with 16-bit channels, and will now have 13 bits 
- * of precision as [(a * (1 << 14)) >> 16] is effectively a right shift by 2.
- *
- * Vertical scaler takes the 13 bit channels, and performs the 
- * same mulhi steps.
- * Another 2 bits of precision is lost, which ends up as 11 bits.
- * Scaling is now complete. Channels are shifted right by 3, and saturated 
- * into 8-bit values.
- *
- * The C version of scalers perform the exact same operations as the 
- * SIMD code for testing purposes.
- */
-
-void scaler_argb8888_vert(const struct scaler_ctx *ctx, void *output_, int stride)
-{
-   int h, w, y;
-   const uint64_t      *input = ctx->scaled.frame;
-   uint32_t           *output = (uint32_t*)output_;
-
-   const int16_t *filter_vert = ctx->vert.filter;
-
-   for (h = 0; h < ctx->out_height; h++, 
-         filter_vert += ctx->vert.filter_stride, output += stride >> 2)
-   {
-      const uint64_t *input_base = input + ctx->vert.filter_pos[h] 
-         * (ctx->scaled.stride >> 3);
-
-      for (w = 0; w < ctx->out_width; w++)
-      {
-         const uint64_t *input_base_y = input_base + w;
-#if defined(__SSE2__)
-         __m128i final;
-         __m128i res = _mm_setzero_si128();
-
-         for (y = 0; (y + 1) < ctx->vert.filter_len; y += 2,
-               input_base_y += (ctx->scaled.stride >> 2))
-         {
-            __m128i coeff = _mm_set_epi64x(filter_vert[y + 1] * 0x0001000100010001ll, filter_vert[y + 0] * 0x0001000100010001ll);
-            __m128i col   = _mm_set_epi64x(input_base_y[ctx->scaled.stride >> 3], input_base_y[0]);
-
-            res           = _mm_adds_epi16(_mm_mulhi_epi16(col, coeff), res);
-         }
-
-         for (; y < ctx->vert.filter_len; y++, input_base_y += (ctx->scaled.stride >> 3))
-         {
-            __m128i coeff = _mm_set_epi64x(0, filter_vert[y] * 0x0001000100010001ll);
-            __m128i col   = _mm_set_epi64x(0, input_base_y[0]);
-
-            res           = _mm_adds_epi16(_mm_mulhi_epi16(col, coeff), res);
-         }
-
-         res       = _mm_adds_epi16(_mm_srli_si128(res, 8), res);
-         res       = _mm_srai_epi16(res, (7 - 2 - 2));
-
-         final     = _mm_packus_epi16(res, res);
-
-         output[w] = _mm_cvtsi128_si32(final);
-#else
-         int16_t res_a = 0;
-         int16_t res_r = 0;
-         int16_t res_g = 0;
-         int16_t res_b = 0;
-
-         for (y = 0; y < ctx->vert.filter_len; y++,
-               input_base_y += (ctx->scaled.stride >> 3))
-         {
-            uint64_t col   = *input_base_y;
-
-            int16_t a      = (col >> 48) & 0xffff;
-            int16_t r      = (col >> 32) & 0xffff;
-            int16_t g      = (col >> 16) & 0xffff;
-            int16_t b      = (col >>  0) & 0xffff;
-
-            int16_t coeff  = filter_vert[y];
-
-            res_a         += (a * coeff) >> 16;
-            res_r         += (r * coeff) >> 16;
-            res_g         += (g * coeff) >> 16;
-            res_b         += (b * coeff) >> 16;
-         }
-
-         res_a           >>= (7 - 2 - 2);
-         res_r           >>= (7 - 2 - 2);
-         res_g           >>= (7 - 2 - 2);
-         res_b           >>= (7 - 2 - 2);
-
-         output[w]         = 
-            (clamp_8bit(res_a) << 24) |
-            (clamp_8bit(res_r) << 16) | 
-            (clamp_8bit(res_g) << 8)  |
-            (clamp_8bit(res_b) << 0);
-#endif
-      }
-   }
-}
-
-void scaler_argb8888_horiz(const struct scaler_ctx *ctx, const void *input_, int stride)
-{
-   int h, w, x;
-   const uint32_t *input = (uint32_t*)input_;
-   uint64_t *output      = ctx->scaled.frame;
-
-   for (h = 0; h < ctx->scaled.height; h++, input += stride >> 2,
-         output += ctx->scaled.stride >> 3)
-   {
-      const int16_t *filter_horiz = ctx->horiz.filter;
-
-      for (w = 0; w < ctx->scaled.width; w++,
-            filter_horiz += ctx->horiz.filter_stride)
-      {
-         const uint32_t *input_base_x = input + ctx->horiz.filter_pos[w];
-#if defined(__SSE2__)
-         __m128i res = _mm_setzero_si128();
-
-         for (x = 0; (x + 1) < ctx->horiz.filter_len; x += 2)
-         {
-            __m128i coeff = _mm_set_epi64x(filter_horiz[x + 1] * 0x0001000100010001ll, filter_horiz[x + 0] * 0x0001000100010001ll);
-
-            __m128i col   = _mm_unpacklo_epi8(_mm_set_epi64x(0,
-                     ((uint64_t)input_base_x[x + 1] << 32) | input_base_x[x + 0]), _mm_setzero_si128());
-
-            col           = _mm_slli_epi16(col, 7);
-            res           = _mm_adds_epi16(_mm_mulhi_epi16(col, coeff), res);
-         }
-
-         for (; x < ctx->horiz.filter_len; x++)
-         {
-            __m128i coeff = _mm_set_epi64x(0, filter_horiz[x] * 0x0001000100010001ll);
-            __m128i col   = _mm_unpacklo_epi8(_mm_set_epi32(0, 0, 0, input_base_x[x]), _mm_setzero_si128());
-
-            col           = _mm_slli_epi16(col, 7);
-            res           = _mm_adds_epi16(_mm_mulhi_epi16(col, coeff), res);
-         }
-
-         res              = _mm_adds_epi16(_mm_srli_si128(res, 8), res);
-
-#ifdef __x86_64__
-         output[w]        = _mm_cvtsi128_si64(res);
-#else /* 32-bit doesn't have si64. Do it in two steps. */
-         union
-         {
-            uint32_t *u32;
-            uint64_t *u64;
-         } u;
-         u.u64    = output + w;
-         u.u32[0] = _mm_cvtsi128_si32(res);
-         u.u32[1] = _mm_cvtsi128_si32(_mm_srli_si128(res, 4));
-#endif
-#else
-         int16_t res_a = 0;
-         int16_t res_r = 0;
-         int16_t res_g = 0;
-         int16_t res_b = 0;
-
-         for (x = 0; x < ctx->horiz.filter_len; x++)
-         {
-            uint32_t col   = input_base_x[x];
-
-            int16_t a      = (col >> (24 - 7)) & (0xff << 7);
-            int16_t r      = (col >> (16 - 7)) & (0xff << 7);
-            int16_t g      = (col >> ( 8 - 7)) & (0xff << 7);
-            int16_t b      = (col << ( 0 + 7)) & (0xff << 7);
-
-            int16_t coeff  = filter_horiz[x];
-
-            res_a         += (a * coeff) >> 16;
-            res_r         += (r * coeff) >> 16;
-            res_g         += (g * coeff) >> 16;
-            res_b         += (b * coeff) >> 16;
-         }
-
-         output[w]         = (
-               (uint64_t)res_a  << 48)  | 
-               ((uint64_t)res_r << 32)  |
-               ((uint64_t)res_g << 16)  |
-               ((uint64_t)res_b << 0);
-#endif
-      }
-   }
-}
-
-void scaler_argb8888_point_special(const struct scaler_ctx *ctx,
-      void *output_, const void *input_,
-      int out_width, int out_height,
-      int in_width, int in_height,
-      int out_stride, int in_stride)
-{
-   int h, w;
-   int x_pos             = (1 << 15) * in_width / out_width - (1 << 15);
-   int x_step            = (1 << 16) * in_width / out_width;
-   int y_pos             = (1 << 15) * in_height / out_height - (1 << 15);
-   int y_step            = (1 << 16) * in_height / out_height;
-   const uint32_t *input = (const uint32_t*)input_;
-   uint32_t *output      = (uint32_t*)output_;
-
-   if (x_pos < 0)
-      x_pos = 0;
-   if (y_pos < 0)
-      y_pos = 0;
-
-   for (h = 0; h < out_height; h++, y_pos += y_step, output += out_stride >> 2)
-   {
-      int               x = x_pos;
-      const uint32_t *inp = input + (y_pos >> 16) * (in_stride >> 2);
-
-      for (w = 0; w < out_width; w++, x += x_step)
-         output[w] = inp[x >> 16];
-   }
-}
-
diff --git a/libretro-common/glsm/glsm.c b/libretro-common/glsm/glsm.c
deleted file mode 100644
index 8fc8e13..0000000
--- a/libretro-common/glsm/glsm.c
+++ /dev/null
@@ -1,2278 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsm).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <glsym/glsym.h>
-#include <glsm/glsm.h>
-
-#ifndef GL_DEPTH_CLAMP
-#define GL_DEPTH_CLAMP                    0x864F
-#define GL_RASTERIZER_DISCARD             0x8C89
-#define GL_SAMPLE_MASK                    0x8E51
-#endif
-
-struct gl_cached_state
-{
-   struct
-   {
-      GLuint *ids;
-   } bind_textures;
-
-   struct
-   {
-      bool used[MAX_ATTRIB];
-      GLint size[MAX_ATTRIB];
-      GLenum type[MAX_ATTRIB];
-      GLboolean normalized[MAX_ATTRIB];
-      GLsizei stride[MAX_ATTRIB];
-      const GLvoid *pointer[MAX_ATTRIB];
-      GLuint buffer[MAX_ATTRIB];
-   } attrib_pointer;
-
-#ifndef HAVE_OPENGLES
-   GLenum colorlogicop;
-#endif
-
-   struct
-   {
-      bool enabled[MAX_ATTRIB];
-   } vertex_attrib_pointer;
-
-   struct
-   {
-      GLenum pname;
-      GLint param;
-   } pixelstore_i;
-
-   struct
-   {
-      GLuint r;
-      GLuint g;
-      GLuint b;
-      GLuint a;
-   } clear_color;
-
-   struct
-   {
-      bool used;
-      GLint x;
-      GLint y;
-      GLsizei w;
-      GLsizei h;
-   } scissor;
-
-   struct
-   {
-      GLint x;
-      GLint y;
-      GLsizei w;
-      GLsizei h;
-   } viewport;
-
-   struct
-   {
-      bool used;
-      GLenum sfactor;
-      GLenum dfactor;
-   } blendfunc;
-
-   struct
-   {
-      bool used;
-      GLenum srcRGB;
-      GLenum dstRGB;
-      GLenum srcAlpha;
-      GLenum dstAlpha;
-   } blendfunc_separate;
-
-   struct
-   {
-      bool used;
-      GLboolean red;
-      GLboolean green;
-      GLboolean blue;
-      GLboolean alpha;
-   } colormask;
-
-   struct
-   {
-      bool used;
-      GLdouble depth;
-   } cleardepth;
-
-   struct
-   {
-      bool used;
-      GLenum func;
-   } depthfunc;
-
-
-   struct
-   {
-      bool used;
-      GLclampd zNear;
-      GLclampd zFar;
-   } depthrange;
-
-   struct
-   {
-      bool used;
-      GLfloat factor;
-      GLfloat units;
-   } polygonoffset;
-
-   struct
-   {
-      bool used;
-      GLenum func;
-      GLint ref;
-      GLuint mask;
-   } stencilfunc;
-
-   struct
-   {
-      bool used;
-      GLenum sfail;
-      GLenum dpfail;
-      GLenum dppass;
-   } stencilop;
-
-   struct
-   {
-      bool used;
-      GLenum mode;
-   } frontface;
-
-   struct 
-   {
-      bool used;
-      GLenum mode;
-   } cullface;
-
-   struct
-   {
-      bool used;
-      GLuint mask;
-   } stencilmask;
-
-   struct
-   {
-      bool used;
-      GLboolean mask;
-   } depthmask;
-
-   struct
-   {
-      GLenum mode;
-   } readbuffer;
-
-   GLuint vao;
-   GLuint framebuf;
-   GLuint array_buffer;
-   GLuint program; 
-   GLenum active_texture;
-   int cap_state[SGL_CAP_MAX];
-   int cap_translate[SGL_CAP_MAX];
-};
-
-static GLint glsm_max_textures;
-static struct retro_hw_render_callback hw_render;
-static struct gl_cached_state gl_state;
-
-/* GL wrapper-side */
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-GLenum rglGetError(void)
-{
-   return glGetError();
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-void rglClear(GLbitfield mask)
-{
-   glClear(mask);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0
- */
-void rglValidateProgram(GLuint program)
-{
-   glValidateProgram(program);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- * OpenGLES  : N/A
- */
-void rglPolygonMode(GLenum face, GLenum mode)
-{
-#ifndef HAVE_OPENGLES
-   glPolygonMode(face, mode);
-#endif
-}
-
-void rglTexSubImage2D(
-      GLenum target,
-  	GLint level,
-  	GLint xoffset,
-  	GLint yoffset,
-  	GLsizei width,
-  	GLsizei height,
-  	GLenum format,
-  	GLenum type,
-  	const GLvoid * pixels)
-{
-   glTexSubImage2D(target, level, xoffset, yoffset,
-         width, height, format, type, pixels);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-void rglLineWidth(GLfloat width)
-{
-   glLineWidth(width);
-}
-
-/*
- * Category: FBO
- *
- * Core in:
- * OpenGL    : 3.0
- * OpenGLES  : 3.0
- */
-void rglBlitFramebuffer(
-      GLint srcX0, GLint srcY0,
-      GLint srcX1, GLint srcY1,
-      GLint dstX0, GLint dstY0,
-      GLint dstX1, GLint dstY1,
-      GLbitfield mask, GLenum filter)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glBlitFramebuffer(srcX0, srcY0, srcX1, srcY1,
-         dstX0, dstY0, dstX1, dstY1,
-         mask, filter);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 3.0
- */
-void rglReadBuffer(GLenum mode)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glReadBuffer(mode);
-   gl_state.readbuffer.mode = mode;
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 2.0
- */
-void rglClearDepth(GLdouble depth)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-#ifdef HAVE_OPENGLES
-   glClearDepthf(depth);
-#else
-   glClearDepth(depth);
-#endif
-   gl_state.cleardepth.used  = true;
-   gl_state.cleardepth.depth = depth;
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 2.0
- */
-void rglPixelStorei(GLenum pname, GLint param)
-{
-   glPixelStorei(pname, param);
-   gl_state.pixelstore_i.pname = pname;
-   gl_state.pixelstore_i.param = param;
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 2.0
- */
-void rglDepthRange(GLclampd zNear, GLclampd zFar)
-{
-#ifdef HAVE_OPENGLES
-   glDepthRangef(zNear, zFar);
-#else
-   glDepthRange(zNear, zFar);
-#endif
-   gl_state.depthrange.used  = true;
-   gl_state.depthrange.zNear = zNear;
-   gl_state.depthrange.zFar  = zFar;
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 2.0
- */
-void rglFrontFace(GLenum mode)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glFrontFace(mode);
-   gl_state.frontface.used = true;
-   gl_state.frontface.mode = mode; 
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 2.0
- */
-void rglDepthFunc(GLenum func)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   gl_state.depthfunc.used = true;
-   gl_state.depthfunc.func = func;
-   glDepthFunc(func);
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 2.0
- */
-void rglColorMask(GLboolean red, GLboolean green,
-      GLboolean blue, GLboolean alpha)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glColorMask(red, green, blue, alpha);
-   gl_state.colormask.red   = red;
-   gl_state.colormask.green = green;
-   gl_state.colormask.blue  = blue;
-   gl_state.colormask.alpha = alpha;
-   gl_state.colormask.used  = true;
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 2.0
- */
-void rglCullFace(GLenum mode)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glCullFace(mode);
-   gl_state.cullface.used = true;
-   gl_state.cullface.mode = mode;
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 2.0
- */
-void rglStencilOp(GLenum sfail, GLenum dpfail, GLenum dppass)
-{
-   glStencilOp(sfail, dpfail, dppass);
-   gl_state.stencilop.used   = true;
-   gl_state.stencilop.sfail  = sfail;
-   gl_state.stencilop.dpfail = dpfail;
-   gl_state.stencilop.dppass = dppass;
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 2.0
- */
-void rglStencilFunc(GLenum func, GLint ref, GLuint mask)
-{
-   glStencilFunc(func, ref, mask);
-   gl_state.stencilfunc.used = true;
-   gl_state.stencilfunc.func = func;
-   gl_state.stencilfunc.ref  = ref;
-   gl_state.stencilfunc.mask = mask;
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-GLboolean rglIsEnabled(GLenum cap)
-{
-   return gl_state.cap_state[cap] ? GL_TRUE : GL_FALSE;
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-void rglClearColor(GLclampf red, GLclampf green,
-      GLclampf blue, GLclampf alpha)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glClearColor(red, green, blue, alpha);
-   gl_state.clear_color.r = red;
-   gl_state.clear_color.g = green;
-   gl_state.clear_color.b = blue;
-   gl_state.clear_color.a = alpha;
-}
-
-/*
- *
- * Core in:
- * OpenGLES    : 2.0 (maybe earlier?)
- */
-void rglScissor(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glScissor(x, y, width, height);
-   gl_state.scissor.used = true;
-   gl_state.scissor.x    = x;
-   gl_state.scissor.y    = y;
-   gl_state.scissor.w    = width;
-   gl_state.scissor.h    = height;
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-void rglViewport(GLint x, GLint y, GLsizei width, GLsizei height)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glViewport(x, y, width, height);
-   gl_state.viewport.x = x;
-   gl_state.viewport.y = y;
-   gl_state.viewport.w = width;
-   gl_state.viewport.h = height;
-}
-
-void rglBlendFunc(GLenum sfactor, GLenum dfactor)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   gl_state.blendfunc.used    = true;
-   gl_state.blendfunc.sfactor = sfactor;
-   gl_state.blendfunc.dfactor = dfactor;
-   glBlendFunc(sfactor, dfactor);
-}
-
-/*
- * Category: Blending
- *
- * Core in:
- * OpenGL    : 1.4
- */
-void rglBlendFuncSeparate(GLenum sfactor, GLenum dfactor)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   gl_state.blendfunc_separate.used     = true;
-   gl_state.blendfunc_separate.srcRGB   = sfactor;
-   gl_state.blendfunc_separate.dstRGB   = dfactor;
-   gl_state.blendfunc_separate.srcAlpha = sfactor;
-   gl_state.blendfunc_separate.dstAlpha = dfactor;
-   glBlendFunc(sfactor, dfactor);
-}
-
-/*
- * Category: Textures
- *
- * Core in:
- * OpenGL    : 1.3 
- */
-void rglActiveTexture(GLenum texture)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glActiveTexture(texture);
-   gl_state.active_texture = texture - GL_TEXTURE0;
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.1
- */
-void rglBindTexture(GLenum target, GLuint texture)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glBindTexture(target, texture);
-   gl_state.bind_textures.ids[gl_state.active_texture] = texture;
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-void rglDisable(GLenum cap)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glDisable(gl_state.cap_translate[cap]);
-   gl_state.cap_state[cap] = 0;
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-void rglEnable(GLenum cap)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glEnable(gl_state.cap_translate[cap]);
-   gl_state.cap_state[cap] = 1;
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUseProgram(GLuint program)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   gl_state.program = program;
-   glUseProgram(program);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-void rglDepthMask(GLboolean flag)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glDepthMask(flag);
-   gl_state.depthmask.used = true;
-   gl_state.depthmask.mask = flag;
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0
- */
-void rglStencilMask(GLenum mask)
-{
-   glStencilMask(mask);
-   gl_state.stencilmask.used = true;
-   gl_state.stencilmask.mask = mask;
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.5
- */
-void rglBufferData(GLenum target, GLsizeiptr size,
-      const GLvoid *data, GLenum usage)
-{
-   glBufferData(target, size, data, usage);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.5
- */
-void rglBufferSubData(GLenum target, GLintptr offset,
-      GLsizeiptr size, const GLvoid *data)
-{
-   glBufferSubData(target, offset, size, data);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.5
- */
-void rglBindBuffer(GLenum target, GLuint buffer)
-{
-   if (target == GL_ARRAY_BUFFER)
-      gl_state.array_buffer = buffer;
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glBindBuffer(target, buffer);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0
- */
-void rglLinkProgram(GLuint program)
-{
-   glLinkProgram(program);
-}
-
-/*
- * Category: FBO
- *
- * Core in:
- * OpenGL    : 3.0 
- * OpenGLES  : 2.0
- */
-void rglFramebufferTexture2D(GLenum target, GLenum attachment,
-      GLenum textarget, GLuint texture, GLint level)
-{
-   glFramebufferTexture2D(target, attachment, textarget, texture, level);
-}
-
-/*
- * Category: FBO
- *
- * Core in:
- * OpenGL    : 3.0
- * OpenGLES  : 3.2
- */
-void rglFramebufferTexture(GLenum target, GLenum attachment,
-  	GLuint texture, GLint level)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES_3_2)
-   glFramebufferTexture(target, attachment, texture, level);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.1
- */
-void rglDrawArrays(GLenum mode, GLint first, GLsizei count)
-{
-   glDrawArrays(mode, first, count);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.1
- */
-void rglDrawElements(GLenum mode, GLsizei count, GLenum type,
-                           const GLvoid * indices)
-{
-   glDrawElements(mode, count, type, indices);
-}
-
-void rglCompressedTexImage2D(GLenum target, GLint level,
-      GLenum internalformat, GLsizei width, GLsizei height,
-      GLint border, GLsizei imageSize, const GLvoid *data)
-{
-   glCompressedTexImage2D(target, level, internalformat, 
-         width, height, border, imageSize, data);
-}
-
-
-void rglDeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
-{
-   glDeleteFramebuffers(n, framebuffers);
-}
-
-void rglDeleteTextures(GLsizei n, const GLuint *textures)
-{
-   glDeleteTextures(n, textures);
-}
-
-/*
- *
- * Core in:
- * OpenGLES    : 2.0 
- */
-void rglRenderbufferStorage(GLenum target, GLenum internalFormat,
-      GLsizei width, GLsizei height)
-{
-   glRenderbufferStorage(target, internalFormat, width, height);
-}
-
-/*
- *
- * Core in:
- *
- * OpenGL      : 3.0
- * OpenGLES    : 2.0 
- */
-void rglBindRenderbuffer(GLenum target, GLuint renderbuffer)
-{
-   glBindRenderbuffer(target, renderbuffer);
-}
-
-/*
- *
- * Core in:
- *
- * OpenGLES    : 2.0 
- */
-void rglDeleteRenderbuffers(GLsizei n, GLuint *renderbuffers)
-{
-   glDeleteRenderbuffers(n, renderbuffers);
-}
-
-/*
- *
- * Core in:
- *
- * OpenGL      : 3.0
- * OpenGLES    : 2.0 
- */
-void rglGenRenderbuffers(GLsizei n, GLuint *renderbuffers)
-{
-   glGenRenderbuffers(n, renderbuffers);
-}
-
-/*
- *
- * Core in:
- *
- * OpenGL      : 3.0
- * OpenGLES    : 2.0 
- */
-void rglGenerateMipmap(GLenum target)
-{
-   glGenerateMipmap(target);
-}
-
-/*
- * Category: FBO
- *
- * Core in:
- * OpenGL    : 3.0 
- */
-GLenum rglCheckFramebufferStatus(GLenum target)
-{
-   return glCheckFramebufferStatus(target);
-}
-
-/*
- * Category: FBO
- *
- * Core in:
- * OpenGL    : 3.0 
- * OpenGLES  : 2.0
- */
-void rglFramebufferRenderbuffer(GLenum target, GLenum attachment,
-      GLenum renderbuffertarget, GLuint renderbuffer)
-{
-   glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 3.0 
- */
-void rglBindFragDataLocation(GLuint program, GLuint colorNumber,
-                                   const char * name)
-{
-#if !defined(HAVE_OPENGLES2)
-   glBindFragDataLocation(program, colorNumber, name);
-#endif
-}
-
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglGetProgramiv(GLuint shader, GLenum pname, GLint *params)
-{
-   glGetProgramiv(shader, pname, params);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 4.1 
- * OpenGLES  : 3.0
- */
-void rglProgramParameteri( 	GLuint program,
-  	GLenum pname,
-  	GLint value)
-{
-#if !defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES) && (defined(HAVE_OPENGLES3) || defined(HAVE_OPENGLES_3_1))
-   glProgramParameteri(program, pname, value);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglGetActiveUniform(GLuint program, GLuint index, GLsizei bufsize,
-      GLsizei *length, GLint *size, GLenum *type, GLchar *name)
-{
-   glGetActiveUniform(program, index, bufsize, length, size, type, name);
-}
-
-/*
- * Category: UBO
- *
- * Core in:
- *
- * OpenGL    : 2.0 
- * OpenGLES  : 3.0
- */
-void rglGetActiveUniformBlockiv(GLuint program,
-  	GLuint uniformBlockIndex,
-  	GLenum pname,
-  	GLint *params)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glGetActiveUniformBlockiv(program, uniformBlockIndex,
-         pname, params);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-/*
- *
- * Core in:
- *
- * OpenGLES  : 3.0
- */
-void rglGetActiveUniformsiv( 	GLuint program,
-  	GLsizei uniformCount,
-  	const GLuint *uniformIndices,
-  	GLenum pname,
-  	GLint *params)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glGetActiveUniformsiv(program, uniformCount,
-         uniformIndices, pname, params);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-/*
- *
- * Core in:
- *
- * OpenGLES  : 3.0
- */
-void rglGetUniformIndices(GLuint program,
-  	GLsizei uniformCount,
-  	const GLchar **uniformNames,
-  	GLuint *uniformIndices)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glGetUniformIndices(program, uniformCount,
-         uniformNames, uniformIndices);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-/*
- * Category: UBO
- *
- * Core in:
- *
- * OpenGLES  : 3.0
- */
-void rglBindBufferBase( 	GLenum target,
-  	GLuint index,
-  	GLuint buffer)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glBindBufferBase(target, index, buffer);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-/*
- *
- * Category: UBO
- *
- * Core in:
- *
- * OpenGLES  : 3.0
- */
-GLuint rglGetUniformBlockIndex( 	GLuint program,
-  	const GLchar *uniformBlockName)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   return glGetUniformBlockIndex(program, uniformBlockName);
-#else
-   printf("WARNING! Not implemented.\n");
-   return 0;
-#endif
-}
-
-/*
- * Category: UBO
- *
- * Core in:
- *
- * OpenGLES  : 3.0
- */
-void rglUniformBlockBinding( 	GLuint program,
-  	GLuint uniformBlockIndex,
-  	GLuint uniformBlockBinding)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glUniformBlockBinding(program, uniformBlockIndex,
-         uniformBlockBinding);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- * OpenGLES  : 3.0
- */
-void rglUniform1ui(GLint location, GLuint v)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glUniform1ui(location ,v);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- * OpenGLES  : 3.0
- */
-void rglUniform2ui(GLint location, GLuint v0, GLuint v1)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glUniform2ui(location, v0, v1);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- * OpenGLES  : 3.0
- */
-void rglUniform3ui(GLint location, GLuint v0, GLuint v1, GLuint v2)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glUniform3ui(location, v0, v1, v2);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- * OpenGLES  : 3.0
- */
-void rglUniform4ui(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glUniform4ui(location, v0, v1, v2, v3);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
-      const GLfloat *value)
-{
-   glUniformMatrix4fv(location, count, transpose, value);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglDetachShader(GLuint program, GLuint shader)
-{
-   glDetachShader(program, shader);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglGetShaderiv(GLuint shader, GLenum pname, GLint *params)
-{
-   glGetShaderiv(shader, pname, params);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglAttachShader(GLuint program, GLuint shader)
-{
-   glAttachShader(program, shader);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-GLint rglGetAttribLocation(GLuint program, const GLchar *name)
-{
-   return glGetAttribLocation(program, name);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglShaderSource(GLuint shader, GLsizei count,
-      const GLchar **string, const GLint *length)
-{
-   return glShaderSource(shader, count, string, length);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglCompileShader(GLuint shader)
-{
-   glCompileShader(shader);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-GLuint rglCreateProgram(void)
-{
-   return glCreateProgram();
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.1 
- */
-void rglGenTextures(GLsizei n, GLuint *textures)
-{
-   glGenTextures(n, textures);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglGetShaderInfoLog(GLuint shader, GLsizei maxLength,
-      GLsizei *length, GLchar *infoLog)
-{
-   glGetShaderInfoLog(shader, maxLength, length, infoLog);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglGetProgramInfoLog(GLuint shader, GLsizei maxLength,
-      GLsizei *length, GLchar *infoLog)
-{
-   glGetProgramInfoLog(shader, maxLength, length, infoLog);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-GLboolean rglIsProgram(GLuint program)
-{
-   return glIsProgram(program);
-}
-
-
-void rglTexCoord2f(GLfloat s, GLfloat t)
-{
-#ifdef HAVE_LEGACY_GL
-   glTexCoord2f(s, t);
-#endif
-}
-
-/*
- * Category: Generic vertex attributes
- *
- * Core in:
- * OpenGL    : 2.0 
- *
- */
-void rglDisableVertexAttribArray(GLuint index)
-{
-   gl_state.vertex_attrib_pointer.enabled[index] = 0;
-   glDisableVertexAttribArray(index);
-}
-
-/*
- * Category: Generic vertex attributes
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglEnableVertexAttribArray(GLuint index)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   gl_state.vertex_attrib_pointer.enabled[index] = 1;
-   glEnableVertexAttribArray(index);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglVertexAttribIPointer(
-      GLuint index,
-      GLint size,
-      GLenum type,
-      GLsizei stride,
-      const GLvoid * pointer)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glVertexAttribIPointer(index, size, type, stride, pointer);
-#endif
-}
-
-void rglVertexAttribLPointer(
-      GLuint index,
-      GLint size,
-      GLenum type,
-      GLsizei stride,
-      const GLvoid * pointer)
-{
-#if defined(HAVE_OPENGL)
-   glVertexAttribLPointer(index, size, type, stride, pointer);
-#endif
-}
-
-/*
- * Category: Generic vertex attributes
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglVertexAttribPointer(GLuint name, GLint size,
-      GLenum type, GLboolean normalized, GLsizei stride,
-      const GLvoid* pointer)
-{
-   gl_state.attrib_pointer.used[name] = 1;
-   gl_state.attrib_pointer.size[name] = size;
-   gl_state.attrib_pointer.type[name] = type;
-   gl_state.attrib_pointer.normalized[name] = normalized;
-   gl_state.attrib_pointer.stride[name] = stride;
-   gl_state.attrib_pointer.pointer[name] = pointer;
-   gl_state.attrib_pointer.buffer[name] = gl_state.array_buffer;
-   glVertexAttribPointer(name, size, type, normalized, stride, pointer);
-}
-
-/*
- * Category: Generic vertex attributes
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglBindAttribLocation(GLuint program, GLuint index, const GLchar *name)
-{
-   glBindAttribLocation(program, index, name);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglVertexAttrib4f(GLuint name, GLfloat x, GLfloat y,
-      GLfloat z, GLfloat w)
-{
-    glVertexAttrib4f(name, x, y, z, w);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglVertexAttrib4fv(GLuint name, GLfloat* v)
-{
-    glVertexAttrib4fv(name, v);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-GLuint rglCreateShader(GLenum shaderType)
-{
-   return glCreateShader(shaderType);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglDeleteProgram(GLuint program)
-{
-   glDeleteProgram(program);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglDeleteShader(GLuint shader)
-{
-   glDeleteShader(shader);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-GLint rglGetUniformLocation(GLuint program, const GLchar *name)
-{
-   return glGetUniformLocation(program, name);
-}
-
-/*
- * Category: VBO and PBO
- *
- * Core in:
- * OpenGL    : 1.5 
- */
-void rglDeleteBuffers(GLsizei n, const GLuint *buffers)
-{
-   glDeleteBuffers(n, buffers);
-}
-
-/*
- * Category: VBO and PBO
- *
- * Core in:
- * OpenGL    : 1.5 
- */
-void rglGenBuffers(GLsizei n, GLuint *buffers)
-{
-   glGenBuffers(n, buffers);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform1f(GLint location, GLfloat v0)
-{
-   glUniform1f(location, v0);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform1fv(GLint location,  GLsizei count,  const GLfloat *value)
-{
-   glUniform1fv(location, count, value);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform1iv(GLint location,  GLsizei count,  const GLint *value)
-{
-   glUniform1iv(location, count, value);
-}
-
-void rglClearBufferfv( 	GLenum buffer,
-  	GLint drawBuffer,
-  	const GLfloat * value)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES_3)
-   glClearBufferfv(buffer, drawBuffer, value);
-#endif
-}
-
-void rglTexBuffer(GLenum target, GLenum internalFormat, GLuint buffer)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES_3_2)
-   glTexBuffer(target, internalFormat, buffer);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- * OpenGLES  : 3.0
- */
-const GLubyte* rglGetStringi(GLenum name, GLuint index)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES_3)
-   return glGetStringi(name, index);
-#else
-   return NULL;
-#endif
-}
-
-void rglClearBufferfi( 	GLenum buffer,
-  	GLint drawBuffer,
-  	GLfloat depth,
-  	GLint stencil)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES_3)
-   glClearBufferfi(buffer, drawBuffer, depth, stencil);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 3.0 
- * OpenGLES  : 3.0
- */
-void rglRenderbufferStorageMultisample( 	GLenum target,
-  	GLsizei samples,
-  	GLenum internalformat,
-  	GLsizei width,
-  	GLsizei height)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES_3)
-   glRenderbufferStorageMultisample(target, samples, internalformat, width, height);
-#endif
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform1i(GLint location, GLint v0)
-{
-   glUniform1i(location, v0);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform2f(GLint location, GLfloat v0, GLfloat v1)
-{
-   glUniform2f(location, v0, v1);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform2i(GLint location, GLint v0, GLint v1)
-{
-   glUniform2i(location, v0, v1);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform2fv(GLint location, GLsizei count, const GLfloat *value)
-{
-   glUniform2fv(location, count, value);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform3f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2)
-{
-   glUniform3f(location, v0, v1, v2);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform3fv(GLint location, GLsizei count, const GLfloat *value)
-{
-   glUniform3fv(location, count, value);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0
- */
-void rglUniform4i(GLint location, GLint v0, GLint v1, GLint v2, GLint v3)
-{
-   glUniform4i(location, v0, v1, v2, v3);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform4f(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3)
-{
-   glUniform4f(location, v0, v1, v2, v3);
-}
-
-/*
- * Category: Shaders
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglUniform4fv(GLint location, GLsizei count, const GLfloat *value)
-{
-   glUniform4fv(location, count, value);
-}
-
-
-/*
- *
- * Core in:
- * OpenGL    : 1.0 
- */
-void rglPolygonOffset(GLfloat factor, GLfloat units)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glPolygonOffset(factor, units);
-   gl_state.polygonoffset.used   = true;
-   gl_state.polygonoffset.factor = factor;
-   gl_state.polygonoffset.units  = units;
-}
-
-/*
- * Category: FBO
- *
- * Core in:
- * OpenGL    : 3.0 
- */
-void rglGenFramebuffers(GLsizei n, GLuint *ids)
-{
-   glGenFramebuffers(n, ids);
-}
-
-/*
- * Category: FBO
- *
- * Core in:
- * OpenGL    : 3.0 
- */
-void rglBindFramebuffer(GLenum target, GLuint framebuffer)
-{
-   glsm_ctl(GLSM_CTL_IMM_VBO_DRAW, NULL);
-   glBindFramebuffer(target, framebuffer);
-   gl_state.framebuf = framebuffer;
-}
-
-/*
- * Category: FBO
- *
- * Core in:
- * OpenGL    : 2.0 
- * OpenGLES  : 3.0
- */
-void rglDrawBuffers(GLsizei n, const GLenum *bufs)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glDrawBuffers(n, bufs);
-#endif
-}
-
-/*
- * Category: FBO
- *
- * Core in:
- * OpenGL    : 2.0 
- * OpenGLES  : 3.0
- */
-void *rglMapBufferRange( 	GLenum target,
-  	GLintptr offset,
-  	GLsizeiptr length,
-  	GLbitfield access)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   return glMapBufferRange(target, offset, length, access);
-#else
-   printf("WARNING! Not implemented.\n");
-   return NULL;
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 4.3
- * OpenGLES  : 3.1
- */
-void rglTexStorage2DMultisample(GLenum target, GLsizei samples,
-      GLenum internalformat, GLsizei width, GLsizei height,
-      GLboolean fixedsamplelocations)
-{
-#if defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES_3_1)
-   glTexStorage2DMultisample(target, samples, internalformat,
-         width, height, fixedsamplelocations);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGLES  : 3.0
- */
-void rglTexStorage2D(GLenum target, GLsizei levels, GLenum internalFormat,
-      GLsizei width, GLsizei height)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glTexStorage2D(target, levels, internalFormat, width, height);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 4.2 
- * OpenGLES  : 3.1
- */
-void rglMemoryBarrier( 	GLbitfield barriers)
-{
-#if !defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES3) && defined(HAVE_OPENGLES_3_1)
-   glMemoryBarrier(barriers);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 4.2 
- * OpenGLES  : 3.1
- */
-void rglBindImageTexture( 	GLuint unit,
-  	GLuint texture,
-  	GLint level,
-  	GLboolean layered,
-  	GLint layer,
-  	GLenum access,
-  	GLenum format)
-{
-#if !defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES3) && defined(HAVE_OPENGLES_3_1)
-   glBindImageTexture(unit, texture, level, layered, layer, access, format);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 4.1
- * OpenGLES  : 3.1
- */
-void rglGetProgramBinary( 	GLuint program,
-  	GLsizei bufsize,
-  	GLsizei *length,
-  	GLenum *binaryFormat,
-  	void *binary)
-{
-#if !defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glGetProgramBinary(program, bufsize, length, binaryFormat, binary);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 4.1
- * OpenGLES  : 3.1
- */
-void rglProgramBinary(GLuint program,
-  	GLenum binaryFormat,
-  	const void *binary,
-  	GLsizei length)
-{
-#if !defined(HAVE_OPENGLES) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES_3_1)
-   glProgramBinary(program, binaryFormat, binary, length);
-#else
-   printf("WARNING! Not implemented.\n");
-#endif
-}
-
-void rglTexImage2DMultisample( 	GLenum target,
-  	GLsizei samples,
-  	GLenum internalformat,
-  	GLsizei width,
-  	GLsizei height,
-  	GLboolean fixedsamplelocations)
-{
-#ifndef HAVE_OPENGLES
-   glTexImage2DMultisample(target, samples, internalformat, width, height, fixedsamplelocations);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.5 
- */
-void * rglMapBuffer(	GLenum target, GLenum access)
-{
-#if defined(HAVE_OPENGLES)
-   return glMapBufferOES(target, access);
-#else
-   return glMapBuffer(target, access);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 1.5 
- */
-GLboolean rglUnmapBuffer( 	GLenum target)
-{
-#if defined(HAVE_OPENGLES)
-   return glUnmapBufferOES(target);
-#else
-   return glUnmapBuffer(target);
-#endif
-}
-
-void rglBlendEquation(GLenum mode)
-{
-   glBlendEquation(mode);
-}
-
-void rglBlendColor(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
-{
-   glBlendColor(red, green, blue, alpha);
-}
-
-/*
- * Category: Blending
- *
- * Core in:
- * OpenGL    : 2.0 
- */
-void rglBlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha)
-{
-   glBlendEquationSeparate(modeRGB, modeAlpha);
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 2.0 
- * OpenGLES  : 3.2
- */
-void rglCopyImageSubData( 	GLuint srcName,
-  	GLenum srcTarget,
-  	GLint srcLevel,
-  	GLint srcX,
-  	GLint srcY,
-  	GLint srcZ,
-  	GLuint dstName,
-  	GLenum dstTarget,
-  	GLint dstLevel,
-  	GLint dstX,
-  	GLint dstY,
-  	GLint dstZ,
-  	GLsizei srcWidth,
-  	GLsizei srcHeight,
-  	GLsizei srcDepth)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES_3_2)
-   glCopyImageSubData(srcName,
-         srcTarget,
-         srcLevel,
-         srcX,
-         srcY,
-         srcZ,
-         dstName,
-         dstTarget,
-         dstLevel,
-         dstX,
-         dstY,
-         dstZ,
-         srcWidth,
-         srcHeight,
-         srcDepth);
-#endif
-}
-
-/*
- * Category: VAO
- *
- * Core in:
- * OpenGL    : 3.0 
- * OpenGLES  : 3.0
- */
-void rglBindVertexArray(GLuint array)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glBindVertexArray(array);
-#endif
-}
-
-/*
- * Category: VAO
- *
- * Core in:
- * OpenGL    : 3.0 
- * OpenGLES  : 3.0
- */
-void rglGenVertexArrays(GLsizei n, GLuint *arrays)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glGenVertexArrays(n, arrays);
-#endif
-}
-
-/*
- * Category: VAO
- *
- * Core in:
- * OpenGL    : 3.0 
- * OpenGLES  : 3.0
- */
-void rglDeleteVertexArrays(GLsizei n, const GLuint *arrays)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glDeleteVertexArrays(n, arrays);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 3.2
- * OpenGLES  : 3.0
- */
-void *rglFenceSync(GLenum condition, GLbitfield flags)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   return (GLsync)glFenceSync(condition, flags);
-#else
-   return NULL;
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 3.2
- * OpenGLES  : 3.0
- */
-void rglDeleteSync(void * sync)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-  glDeleteSync((GLsync)sync);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 3.2
- * OpenGLES  : 3.0
- */
-void rglWaitSync(void *sync, GLbitfield flags, uint64_t timeout)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glWaitSync((GLsync)sync, flags, (GLuint64)timeout);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 4.4
- * OpenGLES  : Not available
- */
-void rglBufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitfield flags) {
-#if defined(HAVE_OPENGL)
-  glBufferStorage(target, size, data, flags);
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 3.0
- * OpenGLES  : 3.0
- */
-void rglFlushMappedBufferRange(GLenum target, GLintptr offset, GLsizeiptr length) {
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-  glFlushMappedBufferRange(target, offset, length);
-#endif
-}
-
-#ifndef GL_WAIT_FAILED
-#define GL_WAIT_FAILED                                   0x911D
-#endif
-
-/*
- *
- * Core in:
- * OpenGL    : 3.2
- * OpenGLES  : 3.0
- */
-GLenum rglClientWaitSync(void *sync, GLbitfield flags, uint64_t timeout)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-  return glClientWaitSync((GLsync)sync, flags, (GLuint64)timeout);
-#else
-  return GL_WAIT_FAILED;
-#endif
-}
-
-/*
- *
- * Core in:
- * OpenGL    : 3.2
- * OpenGLES  : Not available
- */
-void rglDrawElementsBaseVertex(GLenum mode, GLsizei count, GLenum type,
-			       GLvoid *indices, GLint basevertex) {
-#if defined(HAVE_OPENGL)
-  glDrawElementsBaseVertex(mode, count, type, indices, basevertex);
-#endif
-}
-
-/* GLSM-side */
-
-static void glsm_state_setup(void)
-{
-   unsigned i;
-
-   gl_state.cap_translate[SGL_DEPTH_TEST]           = GL_DEPTH_TEST;
-   gl_state.cap_translate[SGL_BLEND]                = GL_BLEND;
-   gl_state.cap_translate[SGL_POLYGON_OFFSET_FILL]  = GL_POLYGON_OFFSET_FILL;
-   gl_state.cap_translate[SGL_FOG]                  = GL_FOG;
-   gl_state.cap_translate[SGL_CULL_FACE]            = GL_CULL_FACE;
-   gl_state.cap_translate[SGL_ALPHA_TEST]           = GL_ALPHA_TEST;
-   gl_state.cap_translate[SGL_SCISSOR_TEST]         = GL_SCISSOR_TEST;
-   gl_state.cap_translate[SGL_STENCIL_TEST]         = GL_STENCIL_TEST;
-
-#ifndef HAVE_OPENGLES
-   gl_state.cap_translate[SGL_COLOR_LOGIC_OP]       = GL_COLOR_LOGIC_OP;
-   gl_state.cap_translate[SGL_CLIP_DISTANCE0]       = GL_CLIP_DISTANCE0;
-   gl_state.cap_translate[SGL_DEPTH_CLAMP]          = GL_DEPTH_CLAMP;
-#endif
-
-   for (i = 0; i < MAX_ATTRIB; i++)
-   {
-      gl_state.vertex_attrib_pointer.enabled[i] = 0;
-      gl_state.attrib_pointer.used[i] = 0;
-   }
-
-   glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &glsm_max_textures);
-
-   gl_state.bind_textures.ids           = (GLuint*)calloc(glsm_max_textures, sizeof(GLuint));
-
-   gl_state.framebuf                    = hw_render.get_current_framebuffer();
-   gl_state.cullface.mode               = GL_BACK;
-   gl_state.frontface.mode              = GL_CCW; 
-
-   gl_state.blendfunc_separate.used     = false;
-   gl_state.blendfunc_separate.srcRGB   = GL_ONE;
-   gl_state.blendfunc_separate.dstRGB   = GL_ZERO;
-   gl_state.blendfunc_separate.srcAlpha = GL_ONE;
-   gl_state.blendfunc_separate.dstAlpha = GL_ZERO;
-
-   gl_state.depthfunc.used              = false;
-   
-   gl_state.colormask.used              = false;
-   gl_state.colormask.red               = GL_TRUE;
-   gl_state.colormask.green             = GL_TRUE;
-   gl_state.colormask.blue              = GL_TRUE;
-   gl_state.colormask.alpha             = GL_TRUE;
-
-   gl_state.polygonoffset.used          = false;
-
-   gl_state.depthfunc.func              = GL_LESS;
-
-#ifndef HAVE_OPENGLES
-   gl_state.colorlogicop                = GL_COPY;
-#endif
-
-#ifdef CORE
-   glGenVertexArrays(1, &gl_state.vao);
-#endif
-}
-
-static void glsm_state_bind(void)
-{
-   unsigned i;
-#ifdef CORE
-   glBindVertexArray(gl_state.vao);
-#endif
-   glBindBuffer(GL_ARRAY_BUFFER, gl_state.array_buffer);
-
-   for (i = 0; i < MAX_ATTRIB; i++)
-   {
-      if (gl_state.vertex_attrib_pointer.enabled[i])
-         glEnableVertexAttribArray(i);
-      else
-         glDisableVertexAttribArray(i);
-
-      if (gl_state.attrib_pointer.used[i] && gl_state.attrib_pointer.buffer[i] == gl_state.array_buffer)
-      {
-         glVertexAttribPointer(
-               i,
-               gl_state.attrib_pointer.size[i],
-               gl_state.attrib_pointer.type[i],
-               gl_state.attrib_pointer.normalized[i],
-               gl_state.attrib_pointer.stride[i],
-               gl_state.attrib_pointer.pointer[i]);
-      }
-   }
-
-   glBindFramebuffer(RARCH_GL_FRAMEBUFFER, hw_render.get_current_framebuffer());
-
-   if (gl_state.blendfunc.used)
-      glBlendFunc(
-            gl_state.blendfunc.sfactor,
-            gl_state.blendfunc.dfactor);
-
-   if (gl_state.blendfunc_separate.used)
-      glBlendFuncSeparate(
-            gl_state.blendfunc_separate.srcRGB,
-            gl_state.blendfunc_separate.dstRGB,
-            gl_state.blendfunc_separate.srcAlpha,
-            gl_state.blendfunc_separate.dstAlpha
-            );
-
-   glClearColor(
-         gl_state.clear_color.r,
-         gl_state.clear_color.g,
-         gl_state.clear_color.b,
-         gl_state.clear_color.a);
-
-   if (gl_state.depthfunc.used)
-      glDepthFunc(gl_state.depthfunc.func);
-
-   if (gl_state.colormask.used)
-      glColorMask(
-            gl_state.colormask.red,
-            gl_state.colormask.green,
-            gl_state.colormask.blue,
-            gl_state.colormask.alpha);
-
-   if (gl_state.cullface.used)
-      glCullFace(gl_state.cullface.mode);
-
-   if (gl_state.depthmask.used)
-      glDepthMask(gl_state.depthmask.mask);
-
-   if (gl_state.polygonoffset.used)
-      glPolygonOffset(
-            gl_state.polygonoffset.factor,
-            gl_state.polygonoffset.units);
-
-   if (gl_state.scissor.used)
-      glScissor(
-            gl_state.scissor.x,
-            gl_state.scissor.y,
-            gl_state.scissor.w,
-            gl_state.scissor.h);
-
-   glUseProgram(gl_state.program);
-
-   glViewport(
-         gl_state.viewport.x,
-         gl_state.viewport.y,
-         gl_state.viewport.w,
-         gl_state.viewport.h);
-
-   for(i = 0; i < SGL_CAP_MAX; i ++)
-   {
-      if (gl_state.cap_state[i])
-         glEnable(gl_state.cap_translate[i]);
-   }
-
-   if (gl_state.frontface.used)
-      glFrontFace(gl_state.frontface.mode);
-
-   if (gl_state.stencilmask.used)
-      glStencilMask(gl_state.stencilmask.mask);
-
-   if (gl_state.stencilop.used)
-      glStencilOp(gl_state.stencilop.sfail,
-            gl_state.stencilop.dpfail,
-            gl_state.stencilop.dppass);
-
-   if (gl_state.stencilfunc.used)
-      glStencilFunc(
-            gl_state.stencilfunc.func,
-            gl_state.stencilfunc.ref,
-            gl_state.stencilfunc.mask);
-
-   for (i = 0; i < glsm_max_textures; i ++)
-   {
-      glActiveTexture(GL_TEXTURE0 + i);
-      glBindTexture(GL_TEXTURE_2D, gl_state.bind_textures.ids[i]);
-   }
-
-   glActiveTexture(GL_TEXTURE0 + gl_state.active_texture);
-}
-
-static void glsm_state_unbind(void)
-{
-   unsigned i;
-#ifdef CORE
-   glBindVertexArray(0);
-#endif
-   for (i = 0; i < SGL_CAP_MAX; i ++)
-   {
-      if (gl_state.cap_state[i])
-         glDisable(gl_state.cap_translate[i]);
-   }
-
-   glBlendFunc(GL_ONE, GL_ZERO);
-
-   if (gl_state.colormask.used)
-      glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
-   if (gl_state.blendfunc_separate.used)
-      glBlendFuncSeparate(GL_ONE, GL_ZERO, GL_ONE, GL_ZERO);
-
-   if (gl_state.cullface.used)
-      glCullFace(GL_BACK);
-
-   if (gl_state.depthmask.used)
-      glDepthMask(GL_TRUE);
-
-   if (gl_state.polygonoffset.used)
-      glPolygonOffset(0, 0);
-
-   glUseProgram(0);
-   glClearColor(0,0,0,0.0f);
-
-   if (gl_state.depthrange.used)
-      rglDepthRange(0, 1);
-
-   glStencilMask(1);
-   glFrontFace(GL_CCW);
-   if (gl_state.depthfunc.used)
-      glDepthFunc(GL_LESS);
-
-   if (gl_state.stencilop.used)
-      glStencilOp(GL_KEEP,GL_KEEP, GL_KEEP);
-
-   if (gl_state.stencilfunc.used)
-      glStencilFunc(GL_ALWAYS,0,1);
-
-   /* Clear textures */
-   for (i = 0; i < glsm_max_textures; i ++)
-   {
-      glActiveTexture(GL_TEXTURE0 + i);
-      glBindTexture(GL_TEXTURE_2D, 0);
-   }
-   glActiveTexture(GL_TEXTURE0);
-
-   for (i = 0; i < MAX_ATTRIB; i ++)
-      glDisableVertexAttribArray(i);
-
-   glBindFramebuffer(RARCH_GL_FRAMEBUFFER, 0);
-}
-
-static bool glsm_state_ctx_destroy(void *data)
-{
-   if (gl_state.bind_textures.ids)
-      free(gl_state.bind_textures.ids);
-   gl_state.bind_textures.ids = NULL;
-
-   return true;
-}
-
-static bool glsm_state_ctx_init(void *data)
-{
-   glsm_ctx_params_t *params = (glsm_ctx_params_t*)data;
-
-   if (!params || !params->environ_cb)
-      return false;
-
-#ifdef HAVE_OPENGLES
-#if defined(HAVE_OPENGLES_3_1)
-   hw_render.context_type       = RETRO_HW_CONTEXT_OPENGLES_VERSION;
-   hw_render.version_major      = 3;
-   hw_render.version_minor      = 1;
-#elif defined(HAVE_OPENGLES3)
-   hw_render.context_type       = RETRO_HW_CONTEXT_OPENGLES3;
-#else
-   hw_render.context_type       = RETRO_HW_CONTEXT_OPENGLES2;
-#endif
-#else
-#ifdef CORE
-   hw_render.context_type       = RETRO_HW_CONTEXT_OPENGL_CORE;
-   hw_render.version_major      = 3;
-   hw_render.version_minor      = 1;
-#else
-   hw_render.context_type       = RETRO_HW_CONTEXT_OPENGL;
-#endif
-#endif
-   hw_render.context_reset      = params->context_reset;
-   hw_render.context_destroy    = params->context_destroy;
-   hw_render.stencil            = params->stencil;
-   hw_render.depth              = true;
-   hw_render.bottom_left_origin = true;
-   hw_render.cache_context      = true;
-
-   if (!params->environ_cb(RETRO_ENVIRONMENT_SET_HW_RENDER, &hw_render))
-      return false;
-
-   return true;
-}
-
-GLuint glsm_get_current_framebuffer(void)
-{
-   return hw_render.get_current_framebuffer();
-}
-
-bool glsm_ctl(enum glsm_state_ctl state, void *data)
-{
-   switch (state)
-   {
-      case GLSM_CTL_IMM_VBO_DRAW:
-         return false;
-      case GLSM_CTL_IMM_VBO_DISABLE:
-         return false;
-      case GLSM_CTL_IS_IMM_VBO:
-         return false;
-      case GLSM_CTL_SET_IMM_VBO:
-         break;
-      case GLSM_CTL_UNSET_IMM_VBO:
-         break;
-      case GLSM_CTL_PROC_ADDRESS_GET:
-         {
-            glsm_ctx_proc_address_t *proc = (glsm_ctx_proc_address_t*)data;
-            if (!hw_render.get_proc_address)
-               return false;
-            proc->addr = hw_render.get_proc_address;
-         }
-         break;
-      case GLSM_CTL_STATE_CONTEXT_RESET:
-         rglgen_resolve_symbols(hw_render.get_proc_address);
-         break;
-      case GLSM_CTL_STATE_CONTEXT_DESTROY:
-         glsm_state_ctx_destroy(data);
-         break;
-      case GLSM_CTL_STATE_CONTEXT_INIT:
-         return glsm_state_ctx_init(data);
-      case GLSM_CTL_STATE_SETUP:
-         glsm_state_setup();
-         break;
-      case GLSM_CTL_STATE_UNBIND:
-         glsm_state_unbind();
-         break;
-      case GLSM_CTL_STATE_BIND:
-         glsm_state_bind();
-         break;
-      case GLSM_CTL_NONE:
-      default:
-         break;
-   }
-
-   return true;
-}
diff --git a/libretro-common/glsym/README.md b/libretro-common/glsym/README.md
deleted file mode 100644
index 9e4f0e8..0000000
--- a/libretro-common/glsym/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerate GL extension loaders
-
-## OpenGL desktop
-
-Use Khronos' recent [header](www.opengl.org/registry/api/glext.h).
-
-    ./glgen.py /usr/include/GL/glext.h glsym_gl.h glsym_gl.c
-
-## OpenGL ES
-
-    ./glgen.py /usr/include/GLES2/gl2ext.h glsym_es2.h glsym_es2.c
-
diff --git a/libretro-common/glsym/glgen.py b/libretro-common/glsym/glgen.py
deleted file mode 100644
index 3e2c810..0000000
--- a/libretro-common/glsym/glgen.py
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-   License statement applies to this file (glgen.py) only.
-""" 
-
-"""
-   Permission is hereby granted, free of charge,
-   to any person obtaining a copy of this software and associated documentation files (the "Software"),
-   to deal in the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-   INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""
-
-import sys
-import os
-import re
-
-banned_ext = [ 'AMD', 'APPLE', 'NV', 'NVX', 'ATI', '3DLABS', 'SUN', 'SGI', 'SGIX', 'SGIS', 'INTEL', '3DFX', 'IBM', 'MESA', 'GREMEDY', 'OML', 'PGI', 'I3D', 'INGL', 'MTX', 'QCOM', 'IMG', 'ANGLE', 'SUNX', 'INGR' ]
-
-def noext(sym):
-   for ext in banned_ext:
-      if sym.endswith(ext):
-         return False
-   return True
-
-def find_gl_symbols(lines):
-   typedefs = []
-   syms = []
-   for line in lines:
-      m = re.search(r'^typedef.+PFN(\S+)PROC.+$', line)
-      g = re.search(r'^.+(gl\S+)\W*\(.+\).*$', line)
-      if m and noext(m.group(1)):
-         typedefs.append(m.group(0).replace('PFN', 'RGLSYM').replace('GLDEBUGPROC', 'RGLGENGLDEBUGPROC'))
-      if g and noext(g.group(1)):
-         syms.append(g.group(1))
-   return (typedefs, syms)
-
-def generate_defines(gl_syms):
-   res = []
-   for line in gl_syms:
-      res.append('#define {} __rglgen_{}'.format(line, line))
-   return res
-
-def generate_declarations(gl_syms):
-   return ['RGLSYM' + x.upper() + 'PROC ' + '__rglgen_' + x + ';' for x in gl_syms]
-
-def generate_macros(gl_syms):
-   return ['    SYM(' + x.replace('gl', '') + '),' for x in gl_syms]
-
-def dump(f, lines):
-   f.write('\n'.join(lines))
-   f.write('\n\n')
-
-if __name__ == '__main__':
-
-   if len(sys.argv) > 4:
-      for banned in sys.argv[4:]:
-         banned_ext.append(banned)
-
-   with open(sys.argv[1], 'r') as f:
-      lines = f.readlines()
-      typedefs, syms = find_gl_symbols(lines)
-
-      overrides = generate_defines(syms)
-      declarations = generate_declarations(syms)
-      externs = ['extern ' + x for x in declarations]
-
-      macros = generate_macros(syms)
-
-   with open(sys.argv[2], 'w') as f:
-      f.write('#ifndef RGLGEN_DECL_H__\n')
-      f.write('#define RGLGEN_DECL_H__\n')
-
-      f.write('#ifdef __cplusplus\n')
-      f.write('extern "C" {\n')
-      f.write('#endif\n')
-
-      f.write('#ifdef GL_APIENTRY\n')
-      f.write('typedef void (GL_APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);\n')
-      f.write('typedef void (GL_APIENTRY *RGLGENGLDEBUGPROCKHR)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);\n')
-      f.write('#else\n')
-      f.write('#ifndef APIENTRY\n')
-      f.write('#define APIENTRY\n')
-      f.write('#endif\n')
-      f.write('#ifndef APIENTRYP\n')
-      f.write('#define APIENTRYP APIENTRY *\n')
-      f.write('#endif\n')
-      f.write('typedef void (APIENTRY *RGLGENGLDEBUGPROCARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);\n')
-      f.write('typedef void (APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);\n')
-      f.write('#endif\n')
-
-      f.write('#ifndef GL_OES_EGL_image\n')
-      f.write('typedef void *GLeglImageOES;\n')
-      f.write('#endif\n')
-
-      f.write('#if !defined(GL_OES_fixed_point) && !defined(HAVE_OPENGLES2)\n')
-      f.write('typedef GLint GLfixed;\n')
-      f.write('#endif\n')
-
-      dump(f, typedefs)
-      dump(f, overrides)
-      dump(f, externs)
-
-      f.write('struct rglgen_sym_map { const char *sym; void *ptr; };\n')
-      f.write('extern const struct rglgen_sym_map rglgen_symbol_map[];\n')
-
-      f.write('#ifdef __cplusplus\n')
-      f.write('}\n')
-      f.write('#endif\n')
-
-      f.write('#endif\n')
-
-   with open(sys.argv[3], 'w') as f:
-      f.write('#include "glsym/glsym.h"\n')
-      f.write('#include <stddef.h>\n')
-      f.write('#define SYM(x) { "gl" #x, &(gl##x) }\n')
-      f.write('const struct rglgen_sym_map rglgen_symbol_map[] = {\n')
-      dump(f, macros)
-      f.write('    { NULL, NULL },\n')
-      f.write('};\n')
-      dump(f, declarations)
-
diff --git a/libretro-common/glsym/glsym_es2.c b/libretro-common/glsym/glsym_es2.c
deleted file mode 100644
index 8515549..0000000
--- a/libretro-common/glsym/glsym_es2.c
+++ /dev/null
@@ -1,410 +0,0 @@
-#include "glsym/glsym.h"
-#include <stddef.h>
-#define SYM(x) { "gl" #x, &(gl##x) }
-const struct rglgen_sym_map rglgen_symbol_map[] = {
-    SYM(BlendBarrierKHR),
-    SYM(DebugMessageControlKHR),
-    SYM(DebugMessageInsertKHR),
-    SYM(DebugMessageCallbackKHR),
-    SYM(GetDebugMessageLogKHR),
-    SYM(PushDebugGroupKHR),
-    SYM(PopDebugGroupKHR),
-    SYM(ObjectLabelKHR),
-    SYM(GetObjectLabelKHR),
-    SYM(ObjectPtrLabelKHR),
-    SYM(GetObjectPtrLabelKHR),
-    SYM(GetPointervKHR),
-    SYM(GetGraphicsResetStatusKHR),
-    SYM(ReadnPixelsKHR),
-    SYM(GetnUniformfvKHR),
-    SYM(GetnUniformivKHR),
-    SYM(GetnUniformuivKHR),
-    SYM(EGLImageTargetTexture2DOES),
-    SYM(EGLImageTargetRenderbufferStorageOES),
-    SYM(CopyImageSubDataOES),
-    SYM(EnableiOES),
-    SYM(DisableiOES),
-    SYM(BlendEquationiOES),
-    SYM(BlendEquationSeparateiOES),
-    SYM(BlendFunciOES),
-    SYM(BlendFuncSeparateiOES),
-    SYM(ColorMaskiOES),
-    SYM(IsEnablediOES),
-    SYM(DrawElementsBaseVertexOES),
-    SYM(DrawRangeElementsBaseVertexOES),
-    SYM(DrawElementsInstancedBaseVertexOES),
-    SYM(MultiDrawElementsBaseVertexOES),
-    SYM(FramebufferTextureOES),
-    SYM(GetProgramBinaryOES),
-    SYM(ProgramBinaryOES),
-    SYM(MapBufferOES),
-    SYM(UnmapBufferOES),
-    SYM(GetBufferPointervOES),
-    SYM(PrimitiveBoundingBoxOES),
-    SYM(MinSampleShadingOES),
-    SYM(PatchParameteriOES),
-    SYM(TexImage3DOES),
-    SYM(TexSubImage3DOES),
-    SYM(CopyTexSubImage3DOES),
-    SYM(CompressedTexImage3DOES),
-    SYM(CompressedTexSubImage3DOES),
-    SYM(FramebufferTexture3DOES),
-    SYM(TexParameterIivOES),
-    SYM(TexParameterIuivOES),
-    SYM(GetTexParameterIivOES),
-    SYM(GetTexParameterIuivOES),
-    SYM(SamplerParameterIivOES),
-    SYM(SamplerParameterIuivOES),
-    SYM(GetSamplerParameterIivOES),
-    SYM(GetSamplerParameterIuivOES),
-    SYM(TexBufferOES),
-    SYM(TexBufferRangeOES),
-    SYM(TexStorage3DMultisampleOES),
-    SYM(TextureViewOES),
-    SYM(BindVertexArrayOES),
-    SYM(DeleteVertexArraysOES),
-    SYM(GenVertexArraysOES),
-    SYM(IsVertexArrayOES),
-    SYM(ViewportArrayvOES),
-    SYM(ViewportIndexedfOES),
-    SYM(ViewportIndexedfvOES),
-    SYM(ScissorArrayvOES),
-    SYM(ScissorIndexedOES),
-    SYM(ScissorIndexedvOES),
-    SYM(DepthRangeArrayfvOES),
-    SYM(DepthRangeIndexedfOES),
-    SYM(GetFloati_vOES),
-    SYM(DrawArraysInstancedBaseInstanceEXT),
-    SYM(DrawElementsInstancedBaseInstanceEXT),
-    SYM(DrawElementsInstancedBaseVertexBaseInstanceEXT),
-    SYM(BindFragDataLocationIndexedEXT),
-    SYM(BindFragDataLocationEXT),
-    SYM(GetProgramResourceLocationIndexEXT),
-    SYM(GetFragDataIndexEXT),
-    SYM(BufferStorageEXT),
-    SYM(ClearTexImageEXT),
-    SYM(ClearTexSubImageEXT),
-    SYM(CopyImageSubDataEXT),
-    SYM(LabelObjectEXT),
-    SYM(GetObjectLabelEXT),
-    SYM(InsertEventMarkerEXT),
-    SYM(PushGroupMarkerEXT),
-    SYM(PopGroupMarkerEXT),
-    SYM(DiscardFramebufferEXT),
-    SYM(GenQueriesEXT),
-    SYM(DeleteQueriesEXT),
-    SYM(IsQueryEXT),
-    SYM(BeginQueryEXT),
-    SYM(EndQueryEXT),
-    SYM(QueryCounterEXT),
-    SYM(GetQueryivEXT),
-    SYM(GetQueryObjectivEXT),
-    SYM(GetQueryObjectuivEXT),
-    SYM(DrawBuffersEXT),
-    SYM(EnableiEXT),
-    SYM(DisableiEXT),
-    SYM(BlendEquationiEXT),
-    SYM(BlendEquationSeparateiEXT),
-    SYM(BlendFunciEXT),
-    SYM(BlendFuncSeparateiEXT),
-    SYM(ColorMaskiEXT),
-    SYM(IsEnablediEXT),
-    SYM(DrawElementsBaseVertexEXT),
-    SYM(DrawRangeElementsBaseVertexEXT),
-    SYM(DrawElementsInstancedBaseVertexEXT),
-    SYM(MultiDrawElementsBaseVertexEXT),
-    SYM(DrawArraysInstancedEXT),
-    SYM(DrawElementsInstancedEXT),
-    SYM(FramebufferTextureEXT),
-    SYM(VertexAttribDivisorEXT),
-    SYM(MapBufferRangeEXT),
-    SYM(FlushMappedBufferRangeEXT),
-    SYM(MultiDrawArraysEXT),
-    SYM(MultiDrawElementsEXT),
-    SYM(MultiDrawArraysIndirectEXT),
-    SYM(MultiDrawElementsIndirectEXT),
-    SYM(RenderbufferStorageMultisampleEXT),
-    SYM(FramebufferTexture2DMultisampleEXT),
-    SYM(ReadBufferIndexedEXT),
-    SYM(DrawBuffersIndexedEXT),
-    SYM(GetIntegeri_vEXT),
-    SYM(PolygonOffsetClampEXT),
-    SYM(PrimitiveBoundingBoxEXT),
-    SYM(RasterSamplesEXT),
-    SYM(GetGraphicsResetStatusEXT),
-    SYM(ReadnPixelsEXT),
-    SYM(GetnUniformfvEXT),
-    SYM(GetnUniformivEXT),
-    SYM(ActiveShaderProgramEXT),
-    SYM(BindProgramPipelineEXT),
-    SYM(CreateShaderProgramvEXT),
-    SYM(DeleteProgramPipelinesEXT),
-    SYM(GenProgramPipelinesEXT),
-    SYM(GetProgramPipelineInfoLogEXT),
-    SYM(GetProgramPipelineivEXT),
-    SYM(IsProgramPipelineEXT),
-    SYM(ProgramParameteriEXT),
-    SYM(ProgramUniform1fEXT),
-    SYM(ProgramUniform1fvEXT),
-    SYM(ProgramUniform1iEXT),
-    SYM(ProgramUniform1ivEXT),
-    SYM(ProgramUniform2fEXT),
-    SYM(ProgramUniform2fvEXT),
-    SYM(ProgramUniform2iEXT),
-    SYM(ProgramUniform2ivEXT),
-    SYM(ProgramUniform3fEXT),
-    SYM(ProgramUniform3fvEXT),
-    SYM(ProgramUniform3iEXT),
-    SYM(ProgramUniform3ivEXT),
-    SYM(ProgramUniform4fEXT),
-    SYM(ProgramUniform4fvEXT),
-    SYM(ProgramUniform4iEXT),
-    SYM(ProgramUniform4ivEXT),
-    SYM(ProgramUniformMatrix2fvEXT),
-    SYM(ProgramUniformMatrix3fvEXT),
-    SYM(ProgramUniformMatrix4fvEXT),
-    SYM(UseProgramStagesEXT),
-    SYM(ValidateProgramPipelineEXT),
-    SYM(ProgramUniform1uiEXT),
-    SYM(ProgramUniform2uiEXT),
-    SYM(ProgramUniform3uiEXT),
-    SYM(ProgramUniform4uiEXT),
-    SYM(ProgramUniform1uivEXT),
-    SYM(ProgramUniform2uivEXT),
-    SYM(ProgramUniform3uivEXT),
-    SYM(ProgramUniform4uivEXT),
-    SYM(ProgramUniformMatrix2x3fvEXT),
-    SYM(ProgramUniformMatrix3x2fvEXT),
-    SYM(ProgramUniformMatrix2x4fvEXT),
-    SYM(ProgramUniformMatrix4x2fvEXT),
-    SYM(ProgramUniformMatrix3x4fvEXT),
-    SYM(ProgramUniformMatrix4x3fvEXT),
-    SYM(FramebufferPixelLocalStorageSizeEXT),
-    SYM(GetFramebufferPixelLocalStorageSizeEXT),
-    SYM(ClearPixelLocalStorageuiEXT),
-    SYM(TexPageCommitmentEXT),
-    SYM(PatchParameteriEXT),
-    SYM(TexParameterIivEXT),
-    SYM(TexParameterIuivEXT),
-    SYM(GetTexParameterIivEXT),
-    SYM(GetTexParameterIuivEXT),
-    SYM(SamplerParameterIivEXT),
-    SYM(SamplerParameterIuivEXT),
-    SYM(GetSamplerParameterIivEXT),
-    SYM(GetSamplerParameterIuivEXT),
-    SYM(TexBufferEXT),
-    SYM(TexBufferRangeEXT),
-    SYM(TexStorage1DEXT),
-    SYM(TexStorage2DEXT),
-    SYM(TexStorage3DEXT),
-    SYM(TextureStorage1DEXT),
-    SYM(TextureStorage2DEXT),
-    SYM(TextureStorage3DEXT),
-    SYM(TextureViewEXT),
-    SYM(FramebufferTextureMultiviewOVR),
-    SYM(FramebufferTextureMultisampleMultiviewOVR),
-
-    { NULL, NULL },
-};
-RGLSYMGLBLENDBARRIERKHRPROC __rglgen_glBlendBarrierKHR;
-RGLSYMGLDEBUGMESSAGECONTROLKHRPROC __rglgen_glDebugMessageControlKHR;
-RGLSYMGLDEBUGMESSAGEINSERTKHRPROC __rglgen_glDebugMessageInsertKHR;
-RGLSYMGLDEBUGMESSAGECALLBACKKHRPROC __rglgen_glDebugMessageCallbackKHR;
-RGLSYMGLGETDEBUGMESSAGELOGKHRPROC __rglgen_glGetDebugMessageLogKHR;
-RGLSYMGLPUSHDEBUGGROUPKHRPROC __rglgen_glPushDebugGroupKHR;
-RGLSYMGLPOPDEBUGGROUPKHRPROC __rglgen_glPopDebugGroupKHR;
-RGLSYMGLOBJECTLABELKHRPROC __rglgen_glObjectLabelKHR;
-RGLSYMGLGETOBJECTLABELKHRPROC __rglgen_glGetObjectLabelKHR;
-RGLSYMGLOBJECTPTRLABELKHRPROC __rglgen_glObjectPtrLabelKHR;
-RGLSYMGLGETOBJECTPTRLABELKHRPROC __rglgen_glGetObjectPtrLabelKHR;
-RGLSYMGLGETPOINTERVKHRPROC __rglgen_glGetPointervKHR;
-RGLSYMGLGETGRAPHICSRESETSTATUSKHRPROC __rglgen_glGetGraphicsResetStatusKHR;
-RGLSYMGLREADNPIXELSKHRPROC __rglgen_glReadnPixelsKHR;
-RGLSYMGLGETNUNIFORMFVKHRPROC __rglgen_glGetnUniformfvKHR;
-RGLSYMGLGETNUNIFORMIVKHRPROC __rglgen_glGetnUniformivKHR;
-RGLSYMGLGETNUNIFORMUIVKHRPROC __rglgen_glGetnUniformuivKHR;
-RGLSYMGLEGLIMAGETARGETTEXTURE2DOESPROC __rglgen_glEGLImageTargetTexture2DOES;
-RGLSYMGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC __rglgen_glEGLImageTargetRenderbufferStorageOES;
-RGLSYMGLCOPYIMAGESUBDATAOESPROC __rglgen_glCopyImageSubDataOES;
-RGLSYMGLENABLEIOESPROC __rglgen_glEnableiOES;
-RGLSYMGLDISABLEIOESPROC __rglgen_glDisableiOES;
-RGLSYMGLBLENDEQUATIONIOESPROC __rglgen_glBlendEquationiOES;
-RGLSYMGLBLENDEQUATIONSEPARATEIOESPROC __rglgen_glBlendEquationSeparateiOES;
-RGLSYMGLBLENDFUNCIOESPROC __rglgen_glBlendFunciOES;
-RGLSYMGLBLENDFUNCSEPARATEIOESPROC __rglgen_glBlendFuncSeparateiOES;
-RGLSYMGLCOLORMASKIOESPROC __rglgen_glColorMaskiOES;
-RGLSYMGLISENABLEDIOESPROC __rglgen_glIsEnablediOES;
-RGLSYMGLDRAWELEMENTSBASEVERTEXOESPROC __rglgen_glDrawElementsBaseVertexOES;
-RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXOESPROC __rglgen_glDrawRangeElementsBaseVertexOES;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC __rglgen_glDrawElementsInstancedBaseVertexOES;
-RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXOESPROC __rglgen_glMultiDrawElementsBaseVertexOES;
-RGLSYMGLFRAMEBUFFERTEXTUREOESPROC __rglgen_glFramebufferTextureOES;
-RGLSYMGLGETPROGRAMBINARYOESPROC __rglgen_glGetProgramBinaryOES;
-RGLSYMGLPROGRAMBINARYOESPROC __rglgen_glProgramBinaryOES;
-RGLSYMGLMAPBUFFEROESPROC __rglgen_glMapBufferOES;
-RGLSYMGLUNMAPBUFFEROESPROC __rglgen_glUnmapBufferOES;
-RGLSYMGLGETBUFFERPOINTERVOESPROC __rglgen_glGetBufferPointervOES;
-RGLSYMGLPRIMITIVEBOUNDINGBOXOESPROC __rglgen_glPrimitiveBoundingBoxOES;
-RGLSYMGLMINSAMPLESHADINGOESPROC __rglgen_glMinSampleShadingOES;
-RGLSYMGLPATCHPARAMETERIOESPROC __rglgen_glPatchParameteriOES;
-RGLSYMGLTEXIMAGE3DOESPROC __rglgen_glTexImage3DOES;
-RGLSYMGLTEXSUBIMAGE3DOESPROC __rglgen_glTexSubImage3DOES;
-RGLSYMGLCOPYTEXSUBIMAGE3DOESPROC __rglgen_glCopyTexSubImage3DOES;
-RGLSYMGLCOMPRESSEDTEXIMAGE3DOESPROC __rglgen_glCompressedTexImage3DOES;
-RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DOESPROC __rglgen_glCompressedTexSubImage3DOES;
-RGLSYMGLFRAMEBUFFERTEXTURE3DOESPROC __rglgen_glFramebufferTexture3DOES;
-RGLSYMGLTEXPARAMETERIIVOESPROC __rglgen_glTexParameterIivOES;
-RGLSYMGLTEXPARAMETERIUIVOESPROC __rglgen_glTexParameterIuivOES;
-RGLSYMGLGETTEXPARAMETERIIVOESPROC __rglgen_glGetTexParameterIivOES;
-RGLSYMGLGETTEXPARAMETERIUIVOESPROC __rglgen_glGetTexParameterIuivOES;
-RGLSYMGLSAMPLERPARAMETERIIVOESPROC __rglgen_glSamplerParameterIivOES;
-RGLSYMGLSAMPLERPARAMETERIUIVOESPROC __rglgen_glSamplerParameterIuivOES;
-RGLSYMGLGETSAMPLERPARAMETERIIVOESPROC __rglgen_glGetSamplerParameterIivOES;
-RGLSYMGLGETSAMPLERPARAMETERIUIVOESPROC __rglgen_glGetSamplerParameterIuivOES;
-RGLSYMGLTEXBUFFEROESPROC __rglgen_glTexBufferOES;
-RGLSYMGLTEXBUFFERRANGEOESPROC __rglgen_glTexBufferRangeOES;
-RGLSYMGLTEXSTORAGE3DMULTISAMPLEOESPROC __rglgen_glTexStorage3DMultisampleOES;
-RGLSYMGLTEXTUREVIEWOESPROC __rglgen_glTextureViewOES;
-RGLSYMGLBINDVERTEXARRAYOESPROC __rglgen_glBindVertexArrayOES;
-RGLSYMGLDELETEVERTEXARRAYSOESPROC __rglgen_glDeleteVertexArraysOES;
-RGLSYMGLGENVERTEXARRAYSOESPROC __rglgen_glGenVertexArraysOES;
-RGLSYMGLISVERTEXARRAYOESPROC __rglgen_glIsVertexArrayOES;
-RGLSYMGLVIEWPORTARRAYVOESPROC __rglgen_glViewportArrayvOES;
-RGLSYMGLVIEWPORTINDEXEDFOESPROC __rglgen_glViewportIndexedfOES;
-RGLSYMGLVIEWPORTINDEXEDFVOESPROC __rglgen_glViewportIndexedfvOES;
-RGLSYMGLSCISSORARRAYVOESPROC __rglgen_glScissorArrayvOES;
-RGLSYMGLSCISSORINDEXEDOESPROC __rglgen_glScissorIndexedOES;
-RGLSYMGLSCISSORINDEXEDVOESPROC __rglgen_glScissorIndexedvOES;
-RGLSYMGLDEPTHRANGEARRAYFVOESPROC __rglgen_glDepthRangeArrayfvOES;
-RGLSYMGLDEPTHRANGEINDEXEDFOESPROC __rglgen_glDepthRangeIndexedfOES;
-RGLSYMGLGETFLOATI_VOESPROC __rglgen_glGetFloati_vOES;
-RGLSYMGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC __rglgen_glDrawArraysInstancedBaseInstanceEXT;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC __rglgen_glDrawElementsInstancedBaseInstanceEXT;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC __rglgen_glDrawElementsInstancedBaseVertexBaseInstanceEXT;
-RGLSYMGLBINDFRAGDATALOCATIONINDEXEDEXTPROC __rglgen_glBindFragDataLocationIndexedEXT;
-RGLSYMGLBINDFRAGDATALOCATIONEXTPROC __rglgen_glBindFragDataLocationEXT;
-RGLSYMGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC __rglgen_glGetProgramResourceLocationIndexEXT;
-RGLSYMGLGETFRAGDATAINDEXEXTPROC __rglgen_glGetFragDataIndexEXT;
-RGLSYMGLBUFFERSTORAGEEXTPROC __rglgen_glBufferStorageEXT;
-RGLSYMGLCLEARTEXIMAGEEXTPROC __rglgen_glClearTexImageEXT;
-RGLSYMGLCLEARTEXSUBIMAGEEXTPROC __rglgen_glClearTexSubImageEXT;
-RGLSYMGLCOPYIMAGESUBDATAEXTPROC __rglgen_glCopyImageSubDataEXT;
-RGLSYMGLLABELOBJECTEXTPROC __rglgen_glLabelObjectEXT;
-RGLSYMGLGETOBJECTLABELEXTPROC __rglgen_glGetObjectLabelEXT;
-RGLSYMGLINSERTEVENTMARKEREXTPROC __rglgen_glInsertEventMarkerEXT;
-RGLSYMGLPUSHGROUPMARKEREXTPROC __rglgen_glPushGroupMarkerEXT;
-RGLSYMGLPOPGROUPMARKEREXTPROC __rglgen_glPopGroupMarkerEXT;
-RGLSYMGLDISCARDFRAMEBUFFEREXTPROC __rglgen_glDiscardFramebufferEXT;
-RGLSYMGLGENQUERIESEXTPROC __rglgen_glGenQueriesEXT;
-RGLSYMGLDELETEQUERIESEXTPROC __rglgen_glDeleteQueriesEXT;
-RGLSYMGLISQUERYEXTPROC __rglgen_glIsQueryEXT;
-RGLSYMGLBEGINQUERYEXTPROC __rglgen_glBeginQueryEXT;
-RGLSYMGLENDQUERYEXTPROC __rglgen_glEndQueryEXT;
-RGLSYMGLQUERYCOUNTEREXTPROC __rglgen_glQueryCounterEXT;
-RGLSYMGLGETQUERYIVEXTPROC __rglgen_glGetQueryivEXT;
-RGLSYMGLGETQUERYOBJECTIVEXTPROC __rglgen_glGetQueryObjectivEXT;
-RGLSYMGLGETQUERYOBJECTUIVEXTPROC __rglgen_glGetQueryObjectuivEXT;
-RGLSYMGLDRAWBUFFERSEXTPROC __rglgen_glDrawBuffersEXT;
-RGLSYMGLENABLEIEXTPROC __rglgen_glEnableiEXT;
-RGLSYMGLDISABLEIEXTPROC __rglgen_glDisableiEXT;
-RGLSYMGLBLENDEQUATIONIEXTPROC __rglgen_glBlendEquationiEXT;
-RGLSYMGLBLENDEQUATIONSEPARATEIEXTPROC __rglgen_glBlendEquationSeparateiEXT;
-RGLSYMGLBLENDFUNCIEXTPROC __rglgen_glBlendFunciEXT;
-RGLSYMGLBLENDFUNCSEPARATEIEXTPROC __rglgen_glBlendFuncSeparateiEXT;
-RGLSYMGLCOLORMASKIEXTPROC __rglgen_glColorMaskiEXT;
-RGLSYMGLISENABLEDIEXTPROC __rglgen_glIsEnablediEXT;
-RGLSYMGLDRAWELEMENTSBASEVERTEXEXTPROC __rglgen_glDrawElementsBaseVertexEXT;
-RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC __rglgen_glDrawRangeElementsBaseVertexEXT;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC __rglgen_glDrawElementsInstancedBaseVertexEXT;
-RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC __rglgen_glMultiDrawElementsBaseVertexEXT;
-RGLSYMGLDRAWARRAYSINSTANCEDEXTPROC __rglgen_glDrawArraysInstancedEXT;
-RGLSYMGLDRAWELEMENTSINSTANCEDEXTPROC __rglgen_glDrawElementsInstancedEXT;
-RGLSYMGLFRAMEBUFFERTEXTUREEXTPROC __rglgen_glFramebufferTextureEXT;
-RGLSYMGLVERTEXATTRIBDIVISOREXTPROC __rglgen_glVertexAttribDivisorEXT;
-RGLSYMGLMAPBUFFERRANGEEXTPROC __rglgen_glMapBufferRangeEXT;
-RGLSYMGLFLUSHMAPPEDBUFFERRANGEEXTPROC __rglgen_glFlushMappedBufferRangeEXT;
-RGLSYMGLMULTIDRAWARRAYSEXTPROC __rglgen_glMultiDrawArraysEXT;
-RGLSYMGLMULTIDRAWELEMENTSEXTPROC __rglgen_glMultiDrawElementsEXT;
-RGLSYMGLMULTIDRAWARRAYSINDIRECTEXTPROC __rglgen_glMultiDrawArraysIndirectEXT;
-RGLSYMGLMULTIDRAWELEMENTSINDIRECTEXTPROC __rglgen_glMultiDrawElementsIndirectEXT;
-RGLSYMGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __rglgen_glRenderbufferStorageMultisampleEXT;
-RGLSYMGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC __rglgen_glFramebufferTexture2DMultisampleEXT;
-RGLSYMGLREADBUFFERINDEXEDEXTPROC __rglgen_glReadBufferIndexedEXT;
-RGLSYMGLDRAWBUFFERSINDEXEDEXTPROC __rglgen_glDrawBuffersIndexedEXT;
-RGLSYMGLGETINTEGERI_VEXTPROC __rglgen_glGetIntegeri_vEXT;
-RGLSYMGLPOLYGONOFFSETCLAMPEXTPROC __rglgen_glPolygonOffsetClampEXT;
-RGLSYMGLPRIMITIVEBOUNDINGBOXEXTPROC __rglgen_glPrimitiveBoundingBoxEXT;
-RGLSYMGLRASTERSAMPLESEXTPROC __rglgen_glRasterSamplesEXT;
-RGLSYMGLGETGRAPHICSRESETSTATUSEXTPROC __rglgen_glGetGraphicsResetStatusEXT;
-RGLSYMGLREADNPIXELSEXTPROC __rglgen_glReadnPixelsEXT;
-RGLSYMGLGETNUNIFORMFVEXTPROC __rglgen_glGetnUniformfvEXT;
-RGLSYMGLGETNUNIFORMIVEXTPROC __rglgen_glGetnUniformivEXT;
-RGLSYMGLACTIVESHADERPROGRAMEXTPROC __rglgen_glActiveShaderProgramEXT;
-RGLSYMGLBINDPROGRAMPIPELINEEXTPROC __rglgen_glBindProgramPipelineEXT;
-RGLSYMGLCREATESHADERPROGRAMVEXTPROC __rglgen_glCreateShaderProgramvEXT;
-RGLSYMGLDELETEPROGRAMPIPELINESEXTPROC __rglgen_glDeleteProgramPipelinesEXT;
-RGLSYMGLGENPROGRAMPIPELINESEXTPROC __rglgen_glGenProgramPipelinesEXT;
-RGLSYMGLGETPROGRAMPIPELINEINFOLOGEXTPROC __rglgen_glGetProgramPipelineInfoLogEXT;
-RGLSYMGLGETPROGRAMPIPELINEIVEXTPROC __rglgen_glGetProgramPipelineivEXT;
-RGLSYMGLISPROGRAMPIPELINEEXTPROC __rglgen_glIsProgramPipelineEXT;
-RGLSYMGLPROGRAMPARAMETERIEXTPROC __rglgen_glProgramParameteriEXT;
-RGLSYMGLPROGRAMUNIFORM1FEXTPROC __rglgen_glProgramUniform1fEXT;
-RGLSYMGLPROGRAMUNIFORM1FVEXTPROC __rglgen_glProgramUniform1fvEXT;
-RGLSYMGLPROGRAMUNIFORM1IEXTPROC __rglgen_glProgramUniform1iEXT;
-RGLSYMGLPROGRAMUNIFORM1IVEXTPROC __rglgen_glProgramUniform1ivEXT;
-RGLSYMGLPROGRAMUNIFORM2FEXTPROC __rglgen_glProgramUniform2fEXT;
-RGLSYMGLPROGRAMUNIFORM2FVEXTPROC __rglgen_glProgramUniform2fvEXT;
-RGLSYMGLPROGRAMUNIFORM2IEXTPROC __rglgen_glProgramUniform2iEXT;
-RGLSYMGLPROGRAMUNIFORM2IVEXTPROC __rglgen_glProgramUniform2ivEXT;
-RGLSYMGLPROGRAMUNIFORM3FEXTPROC __rglgen_glProgramUniform3fEXT;
-RGLSYMGLPROGRAMUNIFORM3FVEXTPROC __rglgen_glProgramUniform3fvEXT;
-RGLSYMGLPROGRAMUNIFORM3IEXTPROC __rglgen_glProgramUniform3iEXT;
-RGLSYMGLPROGRAMUNIFORM3IVEXTPROC __rglgen_glProgramUniform3ivEXT;
-RGLSYMGLPROGRAMUNIFORM4FEXTPROC __rglgen_glProgramUniform4fEXT;
-RGLSYMGLPROGRAMUNIFORM4FVEXTPROC __rglgen_glProgramUniform4fvEXT;
-RGLSYMGLPROGRAMUNIFORM4IEXTPROC __rglgen_glProgramUniform4iEXT;
-RGLSYMGLPROGRAMUNIFORM4IVEXTPROC __rglgen_glProgramUniform4ivEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX2FVEXTPROC __rglgen_glProgramUniformMatrix2fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX3FVEXTPROC __rglgen_glProgramUniformMatrix3fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX4FVEXTPROC __rglgen_glProgramUniformMatrix4fvEXT;
-RGLSYMGLUSEPROGRAMSTAGESEXTPROC __rglgen_glUseProgramStagesEXT;
-RGLSYMGLVALIDATEPROGRAMPIPELINEEXTPROC __rglgen_glValidateProgramPipelineEXT;
-RGLSYMGLPROGRAMUNIFORM1UIEXTPROC __rglgen_glProgramUniform1uiEXT;
-RGLSYMGLPROGRAMUNIFORM2UIEXTPROC __rglgen_glProgramUniform2uiEXT;
-RGLSYMGLPROGRAMUNIFORM3UIEXTPROC __rglgen_glProgramUniform3uiEXT;
-RGLSYMGLPROGRAMUNIFORM4UIEXTPROC __rglgen_glProgramUniform4uiEXT;
-RGLSYMGLPROGRAMUNIFORM1UIVEXTPROC __rglgen_glProgramUniform1uivEXT;
-RGLSYMGLPROGRAMUNIFORM2UIVEXTPROC __rglgen_glProgramUniform2uivEXT;
-RGLSYMGLPROGRAMUNIFORM3UIVEXTPROC __rglgen_glProgramUniform3uivEXT;
-RGLSYMGLPROGRAMUNIFORM4UIVEXTPROC __rglgen_glProgramUniform4uivEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __rglgen_glProgramUniformMatrix2x3fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __rglgen_glProgramUniformMatrix3x2fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __rglgen_glProgramUniformMatrix2x4fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __rglgen_glProgramUniformMatrix4x2fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __rglgen_glProgramUniformMatrix3x4fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __rglgen_glProgramUniformMatrix4x3fvEXT;
-RGLSYMGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __rglgen_glFramebufferPixelLocalStorageSizeEXT;
-RGLSYMGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __rglgen_glGetFramebufferPixelLocalStorageSizeEXT;
-RGLSYMGLCLEARPIXELLOCALSTORAGEUIEXTPROC __rglgen_glClearPixelLocalStorageuiEXT;
-RGLSYMGLTEXPAGECOMMITMENTEXTPROC __rglgen_glTexPageCommitmentEXT;
-RGLSYMGLPATCHPARAMETERIEXTPROC __rglgen_glPatchParameteriEXT;
-RGLSYMGLTEXPARAMETERIIVEXTPROC __rglgen_glTexParameterIivEXT;
-RGLSYMGLTEXPARAMETERIUIVEXTPROC __rglgen_glTexParameterIuivEXT;
-RGLSYMGLGETTEXPARAMETERIIVEXTPROC __rglgen_glGetTexParameterIivEXT;
-RGLSYMGLGETTEXPARAMETERIUIVEXTPROC __rglgen_glGetTexParameterIuivEXT;
-RGLSYMGLSAMPLERPARAMETERIIVEXTPROC __rglgen_glSamplerParameterIivEXT;
-RGLSYMGLSAMPLERPARAMETERIUIVEXTPROC __rglgen_glSamplerParameterIuivEXT;
-RGLSYMGLGETSAMPLERPARAMETERIIVEXTPROC __rglgen_glGetSamplerParameterIivEXT;
-RGLSYMGLGETSAMPLERPARAMETERIUIVEXTPROC __rglgen_glGetSamplerParameterIuivEXT;
-RGLSYMGLTEXBUFFEREXTPROC __rglgen_glTexBufferEXT;
-RGLSYMGLTEXBUFFERRANGEEXTPROC __rglgen_glTexBufferRangeEXT;
-RGLSYMGLTEXSTORAGE1DEXTPROC __rglgen_glTexStorage1DEXT;
-RGLSYMGLTEXSTORAGE2DEXTPROC __rglgen_glTexStorage2DEXT;
-RGLSYMGLTEXSTORAGE3DEXTPROC __rglgen_glTexStorage3DEXT;
-RGLSYMGLTEXTURESTORAGE1DEXTPROC __rglgen_glTextureStorage1DEXT;
-RGLSYMGLTEXTURESTORAGE2DEXTPROC __rglgen_glTextureStorage2DEXT;
-RGLSYMGLTEXTURESTORAGE3DEXTPROC __rglgen_glTextureStorage3DEXT;
-RGLSYMGLTEXTUREVIEWEXTPROC __rglgen_glTextureViewEXT;
-RGLSYMGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC __rglgen_glFramebufferTextureMultiviewOVR;
-RGLSYMGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC __rglgen_glFramebufferTextureMultisampleMultiviewOVR;
-
diff --git a/libretro-common/glsym/glsym_es3.c b/libretro-common/glsym/glsym_es3.c
deleted file mode 100644
index b247b8f..0000000
--- a/libretro-common/glsym/glsym_es3.c
+++ /dev/null
@@ -1,414 +0,0 @@
-#include "glsym/glsym.h"
-#include <stddef.h>
-#define SYM(x) { "gl" #x, &(gl##x) }
-const struct rglgen_sym_map rglgen_symbol_map[] = {
-    SYM(BlendBarrierKHR),
-    SYM(DebugMessageControlKHR),
-    SYM(DebugMessageInsertKHR),
-    SYM(DebugMessageCallbackKHR),
-    SYM(GetDebugMessageLogKHR),
-    SYM(PushDebugGroupKHR),
-    SYM(PopDebugGroupKHR),
-    SYM(ObjectLabelKHR),
-    SYM(GetObjectLabelKHR),
-    SYM(ObjectPtrLabelKHR),
-    SYM(GetObjectPtrLabelKHR),
-    SYM(GetPointervKHR),
-    SYM(GetGraphicsResetStatusKHR),
-    SYM(ReadnPixelsKHR),
-    SYM(GetnUniformfvKHR),
-    SYM(GetnUniformivKHR),
-    SYM(GetnUniformuivKHR),
-    SYM(EGLImageTargetTexture2DOES),
-    SYM(EGLImageTargetRenderbufferStorageOES),
-    SYM(CopyImageSubDataOES),
-    SYM(EnableiOES),
-    SYM(DisableiOES),
-    SYM(BlendEquationiOES),
-    SYM(BlendEquationSeparateiOES),
-    SYM(BlendFunciOES),
-    SYM(BlendFuncSeparateiOES),
-    SYM(ColorMaskiOES),
-    SYM(IsEnablediOES),
-    SYM(DrawElementsBaseVertexOES),
-    SYM(DrawRangeElementsBaseVertexOES),
-    SYM(DrawElementsInstancedBaseVertexOES),
-    SYM(MultiDrawElementsBaseVertexOES),
-    SYM(FramebufferTextureOES),
-    SYM(GetProgramBinaryOES),
-    SYM(ProgramBinaryOES),
-    SYM(MapBufferOES),
-    SYM(UnmapBufferOES),
-    SYM(GetBufferPointervOES),
-    SYM(PrimitiveBoundingBoxOES),
-    SYM(MinSampleShadingOES),
-    SYM(PatchParameteriOES),
-    SYM(TexImage3DOES),
-    SYM(TexSubImage3DOES),
-    SYM(CopyTexSubImage3DOES),
-    SYM(CompressedTexImage3DOES),
-    SYM(CompressedTexSubImage3DOES),
-    SYM(FramebufferTexture3DOES),
-    SYM(TexParameterIivOES),
-    SYM(TexParameterIuivOES),
-    SYM(GetTexParameterIivOES),
-    SYM(GetTexParameterIuivOES),
-    SYM(SamplerParameterIivOES),
-    SYM(SamplerParameterIuivOES),
-    SYM(GetSamplerParameterIivOES),
-    SYM(GetSamplerParameterIuivOES),
-    SYM(TexBufferOES),
-    SYM(TexBufferRangeOES),
-    SYM(TexStorage3DMultisampleOES),
-    SYM(TextureViewOES),
-    SYM(BindVertexArrayOES),
-    SYM(DeleteVertexArraysOES),
-    SYM(GenVertexArraysOES),
-    SYM(IsVertexArrayOES),
-    SYM(ViewportArrayvOES),
-    SYM(ViewportIndexedfOES),
-    SYM(ViewportIndexedfvOES),
-    SYM(ScissorArrayvOES),
-    SYM(ScissorIndexedOES),
-    SYM(ScissorIndexedvOES),
-    SYM(DepthRangeArrayfvOES),
-    SYM(DepthRangeIndexedfOES),
-    SYM(GetFloati_vOES),
-    SYM(DrawArraysInstancedBaseInstanceEXT),
-    SYM(DrawElementsInstancedBaseInstanceEXT),
-    SYM(DrawElementsInstancedBaseVertexBaseInstanceEXT),
-    SYM(BindFragDataLocationIndexedEXT),
-    SYM(BindFragDataLocationEXT),
-    SYM(GetProgramResourceLocationIndexEXT),
-    SYM(GetFragDataIndexEXT),
-    SYM(BufferStorageEXT),
-    SYM(ClearTexImageEXT),
-    SYM(ClearTexSubImageEXT),
-    SYM(CopyImageSubDataEXT),
-    SYM(LabelObjectEXT),
-    SYM(GetObjectLabelEXT),
-    SYM(InsertEventMarkerEXT),
-    SYM(PushGroupMarkerEXT),
-    SYM(PopGroupMarkerEXT),
-    SYM(DiscardFramebufferEXT),
-    SYM(GenQueriesEXT),
-    SYM(DeleteQueriesEXT),
-    SYM(IsQueryEXT),
-    SYM(BeginQueryEXT),
-    SYM(EndQueryEXT),
-    SYM(QueryCounterEXT),
-    SYM(GetQueryivEXT),
-    SYM(GetQueryObjectivEXT),
-    SYM(GetQueryObjectuivEXT),
-    SYM(GetQueryObjecti64vEXT),
-    SYM(GetQueryObjectui64vEXT),
-    SYM(DrawBuffersEXT),
-    SYM(EnableiEXT),
-    SYM(DisableiEXT),
-    SYM(BlendEquationiEXT),
-    SYM(BlendEquationSeparateiEXT),
-    SYM(BlendFunciEXT),
-    SYM(BlendFuncSeparateiEXT),
-    SYM(ColorMaskiEXT),
-    SYM(IsEnablediEXT),
-    SYM(DrawElementsBaseVertexEXT),
-    SYM(DrawRangeElementsBaseVertexEXT),
-    SYM(DrawElementsInstancedBaseVertexEXT),
-    SYM(MultiDrawElementsBaseVertexEXT),
-    SYM(DrawArraysInstancedEXT),
-    SYM(DrawElementsInstancedEXT),
-    SYM(FramebufferTextureEXT),
-    SYM(VertexAttribDivisorEXT),
-    SYM(MapBufferRangeEXT),
-    SYM(FlushMappedBufferRangeEXT),
-    SYM(MultiDrawArraysEXT),
-    SYM(MultiDrawElementsEXT),
-    SYM(MultiDrawArraysIndirectEXT),
-    SYM(MultiDrawElementsIndirectEXT),
-    SYM(RenderbufferStorageMultisampleEXT),
-    SYM(FramebufferTexture2DMultisampleEXT),
-    SYM(ReadBufferIndexedEXT),
-    SYM(DrawBuffersIndexedEXT),
-    SYM(GetIntegeri_vEXT),
-    SYM(PolygonOffsetClampEXT),
-    SYM(PrimitiveBoundingBoxEXT),
-    SYM(RasterSamplesEXT),
-    SYM(GetGraphicsResetStatusEXT),
-    SYM(ReadnPixelsEXT),
-    SYM(GetnUniformfvEXT),
-    SYM(GetnUniformivEXT),
-    SYM(ActiveShaderProgramEXT),
-    SYM(BindProgramPipelineEXT),
-    SYM(CreateShaderProgramvEXT),
-    SYM(DeleteProgramPipelinesEXT),
-    SYM(GenProgramPipelinesEXT),
-    SYM(GetProgramPipelineInfoLogEXT),
-    SYM(GetProgramPipelineivEXT),
-    SYM(IsProgramPipelineEXT),
-    SYM(ProgramParameteriEXT),
-    SYM(ProgramUniform1fEXT),
-    SYM(ProgramUniform1fvEXT),
-    SYM(ProgramUniform1iEXT),
-    SYM(ProgramUniform1ivEXT),
-    SYM(ProgramUniform2fEXT),
-    SYM(ProgramUniform2fvEXT),
-    SYM(ProgramUniform2iEXT),
-    SYM(ProgramUniform2ivEXT),
-    SYM(ProgramUniform3fEXT),
-    SYM(ProgramUniform3fvEXT),
-    SYM(ProgramUniform3iEXT),
-    SYM(ProgramUniform3ivEXT),
-    SYM(ProgramUniform4fEXT),
-    SYM(ProgramUniform4fvEXT),
-    SYM(ProgramUniform4iEXT),
-    SYM(ProgramUniform4ivEXT),
-    SYM(ProgramUniformMatrix2fvEXT),
-    SYM(ProgramUniformMatrix3fvEXT),
-    SYM(ProgramUniformMatrix4fvEXT),
-    SYM(UseProgramStagesEXT),
-    SYM(ValidateProgramPipelineEXT),
-    SYM(ProgramUniform1uiEXT),
-    SYM(ProgramUniform2uiEXT),
-    SYM(ProgramUniform3uiEXT),
-    SYM(ProgramUniform4uiEXT),
-    SYM(ProgramUniform1uivEXT),
-    SYM(ProgramUniform2uivEXT),
-    SYM(ProgramUniform3uivEXT),
-    SYM(ProgramUniform4uivEXT),
-    SYM(ProgramUniformMatrix2x3fvEXT),
-    SYM(ProgramUniformMatrix3x2fvEXT),
-    SYM(ProgramUniformMatrix2x4fvEXT),
-    SYM(ProgramUniformMatrix4x2fvEXT),
-    SYM(ProgramUniformMatrix3x4fvEXT),
-    SYM(ProgramUniformMatrix4x3fvEXT),
-    SYM(FramebufferPixelLocalStorageSizeEXT),
-    SYM(GetFramebufferPixelLocalStorageSizeEXT),
-    SYM(ClearPixelLocalStorageuiEXT),
-    SYM(TexPageCommitmentEXT),
-    SYM(PatchParameteriEXT),
-    SYM(TexParameterIivEXT),
-    SYM(TexParameterIuivEXT),
-    SYM(GetTexParameterIivEXT),
-    SYM(GetTexParameterIuivEXT),
-    SYM(SamplerParameterIivEXT),
-    SYM(SamplerParameterIuivEXT),
-    SYM(GetSamplerParameterIivEXT),
-    SYM(GetSamplerParameterIuivEXT),
-    SYM(TexBufferEXT),
-    SYM(TexBufferRangeEXT),
-    SYM(TexStorage1DEXT),
-    SYM(TexStorage2DEXT),
-    SYM(TexStorage3DEXT),
-    SYM(TextureStorage1DEXT),
-    SYM(TextureStorage2DEXT),
-    SYM(TextureStorage3DEXT),
-    SYM(TextureViewEXT),
-    SYM(FramebufferTextureMultiviewOVR),
-    SYM(FramebufferTextureMultisampleMultiviewOVR),
-
-    { NULL, NULL },
-};
-RGLSYMGLBLENDBARRIERKHRPROC __rglgen_glBlendBarrierKHR;
-RGLSYMGLDEBUGMESSAGECONTROLKHRPROC __rglgen_glDebugMessageControlKHR;
-RGLSYMGLDEBUGMESSAGEINSERTKHRPROC __rglgen_glDebugMessageInsertKHR;
-RGLSYMGLDEBUGMESSAGECALLBACKKHRPROC __rglgen_glDebugMessageCallbackKHR;
-RGLSYMGLGETDEBUGMESSAGELOGKHRPROC __rglgen_glGetDebugMessageLogKHR;
-RGLSYMGLPUSHDEBUGGROUPKHRPROC __rglgen_glPushDebugGroupKHR;
-RGLSYMGLPOPDEBUGGROUPKHRPROC __rglgen_glPopDebugGroupKHR;
-RGLSYMGLOBJECTLABELKHRPROC __rglgen_glObjectLabelKHR;
-RGLSYMGLGETOBJECTLABELKHRPROC __rglgen_glGetObjectLabelKHR;
-RGLSYMGLOBJECTPTRLABELKHRPROC __rglgen_glObjectPtrLabelKHR;
-RGLSYMGLGETOBJECTPTRLABELKHRPROC __rglgen_glGetObjectPtrLabelKHR;
-RGLSYMGLGETPOINTERVKHRPROC __rglgen_glGetPointervKHR;
-RGLSYMGLGETGRAPHICSRESETSTATUSKHRPROC __rglgen_glGetGraphicsResetStatusKHR;
-RGLSYMGLREADNPIXELSKHRPROC __rglgen_glReadnPixelsKHR;
-RGLSYMGLGETNUNIFORMFVKHRPROC __rglgen_glGetnUniformfvKHR;
-RGLSYMGLGETNUNIFORMIVKHRPROC __rglgen_glGetnUniformivKHR;
-RGLSYMGLGETNUNIFORMUIVKHRPROC __rglgen_glGetnUniformuivKHR;
-RGLSYMGLEGLIMAGETARGETTEXTURE2DOESPROC __rglgen_glEGLImageTargetTexture2DOES;
-RGLSYMGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC __rglgen_glEGLImageTargetRenderbufferStorageOES;
-RGLSYMGLCOPYIMAGESUBDATAOESPROC __rglgen_glCopyImageSubDataOES;
-RGLSYMGLENABLEIOESPROC __rglgen_glEnableiOES;
-RGLSYMGLDISABLEIOESPROC __rglgen_glDisableiOES;
-RGLSYMGLBLENDEQUATIONIOESPROC __rglgen_glBlendEquationiOES;
-RGLSYMGLBLENDEQUATIONSEPARATEIOESPROC __rglgen_glBlendEquationSeparateiOES;
-RGLSYMGLBLENDFUNCIOESPROC __rglgen_glBlendFunciOES;
-RGLSYMGLBLENDFUNCSEPARATEIOESPROC __rglgen_glBlendFuncSeparateiOES;
-RGLSYMGLCOLORMASKIOESPROC __rglgen_glColorMaskiOES;
-RGLSYMGLISENABLEDIOESPROC __rglgen_glIsEnablediOES;
-RGLSYMGLDRAWELEMENTSBASEVERTEXOESPROC __rglgen_glDrawElementsBaseVertexOES;
-RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXOESPROC __rglgen_glDrawRangeElementsBaseVertexOES;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC __rglgen_glDrawElementsInstancedBaseVertexOES;
-RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXOESPROC __rglgen_glMultiDrawElementsBaseVertexOES;
-RGLSYMGLFRAMEBUFFERTEXTUREOESPROC __rglgen_glFramebufferTextureOES;
-RGLSYMGLGETPROGRAMBINARYOESPROC __rglgen_glGetProgramBinaryOES;
-RGLSYMGLPROGRAMBINARYOESPROC __rglgen_glProgramBinaryOES;
-RGLSYMGLMAPBUFFEROESPROC __rglgen_glMapBufferOES;
-RGLSYMGLUNMAPBUFFEROESPROC __rglgen_glUnmapBufferOES;
-RGLSYMGLGETBUFFERPOINTERVOESPROC __rglgen_glGetBufferPointervOES;
-RGLSYMGLPRIMITIVEBOUNDINGBOXOESPROC __rglgen_glPrimitiveBoundingBoxOES;
-RGLSYMGLMINSAMPLESHADINGOESPROC __rglgen_glMinSampleShadingOES;
-RGLSYMGLPATCHPARAMETERIOESPROC __rglgen_glPatchParameteriOES;
-RGLSYMGLTEXIMAGE3DOESPROC __rglgen_glTexImage3DOES;
-RGLSYMGLTEXSUBIMAGE3DOESPROC __rglgen_glTexSubImage3DOES;
-RGLSYMGLCOPYTEXSUBIMAGE3DOESPROC __rglgen_glCopyTexSubImage3DOES;
-RGLSYMGLCOMPRESSEDTEXIMAGE3DOESPROC __rglgen_glCompressedTexImage3DOES;
-RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DOESPROC __rglgen_glCompressedTexSubImage3DOES;
-RGLSYMGLFRAMEBUFFERTEXTURE3DOESPROC __rglgen_glFramebufferTexture3DOES;
-RGLSYMGLTEXPARAMETERIIVOESPROC __rglgen_glTexParameterIivOES;
-RGLSYMGLTEXPARAMETERIUIVOESPROC __rglgen_glTexParameterIuivOES;
-RGLSYMGLGETTEXPARAMETERIIVOESPROC __rglgen_glGetTexParameterIivOES;
-RGLSYMGLGETTEXPARAMETERIUIVOESPROC __rglgen_glGetTexParameterIuivOES;
-RGLSYMGLSAMPLERPARAMETERIIVOESPROC __rglgen_glSamplerParameterIivOES;
-RGLSYMGLSAMPLERPARAMETERIUIVOESPROC __rglgen_glSamplerParameterIuivOES;
-RGLSYMGLGETSAMPLERPARAMETERIIVOESPROC __rglgen_glGetSamplerParameterIivOES;
-RGLSYMGLGETSAMPLERPARAMETERIUIVOESPROC __rglgen_glGetSamplerParameterIuivOES;
-RGLSYMGLTEXBUFFEROESPROC __rglgen_glTexBufferOES;
-RGLSYMGLTEXBUFFERRANGEOESPROC __rglgen_glTexBufferRangeOES;
-RGLSYMGLTEXSTORAGE3DMULTISAMPLEOESPROC __rglgen_glTexStorage3DMultisampleOES;
-RGLSYMGLTEXTUREVIEWOESPROC __rglgen_glTextureViewOES;
-RGLSYMGLBINDVERTEXARRAYOESPROC __rglgen_glBindVertexArrayOES;
-RGLSYMGLDELETEVERTEXARRAYSOESPROC __rglgen_glDeleteVertexArraysOES;
-RGLSYMGLGENVERTEXARRAYSOESPROC __rglgen_glGenVertexArraysOES;
-RGLSYMGLISVERTEXARRAYOESPROC __rglgen_glIsVertexArrayOES;
-RGLSYMGLVIEWPORTARRAYVOESPROC __rglgen_glViewportArrayvOES;
-RGLSYMGLVIEWPORTINDEXEDFOESPROC __rglgen_glViewportIndexedfOES;
-RGLSYMGLVIEWPORTINDEXEDFVOESPROC __rglgen_glViewportIndexedfvOES;
-RGLSYMGLSCISSORARRAYVOESPROC __rglgen_glScissorArrayvOES;
-RGLSYMGLSCISSORINDEXEDOESPROC __rglgen_glScissorIndexedOES;
-RGLSYMGLSCISSORINDEXEDVOESPROC __rglgen_glScissorIndexedvOES;
-RGLSYMGLDEPTHRANGEARRAYFVOESPROC __rglgen_glDepthRangeArrayfvOES;
-RGLSYMGLDEPTHRANGEINDEXEDFOESPROC __rglgen_glDepthRangeIndexedfOES;
-RGLSYMGLGETFLOATI_VOESPROC __rglgen_glGetFloati_vOES;
-RGLSYMGLDRAWARRAYSINSTANCEDBASEINSTANCEEXTPROC __rglgen_glDrawArraysInstancedBaseInstanceEXT;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEINSTANCEEXTPROC __rglgen_glDrawElementsInstancedBaseInstanceEXT;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEEXTPROC __rglgen_glDrawElementsInstancedBaseVertexBaseInstanceEXT;
-RGLSYMGLBINDFRAGDATALOCATIONINDEXEDEXTPROC __rglgen_glBindFragDataLocationIndexedEXT;
-RGLSYMGLBINDFRAGDATALOCATIONEXTPROC __rglgen_glBindFragDataLocationEXT;
-RGLSYMGLGETPROGRAMRESOURCELOCATIONINDEXEXTPROC __rglgen_glGetProgramResourceLocationIndexEXT;
-RGLSYMGLGETFRAGDATAINDEXEXTPROC __rglgen_glGetFragDataIndexEXT;
-RGLSYMGLBUFFERSTORAGEEXTPROC __rglgen_glBufferStorageEXT;
-RGLSYMGLCLEARTEXIMAGEEXTPROC __rglgen_glClearTexImageEXT;
-RGLSYMGLCLEARTEXSUBIMAGEEXTPROC __rglgen_glClearTexSubImageEXT;
-RGLSYMGLCOPYIMAGESUBDATAEXTPROC __rglgen_glCopyImageSubDataEXT;
-RGLSYMGLLABELOBJECTEXTPROC __rglgen_glLabelObjectEXT;
-RGLSYMGLGETOBJECTLABELEXTPROC __rglgen_glGetObjectLabelEXT;
-RGLSYMGLINSERTEVENTMARKEREXTPROC __rglgen_glInsertEventMarkerEXT;
-RGLSYMGLPUSHGROUPMARKEREXTPROC __rglgen_glPushGroupMarkerEXT;
-RGLSYMGLPOPGROUPMARKEREXTPROC __rglgen_glPopGroupMarkerEXT;
-RGLSYMGLDISCARDFRAMEBUFFEREXTPROC __rglgen_glDiscardFramebufferEXT;
-RGLSYMGLGENQUERIESEXTPROC __rglgen_glGenQueriesEXT;
-RGLSYMGLDELETEQUERIESEXTPROC __rglgen_glDeleteQueriesEXT;
-RGLSYMGLISQUERYEXTPROC __rglgen_glIsQueryEXT;
-RGLSYMGLBEGINQUERYEXTPROC __rglgen_glBeginQueryEXT;
-RGLSYMGLENDQUERYEXTPROC __rglgen_glEndQueryEXT;
-RGLSYMGLQUERYCOUNTEREXTPROC __rglgen_glQueryCounterEXT;
-RGLSYMGLGETQUERYIVEXTPROC __rglgen_glGetQueryivEXT;
-RGLSYMGLGETQUERYOBJECTIVEXTPROC __rglgen_glGetQueryObjectivEXT;
-RGLSYMGLGETQUERYOBJECTUIVEXTPROC __rglgen_glGetQueryObjectuivEXT;
-RGLSYMGLGETQUERYOBJECTI64VEXTPROC __rglgen_glGetQueryObjecti64vEXT;
-RGLSYMGLGETQUERYOBJECTUI64VEXTPROC __rglgen_glGetQueryObjectui64vEXT;
-RGLSYMGLDRAWBUFFERSEXTPROC __rglgen_glDrawBuffersEXT;
-RGLSYMGLENABLEIEXTPROC __rglgen_glEnableiEXT;
-RGLSYMGLDISABLEIEXTPROC __rglgen_glDisableiEXT;
-RGLSYMGLBLENDEQUATIONIEXTPROC __rglgen_glBlendEquationiEXT;
-RGLSYMGLBLENDEQUATIONSEPARATEIEXTPROC __rglgen_glBlendEquationSeparateiEXT;
-RGLSYMGLBLENDFUNCIEXTPROC __rglgen_glBlendFunciEXT;
-RGLSYMGLBLENDFUNCSEPARATEIEXTPROC __rglgen_glBlendFuncSeparateiEXT;
-RGLSYMGLCOLORMASKIEXTPROC __rglgen_glColorMaskiEXT;
-RGLSYMGLISENABLEDIEXTPROC __rglgen_glIsEnablediEXT;
-RGLSYMGLDRAWELEMENTSBASEVERTEXEXTPROC __rglgen_glDrawElementsBaseVertexEXT;
-RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC __rglgen_glDrawRangeElementsBaseVertexEXT;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC __rglgen_glDrawElementsInstancedBaseVertexEXT;
-RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC __rglgen_glMultiDrawElementsBaseVertexEXT;
-RGLSYMGLDRAWARRAYSINSTANCEDEXTPROC __rglgen_glDrawArraysInstancedEXT;
-RGLSYMGLDRAWELEMENTSINSTANCEDEXTPROC __rglgen_glDrawElementsInstancedEXT;
-RGLSYMGLFRAMEBUFFERTEXTUREEXTPROC __rglgen_glFramebufferTextureEXT;
-RGLSYMGLVERTEXATTRIBDIVISOREXTPROC __rglgen_glVertexAttribDivisorEXT;
-RGLSYMGLMAPBUFFERRANGEEXTPROC __rglgen_glMapBufferRangeEXT;
-RGLSYMGLFLUSHMAPPEDBUFFERRANGEEXTPROC __rglgen_glFlushMappedBufferRangeEXT;
-RGLSYMGLMULTIDRAWARRAYSEXTPROC __rglgen_glMultiDrawArraysEXT;
-RGLSYMGLMULTIDRAWELEMENTSEXTPROC __rglgen_glMultiDrawElementsEXT;
-RGLSYMGLMULTIDRAWARRAYSINDIRECTEXTPROC __rglgen_glMultiDrawArraysIndirectEXT;
-RGLSYMGLMULTIDRAWELEMENTSINDIRECTEXTPROC __rglgen_glMultiDrawElementsIndirectEXT;
-RGLSYMGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC __rglgen_glRenderbufferStorageMultisampleEXT;
-RGLSYMGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC __rglgen_glFramebufferTexture2DMultisampleEXT;
-RGLSYMGLREADBUFFERINDEXEDEXTPROC __rglgen_glReadBufferIndexedEXT;
-RGLSYMGLDRAWBUFFERSINDEXEDEXTPROC __rglgen_glDrawBuffersIndexedEXT;
-RGLSYMGLGETINTEGERI_VEXTPROC __rglgen_glGetIntegeri_vEXT;
-RGLSYMGLPOLYGONOFFSETCLAMPEXTPROC __rglgen_glPolygonOffsetClampEXT;
-RGLSYMGLPRIMITIVEBOUNDINGBOXEXTPROC __rglgen_glPrimitiveBoundingBoxEXT;
-RGLSYMGLRASTERSAMPLESEXTPROC __rglgen_glRasterSamplesEXT;
-RGLSYMGLGETGRAPHICSRESETSTATUSEXTPROC __rglgen_glGetGraphicsResetStatusEXT;
-RGLSYMGLREADNPIXELSEXTPROC __rglgen_glReadnPixelsEXT;
-RGLSYMGLGETNUNIFORMFVEXTPROC __rglgen_glGetnUniformfvEXT;
-RGLSYMGLGETNUNIFORMIVEXTPROC __rglgen_glGetnUniformivEXT;
-RGLSYMGLACTIVESHADERPROGRAMEXTPROC __rglgen_glActiveShaderProgramEXT;
-RGLSYMGLBINDPROGRAMPIPELINEEXTPROC __rglgen_glBindProgramPipelineEXT;
-RGLSYMGLCREATESHADERPROGRAMVEXTPROC __rglgen_glCreateShaderProgramvEXT;
-RGLSYMGLDELETEPROGRAMPIPELINESEXTPROC __rglgen_glDeleteProgramPipelinesEXT;
-RGLSYMGLGENPROGRAMPIPELINESEXTPROC __rglgen_glGenProgramPipelinesEXT;
-RGLSYMGLGETPROGRAMPIPELINEINFOLOGEXTPROC __rglgen_glGetProgramPipelineInfoLogEXT;
-RGLSYMGLGETPROGRAMPIPELINEIVEXTPROC __rglgen_glGetProgramPipelineivEXT;
-RGLSYMGLISPROGRAMPIPELINEEXTPROC __rglgen_glIsProgramPipelineEXT;
-RGLSYMGLPROGRAMPARAMETERIEXTPROC __rglgen_glProgramParameteriEXT;
-RGLSYMGLPROGRAMUNIFORM1FEXTPROC __rglgen_glProgramUniform1fEXT;
-RGLSYMGLPROGRAMUNIFORM1FVEXTPROC __rglgen_glProgramUniform1fvEXT;
-RGLSYMGLPROGRAMUNIFORM1IEXTPROC __rglgen_glProgramUniform1iEXT;
-RGLSYMGLPROGRAMUNIFORM1IVEXTPROC __rglgen_glProgramUniform1ivEXT;
-RGLSYMGLPROGRAMUNIFORM2FEXTPROC __rglgen_glProgramUniform2fEXT;
-RGLSYMGLPROGRAMUNIFORM2FVEXTPROC __rglgen_glProgramUniform2fvEXT;
-RGLSYMGLPROGRAMUNIFORM2IEXTPROC __rglgen_glProgramUniform2iEXT;
-RGLSYMGLPROGRAMUNIFORM2IVEXTPROC __rglgen_glProgramUniform2ivEXT;
-RGLSYMGLPROGRAMUNIFORM3FEXTPROC __rglgen_glProgramUniform3fEXT;
-RGLSYMGLPROGRAMUNIFORM3FVEXTPROC __rglgen_glProgramUniform3fvEXT;
-RGLSYMGLPROGRAMUNIFORM3IEXTPROC __rglgen_glProgramUniform3iEXT;
-RGLSYMGLPROGRAMUNIFORM3IVEXTPROC __rglgen_glProgramUniform3ivEXT;
-RGLSYMGLPROGRAMUNIFORM4FEXTPROC __rglgen_glProgramUniform4fEXT;
-RGLSYMGLPROGRAMUNIFORM4FVEXTPROC __rglgen_glProgramUniform4fvEXT;
-RGLSYMGLPROGRAMUNIFORM4IEXTPROC __rglgen_glProgramUniform4iEXT;
-RGLSYMGLPROGRAMUNIFORM4IVEXTPROC __rglgen_glProgramUniform4ivEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX2FVEXTPROC __rglgen_glProgramUniformMatrix2fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX3FVEXTPROC __rglgen_glProgramUniformMatrix3fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX4FVEXTPROC __rglgen_glProgramUniformMatrix4fvEXT;
-RGLSYMGLUSEPROGRAMSTAGESEXTPROC __rglgen_glUseProgramStagesEXT;
-RGLSYMGLVALIDATEPROGRAMPIPELINEEXTPROC __rglgen_glValidateProgramPipelineEXT;
-RGLSYMGLPROGRAMUNIFORM1UIEXTPROC __rglgen_glProgramUniform1uiEXT;
-RGLSYMGLPROGRAMUNIFORM2UIEXTPROC __rglgen_glProgramUniform2uiEXT;
-RGLSYMGLPROGRAMUNIFORM3UIEXTPROC __rglgen_glProgramUniform3uiEXT;
-RGLSYMGLPROGRAMUNIFORM4UIEXTPROC __rglgen_glProgramUniform4uiEXT;
-RGLSYMGLPROGRAMUNIFORM1UIVEXTPROC __rglgen_glProgramUniform1uivEXT;
-RGLSYMGLPROGRAMUNIFORM2UIVEXTPROC __rglgen_glProgramUniform2uivEXT;
-RGLSYMGLPROGRAMUNIFORM3UIVEXTPROC __rglgen_glProgramUniform3uivEXT;
-RGLSYMGLPROGRAMUNIFORM4UIVEXTPROC __rglgen_glProgramUniform4uivEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX2X3FVEXTPROC __rglgen_glProgramUniformMatrix2x3fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX3X2FVEXTPROC __rglgen_glProgramUniformMatrix3x2fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX2X4FVEXTPROC __rglgen_glProgramUniformMatrix2x4fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX4X2FVEXTPROC __rglgen_glProgramUniformMatrix4x2fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX3X4FVEXTPROC __rglgen_glProgramUniformMatrix3x4fvEXT;
-RGLSYMGLPROGRAMUNIFORMMATRIX4X3FVEXTPROC __rglgen_glProgramUniformMatrix4x3fvEXT;
-RGLSYMGLFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __rglgen_glFramebufferPixelLocalStorageSizeEXT;
-RGLSYMGLGETFRAMEBUFFERPIXELLOCALSTORAGESIZEEXTPROC __rglgen_glGetFramebufferPixelLocalStorageSizeEXT;
-RGLSYMGLCLEARPIXELLOCALSTORAGEUIEXTPROC __rglgen_glClearPixelLocalStorageuiEXT;
-RGLSYMGLTEXPAGECOMMITMENTEXTPROC __rglgen_glTexPageCommitmentEXT;
-RGLSYMGLPATCHPARAMETERIEXTPROC __rglgen_glPatchParameteriEXT;
-RGLSYMGLTEXPARAMETERIIVEXTPROC __rglgen_glTexParameterIivEXT;
-RGLSYMGLTEXPARAMETERIUIVEXTPROC __rglgen_glTexParameterIuivEXT;
-RGLSYMGLGETTEXPARAMETERIIVEXTPROC __rglgen_glGetTexParameterIivEXT;
-RGLSYMGLGETTEXPARAMETERIUIVEXTPROC __rglgen_glGetTexParameterIuivEXT;
-RGLSYMGLSAMPLERPARAMETERIIVEXTPROC __rglgen_glSamplerParameterIivEXT;
-RGLSYMGLSAMPLERPARAMETERIUIVEXTPROC __rglgen_glSamplerParameterIuivEXT;
-RGLSYMGLGETSAMPLERPARAMETERIIVEXTPROC __rglgen_glGetSamplerParameterIivEXT;
-RGLSYMGLGETSAMPLERPARAMETERIUIVEXTPROC __rglgen_glGetSamplerParameterIuivEXT;
-RGLSYMGLTEXBUFFEREXTPROC __rglgen_glTexBufferEXT;
-RGLSYMGLTEXBUFFERRANGEEXTPROC __rglgen_glTexBufferRangeEXT;
-RGLSYMGLTEXSTORAGE1DEXTPROC __rglgen_glTexStorage1DEXT;
-RGLSYMGLTEXSTORAGE2DEXTPROC __rglgen_glTexStorage2DEXT;
-RGLSYMGLTEXSTORAGE3DEXTPROC __rglgen_glTexStorage3DEXT;
-RGLSYMGLTEXTURESTORAGE1DEXTPROC __rglgen_glTextureStorage1DEXT;
-RGLSYMGLTEXTURESTORAGE2DEXTPROC __rglgen_glTextureStorage2DEXT;
-RGLSYMGLTEXTURESTORAGE3DEXTPROC __rglgen_glTextureStorage3DEXT;
-RGLSYMGLTEXTUREVIEWEXTPROC __rglgen_glTextureViewEXT;
-RGLSYMGLFRAMEBUFFERTEXTUREMULTIVIEWOVRPROC __rglgen_glFramebufferTextureMultiviewOVR;
-RGLSYMGLFRAMEBUFFERTEXTUREMULTISAMPLEMULTIVIEWOVRPROC __rglgen_glFramebufferTextureMultisampleMultiviewOVR;
-
diff --git a/libretro-common/glsym/glsym_gl.c b/libretro-common/glsym/glsym_gl.c
deleted file mode 100644
index 5aa92fd..0000000
--- a/libretro-common/glsym/glsym_gl.c
+++ /dev/null
@@ -1,2083 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsym).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stddef.h>
-
-#include <glsym/glsym.h>
-
-#define SYM(x) { "gl" #x, &(gl##x) }
-
-const struct rglgen_sym_map rglgen_symbol_map[] = {
-    SYM(DrawRangeElements),
-    SYM(TexImage3D),
-    SYM(TexSubImage3D),
-    SYM(CopyTexSubImage3D),
-    SYM(ActiveTexture),
-    SYM(SampleCoverage),
-    SYM(CompressedTexImage3D),
-    SYM(CompressedTexImage2D),
-    SYM(CompressedTexImage1D),
-    SYM(CompressedTexSubImage3D),
-    SYM(CompressedTexSubImage2D),
-    SYM(CompressedTexSubImage1D),
-    SYM(GetCompressedTexImage),
-    SYM(ClientActiveTexture),
-    SYM(MultiTexCoord1d),
-    SYM(MultiTexCoord1dv),
-    SYM(MultiTexCoord1f),
-    SYM(MultiTexCoord1fv),
-    SYM(MultiTexCoord1i),
-    SYM(MultiTexCoord1iv),
-    SYM(MultiTexCoord1s),
-    SYM(MultiTexCoord1sv),
-    SYM(MultiTexCoord2d),
-    SYM(MultiTexCoord2dv),
-    SYM(MultiTexCoord2f),
-    SYM(MultiTexCoord2fv),
-    SYM(MultiTexCoord2i),
-    SYM(MultiTexCoord2iv),
-    SYM(MultiTexCoord2s),
-    SYM(MultiTexCoord2sv),
-    SYM(MultiTexCoord3d),
-    SYM(MultiTexCoord3dv),
-    SYM(MultiTexCoord3f),
-    SYM(MultiTexCoord3fv),
-    SYM(MultiTexCoord3i),
-    SYM(MultiTexCoord3iv),
-    SYM(MultiTexCoord3s),
-    SYM(MultiTexCoord3sv),
-    SYM(MultiTexCoord4d),
-    SYM(MultiTexCoord4dv),
-    SYM(MultiTexCoord4f),
-    SYM(MultiTexCoord4fv),
-    SYM(MultiTexCoord4i),
-    SYM(MultiTexCoord4iv),
-    SYM(MultiTexCoord4s),
-    SYM(MultiTexCoord4sv),
-    SYM(LoadTransposeMatrixf),
-    SYM(LoadTransposeMatrixd),
-    SYM(MultTransposeMatrixf),
-    SYM(MultTransposeMatrixd),
-    SYM(BlendFuncSeparate),
-    SYM(MultiDrawArrays),
-    SYM(MultiDrawElements),
-    SYM(PointParameterf),
-    SYM(PointParameterfv),
-    SYM(PointParameteri),
-    SYM(PointParameteriv),
-    SYM(FogCoordf),
-    SYM(FogCoordfv),
-    SYM(FogCoordd),
-    SYM(FogCoorddv),
-    SYM(FogCoordPointer),
-    SYM(SecondaryColor3b),
-    SYM(SecondaryColor3bv),
-    SYM(SecondaryColor3d),
-    SYM(SecondaryColor3dv),
-    SYM(SecondaryColor3f),
-    SYM(SecondaryColor3fv),
-    SYM(SecondaryColor3i),
-    SYM(SecondaryColor3iv),
-    SYM(SecondaryColor3s),
-    SYM(SecondaryColor3sv),
-    SYM(SecondaryColor3ub),
-    SYM(SecondaryColor3ubv),
-    SYM(SecondaryColor3ui),
-    SYM(SecondaryColor3uiv),
-    SYM(SecondaryColor3us),
-    SYM(SecondaryColor3usv),
-    SYM(SecondaryColorPointer),
-    SYM(WindowPos2d),
-    SYM(WindowPos2dv),
-    SYM(WindowPos2f),
-    SYM(WindowPos2fv),
-    SYM(WindowPos2i),
-    SYM(WindowPos2iv),
-    SYM(WindowPos2s),
-    SYM(WindowPos2sv),
-    SYM(WindowPos3d),
-    SYM(WindowPos3dv),
-    SYM(WindowPos3f),
-    SYM(WindowPos3fv),
-    SYM(WindowPos3i),
-    SYM(WindowPos3iv),
-    SYM(WindowPos3s),
-    SYM(WindowPos3sv),
-    SYM(BlendColor),
-    SYM(BlendEquation),
-    SYM(GenQueries),
-    SYM(DeleteQueries),
-    SYM(IsQuery),
-    SYM(BeginQuery),
-    SYM(EndQuery),
-    SYM(GetQueryiv),
-    SYM(GetQueryObjectiv),
-    SYM(GetQueryObjectuiv),
-    SYM(BindBuffer),
-    SYM(DeleteBuffers),
-    SYM(GenBuffers),
-    SYM(IsBuffer),
-    SYM(BufferData),
-    SYM(BufferSubData),
-    SYM(GetBufferSubData),
-    SYM(MapBuffer),
-    SYM(UnmapBuffer),
-    SYM(GetBufferParameteriv),
-    SYM(GetBufferPointerv),
-    SYM(BlendEquationSeparate),
-    SYM(DrawBuffers),
-    SYM(StencilOpSeparate),
-    SYM(StencilFuncSeparate),
-    SYM(StencilMaskSeparate),
-    SYM(AttachShader),
-    SYM(BindAttribLocation),
-    SYM(CompileShader),
-    SYM(CreateProgram),
-    SYM(CreateShader),
-    SYM(DeleteProgram),
-    SYM(DeleteShader),
-    SYM(DetachShader),
-    SYM(DisableVertexAttribArray),
-    SYM(EnableVertexAttribArray),
-    SYM(GetActiveAttrib),
-    SYM(GetActiveUniform),
-    SYM(GetAttachedShaders),
-    SYM(GetAttribLocation),
-    SYM(GetProgramiv),
-    SYM(GetProgramInfoLog),
-    SYM(GetShaderiv),
-    SYM(GetShaderInfoLog),
-    SYM(GetShaderSource),
-    SYM(GetUniformLocation),
-    SYM(GetUniformfv),
-    SYM(GetUniformiv),
-    SYM(GetVertexAttribdv),
-    SYM(GetVertexAttribfv),
-    SYM(GetVertexAttribiv),
-    SYM(GetVertexAttribPointerv),
-    SYM(IsProgram),
-    SYM(IsShader),
-    SYM(LinkProgram),
-    SYM(ShaderSource),
-    SYM(UseProgram),
-    SYM(Uniform1f),
-    SYM(Uniform2f),
-    SYM(Uniform3f),
-    SYM(Uniform4f),
-    SYM(Uniform1i),
-    SYM(Uniform2i),
-    SYM(Uniform3i),
-    SYM(Uniform4i),
-    SYM(Uniform1fv),
-    SYM(Uniform2fv),
-    SYM(Uniform3fv),
-    SYM(Uniform4fv),
-    SYM(Uniform1iv),
-    SYM(Uniform2iv),
-    SYM(Uniform3iv),
-    SYM(Uniform4iv),
-    SYM(UniformMatrix2fv),
-    SYM(UniformMatrix3fv),
-    SYM(UniformMatrix4fv),
-    SYM(ValidateProgram),
-    SYM(VertexAttrib1d),
-    SYM(VertexAttrib1dv),
-    SYM(VertexAttrib1f),
-    SYM(VertexAttrib1fv),
-    SYM(VertexAttrib1s),
-    SYM(VertexAttrib1sv),
-    SYM(VertexAttrib2d),
-    SYM(VertexAttrib2dv),
-    SYM(VertexAttrib2f),
-    SYM(VertexAttrib2fv),
-    SYM(VertexAttrib2s),
-    SYM(VertexAttrib2sv),
-    SYM(VertexAttrib3d),
-    SYM(VertexAttrib3dv),
-    SYM(VertexAttrib3f),
-    SYM(VertexAttrib3fv),
-    SYM(VertexAttrib3s),
-    SYM(VertexAttrib3sv),
-    SYM(VertexAttrib4Nbv),
-    SYM(VertexAttrib4Niv),
-    SYM(VertexAttrib4Nsv),
-    SYM(VertexAttrib4Nub),
-    SYM(VertexAttrib4Nubv),
-    SYM(VertexAttrib4Nuiv),
-    SYM(VertexAttrib4Nusv),
-    SYM(VertexAttrib4bv),
-    SYM(VertexAttrib4d),
-    SYM(VertexAttrib4dv),
-    SYM(VertexAttrib4f),
-    SYM(VertexAttrib4fv),
-    SYM(VertexAttrib4iv),
-    SYM(VertexAttrib4s),
-    SYM(VertexAttrib4sv),
-    SYM(VertexAttrib4ubv),
-    SYM(VertexAttrib4uiv),
-    SYM(VertexAttrib4usv),
-    SYM(VertexAttribPointer),
-    SYM(UniformMatrix2x3fv),
-    SYM(UniformMatrix3x2fv),
-    SYM(UniformMatrix2x4fv),
-    SYM(UniformMatrix4x2fv),
-    SYM(UniformMatrix3x4fv),
-    SYM(UniformMatrix4x3fv),
-    SYM(ColorMaski),
-    SYM(GetBooleani_v),
-    SYM(GetIntegeri_v),
-    SYM(Enablei),
-    SYM(Disablei),
-    SYM(IsEnabledi),
-    SYM(BeginTransformFeedback),
-    SYM(EndTransformFeedback),
-    SYM(BindBufferRange),
-    SYM(BindBufferBase),
-    SYM(TransformFeedbackVaryings),
-    SYM(GetTransformFeedbackVarying),
-    SYM(ClampColor),
-    SYM(BeginConditionalRender),
-    SYM(EndConditionalRender),
-    SYM(VertexAttribIPointer),
-    SYM(GetVertexAttribIiv),
-    SYM(GetVertexAttribIuiv),
-    SYM(VertexAttribI1i),
-    SYM(VertexAttribI2i),
-    SYM(VertexAttribI3i),
-    SYM(VertexAttribI4i),
-    SYM(VertexAttribI1ui),
-    SYM(VertexAttribI2ui),
-    SYM(VertexAttribI3ui),
-    SYM(VertexAttribI4ui),
-    SYM(VertexAttribI1iv),
-    SYM(VertexAttribI2iv),
-    SYM(VertexAttribI3iv),
-    SYM(VertexAttribI4iv),
-    SYM(VertexAttribI1uiv),
-    SYM(VertexAttribI2uiv),
-    SYM(VertexAttribI3uiv),
-    SYM(VertexAttribI4uiv),
-    SYM(VertexAttribI4bv),
-    SYM(VertexAttribI4sv),
-    SYM(VertexAttribI4ubv),
-    SYM(VertexAttribI4usv),
-    SYM(GetUniformuiv),
-    SYM(BindFragDataLocation),
-    SYM(GetFragDataLocation),
-    SYM(Uniform1ui),
-    SYM(Uniform2ui),
-    SYM(Uniform3ui),
-    SYM(Uniform4ui),
-    SYM(Uniform1uiv),
-    SYM(Uniform2uiv),
-    SYM(Uniform3uiv),
-    SYM(Uniform4uiv),
-    SYM(TexParameterIiv),
-    SYM(TexParameterIuiv),
-    SYM(GetTexParameterIiv),
-    SYM(GetTexParameterIuiv),
-    SYM(ClearBufferiv),
-    SYM(ClearBufferuiv),
-    SYM(ClearBufferfv),
-    SYM(ClearBufferfi),
-    SYM(GetStringi),
-    SYM(IsRenderbuffer),
-    SYM(BindRenderbuffer),
-    SYM(DeleteRenderbuffers),
-    SYM(GenRenderbuffers),
-    SYM(RenderbufferStorage),
-    SYM(GetRenderbufferParameteriv),
-    SYM(IsFramebuffer),
-    SYM(BindFramebuffer),
-    SYM(DeleteFramebuffers),
-    SYM(GenFramebuffers),
-    SYM(CheckFramebufferStatus),
-    SYM(FramebufferTexture1D),
-    SYM(FramebufferTexture2D),
-    SYM(FramebufferTexture3D),
-    SYM(FramebufferRenderbuffer),
-    SYM(GetFramebufferAttachmentParameteriv),
-    SYM(GenerateMipmap),
-    SYM(BlitFramebuffer),
-    SYM(RenderbufferStorageMultisample),
-    SYM(FramebufferTextureLayer),
-    SYM(MapBufferRange),
-    SYM(FlushMappedBufferRange),
-    SYM(BindVertexArray),
-    SYM(DeleteVertexArrays),
-    SYM(GenVertexArrays),
-    SYM(IsVertexArray),
-    SYM(DrawArraysInstanced),
-    SYM(DrawElementsInstanced),
-    SYM(TexBuffer),
-    SYM(PrimitiveRestartIndex),
-    SYM(CopyBufferSubData),
-    SYM(GetUniformIndices),
-    SYM(GetActiveUniformsiv),
-    SYM(GetActiveUniformName),
-    SYM(GetUniformBlockIndex),
-    SYM(GetActiveUniformBlockiv),
-    SYM(GetActiveUniformBlockName),
-    SYM(UniformBlockBinding),
-    SYM(DrawElementsBaseVertex),
-    SYM(DrawRangeElementsBaseVertex),
-    SYM(DrawElementsInstancedBaseVertex),
-    SYM(MultiDrawElementsBaseVertex),
-    SYM(ProvokingVertex),
-    SYM(FenceSync),
-    SYM(IsSync),
-    SYM(DeleteSync),
-    SYM(ClientWaitSync),
-    SYM(WaitSync),
-    SYM(GetInteger64v),
-    SYM(GetSynciv),
-    SYM(GetInteger64i_v),
-    SYM(GetBufferParameteri64v),
-    SYM(FramebufferTexture),
-    SYM(TexImage2DMultisample),
-    SYM(TexImage3DMultisample),
-    SYM(GetMultisamplefv),
-    SYM(SampleMaski),
-    SYM(BindFragDataLocationIndexed),
-    SYM(GetFragDataIndex),
-    SYM(GenSamplers),
-    SYM(DeleteSamplers),
-    SYM(IsSampler),
-    SYM(BindSampler),
-    SYM(SamplerParameteri),
-    SYM(SamplerParameteriv),
-    SYM(SamplerParameterf),
-    SYM(SamplerParameterfv),
-    SYM(SamplerParameterIiv),
-    SYM(SamplerParameterIuiv),
-    SYM(GetSamplerParameteriv),
-    SYM(GetSamplerParameterIiv),
-    SYM(GetSamplerParameterfv),
-    SYM(GetSamplerParameterIuiv),
-    SYM(QueryCounter),
-    SYM(GetQueryObjecti64v),
-    SYM(GetQueryObjectui64v),
-    SYM(VertexAttribDivisor),
-    SYM(VertexAttribP1ui),
-    SYM(VertexAttribP1uiv),
-    SYM(VertexAttribP2ui),
-    SYM(VertexAttribP2uiv),
-    SYM(VertexAttribP3ui),
-    SYM(VertexAttribP3uiv),
-    SYM(VertexAttribP4ui),
-    SYM(VertexAttribP4uiv),
-    SYM(VertexP2ui),
-    SYM(VertexP2uiv),
-    SYM(VertexP3ui),
-    SYM(VertexP3uiv),
-    SYM(VertexP4ui),
-    SYM(VertexP4uiv),
-    SYM(TexCoordP1ui),
-    SYM(TexCoordP1uiv),
-    SYM(TexCoordP2ui),
-    SYM(TexCoordP2uiv),
-    SYM(TexCoordP3ui),
-    SYM(TexCoordP3uiv),
-    SYM(TexCoordP4ui),
-    SYM(TexCoordP4uiv),
-    SYM(MultiTexCoordP1ui),
-    SYM(MultiTexCoordP1uiv),
-    SYM(MultiTexCoordP2ui),
-    SYM(MultiTexCoordP2uiv),
-    SYM(MultiTexCoordP3ui),
-    SYM(MultiTexCoordP3uiv),
-    SYM(MultiTexCoordP4ui),
-    SYM(MultiTexCoordP4uiv),
-    SYM(NormalP3ui),
-    SYM(NormalP3uiv),
-    SYM(ColorP3ui),
-    SYM(ColorP3uiv),
-    SYM(ColorP4ui),
-    SYM(ColorP4uiv),
-    SYM(SecondaryColorP3ui),
-    SYM(SecondaryColorP3uiv),
-    SYM(MinSampleShading),
-    SYM(BlendEquationi),
-    SYM(BlendEquationSeparatei),
-    SYM(BlendFunci),
-    SYM(BlendFuncSeparatei),
-    SYM(DrawArraysIndirect),
-    SYM(DrawElementsIndirect),
-    SYM(Uniform1d),
-    SYM(Uniform2d),
-    SYM(Uniform3d),
-    SYM(Uniform4d),
-    SYM(Uniform1dv),
-    SYM(Uniform2dv),
-    SYM(Uniform3dv),
-    SYM(Uniform4dv),
-    SYM(UniformMatrix2dv),
-    SYM(UniformMatrix3dv),
-    SYM(UniformMatrix4dv),
-    SYM(UniformMatrix2x3dv),
-    SYM(UniformMatrix2x4dv),
-    SYM(UniformMatrix3x2dv),
-    SYM(UniformMatrix3x4dv),
-    SYM(UniformMatrix4x2dv),
-    SYM(UniformMatrix4x3dv),
-    SYM(GetUniformdv),
-    SYM(GetSubroutineUniformLocation),
-    SYM(GetSubroutineIndex),
-    SYM(GetActiveSubroutineUniformiv),
-    SYM(GetActiveSubroutineUniformName),
-    SYM(GetActiveSubroutineName),
-    SYM(UniformSubroutinesuiv),
-    SYM(GetUniformSubroutineuiv),
-    SYM(GetProgramStageiv),
-    SYM(PatchParameteri),
-    SYM(PatchParameterfv),
-    SYM(BindTransformFeedback),
-    SYM(DeleteTransformFeedbacks),
-    SYM(GenTransformFeedbacks),
-    SYM(IsTransformFeedback),
-    SYM(PauseTransformFeedback),
-    SYM(ResumeTransformFeedback),
-    SYM(DrawTransformFeedback),
-    SYM(DrawTransformFeedbackStream),
-    SYM(BeginQueryIndexed),
-    SYM(EndQueryIndexed),
-    SYM(GetQueryIndexediv),
-    SYM(ReleaseShaderCompiler),
-    SYM(ShaderBinary),
-    SYM(GetShaderPrecisionFormat),
-    SYM(DepthRangef),
-    SYM(ClearDepthf),
-    SYM(GetProgramBinary),
-    SYM(ProgramBinary),
-    SYM(ProgramParameteri),
-    SYM(UseProgramStages),
-    SYM(ActiveShaderProgram),
-    SYM(CreateShaderProgramv),
-    SYM(BindProgramPipeline),
-    SYM(DeleteProgramPipelines),
-    SYM(GenProgramPipelines),
-    SYM(IsProgramPipeline),
-    SYM(GetProgramPipelineiv),
-    SYM(ProgramUniform1i),
-    SYM(ProgramUniform1iv),
-    SYM(ProgramUniform1f),
-    SYM(ProgramUniform1fv),
-    SYM(ProgramUniform1d),
-    SYM(ProgramUniform1dv),
-    SYM(ProgramUniform1ui),
-    SYM(ProgramUniform1uiv),
-    SYM(ProgramUniform2i),
-    SYM(ProgramUniform2iv),
-    SYM(ProgramUniform2f),
-    SYM(ProgramUniform2fv),
-    SYM(ProgramUniform2d),
-    SYM(ProgramUniform2dv),
-    SYM(ProgramUniform2ui),
-    SYM(ProgramUniform2uiv),
-    SYM(ProgramUniform3i),
-    SYM(ProgramUniform3iv),
-    SYM(ProgramUniform3f),
-    SYM(ProgramUniform3fv),
-    SYM(ProgramUniform3d),
-    SYM(ProgramUniform3dv),
-    SYM(ProgramUniform3ui),
-    SYM(ProgramUniform3uiv),
-    SYM(ProgramUniform4i),
-    SYM(ProgramUniform4iv),
-    SYM(ProgramUniform4f),
-    SYM(ProgramUniform4fv),
-    SYM(ProgramUniform4d),
-    SYM(ProgramUniform4dv),
-    SYM(ProgramUniform4ui),
-    SYM(ProgramUniform4uiv),
-    SYM(ProgramUniformMatrix2fv),
-    SYM(ProgramUniformMatrix3fv),
-    SYM(ProgramUniformMatrix4fv),
-    SYM(ProgramUniformMatrix2dv),
-    SYM(ProgramUniformMatrix3dv),
-    SYM(ProgramUniformMatrix4dv),
-    SYM(ProgramUniformMatrix2x3fv),
-    SYM(ProgramUniformMatrix3x2fv),
-    SYM(ProgramUniformMatrix2x4fv),
-    SYM(ProgramUniformMatrix4x2fv),
-    SYM(ProgramUniformMatrix3x4fv),
-    SYM(ProgramUniformMatrix4x3fv),
-    SYM(ProgramUniformMatrix2x3dv),
-    SYM(ProgramUniformMatrix3x2dv),
-    SYM(ProgramUniformMatrix2x4dv),
-    SYM(ProgramUniformMatrix4x2dv),
-    SYM(ProgramUniformMatrix3x4dv),
-    SYM(ProgramUniformMatrix4x3dv),
-    SYM(ValidateProgramPipeline),
-    SYM(GetProgramPipelineInfoLog),
-    SYM(VertexAttribL1d),
-    SYM(VertexAttribL2d),
-    SYM(VertexAttribL3d),
-    SYM(VertexAttribL4d),
-    SYM(VertexAttribL1dv),
-    SYM(VertexAttribL2dv),
-    SYM(VertexAttribL3dv),
-    SYM(VertexAttribL4dv),
-    SYM(VertexAttribLPointer),
-    SYM(GetVertexAttribLdv),
-    SYM(ViewportArrayv),
-    SYM(ViewportIndexedf),
-    SYM(ViewportIndexedfv),
-    SYM(ScissorArrayv),
-    SYM(ScissorIndexed),
-    SYM(ScissorIndexedv),
-    SYM(DepthRangeArrayv),
-    SYM(DepthRangeIndexed),
-    SYM(GetFloati_v),
-    SYM(GetDoublei_v),
-    SYM(DrawArraysInstancedBaseInstance),
-    SYM(DrawElementsInstancedBaseInstance),
-    SYM(DrawElementsInstancedBaseVertexBaseInstance),
-    SYM(GetInternalformativ),
-    SYM(GetActiveAtomicCounterBufferiv),
-    SYM(BindImageTexture),
-    SYM(MemoryBarrier),
-    SYM(TexStorage1D),
-    SYM(TexStorage2D),
-    SYM(TexStorage3D),
-    SYM(DrawTransformFeedbackInstanced),
-    SYM(DrawTransformFeedbackStreamInstanced),
-    SYM(ClearBufferData),
-    SYM(ClearBufferSubData),
-    SYM(DispatchCompute),
-    SYM(DispatchComputeIndirect),
-    SYM(CopyImageSubData),
-    SYM(FramebufferParameteri),
-    SYM(GetFramebufferParameteriv),
-    SYM(GetInternalformati64v),
-    SYM(InvalidateTexSubImage),
-    SYM(InvalidateTexImage),
-    SYM(InvalidateBufferSubData),
-    SYM(InvalidateBufferData),
-    SYM(InvalidateFramebuffer),
-    SYM(InvalidateSubFramebuffer),
-    SYM(MultiDrawArraysIndirect),
-    SYM(MultiDrawElementsIndirect),
-    SYM(GetProgramInterfaceiv),
-    SYM(GetProgramResourceIndex),
-    SYM(GetProgramResourceName),
-    SYM(GetProgramResourceiv),
-    SYM(GetProgramResourceLocation),
-    SYM(GetProgramResourceLocationIndex),
-    SYM(ShaderStorageBlockBinding),
-    SYM(TexBufferRange),
-    SYM(TexStorage2DMultisample),
-    SYM(TexStorage3DMultisample),
-    SYM(TextureView),
-    SYM(BindVertexBuffer),
-    SYM(VertexAttribFormat),
-    SYM(VertexAttribIFormat),
-    SYM(VertexAttribLFormat),
-    SYM(VertexAttribBinding),
-    SYM(VertexBindingDivisor),
-    SYM(DebugMessageControl),
-    SYM(DebugMessageInsert),
-    SYM(DebugMessageCallback),
-    SYM(GetDebugMessageLog),
-    SYM(PushDebugGroup),
-    SYM(PopDebugGroup),
-    SYM(ObjectLabel),
-    SYM(GetObjectLabel),
-    SYM(ObjectPtrLabel),
-    SYM(GetObjectPtrLabel),
-    SYM(BufferStorage),
-    SYM(ClearTexImage),
-    SYM(ClearTexSubImage),
-    SYM(BindBuffersBase),
-    SYM(BindBuffersRange),
-    SYM(BindTextures),
-    SYM(BindSamplers),
-    SYM(BindImageTextures),
-    SYM(BindVertexBuffers),
-    SYM(GetTextureHandleARB),
-    SYM(GetTextureSamplerHandleARB),
-    SYM(MakeTextureHandleResidentARB),
-    SYM(MakeTextureHandleNonResidentARB),
-    SYM(GetImageHandleARB),
-    SYM(MakeImageHandleResidentARB),
-    SYM(MakeImageHandleNonResidentARB),
-    SYM(UniformHandleui64ARB),
-    SYM(UniformHandleui64vARB),
-    SYM(ProgramUniformHandleui64ARB),
-    SYM(ProgramUniformHandleui64vARB),
-    SYM(IsTextureHandleResidentARB),
-    SYM(IsImageHandleResidentARB),
-    SYM(VertexAttribL1ui64ARB),
-    SYM(VertexAttribL1ui64vARB),
-    SYM(GetVertexAttribLui64vARB),
-    SYM(CreateSyncFromCLeventARB),
-    SYM(ClampColorARB),
-    SYM(DispatchComputeGroupSizeARB),
-    SYM(DebugMessageControlARB),
-    SYM(DebugMessageInsertARB),
-    SYM(DebugMessageCallbackARB),
-    SYM(GetDebugMessageLogARB),
-    SYM(DrawBuffersARB),
-    SYM(BlendEquationiARB),
-    SYM(BlendEquationSeparateiARB),
-    SYM(BlendFunciARB),
-    SYM(BlendFuncSeparateiARB),
-    SYM(DrawArraysInstancedARB),
-    SYM(DrawElementsInstancedARB),
-    SYM(ProgramStringARB),
-    SYM(BindProgramARB),
-    SYM(DeleteProgramsARB),
-    SYM(GenProgramsARB),
-    SYM(ProgramEnvParameter4dARB),
-    SYM(ProgramEnvParameter4dvARB),
-    SYM(ProgramEnvParameter4fARB),
-    SYM(ProgramEnvParameter4fvARB),
-    SYM(ProgramLocalParameter4dARB),
-    SYM(ProgramLocalParameter4dvARB),
-    SYM(ProgramLocalParameter4fARB),
-    SYM(ProgramLocalParameter4fvARB),
-    SYM(GetProgramEnvParameterdvARB),
-    SYM(GetProgramEnvParameterfvARB),
-    SYM(GetProgramLocalParameterdvARB),
-    SYM(GetProgramLocalParameterfvARB),
-    SYM(GetProgramivARB),
-    SYM(GetProgramStringARB),
-    SYM(IsProgramARB),
-    SYM(ProgramParameteriARB),
-    SYM(FramebufferTextureARB),
-    SYM(FramebufferTextureLayerARB),
-    SYM(FramebufferTextureFaceARB),
-    SYM(ColorTable),
-    SYM(ColorTableParameterfv),
-    SYM(ColorTableParameteriv),
-    SYM(CopyColorTable),
-    SYM(GetColorTable),
-    SYM(GetColorTableParameterfv),
-    SYM(GetColorTableParameteriv),
-    SYM(ColorSubTable),
-    SYM(CopyColorSubTable),
-    SYM(ConvolutionFilter1D),
-    SYM(ConvolutionFilter2D),
-    SYM(ConvolutionParameterf),
-    SYM(ConvolutionParameterfv),
-    SYM(ConvolutionParameteri),
-    SYM(ConvolutionParameteriv),
-    SYM(CopyConvolutionFilter1D),
-    SYM(CopyConvolutionFilter2D),
-    SYM(GetConvolutionFilter),
-    SYM(GetConvolutionParameterfv),
-    SYM(GetConvolutionParameteriv),
-    SYM(GetSeparableFilter),
-    SYM(SeparableFilter2D),
-    SYM(GetHistogram),
-    SYM(GetHistogramParameterfv),
-    SYM(GetHistogramParameteriv),
-    SYM(GetMinmax),
-    SYM(GetMinmaxParameterfv),
-    SYM(GetMinmaxParameteriv),
-    SYM(Histogram),
-    SYM(Minmax),
-    SYM(ResetHistogram),
-    SYM(ResetMinmax),
-    SYM(MultiDrawArraysIndirectCountARB),
-    SYM(MultiDrawElementsIndirectCountARB),
-    SYM(VertexAttribDivisorARB),
-    SYM(CurrentPaletteMatrixARB),
-    SYM(MatrixIndexubvARB),
-    SYM(MatrixIndexusvARB),
-    SYM(MatrixIndexuivARB),
-    SYM(MatrixIndexPointerARB),
-    SYM(SampleCoverageARB),
-    SYM(ActiveTextureARB),
-    SYM(ClientActiveTextureARB),
-    SYM(MultiTexCoord1dARB),
-    SYM(MultiTexCoord1dvARB),
-    SYM(MultiTexCoord1fARB),
-    SYM(MultiTexCoord1fvARB),
-    SYM(MultiTexCoord1iARB),
-    SYM(MultiTexCoord1ivARB),
-    SYM(MultiTexCoord1sARB),
-    SYM(MultiTexCoord1svARB),
-    SYM(MultiTexCoord2dARB),
-    SYM(MultiTexCoord2dvARB),
-    SYM(MultiTexCoord2fARB),
-    SYM(MultiTexCoord2fvARB),
-    SYM(MultiTexCoord2iARB),
-    SYM(MultiTexCoord2ivARB),
-    SYM(MultiTexCoord2sARB),
-    SYM(MultiTexCoord2svARB),
-    SYM(MultiTexCoord3dARB),
-    SYM(MultiTexCoord3dvARB),
-    SYM(MultiTexCoord3fARB),
-    SYM(MultiTexCoord3fvARB),
-    SYM(MultiTexCoord3iARB),
-    SYM(MultiTexCoord3ivARB),
-    SYM(MultiTexCoord3sARB),
-    SYM(MultiTexCoord3svARB),
-    SYM(MultiTexCoord4dARB),
-    SYM(MultiTexCoord4dvARB),
-    SYM(MultiTexCoord4fARB),
-    SYM(MultiTexCoord4fvARB),
-    SYM(MultiTexCoord4iARB),
-    SYM(MultiTexCoord4ivARB),
-    SYM(MultiTexCoord4sARB),
-    SYM(MultiTexCoord4svARB),
-    SYM(GenQueriesARB),
-    SYM(DeleteQueriesARB),
-    SYM(IsQueryARB),
-    SYM(BeginQueryARB),
-    SYM(EndQueryARB),
-    SYM(GetQueryivARB),
-    SYM(GetQueryObjectivARB),
-    SYM(GetQueryObjectuivARB),
-    SYM(PointParameterfARB),
-    SYM(PointParameterfvARB),
-    SYM(GetGraphicsResetStatusARB),
-    SYM(GetnTexImageARB),
-    SYM(ReadnPixelsARB),
-    SYM(GetnCompressedTexImageARB),
-    SYM(GetnUniformfvARB),
-    SYM(GetnUniformivARB),
-    SYM(GetnUniformuivARB),
-    SYM(GetnUniformdvARB),
-    SYM(GetnMapdvARB),
-    SYM(GetnMapfvARB),
-    SYM(GetnMapivARB),
-    SYM(GetnPixelMapfvARB),
-    SYM(GetnPixelMapuivARB),
-    SYM(GetnPixelMapusvARB),
-    SYM(GetnPolygonStippleARB),
-    SYM(GetnColorTableARB),
-    SYM(GetnConvolutionFilterARB),
-    SYM(GetnSeparableFilterARB),
-    SYM(GetnHistogramARB),
-    SYM(GetnMinmaxARB),
-    SYM(MinSampleShadingARB),
-    SYM(DeleteObjectARB),
-    SYM(GetHandleARB),
-    SYM(DetachObjectARB),
-    SYM(CreateShaderObjectARB),
-    SYM(ShaderSourceARB),
-    SYM(CompileShaderARB),
-    SYM(CreateProgramObjectARB),
-    SYM(AttachObjectARB),
-    SYM(LinkProgramARB),
-    SYM(UseProgramObjectARB),
-    SYM(ValidateProgramARB),
-    SYM(Uniform1fARB),
-    SYM(Uniform2fARB),
-    SYM(Uniform3fARB),
-    SYM(Uniform4fARB),
-    SYM(Uniform1iARB),
-    SYM(Uniform2iARB),
-    SYM(Uniform3iARB),
-    SYM(Uniform4iARB),
-    SYM(Uniform1fvARB),
-    SYM(Uniform2fvARB),
-    SYM(Uniform3fvARB),
-    SYM(Uniform4fvARB),
-    SYM(Uniform1ivARB),
-    SYM(Uniform2ivARB),
-    SYM(Uniform3ivARB),
-    SYM(Uniform4ivARB),
-    SYM(UniformMatrix2fvARB),
-    SYM(UniformMatrix3fvARB),
-    SYM(UniformMatrix4fvARB),
-    SYM(GetObjectParameterfvARB),
-    SYM(GetObjectParameterivARB),
-    SYM(GetInfoLogARB),
-    SYM(GetAttachedObjectsARB),
-    SYM(GetUniformLocationARB),
-    SYM(GetActiveUniformARB),
-    SYM(GetUniformfvARB),
-    SYM(GetUniformivARB),
-    SYM(GetShaderSourceARB),
-    SYM(NamedStringARB),
-    SYM(DeleteNamedStringARB),
-    SYM(CompileShaderIncludeARB),
-    SYM(IsNamedStringARB),
-    SYM(GetNamedStringARB),
-    SYM(GetNamedStringivARB),
-    SYM(TexPageCommitmentARB),
-    SYM(TexBufferARB),
-    SYM(CompressedTexImage3DARB),
-    SYM(CompressedTexImage2DARB),
-    SYM(CompressedTexImage1DARB),
-    SYM(CompressedTexSubImage3DARB),
-    SYM(CompressedTexSubImage2DARB),
-    SYM(CompressedTexSubImage1DARB),
-    SYM(GetCompressedTexImageARB),
-    SYM(LoadTransposeMatrixfARB),
-    SYM(LoadTransposeMatrixdARB),
-    SYM(MultTransposeMatrixfARB),
-    SYM(MultTransposeMatrixdARB),
-    SYM(WeightbvARB),
-    SYM(WeightsvARB),
-    SYM(WeightivARB),
-    SYM(WeightfvARB),
-    SYM(WeightdvARB),
-    SYM(WeightubvARB),
-    SYM(WeightusvARB),
-    SYM(WeightuivARB),
-    SYM(WeightPointerARB),
-    SYM(VertexBlendARB),
-    SYM(BindBufferARB),
-    SYM(DeleteBuffersARB),
-    SYM(GenBuffersARB),
-    SYM(IsBufferARB),
-    SYM(BufferDataARB),
-    SYM(BufferSubDataARB),
-    SYM(GetBufferSubDataARB),
-    SYM(MapBufferARB),
-    SYM(UnmapBufferARB),
-    SYM(GetBufferParameterivARB),
-    SYM(GetBufferPointervARB),
-    SYM(VertexAttrib1dARB),
-    SYM(VertexAttrib1dvARB),
-    SYM(VertexAttrib1fARB),
-    SYM(VertexAttrib1fvARB),
-    SYM(VertexAttrib1sARB),
-    SYM(VertexAttrib1svARB),
-    SYM(VertexAttrib2dARB),
-    SYM(VertexAttrib2dvARB),
-    SYM(VertexAttrib2fARB),
-    SYM(VertexAttrib2fvARB),
-    SYM(VertexAttrib2sARB),
-    SYM(VertexAttrib2svARB),
-    SYM(VertexAttrib3dARB),
-    SYM(VertexAttrib3dvARB),
-    SYM(VertexAttrib3fARB),
-    SYM(VertexAttrib3fvARB),
-    SYM(VertexAttrib3sARB),
-    SYM(VertexAttrib3svARB),
-    SYM(VertexAttrib4NbvARB),
-    SYM(VertexAttrib4NivARB),
-    SYM(VertexAttrib4NsvARB),
-    SYM(VertexAttrib4NubARB),
-    SYM(VertexAttrib4NubvARB),
-    SYM(VertexAttrib4NuivARB),
-    SYM(VertexAttrib4NusvARB),
-    SYM(VertexAttrib4bvARB),
-    SYM(VertexAttrib4dARB),
-    SYM(VertexAttrib4dvARB),
-    SYM(VertexAttrib4fARB),
-    SYM(VertexAttrib4fvARB),
-    SYM(VertexAttrib4ivARB),
-    SYM(VertexAttrib4sARB),
-    SYM(VertexAttrib4svARB),
-    SYM(VertexAttrib4ubvARB),
-    SYM(VertexAttrib4uivARB),
-    SYM(VertexAttrib4usvARB),
-    SYM(VertexAttribPointerARB),
-    SYM(EnableVertexAttribArrayARB),
-    SYM(DisableVertexAttribArrayARB),
-    SYM(GetVertexAttribdvARB),
-    SYM(GetVertexAttribfvARB),
-    SYM(GetVertexAttribivARB),
-    SYM(GetVertexAttribPointervARB),
-    SYM(BindAttribLocationARB),
-    SYM(GetActiveAttribARB),
-    SYM(GetAttribLocationARB),
-    SYM(WindowPos2dARB),
-    SYM(WindowPos2dvARB),
-    SYM(WindowPos2fARB),
-    SYM(WindowPos2fvARB),
-    SYM(WindowPos2iARB),
-    SYM(WindowPos2ivARB),
-    SYM(WindowPos2sARB),
-    SYM(WindowPos2svARB),
-    SYM(WindowPos3dARB),
-    SYM(WindowPos3dvARB),
-    SYM(WindowPos3fARB),
-    SYM(WindowPos3fvARB),
-    SYM(WindowPos3iARB),
-    SYM(WindowPos3ivARB),
-    SYM(WindowPos3sARB),
-    SYM(WindowPos3svARB),
-    SYM(MultiTexCoord1bOES),
-    SYM(MultiTexCoord1bvOES),
-    SYM(MultiTexCoord2bOES),
-    SYM(MultiTexCoord2bvOES),
-    SYM(MultiTexCoord3bOES),
-    SYM(MultiTexCoord3bvOES),
-    SYM(MultiTexCoord4bOES),
-    SYM(MultiTexCoord4bvOES),
-    SYM(TexCoord1bOES),
-    SYM(TexCoord1bvOES),
-    SYM(TexCoord2bOES),
-    SYM(TexCoord2bvOES),
-    SYM(TexCoord3bOES),
-    SYM(TexCoord3bvOES),
-    SYM(TexCoord4bOES),
-    SYM(TexCoord4bvOES),
-    SYM(Vertex2bOES),
-    SYM(Vertex2bvOES),
-    SYM(Vertex3bOES),
-    SYM(Vertex3bvOES),
-    SYM(Vertex4bOES),
-    SYM(Vertex4bvOES),
-    SYM(AlphaFuncxOES),
-    SYM(ClearColorxOES),
-    SYM(ClearDepthxOES),
-    SYM(ClipPlanexOES),
-    SYM(Color4xOES),
-    SYM(DepthRangexOES),
-    SYM(FogxOES),
-    SYM(FogxvOES),
-    SYM(FrustumxOES),
-    SYM(GetClipPlanexOES),
-    SYM(GetFixedvOES),
-    SYM(GetTexEnvxvOES),
-    SYM(GetTexParameterxvOES),
-    SYM(LightModelxOES),
-    SYM(LightModelxvOES),
-    SYM(LightxOES),
-    SYM(LightxvOES),
-    SYM(LineWidthxOES),
-    SYM(LoadMatrixxOES),
-    SYM(MaterialxOES),
-    SYM(MaterialxvOES),
-    SYM(MultMatrixxOES),
-    SYM(MultiTexCoord4xOES),
-    SYM(Normal3xOES),
-    SYM(OrthoxOES),
-    SYM(PointParameterxvOES),
-    SYM(PointSizexOES),
-    SYM(PolygonOffsetxOES),
-    SYM(RotatexOES),
-    SYM(SampleCoverageOES),
-    SYM(ScalexOES),
-    SYM(TexEnvxOES),
-    SYM(TexEnvxvOES),
-    SYM(TexParameterxOES),
-    SYM(TexParameterxvOES),
-    SYM(TranslatexOES),
-    SYM(AccumxOES),
-    SYM(BitmapxOES),
-    SYM(BlendColorxOES),
-    SYM(ClearAccumxOES),
-    SYM(Color3xOES),
-    SYM(Color3xvOES),
-    SYM(Color4xvOES),
-    SYM(ConvolutionParameterxOES),
-    SYM(ConvolutionParameterxvOES),
-    SYM(EvalCoord1xOES),
-    SYM(EvalCoord1xvOES),
-    SYM(EvalCoord2xOES),
-    SYM(EvalCoord2xvOES),
-    SYM(FeedbackBufferxOES),
-    SYM(GetConvolutionParameterxvOES),
-    SYM(GetHistogramParameterxvOES),
-    SYM(GetLightxOES),
-    SYM(GetMapxvOES),
-    SYM(GetMaterialxOES),
-    SYM(GetPixelMapxv),
-    SYM(GetTexGenxvOES),
-    SYM(GetTexLevelParameterxvOES),
-    SYM(IndexxOES),
-    SYM(IndexxvOES),
-    SYM(LoadTransposeMatrixxOES),
-    SYM(Map1xOES),
-    SYM(Map2xOES),
-    SYM(MapGrid1xOES),
-    SYM(MapGrid2xOES),
-    SYM(MultTransposeMatrixxOES),
-    SYM(MultiTexCoord1xOES),
-    SYM(MultiTexCoord1xvOES),
-    SYM(MultiTexCoord2xOES),
-    SYM(MultiTexCoord2xvOES),
-    SYM(MultiTexCoord3xOES),
-    SYM(MultiTexCoord3xvOES),
-    SYM(MultiTexCoord4xvOES),
-    SYM(Normal3xvOES),
-    SYM(PassThroughxOES),
-    SYM(PixelMapx),
-    SYM(PixelStorex),
-    SYM(PixelTransferxOES),
-    SYM(PixelZoomxOES),
-    SYM(PrioritizeTexturesxOES),
-    SYM(RasterPos2xOES),
-    SYM(RasterPos2xvOES),
-    SYM(RasterPos3xOES),
-    SYM(RasterPos3xvOES),
-    SYM(RasterPos4xOES),
-    SYM(RasterPos4xvOES),
-    SYM(RectxOES),
-    SYM(RectxvOES),
-    SYM(TexCoord1xOES),
-    SYM(TexCoord1xvOES),
-    SYM(TexCoord2xOES),
-    SYM(TexCoord2xvOES),
-    SYM(TexCoord3xOES),
-    SYM(TexCoord3xvOES),
-    SYM(TexCoord4xOES),
-    SYM(TexCoord4xvOES),
-    SYM(TexGenxOES),
-    SYM(TexGenxvOES),
-    SYM(Vertex2xOES),
-    SYM(Vertex2xvOES),
-    SYM(Vertex3xOES),
-    SYM(Vertex3xvOES),
-    SYM(Vertex4xOES),
-    SYM(Vertex4xvOES),
-    SYM(QueryMatrixxOES),
-    SYM(ClearDepthfOES),
-    SYM(ClipPlanefOES),
-    SYM(DepthRangefOES),
-    SYM(FrustumfOES),
-    SYM(GetClipPlanefOES),
-    SYM(OrthofOES),
-    SYM(ImageTransformParameteriHP),
-    SYM(ImageTransformParameterfHP),
-    SYM(ImageTransformParameterivHP),
-    SYM(ImageTransformParameterfvHP),
-    SYM(GetImageTransformParameterivHP),
-    SYM(GetImageTransformParameterfvHP),
-
-    { NULL, NULL },
-};
-RGLSYMGLDRAWRANGEELEMENTSPROC __rglgen_glDrawRangeElements;
-RGLSYMGLTEXIMAGE3DPROC __rglgen_glTexImage3D;
-RGLSYMGLTEXSUBIMAGE3DPROC __rglgen_glTexSubImage3D;
-RGLSYMGLCOPYTEXSUBIMAGE3DPROC __rglgen_glCopyTexSubImage3D;
-RGLSYMGLACTIVETEXTUREPROC __rglgen_glActiveTexture;
-RGLSYMGLSAMPLECOVERAGEPROC __rglgen_glSampleCoverage;
-RGLSYMGLCOMPRESSEDTEXIMAGE3DPROC __rglgen_glCompressedTexImage3D;
-RGLSYMGLCOMPRESSEDTEXIMAGE2DPROC __rglgen_glCompressedTexImage2D;
-RGLSYMGLCOMPRESSEDTEXIMAGE1DPROC __rglgen_glCompressedTexImage1D;
-RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DPROC __rglgen_glCompressedTexSubImage3D;
-RGLSYMGLCOMPRESSEDTEXSUBIMAGE2DPROC __rglgen_glCompressedTexSubImage2D;
-RGLSYMGLCOMPRESSEDTEXSUBIMAGE1DPROC __rglgen_glCompressedTexSubImage1D;
-RGLSYMGLGETCOMPRESSEDTEXIMAGEPROC __rglgen_glGetCompressedTexImage;
-RGLSYMGLCLIENTACTIVETEXTUREPROC __rglgen_glClientActiveTexture;
-RGLSYMGLMULTITEXCOORD1DPROC __rglgen_glMultiTexCoord1d;
-RGLSYMGLMULTITEXCOORD1DVPROC __rglgen_glMultiTexCoord1dv;
-RGLSYMGLMULTITEXCOORD1FPROC __rglgen_glMultiTexCoord1f;
-RGLSYMGLMULTITEXCOORD1FVPROC __rglgen_glMultiTexCoord1fv;
-RGLSYMGLMULTITEXCOORD1IPROC __rglgen_glMultiTexCoord1i;
-RGLSYMGLMULTITEXCOORD1IVPROC __rglgen_glMultiTexCoord1iv;
-RGLSYMGLMULTITEXCOORD1SPROC __rglgen_glMultiTexCoord1s;
-RGLSYMGLMULTITEXCOORD1SVPROC __rglgen_glMultiTexCoord1sv;
-RGLSYMGLMULTITEXCOORD2DPROC __rglgen_glMultiTexCoord2d;
-RGLSYMGLMULTITEXCOORD2DVPROC __rglgen_glMultiTexCoord2dv;
-RGLSYMGLMULTITEXCOORD2FPROC __rglgen_glMultiTexCoord2f;
-RGLSYMGLMULTITEXCOORD2FVPROC __rglgen_glMultiTexCoord2fv;
-RGLSYMGLMULTITEXCOORD2IPROC __rglgen_glMultiTexCoord2i;
-RGLSYMGLMULTITEXCOORD2IVPROC __rglgen_glMultiTexCoord2iv;
-RGLSYMGLMULTITEXCOORD2SPROC __rglgen_glMultiTexCoord2s;
-RGLSYMGLMULTITEXCOORD2SVPROC __rglgen_glMultiTexCoord2sv;
-RGLSYMGLMULTITEXCOORD3DPROC __rglgen_glMultiTexCoord3d;
-RGLSYMGLMULTITEXCOORD3DVPROC __rglgen_glMultiTexCoord3dv;
-RGLSYMGLMULTITEXCOORD3FPROC __rglgen_glMultiTexCoord3f;
-RGLSYMGLMULTITEXCOORD3FVPROC __rglgen_glMultiTexCoord3fv;
-RGLSYMGLMULTITEXCOORD3IPROC __rglgen_glMultiTexCoord3i;
-RGLSYMGLMULTITEXCOORD3IVPROC __rglgen_glMultiTexCoord3iv;
-RGLSYMGLMULTITEXCOORD3SPROC __rglgen_glMultiTexCoord3s;
-RGLSYMGLMULTITEXCOORD3SVPROC __rglgen_glMultiTexCoord3sv;
-RGLSYMGLMULTITEXCOORD4DPROC __rglgen_glMultiTexCoord4d;
-RGLSYMGLMULTITEXCOORD4DVPROC __rglgen_glMultiTexCoord4dv;
-RGLSYMGLMULTITEXCOORD4FPROC __rglgen_glMultiTexCoord4f;
-RGLSYMGLMULTITEXCOORD4FVPROC __rglgen_glMultiTexCoord4fv;
-RGLSYMGLMULTITEXCOORD4IPROC __rglgen_glMultiTexCoord4i;
-RGLSYMGLMULTITEXCOORD4IVPROC __rglgen_glMultiTexCoord4iv;
-RGLSYMGLMULTITEXCOORD4SPROC __rglgen_glMultiTexCoord4s;
-RGLSYMGLMULTITEXCOORD4SVPROC __rglgen_glMultiTexCoord4sv;
-RGLSYMGLLOADTRANSPOSEMATRIXFPROC __rglgen_glLoadTransposeMatrixf;
-RGLSYMGLLOADTRANSPOSEMATRIXDPROC __rglgen_glLoadTransposeMatrixd;
-RGLSYMGLMULTTRANSPOSEMATRIXFPROC __rglgen_glMultTransposeMatrixf;
-RGLSYMGLMULTTRANSPOSEMATRIXDPROC __rglgen_glMultTransposeMatrixd;
-RGLSYMGLBLENDFUNCSEPARATEPROC __rglgen_glBlendFuncSeparate;
-RGLSYMGLMULTIDRAWARRAYSPROC __rglgen_glMultiDrawArrays;
-RGLSYMGLMULTIDRAWELEMENTSPROC __rglgen_glMultiDrawElements;
-RGLSYMGLPOINTPARAMETERFPROC __rglgen_glPointParameterf;
-RGLSYMGLPOINTPARAMETERFVPROC __rglgen_glPointParameterfv;
-RGLSYMGLPOINTPARAMETERIPROC __rglgen_glPointParameteri;
-RGLSYMGLPOINTPARAMETERIVPROC __rglgen_glPointParameteriv;
-RGLSYMGLFOGCOORDFPROC __rglgen_glFogCoordf;
-RGLSYMGLFOGCOORDFVPROC __rglgen_glFogCoordfv;
-RGLSYMGLFOGCOORDDPROC __rglgen_glFogCoordd;
-RGLSYMGLFOGCOORDDVPROC __rglgen_glFogCoorddv;
-RGLSYMGLFOGCOORDPOINTERPROC __rglgen_glFogCoordPointer;
-RGLSYMGLSECONDARYCOLOR3BPROC __rglgen_glSecondaryColor3b;
-RGLSYMGLSECONDARYCOLOR3BVPROC __rglgen_glSecondaryColor3bv;
-RGLSYMGLSECONDARYCOLOR3DPROC __rglgen_glSecondaryColor3d;
-RGLSYMGLSECONDARYCOLOR3DVPROC __rglgen_glSecondaryColor3dv;
-RGLSYMGLSECONDARYCOLOR3FPROC __rglgen_glSecondaryColor3f;
-RGLSYMGLSECONDARYCOLOR3FVPROC __rglgen_glSecondaryColor3fv;
-RGLSYMGLSECONDARYCOLOR3IPROC __rglgen_glSecondaryColor3i;
-RGLSYMGLSECONDARYCOLOR3IVPROC __rglgen_glSecondaryColor3iv;
-RGLSYMGLSECONDARYCOLOR3SPROC __rglgen_glSecondaryColor3s;
-RGLSYMGLSECONDARYCOLOR3SVPROC __rglgen_glSecondaryColor3sv;
-RGLSYMGLSECONDARYCOLOR3UBPROC __rglgen_glSecondaryColor3ub;
-RGLSYMGLSECONDARYCOLOR3UBVPROC __rglgen_glSecondaryColor3ubv;
-RGLSYMGLSECONDARYCOLOR3UIPROC __rglgen_glSecondaryColor3ui;
-RGLSYMGLSECONDARYCOLOR3UIVPROC __rglgen_glSecondaryColor3uiv;
-RGLSYMGLSECONDARYCOLOR3USPROC __rglgen_glSecondaryColor3us;
-RGLSYMGLSECONDARYCOLOR3USVPROC __rglgen_glSecondaryColor3usv;
-RGLSYMGLSECONDARYCOLORPOINTERPROC __rglgen_glSecondaryColorPointer;
-RGLSYMGLWINDOWPOS2DPROC __rglgen_glWindowPos2d;
-RGLSYMGLWINDOWPOS2DVPROC __rglgen_glWindowPos2dv;
-RGLSYMGLWINDOWPOS2FPROC __rglgen_glWindowPos2f;
-RGLSYMGLWINDOWPOS2FVPROC __rglgen_glWindowPos2fv;
-RGLSYMGLWINDOWPOS2IPROC __rglgen_glWindowPos2i;
-RGLSYMGLWINDOWPOS2IVPROC __rglgen_glWindowPos2iv;
-RGLSYMGLWINDOWPOS2SPROC __rglgen_glWindowPos2s;
-RGLSYMGLWINDOWPOS2SVPROC __rglgen_glWindowPos2sv;
-RGLSYMGLWINDOWPOS3DPROC __rglgen_glWindowPos3d;
-RGLSYMGLWINDOWPOS3DVPROC __rglgen_glWindowPos3dv;
-RGLSYMGLWINDOWPOS3FPROC __rglgen_glWindowPos3f;
-RGLSYMGLWINDOWPOS3FVPROC __rglgen_glWindowPos3fv;
-RGLSYMGLWINDOWPOS3IPROC __rglgen_glWindowPos3i;
-RGLSYMGLWINDOWPOS3IVPROC __rglgen_glWindowPos3iv;
-RGLSYMGLWINDOWPOS3SPROC __rglgen_glWindowPos3s;
-RGLSYMGLWINDOWPOS3SVPROC __rglgen_glWindowPos3sv;
-RGLSYMGLBLENDCOLORPROC __rglgen_glBlendColor;
-RGLSYMGLBLENDEQUATIONPROC __rglgen_glBlendEquation;
-RGLSYMGLGENQUERIESPROC __rglgen_glGenQueries;
-RGLSYMGLDELETEQUERIESPROC __rglgen_glDeleteQueries;
-RGLSYMGLISQUERYPROC __rglgen_glIsQuery;
-RGLSYMGLBEGINQUERYPROC __rglgen_glBeginQuery;
-RGLSYMGLENDQUERYPROC __rglgen_glEndQuery;
-RGLSYMGLGETQUERYIVPROC __rglgen_glGetQueryiv;
-RGLSYMGLGETQUERYOBJECTIVPROC __rglgen_glGetQueryObjectiv;
-RGLSYMGLGETQUERYOBJECTUIVPROC __rglgen_glGetQueryObjectuiv;
-RGLSYMGLBINDBUFFERPROC __rglgen_glBindBuffer;
-RGLSYMGLDELETEBUFFERSPROC __rglgen_glDeleteBuffers;
-RGLSYMGLGENBUFFERSPROC __rglgen_glGenBuffers;
-RGLSYMGLISBUFFERPROC __rglgen_glIsBuffer;
-RGLSYMGLBUFFERDATAPROC __rglgen_glBufferData;
-RGLSYMGLBUFFERSUBDATAPROC __rglgen_glBufferSubData;
-RGLSYMGLGETBUFFERSUBDATAPROC __rglgen_glGetBufferSubData;
-RGLSYMGLMAPBUFFERPROC __rglgen_glMapBuffer;
-RGLSYMGLUNMAPBUFFERPROC __rglgen_glUnmapBuffer;
-RGLSYMGLGETBUFFERPARAMETERIVPROC __rglgen_glGetBufferParameteriv;
-RGLSYMGLGETBUFFERPOINTERVPROC __rglgen_glGetBufferPointerv;
-RGLSYMGLBLENDEQUATIONSEPARATEPROC __rglgen_glBlendEquationSeparate;
-RGLSYMGLDRAWBUFFERSPROC __rglgen_glDrawBuffers;
-RGLSYMGLSTENCILOPSEPARATEPROC __rglgen_glStencilOpSeparate;
-RGLSYMGLSTENCILFUNCSEPARATEPROC __rglgen_glStencilFuncSeparate;
-RGLSYMGLSTENCILMASKSEPARATEPROC __rglgen_glStencilMaskSeparate;
-RGLSYMGLATTACHSHADERPROC __rglgen_glAttachShader;
-RGLSYMGLBINDATTRIBLOCATIONPROC __rglgen_glBindAttribLocation;
-RGLSYMGLCOMPILESHADERPROC __rglgen_glCompileShader;
-RGLSYMGLCREATEPROGRAMPROC __rglgen_glCreateProgram;
-RGLSYMGLCREATESHADERPROC __rglgen_glCreateShader;
-RGLSYMGLDELETEPROGRAMPROC __rglgen_glDeleteProgram;
-RGLSYMGLDELETESHADERPROC __rglgen_glDeleteShader;
-RGLSYMGLDETACHSHADERPROC __rglgen_glDetachShader;
-RGLSYMGLDISABLEVERTEXATTRIBARRAYPROC __rglgen_glDisableVertexAttribArray;
-RGLSYMGLENABLEVERTEXATTRIBARRAYPROC __rglgen_glEnableVertexAttribArray;
-RGLSYMGLGETACTIVEATTRIBPROC __rglgen_glGetActiveAttrib;
-RGLSYMGLGETACTIVEUNIFORMPROC __rglgen_glGetActiveUniform;
-RGLSYMGLGETATTACHEDSHADERSPROC __rglgen_glGetAttachedShaders;
-RGLSYMGLGETATTRIBLOCATIONPROC __rglgen_glGetAttribLocation;
-RGLSYMGLGETPROGRAMIVPROC __rglgen_glGetProgramiv;
-RGLSYMGLGETPROGRAMINFOLOGPROC __rglgen_glGetProgramInfoLog;
-RGLSYMGLGETSHADERIVPROC __rglgen_glGetShaderiv;
-RGLSYMGLGETSHADERINFOLOGPROC __rglgen_glGetShaderInfoLog;
-RGLSYMGLGETSHADERSOURCEPROC __rglgen_glGetShaderSource;
-RGLSYMGLGETUNIFORMLOCATIONPROC __rglgen_glGetUniformLocation;
-RGLSYMGLGETUNIFORMFVPROC __rglgen_glGetUniformfv;
-RGLSYMGLGETUNIFORMIVPROC __rglgen_glGetUniformiv;
-RGLSYMGLGETVERTEXATTRIBDVPROC __rglgen_glGetVertexAttribdv;
-RGLSYMGLGETVERTEXATTRIBFVPROC __rglgen_glGetVertexAttribfv;
-RGLSYMGLGETVERTEXATTRIBIVPROC __rglgen_glGetVertexAttribiv;
-RGLSYMGLGETVERTEXATTRIBPOINTERVPROC __rglgen_glGetVertexAttribPointerv;
-RGLSYMGLISPROGRAMPROC __rglgen_glIsProgram;
-RGLSYMGLISSHADERPROC __rglgen_glIsShader;
-RGLSYMGLLINKPROGRAMPROC __rglgen_glLinkProgram;
-RGLSYMGLSHADERSOURCEPROC __rglgen_glShaderSource;
-RGLSYMGLUSEPROGRAMPROC __rglgen_glUseProgram;
-RGLSYMGLUNIFORM1FPROC __rglgen_glUniform1f;
-RGLSYMGLUNIFORM2FPROC __rglgen_glUniform2f;
-RGLSYMGLUNIFORM3FPROC __rglgen_glUniform3f;
-RGLSYMGLUNIFORM4FPROC __rglgen_glUniform4f;
-RGLSYMGLUNIFORM1IPROC __rglgen_glUniform1i;
-RGLSYMGLUNIFORM2IPROC __rglgen_glUniform2i;
-RGLSYMGLUNIFORM3IPROC __rglgen_glUniform3i;
-RGLSYMGLUNIFORM4IPROC __rglgen_glUniform4i;
-RGLSYMGLUNIFORM1FVPROC __rglgen_glUniform1fv;
-RGLSYMGLUNIFORM2FVPROC __rglgen_glUniform2fv;
-RGLSYMGLUNIFORM3FVPROC __rglgen_glUniform3fv;
-RGLSYMGLUNIFORM4FVPROC __rglgen_glUniform4fv;
-RGLSYMGLUNIFORM1IVPROC __rglgen_glUniform1iv;
-RGLSYMGLUNIFORM2IVPROC __rglgen_glUniform2iv;
-RGLSYMGLUNIFORM3IVPROC __rglgen_glUniform3iv;
-RGLSYMGLUNIFORM4IVPROC __rglgen_glUniform4iv;
-RGLSYMGLUNIFORMMATRIX2FVPROC __rglgen_glUniformMatrix2fv;
-RGLSYMGLUNIFORMMATRIX3FVPROC __rglgen_glUniformMatrix3fv;
-RGLSYMGLUNIFORMMATRIX4FVPROC __rglgen_glUniformMatrix4fv;
-RGLSYMGLVALIDATEPROGRAMPROC __rglgen_glValidateProgram;
-RGLSYMGLVERTEXATTRIB1DPROC __rglgen_glVertexAttrib1d;
-RGLSYMGLVERTEXATTRIB1DVPROC __rglgen_glVertexAttrib1dv;
-RGLSYMGLVERTEXATTRIB1FPROC __rglgen_glVertexAttrib1f;
-RGLSYMGLVERTEXATTRIB1FVPROC __rglgen_glVertexAttrib1fv;
-RGLSYMGLVERTEXATTRIB1SPROC __rglgen_glVertexAttrib1s;
-RGLSYMGLVERTEXATTRIB1SVPROC __rglgen_glVertexAttrib1sv;
-RGLSYMGLVERTEXATTRIB2DPROC __rglgen_glVertexAttrib2d;
-RGLSYMGLVERTEXATTRIB2DVPROC __rglgen_glVertexAttrib2dv;
-RGLSYMGLVERTEXATTRIB2FPROC __rglgen_glVertexAttrib2f;
-RGLSYMGLVERTEXATTRIB2FVPROC __rglgen_glVertexAttrib2fv;
-RGLSYMGLVERTEXATTRIB2SPROC __rglgen_glVertexAttrib2s;
-RGLSYMGLVERTEXATTRIB2SVPROC __rglgen_glVertexAttrib2sv;
-RGLSYMGLVERTEXATTRIB3DPROC __rglgen_glVertexAttrib3d;
-RGLSYMGLVERTEXATTRIB3DVPROC __rglgen_glVertexAttrib3dv;
-RGLSYMGLVERTEXATTRIB3FPROC __rglgen_glVertexAttrib3f;
-RGLSYMGLVERTEXATTRIB3FVPROC __rglgen_glVertexAttrib3fv;
-RGLSYMGLVERTEXATTRIB3SPROC __rglgen_glVertexAttrib3s;
-RGLSYMGLVERTEXATTRIB3SVPROC __rglgen_glVertexAttrib3sv;
-RGLSYMGLVERTEXATTRIB4NBVPROC __rglgen_glVertexAttrib4Nbv;
-RGLSYMGLVERTEXATTRIB4NIVPROC __rglgen_glVertexAttrib4Niv;
-RGLSYMGLVERTEXATTRIB4NSVPROC __rglgen_glVertexAttrib4Nsv;
-RGLSYMGLVERTEXATTRIB4NUBPROC __rglgen_glVertexAttrib4Nub;
-RGLSYMGLVERTEXATTRIB4NUBVPROC __rglgen_glVertexAttrib4Nubv;
-RGLSYMGLVERTEXATTRIB4NUIVPROC __rglgen_glVertexAttrib4Nuiv;
-RGLSYMGLVERTEXATTRIB4NUSVPROC __rglgen_glVertexAttrib4Nusv;
-RGLSYMGLVERTEXATTRIB4BVPROC __rglgen_glVertexAttrib4bv;
-RGLSYMGLVERTEXATTRIB4DPROC __rglgen_glVertexAttrib4d;
-RGLSYMGLVERTEXATTRIB4DVPROC __rglgen_glVertexAttrib4dv;
-RGLSYMGLVERTEXATTRIB4FPROC __rglgen_glVertexAttrib4f;
-RGLSYMGLVERTEXATTRIB4FVPROC __rglgen_glVertexAttrib4fv;
-RGLSYMGLVERTEXATTRIB4IVPROC __rglgen_glVertexAttrib4iv;
-RGLSYMGLVERTEXATTRIB4SPROC __rglgen_glVertexAttrib4s;
-RGLSYMGLVERTEXATTRIB4SVPROC __rglgen_glVertexAttrib4sv;
-RGLSYMGLVERTEXATTRIB4UBVPROC __rglgen_glVertexAttrib4ubv;
-RGLSYMGLVERTEXATTRIB4UIVPROC __rglgen_glVertexAttrib4uiv;
-RGLSYMGLVERTEXATTRIB4USVPROC __rglgen_glVertexAttrib4usv;
-RGLSYMGLVERTEXATTRIBPOINTERPROC __rglgen_glVertexAttribPointer;
-RGLSYMGLUNIFORMMATRIX2X3FVPROC __rglgen_glUniformMatrix2x3fv;
-RGLSYMGLUNIFORMMATRIX3X2FVPROC __rglgen_glUniformMatrix3x2fv;
-RGLSYMGLUNIFORMMATRIX2X4FVPROC __rglgen_glUniformMatrix2x4fv;
-RGLSYMGLUNIFORMMATRIX4X2FVPROC __rglgen_glUniformMatrix4x2fv;
-RGLSYMGLUNIFORMMATRIX3X4FVPROC __rglgen_glUniformMatrix3x4fv;
-RGLSYMGLUNIFORMMATRIX4X3FVPROC __rglgen_glUniformMatrix4x3fv;
-RGLSYMGLCOLORMASKIPROC __rglgen_glColorMaski;
-RGLSYMGLGETBOOLEANI_VPROC __rglgen_glGetBooleani_v;
-RGLSYMGLGETINTEGERI_VPROC __rglgen_glGetIntegeri_v;
-RGLSYMGLENABLEIPROC __rglgen_glEnablei;
-RGLSYMGLDISABLEIPROC __rglgen_glDisablei;
-RGLSYMGLISENABLEDIPROC __rglgen_glIsEnabledi;
-RGLSYMGLBEGINTRANSFORMFEEDBACKPROC __rglgen_glBeginTransformFeedback;
-RGLSYMGLENDTRANSFORMFEEDBACKPROC __rglgen_glEndTransformFeedback;
-RGLSYMGLBINDBUFFERRANGEPROC __rglgen_glBindBufferRange;
-RGLSYMGLBINDBUFFERBASEPROC __rglgen_glBindBufferBase;
-RGLSYMGLTRANSFORMFEEDBACKVARYINGSPROC __rglgen_glTransformFeedbackVaryings;
-RGLSYMGLGETTRANSFORMFEEDBACKVARYINGPROC __rglgen_glGetTransformFeedbackVarying;
-RGLSYMGLCLAMPCOLORPROC __rglgen_glClampColor;
-RGLSYMGLBEGINCONDITIONALRENDERPROC __rglgen_glBeginConditionalRender;
-RGLSYMGLENDCONDITIONALRENDERPROC __rglgen_glEndConditionalRender;
-RGLSYMGLVERTEXATTRIBIPOINTERPROC __rglgen_glVertexAttribIPointer;
-RGLSYMGLGETVERTEXATTRIBIIVPROC __rglgen_glGetVertexAttribIiv;
-RGLSYMGLGETVERTEXATTRIBIUIVPROC __rglgen_glGetVertexAttribIuiv;
-RGLSYMGLVERTEXATTRIBI1IPROC __rglgen_glVertexAttribI1i;
-RGLSYMGLVERTEXATTRIBI2IPROC __rglgen_glVertexAttribI2i;
-RGLSYMGLVERTEXATTRIBI3IPROC __rglgen_glVertexAttribI3i;
-RGLSYMGLVERTEXATTRIBI4IPROC __rglgen_glVertexAttribI4i;
-RGLSYMGLVERTEXATTRIBI1UIPROC __rglgen_glVertexAttribI1ui;
-RGLSYMGLVERTEXATTRIBI2UIPROC __rglgen_glVertexAttribI2ui;
-RGLSYMGLVERTEXATTRIBI3UIPROC __rglgen_glVertexAttribI3ui;
-RGLSYMGLVERTEXATTRIBI4UIPROC __rglgen_glVertexAttribI4ui;
-RGLSYMGLVERTEXATTRIBI1IVPROC __rglgen_glVertexAttribI1iv;
-RGLSYMGLVERTEXATTRIBI2IVPROC __rglgen_glVertexAttribI2iv;
-RGLSYMGLVERTEXATTRIBI3IVPROC __rglgen_glVertexAttribI3iv;
-RGLSYMGLVERTEXATTRIBI4IVPROC __rglgen_glVertexAttribI4iv;
-RGLSYMGLVERTEXATTRIBI1UIVPROC __rglgen_glVertexAttribI1uiv;
-RGLSYMGLVERTEXATTRIBI2UIVPROC __rglgen_glVertexAttribI2uiv;
-RGLSYMGLVERTEXATTRIBI3UIVPROC __rglgen_glVertexAttribI3uiv;
-RGLSYMGLVERTEXATTRIBI4UIVPROC __rglgen_glVertexAttribI4uiv;
-RGLSYMGLVERTEXATTRIBI4BVPROC __rglgen_glVertexAttribI4bv;
-RGLSYMGLVERTEXATTRIBI4SVPROC __rglgen_glVertexAttribI4sv;
-RGLSYMGLVERTEXATTRIBI4UBVPROC __rglgen_glVertexAttribI4ubv;
-RGLSYMGLVERTEXATTRIBI4USVPROC __rglgen_glVertexAttribI4usv;
-RGLSYMGLGETUNIFORMUIVPROC __rglgen_glGetUniformuiv;
-RGLSYMGLBINDFRAGDATALOCATIONPROC __rglgen_glBindFragDataLocation;
-RGLSYMGLGETFRAGDATALOCATIONPROC __rglgen_glGetFragDataLocation;
-RGLSYMGLUNIFORM1UIPROC __rglgen_glUniform1ui;
-RGLSYMGLUNIFORM2UIPROC __rglgen_glUniform2ui;
-RGLSYMGLUNIFORM3UIPROC __rglgen_glUniform3ui;
-RGLSYMGLUNIFORM4UIPROC __rglgen_glUniform4ui;
-RGLSYMGLUNIFORM1UIVPROC __rglgen_glUniform1uiv;
-RGLSYMGLUNIFORM2UIVPROC __rglgen_glUniform2uiv;
-RGLSYMGLUNIFORM3UIVPROC __rglgen_glUniform3uiv;
-RGLSYMGLUNIFORM4UIVPROC __rglgen_glUniform4uiv;
-RGLSYMGLTEXPARAMETERIIVPROC __rglgen_glTexParameterIiv;
-RGLSYMGLTEXPARAMETERIUIVPROC __rglgen_glTexParameterIuiv;
-RGLSYMGLGETTEXPARAMETERIIVPROC __rglgen_glGetTexParameterIiv;
-RGLSYMGLGETTEXPARAMETERIUIVPROC __rglgen_glGetTexParameterIuiv;
-RGLSYMGLCLEARBUFFERIVPROC __rglgen_glClearBufferiv;
-RGLSYMGLCLEARBUFFERUIVPROC __rglgen_glClearBufferuiv;
-RGLSYMGLCLEARBUFFERFVPROC __rglgen_glClearBufferfv;
-RGLSYMGLCLEARBUFFERFIPROC __rglgen_glClearBufferfi;
-RGLSYMGLGETSTRINGIPROC __rglgen_glGetStringi;
-RGLSYMGLISRENDERBUFFERPROC __rglgen_glIsRenderbuffer;
-RGLSYMGLBINDRENDERBUFFERPROC __rglgen_glBindRenderbuffer;
-RGLSYMGLDELETERENDERBUFFERSPROC __rglgen_glDeleteRenderbuffers;
-RGLSYMGLGENRENDERBUFFERSPROC __rglgen_glGenRenderbuffers;
-RGLSYMGLRENDERBUFFERSTORAGEPROC __rglgen_glRenderbufferStorage;
-RGLSYMGLGETRENDERBUFFERPARAMETERIVPROC __rglgen_glGetRenderbufferParameteriv;
-RGLSYMGLISFRAMEBUFFERPROC __rglgen_glIsFramebuffer;
-RGLSYMGLBINDFRAMEBUFFERPROC __rglgen_glBindFramebuffer;
-RGLSYMGLDELETEFRAMEBUFFERSPROC __rglgen_glDeleteFramebuffers;
-RGLSYMGLGENFRAMEBUFFERSPROC __rglgen_glGenFramebuffers;
-RGLSYMGLCHECKFRAMEBUFFERSTATUSPROC __rglgen_glCheckFramebufferStatus;
-RGLSYMGLFRAMEBUFFERTEXTURE1DPROC __rglgen_glFramebufferTexture1D;
-RGLSYMGLFRAMEBUFFERTEXTURE2DPROC __rglgen_glFramebufferTexture2D;
-RGLSYMGLFRAMEBUFFERTEXTURE3DPROC __rglgen_glFramebufferTexture3D;
-RGLSYMGLFRAMEBUFFERRENDERBUFFERPROC __rglgen_glFramebufferRenderbuffer;
-RGLSYMGLGETFRAMEBUFFERATTACHMENTPARAMETERIVPROC __rglgen_glGetFramebufferAttachmentParameteriv;
-RGLSYMGLGENERATEMIPMAPPROC __rglgen_glGenerateMipmap;
-RGLSYMGLBLITFRAMEBUFFERPROC __rglgen_glBlitFramebuffer;
-RGLSYMGLRENDERBUFFERSTORAGEMULTISAMPLEPROC __rglgen_glRenderbufferStorageMultisample;
-RGLSYMGLFRAMEBUFFERTEXTURELAYERPROC __rglgen_glFramebufferTextureLayer;
-RGLSYMGLMAPBUFFERRANGEPROC __rglgen_glMapBufferRange;
-RGLSYMGLFLUSHMAPPEDBUFFERRANGEPROC __rglgen_glFlushMappedBufferRange;
-RGLSYMGLBINDVERTEXARRAYPROC __rglgen_glBindVertexArray;
-RGLSYMGLDELETEVERTEXARRAYSPROC __rglgen_glDeleteVertexArrays;
-RGLSYMGLGENVERTEXARRAYSPROC __rglgen_glGenVertexArrays;
-RGLSYMGLISVERTEXARRAYPROC __rglgen_glIsVertexArray;
-RGLSYMGLDRAWARRAYSINSTANCEDPROC __rglgen_glDrawArraysInstanced;
-RGLSYMGLDRAWELEMENTSINSTANCEDPROC __rglgen_glDrawElementsInstanced;
-RGLSYMGLTEXBUFFERPROC __rglgen_glTexBuffer;
-RGLSYMGLPRIMITIVERESTARTINDEXPROC __rglgen_glPrimitiveRestartIndex;
-RGLSYMGLCOPYBUFFERSUBDATAPROC __rglgen_glCopyBufferSubData;
-RGLSYMGLGETUNIFORMINDICESPROC __rglgen_glGetUniformIndices;
-RGLSYMGLGETACTIVEUNIFORMSIVPROC __rglgen_glGetActiveUniformsiv;
-RGLSYMGLGETACTIVEUNIFORMNAMEPROC __rglgen_glGetActiveUniformName;
-RGLSYMGLGETUNIFORMBLOCKINDEXPROC __rglgen_glGetUniformBlockIndex;
-RGLSYMGLGETACTIVEUNIFORMBLOCKIVPROC __rglgen_glGetActiveUniformBlockiv;
-RGLSYMGLGETACTIVEUNIFORMBLOCKNAMEPROC __rglgen_glGetActiveUniformBlockName;
-RGLSYMGLUNIFORMBLOCKBINDINGPROC __rglgen_glUniformBlockBinding;
-RGLSYMGLDRAWELEMENTSBASEVERTEXPROC __rglgen_glDrawElementsBaseVertex;
-RGLSYMGLDRAWRANGEELEMENTSBASEVERTEXPROC __rglgen_glDrawRangeElementsBaseVertex;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC __rglgen_glDrawElementsInstancedBaseVertex;
-RGLSYMGLMULTIDRAWELEMENTSBASEVERTEXPROC __rglgen_glMultiDrawElementsBaseVertex;
-RGLSYMGLPROVOKINGVERTEXPROC __rglgen_glProvokingVertex;
-RGLSYMGLFENCESYNCPROC __rglgen_glFenceSync;
-RGLSYMGLISSYNCPROC __rglgen_glIsSync;
-RGLSYMGLDELETESYNCPROC __rglgen_glDeleteSync;
-RGLSYMGLCLIENTWAITSYNCPROC __rglgen_glClientWaitSync;
-RGLSYMGLWAITSYNCPROC __rglgen_glWaitSync;
-RGLSYMGLGETINTEGER64VPROC __rglgen_glGetInteger64v;
-RGLSYMGLGETSYNCIVPROC __rglgen_glGetSynciv;
-RGLSYMGLGETINTEGER64I_VPROC __rglgen_glGetInteger64i_v;
-RGLSYMGLGETBUFFERPARAMETERI64VPROC __rglgen_glGetBufferParameteri64v;
-RGLSYMGLFRAMEBUFFERTEXTUREPROC __rglgen_glFramebufferTexture;
-RGLSYMGLTEXIMAGE2DMULTISAMPLEPROC __rglgen_glTexImage2DMultisample;
-RGLSYMGLTEXIMAGE3DMULTISAMPLEPROC __rglgen_glTexImage3DMultisample;
-RGLSYMGLGETMULTISAMPLEFVPROC __rglgen_glGetMultisamplefv;
-RGLSYMGLSAMPLEMASKIPROC __rglgen_glSampleMaski;
-RGLSYMGLBINDFRAGDATALOCATIONINDEXEDPROC __rglgen_glBindFragDataLocationIndexed;
-RGLSYMGLGETFRAGDATAINDEXPROC __rglgen_glGetFragDataIndex;
-RGLSYMGLGENSAMPLERSPROC __rglgen_glGenSamplers;
-RGLSYMGLDELETESAMPLERSPROC __rglgen_glDeleteSamplers;
-RGLSYMGLISSAMPLERPROC __rglgen_glIsSampler;
-RGLSYMGLBINDSAMPLERPROC __rglgen_glBindSampler;
-RGLSYMGLSAMPLERPARAMETERIPROC __rglgen_glSamplerParameteri;
-RGLSYMGLSAMPLERPARAMETERIVPROC __rglgen_glSamplerParameteriv;
-RGLSYMGLSAMPLERPARAMETERFPROC __rglgen_glSamplerParameterf;
-RGLSYMGLSAMPLERPARAMETERFVPROC __rglgen_glSamplerParameterfv;
-RGLSYMGLSAMPLERPARAMETERIIVPROC __rglgen_glSamplerParameterIiv;
-RGLSYMGLSAMPLERPARAMETERIUIVPROC __rglgen_glSamplerParameterIuiv;
-RGLSYMGLGETSAMPLERPARAMETERIVPROC __rglgen_glGetSamplerParameteriv;
-RGLSYMGLGETSAMPLERPARAMETERIIVPROC __rglgen_glGetSamplerParameterIiv;
-RGLSYMGLGETSAMPLERPARAMETERFVPROC __rglgen_glGetSamplerParameterfv;
-RGLSYMGLGETSAMPLERPARAMETERIUIVPROC __rglgen_glGetSamplerParameterIuiv;
-RGLSYMGLQUERYCOUNTERPROC __rglgen_glQueryCounter;
-RGLSYMGLGETQUERYOBJECTI64VPROC __rglgen_glGetQueryObjecti64v;
-RGLSYMGLGETQUERYOBJECTUI64VPROC __rglgen_glGetQueryObjectui64v;
-RGLSYMGLVERTEXATTRIBDIVISORPROC __rglgen_glVertexAttribDivisor;
-RGLSYMGLVERTEXATTRIBP1UIPROC __rglgen_glVertexAttribP1ui;
-RGLSYMGLVERTEXATTRIBP1UIVPROC __rglgen_glVertexAttribP1uiv;
-RGLSYMGLVERTEXATTRIBP2UIPROC __rglgen_glVertexAttribP2ui;
-RGLSYMGLVERTEXATTRIBP2UIVPROC __rglgen_glVertexAttribP2uiv;
-RGLSYMGLVERTEXATTRIBP3UIPROC __rglgen_glVertexAttribP3ui;
-RGLSYMGLVERTEXATTRIBP3UIVPROC __rglgen_glVertexAttribP3uiv;
-RGLSYMGLVERTEXATTRIBP4UIPROC __rglgen_glVertexAttribP4ui;
-RGLSYMGLVERTEXATTRIBP4UIVPROC __rglgen_glVertexAttribP4uiv;
-RGLSYMGLVERTEXP2UIPROC __rglgen_glVertexP2ui;
-RGLSYMGLVERTEXP2UIVPROC __rglgen_glVertexP2uiv;
-RGLSYMGLVERTEXP3UIPROC __rglgen_glVertexP3ui;
-RGLSYMGLVERTEXP3UIVPROC __rglgen_glVertexP3uiv;
-RGLSYMGLVERTEXP4UIPROC __rglgen_glVertexP4ui;
-RGLSYMGLVERTEXP4UIVPROC __rglgen_glVertexP4uiv;
-RGLSYMGLTEXCOORDP1UIPROC __rglgen_glTexCoordP1ui;
-RGLSYMGLTEXCOORDP1UIVPROC __rglgen_glTexCoordP1uiv;
-RGLSYMGLTEXCOORDP2UIPROC __rglgen_glTexCoordP2ui;
-RGLSYMGLTEXCOORDP2UIVPROC __rglgen_glTexCoordP2uiv;
-RGLSYMGLTEXCOORDP3UIPROC __rglgen_glTexCoordP3ui;
-RGLSYMGLTEXCOORDP3UIVPROC __rglgen_glTexCoordP3uiv;
-RGLSYMGLTEXCOORDP4UIPROC __rglgen_glTexCoordP4ui;
-RGLSYMGLTEXCOORDP4UIVPROC __rglgen_glTexCoordP4uiv;
-RGLSYMGLMULTITEXCOORDP1UIPROC __rglgen_glMultiTexCoordP1ui;
-RGLSYMGLMULTITEXCOORDP1UIVPROC __rglgen_glMultiTexCoordP1uiv;
-RGLSYMGLMULTITEXCOORDP2UIPROC __rglgen_glMultiTexCoordP2ui;
-RGLSYMGLMULTITEXCOORDP2UIVPROC __rglgen_glMultiTexCoordP2uiv;
-RGLSYMGLMULTITEXCOORDP3UIPROC __rglgen_glMultiTexCoordP3ui;
-RGLSYMGLMULTITEXCOORDP3UIVPROC __rglgen_glMultiTexCoordP3uiv;
-RGLSYMGLMULTITEXCOORDP4UIPROC __rglgen_glMultiTexCoordP4ui;
-RGLSYMGLMULTITEXCOORDP4UIVPROC __rglgen_glMultiTexCoordP4uiv;
-RGLSYMGLNORMALP3UIPROC __rglgen_glNormalP3ui;
-RGLSYMGLNORMALP3UIVPROC __rglgen_glNormalP3uiv;
-RGLSYMGLCOLORP3UIPROC __rglgen_glColorP3ui;
-RGLSYMGLCOLORP3UIVPROC __rglgen_glColorP3uiv;
-RGLSYMGLCOLORP4UIPROC __rglgen_glColorP4ui;
-RGLSYMGLCOLORP4UIVPROC __rglgen_glColorP4uiv;
-RGLSYMGLSECONDARYCOLORP3UIPROC __rglgen_glSecondaryColorP3ui;
-RGLSYMGLSECONDARYCOLORP3UIVPROC __rglgen_glSecondaryColorP3uiv;
-RGLSYMGLMINSAMPLESHADINGPROC __rglgen_glMinSampleShading;
-RGLSYMGLBLENDEQUATIONIPROC __rglgen_glBlendEquationi;
-RGLSYMGLBLENDEQUATIONSEPARATEIPROC __rglgen_glBlendEquationSeparatei;
-RGLSYMGLBLENDFUNCIPROC __rglgen_glBlendFunci;
-RGLSYMGLBLENDFUNCSEPARATEIPROC __rglgen_glBlendFuncSeparatei;
-RGLSYMGLDRAWARRAYSINDIRECTPROC __rglgen_glDrawArraysIndirect;
-RGLSYMGLDRAWELEMENTSINDIRECTPROC __rglgen_glDrawElementsIndirect;
-RGLSYMGLUNIFORM1DPROC __rglgen_glUniform1d;
-RGLSYMGLUNIFORM2DPROC __rglgen_glUniform2d;
-RGLSYMGLUNIFORM3DPROC __rglgen_glUniform3d;
-RGLSYMGLUNIFORM4DPROC __rglgen_glUniform4d;
-RGLSYMGLUNIFORM1DVPROC __rglgen_glUniform1dv;
-RGLSYMGLUNIFORM2DVPROC __rglgen_glUniform2dv;
-RGLSYMGLUNIFORM3DVPROC __rglgen_glUniform3dv;
-RGLSYMGLUNIFORM4DVPROC __rglgen_glUniform4dv;
-RGLSYMGLUNIFORMMATRIX2DVPROC __rglgen_glUniformMatrix2dv;
-RGLSYMGLUNIFORMMATRIX3DVPROC __rglgen_glUniformMatrix3dv;
-RGLSYMGLUNIFORMMATRIX4DVPROC __rglgen_glUniformMatrix4dv;
-RGLSYMGLUNIFORMMATRIX2X3DVPROC __rglgen_glUniformMatrix2x3dv;
-RGLSYMGLUNIFORMMATRIX2X4DVPROC __rglgen_glUniformMatrix2x4dv;
-RGLSYMGLUNIFORMMATRIX3X2DVPROC __rglgen_glUniformMatrix3x2dv;
-RGLSYMGLUNIFORMMATRIX3X4DVPROC __rglgen_glUniformMatrix3x4dv;
-RGLSYMGLUNIFORMMATRIX4X2DVPROC __rglgen_glUniformMatrix4x2dv;
-RGLSYMGLUNIFORMMATRIX4X3DVPROC __rglgen_glUniformMatrix4x3dv;
-RGLSYMGLGETUNIFORMDVPROC __rglgen_glGetUniformdv;
-RGLSYMGLGETSUBROUTINEUNIFORMLOCATIONPROC __rglgen_glGetSubroutineUniformLocation;
-RGLSYMGLGETSUBROUTINEINDEXPROC __rglgen_glGetSubroutineIndex;
-RGLSYMGLGETACTIVESUBROUTINEUNIFORMIVPROC __rglgen_glGetActiveSubroutineUniformiv;
-RGLSYMGLGETACTIVESUBROUTINEUNIFORMNAMEPROC __rglgen_glGetActiveSubroutineUniformName;
-RGLSYMGLGETACTIVESUBROUTINENAMEPROC __rglgen_glGetActiveSubroutineName;
-RGLSYMGLUNIFORMSUBROUTINESUIVPROC __rglgen_glUniformSubroutinesuiv;
-RGLSYMGLGETUNIFORMSUBROUTINEUIVPROC __rglgen_glGetUniformSubroutineuiv;
-RGLSYMGLGETPROGRAMSTAGEIVPROC __rglgen_glGetProgramStageiv;
-RGLSYMGLPATCHPARAMETERIPROC __rglgen_glPatchParameteri;
-RGLSYMGLPATCHPARAMETERFVPROC __rglgen_glPatchParameterfv;
-RGLSYMGLBINDTRANSFORMFEEDBACKPROC __rglgen_glBindTransformFeedback;
-RGLSYMGLDELETETRANSFORMFEEDBACKSPROC __rglgen_glDeleteTransformFeedbacks;
-RGLSYMGLGENTRANSFORMFEEDBACKSPROC __rglgen_glGenTransformFeedbacks;
-RGLSYMGLISTRANSFORMFEEDBACKPROC __rglgen_glIsTransformFeedback;
-RGLSYMGLPAUSETRANSFORMFEEDBACKPROC __rglgen_glPauseTransformFeedback;
-RGLSYMGLRESUMETRANSFORMFEEDBACKPROC __rglgen_glResumeTransformFeedback;
-RGLSYMGLDRAWTRANSFORMFEEDBACKPROC __rglgen_glDrawTransformFeedback;
-RGLSYMGLDRAWTRANSFORMFEEDBACKSTREAMPROC __rglgen_glDrawTransformFeedbackStream;
-RGLSYMGLBEGINQUERYINDEXEDPROC __rglgen_glBeginQueryIndexed;
-RGLSYMGLENDQUERYINDEXEDPROC __rglgen_glEndQueryIndexed;
-RGLSYMGLGETQUERYINDEXEDIVPROC __rglgen_glGetQueryIndexediv;
-RGLSYMGLRELEASESHADERCOMPILERPROC __rglgen_glReleaseShaderCompiler;
-RGLSYMGLSHADERBINARYPROC __rglgen_glShaderBinary;
-RGLSYMGLGETSHADERPRECISIONFORMATPROC __rglgen_glGetShaderPrecisionFormat;
-RGLSYMGLDEPTHRANGEFPROC __rglgen_glDepthRangef;
-RGLSYMGLCLEARDEPTHFPROC __rglgen_glClearDepthf;
-RGLSYMGLGETPROGRAMBINARYPROC __rglgen_glGetProgramBinary;
-RGLSYMGLPROGRAMBINARYPROC __rglgen_glProgramBinary;
-RGLSYMGLPROGRAMPARAMETERIPROC __rglgen_glProgramParameteri;
-RGLSYMGLUSEPROGRAMSTAGESPROC __rglgen_glUseProgramStages;
-RGLSYMGLACTIVESHADERPROGRAMPROC __rglgen_glActiveShaderProgram;
-RGLSYMGLCREATESHADERPROGRAMVPROC __rglgen_glCreateShaderProgramv;
-RGLSYMGLBINDPROGRAMPIPELINEPROC __rglgen_glBindProgramPipeline;
-RGLSYMGLDELETEPROGRAMPIPELINESPROC __rglgen_glDeleteProgramPipelines;
-RGLSYMGLGENPROGRAMPIPELINESPROC __rglgen_glGenProgramPipelines;
-RGLSYMGLISPROGRAMPIPELINEPROC __rglgen_glIsProgramPipeline;
-RGLSYMGLGETPROGRAMPIPELINEIVPROC __rglgen_glGetProgramPipelineiv;
-RGLSYMGLPROGRAMUNIFORM1IPROC __rglgen_glProgramUniform1i;
-RGLSYMGLPROGRAMUNIFORM1IVPROC __rglgen_glProgramUniform1iv;
-RGLSYMGLPROGRAMUNIFORM1FPROC __rglgen_glProgramUniform1f;
-RGLSYMGLPROGRAMUNIFORM1FVPROC __rglgen_glProgramUniform1fv;
-RGLSYMGLPROGRAMUNIFORM1DPROC __rglgen_glProgramUniform1d;
-RGLSYMGLPROGRAMUNIFORM1DVPROC __rglgen_glProgramUniform1dv;
-RGLSYMGLPROGRAMUNIFORM1UIPROC __rglgen_glProgramUniform1ui;
-RGLSYMGLPROGRAMUNIFORM1UIVPROC __rglgen_glProgramUniform1uiv;
-RGLSYMGLPROGRAMUNIFORM2IPROC __rglgen_glProgramUniform2i;
-RGLSYMGLPROGRAMUNIFORM2IVPROC __rglgen_glProgramUniform2iv;
-RGLSYMGLPROGRAMUNIFORM2FPROC __rglgen_glProgramUniform2f;
-RGLSYMGLPROGRAMUNIFORM2FVPROC __rglgen_glProgramUniform2fv;
-RGLSYMGLPROGRAMUNIFORM2DPROC __rglgen_glProgramUniform2d;
-RGLSYMGLPROGRAMUNIFORM2DVPROC __rglgen_glProgramUniform2dv;
-RGLSYMGLPROGRAMUNIFORM2UIPROC __rglgen_glProgramUniform2ui;
-RGLSYMGLPROGRAMUNIFORM2UIVPROC __rglgen_glProgramUniform2uiv;
-RGLSYMGLPROGRAMUNIFORM3IPROC __rglgen_glProgramUniform3i;
-RGLSYMGLPROGRAMUNIFORM3IVPROC __rglgen_glProgramUniform3iv;
-RGLSYMGLPROGRAMUNIFORM3FPROC __rglgen_glProgramUniform3f;
-RGLSYMGLPROGRAMUNIFORM3FVPROC __rglgen_glProgramUniform3fv;
-RGLSYMGLPROGRAMUNIFORM3DPROC __rglgen_glProgramUniform3d;
-RGLSYMGLPROGRAMUNIFORM3DVPROC __rglgen_glProgramUniform3dv;
-RGLSYMGLPROGRAMUNIFORM3UIPROC __rglgen_glProgramUniform3ui;
-RGLSYMGLPROGRAMUNIFORM3UIVPROC __rglgen_glProgramUniform3uiv;
-RGLSYMGLPROGRAMUNIFORM4IPROC __rglgen_glProgramUniform4i;
-RGLSYMGLPROGRAMUNIFORM4IVPROC __rglgen_glProgramUniform4iv;
-RGLSYMGLPROGRAMUNIFORM4FPROC __rglgen_glProgramUniform4f;
-RGLSYMGLPROGRAMUNIFORM4FVPROC __rglgen_glProgramUniform4fv;
-RGLSYMGLPROGRAMUNIFORM4DPROC __rglgen_glProgramUniform4d;
-RGLSYMGLPROGRAMUNIFORM4DVPROC __rglgen_glProgramUniform4dv;
-RGLSYMGLPROGRAMUNIFORM4UIPROC __rglgen_glProgramUniform4ui;
-RGLSYMGLPROGRAMUNIFORM4UIVPROC __rglgen_glProgramUniform4uiv;
-RGLSYMGLPROGRAMUNIFORMMATRIX2FVPROC __rglgen_glProgramUniformMatrix2fv;
-RGLSYMGLPROGRAMUNIFORMMATRIX3FVPROC __rglgen_glProgramUniformMatrix3fv;
-RGLSYMGLPROGRAMUNIFORMMATRIX4FVPROC __rglgen_glProgramUniformMatrix4fv;
-RGLSYMGLPROGRAMUNIFORMMATRIX2DVPROC __rglgen_glProgramUniformMatrix2dv;
-RGLSYMGLPROGRAMUNIFORMMATRIX3DVPROC __rglgen_glProgramUniformMatrix3dv;
-RGLSYMGLPROGRAMUNIFORMMATRIX4DVPROC __rglgen_glProgramUniformMatrix4dv;
-RGLSYMGLPROGRAMUNIFORMMATRIX2X3FVPROC __rglgen_glProgramUniformMatrix2x3fv;
-RGLSYMGLPROGRAMUNIFORMMATRIX3X2FVPROC __rglgen_glProgramUniformMatrix3x2fv;
-RGLSYMGLPROGRAMUNIFORMMATRIX2X4FVPROC __rglgen_glProgramUniformMatrix2x4fv;
-RGLSYMGLPROGRAMUNIFORMMATRIX4X2FVPROC __rglgen_glProgramUniformMatrix4x2fv;
-RGLSYMGLPROGRAMUNIFORMMATRIX3X4FVPROC __rglgen_glProgramUniformMatrix3x4fv;
-RGLSYMGLPROGRAMUNIFORMMATRIX4X3FVPROC __rglgen_glProgramUniformMatrix4x3fv;
-RGLSYMGLPROGRAMUNIFORMMATRIX2X3DVPROC __rglgen_glProgramUniformMatrix2x3dv;
-RGLSYMGLPROGRAMUNIFORMMATRIX3X2DVPROC __rglgen_glProgramUniformMatrix3x2dv;
-RGLSYMGLPROGRAMUNIFORMMATRIX2X4DVPROC __rglgen_glProgramUniformMatrix2x4dv;
-RGLSYMGLPROGRAMUNIFORMMATRIX4X2DVPROC __rglgen_glProgramUniformMatrix4x2dv;
-RGLSYMGLPROGRAMUNIFORMMATRIX3X4DVPROC __rglgen_glProgramUniformMatrix3x4dv;
-RGLSYMGLPROGRAMUNIFORMMATRIX4X3DVPROC __rglgen_glProgramUniformMatrix4x3dv;
-RGLSYMGLVALIDATEPROGRAMPIPELINEPROC __rglgen_glValidateProgramPipeline;
-RGLSYMGLGETPROGRAMPIPELINEINFOLOGPROC __rglgen_glGetProgramPipelineInfoLog;
-RGLSYMGLVERTEXATTRIBL1DPROC __rglgen_glVertexAttribL1d;
-RGLSYMGLVERTEXATTRIBL2DPROC __rglgen_glVertexAttribL2d;
-RGLSYMGLVERTEXATTRIBL3DPROC __rglgen_glVertexAttribL3d;
-RGLSYMGLVERTEXATTRIBL4DPROC __rglgen_glVertexAttribL4d;
-RGLSYMGLVERTEXATTRIBL1DVPROC __rglgen_glVertexAttribL1dv;
-RGLSYMGLVERTEXATTRIBL2DVPROC __rglgen_glVertexAttribL2dv;
-RGLSYMGLVERTEXATTRIBL3DVPROC __rglgen_glVertexAttribL3dv;
-RGLSYMGLVERTEXATTRIBL4DVPROC __rglgen_glVertexAttribL4dv;
-RGLSYMGLVERTEXATTRIBLPOINTERPROC __rglgen_glVertexAttribLPointer;
-RGLSYMGLGETVERTEXATTRIBLDVPROC __rglgen_glGetVertexAttribLdv;
-RGLSYMGLVIEWPORTARRAYVPROC __rglgen_glViewportArrayv;
-RGLSYMGLVIEWPORTINDEXEDFPROC __rglgen_glViewportIndexedf;
-RGLSYMGLVIEWPORTINDEXEDFVPROC __rglgen_glViewportIndexedfv;
-RGLSYMGLSCISSORARRAYVPROC __rglgen_glScissorArrayv;
-RGLSYMGLSCISSORINDEXEDPROC __rglgen_glScissorIndexed;
-RGLSYMGLSCISSORINDEXEDVPROC __rglgen_glScissorIndexedv;
-RGLSYMGLDEPTHRANGEARRAYVPROC __rglgen_glDepthRangeArrayv;
-RGLSYMGLDEPTHRANGEINDEXEDPROC __rglgen_glDepthRangeIndexed;
-RGLSYMGLGETFLOATI_VPROC __rglgen_glGetFloati_v;
-RGLSYMGLGETDOUBLEI_VPROC __rglgen_glGetDoublei_v;
-RGLSYMGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC __rglgen_glDrawArraysInstancedBaseInstance;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC __rglgen_glDrawElementsInstancedBaseInstance;
-RGLSYMGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC __rglgen_glDrawElementsInstancedBaseVertexBaseInstance;
-RGLSYMGLGETINTERNALFORMATIVPROC __rglgen_glGetInternalformativ;
-RGLSYMGLGETACTIVEATOMICCOUNTERBUFFERIVPROC __rglgen_glGetActiveAtomicCounterBufferiv;
-RGLSYMGLBINDIMAGETEXTUREPROC __rglgen_glBindImageTexture;
-RGLSYMGLMEMORYBARRIERPROC __rglgen_glMemoryBarrier;
-RGLSYMGLTEXSTORAGE1DPROC __rglgen_glTexStorage1D;
-RGLSYMGLTEXSTORAGE2DPROC __rglgen_glTexStorage2D;
-RGLSYMGLTEXSTORAGE3DPROC __rglgen_glTexStorage3D;
-RGLSYMGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC __rglgen_glDrawTransformFeedbackInstanced;
-RGLSYMGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC __rglgen_glDrawTransformFeedbackStreamInstanced;
-RGLSYMGLCLEARBUFFERDATAPROC __rglgen_glClearBufferData;
-RGLSYMGLCLEARBUFFERSUBDATAPROC __rglgen_glClearBufferSubData;
-RGLSYMGLDISPATCHCOMPUTEPROC __rglgen_glDispatchCompute;
-RGLSYMGLDISPATCHCOMPUTEINDIRECTPROC __rglgen_glDispatchComputeIndirect;
-RGLSYMGLCOPYIMAGESUBDATAPROC __rglgen_glCopyImageSubData;
-RGLSYMGLFRAMEBUFFERPARAMETERIPROC __rglgen_glFramebufferParameteri;
-RGLSYMGLGETFRAMEBUFFERPARAMETERIVPROC __rglgen_glGetFramebufferParameteriv;
-RGLSYMGLGETINTERNALFORMATI64VPROC __rglgen_glGetInternalformati64v;
-RGLSYMGLINVALIDATETEXSUBIMAGEPROC __rglgen_glInvalidateTexSubImage;
-RGLSYMGLINVALIDATETEXIMAGEPROC __rglgen_glInvalidateTexImage;
-RGLSYMGLINVALIDATEBUFFERSUBDATAPROC __rglgen_glInvalidateBufferSubData;
-RGLSYMGLINVALIDATEBUFFERDATAPROC __rglgen_glInvalidateBufferData;
-RGLSYMGLINVALIDATEFRAMEBUFFERPROC __rglgen_glInvalidateFramebuffer;
-RGLSYMGLINVALIDATESUBFRAMEBUFFERPROC __rglgen_glInvalidateSubFramebuffer;
-RGLSYMGLMULTIDRAWARRAYSINDIRECTPROC __rglgen_glMultiDrawArraysIndirect;
-RGLSYMGLMULTIDRAWELEMENTSINDIRECTPROC __rglgen_glMultiDrawElementsIndirect;
-RGLSYMGLGETPROGRAMINTERFACEIVPROC __rglgen_glGetProgramInterfaceiv;
-RGLSYMGLGETPROGRAMRESOURCEINDEXPROC __rglgen_glGetProgramResourceIndex;
-RGLSYMGLGETPROGRAMRESOURCENAMEPROC __rglgen_glGetProgramResourceName;
-RGLSYMGLGETPROGRAMRESOURCEIVPROC __rglgen_glGetProgramResourceiv;
-RGLSYMGLGETPROGRAMRESOURCELOCATIONPROC __rglgen_glGetProgramResourceLocation;
-RGLSYMGLGETPROGRAMRESOURCELOCATIONINDEXPROC __rglgen_glGetProgramResourceLocationIndex;
-RGLSYMGLSHADERSTORAGEBLOCKBINDINGPROC __rglgen_glShaderStorageBlockBinding;
-RGLSYMGLTEXBUFFERRANGEPROC __rglgen_glTexBufferRange;
-RGLSYMGLTEXSTORAGE2DMULTISAMPLEPROC __rglgen_glTexStorage2DMultisample;
-RGLSYMGLTEXSTORAGE3DMULTISAMPLEPROC __rglgen_glTexStorage3DMultisample;
-RGLSYMGLTEXTUREVIEWPROC __rglgen_glTextureView;
-RGLSYMGLBINDVERTEXBUFFERPROC __rglgen_glBindVertexBuffer;
-RGLSYMGLVERTEXATTRIBFORMATPROC __rglgen_glVertexAttribFormat;
-RGLSYMGLVERTEXATTRIBIFORMATPROC __rglgen_glVertexAttribIFormat;
-RGLSYMGLVERTEXATTRIBLFORMATPROC __rglgen_glVertexAttribLFormat;
-RGLSYMGLVERTEXATTRIBBINDINGPROC __rglgen_glVertexAttribBinding;
-RGLSYMGLVERTEXBINDINGDIVISORPROC __rglgen_glVertexBindingDivisor;
-RGLSYMGLDEBUGMESSAGECONTROLPROC __rglgen_glDebugMessageControl;
-RGLSYMGLDEBUGMESSAGEINSERTPROC __rglgen_glDebugMessageInsert;
-RGLSYMGLDEBUGMESSAGECALLBACKPROC __rglgen_glDebugMessageCallback;
-RGLSYMGLGETDEBUGMESSAGELOGPROC __rglgen_glGetDebugMessageLog;
-RGLSYMGLPUSHDEBUGGROUPPROC __rglgen_glPushDebugGroup;
-RGLSYMGLPOPDEBUGGROUPPROC __rglgen_glPopDebugGroup;
-RGLSYMGLOBJECTLABELPROC __rglgen_glObjectLabel;
-RGLSYMGLGETOBJECTLABELPROC __rglgen_glGetObjectLabel;
-RGLSYMGLOBJECTPTRLABELPROC __rglgen_glObjectPtrLabel;
-RGLSYMGLGETOBJECTPTRLABELPROC __rglgen_glGetObjectPtrLabel;
-RGLSYMGLBUFFERSTORAGEPROC __rglgen_glBufferStorage;
-RGLSYMGLCLEARTEXIMAGEPROC __rglgen_glClearTexImage;
-RGLSYMGLCLEARTEXSUBIMAGEPROC __rglgen_glClearTexSubImage;
-RGLSYMGLBINDBUFFERSBASEPROC __rglgen_glBindBuffersBase;
-RGLSYMGLBINDBUFFERSRANGEPROC __rglgen_glBindBuffersRange;
-RGLSYMGLBINDTEXTURESPROC __rglgen_glBindTextures;
-RGLSYMGLBINDSAMPLERSPROC __rglgen_glBindSamplers;
-RGLSYMGLBINDIMAGETEXTURESPROC __rglgen_glBindImageTextures;
-RGLSYMGLBINDVERTEXBUFFERSPROC __rglgen_glBindVertexBuffers;
-RGLSYMGLGETTEXTUREHANDLEARBPROC __rglgen_glGetTextureHandleARB;
-RGLSYMGLGETTEXTURESAMPLERHANDLEARBPROC __rglgen_glGetTextureSamplerHandleARB;
-RGLSYMGLMAKETEXTUREHANDLERESIDENTARBPROC __rglgen_glMakeTextureHandleResidentARB;
-RGLSYMGLMAKETEXTUREHANDLENONRESIDENTARBPROC __rglgen_glMakeTextureHandleNonResidentARB;
-RGLSYMGLGETIMAGEHANDLEARBPROC __rglgen_glGetImageHandleARB;
-RGLSYMGLMAKEIMAGEHANDLERESIDENTARBPROC __rglgen_glMakeImageHandleResidentARB;
-RGLSYMGLMAKEIMAGEHANDLENONRESIDENTARBPROC __rglgen_glMakeImageHandleNonResidentARB;
-RGLSYMGLUNIFORMHANDLEUI64ARBPROC __rglgen_glUniformHandleui64ARB;
-RGLSYMGLUNIFORMHANDLEUI64VARBPROC __rglgen_glUniformHandleui64vARB;
-RGLSYMGLPROGRAMUNIFORMHANDLEUI64ARBPROC __rglgen_glProgramUniformHandleui64ARB;
-RGLSYMGLPROGRAMUNIFORMHANDLEUI64VARBPROC __rglgen_glProgramUniformHandleui64vARB;
-RGLSYMGLISTEXTUREHANDLERESIDENTARBPROC __rglgen_glIsTextureHandleResidentARB;
-RGLSYMGLISIMAGEHANDLERESIDENTARBPROC __rglgen_glIsImageHandleResidentARB;
-RGLSYMGLVERTEXATTRIBL1UI64ARBPROC __rglgen_glVertexAttribL1ui64ARB;
-RGLSYMGLVERTEXATTRIBL1UI64VARBPROC __rglgen_glVertexAttribL1ui64vARB;
-RGLSYMGLGETVERTEXATTRIBLUI64VARBPROC __rglgen_glGetVertexAttribLui64vARB;
-RGLSYMGLCREATESYNCFROMCLEVENTARBPROC __rglgen_glCreateSyncFromCLeventARB;
-RGLSYMGLCLAMPCOLORARBPROC __rglgen_glClampColorARB;
-RGLSYMGLDISPATCHCOMPUTEGROUPSIZEARBPROC __rglgen_glDispatchComputeGroupSizeARB;
-RGLSYMGLDEBUGMESSAGECONTROLARBPROC __rglgen_glDebugMessageControlARB;
-RGLSYMGLDEBUGMESSAGEINSERTARBPROC __rglgen_glDebugMessageInsertARB;
-RGLSYMGLDEBUGMESSAGECALLBACKARBPROC __rglgen_glDebugMessageCallbackARB;
-RGLSYMGLGETDEBUGMESSAGELOGARBPROC __rglgen_glGetDebugMessageLogARB;
-RGLSYMGLDRAWBUFFERSARBPROC __rglgen_glDrawBuffersARB;
-RGLSYMGLBLENDEQUATIONIARBPROC __rglgen_glBlendEquationiARB;
-RGLSYMGLBLENDEQUATIONSEPARATEIARBPROC __rglgen_glBlendEquationSeparateiARB;
-RGLSYMGLBLENDFUNCIARBPROC __rglgen_glBlendFunciARB;
-RGLSYMGLBLENDFUNCSEPARATEIARBPROC __rglgen_glBlendFuncSeparateiARB;
-RGLSYMGLDRAWARRAYSINSTANCEDARBPROC __rglgen_glDrawArraysInstancedARB;
-RGLSYMGLDRAWELEMENTSINSTANCEDARBPROC __rglgen_glDrawElementsInstancedARB;
-RGLSYMGLPROGRAMSTRINGARBPROC __rglgen_glProgramStringARB;
-RGLSYMGLBINDPROGRAMARBPROC __rglgen_glBindProgramARB;
-RGLSYMGLDELETEPROGRAMSARBPROC __rglgen_glDeleteProgramsARB;
-RGLSYMGLGENPROGRAMSARBPROC __rglgen_glGenProgramsARB;
-RGLSYMGLPROGRAMENVPARAMETER4DARBPROC __rglgen_glProgramEnvParameter4dARB;
-RGLSYMGLPROGRAMENVPARAMETER4DVARBPROC __rglgen_glProgramEnvParameter4dvARB;
-RGLSYMGLPROGRAMENVPARAMETER4FARBPROC __rglgen_glProgramEnvParameter4fARB;
-RGLSYMGLPROGRAMENVPARAMETER4FVARBPROC __rglgen_glProgramEnvParameter4fvARB;
-RGLSYMGLPROGRAMLOCALPARAMETER4DARBPROC __rglgen_glProgramLocalParameter4dARB;
-RGLSYMGLPROGRAMLOCALPARAMETER4DVARBPROC __rglgen_glProgramLocalParameter4dvARB;
-RGLSYMGLPROGRAMLOCALPARAMETER4FARBPROC __rglgen_glProgramLocalParameter4fARB;
-RGLSYMGLPROGRAMLOCALPARAMETER4FVARBPROC __rglgen_glProgramLocalParameter4fvARB;
-RGLSYMGLGETPROGRAMENVPARAMETERDVARBPROC __rglgen_glGetProgramEnvParameterdvARB;
-RGLSYMGLGETPROGRAMENVPARAMETERFVARBPROC __rglgen_glGetProgramEnvParameterfvARB;
-RGLSYMGLGETPROGRAMLOCALPARAMETERDVARBPROC __rglgen_glGetProgramLocalParameterdvARB;
-RGLSYMGLGETPROGRAMLOCALPARAMETERFVARBPROC __rglgen_glGetProgramLocalParameterfvARB;
-RGLSYMGLGETPROGRAMIVARBPROC __rglgen_glGetProgramivARB;
-RGLSYMGLGETPROGRAMSTRINGARBPROC __rglgen_glGetProgramStringARB;
-RGLSYMGLISPROGRAMARBPROC __rglgen_glIsProgramARB;
-RGLSYMGLPROGRAMPARAMETERIARBPROC __rglgen_glProgramParameteriARB;
-RGLSYMGLFRAMEBUFFERTEXTUREARBPROC __rglgen_glFramebufferTextureARB;
-RGLSYMGLFRAMEBUFFERTEXTURELAYERARBPROC __rglgen_glFramebufferTextureLayerARB;
-RGLSYMGLFRAMEBUFFERTEXTUREFACEARBPROC __rglgen_glFramebufferTextureFaceARB;
-RGLSYMGLCOLORTABLEPROC __rglgen_glColorTable;
-RGLSYMGLCOLORTABLEPARAMETERFVPROC __rglgen_glColorTableParameterfv;
-RGLSYMGLCOLORTABLEPARAMETERIVPROC __rglgen_glColorTableParameteriv;
-RGLSYMGLCOPYCOLORTABLEPROC __rglgen_glCopyColorTable;
-RGLSYMGLGETCOLORTABLEPROC __rglgen_glGetColorTable;
-RGLSYMGLGETCOLORTABLEPARAMETERFVPROC __rglgen_glGetColorTableParameterfv;
-RGLSYMGLGETCOLORTABLEPARAMETERIVPROC __rglgen_glGetColorTableParameteriv;
-RGLSYMGLCOLORSUBTABLEPROC __rglgen_glColorSubTable;
-RGLSYMGLCOPYCOLORSUBTABLEPROC __rglgen_glCopyColorSubTable;
-RGLSYMGLCONVOLUTIONFILTER1DPROC __rglgen_glConvolutionFilter1D;
-RGLSYMGLCONVOLUTIONFILTER2DPROC __rglgen_glConvolutionFilter2D;
-RGLSYMGLCONVOLUTIONPARAMETERFPROC __rglgen_glConvolutionParameterf;
-RGLSYMGLCONVOLUTIONPARAMETERFVPROC __rglgen_glConvolutionParameterfv;
-RGLSYMGLCONVOLUTIONPARAMETERIPROC __rglgen_glConvolutionParameteri;
-RGLSYMGLCONVOLUTIONPARAMETERIVPROC __rglgen_glConvolutionParameteriv;
-RGLSYMGLCOPYCONVOLUTIONFILTER1DPROC __rglgen_glCopyConvolutionFilter1D;
-RGLSYMGLCOPYCONVOLUTIONFILTER2DPROC __rglgen_glCopyConvolutionFilter2D;
-RGLSYMGLGETCONVOLUTIONFILTERPROC __rglgen_glGetConvolutionFilter;
-RGLSYMGLGETCONVOLUTIONPARAMETERFVPROC __rglgen_glGetConvolutionParameterfv;
-RGLSYMGLGETCONVOLUTIONPARAMETERIVPROC __rglgen_glGetConvolutionParameteriv;
-RGLSYMGLGETSEPARABLEFILTERPROC __rglgen_glGetSeparableFilter;
-RGLSYMGLSEPARABLEFILTER2DPROC __rglgen_glSeparableFilter2D;
-RGLSYMGLGETHISTOGRAMPROC __rglgen_glGetHistogram;
-RGLSYMGLGETHISTOGRAMPARAMETERFVPROC __rglgen_glGetHistogramParameterfv;
-RGLSYMGLGETHISTOGRAMPARAMETERIVPROC __rglgen_glGetHistogramParameteriv;
-RGLSYMGLGETMINMAXPROC __rglgen_glGetMinmax;
-RGLSYMGLGETMINMAXPARAMETERFVPROC __rglgen_glGetMinmaxParameterfv;
-RGLSYMGLGETMINMAXPARAMETERIVPROC __rglgen_glGetMinmaxParameteriv;
-RGLSYMGLHISTOGRAMPROC __rglgen_glHistogram;
-RGLSYMGLMINMAXPROC __rglgen_glMinmax;
-RGLSYMGLRESETHISTOGRAMPROC __rglgen_glResetHistogram;
-RGLSYMGLRESETMINMAXPROC __rglgen_glResetMinmax;
-RGLSYMGLMULTIDRAWARRAYSINDIRECTCOUNTARBPROC __rglgen_glMultiDrawArraysIndirectCountARB;
-RGLSYMGLMULTIDRAWELEMENTSINDIRECTCOUNTARBPROC __rglgen_glMultiDrawElementsIndirectCountARB;
-RGLSYMGLVERTEXATTRIBDIVISORARBPROC __rglgen_glVertexAttribDivisorARB;
-RGLSYMGLCURRENTPALETTEMATRIXARBPROC __rglgen_glCurrentPaletteMatrixARB;
-RGLSYMGLMATRIXINDEXUBVARBPROC __rglgen_glMatrixIndexubvARB;
-RGLSYMGLMATRIXINDEXUSVARBPROC __rglgen_glMatrixIndexusvARB;
-RGLSYMGLMATRIXINDEXUIVARBPROC __rglgen_glMatrixIndexuivARB;
-RGLSYMGLMATRIXINDEXPOINTERARBPROC __rglgen_glMatrixIndexPointerARB;
-RGLSYMGLSAMPLECOVERAGEARBPROC __rglgen_glSampleCoverageARB;
-RGLSYMGLACTIVETEXTUREARBPROC __rglgen_glActiveTextureARB;
-RGLSYMGLCLIENTACTIVETEXTUREARBPROC __rglgen_glClientActiveTextureARB;
-RGLSYMGLMULTITEXCOORD1DARBPROC __rglgen_glMultiTexCoord1dARB;
-RGLSYMGLMULTITEXCOORD1DVARBPROC __rglgen_glMultiTexCoord1dvARB;
-RGLSYMGLMULTITEXCOORD1FARBPROC __rglgen_glMultiTexCoord1fARB;
-RGLSYMGLMULTITEXCOORD1FVARBPROC __rglgen_glMultiTexCoord1fvARB;
-RGLSYMGLMULTITEXCOORD1IARBPROC __rglgen_glMultiTexCoord1iARB;
-RGLSYMGLMULTITEXCOORD1IVARBPROC __rglgen_glMultiTexCoord1ivARB;
-RGLSYMGLMULTITEXCOORD1SARBPROC __rglgen_glMultiTexCoord1sARB;
-RGLSYMGLMULTITEXCOORD1SVARBPROC __rglgen_glMultiTexCoord1svARB;
-RGLSYMGLMULTITEXCOORD2DARBPROC __rglgen_glMultiTexCoord2dARB;
-RGLSYMGLMULTITEXCOORD2DVARBPROC __rglgen_glMultiTexCoord2dvARB;
-RGLSYMGLMULTITEXCOORD2FARBPROC __rglgen_glMultiTexCoord2fARB;
-RGLSYMGLMULTITEXCOORD2FVARBPROC __rglgen_glMultiTexCoord2fvARB;
-RGLSYMGLMULTITEXCOORD2IARBPROC __rglgen_glMultiTexCoord2iARB;
-RGLSYMGLMULTITEXCOORD2IVARBPROC __rglgen_glMultiTexCoord2ivARB;
-RGLSYMGLMULTITEXCOORD2SARBPROC __rglgen_glMultiTexCoord2sARB;
-RGLSYMGLMULTITEXCOORD2SVARBPROC __rglgen_glMultiTexCoord2svARB;
-RGLSYMGLMULTITEXCOORD3DARBPROC __rglgen_glMultiTexCoord3dARB;
-RGLSYMGLMULTITEXCOORD3DVARBPROC __rglgen_glMultiTexCoord3dvARB;
-RGLSYMGLMULTITEXCOORD3FARBPROC __rglgen_glMultiTexCoord3fARB;
-RGLSYMGLMULTITEXCOORD3FVARBPROC __rglgen_glMultiTexCoord3fvARB;
-RGLSYMGLMULTITEXCOORD3IARBPROC __rglgen_glMultiTexCoord3iARB;
-RGLSYMGLMULTITEXCOORD3IVARBPROC __rglgen_glMultiTexCoord3ivARB;
-RGLSYMGLMULTITEXCOORD3SARBPROC __rglgen_glMultiTexCoord3sARB;
-RGLSYMGLMULTITEXCOORD3SVARBPROC __rglgen_glMultiTexCoord3svARB;
-RGLSYMGLMULTITEXCOORD4DARBPROC __rglgen_glMultiTexCoord4dARB;
-RGLSYMGLMULTITEXCOORD4DVARBPROC __rglgen_glMultiTexCoord4dvARB;
-RGLSYMGLMULTITEXCOORD4FARBPROC __rglgen_glMultiTexCoord4fARB;
-RGLSYMGLMULTITEXCOORD4FVARBPROC __rglgen_glMultiTexCoord4fvARB;
-RGLSYMGLMULTITEXCOORD4IARBPROC __rglgen_glMultiTexCoord4iARB;
-RGLSYMGLMULTITEXCOORD4IVARBPROC __rglgen_glMultiTexCoord4ivARB;
-RGLSYMGLMULTITEXCOORD4SARBPROC __rglgen_glMultiTexCoord4sARB;
-RGLSYMGLMULTITEXCOORD4SVARBPROC __rglgen_glMultiTexCoord4svARB;
-RGLSYMGLGENQUERIESARBPROC __rglgen_glGenQueriesARB;
-RGLSYMGLDELETEQUERIESARBPROC __rglgen_glDeleteQueriesARB;
-RGLSYMGLISQUERYARBPROC __rglgen_glIsQueryARB;
-RGLSYMGLBEGINQUERYARBPROC __rglgen_glBeginQueryARB;
-RGLSYMGLENDQUERYARBPROC __rglgen_glEndQueryARB;
-RGLSYMGLGETQUERYIVARBPROC __rglgen_glGetQueryivARB;
-RGLSYMGLGETQUERYOBJECTIVARBPROC __rglgen_glGetQueryObjectivARB;
-RGLSYMGLGETQUERYOBJECTUIVARBPROC __rglgen_glGetQueryObjectuivARB;
-RGLSYMGLPOINTPARAMETERFARBPROC __rglgen_glPointParameterfARB;
-RGLSYMGLPOINTPARAMETERFVARBPROC __rglgen_glPointParameterfvARB;
-RGLSYMGLGETGRAPHICSRESETSTATUSARBPROC __rglgen_glGetGraphicsResetStatusARB;
-RGLSYMGLGETNTEXIMAGEARBPROC __rglgen_glGetnTexImageARB;
-RGLSYMGLREADNPIXELSARBPROC __rglgen_glReadnPixelsARB;
-RGLSYMGLGETNCOMPRESSEDTEXIMAGEARBPROC __rglgen_glGetnCompressedTexImageARB;
-RGLSYMGLGETNUNIFORMFVARBPROC __rglgen_glGetnUniformfvARB;
-RGLSYMGLGETNUNIFORMIVARBPROC __rglgen_glGetnUniformivARB;
-RGLSYMGLGETNUNIFORMUIVARBPROC __rglgen_glGetnUniformuivARB;
-RGLSYMGLGETNUNIFORMDVARBPROC __rglgen_glGetnUniformdvARB;
-RGLSYMGLGETNMAPDVARBPROC __rglgen_glGetnMapdvARB;
-RGLSYMGLGETNMAPFVARBPROC __rglgen_glGetnMapfvARB;
-RGLSYMGLGETNMAPIVARBPROC __rglgen_glGetnMapivARB;
-RGLSYMGLGETNPIXELMAPFVARBPROC __rglgen_glGetnPixelMapfvARB;
-RGLSYMGLGETNPIXELMAPUIVARBPROC __rglgen_glGetnPixelMapuivARB;
-RGLSYMGLGETNPIXELMAPUSVARBPROC __rglgen_glGetnPixelMapusvARB;
-RGLSYMGLGETNPOLYGONSTIPPLEARBPROC __rglgen_glGetnPolygonStippleARB;
-RGLSYMGLGETNCOLORTABLEARBPROC __rglgen_glGetnColorTableARB;
-RGLSYMGLGETNCONVOLUTIONFILTERARBPROC __rglgen_glGetnConvolutionFilterARB;
-RGLSYMGLGETNSEPARABLEFILTERARBPROC __rglgen_glGetnSeparableFilterARB;
-RGLSYMGLGETNHISTOGRAMARBPROC __rglgen_glGetnHistogramARB;
-RGLSYMGLGETNMINMAXARBPROC __rglgen_glGetnMinmaxARB;
-RGLSYMGLMINSAMPLESHADINGARBPROC __rglgen_glMinSampleShadingARB;
-RGLSYMGLDELETEOBJECTARBPROC __rglgen_glDeleteObjectARB;
-RGLSYMGLGETHANDLEARBPROC __rglgen_glGetHandleARB;
-RGLSYMGLDETACHOBJECTARBPROC __rglgen_glDetachObjectARB;
-RGLSYMGLCREATESHADEROBJECTARBPROC __rglgen_glCreateShaderObjectARB;
-RGLSYMGLSHADERSOURCEARBPROC __rglgen_glShaderSourceARB;
-RGLSYMGLCOMPILESHADERARBPROC __rglgen_glCompileShaderARB;
-RGLSYMGLCREATEPROGRAMOBJECTARBPROC __rglgen_glCreateProgramObjectARB;
-RGLSYMGLATTACHOBJECTARBPROC __rglgen_glAttachObjectARB;
-RGLSYMGLLINKPROGRAMARBPROC __rglgen_glLinkProgramARB;
-RGLSYMGLUSEPROGRAMOBJECTARBPROC __rglgen_glUseProgramObjectARB;
-RGLSYMGLVALIDATEPROGRAMARBPROC __rglgen_glValidateProgramARB;
-RGLSYMGLUNIFORM1FARBPROC __rglgen_glUniform1fARB;
-RGLSYMGLUNIFORM2FARBPROC __rglgen_glUniform2fARB;
-RGLSYMGLUNIFORM3FARBPROC __rglgen_glUniform3fARB;
-RGLSYMGLUNIFORM4FARBPROC __rglgen_glUniform4fARB;
-RGLSYMGLUNIFORM1IARBPROC __rglgen_glUniform1iARB;
-RGLSYMGLUNIFORM2IARBPROC __rglgen_glUniform2iARB;
-RGLSYMGLUNIFORM3IARBPROC __rglgen_glUniform3iARB;
-RGLSYMGLUNIFORM4IARBPROC __rglgen_glUniform4iARB;
-RGLSYMGLUNIFORM1FVARBPROC __rglgen_glUniform1fvARB;
-RGLSYMGLUNIFORM2FVARBPROC __rglgen_glUniform2fvARB;
-RGLSYMGLUNIFORM3FVARBPROC __rglgen_glUniform3fvARB;
-RGLSYMGLUNIFORM4FVARBPROC __rglgen_glUniform4fvARB;
-RGLSYMGLUNIFORM1IVARBPROC __rglgen_glUniform1ivARB;
-RGLSYMGLUNIFORM2IVARBPROC __rglgen_glUniform2ivARB;
-RGLSYMGLUNIFORM3IVARBPROC __rglgen_glUniform3ivARB;
-RGLSYMGLUNIFORM4IVARBPROC __rglgen_glUniform4ivARB;
-RGLSYMGLUNIFORMMATRIX2FVARBPROC __rglgen_glUniformMatrix2fvARB;
-RGLSYMGLUNIFORMMATRIX3FVARBPROC __rglgen_glUniformMatrix3fvARB;
-RGLSYMGLUNIFORMMATRIX4FVARBPROC __rglgen_glUniformMatrix4fvARB;
-RGLSYMGLGETOBJECTPARAMETERFVARBPROC __rglgen_glGetObjectParameterfvARB;
-RGLSYMGLGETOBJECTPARAMETERIVARBPROC __rglgen_glGetObjectParameterivARB;
-RGLSYMGLGETINFOLOGARBPROC __rglgen_glGetInfoLogARB;
-RGLSYMGLGETATTACHEDOBJECTSARBPROC __rglgen_glGetAttachedObjectsARB;
-RGLSYMGLGETUNIFORMLOCATIONARBPROC __rglgen_glGetUniformLocationARB;
-RGLSYMGLGETACTIVEUNIFORMARBPROC __rglgen_glGetActiveUniformARB;
-RGLSYMGLGETUNIFORMFVARBPROC __rglgen_glGetUniformfvARB;
-RGLSYMGLGETUNIFORMIVARBPROC __rglgen_glGetUniformivARB;
-RGLSYMGLGETSHADERSOURCEARBPROC __rglgen_glGetShaderSourceARB;
-RGLSYMGLNAMEDSTRINGARBPROC __rglgen_glNamedStringARB;
-RGLSYMGLDELETENAMEDSTRINGARBPROC __rglgen_glDeleteNamedStringARB;
-RGLSYMGLCOMPILESHADERINCLUDEARBPROC __rglgen_glCompileShaderIncludeARB;
-RGLSYMGLISNAMEDSTRINGARBPROC __rglgen_glIsNamedStringARB;
-RGLSYMGLGETNAMEDSTRINGARBPROC __rglgen_glGetNamedStringARB;
-RGLSYMGLGETNAMEDSTRINGIVARBPROC __rglgen_glGetNamedStringivARB;
-RGLSYMGLTEXPAGECOMMITMENTARBPROC __rglgen_glTexPageCommitmentARB;
-RGLSYMGLTEXBUFFERARBPROC __rglgen_glTexBufferARB;
-RGLSYMGLCOMPRESSEDTEXIMAGE3DARBPROC __rglgen_glCompressedTexImage3DARB;
-RGLSYMGLCOMPRESSEDTEXIMAGE2DARBPROC __rglgen_glCompressedTexImage2DARB;
-RGLSYMGLCOMPRESSEDTEXIMAGE1DARBPROC __rglgen_glCompressedTexImage1DARB;
-RGLSYMGLCOMPRESSEDTEXSUBIMAGE3DARBPROC __rglgen_glCompressedTexSubImage3DARB;
-RGLSYMGLCOMPRESSEDTEXSUBIMAGE2DARBPROC __rglgen_glCompressedTexSubImage2DARB;
-RGLSYMGLCOMPRESSEDTEXSUBIMAGE1DARBPROC __rglgen_glCompressedTexSubImage1DARB;
-RGLSYMGLGETCOMPRESSEDTEXIMAGEARBPROC __rglgen_glGetCompressedTexImageARB;
-RGLSYMGLLOADTRANSPOSEMATRIXFARBPROC __rglgen_glLoadTransposeMatrixfARB;
-RGLSYMGLLOADTRANSPOSEMATRIXDARBPROC __rglgen_glLoadTransposeMatrixdARB;
-RGLSYMGLMULTTRANSPOSEMATRIXFARBPROC __rglgen_glMultTransposeMatrixfARB;
-RGLSYMGLMULTTRANSPOSEMATRIXDARBPROC __rglgen_glMultTransposeMatrixdARB;
-RGLSYMGLWEIGHTBVARBPROC __rglgen_glWeightbvARB;
-RGLSYMGLWEIGHTSVARBPROC __rglgen_glWeightsvARB;
-RGLSYMGLWEIGHTIVARBPROC __rglgen_glWeightivARB;
-RGLSYMGLWEIGHTFVARBPROC __rglgen_glWeightfvARB;
-RGLSYMGLWEIGHTDVARBPROC __rglgen_glWeightdvARB;
-RGLSYMGLWEIGHTUBVARBPROC __rglgen_glWeightubvARB;
-RGLSYMGLWEIGHTUSVARBPROC __rglgen_glWeightusvARB;
-RGLSYMGLWEIGHTUIVARBPROC __rglgen_glWeightuivARB;
-RGLSYMGLWEIGHTPOINTERARBPROC __rglgen_glWeightPointerARB;
-RGLSYMGLVERTEXBLENDARBPROC __rglgen_glVertexBlendARB;
-RGLSYMGLBINDBUFFERARBPROC __rglgen_glBindBufferARB;
-RGLSYMGLDELETEBUFFERSARBPROC __rglgen_glDeleteBuffersARB;
-RGLSYMGLGENBUFFERSARBPROC __rglgen_glGenBuffersARB;
-RGLSYMGLISBUFFERARBPROC __rglgen_glIsBufferARB;
-RGLSYMGLBUFFERDATAARBPROC __rglgen_glBufferDataARB;
-RGLSYMGLBUFFERSUBDATAARBPROC __rglgen_glBufferSubDataARB;
-RGLSYMGLGETBUFFERSUBDATAARBPROC __rglgen_glGetBufferSubDataARB;
-RGLSYMGLMAPBUFFERARBPROC __rglgen_glMapBufferARB;
-RGLSYMGLUNMAPBUFFERARBPROC __rglgen_glUnmapBufferARB;
-RGLSYMGLGETBUFFERPARAMETERIVARBPROC __rglgen_glGetBufferParameterivARB;
-RGLSYMGLGETBUFFERPOINTERVARBPROC __rglgen_glGetBufferPointervARB;
-RGLSYMGLVERTEXATTRIB1DARBPROC __rglgen_glVertexAttrib1dARB;
-RGLSYMGLVERTEXATTRIB1DVARBPROC __rglgen_glVertexAttrib1dvARB;
-RGLSYMGLVERTEXATTRIB1FARBPROC __rglgen_glVertexAttrib1fARB;
-RGLSYMGLVERTEXATTRIB1FVARBPROC __rglgen_glVertexAttrib1fvARB;
-RGLSYMGLVERTEXATTRIB1SARBPROC __rglgen_glVertexAttrib1sARB;
-RGLSYMGLVERTEXATTRIB1SVARBPROC __rglgen_glVertexAttrib1svARB;
-RGLSYMGLVERTEXATTRIB2DARBPROC __rglgen_glVertexAttrib2dARB;
-RGLSYMGLVERTEXATTRIB2DVARBPROC __rglgen_glVertexAttrib2dvARB;
-RGLSYMGLVERTEXATTRIB2FARBPROC __rglgen_glVertexAttrib2fARB;
-RGLSYMGLVERTEXATTRIB2FVARBPROC __rglgen_glVertexAttrib2fvARB;
-RGLSYMGLVERTEXATTRIB2SARBPROC __rglgen_glVertexAttrib2sARB;
-RGLSYMGLVERTEXATTRIB2SVARBPROC __rglgen_glVertexAttrib2svARB;
-RGLSYMGLVERTEXATTRIB3DARBPROC __rglgen_glVertexAttrib3dARB;
-RGLSYMGLVERTEXATTRIB3DVARBPROC __rglgen_glVertexAttrib3dvARB;
-RGLSYMGLVERTEXATTRIB3FARBPROC __rglgen_glVertexAttrib3fARB;
-RGLSYMGLVERTEXATTRIB3FVARBPROC __rglgen_glVertexAttrib3fvARB;
-RGLSYMGLVERTEXATTRIB3SARBPROC __rglgen_glVertexAttrib3sARB;
-RGLSYMGLVERTEXATTRIB3SVARBPROC __rglgen_glVertexAttrib3svARB;
-RGLSYMGLVERTEXATTRIB4NBVARBPROC __rglgen_glVertexAttrib4NbvARB;
-RGLSYMGLVERTEXATTRIB4NIVARBPROC __rglgen_glVertexAttrib4NivARB;
-RGLSYMGLVERTEXATTRIB4NSVARBPROC __rglgen_glVertexAttrib4NsvARB;
-RGLSYMGLVERTEXATTRIB4NUBARBPROC __rglgen_glVertexAttrib4NubARB;
-RGLSYMGLVERTEXATTRIB4NUBVARBPROC __rglgen_glVertexAttrib4NubvARB;
-RGLSYMGLVERTEXATTRIB4NUIVARBPROC __rglgen_glVertexAttrib4NuivARB;
-RGLSYMGLVERTEXATTRIB4NUSVARBPROC __rglgen_glVertexAttrib4NusvARB;
-RGLSYMGLVERTEXATTRIB4BVARBPROC __rglgen_glVertexAttrib4bvARB;
-RGLSYMGLVERTEXATTRIB4DARBPROC __rglgen_glVertexAttrib4dARB;
-RGLSYMGLVERTEXATTRIB4DVARBPROC __rglgen_glVertexAttrib4dvARB;
-RGLSYMGLVERTEXATTRIB4FARBPROC __rglgen_glVertexAttrib4fARB;
-RGLSYMGLVERTEXATTRIB4FVARBPROC __rglgen_glVertexAttrib4fvARB;
-RGLSYMGLVERTEXATTRIB4IVARBPROC __rglgen_glVertexAttrib4ivARB;
-RGLSYMGLVERTEXATTRIB4SARBPROC __rglgen_glVertexAttrib4sARB;
-RGLSYMGLVERTEXATTRIB4SVARBPROC __rglgen_glVertexAttrib4svARB;
-RGLSYMGLVERTEXATTRIB4UBVARBPROC __rglgen_glVertexAttrib4ubvARB;
-RGLSYMGLVERTEXATTRIB4UIVARBPROC __rglgen_glVertexAttrib4uivARB;
-RGLSYMGLVERTEXATTRIB4USVARBPROC __rglgen_glVertexAttrib4usvARB;
-RGLSYMGLVERTEXATTRIBPOINTERARBPROC __rglgen_glVertexAttribPointerARB;
-RGLSYMGLENABLEVERTEXATTRIBARRAYARBPROC __rglgen_glEnableVertexAttribArrayARB;
-RGLSYMGLDISABLEVERTEXATTRIBARRAYARBPROC __rglgen_glDisableVertexAttribArrayARB;
-RGLSYMGLGETVERTEXATTRIBDVARBPROC __rglgen_glGetVertexAttribdvARB;
-RGLSYMGLGETVERTEXATTRIBFVARBPROC __rglgen_glGetVertexAttribfvARB;
-RGLSYMGLGETVERTEXATTRIBIVARBPROC __rglgen_glGetVertexAttribivARB;
-RGLSYMGLGETVERTEXATTRIBPOINTERVARBPROC __rglgen_glGetVertexAttribPointervARB;
-RGLSYMGLBINDATTRIBLOCATIONARBPROC __rglgen_glBindAttribLocationARB;
-RGLSYMGLGETACTIVEATTRIBARBPROC __rglgen_glGetActiveAttribARB;
-RGLSYMGLGETATTRIBLOCATIONARBPROC __rglgen_glGetAttribLocationARB;
-RGLSYMGLWINDOWPOS2DARBPROC __rglgen_glWindowPos2dARB;
-RGLSYMGLWINDOWPOS2DVARBPROC __rglgen_glWindowPos2dvARB;
-RGLSYMGLWINDOWPOS2FARBPROC __rglgen_glWindowPos2fARB;
-RGLSYMGLWINDOWPOS2FVARBPROC __rglgen_glWindowPos2fvARB;
-RGLSYMGLWINDOWPOS2IARBPROC __rglgen_glWindowPos2iARB;
-RGLSYMGLWINDOWPOS2IVARBPROC __rglgen_glWindowPos2ivARB;
-RGLSYMGLWINDOWPOS2SARBPROC __rglgen_glWindowPos2sARB;
-RGLSYMGLWINDOWPOS2SVARBPROC __rglgen_glWindowPos2svARB;
-RGLSYMGLWINDOWPOS3DARBPROC __rglgen_glWindowPos3dARB;
-RGLSYMGLWINDOWPOS3DVARBPROC __rglgen_glWindowPos3dvARB;
-RGLSYMGLWINDOWPOS3FARBPROC __rglgen_glWindowPos3fARB;
-RGLSYMGLWINDOWPOS3FVARBPROC __rglgen_glWindowPos3fvARB;
-RGLSYMGLWINDOWPOS3IARBPROC __rglgen_glWindowPos3iARB;
-RGLSYMGLWINDOWPOS3IVARBPROC __rglgen_glWindowPos3ivARB;
-RGLSYMGLWINDOWPOS3SARBPROC __rglgen_glWindowPos3sARB;
-RGLSYMGLWINDOWPOS3SVARBPROC __rglgen_glWindowPos3svARB;
-RGLSYMGLMULTITEXCOORD1BOESPROC __rglgen_glMultiTexCoord1bOES;
-RGLSYMGLMULTITEXCOORD1BVOESPROC __rglgen_glMultiTexCoord1bvOES;
-RGLSYMGLMULTITEXCOORD2BOESPROC __rglgen_glMultiTexCoord2bOES;
-RGLSYMGLMULTITEXCOORD2BVOESPROC __rglgen_glMultiTexCoord2bvOES;
-RGLSYMGLMULTITEXCOORD3BOESPROC __rglgen_glMultiTexCoord3bOES;
-RGLSYMGLMULTITEXCOORD3BVOESPROC __rglgen_glMultiTexCoord3bvOES;
-RGLSYMGLMULTITEXCOORD4BOESPROC __rglgen_glMultiTexCoord4bOES;
-RGLSYMGLMULTITEXCOORD4BVOESPROC __rglgen_glMultiTexCoord4bvOES;
-RGLSYMGLTEXCOORD1BOESPROC __rglgen_glTexCoord1bOES;
-RGLSYMGLTEXCOORD1BVOESPROC __rglgen_glTexCoord1bvOES;
-RGLSYMGLTEXCOORD2BOESPROC __rglgen_glTexCoord2bOES;
-RGLSYMGLTEXCOORD2BVOESPROC __rglgen_glTexCoord2bvOES;
-RGLSYMGLTEXCOORD3BOESPROC __rglgen_glTexCoord3bOES;
-RGLSYMGLTEXCOORD3BVOESPROC __rglgen_glTexCoord3bvOES;
-RGLSYMGLTEXCOORD4BOESPROC __rglgen_glTexCoord4bOES;
-RGLSYMGLTEXCOORD4BVOESPROC __rglgen_glTexCoord4bvOES;
-RGLSYMGLVERTEX2BOESPROC __rglgen_glVertex2bOES;
-RGLSYMGLVERTEX2BVOESPROC __rglgen_glVertex2bvOES;
-RGLSYMGLVERTEX3BOESPROC __rglgen_glVertex3bOES;
-RGLSYMGLVERTEX3BVOESPROC __rglgen_glVertex3bvOES;
-RGLSYMGLVERTEX4BOESPROC __rglgen_glVertex4bOES;
-RGLSYMGLVERTEX4BVOESPROC __rglgen_glVertex4bvOES;
-RGLSYMGLALPHAFUNCXOESPROC __rglgen_glAlphaFuncxOES;
-RGLSYMGLCLEARCOLORXOESPROC __rglgen_glClearColorxOES;
-RGLSYMGLCLEARDEPTHXOESPROC __rglgen_glClearDepthxOES;
-RGLSYMGLCLIPPLANEXOESPROC __rglgen_glClipPlanexOES;
-RGLSYMGLCOLOR4XOESPROC __rglgen_glColor4xOES;
-RGLSYMGLDEPTHRANGEXOESPROC __rglgen_glDepthRangexOES;
-RGLSYMGLFOGXOESPROC __rglgen_glFogxOES;
-RGLSYMGLFOGXVOESPROC __rglgen_glFogxvOES;
-RGLSYMGLFRUSTUMXOESPROC __rglgen_glFrustumxOES;
-RGLSYMGLGETCLIPPLANEXOESPROC __rglgen_glGetClipPlanexOES;
-RGLSYMGLGETFIXEDVOESPROC __rglgen_glGetFixedvOES;
-RGLSYMGLGETTEXENVXVOESPROC __rglgen_glGetTexEnvxvOES;
-RGLSYMGLGETTEXPARAMETERXVOESPROC __rglgen_glGetTexParameterxvOES;
-RGLSYMGLLIGHTMODELXOESPROC __rglgen_glLightModelxOES;
-RGLSYMGLLIGHTMODELXVOESPROC __rglgen_glLightModelxvOES;
-RGLSYMGLLIGHTXOESPROC __rglgen_glLightxOES;
-RGLSYMGLLIGHTXVOESPROC __rglgen_glLightxvOES;
-RGLSYMGLLINEWIDTHXOESPROC __rglgen_glLineWidthxOES;
-RGLSYMGLLOADMATRIXXOESPROC __rglgen_glLoadMatrixxOES;
-RGLSYMGLMATERIALXOESPROC __rglgen_glMaterialxOES;
-RGLSYMGLMATERIALXVOESPROC __rglgen_glMaterialxvOES;
-RGLSYMGLMULTMATRIXXOESPROC __rglgen_glMultMatrixxOES;
-RGLSYMGLMULTITEXCOORD4XOESPROC __rglgen_glMultiTexCoord4xOES;
-RGLSYMGLNORMAL3XOESPROC __rglgen_glNormal3xOES;
-RGLSYMGLORTHOXOESPROC __rglgen_glOrthoxOES;
-RGLSYMGLPOINTPARAMETERXVOESPROC __rglgen_glPointParameterxvOES;
-RGLSYMGLPOINTSIZEXOESPROC __rglgen_glPointSizexOES;
-RGLSYMGLPOLYGONOFFSETXOESPROC __rglgen_glPolygonOffsetxOES;
-RGLSYMGLROTATEXOESPROC __rglgen_glRotatexOES;
-RGLSYMGLSAMPLECOVERAGEOESPROC __rglgen_glSampleCoverageOES;
-RGLSYMGLSCALEXOESPROC __rglgen_glScalexOES;
-RGLSYMGLTEXENVXOESPROC __rglgen_glTexEnvxOES;
-RGLSYMGLTEXENVXVOESPROC __rglgen_glTexEnvxvOES;
-RGLSYMGLTEXPARAMETERXOESPROC __rglgen_glTexParameterxOES;
-RGLSYMGLTEXPARAMETERXVOESPROC __rglgen_glTexParameterxvOES;
-RGLSYMGLTRANSLATEXOESPROC __rglgen_glTranslatexOES;
-RGLSYMGLACCUMXOESPROC __rglgen_glAccumxOES;
-RGLSYMGLBITMAPXOESPROC __rglgen_glBitmapxOES;
-RGLSYMGLBLENDCOLORXOESPROC __rglgen_glBlendColorxOES;
-RGLSYMGLCLEARACCUMXOESPROC __rglgen_glClearAccumxOES;
-RGLSYMGLCOLOR3XOESPROC __rglgen_glColor3xOES;
-RGLSYMGLCOLOR3XVOESPROC __rglgen_glColor3xvOES;
-RGLSYMGLCOLOR4XVOESPROC __rglgen_glColor4xvOES;
-RGLSYMGLCONVOLUTIONPARAMETERXOESPROC __rglgen_glConvolutionParameterxOES;
-RGLSYMGLCONVOLUTIONPARAMETERXVOESPROC __rglgen_glConvolutionParameterxvOES;
-RGLSYMGLEVALCOORD1XOESPROC __rglgen_glEvalCoord1xOES;
-RGLSYMGLEVALCOORD1XVOESPROC __rglgen_glEvalCoord1xvOES;
-RGLSYMGLEVALCOORD2XOESPROC __rglgen_glEvalCoord2xOES;
-RGLSYMGLEVALCOORD2XVOESPROC __rglgen_glEvalCoord2xvOES;
-RGLSYMGLFEEDBACKBUFFERXOESPROC __rglgen_glFeedbackBufferxOES;
-RGLSYMGLGETCONVOLUTIONPARAMETERXVOESPROC __rglgen_glGetConvolutionParameterxvOES;
-RGLSYMGLGETHISTOGRAMPARAMETERXVOESPROC __rglgen_glGetHistogramParameterxvOES;
-RGLSYMGLGETLIGHTXOESPROC __rglgen_glGetLightxOES;
-RGLSYMGLGETMAPXVOESPROC __rglgen_glGetMapxvOES;
-RGLSYMGLGETMATERIALXOESPROC __rglgen_glGetMaterialxOES;
-RGLSYMGLGETPIXELMAPXVPROC __rglgen_glGetPixelMapxv;
-RGLSYMGLGETTEXGENXVOESPROC __rglgen_glGetTexGenxvOES;
-RGLSYMGLGETTEXLEVELPARAMETERXVOESPROC __rglgen_glGetTexLevelParameterxvOES;
-RGLSYMGLINDEXXOESPROC __rglgen_glIndexxOES;
-RGLSYMGLINDEXXVOESPROC __rglgen_glIndexxvOES;
-RGLSYMGLLOADTRANSPOSEMATRIXXOESPROC __rglgen_glLoadTransposeMatrixxOES;
-RGLSYMGLMAP1XOESPROC __rglgen_glMap1xOES;
-RGLSYMGLMAP2XOESPROC __rglgen_glMap2xOES;
-RGLSYMGLMAPGRID1XOESPROC __rglgen_glMapGrid1xOES;
-RGLSYMGLMAPGRID2XOESPROC __rglgen_glMapGrid2xOES;
-RGLSYMGLMULTTRANSPOSEMATRIXXOESPROC __rglgen_glMultTransposeMatrixxOES;
-RGLSYMGLMULTITEXCOORD1XOESPROC __rglgen_glMultiTexCoord1xOES;
-RGLSYMGLMULTITEXCOORD1XVOESPROC __rglgen_glMultiTexCoord1xvOES;
-RGLSYMGLMULTITEXCOORD2XOESPROC __rglgen_glMultiTexCoord2xOES;
-RGLSYMGLMULTITEXCOORD2XVOESPROC __rglgen_glMultiTexCoord2xvOES;
-RGLSYMGLMULTITEXCOORD3XOESPROC __rglgen_glMultiTexCoord3xOES;
-RGLSYMGLMULTITEXCOORD3XVOESPROC __rglgen_glMultiTexCoord3xvOES;
-RGLSYMGLMULTITEXCOORD4XVOESPROC __rglgen_glMultiTexCoord4xvOES;
-RGLSYMGLNORMAL3XVOESPROC __rglgen_glNormal3xvOES;
-RGLSYMGLPASSTHROUGHXOESPROC __rglgen_glPassThroughxOES;
-RGLSYMGLPIXELMAPXPROC __rglgen_glPixelMapx;
-RGLSYMGLPIXELSTOREXPROC __rglgen_glPixelStorex;
-RGLSYMGLPIXELTRANSFERXOESPROC __rglgen_glPixelTransferxOES;
-RGLSYMGLPIXELZOOMXOESPROC __rglgen_glPixelZoomxOES;
-RGLSYMGLPRIORITIZETEXTURESXOESPROC __rglgen_glPrioritizeTexturesxOES;
-RGLSYMGLRASTERPOS2XOESPROC __rglgen_glRasterPos2xOES;
-RGLSYMGLRASTERPOS2XVOESPROC __rglgen_glRasterPos2xvOES;
-RGLSYMGLRASTERPOS3XOESPROC __rglgen_glRasterPos3xOES;
-RGLSYMGLRASTERPOS3XVOESPROC __rglgen_glRasterPos3xvOES;
-RGLSYMGLRASTERPOS4XOESPROC __rglgen_glRasterPos4xOES;
-RGLSYMGLRASTERPOS4XVOESPROC __rglgen_glRasterPos4xvOES;
-RGLSYMGLRECTXOESPROC __rglgen_glRectxOES;
-RGLSYMGLRECTXVOESPROC __rglgen_glRectxvOES;
-RGLSYMGLTEXCOORD1XOESPROC __rglgen_glTexCoord1xOES;
-RGLSYMGLTEXCOORD1XVOESPROC __rglgen_glTexCoord1xvOES;
-RGLSYMGLTEXCOORD2XOESPROC __rglgen_glTexCoord2xOES;
-RGLSYMGLTEXCOORD2XVOESPROC __rglgen_glTexCoord2xvOES;
-RGLSYMGLTEXCOORD3XOESPROC __rglgen_glTexCoord3xOES;
-RGLSYMGLTEXCOORD3XVOESPROC __rglgen_glTexCoord3xvOES;
-RGLSYMGLTEXCOORD4XOESPROC __rglgen_glTexCoord4xOES;
-RGLSYMGLTEXCOORD4XVOESPROC __rglgen_glTexCoord4xvOES;
-RGLSYMGLTEXGENXOESPROC __rglgen_glTexGenxOES;
-RGLSYMGLTEXGENXVOESPROC __rglgen_glTexGenxvOES;
-RGLSYMGLVERTEX2XOESPROC __rglgen_glVertex2xOES;
-RGLSYMGLVERTEX2XVOESPROC __rglgen_glVertex2xvOES;
-RGLSYMGLVERTEX3XOESPROC __rglgen_glVertex3xOES;
-RGLSYMGLVERTEX3XVOESPROC __rglgen_glVertex3xvOES;
-RGLSYMGLVERTEX4XOESPROC __rglgen_glVertex4xOES;
-RGLSYMGLVERTEX4XVOESPROC __rglgen_glVertex4xvOES;
-RGLSYMGLQUERYMATRIXXOESPROC __rglgen_glQueryMatrixxOES;
-RGLSYMGLCLEARDEPTHFOESPROC __rglgen_glClearDepthfOES;
-RGLSYMGLCLIPPLANEFOESPROC __rglgen_glClipPlanefOES;
-RGLSYMGLDEPTHRANGEFOESPROC __rglgen_glDepthRangefOES;
-RGLSYMGLFRUSTUMFOESPROC __rglgen_glFrustumfOES;
-RGLSYMGLGETCLIPPLANEFOESPROC __rglgen_glGetClipPlanefOES;
-RGLSYMGLORTHOFOESPROC __rglgen_glOrthofOES;
-RGLSYMGLIMAGETRANSFORMPARAMETERIHPPROC __rglgen_glImageTransformParameteriHP;
-RGLSYMGLIMAGETRANSFORMPARAMETERFHPPROC __rglgen_glImageTransformParameterfHP;
-RGLSYMGLIMAGETRANSFORMPARAMETERIVHPPROC __rglgen_glImageTransformParameterivHP;
-RGLSYMGLIMAGETRANSFORMPARAMETERFVHPPROC __rglgen_glImageTransformParameterfvHP;
-RGLSYMGLGETIMAGETRANSFORMPARAMETERIVHPPROC __rglgen_glGetImageTransformParameterivHP;
-RGLSYMGLGETIMAGETRANSFORMPARAMETERFVHPPROC __rglgen_glGetImageTransformParameterfvHP;
-
diff --git a/libretro-common/glsym/rglgen.c b/libretro-common/glsym/rglgen.c
deleted file mode 100644
index 0ea1fdc..0000000
--- a/libretro-common/glsym/rglgen.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Copyright (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this libretro SDK code part (glsym).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <string.h>
-
-#include <glsym/rglgen.h>
-#include <glsym/glsym.h>
-
-void rglgen_resolve_symbols_custom(rglgen_proc_address_t proc,
-      const struct rglgen_sym_map *map)
-{
-   for (; map->sym; map++)
-   {
-      rglgen_func_t func = proc(map->sym);
-      memcpy(map->ptr, &func, sizeof(func));
-   }
-}
-
-void rglgen_resolve_symbols(rglgen_proc_address_t proc)
-{
-   rglgen_resolve_symbols_custom(proc, rglgen_symbol_map);
-}
-
diff --git a/libretro-common/glsym/rglgen.py b/libretro-common/glsym/rglgen.py
deleted file mode 100644
index 897d8cb..0000000
--- a/libretro-common/glsym/rglgen.py
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/usr/bin/env python3
-
-"""
-   License statement applies to this file (glgen.py) only.
-""" 
-
-"""
-   Permission is hereby granted, free of charge,
-   to any person obtaining a copy of this software and associated documentation files (the "Software"),
-   to deal in the Software without restriction, including without limitation the rights to
-   use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
-   INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-   IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-"""
-
-import sys
-import os
-import re
-
-banned_ext = [ 'AMD', 'APPLE', 'NV', 'NVX', 'ATI', '3DLABS', 'SUN', 'SGI', 'SGIX', 'SGIS', 'INTEL', '3DFX', 'IBM', 'MESA', 'GREMEDY', 'OML', 'PGI', 'I3D', 'INGL', 'MTX', 'QCOM', 'IMG', 'ANGLE', 'SUNX', 'INGR' ]
-
-def noext(sym):
-   for ext in banned_ext:
-      if sym.endswith(ext):
-         return False
-   return True
-
-def find_gl_symbols(lines):
-   typedefs = []
-   syms = []
-   for line in lines:
-      m = re.search(r'^typedef.+PFN(\S+)PROC.+$', line)
-      g = re.search(r'^.+(gl\S+)\W*\(.+\).*$', line)
-      if m and noext(m.group(1)):
-         typedefs.append(m.group(0).replace('PFN', 'RGLSYM').replace('GLDEBUGPROC', 'RGLGENGLDEBUGPROC'))
-      if g and noext(g.group(1)):
-         syms.append(g.group(1))
-   return (typedefs, syms)
-
-def generate_defines(gl_syms):
-   res = []
-   for line in gl_syms:
-      res.append('#define {} __rglgen_{}'.format(line, line))
-   return res
-
-def generate_declarations(gl_syms):
-   return ['RGLSYM' + x.upper() + 'PROC ' + '__rglgen_' + x + ';' for x in gl_syms]
-
-def generate_macros(gl_syms):
-   return ['    SYM(' + x.replace('gl', '') + '),' for x in gl_syms]
-
-def dump(f, lines):
-   f.write('\n'.join(lines))
-   f.write('\n\n')
-
-if __name__ == '__main__':
-
-   if len(sys.argv) > 4:
-      for banned in sys.argv[4:]:
-         banned_ext.append(banned)
-
-   with open(sys.argv[1], 'r') as f:
-      lines = f.readlines()
-      typedefs, syms = find_gl_symbols(lines)
-
-      overrides = generate_defines(syms)
-      declarations = generate_declarations(syms)
-      externs = ['extern ' + x for x in declarations]
-
-      macros = generate_macros(syms)
-
-   with open(sys.argv[2], 'w') as f:
-      f.write('#ifndef RGLGEN_DECL_H__\n')
-      f.write('#define RGLGEN_DECL_H__\n')
-
-      f.write('#ifdef __cplusplus\n')
-      f.write('extern "C" {\n')
-      f.write('#endif\n')
-
-      f.write('#ifdef GL_APIENTRY\n')
-      f.write('typedef void (GL_APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);\n')
-      f.write('#else\n')
-      f.write('#ifndef APIENTRY\n')
-      f.write('#define APIENTRY\n')
-      f.write('#endif\n')
-      f.write('#ifndef APIENTRYP\n')
-      f.write('#define APIENTRYP APIENTRY *\n')
-      f.write('#endif\n')
-      f.write('typedef void (APIENTRY *RGLGENGLDEBUGPROCARB)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);\n')
-      f.write('typedef void (APIENTRY *RGLGENGLDEBUGPROC)(GLenum, GLenum, GLuint, GLenum, GLsizei, const GLchar*, GLvoid*);\n')
-      f.write('#endif\n')
-
-      f.write('#ifndef GL_OES_EGL_image\n')
-      f.write('typedef void *GLeglImageOES;\n')
-      f.write('#endif\n')
-
-      f.write('#if !defined(GL_OES_fixed_point) && !defined(HAVE_OPENGLES2)\n')
-      f.write('typedef GLint GLfixed;\n')
-      f.write('#endif\n')
-
-      dump(f, typedefs)
-      dump(f, overrides)
-      dump(f, externs)
-
-      f.write('struct rglgen_sym_map { const char *sym; void *ptr; };\n')
-      f.write('extern const struct rglgen_sym_map rglgen_symbol_map[];\n')
-
-      f.write('#ifdef __cplusplus\n')
-      f.write('}\n')
-      f.write('#endif\n')
-
-      f.write('#endif\n')
-
-   with open(sys.argv[3], 'w') as f:
-      f.write('#include "glsym/glsym.h"\n')
-      f.write('#include <stddef.h>\n')
-      f.write('#define SYM(x) { "gl" #x, &(gl##x) }\n')
-      f.write('const struct rglgen_sym_map rglgen_symbol_map[] = {\n')
-      dump(f, macros)
-      f.write('    { NULL, NULL },\n')
-      f.write('};\n')
-      dump(f, declarations)
-
-
diff --git a/libretro-common/hash/rhash.c b/libretro-common/hash/rhash.c
deleted file mode 100644
index 8eb2bb5..0000000
--- a/libretro-common/hash/rhash.c
+++ /dev/null
@@ -1,559 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rhash.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <string.h>
-#include <stdio.h>
-#ifdef _WIN32
-#include <io.h>
-#else
-#include <unistd.h>
-#endif
-#include <rhash.h>
-#include <retro_miscellaneous.h>
-#include <retro_endianness.h>
-#include <streams/file_stream.h>
-
-#define LSL32(x, n) ((uint32_t)(x) << (n))
-#define LSR32(x, n) ((uint32_t)(x) >> (n))
-#define ROR32(x, n) (LSR32(x, n) | LSL32(x, 32 - (n)))
-
-/* First 32 bits of the fractional parts of the square roots of the first 8 primes 2..19 */
-static const uint32_t T_H[8] = {
-   0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
-};
-
-/* First 32 bits of the fractional parts of the cube roots of the first 64 primes 2..311 */
-static const uint32_t T_K[64] = {
-   0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
-   0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
-   0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
-   0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
-   0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
-   0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
-   0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
-   0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2,
-};
-
-/* SHA256 implementation from bSNES. Written by valditx. */
-
-struct sha256_ctx 
-{
-   union
-   {
-      uint8_t u8[64];
-      uint32_t u32[16];
-   } in;
-   unsigned inlen;
-
-   uint32_t w[64];
-   uint32_t h[8];
-   uint64_t len;
-};
-
-static void sha256_init(struct sha256_ctx *p) 
-{
-   memset(p, 0, sizeof(struct sha256_ctx));
-   memcpy(p->h, T_H, sizeof(T_H));
-}
-
-static void sha256_block(struct sha256_ctx *p) 
-{
-   unsigned i;
-   uint32_t s0, s1;
-   uint32_t a, b, c, d, e, f, g, h;
-
-   for (i = 0; i < 16; i++) 
-      p->w[i] = load32be(p->in.u32 + i);
-
-   for (i = 16; i < 64; i++) 
-   {
-      s0 = ROR32(p->w[i - 15],  7) ^ ROR32(p->w[i - 15], 18) ^ LSR32(p->w[i - 15],  3);
-      s1 = ROR32(p->w[i -  2], 17) ^ ROR32(p->w[i -  2], 19) ^ LSR32(p->w[i -  2], 10);
-      p->w[i] = p->w[i - 16] + s0 + p->w[i - 7] + s1;
-   }
-
-   a = p->h[0]; b = p->h[1]; c = p->h[2]; d = p->h[3];
-   e = p->h[4]; f = p->h[5]; g = p->h[6]; h = p->h[7];
-
-   for (i = 0; i < 64; i++) 
-   {
-      uint32_t t1, t2, maj, ch;
-
-      s0 = ROR32(a, 2) ^ ROR32(a, 13) ^ ROR32(a, 22);
-      maj = (a & b) ^ (a & c) ^ (b & c);
-      t2  = s0 + maj;
-      s1  = ROR32(e, 6) ^ ROR32(e, 11) ^ ROR32(e, 25);
-      ch  = (e & f) ^ (~e & g);
-      t1  = h + s1 + ch + T_K[i] + p->w[i];
-
-      h   = g;
-      g   = f;
-      f   = e;
-      e   = d + t1;
-      d   = c;
-      c   = b;
-      b   = a;
-      a   = t1 + t2;
-   }
-
-   p->h[0] += a; p->h[1] += b; p->h[2] += c; p->h[3] += d;
-   p->h[4] += e; p->h[5] += f; p->h[6] += g; p->h[7] += h;
-
-   /* Next block */
-   p->inlen = 0;
-}
-
-static void sha256_chunk(struct sha256_ctx *p,
-      const uint8_t *s, unsigned len) 
-{
-   p->len += len;
-
-   while (len) 
-   {
-      unsigned l = 64 - p->inlen;
-
-      if (len < l)
-         l       = len;
-
-      memcpy(p->in.u8 + p->inlen, s, l);
-
-      s         += l;
-      p->inlen  += l;
-      len       -= l;
-
-      if (p->inlen == 64) 
-         sha256_block(p);
-   }
-}
-
-static void sha256_final(struct sha256_ctx *p) 
-{
-   uint64_t len;
-   p->in.u8[p->inlen++] = 0x80;
-
-   if (p->inlen > 56) 
-   {
-      memset(p->in.u8 + p->inlen, 0, 64 - p->inlen);
-      sha256_block(p);
-   }
-
-   memset(p->in.u8 + p->inlen, 0, 56 - p->inlen);
-
-   len = p->len << 3;
-   store32be(p->in.u32 + 14, (uint32_t)(len >> 32));
-   store32be(p->in.u32 + 15, (uint32_t)len);
-   sha256_block(p);
-}
-
-static void sha256_subhash(struct sha256_ctx *p, uint32_t *t) 
-{
-   unsigned i;
-   for (i = 0; i < 8; i++) 
-      store32be(t++, p->h[i]);
-}
-
-/** 
- * sha256_hash:
- * @s                 : Output.
- * @in                : Input.
- * @size              : Size of @s.
- *
- * Hashes SHA256 and outputs a human readable string.
- **/
-void sha256_hash(char *s, const uint8_t *in, size_t size)
-{
-   unsigned i;
-   struct sha256_ctx sha;
-
-   union
-   {
-      uint32_t u32[8];
-      uint8_t u8[32];
-   } shahash;
-
-   sha256_init(&sha);
-   sha256_chunk(&sha, in, (unsigned)size);
-   sha256_final(&sha);
-   sha256_subhash(&sha, shahash.u32);
-
-   for (i = 0; i < 32; i++)
-      snprintf(s + 2 * i, 3, "%02x", (unsigned)shahash.u8[i]);
-}
-
-#ifndef HAVE_ZLIB
-/* Zlib CRC32. */
-static const uint32_t crc32_table[256] = {
-    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-    0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-    0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
-    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
-    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-    0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
-    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-    0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-    0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-    0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-    0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-    0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-    0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-    0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-    0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-    0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-    0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-};
-
-uint32_t crc32_adjust(uint32_t checksum, uint8_t input)
-{
-   return ((checksum >> 8) & 0x00ffffff) ^ crc32_table[(checksum ^ input) & 0xff];
-}
-
-uint32_t crc32_calculate(const uint8_t *data, size_t length)
-{
-   size_t i;
-   uint32_t checksum = ~0;
-   for (i = 0; i < length; i++)
-      checksum = crc32_adjust(checksum, data[i]);
-   return ~checksum;
-}
-#endif
-
-/* SHA-1 implementation. */
-
-/*
- *  sha1.c
- *
- *  Copyright (C) 1998, 2009
- *  Paul E. Jones <paulej@packetizer.com>
- *  All Rights Reserved
- *
- *****************************************************************************
- *  $Id: sha1.c 12 2009-06-22 19:34:25Z paulej $
- *****************************************************************************
- *
- *  Description:
- *      This file implements the Secure Hashing Standard as defined
- *      in FIPS PUB 180-1 published April 17, 1995.
- *
- *      The Secure Hashing Standard, which uses the Secure Hashing
- *      Algorithm (SHA), produces a 160-bit message digest for a
- *      given data stream.  In theory, it is highly improbable that
- *      two messages will produce the same message digest.  Therefore,
- *      this algorithm can serve as a means of providing a "fingerprint"
- *      for a message.
- *
- *  Portability Issues:
- *      SHA-1 is defined in terms of 32-bit "words".  This code was
- *      written with the expectation that the processor has at least
- *      a 32-bit machine word size.  If the machine word size is larger,
- *      the code should still function properly.  One caveat to that
- *      is that the input functions taking characters and character
- *      arrays assume that only 8 bits of information are stored in each
- *      character.
- *
- *  Caveats:
- *      SHA-1 is designed to work with messages less than 2^64 bits
- *      long. Although SHA-1 allows a message digest to be generated for
- *      messages of any number of bits less than 2^64, this
- *      implementation only works with messages with a length that is a
- *      multiple of the size of an 8-bit character.
- *
- */
-
-/* Define the circular shift macro */
-#define SHA1CircularShift(bits,word) ((((word) << (bits)) & 0xFFFFFFFF) | ((word) >> (32-(bits))))
-
-static void SHA1Reset(SHA1Context *context)
-{
-   if (!context)
-      return;
-
-   context->Length_Low             = 0;
-   context->Length_High            = 0;
-   context->Message_Block_Index    = 0;
-
-   context->Message_Digest[0]      = 0x67452301;
-   context->Message_Digest[1]      = 0xEFCDAB89;
-   context->Message_Digest[2]      = 0x98BADCFE;
-   context->Message_Digest[3]      = 0x10325476;
-   context->Message_Digest[4]      = 0xC3D2E1F0;
-
-   context->Computed   = 0;
-   context->Corrupted  = 0;
-}
-
-static void SHA1ProcessMessageBlock(SHA1Context *context)
-{
-   const unsigned K[] =            /* Constants defined in SHA-1   */      
-   {
-      0x5A827999,
-      0x6ED9EBA1,
-      0x8F1BBCDC,
-      0xCA62C1D6
-   };
-   int         t;                  /* Loop counter                 */
-   unsigned    temp;               /* Temporary word value         */
-   unsigned    W[80];              /* Word sequence                */
-   unsigned    A, B, C, D, E;      /* Word buffers                 */
-
-   /* Initialize the first 16 words in the array W */
-   for(t = 0; t < 16; t++)
-   {
-      W[t] = ((unsigned) context->Message_Block[t * 4]) << 24;
-      W[t] |= ((unsigned) context->Message_Block[t * 4 + 1]) << 16;
-      W[t] |= ((unsigned) context->Message_Block[t * 4 + 2]) << 8;
-      W[t] |= ((unsigned) context->Message_Block[t * 4 + 3]);
-   }
-
-   for(t = 16; t < 80; t++)
-      W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
-
-   A = context->Message_Digest[0];
-   B = context->Message_Digest[1];
-   C = context->Message_Digest[2];
-   D = context->Message_Digest[3];
-   E = context->Message_Digest[4];
-
-   for(t = 0; t < 20; t++)
-   {
-      temp  =  SHA1CircularShift(5,A) +
-         ((B & C) | ((~B) & D)) + E + W[t] + K[0];
-      temp &= 0xFFFFFFFF;
-      E     = D;
-      D     = C;
-      C     = SHA1CircularShift(30,B);
-      B     = A;
-      A     = temp;
-   }
-
-   for(t = 20; t < 40; t++)
-   {
-      temp  = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
-      temp &= 0xFFFFFFFF;
-      E     = D;
-      D     = C;
-      C     = SHA1CircularShift(30,B);
-      B     = A;
-      A     = temp;
-   }
-
-   for(t = 40; t < 60; t++)
-   {
-      temp  = SHA1CircularShift(5,A) +
-         ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
-      temp &= 0xFFFFFFFF;
-      E     = D;
-      D     = C;
-      C     = SHA1CircularShift(30,B);
-      B     = A;
-      A     = temp;
-   }
-
-   for(t = 60; t < 80; t++)
-   {
-      temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
-      temp &= 0xFFFFFFFF;
-      E = D;
-      D = C;
-      C = SHA1CircularShift(30,B);
-      B = A;
-      A = temp;
-   }
-
-   context->Message_Digest[0] =
-      (context->Message_Digest[0] + A) & 0xFFFFFFFF;
-   context->Message_Digest[1] =
-      (context->Message_Digest[1] + B) & 0xFFFFFFFF;
-   context->Message_Digest[2] =
-      (context->Message_Digest[2] + C) & 0xFFFFFFFF;
-   context->Message_Digest[3] =
-      (context->Message_Digest[3] + D) & 0xFFFFFFFF;
-   context->Message_Digest[4] =
-      (context->Message_Digest[4] + E) & 0xFFFFFFFF;
-
-   context->Message_Block_Index = 0;
-}
-
-static void SHA1PadMessage(SHA1Context *context)
-{
-   if (!context)
-      return;
-
-   /*
-    *  Check to see if the current message block is too small to hold
-    *  the initial padding bits and length.  If so, we will pad the
-    *  block, process it, and then continue padding into a second
-    *  block.
-    */
-   context->Message_Block[context->Message_Block_Index++] = 0x80;
-
-   if (context->Message_Block_Index > 55)
-   {
-      while(context->Message_Block_Index < 64)
-         context->Message_Block[context->Message_Block_Index++] = 0;
-
-      SHA1ProcessMessageBlock(context);
-   }
-
-   while(context->Message_Block_Index < 56)
-      context->Message_Block[context->Message_Block_Index++] = 0;
-
-   /*  Store the message length as the last 8 octets */
-   context->Message_Block[56] = (context->Length_High >> 24) & 0xFF;
-   context->Message_Block[57] = (context->Length_High >> 16) & 0xFF;
-   context->Message_Block[58] = (context->Length_High >> 8) & 0xFF;
-   context->Message_Block[59] = (context->Length_High) & 0xFF;
-   context->Message_Block[60] = (context->Length_Low >> 24) & 0xFF;
-   context->Message_Block[61] = (context->Length_Low >> 16) & 0xFF;
-   context->Message_Block[62] = (context->Length_Low >> 8) & 0xFF;
-   context->Message_Block[63] = (context->Length_Low) & 0xFF;
-
-   SHA1ProcessMessageBlock(context);
-}
-
-static int SHA1Result(SHA1Context *context)
-{
-   if (context->Corrupted)
-      return 0;
-
-   if (!context->Computed)
-   {
-      SHA1PadMessage(context);
-      context->Computed = 1;
-   }
-
-   return 1;
-}
-
-static void SHA1Input(SHA1Context *context,
-      const unsigned char *message_array,
-      unsigned length)
-{
-   if (!length)
-      return;
-
-   if (context->Computed || context->Corrupted)
-   {
-      context->Corrupted = 1;
-      return;
-   }
-
-   while(length-- && !context->Corrupted)
-   {
-      context->Message_Block[context->Message_Block_Index++] =
-         (*message_array & 0xFF);
-
-      context->Length_Low += 8;
-      /* Force it to 32 bits */
-      context->Length_Low &= 0xFFFFFFFF;
-      if (context->Length_Low == 0)
-      {
-         context->Length_High++;
-         /* Force it to 32 bits */
-         context->Length_High &= 0xFFFFFFFF;
-         if (context->Length_High == 0)
-            context->Corrupted = 1; /* Message is too long */
-      }
-
-      if (context->Message_Block_Index == 64)
-         SHA1ProcessMessageBlock(context);
-
-      message_array++;
-   }
-}
-
-int sha1_calculate(const char *path, char *result)
-{
-   SHA1Context sha;
-   unsigned char buff[4096];
-   int rv    = 1;
-   RFILE *fd = filestream_open(path, RFILE_MODE_READ, -1);
-
-   if (!fd)
-      goto error;
-
-   buff[0] = '\0';
-
-   SHA1Reset(&sha);
-
-   do
-   {
-      rv = (int)filestream_read(fd, buff, 4096);
-      if (rv < 0)
-         goto error;
-
-      SHA1Input(&sha, buff, rv);
-   }while(rv);
-
-   if (!SHA1Result(&sha))
-      goto error;
-
-   sprintf(result, "%08X%08X%08X%08X%08X",
-         sha.Message_Digest[0],
-         sha.Message_Digest[1],
-         sha.Message_Digest[2],
-         sha.Message_Digest[3], sha.Message_Digest[4]);
-
-   filestream_close(fd);
-   return 0;
-
-error:
-   if (fd)
-      filestream_close(fd);
-   return -1;
-}
-
-uint32_t djb2_calculate(const char *str)
-{
-   const unsigned char *aux = (const unsigned char*)str;
-   uint32_t            hash = 5381;
-
-   while ( *aux )
-      hash = ( hash << 5 ) + hash + *aux++;
-
-   return hash;
-}
diff --git a/libretro-common/libco/amd64.c b/libretro-common/libco/amd64.c
deleted file mode 100644
index 2494415..0000000
--- a/libretro-common/libco/amd64.c
+++ /dev/null
@@ -1,204 +0,0 @@
-/*
-  libco.amd64 (2009-10-12)
-  author: byuu
-  license: public domain
-*/
-
-#define LIBCO_C
-#include <libco.h>
-#include <assert.h>
-#include <stdlib.h>
-
-#if defined(__GNUC__) && !defined(_WIN32) && !defined(__cplusplus)
-#define CO_USE_INLINE_ASM
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static thread_local long long co_active_buffer[64];
-static thread_local cothread_t co_active_handle = 0;
-#ifndef CO_USE_INLINE_ASM
-static void (*co_swap)(cothread_t, cothread_t) = 0;
-#endif
-
-#ifdef _WIN32
-/* ABI: Win64 */
-static unsigned char co_swap_function[] = {
-  0x48, 0x89, 0x22,                                 /* mov    [rdx],rsp        */
-  0x48, 0x8b, 0x21,                                 /* mov    rsp,[rcx]        */
-  0x58,                                             /* pop    rax              */
-  0x48, 0x89, 0x6a, 0x08,                           /* mov    [rdx+0x8],rbp    */
-  0x48, 0x89, 0x72, 0x10,                           /* mov    [rdx+0x10],rsi   */
-  0x48, 0x89, 0x7a, 0x18,                           /* mov    [rdx+0x18],rdi   */
-  0x48, 0x89, 0x5a, 0x20,                           /* mov    [rdx+0x20],rbx   */
-  0x4c, 0x89, 0x62, 0x28,                           /* mov    [rdx+0x28],r12   */
-  0x4c, 0x89, 0x6a, 0x30,                           /* mov    [rdx+0x30],r13   */
-  0x4c, 0x89, 0x72, 0x38,                           /* mov    [rdx+0x38],r14   */
-  0x4c, 0x89, 0x7a, 0x40,                           /* mov    [rdx+0x40],r15   */
-  0x48, 0x81, 0xc2, 0x80, 0x00, 0x00, 0x00,         /* add    rdx,0x80         */
-  0x48, 0x83, 0xe2, 0xf0,                           /* and    rdx,-0x10        */
-  0x0f, 0x29, 0x32,                                 /* movaps [rdx],xmm6       */
-  0x0f, 0x29, 0x7a, 0x10,                           /* movaps [rdx+0x10],xmm7  */
-  0x44, 0x0f, 0x29, 0x42, 0x20,                     /* movaps [rdx+0x20],xmm8  */
-  0x44, 0x0f, 0x29, 0x4a, 0x30,                     /* movaps [rdx+0x30],xmm9  */
-  0x44, 0x0f, 0x29, 0x52, 0x40,                     /* movaps [rdx+0x40],xmm10 */
-  0x44, 0x0f, 0x29, 0x5a, 0x50,                     /* movaps [rdx+0x50],xmm11 */
-  0x44, 0x0f, 0x29, 0x62, 0x60,                     /* movaps [rdx+0x60],xmm12 */
-  0x44, 0x0f, 0x29, 0x6a, 0x70,                     /* movaps [rdx+0x70],xmm13 */
-  0x44, 0x0f, 0x29, 0xb2, 0x80, 0x00, 0x00, 0x00,   /* movaps [rdx+0x80],xmm14 */
-  0x44, 0x0f, 0x29, 0xba, 0x90, 0x00, 0x00, 0x00,   /* movaps [rdx+0x90],xmm15 */
-  0x48, 0x8b, 0x69, 0x08,                           /* mov    rbp,[rcx+0x8]    */
-  0x48, 0x8b, 0x71, 0x10,                           /* mov    rsi,[rcx+0x10]   */
-  0x48, 0x8b, 0x79, 0x18,                           /* mov    rdi,[rcx+0x18]   */
-  0x48, 0x8b, 0x59, 0x20,                           /* mov    rbx,[rcx+0x20]   */
-  0x4c, 0x8b, 0x61, 0x28,                           /* mov    r12,[rcx+0x28]   */
-  0x4c, 0x8b, 0x69, 0x30,                           /* mov    r13,[rcx+0x30]   */
-  0x4c, 0x8b, 0x71, 0x38,                           /* mov    r14,[rcx+0x38]   */
-  0x4c, 0x8b, 0x79, 0x40,                           /* mov    r15,[rcx+0x40]   */
-  0x48, 0x81, 0xc1, 0x80, 0x00, 0x00, 0x00,         /* add    rcx,0x80         */
-  0x48, 0x83, 0xe1, 0xf0,                           /* and    rcx,-0x10        */
-  0x0f, 0x29, 0x31,                                 /* movaps [rcx],xmm6       */
-  0x0f, 0x29, 0x79, 0x10,                           /* movaps [rcx+0x10],xmm7  */
-  0x44, 0x0f, 0x29, 0x41, 0x20,                     /* movaps [rcx+0x20],xmm8  */
-  0x44, 0x0f, 0x29, 0x49, 0x30,                     /* movaps [rcx+0x30],xmm9  */
-  0x44, 0x0f, 0x29, 0x51, 0x40,                     /* movaps [rcx+0x40],xmm10 */
-  0x44, 0x0f, 0x29, 0x59, 0x50,                     /* movaps [rcx+0x50],xmm11 */
-  0x44, 0x0f, 0x29, 0x61, 0x60,                     /* movaps [rcx+0x60],xmm12 */
-  0x44, 0x0f, 0x29, 0x69, 0x70,                     /* movaps [rcx+0x70],xmm13 */
-  0x44, 0x0f, 0x29, 0xb1, 0x80, 0x00, 0x00, 0x00,   /* movaps [rcx+0x80],xmm14 */
-  0x44, 0x0f, 0x29, 0xb9, 0x90, 0x00, 0x00, 0x00,   /* movaps [rcx+0x90],xmm15 */
-  0xff, 0xe0,                                       /* jmp    rax              */
-};
-
-#include <windows.h>
-
-void co_init(void)
-{
-   DWORD old_privileges;
-   VirtualProtect(co_swap_function,
-         sizeof(co_swap_function), PAGE_EXECUTE_READWRITE, &old_privileges);
-}
-#else
-/* ABI: SystemV */
-#ifndef CO_USE_INLINE_ASM
-static unsigned char co_swap_function[] = {
-  0x48, 0x89, 0x26,                                 /* mov    [rsi],rsp      */
-  0x48, 0x8b, 0x27,                                 /* mov    rsp,[rdi]      */
-  0x58,                                             /* pop    rax            */
-  0x48, 0x89, 0x6e, 0x08,                           /* mov    [rsi+0x08],rbp */
-  0x48, 0x89, 0x5e, 0x10,                           /* mov    [rsi+0x10],rbx */
-  0x4c, 0x89, 0x66, 0x18,                           /* mov    [rsi+0x18],r12 */
-  0x4c, 0x89, 0x6e, 0x20,                           /* mov    [rsi+0x20],r13 */
-  0x4c, 0x89, 0x76, 0x28,                           /* mov    [rsi+0x28],r14 */
-  0x4c, 0x89, 0x7e, 0x30,                           /* mov    [rsi+0x30],r15 */
-  0x48, 0x8b, 0x6f, 0x08,                           /* mov    rbp,[rdi+0x08] */
-  0x48, 0x8b, 0x5f, 0x10,                           /* mov    rbx,[rdi+0x10] */
-  0x4c, 0x8b, 0x67, 0x18,                           /* mov    r12,[rdi+0x18] */
-  0x4c, 0x8b, 0x6f, 0x20,                           /* mov    r13,[rdi+0x20] */
-  0x4c, 0x8b, 0x77, 0x28,                           /* mov    r14,[rdi+0x28] */
-  0x4c, 0x8b, 0x7f, 0x30,                           /* mov    r15,[rdi+0x30] */
-  0xff, 0xe0,                                       /* jmp    rax            */
-};
-
-#include <unistd.h>
-#include <sys/mman.h>
-
-void co_init(void)
-{
-   unsigned long long addr = (unsigned long long)co_swap_function;
-   unsigned long long base = addr - (addr % sysconf(_SC_PAGESIZE));
-   unsigned long long size = (addr - base) + sizeof(co_swap_function);
-   mprotect((void*)base, size, PROT_READ | PROT_WRITE | PROT_EXEC);
-}
-#else
-void co_init(void) {}
-#endif
-#endif
-
-static void crash(void)
-{
-  assert(0); /* called only if cothread_t entrypoint returns */
-}
-
-cothread_t co_active(void)
-{
-  if (!co_active_handle)
-     co_active_handle = &co_active_buffer;
-  return co_active_handle;
-}
-
-cothread_t co_create(unsigned int size, void (*entrypoint)(void))
-{
-   cothread_t handle;
-
-#ifndef CO_USE_INLINE_ASM
-   if(!co_swap)
-   {
-      co_init();
-      co_swap = (void (*)(cothread_t, cothread_t))co_swap_function;
-   }
-#endif
-
-   if (!co_active_handle)
-      co_active_handle = &co_active_buffer;
-   size += 512; /* allocate additional space for storage */
-   size &= ~15; /* align stack to 16-byte boundary */
-
-   if((handle = (cothread_t)malloc(size)))
-   {
-      long long *p = (long long*)((char*)handle + size); /* seek to top of stack */
-      *--p = (long long)crash;                           /* crash if entrypoint returns */
-      *--p = (long long)entrypoint;                      /* start of function */
-      *(long long*)handle = (long long)p;                /* stack pointer */
-   }
-
-   return handle;
-}
-
-void co_delete(cothread_t handle)
-{
-   free(handle);
-}
-
-#ifndef CO_USE_INLINE_ASM
-void co_switch(cothread_t handle)
-{
-  register cothread_t co_previous_handle = co_active_handle;
-  co_swap(co_active_handle = handle, co_previous_handle);
-}
-#else
-#ifdef __APPLE__
-#define ASM_PREFIX "_"
-#else
-#define ASM_PREFIX ""
-#endif
-__asm__(
-".intel_syntax noprefix         \n"
-".globl " ASM_PREFIX "co_switch              \n"
-ASM_PREFIX "co_switch:                     \n"
-"mov rsi, [rip+" ASM_PREFIX "co_active_handle]\n"
-"mov [rsi],rsp                  \n"
-"mov [rsi+0x08],rbp             \n"
-"mov [rsi+0x10],rbx             \n"
-"mov [rsi+0x18],r12             \n"
-"mov [rsi+0x20],r13             \n"
-"mov [rsi+0x28],r14             \n"
-"mov [rsi+0x30],r15             \n"
-"mov [rip+" ASM_PREFIX "co_active_handle], rdi\n"
-"mov rsp,[rdi]                  \n"
-"mov rbp,[rdi+0x08]             \n"
-"mov rbx,[rdi+0x10]             \n"
-"mov r12,[rdi+0x18]             \n"
-"mov r13,[rdi+0x20]             \n"
-"mov r14,[rdi+0x28]             \n"
-"mov r15,[rdi+0x30]             \n"
-"ret                            \n"
-".att_syntax                    \n"
-);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/libretro-common/libco/armeabi.c b/libretro-common/libco/armeabi.c
deleted file mode 100644
index 6128f3f..0000000
--- a/libretro-common/libco/armeabi.c
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-  libco.armeabi (2013-04-05)
-  author: Themaister
-  license: public domain
-*/
-
-#define LIBCO_C
-#include <libco.h>
-#include <assert.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdint.h>
-
-#ifndef __APPLE__
-#include <malloc.h>
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static thread_local uint32_t co_active_buffer[64];
-static thread_local cothread_t co_active_handle;
-
-asm (
-#if defined(__thumb2__)
-      ".thumb\n"
-      ".align 2\n"
-      ".globl co_switch_arm\n"
-      ".globl _co_switch_arm\n"
-      "co_switch_arm:\n"
-      "_co_switch_arm:\n"
-      " mov r3, sp\n"
-      " stmia r1!, {r4, r5, r6, r7, r8, r9, r10, r11}\n"
-      " stmia r1!, {r3, lr}\n"
-      " ldmia r0!, {r4, r5, r6, r7, r8, r9, r10, r11}\n"
-      " ldmfd r0!, { r3 }\n"
-      " mov sp, r3\n"
-      " ldmfd r0!, { r3 }\n"
-      " mov pc, r3\n"
-#else
-      ".arm\n"
-      ".align 4\n"
-      ".globl co_switch_arm\n"
-      ".globl _co_switch_arm\n"
-      "co_switch_arm:\n"
-      "_co_switch_arm:\n"      
-      "  stmia r1!, {r4, r5, r6, r7, r8, r9, r10, r11, sp, lr}\n"
-      "  ldmia r0!, {r4, r5, r6, r7, r8, r9, r10, r11, sp, pc}\n"
-#endif
-    );
-
-/* ASM */
-void co_switch_arm(cothread_t handle, cothread_t current);
-
-cothread_t co_create(unsigned int size, void (*entrypoint)(void))
-{
-   size = (size + 1023) & ~1023;
-   cothread_t handle = 0;
-#if defined(__APPLE__) || HAVE_POSIX_MEMALIGN >= 1
-   if (posix_memalign(&handle, 1024, size + 256) < 0)
-      return 0;
-#else
-   handle = memalign(1024, size + 256);
-#endif
-
-   if (!handle)
-      return handle;
-
-   uint32_t *ptr = (uint32_t*)handle;
-   /* Non-volatiles.  */
-   ptr[0] = 0; /* r4  */
-   ptr[1] = 0; /* r5  */
-   ptr[2] = 0; /* r6  */
-   ptr[3] = 0; /* r7  */
-   ptr[4] = 0; /* r8  */
-   ptr[5] = 0; /* r9  */
-   ptr[6] = 0; /* r10 */
-   ptr[7] = 0; /* r11 */
-   /* Align stack to 64-bit */
-   ptr[8] = (uintptr_t)ptr + size + 256 - 8; /* r13, stack pointer */
-   ptr[9] = (uintptr_t)entrypoint; /* r15, PC (link register r14 gets saved here). */
-   return handle;
-}
-
-cothread_t co_active(void)
-{
-   if (!co_active_handle)
-      co_active_handle = co_active_buffer;
-   return co_active_handle;
-}
-
-void co_delete(cothread_t handle)
-{
-   free(handle);
-}
-
-void co_switch(cothread_t handle)
-{
-   cothread_t co_previous_handle = co_active();
-   co_switch_arm(co_active_handle = handle, co_previous_handle);
-}
-
-#ifdef __cplusplus
-}
-#endif
-
diff --git a/libretro-common/libco/fiber.c b/libretro-common/libco/fiber.c
deleted file mode 100644
index 90ba115..0000000
--- a/libretro-common/libco/fiber.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-  libco.win (2008-01-28)
-  authors: Nach, byuu
-  license: public domain
-*/
-
-#define LIBCO_C
-#include <libco.h>
-#define WINVER 0x0400
-#define _WIN32_WINNT 0x0400
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static thread_local cothread_t co_active_ = 0;
-
-static void __stdcall co_thunk(void *coentry)
-{
-   ((void (*)(void))coentry)();
-}
-
-cothread_t co_active(void)
-{
-   if(!co_active_)
-   {
-      ConvertThreadToFiber(0);
-      co_active_ = GetCurrentFiber();
-   }
-   return co_active_;
-}
-
-cothread_t co_create(unsigned int heapsize, void (*coentry)(void))
-{
-   if(!co_active_)
-   {
-      ConvertThreadToFiber(0);
-      co_active_ = GetCurrentFiber();
-   }
-   return (cothread_t)CreateFiber(heapsize, co_thunk, (void*)coentry);
-}
-
-void co_delete(cothread_t cothread)
-{
-   DeleteFiber(cothread);
-}
-
-void co_switch(cothread_t cothread)
-{
-   co_active_ = cothread;
-   SwitchToFiber(cothread);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/libretro-common/libco/libco.c b/libretro-common/libco/libco.c
deleted file mode 100644
index 4e5c649..0000000
--- a/libretro-common/libco/libco.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-  libco
-  auto-selection module
-  license: public domain
-*/
-
-#if defined(__GNUC__) && defined(__i386__) || (defined(_MSC_VER) && defined(_M_IX86))
-  #include "x86.c"
-#elif defined(__GNUC__) && defined(__amd64__) || (defined(_MSC_VER) && defined(_M_AMD64))
-  #include "amd64.c"
-#elif defined(__GNUC__) && defined(_ARCH_PPC)
-  #include "ppc.c"
-#elif defined(__GNUC__) && defined(VITA)
-  #include "scefiber.c"
-#elif defined(__GNUC__) && (defined(__ARM_EABI__) || defined(__arm__))
-  #include "armeabi.c"
-#elif defined(__GNUC__)
-  #include "sjlj.c"
-#elif defined(_MSC_VER)
-  #include "fiber.c"
-#else
-  #error "libco: unsupported processor, compiler or operating system"
-#endif
diff --git a/libretro-common/libco/ppc.c b/libretro-common/libco/ppc.c
deleted file mode 100644
index f6cb536..0000000
--- a/libretro-common/libco/ppc.c
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
-  libco.ppc (2010-10-17)
-  author: blargg
-  license: public domain
-*/
-
-/* PowerPC 32/64 using embedded or external asm, with optional
-floating-point and AltiVec save/restore */
-
-#define LIBCO_C
-#include <libco.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-
-#define LIBCO_MPROTECT (__unix__ && !LIBCO_PPC_ASM)
-
-#if LIBCO_MPROTECT
-	#include <unistd.h>
-	#include <sys/mman.h>
-#endif
-
-/* State format (offsets in 32-bit words)
-
-+0	Pointer to swap code
-	Rest of function descriptor for entry function
-+8	PC
-+10	SP
-	Special regs
-	GPRs
-	FPRs
-	VRs
-	stack
-*/
-
-enum { state_size  = 1024 };
-enum { above_stack = 2048 };
-enum { stack_align = 256  };
-
-static thread_local cothread_t co_active_handle = 0;
-
-/**** Determine environment ****/
-
-#define LIBCO_PPC64 (_ARCH_PPC64 || __PPC64__ || __ppc64__ || __powerpc64__)
-
-/* Whether function calls are indirect through a descriptor,
-or are directly to function */
-#ifndef LIBCO_PPCDESC
-	#if !_CALL_SYSV && (_CALL_AIX || _CALL_AIXDESC || LIBCO_PPC64)
-		#define LIBCO_PPCDESC 1
-	#endif
-#endif
-
-#ifdef LIBCO_PPC_ASM
-
-	#ifdef __cplusplus
-		extern "C"
-	#endif
-	
-	/* Swap code is in ppc.S */
-	void co_swap_asm( cothread_t, cothread_t );
-	#define CO_SWAP_ASM( x, y ) co_swap_asm( x, y )
-
-#else
-
-/* Swap code is here in array. Please leave dieassembly comments,
-as they make it easy to see what it does, and reorder instructions
-if one wants to see whether that improves performance. */
-static const uint32_t libco_ppc_code [] = {
-#if LIBCO_PPC64
-    0x7d000026, /* mfcr    r8 */
-    0xf8240028, /* std     r1,40(r4) */
-    0x7d2802a6, /* mflr    r9 */
-    0xf9c40048, /* std     r14,72(r4) */
-    0xf9e40050, /* std     r15,80(r4) */
-    0xfa040058, /* std     r16,88(r4) */
-    0xfa240060, /* std     r17,96(r4) */
-    0xfa440068, /* std     r18,104(r4) */
-    0xfa640070, /* std     r19,112(r4) */
-    0xfa840078, /* std     r20,120(r4) */
-    0xfaa40080, /* std     r21,128(r4) */
-    0xfac40088, /* std     r22,136(r4) */
-    0xfae40090, /* std     r23,144(r4) */
-    0xfb040098, /* std     r24,152(r4) */
-    0xfb2400a0, /* std     r25,160(r4) */
-    0xfb4400a8, /* std     r26,168(r4) */
-    0xfb6400b0, /* std     r27,176(r4) */
-    0xfb8400b8, /* std     r28,184(r4) */
-    0xfba400c0, /* std     r29,192(r4) */
-    0xfbc400c8, /* std     r30,200(r4) */
-    0xfbe400d0, /* std     r31,208(r4) */
-    0xf9240020, /* std     r9,32(r4) */
-    0xe8e30020, /* ld      r7,32(r3) */
-    0xe8230028, /* ld      r1,40(r3) */
-    0x48000009, /* bl      1 */
-	0x7fe00008, /* trap */
-    0x91040030,/*1:stw     r8,48(r4) */
-    0x80c30030, /* lwz     r6,48(r3) */
-    0x7ce903a6, /* mtctr   r7 */
-    0xe9c30048, /* ld      r14,72(r3) */
-    0xe9e30050, /* ld      r15,80(r3) */
-    0xea030058, /* ld      r16,88(r3) */
-    0xea230060, /* ld      r17,96(r3) */
-    0xea430068, /* ld      r18,104(r3) */
-    0xea630070, /* ld      r19,112(r3) */
-    0xea830078, /* ld      r20,120(r3) */
-    0xeaa30080, /* ld      r21,128(r3) */
-    0xeac30088, /* ld      r22,136(r3) */
-    0xeae30090, /* ld      r23,144(r3) */
-    0xeb030098, /* ld      r24,152(r3) */
-    0xeb2300a0, /* ld      r25,160(r3) */
-    0xeb4300a8, /* ld      r26,168(r3) */
-    0xeb6300b0, /* ld      r27,176(r3) */
-    0xeb8300b8, /* ld      r28,184(r3) */
-    0xeba300c0, /* ld      r29,192(r3) */
-    0xebc300c8, /* ld      r30,200(r3) */
-    0xebe300d0, /* ld      r31,208(r3) */
-    0x7ccff120, /* mtcr    r6 */
-#else
-	0x7d000026, /* mfcr    r8 */
-	0x90240028, /* stw     r1,40(r4) */
-	0x7d2802a6, /* mflr    r9 */
-	0x91a4003c, /* stw     r13,60(r4) */
-	0x91c40040, /* stw     r14,64(r4) */
-	0x91e40044, /* stw     r15,68(r4) */
-	0x92040048, /* stw     r16,72(r4) */
-	0x9224004c, /* stw     r17,76(r4) */
-	0x92440050, /* stw     r18,80(r4) */
-	0x92640054, /* stw     r19,84(r4) */
-	0x92840058, /* stw     r20,88(r4) */
-	0x92a4005c, /* stw     r21,92(r4) */
-	0x92c40060, /* stw     r22,96(r4) */
-	0x92e40064, /* stw     r23,100(r4) */
-	0x93040068, /* stw     r24,104(r4) */
-	0x9324006c, /* stw     r25,108(r4) */
-	0x93440070, /* stw     r26,112(r4) */
-	0x93640074, /* stw     r27,116(r4) */
-	0x93840078, /* stw     r28,120(r4) */
-	0x93a4007c, /* stw     r29,124(r4) */
-	0x93c40080, /* stw     r30,128(r4) */
-	0x93e40084, /* stw     r31,132(r4) */
-	0x91240020, /* stw     r9,32(r4) */
-	0x80e30020, /* lwz     r7,32(r3) */
-	0x80230028, /* lwz     r1,40(r3) */
-	0x48000009, /* bl      1 */
-	0x7fe00008, /* trap */
-	0x91040030,/*1:stw     r8,48(r4) */
-	0x80c30030, /* lwz     r6,48(r3) */
-	0x7ce903a6, /* mtctr   r7 */
-	0x81a3003c, /* lwz     r13,60(r3) */
-	0x81c30040, /* lwz     r14,64(r3) */
-	0x81e30044, /* lwz     r15,68(r3) */
-	0x82030048, /* lwz     r16,72(r3) */
-	0x8223004c, /* lwz     r17,76(r3) */
-	0x82430050, /* lwz     r18,80(r3) */
-	0x82630054, /* lwz     r19,84(r3) */
-	0x82830058, /* lwz     r20,88(r3) */
-	0x82a3005c, /* lwz     r21,92(r3) */
-	0x82c30060, /* lwz     r22,96(r3) */
-	0x82e30064, /* lwz     r23,100(r3) */
-	0x83030068, /* lwz     r24,104(r3) */
-	0x8323006c, /* lwz     r25,108(r3) */
-	0x83430070, /* lwz     r26,112(r3) */
-	0x83630074, /* lwz     r27,116(r3) */
-	0x83830078, /* lwz     r28,120(r3) */
-	0x83a3007c, /* lwz     r29,124(r3) */
-	0x83c30080, /* lwz     r30,128(r3) */
-	0x83e30084, /* lwz     r31,132(r3) */
-	0x7ccff120, /* mtcr    r6 */
-#endif
-
-#ifndef LIBCO_PPC_NOFP
-	0xd9c400e0, /* stfd    f14,224(r4) */
-	0xd9e400e8, /* stfd    f15,232(r4) */
-	0xda0400f0, /* stfd    f16,240(r4) */
-	0xda2400f8, /* stfd    f17,248(r4) */
-	0xda440100, /* stfd    f18,256(r4) */
-	0xda640108, /* stfd    f19,264(r4) */
-	0xda840110, /* stfd    f20,272(r4) */
-	0xdaa40118, /* stfd    f21,280(r4) */
-	0xdac40120, /* stfd    f22,288(r4) */
-	0xdae40128, /* stfd    f23,296(r4) */
-	0xdb040130, /* stfd    f24,304(r4) */
-	0xdb240138, /* stfd    f25,312(r4) */
-	0xdb440140, /* stfd    f26,320(r4) */
-	0xdb640148, /* stfd    f27,328(r4) */
-	0xdb840150, /* stfd    f28,336(r4) */
-	0xdba40158, /* stfd    f29,344(r4) */
-	0xdbc40160, /* stfd    f30,352(r4) */
-	0xdbe40168, /* stfd    f31,360(r4) */
-	0xc9c300e0, /* lfd     f14,224(r3) */
-	0xc9e300e8, /* lfd     f15,232(r3) */
-	0xca0300f0, /* lfd     f16,240(r3) */
-	0xca2300f8, /* lfd     f17,248(r3) */
-	0xca430100, /* lfd     f18,256(r3) */
-	0xca630108, /* lfd     f19,264(r3) */
-	0xca830110, /* lfd     f20,272(r3) */
-	0xcaa30118, /* lfd     f21,280(r3) */
-	0xcac30120, /* lfd     f22,288(r3) */
-	0xcae30128, /* lfd     f23,296(r3) */
-	0xcb030130, /* lfd     f24,304(r3) */
-	0xcb230138, /* lfd     f25,312(r3) */
-	0xcb430140, /* lfd     f26,320(r3) */
-	0xcb630148, /* lfd     f27,328(r3) */
-	0xcb830150, /* lfd     f28,336(r3) */
-	0xcba30158, /* lfd     f29,344(r3) */
-	0xcbc30160, /* lfd     f30,352(r3) */
-	0xcbe30168, /* lfd     f31,360(r3) */
-#endif
-
-#ifdef __ALTIVEC__
-	0x7ca042a6, /* mfvrsave r5 */
-	0x39040180, /* addi    r8,r4,384 */
-	0x39240190, /* addi    r9,r4,400 */
-	0x70a00fff, /* andi.   r0,r5,4095 */
-	0x90a40034, /* stw     r5,52(r4) */
-	0x4182005c, /* beq-    2 */
-	0x7e8041ce, /* stvx    v20,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7ea049ce, /* stvx    v21,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7ec041ce, /* stvx    v22,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7ee049ce, /* stvx    v23,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7f0041ce, /* stvx    v24,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7f2049ce, /* stvx    v25,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7f4041ce, /* stvx    v26,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7f6049ce, /* stvx    v27,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7f8041ce, /* stvx    v28,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7fa049ce, /* stvx    v29,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7fc041ce, /* stvx    v30,r0,r8 */
-	0x7fe049ce, /* stvx    v31,r0,r9 */
-	0x80a30034,/*2:lwz     r5,52(r3) */
-	0x39030180, /* addi    r8,r3,384 */
-	0x39230190, /* addi    r9,r3,400 */
-	0x70a00fff, /* andi.   r0,r5,4095 */
-	0x7ca043a6, /* mtvrsave r5 */
-	0x4d820420, /* beqctr   */
-	0x7e8040ce, /* lvx     v20,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7ea048ce, /* lvx     v21,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7ec040ce, /* lvx     v22,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7ee048ce, /* lvx     v23,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7f0040ce, /* lvx     v24,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7f2048ce, /* lvx     v25,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7f4040ce, /* lvx     v26,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7f6048ce, /* lvx     v27,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7f8040ce, /* lvx     v28,r0,r8 */
-	0x39080020, /* addi    r8,r8,32 */
-	0x7fa048ce, /* lvx     v29,r0,r9 */
-	0x39290020, /* addi    r9,r9,32 */
-	0x7fc040ce, /* lvx     v30,r0,r8 */
-	0x7fe048ce, /* lvx     v31,r0,r9 */
-#endif
-
-	0x4e800420, /* bctr */
-};
-
-	#if LIBCO_PPCDESC
-		/* Function call goes through indirect descriptor */
-		#define CO_SWAP_ASM( x, y ) \
-			((void (*)( cothread_t, cothread_t )) (uintptr_t) x)( x, y )
-	#else
-		/* Function call goes directly to code */
-		#define CO_SWAP_ASM( x, y ) \
-			((void (*)( cothread_t, cothread_t )) (uintptr_t) libco_ppc_code)( x, y )
-	#endif
-
-#endif
-
-static uint32_t* co_create_( unsigned size, uintptr_t entry )
-{
-	uint32_t* t = (uint32_t*) malloc( size );
-	
-	(void) entry;
-	
-	#if LIBCO_PPCDESC
-		if ( t )
-		{
-			/* Copy entry's descriptor */
-			memcpy( t, (void*) entry, sizeof (void*) * 3 );
-			
-			/* Set function pointer to swap routine */
-			#ifdef LIBCO_PPC_ASM
-				*(const void**) t = *(void**) &co_swap_asm;
-			#else
-				*(const void**) t = libco_ppc_code;
-			#endif
-		}
-	#endif
-	
-	return t;
-}
-
-cothread_t co_create( unsigned int size, void (*entry_)( void ) )
-{
-	uintptr_t entry = (uintptr_t) entry_;
-	uint32_t* t = NULL;
-	
-	/* Be sure main thread was successfully allocated */
-	if ( co_active() )
-	{
-		size += state_size + above_stack + stack_align;
-		t = co_create_( size, entry );
-	}
-	
-	if ( t )
-	{
-		uintptr_t sp;
-		int shift;
-		
-		/* Save current registers into new thread, so that any special ones will
-		have proper values when thread is begun */
-		CO_SWAP_ASM( t, t );
-		
-		#if LIBCO_PPCDESC
-			/* Get real address */
-			entry = (uintptr_t) *(void**) entry;
-		#endif
-		
-		/* Put stack near end of block, and align */
-		sp = (uintptr_t) t + size - above_stack;
-		sp -= sp % stack_align;
-		
-		/* On PPC32, we save and restore GPRs as 32 bits. For PPC64, we
-		save and restore them as 64 bits, regardless of the size the ABI
-		uses. So, we manually write pointers at the proper size. We always
-		save and restore at the same address, and since PPC is big-endian,
-		we must put the low byte first on PPC32. */
-		
-		/* If uintptr_t is 32 bits, >>32 is undefined behavior, so we do two shifts
-		and don't have to care how many bits uintptr_t is. */
-		#if LIBCO_PPC64
-			shift = 16;
-		#else
-			shift = 0;
-		#endif
-		
-		/* Set up so entry will be called on next swap */
-		t [8] = (uint32_t) (entry >> shift >> shift);
-		t [9] = (uint32_t) entry;
-		
-		t [10] = (uint32_t) (sp >> shift >> shift); 
-		t [11] = (uint32_t) sp;
-	}
-	
-	return t;
-}
-
-void co_delete( cothread_t t )
-{
-   free(t);
-}
-
-static void co_init_( void )
-{
-#if LIBCO_MPROTECT
-   /* TODO: pre- and post-pad PPC code so that this doesn't make other
-      data executable and writable */
-   long page_size = sysconf( _SC_PAGESIZE );
-   if ( page_size > 0 )
-   {
-      uintptr_t align = page_size;
-      uintptr_t begin = (uintptr_t) libco_ppc_code;
-      uintptr_t end   = begin + sizeof libco_ppc_code;
-
-      /* Align beginning and end */
-      end   += align - 1;
-      end   -= end   % align;
-      begin -= begin % align;
-
-      mprotect( (void*) begin, end - begin, PROT_READ | PROT_WRITE | PROT_EXEC );
-   }
-#endif
-
-   co_active_handle = co_create_( state_size, (uintptr_t) &co_switch );
-}
-
-cothread_t co_active(void)
-{
-   if (!co_active_handle)
-      co_init_();
-
-   return co_active_handle;
-}
-
-void co_switch(cothread_t t)
-{
-   cothread_t old = co_active_handle;
-   co_active_handle = t;
-
-   CO_SWAP_ASM( t, old );
-}
diff --git a/libretro-common/libco/psp2.c b/libretro-common/libco/psp2.c
deleted file mode 100644
index eaf9b7a..0000000
--- a/libretro-common/libco/psp2.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-libco.arm (2015-06-18)
-license: public domain
-*/
-
-#define LIBCO_C
-#include "libco.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <psp2/kernel/sysmem.h>
-#include <stdio.h>
-#include <string.h>
-
-#define FOUR_KB_ALIGN(x) align(x, 12)
-#define MB_ALIGN(x)      align(x, 20)
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-   static inline int align(int x, int n)
-   {
-      return (((x >> n) + 1) << n);
-   }
-
-   static thread_local unsigned long co_active_buffer[64];
-   static thread_local cothread_t co_active_handle = 0;
-   static void(*co_swap)(cothread_t, cothread_t) = 0;
-   static int block;
-   static uint32_t co_swap_function[] = {
-      0xe8a16ff0,  /* stmia r1!, {r4-r11,sp,lr} */
-      0xe8b0aff0,  /* ldmia r0!, {r4-r11,sp,pc} */
-      0xe12fff1e,  /* bx lr                     */
-   };
-
-   void co_init()
-   {
-      int ret;
-      void *base;
-
-      block = sceKernelAllocMemBlockForVM("libco",
-            MB_ALIGN(FOUR_KB_ALIGN(sizeof co_swap_function)));
-      if (block < 0)
-         return;
-
-      /* get base address */
-      ret = sceKernelGetMemBlockBase(block, &base);
-      if (ret < 0)
-         return;
-
-      /* set domain to be writable by user */
-      ret = sceKernelOpenVMDomain();
-      if (ret < 0)
-         return;
-
-      memcpy(base, co_swap_function, sizeof co_swap_function);
-
-      /* set domain back to read-only */
-      ret = sceKernelCloseVMDomain();
-      if (ret < 0)
-         return;
-
-      /* flush icache */
-      ret = sceKernelSyncVMDomain(block, base,
-            MB_ALIGN(FOUR_KB_ALIGN(sizeof co_swap_function)));
-      if (ret < 0)
-         return;
-
-      co_swap = (void(*)(cothread_t, cothread_t))base;
-   }
-
-   cothread_t co_active(void)
-   {
-      if (!co_active_handle) co_active_handle = &co_active_buffer;
-      return co_active_handle;
-   }
-
-   cothread_t co_create(unsigned int size, void(*entrypoint)(void))
-   {
-      unsigned long* handle = 0;
-      if (!co_swap)
-         co_init();
-      if (!co_active_handle) co_active_handle = &co_active_buffer;
-      size += 256;
-      size &= ~15;
-
-      if ((handle = (unsigned long*)malloc(size)))
-      {
-         unsigned long* p = (unsigned long*)((unsigned char*)handle + size);
-         handle[8] = (unsigned long)p;
-         handle[9] = (unsigned long)entrypoint;
-      }
-
-      return handle;
-   }
-
-   void co_delete(cothread_t handle)
-   {
-      free(handle);
-      sceKernelFreeMemBlock(block);
-   }
-
-   void co_switch(cothread_t handle)
-   {
-      cothread_t co_previous_handle = co_active_handle;
-      co_swap(co_active_handle = handle, co_previous_handle);
-   }
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/libretro-common/libco/scefiber.c b/libretro-common/libco/scefiber.c
deleted file mode 100644
index a233bec..0000000
--- a/libretro-common/libco/scefiber.c
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-  libco.win (2016-09-06)
-  authors: frangarcj
-  license: public domain
-*/
-
-#define LIBCO_C
-#include <libco.h>
-#include <stdlib.h>
-#include <psp2/sysmodule.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static thread_local cothread_t co_active_ = 0;
-
-typedef struct SceFiber {
-	char reserved[128];
-} SceFiber __attribute__( ( aligned ( 8 ) ) ) ;
-
-int32_t _sceFiberInitializeImpl(SceFiber* fiber, char* name, void* entry, uint32_t argOnInitialize, void* addrContext, int32_t sizeContext, void* params);
-
-int32_t sceFiberFinalize(SceFiber* fiber);
-
-int32_t sceFiberRun(SceFiber* fiber, uint32_t argOnRunTo, uint32_t* argOnRun);
-
-int32_t sceFiberSwitch(SceFiber* fiber, uint32_t argOnRunTo, uint32_t* argOnRun);
-
-int32_t sceFiberReturnToThread(uint32_t argOnReturn, uint32_t* argOnRun);
-
-void co_thunk(uint32_t argOnInitialize, uint32_t argOnRun)
-{
-   ((void (*)(void))argOnInitialize)();
-}
-
-cothread_t co_active(void)
-{
-   if(!co_active_)
-   {
-		  sceSysmoduleLoadModule(SCE_SYSMODULE_FIBER);
-      co_active_ = (cothread_t)1;
-   }
-   return co_active_;
-}
-
-cothread_t co_create(unsigned int heapsize, void (*coentry)(void))
-{
-   SceFiber* tailFiber = malloc(sizeof(SceFiber));
-	 char * m_contextBuffer = malloc(sizeof(char)*heapsize);
-	 if(!co_active_)
-   {
-      sceSysmoduleLoadModule(SCE_SYSMODULE_FIBER);
-      co_active_ = (cothread_t)1;
-   }
-
-   //_sceFiberInitializeImpl
-   int ret = _sceFiberInitializeImpl(tailFiber, "tailFiber", co_thunk, (uint32_t)coentry, (void*) m_contextBuffer, heapsize, NULL);
-   if(ret==0){
-     return (cothread_t)tailFiber;
-   }else{
-     return (cothread_t)ret;
-   }
-
-}
-
-void co_delete(cothread_t cothread)
-{
-	 if(cothread == (cothread_t)1){
-		 return;
-	 }
-   sceFiberFinalize((SceFiber*)cothread);
-}
-
-void co_switch(cothread_t cothread)
-{
-
-   uint32_t argOnReturn = 0;
-   if(cothread == (cothread_t)1){
-     co_active_ = cothread;
-     sceFiberReturnToThread(0, NULL);
-   }else{
-		 SceFiber* theFiber = (SceFiber*)cothread;
-		 if(co_active_ == (cothread_t)1){
-			 co_active_ = cothread;
-			 sceFiberRun(theFiber, 0, &argOnReturn);
-		 }else{
-			 co_active_ = cothread;
-			 sceFiberSwitch(theFiber, 0, &argOnReturn);
-		 }
-   }
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/libretro-common/libco/sjlj.c b/libretro-common/libco/sjlj.c
deleted file mode 100644
index bb65136..0000000
--- a/libretro-common/libco/sjlj.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-  libco.sjlj (2008-01-28)
-  author: Nach
-  license: public domain
-*/
-
-/*
- * Note this was designed for UNIX systems. Based on ideas expressed in a paper
- * by Ralf Engelschall.
- * For SJLJ on other systems, one would want to rewrite springboard() and
- * co_create() and hack the jmb_buf stack pointer.
- */
-
-#define LIBCO_C
-#include <libco.h>
-#include <stdlib.h>
-#include <signal.h>
-#include <setjmp.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct
-{
-   sigjmp_buf context;
-   void (*coentry)(void);
-   void *stack;
-} cothread_struct;
-
-static thread_local cothread_struct co_primary;
-static thread_local cothread_struct *creating, *co_running = 0;
-
-static void springboard(int ignored)
-{
-   if(sigsetjmp(creating->context, 0))
-      co_running->coentry();
-}
-
-cothread_t co_active(void)
-{
-  if (!co_running)
-     co_running = &co_primary;
-  return (cothread_t)co_running;
-}
-
-cothread_t co_create(unsigned int size, void (*coentry)(void))
-{
-   if(!co_running)
-      co_running = &co_primary;
-
-   cothread_struct *thread = (cothread_struct*)malloc(sizeof(cothread_struct));
-
-   if(thread)
-   {
-      stack_t stack;
-      stack_t old_stack;
-
-      struct sigaction handler     = {{0}};
-      struct sigaction old_handler = {{0}};
-
-      thread->coentry = thread->stack = 0;
-
-      stack.ss_flags = 0;
-      stack.ss_size = size;
-      thread->stack = stack.ss_sp = malloc(size);
-
-      if(stack.ss_sp && !sigaltstack(&stack, &old_stack))
-      {
-         handler.sa_handler = springboard;
-         handler.sa_flags   = SA_ONSTACK;
-         sigemptyset(&handler.sa_mask);
-         creating = thread;
-
-         if(!sigaction(SIGUSR1, &handler, &old_handler))
-         {
-            if(!raise(SIGUSR1))
-               thread->coentry = coentry;
-            sigaltstack(&old_stack, 0);
-            sigaction(SIGUSR1, &old_handler, 0);
-         }
-      }
-
-      if(thread->coentry != coentry)
-      {
-         co_delete(thread);
-         thread = 0;
-      }
-   }
-
-   return (cothread_t)thread;
-}
-
-void co_delete(cothread_t cothread)
-{
-   if (cothread)
-   {
-      if(((cothread_struct*)cothread)->stack)
-         free(((cothread_struct*)cothread)->stack);
-      free(cothread);
-   }
-}
-
-void co_switch(cothread_t cothread)
-{
-   if (!sigsetjmp(co_running->context, 0))
-   {
-      co_running = (cothread_struct*)cothread;
-      siglongjmp(co_running->context, 1);
-   }
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/libretro-common/libco/ucontext.c b/libretro-common/libco/ucontext.c
deleted file mode 100644
index 3e21816..0000000
--- a/libretro-common/libco/ucontext.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-  libco.ucontext (2008-01-28)
-  author: Nach
-  license: public domain
-*/
-
-/*
- * WARNING: the overhead of POSIX ucontext is very high,
- * assembly versions of libco or libco_sjlj should be much faster
- *
- * This library only exists for two reasons:
- * 1 - as an initial test for the viability of a ucontext implementation
- * 2 - to demonstrate the power and speed of libco over existing implementations,
- *     such as pth (which defaults to wrapping ucontext on unix targets)
- *
- * Use this library only as a *last resort*
- */
-
-#define LIBCO_C
-#include <libco.h>
-#include <stdlib.h>
-#include <ucontext.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-static thread_local ucontext_t co_primary;
-static thread_local ucontext_t *co_running = 0;
-
-cothread_t co_active(void)
-{
-   if (!co_running)
-      co_running = &co_primary;
-   return (cothread_t)co_running;
-}
-
-cothread_t co_create(unsigned int heapsize, void (*coentry)(void))
-{
-   if (!co_running)
-      co_running = &co_primary;
-   ucontext_t *thread = (ucontext_t*)malloc(sizeof(ucontext_t));
-
-   if(thread)
-   {
-      if((!getcontext(thread) && !(thread->uc_stack.ss_sp = 0)) && (thread->uc_stack.ss_sp = malloc(heapsize)))
-      {
-         thread->uc_link = co_running;
-         thread->uc_stack.ss_size = heapsize;
-         makecontext(thread, coentry, 0);
-      }
-      else
-      {
-         co_delete((cothread_t)thread);
-         thread = 0;
-      }
-   }
-   return (cothread_t)thread;
-}
-
-void co_delete(cothread_t cothread)
-{
-   if (!cothread)
-      return;
-
-   if(((ucontext_t*)cothread)->uc_stack.ss_sp)
-      free(((ucontext_t*)cothread)->uc_stack.ss_sp);
-   free(cothread);
-}
-
-void co_switch(cothread_t cothread)
-{
-   ucontext_t *old_thread = co_running;
-
-   co_running = (ucontext_t*)cothread;
-   swapcontext(old_thread, co_running);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/libretro-common/libco/x86.c b/libretro-common/libco/x86.c
deleted file mode 100644
index ae16766..0000000
--- a/libretro-common/libco/x86.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-  libco.x86 (2009-10-12)
-  author: byuu
-  license: public domain
-*/
-
-#define LIBCO_C
-#include <libco.h>
-#include <assert.h>
-#include <stdlib.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#if defined(_MSC_VER)
-  #define fastcall __fastcall
-#elif defined(__GNUC__)
-  #define fastcall __attribute__((fastcall))
-#else
-  #error "libco: please define fastcall macro"
-#endif
-
-static thread_local long co_active_buffer[64];
-static thread_local cothread_t co_active_handle = 0;
-static void (fastcall *co_swap)(cothread_t, cothread_t) = 0;
-
-//ABI: fastcall
-static unsigned char co_swap_function[] = {
-  0x89, 0x22,         /* mov [edx],esp      */
-  0x8b, 0x21,         /* mov esp,[ecx]      */
-  0x58,               /* pop eax            */
-  0x89, 0x6a, 0x04,   /* mov [edx+0x04],ebp */
-  0x89, 0x72, 0x08,   /* mov [edx+0x08],esi */
-  0x89, 0x7a, 0x0c,   /* mov [edx+0x0c],edi */
-  0x89, 0x5a, 0x10,   /* mov [edx+0x10],ebx */
-  0x8b, 0x69, 0x04,   /* mov ebp,[ecx+0x04] */
-  0x8b, 0x71, 0x08,   /* mov esi,[ecx+0x08] */
-  0x8b, 0x79, 0x0c,   /* mov edi,[ecx+0x0c] */
-  0x8b, 0x59, 0x10,   /* mov ebx,[ecx+0x10] */
-  0xff, 0xe0,         /* jmp eax            */
-};
-
-#ifdef _WIN32
-#include <windows.h>
-
-void co_init(void)
-{
-   DWORD old_privileges;
-   VirtualProtect(co_swap_function,
-         sizeof co_swap_function, PAGE_EXECUTE_READWRITE, &old_privileges);
-}
-#else
-#include <unistd.h>
-#include <sys/mman.h>
-
-void co_init(void)
-{
-   unsigned long addr = (unsigned long)co_swap_function;
-   unsigned long base = addr - (addr % sysconf(_SC_PAGESIZE));
-   unsigned long size = (addr - base) + sizeof co_swap_function;
-   mprotect((void*)base, size, PROT_READ | PROT_WRITE | PROT_EXEC);
-}
-#endif
-
-static void crash(void)
-{
-   assert(0); /* called only if cothread_t entrypoint returns */
-}
-
-cothread_t co_active(void)
-{
-   if(!co_active_handle)
-      co_active_handle = &co_active_buffer;
-   return co_active_handle;
-}
-
-cothread_t co_create(unsigned int size, void (*entrypoint)(void))
-{
-   cothread_t handle;
-   if(!co_swap)
-   {
-      co_init();
-      co_swap = (void (fastcall*)(cothread_t, cothread_t))co_swap_function;
-   }
-
-   if(!co_active_handle)
-      co_active_handle = &co_active_buffer;
-
-   size += 256; /* allocate additional space for storage */
-   size &= ~15; /* align stack to 16-byte boundary */
-
-   if((handle = (cothread_t)malloc(size)))
-   {
-      long *p = (long*)((char*)handle + size); /* seek to top of stack */
-      *--p = (long)crash;                      /* crash if entrypoint returns */
-      *--p = (long)entrypoint;                 /* start of function */
-      *(long*)handle = (long)p;                /* stack pointer */
-   }
-
-   return handle;
-}
-
-void co_delete(cothread_t handle)
-{
-   free(handle);
-}
-
-void co_switch(cothread_t handle)
-{
-   register cothread_t co_previous_handle = co_active_handle;
-   co_swap(co_active_handle = handle, co_previous_handle);
-}
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/libretro-common/lists/dir_list.c b/libretro-common/lists/dir_list.c
deleted file mode 100644
index 2306eff..0000000
--- a/libretro-common/lists/dir_list.c
+++ /dev/null
@@ -1,278 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (dir_list.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-
-#if defined(_WIN32) && defined(_XBOX)
-#include <xtl.h>
-#elif defined(_WIN32)
-#include <windows.h>
-#endif
-
-#include <lists/dir_list.h>
-#include <lists/string_list.h>
-#include <file/file_path.h>
-
-#include <compat/strl.h>
-#include <retro_dirent.h>
-
-#include <string/stdstring.h>
-#include <retro_miscellaneous.h>
-
-static int qstrcmp_plain(const void *a_, const void *b_)
-{
-   const struct string_list_elem *a = (const struct string_list_elem*)a_;
-   const struct string_list_elem *b = (const struct string_list_elem*)b_;
-
-   return strcasecmp(a->data, b->data);
-}
-
-static int qstrcmp_dir(const void *a_, const void *b_)
-{
-   const struct string_list_elem *a = (const struct string_list_elem*)a_;
-   const struct string_list_elem *b = (const struct string_list_elem*)b_;
-   int a_type = a->attr.i;
-   int b_type = b->attr.i;
-
-
-   /* Sort directories before files. */
-   if (a_type != b_type)
-      return b_type - a_type;
-   return strcasecmp(a->data, b->data);
-}
-
-/**
- * dir_list_sort:
- * @list      : pointer to the directory listing.
- * @dir_first : move the directories in the listing to the top?
- *
- * Sorts a directory listing.
- *
- **/
-void dir_list_sort(struct string_list *list, bool dir_first)
-{
-   if (list)
-      qsort(list->elems, list->size, sizeof(struct string_list_elem),
-            dir_first ? qstrcmp_dir : qstrcmp_plain);
-}
-
-/**
- * dir_list_free:
- * @list : pointer to the directory listing
- *
- * Frees a directory listing.
- *
- **/
-void dir_list_free(struct string_list *list)
-{
-   string_list_free(list);
-}
-
-/**
- * parse_dir_entry:
- * @name               : name of the directory listing entry.
- * @file_path          : file path of the directory listing entry.
- * @is_dir             : is the directory listing a directory?
- * @include_dirs       : include directories as part of the finished directory listing?
- * @include_compressed : Include compressed files, even if not part of ext_list.
- * @list               : pointer to directory listing.
- * @ext_list           : pointer to allowed file extensions listing.
- * @file_ext           : file extension of the directory listing entry.
- *
- * Parses a directory listing.
- *
- * Returns: zero on success, -1 on error, 1 if we should
- * continue to the next entry in the directory listing.
- **/
-static int parse_dir_entry(const char *name, char *file_path,
-      bool is_dir, bool include_dirs, bool include_compressed,
-      struct string_list *list, struct string_list *ext_list,
-      const char *file_ext)
-{
-   union string_list_elem_attr attr;
-   bool is_compressed_file = false;
-   bool supported_by_core  = false;
-
-   attr.i                  = RARCH_FILETYPE_UNSET;
-
-   if (!is_dir)
-   {
-      is_compressed_file = path_is_compressed_file(file_path);
-      if (string_list_find_elem_prefix(ext_list, ".", file_ext))
-         supported_by_core = true;
-   }
-
-   if (!include_dirs && is_dir)
-      return 1;
-
-   if (string_is_equal(name, ".") || string_is_equal(name, ".."))
-      return 1;
-
-   if (!is_dir && ext_list &&
-           ((!is_compressed_file && !supported_by_core) ||
-            (!supported_by_core && !include_compressed)))
-      return 1;
-
-   if (is_dir)
-      attr.i = RARCH_DIRECTORY;
-   if (is_compressed_file)
-      attr.i = RARCH_COMPRESSED_ARCHIVE;
-   /* The order of these ifs is important.
-    * If the file format is explicitly supported by the libretro-core, we
-    * need to immediately load it and not designate it as a compressed file.
-    *
-    * Example: .zip could be supported as a image by the core and as a
-    * compressed_file. In that case, we have to interpret it as a image.
-    *
-    * */
-   if (supported_by_core)
-      attr.i = RARCH_PLAIN_FILE;
-
-   if (!string_list_append(list, file_path, attr))
-      return -1;
-
-   return 0;
-}
-
-/**
- * dir_list_read:
- * @dir                : directory path.
- * @list               : the string list to add files to
- * @ext_list           : the string list of extensions to include
- * @include_dirs       : include directories as part of the finished directory listing?
- * @include_hidden     : include hidden files and directories as part of the finished directory listing?
- * @include_compressed : Only include files which match ext. Do not try to match compressed files, etc.
- * @recursive          : list directory contents recursively
- *
- * Add files within a directory to an existing string list
- *
- * Returns: -1 on error, 0 on success.
- **/
-static int dir_list_read(const char *dir,
-      struct string_list *list, struct string_list *ext_list,
-      bool include_dirs, bool include_hidden,
-      bool include_compressed, bool recursive)
-{
-   struct RDIR *entry = retro_opendir(dir);
-
-   if (!entry)
-      return -1;
-
-   if (retro_dirent_error(entry))
-   {
-      retro_closedir(entry);
-      return -1;
-   }
-
-#ifdef _WIN32
-   if (include_hidden)
-      entry->entry.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN;
-   else
-      entry->entry.dwFileAttributes &= ~FILE_ATTRIBUTE_HIDDEN;
-#endif
-
-   while (retro_readdir(entry))
-   {
-      char file_path[PATH_MAX_LENGTH];
-      bool is_dir                     = false;
-      int ret                         = 0;
-      const char *name                = retro_dirent_get_name(entry);
-      const char *file_ext            = path_get_extension(name);
-
-      file_path[0] = '\0';
-
-      fill_pathname_join(file_path, dir, name, sizeof(file_path));
-      is_dir = retro_dirent_is_dir(entry, file_path);
-
-      if (!include_hidden)
-      {
-         if (*name == '.')
-            continue;
-      }
-
-      if(is_dir && recursive)
-      {
-         if(strstr(name, ".") || strstr(name, ".."))
-            continue;
-
-         dir_list_read(file_path, list, ext_list, include_dirs,
-               include_hidden, include_compressed, recursive);
-      }
-
-      ret    = parse_dir_entry(name, file_path, is_dir,
-            include_dirs, include_compressed, list, ext_list, file_ext);
-
-      if (ret == -1)
-      {
-         retro_closedir(entry);
-         return -1;
-      }
-
-      if (ret == 1)
-         continue;
-   }
-
-   retro_closedir(entry);
-
-   return 0;
-}
-
-/**
- * dir_list_new:
- * @dir                : directory path.
- * @ext                : allowed extensions of file directory entries to include.
- * @include_dirs       : include directories as part of the finished directory listing?
- * @include_hidden     : include hidden files and directories as part of the finished directory listing?
- * @include_compressed : Only include files which match ext. Do not try to match compressed files, etc.
- * @recursive          : list directory contents recursively
- *
- * Create a directory listing.
- *
- * Returns: pointer to a directory listing of type 'struct string_list *' on success,
- * NULL in case of error. Has to be freed manually.
- **/
-struct string_list *dir_list_new(const char *dir,
-      const char *ext, bool include_dirs,
-      bool include_hidden, bool include_compressed,
-      bool recursive)
-{
-   struct string_list *ext_list   = NULL;
-   struct string_list *list       = NULL;
-
-   if (!(list = string_list_new()))
-      return NULL;
-
-   if (ext)
-      ext_list = string_split(ext, "|");
-
-   if(dir_list_read(dir, list, ext_list, include_dirs,
-            include_hidden, include_compressed, recursive) == -1)
-   {
-      string_list_free(list);
-      string_list_free(ext_list);
-      return NULL;
-   }
-
-   string_list_free(ext_list);
-   return list;
-}
-
diff --git a/libretro-common/lists/file_list.c b/libretro-common/lists/file_list.c
deleted file mode 100644
index 1cacd96..0000000
--- a/libretro-common/lists/file_list.c
+++ /dev/null
@@ -1,487 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (file_list.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_assert.h>
-#include <retro_common.h>
-#include <lists/file_list.h>
-#include <string/stdstring.h>
-#include <compat/strcasestr.h>
-
-/**
- * file_list_capacity:
- * @list             : pointer to file list
- * @cap              : new capacity for file list.
- *
- * Change maximum capacity of file list's size.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-static struct item_file *realloc_file_list_capacity(file_list_t *list, size_t cap)
-{
-   struct item_file *new_data = NULL;
-   retro_assert(cap > list->size);
-
-   new_data = (struct item_file*)realloc(list->list,
-         cap * sizeof(struct item_file));
-
-   if (!new_data)
-      return NULL;
-
-   if (cap > list->capacity)
-      memset(&new_data[list->capacity], 0,
-            sizeof(*new_data) * (cap - list->capacity));
-
-   return new_data;
-}
-
-static void file_list_add(file_list_t *list, unsigned idx,
-      const char *path, const char *label,
-      unsigned type, size_t directory_ptr,
-      size_t entry_idx)
-{
-   list->list[idx].path          = NULL;
-   list->list[idx].label         = NULL;
-   list->list[idx].alt           = NULL;
-   list->list[idx].type          = type;
-   list->list[idx].directory_ptr = directory_ptr;
-   list->list[idx].entry_idx     = entry_idx;
-   list->list[idx].userdata      = NULL;
-   list->list[idx].actiondata    = NULL;
-
-   if (label)
-      list->list[idx].label      = strdup(label);
-   if (path)
-      list->list[idx].path       = strdup(path);
-
-   list->size++;
-}
-
-static bool file_list_expand_if_needed(file_list_t *list)
-{
-   if (list->size >= list->capacity)
-   {
-      size_t new_capacity     = list->capacity * 2 + 1;
-      struct item_file *items = realloc_file_list_capacity(
-            list, new_capacity);
-
-      if (!items)
-         return false;
-      list->list     = items;
-      list->capacity = new_capacity;
-   }
-   return true;
-}
-
-bool file_list_prepend(file_list_t *list,
-      const char *path, const char *label,
-      unsigned type, size_t directory_ptr,
-      size_t entry_idx)
-{
-   unsigned i;
-   
-   if (!file_list_expand_if_needed(list))
-      return false;
-
-   for (i = (unsigned)list->size; i > 0; i--)
-   {
-      struct item_file *copy = (struct item_file*)
-         calloc(1, sizeof(struct item_file));
-      
-      memcpy(copy, &list->list[i-1], sizeof(struct item_file));
-
-      memcpy(&list->list[i-1], &list->list[i], sizeof(struct item_file));
-      memcpy(&list->list[i],             copy, sizeof(struct item_file));
-
-      free(copy);
-   }
-
-   file_list_add(list, 0, path, label, type,
-         directory_ptr, entry_idx);
-
-   return true;
-}
-
-bool file_list_append(file_list_t *list,
-      const char *path, const char *label,
-      unsigned type, size_t directory_ptr,
-      size_t entry_idx)
-{
-   if (!file_list_expand_if_needed(list))
-      return false;
-
-   file_list_add(list, (unsigned)list->size, path, label, type,
-         directory_ptr, entry_idx);
-
-   return true;
-}
-
-size_t file_list_get_size(const file_list_t *list)
-{
-   if (!list)
-      return 0;
-   return list->size;
-}
-
-size_t file_list_get_directory_ptr(const file_list_t *list)
-{
-   size_t size = file_list_get_size(list);
-   return list->list[size].directory_ptr;
-}
-
-
-void file_list_pop(file_list_t *list, size_t *directory_ptr)
-{
-   if (!list)
-      return;
-
-   if (list->size != 0)
-   {
-      --list->size;
-      if (list->list[list->size].path)
-         free(list->list[list->size].path);
-      list->list[list->size].path = NULL;
-
-      if (list->list[list->size].label)
-         free(list->list[list->size].label);
-      list->list[list->size].label = NULL;
-   }
-
-   if (directory_ptr)
-      *directory_ptr = list->list[list->size].directory_ptr;
-}
-
-void file_list_free(file_list_t *list)
-{
-   size_t i;
-
-   if (!list)
-      return;
-
-   for (i = 0; i < list->size; i++)
-   {
-      file_list_free_userdata(list, i);
-      file_list_free_actiondata(list, i);
-       
-      if (list->list[i].path)
-         free(list->list[i].path);
-      list->list[i].path = NULL;
-
-      if (list->list[i].label)
-         free(list->list[i].label);
-      list->list[i].label = NULL;
-
-      if (list->list[i].alt)
-         free(list->list[i].alt);
-      list->list[i].alt = NULL;
-   }
-   if (list->list)
-      free(list->list);
-   list->list = NULL;
-   free(list);
-}
-
-void file_list_clear(file_list_t *list)
-{
-   size_t i;
-
-   if (!list)
-      return;
-
-   for (i = 0; i < list->size; i++)
-   {
-      if (list->list[i].path)
-         free(list->list[i].path);
-      list->list[i].path = NULL;
-
-      if (list->list[i].label)
-         free(list->list[i].label);
-      list->list[i].label = NULL;
-
-      if (list->list[i].alt)
-         free(list->list[i].alt);
-      list->list[i].alt = NULL;
-   }
-
-   list->size = 0;
-}
-
-void file_list_copy(const file_list_t *src, file_list_t *dst)
-{
-   struct item_file *item = NULL;
-
-   if (!src || !dst)
-      return;
-
-   if (dst->list)
-   {
-      for (item = dst->list; item < &dst->list[dst->size]; ++item)
-      {
-         if (!item)
-            continue;
-
-         if (item->path)
-            free(item->path);
-         item->path = NULL;
-
-         if (item->label)
-            free(item->label);
-         item->label = NULL;
-
-         if (item->alt)
-            free(item->alt);
-         item->alt = NULL;
-      }
-
-      free(dst->list);
-      dst->list = NULL;
-   }
-
-   dst->size     = 0;
-   dst->capacity = 0;
-   dst->list     = (struct item_file*)malloc(src->size * sizeof(struct item_file));
-
-   if (!dst->list)
-      return;
-
-   dst->size     = dst->capacity = src->size;
-
-   memcpy(dst->list, src->list, dst->size * sizeof(struct item_file));
-
-   for (item = dst->list; item < &dst->list[dst->size]; ++item)
-   {
-      if (item->path)
-         item->path  = strdup(item->path);
-
-      if (item->label)
-         item->label = strdup(item->label);
-
-      if (item->alt)
-         item->alt   = strdup(item->alt);
-   }
-}
-
-void file_list_set_label_at_offset(file_list_t *list, size_t idx,
-      const char *label)
-{
-   if (!list)
-      return;
-
-   if (list->list[idx].label)
-      free(list->list[idx].label);
-   list->list[idx].alt      = NULL;
-
-   if (label)
-      list->list[idx].label = strdup(label);
-}
-
-void file_list_get_label_at_offset(const file_list_t *list, size_t idx,
-      const char **label)
-{
-   if (!label || !list)
-      return;
-
-   *label = list->list[idx].path;
-   if (list->list[idx].label)
-      *label = list->list[idx].label;
-}
-
-void file_list_set_alt_at_offset(file_list_t *list, size_t idx,
-      const char *alt)
-{
-   if (!list || !alt)
-      return;
-
-   if (list->list[idx].alt)
-      free(list->list[idx].alt);
-   list->list[idx].alt      = NULL;
-
-   if (alt)
-      list->list[idx].alt   = strdup(alt);
-}
-
-void file_list_get_alt_at_offset(const file_list_t *list, size_t idx,
-      const char **alt)
-{
-   if (!list)
-      return;
-
-   if (alt)
-      *alt = list->list[idx].alt ?
-         list->list[idx].alt : list->list[idx].path;
-}
-
-static int file_list_alt_cmp(const void *a_, const void *b_)
-{
-   const struct item_file *a = (const struct item_file*)a_;
-   const struct item_file *b = (const struct item_file*)b_;
-   const char *cmp_a = a->alt ? a->alt : a->path;
-   const char *cmp_b = b->alt ? b->alt : b->path;
-   return strcasecmp(cmp_a, cmp_b);
-}
-
-static int file_list_type_cmp(const void *a_, const void *b_)
-{
-   const struct item_file *a = (const struct item_file*)a_;
-   const struct item_file *b = (const struct item_file*)b_;
-   if (a->type < b->type)
-      return -1;
-   if (a->type == b->type)
-      return 0;
-
-   return 1;
-}
-
-void file_list_sort_on_alt(file_list_t *list)
-{
-   qsort(list->list, list->size, sizeof(list->list[0]), file_list_alt_cmp);
-}
-
-void file_list_sort_on_type(file_list_t *list)
-{
-   qsort(list->list, list->size, sizeof(list->list[0]), file_list_type_cmp);
-}
-
-void *file_list_get_userdata_at_offset(const file_list_t *list, size_t idx)
-{
-   if (!list)
-      return NULL;
-   return list->list[idx].userdata;
-}
-
-void file_list_set_userdata(const file_list_t *list, size_t idx, void *ptr)
-{
-   if (!list || !ptr)
-      return;
-   list->list[idx].userdata = ptr;
-}
-
-void file_list_set_actiondata(const file_list_t *list, size_t idx, void *ptr)
-{
-   if (!list || !ptr)
-      return;
-   list->list[idx].actiondata = ptr;
-}
-
-void *file_list_get_actiondata_at_offset(const file_list_t *list, size_t idx)
-{
-   if (!list)
-      return NULL;
-   return list->list[idx].actiondata;
-}
-
-void file_list_free_actiondata(const file_list_t *list, size_t idx)
-{
-   if (!list)
-      return;
-   if (list->list[idx].actiondata)
-       free(list->list[idx].actiondata);
-   list->list[idx].actiondata = NULL;
-}
-
-void file_list_free_userdata(const file_list_t *list, size_t idx)
-{
-   if (!list)
-      return;
-   if (list->list[idx].userdata)
-       free(list->list[idx].userdata);
-   list->list[idx].userdata = NULL;
-}
-
-void *file_list_get_last_actiondata(const file_list_t *list)
-{
-   if (!list)
-      return NULL;
-   return list->list[list->size - 1].actiondata;
-}
-
-void file_list_get_at_offset(const file_list_t *list, size_t idx,
-      const char **path, const char **label, unsigned *file_type,
-      size_t *entry_idx)
-{
-   if (!list)
-      return;
-
-   if (path)
-      *path      = list->list[idx].path;
-   if (label)
-      *label     = list->list[idx].label;
-   if (file_type)
-      *file_type = list->list[idx].type;
-   if (entry_idx)
-      *entry_idx = list->list[idx].entry_idx;
-}
-
-void file_list_get_last(const file_list_t *list,
-      const char **path, const char **label,
-      unsigned *file_type, size_t *entry_idx)
-{
-   if (!list)
-      return;
-
-   if (list->size)
-      file_list_get_at_offset(list, list->size - 1, path, label, file_type, entry_idx);
-}
-
-bool file_list_search(const file_list_t *list, const char *needle, size_t *idx)
-{
-   size_t i;
-   const char *alt = NULL;
-   bool ret        = false;
-
-   if (!list)
-      return false;
-
-   for (i = 0; i < list->size; i++)
-   {
-      const char *str = NULL;
-
-      file_list_get_alt_at_offset(list, i, &alt);
-      if (!alt)
-      {
-         file_list_get_label_at_offset(list, i, &alt);
-         if (!alt)
-            continue;
-      }
-
-      str = (const char *)strcasestr(alt, needle);
-      if (str == alt)
-      {
-         /* Found match with first chars, best possible match. */
-         *idx = i;
-         ret = true;
-         break;
-      }
-      else if (str && !ret)
-      {
-         /* Found mid-string match, but try to find a match with 
-          * first characters before we settle. */
-         *idx = i;
-         ret = true;
-      }
-   }
-
-   return ret;
-}
diff --git a/libretro-common/lists/string_list.c b/libretro-common/lists/string_list.c
deleted file mode 100644
index 0a285bc..0000000
--- a/libretro-common/lists/string_list.c
+++ /dev/null
@@ -1,312 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (string_list.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-
-#include <lists/string_list.h>
-#include <retro_assert.h>
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-#include <string/stdstring.h>
-
-/**
- * string_list_free
- * @list             : pointer to string list object
- *
- * Frees a string list.
- */
-void string_list_free(struct string_list *list)
-{
-   size_t i;
-   if (!list)
-      return;
-
-   for (i = 0; i < list->size; i++)
-      free(list->elems[i].data);
-   free(list->elems);
-   free(list);
-}
-
-/**
- * string_list_capacity:
- * @list             : pointer to string list
- * @cap              : new capacity for string list.
- *
- * Change maximum capacity of string list's size.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-static bool string_list_capacity(struct string_list *list, size_t cap)
-{
-   struct string_list_elem *new_data = NULL;
-   retro_assert(cap > list->size);
-
-   new_data = (struct string_list_elem*)
-      realloc(list->elems, cap * sizeof(*new_data));
-
-   if (!new_data)
-      return false;
-
-   if (cap > list->cap)
-      memset(&new_data[list->cap], 0, sizeof(*new_data) * (cap - list->cap));
-
-   list->elems = new_data;
-   list->cap   = cap;
-   return true;
-}
-
-/**
- * string_list_new:
- *
- * Creates a new string list. Has to be freed manually.
- *
- * Returns: new string list if successful, otherwise NULL.
- */
-struct string_list *string_list_new(void)
-{
-   struct string_list *list = (struct string_list*)
-      calloc(1, sizeof(*list));
-
-   if (!list)
-      return NULL;
-
-   if (!string_list_capacity(list, 32))
-   {
-      string_list_free(list);
-      return NULL;
-   }
-
-   return list;
-}
-
-/**
- * string_list_append:
- * @list             : pointer to string list
- * @elem             : element to add to the string list
- * @attr             : attributes of new element.
- *
- * Appends a new element to the string list.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool string_list_append(struct string_list *list, const char *elem,
-      union string_list_elem_attr attr)
-{
-   char *data_dup = NULL;
-
-   if (list->size >= list->cap &&
-         !string_list_capacity(list, list->cap * 2))
-      return false;
-
-   data_dup = strdup(elem);
-   if (!data_dup)
-      return false;
-
-   list->elems[list->size].data = data_dup;
-   list->elems[list->size].attr = attr;
-
-   list->size++;
-   return true;
-}
-
-/**
- * string_list_append_n:
- * @list             : pointer to string list
- * @elem             : element to add to the string list
- * @length           : read at most this many bytes from elem
- * @attr             : attributes of new element.
- *
- * Appends a new element to the string list.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool string_list_append_n(struct string_list *list, const char *elem,
-      unsigned length, union string_list_elem_attr attr)
-{
-   char *data_dup = NULL;
-
-   if (list->size >= list->cap &&
-         !string_list_capacity(list, list->cap * 2))
-      return false;
-
-   data_dup = (char*)malloc(length + 1);
-
-   if (!data_dup)
-      return false;
-
-   strlcpy(data_dup, elem, length + 1);
-
-   list->elems[list->size].data = data_dup;
-   list->elems[list->size].attr = attr;
-
-   list->size++;
-   return true;
-}
-
-/**
- * string_list_set:
- * @list             : pointer to string list
- * @idx              : index of element in string list
- * @str              : value for the element.
- *
- * Set value of element inside string list.
- **/
-void string_list_set(struct string_list *list,
-      unsigned idx, const char *str)
-{
-   free(list->elems[idx].data);
-   list->elems[idx].data = strdup(str);
-}
-
-/**
- * string_list_join_concat:
- * @buffer           : buffer that @list will be joined to.
- * @size             : length of @buffer.
- * @list             : pointer to string list.
- * @delim            : delimiter character for @list.
- *
- * A string list will be joined/concatenated as a
- * string to @buffer, delimited by @delim.
- */
-void string_list_join_concat(char *buffer, size_t size,
-      const struct string_list *list, const char *delim)
-{
-   size_t i, len = strlen(buffer);
-
-   retro_assert(len < size);
-   buffer += len;
-   size   -= len;
-
-   for (i = 0; i < list->size; i++)
-   {
-      strlcat(buffer, list->elems[i].data, size);
-      if ((i + 1) < list->size)
-         strlcat(buffer, delim, size);
-   }
-}
-
-/**
- * string_split:
- * @str              : string to turn into a string list
- * @delim            : delimiter character to use for splitting the string.
- *
- * Creates a new string list based on string @str, delimited by @delim.
- *
- * Returns: new string list if successful, otherwise NULL.
- */
-struct string_list *string_split(const char *str, const char *delim)
-{
-   char *save      = NULL;
-   char *copy      = NULL;
-   const char *tmp = NULL;
-   struct string_list *list = string_list_new();
-
-   if (!list)
-      goto error;
-
-   copy = strdup(str);
-   if (!copy)
-      goto error;
-
-   tmp = strtok_r(copy, delim, &save);
-   while (tmp)
-   {
-      union string_list_elem_attr attr;
-
-      attr.i = 0;
-
-      if (!string_list_append(list, tmp, attr))
-         goto error;
-
-      tmp = strtok_r(NULL, delim, &save);
-   }
-
-   free(copy);
-   return list;
-
-error:
-   string_list_free(list);
-   free(copy);
-   return NULL;
-}
-
-/**
- * string_list_find_elem:
- * @list             : pointer to string list
- * @elem             : element to find inside the string list.
- *
- * Searches for an element (@elem) inside the string list.
- *
- * Returns: true (1) if element could be found, otherwise false (0).
- */
-int string_list_find_elem(const struct string_list *list, const char *elem)
-{
-   size_t i;
-
-   if (!list)
-      return false;
-
-   for (i = 0; i < list->size; i++)
-   {
-      if (string_is_equal_noncase(list->elems[i].data, elem))
-         return (int)(i + 1);
-   }
-
-   return false;
-}
-
-/**
- * string_list_find_elem_prefix:
- * @list             : pointer to string list
- * @prefix           : prefix to append to @elem
- * @elem             : element to find inside the string list.
- *
- * Searches for an element (@elem) inside the string list. Will
- * also search for the same element prefixed by @prefix.
- *
- * Returns: true (1) if element could be found, otherwise false (0).
- */
-bool string_list_find_elem_prefix(const struct string_list *list,
-      const char *prefix, const char *elem)
-{
-   size_t i;
-   char prefixed[255];
-
-   if (!list)
-      return false;
-
-   prefixed[0] = '\0';
-
-   strlcpy(prefixed, prefix, sizeof(prefixed));
-   strlcat(prefixed, elem,   sizeof(prefixed));
-
-   for (i = 0; i < list->size; i++)
-   {
-      if (string_is_equal_noncase(list->elems[i].data, elem) ||
-            string_is_equal_noncase(list->elems[i].data, prefixed))
-         return true;
-   }
-
-   return false;
-}
diff --git a/libretro-common/net/net_compat.c b/libretro-common/net/net_compat.c
deleted file mode 100644
index be59de6..0000000
--- a/libretro-common/net/net_compat.c
+++ /dev/null
@@ -1,450 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_compat.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-#include <net/net_compat.h>
-#include <net/net_socket.h>
-#include <compat/strl.h>
-
-#if defined(_XBOX)
-/* TODO - implement h_length and h_addrtype */
-struct hostent
-{
-   int h_addrtype;     /* host address type   */
-   int h_length;       /* length of addresses */
-   char **h_addr_list; /* list of addresses   */
-};
-
-struct hostent *gethostbyname(const char *name)
-{
-   WSAEVENT event;
-   static struct hostent he;
-   static struct in_addr addr;
-   static char *addr_ptr      = NULL;
-   XNDNS *dns                 = NULL;
-
-   he.h_addr_list             = &addr_ptr;
-   addr_ptr                   = (char*)&addr;
-
-   if (!name)
-      return NULL;
-
-   event = WSACreateEvent();
-   XNetDnsLookup(name, event, &dns);
-   if (!dns)
-      goto error;
-
-   WaitForSingleObject((HANDLE)event, INFINITE);
-   if (dns->iStatus)
-      goto error;
-
-   memcpy(&addr, dns->aina, sizeof(addr));
-
-   WSACloseEvent(event);
-   XNetDnsRelease(dns);
-
-   return &he;
-
-error:
-   if (event)
-      WSACloseEvent(event);
-   return NULL;
-}
-#elif defined(VITA)
-static void *_net_compat_net_memory = NULL;
-#define COMPAT_NET_INIT_SIZE 512*1024
-#define INET_ADDRSTRLEN sizeof(struct sockaddr_in)
-#define MAX_NAME 512
-
-typedef uint32_t in_addr_t;
-
-struct in_addr
-{
-   in_addr_t s_addr;
-};
-
-char *inet_ntoa(struct SceNetInAddr in)
-{
-	static char ip_addr[INET_ADDRSTRLEN + 1];
-
-   if (inet_ntop_compat(AF_INET, &in, ip_addr, INET_ADDRSTRLEN) == NULL)
-		strlcpy(ip_addr, "Invalid", sizeof(ip_addr));
-
-	return ip_addr;
-}
-
-struct SceNetInAddr inet_aton(const char *ip_addr)
-{
-   SceNetInAddr inaddr;
-
-   inet_ptrton(AF_INET, ip_addr, &inaddr);
-   return inaddr;
-}
-
-unsigned int inet_addr(const char *cp)
-{
-   return inet_aton(cp).s_addr;
-}
-
-struct hostent *gethostbyname(const char *name)
-{
-   int err;
-   static struct hostent ent;
-   static char sname[MAX_NAME]      = {0};
-   static struct SceNetInAddr saddr = {0};
-   static char *addrlist[2]         = {(char *) &saddr, NULL };
-   int rid = sceNetResolverCreate("resolver", NULL, 0);
-
-   if(rid < 0)
-      return NULL;
-
-   err = sceNetResolverStartNtoa(rid, name, &saddr, 0,0,0);
-   sceNetResolverDestroy(rid);
-   if(err < 0)
-      return NULL;
-
-   addrlist[0]     = inet_ntoa(saddr);
-   ent.h_name      = sname;
-   ent.h_aliases   = 0;
-   ent.h_addrtype  = AF_INET;
-   ent.h_length    = sizeof(struct in_addr);
-   ent.h_addr_list = addrlist;
-   ent.h_addr      = addrlist[0];
-
-   return &ent;
-}
-
-int retro_epoll_fd;
-#elif defined(_WIN32)
-int inet_aton(const char *cp, struct in_addr *inp)
-{
-	uint32_t addr = 0;
-	if (cp == 0 || inp == 0)
-		return -1;
-
-	addr = inet_addr(cp);
-	if (addr == INADDR_NONE || addr == INADDR_ANY)
-		return -1;
-
-	inp->s_addr = addr;
-   return 1;
-}
-#endif
-
-int getaddrinfo_retro(const char *node, const char *service,
-      struct addrinfo *hints, struct addrinfo **res)
-{
-   struct sockaddr_in *in_addr = NULL;
-   struct addrinfo *info       = NULL;
-
-   (void)in_addr;
-   (void)info;
-
-   if (!hints->ai_family)
-   {
-#if defined(_WIN32) || defined(HAVE_SOCKET_LEGACY) || defined(WIIU)
-      hints->ai_family    = AF_INET;
-#else
-      hints->ai_family    = AF_UNSPEC;
-#endif
-   }
-
-#ifdef HAVE_SOCKET_LEGACY
-   info = (struct addrinfo*)calloc(1, sizeof(*info));
-   if (!info)
-      goto error;
-
-   info->ai_family     = AF_INET;
-   info->ai_socktype   = hints->ai_socktype;
-   in_addr             = (struct sockaddr_in*)
-      calloc(1, sizeof(*in_addr));
-
-   if (!in_addr)
-      goto error;
-
-   info->ai_addrlen    = sizeof(*in_addr);
-   in_addr->sin_family = AF_INET;
-   in_addr->sin_port   = inet_htons(strtoul(service, NULL, 0));
-
-   if (!node && (hints->ai_flags & AI_PASSIVE))
-      in_addr->sin_addr.s_addr = INADDR_ANY;
-   else if (node && isdigit(*node))
-      in_addr->sin_addr.s_addr = inet_addr(node);
-   else if (node && !isdigit(*node))
-   {
-      struct hostent *host = (struct hostent*)gethostbyname(node);
-
-      if (!host || !host->h_addr_list[0])
-         goto error;
-
-      in_addr->sin_addr.s_addr = inet_addr(host->h_addr_list[0]);
-   }
-   else
-      goto error;
-
-   info->ai_addr = (struct sockaddr*)in_addr;
-   *res          = info;
-
-   return 0;
-
-error:
-   if (in_addr)
-      free(in_addr);
-   if (info)
-      free(info);
-   return -1;
-#else
-   return getaddrinfo(node, service, hints, res);
-#endif
-}
-
-void freeaddrinfo_retro(struct addrinfo *res)
-{
-#ifdef HAVE_SOCKET_LEGACY
-   free(res->ai_addr);
-   free(res);
-#else
-   freeaddrinfo(res);
-#endif
-}
-
-/**
- * network_init:
- *
- * Platform specific socket library initialization.
- *
- * Returns: true (1) if successful, otherwise false (0).
- **/
-bool network_init(void)
-{
-#ifdef _WIN32
-   WSADATA wsaData;
-#endif
-   static bool inited = false;
-   if (inited)
-      return true;
-
-#if defined(_WIN32)
-   if (WSAStartup(MAKEWORD(2, 2), &wsaData) != 0)
-   {
-      network_deinit();
-      return false;
-   }
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   int timeout_count = 10;
-
-   cellSysmoduleLoadModule(CELL_SYSMODULE_NET);
-   sys_net_initialize_network();
-
-   if (cellNetCtlInit() < 0)
-      return false;
-
-   for (;;)
-   {
-      int state;
-      if (cellNetCtlGetState(&state) < 0)
-         return false;
-
-      if (state == CELL_NET_CTL_STATE_IPObtained)
-         break;
-
-      retro_sleep(500);
-      timeout_count--;
-      if (timeout_count < 0)
-         return 0;
-   }
-#elif defined(VITA)
-   SceNetInitParam initparam;
-
-   if (sceNetShowNetstat() == SCE_NET_ERROR_ENOTINIT)
-   {
-      _net_compat_net_memory = malloc(COMPAT_NET_INIT_SIZE);
-
-      initparam.memory       = _net_compat_net_memory;
-      initparam.size         = COMPAT_NET_INIT_SIZE;
-      initparam.flags        = 0;
-
-      sceNetInit(&initparam);
-
-      sceNetCtlInit();
-   }
-   
-   retro_epoll_fd = sceNetEpollCreate("epoll", 0);
-#elif defined(GEKKO)
-   char t[16];
-   if (if_config(t, NULL, NULL, TRUE, 10) < 0)
-      return false;
-#elif defined(WIIU)
-   socket_lib_init();
-#else
-   signal(SIGPIPE, SIG_IGN); /* Do not like SIGPIPE killing our app. */
-#endif
-
-   inited = true;
-   return true;
-}
-
-/**
- * network_deinit:
- *
- * Deinitialize platform specific socket libraries.
- **/
-void network_deinit(void)
-{
-#if defined(_WIN32)
-   WSACleanup();
-#elif defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)
-   cellNetCtlTerm();
-   sys_net_finalize_network();
-   cellSysmoduleUnloadModule(CELL_SYSMODULE_NET);
-#elif defined(VITA)
-   sceNetCtlTerm();
-   sceNetTerm();
-
-   if (_net_compat_net_memory)
-   {
-      free(_net_compat_net_memory);
-      _net_compat_net_memory = NULL;
-   }
-#elif defined(GEKKO) && !defined(HW_DOL)
-   net_deinit();
-#endif
-}
-
-uint16_t inet_htons(uint16_t hostshort)
-{
-#if defined(VITA) || defined(__ORBIS__)
-   return sceNetHtons(hostshort);
-#else
-   return htons(hostshort);
-#endif
-}
-
-int inet_ptrton(int af, const char *src, void *dst)
-{
-#if defined(VITA) || defined(__ORBIS__)
-   return sceNetInetPton(af, src, dst);	
-#elif defined(GEKKO) || defined(_WIN32)
-   /* TODO/FIXME - should use InetPton on Vista and later */
-   return inet_aton(src, (struct in_addr*)dst);
-#else
-   return inet_pton(af, src, dst);
-#endif
-}
-
-struct in_addr6_compat
-{
-   unsigned char ip_addr[16];
-};
-
-const char *inet_ntop_compat(int af, const void *src, char *dst, socklen_t cnt)
-{
-#if defined(VITA) || defined(__ORBIS__)
-   return sceNetInetNtop(af,src,dst,cnt);
-#elif defined(WIIU)
-   return inet_ntop(af, src, dst, cnt);
-#elif defined(_WIN32)
-   if (af == AF_INET)
-   {
-      struct sockaddr_in in;
-      memset(&in, 0, sizeof(in));
-      in.sin_family = AF_INET;
-      memcpy(&in.sin_addr, src, sizeof(struct in_addr));
-      getnameinfo((struct sockaddr *)&in, sizeof(struct
-               sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
-      return dst;
-   }
-#if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY)
-   else if (af == AF_INET6)
-   {
-      struct sockaddr_in6 in;
-      memset(&in, 0, sizeof(in));
-      in.sin6_family = AF_INET6;
-      memcpy(&in.sin6_addr, src, sizeof(struct in_addr6_compat));
-      getnameinfo((struct sockaddr *)&in, sizeof(struct
-               sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
-      return dst;
-   }
-#endif
-#endif
-
-   return NULL;
-}
-
-bool udp_send_packet(const char *host,
-      uint16_t port, const char *msg)
-{
-   char port_buf[16]           = {0};
-   struct addrinfo hints       = {0};
-   struct addrinfo *res        = NULL;
-   const struct addrinfo *tmp  = NULL;
-   int fd                      = -1;
-   bool ret                    = true;
-
-   hints.ai_socktype           = SOCK_DGRAM;
-
-   snprintf(port_buf, sizeof(port_buf), "%hu", (unsigned short)port);
-
-   if (getaddrinfo_retro(host, port_buf, &hints, &res) != 0)
-      return false;
-
-   /* Send to all possible targets.
-    * "localhost" might resolve to several different IPs. */
-   tmp = (const struct addrinfo*)res;
-   while (tmp)
-   {
-      ssize_t len, ret_len;
-
-      fd = socket(tmp->ai_family, tmp->ai_socktype, tmp->ai_protocol);
-      if (fd < 0)
-      {
-         ret = false;
-         goto end;
-      }
-
-      len     = strlen(msg);
-      ret_len = sendto(fd, msg, len, 0, tmp->ai_addr, tmp->ai_addrlen);
-
-      if (ret_len < len)
-      {
-         ret = false;
-         goto end;
-      }
-
-      socket_close(fd);
-      fd = -1;
-      tmp = tmp->ai_next;
-   }
-
-end:
-   freeaddrinfo_retro(res);
-   if (fd >= 0)
-      socket_close(fd);
-   return ret;
-}
diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c
deleted file mode 100644
index a4ec2c4..0000000
--- a/libretro-common/net/net_http.c
+++ /dev/null
@@ -1,656 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_http.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <ctype.h>
-
-#include <net/net_http.h>
-#include <net/net_compat.h>
-#include <net/net_socket.h>
-#include <compat/strl.h>
-#include <string/stdstring.h>
-
-enum
-{
-   P_HEADER_TOP = 0,
-   P_HEADER,
-   P_BODY,
-   P_BODY_CHUNKLEN,
-   P_DONE,
-   P_ERROR
-};
-
-enum
-{
-   T_FULL = 0,
-   T_LEN,
-   T_CHUNK
-};
-
-struct http_t
-{
-   int fd;
-   int status;
-   
-   char part;
-   char bodytype;
-   bool error;
-   
-   size_t pos;
-   size_t len;
-   size_t buflen;
-   char * data;
-};
-
-struct http_connection_t
-{
-   char *domain;
-   char *location;
-   char *urlcopy;
-   char *scan;
-   char *methodcopy;
-   char *contenttypecopy;
-   char *postdatacopy;
-   int port;
-};
-
-static char urlencode_lut[256];
-static bool urlencode_lut_inited = false;
-
-void urlencode_lut_init()
-{
-   unsigned i;
-
-   urlencode_lut_inited = true;
-
-   for (i = 0; i < 256; i++)
-   {
-      urlencode_lut[i] = isalnum(i) || i == '*' || i == '-' || i == '.' || i == '_' ? i : (i == ' ') ? '+' : 0;
-   }
-}
-
-/* caller is responsible for deleting the destination buffer */
-void net_http_urlencode_full(char **dest, const char *source)
-{
-   char *enc  = NULL;
-   /* Assume every character will be encoded, so we need 3 times the space. */
-   size_t len = strlen(source) * 3 + 1;
-
-   if (!urlencode_lut_inited)
-      urlencode_lut_init();
-
-   enc = (char*)calloc(1, len);
-
-   *dest = enc;
-
-   for (; *source; source++)
-   {
-      /* any non-ascii character will just be encoded without question */
-      if ((int)*source < sizeof(urlencode_lut) && urlencode_lut[(int)*source])
-         snprintf(enc, len, "%c", urlencode_lut[(int)*source]);
-      else
-         snprintf(enc, len, "%%%02X", *source & 0xFF);
-
-      while (*++enc);
-   }
-
-   (*dest)[len - 1] = '\0';
-}
-
-static int net_http_new_socket(const char *domain, int port)
-{
-   int ret;
-   struct addrinfo *addr = NULL;
-   int fd                = socket_init(
-         (void**)&addr, port, domain, SOCKET_TYPE_STREAM);
-
-   if (fd < 0)
-      return -1;
-
-   ret = socket_connect(fd, (void*)addr, true);
-
-   freeaddrinfo_retro(addr);
-
-   if (ret < 0)
-      goto error;
-
-   if (!socket_nonblock(fd))
-      goto error;
-
-   return fd;
-
-error:
-   socket_close(fd);
-   return -1;
-}
-
-static void net_http_send_str(int fd, bool *error, const char *text)
-{
-   if (*error)
-      return;
-
-   if (!socket_send_all_blocking(fd, text, strlen(text), true))
-      *error = true;
-}
-
-struct http_connection_t *net_http_connection_new(const char *url,
-      const char *method, const char *data)
-{
-   char **domain = NULL;
-   struct http_connection_t *conn = (struct http_connection_t*)calloc(1,
-         sizeof(struct http_connection_t));
-
-   if (!conn)
-      return NULL;
-
-   if (!url)
-      goto error;
-
-   conn->urlcopy         = strdup(url);
-
-   if (method)
-      conn->methodcopy   = strdup(method);
-
-   if (data)
-      conn->postdatacopy = strdup(data);
-
-   if (!conn->urlcopy)
-      goto error;
-
-   if (strncmp(url, "http://", strlen("http://")) != 0)
-      goto error;
-
-   conn->scan    = conn->urlcopy + strlen("http://");
-   domain        = &conn->domain;
-   *domain       = conn->scan;
-
-   return conn;
-
-error:
-   if (conn->urlcopy)
-      free(conn->urlcopy);
-   if (conn->methodcopy)
-      free(conn->methodcopy);
-   if (conn->postdatacopy)
-      free(conn->postdatacopy);
-   conn->urlcopy      = NULL;
-   conn->methodcopy   = NULL;
-   conn->postdatacopy = NULL;
-   free(conn);
-   return NULL;
-}
-
-bool net_http_connection_iterate(struct http_connection_t *conn)
-{
-   if (!conn)
-      return false;
-
-   while (*conn->scan != '/' && *conn->scan != ':' && *conn->scan != '\0')
-      conn->scan++;
-
-   return true;
-}
-
-bool net_http_connection_done(struct http_connection_t *conn)
-{
-   char **location = NULL;
-
-   if (!conn)
-      return false;
-
-   location     = &conn->location;
-
-   if (*conn->scan == '\0')
-      return false;
-
-   *conn->scan  = '\0';
-   conn->port   = 80;
-
-   if (*conn->scan == ':')
-   {
-      if (!isdigit((int)conn->scan[1]))
-         return false;
-
-      conn->port = (int)strtoul(conn->scan + 1, &conn->scan, 10);
-
-      if (*conn->scan != '/')
-         return false;
-   }
-
-   *location = conn->scan + 1;
-
-   return true;
-}
-
-void net_http_connection_free(struct http_connection_t *conn)
-{
-   if (!conn)
-      return;
-
-   if (conn->urlcopy)
-      free(conn->urlcopy);
-
-   if (conn->methodcopy)
-      free(conn->methodcopy);
-
-   if (conn->contenttypecopy)
-      free(conn->contenttypecopy);
-
-   if (conn->postdatacopy)
-      free(conn->postdatacopy);
-
-   conn->urlcopy = NULL;
-   conn->methodcopy = NULL;
-   conn->contenttypecopy = NULL;
-   conn->postdatacopy = NULL;
-
-   free(conn);
-}
-
-const char *net_http_connection_url(struct http_connection_t *conn)
-{
-   return conn->urlcopy;
-}
-
-struct http_t *net_http_new(struct http_connection_t *conn)
-{
-   bool error            = false;
-   int fd                = -1;
-   struct http_t *state  = NULL;
-
-   if (!conn)
-      goto error;
-
-   fd = net_http_new_socket(conn->domain, conn->port);
-   if (fd < 0)
-      goto error;
-
-   error = false;
-
-   /* This is a bit lazy, but it works. */
-   if (conn->methodcopy)
-   {
-      net_http_send_str(fd, &error, conn->methodcopy);
-      net_http_send_str(fd, &error, " /");
-   }
-   else
-   {
-      net_http_send_str(fd, &error, "GET /");
-   }
-
-   net_http_send_str(fd, &error, conn->location);
-   net_http_send_str(fd, &error, " HTTP/1.1\r\n");
-
-   net_http_send_str(fd, &error, "Host: ");
-   net_http_send_str(fd, &error, conn->domain);
-
-   if (conn->port != 80)
-   {
-      char portstr[16];
-
-      portstr[0] = '\0';
-
-      snprintf(portstr, sizeof(portstr), ":%i", conn->port);
-      net_http_send_str(fd, &error, portstr);
-   }
-
-   net_http_send_str(fd, &error, "\r\n");
-
-   /* this is not being set anywhere yet */
-   if (conn->contenttypecopy)
-   {
-      net_http_send_str(fd, &error, "Content-Type: ");
-      net_http_send_str(fd, &error, conn->contenttypecopy);
-      net_http_send_str(fd, &error, "\r\n");
-   }
-
-   if (conn->methodcopy && (string_is_equal_fast(conn->methodcopy, "POST", 4)))
-   {
-      size_t post_len, len;
-      char *len_str        = NULL;
-
-      if (!conn->postdatacopy)
-         goto error;
-
-      if (!conn->contenttypecopy)
-         net_http_send_str(fd, &error,
-               "Content-Type: application/x-www-form-urlencoded\r\n");
-
-      net_http_send_str(fd, &error, "Content-Length: ");
-
-      post_len = strlen(conn->postdatacopy);
-#ifdef _WIN32
-      len = snprintf(NULL, 0, "%I64u", post_len);
-      len_str = (char*)malloc(len + 1);
-      snprintf(len_str, len + 1, "%I64u", post_len);
-#else
-      len = snprintf(NULL, 0, "%llu", (long long unsigned)post_len);
-      len_str = (char*)malloc(len + 1);
-      snprintf(len_str, len + 1, "%llu", (long long unsigned)post_len);
-#endif
-
-      len_str[len] = '\0';
-
-      net_http_send_str(fd, &error, len_str);
-      net_http_send_str(fd, &error, "\r\n");
-
-      free(len_str);
-   }
-
-   net_http_send_str(fd, &error, "User-Agent: libretro\r\n");
-   net_http_send_str(fd, &error, "Connection: close\r\n");
-   net_http_send_str(fd, &error, "\r\n");
-
-   if (conn->methodcopy && (string_is_equal_fast(conn->methodcopy, "POST", 4)))
-      net_http_send_str(fd, &error, conn->postdatacopy);
-
-   if (error)
-      goto error;
-
-   state          = (struct http_t*)malloc(sizeof(struct http_t));
-   state->fd      = fd;
-   state->status  = -1;
-   state->data    = NULL;
-   state->part    = P_HEADER_TOP;
-   state->bodytype= T_FULL;
-   state->error   = false;
-   state->pos     = 0;
-   state->len     = 0;
-   state->buflen  = 512;
-   state->data    = (char*)malloc(state->buflen);
-
-   if (!state->data)
-      goto error;
-
-   return state;
-
-error:
-   if (conn->methodcopy)
-      free(conn->methodcopy);
-   if (conn->contenttypecopy)
-      free(conn->contenttypecopy);
-   conn->methodcopy = NULL;
-   conn->contenttypecopy = NULL;
-   conn->postdatacopy = NULL;
-   if (fd >= 0)
-      socket_close(fd);
-   if (state)
-      free(state);
-   return NULL;
-}
-
-int net_http_fd(struct http_t *state)
-{
-   if (!state)
-      return -1;
-   return state->fd;
-}
-
-bool net_http_update(struct http_t *state, size_t* progress, size_t* total)
-{
-   ssize_t newlen = 0;
-
-   if (!state || state->error)
-      goto fail;
-
-   if (state->part < P_BODY)
-   {
-      if (state->error)
-         newlen = -1;
-      else
-         newlen = socket_receive_all_nonblocking(state->fd, &state->error,
-               (uint8_t*)state->data + state->pos,
-               state->buflen - state->pos);
-
-      if (newlen < 0)
-         goto fail;
-
-      if (state->pos + newlen >= state->buflen - 64)
-      {
-         state->buflen *= 2;
-         state->data    = (char*)realloc(state->data, state->buflen);
-      }
-      state->pos += newlen;
-
-      while (state->part < P_BODY)
-      {
-         char *dataend = state->data + state->pos;
-         char *lineend = (char*)memchr(state->data, '\n', state->pos);
-
-         if (!lineend)
-            break;
-
-         *lineend='\0';
-
-         if (lineend != state->data && lineend[-1]=='\r')
-            lineend[-1]='\0';
-
-         if (state->part == P_HEADER_TOP)
-         {
-            if (strncmp(state->data, "HTTP/1.", strlen("HTTP/1."))!=0)
-               goto fail;
-            state->status = (int)strtoul(state->data + strlen("HTTP/1.1 "), NULL, 10);
-            state->part   = P_HEADER;
-         }
-         else
-         {
-            if (!strncmp(state->data, "Content-Length: ",
-                     strlen("Content-Length: ")))
-            {
-               state->bodytype = T_LEN;
-               state->len = strtol(state->data + 
-                     strlen("Content-Length: "), NULL, 10);
-            }
-            if (string_is_equal(state->data, "Transfer-Encoding: chunked"))
-               state->bodytype = T_CHUNK;
-
-            /* TODO: save headers somewhere */
-            if (state->data[0]=='\0')
-            {
-               state->part = P_BODY;
-               if (state->bodytype == T_CHUNK)
-                  state->part = P_BODY_CHUNKLEN;
-            }
-         }
-
-         memmove(state->data, lineend + 1, dataend-(lineend+1));
-         state->pos = (dataend-(lineend + 1));
-      }
-      if (state->part >= P_BODY)
-      {
-         newlen = state->pos;
-         state->pos = 0;
-      }
-   }
-
-   if (state->part >= P_BODY && state->part < P_DONE)
-   {
-      if (!newlen)
-      {
-         if (state->error)
-            newlen = -1;
-         else
-            newlen = socket_receive_all_nonblocking(
-                  state->fd,
-                  &state->error,
-                  (uint8_t*)state->data + state->pos,
-                  state->buflen - state->pos);
-
-         if (newlen < 0)
-         {
-            if (state->bodytype == T_FULL)
-            {
-               state->part = P_DONE;
-               state->data = (char*)realloc(state->data, state->len);
-            }
-            else
-               goto fail;
-            newlen=0;
-         }
-
-         if (state->pos + newlen >= state->buflen - 64)
-         {
-            state->buflen *= 2;
-            state->data = (char*)realloc(state->data, state->buflen);
-         }
-      }
-
-parse_again:
-      if (state->bodytype == T_CHUNK)
-      {
-         if (state->part == P_BODY_CHUNKLEN)
-         {
-            state->pos += newlen;
-            if (state->pos - state->len >= 2)
-            {
-               /*
-                * len=start of chunk including \r\n
-                * pos=end of data
-                */
-
-               char *fullend = state->data + state->pos;
-               char *end     = (char*)memchr(state->data + state->len + 2, '\n',
-                                             state->pos - state->len - 2);
-
-               if (end)
-               {
-                  size_t chunklen = strtoul(state->data+state->len, NULL, 16);
-                  state->pos      = state->len;
-                  end++;
-
-                  memmove(state->data+state->len, end, fullend-end);
-
-                  state->len      = chunklen;
-                  newlen          = (fullend - end);
-
-                  /*
-                     len=num bytes
-                     newlen=unparsed bytes after \n
-                     pos=start of chunk including \r\n
-                     */
-
-                  state->part = P_BODY;
-                  if (state->len == 0)
-                  {
-                     state->part = P_DONE;
-                     state->len  = state->pos;
-                     state->data = (char*)realloc(state->data, state->len);
-                  }
-                  goto parse_again;
-               }
-            }
-         }
-         else if (state->part == P_BODY)
-         {
-            if ((size_t)newlen >= state->len)
-            {
-               state->pos += state->len;
-               newlen     -= state->len;
-               state->len  = state->pos;
-               state->part = P_BODY_CHUNKLEN;
-               goto parse_again;
-            }
-            else
-            {
-               state->pos += newlen;
-               state->len -= newlen;
-            }
-         }
-      }
-      else
-      {
-         state->pos += newlen;
-
-         if (state->pos == state->len)
-         {
-            state->part = P_DONE;
-            state->data = (char*)realloc(state->data, state->len);
-         }
-         if (state->pos > state->len)
-            goto fail;
-      }
-   }
-
-   if (progress)
-      *progress = state->pos;
-
-   if (total)
-   {
-      if (state->bodytype == T_LEN)
-         *total=state->len;
-      else
-         *total=0;
-   }
-
-   return (state->part == P_DONE);
-
-fail:
-   if (state)
-   {
-      state->error  = true;
-      state->part   = P_ERROR;
-      state->status = -1;
-   }
-
-   return true;
-}
-
-int net_http_status(struct http_t *state)
-{
-   if (!state)
-      return -1;
-   return state->status;
-}
-
-uint8_t* net_http_data(struct http_t *state, size_t* len, bool accept_error)
-{
-   if (!state)
-      return NULL;
-
-   if (!accept_error && net_http_error(state))
-   {
-      if (len)
-         *len=0;
-      return NULL;
-   }
-
-   if (len)
-      *len=state->len;
-
-   return (uint8_t*)state->data;
-}
-
-void net_http_delete(struct http_t *state)
-{
-   if (!state)
-      return;
-
-   if (state->fd >= 0)
-      socket_close(state->fd);
-   free(state);
-}
-
-bool net_http_error(struct http_t *state)
-{
-   return (state->error || state->status<200 || state->status>299);
-}
diff --git a/libretro-common/net/net_http_parse.c b/libretro-common/net/net_http_parse.c
deleted file mode 100644
index 69b80f6..0000000
--- a/libretro-common/net/net_http_parse.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_http_parse.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <compat/strcasestr.h>
-
-/**
- * string_parse_html_anchor:
- * @line               : Buffer where the <a> tag is stored
- * @link               : Buffer to store the link URL in
- * @name               : Buffer to store the link URL in
- * @link_size          : Size of the link buffer including the NUL-terminator
- * @name_size          : Size of the name buffer including the NUL-terminator
- *
- * Parses an HTML anchor link stored in @line in the form of: <a href="/path/to/url">Title</a>
- * The buffer pointed to by @link is filled with the URL path the link points to,
- * and @name is filled with the title portion of the link.
- *
- * Returns: 0 if URL was parsed completely, otherwise 1.
- **/
-int string_parse_html_anchor(const char *line, char *link, char *name,
-      size_t link_size, size_t name_size)
-{
-   if (!line || !link || !name)
-      return 1;
-
-   memset(link, 0, link_size);
-   memset(name, 0, name_size);
-
-   line = strcasestr(line, "<a href=\"");
-
-   if (!line)
-      return 1;
-
-   line += 9;
-
-   if (line && *line)
-   {
-      if (!*link)
-      {
-         const char *end = strstr(line, "\"");
-
-         if (!end)
-            return 1;
-
-         memcpy(link, line, end - line);
-
-         *(link + (end - line)) = '\0';
-         line += end - line;
-      }
-
-      if (!*name)
-      {
-         const char *start = strstr(line, "\">");
-         const char *end   = start ? strstr(start, "</a>") : NULL;
-
-         if (!start || !end)
-            return 1;
-
-         memcpy(name, start + 2, end - start - 2);
-
-         *(name + (end - start - 2)) = '\0';
-      }
-   }
-
-   return 0;
-}
-
-#ifndef RARCH_INTERNAL
-int main(int argc, char *argv[])
-{
-   char link[1024];
-   char name[1024];
-   const char *line  = "<a href=\"http://www.test.com/somefile.zip\">Test</a>\n";
-
-   link[0] = name[0] = '\0';
-
-   string_parse_html_anchor(line, link, name, sizeof(link), sizeof(name));
-
-   printf("link: %s\nname: %s\n", link, name);
-
-   return 1;
-}
-#endif
diff --git a/libretro-common/net/net_ifinfo.c b/libretro-common/net/net_ifinfo.c
deleted file mode 100644
index 9aed753..0000000
--- a/libretro-common/net/net_ifinfo.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_ifinfo.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <retro_miscellaneous.h>
-
-#if defined(_WIN32) && !defined(_XBOX)
-#include <winsock2.h>
-#include <iphlpapi.h>
-#include <ws2tcpip.h>
-#else
-#include <arpa/inet.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
-#ifdef WANT_IFADDRS
-#include <compat/ifaddrs.h>
-#else
-#include <ifaddrs.h>
-#endif
-#endif
-
-#include <net/net_ifinfo.h>
-
-#if defined(BSD)
-#include <netinet/in.h>
-#endif
-
-void net_ifinfo_free(net_ifinfo_t *list)
-{
-   unsigned k;
-
-   if (!list)
-      return;
-
-   for (k = 0; k < list->size; k++)
-   {
-      struct net_ifinfo_entry *ptr = 
-         (struct net_ifinfo_entry*)&list->entries[k];
-
-      if (*ptr->name)
-         free(ptr->name);
-      if (*ptr->host)
-         free(ptr->host);
-
-      ptr->name = NULL;
-      ptr->host = NULL;
-   }
-   free(list->entries);
-}
-
-bool net_ifinfo_new(net_ifinfo_t *list)
-{
-   unsigned k              = 0;
-#if defined(_WIN32) && !defined(_XBOX)
-   PIP_ADAPTER_ADDRESSES adapter_addresses = NULL, aa = NULL;
-   PIP_ADAPTER_UNICAST_ADDRESS ua = NULL;
-#ifdef _WIN32_WINNT_WINXP
-   DWORD size;
-   DWORD rv = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, NULL, &size);
-
-   adapter_addresses = (PIP_ADAPTER_ADDRESSES)malloc(size);
-
-   rv = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, adapter_addresses, &size);
-
-   memset(list, 0, sizeof(net_ifinfo_t));
-
-   if (rv != ERROR_SUCCESS)
-      goto error;
-#endif
-   for (aa = adapter_addresses; aa != NULL; aa = aa->Next)
-   {
-      char name[PATH_MAX_LENGTH];
-      memset(name, 0, sizeof(name));
-
-      WideCharToMultiByte(CP_ACP, 0, aa->FriendlyName, wcslen(aa->FriendlyName),
-            name, PATH_MAX_LENGTH, NULL, NULL);
-
-      for (ua = aa->FirstUnicastAddress; ua != NULL; ua = ua->Next)
-      {
-         char host[PATH_MAX_LENGTH];
-         struct net_ifinfo_entry *ptr = (struct net_ifinfo_entry*)
-            realloc(list->entries, (k+1) * sizeof(struct net_ifinfo_entry));
-
-         if (!ptr)
-            goto error;
-
-         list->entries          = ptr;
-
-         memset(host, 0, sizeof(host));
-
-         getnameinfo(ua->Address.lpSockaddr, ua->Address.iSockaddrLength,
-               host, sizeof(host), NULL, NI_MAXSERV, NI_NUMERICHOST);
-
-         list->entries[k].name  = strdup(name);
-         list->entries[k].host  = strdup(host);
-         list->size             = k + 1;
-
-         k++;
-      }
-   }
-
-   free(adapter_addresses);
-#else
-   struct ifaddrs *ifa     = NULL;
-   struct ifaddrs *ifaddr  = NULL;
-
-   memset(list, 0, sizeof(net_ifinfo_t));
-
-   if (getifaddrs(&ifaddr) == -1)
-      goto error;
-
-   if (!list)
-      goto error;
-
-   for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next)
-   {
-      char host[NI_MAXHOST];
-      struct net_ifinfo_entry *ptr = NULL;
-
-      if (!ifa->ifa_addr)
-         continue;
-
-      if (ifa->ifa_addr->sa_family != AF_INET)
-         continue;
-
-      if (getnameinfo(ifa->ifa_addr, sizeof(struct sockaddr_in),
-               host, NI_MAXHOST, NULL, 0, NI_NUMERICHOST) != 0)
-         goto error;
-
-      ptr = (struct net_ifinfo_entry*)
-         realloc(list->entries, (k+1) * sizeof(struct net_ifinfo_entry));
-
-      if (!ptr)
-         goto error;
-
-      list->entries          = ptr;
-
-      list->entries[k].name  = strdup(ifa->ifa_name);
-      list->entries[k].host  = strdup(host);
-      list->size             = k + 1;
-
-      k++;
-   }
-
-   freeifaddrs(ifaddr);
-#endif
-   return true;
-
-error:
-#ifdef _WIN32
-   if (adapter_addresses)
-      free(adapter_addresses);
-#else
-   freeifaddrs(ifaddr);
-#endif
-   net_ifinfo_free(list);
-
-   return false;
-}
diff --git a/libretro-common/net/net_natt.c b/libretro-common/net/net_natt.c
deleted file mode 100644
index 34c6f1d..0000000
--- a/libretro-common/net/net_natt.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* Copyright  (C) 2016-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_natt.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-
-#include <net/net_compat.h>
-#include <net/net_ifinfo.h>
-#include <retro_miscellaneous.h>
-
-#include <string/stdstring.h>
-#include <net/net_natt.h>
-
-#if HAVE_MINIUPNPC
-#include <miniupnpc/miniwget.h>
-#include <miniupnpc/miniupnpc.h>
-#include <miniupnpc/upnpcommands.h>
-
-#if MINIUPNPC_API_VERSION < 16
-#undef HAVE_MINIUPNPC
-#endif
-#endif
-
-#if HAVE_MINIUPNPC
-static struct UPNPUrls urls;
-static struct IGDdatas data;
-#endif
-
-void natt_init(void)
-{
-#ifndef HAVE_SOCKET_LEGACY
-#if HAVE_MINIUPNPC
-   struct UPNPDev * devlist;
-   struct UPNPDev * dev;
-   char * descXML;
-   int descXMLsize = 0;
-   int upnperror = 0;
-   memset(&urls, 0, sizeof(struct UPNPUrls));
-   memset(&data, 0, sizeof(struct IGDdatas));
-   devlist = upnpDiscover(2000, NULL, NULL, 0, 0, 2, &upnperror);
-   if (devlist)
-   {
-      dev = devlist;
-      while (dev)
-      {
-         if (strstr (dev->st, "InternetGatewayDevice"))
-            break;
-         dev = dev->pNext;
-      }
-      if (!dev)
-         dev = devlist;
-
-      descXML = (char *) miniwget(dev->descURL, &descXMLsize, 0, NULL);
-      if (descXML)
-      {
-         parserootdesc (descXML, descXMLsize, &data);
-         free (descXML); descXML = 0;
-         GetUPNPUrls (&urls, &data, dev->descURL, 0);
-      }
-      freeUPNPDevlist(devlist);
-   }
-#endif
-#endif
-}
-
-bool natt_new(struct natt_status *status)
-{
-   memset(status, 0, sizeof(struct natt_status));
-   return true;
-}
-
-void natt_free(struct natt_status *status)
-{
-   /* Nothing */
-}
-
-static bool natt_open_port(struct natt_status *status,
-      struct sockaddr *addr, socklen_t addrlen, enum socket_protocol proto)
-{
-#ifndef HAVE_SOCKET_LEGACY
-#if HAVE_MINIUPNPC
-   int r;
-   char host[PATH_MAX_LENGTH], ext_host[PATH_MAX_LENGTH],
-        port_str[6], ext_port_str[6];
-   struct addrinfo hints         = {0};
-   const char *proto_str         = NULL;
-   struct addrinfo *ext_addrinfo = NULL;
-
-   /* if NAT traversal is uninitialized or unavailable, oh well */
-   if (!urls.controlURL || !urls.controlURL[0])
-      return false;
-
-   /* figure out the internal info */
-   if (getnameinfo(addr, addrlen, host, PATH_MAX_LENGTH, port_str, 6, NI_NUMERICHOST|NI_NUMERICSERV) != 0)
-      return false;
-   proto_str = (proto == SOCKET_PROTOCOL_UDP) ? "UDP" : "TCP";
-
-   /* add the port mapping */
-   r = UPNP_AddAnyPortMapping(urls.controlURL, data.first.servicetype, port_str,
-      port_str, host, "retroarch", proto_str, NULL, "3600", ext_port_str);
-   if (r != 0)
-   {
-      /* try the older AddPortMapping */
-      memcpy(ext_port_str, port_str, 6);
-      r = UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port_str,
-         port_str, host, "retroarch", proto_str, NULL, "3600");
-   }
-   if (r != 0)
-      return false;
-
-   /* get the external IP */
-   r = UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, ext_host);
-   if (r != 0)
-      return false;
-
-   /* update the status */
-   if (getaddrinfo_retro(ext_host, ext_port_str, &hints, &ext_addrinfo) != 0)
-      return false;
-
-   if (ext_addrinfo->ai_family == AF_INET &&
-       ext_addrinfo->ai_addrlen >= sizeof(struct sockaddr_in))
-   {
-      status->have_inet4 = true;
-      status->ext_inet4_addr = *((struct sockaddr_in *) ext_addrinfo->ai_addr);
-   }
-#if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY)
-   else if (ext_addrinfo->ai_family == AF_INET6 &&
-            ext_addrinfo->ai_addrlen >= sizeof(struct sockaddr_in6))
-   {
-      status->have_inet6 = true;
-      status->ext_inet6_addr = *((struct sockaddr_in6 *) ext_addrinfo->ai_addr);
-   }
-#endif
-   else
-   {
-      freeaddrinfo_retro(ext_addrinfo);
-      return false;
-   }
-
-   freeaddrinfo_retro(ext_addrinfo);
-   return true;
-
-#else
-   return false;
-#endif
-#else
-   return false;
-#endif
-}
-
-bool natt_open_port_any(struct natt_status *status, uint16_t port, enum socket_protocol proto)
-{
-#if !defined(HAVE_SOCKET_LEGACY) && !defined(WIIU)
-   struct net_ifinfo list;
-   bool ret = false;
-   size_t i;
-   struct addrinfo hints = {0}, *addr;
-   char port_str[6];
-
-   sprintf(port_str, "%hu", port);
-
-   /* get our interfaces */
-   if (!net_ifinfo_new(&list))
-      return false;
-
-   /* loop through them */
-   for (i = 0; i < list.size; i++)
-   {
-      struct net_ifinfo_entry *entry = list.entries + i;
-
-      /* ignore localhost */
-      if (string_is_equal(entry->host, "127.0.0.1") || string_is_equal(entry->host, "::1"))
-         continue;
-
-      /* make a request for this host */
-      if (getaddrinfo_retro(entry->host, port_str, &hints, &addr) == 0)
-      {
-         ret = natt_open_port(status, addr->ai_addr, addr->ai_addrlen, proto) || ret;
-         freeaddrinfo_retro(addr);
-      }
-   }
-
-   net_ifinfo_free(&list);
-
-   return ret;
-
-#else
-   return false;
-#endif
-}
-
-bool natt_read(struct natt_status *status)
-{
-   /* MiniUPNPC is always synchronous, so there's nothing to read here.
-    * Reserved for future backends. */
-   return false;
-}
-
-#if 0
-/* If we want to remove redirects in the future, this is a sample of how to do
- * that */
-void upnp_rem_redir (int port)
-{
-   char port_str[16];
-   int t;
-   printf("TB : upnp_rem_redir (%d)\n", port);
-   if(urls.controlURL[0] == '\0')
-   {
-      printf("TB : the init was not done !\n");
-      return;
-   }
-   sprintf(port_str, "%d", port);
-   UPNP_DeletePortMapping(urls.controlURL, data.first.servicetype, port_str, "TCP", NULL);
-}
-#endif
diff --git a/libretro-common/net/net_socket.c b/libretro-common/net/net_socket.c
deleted file mode 100644
index 82e4807..0000000
--- a/libretro-common/net/net_socket.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_socket.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <net/net_compat.h>
-#include <net/net_socket.h>
-
-int socket_init(void **address, uint16_t port, const char *server, enum socket_type type)
-{
-   char port_buf[16];
-   struct addrinfo hints = {0};
-   struct addrinfo **addrinfo = (struct addrinfo**)address;
-   struct addrinfo *addr = NULL;
-   
-   if (!network_init())
-      goto error;
-
-   switch (type)
-   {
-      case SOCKET_TYPE_DATAGRAM:
-         hints.ai_socktype = SOCK_DGRAM;
-         break;
-      case SOCKET_TYPE_STREAM:
-         hints.ai_socktype = SOCK_STREAM;
-         break;
-      case SOCKET_TYPE_SEQPACKET:
-         /* TODO/FIXME - implement? */
-         break;
-   }
-
-   if (!server)
-      hints.ai_flags = AI_PASSIVE;
-
-   port_buf[0] = '\0';
-
-   snprintf(port_buf, sizeof(port_buf), "%hu", (unsigned short)port);
-
-   if (getaddrinfo_retro(server, port_buf, &hints, addrinfo) != 0)
-      goto error;
-
-   addr = (struct addrinfo*)*addrinfo;
-
-   if (!addr)
-      goto error;
-
-   return socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
-
-error:
-   return -1;
-}
-
-ssize_t socket_receive_all_nonblocking(int fd, bool *error,
-      void *data_, size_t size)
-{
-   const uint8_t *data = (const uint8_t*)data_;
-   ssize_t         ret = recv(fd, (char*)data, size, 0);
-
-   if (ret > 0)
-      return ret;
-
-   if (ret == 0)
-   {
-      /* Socket closed */
-      *error = true;
-      return -1;
-   }
-
-   if (isagain((int)ret))
-      return 0;
-
-   *error = true;
-   return -1;
-}
-
-int socket_receive_all_blocking(int fd, void *data_, size_t size)
-{
-   const uint8_t *data = (const uint8_t*)data_;
-
-   while (size)
-   {
-      ssize_t ret = recv(fd, (char*)data, size, 0);
-      if (ret <= 0)
-         return false;
-
-      data += ret;
-      size -= ret;
-   }
-
-   return true;
-}
-
-bool socket_nonblock(int fd)
-{
-#if defined(__CELLOS_LV2__) || defined(VITA) || defined(WIIU)
-   int i = 1;
-   setsockopt(fd, SOL_SOCKET, SO_NBIO, &i, sizeof(int));
-   return true;
-#elif defined(_WIN32)
-   u_long mode = 1;
-   return ioctlsocket(fd, FIONBIO, &mode) == 0;
-#else
-   return fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK) == 0;
-#endif
-}
-
-int socket_close(int fd)
-{ 
-#if defined(_WIN32) && !defined(_XBOX360)
-   /* WinSock has headers from the stone age. */
-   return closesocket(fd);
-#elif defined(__CELLOS_LV2__) || defined(WIIU)
-   return socketclose(fd);
-#elif defined(VITA)
-   return sceNetSocketClose(fd);
-#else
-   return close(fd);
-#endif
-}
-
-int socket_select(int nfds, fd_set *readfs, fd_set *writefds,
-      fd_set *errorfds, struct timeval *timeout)
-{
-#if defined(__CELLOS_LV2__)
-   return socketselect(nfds, readfs, writefds, errorfds, timeout);
-#elif defined(VITA)
-   extern int retro_epoll_fd;
-   SceNetEpollEvent ev = {0};
-
-   ev.events = SCE_NET_EPOLLIN | SCE_NET_EPOLLHUP;
-   ev.data.fd = nfds;
-
-   if((sceNetEpollControl(retro_epoll_fd, SCE_NET_EPOLL_CTL_ADD, nfds, &ev)))
-   {
-      int ret = sceNetEpollWait(retro_epoll_fd, &ev, 1, 0);
-      sceNetEpollControl(retro_epoll_fd, SCE_NET_EPOLL_CTL_DEL, nfds, NULL);
-      return ret;
-   }
-   return 0;
-#else
-   return select(nfds, readfs, writefds, errorfds, timeout);
-#endif
-}
-
-int socket_send_all_blocking(int fd, const void *data_, size_t size,
-      bool no_signal)
-{
-   const uint8_t *data = (const uint8_t*)data_;
-
-   while (size)
-   {
-      ssize_t ret = send(fd, (const char*)data, size,
-            no_signal ? MSG_NOSIGNAL : 0);
-      if (ret <= 0)
-      {
-         if (isagain((int)ret))
-            continue;
-
-         return false;
-      }
-
-      data += ret;
-      size -= ret;
-   }
-
-   return true;
-}
-
-ssize_t socket_send_all_nonblocking(int fd, const void *data_, size_t size,
-      bool no_signal)
-{
-   const uint8_t *data = (const uint8_t*)data_;
-   ssize_t sent = 0;
-
-   while (size)
-   {
-      ssize_t ret = send(fd, (const char*)data, size,
-            no_signal ? MSG_NOSIGNAL : 0);
-      if (ret < 0)
-      {
-         if (isagain((int)ret))
-            break;
-
-         return -1;
-      }
-      else if (ret == 0)
-         break;
-
-      data += ret;
-      size -= ret;
-      sent += ret;
-   }
-
-   return sent;
-}
-
-bool socket_bind(int fd, void *data)
-{
-   int yes               = 1;
-   struct addrinfo *res  = (struct addrinfo*)data;
-   setsockopt(fd, SOL_SOCKET,
-         SO_REUSEADDR, (const char*)&yes, sizeof(int));
-   if (bind(fd, res->ai_addr, res->ai_addrlen) < 0)
-      return false;
-   return true;
-}
-
-int socket_connect(int fd, void *data, bool timeout_enable)
-{
-   struct addrinfo *addr = (struct addrinfo*)data;
-
-#if !defined(_WIN32) && !defined(VITA) && !defined(WIIU)
-   if (timeout_enable)
-   {
-      struct timeval timeout;
-      timeout.tv_sec  = 4;
-      timeout.tv_usec = 0;
-
-      setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char*)&timeout, sizeof timeout);
-   }
-#endif
-
-   return connect(fd, addr->ai_addr, addr->ai_addrlen);
-}
-
-static int domain_get(enum socket_domain type)
-{
-   switch (type)
-   {
-      case SOCKET_DOMAIN_INET:
-#ifdef VITA
-         return SCE_NET_AF_INET;
-#else
-         return AF_INET;
-#endif
-      default:
-         break;
-   }
-
-   return 0;
-}
-
-int socket_create(
-      const char *name,
-      enum socket_domain   domain_type,
-      enum socket_type     socket_type,
-      enum socket_protocol protocol_type)
-{
-   int type     = 0;
-   int protocol = 0;
-   int domain   = domain_get(domain_type);
-#ifdef VITA
-
-   switch (socket_type)
-   {
-      case SOCKET_TYPE_DATAGRAM:
-         type = SCE_NET_SOCK_DGRAM;
-         break;
-      case SOCKET_TYPE_STREAM:
-         type = SCE_NET_SOCK_STREAM;
-         break;
-      case SOCKET_TYPE_SEQPACKET:
-         /* TODO/FIXME - implement */
-         break;
-   }
-
-   switch (protocol_type)
-   {
-      case SOCKET_PROTOCOL_NONE:
-         protocol = 0;
-         break;
-      case SOCKET_PROTOCOL_TCP:
-         protocol = SCE_NET_IPPROTO_TCP;
-         break;
-      case SOCKET_PROTOCOL_UDP:
-         protocol = SCE_NET_IPPROTO_UDP;
-         break;
-   }
-
-   return sceNetSocket(name, domain, type, protocol);
-#else
-   switch (socket_type)
-   {
-      case SOCKET_TYPE_DATAGRAM:
-         type = SOCK_DGRAM;
-         break;
-      case SOCKET_TYPE_STREAM:
-         type = SOCK_STREAM;
-         break;
-      case SOCKET_TYPE_SEQPACKET:
-         /* TODO/FIXME - implement */
-         break;
-   }
-
-   switch (protocol_type)
-   {
-      case SOCKET_PROTOCOL_NONE:
-         protocol = 0;
-         break;
-      case SOCKET_PROTOCOL_TCP:
-         protocol = IPPROTO_TCP;
-         break;
-      case SOCKET_PROTOCOL_UDP:
-         protocol = IPPROTO_UDP;
-         break;
-   }
-
-   return socket(domain, type, protocol);
-#endif
-}
-
-void socket_set_target(void *data, socket_target_t *in_addr)
-{
-   struct sockaddr_in *out_target = (struct sockaddr_in*)data;
-
-   out_target->sin_port   = inet_htons(in_addr->port);
-   out_target->sin_family = domain_get(in_addr->domain);
-#ifdef VITA
-   out_target->sin_addr   = inet_aton(in_addr->server);
-#else
-#ifdef GEKKO
-   out_target->sin_len    = 8;
-#endif
-
-   inet_ptrton(AF_INET, in_addr->server, &out_target->sin_addr);
-
-#endif
-}
diff --git a/libretro-common/queues/fifo_queue.c b/libretro-common/queues/fifo_queue.c
deleted file mode 100644
index 85d0268..0000000
--- a/libretro-common/queues/fifo_queue.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (fifo_queue.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <queues/fifo_queue.h>
-
-fifo_buffer_t *fifo_new(size_t size)
-{
-   uint8_t    *buffer = NULL;
-   fifo_buffer_t *buf = (fifo_buffer_t*)calloc(1, sizeof(*buf));
-
-   if (!buf)
-      return NULL;
-
-   buffer = (uint8_t*)calloc(1, size + 1);
-
-   if (!buffer)
-   {
-      free(buf);
-      return NULL;
-   }
-
-   buf->buffer = buffer;
-   buf->size   = size + 1;
-
-   return buf;
-}
-
-void fifo_write(fifo_buffer_t *buffer, const void *in_buf, size_t size)
-{
-   size_t first_write = size;
-   size_t rest_write  = 0;
-
-   if (buffer->end + size > buffer->size)
-   {
-      first_write = buffer->size - buffer->end;
-      rest_write  = size - first_write;
-   }
-
-   memcpy(buffer->buffer + buffer->end, in_buf, first_write);
-   memcpy(buffer->buffer, (const uint8_t*)in_buf + first_write, rest_write);
-
-   buffer->end = (buffer->end + size) % buffer->size;
-}
-
-
-void fifo_read(fifo_buffer_t *buffer, void *in_buf, size_t size)
-{
-   size_t first_read = size;
-   size_t rest_read  = 0;
-
-   if (buffer->first + size > buffer->size)
-   {
-      first_read = buffer->size - buffer->first;
-      rest_read  = size - first_read;
-   }
-
-   memcpy(in_buf, (const uint8_t*)buffer->buffer + buffer->first, first_read);
-   memcpy((uint8_t*)in_buf + first_read, buffer->buffer, rest_read);
-
-   buffer->first = (buffer->first + size) % buffer->size;
-}
-
diff --git a/libretro-common/queues/message_queue.c b/libretro-common/queues/message_queue.c
deleted file mode 100644
index 5c5c9cf..0000000
--- a/libretro-common/queues/message_queue.c
+++ /dev/null
@@ -1,240 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (message_queue.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <boolean.h>
-#include <queues/message_queue.h>
-#include <compat/strl.h>
-#include <compat/posix_string.h>
-
-struct queue_elem
-{
-   unsigned duration;
-   unsigned prio;
-   char *msg;
-};
-
-struct msg_queue
-{
-   struct queue_elem **elems;
-   size_t ptr;
-   size_t size;
-   char *tmp_msg;
-};
-
-/**
- * msg_queue_new:
- * @size              : maximum size of message
- *
- * Creates a message queue with maximum size different messages.
- *
- * Returns: NULL if allocation error, pointer to a message queue
- * if successful. Has to be freed manually.
- **/
-msg_queue_t *msg_queue_new(size_t size)
-{
-   struct queue_elem **elems = NULL;
-   msg_queue_t *queue        = (msg_queue_t*)calloc(1, sizeof(*queue));
-
-   if (!queue)
-      return NULL;
-
-   queue->size = size + 1;
-
-   elems = (struct queue_elem**)calloc(queue->size,
-         sizeof(struct queue_elem*)); 
-
-   if (!elems)
-   {
-      free(queue);
-      return NULL;
-   }
-
-   queue->elems = elems;
-   queue->ptr   = 1;
-
-   return queue;
-}
-
-/**
- * msg_queue_free:
- * @queue             : pointer to queue object
- *
- * Frees message queue..
- **/
-void msg_queue_free(msg_queue_t *queue)
-{
-   if (queue)
-   {
-      msg_queue_clear(queue);
-      free(queue->elems);
-   }
-   free(queue);
-}
-
-
-/**
- * msg_queue_push:
- * @queue             : pointer to queue object
- * @msg               : message to add to the queue
- * @prio              : priority level of the message
- * @duration          : how many times the message can be pulled
- *                      before it vanishes (E.g. show a message for
- *                      3 seconds @ 60fps = 180 duration).
- *
- * Push a new message onto the queue.
- **/
-void msg_queue_push(msg_queue_t *queue, const char *msg,
-      unsigned prio, unsigned duration)
-{
-   size_t tmp_ptr = 0;
-   struct queue_elem *new_elem = NULL;
-
-   if (!queue || queue->ptr >= queue->size)
-      return;
-
-   new_elem                      = (struct queue_elem*)
-      calloc(1, sizeof(struct queue_elem));
-   if (!new_elem)
-      return;
-
-   new_elem->prio                = prio;
-   new_elem->duration            = duration;
-   new_elem->msg                 = msg ? strdup(msg) : NULL;
-
-   queue->elems[queue->ptr]      = new_elem;
-
-   tmp_ptr                       = queue->ptr++;
-
-   while (tmp_ptr > 1)
-   {
-      struct queue_elem *parent  = queue->elems[tmp_ptr >> 1];
-      struct queue_elem *child   = queue->elems[tmp_ptr];
-
-      if (child->prio <= parent->prio)
-         break;
-
-      queue->elems[tmp_ptr >> 1] = child;
-      queue->elems[tmp_ptr]      = parent;
-
-      tmp_ptr >>= 1;
-   }
-}
-
-/**
- * msg_queue_clear:
- * @queue             : pointer to queue object
- *
- * Clears out everything in the queue.
- **/
-void msg_queue_clear(msg_queue_t *queue)
-{
-   size_t i;
-
-   if (!queue)
-      return;
-
-   for (i = 1; i < queue->ptr; i++)
-   {
-      if (queue->elems[i])
-      {
-         free(queue->elems[i]->msg);
-         free(queue->elems[i]);
-         queue->elems[i] = NULL;
-      }
-   }
-   queue->ptr = 1;
-   free(queue->tmp_msg);
-   queue->tmp_msg = NULL;
-}
-
-/**
- * msg_queue_pull:
- * @queue             : pointer to queue object
- *
- * Pulls highest priority message in queue.
- *
- * Returns: NULL if no message in queue, otherwise a string
- * containing the message.
- **/
-const char *msg_queue_pull(msg_queue_t *queue)
-{
-   struct queue_elem *front  = NULL, *last = NULL;
-   size_t tmp_ptr = 1;
-    
-   (void)tmp_ptr;
-    
-   /* Nothing in queue. */
-   if (!queue || queue->ptr == 1)
-      return NULL;
-
-   front = (struct queue_elem*)queue->elems[1];
-   front->duration--;
-   if (front->duration > 0)
-      return front->msg;
-
-   free(queue->tmp_msg);
-   queue->tmp_msg = front->msg;
-   front->msg = NULL;
-
-   front = (struct queue_elem*)queue->elems[1];
-   last  = (struct queue_elem*)queue->elems[--queue->ptr];
-   queue->elems[1] = last;
-   free(front);
-
-   for (;;)
-   {
-      struct queue_elem *parent = NULL;
-      struct queue_elem *child  = NULL;
-      size_t switch_index       = tmp_ptr;
-      bool left                 = (tmp_ptr * 2 <= queue->ptr)
-         && (queue->elems[tmp_ptr] < queue->elems[tmp_ptr * 2]);
-      bool right                = (tmp_ptr * 2 + 1 <= queue->ptr)
-         && (queue->elems[tmp_ptr] < queue->elems[tmp_ptr * 2 + 1]);
-
-      if (!left && !right)
-         break;
-
-      if (left && !right)
-         switch_index <<= 1;
-      else if (right && !left)
-         switch_index += switch_index + 1;
-      else
-      {
-         if (queue->elems[tmp_ptr * 2]
-               >= queue->elems[tmp_ptr * 2 + 1])
-            switch_index <<= 1;
-         else
-            switch_index += switch_index + 1;
-      }
-
-      parent = (struct queue_elem*)queue->elems[tmp_ptr];
-      child  = (struct queue_elem*)queue->elems[switch_index];
-      queue->elems[tmp_ptr]      = child;
-      queue->elems[switch_index] = parent;
-      tmp_ptr                    = switch_index;
-   }
-
-   return queue->tmp_msg;
-}
diff --git a/libretro-common/queues/task_queue.c b/libretro-common/queues/task_queue.c
deleted file mode 100644
index bc92e7b..0000000
--- a/libretro-common/queues/task_queue.c
+++ /dev/null
@@ -1,820 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (task_queue.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include <queues/task_queue.h>
-
-#ifdef HAVE_THREADS
-#include <rthreads/rthreads.h>
-#define SLOCK_LOCK(x) slock_lock(x)
-#define SLOCK_UNLOCK(x) slock_unlock(x)
-#else
-#define SLOCK_LOCK(x)
-#define SLOCK_UNLOCK(x)
-#endif
-
-typedef struct
-{
-   retro_task_t *front;
-   retro_task_t *back;
-} task_queue_t;
-
-struct retro_task_impl
-{
-   retro_task_queue_msg_t msg_push;
-   void (*push_running)(retro_task_t *);
-   void (*cancel)(void *);
-   void (*reset)(void);
-   void (*wait)(retro_task_condition_fn_t, void *);
-   void (*gather)(void);
-   bool (*find)(retro_task_finder_t, void*);
-   void (*retrieve)(task_retriever_data_t *data);
-   void (*init)(void);
-   void (*deinit)(void);
-};
-
-static retro_task_queue_msg_t msg_push_bak;
-static task_queue_t tasks_running  = {NULL, NULL};
-static task_queue_t tasks_finished = {NULL, NULL};
-
-static struct retro_task_impl *impl_current = NULL;
-static bool task_threaded_enable            = false;
-
-static void task_queue_msg_push(retro_task_t *task,
-      unsigned prio, unsigned duration,
-      bool flush, const char *fmt, ...)
-{
-   char buf[1024];
-   va_list ap;
-
-   buf[0] = '\0';
-
-   va_start(ap, fmt);
-   vsnprintf(buf, sizeof(buf), fmt, ap);
-   va_end(ap);
-
-   if (impl_current->msg_push)
-      impl_current->msg_push(buf, prio, duration, flush);
-}
-
-static void task_queue_push_progress(retro_task_t *task)
-{
-   if (task->title && !task->mute)
-   {
-      if (task->finished)
-      {
-         if (task->error)
-            task_queue_msg_push(task, 1, 60, true, "%s: %s",
-               "Task failed", task->title);
-         else
-            task_queue_msg_push(task, 1, 60, false, "100%%: %s", task->title);
-      }
-      else
-      {
-         if (task->progress >= 0 && task->progress <= 100)
-            task_queue_msg_push(task, 1, 60, true, "%i%%: %s",
-                  task->progress, task->title);
-         else
-            task_queue_msg_push(task, 1, 60, false, "%s...", task->title);
-      }
-   }
-}
-
-static void task_queue_put(task_queue_t *queue, retro_task_t *task)
-{
-   task->next = NULL;
-
-   if (queue->front)
-      queue->back->next = task;
-   else
-      queue->front = task;
-
-   queue->back = task;
-}
-
-static retro_task_t *task_queue_get(task_queue_t *queue)
-{
-   retro_task_t *task = queue->front;
-
-   if (task)
-   {
-      queue->front = task->next;
-      task->next = NULL;
-   }
-
-   return task;
-}
-
-static void retro_task_internal_gather(void)
-{
-   retro_task_t *task = NULL;
-   while ((task = task_queue_get(&tasks_finished)) != NULL)
-   {
-      task_queue_push_progress(task);
-
-      if (task->callback)
-         task->callback(task->task_data, task->user_data, task->error);
-
-      if (task->cleanup)
-          task->cleanup(task);
-
-      if (task->error)
-         free(task->error);
-
-      if (task->title)
-         free(task->title);
-
-      free(task);
-   }
-}
-
-static void retro_task_regular_push_running(retro_task_t *task)
-{
-   task_queue_put(&tasks_running, task);
-}
-
-static void retro_task_regular_cancel(void *task)
-{
-   retro_task_t *t = (retro_task_t*)task;
-   t->cancelled    = true;
-}
-
-static void retro_task_regular_gather(void)
-{
-   retro_task_t *task  = NULL;
-   retro_task_t *queue = NULL;
-   retro_task_t *next  = NULL;
-
-   while ((task = task_queue_get(&tasks_running)) != NULL)
-   {
-      task->next = queue;
-      queue = task;
-   }
-
-   for (task = queue; task; task = next)
-   {
-      next = task->next;
-      task->handler(task);
-
-      task_queue_push_progress(task);
-
-      if (task->finished)
-         task_queue_put(&tasks_finished, task);
-      else
-         retro_task_regular_push_running(task);
-   }
-
-   retro_task_internal_gather();
-}
-
-static void retro_task_regular_wait(retro_task_condition_fn_t cond, void* data)
-{
-   while (tasks_running.front && (!cond || cond(data)))
-      retro_task_regular_gather();
-}
-
-static void retro_task_regular_reset(void)
-{
-   retro_task_t *task = tasks_running.front;
-
-   for (; task; task = task->next)
-      task->cancelled = true;
-}
-
-static void retro_task_regular_init(void)
-{
-}
-
-static void retro_task_regular_deinit(void)
-{
-}
-
-static bool retro_task_regular_find(retro_task_finder_t func, void *user_data)
-{
-   retro_task_t *task = tasks_running.front;
-
-   for (; task; task = task->next)
-   {
-      if (func(task, user_data))
-         return true;
-   }
-
-   return false;
-}
-
-static void retro_task_regular_retrieve(task_retriever_data_t *data)
-{
-   retro_task_t *task          = NULL;
-   task_retriever_info_t *tail = NULL;
-
-   /* Parse all running tasks and handle matching handlers */
-   for (task = tasks_running.front; task != NULL; task = task->next)
-   {
-      task_retriever_info_t *info = NULL;
-      if (task->handler != data->handler)
-         continue;
-
-      /* Create new link */
-      info       = (task_retriever_info_t*)malloc(sizeof(task_retriever_info_t));
-      info->data = malloc(data->element_size);
-      info->next = NULL;
-
-      /* Call retriever function and fill info-specific data */
-      if (!data->func(task, info->data))
-      {
-         free(info->data);
-         free(info);
-         continue;
-      }
-
-      /* Add link to list */
-      if (data->list)
-      {
-         if (tail)
-         {
-            tail->next = info;
-            tail       = tail->next;
-         }
-         else
-            tail       = info;
-      }
-      else
-      {
-         data->list    = info;
-         tail          = data->list;
-      }
-   }
-}
-
-static struct retro_task_impl impl_regular = {
-   NULL,
-   retro_task_regular_push_running,
-   retro_task_regular_cancel,
-   retro_task_regular_reset,
-   retro_task_regular_wait,
-   retro_task_regular_gather,
-   retro_task_regular_find,
-   retro_task_regular_retrieve,
-   retro_task_regular_init,
-   retro_task_regular_deinit
-};
-
-#ifdef HAVE_THREADS
-static slock_t *running_lock    = NULL;
-static slock_t *finished_lock   = NULL;
-static slock_t *property_lock   = NULL;
-static slock_t *queue_lock      = NULL;
-static scond_t *worker_cond     = NULL;
-static sthread_t *worker_thread = NULL;
-static bool worker_continue     = true; /* use running_lock when touching it */
-
-static void task_queue_remove(task_queue_t *queue, retro_task_t *task)
-{
-   retro_task_t     *t = NULL;
-   retro_task_t *front = NULL;
-
-   slock_lock(queue_lock);
-   front = queue->front;
-   slock_unlock(queue_lock);
-
-   /* Remove first element if needed */
-   if (task == front)
-   {
-      slock_lock(queue_lock);
-      queue->front = task->next;
-      slock_unlock(queue_lock);
-      task->next   = NULL;
-       
-      return;
-   }
-
-   /* Parse queue */
-   t = front;
-    
-   while (t && t->next)
-   {
-      /* Remove task and update queue */
-      if (t->next == task)
-      {
-         t->next    = task->next;
-         task->next = NULL;
-         break;
-      }
-
-      /* Update iterator */
-      t = t->next;
-   }
-}
-
-static void retro_task_threaded_push_running(retro_task_t *task)
-{
-   slock_lock(running_lock);
-   slock_lock(queue_lock);
-   task_queue_put(&tasks_running, task);
-   scond_signal(worker_cond);
-   slock_unlock(queue_lock);
-   slock_unlock(running_lock);
-}
-
-static void retro_task_threaded_cancel(void *task)
-{
-   retro_task_t *t;
-
-   slock_lock(running_lock);
-
-   for (t = tasks_running.front; t; t = t->next)
-   {
-      if (t == task)
-      {
-        t->cancelled = true;
-        break;
-      }
-   }
-
-   slock_unlock(running_lock);
-}
-
-static void retro_task_threaded_gather(void)
-{
-   retro_task_t *task = NULL;
-
-   slock_lock(property_lock);
-   slock_lock(running_lock);
-   for (task = tasks_running.front; task; task = task->next)
-      task_queue_push_progress(task);
-
-   slock_unlock(running_lock);
-
-   slock_lock(finished_lock);
-   retro_task_internal_gather();
-   slock_unlock(finished_lock);
-   slock_unlock(property_lock);
-}
-
-static void retro_task_threaded_wait(retro_task_condition_fn_t cond, void* data)
-{
-   bool wait = false;
-
-   do
-   {
-      retro_task_threaded_gather();
-
-      slock_lock(running_lock);
-      wait = (tasks_running.front != NULL) &&
-             (!cond || cond(data));
-      slock_unlock(running_lock);
-   } while (wait);
-}
-
-static void retro_task_threaded_reset(void)
-{
-   retro_task_t *task = NULL;
-
-   slock_lock(running_lock);
-   for (task = tasks_running.front; task; task = task->next)
-      task->cancelled = true;
-   slock_unlock(running_lock);
-}
-
-
-static bool retro_task_threaded_find(
-      retro_task_finder_t func, void *user_data)
-{
-   retro_task_t *task = NULL;
-   bool result = false;
-
-   slock_lock(running_lock);
-   for (task = tasks_running.front; task; task = task->next)
-   {
-      if (func(task, user_data))
-      {
-         result = true;
-         break;
-      }
-   }
-   slock_unlock(running_lock);
-
-   return result;
-}
-
-static void retro_task_threaded_retrieve(task_retriever_data_t *data)
-{
-   /* Protect access to running tasks */
-   slock_lock(running_lock);
-
-   /* Call regular retrieve function */
-   retro_task_regular_retrieve(data);
-
-   /* Release access to running tasks */
-   slock_unlock(running_lock);
-}
-
-static void threaded_worker(void *userdata)
-{
-   (void)userdata;
-
-   for (;;)
-   {
-      retro_task_t *task  = NULL;
-      bool finished = false;
-
-      if (!worker_continue)
-         break; /* should we keep running until all tasks finished? */
-
-      slock_lock(running_lock);
-
-      /* Get first task to run */
-      task = tasks_running.front;
-      if (task == NULL)
-      {
-         scond_wait(worker_cond, running_lock);
-         slock_unlock(running_lock);
-         continue;
-      }
-
-      slock_unlock(running_lock);
-
-      task->handler(task);
-
-      slock_lock(property_lock);
-      finished = task->finished;
-      slock_unlock(property_lock);
-
-      slock_lock(running_lock);
-      task_queue_remove(&tasks_running, task);
-      slock_unlock(running_lock);
-
-      /* Update queue */
-      if (!finished)
-      {
-         /* Re-add task to running queue */
-         retro_task_threaded_push_running(task);
-      }
-      else
-      {
-         /* Add task to finished queue */
-         slock_lock(finished_lock);
-         task_queue_put(&tasks_finished, task);
-         slock_unlock(finished_lock);
-      }
-   }
-}
-
-static void retro_task_threaded_init(void)
-{
-   running_lock  = slock_new();
-   finished_lock = slock_new();
-   property_lock = slock_new();
-   queue_lock    = slock_new();
-   worker_cond   = scond_new();
-
-   slock_lock(running_lock);
-   worker_continue = true;
-   slock_unlock(running_lock);
-
-   worker_thread = sthread_create(threaded_worker, NULL);
-}
-
-static void retro_task_threaded_deinit(void)
-{
-   slock_lock(running_lock);
-   worker_continue = false;
-   scond_signal(worker_cond);
-   slock_unlock(running_lock);
-
-   sthread_join(worker_thread);
-
-   scond_free(worker_cond);
-   slock_free(running_lock);
-   slock_free(finished_lock);
-   slock_free(property_lock);
-   slock_free(queue_lock);
-
-   worker_thread = NULL;
-   worker_cond   = NULL;
-   running_lock  = NULL;
-   finished_lock = NULL;
-   property_lock = NULL;
-   queue_lock = NULL;
-}
-
-static struct retro_task_impl impl_threaded = {
-   NULL,
-   retro_task_threaded_push_running,
-   retro_task_threaded_cancel,
-   retro_task_threaded_reset,
-   retro_task_threaded_wait,
-   retro_task_threaded_gather,
-   retro_task_threaded_find,
-   retro_task_threaded_retrieve,
-   retro_task_threaded_init,
-   retro_task_threaded_deinit
-};
-#endif
-
-/* Deinitializes the task system.
- * This deinitializes the task system.
- * The tasks that are running at
- * the moment will stay on hold */
-void task_queue_deinit(void)
-{
-   if (impl_current)
-      impl_current->deinit();
-   impl_current = NULL;
-}
-
-void task_queue_init(bool threaded, retro_task_queue_msg_t msg_push)
-{
-   impl_current = &impl_regular;
-
-#ifdef HAVE_THREADS
-   if (threaded)
-   {
-      task_threaded_enable = true;
-      impl_current         = &impl_threaded;
-   }
-#endif
-
-   msg_push_bak            = msg_push;
-
-   impl_current->msg_push  = msg_push;
-   impl_current->init();
-}
-
-void task_queue_set_threaded(void)
-{
-   task_threaded_enable = true;
-}
-
-void task_queue_unset_threaded(void)
-{
-   task_threaded_enable = false;
-}
-
-bool task_queue_is_threaded(void)
-{
-   return task_threaded_enable;
-}
-
-bool task_queue_find(task_finder_data_t *find_data)
-{
-   if (!impl_current->find(find_data->func, find_data->userdata))
-      return false;
-   return true;
-}
-
-void task_queue_retrieve(task_retriever_data_t *data)
-{
-   impl_current->retrieve(data);
-}
-
-void task_queue_check(void)
-{
-#ifdef HAVE_THREADS
-   bool current_threaded = (impl_current == &impl_threaded);
-   bool want_threaded    = task_queue_is_threaded();
-
-   if (want_threaded != current_threaded)
-      task_queue_deinit();
-
-   if (!impl_current)
-      task_queue_init(want_threaded, msg_push_bak);
-#endif
-
-   impl_current->gather();
-}
-
-void task_queue_push(retro_task_t *task)
-{
-   /* Ignore this task if a related one is already running */
-   if (task->type == TASK_TYPE_BLOCKING)
-   {
-      retro_task_t *running = NULL;
-      bool found = false;
-
-      SLOCK_LOCK(queue_lock);
-      running = tasks_running.front;
-
-      for (; running; running = running->next)
-      {
-         if (running->type == TASK_TYPE_BLOCKING)
-         {
-            found = true;
-            break;
-         }
-      }
-
-      SLOCK_UNLOCK(queue_lock);
-
-      /* skip this task, user must try again later */
-      if (found)
-         return;
-   }
-
-   /* The lack of NULL checks in the following functions
-    * is proposital to ensure correct control flow by the users. */
-   impl_current->push_running(task);
-}
-
-void task_queue_wait(retro_task_condition_fn_t cond, void* data)
-{
-   impl_current->wait(cond, data);
-}
-
-void task_queue_reset(void)
-{
-   impl_current->reset();
-}
-
-/**
- * Signals a task to end without waiting for
- * it to complete. */
-void task_queue_cancel_task(void *task)
-{
-   impl_current->cancel(task);
-}
-
-void *task_queue_retriever_info_next(task_retriever_info_t **link)
-{
-   void *data = NULL;
-
-   /* Grab data and move to next link */
-   if (*link)
-   {
-      data = (*link)->data;
-      *link = (*link)->next;
-   }
-
-   return data;
-}
-
-void task_queue_retriever_info_free(task_retriever_info_t *list)
-{
-   task_retriever_info_t *info;
-
-   /* Free links including retriever-specific data */
-   while (list)
-   {
-      info = list->next;
-      free(list->data);
-      free(list);
-      list = info;
-   }
-}
-
-void task_set_finished(retro_task_t *task, bool finished)
-{
-   SLOCK_LOCK(property_lock);
-   task->finished = finished;
-   SLOCK_UNLOCK(property_lock);
-}
-
-void task_set_mute(retro_task_t *task, bool mute)
-{
-   SLOCK_LOCK(property_lock);
-   task->mute = mute;
-   SLOCK_UNLOCK(property_lock);
-}
-
-void task_set_error(retro_task_t *task, char *error)
-{
-   SLOCK_LOCK(property_lock);
-   task->error = error;
-   SLOCK_UNLOCK(property_lock);
-}
-
-void task_set_progress(retro_task_t *task, int8_t progress)
-{
-   SLOCK_LOCK(property_lock);
-   task->progress = progress;
-   SLOCK_UNLOCK(property_lock);
-}
-
-void task_set_title(retro_task_t *task, char *title)
-{
-   SLOCK_LOCK(property_lock);
-   task->title = title;
-   SLOCK_UNLOCK(property_lock);
-}
-
-void task_set_data(retro_task_t *task, void *data)
-{
-   SLOCK_LOCK(running_lock);
-   task->task_data = data;
-   SLOCK_UNLOCK(running_lock);
-}
-
-void task_set_cancelled(retro_task_t *task, bool cancelled)
-{
-   SLOCK_LOCK(running_lock);
-   task->cancelled = cancelled;
-   SLOCK_UNLOCK(running_lock);
-}
-
-void task_free_title(retro_task_t *task)
-{
-   SLOCK_LOCK(property_lock);
-   if (task->title)
-      free(task->title);
-   task->title = NULL;
-   SLOCK_UNLOCK(property_lock);
-}
-
-void* task_get_data(retro_task_t *task)
-{
-   void *data = NULL;
-
-   SLOCK_LOCK(running_lock);
-   data = task->task_data;
-   SLOCK_UNLOCK(running_lock);
-
-   return data;
-}
-
-bool task_get_cancelled(retro_task_t *task)
-{
-   bool cancelled = false;
-
-   SLOCK_LOCK(running_lock);
-   cancelled = task->cancelled;
-   SLOCK_UNLOCK(running_lock);
-
-   return cancelled;
-}
-
-bool task_get_finished(retro_task_t *task)
-{
-   bool finished = false;
-
-   SLOCK_LOCK(property_lock);
-   finished = task->finished;
-   SLOCK_UNLOCK(property_lock);
-
-   return finished;
-}
-
-bool task_get_mute(retro_task_t *task)
-{
-   bool mute = false;
-
-   SLOCK_LOCK(property_lock);
-   mute = task->mute;
-   SLOCK_UNLOCK(property_lock);
-
-   return mute;
-}
-
-char* task_get_error(retro_task_t *task)
-{
-   char *error = NULL;
-
-   SLOCK_LOCK(property_lock);
-   error = task->error;
-   SLOCK_UNLOCK(property_lock);
-
-   return error;
-}
-
-int8_t task_get_progress(retro_task_t *task)
-{
-   int8_t progress = 0;
-
-   SLOCK_LOCK(property_lock);
-   progress = task->progress;
-   SLOCK_UNLOCK(property_lock);
-
-   return progress;
-}
-
-char* task_get_title(retro_task_t *task)
-{
-   char *title = NULL;
-
-   SLOCK_LOCK(property_lock);
-   title = task->title;
-   SLOCK_UNLOCK(property_lock);
-
-   return title;
-}
diff --git a/libretro-common/rthreads/gx_pthread.h b/libretro-common/rthreads/gx_pthread.h
deleted file mode 100644
index 8cb4616..0000000
--- a/libretro-common/rthreads/gx_pthread.h
+++ /dev/null
@@ -1,185 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (gx_pthread.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef _GX_PTHREAD_WRAP_GX_
-#define _GX_PTHREAD_WRAP_GX_
-
-#include <ogcsys.h>
-#include <gccore.h>
-#include <ogc/cond.h>
-#include <retro_inline.h>
-
-#ifndef OSThread
-#define OSThread lwp_t
-#endif
-
-#ifndef OSCond
-#define OSCond lwpq_t
-#endif
-
-#ifndef OSThreadQueue
-#define OSThreadQueue lwpq_t
-#endif
-
-#ifndef OSInitMutex
-#define OSInitMutex(mutex) LWP_MutexInit(mutex, 0)
-#endif
-
-#ifndef OSLockMutex
-#define OSLockMutex(mutex) LWP_MutexLock(mutex)
-#endif
-
-#ifndef OSUnlockMutex
-#define OSUnlockMutex(mutex) LWP_MutexUnlock(mutex)
-#endif
-
-#ifndef OSTryLockMutex
-#define OSTryLockMutex(mutex) LWP_MutexTryLock(mutex)
-#endif
-
-#ifndef OSInitCond
-#define OSInitCond(cond) LWP_CondInit(cond)
-#endif
-
-#ifndef OSWaitCond
-#define OSWaitCond(cond, mutex) LWP_CondWait(cond, mutex)
-#endif
-
-#ifndef OSInitThreadQueue
-#define OSInitThreadQueue(queue) LWP_InitQueue(queue)
-#endif
-
-#ifndef OSSleepThread
-#define OSSleepThread(queue) LWP_ThreadSleep(queue)
-#endif
-
-#ifndef OSJoinThread
-#define OSJoinThread(thread, val) LWP_JoinThread(thread, val)
-#endif
-
-#ifndef OSCreateThread
-#define OSCreateThread(thread, func, intarg, ptrarg, stackbase, stacksize, priority, attrs) LWP_CreateThread(thread, func, ptrarg, stackbase, stacksize, priority)
-#endif
-
-#define STACKSIZE (8 * 1024)
-
-typedef OSThread pthread_t;
-typedef mutex_t pthread_mutex_t;
-typedef void* pthread_mutexattr_t;
-typedef int pthread_attr_t;
-typedef OSCond pthread_cond_t;
-typedef OSCond pthread_condattr_t;
-
-static INLINE int pthread_create(pthread_t *thread,
-      const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg)
-{
-   *thread = 0;
-   return OSCreateThread(thread, start_routine, 0 /* unused */, arg,
-         0, STACKSIZE, 64, 0 /* unused */);
-}
-
-static INLINE pthread_t pthread_self(void)
-{
-   /* zero 20-mar-2016: untested */
-   return LWP_GetSelf();
-}
-
-static INLINE int pthread_mutex_init(pthread_mutex_t *mutex,
-      const pthread_mutexattr_t *attr)
-{
-   return OSInitMutex(mutex);
-}
-
-static INLINE int pthread_mutex_destroy(pthread_mutex_t *mutex)
-{
-   return LWP_MutexDestroy(*mutex);
-}
-
-static INLINE int pthread_mutex_lock(pthread_mutex_t *mutex)
-{
-   return OSLockMutex(*mutex);
-}
-
-static INLINE int pthread_mutex_unlock(pthread_mutex_t *mutex)
-{
-   return OSUnlockMutex(*mutex);
-}
-
-static INLINE void pthread_exit(void *retval)
-{
-   /* FIXME: No LWP equivalent for this? */
-   (void)retval;
-}
-
-static INLINE int pthread_detach(pthread_t thread)
-{
-   /* FIXME: pthread_detach equivalent missing? */
-   (void)thread;
-   return 0;
-}
-
-static INLINE int pthread_join(pthread_t thread, void **retval)
-{
-   return OSJoinThread(thread, retval);
-}
-
-static INLINE int pthread_mutex_trylock(pthread_mutex_t *mutex)
-{
-   return OSTryLockMutex(*mutex);
-}
-
-static INLINE int pthread_cond_wait(pthread_cond_t *cond,
-      pthread_mutex_t *mutex)
-{
-   return OSWaitCond(*cond, *mutex);
-}
-
-static INLINE int pthread_cond_timedwait(pthread_cond_t *cond,
-      pthread_mutex_t *mutex, const struct timespec *abstime)
-{
-   return LWP_CondTimedWait(*cond, *mutex, abstime);
-}
-
-static INLINE int pthread_cond_init(pthread_cond_t *cond,
-      const pthread_condattr_t *attr)
-{
-   return OSInitCond(cond);
-}
-
-static INLINE int pthread_cond_signal(pthread_cond_t *cond)
-{
-   return LWP_CondSignal(*cond);
-}
-
-static INLINE int pthread_cond_broadcast(pthread_cond_t *cond)
-{
-   return LWP_CondBroadcast(*cond);
-}
-
-static INLINE int pthread_cond_destroy(pthread_cond_t *cond)
-{
-   return LWP_CondDestroy(*cond);
-}
-
-extern int pthread_equal(pthread_t t1, pthread_t t2);
-
-#endif
diff --git a/libretro-common/rthreads/psp_pthread.h b/libretro-common/rthreads/psp_pthread.h
deleted file mode 100644
index 007aa5c..0000000
--- a/libretro-common/rthreads/psp_pthread.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (psp_pthread.h).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* FIXME: unfinished on PSP, mutexes and condition variables basically a stub. */
-#ifndef _PSP_PTHREAD_WRAP__
-#define _PSP_PTHREAD_WRAP__
-
-#ifdef VITA
-#include <psp2/kernel/threadmgr.h>
-#include <sys/time.h>
-#else
-#include <pspkernel.h>
-#include <pspthreadman.h>
-#include <pspthreadman_kernel.h>
-#endif
-#include <stdio.h>
-#include <retro_inline.h>
-
-#define STACKSIZE (8 * 1024)
-
-typedef SceUID pthread_t;
-typedef SceUID pthread_mutex_t;
-typedef void* pthread_mutexattr_t;
-typedef int pthread_attr_t;
-
-typedef struct
-{
-	SceUID mutex;
-	SceUID sema;
-	int waiting;
-} pthread_cond_t;
-
-typedef SceUID pthread_condattr_t;
-
-/* Use pointer values to create unique names for threads/mutexes */
-char name_buffer[256];
-
-typedef void* (*sthreadEntry)(void *argp);
-
-typedef struct
-{
-   void* arg;
-   sthreadEntry start_routine;
-} sthread_args_struct;
-
-
-static int psp_thread_wrap(SceSize args, void *argp)
-{
-   sthread_args_struct* sthread_args = (sthread_args_struct*)argp;
-
-   return (int)sthread_args->start_routine(sthread_args->arg);
-}
-
-static INLINE int pthread_create(pthread_t *thread,
-      const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg)
-{
-   snprintf(name_buffer, sizeof(name_buffer), "0x%08X", (unsigned int) thread);
-
-#ifdef VITA
-   *thread = sceKernelCreateThread(name_buffer, psp_thread_wrap,
-         0x10000100, 0x10000, 0, 0, NULL);
-#else
-   *thread = sceKernelCreateThread(name_buffer,
-         psp_thread_wrap, 0x20, STACKSIZE, 0, NULL);
-#endif
-
-   sthread_args_struct sthread_args;
-   sthread_args.arg = arg;
-   sthread_args.start_routine = start_routine;
-
-   return sceKernelStartThread(*thread, sizeof(sthread_args), &sthread_args);
-}
-
-static INLINE int pthread_mutex_init(pthread_mutex_t *mutex,
-      const pthread_mutexattr_t *attr)
-{
-   snprintf(name_buffer, sizeof(name_buffer), "0x%08X", (unsigned int) mutex);
-
-#ifdef VITA
-   *mutex = sceKernelCreateMutex(name_buffer, 0, 0, 0);
-	 if(*mutex<0)
-	 		return *mutex;
-	 return 0;
-#else
-   return *mutex = sceKernelCreateSema(name_buffer, 0, 1, 1, NULL);
-#endif
-}
-
-static INLINE int pthread_mutex_destroy(pthread_mutex_t *mutex)
-{
-#ifdef VITA
-   return sceKernelDeleteMutex(*mutex);
-#else
-   return sceKernelDeleteSema(*mutex);
-#endif
-}
-
-static INLINE int pthread_mutex_lock(pthread_mutex_t *mutex)
-{
-#ifdef VITA
-	 int ret = sceKernelLockMutex(*mutex, 1, 0);
-	 return ret;
-
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_mutex_unlock(pthread_mutex_t *mutex)
-{
-#ifdef VITA
-	int ret = sceKernelUnlockMutex(*mutex, 1);
-	return ret;
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-
-static INLINE int pthread_join(pthread_t thread, void **retval)
-{
-#ifdef VITA
-   int res = sceKernelWaitThreadEnd(thread, 0, 0);
-   if (res < 0)
-      return res;
-   return sceKernelDeleteThread(thread);
-#else
-   SceUInt timeout = (SceUInt)-1;
-   sceKernelWaitThreadEnd(thread, &timeout);
-   exit_status = sceKernelGetThreadExitStatus(thread);
-   sceKernelDeleteThread(thread);
-   return exit_status;
-#endif
-}
-
-static INLINE int pthread_mutex_trylock(pthread_mutex_t *mutex)
-{
-#ifdef VITA
-   return sceKernelTryLockMutex(*mutex, 1 /* not sure about this last param */);
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_wait(pthread_cond_t *cond,
-      pthread_mutex_t *mutex)
-{
-#ifdef VITA
-   int ret = pthread_mutex_lock(&cond->mutex);
-   if (ret < 0)
-      return ret;
-   ++cond->waiting;
-   pthread_mutex_unlock(mutex);
-   pthread_mutex_unlock(&cond->mutex);
-
-   ret = sceKernelWaitSema(cond->sema, 1, 0);
-   if (ret < 0)
-      sceClibPrintf("Premature wakeup: %08X", ret);
-   pthread_mutex_lock(mutex);
-   return ret;
-#else
-   /* FIXME: stub */
-   sceKernelDelayThread(10000);
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_timedwait(pthread_cond_t *cond,
-      pthread_mutex_t *mutex, const struct timespec *abstime)
-{
-#ifdef VITA
-   int ret = pthread_mutex_lock(&cond->mutex);
-   if (ret < 0)
-      return ret;
-   ++cond->waiting;
-   pthread_mutex_unlock(mutex);
-   pthread_mutex_unlock(&cond->mutex);
-
-   SceUInt timeout = 0;
-
-   timeout  = abstime->tv_sec;
-   timeout += abstime->tv_nsec / 1.0e6;
-
-   ret = sceKernelWaitSema(cond->sema, 1, &timeout);
-   if (ret < 0)
-      sceClibPrintf("Premature wakeup: %08X", ret);
-   pthread_mutex_lock(mutex);
-   return ret;
-
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_init(pthread_cond_t *cond,
-      const pthread_condattr_t *attr)
-{
-#ifdef VITA
-
-   pthread_mutex_init(&cond->mutex,NULL);
-
-   if(cond->mutex<0)
-      return cond->mutex;
-
-   snprintf(name_buffer, sizeof(name_buffer), "0x%08X", (unsigned int) cond);
-   cond->sema = sceKernelCreateSema(name_buffer, 0, 0, 1, 0);
-
-   if(cond->sema < 0)
-   {
-      pthread_mutex_destroy(&cond->mutex);
-      return cond->sema;
-   }
-
-   cond->waiting = 0;
-
-   return 0;
-
-
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_signal(pthread_cond_t *cond)
-{
-#ifdef VITA
-	pthread_mutex_lock(&cond->mutex);
-	if (cond->waiting)
-   {
-		--cond->waiting;
-		sceKernelSignalSema(cond->sema, 1);
-	}
-	pthread_mutex_unlock(&cond->mutex);
-	return 0;
-#else
-   /* FIXME: stub */
-   return 1;
-#endif
-}
-
-static INLINE int pthread_cond_broadcast(pthread_cond_t *cond)
-{
-   /* FIXME: stub */
-   return 1;
-}
-
-static INLINE int pthread_cond_destroy(pthread_cond_t *cond)
-{
-#ifdef VITA
-   int ret = sceKernelDeleteSema(cond->sema);
-   if(ret < 0)
-    return ret;
-
-   return sceKernelDeleteMutex(cond->mutex);
-#else
-  /* FIXME: stub */
-  return 1;
-#endif
-}
-
-
-static INLINE int pthread_detach(pthread_t thread)
-{
-   return 0;
-}
-
-static INLINE void pthread_exit(void *retval)
-{
-#ifdef VITA
-   sceKernelExitDeleteThread(sceKernelGetThreadId());
-#endif
-}
-
-static INLINE pthread_t pthread_self(void)
-{
-   /* zero 20-mar-2016: untested */
-   return sceKernelGetThreadId();
-}
-
-static INLINE int pthread_equal(pthread_t t1, pthread_t t2)
-{
-	 return t1 == t2;
-}
-
-#endif //_PSP_PTHREAD_WRAP__
diff --git a/libretro-common/rthreads/rthreads.c b/libretro-common/rthreads/rthreads.c
deleted file mode 100644
index c4ffce1..0000000
--- a/libretro-common/rthreads/rthreads.c
+++ /dev/null
@@ -1,822 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rthreads.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifdef __unix__
-#define _POSIX_C_SOURCE 199309
-#endif
-
-#include <stdlib.h>
-
-#include <boolean.h>
-#include <rthreads/rthreads.h>
-
-/* with RETRO_WIN32_USE_PTHREADS, pthreads can be used even on win32. Maybe only supported in MSVC>=2005  */
-
-#if defined(_WIN32) && !defined(RETRO_WIN32_USE_PTHREADS)
-#define USE_WIN32_THREADS
-#ifdef _XBOX
-#include <xtl.h>
-#else
-#define WIN32_LEAN_AND_MEAN
-#ifndef _WIN32_WINNT
-#define _WIN32_WINNT 0x0500 /*_WIN32_WINNT_WIN2K */
-#endif
-#include <windows.h>
-#include <mmsystem.h>
-#endif
-#elif defined(GEKKO)
-#include "gx_pthread.h"
-#elif defined(PSP)
-#include "psp_pthread.h"
-#elif defined(__CELLOS_LV2__)
-#include <pthread.h>
-#include <sys/sys_time.h>
-#else
-#include <pthread.h>
-#include <time.h>
-#endif
-
-#if defined(VITA) || defined(BSD)
-#include <sys/time.h>
-#endif
-
-#ifdef __MACH__
-#include <mach/clock.h>
-#include <mach/mach.h>
-#endif
-
-struct thread_data
-{
-   void (*func)(void*);
-   void *userdata;
-};
-
-struct sthread
-{
-#ifdef USE_WIN32_THREADS
-   HANDLE thread;
-#else
-   pthread_t id;
-#endif
-};
-
-struct slock
-{
-#ifdef USE_WIN32_THREADS
-   CRITICAL_SECTION lock;
-#else
-   pthread_mutex_t lock;
-#endif
-};
-
-#ifdef USE_WIN32_THREADS
-/* The syntax we'll use is mind-bending unless we use a struct. Plus, we might want to store more info later */
-/* This will be used as a linked list immplementing a queue of waiting threads */
-struct QueueEntry
-{
-   struct QueueEntry *next;
-};
-#endif
-
-struct scond
-{
-#ifdef USE_WIN32_THREADS
-   /* With this implementation of scond, we don't have any way of waking 
-    * (or even identifying) specific threads
-    * But we need to wake them in the order indicated by the queue.
-    * This potato token will get get passed around every waiter. 
-    * The bearer can test whether he's next, and hold onto the potato if he is.
-    * When he's done he can then put it back into play to progress 
-    * the queue further */
-   HANDLE hot_potato;
-
-   /* The primary signalled event. Hot potatoes are passed until this is set. */
-   HANDLE event;
-
-   /* the head of the queue; NULL if queue is empty */
-   struct QueueEntry *head;
-
-   /* equivalent to the queue length */
-   int waiters;
-
-   /* how many waiters in the queue have been conceptually wakened by signals 
-    * (even if we haven't managed to actually wake them yet) */
-   int wakens;
-
-   /* used to control access to this scond, in case the user fails */
-   CRITICAL_SECTION cs;
-
-#else
-   pthread_cond_t cond;
-#endif
-};
-
-#ifdef USE_WIN32_THREADS
-static DWORD CALLBACK thread_wrap(void *data_)
-#else
-static void *thread_wrap(void *data_)
-#endif
-{
-   struct thread_data *data = (struct thread_data*)data_;
-   if (!data)
-	   return 0;
-   data->func(data->userdata);
-   free(data);
-   return 0;
-}
-
-/**
- * sthread_create:
- * @start_routine           : thread entry callback function
- * @userdata                : pointer to userdata that will be made
- *                            available in thread entry callback function
- *
- * Create a new thread.
- *
- * Returns: pointer to new thread if successful, otherwise NULL.
- */
-sthread_t *sthread_create(void (*thread_func)(void*), void *userdata)
-{
-   bool thread_created      = false;
-   struct thread_data *data = NULL;
-   sthread_t *thread        = (sthread_t*)calloc(1, sizeof(*thread));
-
-   if (!thread)
-      return NULL;
-
-   data                     = (struct thread_data*)calloc(1, sizeof(*data));
-   if (!data)
-      goto error;
-
-   data->func = thread_func;
-   data->userdata = userdata;
-
-#ifdef USE_WIN32_THREADS
-   thread->thread = CreateThread(NULL, 0, thread_wrap, data, 0, NULL);
-   thread_created = !!thread->thread;
-#else
-#if defined(VITA)
-   pthread_attr_t thread_attr;
-   pthread_attr_init(&thread_attr);
-   pthread_attr_setstacksize(&thread_attr , 0x10000 );
-   thread_created = pthread_create(&thread->id, &thread_attr, thread_wrap, data) == 0;
-#else
-   thread_created = pthread_create(&thread->id, NULL, thread_wrap, data) == 0;
-#endif
-#endif
-
-   if (!thread_created)
-      goto error;
-
-   return thread;
-
-error:
-   if (data)
-      free(data);
-   free(thread);
-   return NULL;
-}
-
-/**
- * sthread_detach:
- * @thread                  : pointer to thread object
- *
- * Detach a thread. When a detached thread terminates, its
- * resources are automatically released back to the system
- * without the need for another thread to join with the
- * terminated thread.
- *
- * Returns: 0 on success, otherwise it returns a non-zero error number.
- */
-int sthread_detach(sthread_t *thread)
-{
-#ifdef USE_WIN32_THREADS
-   CloseHandle(thread->thread);
-   free(thread);
-   return 0;
-#else
-   return pthread_detach(thread->id);
-#endif
-}
-
-/**
- * sthread_join:
- * @thread                  : pointer to thread object
- *
- * Join with a terminated thread. Waits for the thread specified by
- * @thread to terminate. If that thread has already terminated, then
- * it will return immediately. The thread specified by @thread must
- * be joinable.
- *
- * Returns: 0 on success, otherwise it returns a non-zero error number.
- */
-void sthread_join(sthread_t *thread)
-{
-#ifdef USE_WIN32_THREADS
-   WaitForSingleObject(thread->thread, INFINITE);
-   CloseHandle(thread->thread);
-#else
-   pthread_join(thread->id, NULL);
-#endif
-   free(thread);
-}
-
-/**
- * sthread_isself:
- * @thread                  : pointer to thread object
- *
- * Returns: true (1) if calling thread is the specified thread
- */
-bool sthread_isself(sthread_t *thread)
-{
-  /* This thread can't possibly be a null thread */
-  if (!thread) return false;
-
-#ifdef USE_WIN32_THREADS
-   return GetCurrentThread() == thread->thread;
-#else
-   return pthread_equal(pthread_self(),thread->id);
-#endif
-}
-
-/**
- * slock_new:
- *
- * Create and initialize a new mutex. Must be manually
- * freed.
- *
- * Returns: pointer to a new mutex if successful, otherwise NULL.
- **/
-slock_t *slock_new(void)
-{
-   bool mutex_created = false;
-   slock_t      *lock = (slock_t*)calloc(1, sizeof(*lock));
-   if (!lock)
-      return NULL;
-
-#ifdef USE_WIN32_THREADS
-   InitializeCriticalSection(&lock->lock);
-   mutex_created = true;
-#else
-   mutex_created = (pthread_mutex_init(&lock->lock, NULL) == 0);
-#endif
-
-   if (!mutex_created)
-      goto error;
-
-   return lock;
-
-error:
-   free(lock);
-   return NULL;
-}
-
-/**
- * slock_free:
- * @lock                    : pointer to mutex object
- *
- * Frees a mutex.
- **/
-void slock_free(slock_t *lock)
-{
-   if (!lock)
-      return;
-
-#ifdef USE_WIN32_THREADS
-   DeleteCriticalSection(&lock->lock);
-#else
-   pthread_mutex_destroy(&lock->lock);
-#endif
-   free(lock);
-}
-
-/**
- * slock_lock:
- * @lock                    : pointer to mutex object
- *
- * Locks a mutex. If a mutex is already locked by
- * another thread, the calling thread shall block until
- * the mutex becomes available.
-**/
-void slock_lock(slock_t *lock)
-{
-   if (!lock)
-      return;
-#ifdef USE_WIN32_THREADS
-   EnterCriticalSection(&lock->lock);
-#else
-   pthread_mutex_lock(&lock->lock);
-#endif
-}
-
-/**
- * slock_unlock:
- * @lock                    : pointer to mutex object
- *
- * Unlocks a mutex.
- **/
-void slock_unlock(slock_t *lock)
-{
-   if (!lock)
-      return;
-#ifdef USE_WIN32_THREADS
-   LeaveCriticalSection(&lock->lock);
-#else
-   pthread_mutex_unlock(&lock->lock);
-#endif
-}
-
-/**
- * scond_new:
- *
- * Creates and initializes a condition variable. Must
- * be manually freed.
- *
- * Returns: pointer to new condition variable on success,
- * otherwise NULL.
- **/
-scond_t *scond_new(void)
-{
-   scond_t      *cond = (scond_t*)calloc(1, sizeof(*cond));
-
-   if (!cond)
-      return NULL;
-
-#ifdef USE_WIN32_THREADS
-
-   /* This is very complex because recreating condition variable semantics 
-    * with Win32 parts is not easy.
-    *
-    * The main problem is that a condition variable can't be used to 
-    * "pre-wake" a thread (it will get wakened only after it's waited).
-    *
-    * Whereas a win32 event can pre-wake a thread (the event will be set 
-    * in advance, so a 'waiter' won't even have to wait on it). 
-    *
-    * Keep in mind a condition variable can apparently pre-wake a thread, 
-    * insofar as spurious wakeups are always possible,
-    * but nobody will be expecting this and it does not need to be simulated.
-    *
-    * Moreover, we won't be doing this, because it counts as a spurious wakeup 
-    * -- someone else with a genuine claim must get wakened, in any case.
-    *
-    * Therefore we choose to wake only one of the correct waiting threads.
-    * So at the very least, we need to do something clever. But there's 
-    * bigger problems.
-    * We don't even have a straightforward way in win32 to satisfy 
-    * pthread_cond_wait's atomicity requirement. The bulk of this 
-    * algorithm is solving that.
-    *
-    * Note: We might could simplify this using vista+ condition variables, 
-    * but we wanted an XP compatible solution. */
-   cond->event = CreateEvent(NULL, FALSE, FALSE, NULL);
-   if (!cond->event) goto error;
-   cond->hot_potato = CreateEvent(NULL, FALSE, FALSE, NULL);
-   if (!cond->hot_potato)
-   {
-      CloseHandle(cond->event);
-      goto error;
-   }
-   
-   InitializeCriticalSection(&cond->cs);
-   cond->waiters = cond->wakens = 0;
-   cond->head = NULL;
-
-#else
-   if (pthread_cond_init(&cond->cond, NULL) != 0)
-      goto error;
-#endif
-
-   return cond;
-
-error:
-   free(cond);
-   return NULL;
-}
-
-/**
- * scond_free:
- * @cond                    : pointer to condition variable object
- *
- * Frees a condition variable.
-**/
-void scond_free(scond_t *cond)
-{
-   if (!cond)
-      return;
-
-#ifdef USE_WIN32_THREADS
-   CloseHandle(cond->event);
-   CloseHandle(cond->hot_potato);
-   DeleteCriticalSection(&cond->cs);
-#else
-   pthread_cond_destroy(&cond->cond);
-#endif
-   free(cond);
-}
-
-#ifdef USE_WIN32_THREADS
-static bool _scond_wait_win32(scond_t *cond, slock_t *lock, DWORD dwMilliseconds)
-{
-   static bool beginPeriod = false;
-
-   struct QueueEntry myentry;
-   struct QueueEntry **ptr;
-   DWORD tsBegin;
-   DWORD waitResult;
-   DWORD dwFinalTimeout = dwMilliseconds; /* Careful! in case we begin in the head, 
-                                             we don't do the hot potato stuff, 
-                                             so this timeout needs presetting. */
-
-   /* Reminder: `lock` is held before this is called. */
-   /* however, someone else may have called scond_signal without the lock. soo... */
-   EnterCriticalSection(&cond->cs);
-
-   /* since this library is meant for realtime game software 
-    * I have no problem setting this to 1 and forgetting about it. */
-   if (!beginPeriod)
-   {
-      beginPeriod = true;
-      timeBeginPeriod(1);
-   }
-
-   /* Now we can take a good timestamp for use in faking the timeout ourselves. */
-   /* But don't bother unless we need to (to save a little time) */
-   if (dwMilliseconds != INFINITE)
-      tsBegin = timeGetTime();
-
-   /* add ourselves to a queue of waiting threads */
-   ptr = &cond->head;
-
-   /* walk to the end of the linked list */
-   while (*ptr) 
-      ptr = &((*ptr)->next);
-
-   *ptr = &myentry;
-   myentry.next = NULL;
-
-   cond->waiters++;
-
-   /* now the conceptual lock release and condition block are supposed to be atomic.
-    * we can't do that in Windows, but we can simulate the effects by using 
-    * the queue, by the following analysis:
-    * What happens if they aren't atomic?
-    *
-    * 1. a signaller can rush in and signal, expecting a waiter to get it; 
-    * but the waiter wouldn't, because he isn't blocked yet.
-    * Solution: Win32 events make this easy. The event will sit there enabled
-    *
-    * 2. a signaller can rush in and signal, and then turn right around and wait.
-    * Solution: the signaller will get queued behind the waiter, who's 
-    * enqueued before he releases the mutex. */
-
-   /* It's my turn if I'm the head of the queue. 
-    * Check to see if it's my turn. */
-   while (cond->head != &myentry)
-   {
-      /* It isn't my turn: */
-      DWORD timeout = INFINITE;
-
-      /* As long as someone is even going to be able to wake up 
-       * when they receive the potato, keep it going round. */
-      if (cond->wakens > 0)
-         SetEvent(cond->hot_potato);
-
-      /* Assess the remaining timeout time */
-      if (dwMilliseconds != INFINITE)
-      {
-         DWORD now     = timeGetTime();
-         DWORD elapsed = now - tsBegin;
-
-         /* Try one last time with a zero timeout (keeps the code simpler) */
-         if (elapsed > dwMilliseconds)
-            elapsed = dwMilliseconds;
-
-         timeout = dwMilliseconds - elapsed;
-      }
-
-      /* Let someone else go */
-      LeaveCriticalSection(&lock->lock);
-      LeaveCriticalSection(&cond->cs);
-
-      /* Wait a while to catch the hot potato.. 
-       * someone else should get a chance to go */
-      /* After all, it isn't my turn (and it must be someone else's) */
-      Sleep(0);
-      waitResult = WaitForSingleObject(cond->hot_potato, timeout);
-
-      /* I should come out of here with the main lock taken */
-      EnterCriticalSection(&lock->lock);
-      EnterCriticalSection(&cond->cs);
-
-      if (waitResult == WAIT_TIMEOUT)
-      {
-         /* Out of time! Now, let's think about this. I do have the potato now--
-          * maybe it's my turn, and I have the event?
-          * If that's the case, I could proceed right now without aborting 
-          * due to timeout.
-          *
-          * However.. I DID wait a real long time. The caller was willing 
-          * to wait that long.
-          *
-          * I choose to give him one last chance with a zero timeout 
-          * in the next step
-          */
-         if (cond->head == &myentry)
-         {
-            dwFinalTimeout = 0;
-            break;
-         }
-         else
-         {
-            /* It's not our turn and we're out of time. Give up.
-             * Remove ourself from the queue and bail. */
-            struct QueueEntry* curr = cond->head;
-
-            while (curr->next != &myentry)
-               curr = curr->next;
-            curr->next = myentry.next;
-            cond->waiters--;
-            LeaveCriticalSection(&cond->cs);
-            return false;
-         }
-      }
-
-   }
-   
-   /* It's my turn now -- and I hold the potato */
-
-   /* I still have the main lock, in any case */
-   /* I need to release it so that someone can set the event */
-   LeaveCriticalSection(&lock->lock);
-   LeaveCriticalSection(&cond->cs);
-
-   /* Wait for someone to actually signal this condition */
-   /* We're the only waiter waiting on the event right now -- everyone else 
-    * is waiting on something different */
-   waitResult = WaitForSingleObject(cond->event, dwFinalTimeout);
-
-   /* Take the main lock so we can do work. Nobody else waits on this lock 
-    * for very long, so even though it's GO TIME we won't have to wait long */
-   EnterCriticalSection(&lock->lock);
-   EnterCriticalSection(&cond->cs);
-
-   /* Remove ourselves from the queue */
-   cond->head = myentry.next;
-   cond->waiters--;
-
-   if (waitResult == WAIT_TIMEOUT)
-   {
-      /* Oops! ran out of time in the final wait. Just bail. */
-      LeaveCriticalSection(&cond->cs);
-      return false;
-   }
-
-   /* If any other wakenings are pending, go ahead and set it up  */
-   /* There may actually be no waiters. That's OK. The first waiter will come in, 
-    * find it's his turn, and immediately get the signaled event */
-   cond->wakens--;
-   if (cond->wakens > 0)
-   {
-      SetEvent(cond->event);
-
-      /* Progress the queue: Put the hot potato back into play. It'll be 
-       * tossed around until next in line gets it */
-      SetEvent(cond->hot_potato); 
-   }
-
-   LeaveCriticalSection(&cond->cs);
-   return true;
-}
-#endif
-
-/**
- * scond_wait:
- * @cond                    : pointer to condition variable object
- * @lock                    : pointer to mutex object
- *
- * Block on a condition variable (i.e. wait on a condition).
- **/
-void scond_wait(scond_t *cond, slock_t *lock)
-{
-#ifdef USE_WIN32_THREADS
-   _scond_wait_win32(cond, lock, INFINITE);
-#else
-   pthread_cond_wait(&cond->cond, &lock->lock);
-#endif
-}
-
-/**
- * scond_broadcast:
- * @cond                    : pointer to condition variable object
- *
- * Broadcast a condition. Unblocks all threads currently blocked
- * on the specified condition variable @cond.
- **/
-int scond_broadcast(scond_t *cond)
-{
-#ifdef USE_WIN32_THREADS
-   /* remember: we currently have mutex */
-   if (cond->waiters == 0)
-      return 0;
-   
-   /* awaken everything which is currently queued up */
-   if (cond->wakens == 0)
-      SetEvent(cond->event);
-   cond->wakens = cond->waiters;
-
-   /* Since there is now at least one pending waken, the potato must be in play */
-   SetEvent(cond->hot_potato); 
-
-   return 0;
-#else
-   return pthread_cond_broadcast(&cond->cond);
-#endif
-}
-
-/**
- * scond_signal:
- * @cond                    : pointer to condition variable object
- *
- * Signal a condition. Unblocks at least one of the threads currently blocked
- * on the specified condition variable @cond.
- **/
-void scond_signal(scond_t *cond)
-{
-#ifdef USE_WIN32_THREADS
-
-   /* Unfortunately, pthread_cond_signal does not require that the 
-    * lock be held in advance */
-   /* To avoid stomping on the condvar from other threads, we need 
-    * to control access to it with this */
-   EnterCriticalSection(&cond->cs);
-
-   /* remember: we currently have mutex */
-   if (cond->waiters == 0)
-   {
-      LeaveCriticalSection(&cond->cs);
-      return;
-   }
- 
-   /* wake up the next thing in the queue */
-   if (cond->wakens == 0)
-      SetEvent(cond->event);
-
-   cond->wakens++;
-
-   /* The data structure is done being modified.. I think we can leave the CS now.
-    * This would prevent some other thread from receiving the hot potato and then 
-    * immediately stalling for the critical section.
-    * But remember, we were trying to replicate a semantic where this entire 
-    * scond_signal call was controlled (by the user) by a lock.
-    * So in case there's trouble with this, we can move it after SetEvent() */
-   LeaveCriticalSection(&cond->cs);
-
-   /* Since there is now at least one pending waken, the potato must be in play */
-   SetEvent(cond->hot_potato); 
-
-#else
-   pthread_cond_signal(&cond->cond);
-#endif
-}
-
-/**
- * scond_wait_timeout:
- * @cond                    : pointer to condition variable object
- * @lock                    : pointer to mutex object
- * @timeout_us              : timeout (in microseconds)
- *
- * Try to block on a condition variable (i.e. wait on a condition) until
- * @timeout_us elapses.
- *
- * Returns: false (0) if timeout elapses before condition variable is
- * signaled or broadcast, otherwise true (1).
- **/
-bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us)
-{
-#ifdef USE_WIN32_THREADS
-   /* How to convert a microsecond (us) timeout to millisecond (ms)?
-    *
-    * Someone asking for a 0 timeout clearly wants immediate timeout.
-    * Someone asking for a 1 timeout clearly wants an actual timeout 
-    * of the minimum length */
-
-   /* Someone asking for 1000 or 1001 timeout shouldn't 
-    * accidentally get 2ms. */
-   DWORD dwMilliseconds = timeout_us/1000;
-
-   /* The implementation of a 0 timeout here with pthreads is sketchy.
-    * It isn't clear what happens if pthread_cond_timedwait is called with NOW.
-    * Moreover, it is possible that this thread gets pre-empted after the 
-    * clock_gettime but before the pthread_cond_timedwait.
-    * In order to help smoke out problems caused by this strange usage, 
-    * let's treat a 0 timeout as always timing out.
-    */
-   if (timeout_us == 0)
-      return false;
-   else if (timeout_us < 1000)
-      dwMilliseconds = 1;
-
-   return _scond_wait_win32(cond,lock,dwMilliseconds);
-#else
-   int ret;
-   int64_t seconds, remainder;
-   struct timespec now = {0};
-
-#ifdef __MACH__
-   /* OSX doesn't have clock_gettime. */
-   clock_serv_t cclock;
-   mach_timespec_t mts;
-
-   host_get_clock_service(mach_host_self(), CALENDAR_CLOCK, &cclock);
-   clock_get_time(cclock, &mts);
-   mach_port_deallocate(mach_task_self(), cclock);
-   now.tv_sec = mts.tv_sec;
-   now.tv_nsec = mts.tv_nsec;
-#elif defined(__CELLOS_LV2__)
-   sys_time_sec_t s;
-   sys_time_nsec_t n;
-
-   sys_time_get_current_time(&s, &n);
-   now.tv_sec  = s;
-   now.tv_nsec = n;
-#elif defined(__mips__) || defined(VITA)
-   struct timeval tm;
-
-   gettimeofday(&tm, NULL);
-   now.tv_sec = tm.tv_sec;
-   now.tv_nsec = tm.tv_usec * 1000;
-#elif defined(RETRO_WIN32_USE_PTHREADS)
-   _ftime64_s(&now);
-#elif !defined(GEKKO)
-   /* timeout on libogc is duration, not end time. */
-   clock_gettime(CLOCK_REALTIME, &now);
-#endif
-
-   seconds      = timeout_us / INT64_C(1000000);
-   remainder    = timeout_us % INT64_C(1000000);
-
-   now.tv_sec  += seconds;
-   now.tv_nsec += remainder * INT64_C(1000);
-
-   ret = pthread_cond_timedwait(&cond->cond, &lock->lock, &now);
-   return (ret == 0);
-#endif
-}
-
-#ifdef HAVE_THREAD_STORAGE
-bool sthread_tls_create(sthread_tls_t *tls)
-{
-#ifdef USE_WIN32_THREADS
-   return (*tls = TlsAlloc()) != TLS_OUT_OF_INDEXES;
-#else
-   return pthread_key_create((pthread_key_t*)tls, NULL) == 0;
-#endif
-}
-
-bool sthread_tls_delete(sthread_tls_t *tls)
-{
-#ifdef USE_WIN32_THREADS
-   return TlsFree(*tls) != 0;
-#else
-   return pthread_key_delete(*tls) == 0;
-#endif
-}
-
-void *sthread_tls_get(sthread_tls_t *tls)
-{
-#ifdef USE_WIN32_THREADS
-   return TlsGetValue(*tls);
-#else
-   return pthread_getspecific(*tls);
-#endif
-}
-
-bool sthread_tls_set(sthread_tls_t *tls, const void *data)
-{
-#ifdef USE_WIN32_THREADS
-   return TlsSetValue(*tls, (void*)data) != 0;
-#else
-   return pthread_setspecific(*tls, data) == 0;
-#endif
-}
-#endif
diff --git a/libretro-common/rthreads/xenon_sdl_threads.c b/libretro-common/rthreads/xenon_sdl_threads.c
deleted file mode 100644
index 0097673..0000000
--- a/libretro-common/rthreads/xenon_sdl_threads.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (xenon_sdl_threads.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-/* libSDLxenon doesn't implement this yet :[. Implement it very stupidly for now. ;) */
-
-#include "SDL_thread.h"
-#include "SDL_mutex.h"
-#include <stdlib.h>
-#include <boolean.h>
-
-SDL_cond *SDL_CreateCond(void)
-{
-   bool *sleeping = calloc(1, sizeof(*sleeping));
-   return (SDL_cond*)sleeping;
-}
-
-void SDL_DestroyCond(SDL_cond *sleeping)
-{
-   free(sleeping);
-}
-
-int SDL_CondWait(SDL_cond *cond, SDL_mutex *lock)
-{
-   (void)lock;
-   volatile bool *sleeping = (volatile bool*)cond;
-
-   SDL_mutexV(lock);
-   *sleeping = true;
-   while (*sleeping); /* Yeah, we all love busyloops don't we? ._. */
-   SDL_mutexP(lock);
-
-   return 0;
-}
-
-int SDL_CondSignal(SDL_cond *cond)
-{
-   *(volatile bool*)cond = false;
-   return 0;
-}
-
diff --git a/libretro-common/samples/file/nbio/Makefile b/libretro-common/samples/file/nbio/Makefile
deleted file mode 100644
index fd39a89..0000000
--- a/libretro-common/samples/file/nbio/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-TARGET := nbio_test
-
-LIBRETRO_COMM_DIR := ../../..
-
-SOURCES := \
-	nbio_test.c \
-	$(LIBRETRO_COMM_DIR)/file/nbio/nbio_stdio.c
-
-OBJS := $(SOURCES:.c=.o)
-
-CFLAGS += -Wall -pedantic -std=gnu99 -g -I$(LIBRETRO_COMM_DIR)/include
-
-all: $(TARGET)
-
-%.o: %.c
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-$(TARGET): $(OBJS)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-clean:
-	rm -f $(TARGET) $(OBJS)
-
-.PHONY: clean
-
diff --git a/libretro-common/samples/file/nbio/nbio_test.c b/libretro-common/samples/file/nbio/nbio_test.c
deleted file mode 100644
index 3fadf8f..0000000
--- a/libretro-common/samples/file/nbio/nbio_test.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-
-#include <file/nbio.h>
-
-static void nbio_write_test(void)
-{
-   size_t size;
-   bool looped = false;
-   void* ptr = NULL;
-   struct nbio_t* write = nbio_open("test.bin", NBIO_WRITE);
-
-   nbio_resize(write, 1024*1024);
-
-   ptr = nbio_get_ptr(write, &size);
-   if (size != 1024*1024)
-      puts("ERROR: wrong size (1)");
-
-   memset(ptr, 0x42, 1024*1024);
-   nbio_begin_write(write);
-
-   while (!nbio_iterate(write)) looped=true;
-
-   if (!looped)
-      puts("Write finished immediately?");
-
-   nbio_free(write);
-}
-
-static void nbio_read_test(void)
-{
-   size_t size;
-   bool looped = false;
-   struct nbio_t* read = nbio_open("test.bin", NBIO_READ);
-   void* ptr           = nbio_get_ptr(read, &size);
-
-   if (size != 1024*1024)
-      puts("ERROR: wrong size (2)");
-   if (ptr)
-      puts("Read pointer is available before iterating?");
-
-   nbio_begin_read(read);
-
-   while (!nbio_iterate(read)) looped=true;
-
-   if (!looped)
-      puts("Read finished immediately?");
-
-   ptr = nbio_get_ptr(read, &size);
-
-   if (size != 1024*1024)
-      puts("ERROR: wrong size (3)");
-   if (*(char*)ptr != 0x42 || memcmp(ptr, (char*)ptr+1, 1024*1024-1))
-      puts("ERROR: wrong data");
-
-   nbio_free(read);
-}
-
-int main(void)
-{
-   nbio_write_test();
-   nbio_read_test();
-}
diff --git a/libretro-common/samples/formats/png/Makefile b/libretro-common/samples/formats/png/Makefile
deleted file mode 100644
index 43e1270..0000000
--- a/libretro-common/samples/formats/png/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-TARGET := rpng
-
-CORE_DIR          := .
-LIBRETRO_PNG_DIR  := ../../../formats/png
-LIBRETRO_COMM_DIR := ../../..
-
-HAVE_IMLIB2=1
-
-LDFLAGS +=  -lz
-
-ifeq ($(HAVE_IMLIB2),1)
-CFLAGS += -DHAVE_IMLIB2
-LDFLAGS += -lImlib2
-endif
-
-SOURCES_C := 	\
-	$(CORE_DIR)/rpng_test.c \
-	$(LIBRETRO_PNG_DIR)/rpng.c \
-	$(LIBRETRO_PNG_DIR)/rpng_encode.c \
-	$(LIBRETRO_COMM_DIR)/encodings/encoding_crc32.c \
-	$(LIBRETRO_COMM_DIR)/string/stdstring.c \
-	$(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
-	$(LIBRETRO_COMM_DIR)/file/nbio/nbio_stdio.c \
-	$(LIBRETRO_COMM_DIR)/file/archive_file.c \
-	$(LIBRETRO_COMM_DIR)/file/archive_file_zlib.c \
-	$(LIBRETRO_COMM_DIR)//file/file_path.c \
-	$(LIBRETRO_COMM_DIR)//file/retro_stat.c \
-	$(LIBRETRO_COMM_DIR)/streams/file_stream.c \
-	$(LIBRETRO_COMM_DIR)/lists/string_list.c
-
-OBJS := $(SOURCES_C:.c=.o)
-
-CFLAGS += -Wall -pedantic -std=gnu99 -O0 -g -DHAVE_ZLIB -DRPNG_TEST -I$(LIBRETRO_COMM_DIR)/include
-
-all: $(TARGET)
-
-%.o: %.c
-	$(CC) -c -o $@ $< $(CFLAGS)
-
-$(TARGET): $(OBJS)
-	$(CC) -o $@ $^ $(LDFLAGS)
-
-clean:
-	rm -f $(TARGET) $(OBJS)
-
-.PHONY: clean
-
diff --git a/libretro-common/samples/formats/png/rpng_test.c b/libretro-common/samples/formats/png/rpng_test.c
deleted file mode 100644
index 148544b..0000000
--- a/libretro-common/samples/formats/png/rpng_test.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (rpng_test.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#ifdef HAVE_IMLIB2
-#include <Imlib2.h>
-#endif
-
-#include <file/nbio.h>
-#include <formats/rpng.h>
-#include <formats/image.h>
-
-static bool rpng_load_image_argb(const char *path, uint32_t **data,
-      unsigned *width, unsigned *height)
-{
-   int retval;
-   size_t file_len;
-   bool              ret = true;
-   rpng_t          *rpng = NULL;
-   void             *ptr = NULL;
-   struct nbio_t* handle = (struct nbio_t*)nbio_open(path, NBIO_READ);
-
-   if (!handle)
-      goto end;
-
-   nbio_begin_read(handle);
-
-   while (!nbio_iterate(handle));
-
-   ptr = nbio_get_ptr(handle, &file_len);
-
-   if (!ptr)
-   {
-      ret = false;
-      goto end;
-   }
-
-   rpng = rpng_alloc();
-
-   if (!rpng)
-   {
-      ret = false;
-      goto end;
-   }
-
-   if (!rpng_set_buf_ptr(rpng, (uint8_t*)ptr))
-   {
-      ret = false;
-      goto end;
-   }
-
-   if (!rpng_start(rpng))
-   {
-      ret = false;
-      goto end;
-   }
-
-   while (rpng_iterate_image(rpng));
-
-   if (!rpng_is_valid(rpng))
-   {
-      ret = false;
-      goto end;
-   }
-   
-   do
-   {
-      retval = rpng_process_image(rpng,
-            (void**)data, file_len, width, height);
-   }while(retval == IMAGE_PROCESS_NEXT);
-
-   if (retval == IMAGE_PROCESS_ERROR || retval == IMAGE_PROCESS_ERROR_END)
-      ret = false;
-
-end:
-   if (handle)
-      nbio_free(handle);
-   if (rpng)
-      rpng_free(rpng);
-   rpng = NULL;
-   if (!ret)
-      free(*data);
-   return ret;
-}
-
-static int test_rpng(const char *in_path)
-{
-#ifdef HAVE_IMLIB2
-   Imlib_Image img;
-   const uint32_t *imlib_data = NULL;
-#endif
-   const uint32_t test_data[] = {
-      0xff000000 | 0x50, 0xff000000 | 0x80,
-      0xff000000 | 0x40, 0xff000000 | 0x88,
-      0xff000000 | 0x50, 0xff000000 | 0x80,
-      0xff000000 | 0x40, 0xff000000 | 0x88,
-      0xff000000 | 0xc3, 0xff000000 | 0xd3,
-      0xff000000 | 0xc3, 0xff000000 | 0xd3,
-      0xff000000 | 0xc3, 0xff000000 | 0xd3,
-      0xff000000 | 0xc3, 0xff000000 | 0xd3,
-   };
-   uint32_t *data = NULL;
-   unsigned width = 0;
-   unsigned height = 0;
-
-   if (!rpng_save_image_argb("/tmp/test.png", test_data, 4, 4, 16))
-      return 1;
-
-   if (!rpng_load_image_argb(in_path, &data, &width, &height))
-      return 2;
-
-   fprintf(stderr, "Path: %s.\n", in_path);
-   fprintf(stderr, "Got image: %u x %u.\n", width, height);
-
-#if 0
-   fprintf(stderr, "\nRPNG:\n");
-   for (unsigned h = 0; h < height; h++)
-   {
-      unsigned w;
-      for (w = 0; w < width; w++)
-         fprintf(stderr, "[%08x] ", data[h * width + w]);
-      fprintf(stderr, "\n");
-   }
-#endif
-
-#ifdef HAVE_IMLIB2
-   /* Validate with imlib2 as well. */
-   img = imlib_load_image(in_path);
-   if (!img)
-      return 4;
-
-   imlib_context_set_image(img);
-
-   width      = imlib_image_get_width();
-   height     = imlib_image_get_width();
-   imlib_data = imlib_image_get_data_for_reading_only();
-
-#if 0
-   fprintf(stderr, "\nImlib:\n");
-   for (unsigned h = 0; h < height; h++)
-   {
-      for (unsigned w = 0; w < width; w++)
-         fprintf(stderr, "[%08x] ", imlib_data[h * width + w]);
-      fprintf(stderr, "\n");
-   }
-#endif
-
-   if (memcmp(imlib_data, data, width * height * sizeof(uint32_t)) != 0)
-   {
-      fprintf(stderr, "Imlib and RPNG differs!\n");
-      return 5;
-   }
-   else
-      fprintf(stderr, "Imlib and RPNG are equivalent!\n");
-
-   imlib_free_image();
-#endif
-   free(data);
-
-   return 0;
-}
-
-int main(int argc, char *argv[])
-{
-   const char *in_path = "/tmp/test.png";
-
-   if (argc > 2)
-   {
-      fprintf(stderr, "Usage: %s <png file>\n", argv[0]);
-      return 1;
-   }
-
-   if (argc == 2)
-      in_path = argv[1];
-
-   fprintf(stderr, "Doing tests...\n");
-
-   if (test_rpng(in_path) != 0)
-   {
-      fprintf(stderr, "Test failed.\n");
-      return -1;
-   }
-
-   return 0;
-}
diff --git a/libretro-common/samples/net/Makefile b/libretro-common/samples/net/Makefile
deleted file mode 100644
index 9ef1c56..0000000
--- a/libretro-common/samples/net/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-TARGETS  = http_test net_ifinfo
-
-LIBRETRO_COMM_DIR := ../..
-
-INCFLAGS = -I$(LIBRETRO_COMM_DIR)/include
-
-ifeq ($(DEBUG),1)
-CFLAGS += -O0 -g
-else
-CFLAGS += -O2
-endif
-CFLAGS += -Wall -pedantic -std=gnu99
-
-HTTP_TEST_C = \
-				  $(LIBRETRO_COMM_DIR)/net/net_http.c \
-				  $(LIBRETRO_COMM_DIR)/net/net_compat.c \
-				  $(LIBRETRO_COMM_DIR)/net/net_socket.c \
-				  $(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
-				  $(LIBRETRO_COMM_DIR)/string/stdstring.c \
-				  net_http_test.c
-
-HTTP_TEST_OBJS := $(HTTP_TEST_C:.c=.o)
-
-NET_IFINFO_C = \
-					$(LIBRETRO_COMM_DIR)/net/net_ifinfo.c \
-					net_ifinfo_test.c
-
-NET_IFINFO_OBJS := $(NET_IFINFO_C:.c=.o)
-
-.PHONY: all clean
-
-all: $(TARGETS)
-
-%.o: %.c
-	$(CC) $(INCFLAGS) $< -c $(CFLAGS) -o $@
-
-http_test: $(HTTP_TEST_OBJS)
-	$(CC) $(INCFLAGS) $(HTTP_TEST_OBJS) $(CFLAGS) -o $@
-
-net_ifinfo: $(NET_IFINFO_OBJS)
-	$(CC) $(INCFLAGS) $(NET_IFINFO_OBJS) $(CFLAGS) -o $@
-
-clean:
-	rm -rf $(TARGETS) $(HTTP_TEST_OBJS) $(NET_IFINFO_OBJS)
diff --git a/libretro-common/samples/net/http_test b/libretro-common/samples/net/http_test
deleted file mode 100644
index bcdeb81..0000000
Binary files a/libretro-common/samples/net/http_test and /dev/null differ
diff --git a/libretro-common/samples/net/net_http_test.c b/libretro-common/samples/net/net_http_test.c
deleted file mode 100644
index 92d1cde..0000000
--- a/libretro-common/samples/net/net_http_test.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_http_test.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <net/net_http.h>
-#include <net/net_compat.h>
-
-#ifdef _WIN32
-#include <winsock2.h>
-#endif
-
-int main(void)
-{
-   char   *data;
-   struct http_t *http1, *http3;
-   size_t len, pos = 0, tot = 0;
-
-   if (!network_init())
-      return -1;
-
-   http1 = net_http_new("http://buildbot.libretro.com/nightly/win-x86/latest/mednafen_psx_libretro.dll.zip");
-
-   while (!net_http_update(http1, &pos, &tot))
-      printf("%.9lu / %.9lu        \r",pos,tot);
-	
-   http3 = net_http_new("http://www.wikipedia.org/");
-   while (!net_http_update(http3, NULL, NULL)) {}
-	
-   data  = (char*)net_http_data(http3, &len, false);
-
-   printf("%.*s\n", (int)256, data);
-
-   net_http_delete(http1);
-   net_http_delete(http3);
-   
-   network_deinit();
-
-   return 0;
-}
diff --git a/libretro-common/samples/net/net_ifinfo b/libretro-common/samples/net/net_ifinfo
deleted file mode 100644
index 0b8dc0e..0000000
Binary files a/libretro-common/samples/net/net_ifinfo and /dev/null differ
diff --git a/libretro-common/samples/net/net_ifinfo_test.c b/libretro-common/samples/net/net_ifinfo_test.c
deleted file mode 100644
index 63da414..0000000
--- a/libretro-common/samples/net/net_ifinfo_test.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (net_ifinfo_test.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <net/net_ifinfo.h>
-
-int main(int argc, const char *argv[])
-{
-   unsigned k              = 0;
-   net_ifinfo_t list;
-
-   if (!net_ifinfo_new(&list))
-      return -1;
-
-   for (k = 0; k < list.size; k++)
-   {
-      printf("%s:%s\n", list.entries[k].name, list.entries[k].host);
-   }
-
-   net_ifinfo_free(&list);
-
-   return 0;
-}
diff --git a/libretro-common/samples/net/udp-test.c b/libretro-common/samples/net/udp-test.c
deleted file mode 100644
index c1cbd77..0000000
--- a/libretro-common/samples/net/udp-test.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* public domain */
-/* gcc -o udptest udp-test.c */
-
-/* 
-   will send "RETROPAD RIGHT" indefinely to player 1 
-   to send to player 2 change port to 55401 and so on
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <arpa/inet.h>
-#include <sys/socket.h>
-
-#define SERVER "127.0.0.1"
-#define PORT 55400
-
-void die(char *s)
-{
-    perror(s);
-    exit(1);
-}
-
-int main(void)
-{
-    struct sockaddr_in si_other;
-    int s, i, slen=sizeof(si_other);
-
-    if ( (s=socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1)
-    {
-        die("socket");
-    }
-
-    memset((char *) &si_other, 0, sizeof(si_other));
-    si_other.sin_family = AF_INET;
-    si_other.sin_port = htons(PORT);
-
-    if (inet_aton(SERVER , &si_other.sin_addr) == 0)
-    {
-        fprintf(stderr, "inet_aton() failed\n");
-        exit(1);
-    }
-    while(1)
-    {
-
-        char message[10]="128";
-        //send the message
-        if (sendto(s, message, strlen(message) , 0 , (struct sockaddr *) &si_other, slen)==-1)
-        {
-            die("sendto()");
-        }
-        /* sleep for 1 frame (60hz) */
-        usleep(16*1000); 
-
-    }
-
-    close(s);
-    return 0;
-}
\ No newline at end of file
diff --git a/libretro-common/samples/utils/Makefile b/libretro-common/samples/utils/Makefile
deleted file mode 100644
index ec251f2..0000000
--- a/libretro-common/samples/utils/Makefile
+++ /dev/null
@@ -1,106 +0,0 @@
-compiler    := gcc
-extra_flags :=
-use_neon    := 0
-release	   := release
-DYLIB	      :=
-
-ifeq ($(platform),)
-platform = unix
-ifeq ($(shell uname -a),)
-   platform = win
-else ifneq ($(findstring MINGW,$(shell uname -a)),)
-   platform = win
-else ifneq ($(findstring Darwin,$(shell uname -a)),)
-   platform = osx
-   arch = intel
-ifeq ($(shell uname -p),powerpc)
-   arch = ppc
-endif
-else ifneq ($(findstring win,$(shell uname -a)),)
-   platform = win
-endif
-endif
-
-ifeq ($(platform),gcc)
-extra_rules_gcc := $(shell $(compiler) -dumpmachine)
-endif
-
-ifneq (,$(findstring armv7,$(extra_rules_gcc)))
-extra_flags += -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon
-use_neon := 1
-endif
-
-ifneq (,$(findstring hardfloat,$(extra_rules_gcc)))
-extra_flags += -mfloat-abi=hard
-endif
-
-ifeq (release,$(build))
-extra_flags += -O2
-endif
-
-ifeq (debug,$(build))
-extra_flags += -O0 -g
-endif
-
-ldflags := -shared -Wl,--version-script=link.T
-
-ifeq ($(platform), unix)
-DYLIB =
-else ifeq ($(platform), osx)
-compiler := $(CC)
-DYLIB =
-ldflags := -dynamiclib
-else
-extra_flags += -static-libgcc -static-libstdc++
-DYLIB = exe
-endif
-
-LIBRETRO_COMM_DIR := ../..
-CORE_DIR := $(LIBRETRO_COMM_DIR)/utils
-
-CC      := $(compiler)
-CXX     := $(subst CC,++,$(compiler))
-flags   := -fPIC $(extra_flags) -I$(LIBRETRO_COMM_DIR)/include
-asflags := -fPIC  $(extra_flags)
-LDFLAGS := 
-flags   += -std=c99 -DMD5_BUILD_UTILITY -DSHA1_BUILD_UTILITY
-
-
-ifeq (1,$(use_neon))
-ASMFLAGS := -INEON/asm
-asflags += -mfpu=neon
-endif
-
-
-OBJS += $(CORE_DIR)/djb2.o \
-		  $(CORE_DIR)/md5.o \
-		  $(CORE_DIR)/sha1.o \
-		  $(CORE_DIR)/sha1_main.o \
-		  $(CORE_DIR)/crc32.o
-UTILS += djb2$(DYLIB) md5$(DYLIB) sha1$(DYLIB) crc32$(DYLIB)
-
-all: djb2$(DYLIB) md5$(DYLIB) sha1$(DYLIB) crc32$(DYLIB)
-
-djb2$(DYLIB): $(CORE_DIR)/djb2.o
-
-md5$(DYLIB): $(CORE_DIR)/md5.o
-
-sha1$(DYLIB): $(CORE_DIR)/sha1.o
-
-crc32$(DYLIB): $(CORE_DIR)/crc32.o $(CORE_DIR)/../encodings/encoding_crc32.o
-
-%.o: %.S
-	$(CC) -c -o $@ $(asflags) $(LDFLAGS)  $(ASMFLAGS)  $<
-
-%.o: %.c
-	$(CC) -c -o $@ $(flags) $<
-
-%.$(DYLIB): %.o
-	$(CC) -o $@ $(ldflags) $(flags) $^
-
-clean:
-	rm -f *.o
-	rm -f djb2$(DYLIB) md5$(DYLIB) sha1$(DYLIB) crc32$(DYLIB)
-
-strip:
-	strip -s *.$(DYLIB)
diff --git a/libretro-common/string/stdstring.c b/libretro-common/string/stdstring.c
deleted file mode 100644
index ea8d62e..0000000
--- a/libretro-common/string/stdstring.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* Copyright  (C) 2010-2017 The RetroArch team
- *
- * ---------------------------------------------------------------------------------------
- * The following license statement only applies to this file (stdstring.c).
- * ---------------------------------------------------------------------------------------
- *
- * Permission is hereby granted, free of charge,
- * to any person obtaining a copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
- * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <stdint.h>
-#include <ctype.h>
-
-#include <string/stdstring.h>
-
-char *string_to_upper(char *s)
-{
-   char *cs = (char *)s;
-   for ( ; *cs != '\0'; cs++)
-      *cs = toupper(*cs);
-   return s;
-}
-
-char *string_to_lower(char *s)
-{
-   char *cs = (char *)s;
-   for ( ; *cs != '\0'; cs++)
-      *cs = tolower(*cs);
-   return s;
-}
-
-char *string_ucwords(char *s)
-{
-   char *cs = (char *)s;
-   for ( ; *cs != '\0'; cs++)
-   {
-      if (*cs == ' ')
-         *(cs+1) = toupper(*(cs+1));
-   }
-
-   s[0] = toupper(s[0]);
-   return s;
-}
-
-char *string_replace_substring(const char *in,
-      const char *pattern, const char *replacement)
-{
-   size_t numhits, pattern_len, replacement_len, outlen;
-   const char *inat   = NULL;
-   const char *inprev = NULL;
-   char          *out = NULL;
-   char        *outat = NULL;
-   
-   /* if either pattern or replacement is NULL,
-    * duplicate in and let caller handle it. */
-   if (!pattern || !replacement)
-      return strdup(in);
-   
-   pattern_len     = strlen(pattern);
-   replacement_len = strlen(replacement);
-   numhits         = 0;
-   inat            = in;
-
-   while ((inat = strstr(inat, pattern)))
-   {
-      inat += pattern_len;
-      numhits++;
-   }
-   
-   outlen          = strlen(in) - pattern_len*numhits + replacement_len*numhits;
-   out             = (char *)malloc(outlen+1);
-   outat           = out;
-   inat            = in;
-   inprev          = in;
-
-   while ((inat = strstr(inat, pattern)))
-   {
-      memcpy(outat, inprev, inat-inprev);
-      outat += inat-inprev;
-      memcpy(outat, replacement, replacement_len);
-      outat += replacement_len;
-      inat += pattern_len;
-      inprev = inat;
-   }
-   strcpy(outat, inprev);
-   
-   return out;
-}
-
-/* Remove leading whitespaces */
-char *string_trim_whitespace_left(char *const s)
-{
-   if(s && *s)
-   {
-      size_t len = strlen(s);
-      char *cur  = s;
-
-      while(*cur && isspace(*cur))
-         ++cur, --len;
-
-      if(s != cur)
-         memmove(s, cur, len + 1);
-
-   }
-
-   return s;
-}
-
-/* Remove trailing whitespaces */
-char *string_trim_whitespace_right(char *const s)
-{
-   if(s && *s)
-   {
-      size_t len = strlen(s);
-      char  *cur = s + len - 1;
-
-      while(cur != s && isspace(*cur))
-         --cur, --len;
-
-      cur[isspace(*cur) ? 0 : 1] = '\0';
-   }
-
-   return s;
-}
-
-/* Remove leading and trailing whitespaces */
-char *string_trim_whitespace(char *const s)
-{
-   string_trim_whitespace_right(s);  /* order matters */
-   string_trim_whitespace_left(s);
-
-   return s;
-}
-
-char *word_wrap(char* buffer, const char *string, int line_width)
-{
-   unsigned i   = 0;
-   unsigned len = (unsigned)strlen(string);
-
-   while (i < len)
-   {
-      unsigned counter;
-
-      /* copy string until the end of the line is reached */
-      for (counter = 1; counter <= (unsigned)line_width; counter++)
-      {
-         /* check if end of string reached */
-         if (i == strlen(string))
-         {
-            buffer[i] = 0;
-            return buffer;
-         }
-
-         buffer[i] = string[i];
-
-         /* check for newlines embedded in the original input
-          * and reset the index */
-         if (buffer[i] == '\n')
-            counter = 1;
-         i++;
-      }
-
-      /* check for whitespace */
-      if (string[i] == ' ')
-      {
-         buffer[i] = '\n';
-         i++;
-      }
-      else
-      {
-         int k;
-
-         /* check for nearest whitespace back in string */
-         for (k = i; k > 0; k--)
-         {
-            if (string[k] != ' ')
-               continue;
-
-            buffer[k] = '\n';
-            /* set string index back to character after this one */
-            i         = k + 1;
-            break;
-         }
-      }
-   }
-
-   buffer[i] = 0;
-
-   return buffer;
-}
diff --git a/libretro-common/utils/crc32.c b/libretro-common/utils/crc32.c
deleted file mode 100644
index 786fed7..0000000
--- a/libretro-common/utils/crc32.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* gcc -O3 -o crc32 crc32.c -lz */
-
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-
-#include <encodings/crc32.h>
-
-int main(int argc, const char* argv[])
-{
-   if (argc != 2 )
-   {
-      fprintf( stderr, "Usage: crc32 <filename>\n" );
-      return 1;
-   }
-
-   FILE *file = fopen(argv[1], "rb");
-
-   if (file)
-   {
-      uint32_t crc = encoding_crc32(0L, NULL, 0 );
-
-      for (;;)
-      {
-         uint8_t buffer[16384];
-
-         int numread = fread((void*)buffer, 1, sizeof(buffer), file);
-
-         if (numread > 0)
-            crc = encoding_crc32( crc, buffer, numread );
-         else
-            break;
-      }
-
-      fclose(file);
-
-      printf("%08x\n", crc);
-      return 0;
-   }
-
-   fprintf(stderr, "Error opening input file: %s\n", strerror(errno));
-   return 1;
-}
diff --git a/libretro-common/utils/djb2.c b/libretro-common/utils/djb2.c
deleted file mode 100644
index d70f2c8..0000000
--- a/libretro-common/utils/djb2.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* public domain */
-/* gcc -O3 -o djb2 djb2.c */
-
-#include <stdio.h>
-#include <stdint.h>
-
-static uint32_t djb2(const char* str)
-{
-   const unsigned char* aux = (const unsigned char*)str;
-   uint32_t hash = 5381;
-
-   while (*aux)
-      hash = (hash << 5) + hash + *aux++;
-
-   return hash;
-}
-
-int main(int argc, const char* argv[])
-{
-   int i;
-
-   for (i = 1; i < argc; i++)
-      printf( "0x%08xU: %s\n", djb2( argv[ i ] ), argv[ i ] );
-
-   return 0;
-}
diff --git a/libretro-common/utils/md5.c b/libretro-common/utils/md5.c
deleted file mode 100644
index 34b3a7e..0000000
--- a/libretro-common/utils/md5.c
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
- * This is an OpenSSL-compatible implementation of the RSA Data Security, Inc.
- * MD5 Message-Digest Algorithm (RFC 1321).
- *
- * Homepage:
- * http://openwall.info/wiki/people/solar/software/public-domain-source-code/md5
- *
- * Author:
- * Alexander Peslyak, better known as Solar Designer <solar at openwall.com>
- *
- * This software was written by Alexander Peslyak in 2001.  No copyright is
- * claimed, and the software is hereby placed in the public domain.
- * In case this attempt to disclaim copyright and place the software in the
- * public domain is deemed null and void, then the software is
- * Copyright (c) 2001 Alexander Peslyak and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * (This is a heavily cut-down "BSD license".)
- *
- * This differs from Colin Plumb's older public domain implementation in that
- * no exactly 32-bit integer data type is required (any 32-bit or wider
- * unsigned integer data type will do), there's no compile-time endianness
- * configuration, and the function prototypes match OpenSSL's.  No code from
- * Colin Plumb's implementation has been reused; this comment merely compares
- * the properties of the two independent implementations.
- *
- * The primary goals of this implementation are portability and ease of use.
- * It is meant to be fast, but not as fast as possible.  Some known
- * optimizations are not included to reduce source code size and avoid
- * compile-time configuration.
- */
-#include <rhash.h>
-
-#include <string.h>
-
-/*
- * The basic MD5 functions.
- *
- * F and G are optimized compared to their RFC 1321 definitions for
- * architectures that lack an AND-NOT instruction, just like in Colin Plumb's
- * implementation.
- */
-#define MD5_F(x, y, z)			((z) ^ ((x) & ((y) ^ (z))))
-#define MD5_G(x, y, z)			((y) ^ ((z) & ((x) ^ (y))))
-#define MD5_H(x, y, z)			(((x) ^ (y)) ^ (z))
-#define MD5_H2(x, y, z)			((x) ^ ((y) ^ (z)))
-#define MD5_I(x, y, z)			((y) ^ ((x) | ~(z)))
-
-/*
- * The MD5 transformation for all four rounds.
- */
-#define MD5_STEP(f, a, b, c, d, x, t, s) \
-	(a) += f((b), (c), (d)) + (x) + (t); \
-	(a) = (((a) << (s)) | (((a) & 0xffffffff) >> (32 - (s)))); \
-	(a) += (b);
-
-/*
- * MD5_SET reads 4 input bytes in little-endian byte order and stores them
- * in a properly aligned word in host byte order.
- *
- * The check for little-endian architectures that tolerate unaligned
- * memory accesses is just an optimization.  Nothing will break if it
- * doesn't work.
- */
-#if defined(__i386__) || defined(__x86_64__) || defined(__vax__)
-#define MD5_SET(n) \
-	(*(MD5_u32plus *)&ptr[(n) * 4])
-#define MD5_GET(n) \
-	MD5_SET(n)
-#else
-#define MD5_SET(n) \
-	(ctx->block[(n)] = \
-	(MD5_u32plus)ptr[(n) * 4] | \
-	((MD5_u32plus)ptr[(n) * 4 + 1] << 8) | \
-	((MD5_u32plus)ptr[(n) * 4 + 2] << 16) | \
-	((MD5_u32plus)ptr[(n) * 4 + 3] << 24))
-#define MD5_GET(n) \
-	(ctx->block[(n)])
-#endif
-
-/*
- * This processes one or more 64-byte data blocks, but does NOT update
- * the bit counters.  There are no alignment requirements.
- */
-static const void *MD5_body(MD5_CTX *ctx, const void *data, unsigned long size)
-{
-	const unsigned char *ptr;
-	MD5_u32plus a, b, c, d;
-	MD5_u32plus saved_a, saved_b, saved_c, saved_d;
-
-	ptr = (const unsigned char *)data;
-
-	a = ctx->a;
-	b = ctx->b;
-	c = ctx->c;
-	d = ctx->d;
-
-	do {
-		saved_a = a;
-		saved_b = b;
-		saved_c = c;
-		saved_d = d;
-
-/* Round 1 */
-		MD5_STEP(MD5_F, a, b, c, d, MD5_SET(0), 0xd76aa478, 7)
-		MD5_STEP(MD5_F, d, a, b, c, MD5_SET(1), 0xe8c7b756, 12)
-		MD5_STEP(MD5_F, c, d, a, b, MD5_SET(2), 0x242070db, 17)
-		MD5_STEP(MD5_F, b, c, d, a, MD5_SET(3), 0xc1bdceee, 22)
-		MD5_STEP(MD5_F, a, b, c, d, MD5_SET(4), 0xf57c0faf, 7)
-		MD5_STEP(MD5_F, d, a, b, c, MD5_SET(5), 0x4787c62a, 12)
-		MD5_STEP(MD5_F, c, d, a, b, MD5_SET(6), 0xa8304613, 17)
-		MD5_STEP(MD5_F, b, c, d, a, MD5_SET(7), 0xfd469501, 22)
-		MD5_STEP(MD5_F, a, b, c, d, MD5_SET(8), 0x698098d8, 7)
-		MD5_STEP(MD5_F, d, a, b, c, MD5_SET(9), 0x8b44f7af, 12)
-		MD5_STEP(MD5_F, c, d, a, b, MD5_SET(10), 0xffff5bb1, 17)
-		MD5_STEP(MD5_F, b, c, d, a, MD5_SET(11), 0x895cd7be, 22)
-		MD5_STEP(MD5_F, a, b, c, d, MD5_SET(12), 0x6b901122, 7)
-		MD5_STEP(MD5_F, d, a, b, c, MD5_SET(13), 0xfd987193, 12)
-		MD5_STEP(MD5_F, c, d, a, b, MD5_SET(14), 0xa679438e, 17)
-		MD5_STEP(MD5_F, b, c, d, a, MD5_SET(15), 0x49b40821, 22)
-
-/* Round 2 */
-		MD5_STEP(MD5_G, a, b, c, d, MD5_GET(1), 0xf61e2562, 5)
-		MD5_STEP(MD5_G, d, a, b, c, MD5_GET(6), 0xc040b340, 9)
-		MD5_STEP(MD5_G, c, d, a, b, MD5_GET(11), 0x265e5a51, 14)
-		MD5_STEP(MD5_G, b, c, d, a, MD5_GET(0), 0xe9b6c7aa, 20)
-		MD5_STEP(MD5_G, a, b, c, d, MD5_GET(5), 0xd62f105d, 5)
-		MD5_STEP(MD5_G, d, a, b, c, MD5_GET(10), 0x02441453, 9)
-		MD5_STEP(MD5_G, c, d, a, b, MD5_GET(15), 0xd8a1e681, 14)
-		MD5_STEP(MD5_G, b, c, d, a, MD5_GET(4), 0xe7d3fbc8, 20)
-		MD5_STEP(MD5_G, a, b, c, d, MD5_GET(9), 0x21e1cde6, 5)
-		MD5_STEP(MD5_G, d, a, b, c, MD5_GET(14), 0xc33707d6, 9)
-		MD5_STEP(MD5_G, c, d, a, b, MD5_GET(3), 0xf4d50d87, 14)
-		MD5_STEP(MD5_G, b, c, d, a, MD5_GET(8), 0x455a14ed, 20)
-		MD5_STEP(MD5_G, a, b, c, d, MD5_GET(13), 0xa9e3e905, 5)
-		MD5_STEP(MD5_G, d, a, b, c, MD5_GET(2), 0xfcefa3f8, 9)
-		MD5_STEP(MD5_G, c, d, a, b, MD5_GET(7), 0x676f02d9, 14)
-		MD5_STEP(MD5_G, b, c, d, a, MD5_GET(12), 0x8d2a4c8a, 20)
-
-/* Round 3 */
-		MD5_STEP(MD5_H, a, b, c, d, MD5_GET(5), 0xfffa3942, 4)
-		MD5_STEP(MD5_H2, d, a, b, c, MD5_GET(8), 0x8771f681, 11)
-		MD5_STEP(MD5_H, c, d, a, b, MD5_GET(11), 0x6d9d6122, 16)
-		MD5_STEP(MD5_H2, b, c, d, a, MD5_GET(14), 0xfde5380c, 23)
-		MD5_STEP(MD5_H, a, b, c, d, MD5_GET(1), 0xa4beea44, 4)
-		MD5_STEP(MD5_H2, d, a, b, c, MD5_GET(4), 0x4bdecfa9, 11)
-		MD5_STEP(MD5_H, c, d, a, b, MD5_GET(7), 0xf6bb4b60, 16)
-		MD5_STEP(MD5_H2, b, c, d, a, MD5_GET(10), 0xbebfbc70, 23)
-		MD5_STEP(MD5_H, a, b, c, d, MD5_GET(13), 0x289b7ec6, 4)
-		MD5_STEP(MD5_H2, d, a, b, c, MD5_GET(0), 0xeaa127fa, 11)
-		MD5_STEP(MD5_H, c, d, a, b, MD5_GET(3), 0xd4ef3085, 16)
-		MD5_STEP(MD5_H2, b, c, d, a, MD5_GET(6), 0x04881d05, 23)
-		MD5_STEP(MD5_H, a, b, c, d, MD5_GET(9), 0xd9d4d039, 4)
-		MD5_STEP(MD5_H2, d, a, b, c, MD5_GET(12), 0xe6db99e5, 11)
-		MD5_STEP(MD5_H, c, d, a, b, MD5_GET(15), 0x1fa27cf8, 16)
-		MD5_STEP(MD5_H2, b, c, d, a, MD5_GET(2), 0xc4ac5665, 23)
-
-/* Round 4 */
-		MD5_STEP(MD5_I, a, b, c, d, MD5_GET(0), 0xf4292244, 6)
-		MD5_STEP(MD5_I, d, a, b, c, MD5_GET(7), 0x432aff97, 10)
-		MD5_STEP(MD5_I, c, d, a, b, MD5_GET(14), 0xab9423a7, 15)
-		MD5_STEP(MD5_I, b, c, d, a, MD5_GET(5), 0xfc93a039, 21)
-		MD5_STEP(MD5_I, a, b, c, d, MD5_GET(12), 0x655b59c3, 6)
-		MD5_STEP(MD5_I, d, a, b, c, MD5_GET(3), 0x8f0ccc92, 10)
-		MD5_STEP(MD5_I, c, d, a, b, MD5_GET(10), 0xffeff47d, 15)
-		MD5_STEP(MD5_I, b, c, d, a, MD5_GET(1), 0x85845dd1, 21)
-		MD5_STEP(MD5_I, a, b, c, d, MD5_GET(8), 0x6fa87e4f, 6)
-		MD5_STEP(MD5_I, d, a, b, c, MD5_GET(15), 0xfe2ce6e0, 10)
-		MD5_STEP(MD5_I, c, d, a, b, MD5_GET(6), 0xa3014314, 15)
-		MD5_STEP(MD5_I, b, c, d, a, MD5_GET(13), 0x4e0811a1, 21)
-		MD5_STEP(MD5_I, a, b, c, d, MD5_GET(4), 0xf7537e82, 6)
-		MD5_STEP(MD5_I, d, a, b, c, MD5_GET(11), 0xbd3af235, 10)
-		MD5_STEP(MD5_I, c, d, a, b, MD5_GET(2), 0x2ad7d2bb, 15)
-		MD5_STEP(MD5_I, b, c, d, a, MD5_GET(9), 0xeb86d391, 21)
-
-		a += saved_a;
-		b += saved_b;
-		c += saved_c;
-		d += saved_d;
-
-		ptr += 64;
-	} while (size -= 64);
-
-	ctx->a = a;
-	ctx->b = b;
-	ctx->c = c;
-	ctx->d = d;
-
-	return ptr;
-}
-
-void MD5_Init(MD5_CTX *ctx)
-{
-	ctx->a = 0x67452301;
-	ctx->b = 0xefcdab89;
-	ctx->c = 0x98badcfe;
-	ctx->d = 0x10325476;
-
-	ctx->lo = 0;
-	ctx->hi = 0;
-}
-
-void MD5_Update(MD5_CTX *ctx, const void *data, unsigned long size)
-{
-	MD5_u32plus saved_lo;
-	unsigned long used, available;
-
-	saved_lo = ctx->lo;
-	if ((ctx->lo = (saved_lo + size) & 0x1fffffff) < saved_lo)
-		ctx->hi++;
-	ctx->hi += size >> 29;
-
-	used = saved_lo & 0x3f;
-
-	if (used)
-   {
-      available = 64 - used;
-
-      if (size < available)
-      {
-         memcpy(&ctx->buffer[used], data, size);
-         return;
-      }
-
-      memcpy(&ctx->buffer[used], data, available);
-      data = (const unsigned char *)data + available;
-      size -= available;
-      MD5_body(ctx, ctx->buffer, 64);
-   }
-
-	if (size >= 64)
-   {
-      data = MD5_body(ctx, data, size & ~(unsigned long)0x3f);
-      size &= 0x3f;
-   }
-
-	memcpy(ctx->buffer, data, size);
-}
-
-void MD5_Final(unsigned char *result, MD5_CTX *ctx)
-{
-	unsigned long used, available;
-
-	used = ctx->lo & 0x3f;
-
-	ctx->buffer[used++] = 0x80;
-
-	available = 64 - used;
-
-	if (available < 8)
-   {
-      memset(&ctx->buffer[used], 0, available);
-      MD5_body(ctx, ctx->buffer, 64);
-      used = 0;
-      available = 64;
-   }
-
-	memset(&ctx->buffer[used], 0, available - 8);
-
-	ctx->lo <<= 3;
-	ctx->buffer[56] = ctx->lo;
-	ctx->buffer[57] = ctx->lo >> 8;
-	ctx->buffer[58] = ctx->lo >> 16;
-	ctx->buffer[59] = ctx->lo >> 24;
-	ctx->buffer[60] = ctx->hi;
-	ctx->buffer[61] = ctx->hi >> 8;
-	ctx->buffer[62] = ctx->hi >> 16;
-	ctx->buffer[63] = ctx->hi >> 24;
-
-	MD5_body(ctx, ctx->buffer, 64);
-
-	result[0] = ctx->a;
-	result[1] = ctx->a >> 8;
-	result[2] = ctx->a >> 16;
-	result[3] = ctx->a >> 24;
-	result[4] = ctx->b;
-	result[5] = ctx->b >> 8;
-	result[6] = ctx->b >> 16;
-	result[7] = ctx->b >> 24;
-	result[8] = ctx->c;
-	result[9] = ctx->c >> 8;
-	result[10] = ctx->c >> 16;
-	result[11] = ctx->c >> 24;
-	result[12] = ctx->d;
-	result[13] = ctx->d >> 8;
-	result[14] = ctx->d >> 16;
-	result[15] = ctx->d >> 24;
-
-	memset(ctx, 0, sizeof(*ctx));
-}
-
-#ifdef MD5_BUILD_UTILITY
-
-#include <stdio.h>
-
-int main (int argc, char *argv[])
-{
-   /* For each command line argument in turn:
-    ** filename          -- prints message digest and name of file
-    */
-   int i;
-   MD5_CTX ctx;
-   FILE* file;
-   size_t numread;
-   char buffer[16384];
-   unsigned char result[16];
-
-   for (i = 1; i < argc; i++)
-   {
-      MD5_Init(&ctx);
-      file = fopen(argv[i], "rb");
-
-      if (file)
-      {
-         do
-         {
-            numread = fread((void*)buffer, 1, sizeof(buffer), file);
-
-            if (numread)
-            {
-               MD5_Update(&ctx,(void*)buffer, numread);
-            }
-         }
-         while (numread);
-
-         fclose(file);
-         MD5_Final(result, &ctx);
-         printf("%02x%02x%02x%02x%02x%02x%02x%02x"
-			          "%02x%02x%02x%02x%02x%02x%02x%02x %s\n",
-			          result[ 0 ], result[ 1 ], result[ 2 ], result[ 3 ],
-                result[ 4 ], result[ 5 ], result[ 6 ], result[ 7 ],
-                result[ 8 ], result[ 9 ], result[ 10 ], result[ 11 ],
-                result[ 12 ], result[ 13 ], result[ 14 ], result[ 15 ],
-                argv[i]);
-      }
-   }
-
-   return 0;
-}
-
-#endif
diff --git a/libretro-common/utils/sha1.c b/libretro-common/utils/sha1.c
deleted file mode 100644
index 5dec4f6..0000000
--- a/libretro-common/utils/sha1.c
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- *  sha1.h
- *
- *  Copyright (C) 1998, 2009
- *  Paul E. Jones <paulej@packetizer.com>
- *  All Rights Reserved
- *
- *****************************************************************************
- *  $Id: sha1.h 12 2009-06-22 19:34:25Z paulej $
- *****************************************************************************
- *
- *  Description:
- *      This class implements the Secure Hashing Standard as defined
- *      in FIPS PUB 180-1 published April 17, 1995.
- *
- *      Many of the variable names in the SHA1Context, especially the
- *      single character names, were used because those were the names
- *      used in the publication.
- *
- *      Please read the file sha1.c for more information.
- *
- */
-
-#include <stdio.h>
-#include <string.h>
-#ifdef WIN32
-#include <io.h>
-#endif
-#include <fcntl.h>
-#include <string/stdstring.h>
-
-#ifndef _SHA1_H_
-#define _SHA1_H_
-
-/* 
- *  This structure will hold context information for the hashing
- *  operation
- */
-typedef struct SHA1Context
-{
-   unsigned Message_Digest[5]; /* Message Digest (output)          */
-
-   unsigned Length_Low;        /* Message length in bits           */
-   unsigned Length_High;       /* Message length in bits           */
-
-   unsigned char Message_Block[64]; /* 512-bit message blocks      */
-   int Message_Block_Index;    /* Index into message block array   */
-
-   int Computed;               /* Is the digest computed?          */
-   int Corrupted;              /* Is the message digest corruped?  */
-} SHA1Context;
-
-/*
- *  Function Prototypes
- */
-void SHA1Reset(SHA1Context *);
-int SHA1Result(SHA1Context *);
-void SHA1Input( SHA1Context *,
-      const unsigned char *,
-      unsigned);
-
-#endif
-
-/*
- *  sha1.c
- *
- *  Copyright (C) 1998, 2009
- *  Paul E. Jones <paulej@packetizer.com>
- *  All Rights Reserved
- *
- *****************************************************************************
- *  $Id: sha1.c 12 2009-06-22 19:34:25Z paulej $
- *****************************************************************************
- *
- *  Description:
- *      This file implements the Secure Hashing Standard as defined
- *      in FIPS PUB 180-1 published April 17, 1995.
- *
- *      The Secure Hashing Standard, which uses the Secure Hashing
- *      Algorithm (SHA), produces a 160-bit message digest for a
- *      given data stream.  In theory, it is highly improbable that
- *      two messages will produce the same message digest.  Therefore,
- *      this algorithm can serve as a means of providing a "fingerprint"
- *      for a message.
- *
- *  Portability Issues:
- *      SHA-1 is defined in terms of 32-bit "words".  This code was
- *      written with the expectation that the processor has at least
- *      a 32-bit machine word size.  If the machine word size is larger,
- *      the code should still function properly.  One caveat to that
- *      is that the input functions taking characters and character
- *      arrays assume that only 8 bits of information are stored in each
- *      character.
- *
- *  Caveats:
- *      SHA-1 is designed to work with messages less than 2^64 bits
- *      long. Although SHA-1 allows a message digest to be generated for
- *      messages of any number of bits less than 2^64, this
- *      implementation only works with messages with a length that is a
- *      multiple of the size of an 8-bit character.
- *
- */
-
-/*#include "sha1.h"*/
-
-/*
- *  Define the circular shift macro
- */
-#define SHA1CircularShift(bits,word) \
-                ((((word) << (bits)) & 0xFFFFFFFF) | \
-                ((word) >> (32-(bits))))
-
-/* Function prototypes */
-void SHA1ProcessMessageBlock(SHA1Context *);
-void SHA1PadMessage(SHA1Context *);
-
-/*  
- *  SHA1Reset
- *
- *  Description:
- *      This function will initialize the SHA1Context in preparation
- *      for computing a new message digest.
- *
- *  Parameters:
- *      context: [in/out]
- *          The context to reset.
- *
- *  Returns:
- *      Nothing.
- *
- *  Comments:
- *
- */
-void SHA1Reset(SHA1Context *context)
-{
-   context->Length_Low             = 0;
-   context->Length_High            = 0;
-   context->Message_Block_Index    = 0;
-
-   context->Message_Digest[0]      = 0x67452301;
-   context->Message_Digest[1]      = 0xEFCDAB89;
-   context->Message_Digest[2]      = 0x98BADCFE;
-   context->Message_Digest[3]      = 0x10325476;
-   context->Message_Digest[4]      = 0xC3D2E1F0;
-
-   context->Computed   = 0;
-   context->Corrupted  = 0;
-}
-
-/*  
- *  SHA1Result
- *
- *  Description:
- *      This function will return the 160-bit message digest into the
- *      Message_Digest array within the SHA1Context provided
- *
- *  Parameters:
- *      context: [in/out]
- *          The context to use to calculate the SHA-1 hash.
- *
- *  Returns:
- *      1 if successful, 0 if it failed.
- *
- *  Comments:
- *
- */
-int SHA1Result(SHA1Context *context)
-{
-   if (context->Corrupted)
-      return 0;
-
-   if (!context->Computed)
-   {
-      SHA1PadMessage(context);
-      context->Computed = 1;
-   }
-
-   return 1;
-}
-
-/*  
- *  SHA1Input
- *
- *  Description:
- *      This function accepts an array of octets as the next portion of
- *      the message.
- *
- *  Parameters:
- *      context: [in/out]
- *          The SHA-1 context to update
- *      message_array: [in]
- *          An array of characters representing the next portion of the
- *          message.
- *      length: [in]
- *          The length of the message in message_array
- *
- *  Returns:
- *      Nothing.
- *
- *  Comments:
- *
- */
-void SHA1Input(     SHA1Context         *context,
-                    const unsigned char *message_array,
-                    unsigned            length)
-{
-   if (!length)
-      return;
-
-   if (context->Computed || context->Corrupted)
-   {
-      context->Corrupted = 1;
-      return;
-   }
-
-   while(length-- && !context->Corrupted)
-   {
-      context->Message_Block[context->Message_Block_Index++] =
-         (*message_array & 0xFF);
-
-      context->Length_Low += 8;
-      /* Force it to 32 bits */
-      context->Length_Low &= 0xFFFFFFFF;
-      if (context->Length_Low == 0)
-      {
-         context->Length_High++;
-         /* Force it to 32 bits */
-         context->Length_High &= 0xFFFFFFFF;
-         if (context->Length_High == 0)
-         {
-            /* Message is too long */
-            context->Corrupted = 1;
-         }
-      }
-
-      if (context->Message_Block_Index == 64)
-         SHA1ProcessMessageBlock(context);
-
-      message_array++;
-   }
-}
-
-/*  
- *  SHA1ProcessMessageBlock
- *
- *  Description:
- *      This function will process the next 512 bits of the message
- *      stored in the Message_Block array.
- *
- *  Parameters:
- *      None.
- *
- *  Returns:
- *      Nothing.
- *
- *  Comments:
- *      Many of the variable names in the SHAContext, especially the
- *      single character names, were used because those were the names
- *      used in the publication.
- *         
- *
- */
-void SHA1ProcessMessageBlock(SHA1Context *context)
-{
-   const unsigned K[] =            /* Constants defined in SHA-1   */      
-   {
-      0x5A827999,
-      0x6ED9EBA1,
-      0x8F1BBCDC,
-      0xCA62C1D6
-   };
-   int         t;                  /* Loop counter                 */
-   unsigned    temp;               /* Temporary word value         */
-   unsigned    W[80];              /* Word sequence                */
-   unsigned    A, B, C, D, E;      /* Word buffers                 */
-
-   /*
-    *  Initialize the first 16 words in the array W
-    */
-   for(t = 0; t < 16; t++)
-   {
-      W[t] = ((unsigned) context->Message_Block[t * 4]) << 24;
-      W[t] |= ((unsigned) context->Message_Block[t * 4 + 1]) << 16;
-      W[t] |= ((unsigned) context->Message_Block[t * 4 + 2]) << 8;
-      W[t] |= ((unsigned) context->Message_Block[t * 4 + 3]);
-   }
-
-   for(t = 16; t < 80; t++)
-   {
-      W[t] = SHA1CircularShift(1,W[t-3] ^ W[t-8] ^ W[t-14] ^ W[t-16]);
-   }
-
-   A = context->Message_Digest[0];
-   B = context->Message_Digest[1];
-   C = context->Message_Digest[2];
-   D = context->Message_Digest[3];
-   E = context->Message_Digest[4];
-
-   for(t = 0; t < 20; t++)
-   {
-      temp =  SHA1CircularShift(5,A) +
-         ((B & C) | ((~B) & D)) + E + W[t] + K[0];
-      temp &= 0xFFFFFFFF;
-      E = D;
-      D = C;
-      C = SHA1CircularShift(30,B);
-      B = A;
-      A = temp;
-   }
-
-   for(t = 20; t < 40; t++)
-   {
-      temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[1];
-      temp &= 0xFFFFFFFF;
-      E = D;
-      D = C;
-      C = SHA1CircularShift(30,B);
-      B = A;
-      A = temp;
-   }
-
-   for(t = 40; t < 60; t++)
-   {
-      temp = SHA1CircularShift(5,A) +
-         ((B & C) | (B & D) | (C & D)) + E + W[t] + K[2];
-      temp &= 0xFFFFFFFF;
-      E = D;
-      D = C;
-      C = SHA1CircularShift(30,B);
-      B = A;
-      A = temp;
-   }
-
-   for(t = 60; t < 80; t++)
-   {
-      temp = SHA1CircularShift(5,A) + (B ^ C ^ D) + E + W[t] + K[3];
-      temp &= 0xFFFFFFFF;
-      E = D;
-      D = C;
-      C = SHA1CircularShift(30,B);
-      B = A;
-      A = temp;
-   }
-
-   context->Message_Digest[0] =
-      (context->Message_Digest[0] + A) & 0xFFFFFFFF;
-   context->Message_Digest[1] =
-      (context->Message_Digest[1] + B) & 0xFFFFFFFF;
-   context->Message_Digest[2] =
-      (context->Message_Digest[2] + C) & 0xFFFFFFFF;
-   context->Message_Digest[3] =
-      (context->Message_Digest[3] + D) & 0xFFFFFFFF;
-   context->Message_Digest[4] =
-      (context->Message_Digest[4] + E) & 0xFFFFFFFF;
-
-   context->Message_Block_Index = 0;
-}
-
-/*  
- *  SHA1PadMessage
- *
- *  Description:
- *      According to the standard, the message must be padded to an even
- *      512 bits.  The first padding bit must be a '1'.  The last 64
- *      bits represent the length of the original message.  All bits in
- *      between should be 0.  This function will pad the message
- *      according to those rules by filling the Message_Block array
- *      accordingly.  It will also call SHA1ProcessMessageBlock()
- *      appropriately.  When it returns, it can be assumed that the
- *      message digest has been computed.
- *
- *  Parameters:
- *      context: [in/out]
- *          The context to pad
- *
- *  Returns:
- *      Nothing.
- *
- *  Comments:
- *
- */
-void SHA1PadMessage(SHA1Context *context)
-{
-   /*
-    *  Check to see if the current message block is too small to hold
-    *  the initial padding bits and length.  If so, we will pad the
-    *  block, process it, and then continue padding into a second
-    *  block.
-    */
-   if (context->Message_Block_Index > 55)
-   {
-      context->Message_Block[context->Message_Block_Index++] = 0x80;
-      while(context->Message_Block_Index < 64)
-         context->Message_Block[context->Message_Block_Index++] = 0;
-
-      SHA1ProcessMessageBlock(context);
-
-      while(context->Message_Block_Index < 56)
-         context->Message_Block[context->Message_Block_Index++] = 0;
-   }
-   else
-   {
-      context->Message_Block[context->Message_Block_Index++] = 0x80;
-      while(context->Message_Block_Index < 56)
-         context->Message_Block[context->Message_Block_Index++] = 0;
-   }
-
-   /*
-    *  Store the message length as the last 8 octets
-    */
-   context->Message_Block[56] = (context->Length_High >> 24) & 0xFF;
-   context->Message_Block[57] = (context->Length_High >> 16) & 0xFF;
-   context->Message_Block[58] = (context->Length_High >> 8) & 0xFF;
-   context->Message_Block[59] = (context->Length_High) & 0xFF;
-   context->Message_Block[60] = (context->Length_Low >> 24) & 0xFF;
-   context->Message_Block[61] = (context->Length_Low >> 16) & 0xFF;
-   context->Message_Block[62] = (context->Length_Low >> 8) & 0xFF;
-   context->Message_Block[63] = (context->Length_Low) & 0xFF;
-
-   SHA1ProcessMessageBlock(context);
-}
diff --git a/libretro-common/utils/sha1_main.c b/libretro-common/utils/sha1_main.c
deleted file mode 100644
index 26afe6a..0000000
--- a/libretro-common/utils/sha1_main.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- *  sha.cpp
- *
- *  Copyright (C) 1998, 2009
- *  Paul E. Jones <paulej@packetizer.com>
- *  All Rights Reserved
- *
- *****************************************************************************
- *  $Id: sha.c 12 2009-06-22 19:34:25Z paulej $
- *****************************************************************************
- *
- *  Description:
- *      This utility will display the message digest (fingerprint) for
- *      the specified file(s).
- *
- *  Portability Issues:
- *      None.
- */
-
-#include <stdio.h>
-#include <string.h>
-#ifdef WIN32
-#include <io.h>
-#endif
-#include <fcntl.h>
-#include <string/stdstring.h>
-/*#include "sha1.h"*/
-
-/*
- *  Function prototype
- */
-void usage(void);
-
-
-/*  
- *  main
- *
- *  Description:
- *      This is the entry point for the program
- *
- *  Parameters:
- *      argc: [in]
- *          This is the count of arguments in the argv array
- *      argv: [in]
- *          This is an array of filenames for which to compute message
- *          digests
- *
- *  Returns:
- *      Nothing.
- *
- *  Comments:
- *
- */
-int main(int argc, char *argv[])
-{
-   SHA1Context sha;                /* SHA-1 context                 */
-   FILE        *fp;                /* File pointer for reading files*/
-   char        c;                  /* Character read from file      */
-   int         i;                  /* Counter                       */
-   int         reading_stdin;      /* Are we reading standard in?   */
-   int         read_stdin = 0;     /* Have we read stdin?           */
-
-   /*
-    *  Check the program arguments and print usage information if -?
-    *  or --help is passed as the first argument.
-    */
-   if (argc > 1 && (string_is_equal(argv[1],"-?") ||
-            string_is_equal(argv[1],"--help")))
-   {
-      usage();
-      return 1;
-   }
-
-   /*
-    *  For each filename passed in on the command line, calculate the
-    *  SHA-1 value and display it.
-    */
-   for(i = 0; i < argc; i++)
-   {
-      /*
-       *  We start the counter at 0 to guarantee entry into the for
-       *  loop. So if 'i' is zero, we will increment it now.  If there
-       *  is no argv[1], we will use STDIN below.
-       */
-      if (i == 0)
-         i++;
-
-      if (argc == 1 || string_is_equal(argv[i],"-"))
-      {
-#ifdef WIN32
-         setmode(fileno(stdin), _O_BINARY);
-#endif
-         fp = stdin;
-         reading_stdin = 1;
-      }
-      else
-      {
-         if (!(fp = fopen(argv[i],"rb")))
-         {
-            fprintf(stderr,
-                  "sha: unable to open file %s\n",
-                  argv[i]);
-            return 2;
-         }
-         reading_stdin = 0;
-      }
-
-      /*
-       *  We do not want to read STDIN multiple times
-       */
-      if (reading_stdin)
-      {
-         if (read_stdin)
-            continue;
-
-         read_stdin = 1;
-      }
-
-      /*
-       *  Reset the SHA-1 context and process input
-       */
-      SHA1Reset(&sha);
-
-      c = fgetc(fp);
-      while(!feof(fp))
-      {
-         SHA1Input(&sha, &c, 1);
-         c = fgetc(fp);
-      }
-
-      if (!reading_stdin)
-         fclose(fp);
-
-      if (!SHA1Result(&sha))
-      {
-         fprintf(stderr,
-               "sha: could not compute message digest for %s\n",
-               reading_stdin?"STDIN":argv[i]);
-      }
-      else
-      {
-         printf( "%08X %08X %08X %08X %08X - %s\n",
-               sha.Message_Digest[0],
-               sha.Message_Digest[1],
-               sha.Message_Digest[2],
-               sha.Message_Digest[3],
-               sha.Message_Digest[4],
-               reading_stdin?"STDIN":argv[i]);
-      }
-   }
-
-   return 0;
-}
-
-/*  
- *  usage
- *
- *  Description:
- *      This function will display program usage information to the
- *      user.
- *
- *  Parameters:
- *      None.
- *
- *  Returns:
- *      Nothing.
- *
- *  Comments:
- *
- */
-void usage(void)
-{
-   printf("usage: sha <file> [<file> ...]\n");
-   printf("\tThis program will display the message digest\n");
-   printf("\tfor files using the Secure Hashing Algorithm (SHA-1).\n");
-}
diff --git a/libretro-common/vulkan/vulkan_symbol_wrapper.c b/libretro-common/vulkan/vulkan_symbol_wrapper.c
deleted file mode 100644
index abf02dc..0000000
--- a/libretro-common/vulkan/vulkan_symbol_wrapper.c
+++ /dev/null
@@ -1,485 +0,0 @@
-
-/* This header is autogenerated by vulkan_loader_generator.py */
-#include <vulkan/vulkan_symbol_wrapper.h>
-
-PFN_vkCreateInstance vulkan_symbol_wrapper_vkCreateInstance;
-PFN_vkEnumerateInstanceExtensionProperties vulkan_symbol_wrapper_vkEnumerateInstanceExtensionProperties;
-PFN_vkEnumerateInstanceLayerProperties vulkan_symbol_wrapper_vkEnumerateInstanceLayerProperties;
-PFN_vkDestroyInstance vulkan_symbol_wrapper_vkDestroyInstance;
-PFN_vkEnumeratePhysicalDevices vulkan_symbol_wrapper_vkEnumeratePhysicalDevices;
-PFN_vkGetPhysicalDeviceFeatures vulkan_symbol_wrapper_vkGetPhysicalDeviceFeatures;
-PFN_vkGetPhysicalDeviceFormatProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceFormatProperties;
-PFN_vkGetPhysicalDeviceImageFormatProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceImageFormatProperties;
-PFN_vkGetPhysicalDeviceProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceProperties;
-PFN_vkGetPhysicalDeviceQueueFamilyProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceQueueFamilyProperties;
-PFN_vkGetPhysicalDeviceMemoryProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceMemoryProperties;
-PFN_vkGetDeviceProcAddr vulkan_symbol_wrapper_vkGetDeviceProcAddr;
-PFN_vkCreateDevice vulkan_symbol_wrapper_vkCreateDevice;
-PFN_vkDestroyDevice vulkan_symbol_wrapper_vkDestroyDevice;
-PFN_vkEnumerateDeviceExtensionProperties vulkan_symbol_wrapper_vkEnumerateDeviceExtensionProperties;
-PFN_vkEnumerateDeviceLayerProperties vulkan_symbol_wrapper_vkEnumerateDeviceLayerProperties;
-PFN_vkGetDeviceQueue vulkan_symbol_wrapper_vkGetDeviceQueue;
-PFN_vkQueueSubmit vulkan_symbol_wrapper_vkQueueSubmit;
-PFN_vkQueueWaitIdle vulkan_symbol_wrapper_vkQueueWaitIdle;
-PFN_vkDeviceWaitIdle vulkan_symbol_wrapper_vkDeviceWaitIdle;
-PFN_vkAllocateMemory vulkan_symbol_wrapper_vkAllocateMemory;
-PFN_vkFreeMemory vulkan_symbol_wrapper_vkFreeMemory;
-PFN_vkMapMemory vulkan_symbol_wrapper_vkMapMemory;
-PFN_vkUnmapMemory vulkan_symbol_wrapper_vkUnmapMemory;
-PFN_vkFlushMappedMemoryRanges vulkan_symbol_wrapper_vkFlushMappedMemoryRanges;
-PFN_vkInvalidateMappedMemoryRanges vulkan_symbol_wrapper_vkInvalidateMappedMemoryRanges;
-PFN_vkGetDeviceMemoryCommitment vulkan_symbol_wrapper_vkGetDeviceMemoryCommitment;
-PFN_vkBindBufferMemory vulkan_symbol_wrapper_vkBindBufferMemory;
-PFN_vkBindImageMemory vulkan_symbol_wrapper_vkBindImageMemory;
-PFN_vkGetBufferMemoryRequirements vulkan_symbol_wrapper_vkGetBufferMemoryRequirements;
-PFN_vkGetImageMemoryRequirements vulkan_symbol_wrapper_vkGetImageMemoryRequirements;
-PFN_vkGetImageSparseMemoryRequirements vulkan_symbol_wrapper_vkGetImageSparseMemoryRequirements;
-PFN_vkGetPhysicalDeviceSparseImageFormatProperties vulkan_symbol_wrapper_vkGetPhysicalDeviceSparseImageFormatProperties;
-PFN_vkQueueBindSparse vulkan_symbol_wrapper_vkQueueBindSparse;
-PFN_vkCreateFence vulkan_symbol_wrapper_vkCreateFence;
-PFN_vkDestroyFence vulkan_symbol_wrapper_vkDestroyFence;
-PFN_vkResetFences vulkan_symbol_wrapper_vkResetFences;
-PFN_vkGetFenceStatus vulkan_symbol_wrapper_vkGetFenceStatus;
-PFN_vkWaitForFences vulkan_symbol_wrapper_vkWaitForFences;
-PFN_vkCreateSemaphore vulkan_symbol_wrapper_vkCreateSemaphore;
-PFN_vkDestroySemaphore vulkan_symbol_wrapper_vkDestroySemaphore;
-PFN_vkCreateEvent vulkan_symbol_wrapper_vkCreateEvent;
-PFN_vkDestroyEvent vulkan_symbol_wrapper_vkDestroyEvent;
-PFN_vkGetEventStatus vulkan_symbol_wrapper_vkGetEventStatus;
-PFN_vkSetEvent vulkan_symbol_wrapper_vkSetEvent;
-PFN_vkResetEvent vulkan_symbol_wrapper_vkResetEvent;
-PFN_vkCreateQueryPool vulkan_symbol_wrapper_vkCreateQueryPool;
-PFN_vkDestroyQueryPool vulkan_symbol_wrapper_vkDestroyQueryPool;
-PFN_vkGetQueryPoolResults vulkan_symbol_wrapper_vkGetQueryPoolResults;
-PFN_vkCreateBuffer vulkan_symbol_wrapper_vkCreateBuffer;
-PFN_vkDestroyBuffer vulkan_symbol_wrapper_vkDestroyBuffer;
-PFN_vkCreateBufferView vulkan_symbol_wrapper_vkCreateBufferView;
-PFN_vkDestroyBufferView vulkan_symbol_wrapper_vkDestroyBufferView;
-PFN_vkCreateImage vulkan_symbol_wrapper_vkCreateImage;
-PFN_vkDestroyImage vulkan_symbol_wrapper_vkDestroyImage;
-PFN_vkGetImageSubresourceLayout vulkan_symbol_wrapper_vkGetImageSubresourceLayout;
-PFN_vkCreateImageView vulkan_symbol_wrapper_vkCreateImageView;
-PFN_vkDestroyImageView vulkan_symbol_wrapper_vkDestroyImageView;
-PFN_vkCreateShaderModule vulkan_symbol_wrapper_vkCreateShaderModule;
-PFN_vkDestroyShaderModule vulkan_symbol_wrapper_vkDestroyShaderModule;
-PFN_vkCreatePipelineCache vulkan_symbol_wrapper_vkCreatePipelineCache;
-PFN_vkDestroyPipelineCache vulkan_symbol_wrapper_vkDestroyPipelineCache;
-PFN_vkGetPipelineCacheData vulkan_symbol_wrapper_vkGetPipelineCacheData;
-PFN_vkMergePipelineCaches vulkan_symbol_wrapper_vkMergePipelineCaches;
-PFN_vkCreateGraphicsPipelines vulkan_symbol_wrapper_vkCreateGraphicsPipelines;
-PFN_vkCreateComputePipelines vulkan_symbol_wrapper_vkCreateComputePipelines;
-PFN_vkDestroyPipeline vulkan_symbol_wrapper_vkDestroyPipeline;
-PFN_vkCreatePipelineLayout vulkan_symbol_wrapper_vkCreatePipelineLayout;
-PFN_vkDestroyPipelineLayout vulkan_symbol_wrapper_vkDestroyPipelineLayout;
-PFN_vkCreateSampler vulkan_symbol_wrapper_vkCreateSampler;
-PFN_vkDestroySampler vulkan_symbol_wrapper_vkDestroySampler;
-PFN_vkCreateDescriptorSetLayout vulkan_symbol_wrapper_vkCreateDescriptorSetLayout;
-PFN_vkDestroyDescriptorSetLayout vulkan_symbol_wrapper_vkDestroyDescriptorSetLayout;
-PFN_vkCreateDescriptorPool vulkan_symbol_wrapper_vkCreateDescriptorPool;
-PFN_vkDestroyDescriptorPool vulkan_symbol_wrapper_vkDestroyDescriptorPool;
-PFN_vkResetDescriptorPool vulkan_symbol_wrapper_vkResetDescriptorPool;
-PFN_vkAllocateDescriptorSets vulkan_symbol_wrapper_vkAllocateDescriptorSets;
-PFN_vkFreeDescriptorSets vulkan_symbol_wrapper_vkFreeDescriptorSets;
-PFN_vkUpdateDescriptorSets vulkan_symbol_wrapper_vkUpdateDescriptorSets;
-PFN_vkCreateFramebuffer vulkan_symbol_wrapper_vkCreateFramebuffer;
-PFN_vkDestroyFramebuffer vulkan_symbol_wrapper_vkDestroyFramebuffer;
-PFN_vkCreateRenderPass vulkan_symbol_wrapper_vkCreateRenderPass;
-PFN_vkDestroyRenderPass vulkan_symbol_wrapper_vkDestroyRenderPass;
-PFN_vkGetRenderAreaGranularity vulkan_symbol_wrapper_vkGetRenderAreaGranularity;
-PFN_vkCreateCommandPool vulkan_symbol_wrapper_vkCreateCommandPool;
-PFN_vkDestroyCommandPool vulkan_symbol_wrapper_vkDestroyCommandPool;
-PFN_vkResetCommandPool vulkan_symbol_wrapper_vkResetCommandPool;
-PFN_vkAllocateCommandBuffers vulkan_symbol_wrapper_vkAllocateCommandBuffers;
-PFN_vkFreeCommandBuffers vulkan_symbol_wrapper_vkFreeCommandBuffers;
-PFN_vkBeginCommandBuffer vulkan_symbol_wrapper_vkBeginCommandBuffer;
-PFN_vkEndCommandBuffer vulkan_symbol_wrapper_vkEndCommandBuffer;
-PFN_vkResetCommandBuffer vulkan_symbol_wrapper_vkResetCommandBuffer;
-PFN_vkCmdBindPipeline vulkan_symbol_wrapper_vkCmdBindPipeline;
-PFN_vkCmdSetViewport vulkan_symbol_wrapper_vkCmdSetViewport;
-PFN_vkCmdSetScissor vulkan_symbol_wrapper_vkCmdSetScissor;
-PFN_vkCmdSetLineWidth vulkan_symbol_wrapper_vkCmdSetLineWidth;
-PFN_vkCmdSetDepthBias vulkan_symbol_wrapper_vkCmdSetDepthBias;
-PFN_vkCmdSetBlendConstants vulkan_symbol_wrapper_vkCmdSetBlendConstants;
-PFN_vkCmdSetDepthBounds vulkan_symbol_wrapper_vkCmdSetDepthBounds;
-PFN_vkCmdSetStencilCompareMask vulkan_symbol_wrapper_vkCmdSetStencilCompareMask;
-PFN_vkCmdSetStencilWriteMask vulkan_symbol_wrapper_vkCmdSetStencilWriteMask;
-PFN_vkCmdSetStencilReference vulkan_symbol_wrapper_vkCmdSetStencilReference;
-PFN_vkCmdBindDescriptorSets vulkan_symbol_wrapper_vkCmdBindDescriptorSets;
-PFN_vkCmdBindIndexBuffer vulkan_symbol_wrapper_vkCmdBindIndexBuffer;
-PFN_vkCmdBindVertexBuffers vulkan_symbol_wrapper_vkCmdBindVertexBuffers;
-PFN_vkCmdDraw vulkan_symbol_wrapper_vkCmdDraw;
-PFN_vkCmdDrawIndexed vulkan_symbol_wrapper_vkCmdDrawIndexed;
-PFN_vkCmdDrawIndirect vulkan_symbol_wrapper_vkCmdDrawIndirect;
-PFN_vkCmdDrawIndexedIndirect vulkan_symbol_wrapper_vkCmdDrawIndexedIndirect;
-PFN_vkCmdDispatch vulkan_symbol_wrapper_vkCmdDispatch;
-PFN_vkCmdDispatchIndirect vulkan_symbol_wrapper_vkCmdDispatchIndirect;
-PFN_vkCmdCopyBuffer vulkan_symbol_wrapper_vkCmdCopyBuffer;
-PFN_vkCmdCopyImage vulkan_symbol_wrapper_vkCmdCopyImage;
-PFN_vkCmdBlitImage vulkan_symbol_wrapper_vkCmdBlitImage;
-PFN_vkCmdCopyBufferToImage vulkan_symbol_wrapper_vkCmdCopyBufferToImage;
-PFN_vkCmdCopyImageToBuffer vulkan_symbol_wrapper_vkCmdCopyImageToBuffer;
-PFN_vkCmdUpdateBuffer vulkan_symbol_wrapper_vkCmdUpdateBuffer;
-PFN_vkCmdFillBuffer vulkan_symbol_wrapper_vkCmdFillBuffer;
-PFN_vkCmdClearColorImage vulkan_symbol_wrapper_vkCmdClearColorImage;
-PFN_vkCmdClearDepthStencilImage vulkan_symbol_wrapper_vkCmdClearDepthStencilImage;
-PFN_vkCmdClearAttachments vulkan_symbol_wrapper_vkCmdClearAttachments;
-PFN_vkCmdResolveImage vulkan_symbol_wrapper_vkCmdResolveImage;
-PFN_vkCmdSetEvent vulkan_symbol_wrapper_vkCmdSetEvent;
-PFN_vkCmdResetEvent vulkan_symbol_wrapper_vkCmdResetEvent;
-PFN_vkCmdWaitEvents vulkan_symbol_wrapper_vkCmdWaitEvents;
-PFN_vkCmdPipelineBarrier vulkan_symbol_wrapper_vkCmdPipelineBarrier;
-PFN_vkCmdBeginQuery vulkan_symbol_wrapper_vkCmdBeginQuery;
-PFN_vkCmdEndQuery vulkan_symbol_wrapper_vkCmdEndQuery;
-PFN_vkCmdResetQueryPool vulkan_symbol_wrapper_vkCmdResetQueryPool;
-PFN_vkCmdWriteTimestamp vulkan_symbol_wrapper_vkCmdWriteTimestamp;
-PFN_vkCmdCopyQueryPoolResults vulkan_symbol_wrapper_vkCmdCopyQueryPoolResults;
-PFN_vkCmdPushConstants vulkan_symbol_wrapper_vkCmdPushConstants;
-PFN_vkCmdBeginRenderPass vulkan_symbol_wrapper_vkCmdBeginRenderPass;
-PFN_vkCmdNextSubpass vulkan_symbol_wrapper_vkCmdNextSubpass;
-PFN_vkCmdEndRenderPass vulkan_symbol_wrapper_vkCmdEndRenderPass;
-PFN_vkCmdExecuteCommands vulkan_symbol_wrapper_vkCmdExecuteCommands;
-PFN_vkDestroySurfaceKHR vulkan_symbol_wrapper_vkDestroySurfaceKHR;
-PFN_vkGetPhysicalDeviceSurfaceSupportKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfaceSupportKHR;
-PFN_vkGetPhysicalDeviceSurfaceCapabilitiesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfaceCapabilitiesKHR;
-PFN_vkGetPhysicalDeviceSurfaceFormatsKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfaceFormatsKHR;
-PFN_vkGetPhysicalDeviceSurfacePresentModesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceSurfacePresentModesKHR;
-PFN_vkCreateSwapchainKHR vulkan_symbol_wrapper_vkCreateSwapchainKHR;
-PFN_vkDestroySwapchainKHR vulkan_symbol_wrapper_vkDestroySwapchainKHR;
-PFN_vkGetSwapchainImagesKHR vulkan_symbol_wrapper_vkGetSwapchainImagesKHR;
-PFN_vkAcquireNextImageKHR vulkan_symbol_wrapper_vkAcquireNextImageKHR;
-PFN_vkQueuePresentKHR vulkan_symbol_wrapper_vkQueuePresentKHR;
-PFN_vkGetPhysicalDeviceDisplayPropertiesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceDisplayPropertiesKHR;
-PFN_vkGetPhysicalDeviceDisplayPlanePropertiesKHR vulkan_symbol_wrapper_vkGetPhysicalDeviceDisplayPlanePropertiesKHR;
-PFN_vkGetDisplayPlaneSupportedDisplaysKHR vulkan_symbol_wrapper_vkGetDisplayPlaneSupportedDisplaysKHR;
-PFN_vkGetDisplayModePropertiesKHR vulkan_symbol_wrapper_vkGetDisplayModePropertiesKHR;
-PFN_vkCreateDisplayModeKHR vulkan_symbol_wrapper_vkCreateDisplayModeKHR;
-PFN_vkGetDisplayPlaneCapabilitiesKHR vulkan_symbol_wrapper_vkGetDisplayPlaneCapabilitiesKHR;
-PFN_vkCreateDisplayPlaneSurfaceKHR vulkan_symbol_wrapper_vkCreateDisplayPlaneSurfaceKHR;
-PFN_vkCreateSharedSwapchainsKHR vulkan_symbol_wrapper_vkCreateSharedSwapchainsKHR;
-PFN_vkCreateDebugReportCallbackEXT vulkan_symbol_wrapper_vkCreateDebugReportCallbackEXT;
-PFN_vkDestroyDebugReportCallbackEXT vulkan_symbol_wrapper_vkDestroyDebugReportCallbackEXT;
-PFN_vkDebugReportMessageEXT vulkan_symbol_wrapper_vkDebugReportMessageEXT;
-PFN_vkDebugMarkerSetObjectTagEXT vulkan_symbol_wrapper_vkDebugMarkerSetObjectTagEXT;
-PFN_vkDebugMarkerSetObjectNameEXT vulkan_symbol_wrapper_vkDebugMarkerSetObjectNameEXT;
-PFN_vkCmdDebugMarkerBeginEXT vulkan_symbol_wrapper_vkCmdDebugMarkerBeginEXT;
-PFN_vkCmdDebugMarkerEndEXT vulkan_symbol_wrapper_vkCmdDebugMarkerEndEXT;
-PFN_vkCmdDebugMarkerInsertEXT vulkan_symbol_wrapper_vkCmdDebugMarkerInsertEXT;
-
-static PFN_vkGetInstanceProcAddr GetInstanceProcAddr;
-void vulkan_symbol_wrapper_init(PFN_vkGetInstanceProcAddr get_instance_proc_addr)
-{
-    GetInstanceProcAddr = get_instance_proc_addr;
-}
-
-PFN_vkGetInstanceProcAddr vulkan_symbol_wrapper_instance_proc_addr(void)
-{
-    return GetInstanceProcAddr;
-}
-
-
-VkBool32 vulkan_symbol_wrapper_load_instance_symbol(VkInstance instance, const char *name, PFN_vkVoidFunction *ppSymbol)
-{
-    *ppSymbol = GetInstanceProcAddr(instance, name);
-    return *ppSymbol != NULL;
-}
-
-VkBool32 vulkan_symbol_wrapper_load_device_symbol(VkDevice device, const char *name, PFN_vkVoidFunction *ppSymbol)
-{
-    *ppSymbol = vkGetDeviceProcAddr(device, name);
-    return *ppSymbol != NULL;
-}
-
-VkBool32 vulkan_symbol_wrapper_load_global_symbols(void)
-{
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(NULL, "vkCreateInstance", vkCreateInstance)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(NULL, "vkEnumerateInstanceExtensionProperties", vkEnumerateInstanceExtensionProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(NULL, "vkEnumerateInstanceLayerProperties", vkEnumerateInstanceLayerProperties)) return VK_FALSE;
-    return VK_TRUE;
-}
-
-VkBool32 vulkan_symbol_wrapper_load_core_symbols(VkInstance instance)
-{
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyInstance", vkDestroyInstance)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkEnumeratePhysicalDevices", vkEnumeratePhysicalDevices)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceFeatures", vkGetPhysicalDeviceFeatures)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceFormatProperties", vkGetPhysicalDeviceFormatProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceImageFormatProperties", vkGetPhysicalDeviceImageFormatProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceProperties", vkGetPhysicalDeviceProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceQueueFamilyProperties", vkGetPhysicalDeviceQueueFamilyProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceMemoryProperties", vkGetPhysicalDeviceMemoryProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetDeviceProcAddr", vkGetDeviceProcAddr)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateDevice", vkCreateDevice)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyDevice", vkDestroyDevice)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkEnumerateDeviceExtensionProperties", vkEnumerateDeviceExtensionProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkEnumerateDeviceLayerProperties", vkEnumerateDeviceLayerProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetDeviceQueue", vkGetDeviceQueue)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkQueueSubmit", vkQueueSubmit)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkQueueWaitIdle", vkQueueWaitIdle)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDeviceWaitIdle", vkDeviceWaitIdle)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkAllocateMemory", vkAllocateMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkFreeMemory", vkFreeMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkMapMemory", vkMapMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkUnmapMemory", vkUnmapMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkFlushMappedMemoryRanges", vkFlushMappedMemoryRanges)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkInvalidateMappedMemoryRanges", vkInvalidateMappedMemoryRanges)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetDeviceMemoryCommitment", vkGetDeviceMemoryCommitment)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkBindBufferMemory", vkBindBufferMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkBindImageMemory", vkBindImageMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetBufferMemoryRequirements", vkGetBufferMemoryRequirements)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetImageMemoryRequirements", vkGetImageMemoryRequirements)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetImageSparseMemoryRequirements", vkGetImageSparseMemoryRequirements)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceSparseImageFormatProperties", vkGetPhysicalDeviceSparseImageFormatProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkQueueBindSparse", vkQueueBindSparse)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateFence", vkCreateFence)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyFence", vkDestroyFence)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkResetFences", vkResetFences)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetFenceStatus", vkGetFenceStatus)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkWaitForFences", vkWaitForFences)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateSemaphore", vkCreateSemaphore)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroySemaphore", vkDestroySemaphore)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateEvent", vkCreateEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyEvent", vkDestroyEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetEventStatus", vkGetEventStatus)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkSetEvent", vkSetEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkResetEvent", vkResetEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateQueryPool", vkCreateQueryPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyQueryPool", vkDestroyQueryPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetQueryPoolResults", vkGetQueryPoolResults)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateBuffer", vkCreateBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyBuffer", vkDestroyBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateBufferView", vkCreateBufferView)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyBufferView", vkDestroyBufferView)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateImage", vkCreateImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyImage", vkDestroyImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetImageSubresourceLayout", vkGetImageSubresourceLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateImageView", vkCreateImageView)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyImageView", vkDestroyImageView)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateShaderModule", vkCreateShaderModule)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyShaderModule", vkDestroyShaderModule)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreatePipelineCache", vkCreatePipelineCache)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyPipelineCache", vkDestroyPipelineCache)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPipelineCacheData", vkGetPipelineCacheData)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkMergePipelineCaches", vkMergePipelineCaches)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateGraphicsPipelines", vkCreateGraphicsPipelines)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateComputePipelines", vkCreateComputePipelines)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyPipeline", vkDestroyPipeline)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreatePipelineLayout", vkCreatePipelineLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyPipelineLayout", vkDestroyPipelineLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateSampler", vkCreateSampler)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroySampler", vkDestroySampler)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateDescriptorSetLayout", vkCreateDescriptorSetLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyDescriptorSetLayout", vkDestroyDescriptorSetLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateDescriptorPool", vkCreateDescriptorPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyDescriptorPool", vkDestroyDescriptorPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkResetDescriptorPool", vkResetDescriptorPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkAllocateDescriptorSets", vkAllocateDescriptorSets)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkFreeDescriptorSets", vkFreeDescriptorSets)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkUpdateDescriptorSets", vkUpdateDescriptorSets)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateFramebuffer", vkCreateFramebuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyFramebuffer", vkDestroyFramebuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateRenderPass", vkCreateRenderPass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyRenderPass", vkDestroyRenderPass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetRenderAreaGranularity", vkGetRenderAreaGranularity)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateCommandPool", vkCreateCommandPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyCommandPool", vkDestroyCommandPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkResetCommandPool", vkResetCommandPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkAllocateCommandBuffers", vkAllocateCommandBuffers)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkFreeCommandBuffers", vkFreeCommandBuffers)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkBeginCommandBuffer", vkBeginCommandBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkEndCommandBuffer", vkEndCommandBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkResetCommandBuffer", vkResetCommandBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdBindPipeline", vkCmdBindPipeline)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetViewport", vkCmdSetViewport)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetScissor", vkCmdSetScissor)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetLineWidth", vkCmdSetLineWidth)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetDepthBias", vkCmdSetDepthBias)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetBlendConstants", vkCmdSetBlendConstants)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetDepthBounds", vkCmdSetDepthBounds)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetStencilCompareMask", vkCmdSetStencilCompareMask)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetStencilWriteMask", vkCmdSetStencilWriteMask)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetStencilReference", vkCmdSetStencilReference)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdBindDescriptorSets", vkCmdBindDescriptorSets)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdBindIndexBuffer", vkCmdBindIndexBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdBindVertexBuffers", vkCmdBindVertexBuffers)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdDraw", vkCmdDraw)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdDrawIndexed", vkCmdDrawIndexed)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdDrawIndirect", vkCmdDrawIndirect)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdDrawIndexedIndirect", vkCmdDrawIndexedIndirect)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdDispatch", vkCmdDispatch)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdDispatchIndirect", vkCmdDispatchIndirect)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdCopyBuffer", vkCmdCopyBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdCopyImage", vkCmdCopyImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdBlitImage", vkCmdBlitImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdCopyBufferToImage", vkCmdCopyBufferToImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdCopyImageToBuffer", vkCmdCopyImageToBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdUpdateBuffer", vkCmdUpdateBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdFillBuffer", vkCmdFillBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdClearColorImage", vkCmdClearColorImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdClearDepthStencilImage", vkCmdClearDepthStencilImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdClearAttachments", vkCmdClearAttachments)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdResolveImage", vkCmdResolveImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdSetEvent", vkCmdSetEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdResetEvent", vkCmdResetEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdWaitEvents", vkCmdWaitEvents)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdPipelineBarrier", vkCmdPipelineBarrier)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdBeginQuery", vkCmdBeginQuery)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdEndQuery", vkCmdEndQuery)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdResetQueryPool", vkCmdResetQueryPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdWriteTimestamp", vkCmdWriteTimestamp)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdCopyQueryPoolResults", vkCmdCopyQueryPoolResults)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdPushConstants", vkCmdPushConstants)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdBeginRenderPass", vkCmdBeginRenderPass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdNextSubpass", vkCmdNextSubpass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdEndRenderPass", vkCmdEndRenderPass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCmdExecuteCommands", vkCmdExecuteCommands)) return VK_FALSE;
-    return VK_TRUE;
-}
-
-VkBool32 vulkan_symbol_wrapper_load_core_instance_symbols(VkInstance instance)
-{
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkDestroyInstance", vkDestroyInstance)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkEnumeratePhysicalDevices", vkEnumeratePhysicalDevices)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceFeatures", vkGetPhysicalDeviceFeatures)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceFormatProperties", vkGetPhysicalDeviceFormatProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceImageFormatProperties", vkGetPhysicalDeviceImageFormatProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceProperties", vkGetPhysicalDeviceProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceQueueFamilyProperties", vkGetPhysicalDeviceQueueFamilyProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceMemoryProperties", vkGetPhysicalDeviceMemoryProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetDeviceProcAddr", vkGetDeviceProcAddr)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkCreateDevice", vkCreateDevice)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkEnumerateDeviceExtensionProperties", vkEnumerateDeviceExtensionProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkEnumerateDeviceLayerProperties", vkEnumerateDeviceLayerProperties)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_INSTANCE_SYMBOL(instance, "vkGetPhysicalDeviceSparseImageFormatProperties", vkGetPhysicalDeviceSparseImageFormatProperties)) return VK_FALSE;
-    return VK_TRUE;
-}
-
-VkBool32 vulkan_symbol_wrapper_load_core_device_symbols(VkDevice device)
-{
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyDevice", vkDestroyDevice)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetDeviceQueue", vkGetDeviceQueue)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkQueueSubmit", vkQueueSubmit)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkQueueWaitIdle", vkQueueWaitIdle)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDeviceWaitIdle", vkDeviceWaitIdle)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkAllocateMemory", vkAllocateMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkFreeMemory", vkFreeMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkMapMemory", vkMapMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkUnmapMemory", vkUnmapMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkFlushMappedMemoryRanges", vkFlushMappedMemoryRanges)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkInvalidateMappedMemoryRanges", vkInvalidateMappedMemoryRanges)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetDeviceMemoryCommitment", vkGetDeviceMemoryCommitment)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkBindBufferMemory", vkBindBufferMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkBindImageMemory", vkBindImageMemory)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetBufferMemoryRequirements", vkGetBufferMemoryRequirements)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetImageMemoryRequirements", vkGetImageMemoryRequirements)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetImageSparseMemoryRequirements", vkGetImageSparseMemoryRequirements)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkQueueBindSparse", vkQueueBindSparse)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateFence", vkCreateFence)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyFence", vkDestroyFence)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkResetFences", vkResetFences)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetFenceStatus", vkGetFenceStatus)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkWaitForFences", vkWaitForFences)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateSemaphore", vkCreateSemaphore)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroySemaphore", vkDestroySemaphore)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateEvent", vkCreateEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyEvent", vkDestroyEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetEventStatus", vkGetEventStatus)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkSetEvent", vkSetEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkResetEvent", vkResetEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateQueryPool", vkCreateQueryPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyQueryPool", vkDestroyQueryPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetQueryPoolResults", vkGetQueryPoolResults)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateBuffer", vkCreateBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyBuffer", vkDestroyBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateBufferView", vkCreateBufferView)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyBufferView", vkDestroyBufferView)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateImage", vkCreateImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyImage", vkDestroyImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetImageSubresourceLayout", vkGetImageSubresourceLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateImageView", vkCreateImageView)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyImageView", vkDestroyImageView)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateShaderModule", vkCreateShaderModule)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyShaderModule", vkDestroyShaderModule)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreatePipelineCache", vkCreatePipelineCache)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyPipelineCache", vkDestroyPipelineCache)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetPipelineCacheData", vkGetPipelineCacheData)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkMergePipelineCaches", vkMergePipelineCaches)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateGraphicsPipelines", vkCreateGraphicsPipelines)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateComputePipelines", vkCreateComputePipelines)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyPipeline", vkDestroyPipeline)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreatePipelineLayout", vkCreatePipelineLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyPipelineLayout", vkDestroyPipelineLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateSampler", vkCreateSampler)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroySampler", vkDestroySampler)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateDescriptorSetLayout", vkCreateDescriptorSetLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyDescriptorSetLayout", vkDestroyDescriptorSetLayout)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateDescriptorPool", vkCreateDescriptorPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyDescriptorPool", vkDestroyDescriptorPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkResetDescriptorPool", vkResetDescriptorPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkAllocateDescriptorSets", vkAllocateDescriptorSets)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkFreeDescriptorSets", vkFreeDescriptorSets)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkUpdateDescriptorSets", vkUpdateDescriptorSets)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateFramebuffer", vkCreateFramebuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyFramebuffer", vkDestroyFramebuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateRenderPass", vkCreateRenderPass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyRenderPass", vkDestroyRenderPass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkGetRenderAreaGranularity", vkGetRenderAreaGranularity)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCreateCommandPool", vkCreateCommandPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkDestroyCommandPool", vkDestroyCommandPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkResetCommandPool", vkResetCommandPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkAllocateCommandBuffers", vkAllocateCommandBuffers)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkFreeCommandBuffers", vkFreeCommandBuffers)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkBeginCommandBuffer", vkBeginCommandBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkEndCommandBuffer", vkEndCommandBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkResetCommandBuffer", vkResetCommandBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdBindPipeline", vkCmdBindPipeline)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetViewport", vkCmdSetViewport)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetScissor", vkCmdSetScissor)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetLineWidth", vkCmdSetLineWidth)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetDepthBias", vkCmdSetDepthBias)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetBlendConstants", vkCmdSetBlendConstants)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetDepthBounds", vkCmdSetDepthBounds)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetStencilCompareMask", vkCmdSetStencilCompareMask)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetStencilWriteMask", vkCmdSetStencilWriteMask)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetStencilReference", vkCmdSetStencilReference)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdBindDescriptorSets", vkCmdBindDescriptorSets)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdBindIndexBuffer", vkCmdBindIndexBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdBindVertexBuffers", vkCmdBindVertexBuffers)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdDraw", vkCmdDraw)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdDrawIndexed", vkCmdDrawIndexed)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdDrawIndirect", vkCmdDrawIndirect)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdDrawIndexedIndirect", vkCmdDrawIndexedIndirect)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdDispatch", vkCmdDispatch)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdDispatchIndirect", vkCmdDispatchIndirect)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdCopyBuffer", vkCmdCopyBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdCopyImage", vkCmdCopyImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdBlitImage", vkCmdBlitImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdCopyBufferToImage", vkCmdCopyBufferToImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdCopyImageToBuffer", vkCmdCopyImageToBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdUpdateBuffer", vkCmdUpdateBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdFillBuffer", vkCmdFillBuffer)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdClearColorImage", vkCmdClearColorImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdClearDepthStencilImage", vkCmdClearDepthStencilImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdClearAttachments", vkCmdClearAttachments)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdResolveImage", vkCmdResolveImage)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdSetEvent", vkCmdSetEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdResetEvent", vkCmdResetEvent)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdWaitEvents", vkCmdWaitEvents)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdPipelineBarrier", vkCmdPipelineBarrier)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdBeginQuery", vkCmdBeginQuery)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdEndQuery", vkCmdEndQuery)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdResetQueryPool", vkCmdResetQueryPool)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdWriteTimestamp", vkCmdWriteTimestamp)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdCopyQueryPoolResults", vkCmdCopyQueryPoolResults))
-    {
-#if 0
-       /* Don't return false here. Would cause MESA Intel Ivy Bridge drivers to not work at all. */
-       return VK_FALSE;
-#endif
-    }
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdPushConstants", vkCmdPushConstants)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdBeginRenderPass", vkCmdBeginRenderPass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdNextSubpass", vkCmdNextSubpass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdEndRenderPass", vkCmdEndRenderPass)) return VK_FALSE;
-    if (!VULKAN_SYMBOL_WRAPPER_LOAD_DEVICE_SYMBOL(device, "vkCmdExecuteCommands", vkCmdExecuteCommands)) return VK_FALSE;
-    return VK_TRUE;
-}