3 files changed, 34 insertions, 32 deletions
diff --git a/src/xvmc/I915XvMC.c b/src/xvmc/I915XvMC.c
index 94b50262..59d5730a 100644
--- a/src/xvmc/I915XvMC.c
+++ b/src/xvmc/I915XvMC.c
@@ -45,7 +45,6 @@
 #include <xf86drm.h>
 #include <drm_sarea.h>
 
-#include "intel_xvmc.h"
 #include "I915XvMC.h"
 #include "i915_structs.h"
 #include "i915_program.h"
@@ -2524,7 +2523,7 @@ Status XvMCPutSurface(Display *display,XvMCSurface *surface,
     pI915XvMC->draw = draw;
     pI915XvMC->xvImage->data = (char *)&buf;
 
-    buf.command = I915_XVMC_COMMAND_DISPLAY;
+    buf.command = INTEL_XVMC_COMMAND_DISPLAY;
     buf.ctxNo = pI915XvMC->ctxno;
     buf.srfNo = pI915Surface->srfNo;
     pI915SubPic = pI915Surface->privSubPic;
diff --git a/src/xvmc/I915XvMC.h b/src/xvmc/I915XvMC.h
index 78aea7d2..d122bcc7 100644
--- a/src/xvmc/I915XvMC.h
+++ b/src/xvmc/I915XvMC.h
@@ -31,12 +31,8 @@
 /* #define XVMC_DEBUG(x) do {x; }while(0); */
 #define XVMC_DEBUG(x)
 
-#include "xf86drm.h"
-#include "i830_common.h"
+#include "intel_xvmc.h"
 #include "i915_hwmc.h"
-#include <X11/Xlibint.h>
-#include <X11/Xutil.h>
-#include <signal.h>
 
 #define I915_SUBPIC_PALETTE_SIZE        16
 #define MAX_SUBCONTEXT_LEN              1024
@@ -163,29 +159,4 @@ typedef struct _i915XvMCSurface {
                                          * displaying. NULL if none. */
 } i915XvMCSurface;
 
-/* Subpicture fourcc */
-#define FOURCC_IA44 0x34344149
-
-/*
-  Definitions for temporary wire protocol hooks to be replaced
-  when a HW independent libXvMC is created.
-*/
-extern Status _xvmc_create_context(Display *dpy, XvMCContext *context,
-				   int *priv_count, uint **priv_data);
-
-extern Status _xvmc_destroy_context(Display *dpy, XvMCContext *context);
-
-extern Status _xvmc_create_surface(Display *dpy, XvMCContext *context,
-				   XvMCSurface *surface, int *priv_count,
-				   uint **priv_data);
-
-extern Status _xvmc_destroy_surface(Display *dpy, XvMCSurface *surface);
-
-extern Status  _xvmc_create_subpicture(Display *dpy, XvMCContext *context,
-				       XvMCSubpicture *subpicture,
-				       int *priv_count, uint **priv_data);
-
-extern Status   _xvmc_destroy_subpicture(Display *dpy,
-					 XvMCSubpicture *subpicture);
-
 #endif /* _I915XVMC_H */
diff --git a/src/xvmc/intel_xvmc.h b/src/xvmc/intel_xvmc.h
index 072a0f49..0726be43 100644
--- a/src/xvmc/intel_xvmc.h
+++ b/src/xvmc/intel_xvmc.h
@@ -2,6 +2,13 @@
 #ifndef INTEL_XVMC_H
 #define INTEL_XVMC_H
 
+#include "xf86drm.h"
+#include "i830_common.h"
+#include "i830_hwmc.h"
+#include <X11/Xlibint.h>
+#include <X11/Xutil.h>
+#include <signal.h>
+
 #define DEBUG 0
 
 #define XVMC_ERR(s, arg...)					\
@@ -20,4 +27,29 @@
 	    fprintf(stderr, "intel_xvmc debug: " s "\n", ##arg);	\
     } while (0)
 
+/* Subpicture fourcc */
+#define FOURCC_IA44 0x34344149
+
+/*
+  Definitions for temporary wire protocol hooks to be replaced
+  when a HW independent libXvMC is created.
+*/
+extern Status _xvmc_create_context(Display *dpy, XvMCContext *context,
+				   int *priv_count, uint **priv_data);
+
+extern Status _xvmc_destroy_context(Display *dpy, XvMCContext *context);
+
+extern Status _xvmc_create_surface(Display *dpy, XvMCContext *context,
+				   XvMCSurface *surface, int *priv_count,
+				   uint **priv_data);
+
+extern Status _xvmc_destroy_surface(Display *dpy, XvMCSurface *surface);
+
+extern Status  _xvmc_create_subpicture(Display *dpy, XvMCContext *context,
+				       XvMCSubpicture *subpicture,
+				       int *priv_count, uint **priv_data);
+
+extern Status   _xvmc_destroy_subpicture(Display *dpy,
+					 XvMCSubpicture *subpicture);
+
 #endif