diff --git a/stepmania/src/archutils/Unix/X11Helper.cpp b/stepmania/src/archutils/Unix/X11Helper.cpp
index c4d032f48e..b2a14c9146 100644
--- a/stepmania/src/archutils/Unix/X11Helper.cpp
+++ b/stepmania/src/archutils/Unix/X11Helper.cpp
@@ -1,16 +1,14 @@
 #include "global.h"
 #include "X11Helper.h"
 
-#include <vector>
-
 #include <X11/Xlib.h>		// Display, Window
 
-#include "RageLog.h"		// LOG
-#include "RageDisplay.h"	// RageDisplay
-#include "RageThreads.h"	// Don't make me list everything...
+#include "RageLog.h"
+#include "RageDisplay.h"
+#include "RageThreads.h"
 
-vector<long>		pMasks;				// Currently open masks
-unsigned short int	pCt		= 0;		// Number of subsystems
+static vector<long>		pMasks;				// Currently open masks
+static unsigned short int	pCt		= 0;		// Number of subsystems
 							// using the X connection
 
 Display *X11Helper::Dpy = NULL;