--- SDL_mixer-1.2.12.old/music_mad.c
+++ SDL_mixer-1.2.12/music_mad.c
@@ -224,7 +224,7 @@
   if ((mp3_mad->status & MS_playing) == 0) {
 	/* We're not supposed to be playing, so send silence instead. */
 	memset(stream, 0, len);
-	return;
+	return 0;
   }
 
   out = stream;
--- SDL_mixer-1.2.12.old/music_modplug.h
+++ SDL_mixer-1.2.12/music_modplug.h
@@ -1,6 +1,6 @@
 #ifdef MODPLUG_MUSIC
 
-#include "modplug.h"
+#include "libmodplug/modplug.h"
 #include "SDL_rwops.h"
 #include "SDL_audio.h"
 #include "SDL_mixer.h"