Removed X11 header, added some clarifications

eek/eek-xkb-layout.c

@@ -31,14 +31,14 @@
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include "eek-xkb-layout.h"
+
 #include <X11/keysym.h>
-#include <X11/XKBlib.h>
 #include <X11/extensions/XKBgeom.h>
 #include <string.h>
 #include <stdarg.h>
 #include <gio/gio.h>
 
-#include "eek-xkb-layout.h"
 #include "eek-keyboard.h"
 #include "eek-section.h"
 #include "eek-key.h"

eek/eek-xkb-layout.h

@@ -25,7 +25,6 @@
 #ifndef EEK_XKB_LAYOUT_H
 #define EEK_XKB_LAYOUT_H 1
 
-#include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 #include "eek-layout.h"
 

eekboard/eekboard-context-service.h

@@ -43,6 +43,8 @@ typedef struct _EekboardContextServicePrivate EekboardContextServicePrivate;
 /**
  * EekboardContextService:
  *
+ * TODO: Restrict to managing keyboard layouts, and maybe button rerpeats.
+ *
  * The #EekboardContextService structure contains only private data
  * and should only be accessed using the provided API.
  */

src/server-context-service.c

@@ -22,7 +22,6 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#include <X11/Xatom.h>
 #include <gdk/gdkx.h>
 
 #include "eek/eek-gtk.h"

src/server-context-service.h

@@ -29,6 +29,7 @@ G_BEGIN_DECLS
 #define SERVER_IS_CONTEXT_SERVICE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), SERVER_TYPE_CONTEXT_SERVICE))
 #define SERVER_CONTEXT_SERVICE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), SERVER_TYPE_CONTEXT_SERVICE, ServerContextServiceClass))
 
+/** Manages the liecycle of the window displaying layouts. */
 typedef struct _ServerContextService ServerContextService;
 
 ServerContextService *server_context_service_new ();