diff --git a/garcon/Makefile.am b/garcon/Makefile.am
index a706b7a4442b8c845461db7afad661b67881a4eb..901ee481956dbfeb29f54181ed4267d85a7cf462 100644
--- a/garcon/Makefile.am
+++ b/garcon/Makefile.am
@@ -29,37 +29,39 @@ lib_LTLIBRARIES = 							\
 
 libgarcon_headers =							\
 	garcon.h							\
-	garcongio.h							\
-	garconmenuelement.h						\
-	garconmenuseparator.h						\
-	garconmenudirectory.h						\
-	garconmenuitempool.h						\
-	garconmenuitemcache.h						\
-	garconenvironment.h						\
-	garconmenu.h							\
-	garconmenumonitor.h						\
-	garconmenuitem.h						\
-	garconmenunode.h						\
-	garconmenutreeprovider.h					\
-	garconmenumerger.h						\
-	garconmenuparser.h
+	garcon-config.h							\
+	garcon-gio.h							\
+	garcon-menu-element.h						\
+	garcon-menu-separator.h						\
+	garcon-menu-directory.h						\
+	garcon-menu-item-pool.h						\
+	garcon-menu-item-cache.h					\
+	garcon-environment.h						\
+	garcon-menu.h							\
+	garcon-menu-monitor.h						\
+	garcon-menu-item.h						\
+	garcon-menu-node.h						\
+	garcon-menu-tree-provider.h					\
+	garcon-menu-merger.h						\
+	garcon-menu-parser.h
 
 libgarcon_sources =							\
 	garcon.c							\
-	garcongio.c							\
-	garconmenuelement.c						\
-	garconmenuseparator.c						\
-	garconmenudirectory.c						\
-	garconmenuitempool.c						\
-	garconmenuitemcache.c						\
-	garconenvironment.c						\
-	garconmenu.c							\
-	garconmenumonitor.c						\
-	garconmenuitem.c						\
-	garconmenunode.c						\
-	garconmenutreeprovider.c					\
-	garconmenumerger.c						\
-	garconmenuparser.c
+	garcon-config.c							\
+	garcon-gio.c							\
+	garcon-menu-element.c						\
+	garcon-menu-separator.c						\
+	garcon-menu-directory.c						\
+	garcon-menu-item-pool.c						\
+	garcon-menu-item-cache.c					\
+	garcon-environment.c						\
+	garcon-menu.c							\
+	garcon-menu-monitor.c						\
+	garcon-menu-item.c						\
+	garcon-menu-node.c						\
+	garcon-menu-tree-provider.c					\
+	garcon-menu-merger.c						\
+	garcon-menu-parser.c
 
 libgarconincludedir = $(includedir)/garcon-1/garcon
 
