diff --git a/src/legacy/i810/i810_video.c b/src/legacy/i810/i810_video.c
index 20564288..73aaee6f 100644
--- a/src/legacy/i810/i810_video.c
+++ b/src/legacy/i810/i810_video.c
@@ -200,7 +200,7 @@ static XF86VideoFormatRec Formats[NUM_FORMATS] =
 
 #define NUM_ATTRIBUTES 3
 
-static XF86AttributeRec Attributes[NUM_ATTRIBUTES] =
+static XvAttributeRec Attributes[NUM_ATTRIBUTES] =
 {
    {XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
    {XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
diff --git a/src/uxa/intel_video.c b/src/uxa/intel_video.c
index 1be5d885..49f73c75 100644
--- a/src/uxa/intel_video.c
+++ b/src/uxa/intel_video.c
@@ -96,7 +96,7 @@ XF86VideoFormatRec intel_xv_formats[NUM_FORMATS] = {
 	{15, TrueColor}, {16, TrueColor}, {24, TrueColor}
 };
 
-XF86AttributeRec intel_xv_attributes[NUM_ATTRIBUTES] = {
+XvAttributeRec intel_xv_attributes[NUM_ATTRIBUTES] = {
 	{XvSettable | XvGettable, 0, (1 << 24) - 1, "XV_COLORKEY"},
 	{XvSettable | XvGettable, -128, 127, "XV_BRIGHTNESS"},
 	{XvSettable | XvGettable, 0, 255, "XV_CONTRAST"},
@@ -105,7 +105,7 @@ XF86AttributeRec intel_xv_attributes[NUM_ATTRIBUTES] = {
 };
 
 #define GAMMA_ATTRIBUTES 6
-XF86AttributeRec intel_xv_gamma_attributes[GAMMA_ATTRIBUTES] = {
+XvAttributeRec intel_xv_gamma_attributes[GAMMA_ATTRIBUTES] = {
 	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA0"},
 	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA1"},
 	{XvSettable | XvGettable, 0, 0xffffff, "XV_GAMMA2"},
diff --git a/src/uxa/intel_video.h b/src/uxa/intel_video.h
index 09cc4775..2d898f2d 100644
--- a/src/uxa/intel_video.h
+++ b/src/uxa/intel_video.h
@@ -144,11 +144,11 @@ extern XF86VideoFormatRec intel_xv_formats[NUM_FORMATS];
 
 #define NUM_ATTRIBUTES 5
 
-extern XF86AttributeRec intel_xv_attributes[NUM_ATTRIBUTES];
+extern XvAttributeRec intel_xv_attributes[NUM_ATTRIBUTES];
 
 #define GAMMA_ATTRIBUTES 6
 
-extern XF86AttributeRec intel_xv_gamma_attributes[GAMMA_ATTRIBUTES];
+extern XvAttributeRec intel_xv_gamma_attributes[GAMMA_ATTRIBUTES];
 
 #ifdef INTEL_XVMC
 #define NUM_IMAGES 5
diff --git a/src/uxa/intel_video_overlay.c b/src/uxa/intel_video_overlay.c
index ae5cd469..9166264b 100644
--- a/src/uxa/intel_video_overlay.c
+++ b/src/uxa/intel_video_overlay.c
@@ -433,7 +433,7 @@ XF86VideoAdaptorPtr intel_video_overlay_setup_image(ScreenPtr screen)
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	XF86VideoAdaptorPtr adapt;
 	intel_adaptor_private *adaptor_priv;
-	XF86AttributePtr att;
+	XvAttributePtr att;
 
 	/* Set up overlay video if it is available */
 	intel->use_overlay = intel_has_overlay(intel);
@@ -470,15 +470,15 @@ XF86VideoAdaptorPtr intel_video_overlay_setup_image(ScreenPtr screen)
 	if (INTEL_INFO(intel)->gen >= 030)
 		adapt->nAttributes += GAMMA_ATTRIBUTES;	/* has gamma */
 	adapt->pAttributes =
-	    XNFalloc(sizeof(XF86AttributeRec) * adapt->nAttributes);
+	    XNFalloc(sizeof(XvAttributeRec) * adapt->nAttributes);
 	/* Now copy the attributes */
 	att = adapt->pAttributes;
 	memcpy((char *)att, (char *)intel_xv_attributes,
-	       sizeof(XF86AttributeRec) * NUM_ATTRIBUTES);
+	       sizeof(XvAttributeRec) * NUM_ATTRIBUTES);
 	att += NUM_ATTRIBUTES;
 	if (INTEL_INFO(intel)->gen >= 030) {
 		memcpy((char *)att, (char *)intel_xv_gamma_attributes,
-		       sizeof(XF86AttributeRec) * GAMMA_ATTRIBUTES);
+		       sizeof(XvAttributeRec) * GAMMA_ATTRIBUTES);
 	}
 	adapt->nImages = NUM_IMAGES - XVMC_IMAGE;