diff --git a/eek/eek-element.c b/eek/eek-element.c
index 62a34d25..d08af0c7 100644
--- a/eek/eek-element.c
+++ b/eek/eek-element.c
@@ -311,7 +311,7 @@ eek_element_set_name (EekElement  *element,
  * Get the name of @element.
  * Returns: the name of @element or NULL when the name is not set
  */
-G_CONST_RETURN gchar *
+const gchar *
 eek_element_get_name (EekElement  *element)
 {
     g_return_val_if_fail (EEK_IS_ELEMENT(element), NULL);
diff --git a/eek/eek-element.h b/eek/eek-element.h
index f608afc5..fd1efc03 100644
--- a/eek/eek-element.h
+++ b/eek/eek-element.h
@@ -58,45 +58,45 @@ struct _EekElementClass
                                                     gint         level);
 };
 
-GType                 eek_element_get_type              (void) G_GNUC_CONST;
+GType        eek_element_get_type              (void) G_GNUC_CONST;
 
-void                  eek_element_set_parent            (EekElement  *element,
-                                                         EekElement  *parent);
-EekElement           *eek_element_get_parent            (EekElement  *element);
-void                  eek_element_set_name              (EekElement  *element,
-                                                         const gchar *name);
+void         eek_element_set_parent            (EekElement  *element,
+                                                EekElement  *parent);
+EekElement  *eek_element_get_parent            (EekElement  *element);
+void         eek_element_set_name              (EekElement  *element,
+                                                const gchar *name);
 
-G_CONST_RETURN gchar *eek_element_get_name              (EekElement  *element);
+const gchar *eek_element_get_name              (EekElement  *element);
 
-void                  eek_element_set_bounds            (EekElement  *element,
-                                                         EekBounds   *bounds);
+void         eek_element_set_bounds            (EekElement  *element,
+                                                EekBounds   *bounds);
 
-void                  eek_element_get_bounds            (EekElement  *element,
-                                                         EekBounds   *bounds);
+void         eek_element_get_bounds            (EekElement  *element,
+                                                EekBounds   *bounds);
 
-void                  eek_element_set_position          (EekElement  *element,
-                                                         gdouble      x,
-                                                         gdouble      y);
-void                  eek_element_set_size              (EekElement  *element,
-                                                         gdouble      width,
-                                                         gdouble      height);
+void         eek_element_set_position          (EekElement  *element,
+                                                gdouble      x,
+                                                gdouble      y);
+void         eek_element_set_size              (EekElement  *element,
+                                                gdouble      width,
+                                                gdouble      height);
 
-void                  eek_element_get_absolute_position (EekElement  *element,
-                                                         gdouble     *x,
-                                                         gdouble     *y);
+void         eek_element_get_absolute_position (EekElement  *element,
+                                                gdouble     *x,
+                                                gdouble     *y);
 
-void                  eek_element_set_symbol_index      (EekElement  *element,
-                                                         gint         group,
-                                                         gint         level);
-void                  eek_element_get_symbol_index      (EekElement  *element,
-                                                         gint        *group,
-                                                         gint        *level);
-void                  eek_element_set_group             (EekElement  *element,
-                                                         gint         group);
-void                  eek_element_set_level             (EekElement  *element,
-                                                         gint         level);
-gint                  eek_element_get_group             (EekElement  *element);
-gint                  eek_element_get_level             (EekElement  *element);
+void         eek_element_set_symbol_index      (EekElement  *element,
+                                                gint         group,
+                                                gint         level);
+void         eek_element_get_symbol_index      (EekElement  *element,
+                                                gint        *group,
+                                                gint        *level);
+void         eek_element_set_group             (EekElement  *element,
+                                                gint         group);
+void         eek_element_set_level             (EekElement  *element,
+                                                gint         level);
+gint         eek_element_get_group             (EekElement  *element);
+gint         eek_element_get_level             (EekElement  *element);
 
 G_END_DECLS
 #endif  /* EEK_ELEMENT_H */
diff --git a/eek/eek-symbol.c b/eek/eek-symbol.c
index 734a9a85..c23fbab5 100644
--- a/eek/eek-symbol.c
+++ b/eek/eek-symbol.c
@@ -285,7 +285,7 @@ eek_symbol_set_name (EekSymbol   *symbol,
  *
  * Get the name of @symbol.
  */
-G_CONST_RETURN gchar *
+const gchar *
 eek_symbol_get_name (EekSymbol *symbol)
 {
     EekSymbolPrivate *priv;
@@ -324,7 +324,7 @@ eek_symbol_set_label (EekSymbol   *symbol,
  *
  * Get the label text of @symbol.
  */
-G_CONST_RETURN gchar *
+const gchar *
 eek_symbol_get_label (EekSymbol *symbol)
 {
     EekSymbolPrivate *priv;
@@ -448,7 +448,7 @@ eek_symbol_set_icon_name (EekSymbol   *symbol,
  *
  * Get the icon name of @symbol.
  */
-G_CONST_RETURN gchar *
+const gchar *
 eek_symbol_get_icon_name (EekSymbol *symbol)
 {
     EekSymbolPrivate *priv;
@@ -487,7 +487,7 @@ eek_symbol_set_tooltip (EekSymbol   *symbol,
  *
  * Get the tooltip text of @symbol.
  */
-G_CONST_RETURN gchar *
+const gchar *
 eek_symbol_get_tooltip (EekSymbol *symbol)
 {
     EekSymbolPrivate *priv;
@@ -515,7 +515,7 @@ static const struct {
     { EEK_SYMBOL_CATEGORY_UNKNOWN, NULL }
 };
 
-G_CONST_RETURN gchar *
+const gchar *
 eek_symbol_category_get_name (EekSymbolCategory category)
 {
     gint i;
diff --git a/eek/eek-xkb-layout.c b/eek/eek-xkb-layout.c
index 4e37e68e..6b75195b 100644
--- a/eek/eek-xkb-layout.c
+++ b/eek/eek-xkb-layout.c
@@ -715,7 +715,7 @@ eek_xkb_layout_set_symbols (EekXkbLayout *layout, const gchar *symbols)
  *
  * Get the keycodes component name (in the XKB terminology).
  */
-G_CONST_RETURN gchar *
+const gchar *
 eek_xkb_layout_get_keycodes (EekXkbLayout *layout)
 {
     EekXkbLayoutPrivate *priv = EEK_XKB_LAYOUT_GET_PRIVATE (layout);
@@ -730,7 +730,7 @@ eek_xkb_layout_get_keycodes (EekXkbLayout *layout)
  *
  * Get the geometry component name (in the XKB terminology).
  */
-G_CONST_RETURN gchar *
+const gchar *
 eek_xkb_layout_get_geometry (EekXkbLayout *layout)
 {
     EekXkbLayoutPrivate *priv = EEK_XKB_LAYOUT_GET_PRIVATE (layout);
@@ -745,7 +745,7 @@ eek_xkb_layout_get_geometry (EekXkbLayout *layout)
  *
  * Get the symbols component name (in the XKB terminology).
  */
-G_CONST_RETURN gchar *
+const gchar *
 eek_xkb_layout_get_symbols (EekXkbLayout *layout)
 {
     EekXkbLayoutPrivate *priv = EEK_XKB_LAYOUT_GET_PRIVATE (layout);