diff --git a/garcon/garcon-config.c b/garcon/garcon-config.c
new file mode 100644
index 0000000000000000000000000000000000000000..64c7bd45b7082dec1cab91039f28932f9955475b
--- /dev/null
+++ b/garcon/garcon-config.c
@@ -0,0 +1,76 @@
+/* vi:set et ai sw=2 sts=2 ts=2: */
+/*-
+ * Copyright (c) 2009 Jannis Pohlmann <jannis@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General 
+ * Public License along with this library; if not, write to the 
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <garcon/garcon-config.h>
+
+
+
+const guint garcon_major_version = GARCON_MAJOR_VERSION;
+const guint garcon_minor_version = GARCON_MINOR_VERSION;
+const guint garcon_micro_version = GARCON_MICRO_VERSION;
+
+
+
+
+/**
+ * garcon_check_version:
+ * @required_major : the required major version.
+ * @required_minor : the required minor version.
+ * @required_micro : the required micro version.
+ *
+ * Checks that the <systemitem class="library">garcon</systemitem> 
+ * library in use is compatible with the given version. Generally you 
+ * would pass in the constants #GARCON_MAJOR_VERSION, 
+ * #GARCON_MINOR_VERSION and #GARCON_MICRO_VERSION as the three 
+ * arguments to this function; that produces a check that the library
+ * in use is compatible with the version of 
+ * <systemitem class="library">garcon</systemitem> the application was
+ * compiled against.
+ *
+ * <example>
+ * <title>Checking the runtime version of the garcon library</title>
+ * <programlisting>
+ * const gchar *mismatch;
+ * mismatch = garcon_check_version (GARCON_VERSION_MAJOR,
+ *                                  GARCON_VERSION_MINOR,
+ *                                  GARCON_VERSION_MICRO);
+ * if (G_UNLIKELY (mismatch != NULL))
+ *   g_error ("Version mismatch: %<!---->s", mismatch);
+ * </programlisting>
+ * </example>
+ *
+ * Return value: %NULL if the library is compatible with the given version,
+ *               or a string describing the version mismatch. The returned
+ *               string is owned by the library and must not be freed or
+ *               modified by the caller.
+ *
+ * Since: 0.3.1
+ **/
+const gchar*
+garcon_check_version (guint required_major,
+                      guint required_minor,
+                      guint required_micro)
+{
+  return NULL;
+}
diff --git a/garcon/garcon-config.h.in b/garcon/garcon-config.h.in
new file mode 100644
index 0000000000000000000000000000000000000000..a4727e95e5fd5bc8e5d92c42ac091969b2339be7
--- /dev/null
+++ b/garcon/garcon-config.h.in
@@ -0,0 +1,55 @@
+/* $Id$ */
+/* vi:set expandtab sw=2 sts=2: */
+/*-
+ * Copyright (c) 2008 Jannis Pohlmann <jannis@xfce.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#if !defined (GARCON_INSIDE_GARCON_H) && !defined (GARCON_COMPILATION)
+#error "Only <garcon/garcon.h> can be included directly, this file may disappear or change contents."
+#endif
+
+#ifndef __GARCON_CONFIG_H__
+#define __GARCON_CONFIG_H__
+
+#include <glib-object.h>
+
+G_BEGIN_DECLS
+
+#define GARCON_MAJOR_VERSION @GARCON_VERSION_MAJOR@
+#define GARCON_MINOR_VERSION @GARCON_VERSION_MINOR@
+#define GARCON_MICRO_VERSION @GARCON_VERSION_MICRO@
+
+#define GARCON_CHECK_VERSION(major,minor,micro) \
+  (GARCON_MAJOR_VERSION > (major) \
+   || (GARCON_MAJOR_VERSION == (major) \
+       && GARCON_MINOR_VERSION > (minor)) \
+   || (GARCON_MAJOR_VERSION == (major) \
+       && GARCON_MINOR_VERSION == (minor) \
+       && GARCON_MICRO_VERSION >= (micro)))
+
+extern const guint garcon_major_version;
+extern const guint garcon_minor_version;
+extern const guint garcon_micro_version;
+
+const gchar *garcon_check_version (guint required_major,
+                                   guint required_minor,
+                                   guint required_micro);
+
+G_END_DECLS
+
+#endif /* !__GARCON_CONFIG_H__ */
diff --git a/garcon/garconenvironment.c b/garcon/garcon-environment.c
similarity index 95%
rename from garcon/garconenvironment.c
rename to garcon/garcon-environment.c
index b80574a91c87f1602d85b4183e0f2858347a906d..61d630b69ac5757fd938d0a18616ad62ba952b1b 100644
--- a/garcon/garconenvironment.c
+++ b/garcon/garcon-environment.c
@@ -23,12 +23,12 @@
 #include <config.h>
 #endif
 
