diff --git a/Xext/xvdix.h b/Xext/xvdix.h
index 8633dead9..e2646bbfb 100644
--- a/Xext/xvdix.h
+++ b/Xext/xvdix.h
@@ -70,11 +70,7 @@ typedef struct {
     ClientPtr client;
 } XvGrabRec, *XvGrabPtr;
 
-typedef struct _XvPortNotifyRec {
-    struct _XvPortNotifyRec *next;
-    ClientPtr client;
-    unsigned long id;
-} XvPortNotifyRec, *XvPortNotifyPtr;
+typedef struct _XvPortNotifyRec *XvPortNotifyPtr;
 
 typedef struct {
     int id;
diff --git a/Xext/xvdix_priv.h b/Xext/xvdix_priv.h
index 62fd47843..f304dbc73 100644
--- a/Xext/xvdix_priv.h
+++ b/Xext/xvdix_priv.h
@@ -31,6 +31,12 @@ typedef struct {
     CloseScreenProcPtr CloseScreen;
 } XvScreenRec, *XvScreenPtr;
 
+typedef struct _XvPortNotifyRec {
+    struct _XvPortNotifyRec *next;
+    ClientPtr client;
+    unsigned long id;
+} XvPortNotifyRec, *XvPortNotifyPtr;
+
 extern int XvReqCode;
 extern int XvErrorBase;