diff --git a/stepmania/src/RageDisplay_OGL.cpp b/stepmania/src/RageDisplay_OGL.cpp
index f6b053099d..039b077b98 100644
--- a/stepmania/src/RageDisplay_OGL.cpp
+++ b/stepmania/src/RageDisplay_OGL.cpp
@@ -330,9 +330,7 @@ static void TurnOffHardwareVBO()
 #include "GL/glx.h"
 #undef Font
 #undef Screen
-#endif
 
-#if defined(UNIX)
 Display *g_X11Display = NULL;
 #endif
 
diff --git a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
index 53bc67d1db..328dc6a380 100644
--- a/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
+++ b/stepmania/src/arch/LowLevelWindow/LowLevelWindow_SDL.cpp
@@ -7,9 +7,7 @@
 
 #if defined(UNIX)
 #include <X11/Xlib.h>
-#endif
 
-#if defined(UNIX)
 extern Display *g_X11Display;
 #endif