-#include <garcon/garconenvironment.h>
+#include <garcon/garcon-environment.h>
 
 
 
 /**
- * SECTION:garconmenuenvironment
+ * SECTION:garcon-menu-environment
  * @title: Desktop Environment Configuration
  *
  * Desktop Environment Configuration
diff --git a/garcon/garconenvironment.h b/garcon/garcon-environment.h
similarity index 100%
rename from garcon/garconenvironment.h
rename to garcon/garcon-environment.h
diff --git a/garcon/garcongio.c b/garcon/garcon-gio.c
similarity index 98%
rename from garcon/garcongio.c
rename to garcon/garcon-gio.c
index 0dbb4b34a639959266465ffc194ca276b613357d..4c381c0b3e8d8148be17794af6b731226e9edec7 100644
--- a/garcon/garcongio.c
+++ b/garcon/garcon-gio.c
@@ -24,7 +24,7 @@
 
 #include <gio/gio.h>
 
-#include <garcon/garcongio.h>
+#include <garcon/garcon-gio.h>
 
 
 
diff --git a/garcon/garcongio.h b/garcon/garcon-gio.h
similarity index 100%
rename from garcon/garcongio.h
rename to garcon/garcon-gio.h
diff --git a/garcon/garconmenudirectory.c b/garcon/garcon-menu-directory.c
similarity index 99%
rename from garcon/garconmenudirectory.c
rename to garcon/garcon-menu-directory.c
index 93612aefd44385dc2ddc83844b7c766c5a8f4f73..e5bf6271c1fa14be96f7eb03244bfc4cd9ba589f 100644
--- a/garcon/garconmenudirectory.c
+++ b/garcon/garcon-menu-directory.c
@@ -25,8 +25,8 @@
 #include <locale.h>
 #include <glib.h>
 
-#include <garcon/garconenvironment.h>
-#include <garcon/garconmenudirectory.h>
+#include <garcon/garcon-environment.h>
+#include <garcon/garcon-menu-directory.h>
 
 
 
diff --git a/garcon/garconmenudirectory.h b/garcon/garcon-menu-directory.h
similarity index 100%
rename from garcon/garconmenudirectory.h
rename to garcon/garcon-menu-directory.h
diff --git a/garcon/garconmenuelement.c b/garcon/garcon-menu-element.c
similarity index 98%
rename from garcon/garconmenuelement.c
rename to garcon/garcon-menu-element.c
index cd6b5720a146140b0c3069bb9544328f8ed50027..2e595c278f334de495f6fb24aff31999086e57ba 100644
--- a/garcon/garconmenuelement.c
+++ b/garcon/garcon-menu-element.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include <garcon/garconmenuelement.h>
+#include <garcon/garcon-menu-element.h>
 
 
 
diff --git a/garcon/garconmenuelement.h b/garcon/garcon-menu-element.h
similarity index 96%
rename from garcon/garconmenuelement.h
rename to garcon/garcon-menu-element.h
index a568007b03b9359f23c4f6aa93c4ef2506f7fb63..9270688f8d72faa7efbe6a4a32fa0356f3316a01 100644
--- a/garcon/garconmenuelement.h
+++ b/garcon/garcon-menu-element.h
@@ -19,7 +19,7 @@
  */
 
 #if !defined (GARCON_INSIDE_GARCON_H) && !defined (GARCON_COMPILATION)
-#error "Only <garconmenu/garcon.h> can be included directly. This file may disappear or change contents."
+#error "Only <garcon/garcon.h> can be included directly. This file may disappear or change contents."
 #endif
 
 #ifndef __GARCON_MENU_ELEMENT_H__
diff --git a/garcon/garconmenuitemcache.c b/garcon/garcon-menu-item-cache.c
similarity index 98%
rename from garcon/garconmenuitemcache.c
rename to garcon/garcon-menu-item-cache.c
index 003575ae27d91227618329823066bb1c9531643b..395673d556a76723f43d1cfd6be9c599e58bf5cb 100644
--- a/garcon/garconmenuitemcache.c
+++ b/garcon/garcon-menu-item-cache.c
@@ -38,8 +38,8 @@
 #include <string.h>
 #endif
 
-#include <garcon/garconmenuitem.h>
-#include <garcon/garconmenuitemcache.h>
+#include <garcon/garcon-menu-item.h>
+#include <garcon/garcon-menu-item-cache.h>
 
 
 
diff --git a/garcon/garconmenuitemcache.h b/garcon/garcon-menu-item-cache.h
similarity index 100%
rename from garcon/garconmenuitemcache.h
rename to garcon/garcon-menu-item-cache.h
diff --git a/garcon/garconmenuitempool.c b/garcon/garcon-menu-item-pool.c
similarity index 98%
rename from garcon/garconmenuitempool.c
rename to garcon/garcon-menu-item-pool.c
index 4688554d8866eeb07fd19d0d4d4eedc5655609c1..b5c23da20dba55c44578ae6963c7cd7c2427f6ec 100644
--- a/garcon/garconmenuitempool.c
+++ b/garcon/garcon-menu-item-pool.c
@@ -22,9 +22,9 @@
 #include <config.h>
 #endif
 
