diff --git a/stepmania/src/RageLog.cpp b/stepmania/src/RageLog.cpp
index 2c59813f5c..0e69dc3c18 100644
--- a/stepmania/src/RageLog.cpp
+++ b/stepmania/src/RageLog.cpp
@@ -124,7 +124,7 @@ RageLog::~RageLog()
 
 void RageLog::ShowConsole()
 {
-#if defined(WIN32) || !defined(_XBOX)
+#if defined(WIN32) && !defined(_XBOX)
 	// create a new console window and attach standard handles
 	AllocConsole();
 	freopen("CONOUT$","wb",stdout);
@@ -134,7 +134,7 @@ void RageLog::ShowConsole()
 
 void RageLog::HideConsole()
 {
-#if defined(WIN32) || !defined(_XBOX)
+#if defined(WIN32) && !defined(_XBOX)
 	FreeConsole();
 #endif
 }
diff --git a/stepmania/src/RageMath.cpp b/stepmania/src/RageMath.cpp
index 943ad4aed7..be16bb5e29 100644
--- a/stepmania/src/RageMath.cpp
+++ b/stepmania/src/RageMath.cpp
@@ -222,7 +222,7 @@ void RageMatrixCommand( CString sCommandString, RageMatrix &mat )
 		{
 			CString sError = ssprintf( "Unrecognized matrix command name '%s' in command string '%s'.", sName.c_str(), sCommandString.c_str() );
 			LOG->Warn( sError );
-#if defined(WIN32) || !defined(_XBOX) // XXX arch?
+#if defined(WIN32) && !defined(_XBOX) // XXX arch?
 			if( DISPLAY->IsWindowed() )
 				MessageBox(NULL, sError, "MatrixCommand", MB_OK);
 #endif
diff --git a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp
index 1c19863d8c..7c3530d193 100644
--- a/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp
+++ b/stepmania/src/arch/MovieTexture/MovieTexture_DShow.cpp
@@ -325,7 +325,6 @@ void MovieTexture_DShow::CreateTexture()
 			m_PixelFormat = FMT_RGB5;
 		else
 			m_PixelFormat = FMT_RGBA4;	// everything supports RGBA4
-			
 		break;
 	case 32:
 		if( DISPLAY->SupportsTextureFormat(FMT_RGB8) )