4 files changed, 10 insertions, 15 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 287585c32..41223bd58 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -102,6 +102,9 @@
 /* Define to 1 if you have the <byteswap.h> header file. */
 #undef HAVE_BYTESWAP_H
 
+/* Define to 1 if you have cbrt */
+#undef HAVE_CBRT
+
 /* Define to 1 if you have the <dbm.h> header file. */
 #undef HAVE_DBM_H
 
diff --git a/include/misc.h b/include/misc.h
index 2be1d66a6..e6a5e9eb2 100644
--- a/include/misc.h
+++ b/include/misc.h
@@ -239,7 +239,7 @@ extern int Ones(
     unsigned long /*mask*/);
 
 typedef struct _xPoint *DDXPointPtr;
-typedef struct _Box *BoxPtr;
+typedef struct pixman_box16 *BoxPtr;
 typedef struct _xEvent *xEventPtr;
 typedef struct _xRectangle *xRectanglePtr;
 typedef struct _GrabRec *GrabPtr;
diff --git a/include/miscstruct.h b/include/miscstruct.h
index f78458771..81f699ad1 100644
--- a/include/miscstruct.h
+++ b/include/miscstruct.h
@@ -50,12 +50,11 @@ SOFTWARE.
 
 #include "misc.h"
 #include <X11/Xprotostr.h>
+#include <pixman/pixman.h>
 
 typedef xPoint DDXPointRec;
 
-typedef struct _Box {
-    short x1, y1, x2, y2;
-} BoxRec;
+typedef struct pixman_box16 BoxRec;
 
 typedef union _DevUnion {
     pointer		ptr;
diff --git a/include/regionstr.h b/include/regionstr.h
index e6882e77a..f44cab7b0 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -48,7 +48,7 @@ SOFTWARE.
 #ifndef REGIONSTRUCT_H
 #define REGIONSTRUCT_H
 
-typedef struct _Region RegionRec, *RegionPtr;
+typedef struct pixman_region16 RegionRec, *RegionPtr;
 
 #include "miscstruct.h"
 
@@ -64,16 +64,7 @@ typedef struct _Region RegionRec, *RegionPtr;
  *   clip region
  */
 
-typedef struct _RegData {
-    long	size;
-    long 	numRects;
-/*  BoxRec	rects[size];   in memory but not explicitly declared */
-} RegDataRec, *RegDataPtr;
-
-struct _Region {
-    BoxRec 	extents;
-    RegDataPtr	data;
-};
+typedef struct pixman_region16_data RegDataRec, *RegDataPtr;
 
 extern BoxRec miEmptyBox;
 extern RegDataRec miEmptyData;
@@ -234,6 +225,8 @@ extern RegDataRec miBrokenData;
 
 /* moved from mi.h */
 
+extern void InitRegions (void);
+
 extern RegionPtr miRegionCreate(
     BoxPtr /*rect*/,
     int /*size*/);