-#include <garcon/garconmenuitem.h>
-#include <garcon/garconmenunode.h>
-#include <garcon/garconmenuitempool.h>
+#include <garcon/garcon-menu-item.h>
+#include <garcon/garcon-menu-node.h>
+#include <garcon/garcon-menu-item-pool.h>
 
 
 
diff --git a/garcon/garconmenuitempool.h b/garcon/garcon-menu-item-pool.h
similarity index 100%
rename from garcon/garconmenuitempool.h
rename to garcon/garcon-menu-item-pool.h
diff --git a/garcon/garconmenuitem.c b/garcon/garcon-menu-item.c
similarity index 99%
rename from garcon/garconmenuitem.c
rename to garcon/garcon-menu-item.c
index ebe10cf5f3331b09e3cd9d77aa3a7461ebe4ebd6..5c3dacd1975af5704440c9c0e7e0299fb32f7f4b 100644
--- a/garcon/garconmenuitem.c
+++ b/garcon/garcon-menu-item.c
@@ -24,9 +24,9 @@
 
 #include <gio/gio.h>
 
-#include <garcon/garconenvironment.h>
-#include <garcon/garconmenuelement.h>
-#include <garcon/garconmenuitem.h>
+#include <garcon/garcon-environment.h>
+#include <garcon/garcon-menu-element.h>
+#include <garcon/garcon-menu-item.h>
 
 
 
diff --git a/garcon/garconmenuitem.h b/garcon/garcon-menu-item.h
similarity index 100%
rename from garcon/garconmenuitem.h
rename to garcon/garcon-menu-item.h
diff --git a/garcon/garconmenumerger.c b/garcon/garcon-menu-merger.c
similarity index 99%
rename from garcon/garconmenumerger.c
rename to garcon/garcon-menu-merger.c
index 9cf2ea6c30d611373cfdd3c4f914ee1d05e5e5b4..42a05d3d14df51ff1c062327fb37811a1831aa15 100644
--- a/garcon/garconmenumerger.c
+++ b/garcon/garcon-menu-merger.c
@@ -25,11 +25,11 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <garcon/garconmenunode.h>
-#include <garcon/garconmenutreeprovider.h>
-#include <garcon/garconmenuparser.h>
-#include <garcon/garconmenumerger.h>
-#include <garcon/garcongio.h>
+#include <garcon/garcon-menu-node.h>
+#include <garcon/garcon-menu-tree-provider.h>
+#include <garcon/garcon-menu-parser.h>
+#include <garcon/garcon-menu-merger.h>
+#include <garcon/garcon-gio.h>
 
 
 
diff --git a/garcon/garconmenumerger.h b/garcon/garcon-menu-merger.h
similarity index 98%
rename from garcon/garconmenumerger.h
rename to garcon/garcon-menu-merger.h
index 1ee87078b12aa9a85cc9bffbd00a1c9ba77988d4..45a63cab3af7494f1a1aa4bcfad667d52cb6cd50 100644
--- a/garcon/garconmenumerger.h
+++ b/garcon/garcon-menu-merger.h
@@ -26,7 +26,7 @@
 #define __GARCON_MENU_MERGER_H__
 
 #include <garcon/garcon.h>
-#include <garcon/garconmenutreeprovider.h>
+#include <garcon/garcon-menu-tree-provider.h>
 
 G_BEGIN_DECLS
 
diff --git a/garcon/garconmenumonitor.c b/garcon/garcon-menu-monitor.c
similarity index 99%
rename from garcon/garconmenumonitor.c
rename to garcon/garcon-menu-monitor.c
index d537029e134a306e777767deb51d1d8b25558f35..cf69832cb0c8eb5e15b071f8b1a2c084b610b8c1 100644
--- a/garcon/garconmenumonitor.c
+++ b/garcon/garcon-menu-monitor.c
@@ -22,9 +22,9 @@
 #include <config.h>
 #endif
 
-#include <garcon/garconmenumonitor.h>
+#include <garcon/garcon-menu-monitor.h>
+#include <garcon/garcon-menu-item.h>
 #include <garcon/garcon.h>
-#include <garcon/garconmenuitem.h>
 
 
 
