diff --git a/console/griffin/griffin.c b/console/griffin/griffin.c
index 25403f8b87..643949ce93 100644
--- a/console/griffin/griffin.c
+++ b/console/griffin/griffin.c
@@ -36,7 +36,9 @@ CONSOLE EXTENSIONS
 #include "../rarch_console_exec.c"
 #endif
 
-#include "../rarch_console_sound.c"
+#ifdef HAVE_RSOUND
+#include "../rarch_console_rsound.c"
+#endif
 
 #ifdef HAVE_CONFIGFILE
 #include "../rarch_console_config.c"
diff --git a/console/rarch_console.h b/console/rarch_console.h
index 70419da69f..e383c34658 100644
--- a/console/rarch_console.h
+++ b/console/rarch_console.h
@@ -46,6 +46,17 @@ enum
    MODE_EXIT
 };
 
+enum
+{
+   SOUND_MODE_NORMAL,
+#ifdef HAVE_RSOUND
+   SOUND_MODE_RSOUND,
+#endif
+#ifdef HAVE_HEADSET
+   SOUND_MODE_HEADSET,
+#endif
+};
+
 #define MAXIMUM_PATH 512
 
 typedef struct
diff --git a/console/rarch_console_sound.c b/console/rarch_console_rsound.c
similarity index 96%
rename from console/rarch_console_sound.c
rename to console/rarch_console_rsound.c
index e7061a4006..d70b60eca6 100644
--- a/console/rarch_console_sound.c
+++ b/console/rarch_console_rsound.c
@@ -16,9 +16,8 @@
 
 #include <stdint.h>
 
-#include "rarch_console_sound.h"
+#include "rarch_console_rsound.h"
 
-#ifdef HAVE_RSOUND
 bool rarch_console_rsound_start(const char *ip)
 {
    strlcpy(g_settings.audio.driver, "rsound", sizeof(g_settings.audio.driver));
@@ -49,4 +48,3 @@ void rarch_console_rsound_stop(void)
       init_audio();
    }
 }
-#endif
diff --git a/console/rarch_console_sound.h b/console/rarch_console_rsound.h
similarity index 80%
rename from console/rarch_console_sound.h
rename to console/rarch_console_rsound.h
index ed15d367f1..8912db57c6 100644
--- a/console/rarch_console_sound.h
+++ b/console/rarch_console_rsound.h
@@ -14,23 +14,10 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RARCH_CONSOLE_SOUND_H
-#define RARCH_CONSOLE_SOUND_H
+#ifndef RARCH_CONSOLE_RSOUND_H
+#define RARCH_CONSOLE_RSOUND_H
 
-enum
-{
-   SOUND_MODE_NORMAL,
-#ifdef HAVE_RSOUND
-   SOUND_MODE_RSOUND,
-#endif
-#ifdef HAVE_HEADSET
-   SOUND_MODE_HEADSET,
-#endif
-};
-
-#ifdef HAVE_RSOUND
 bool rarch_console_rsound_start(const char *ip);
 void rarch_console_rsound_stop(void);
-#endif
 
 #endif
diff --git a/ps3/frontend/menu.c b/ps3/frontend/menu.c
index e2ba9a3e3b..b48281d537 100644
--- a/ps3/frontend/menu.c
+++ b/ps3/frontend/menu.c
@@ -31,7 +31,7 @@
 #include "../../console/rarch_console_input.h"
 #include "../../console/rarch_console_config.h"
 #include "../../console/rarch_console_settings.h"
-#include "../../console/rarch_console_sound.h"
+#include "../../console/rarch_console_rsound.h"
 #include "../../console/rarch_console_video.h"
 
 #ifdef HAVE_ZLIB