diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..509ee703
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+.zanata-cache/
+_build
+TAGS
+tags
+vgdump
+*.swp
+*~
+\#*#
+.\#*
diff --git a/eek/config.h b/eek/config.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/eek/eek-container.c b/eek/eek-container.c
index 042005bd..6d44dc63 100644
--- a/eek/eek-container.c
+++ b/eek/eek-container.c
@@ -26,9 +26,7 @@
  * shall be used to implement #EekKeyboard and #EekSection.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek-container.h"
 
diff --git a/eek/eek-element.c b/eek/eek-element.c
index 8e42a015..f44361d3 100644
--- a/eek/eek-element.c
+++ b/eek/eek-element.c
@@ -26,9 +26,7 @@
  * shall be used to implement #EekKeyboard, #EekSection, or #EekKey.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <string.h>
 
diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c
index f5b61447..dfe9a968 100644
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@@ -23,9 +23,7 @@
  * @short_description: a #GtkWidget displaying #EekKeyboard
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
diff --git a/eek/eek-gtk-renderer.c b/eek/eek-gtk-renderer.c
index 8e413978..9763d9da 100644
--- a/eek/eek-gtk-renderer.c
+++ b/eek/eek-gtk-renderer.c
@@ -18,9 +18,7 @@
  * 02110-1301 USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/eek/eek-key.c b/eek/eek-key.c
index 4a57bb84..7df2b81d 100644
--- a/eek/eek-key.c
+++ b/eek/eek-key.c
@@ -25,9 +25,7 @@
  * The #EekKeyClass class represents a key.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <string.h>
 
diff --git a/eek/eek-keyboard-drawing.c b/eek/eek-keyboard-drawing.c
index 1ead5de2..5cd435c7 100644
--- a/eek/eek-keyboard-drawing.c
+++ b/eek/eek-keyboard-drawing.c
@@ -17,9 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <math.h>
 #include <pango/pangocairo.h>
diff --git a/eek/eek-keyboard.c b/eek/eek-keyboard.c
index dfe03662..5bbc4f28 100644
--- a/eek/eek-keyboard.c
+++ b/eek/eek-keyboard.c
@@ -27,9 +27,7 @@
  * of one or more sections of the #EekSectionClass class.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek-keyboard.h"
 #include "eek-marshalers.h"
diff --git a/eek/eek-keysym.c b/eek/eek-keysym.c
index bde422d4..f02a309e 100644
--- a/eek/eek-keysym.c
+++ b/eek/eek-keysym.c
@@ -23,9 +23,7 @@
  * @short_description: an #EekSymbol represents an X keysym
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/eek/eek-layout.c b/eek/eek-layout.c
index 23bb2600..fe1ce293 100644
--- a/eek/eek-layout.c
+++ b/eek/eek-layout.c
@@ -26,9 +26,7 @@
  * arranges keyboard elements.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek-layout.h"
 #include "eek-keyboard.h"
diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c
index 1d7585b8..c9b15083 100644
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@@ -18,9 +18,7 @@
  * 02110-1301 USA
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <math.h>
 #include <string.h>
diff --git a/eek/eek-section.c b/eek/eek-section.c
index 5a04619c..400dbb25 100644
--- a/eek/eek-section.c
+++ b/eek/eek-section.c
@@ -27,9 +27,7 @@
  * of one or more keys of the #EekKeyClass class.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <string.h>
 
diff --git a/eek/eek-serializable.c b/eek/eek-serializable.c
index f3882b42..82fea1ec 100644
--- a/eek/eek-serializable.c
+++ b/eek/eek-serializable.c
@@ -27,9 +27,7 @@
  * method.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek-serializable.h"
 
diff --git a/eek/eek-symbol.c b/eek/eek-symbol.c
index 846f9fd1..8352b11d 100644
--- a/eek/eek-symbol.c
+++ b/eek/eek-symbol.c
@@ -25,9 +25,7 @@
  * The #EekSymbolClass class represents a symbol assigned to a key.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek-symbol.h"
 #include "eek-serializable.h"
diff --git a/eek/eek-text.c b/eek/eek-text.c
index 258e9e97..6ef1ed4f 100644
--- a/eek/eek-text.c
+++ b/eek/eek-text.c
@@ -23,9 +23,7 @@
  * @short_description: an #EekText represents a text symbol
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek-text.h"
 #include "eek-serializable.h"
diff --git a/eek/eek-theme-context.c b/eek/eek-theme-context.c
index c6211e41..36b63370 100644
--- a/eek/eek-theme-context.c
+++ b/eek/eek-theme-context.c
@@ -19,9 +19,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek-theme.h"
 #include "eek-theme-context.h"
diff --git a/eek/eek-theme-node.c b/eek/eek-theme-node.c
index 33c089ad..a3bb3607 100644
--- a/eek/eek-theme-node.c
+++ b/eek/eek-theme-node.c
@@ -23,9 +23,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/eek/eek-types.c b/eek/eek-types.c
index a757bb7d..6bd1b9fa 100644
--- a/eek/eek-types.c
+++ b/eek/eek-types.c
@@ -24,9 +24,7 @@
  * @short_description: Miscellaneous types used in Libeek
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <string.h>
 #include <math.h>
