summaryrefslogtreecommitdiff
path: root/xkb/xkmread.c
diff options
context:
space:
mode:
Diffstat (limited to 'xkb/xkmread.c')
-rw-r--r--xkb/xkmread.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/xkb/xkmread.c b/xkb/xkmread.c
index 3f38a4f96..f22941f67 100644
--- a/xkb/xkmread.c
+++ b/xkb/xkmread.c
@@ -28,11 +28,10 @@
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
-#endif
-
-#ifdef HAVE_CONFIG_H
+#elif defined(HAVE_CONFIG_H)
#include <config.h>
#endif
+
#include <stdio.h>
#include <X11/Xos.h>
@@ -52,16 +51,16 @@
#else
-#include "X.h"
+#include <X11/X.h>
#define NEED_EVENTS
-#include "Xproto.h"
+#include <X11/Xproto.h>
#include <X11/keysym.h>
#include "misc.h"
#include "inputstr.h"
-#include "XKBstr.h"
+#include <X11/extensions/XKBstr.h>
#define XKBSRV_NEED_FILE_FUNCS
-#include "XKBsrv.h"
-#include "XKBgeom.h"
+#include <X11/extensions/XKBsrv.h>
+#include <X11/extensions/XKBgeom.h>
Atom
XkbInternAtom(Display *dpy,char *str,Bool only_if_exists)