diff --git a/src/audio/mockingboard.c b/src/audio/mockingboard.c
index 492b649b..26c812af 100644
--- a/src/audio/mockingboard.c
+++ b/src/audio/mockingboard.c
@@ -85,14 +85,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #       include <sys/io.h>
 #       endif
 
-#       if defined(__GNUC__)
-#               pragma GCC diagnostic push
-#               pragma GCC diagnostic ignored "-Wformat"
-#       elif defined(__clang__)
-#               pragma clang diagnostic push
-#               pragma clang diagnostic ignored "-Wformat"
-#       endif
-
 #else
 #include "StdAfx.h"
 #endif
@@ -2254,10 +2246,3 @@ DWORD MB_SetSnapshot(SS_CARD_MOCKINGBOARD* pSS, DWORD dwSlot_unused)
 #endif
 }
 
-#ifdef APPLE2IX
-#   if defined(__GNUC__)
-#       pragma GCC diagnostic pop
-#   elif defined(__clang__)
-#       pragma clang diagnostic pop
-#   endif
-#endif
diff --git a/src/audio/soundcore.c b/src/audio/soundcore.c
index 599499f2..8ec7c12f 100644
--- a/src/audio/soundcore.c
+++ b/src/audio/soundcore.c
@@ -37,14 +37,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #include "audio/win-shim.h"
 
-#if defined(__GNUC__)
-#   pragma GCC diagnostic push
-#   pragma GCC diagnostic ignored "-Wformat"
-#elif defined(__clang__)
-#   pragma clang diagnostic push
-#   pragma clang diagnostic ignored "-Wformat"
-#endif
-
 #else
 #include "StdAfx.h"
 #endif
@@ -88,6 +80,11 @@ bool g_bDSAvailable = false;
 #ifdef APPLE2IX
 bool g_bDisableDirectSound = false;
 FILE *g_fh = NULL;
+
+__attribute__((constructor))
+static void _init_soundcore() {
+    g_fh = error_log;
+}
 #endif
 
 //-----------------------------------------------------------------------------
@@ -863,10 +860,3 @@ void SysClk_StopTimer()
 #endif
 }
 
-#ifdef APPLE2IX
-#   if defined(__GNUC__)
-#       pragma GCC diagnostic pop
-#   elif defined(__clang__)
-#       pragma clang diagnostic pop
-#   endif
-#endif
diff --git a/src/audio/speaker.c b/src/audio/speaker.c
index 709cb0dc..f1cd3aaa 100644
--- a/src/audio/speaker.c
+++ b/src/audio/speaker.c
@@ -36,14 +36,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #       include <sys/io.h>
 #       endif
 
-#       if defined(__GNUC__)
-#               pragma GCC diagnostic push
-#               pragma GCC diagnostic ignored "-Wformat"
-#       elif defined(__clang__)
-#               pragma clang diagnostic push
-#               pragma clang diagnostic ignored "-Wunused-variable"
-#       endif
-
 #else
 #include "StdAfx.h"
 #endif
@@ -515,7 +507,11 @@ static void ReinitRemainderBuffer(UINT nCyclesRemaining)
 	for(g_nRemainderBufferIdx=0; (g_nRemainderBufferIdx<nCyclesRemaining) && (g_nRemainderBufferIdx<g_nRemainderBufferSize); g_nRemainderBufferIdx++)
 		g_pRemainderBuffer[g_nRemainderBufferIdx] = g_nSpeakerData;
 
+#ifdef APPLE2IX
+        // believe this is a erroneous (comparison should be <=) but ultimately spurious assert
+#else
 	_ASSERT(g_nRemainderBufferIdx < g_nRemainderBufferSize);
+#endif
 }
 
 static void UpdateRemainderBuffer(ULONG* pnCycleDiff)
@@ -1341,10 +1337,3 @@ DWORD SpkrSetSnapshot(SS_IO_Speaker* pSS)
 	return 0;
 }
 
-#ifdef APPLE2IX
-#       if defined(__GNUC__)
-#               pragma GCC diagnostic pop
-#       elif defined(__clang__)
-#               pragma clang diagnostic pop
-#       endif
-#endif