diff --git a/audio/drivers_resampler/sinc.c b/audio/drivers_resampler/sinc.c
index 87c54ec47d..2ae4edf194 100644
--- a/audio/drivers_resampler/sinc.c
+++ b/audio/drivers_resampler/sinc.c
@@ -426,7 +426,7 @@ static void *resampler_sinc_new(const struct resampler_config *config,
    (void)config;
 
    re->taps = TAPS;
-   cutoff = CUTOFF;
+   cutoff   = CUTOFF;
 
    /* Downsampling, must lower cutoff, and extend number of 
     * taps accordingly to keep same stopband attenuation. */
diff --git a/audio/test/Makefile b/audio/test/Makefile
index f17af64da5..87db6b367e 100644
--- a/audio/test/Makefile
+++ b/audio/test/Makefile
@@ -11,18 +11,28 @@ TESTS := test-sinc-lowest \
 	test-cc \
 	test-snr-cc
 
+LIBRETRO_COMM_DIR = ../../libretro-common
+
 CFLAGS += -O3 -ffast-math -g -Wall -pedantic -march=native -std=gnu99
-CFLAGS += -DRESAMPLER_TEST -DRARCH_DUMMY_LOG
-CFLAGS += -I../../libretro-common/include -I../../
+CFLAGS += -DRESAMPLER_TEST -DRARCH_DUMMY_LOG -DRARCH_INTERNAL
+CFLAGS += -I$(LIBRETRO_COMM_DIR)/include -I../../
 
 LDFLAGS += -lm
 
+SHAREDOBJ += $(LIBRETRO_COMM_DIR)/memmap/memalign.o \
+				 $(LIBRETRO_COMM_DIR)/string/string_list.o \
+				 $(LIBRETRO_COMM_DIR)/file/config_file_userdata.o \
+				 $(LIBRETRO_COMM_DIR)/file/config_file.o \
+				 $(LIBRETRO_COMM_DIR)/file/file_path.o \
+				 $(LIBRETRO_COMM_DIR)/compat/compat.o \
+				 $(LIBRETRO_COMM_DIR)/hash/rhash.o \
+
 all: $(TESTS)
 
-resampler-sinc.o: ../audio_resampler_driver.c
+resampler-sinc.o: ../audio_resampler_driver.c $(SHAREDOBJ)
 	$(CC) -c -o $@ $< $(CFLAGS)
 
-resampler-cc.o: ../audio_resampler_driver.c
+resampler-cc.o: ../audio_resampler_driver.c $(SHAREDOBJ)
 	$(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"'
 
 main-cc.o: main.c
@@ -31,7 +41,7 @@ main-cc.o: main.c
 snr-cc.o: snr.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DRESAMPLER_IDENT='"CC"'
 
-cc-resampler.o: ../resamplers/cc_resampler.c
+cc-resampler.o: ../drivers_resampler/cc_resampler.c
 	$(CC) -c -o $@ $< $(CFLAGS)
 
 sinc-lowest.o: ../drivers_resampler/sinc.c
@@ -52,40 +62,40 @@ sinc-higher.o: ../drivers_resampler/sinc.c
 sinc-highest.o: ../drivers_resampler/sinc.c
 	$(CC) -c -o $@ $< $(CFLAGS) -DSINC_HIGHEST_QUALITY
 
-test-sinc-lowest: sinc-lowest.o ../audio_utils.o main.o resampler-sinc.o nearest.o
+test-sinc-lowest: sinc-lowest.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc-lowest: sinc-lowest.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc-lowest: sinc-lowest.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-sinc-lower: sinc-lower.o ../audio_utils.o main.o resampler-sinc.o nearest.o
+test-sinc-lower: sinc-lower.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc-lower: sinc-lower.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc-lower: sinc-lower.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-sinc: sinc.o ../audio_utils.o main.o resampler-sinc.o nearest.o
+test-sinc: sinc.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc: sinc.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc: sinc.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o  nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-sinc-higher: sinc-higher.o ../audio_utils.o main.o resampler-sinc.o nearest.o
+test-sinc-higher: sinc-higher.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc-higher: sinc-higher.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc-higher: sinc-higher.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-sinc-highest: sinc-highest.o ../audio_utils.o main.o resampler-sinc.o nearest.o
+test-sinc-highest: sinc-highest.o ../audio_utils.o main.o resampler-sinc.o resampler-cc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-sinc-highest: sinc-highest.o ../audio_utils.o snr.o resampler-sinc.o nearest.o
+test-snr-sinc-highest: sinc-highest.o ../audio_utils.o snr.o resampler-sinc.o resampler-cc.o  nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-cc: cc-resampler.o ../audio_utils.o main-cc.o resampler-cc.o sinc.o nearest.o
+test-cc: cc-resampler.o ../audio_utils.o main-cc.o resampler-cc.o resampler-cc.o sinc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
-test-snr-cc: cc-resampler.o ../audio_utils.o snr-cc.o resampler-cc.o sinc.o nearest.o
+test-snr-cc: cc-resampler.o ../audio_utils.o snr-cc.o resampler-cc.o sinc.o nearest.o $(SHAREDOBJ)
 	$(CC) -o $@ $^ $(LDFLAGS)
 
 %.o: %.c
diff --git a/audio/test/snr.c b/audio/test/snr.c
index 01d91b16c3..8bc1c839f6 100644
--- a/audio/test/snr.c
+++ b/audio/test/snr.c
@@ -13,8 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../resamplers/resampler.h"
-#include "../audio_utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
@@ -23,6 +21,9 @@
 #include <assert.h>
 #include <stdbool.h>
 
+#include "../audio_resampler_driver.h"
+#include "../audio_utils.h"
+
 #ifndef RESAMPLER_IDENT
 #define RESAMPLER_IDENT "sinc"
 #endif