diff --git a/source/audiolib/src/driver_sdl.cpp b/source/audiolib/src/driver_sdl.cpp
index 419ce60c8..e468828c2 100644
--- a/source/audiolib/src/driver_sdl.cpp
+++ b/source/audiolib/src/driver_sdl.cpp
@@ -22,7 +22,7 @@
  * libSDL output driver for MultiVoc
  */
 
-#define _NEED_SDLMIXER
+#define NEED_SDL_MIXER
 #include "compat.h"
 #include "sdl_inc.h"
 #include "driver_sdl.h"
diff --git a/source/build/include/sdl_inc.h b/source/build/include/sdl_inc.h
index e77e64b69..160395c14 100644
--- a/source/build/include/sdl_inc.h
+++ b/source/build/include/sdl_inc.h
@@ -51,7 +51,7 @@ Minimum required SDL versions:
 #error SDL version found is too old
 #endif
 
-#if defined _NEED_SDLMIXER
+#if defined NEED_SDL_MIXER
 
 # if defined SDL_USEFOLDER
 #  if SDL_TARGET == 2
diff --git a/source/duke3d/src/sdlmusic.cpp b/source/duke3d/src/sdlmusic.cpp
index bfb8229c2..378367b78 100644
--- a/source/duke3d/src/sdlmusic.cpp
+++ b/source/duke3d/src/sdlmusic.cpp
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 // This object is shared by all Build games with MIDI playback!
 
-#define _NEED_SDLMIXER	1
+#define NEED_SDL_MIXER
 
 #include "compat.h"
 
@@ -102,8 +102,8 @@ const char *MUSIC_ErrorString(int32_t ErrorNumber)
 int32_t MUSIC_Init(int32_t SoundCard, int32_t Address)
 {
 #ifdef __ANDROID__
-	music_initialized = 1;
-	return MUSIC_Ok;
+    music_initialized = 1;
+    return MUSIC_Ok;
 #endif
     // Use an external MIDI player if the user has specified to do so
     char *command = getenv("EDUKE32_MUSIC_CMD");
@@ -410,7 +410,6 @@ static void sigchld_handler(int signo)
 // void MUSIC_PlayMusic(char *_filename)
 int32_t MUSIC_PlaySong(char *song, int32_t songsize, int32_t loopflag)
 {
-//	initprintf("MUSIC_PlaySong");
     if (external_midi)
     {
         FILE *fp;