summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Xext/bigreq.c1
-rw-r--r--Xext/geint.h1
-rw-r--r--Xext/mbuf.c2
-rw-r--r--Xext/mbufbf.c2
-rw-r--r--Xext/mbufpx.c2
-rw-r--r--Xext/panoramiX.c1
-rw-r--r--Xext/panoramiXprocs.c2
-rw-r--r--Xext/saver.c2
-rw-r--r--Xext/shape.c2
-rw-r--r--Xext/shm.c2
-rw-r--r--Xext/sync.c2
-rw-r--r--Xext/xcalibrate.c2
-rw-r--r--Xext/xcmisc.c2
-rw-r--r--Xext/xres.c2
-rw-r--r--Xext/xtest.c1
-rw-r--r--Xext/xvmc.c2
-rw-r--r--Xi/allowev.c2
-rw-r--r--Xi/chdevcur.c2
-rw-r--r--Xi/chdevhier.c2
-rw-r--r--Xi/chgdctl.c2
-rw-r--r--Xi/chgfctl.c2
-rw-r--r--Xi/chgkbd.c2
-rw-r--r--Xi/chgkmap.c2
-rw-r--r--Xi/chgprop.c2
-rw-r--r--Xi/chgptr.c2
-rw-r--r--Xi/closedev.c2
-rw-r--r--Xi/devbell.c2
-rw-r--r--Xi/exevents.c1
-rw-r--r--Xi/extgrbdev.c2
-rw-r--r--Xi/extinit.c2
-rw-r--r--Xi/getbmap.c2
-rw-r--r--Xi/getcptr.c2
-rw-r--r--Xi/getdctl.c2
-rw-r--r--Xi/getfctl.c2
-rw-r--r--Xi/getfocus.c2
-rw-r--r--Xi/getkmap.c2
-rw-r--r--Xi/getmmap.c2
-rw-r--r--Xi/getprop.c2
-rw-r--r--Xi/getselev.c2
-rw-r--r--Xi/getvers.c2
-rw-r--r--Xi/grabdev.c2
-rw-r--r--Xi/grabdevb.c2
-rw-r--r--Xi/grabdevk.c2
-rw-r--r--Xi/gtmotion.c2
-rw-r--r--Xi/listdev.c2
-rw-r--r--Xi/opendev.c2
-rw-r--r--Xi/querydp.c2
-rw-r--r--Xi/queryst.c2
-rw-r--r--Xi/selectev.c2
-rw-r--r--Xi/sendexev.c2
-rw-r--r--Xi/setbmap.c2
-rw-r--r--Xi/setcptr.c2
-rw-r--r--Xi/setdval.c2
-rw-r--r--Xi/setfocus.c2
-rw-r--r--Xi/setmmap.c2
-rw-r--r--Xi/setmode.c2
-rw-r--r--Xi/stubs.c1
-rw-r--r--Xi/ungrdev.c2
-rw-r--r--Xi/ungrdevb.c2
-rw-r--r--Xi/ungrdevk.c2
-rw-r--r--Xi/warpdevp.c2
-rw-r--r--Xi/xiselev.c2
-rw-r--r--damageext/damageextint.h1
-rw-r--r--dbe/dbe.c1
-rw-r--r--dbe/midbe.c2
-rw-r--r--dix/colormap.c1
-rw-r--r--dix/devices.c2
-rw-r--r--dix/dixfonts.c1
-rw-r--r--dix/events.c2
-rw-r--r--dix/extension.c2
-rw-r--r--dix/getevents.c2
-rw-r--r--dix/grabs.c1
-rw-r--r--dix/main.c1
-rw-r--r--dix/property.c2
-rw-r--r--dix/resource.c1
-rw-r--r--dix/swaprep.c2
-rw-r--r--dix/swapreq.c1
-rw-r--r--dix/tables.c2
-rw-r--r--exa/exa_priv.h1
-rw-r--r--glx/glxcmds.c1
-rw-r--r--glx/glxcmdsswap.c1
-rw-r--r--glx/glxext.c1
-rw-r--r--glx/glxutil.c1
-rw-r--r--glx/indirect_program.c1
-rw-r--r--glx/indirect_texture_compression.c1
-rw-r--r--glx/render2.c1
-rw-r--r--glx/render2swap.c1
-rw-r--r--glx/renderpix.c1
-rw-r--r--glx/renderpixswap.c1
-rw-r--r--glx/single2.c1
-rw-r--r--glx/single2swap.c1
-rw-r--r--glx/singlepix.c1
-rw-r--r--glx/singlepixswap.c1
-rw-r--r--glx/swap_interval.c1
-rw-r--r--glx/xfont.c1
-rw-r--r--hw/dmx/glxProxy/g_renderswap.c1
-rw-r--r--hw/dmx/glxProxy/global.c1
-rw-r--r--hw/dmx/glxProxy/glxcmds.c1
-rw-r--r--hw/dmx/glxProxy/glxcmdsswap.c1
-rw-r--r--hw/dmx/glxProxy/glxext.c1
-rw-r--r--hw/dmx/glxProxy/glxsingle.c1
-rw-r--r--hw/dmx/glxProxy/glxutil.c1
-rw-r--r--hw/dmx/glxProxy/glxvendor.c1
-rw-r--r--hw/dmx/glxProxy/render2swap.c1
-rw-r--r--hw/dmx/glxProxy/renderpixswap.c1
-rw-r--r--hw/dmx/input/ChkNotMaskEv.c1
-rw-r--r--hw/dmx/input/dmxxinput.c1
-rw-r--r--hw/kdrive/ephyr/XF86dri.c1
-rw-r--r--hw/kdrive/ephyr/ephyrdriext.c2
-rw-r--r--hw/kdrive/fake/mouse.c1
-rw-r--r--hw/kdrive/linux/bus.c1
-rw-r--r--hw/kdrive/linux/evdev.c1
-rw-r--r--hw/kdrive/linux/mouse.c1
-rw-r--r--hw/kdrive/linux/ms.c1
-rw-r--r--hw/kdrive/linux/ps2.c1
-rw-r--r--hw/kdrive/linux/tslib.c1
-rw-r--r--hw/kdrive/src/kdrive.h1
-rw-r--r--hw/vfb/InitInput.c1
-rw-r--r--hw/vfb/InitOutput.c1
-rw-r--r--hw/xfree86/common/xf86Cursor.c1
-rw-r--r--hw/xfree86/common/xf86Init.c1
-rw-r--r--hw/xfree86/common/xf86Xinput.h3
-rw-r--r--hw/xfree86/dixmods/extmod/xf86dga2.c2
-rw-r--r--hw/xfree86/dixmods/extmod/xf86vmode.c2
-rw-r--r--hw/xfree86/dixmods/xkbKillSrv.c1
-rw-r--r--hw/xfree86/dixmods/xkbPrivate.c1
-rw-r--r--hw/xfree86/dixmods/xkbVT.c1
-rw-r--r--hw/xfree86/dri/dri.c2
-rw-r--r--hw/xfree86/dri/xf86dri.c2
-rw-r--r--hw/xfree86/dri2/dri2ext.c1
-rw-r--r--hw/xnest/Events.c1
-rw-r--r--hw/xnest/Keyboard.c1
-rw-r--r--hw/xquartz/applewm.c2
-rw-r--r--hw/xquartz/darwinEvents.c1
-rw-r--r--hw/xquartz/darwinXinput.c1
-rw-r--r--hw/xquartz/xpr/appledri.c2
-rw-r--r--hw/xquartz/xpr/dri.c2
-rw-r--r--hw/xquartz/xpr/xprEvent.c1
-rw-r--r--hw/xwin/win.h1
-rwxr-xr-xhw/xwin/winwindowswm.c2
-rw-r--r--include/closestr.h1
-rw-r--r--include/dixfontstr.h1
-rw-r--r--mi/midispcur.c1
-rw-r--r--mi/mieq.c1
-rw-r--r--mi/miexpose.c1
-rw-r--r--mi/mipointer.c1
-rw-r--r--os/io.c1
-rw-r--r--randr/randr.c2
-rw-r--r--record/record.c1
-rw-r--r--render/render.c2
-rw-r--r--xfixes/xfixesint.h1
-rw-r--r--xkb/XKBAlloc.c2
-rw-r--r--xkb/XKBGAlloc.c2
-rw-r--r--xkb/XKBMAlloc.c2
-rw-r--r--xkb/XKBMisc.c2
-rw-r--r--xkb/ddxBeep.c1
-rw-r--r--xkb/ddxCtrls.c1
-rw-r--r--xkb/ddxDevBtn.c1
-rw-r--r--xkb/ddxFakeMtn.c1
-rw-r--r--xkb/ddxInit.c1
-rw-r--r--xkb/ddxKeyClick.c1
-rw-r--r--xkb/ddxKillSrv.c1
-rw-r--r--xkb/ddxLEDs.c1
-rw-r--r--xkb/ddxList.c1
-rw-r--r--xkb/ddxLoad.c1
-rw-r--r--xkb/ddxPrivate.c1
-rw-r--r--xkb/ddxVT.c1
-rw-r--r--xkb/maprules.c1
-rw-r--r--xkb/xkb.c2
-rw-r--r--xkb/xkbAccessX.c1
-rw-r--r--xkb/xkbActions.c1
-rw-r--r--xkb/xkbEvents.c1
-rw-r--r--xkb/xkbInit.c1
-rw-r--r--xkb/xkbLEDs.c1
-rw-r--r--xkb/xkbPrKeyEv.c1
-rw-r--r--xkb/xkbPrOtherEv.c1
-rw-r--r--xkb/xkbSwap.c2
-rw-r--r--xkb/xkbUtils.c1
-rw-r--r--xkb/xkbfmisc.c1
-rw-r--r--xkb/xkbout.c1
-rw-r--r--xkb/xkbtext.c1
-rw-r--r--xkb/xkmread.c1
182 files changed, 0 insertions, 265 deletions
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 1e807d820..7ea69a874 100644
--- a/Xext/bigreq.c
+++ b/Xext/bigreq.c
@@ -26,7 +26,6 @@ from The Open Group.
*/
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xext/geint.h b/Xext/geint.h
index b7f0265a1..881d30661 100644
--- a/Xext/geint.h
+++ b/Xext/geint.h
@@ -29,7 +29,6 @@
#ifndef _GEINT_H_
#define _GEINT_H_
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/Xext/mbuf.c b/Xext/mbuf.c
index 39b8ba11e..81b704f2f 100644
--- a/Xext/mbuf.c
+++ b/Xext/mbuf.c
@@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
********************************************************/
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xext/mbufbf.c b/Xext/mbufbf.c
index e929ab5fd..877ccaabd 100644
--- a/Xext/mbufbf.c
+++ b/Xext/mbufbf.c
@@ -25,8 +25,6 @@ in this Software without prior written authorization from The Open Group.
*/
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xext/mbufpx.c b/Xext/mbufpx.c
index 21d525906..01811d9a2 100644
--- a/Xext/mbufpx.c
+++ b/Xext/mbufpx.c
@@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
********************************************************/
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
index 09587c4ed..043966877 100644
--- a/Xext/panoramiX.c
+++ b/Xext/panoramiX.c
@@ -31,7 +31,6 @@ Equipment Corporation.
#include <dmx-config.h>
#endif
-#define NEED_REPLIES
#include <stdio.h>
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/Xext/panoramiXprocs.c b/Xext/panoramiXprocs.c
index 38199a5df..0f9096fe5 100644
--- a/Xext/panoramiXprocs.c
+++ b/Xext/panoramiXprocs.c
@@ -32,8 +32,6 @@ Equipment Corporation.
#include <stdio.h>
#include <X11/X.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "windowstr.h"
#include "dixfontstr.h"
diff --git a/Xext/saver.c b/Xext/saver.c
index 0bdcb8b94..7a5b2c70e 100644
--- a/Xext/saver.c
+++ b/Xext/saver.c
@@ -27,8 +27,6 @@ in this Software without prior written authorization from the X Consortium.
*/
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xext/shape.c b/Xext/shape.c
index aaef0cb14..8e1da87ba 100644
--- a/Xext/shape.c
+++ b/Xext/shape.c
@@ -24,8 +24,6 @@ in this Software without prior written authorization from The Open Group.
********************************************************/
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xext/shm.c b/Xext/shm.c
index de364be3a..ce566b601 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -38,8 +38,6 @@ in this Software without prior written authorization from The Open Group.
#include <sys/shm.h>
#include <unistd.h>
#include <sys/stat.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/Xext/sync.c b/Xext/sync.c
index 51d113ef5..f8870a77c 100644
--- a/Xext/sync.c
+++ b/Xext/sync.c
@@ -50,8 +50,6 @@ PERFORMANCE OF THIS SOFTWARE.
*/
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xext/xcalibrate.c b/Xext/xcalibrate.c
index 3e05e6ca2..f923c17a1 100644
--- a/Xext/xcalibrate.c
+++ b/Xext/xcalibrate.c
@@ -24,8 +24,6 @@
#include <kdrive-config.h>
#endif
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/X.h>
#include <X11/Xproto.h>
diff --git a/Xext/xcmisc.c b/Xext/xcmisc.c
index 1ee173bd6..4f928961d 100644
--- a/Xext/xcmisc.c
+++ b/Xext/xcmisc.c
@@ -26,8 +26,6 @@ from The Open Group.
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xext/xres.c b/Xext/xres.c
index bdc534c91..5c04c1184 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -2,8 +2,6 @@
Copyright (c) 2002 XFree86 Inc
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xext/xtest.c b/Xext/xtest.c
index 1290a236c..87936402a 100644
--- a/Xext/xtest.c
+++ b/Xext/xtest.c
@@ -31,7 +31,6 @@
#endif
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "misc.h"
#include "os.h"
diff --git a/Xext/xvmc.c b/Xext/xvmc.c
index 359e954d9..091e5a1a0 100644
--- a/Xext/xvmc.c
+++ b/Xext/xvmc.c
@@ -1,6 +1,4 @@
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/allowev.c b/Xi/allowev.c
index 36b6caad5..5f0753d42 100644
--- a/Xi/allowev.c
+++ b/Xi/allowev.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/chdevcur.c b/Xi/chdevcur.c
index 121f7921d..b0d3ce341 100644
--- a/Xi/chdevcur.c
+++ b/Xi/chdevcur.c
@@ -29,8 +29,6 @@
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c
index 631857d58..9d3c25dc7 100644
--- a/Xi/chdevhier.c
+++ b/Xi/chdevhier.c
@@ -30,8 +30,6 @@
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/chgdctl.c b/Xi/chgdctl.c
index 6044f6cd6..f5dd08a3c 100644
--- a/Xi/chgdctl.c
+++ b/Xi/chgdctl.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS /* for inputstr.h */
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/chgfctl.c b/Xi/chgfctl.c
index 3155e87c2..e193e1384 100644
--- a/Xi/chgfctl.c
+++ b/Xi/chgfctl.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS /* for inputstr.h */
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/chgkbd.c b/Xi/chgkbd.c
index 83de646f1..f9fd09902 100644
--- a/Xi/chgkbd.c
+++ b/Xi/chgkbd.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/chgkmap.c b/Xi/chgkmap.c
index 3f51648e1..854c17f3b 100644
--- a/Xi/chgkmap.c
+++ b/Xi/chgkmap.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS /* for inputstr.h */
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/chgprop.c b/Xi/chgprop.c
index 3fb33e129..d8e37a7c7 100644
--- a/Xi/chgprop.c
+++ b/Xi/chgprop.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/chgptr.c b/Xi/chgptr.c
index 28950918f..6a4fbc342 100644
--- a/Xi/chgptr.c
+++ b/Xi/chgptr.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/closedev.c b/Xi/closedev.c
index 2be908c4a..159ead55c 100644
--- a/Xi/closedev.c
+++ b/Xi/closedev.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/devbell.c b/Xi/devbell.c
index 264f64800..539da1814 100644
--- a/Xi/devbell.c
+++ b/Xi/devbell.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/exevents.c b/Xi/exevents.c
index 6d9b6671d..01feb0e46 100644
--- a/Xi/exevents.c
+++ b/Xi/exevents.c
@@ -52,7 +52,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/extgrbdev.c b/Xi/extgrbdev.c
index 050984a8e..af8706320 100644
--- a/Xi/extgrbdev.c
+++ b/Xi/extgrbdev.c
@@ -29,8 +29,6 @@
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/extinit.c b/Xi/extinit.c
index 7880497e7..62ec95897 100644
--- a/Xi/extinit.c
+++ b/Xi/extinit.c
@@ -52,8 +52,6 @@ SOFTWARE.
#define NUMTYPES 15
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getbmap.c b/Xi/getbmap.c
index 9f93b06ef..4a788c66b 100644
--- a/Xi/getbmap.c
+++ b/Xi/getbmap.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getcptr.c b/Xi/getcptr.c
index ae45b13ae..c696afead 100644
--- a/Xi/getcptr.c
+++ b/Xi/getcptr.c
@@ -23,8 +23,6 @@
* Author: Peter Hutterer, University of South Australia, NICTA
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getdctl.c b/Xi/getdctl.c
index c979959e2..abb4f9935 100644
--- a/Xi/getdctl.c
+++ b/Xi/getdctl.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS /* for inputstr.h */
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getfctl.c b/Xi/getfctl.c
index 1b1e594a2..3a6dd4585 100644
--- a/Xi/getfctl.c
+++ b/Xi/getfctl.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS /* for inputstr.h */
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getfocus.c b/Xi/getfocus.c
index dfef22fb7..69eadde87 100644
--- a/Xi/getfocus.c
+++ b/Xi/getfocus.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getkmap.c b/Xi/getkmap.c
index 0eec1d8df..540184682 100644
--- a/Xi/getkmap.c
+++ b/Xi/getkmap.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS /* for inputstr.h */
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getmmap.c b/Xi/getmmap.c
index c6c9c3362..0ae2ccc52 100644
--- a/Xi/getmmap.c
+++ b/Xi/getmmap.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS /* for inputstr.h */
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getprop.c b/Xi/getprop.c
index 188f549e5..dfa27f5cc 100644
--- a/Xi/getprop.c
+++ b/Xi/getprop.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getselev.c b/Xi/getselev.c
index caa376fcb..ea9bd9ba5 100644
--- a/Xi/getselev.c
+++ b/Xi/getselev.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/getvers.c b/Xi/getvers.c
index 43a1a4d26..f8fd56e6d 100644
--- a/Xi/getvers.c
+++ b/Xi/getvers.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/grabdev.c b/Xi/grabdev.c
index 8217a9928..f032b4a42 100644
--- a/Xi/grabdev.c
+++ b/Xi/grabdev.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/grabdevb.c b/Xi/grabdevb.c
index 98f7e117d..61ced4813 100644
--- a/Xi/grabdevb.c
+++ b/Xi/grabdevb.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/grabdevk.c b/Xi/grabdevk.c
index 6a245f25a..aefe11b1e 100644
--- a/Xi/grabdevk.c
+++ b/Xi/grabdevk.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/gtmotion.c b/Xi/gtmotion.c
index 8fa0cca29..55d45a363 100644
--- a/Xi/gtmotion.c
+++ b/Xi/gtmotion.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/listdev.c b/Xi/listdev.c
index ce549da50..04550e488 100644
--- a/Xi/listdev.c
+++ b/Xi/listdev.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/opendev.c b/Xi/opendev.c
index c51bb7e3f..41edb0f90 100644
--- a/Xi/opendev.c
+++ b/Xi/opendev.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/querydp.c b/Xi/querydp.c
index 744a295ff..8d8be8187 100644
--- a/Xi/querydp.c
+++ b/Xi/querydp.c
@@ -29,8 +29,6 @@
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/queryst.c b/Xi/queryst.c
index 21de843f3..6553aa88e 100644
--- a/Xi/queryst.c
+++ b/Xi/queryst.c
@@ -32,8 +32,6 @@ from The Open Group.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/selectev.c b/Xi/selectev.c
index 9c336fce5..c3fc88ed9 100644
--- a/Xi/selectev.c
+++ b/Xi/selectev.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/Xi/sendexev.c b/Xi/sendexev.c
index 9b37de307..63b45ee49 100644
--- a/Xi/sendexev.c
+++ b/Xi/sendexev.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/setbmap.c b/Xi/setbmap.c
index f05225531..3c293c0db 100644
--- a/Xi/setbmap.c
+++ b/Xi/setbmap.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#define IsOn(ptr, bit) \
(((BYTE *) (ptr))[(bit)>>3] & (1 << ((bit) & 7)))
diff --git a/Xi/setcptr.c b/Xi/setcptr.c
index 81ce66bd5..1e8281d0d 100644
--- a/Xi/setcptr.c
+++ b/Xi/setcptr.c
@@ -31,8 +31,6 @@
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/setdval.c b/Xi/setdval.c
index 20584629a..fe5f31691 100644
--- a/Xi/setdval.c
+++ b/Xi/setdval.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/setfocus.c b/Xi/setfocus.c
index c6edbc2e5..03bc37acb 100644
--- a/Xi/setfocus.c
+++ b/Xi/setfocus.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/setmmap.c b/Xi/setmmap.c
index 34efde595..ddfc1bd3e 100644
--- a/Xi/setmmap.c
+++ b/Xi/setmmap.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS /* for inputstr.h */
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/setmode.c b/Xi/setmode.c
index 2badb5161..51e57675f 100644
--- a/Xi/setmode.c
+++ b/Xi/setmode.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/stubs.c b/Xi/stubs.c
index d01927c73..229394b93 100644
--- a/Xi/stubs.c
+++ b/Xi/stubs.c
@@ -54,7 +54,6 @@ SOFTWARE.
* Xnest could do the same thing.
*/
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/ungrdev.c b/Xi/ungrdev.c
index f6525a287..b5b572a8e 100644
--- a/Xi/ungrdev.c
+++ b/Xi/ungrdev.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/ungrdevb.c b/Xi/ungrdevb.c
index d1aef5f13..a53dc5bdb 100644
--- a/Xi/ungrdevb.c
+++ b/Xi/ungrdevb.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/ungrdevk.c b/Xi/ungrdevk.c
index bc3ada987..8d9cdb17d 100644
--- a/Xi/ungrdevk.c
+++ b/Xi/ungrdevk.c
@@ -50,8 +50,6 @@ SOFTWARE.
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/warpdevp.c b/Xi/warpdevp.c
index c8e8d6116..565317fe9 100644
--- a/Xi/warpdevp.c
+++ b/Xi/warpdevp.c
@@ -29,8 +29,6 @@
*
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/Xi/xiselev.c b/Xi/xiselev.c
index 0f8433451..0431939e7 100644
--- a/Xi/xiselev.c
+++ b/Xi/xiselev.c
@@ -23,8 +23,6 @@
* Author: Peter Hutterer, University of South Australia, NICTA
*/
-#define NEED_EVENTS
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/damageext/damageextint.h b/damageext/damageextint.h
index e06f28c4e..543f1a70b 100644
--- a/damageext/damageextint.h
+++ b/damageext/damageextint.h
@@ -27,7 +27,6 @@
#ifndef _DAMAGEEXTINT_H_
#define _DAMAGEEXTINT_H_
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/dbe/dbe.c b/dbe/dbe.c
index ff9df7f9f..3fd99dfc9 100644
--- a/dbe/dbe.c
+++ b/dbe/dbe.c
@@ -33,7 +33,6 @@
/* INCLUDES */
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/dbe/midbe.c b/dbe/midbe.c
index f8a3acc87..4426c9d85 100644
--- a/dbe/midbe.c
+++ b/dbe/midbe.c
@@ -33,8 +33,6 @@
/* INCLUDES */
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/dix/colormap.c b/dix/colormap.c
index 3f22a4759..23b755f92 100644
--- a/dix/colormap.c
+++ b/dix/colormap.c
@@ -51,7 +51,6 @@ SOFTWARE.
#endif
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <stdio.h>
#include <string.h>
diff --git a/dix/devices.c b/dix/devices.c
index 763466831..d8cc15691 100644
--- a/dix/devices.c
+++ b/dix/devices.c
@@ -54,8 +54,6 @@ SOFTWARE.
#include <X11/X.h>
#include "misc.h"
#include "resource.h"
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include <X11/Xatom.h>
#include "windowstr.h"
diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 416adb352..15d011c1d 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -48,7 +48,6 @@ Equipment Corporation.
******************************************************************/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/dix/events.c b/dix/events.c
index 45cd608b1..e30f40b17 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -120,8 +120,6 @@ of the copyright holder.
#include <X11/keysym.h>
#include "misc.h"
#include "resource.h"
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "windowstr.h"
#include "inputstr.h"
diff --git a/dix/extension.c b/dix/extension.c
index 289705fd5..b408da944 100644
--- a/dix/extension.c
+++ b/dix/extension.c
@@ -50,8 +50,6 @@ SOFTWARE.
#endif
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
#include "dixstruct.h"
diff --git a/dix/getevents.c b/dix/getevents.c
index f53f3c347..2c47849be 100644
--- a/dix/getevents.c
+++ b/dix/getevents.c
@@ -30,8 +30,6 @@
#include <X11/X.h>
#include <X11/keysym.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/dix/grabs.c b/dix/grabs.c
index b372d8f1b..8878cb7a3 100644
--- a/dix/grabs.c
+++ b/dix/grabs.c
@@ -52,7 +52,6 @@ SOFTWARE.
#include <X11/X.h>
#include "misc.h"
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "windowstr.h"
#include "inputstr.h"
diff --git a/dix/main.c b/dix/main.c
index 354599157..4a062b7f1 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -74,7 +74,6 @@ Equipment Corporation.
******************************************************************/
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/dix/property.c b/dix/property.c
index c653318d4..91839c940 100644
--- a/dix/property.c
+++ b/dix/property.c
@@ -50,8 +50,6 @@ SOFTWARE.
#endif
#include <X11/X.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "windowstr.h"
#include "propertyst.h"
diff --git a/dix/resource.c b/dix/resource.c
index c05d68187..31ad46ec5 100644
--- a/dix/resource.c
+++ b/dix/resource.c
@@ -124,7 +124,6 @@ Equipment Corporation.
* resource "owned" by the client.
*/
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/dix/swaprep.c b/dix/swaprep.c
index e7a4271f7..af82f82ef 100644
--- a/dix/swaprep.c
+++ b/dix/swaprep.c
@@ -51,8 +51,6 @@ SOFTWARE.
#endif
#include <X11/X.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "misc.h"
#include "dixstruct.h"
diff --git a/dix/swapreq.c b/dix/swapreq.c
index 1b8f352f5..5d7d71c8f 100644
--- a/dix/swapreq.c
+++ b/dix/swapreq.c
@@ -51,7 +51,6 @@ SOFTWARE.
#endif
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/Xprotostr.h>
#include "misc.h"
diff --git a/dix/tables.c b/dix/tables.c
index e795ada09..5aafb8b0f 100644
--- a/dix/tables.c
+++ b/dix/tables.c
@@ -50,8 +50,6 @@ SOFTWARE.
#endif
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "windowstr.h"
#include "extnsionst.h"
diff --git a/exa/exa_priv.h b/exa/exa_priv.h
index 00a3c9a6c..cc789c6c7 100644
--- a/exa/exa_priv.h
+++ b/exa/exa_priv.h
@@ -33,7 +33,6 @@
#include "exa.h"
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#ifdef MITSHM
#include "shmint.h"
diff --git a/glx/glxcmds.c b/glx/glxcmds.c
index ab2d91b1b..af52672f1 100644
--- a/glx/glxcmds.c
+++ b/glx/glxcmds.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#define FONT_PCF
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/glx/glxcmdsswap.c b/glx/glxcmdsswap.c
index 65edf6991..4132b76bf 100644
--- a/glx/glxcmdsswap.c
+++ b/glx/glxcmdsswap.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#define FONT_PCF
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/glx/glxext.c b/glx/glxext.c
index c88237209..025e6198f 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/glxutil.c b/glx/glxutil.c
index bc71087d4..52a10e4e5 100644
--- a/glx/glxutil.c
+++ b/glx/glxutil.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#define FONT_PCF
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
diff --git a/glx/indirect_program.c b/glx/indirect_program.c
index d23a0a9e6..a206f90b6 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -29,7 +29,6 @@
* \author Ian Romanick <idr@us.ibm.com>
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/indirect_texture_compression.c b/glx/indirect_texture_compression.c
index 3c09663fc..25c6eb30e 100644
--- a/glx/indirect_texture_compression.c
+++ b/glx/indirect_texture_compression.c
@@ -23,7 +23,6 @@
* SOFTWARE.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/render2.c b/glx/render2.c
index a86a22acb..eca6222ad 100644
--- a/glx/render2.c
+++ b/glx/render2.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-/* #define NEED_REPLIES */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/render2swap.c b/glx/render2swap.c
index 49449ff6f..acfb82826 100644
--- a/glx/render2swap.c
+++ b/glx/render2swap.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-/* #define NEED_REPLIES */
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/renderpix.c b/glx/renderpix.c
index 17deb33c4..056e62c87 100644
--- a/glx/renderpix.c
+++ b/glx/renderpix.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/renderpixswap.c b/glx/renderpixswap.c
index ebb20cfda..9cd57410e 100644
--- a/glx/renderpixswap.c
+++ b/glx/renderpixswap.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/single2.c b/glx/single2.c
index d8b259269..0ca808cc0 100644
--- a/glx/single2.c
+++ b/glx/single2.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/single2swap.c b/glx/single2swap.c
index fcb0657d4..cf83bdc88 100644
--- a/glx/single2swap.c
+++ b/glx/single2swap.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/singlepix.c b/glx/singlepix.c
index 6611b0380..7b2cb4ca6 100644
--- a/glx/singlepix.c
+++ b/glx/singlepix.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/singlepixswap.c b/glx/singlepixswap.c
index b546ec864..143f2049a 100644
--- a/glx/singlepixswap.c
+++ b/glx/singlepixswap.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/swap_interval.c b/glx/swap_interval.c
index 24abd69fa..3a5242022 100644
--- a/glx/swap_interval.c
+++ b/glx/swap_interval.c
@@ -22,7 +22,6 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/glx/xfont.c b/glx/xfont.c
index 6df373a16..1f4ecbd4d 100644
--- a/glx/xfont.c
+++ b/glx/xfont.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/hw/dmx/glxProxy/g_renderswap.c b/hw/dmx/glxProxy/g_renderswap.c
index 940a06af7..b92821d0a 100644
--- a/hw/dmx/glxProxy/g_renderswap.c
+++ b/hw/dmx/glxProxy/g_renderswap.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#include "glxserver.h"
#include "glxext.h"
#include "g_disptab.h"
diff --git a/hw/dmx/glxProxy/global.c b/hw/dmx/glxProxy/global.c
index 70b8afbb5..9cf8c11c3 100644
--- a/hw/dmx/glxProxy/global.c
+++ b/hw/dmx/glxProxy/global.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#include "glxserver.h"
/*
diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
index 536921a87..f19239f31 100644
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/hw/dmx/glxProxy/glxcmds.c
@@ -43,7 +43,6 @@
#undef Xrealloc
#undef Xfree
-#define NEED_REPLIES
#define FONT_PCF
#include "glxserver.h"
#include <GL/glxtokens.h>
diff --git a/hw/dmx/glxProxy/glxcmdsswap.c b/hw/dmx/glxProxy/glxcmdsswap.c
index 7c36be3b7..702479f55 100644
--- a/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/hw/dmx/glxProxy/glxcmdsswap.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#define FONT_PCF
#include "glxserver.h"
#include "glxutil.h"
diff --git a/hw/dmx/glxProxy/glxext.c b/hw/dmx/glxProxy/glxext.c
index 3a2488132..b30d144ee 100644
--- a/hw/dmx/glxProxy/glxext.c
+++ b/hw/dmx/glxProxy/glxext.c
@@ -34,7 +34,6 @@
#include "dmx.h"
-#define NEED_REPLIES
#include "glxserver.h"
#include <windowstr.h>
#include <propertyst.h>
diff --git a/hw/dmx/glxProxy/glxsingle.c b/hw/dmx/glxProxy/glxsingle.c
index 0fb915ad7..4d2d45bb0 100644
--- a/hw/dmx/glxProxy/glxsingle.c
+++ b/hw/dmx/glxProxy/glxsingle.c
@@ -44,7 +44,6 @@
#undef Xrealloc
#undef Xfree
-#define NEED_REPLIES
#include "glxserver.h"
#include "glxext.h"
#include "g_disptab.h"
diff --git a/hw/dmx/glxProxy/glxutil.c b/hw/dmx/glxProxy/glxutil.c
index 080992ea9..67ac822c6 100644
--- a/hw/dmx/glxProxy/glxutil.c
+++ b/hw/dmx/glxProxy/glxutil.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#define FONT_PCF
#include "glxserver.h"
#include <GL/glxtokens.h>
diff --git a/hw/dmx/glxProxy/glxvendor.c b/hw/dmx/glxProxy/glxvendor.c
index 1e5a32629..6b1f9a820 100644
--- a/hw/dmx/glxProxy/glxvendor.c
+++ b/hw/dmx/glxProxy/glxvendor.c
@@ -43,7 +43,6 @@
#undef Xrealloc
#undef Xfree
-#define NEED_REPLIES
#include "glxserver.h"
#include "glxext.h"
#include "g_disptab.h"
diff --git a/hw/dmx/glxProxy/render2swap.c b/hw/dmx/glxProxy/render2swap.c
index 6e7505324..37e43d8fa 100644
--- a/hw/dmx/glxProxy/render2swap.c
+++ b/hw/dmx/glxProxy/render2swap.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-/* #define NEED_REPLIES */
#include "glxserver.h"
#include "unpack.h"
#include "g_disptab.h"
diff --git a/hw/dmx/glxProxy/renderpixswap.c b/hw/dmx/glxProxy/renderpixswap.c
index 3e4548d2e..462feeeb1 100644
--- a/hw/dmx/glxProxy/renderpixswap.c
+++ b/hw/dmx/glxProxy/renderpixswap.c
@@ -28,7 +28,6 @@
* Silicon Graphics, Inc.
*/
-#define NEED_REPLIES
#include "glxserver.h"
#include "unpack.h"
#include "g_disptab.h"
diff --git a/hw/dmx/input/ChkNotMaskEv.c b/hw/dmx/input/ChkNotMaskEv.c
index fdc67a889..635332e63 100644
--- a/hw/dmx/input/ChkNotMaskEv.c
+++ b/hw/dmx/input/ChkNotMaskEv.c
@@ -58,7 +58,6 @@
#include <dmx-config.h>
#endif
-#define NEED_EVENTS
#include "dmx.h"
#include "ChkNotMaskEv.h"
diff --git a/hw/dmx/input/dmxxinput.c b/hw/dmx/input/dmxxinput.c
index 97f43927a..a2a4156ab 100644
--- a/hw/dmx/input/dmxxinput.c
+++ b/hw/dmx/input/dmxxinput.c
@@ -40,7 +40,6 @@
#include <dmx-config.h>
#endif
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "inputstr.h"
diff --git a/hw/kdrive/ephyr/XF86dri.c b/hw/kdrive/ephyr/XF86dri.c
index 31f796331..237033a36 100644
--- a/hw/kdrive/ephyr/XF86dri.c
+++ b/hw/kdrive/ephyr/XF86dri.c
@@ -58,7 +58,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/* THIS IS NOT AN X CONSORTIUM STANDARD */
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
diff --git a/hw/kdrive/ephyr/ephyrdriext.c b/hw/kdrive/ephyr/ephyrdriext.c
index a906ad170..a127aef2f 100644
--- a/hw/kdrive/ephyr/ephyrdriext.c
+++ b/hw/kdrive/ephyr/ephyrdriext.c
@@ -34,8 +34,6 @@
#include <string.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#define _XF86DRI_SERVER_
diff --git a/hw/kdrive/fake/mouse.c b/hw/kdrive/fake/mouse.c
index 4b8d2b06d..758f6cd22 100644
--- a/hw/kdrive/fake/mouse.c
+++ b/hw/kdrive/fake/mouse.c
@@ -23,7 +23,6 @@
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
-#define NEED_EVENTS
#include <errno.h>
#include <termios.h>
#include <X11/X.h>
diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c
index 2d7a15751..a0d9b12ee 100644
--- a/hw/kdrive/linux/bus.c
+++ b/hw/kdrive/linux/bus.c
@@ -23,7 +23,6 @@
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xpoll.h>
diff --git a/hw/kdrive/linux/evdev.c b/hw/kdrive/linux/evdev.c
index 4ccd82239..fcec0f89f 100644
--- a/hw/kdrive/linux/evdev.c
+++ b/hw/kdrive/linux/evdev.c
@@ -23,7 +23,6 @@
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
-#define NEED_EVENTS
#include <errno.h>
#include <linux/input.h>
#include <X11/X.h>
diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c
index 1965342b8..f2fae942b 100644
--- a/hw/kdrive/linux/mouse.c
+++ b/hw/kdrive/linux/mouse.c
@@ -23,7 +23,6 @@
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
-#define NEED_EVENTS
#include <errno.h>
#include <termios.h>
#include <X11/X.h>
diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c
index d0b47a3ee..4cf882233 100644
--- a/hw/kdrive/linux/ms.c
+++ b/hw/kdrive/linux/ms.c
@@ -24,7 +24,6 @@ THE SOFTWARE.
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
-#define NEED_EVENTS
#include <errno.h>
#include <termios.h>
#include <X11/X.h>
diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c
index d361e82a1..31516a721 100644
--- a/hw/kdrive/linux/ps2.c
+++ b/hw/kdrive/linux/ps2.c
@@ -23,7 +23,6 @@
#ifdef HAVE_CONFIG_H
#include <kdrive-config.h>
#endif
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xpoll.h>
diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c
index e0e860e48..7ad7a8814 100644
--- a/hw/kdrive/linux/tslib.c
+++ b/hw/kdrive/linux/tslib.c
@@ -35,7 +35,6 @@
#include <kdrive-config.h>
#endif
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xpoll.h>
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h
index 8e1998ef9..4b9566970 100644
--- a/hw/kdrive/src/kdrive.h
+++ b/hw/kdrive/src/kdrive.h
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/Xos.h>
#include "scrnintstr.h"
diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c
index 2af3c6421..feb7ad1be 100644
--- a/hw/vfb/InitInput.c
+++ b/hw/vfb/InitInput.c
@@ -31,7 +31,6 @@ from The Open Group.
#endif
#include <X11/X.h>
-#define NEED_EVENTS
#include "mi.h"
#include <X11/Xproto.h>
#include "scrnintstr.h"
diff --git a/hw/vfb/InitOutput.c b/hw/vfb/InitOutput.c
index 6bf6a33a1..bcfb2ef7b 100644
--- a/hw/vfb/InitOutput.c
+++ b/hw/vfb/InitOutput.c
@@ -35,7 +35,6 @@ from The Open Group.
#endif
#include <stdio.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/Xos.h>
#include "scrnintstr.h"
diff --git a/hw/xfree86/common/xf86Cursor.c b/hw/xfree86/common/xf86Cursor.c
index 1203aad43..29b690ac8 100644
--- a/hw/xfree86/common/xf86Cursor.c
+++ b/hw/xfree86/common/xf86Cursor.c
@@ -25,7 +25,6 @@
* authorization from the copyright holder(s) and author(s).
*/
-#define NEED_EVENTS
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 139340e73..e470285a1 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -43,7 +43,6 @@
#include <sys/utsname.h>
#endif
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index 8afda95e1..04c663faa 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -52,9 +52,6 @@
#ifndef _xf86Xinput_h
#define _xf86Xinput_h
-#ifndef NEED_EVENTS
-#define NEED_EVENTS
-#endif
#include "xf86str.h"
#include "inputstr.h"
#include <X11/extensions/XI.h>
diff --git a/hw/xfree86/dixmods/extmod/xf86dga2.c b/hw/xfree86/dixmods/extmod/xf86dga2.c
index df0030e80..868fb0624 100644
--- a/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -11,8 +11,6 @@
#include <xorg-config.h>
#endif
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/hw/xfree86/dixmods/extmod/xf86vmode.c b/hw/xfree86/dixmods/extmod/xf86vmode.c
index 6485a0461..ea8089e94 100644
--- a/hw/xfree86/dixmods/extmod/xf86vmode.c
+++ b/hw/xfree86/dixmods/extmod/xf86vmode.c
@@ -34,8 +34,6 @@ from Kaleb S. KEITHLEY
#include <xorg-config.h>
#endif
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/hw/xfree86/dixmods/xkbKillSrv.c b/hw/xfree86/dixmods/xkbKillSrv.c
index 9074fd390..0f4e25c0c 100644
--- a/hw/xfree86/dixmods/xkbKillSrv.c
+++ b/hw/xfree86/dixmods/xkbKillSrv.c
@@ -33,7 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/hw/xfree86/dixmods/xkbPrivate.c b/hw/xfree86/dixmods/xkbPrivate.c
index db21a4e17..9742eaf31 100644
--- a/hw/xfree86/dixmods/xkbPrivate.c
+++ b/hw/xfree86/dixmods/xkbPrivate.c
@@ -8,7 +8,6 @@
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include "windowstr.h"
#define XKBSRV_NEED_FILE_FUNCS
diff --git a/hw/xfree86/dixmods/xkbVT.c b/hw/xfree86/dixmods/xkbVT.c
index e6d69e2eb..13bd6f41e 100644
--- a/hw/xfree86/dixmods/xkbVT.c
+++ b/hw/xfree86/dixmods/xkbVT.c
@@ -33,7 +33,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 4d17c9a8b..871b6a9b1 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -45,8 +45,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <sys/ioctl.h>
#include <errno.h>
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "xf86drm.h"
diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c
index ea11b38ee..bd040a178 100644
--- a/hw/xfree86/dri/xf86dri.c
+++ b/hw/xfree86/dri/xf86dri.c
@@ -42,8 +42,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "xf86.h"
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/hw/xfree86/dri2/dri2ext.c b/hw/xfree86/dri2/dri2ext.c
index 0a1dce49d..d6e1c9689 100644
--- a/hw/xfree86/dri2/dri2ext.c
+++ b/hw/xfree86/dri2/dri2ext.c
@@ -34,7 +34,6 @@
#include <xorg-config.h>
#endif
-#define NEED_REPLIES
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/extensions/dri2proto.h>
diff --git a/hw/xnest/Events.c b/hw/xnest/Events.c
index 35ba43269..b3ae97284 100644
--- a/hw/xnest/Events.c
+++ b/hw/xnest/Events.c
@@ -17,7 +17,6 @@ is" without express or implied warranty.
#endif
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "screenint.h"
#include "input.h"
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c
index 17d3e5ea6..9adf78fa7 100644
--- a/hw/xnest/Keyboard.c
+++ b/hw/xnest/Keyboard.c
@@ -12,7 +12,6 @@ is" without express or implied warranty.
*/
-#define NEED_EVENTS
#ifdef HAVE_XNEST_CONFIG_H
#include <xnest-config.h>
#endif
diff --git a/hw/xquartz/applewm.c b/hw/xquartz/applewm.c
index c72540ace..238b90d50 100644
--- a/hw/xquartz/applewm.c
+++ b/hw/xquartz/applewm.c
@@ -33,8 +33,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "quartzCommon.h"
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "misc.h"
#include "dixstruct.h"
#include "globals.h"
diff --git a/hw/xquartz/darwinEvents.c b/hw/xquartz/darwinEvents.c
index 7fc390d1e..0ecc17038 100644
--- a/hw/xquartz/darwinEvents.c
+++ b/hw/xquartz/darwinEvents.c
@@ -36,7 +36,6 @@ in this Software without prior written authorization from The Open Group.
#include <dix-config.h>
#endif
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
diff --git a/hw/xquartz/darwinXinput.c b/hw/xquartz/darwinXinput.c
index 59bae6fde..8af9fc740 100644
--- a/hw/xquartz/darwinXinput.c
+++ b/hw/xquartz/darwinXinput.c
@@ -51,7 +51,6 @@ SOFTWARE.
********************************************************/
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/hw/xquartz/xpr/appledri.c b/hw/xquartz/xpr/appledri.c
index 3667c0dea..ab5e7ce0c 100644
--- a/hw/xquartz/xpr/appledri.c
+++ b/hw/xquartz/xpr/appledri.c
@@ -39,8 +39,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <dix-config.h>
#endif
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c
index 8feba7e9b..df1ab1839 100644
--- a/hw/xquartz/xpr/dri.c
+++ b/hw/xquartz/xpr/dri.c
@@ -46,8 +46,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <unistd.h>
#endif
-#define NEED_REPLIES
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/hw/xquartz/xpr/xprEvent.c b/hw/xquartz/xpr/xprEvent.c
index 08581c0e3..f8e985aba 100644
--- a/hw/xquartz/xpr/xprEvent.c
+++ b/hw/xquartz/xpr/xprEvent.c
@@ -32,7 +32,6 @@
#include "xpr.h"
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xmd.h>
#include <X11/Xproto.h>
diff --git a/hw/xwin/win.h b/hw/xwin/win.h
index ea54b997c..2faa67e3a 100644
--- a/hw/xwin/win.h
+++ b/hw/xwin/win.h
@@ -58,7 +58,6 @@
# define WM_XBUTTONDBLCLK 525
#endif
-#define NEED_EVENTS
#define WIN_DEFAULT_BPP 0
#define WIN_DEFAULT_WHITEPIXEL 255
diff --git a/hw/xwin/winwindowswm.c b/hw/xwin/winwindowswm.c
index 28bcb64c8..ed9642a53 100755
--- a/hw/xwin/winwindowswm.c
+++ b/hw/xwin/winwindowswm.c
@@ -31,8 +31,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#endif
#include "win.h"
-#define NEED_REPLIES
-#define NEED_EVENTS
#include "misc.h"
#include "dixstruct.h"
#include "extnsionst.h"
diff --git a/include/closestr.h b/include/closestr.h
index 8855a5f93..2cd67b1d3 100644
--- a/include/closestr.h
+++ b/include/closestr.h
@@ -30,7 +30,6 @@ from The Open Group.
#ifndef CLOSESTR_H
#define CLOSESTR_H
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "closure.h"
#include "dix.h"
diff --git a/include/dixfontstr.h b/include/dixfontstr.h
index 463b2fdc5..c559e861e 100644
--- a/include/dixfontstr.h
+++ b/include/dixfontstr.h
@@ -28,7 +28,6 @@ SOFTWARE.
#include "dixfont.h"
#include <X11/fonts/fontstruct.h>
#include "closure.h"
-#define NEED_REPLIES
#include <X11/Xproto.h> /* for xQueryFontReply */
#define FONTCHARSET(font) (font)
diff --git a/mi/midispcur.c b/mi/midispcur.c
index 4fd187cf6..e73b5003b 100644
--- a/mi/midispcur.c
+++ b/mi/midispcur.c
@@ -34,7 +34,6 @@ in this Software without prior written authorization from The Open Group.
#include <dix-config.h>
#endif
-#define NEED_EVENTS
# include <X11/X.h>
# include "misc.h"
# include "input.h"
diff --git a/mi/mieq.c b/mi/mieq.c
index cb940e403..a19c93979 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -36,7 +36,6 @@ in this Software without prior written authorization from The Open Group.
#include <dix-config.h>
#endif
-# define NEED_EVENTS
# include <X11/X.h>
# include <X11/Xmd.h>
# include <X11/Xproto.h>
diff --git a/mi/miexpose.c b/mi/miexpose.c
index d1fa36510..04bf555ae 100644
--- a/mi/miexpose.c
+++ b/mi/miexpose.c
@@ -78,7 +78,6 @@ Equipment Corporation.
#endif
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/Xprotostr.h>
diff --git a/mi/mipointer.c b/mi/mipointer.c
index 89b1606c6..acfcb1bd6 100644
--- a/mi/mipointer.c
+++ b/mi/mipointer.c
@@ -27,7 +27,6 @@ in this Software without prior written authorization from The Open Group.
#include <dix-config.h>
#endif
-# define NEED_EVENTS
# include <X11/X.h>
# include <X11/Xmd.h>
# include <X11/Xproto.h>
diff --git a/os/io.c b/os/io.c
index 68f9bf0b1..88215e2f0 100644
--- a/os/io.c
+++ b/os/io.c
@@ -73,7 +73,6 @@ SOFTWARE.
#include <sys/uio.h>
#endif
#include <X11/X.h>
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "os.h"
#include "osdep.h"
diff --git a/randr/randr.c b/randr/randr.c
index 2e482f038..b7c44f7ec 100644
--- a/randr/randr.c
+++ b/randr/randr.c
@@ -25,8 +25,6 @@
* Keith Packard, Intel Corporation
*/
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/record/record.c b/record/record.c
index 46218981b..f97626f73 100644
--- a/record/record.c
+++ b/record/record.c
@@ -32,7 +32,6 @@ and Jim Haggerty of Metheus.
*/
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/render/render.c b/render/render.c
index 7cb93bd18..b6e9567f7 100644
--- a/render/render.c
+++ b/render/render.c
@@ -22,8 +22,6 @@
* Author: Keith Packard, SuSE, Inc.
*/
-#define NEED_REPLIES
-#define NEED_EVENTS
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
diff --git a/xfixes/xfixesint.h b/xfixes/xfixesint.h
index 33a3205ed..04117a46c 100644
--- a/xfixes/xfixesint.h
+++ b/xfixes/xfixesint.h
@@ -47,7 +47,6 @@
#ifndef _XFIXESINT_H_
#define _XFIXESINT_H_
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/xkb/XKBAlloc.c b/xkb/XKBAlloc.c
index 8f468a0f3..559a52483 100644
--- a/xkb/XKBAlloc.c
+++ b/xkb/XKBAlloc.c
@@ -30,8 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/xkb/XKBGAlloc.c b/xkb/XKBGAlloc.c
index c37f49a55..9561a3df8 100644
--- a/xkb/XKBGAlloc.c
+++ b/xkb/XKBGAlloc.c
@@ -28,8 +28,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h>
#endif
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <stdio.h>
#include <X11/X.h>
diff --git a/xkb/XKBMAlloc.c b/xkb/XKBMAlloc.c
index 178b5b89a..de8ee29fa 100644
--- a/xkb/XKBMAlloc.c
+++ b/xkb/XKBMAlloc.c
@@ -32,8 +32,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/xkb/XKBMisc.c b/xkb/XKBMisc.c
index a9d8b17c0..39bbec651 100644
--- a/xkb/XKBMisc.c
+++ b/xkb/XKBMisc.c
@@ -32,8 +32,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/xkb/ddxBeep.c b/xkb/ddxBeep.c
index 74d868c0e..10a731724 100644
--- a/xkb/ddxBeep.c
+++ b/xkb/ddxBeep.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxCtrls.c b/xkb/ddxCtrls.c
index be269c2af..04de608df 100644
--- a/xkb/ddxCtrls.c
+++ b/xkb/ddxCtrls.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxDevBtn.c b/xkb/ddxDevBtn.c
index 585ad198e..709efc13a 100644
--- a/xkb/ddxDevBtn.c
+++ b/xkb/ddxDevBtn.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxFakeMtn.c b/xkb/ddxFakeMtn.c
index 3f010f9ce..f90d2099a 100644
--- a/xkb/ddxFakeMtn.c
+++ b/xkb/ddxFakeMtn.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxInit.c b/xkb/ddxInit.c
index 4c78a621b..89ffb789f 100644
--- a/xkb/ddxInit.c
+++ b/xkb/ddxInit.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxKeyClick.c b/xkb/ddxKeyClick.c
index 51d78f56d..aabedab98 100644
--- a/xkb/ddxKeyClick.c
+++ b/xkb/ddxKeyClick.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxKillSrv.c b/xkb/ddxKillSrv.c
index 3b5fd5353..106b39587 100644
--- a/xkb/ddxKillSrv.c
+++ b/xkb/ddxKillSrv.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxLEDs.c b/xkb/ddxLEDs.c
index b4c8086f5..246d58c31 100644
--- a/xkb/ddxLEDs.c
+++ b/xkb/ddxLEDs.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/ddxList.c b/xkb/ddxList.c
index ae3a7f7e0..da2f9a8bf 100644
--- a/xkb/ddxList.c
+++ b/xkb/ddxList.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <ctype.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xos.h>
#include <X11/Xproto.h>
diff --git a/xkb/ddxLoad.c b/xkb/ddxLoad.c
index 4d5dfb685..b4ac53593 100644
--- a/xkb/ddxLoad.c
+++ b/xkb/ddxLoad.c
@@ -34,7 +34,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <ctype.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xos.h>
#include <X11/Xproto.h>
diff --git a/xkb/ddxPrivate.c b/xkb/ddxPrivate.c
index f67e20c27..f1c85f6ea 100644
--- a/xkb/ddxPrivate.c
+++ b/xkb/ddxPrivate.c
@@ -3,7 +3,6 @@
#include <dix-config.h>
#endif
-#define NEED_EVENTS
#include <X11/X.h>
#include "windowstr.h"
#include <xkbsrv.h>
diff --git a/xkb/ddxVT.c b/xkb/ddxVT.c
index 55c82a865..cbd453706 100644
--- a/xkb/ddxVT.c
+++ b/xkb/ddxVT.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/maprules.c b/xkb/maprules.c
index bd242ea05..b56055f5d 100644
--- a/xkb/maprules.c
+++ b/xkb/maprules.c
@@ -36,7 +36,6 @@
#define XOS_USE_NO_LOCKING
#include <X11/Xos_r.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/X.h>
#include <X11/Xos.h>
diff --git a/xkb/xkb.c b/xkb/xkb.c
index 24cf91598..f6dfb0800 100644
--- a/xkb/xkb.c
+++ b/xkb/xkb.c
@@ -30,8 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/xkb/xkbAccessX.c b/xkb/xkbAccessX.c
index 0cc3b80b3..f9b4b850f 100644
--- a/xkb/xkbAccessX.c
+++ b/xkb/xkbAccessX.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbActions.c b/xkb/xkbActions.c
index 64e17e9ac..6696c7649 100644
--- a/xkb/xkbActions.c
+++ b/xkb/xkbActions.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbEvents.c b/xkb/xkbEvents.c
index 51880f85f..96e527baa 100644
--- a/xkb/xkbEvents.c
+++ b/xkb/xkbEvents.c
@@ -29,7 +29,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#endif
#include <stdio.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbInit.c b/xkb/xkbInit.c
index 82ec18c85..5f51c45f5 100644
--- a/xkb/xkbInit.c
+++ b/xkb/xkbInit.c
@@ -37,7 +37,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <ctype.h>
#include <unistd.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbLEDs.c b/xkb/xkbLEDs.c
index e7539254b..68ab5ff4c 100644
--- a/xkb/xkbLEDs.c
+++ b/xkb/xkbLEDs.c
@@ -31,7 +31,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <ctype.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/xkb/xkbPrKeyEv.c b/xkb/xkbPrKeyEv.c
index a3f715c7d..6feb9be6a 100644
--- a/xkb/xkbPrKeyEv.c
+++ b/xkb/xkbPrKeyEv.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbPrOtherEv.c b/xkb/xkbPrOtherEv.c
index 8017903be..ef8b014ff 100644
--- a/xkb/xkbPrOtherEv.c
+++ b/xkb/xkbPrOtherEv.c
@@ -30,7 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <stdio.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/keysym.h>
diff --git a/xkb/xkbSwap.c b/xkb/xkbSwap.c
index 1a513b35c..ffd66b563 100644
--- a/xkb/xkbSwap.c
+++ b/xkb/xkbSwap.c
@@ -30,8 +30,6 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "stdio.h"
#include <X11/X.h>
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index ca80ff48d..6b5acd8c2 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -56,7 +56,6 @@ DEALINGS IN THE SOFTWARE.
#include <stdio.h>
#include <ctype.h>
#include <math.h>
-#define NEED_EVENTS 1
#include <X11/X.h>
#include <X11/Xproto.h>
#define XK_CYRILLIC
diff --git a/xkb/xkbfmisc.c b/xkb/xkbfmisc.c
index ae752e945..dd403eaff 100644
--- a/xkb/xkbfmisc.c
+++ b/xkb/xkbfmisc.c
@@ -36,7 +36,6 @@
#include <X11/Xfuncs.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/xkb/xkbout.c b/xkb/xkbout.c
index 229cc9258..8913d8ed2 100644
--- a/xkb/xkbout.c
+++ b/xkb/xkbout.c
@@ -34,7 +34,6 @@
#include <X11/Xfuncs.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/keysym.h>
#include <X11/Xproto.h>
#include "misc.h"
diff --git a/xkb/xkbtext.c b/xkb/xkbtext.c
index d08c91589..f9bfae581 100644
--- a/xkb/xkbtext.c
+++ b/xkb/xkbtext.c
@@ -35,7 +35,6 @@
#include <X11/Xos.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include "misc.h"
#include "inputstr.h"
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index b14a5beda..1b6149b8b 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -34,7 +34,6 @@
#include <X11/Xfuncs.h>
#include <X11/X.h>
-#define NEED_EVENTS
#include <X11/Xproto.h>
#include <X11/keysym.h>
#include "misc.h"