diff --git a/mk/windoze/build-mg.bat b/mk/windoze/build-mg.bat
index bb9169fc..ac465a81 100644
--- a/mk/windoze/build-mg.bat
+++ b/mk/windoze/build-mg.bat
@@ -65,4 +65,4 @@ if not "%SVNVERSION%" == "." echo #define SVNVERSION "%SVNVERSION%" > ..\..\sour
 msbuild /p:Configuration=Release Glest.sln
 
 rem pause execution so we can see the output before the batch file exits
-pause
+if not "%1" == "nopause" pause
diff --git a/source/shared_lib/include/platform/sdl/thread.h b/source/shared_lib/include/platform/sdl/thread.h
index ccc94242..7b9b4570 100644
--- a/source/shared_lib/include/platform/sdl/thread.h
+++ b/source/shared_lib/include/platform/sdl/thread.h
@@ -12,23 +12,27 @@
 #ifndef _SHARED_PLATFORM_THREAD_H_
 #define _SHARED_PLATFORM_THREAD_H_
 
+//#define DEBUG_MUTEXES
+//#define DEBUG_PERFORMANCE_MUTEXES
+
 #include <SDL_thread.h>
 #include <SDL_mutex.h>
 #include <string>
+#ifdef DEBUG_PERFORMANCE_MUTEXES
 #include "platform_common.h"
+#endif
+
 //#include "util.h"
 #include "leak_dumper.h"
 
-//#define DEBUG_MUTEXES
-//#define DEBUG_PERFORMANCE_MUTEXES
-
 // =====================================================
 //	class Thread
 // =====================================================
 
 using namespace std;
+#ifdef DEBUG_PERFORMANCE_MUTEXES
 using namespace Shared::PlatformCommon;
-
+#endif
 
 namespace Shared { namespace Platform {