[PATCH] Remove #define NEED_EVENTS and NEED_REPLIES
Peter Hutterer
peter.hutterer at who-t.net
Tue Dec 9 18:55:46 PST 2008
A grep on xorg/* revealed there's no consumer of this define.
Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
---
Xext/bigreq.c | 1 -
Xext/geint.h | 1 -
Xext/mbuf.c | 2 --
Xext/mbufbf.c | 2 --
Xext/mbufpx.c | 2 --
Xext/panoramiX.c | 1 -
Xext/panoramiXprocs.c | 2 --
Xext/saver.c | 2 --
Xext/shape.c | 2 --
Xext/shm.c | 2 --
Xext/sync.c | 2 --
Xext/xcalibrate.c | 2 --
Xext/xcmisc.c | 2 --
Xext/xres.c | 2 --
Xext/xtest.c | 1 -
Xext/xvmc.c | 2 --
Xi/allowev.c | 2 --
Xi/chdevcur.c | 2 --
Xi/chdevhier.c | 2 --
Xi/chgdctl.c | 2 --
Xi/chgfctl.c | 2 --
Xi/chgkbd.c | 2 --
Xi/chgkmap.c | 2 --
Xi/chgprop.c | 2 --
Xi/chgptr.c | 2 --
Xi/closedev.c | 2 --
Xi/devbell.c | 2 --
Xi/exevents.c | 1 -
Xi/extgrbdev.c | 2 --
Xi/extinit.c | 2 --
Xi/getbmap.c | 2 --
Xi/getcptr.c | 2 --
Xi/getdctl.c | 2 --
Xi/getfctl.c | 2 --
Xi/getfocus.c | 2 --
Xi/getkmap.c | 2 --
Xi/getmmap.c | 2 --
Xi/getprop.c | 2 --
Xi/getselev.c | 2 --
Xi/getvers.c | 2 --
Xi/grabdev.c | 2 --
Xi/grabdevb.c | 2 --
Xi/grabdevk.c | 2 --
Xi/gtmotion.c | 2 --
Xi/listdev.c | 2 --
Xi/opendev.c | 2 --
Xi/querydp.c | 2 --
Xi/queryst.c | 2 --
Xi/selectev.c | 2 --
Xi/sendexev.c | 2 --
Xi/setbmap.c | 2 --
Xi/setcptr.c | 2 --
Xi/setdval.c | 2 --
Xi/setfocus.c | 2 --
Xi/setmmap.c | 2 --
Xi/setmode.c | 2 --
Xi/stubs.c | 1 -
Xi/ungrdev.c | 2 --
Xi/ungrdevb.c | 2 --
Xi/ungrdevk.c | 2 --
Xi/warpdevp.c | 2 --
Xi/xiselev.c | 2 --
damageext/damageextint.h | 1 -
dbe/dbe.c | 1 -
dbe/midbe.c | 2 --
dix/colormap.c | 1 -
dix/devices.c | 2 --
dix/dixfonts.c | 1 -
dix/events.c | 2 --
dix/extension.c | 2 --
dix/getevents.c | 2 --
dix/grabs.c | 1 -
dix/main.c | 1 -
dix/property.c | 2 --
dix/resource.c | 1 -
dix/swaprep.c | 2 --
dix/swapreq.c | 1 -
dix/tables.c | 2 --
exa/exa_priv.h | 1 -
glx/glxcmds.c | 1 -
glx/glxcmdsswap.c | 1 -
glx/glxext.c | 1 -
glx/glxutil.c | 1 -
glx/indirect_program.c | 1 -
glx/indirect_texture_compression.c | 1 -
glx/render2.c | 1 -
glx/render2swap.c | 1 -
glx/renderpix.c | 1 -
glx/renderpixswap.c | 1 -
glx/single2.c | 1 -
glx/single2swap.c | 1 -
glx/singlepix.c | 1 -
glx/singlepixswap.c | 1 -
glx/swap_interval.c | 1 -
glx/xfont.c | 1 -
hw/dmx/glxProxy/g_renderswap.c | 1 -
hw/dmx/glxProxy/global.c | 1 -
hw/dmx/glxProxy/glxcmds.c | 1 -
hw/dmx/glxProxy/glxcmdsswap.c | 1 -
hw/dmx/glxProxy/glxext.c | 1 -
hw/dmx/glxProxy/glxsingle.c | 1 -
hw/dmx/glxProxy/glxutil.c | 1 -
hw/dmx/glxProxy/glxvendor.c | 1 -
hw/dmx/glxProxy/render2swap.c | 1 -
hw/dmx/glxProxy/renderpixswap.c | 1 -
hw/dmx/input/ChkNotMaskEv.c | 1 -
hw/dmx/input/dmxxinput.c | 1 -
hw/kdrive/ephyr/XF86dri.c | 1 -
hw/kdrive/ephyr/ephyrdriext.c | 2 --
hw/kdrive/fake/mouse.c | 1 -
hw/kdrive/linux/bus.c | 1 -
hw/kdrive/linux/evdev.c | 1 -
hw/kdrive/linux/mouse.c | 1 -
hw/kdrive/linux/ms.c | 1 -
hw/kdrive/linux/ps2.c | 1 -
hw/kdrive/linux/tslib.c | 1 -
hw/kdrive/src/kdrive.h | 1 -
hw/vfb/InitInput.c | 1 -
hw/vfb/InitOutput.c | 1 -
hw/xfree86/common/xf86Cursor.c | 1 -
hw/xfree86/common/xf86Init.c | 1 -
hw/xfree86/common/xf86Xinput.h | 3 ---
hw/xfree86/dixmods/extmod/xf86dga2.c | 2 --
hw/xfree86/dixmods/extmod/xf86vmode.c | 2 --
hw/xfree86/dixmods/xkbKillSrv.c | 1 -
hw/xfree86/dixmods/xkbPrivate.c | 1 -
hw/xfree86/dixmods/xkbVT.c | 1 -
hw/xfree86/dri/dri.c | 2 --
hw/xfree86/dri/xf86dri.c | 2 --
hw/xfree86/dri2/dri2ext.c | 1 -
hw/xnest/Events.c | 1 -
hw/xnest/Keyboard.c | 1 -
hw/xquartz/applewm.c | 2 --
hw/xquartz/darwinEvents.c | 1 -
hw/xquartz/darwinXinput.c | 1 -
hw/xquartz/xpr/appledri.c | 2 --
hw/xquartz/xpr/dri.c | 2 --
hw/xquartz/xpr/xprEvent.c | 1 -
hw/xwin/win.h | 1 -
hw/xwin/winwindowswm.c | 2 --
include/closestr.h | 1 -
include/dixfontstr.h | 1 -
mi/midispcur.c | 1 -
mi/mieq.c | 1 -
mi/miexpose.c | 1 -
mi/mipointer.c | 1 -
os/io.c | 1 -
randr/randr.c | 2 --
record/record.c | 1 -
render/render.c | 2 --
xfixes/xfixesint.h | 1 -
xkb/XKBAlloc.c | 2 --
xkb/XKBGAlloc.c | 2 --
xkb/XKBMAlloc.c | 2 --
xkb/XKBMisc.c | 2 --
xkb/ddxBeep.c | 1 -
xkb/ddxCtrls.c | 1 -
xkb/ddxDevBtn.c | 1 -
xkb/ddxFakeMtn.c | 1 -
xkb/ddxInit.c | 1 -
xkb/ddxKeyClick.c | 1 -
xkb/ddxKillSrv.c | 1 -
xkb/ddxLEDs.c | 1 -
xkb/ddxList.c | 1 -
xkb/ddxLoad.c | 1 -
xkb/ddxPrivate.c | 1 -
xkb/ddxVT.c | 1 -
xkb/maprules.c | 1 -
xkb/xkb.c | 2 --
xkb/xkbAccessX.c | 1 -
xkb/xkbActions.c | 1 -
xkb/xkbEvents.c | 1 -
xkb/xkbInit.c | 1 -
xkb/xkbLEDs.c | 1 -
xkb/xkbPrKeyEv.c | 1 -
xkb/xkbPrOtherEv.c | 1 -
xkb/xkbSwap.c | 2 --
xkb/xkbUtils.c | 1 -
xkb/xkbfmisc.c | 1 -
xkb/xkbout.c | 1 -
xkb/xkbtext.c | 1 -
xkb/xkmread.c | 1 -
182 files changed, 0 insertions(+), 265 deletions(-)
diff --git a/Xext/bigreq.c b/Xext/bigreq.c
index 1e807d8..7ea69a8 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 b7f0265..881d306 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 39b8ba1..81b704f 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 e929ab5..877ccaa 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 21d5259..01811d9 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 09587c4..0439668 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 38199a5..0f9096f 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 0bdcb8b..7a5b2c7 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 aaef0cb..8e1da87 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 de364be..ce566b6 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 63f6fa2..47883f3 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 3e05e6c..f923c17 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 1ee173b..4f92896 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 bdc534c..5c04c11 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 1290a23..8793640 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 359e954..091e5a1 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 36b6caa..5f0753d 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 121f792..b0d3ce3 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 631857d..9d3c25d 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 6044f6c..f5dd08a 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 3155e87..e193e13 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 83de646..f9fd099 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 3f51648..854c17f 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 3fb33e1..d8e37a7 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 2895091..6a4fbc3 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 2be908c..159ead5 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 264f648..539da18 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 6d9b667..01feb0e 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 050984a..af87063 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 7880497..62ec958 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 9f93b06..4a788c6 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 ae45b13..c696afe 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 c979959..abb4f99 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 1b1e594..3a6dd45 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 dfef22f..69eadde 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 0eec1d8..5401846 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 c6c9c33..0ae2ccc 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 188f549..dfa27f5 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 caa376f..ea9bd9b 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 43a1a4d..f8fd56e 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 8217a99..f032b4a 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 98f7e11..61ced48 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 6a245f2..aefe11b 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 8fa0cca..55d45a3 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 ce549da..04550e4 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 c51bb7e..41edb0f 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 744a295..8d8be81 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 21de843..6553aa8 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 9c336fc..c3fc88e 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 9b37de3..63b45ee 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 f052255..3c293c0 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 81ce66b..1e8281d 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 2058462..fe5f316 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 c6edbc2..03bc37a 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 34efde5..ddfc1bd 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 2badb51..51e5767 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 d01927c..229394b 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 f6525a2..b5b572a 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 d1aef5f..a53dc5b 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 bc3ada9..8d9cdb1 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 c8e8d61..565317f 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 0f84334..0431939 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 e06f28c..543f1a7 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 ff9df7f..3fd99df 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 f8a3acc..4426c9d 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 3f22a47..23b755f 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 7634668..d8cc156 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 416adb3..15d011c 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 45cd608..e30f40b 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 289705f..b408da9 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 f53f3c3..2c47849 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 b372d8f..8878cb7 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 3545991..4a062b7 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 c653318..91839c9 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 c05d681..31ad46e 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 e7a4271..af82f82 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 1b8f352..5d7d71c 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 e795ada..5aafb8b 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 00a3c9a..cc789c6 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 ab2d91b..af52672 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 65edf69..4132b76 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 c882372..025e619 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 bc71087..52a10e4 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 d23a0a9..a206f90 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -29,7 +29,6 @@
* \author Ian Romanick <idr at 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 3c09663..25c6eb3 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 a86a22a..eca6222 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 49449ff..acfb828 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 17deb33..056e62c 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 ebb20cf..9cd5741 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 d8b2592..0ca808c 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 fcb0657..cf83bdc 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 6611b03..7b2cb4c 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 b546ec8..143f204 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 24abd69..3a52420 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 6df373a..1f4ecbd 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 940a06a..b92821d 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 70b8afb..9cf8c11 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 536921a..f19239f 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 7c36be3..702479f 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 3a24881..b30d144 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 0fb915a..4d2d45b 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 080992e..67ac822 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 1e5a326..6b1f9a8 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 6e75053..37e43d8 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 3e4548d..462feee 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 fdc67a8..635332e 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 97f4392..a2a4156 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 31f7963..237033a 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 a906ad1..a127aef 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 4b8d2b0..758f6cd 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 2d7a157..a0d9b12 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 4ccd822..fcec0f8 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 1965342..f2fae94 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 d0b47a3..4cf8822 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 d361e82..31516a7 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 e0e860e..7ad7a88 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 8e1998e..4b95669 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 2af3c64..feb7ad1 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 6bf6a33..bcfb2ef 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 1203aad..29b690a 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 139340e..e470285 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 8afda95..04c663f 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 df0030e..868fb06 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 6485a04..ea8089e 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 9074fd3..0f4e25c 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 db21a4e..9742eaf 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 e6d69e2..13bd6f4 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 4d17c9a..871b6a9 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 ea11b38..bd040a1 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 0a1dce4..d6e1c96 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 35ba432..b3ae972 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 17d3e5e..9adf78f 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 c72540a..238b90d 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 7fc390d..0ecc170 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 59bae6f..8af9fc7 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 3667c0d..ab5e7ce 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 8feba7e..df1ab18 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 08581c0..f8e985a 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 ea54b99..2faa67e 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 28bcb64..ed9642a 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 8855a5f..2cd67b1 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 463b2fd..c559e86 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 4fd187c..e73b500 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 cb940e4..a19c939 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 d1fa365..04bf555 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 89b1606..acfcb1b 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 68f9bf0..88215e2 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 230d816..4932c5a 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 4621898..f97626f 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 7cb93bd..b6e9567 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 33a3205..04117a4 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 8f468a0..559a524 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 c37f49a..9561a3d 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 178b5b8..de8ee29 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 fd18a77..078f241 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 74d868c..10a7317 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 be269c2..04de608 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 585ad19..709efc1 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 3f010f9..f90d209 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 4c78a62..89ffb78 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 51d78f5..aabedab 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 3b5fd53..106b395 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 b4c8086..246d58c 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 ae3a7f7..da2f9a8 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 4d5dfb6..b4ac535 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 f67e20c..f1c85f6 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 55c82a8..cbd4537 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 bd242ea..b56055f 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 24cf915..f6dfb08 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 0cc3b80..f9b4b85 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 64e17e9..6696c76 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 51880f8..96e527b 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 82ec18c..5f51c45 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 e753925..68ab5ff 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 a3f715c..6feb9be 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 8017903..ef8b014 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 1a513b3..ffd66b5 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 09617d0..7c39bcc 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 ae752e9..dd403ea 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 229cc92..8913d8e 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 d08c915..f9bfae5 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 b14a5be..1b6149b 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"
--
1.6.0.4
More information about the xorg
mailing list