diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 136bf50ff..75235b368 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -1181,7 +1181,7 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,
 {
     int stolen = 0;
 
-#if XFreeXDGA
+#ifdef XFreeXDGA
     ScreenPtr scr = NULL;
     int idx = 0, i;
 
@@ -1375,7 +1375,7 @@ xf86PostButtonEventM(DeviceIntPtr device,
             flags = POINTER_RELATIVE | POINTER_ACCELERATE;
     }
 
-#if XFreeXDGA
+#ifdef XFreeXDGA
     if (miPointerGetScreen(device)) {
         int index = miPointerGetScreen(device)->myNum;
 
@@ -1406,7 +1406,7 @@ xf86PostKeyEventP(DeviceIntPtr device,
 void
 xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down)
 {
-#if XFreeXDGA
+#ifdef XFreeXDGA
     DeviceIntPtr pointer;
 
     /* Some pointers send key events, paired device is wrong then. */
diff --git a/include/events.h b/include/events.h
index c0ef45d5f..0cbd8c84a 100644
--- a/include/events.h
+++ b/include/events.h
@@ -29,7 +29,7 @@ typedef struct _DeviceChangedEvent DeviceChangedEvent;
 typedef struct _TouchOwnershipEvent TouchOwnershipEvent;
 typedef struct _BarrierEvent BarrierEvent;
 
-#if XFreeXDGA
+#ifdef XFreeXDGA
 typedef struct _DGAEvent DGAEvent;
 #endif
 typedef struct _RawDeviceEvent RawDeviceEvent;
diff --git a/include/eventstr.h b/include/eventstr.h
index 74469613a..bf3b95fe4 100644
--- a/include/eventstr.h
+++ b/include/eventstr.h
@@ -200,7 +200,7 @@ struct _DeviceChangedEvent {
     } keys;
 };
 
-#if XFreeXDGA
+#ifdef XFreeXDGA
 /**
  * DGAEvent, used by DGA to intercept and emulate input events.
  */
@@ -287,7 +287,7 @@ union _InternalEvent {
     DeviceChangedEvent changed_event;
     TouchOwnershipEvent touch_ownership_event;
     BarrierEvent barrier_event;
-#if XFreeXDGA
+#ifdef XFreeXDGA
     DGAEvent dga_event;
 #endif
     RawDeviceEvent raw_event;
diff --git a/mi/mieq.c b/mi/mieq.c
index a6e867df6..555f0ec7e 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -320,7 +320,7 @@ ChangeDeviceID(DeviceIntPtr dev, InternalEvent *event)
     case ET_TouchOwnership:
         event->touch_ownership_event.deviceid = dev->id;
         break;
-#if XFreeXDGA
+#ifdef XFreeXDGA
     case ET_DGAEvent:
         break;
 #endif
@@ -385,7 +385,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
     if (!sdev || IsMaster(sdev) || IsFloating(sdev))
         return NULL;
 
-#if XFreeXDGA
+#ifdef XFreeXDGA
     if (type == ET_DGAEvent)
         type = original->dga_event.subtype;
 #endif