diff --git a/garcon/garconmenumonitor.h b/garcon/garcon-menu-monitor.h
similarity index 100%
rename from garcon/garconmenumonitor.h
rename to garcon/garcon-menu-monitor.h
diff --git a/garcon/garconmenunode.c b/garcon/garcon-menu-node.c
similarity index 99%
rename from garcon/garconmenunode.c
rename to garcon/garcon-menu-node.c
index f5f6270bc90883f5e2176caeea6be3fb285c5df0..fd686bb241036d2bf5a0dc9fccd7b6511f85b070 100644
--- a/garcon/garconmenunode.c
+++ b/garcon/garcon-menu-node.c
@@ -25,8 +25,8 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <garcon/garconmenuitem.h>
-#include <garcon/garconmenunode.h>
+#include <garcon/garcon-menu-item.h>
+#include <garcon/garcon-menu-node.h>
 
 
 
diff --git a/garcon/garconmenunode.h b/garcon/garcon-menu-node.h
similarity index 100%
rename from garcon/garconmenunode.h
rename to garcon/garcon-menu-node.h
diff --git a/garcon/garconmenuparser.c b/garcon/garcon-menu-parser.c
similarity index 99%
rename from garcon/garconmenuparser.c
rename to garcon/garcon-menu-parser.c
index eb94c91d38a5b579ce2a5e0246508ec556199369..31561c821995e9bc19f750de0be9ec1fcdbc5b70 100644
--- a/garcon/garconmenuparser.c
+++ b/garcon/garcon-menu-parser.c
@@ -28,9 +28,9 @@
 
 #include <gio/gio.h>
 
-#include <garcon/garconmenunode.h>
-#include <garcon/garconmenutreeprovider.h>
-#include <garcon/garconmenuparser.h>
+#include <garcon/garcon-menu-node.h>
+#include <garcon/garcon-menu-tree-provider.h>
+#include <garcon/garcon-menu-parser.h>
 
 
 
diff --git a/garcon/garconmenuparser.h b/garcon/garcon-menu-parser.h
similarity index 100%
rename from garcon/garconmenuparser.h
rename to garcon/garcon-menu-parser.h
diff --git a/garcon/garconmenuseparator.c b/garcon/garcon-menu-separator.c
similarity index 98%
rename from garcon/garconmenuseparator.c
rename to garcon/garcon-menu-separator.c
index 8b1ac5332911ae97a30efa0f5cb688ba97d65993..469c40cede42af5980f0ffc490223b84ce7ba8e9 100644
--- a/garcon/garconmenuseparator.c
+++ b/garcon/garcon-menu-separator.c
@@ -22,8 +22,8 @@
 #include <config.h>
 #endif
 
-#include <garcon/garconmenuelement.h>
-#include <garcon/garconmenuseparator.h>
+#include <garcon/garcon-menu-element.h>
+#include <garcon/garcon-menu-separator.h>
 
 
 
diff --git a/garcon/garconmenuseparator.h b/garcon/garcon-menu-separator.h
similarity index 100%
rename from garcon/garconmenuseparator.h
rename to garcon/garcon-menu-separator.h
diff --git a/garcon/garconmenutreeprovider.c b/garcon/garcon-menu-tree-provider.c
similarity index 97%
rename from garcon/garconmenutreeprovider.c
rename to garcon/garcon-menu-tree-provider.c
index 31c4b85ded5f77dad58d842fda8bf8d4feac3f84..89075ad4796fafcb0ab10563fcf8a91896f2341c 100644
--- a/garcon/garconmenutreeprovider.c
+++ b/garcon/garcon-menu-tree-provider.c
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include <garcon/garconmenutreeprovider.h>
+#include <garcon/garcon-menu-tree-provider.h>
 
 
 
diff --git a/garcon/garconmenutreeprovider.h b/garcon/garcon-menu-tree-provider.h
similarity index 100%
rename from garcon/garconmenutreeprovider.h
rename to garcon/garcon-menu-tree-provider.h
diff --git a/garcon/garconmenu.c b/garcon/garcon-menu.c
similarity index 99%
rename from garcon/garconmenu.c
rename to garcon/garcon-menu.c
index 7401c3ba7f04918d386094203f7c2a5a69e3f07b..8b8146e434c01123be068acdf9b73eac7441fa43 100644
--- a/garcon/garconmenu.c
+++ b/garcon/garcon-menu.c
@@ -28,18 +28,18 @@
 
 #include <glib/gi18n.h>
 
