diff --git a/src/audio/oal/stream.cpp b/src/audio/oal/stream.cpp
index e8374f67..8945ec46 100644
--- a/src/audio/oal/stream.cpp
+++ b/src/audio/oal/stream.cpp
@@ -641,7 +641,11 @@ public:
 	}
 };
 #endif
+#endif
 
+#ifdef AUDIO_OAL_USE_MPG123
+// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (nothing breaks though)
+#define MP3_USE_FUZZY_SEEK
 static ssize_t mpg123_read_replacement(void* handle, void* data, size_t size)
 {
 	return fread(data, 1, size, (FILE*)handle);
@@ -651,11 +655,6 @@ static off_t mpg123_seek_replacement(void* handle, off_t offset, int whence)
 {
 	return fseek((FILE*)handle, offset, whence);
 }
-#endif
-
-#ifdef AUDIO_OAL_USE_MPG123
-// fuzzy seek eliminates stutter when playing ADF but spams errors a lot (nothing breaks though)
-#define MP3_USE_FUZZY_SEEK
 
 class CMP3File : public IDecoder
 {
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 9cb66fde..b7253285 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -2026,7 +2026,6 @@ cSampleManager::InitialiseSampleBanks(void)
 		m_aSamples[i].nLoopEnd = BSWAP32(m_aSamples[i].nLoopEnd);
 	}
 #endif
-#ifdef AUDIO_OPUS
 #ifdef OPUS_SFX
 	int32 _nSampleDataEndOffset = m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nOffset + m_aSamples[TOTAL_AUDIO_SAMPLES - 1].nSize;
 #endif
diff --git a/src/core/common.h b/src/core/common.h
index faae21e1..21fbe30c 100644
--- a/src/core/common.h
+++ b/src/core/common.h
@@ -102,6 +102,10 @@ typedef int64_t int64;
 // hardcode ucs-2
 typedef uint16_t wchar;
 
+typedef uint8 bool8;
+typedef uint16 bool16;
+typedef uint32 bool32;
+
 #ifdef BIGENDIAN
 inline float _floatswap32(float f)
 {
@@ -135,11 +139,6 @@ inline float _floatswap32(float f)
 #define FLOATSWAP32(x) (x)
 #endif
 
-#if defined(_MSC_VER)
-typedef uint8 bool8;
-typedef uint16 bool16;
-typedef uint32 bool32;
-
 #if defined(_MSC_VER) || defined (__MWERKS__)
 typedef ptrdiff_t ssize_t;
 #endif
diff --git a/src/core/config.h b/src/core/config.h
index c1276e40..f4cccb94 100644
--- a/src/core/config.h
+++ b/src/core/config.h
@@ -158,7 +158,7 @@ enum Config {
 
 // This is enabled for all released games except mobile
 // any debug stuff that is only left in mobile, is not in MASTER
-#define MASTER
+//#define MASTER
 
 // once and for all:
 // pc: FINAL & MASTER
@@ -384,7 +384,7 @@ enum Config {
 #define RADIO_SCROLL_TO_PREV_STATION
 #define AUDIO_CACHE
 //#define PS2_AUDIO_PATHS // changes audio paths for cutscenes and radio to PS2 paths (needs vbdec on MSS builds)
-//#define AUDIO_OAL_USE_SNDFILE // use libsndfile to decode WAVs instead of our internal decoder
+#define AUDIO_OAL_USE_SNDFILE // use libsndfile to decode WAVs instead of our internal decoder
 #define AUDIO_OAL_USE_MPG123 // use mpg123 to support mp3 files
 
 #ifdef AUDIO_OPUS
diff --git a/src/core/re3.cpp b/src/core/re3.cpp
index 6c3fcf8e..0f64b8a2 100644
--- a/src/core/re3.cpp
+++ b/src/core/re3.cpp
@@ -34,7 +34,7 @@
 #include "MBlur.h"
 #include "ControllerConfig.h"
 
-#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
+#if 1
 #include "crossplatform.h"
 #endif