From d5272dda96e0bf803a590cbc726cba1241e39067 Mon Sep 17 00:00:00 2001 From: "Enrico Weigelt, metux IT consult" Date: Fri, 4 Jul 2025 16:22:22 +0200 Subject: [PATCH] Xi: drop needless include of dix-config.h in headers The consuming .c files must include it at the very first anyways, and we're not using anything from that header here. Signed-off-by: Enrico Weigelt, metux IT consult --- Xi/allowev.h | 5 ----- Xi/chgdctl.h | 5 ----- Xi/chgfctl.h | 5 ----- Xi/chgkbd.h | 5 ----- Xi/chgkmap.h | 5 ----- Xi/chgprop.h | 5 ----- Xi/chgptr.h | 5 ----- Xi/closedev.h | 5 ----- Xi/devbell.h | 5 ----- Xi/exglobals.h | 7 ++----- Xi/getbmap.h | 5 ----- Xi/getdctl.h | 5 ----- Xi/getfctl.h | 5 ----- Xi/getfocus.h | 5 ----- Xi/getkmap.h | 5 ----- Xi/getmmap.h | 5 ----- Xi/getprop.h | 5 ----- Xi/getselev.h | 5 ----- Xi/getvers.h | 5 ----- Xi/grabdev.h | 5 ----- Xi/grabdevb.h | 5 ----- Xi/grabdevk.h | 5 ----- Xi/gtmotion.h | 5 ----- Xi/listdev.h | 5 ----- Xi/opendev.h | 5 ----- Xi/queryst.h | 5 ----- Xi/selectev.h | 5 ----- Xi/sendexev.h | 5 ----- Xi/setbmap.h | 5 ----- Xi/setdval.h | 5 ----- Xi/setfocus.h | 5 ----- Xi/setmmap.h | 5 ----- Xi/setmode.h | 5 ----- Xi/ungrdev.h | 5 ----- Xi/ungrdevb.h | 5 ----- Xi/ungrdevk.h | 5 ----- Xi/xiallowev.h | 5 ----- Xi/xibarriers.h | 5 ----- Xi/xichangecursor.h | 5 ----- Xi/xichangehierarchy.h | 5 ----- Xi/xigetclientpointer.h | 5 ----- Xi/xigrabdev.h | 5 ----- Xi/xipassivegrab.h | 5 ----- Xi/xiproperty.h | 5 ----- Xi/xiquerydevice.h | 5 ----- Xi/xiquerypointer.h | 5 ----- Xi/xiqueryversion.h | 5 ----- Xi/xiselectev.h | 5 ----- Xi/xisetclientpointer.h | 5 ----- Xi/xisetdevfocus.h | 5 ----- Xi/xiwarppointer.h | 5 ----- 51 files changed, 2 insertions(+), 255 deletions(-) diff --git a/Xi/allowev.h b/Xi/allowev.h index f081ab52e..4ad0789d4 100644 --- a/Xi/allowev.h +++ b/Xi/allowev.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef ALLOWEV_H #define ALLOWEV_H 1 diff --git a/Xi/chgdctl.h b/Xi/chgdctl.h index 3924f7251..9dd93d4b6 100644 --- a/Xi/chgdctl.h +++ b/Xi/chgdctl.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHGDCTL_H #define CHGDCTL_H 1 diff --git a/Xi/chgfctl.h b/Xi/chgfctl.h index 45a55a5f8..dd0b35be6 100644 --- a/Xi/chgfctl.h +++ b/Xi/chgfctl.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHGFCTL_H #define CHGFCTL_H 1 diff --git a/Xi/chgkbd.h b/Xi/chgkbd.h index 55ea3947a..1e02fd867 100644 --- a/Xi/chgkbd.h +++ b/Xi/chgkbd.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHGKBD_H #define CHGKBD_H 1 diff --git a/Xi/chgkmap.h b/Xi/chgkmap.h index 633af7ca4..c14157aa2 100644 --- a/Xi/chgkmap.h +++ b/Xi/chgkmap.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHGKMAP_H #define CHGKMAP_H 1 diff --git a/Xi/chgprop.h b/Xi/chgprop.h index 89d6b5695..ffeb9144e 100644 --- a/Xi/chgprop.h +++ b/Xi/chgprop.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHGPROP_H #define CHGPROP_H 1 diff --git a/Xi/chgptr.h b/Xi/chgptr.h index 3a85f0f03..c3bae42af 100644 --- a/Xi/chgptr.h +++ b/Xi/chgptr.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHGPTR_H #define CHGPTR_H 1 diff --git a/Xi/closedev.h b/Xi/closedev.h index 201d14f0a..83cf8c10a 100644 --- a/Xi/closedev.h +++ b/Xi/closedev.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CLOSEDEV_H #define CLOSEDEV_H 1 diff --git a/Xi/devbell.h b/Xi/devbell.h index c83a9d4b0..1cac30380 100644 --- a/Xi/devbell.h +++ b/Xi/devbell.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef DEVBELL_H #define DEVBELL_H 1 diff --git a/Xi/exglobals.h b/Xi/exglobals.h index 02c9fe9d1..048932dcd 100644 --- a/Xi/exglobals.h +++ b/Xi/exglobals.h @@ -28,14 +28,11 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * Globals referenced elsewhere in the server. * */ -#ifdef HAVE_DIX_CONFIG_H -#include -#endif -#include "privates.h" - #ifndef EXGLOBALS_H #define EXGLOBALS_H 1 +#include "privates.h" + extern int IEventBase; extern int BadDevice; extern int BadMode; diff --git a/Xi/getbmap.h b/Xi/getbmap.h index 78cb15198..4c58030b9 100644 --- a/Xi/getbmap.h +++ b/Xi/getbmap.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETBMAP_H #define GETBMAP_H 1 diff --git a/Xi/getdctl.h b/Xi/getdctl.h index 430b75b1d..2552958c3 100644 --- a/Xi/getdctl.h +++ b/Xi/getdctl.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETDCTL_H #define GETDCTL_H 1 diff --git a/Xi/getfctl.h b/Xi/getfctl.h index 63083432e..8476b3408 100644 --- a/Xi/getfctl.h +++ b/Xi/getfctl.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETFCTL_H #define GETFCTL_H 1 diff --git a/Xi/getfocus.h b/Xi/getfocus.h index 00650c17d..66ca9ec89 100644 --- a/Xi/getfocus.h +++ b/Xi/getfocus.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETFOCUS_H #define GETFOCUS_H 1 diff --git a/Xi/getkmap.h b/Xi/getkmap.h index 74e2e5b78..41d1ae275 100644 --- a/Xi/getkmap.h +++ b/Xi/getkmap.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETKMAP_H #define GETKMAP_H 1 diff --git a/Xi/getmmap.h b/Xi/getmmap.h index feef7c505..5c28aac73 100644 --- a/Xi/getmmap.h +++ b/Xi/getmmap.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETMMAP_H #define GETMMAP_H 1 diff --git a/Xi/getprop.h b/Xi/getprop.h index 59225cba9..27c245371 100644 --- a/Xi/getprop.h +++ b/Xi/getprop.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETPROP_H #define GETPROP_H 1 diff --git a/Xi/getselev.h b/Xi/getselev.h index bcb8ebcbb..1742ea6f6 100644 --- a/Xi/getselev.h +++ b/Xi/getselev.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETSELEV_H #define GETSELEV_H 1 diff --git a/Xi/getvers.h b/Xi/getvers.h index 678046d1d..6505042b1 100644 --- a/Xi/getvers.h +++ b/Xi/getvers.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETVERS_H #define GETVERS_H 1 diff --git a/Xi/grabdev.h b/Xi/grabdev.h index 8dfcab70d..4da33f92a 100644 --- a/Xi/grabdev.h +++ b/Xi/grabdev.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GRABDEV_H #define GRABDEV_H 1 diff --git a/Xi/grabdevb.h b/Xi/grabdevb.h index b2a9796b5..90683f97e 100644 --- a/Xi/grabdevb.h +++ b/Xi/grabdevb.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GRABDEVB_H #define GRABDEVB_H 1 diff --git a/Xi/grabdevk.h b/Xi/grabdevk.h index 85738affa..d0164aa5b 100644 --- a/Xi/grabdevk.h +++ b/Xi/grabdevk.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GRABDEVK_H #define GRABDEVK_H 1 diff --git a/Xi/gtmotion.h b/Xi/gtmotion.h index 70e75b85a..ffc6ecdc2 100644 --- a/Xi/gtmotion.h +++ b/Xi/gtmotion.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GTMOTION_H #define GTMOTION_H 1 diff --git a/Xi/listdev.h b/Xi/listdev.h index 65a62220d..89105733e 100644 --- a/Xi/listdev.h +++ b/Xi/listdev.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef LISTDEV_H #define LISTDEV_H 1 diff --git a/Xi/opendev.h b/Xi/opendev.h index 89b326d43..ef06e8cf4 100644 --- a/Xi/opendev.h +++ b/Xi/opendev.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef OPENDEV_H #define OPENDEV_H 1 diff --git a/Xi/queryst.h b/Xi/queryst.h index 32960b1cd..43863507b 100644 --- a/Xi/queryst.h +++ b/Xi/queryst.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef QUERYST_H #define QUERYST_H 1 diff --git a/Xi/selectev.h b/Xi/selectev.h index e80fe4a43..947a061fe 100644 --- a/Xi/selectev.h +++ b/Xi/selectev.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SELECTEV_H #define SELECTEV_H 1 diff --git a/Xi/sendexev.h b/Xi/sendexev.h index 38c66434d..247b3a5b6 100644 --- a/Xi/sendexev.h +++ b/Xi/sendexev.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SENDEXEV_H #define SENDEXEV_H 1 diff --git a/Xi/setbmap.h b/Xi/setbmap.h index f4bb22cb7..2204aeebb 100644 --- a/Xi/setbmap.h +++ b/Xi/setbmap.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETBMAP_H #define SETBMAP_H 1 diff --git a/Xi/setdval.h b/Xi/setdval.h index 644bbcfbe..cf45cfd2e 100644 --- a/Xi/setdval.h +++ b/Xi/setdval.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETDVAL_H #define SETDVAL_H 1 diff --git a/Xi/setfocus.h b/Xi/setfocus.h index 0adf45157..daf48eb41 100644 --- a/Xi/setfocus.h +++ b/Xi/setfocus.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETFOCUS_H #define SETFOCUS_H 1 diff --git a/Xi/setmmap.h b/Xi/setmmap.h index a7de58d3a..f1c519b1b 100644 --- a/Xi/setmmap.h +++ b/Xi/setmmap.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETMMAP_H #define SETMMAP_H 1 diff --git a/Xi/setmode.h b/Xi/setmode.h index 68bdddbc5..92c97db5d 100644 --- a/Xi/setmode.h +++ b/Xi/setmode.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETMODE_H #define SETMODE_H 1 diff --git a/Xi/ungrdev.h b/Xi/ungrdev.h index 8a85c27f1..963bd3b68 100644 --- a/Xi/ungrdev.h +++ b/Xi/ungrdev.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef UNGRDEV_H #define UNGRDEV_H 1 diff --git a/Xi/ungrdevb.h b/Xi/ungrdevb.h index 97d8aede1..2bb9df2cb 100644 --- a/Xi/ungrdevb.h +++ b/Xi/ungrdevb.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef UNGRDEVB_H #define UNGRDEVB_H 1 diff --git a/Xi/ungrdevk.h b/Xi/ungrdevk.h index 1c4bab65b..030b61514 100644 --- a/Xi/ungrdevk.h +++ b/Xi/ungrdevk.h @@ -22,11 +22,6 @@ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ********************************************************/ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef UNGRDEVK_H #define UNGRDEVK_H 1 diff --git a/Xi/xiallowev.h b/Xi/xiallowev.h index c24ac3df4..29c07d32f 100644 --- a/Xi/xiallowev.h +++ b/Xi/xiallowev.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XIALLOWEV_H #define XIALLOWEV_H 1 diff --git a/Xi/xibarriers.h b/Xi/xibarriers.h index 386a6ebe5..2de7eb5fd 100644 --- a/Xi/xibarriers.h +++ b/Xi/xibarriers.h @@ -1,8 +1,3 @@ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef _XIBARRIERS_H_ #define _XIBARRIERS_H_ diff --git a/Xi/xichangecursor.h b/Xi/xichangecursor.h index 14477772a..008a03b72 100644 --- a/Xi/xichangecursor.h +++ b/Xi/xichangecursor.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer, University of South Australia, NICTA */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHDEVCUR_H #define CHDEVCUR_H 1 diff --git a/Xi/xichangehierarchy.h b/Xi/xichangehierarchy.h index 8fa3a66e7..7e852fa46 100644 --- a/Xi/xichangehierarchy.h +++ b/Xi/xichangehierarchy.h @@ -28,11 +28,6 @@ * Request change in the device hierarchy. * */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef CHDEVHIER_H #define CHDEVHIER_H 1 diff --git a/Xi/xigetclientpointer.h b/Xi/xigetclientpointer.h index 2e3cfc330..5d08c29e2 100644 --- a/Xi/xigetclientpointer.h +++ b/Xi/xigetclientpointer.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer, University of South Australia, NICTA */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef GETCPTR_H #define GETCPTR_H 1 diff --git a/Xi/xigrabdev.h b/Xi/xigrabdev.h index 3deacffed..13192e7ff 100644 --- a/Xi/xigrabdev.h +++ b/Xi/xigrabdev.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XIGRABDEV_H #define XIGRABDEV_H 1 diff --git a/Xi/xipassivegrab.h b/Xi/xipassivegrab.h index de59ab990..85754de3b 100644 --- a/Xi/xipassivegrab.h +++ b/Xi/xipassivegrab.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XIPASSIVEGRAB_H #define XIPASSIVEGRAB_H 1 diff --git a/Xi/xiproperty.h b/Xi/xiproperty.h index 5edc28733..a4b15790e 100644 --- a/Xi/xiproperty.h +++ b/Xi/xiproperty.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XIPROPERTY_H #define XIPROPERTY_H 1 diff --git a/Xi/xiquerydevice.h b/Xi/xiquerydevice.h index 5f6fee3db..ff66331aa 100644 --- a/Xi/xiquerydevice.h +++ b/Xi/xiquerydevice.h @@ -23,11 +23,6 @@ * Authors: Peter Hutterer * */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef QUERYDEV_H #define QUERYDEV_H 1 diff --git a/Xi/xiquerypointer.h b/Xi/xiquerypointer.h index f4dfacc4f..192c4b759 100644 --- a/Xi/xiquerypointer.h +++ b/Xi/xiquerypointer.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer, University of South Australia, NICTA */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef QUERYDP_H #define QUERYDP_H 1 diff --git a/Xi/xiqueryversion.h b/Xi/xiqueryversion.h index 824e168a4..880ae3129 100644 --- a/Xi/xiqueryversion.h +++ b/Xi/xiqueryversion.h @@ -23,11 +23,6 @@ * Authors: Peter Hutterer * */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #include #ifndef QUERYVERSION_H diff --git a/Xi/xiselectev.h b/Xi/xiselectev.h index f0f0d1c16..b6d73fec7 100644 --- a/Xi/xiselectev.h +++ b/Xi/xiselectev.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XISELECTEVENTS_H #define XISELECTEVENTS_H 1 diff --git a/Xi/xisetclientpointer.h b/Xi/xisetclientpointer.h index f5c15bf49..b7c867d15 100644 --- a/Xi/xisetclientpointer.h +++ b/Xi/xisetclientpointer.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer, University of South Australia, NICTA */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef SETCPTR_H #define SETCPTR_H 1 diff --git a/Xi/xisetdevfocus.h b/Xi/xisetdevfocus.h index 68dbe0ee5..909d3bb25 100644 --- a/Xi/xisetdevfocus.h +++ b/Xi/xisetdevfocus.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef XISETDEVFOCUS_H #define XISETDEVFOCUS_H 1 diff --git a/Xi/xiwarppointer.h b/Xi/xiwarppointer.h index 7637f422a..5fa22ecf9 100644 --- a/Xi/xiwarppointer.h +++ b/Xi/xiwarppointer.h @@ -22,11 +22,6 @@ * * Author: Peter Hutterer, University of South Australia, NICTA */ - -#ifdef HAVE_DIX_CONFIG_H -#include -#endif - #ifndef WARPDEVP_H #define WARPDEVP_H 1