diff --git a/pixman/src/icint.h b/pixman/src/icint.h
index a489bb7b4..17b13b491 100644
--- a/pixman/src/icint.h
+++ b/pixman/src/icint.h
@@ -985,7 +985,7 @@ typedef struct _PictFormat	*PictFormatPtr;
 #define PictureCmapPolicyColor	    3
 #define PictureCmapPolicyAll	    4
 
-extern int PictureCmapPolicy pixman_private;
+extern pixman_private int PictureCmapPolicy;
 
 int	PictureParseCmapPolicy (const char *name);
 
diff --git a/pixman/src/icrop.h b/pixman/src/icrop.h
index 4e6ac82dc..99fc8e542 100644
--- a/pixman/src/icrop.h
+++ b/pixman/src/icrop.h
@@ -29,7 +29,7 @@ typedef struct _mergeRopBits {
     FbBits   ca1, cx1, ca2, cx2;
 } FbMergeRopRec, *FbMergeRopPtr;
 
-extern const FbMergeRopRec FbMergeRopBits[16] pixman_private;
+extern pixman_private const FbMergeRopRec FbMergeRopBits[16];
 
 #define FbDeclareMergeRop() FbBits   _ca1, _cx1, _ca2, _cx2;
 #define FbDeclarePrebuiltMergeRop()	FbBits	_cca, _ccx;
@@ -98,7 +98,7 @@ extern const FbMergeRopRec FbMergeRopBits[16] pixman_private;
  */
 
 /* half of table */
-extern const pixman_bits_t fbStipple16Bits[256] pixman_private;
+extern pixman_private const pixman_bits_t fbStipple16Bits[256];
 #define FbStipple16Bits(b) \
     (fbStipple16Bits[(b)&0xff] | fbStipple16Bits[(b) >> 8] << FB_HALFUNIT)