diff --git a/xfixes/cursor.c b/xfixes/cursor.c
index bfa91f0134..ff60ec776b 100644
--- a/xfixes/cursor.c
+++ b/xfixes/cursor.c
@@ -76,10 +76,10 @@ static void deleteCursorHideCountsForScreen(ScreenPtr pScreen);
 #define VERIFY_CURSOR(pCursor, cursor, client, access)			\
     do {								\
 	int err;							\
-	err = dixLookupResourceByType((void **) &pCursor, cursor,	\
-				      X11_RESTYPE_CURSOR, client, access);	\
+	err = dixLookupResourceByType((void **) &(pCursor), (cursor),	\
+				      X11_RESTYPE_CURSOR, (client), (access));	\
 	if (err != Success) {						\
-	    client->errorValue = cursor;				\
+	    (client)->errorValue = (cursor);				\
 	    return err;							\
 	}								\
     } while (0)
@@ -126,7 +126,7 @@ typedef struct _CursorScreen {
 } CursorScreenRec, *CursorScreenPtr;
 
 #define GetCursorScreen(s) ((CursorScreenPtr)dixLookupPrivate(&(s)->devPrivates, CursorScreenPrivateKey))
-#define Wrap(as,s,elt,func)	(((as)->elt = (s)->elt), (s)->elt = func)
+#define Wrap(as,s,elt,func)	(((as)->elt = (s)->elt), (s)->elt = (func))
 #define Unwrap(as,s,elt,backup)	(((backup) = (s)->elt), (s)->elt = (as)->elt)
 
 /* The cursor doesn't show up until the first XDefineCursor() */
diff --git a/xfixes/xfixes.h b/xfixes/xfixes.h
index f9ed5e6b01..f8dc929c8e 100644
--- a/xfixes/xfixes.h
+++ b/xfixes/xfixes.h
@@ -31,17 +31,17 @@ extern int XFixesErrorBase;
 #define VERIFY_REGION(pRegion, rid, client, mode)			\
     do {								\
 	int err;							\
-	err = dixLookupResourceByType((void **) &pRegion, rid,	\
-				      RegionResType, client, mode);	\
+	err = dixLookupResourceByType((void **) &(pRegion), (rid),	\
+				      RegionResType, (client), (mode));	\
 	if (err != Success) {						\
-	    client->errorValue = rid;					\
+	    (client)->errorValue = (rid);				\
 	    return err;							\
 	}								\
     } while (0)
 
 #define VERIFY_REGION_OR_NONE(pRegion, rid, client, mode) { \
-    pRegion = 0; \
-    if (rid) VERIFY_REGION(pRegion, rid, client, mode); \
+    (pRegion) = 0; \
+    if ((rid)) VERIFY_REGION((pRegion), (rid), (client), (mode)); \
 }
 
 extern RegionPtr