diff --git a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
index 2d8b82cd96..c1412243d2 100644
--- a/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
+++ b/stepmania/src/arch/ArchHooks/ArchHooks_Unix.cpp
@@ -1,14 +1,14 @@
 #include "global.h"
-#include "RageLog.h"
-#include "RageThreads.h"
 #include "ArchHooks_Unix.h"
+#include "RageLog.h"
+#include "RageUtil.h"
+#include "RageThreads.h"
 #include "archutils/Unix/SignalHandler.h"
 #include "archutils/Unix/GetSysInfo.h"
 #include "archutils/Unix/LinuxThreadHelpers.h"
 #include "archutils/Unix/EmergencyShutdown.h"
 #include "archutils/Unix/AssertionHandler.h"
 #include <unistd.h>
-#include "RageUtil.h"
 #include <sys/time.h>
 
 #if defined(CRASH_HANDLER)
diff --git a/stepmania/src/archutils/Win32/GraphicsWindow.cpp b/stepmania/src/archutils/Win32/GraphicsWindow.cpp
index ebffbee0ce..dd16351352 100644
--- a/stepmania/src/archutils/Win32/GraphicsWindow.cpp
+++ b/stepmania/src/archutils/Win32/GraphicsWindow.cpp
@@ -460,9 +460,8 @@ void GraphicsWindow::Update()
 	{
 		//LOG->Warn( "Changing resolution" );
 
-		/* Let DISPLAY know that our resolution has changed.  (Note that
-		 * ResolutionChanged() can come back here, so reset g_bResolutionChanged
-		 * first.) */
+		/* Let DISPLAY know that our resolution has changed.  (Note that ResolutionChanged()
+		 * can come back here, so reset g_bResolutionChanged first.) */
 		g_bResolutionChanged = false;
 		DISPLAY->ResolutionChanged();
 	}