diff --git a/audio/filters/phaser.c b/audio/filters/phaser.c
index 76262f56b7..d70b974613 100644
--- a/audio/filters/phaser.c
+++ b/audio/filters/phaser.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #define phaserlfoshape 4.0
-#define lfoskipsamples 20
+#define phaserlfoskipsamples 20
 
 #ifndef M_PI
 #define M_PI		3.1415926535897932384626433832795
@@ -67,7 +67,7 @@ static void phaser_process(void *data, struct dspfilter_output *output,
       for (c = 0; c < 2; c++)
          m[c] = in[c] + ph->fbout[c] * ph->fb * 0.01f;
 
-      if ((ph->skipcount++ % lfoskipsamples) == 0)
+      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);
diff --git a/audio/filters/wahwah.c b/audio/filters/wahwah.c
index 6d05ae8335..27055ee3f3 100644
--- a/audio/filters/wahwah.c
+++ b/audio/filters/wahwah.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define lfoskipsamples 30
+#define wahwahlfoskipsamples 30
 
 #ifndef M_PI
 #define M_PI		3.1415926535897932384626433832795
@@ -59,7 +59,7 @@ static void wahwah_process(void *data, struct dspfilter_output *output,
    {
       float in[2] = { out[0], out[1] };
 
-      if ((wah->skipcount++ % lfoskipsamples) == 0)
+      if ((wah->skipcount++ % wahwahlfoskipsamples) == 0)
       {
          float frequency = (1.0 + cos(wah->skipcount * wah->lfoskip + wah->phase)) / 2.0;
          frequency = frequency * wah->depth * (1.0 - wah->freqofs) + wah->freqofs;
diff --git a/griffin/griffin.c b/griffin/griffin.c
index e0b6c7c8e5..930a7d59a4 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -480,9 +480,12 @@ FILTERS
 #include "../gfx/filters/lq2x.c"
 #include "../gfx/filters/phosphor2x.c"
 
-#include "../audio/filters/panning.c"
-#include "../audio/filters/iir.c"
 #include "../audio/filters/echo.c"
+#include "../audio/filters/iir.c"
+#include "../audio/filters/panning.c"
+#include "../audio/filters/phaser.c"
+#include "../audio/filters/reverb.c"
+#include "../audio/filters/wahwah.c"
 #endif
 /*============================================================
 DYNAMIC