diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c
index 2e2c46de..0082c5f2 100644
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@@ -170,7 +170,8 @@ eekboard_context_service_real_create_keyboard (EekboardContextService *self,
             eekboard_xkl_config_rec_from_string (&keyboard_type[4]);
 
         if (display == NULL)
-            display = XOpenDisplay (NULL);
+            //display = XOpenDisplay (NULL);
+            return NULL; // FIXME: replace with wl display
 
         error = NULL;
         layout = eek_xkl_layout_new (display, &error);
diff --git a/src/meson.build b/src/meson.build
index ada7ca26..a9445ded 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -2,21 +2,27 @@ sources = [
   'server-service.c',
   'server-context-service.c',
   'server-main.c',
+  '../eekboard/eekboard-service.c',
+  '../eekboard/eekboard-context-service.c',
+#	$(srcdir)/eekboard-client.c		\
+#	$(srcdir)/eekboard-context.c		\
+  '../eekboard/eekboard-xklutil.c',
 ]
 
 deps = [
 #  dependency('glib-2.0', version: '>=2.26.0'),
   dependency('gio-2.0', version: '>=2.26.0'),
   dependency('gtk+-3.0', version: '>=3.0'),
-  dependency('eekboard-0.90'),
   dependency('eek-gtk-0.90'),
+  dependency('libxklavier'), # FIXME remove
 ]
 
 # Replacement for eekboard-server
 squeekboard = executable('squeekboard',
   sources,
+  include_directories: [include_directories('..')],
   dependencies: deps,
   install: true,
-  c_args: '-DTHEMESDIR="' + pkgdatadir + '/themes"',
+  c_args: ['-DTHEMESDIR="' + pkgdatadir + '/themes"', '-DEEKBOARD_COMPILATION=1'],
 )