diff --git a/eek/eek-clutter-keyboard.c b/eek/eek-clutter-keyboard.c
index 112e744c..4fdaa47c 100644
--- a/eek/eek-clutter-keyboard.c
+++ b/eek/eek-clutter-keyboard.c
@@ -22,13 +22,14 @@
  * SECTION:eek-clutter-keyboard
  * @short_description: a #ClutterActor displaying #EekKeyboard
  */
-#include <string.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include <string.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+
 #include "eek-clutter-keyboard.h"
 #include "eek-clutter-section.h"
 #include "eek-clutter-renderer.h"
diff --git a/eek/eek-clutter-renderer.c b/eek/eek-clutter-renderer.c
index 0717f6e7..86e05811 100644
--- a/eek/eek-clutter-renderer.c
+++ b/eek/eek-clutter-renderer.c
@@ -18,16 +18,16 @@
  * 02110-1301 USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif  /* HAVE_CONFIG_H */
+
 #include <string.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <cogl/cogl.h>
 #include <cogl/cogl-pango.h>
 #include <clutter/clutter.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
 #include "eek-clutter-renderer.h"
 #include "eek-key.h"
 
diff --git a/eek/eek-element.c b/eek/eek-element.c
index 217f851b..e6cd6b6a 100644
--- a/eek/eek-element.c
+++ b/eek/eek-element.c
@@ -26,12 +26,12 @@
  * shall be used to implement #EekKeyboard, #EekSection, or #EekKey.
  */
 
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include <string.h>
+
 #include "eek-element.h"
 #include "eek-container.h"
 #include "eek-marshalers.h"
diff --git a/eek/eek-gtk-keyboard.c b/eek/eek-gtk-keyboard.c
index 828a2d52..2fb9b236 100644
--- a/eek/eek-gtk-keyboard.c
+++ b/eek/eek-gtk-keyboard.c
@@ -22,12 +22,13 @@
  * SECTION:eek-gtk-keyboard
  * @short_description: a #GtkWidget displaying #EekKeyboard
  */
-#include <string.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include <string.h>
+
 #include "eek-gtk-keyboard.h"
 #include "eek-gtk-renderer.h"
 #include "eek-keyboard.h"
diff --git a/eek/eek-key.c b/eek/eek-key.c
index 2c268449..470d623a 100644
--- a/eek/eek-key.c
+++ b/eek/eek-key.c
@@ -25,15 +25,16 @@
  * The #EekKeyClass class represents a key.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif  /* HAVE_CONFIG_H */
+
 #include <string.h>
 #define DEBUG 0
 #if DEBUG
 #include <stdio.h>
 #endif
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
 #include "eek-key.h"
 #include "eek-section.h"
 #include "eek-keyboard.h"
diff --git a/eek/eek-keyboard-drawing.c b/eek/eek-keyboard-drawing.c
index 9a23179b..bc01d607 100644
--- a/eek/eek-keyboard-drawing.c
+++ b/eek/eek-keyboard-drawing.c
@@ -17,13 +17,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <math.h>
-#include <pango/pangocairo.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include <math.h>
+#include <pango/pangocairo.h>
+
 #include "eek-types.h"
 
 static gdouble
diff --git a/eek/eek-keysym.c b/eek/eek-keysym.c
index 16164c66..1ca2a4f4 100644
--- a/eek/eek-keysym.c
+++ b/eek/eek-keysym.c
@@ -23,13 +23,13 @@
  * @short_description: an #EekSymbol represents an X keysym
  */
 
-#include <string.h>
-#include <stdlib.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include <string.h>
+#include <stdlib.h>
+
 #include "eek-keysym.h"
 #include "eek-serializable.h"
 
diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c
index 268441eb..0414951a 100644
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@@ -18,12 +18,12 @@
  * 02110-1301 USA
  */
 
-#include <math.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include <math.h>
+
 #include "eek-key.h"
 #include "eek-section.h"
 #include "eek-renderer.h"
diff --git a/eek/eek-section.c b/eek/eek-section.c
index f3801edc..65b2666a 100644
--- a/eek/eek-section.c
+++ b/eek/eek-section.c
@@ -27,11 +27,12 @@
  * of one or more keys of the #EekKeyClass class.
  */
 
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
+
+#include <string.h>
+
 #include "eek-keyboard.h"
 #include "eek-section.h"
 #include "eek-key.h"
diff --git a/eek/eek-xkb-layout.c b/eek/eek-xkb-layout.c
index fc8ecd9a..1aed8155 100644
--- a/eek/eek-xkb-layout.c
+++ b/eek/eek-xkb-layout.c
@@ -27,16 +27,16 @@
  * elements using XKB.
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif  /* HAVE_CONFIG_H */
+
 #include <gdk/gdkx.h>
 #include <X11/XKBlib.h>
 #include <X11/extensions/XKBgeom.h>
 #include <string.h>
 #include <stdarg.h>
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif  /* HAVE_CONFIG_H */
-
 #include "eek-xkb-layout.h"
 #include "eek-keyboard.h"
 #include "eek-section.h"
diff --git a/eek/eek-xkl-layout.c b/eek/eek-xkl-layout.c
index 56d75ff9..d345525d 100644
--- a/eek/eek-xkl-layout.c
+++ b/eek/eek-xkl-layout.c
@@ -26,14 +26,14 @@
  * to use Libxklavier configuration.
  */
 
-#include <libxklavier/xklavier.h>
-#include <gdk/gdkx.h>
-#include <string.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include <libxklavier/xklavier.h>
+#include <gdk/gdkx.h>
+#include <string.h>
+
 #include "eek-xkl-layout.h"
 
 #define noKBDRAW_DEBUG
diff --git a/eek/eek-xml.c b/eek/eek-xml.c
index 7a4a317c..238212a4 100644
--- a/eek/eek-xml.c
+++ b/eek/eek-xml.c
@@ -21,14 +21,14 @@
  * @short_description: #EekKeyboard to XML conversion utilities
  */
 
-#include <stdio.h>
-#include <stdarg.h>
-#include <glib/gprintf.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif  /* HAVE_CONFIG_H */
 
+#include <stdio.h>
+#include <stdarg.h>
+#include <glib/gprintf.h>
+
 #include "eek-section.h"
 #include "eek-key.h"
 #include "eek-xml.h"