diff --git a/Xi/xigetclientpointer.c b/Xi/xigetclientpointer.c index e366679605..35589875c3 100644 --- a/Xi/xigetclientpointer.c +++ b/Xi/xigetclientpointer.c @@ -36,7 +36,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 f609f44e47..906f9defc2 100644 --- a/glx/glxdricommon.c +++ b/glx/glxdricommon.c @@ -34,7 +34,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 c8a8b2161a..53f39497b6 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -40,7 +40,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 367fb098a5..5321fdac5d 100644 --- a/glx/glxscreens.c +++ b/glx/glxscreens.c @@ -37,7 +37,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 ad5d4b0476..692c294e3d 100644 --- a/hw/kdrive/src/kinput.c +++ b/hw/kdrive/src/kinput.c @@ -46,7 +46,6 @@ #include "xkbsrv.h" #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 447f239319..8f8e334b2b 100644 --- a/hw/vfb/InitInput.c +++ b/hw/vfb/InitInput.c @@ -41,7 +41,6 @@ from The Open Group. #include "xkbsrv.h" #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 2e952f3243..f6869ba935 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 7e12ea2cc3..69ee892fc3 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 7a3ff30f13..c6b2daa02b 100644 --- a/hw/xfree86/common/xf86Xinput.c +++ b/hw/xfree86/common/xf86Xinput.c @@ -68,7 +68,6 @@ #include "XIstubs.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 b90e941d90..08513c536b 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 483b42a647..ab3b2fc30f 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -55,7 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" -#include "extinit.h" #include "cursorstr.h" #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xfree86/dri/xf86dri.c b/hw/xfree86/dri/xf86dri.c index 7f3292ff21..de9dcbd7cd 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 "cursorstr.h" #include "scrnintstr.h" #include "servermd.h" diff --git a/hw/xquartz/darwin.c b/hw/xquartz/darwin.c index fcfcd554ac..4440796d04 100644 --- a/hw/xquartz/darwin.c +++ b/hw/xquartz/darwin.c @@ -51,7 +51,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 21509c1d8c..def2bcaa37 100644 --- a/hw/xquartz/xpr/dri.c +++ b/hw/xquartz/xpr/dri.c @@ -48,7 +48,7 @@ #include "misc.h" #include "dixstruct.h" #include "extnsionst.h" -#include "extinit.h" +#include "extinit_priv.h" #include "cursorstr.h" #include "scrnintstr.h" #include "windowstr.h" diff --git a/hw/xwayland/xwayland-vidmode.c b/hw/xwayland/xwayland-vidmode.c index a4ca0eaf1a..f6fe689424 100644 --- a/hw/xwayland/xwayland-vidmode.c +++ b/hw/xwayland/xwayland-vidmode.c @@ -33,7 +33,6 @@ #include "misc.h" #include "os.h" -#include "extinit.h" #ifdef XF86VIDMODE diff --git a/mi/mieq.c b/mi/mieq.c index a56a4668fc..8da1d9b568 100644 --- a/mi/mieq.c +++ b/mi/mieq.c @@ -56,7 +56,6 @@ in this Software without prior written authorization from The Open Group. #include "inpututils.h" #include "mipointer.h" #include "scrnintstr.h" -#include "extinit.h" #include "exglobals.h" #include "eventstr.h" diff --git a/test/xi2/protocol-xigetselectedevents.c b/test/xi2/protocol-xigetselectedevents.c index b130779557..4e409c5cc6 100644 --- a/test/xi2/protocol-xigetselectedevents.c +++ b/test/xi2/protocol-xigetselectedevents.c @@ -46,7 +46,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 daa3f60243..6ab2afe605 100644 --- a/test/xi2/protocol-xiquerydevice.c +++ b/test/xi2/protocol-xiquerydevice.c @@ -32,7 +32,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 f452333e67..96b854910c 100644 --- a/test/xi2/protocol-xiqueryversion.c +++ b/test/xi2/protocol-xiqueryversion.c @@ -45,7 +45,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 237c8f00b2..a3ebf09191 100644 --- a/test/xi2/protocol-xiselectevents.c +++ b/test/xi2/protocol-xiselectevents.c @@ -54,7 +54,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 674bc9b184..55fbb40a5d 100644 --- a/test/xi2/protocol-xisetclientpointer.c +++ b/test/xi2/protocol-xisetclientpointer.c @@ -41,7 +41,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"