diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 8fbdfaedd..4d29941ee 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -42,9 +42,9 @@ unsigned long XvMCGeneration = 0;
 int XvMCReqCode;
 int XvMCEventBase;
 
-unsigned long XvMCRTContext;
-unsigned long XvMCRTSurface;
-unsigned long XvMCRTSubpicture;
+static RESTYPE XvMCRTContext;
+static RESTYPE XvMCRTSurface;
+static RESTYPE XvMCRTSubpicture;
 
 typedef struct {
    int num_adaptors;