diff --git a/hw/kdrive/ephyr/hostx.h b/hw/kdrive/ephyr/hostx.h
index 8b3caf245e..0c43faddc8 100644
--- a/hw/kdrive/ephyr/hostx.h
+++ b/hw/kdrive/ephyr/hostx.h
@@ -36,7 +36,7 @@
 
 #if (EPHYR_WANT_DEBUG)
 #define EPHYR_DBG(x, a...) \
- fprintf(stderr, __FILE__ ":%d,%s() " x "\n", __LINE__, __func__, ##a)
+ fprintf(stderr, __FILE__ ":%d,%s() " (x) "\n", __LINE__, __func__, ##a)
 #else
 #define EPHYR_DBG(x, a...) do {} while (0)
 #endif
diff --git a/hw/kdrive/fbdev/fbdev.c b/hw/kdrive/fbdev/fbdev.c
index d07cd9cf1e..8e21abed2b 100644
--- a/hw/kdrive/fbdev/fbdev.c
+++ b/hw/kdrive/fbdev/fbdev.c
@@ -290,7 +290,7 @@ fbdevScreenInitialize(KdScreenInfo * screen, FbdevScrPriv * scrpriv)
     case FB_VISUAL_TRUECOLOR:
     case FB_VISUAL_DIRECTCOLOR:
         screen->fb.visuals = (1 << TrueColor);
-#define Mask(o,l)   (((1 << l) - 1) << o)
+#define Mask(o,l)   (((1 << (l)) - 1) << (o))
         screen->fb.redMask = Mask (priv->var.red.offset, priv->var.red.length);
         screen->fb.greenMask =
             Mask (priv->var.green.offset, priv->var.green.length);
diff --git a/hw/kdrive/linux/evdev/evdev.c b/hw/kdrive/linux/evdev/evdev.c
index ae1c9640a1..d91d2e3332 100644
--- a/hw/kdrive/linux/evdev/evdev.c
+++ b/hw/kdrive/linux/evdev/evdev.c
@@ -35,10 +35,10 @@
 
 #define BITS_PER_LONG (sizeof(long) * 8)
 #define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-#define ISBITSET(x,y) ((x)[LONG(y)] & BIT(y))
+#define ISBITSET(x,y) ((x)[LONG((y))] & BIT((y)))
 #define OFF(x)   ((x)%BITS_PER_LONG)
 #define LONG(x)  ((x)/BITS_PER_LONG)
-#define BIT(x)         (1 << OFF(x))
+#define BIT(x)         (1 << OFF((x)))
 
 typedef struct _kevdev {
     /* current device state */
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index dbb0cf4af8..c577f6787e 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -351,8 +351,8 @@ extern const KdOsFuncs *kdOsFuncs;
 #define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \
     dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))
 #define KdSetScreenPriv(pScreen,v) \
-    dixSetPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey, v)
-#define KdScreenPriv(pScreen) KdPrivScreenPtr pScreenPriv = KdGetScreenPriv(pScreen)
+    dixSetPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey, (v))
+#define KdScreenPriv(pScreen) KdPrivScreenPtr pScreenPriv = KdGetScreenPriv((pScreen))
 
 /* kcmap.c */
 void
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index f2ba24b428..8890e17e24 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -65,7 +65,7 @@
 #define DEV_INPUT_EVENT_PREFIX_LEN (sizeof(DEV_INPUT_EVENT_PREFIX) - 1)
 #endif
 
-#define AtomFromName(x) MakeAtom(x, strlen(x), 1)
+#define AtomFromName(x) MakeAtom((x), strlen((x)), 1)
 
 #define KD_KEY_COUNT    248
 #define KD_MIN_KEYCODE  8
@@ -2120,7 +2120,7 @@ KdWakeupHandler(ScreenPtr pScreen, int result)
         KdProcessSwitch();
 }
 
-#define KdScreenOrigin(pScreen) (&(KdGetScreenPriv(pScreen)->screen->origin))
+#define KdScreenOrigin(pScreen) (&(KdGetScreenPriv((pScreen))->screen->origin))
 
 static Bool
 KdCursorOffScreen(ScreenPtr *ppScreen, int *x, int *y)
diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c
index 899f4e014b..994a5b95a3 100644
--- a/hw/kdrive/src/kxv.c
+++ b/hw/kdrive/src/kxv.c
@@ -106,7 +106,7 @@ static unsigned long PortResource = 0;
     dixLookupPrivate(&(pScreen)->devPrivates, KdXvScreenKey))
 
 #define GET_KDXV_SCREEN(pScreen) \
-    ((KdXVScreenPtr)(dixGetPrivate(&pScreen->devPrivates, &KdXVScreenPrivateKey)))
+    ((KdXVScreenPtr)(dixGetPrivate(&(pScreen)->devPrivates, &KdXVScreenPrivateKey)))
 
 #define GET_KDXV_WINDOW(pWin) ((KdXVWindowPtr) \
     dixLookupPrivate(&(pWin)->devPrivates, KdXVWindowKey))