diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c index 37e45ae0c..369d054d3 100644 --- a/Xi/xigetclientpointer.c +++ b/Xi/xigetclientpointer.c @@ -38,7 +38,6 @@ #include "windowstr.h" /* window structure */ #include "scrnintstr.h" /* screen structure */ #include "extnsionst.h" -#include "extinit.h" /* LookupDeviceIntRec */ #include "exevents.h" #include "exglobals.h" #include "xigetclientpointer.h" diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c index 35a539629..c66e29e62 100644 --- a/glx/glxdricommon.c +++ b/glx/glxdricommon.c @@ -36,7 +36,7 @@ #include #include #include -#include "extinit.h" +#include "extinit_priv.h" #include "glxserver.h" #include "glxext.h" #include "glxcontext.h" diff --git a/glx/glxext.c b/glx/glxext.c index 585f64eda..b463a7932 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -38,7 +38,6 @@ #include #include "privates.h" #include -#include "extinit.h" #include "glx_extinit.h" #include "unpack.h" #include "glxutil.h" diff --git a/glx/glxscreens.c b/glx/glxscreens.c index e766e2579..a2b60505e 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -38,7 +38,6 @@ #include #include -#include "extinit.h" #include "privates.h" #include "glxserver.h" #include "glxutil.h" diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c index e59efed4b..eb43d51aa 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -42,7 +42,6 @@ #include #include "XIstubs.h" /* even though we don't use stubs. cute, no? */ #include "exevents.h" -#include "extinit.h" #include "exglobals.h" #include "eventstr.h" #include "xserver-properties.h" diff --git a/hw/vfb/InitInput.c b/hw/vfb/InitInput.c index 21387dee4..6684f7b12 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -41,7 +41,6 @@ from The Open Group. #include #include "xserver-properties.h" #include "exevents.h" -#include "extinit.h" void ProcessInputEvents(void) diff --git a/hw/xfree86/common/xf86Extensions.c b/hw/xfree86/common/xf86Extensions.c index 1b8b78505..0bb4585ff 100644 --- a/hw/xfree86/common/xf86Extensions.c +++ b/hw/xfree86/common/xf86Extensions.c @@ -28,7 +28,6 @@ #endif #include "extension.h" -#include "extinit.h" #include "globals.h" #include "xf86.h" diff --git a/hw/xfree86/common/xf86VidMode.c b/hw/xfree86/common/xf86VidMode.c index 7e12ea2cc..69ee892fc 100644 --- a/hw/xfree86/common/xf86VidMode.c +++ b/hw/xfree86/common/xf86VidMode.c @@ -42,7 +42,6 @@ #include "os.h" #include "xf86.h" #include "xf86Priv.h" -#include "extinit.h" #ifdef XF86VIDMODE #include "vidmodestr.h" diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c index 0c9b97335..20a7a8e54 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -66,7 +66,6 @@ #include "xf86Xinput.h" #include "xf86Optrec.h" #include "mipointer.h" -#include "extinit.h" #include "loaderProcs.h" #include "systemd-logind.h" #include "exevents.h" /* AddInputDevice */ diff --git a/hw/xfree86/dixmods/glxmodule.c b/hw/xfree86/dixmods/glxmodule.c index 2215c8867..dc6045c9e 100644 --- a/hw/xfree86/dixmods/glxmodule.c +++ b/hw/xfree86/dixmods/glxmodule.c @@ -42,7 +42,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "micmap.h" #include "globals.h" #include "glxserver.h" -#include "extinit.h" #include "glx_extinit.h" static MODULESETUPPROTO(glxSetup); diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index dfc33f33d..3edc02b5c 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -54,7 +54,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" -#include "extinit.h" #include "colormapst.h" #include "cursorstr.h" #include "scrnintstr.h" diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index ba7bbd6e9..220c94217 100644 --- a/hw/xfree86/dri/xf86dri.c +++ b/hw/xfree86/dri/xf86dri.c @@ -48,7 +48,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" -#include "extinit.h" #include "colormapst.h" #include "cursorstr.h" #include "scrnintstr.h" diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index 1ec244b03..42f33602e 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -53,7 +53,7 @@ #include #include #include "exevents.h" -#include "extinit.h" +#include "extinit_priv.h" #include "glx_extinit.h" #include "xserver-properties.h" diff --git a/hw/xquartz/xpr/dri.c b/hw/xquartz/xpr/dri.c index 091418e19..73ad601a6 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -50,7 +50,7 @@ #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" -#include "extinit.h" +#include "extinit_priv.h" #include "colormapst.h" #include "cursorstr.h" #include "scrnintstr.h" diff --git a/hw/xwayland/xwayland-vidmode.c b/hw/xwayland/xwayland-vidmode.c index 77e57b1e4..d69beac85 100644 --- a/hw/xwayland/xwayland-vidmode.c +++ b/hw/xwayland/xwayland-vidmode.c @@ -35,7 +35,6 @@ #include "misc.h" #include "os.h" -#include "extinit.h" #ifdef XF86VIDMODE diff --git a/mi/mieq.c b/mi/mieq.c index c98d46862..cb341b366 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -50,7 +50,6 @@ in this Software without prior written authorization from The Open Group. #include #include #include -#include "extinit.h" #include "exglobals.h" #include "eventstr.h" diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c index 37d0467a1..12e948121 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -48,7 +48,7 @@ #include "inputstr.h" #include "windowstr.h" -#include "extinit.h" /* for XInputExtensionInit */ +#include "extinit_priv.h" /* for XInputExtensionInit */ #include "scrnintstr.h" #include "xiselectev.h" diff --git a/test/xi2/protocol-xiquerydevice.c b/test/xi2/protocol-xiquerydevice.c index f0b03a19a..7ee0b1f07 100644 --- a/test/xi2/protocol-xiquerydevice.c +++ b/test/xi2/protocol-xiquerydevice.c @@ -34,7 +34,7 @@ #include #include #include "inputstr.h" -#include "extinit.h" +#include "extinit_priv.h" #include "exglobals.h" #include "scrnintstr.h" #include "xkbsrv.h" diff --git a/test/xi2/protocol-xiqueryversion.c b/test/xi2/protocol-xiqueryversion.c index b8145bc1c..4538588c9 100644 --- a/test/xi2/protocol-xiqueryversion.c +++ b/test/xi2/protocol-xiqueryversion.c @@ -47,7 +47,7 @@ #include "dix/exevents_priv.h" #include "inputstr.h" -#include "extinit.h" /* for XInputExtensionInit */ +#include "extinit_priv.h" /* for XInputExtensionInit */ #include "scrnintstr.h" #include "xiqueryversion.h" #include "protocol-common.h" diff --git a/test/xi2/protocol-xiselectevents.c b/test/xi2/protocol-xiselectevents.c index 8ce8fc99d..ee02e1761 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -56,7 +56,7 @@ #include #include "inputstr.h" #include "windowstr.h" -#include "extinit.h" /* for XInputExtensionInit */ +#include "extinit_priv.h" /* for XInputExtensionInit */ #include "scrnintstr.h" #include "exglobals.h" #include "xiselectev.h" diff --git a/test/xi2/protocol-xisetclientpointer.c b/test/xi2/protocol-xisetclientpointer.c index ad5c0ffe9..fa52941d6 100644 --- a/test/xi2/protocol-xisetclientpointer.c +++ b/test/xi2/protocol-xisetclientpointer.c @@ -43,7 +43,7 @@ #include #include "inputstr.h" #include "windowstr.h" -#include "extinit.h" /* for XInputExtensionInit */ +#include "extinit_priv.h" /* for XInputExtensionInit */ #include "scrnintstr.h" #include "xisetclientpointer.h" #include "exevents.h"