diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 136df87bb..3740514a7 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -55,20 +55,10 @@ SOFTWARE.
 #include "scrnintstr.h"
 #include <X11/extensions/Xvproto.h>
 
-extern _X_EXPORT unsigned long XvExtensionGeneration;
-extern _X_EXPORT unsigned long XvScreenGeneration;
-extern _X_EXPORT unsigned long XvResourceGeneration;
-
 extern _X_EXPORT int XvReqCode;
-extern _X_EXPORT int XvEventBase;
 extern _X_EXPORT int XvErrorBase;
 
 extern _X_EXPORT RESTYPE XvRTPort;
-extern _X_EXPORT RESTYPE XvRTEncoding;
-extern _X_EXPORT RESTYPE XvRTGrab;
-extern _X_EXPORT RESTYPE XvRTVideoNotify;
-extern _X_EXPORT RESTYPE XvRTVideoNotifyList;
-extern _X_EXPORT RESTYPE XvRTPortNotify;
 
 typedef struct {
     int numerator;
diff --git a/Xext/xvmain.c b/Xext/xvmain.c
index 13c716329..b80329027 100644
--- a/Xext/xvmain.c
+++ b/Xext/xvmain.c
@@ -122,20 +122,20 @@ static DevPrivateKeyRec XvScreenKeyRec;
 Bool noXvExtension = FALSE;
 
 #define XvScreenKey (&XvScreenKeyRec)
-unsigned long XvExtensionGeneration = 0;
-unsigned long XvScreenGeneration = 0;
-unsigned long XvResourceGeneration = 0;
+static unsigned long XvExtensionGeneration = 0;
+static unsigned long XvScreenGeneration = 0;
+static unsigned long XvResourceGeneration = 0;
 
 int XvReqCode;
-int XvEventBase;
+static int XvEventBase;
 int XvErrorBase;
 
 RESTYPE XvRTPort;
-RESTYPE XvRTEncoding;
-RESTYPE XvRTGrab;
-RESTYPE XvRTVideoNotify;
-RESTYPE XvRTVideoNotifyList;
-RESTYPE XvRTPortNotify;
+static RESTYPE XvRTEncoding;
+static RESTYPE XvRTGrab;
+static RESTYPE XvRTVideoNotify;
+static RESTYPE XvRTVideoNotifyList;
+static RESTYPE XvRTPortNotify;
 
 /* EXTERNAL */