diff --git a/Makefile.common b/Makefile.common
index 0e6a143042..88347354f8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -212,7 +212,7 @@ OBJ += frontend/frontend.o \
        gfx/font_driver.o \
        gfx/video_filter.o \
        $(LIBRETRO_COMM_DIR)/audio/resampler/audio_resampler.o \
-       audio/audio_dsp_filter.o \
+       $(LIBRETRO_COMM_DIR)/audio/dsp_filter.o \
        $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler.o \
        $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/nearest_resampler.o \
        $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/null_resampler.o \
diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index e36beda6e6..6d21c04cf5 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -22,6 +22,7 @@
 #include <audio/conversion/float_to_s16.h>
 #include <audio/conversion/s16_to_float.h>
 #include <audio/audio_resampler.h>
+#include <audio/dsp_filter.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 
@@ -30,7 +31,6 @@
 #endif
 
 #include "audio_driver.h"
-#include "audio_dsp_filter.h"
 #include "audio_thread_wrapper.h"
 #include "../record/record_driver.h"
 #include "../frontend/frontend_driver.h"
diff --git a/audio/audio_dsp_filter.h b/audio/audio_dsp_filter.h
deleted file mode 100644
index 70ca01eca3..0000000000
--- a/audio/audio_dsp_filter.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __AUDIO_DSP_FILTER_H__
-#define __AUDIO_DSP_FILTER_H__
-
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-typedef struct rarch_dsp_filter rarch_dsp_filter_t;
-
-rarch_dsp_filter_t *rarch_dsp_filter_new(const char *filter_config,
-      void *string_data, float sample_rate);
-
-void rarch_dsp_filter_free(rarch_dsp_filter_t *dsp);
-
-struct rarch_dsp_data
-{
-   float *input;
-   unsigned input_frames;
-
-   /* Set by rarch_dsp_filter_process(). */
-   float *output;
-   unsigned output_frames;
-};
-
-void rarch_dsp_filter_process(rarch_dsp_filter_t *dsp,
-      struct rarch_dsp_data *data);
-
-RETRO_END_DECLS
-
-#endif
-
diff --git a/audio/audio_filters/chorus.c b/audio/audio_filters/chorus.c
index 5012b67749..85444513d2 100644
--- a/audio/audio_filters/chorus.c
+++ b/audio/audio_filters/chorus.c
@@ -39,7 +39,8 @@ struct chorus_data
 
 static void chorus_free(void *data)
 {
-   free(data);
+   if (data)
+      free(data);
 }
 
 static void chorus_process(void *data, struct dspfilter_output *output,
@@ -66,25 +67,27 @@ static void chorus_process(void *data, struct dspfilter_output *output,
          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];
+      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;
+      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;
+      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;
    }
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 1e1b8aeb62..72c175be1d 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -699,7 +699,7 @@ DYNAMIC
 #include "../libretro-common/dynamic/dylib.c"
 #include "../dynamic.c"
 #include "../gfx/video_filter.c"
-#include "../audio/audio_dsp_filter.c"
+#include "../libretro-common/audio/dsp_filter.c"
 
 /*============================================================
 CORES
diff --git a/audio/audio_dsp_filter.c b/libretro-common/audio/dsp_filter.c
similarity index 84%
rename from audio/audio_dsp_filter.c
rename to libretro-common/audio/dsp_filter.c
index bc4a763fc2..578f077b6f 100644
--- a/audio/audio_dsp_filter.c
+++ b/libretro-common/audio/dsp_filter.c
@@ -1,17 +1,23 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2016 - Daniel De Matteis
+/* Copyright  (C) 2010-2016 The RetroArch team
  *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (dsp_filter.c).
+ * ---------------------------------------------------------------------------------------
  *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
+ * 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:
  *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
+ * 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>
@@ -28,7 +34,7 @@
 #include <string/stdstring.h>
 #include <libretro_dspfilter.h>
 
-#include "audio_dsp_filter.h"
+#include <audio/dsp_filter.h>
 
 struct rarch_dsp_plug
 {
diff --git a/libretro-common/include/audio/dsp_filter.h b/libretro-common/include/audio/dsp_filter.h
new file mode 100644
index 0000000000..11462f4bcb
--- /dev/null
+++ b/libretro-common/include/audio/dsp_filter.h
@@ -0,0 +1,53 @@
+/* Copyright  (C) 2010-2016 The RetroArch team
+ *
+ * ---------------------------------------------------------------------------------------
+ * The following license statement only applies to this file (dsp_filter.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 __LIBRETRO_SDK_AUDIO_DSP_FILTER_H
+#define __LIBRETRO_SDK_AUDIO_DSP_FILTER_H
+
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
+
+typedef struct rarch_dsp_filter rarch_dsp_filter_t;
+
+rarch_dsp_filter_t *rarch_dsp_filter_new(const char *filter_config,
+      void *string_data, float sample_rate);
+
+void rarch_dsp_filter_free(rarch_dsp_filter_t *dsp);
+
+struct rarch_dsp_data
+{
+   float *input;
+   unsigned input_frames;
+
+   /* Set by rarch_dsp_filter_process(). */
+   float *output;
+   unsigned output_frames;
+};
+
+void rarch_dsp_filter_process(rarch_dsp_filter_t *dsp,
+      struct rarch_dsp_data *data);
+
+RETRO_END_DECLS
+
+#endif
+