diff --git a/eek/eek-xml-layout.c b/eek/eek-xml-layout.c
index 158b58bf..7c28b056 100644
--- a/eek/eek-xml-layout.c
+++ b/eek/eek-xml-layout.c
@@ -21,9 +21,7 @@
  * @short_description: Layout engine which loads layout information from XML
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <gio/gio.h> /* GResource */
 #include <stdlib.h>
diff --git a/eek/eek-xml.c b/eek/eek-xml.c
index cac9ea0d..de6dd307 100644
--- a/eek/eek-xml.c
+++ b/eek/eek-xml.c
@@ -22,9 +22,7 @@
  * @short_description: #EekKeyboard to XML conversion utilities
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/eek/eek.c b/eek/eek.c
index 6524b387..91ec19f3 100644
--- a/eek/eek.c
+++ b/eek/eek.c
@@ -23,9 +23,7 @@
  * @title: Library Initialization
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek.h"
 
diff --git a/eekboard/eekboard-context-service.c b/eekboard/eekboard-context-service.c
index 00a60cd7..94abf292 100644
--- a/eekboard/eekboard-context-service.c
+++ b/eekboard/eekboard-context-service.c
@@ -25,9 +25,7 @@
  * implementation of eekboard input context service.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eekboard/eekboard-context-service.h"
 
diff --git a/eekboard/eekboard-context.c b/eekboard/eekboard-context.c
index f63f649a..a5bfddbc 100644
--- a/eekboard/eekboard-context.c
+++ b/eekboard/eekboard-context.c
@@ -24,9 +24,7 @@
  * context.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eekboard/eekboard-context.h"
 //#include "eekboard/eekboard-marshalers.h"
diff --git a/eekboard/eekboard-service.c b/eekboard/eekboard-service.c
index 86d125c8..61a51e3f 100644
--- a/eekboard/eekboard-service.c
+++ b/eekboard/eekboard-service.c
@@ -26,9 +26,7 @@
  * implementation of eekboard service.
  */
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eekboard/eekboard-service.h"
 
diff --git a/meson.build b/meson.build
index e88826c9..ff12a382 100644
--- a/meson.build
+++ b/meson.build
@@ -3,12 +3,14 @@ project(
     'c', 'rust',
     version: '1.0.10',
     license: 'GPLv3',
-    meson_version: '>=0.43.0',
+    meson_version: '>=0.49.0',
     default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ],
 )
 
 i18n = import('i18n')
 
+conf_data = configuration_data()
+
 if get_option('buildtype').startswith('debug')
     add_project_arguments('-DDEBUG=1', language : 'c')
 endif
@@ -26,6 +28,16 @@ else
 endif
 dbusdir = join_paths(depdatadir, 'dbus-1/interfaces')
 
+summary = [
+        '',
+        '------------------',
+        'squeekboard @0@'.format(meson.project_version()),
+        '',
+        '------------------',
+        ''
+]
+message('\n'.join(summary))
+
 subdir('data')
 subdir('protocols')
 subdir('eek')
diff --git a/src/config.h.in b/src/config.h.in
new file mode 100644
index 00000000..ae878778
--- /dev/null
+++ b/src/config.h.in
@@ -0,0 +1,4 @@
+/*
+ * Autogenerated by the Meson build system.
+ * Do not edit, your changes will be lost.
+ */
diff --git a/src/meson.build b/src/meson.build
index 2f19c947..1a8dad20 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,7 +4,10 @@ dbus_src = gnome.gdbus_codegen(
     join_paths(meson.source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
 )
 
+config_h = configure_file(input: 'config.h.in', output: 'config.h',configuration: conf_data)
+
 sources = [
+  config_h,
   'imservice.c',
   'server-context-service.c',
   'server-main.c',
diff --git a/src/server-context-service.c b/src/server-context-service.c
index c9ed3edf..1442078e 100644
--- a/src/server-context-service.c
+++ b/src/server-context-service.c
@@ -15,9 +15,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
diff --git a/src/server-main.c b/src/server-main.c
index ac8a0cfb..96b37acd 100644
--- a/src/server-main.c
+++ b/src/server-main.c
@@ -23,13 +23,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
-#if HAVE_CLUTTER_GTK
-#include <clutter-gtk/clutter-gtk.h>
-#endif
 
 #include "eekboard/eekboard-service.h"
 #include "eek/eek.h"
diff --git a/tests/eek-xml-test.c b/tests/eek-xml-test.c
index 7beb7bc9..0ed814e4 100644
--- a/tests/eek-xml-test.c
+++ b/tests/eek-xml-test.c
@@ -21,9 +21,7 @@
 /* For gdk_x11_display_get_xdisplay().  See main(). */
 #include <gtk/gtk.h>
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif  /* HAVE_CONFIG_H */
 
 #include "eek/eek.h"