-#include <garcon/garconenvironment.h>
-#include <garcon/garconmenuelement.h>
-#include <garcon/garconmenuitem.h>
-#include <garcon/garconmenudirectory.h>
-#include <garcon/garconmenuitempool.h>
-#include <garcon/garconmenuitemcache.h>
-#include <garcon/garconmenuseparator.h>
-#include <garcon/garconmenumonitor.h>
-#include <garcon/garconmenunode.h>
-#include <garcon/garconmenuparser.h>
-#include <garcon/garconmenumerger.h>
-#include <garcon/garcongio.h>
+#include <garcon/garcon-environment.h>
+#include <garcon/garcon-menu-element.h>
+#include <garcon/garcon-menu-item.h>
+#include <garcon/garcon-menu-directory.h>
+#include <garcon/garcon-menu-item-pool.h>
+#include <garcon/garcon-menu-item-cache.h>
+#include <garcon/garcon-menu-separator.h>
+#include <garcon/garcon-menu-monitor.h>
+#include <garcon/garcon-menu-node.h>
+#include <garcon/garcon-menu-parser.h>
+#include <garcon/garcon-menu-merger.h>
+#include <garcon/garcon-gio.h>
 #include <garcon/garcon.h>
 
 
diff --git a/garcon/garconmenu.h b/garcon/garcon-menu.h
similarity index 100%
rename from garcon/garconmenu.h
rename to garcon/garcon-menu.h
diff --git a/garcon/garcon.c b/garcon/garcon.c
index 67c0f3d3cdeec94d75013acab143d61f02f58609..c4ed5314c4fcfb1c2df7fa0b8fc2755c9413491d 100644
--- a/garcon/garcon.c
+++ b/garcon/garcon.c
@@ -25,11 +25,11 @@
 #include <glib-object.h>
 
 #include <garcon/garcon.h>
-#include <garcon/garconenvironment.h>
-#include <garcon/garconmenuitemcache.h>
-#include <garcon/garconmenudirectory.h>
-#include <garcon/garconmenumonitor.h>
-#include <garcon/garconmenuseparator.h>
+#include <garcon/garcon-environment.h>
+#include <garcon/garcon-menu-item-cache.h>
+#include <garcon/garcon-menu-directory.h>
+#include <garcon/garcon-menu-monitor.h>
+#include <garcon/garcon-menu-separator.h>
 
 
 
diff --git a/garcon/garcon.h b/garcon/garcon.h
index ec42bd7e6e17028d07c899e74bd7340761c13255..e757fa9b5b7d5f07e4c2b1e6650f44f184587350 100644
--- a/garcon/garcon.h
+++ b/garcon/garcon.h
@@ -26,19 +26,19 @@
 #define GARCON_INSIDE_GARCON_H
 
 #include <garcon/garcon-config.h>
-#include <garcon/garconmenudirectory.h>
-#include <garcon/garconmenuelement.h>
-#include <garcon/garconenvironment.h>
-#include <garcon/garconmenu.h>
-#include <garcon/garconmenuitem.h>
-#include <garcon/garconmenuitemcache.h>
-#include <garcon/garconmenuitempool.h>
-#include <garcon/garconmenunode.h>
-#include <garcon/garconmenumerger.h>
-#include <garcon/garconmenumonitor.h>
-#include <garcon/garconmenuparser.h>
-#include <garcon/garconmenuseparator.h>
-#include <garcon/garconmenutreeprovider.h>
+#include <garcon/garcon-menu-directory.h>
+#include <garcon/garcon-menu-element.h>
+#include <garcon/garcon-environment.h>
+#include <garcon/garcon-menu.h>
+#include <garcon/garcon-menu-item.h>
+#include <garcon/garcon-menu-item-cache.h>
+#include <garcon/garcon-menu-item-pool.h>
+#include <garcon/garcon-menu-node.h>
+#include <garcon/garcon-menu-merger.h>
+#include <garcon/garcon-menu-monitor.h>
+#include <garcon/garcon-menu-parser.h>
+#include <garcon/garcon-menu-separator.h>
+#include <garcon/garcon-menu-tree-provider.h>
 
 #undef GARCON_INSIDE_GARCON_H