diff --git a/dix/pixmap.c b/dix/pixmap.c index 3324f947b..020ceb83a 100644 --- a/dix/pixmap.c +++ b/dix/pixmap.c @@ -29,8 +29,11 @@ from The Open Group. #include #include +#include + +#include "mi/mi_priv.h" + #include "scrnintstr.h" -#include "mi.h" #include "misc.h" #include "os.h" #include "windowstr.h" @@ -38,7 +41,6 @@ from The Open Group. #include "dixstruct.h" #include "gcstruct.h" #include "servermd.h" -#include "X11/extensions/render.h" #include "picturestr.h" #include "randrstr.h" /* diff --git a/hw/xfree86/modes/xf86Rotate.c b/hw/xfree86/modes/xf86Rotate.c index d94c77cdf..da0aa7635 100644 --- a/hw/xfree86/modes/xf86Rotate.c +++ b/hw/xfree86/modes/xf86Rotate.c @@ -33,8 +33,8 @@ #include #include "dix/dix_priv.h" +#include "mi/mi_priv.h" -#include "mi.h" #include "xf86.h" #include "xf86DDC.h" #include "windowstr.h" diff --git a/mi/mi.h b/mi/mi.h index e0eef7f28..83183bd26 100644 --- a/mi/mi.h +++ b/mi/mi.h @@ -232,11 +232,6 @@ extern _X_EXPORT void miPushPixels(GCPtr /*pGC */ , ); /* miscrinit.c */ - -extern _X_EXPORT void -miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h, - unsigned int subWindowMode); - extern _X_EXPORT Bool miModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, diff --git a/mi/mi_priv.h b/mi/mi_priv.h index 360820146..0eec45c29 100644 --- a/mi/mi_priv.h +++ b/mi/mi_priv.h @@ -47,4 +47,7 @@ void miWindowExposures(WindowPtr pWin, RegionPtr prgn); void miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what); +void miSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h, + unsigned int subWindowMode); + #endif /* _XSERVER_MI_PRIV_H */