diff --git a/present/present_priv.h b/present/present_priv.h
index 790073c994..40c2b02391 100644
--- a/present/present_priv.h
+++ b/present/present_priv.h
@@ -41,7 +41,7 @@
 #include "dri3.h"
 
 #if 0
-#define DebugPresent(x) ErrorF x
+#define DebugPresent(x) ErrorF (x)
 #else
 #define DebugPresent(x)
 #endif
@@ -204,12 +204,12 @@ struct present_screen_priv {
 };
 
 #define wrap(priv,real,mem,func) {\
-    priv->mem = real->mem; \
-    real->mem = func; \
+    (priv)->mem = (real)->mem; \
+    (real)->mem = (func); \
 }
 
 #define unwrap(priv,real,mem) {\
-    real->mem = priv->mem; \
+    (real)->mem = (priv)->mem; \
 }
 
 static inline present_screen_priv_ptr
diff --git a/present/present_request.c b/present/present_request.c
index 11050ba7ea..297f2b19ee 100644
--- a/present/present_request.c
+++ b/present/present_request.c
@@ -64,7 +64,7 @@ proc_present_query_version(ClientPtr client)
         if ((fence_id) == None)                                         \
             (fence_ptr) = NULL;                                         \
         else {                                                          \
-            int __rc__ = SyncVerifyFence(&fence_ptr, fence_id, client, access); \
+            int __rc__ = SyncVerifyFence(&(fence_ptr), (fence_id), (client), (access)); \
             if (__rc__ != Success)                                      \
                 return __rc__;                                          \
         }                                                               \
@@ -74,7 +74,7 @@ proc_present_query_version(ClientPtr client)
         if ((crtc_id) == None)                                          \
             (crtc_ptr) = NULL;                                          \
         else {                                                          \
-            VERIFY_RR_CRTC(crtc_id, crtc_ptr, access);                  \
+            VERIFY_RR_CRTC((crtc_id), (crtc_ptr), (access));            \
         }                                                               \
     } while (0)