diff --git a/glib/gchecksum.c b/glib/gchecksum.c
index 70531afe3..620def2bb 100644
--- a/glib/gchecksum.c
+++ b/glib/gchecksum.c
@@ -1289,7 +1289,7 @@ g_checksum_update (GChecksum    *checksum,
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_checksum_get_string (GChecksum *checksum)
 {
   gchar *str = NULL;
diff --git a/glib/gchecksum.h b/glib/gchecksum.h
index 57aea103f..59bb31cd2 100644
--- a/glib/gchecksum.h
+++ b/glib/gchecksum.h
@@ -69,7 +69,7 @@ void                  g_checksum_free               (GChecksum       *checksum);
 void                  g_checksum_update             (GChecksum       *checksum,
                                                      const guchar    *data,
                                                      gssize           length);
-G_CONST_RETURN gchar *g_checksum_get_string         (GChecksum       *checksum);
+const gchar *         g_checksum_get_string         (GChecksum       *checksum);
 void                  g_checksum_get_digest         (GChecksum       *checksum,
                                                      guint8          *buffer,
                                                      gsize           *digest_len);
diff --git a/glib/gconvert.c b/glib/gconvert.c
index 3202800ed..609a800a9 100644
--- a/glib/gconvert.c
+++ b/glib/gconvert.c
@@ -1318,7 +1318,7 @@ filename_charset_cache_free (gpointer data)
  * Since: 2.6
  */
 gboolean
-g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets)
+g_get_filename_charsets (const gchar ***filename_charsets)
 {
   static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
   GFilenameCharsetCache *cache = g_static_private_get (&cache_private);
@@ -1383,7 +1383,7 @@ g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets)
 #else /* G_PLATFORM_WIN32 */
 
 gboolean
-g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets) 
+g_get_filename_charsets (const gchar ***filename_charsets) 
 {
   static const gchar *charsets[] = {
     "UTF-8",
diff --git a/glib/gconvert.h b/glib/gconvert.h
index 3650b996a..2d1bc1ffc 100644
--- a/glib/gconvert.h
+++ b/glib/gconvert.h
@@ -153,7 +153,7 @@ gchar *g_filename_to_uri   (const gchar *filename,
 			    const gchar *hostname,
 			    GError     **error) G_GNUC_MALLOC;
 gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC;
-gboolean g_get_filename_charsets (G_CONST_RETURN gchar ***charsets);
+gboolean g_get_filename_charsets (const gchar ***charsets);
 
 gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC;
 
diff --git a/glib/gdataset.c b/glib/gdataset.c
index 0c1f9c108..b58d66c0f 100644
--- a/glib/gdataset.c
+++ b/glib/gdataset.c
@@ -1246,7 +1246,7 @@ g_quark_from_static_string (const gchar *string)
  *
  * Gets the string associated with the given #GQuark.
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_quark_to_string (GQuark quark)
 {
   gchar* result = NULL;
@@ -1307,7 +1307,7 @@ g_quark_new (gchar *string)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_intern_string (const gchar *string)
 {
   const gchar *result;
@@ -1337,7 +1337,7 @@ g_intern_string (const gchar *string)
  *
  * Since: 2.10
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_intern_static_string (const gchar *string)
 {
   GQuark quark;
diff --git a/glib/gdir.c b/glib/gdir.c
index 0f0a17faf..9919bbb14 100644
--- a/glib/gdir.c
+++ b/glib/gdir.c
@@ -194,7 +194,7 @@ g_dir_open (const gchar  *path,
  *   more entries. The return value is owned by GLib and
  *   must not be modified or freed.
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_dir_read_name (GDir *dir)
 {
 #ifdef G_OS_WIN32
@@ -250,7 +250,7 @@ g_dir_read_name (GDir *dir)
 
 /* Binary compatibility version. Not for newly compiled code. */
 
-G_CONST_RETURN gchar*
+const gchar *
 g_dir_read_name (GDir *dir)
 {
   while (1)
diff --git a/glib/gdir.h b/glib/gdir.h
index a8085c9db..516fbb673 100644
--- a/glib/gdir.h
+++ b/glib/gdir.h
@@ -45,7 +45,7 @@ typedef struct _GDir GDir;
 GDir    *                g_dir_open           (const gchar  *path,
 					       guint         flags,
 					       GError      **error);
-G_CONST_RETURN gchar    *g_dir_read_name      (GDir         *dir);
+const gchar *            g_dir_read_name      (GDir         *dir);
 void                     g_dir_rewind         (GDir         *dir);
 void                     g_dir_close          (GDir         *dir);
 
diff --git a/glib/giochannel.c b/glib/giochannel.c
index 1642250dc..d99ae496e 100644
--- a/glib/giochannel.c
+++ b/glib/giochannel.c
@@ -921,7 +921,7 @@ g_io_channel_set_line_term (GIOChannel	*channel,
  * Return value: The line termination string. This value
  *   is owned by GLib and must not be freed.
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_io_channel_get_line_term (GIOChannel *channel,
 			    gint       *length)
 {
@@ -1459,7 +1459,7 @@ g_io_channel_set_encoding (GIOChannel	*channel,
  * Return value: A string containing the encoding, this string is
  *   owned by GLib and must not be freed.
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_io_channel_get_encoding (GIOChannel *channel)
 {
   g_return_val_if_fail (channel != NULL, NULL);
diff --git a/glib/giochannel.h b/glib/giochannel.h
index 0a427936e..ec6a7c0fd 100644
--- a/glib/giochannel.h
+++ b/glib/giochannel.h
@@ -215,7 +215,7 @@ GIOFlags              g_io_channel_get_flags            (GIOChannel   *channel);
 void                  g_io_channel_set_line_term        (GIOChannel   *channel,
 							 const gchar  *line_term,
 							 gint          length);
-G_CONST_RETURN gchar* g_io_channel_get_line_term        (GIOChannel   *channel,
+const gchar *         g_io_channel_get_line_term        (GIOChannel   *channel,
 							 gint         *length);
 void		      g_io_channel_set_buffered		(GIOChannel   *channel,
 							 gboolean      buffered);
@@ -223,7 +223,7 @@ gboolean	      g_io_channel_get_buffered		(GIOChannel   *channel);
 GIOStatus             g_io_channel_set_encoding         (GIOChannel   *channel,
 							 const gchar  *encoding,
 							 GError      **error);
-G_CONST_RETURN gchar* g_io_channel_get_encoding         (GIOChannel   *channel);
+const gchar *         g_io_channel_get_encoding         (GIOChannel   *channel);
 void                  g_io_channel_set_close_on_unref	(GIOChannel   *channel,
 							 gboolean      do_close);
 gboolean              g_io_channel_get_close_on_unref	(GIOChannel   *channel);
diff --git a/glib/glibintl.h b/glib/glibintl.h
index 3164a0a89..507e1c373 100644
--- a/glib/glibintl.h
+++ b/glib/glibintl.h
@@ -5,9 +5,9 @@
 #error "config.h must be included prior to glibintl.h"
 #endif
 
-G_CONST_RETURN gchar *glib_gettext  (const gchar *str) G_GNUC_FORMAT(1);
-G_CONST_RETURN gchar *glib_pgettext (const gchar *msgctxtid,
-                                     gsize        msgidoffset) G_GNUC_FORMAT(1);
+const gchar * glib_gettext  (const gchar *str) G_GNUC_FORMAT(1);
+const gchar * glib_pgettext (const gchar *msgctxtid,
+                             gsize        msgidoffset) G_GNUC_FORMAT(1);
 
 #ifdef ENABLE_NLS
 
diff --git a/glib/gmain.c b/glib/gmain.c
index e7a789e14..621215ca3 100644
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1621,7 +1621,7 @@ g_source_set_name (GSource    *source,
  * Return value: the name of the source
  * Since: 2.26
  **/
-G_CONST_RETURN char*
+const char *
 g_source_get_name (GSource *source)
 {
   g_return_val_if_fail (source != NULL, NULL);
diff --git a/glib/gmain.h b/glib/gmain.h
index 314b06c62..ed130d038 100644
--- a/glib/gmain.h
+++ b/glib/gmain.h
@@ -366,7 +366,7 @@ gboolean g_source_is_destroyed    (GSource        *source);
 
 void                 g_source_set_name       (GSource        *source,
                                               const char     *name);
-G_CONST_RETURN char* g_source_get_name       (GSource        *source);
+const char *         g_source_get_name       (GSource        *source);
 void                 g_source_set_name_by_id (guint           tag,
                                               const char     *name);
 
diff --git a/glib/gmarkup.c b/glib/gmarkup.c
index dc28bad93..7cc1b0dc4 100644
--- a/glib/gmarkup.c
+++ b/glib/gmarkup.c
@@ -1820,7 +1820,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext  *context,
  *
  * Since: 2.2
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_markup_parse_context_get_element (GMarkupParseContext *context)
 {
   g_return_val_if_fail (context != NULL, NULL);
@@ -1851,7 +1851,7 @@ g_markup_parse_context_get_element (GMarkupParseContext *context)
  *
  * Since: 2.16
  */
-G_CONST_RETURN GSList *
+const GSList *
 g_markup_parse_context_get_element_stack (GMarkupParseContext *context)
 {
   g_return_val_if_fail (context != NULL, NULL);
diff --git a/glib/gmarkup.h b/glib/gmarkup.h
index ab0190efe..a69f6e2a6 100644
--- a/glib/gmarkup.h
+++ b/glib/gmarkup.h
@@ -194,8 +194,8 @@ gpointer             g_markup_parse_context_pop   (GMarkupParseContext *context)
 
 gboolean             g_markup_parse_context_end_parse (GMarkupParseContext *context,
                                                        GError             **error);
-G_CONST_RETURN gchar *g_markup_parse_context_get_element (GMarkupParseContext *context);
-G_CONST_RETURN GSList *g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
+const gchar *        g_markup_parse_context_get_element (GMarkupParseContext *context);
+const GSList *       g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
 
 /* For user-constructed error messages, has no precise semantics */
 void                 g_markup_parse_context_get_position (GMarkupParseContext *context,
diff --git a/glib/goption.c b/glib/goption.c
index 19cd23419..799ea0998 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -2382,7 +2382,7 @@ g_option_context_set_summary (GOptionContext *context,
  *
  * Since: 2.12
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_option_context_get_summary (GOptionContext *context)
 {
   g_return_val_if_fail (context != NULL, NULL);
@@ -2426,7 +2426,7 @@ g_option_context_set_description (GOptionContext *context,
  *
  * Since: 2.12
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_option_context_get_description (GOptionContext *context)
 {
   g_return_val_if_fail (context != NULL, NULL);
diff --git a/glib/goption.h b/glib/goption.h
index 557d8f713..340a84cff 100644
--- a/glib/goption.h
+++ b/glib/goption.h
@@ -310,10 +310,10 @@ struct _GOptionEntry
 GOptionContext *g_option_context_new              (const gchar         *parameter_string);
 void            g_option_context_set_summary      (GOptionContext      *context,
                                                    const gchar         *summary);
-G_CONST_RETURN gchar *g_option_context_get_summary (GOptionContext     *context);
+const gchar *   g_option_context_get_summary      (GOptionContext     *context);
 void            g_option_context_set_description  (GOptionContext      *context,
                                                    const gchar         *description);
-G_CONST_RETURN gchar *g_option_context_get_description (GOptionContext     *context);
+const gchar *   g_option_context_get_description  (GOptionContext     *context);
 void            g_option_context_free             (GOptionContext      *context);
 void		g_option_context_set_help_enabled (GOptionContext      *context,
 						   gboolean		help_enabled);
diff --git a/glib/gquark.h b/glib/gquark.h
index a0cbe2fd7..324c95666 100644
--- a/glib/gquark.h
+++ b/glib/gquark.h
@@ -42,10 +42,10 @@ typedef guint32 GQuark;
 GQuark                g_quark_try_string         (const gchar *string);
 GQuark                g_quark_from_static_string (const gchar *string);
 GQuark                g_quark_from_string        (const gchar *string);
-G_CONST_RETURN gchar* g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
+const gchar *         g_quark_to_string          (GQuark       quark) G_GNUC_CONST;
 
-G_CONST_RETURN gchar* g_intern_string            (const gchar *string);
-G_CONST_RETURN gchar* g_intern_static_string     (const gchar *string);
+const gchar *         g_intern_string            (const gchar *string);
+const gchar *         g_intern_static_string     (const gchar *string);
 
 G_END_DECLS
 
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 3924b028d..71710aad9 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -931,7 +931,7 @@ g_ascii_strtoll (const gchar *nptr,
  *     is unknown, it returns "unknown error (<code>)". The string
  *     can only be used until the next call to g_strerror()
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_strerror (gint errnum)
 {
   static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT;
@@ -1412,7 +1412,7 @@ g_strerror (gint errnum)
  *     it returns "unknown signal (<signum>)". The string can only be
  *     used until the next call to g_strsignal()
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_strsignal (gint signum)
 {
   static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT;
@@ -2966,7 +2966,7 @@ g_str_has_prefix (const gchar  *str,
  *
  * Since: 2.4
  **/
-G_CONST_RETURN gchar *
+const gchar *
 g_strip_context  (const gchar *msgid,
                   const gchar *msgval)
 {
@@ -3032,7 +3032,7 @@ g_strv_length (gchar **str_array)
  *
  * Since: 2.16
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_dpgettext (const gchar *domain,
              const gchar *msgctxtid,
              gsize        msgidoffset)
@@ -3093,7 +3093,7 @@ g_dpgettext (const gchar *domain,
  *
  * Since: 2.18
  */
-G_CONST_RETURN char *
+const char *
 g_dpgettext2 (const char *domain,
               const char *msgctxt,
               const char *msgid)
@@ -3214,7 +3214,7 @@ _g_dgettext_should_translate (void)
  *
  * Since: 2.18
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_dgettext (const gchar *domain,
             const gchar *msgid)
 {
@@ -3240,7 +3240,7 @@ g_dgettext (const gchar *domain,
  *
  * Since: 2.26
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_dcgettext (const gchar *domain,
              const gchar *msgid,
              int          category)
@@ -3270,7 +3270,7 @@ g_dcgettext (const gchar *domain,
  *
  * Since: 2.18
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_dngettext (const gchar *domain,
              const gchar *msgid,
              const gchar *msgid_plural,
diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
index 5c7332a3c..8f99c5597 100644
--- a/glib/gstrfuncs.h
+++ b/glib/gstrfuncs.h
@@ -103,9 +103,9 @@ gchar*	              g_strdelimit     (gchar	     *string,
 gchar*	              g_strcanon       (gchar        *string,
 					const gchar  *valid_chars,
 					gchar         substitutor);
-G_CONST_RETURN gchar* g_strerror       (gint	      errnum) G_GNUC_CONST;
-G_CONST_RETURN gchar* g_strsignal      (gint	      signum) G_GNUC_CONST;
-gchar*	              g_strreverse     (gchar	     *string);
+const gchar *         g_strerror       (gint	      errnum) G_GNUC_CONST;
+const gchar *         g_strsignal      (gint	      signum) G_GNUC_CONST;
+gchar *	              g_strreverse     (gchar	     *string);
 gsize	              g_strlcpy	       (gchar	     *dest,
 					const gchar  *src,
 					gsize         dest_size);
@@ -245,22 +245,22 @@ guint                 g_strv_length    (gchar       **str_array);
 gchar*                g_stpcpy         (gchar        *dest,
                                         const char   *src);
 
-G_CONST_RETURN gchar *g_strip_context  (const gchar *msgid, 
+const gchar *         g_strip_context  (const gchar *msgid, 
 					const gchar *msgval) G_GNUC_FORMAT(1);
 
-G_CONST_RETURN gchar *g_dgettext       (const gchar *domain,
+const gchar *         g_dgettext       (const gchar *domain,
 					const gchar *msgid) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dcgettext      (const gchar *domain,
+const gchar *         g_dcgettext      (const gchar *domain,
 					const gchar *msgid,
                                         int          category) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dngettext      (const gchar *domain,
+const gchar *         g_dngettext      (const gchar *domain,
 					const gchar *msgid,
 					const gchar *msgid_plural,
 					gulong       n) G_GNUC_FORMAT(3);
-G_CONST_RETURN gchar *g_dpgettext      (const gchar *domain,
+const gchar *         g_dpgettext      (const gchar *domain,
                                         const gchar *msgctxtid,
                                         gsize        msgidoffset) G_GNUC_FORMAT(2);
-G_CONST_RETURN gchar *g_dpgettext2     (const gchar *domain,
+const gchar *         g_dpgettext2     (const gchar *domain,
                                         const gchar *context,
                                         const gchar *msgid) G_GNUC_FORMAT(3);
 
diff --git a/glib/gunicode.h b/glib/gunicode.h
index c64f5f48d..d7a68c2ab 100644
--- a/glib/gunicode.h
+++ b/glib/gunicode.h
@@ -236,7 +236,7 @@ typedef enum
  * in case the locale's charset will be changed later using setlocale()
  * or in some other way.
  */
-gboolean g_get_charset (G_CONST_RETURN char **charset);
+gboolean g_get_charset (const char **charset);
 
 /* These are all analogs of the <ctype.h> functions.
  */
diff --git a/glib/gutf8.c b/glib/gutf8.c
index 46f71b183..249b6ad2a 100644
--- a/glib/gutf8.c
+++ b/glib/gutf8.c
@@ -553,7 +553,7 @@ charset_cache_free (gpointer data)
  * Return value: %TRUE if the returned charset is UTF-8
  **/
 gboolean
-g_get_charset (G_CONST_RETURN char **charset) 
+g_get_charset (const char **charset) 
 {
   static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
   GCharsetCache *cache = g_static_private_get (&cache_private);
diff --git a/glib/gutils.c b/glib/gutils.c
index cb089264a..a48725788 100644
--- a/glib/gutils.c
+++ b/glib/gutils.c
@@ -720,7 +720,7 @@ g_parse_debug_string  (const gchar     *string,
  * g_path_get_basename() allocates new memory for the returned string, unlike
  * this function which returns a pointer into the argument.
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_basename (const gchar	   *file_name)
 {
   register gchar *base;
@@ -866,7 +866,7 @@ g_path_is_absolute (const gchar *file_name)
  *
  * Returns: a pointer into @file_name after the root component.
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_path_skip_root (const gchar *file_name)
 {
   g_return_val_if_fail (file_name != NULL, NULL);
@@ -1167,7 +1167,7 @@ g_get_current_dir (void)
  * overwritten by the next call to g_getenv(), g_setenv() or
  * g_unsetenv().
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_getenv (const gchar *variable)
 {
 #ifndef G_OS_WIN32
@@ -1931,7 +1931,7 @@ g_get_any_init_locked (void)
  *
  * Returns: the user name of the current user.
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_get_user_name (void)
 {
   g_get_any_init_locked ();
@@ -1949,7 +1949,7 @@ g_get_user_name (void)
  *
  * Returns: the user's real name.
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_get_real_name (void)
 {
   g_get_any_init_locked ();
@@ -1987,7 +1987,7 @@ g_get_real_name (void)
  *
  * Returns: the current user's home directory
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_get_home_dir (void)
 {
   g_get_any_init_locked ();
@@ -2006,7 +2006,7 @@ g_get_home_dir (void)
  *
  * Returns: the directory to use for temporary files.
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_get_tmp_dir (void)
 {
   g_get_any_init_locked ();
@@ -2125,7 +2125,7 @@ static gchar *g_application_name = NULL;
  *
  * Since: 2.2
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_get_application_name (void)
 {
   gchar* retval;
@@ -2194,7 +2194,7 @@ g_set_application_name (const gchar *application_name)
  *               or freed.
  * Since: 2.6
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_get_user_data_dir (void)
 {
   gchar *data_dir;  
@@ -2282,7 +2282,7 @@ g_init_user_config_dir (void)
  *               or freed.
  * Since: 2.6
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_get_user_config_dir (void)
 {
   G_LOCK (g_utils_global);
@@ -2314,7 +2314,7 @@ g_get_user_config_dir (void)
  *               or freed.
  * Since: 2.6
  **/
-G_CONST_RETURN gchar*
+const gchar *
 g_get_user_cache_dir (void)
 {
   gchar *cache_dir;  
@@ -2755,7 +2755,7 @@ g_reload_user_special_dirs_cache (void)
  *
  * Since: 2.14
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_get_user_special_dir (GUserDirectory directory)
 {
   g_return_val_if_fail (directory >= G_USER_DIRECTORY_DESKTOP &&
@@ -2840,7 +2840,7 @@ get_module_share_dir (gconstpointer address)
   return retval;
 }
 
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
 {
   GArray *data_dirs;
@@ -2865,7 +2865,7 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
 	      if (retval != NULL)
 		{
 		  G_UNLOCK (g_utils_global);
-		  return (G_CONST_RETURN gchar * G_CONST_RETURN *) retval;
+		  return (const gchar * const *) retval;
 		}
 	    }
 	}
@@ -2933,7 +2933,7 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
       G_UNLOCK (g_utils_global);
     }
 
-  return (G_CONST_RETURN gchar * G_CONST_RETURN *) retval;
+  return (const gchar * const *) retval;
 }
 
 #endif
@@ -2975,7 +2975,7 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
  *               not be modified or freed.
  * Since: 2.6
  **/
-G_CONST_RETURN gchar * G_CONST_RETURN * 
+const gchar * const * 
 g_get_system_data_dirs (void)
 {
   gchar **data_dir_vector;
@@ -3002,7 +3002,7 @@ g_get_system_data_dirs (void)
 
   G_UNLOCK (g_utils_global);
 
-  return (G_CONST_RETURN gchar * G_CONST_RETURN *) data_dir_vector;
+  return (const gchar * const *) data_dir_vector;
 }
 
 /**
@@ -3027,7 +3027,7 @@ g_get_system_data_dirs (void)
  *               not be modified or freed.
  * Since: 2.6
  **/
-G_CONST_RETURN gchar * G_CONST_RETURN *
+const gchar * const *
 g_get_system_config_dirs (void)
 {
   gchar *conf_dirs, **conf_dir_vector;
@@ -3063,7 +3063,7 @@ g_get_system_config_dirs (void)
     conf_dir_vector = g_system_config_dirs;
   G_UNLOCK (g_utils_global);
 
-  return (G_CONST_RETURN gchar * G_CONST_RETURN *) conf_dir_vector;
+  return (const gchar * const *) conf_dir_vector;
 }
 
 #ifndef G_OS_WIN32
@@ -3388,7 +3388,7 @@ language_names_cache_free (gpointer data)
  *
  * Since: 2.6
  **/
-G_CONST_RETURN gchar * G_CONST_RETURN * 
+const gchar * const * 
 g_get_language_names (void)
 {
   static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
@@ -3426,7 +3426,7 @@ g_get_language_names (void)
       cache->language_names = (gchar **) g_ptr_array_free (array, FALSE);
     }
 
-  return (G_CONST_RETURN gchar * G_CONST_RETURN *) cache->language_names;
+  return (const gchar * const *) cache->language_names;
 }
 
 /**
@@ -3697,7 +3697,7 @@ ensure_gettext_initialized(void)
  *
  * Returns: the transation of @str to the current locale
  */
-G_CONST_RETURN gchar *
+const gchar *
 glib_gettext (const gchar *str)
 {
   ensure_gettext_initialized();
@@ -3720,7 +3720,7 @@ glib_gettext (const gchar *str)
  *
  * Returns: the transation of @str to the current locale
  */
-G_CONST_RETURN gchar *
+const gchar *
 glib_pgettext(const gchar *msgctxtid,
               gsize        msgidoffset)
 {
@@ -3764,7 +3764,7 @@ g_get_current_dir (void)
 
 #undef g_getenv
 
-G_CONST_RETURN gchar*
+const gchar *
 g_getenv (const gchar *variable)
 {
   gchar *utf8_variable = g_locale_to_utf8 (variable, -1, NULL, NULL, NULL);
@@ -3813,7 +3813,7 @@ g_unsetenv (const gchar *variable)
 
 #undef g_get_user_name
 
-G_CONST_RETURN gchar*
+const gchar *
 g_get_user_name (void)
 {
   g_get_any_init_locked ();
@@ -3822,7 +3822,7 @@ g_get_user_name (void)
 
 #undef g_get_real_name
 
-G_CONST_RETURN gchar*
+const gchar *
 g_get_real_name (void)
 {
   g_get_any_init_locked ();
@@ -3831,7 +3831,7 @@ g_get_real_name (void)
 
 #undef g_get_home_dir
 
-G_CONST_RETURN gchar*
+const gchar *
 g_get_home_dir (void)
 {
   g_get_any_init_locked ();
@@ -3840,7 +3840,7 @@ g_get_home_dir (void)
 
 #undef g_get_tmp_dir
 
-G_CONST_RETURN gchar*
+const gchar *
 g_get_tmp_dir (void)
 {
   g_get_any_init_locked ();
diff --git a/glib/gutils.h b/glib/gutils.h
index edf9c3c2a..a07097104 100644
--- a/glib/gutils.h
+++ b/glib/gutils.h
@@ -117,25 +117,25 @@ G_BEGIN_DECLS
 #endif
 #endif
 
-G_CONST_RETURN gchar* g_get_user_name        (void);
-G_CONST_RETURN gchar* g_get_real_name        (void);
-G_CONST_RETURN gchar* g_get_home_dir         (void);
-G_CONST_RETURN gchar* g_get_tmp_dir          (void);
-G_CONST_RETURN gchar* g_get_host_name	     (void);
-gchar*                g_get_prgname          (void);
+const gchar *         g_get_user_name        (void);
+const gchar *         g_get_real_name        (void);
+const gchar *         g_get_home_dir         (void);
+const gchar *         g_get_tmp_dir          (void);
+const gchar *         g_get_host_name	     (void);
+gchar *               g_get_prgname          (void);
 void                  g_set_prgname          (const gchar *prgname);
-G_CONST_RETURN gchar* g_get_application_name (void);
+const gchar *         g_get_application_name (void);
 void                  g_set_application_name (const gchar *application_name);
 
-void    g_reload_user_special_dirs_cache     (void);
-G_CONST_RETURN gchar*    g_get_user_data_dir      (void);
-G_CONST_RETURN gchar*    g_get_user_config_dir    (void);
-G_CONST_RETURN gchar*    g_get_user_cache_dir     (void);
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_data_dirs   (void);
+void      g_reload_user_special_dirs_cache     (void);
+const gchar *         g_get_user_data_dir      (void);
+const gchar *         g_get_user_config_dir    (void);
+const gchar *         g_get_user_cache_dir     (void);
+const gchar * const * g_get_system_data_dirs   (void);
 
 #ifdef G_OS_WIN32
 /* This functions is not part of the public GLib API */
-G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void));
+const gchar * const * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void));
 #endif
 
 #if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
@@ -143,7 +143,7 @@ G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (
  * g_get_system_data_dirs() in your code, never mind that that is
  * actually a macro and you will in fact call this inline function.
  */
-static inline G_CONST_RETURN gchar * G_CONST_RETURN *
+static inline const gchar * const *
 _g_win32_get_system_data_dirs (void)
 {
   return g_win32_get_system_data_dirs_for_module ((void (*)(void)) &_g_win32_get_system_data_dirs);
@@ -151,11 +151,11 @@ _g_win32_get_system_data_dirs (void)
 #define g_get_system_data_dirs _g_win32_get_system_data_dirs
 #endif
 
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_config_dirs (void);
+const gchar * const * g_get_system_config_dirs (void);
 
 const gchar * g_get_user_runtime_dir (void);
 
-G_CONST_RETURN gchar* G_CONST_RETURN * g_get_language_names (void);
+const gchar * const * g_get_language_names (void);
 
 gchar **g_get_locale_variants (const gchar *locale);
 
@@ -194,7 +194,7 @@ typedef enum {
   G_USER_N_DIRECTORIES
 } GUserDirectory;
 
-G_CONST_RETURN gchar* g_get_user_special_dir (GUserDirectory directory);
+const gchar * g_get_user_special_dir (GUserDirectory directory);
 
 /**
  * GDebugKey:
@@ -230,11 +230,11 @@ gint                  g_vsnprintf          (gchar       *string,
 gboolean              g_path_is_absolute   (const gchar *file_name);
 
 /* In case of absolute paths, skip the root part */
-G_CONST_RETURN gchar* g_path_skip_root     (const gchar *file_name);
+const gchar *         g_path_skip_root     (const gchar *file_name);
 
 #ifndef G_DISABLE_DEPRECATED
 
-G_CONST_RETURN gchar* g_basename           (const gchar *file_name);
+const gchar *         g_basename           (const gchar *file_name);
 #define g_dirname g_path_get_dirname
 
 #endif /* G_DISABLE_DEPRECATED */
@@ -264,7 +264,7 @@ void                  g_nullify_pointer    (gpointer    *nullify_location);
 #endif
 #endif
 
-G_CONST_RETURN gchar* g_getenv             (const gchar *variable);
+const gchar *         g_getenv             (const gchar *variable);
 gboolean              g_setenv             (const gchar *variable,
 					    const gchar *value,
 					    gboolean     overwrite);
diff --git a/gmodule/gmodule.c b/gmodule/gmodule.c
index 2d7f410b6..3e076ec86 100644
--- a/gmodule/gmodule.c
+++ b/gmodule/gmodule.c
@@ -598,7 +598,7 @@ g_module_make_resident (GModule *module)
   module->is_resident = TRUE;
 }
 
-G_CONST_RETURN gchar*
+const gchar *
 g_module_error (void)
 {
   return g_static_private_get (&module_error_private);
@@ -648,7 +648,7 @@ g_module_symbol (GModule	*module,
   return !module_error;
 }
 
-G_CONST_RETURN gchar*
+const gchar *
 g_module_name (GModule *module)
 {
   g_return_val_if_fail (module != NULL, NULL);
@@ -663,7 +663,7 @@ g_module_name (GModule *module)
 
 #undef g_module_name
 
-G_CONST_RETURN gchar*
+const gchar *
 g_module_name (GModule *module)
 {
   g_return_val_if_fail (module != NULL, NULL);
diff --git a/gmodule/gmodule.h b/gmodule/gmodule.h
index ae7f8e54a..5f18f9db1 100644
--- a/gmodule/gmodule.h
+++ b/gmodule/gmodule.h
@@ -71,7 +71,7 @@ gboolean              g_module_close         (GModule      *module);
 void                  g_module_make_resident (GModule      *module);
 
 /* query the last module error as a string */
-G_CONST_RETURN gchar* g_module_error         (void);
+const gchar *         g_module_error         (void);
 
 /* retrieve a symbol pointer from `module', returns TRUE on success */
 gboolean              g_module_symbol        (GModule      *module,
@@ -79,7 +79,7 @@ gboolean              g_module_symbol        (GModule      *module,
 					      gpointer     *symbol);
 
 /* retrieve the file name from an existing module */
-G_CONST_RETURN gchar* g_module_name          (GModule      *module);
+const gchar *         g_module_name          (GModule      *module);
 
 /* Build the actual file name containing a module. `directory' is the
  * directory where the module file is supposed to be, or NULL or empty
diff --git a/gobject/gbinding.c b/gobject/gbinding.c
index 19aaeed1a..c7f3a0645 100644
--- a/gobject/gbinding.c
+++ b/gobject/gbinding.c
@@ -742,7 +742,7 @@ g_binding_get_target (GBinding *binding)
  *
  * Since: 2.26
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_binding_get_source_property (GBinding *binding)
 {
   g_return_val_if_fail (G_IS_BINDING (binding), NULL);
@@ -761,7 +761,7 @@ g_binding_get_source_property (GBinding *binding)
  *
  * Since: 2.26
  */
-G_CONST_RETURN gchar *
+const gchar *
 g_binding_get_target_property (GBinding *binding)
 {
   g_return_val_if_fail (G_IS_BINDING (binding), NULL);
diff --git a/gobject/gbinding.h b/gobject/gbinding.h
index fe6799d43..1b715402e 100644
--- a/gobject/gbinding.h
+++ b/gobject/gbinding.h
@@ -106,8 +106,8 @@ GType                 g_binding_get_type            (void) G_GNUC_CONST;
 GBindingFlags         g_binding_get_flags           (GBinding *binding);
 GObject *             g_binding_get_source          (GBinding *binding);
 GObject *             g_binding_get_target          (GBinding *binding);
-G_CONST_RETURN gchar *g_binding_get_source_property (GBinding *binding);
-G_CONST_RETURN gchar *g_binding_get_target_property (GBinding *binding);
+const gchar *         g_binding_get_source_property (GBinding *binding);
+const gchar *         g_binding_get_target_property (GBinding *binding);
 
 GBinding *g_object_bind_property               (gpointer               source,
                                                 const gchar           *source_property,
diff --git a/gobject/gparam.c b/gobject/gparam.c
index cdd2d9ff5..cc845814d 100644
--- a/gobject/gparam.c
+++ b/gobject/gparam.c
@@ -277,7 +277,7 @@ g_param_spec_ref_sink (GParamSpec *pspec)
  *
  * Returns: the name of @pspec.
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_param_spec_get_name (GParamSpec *pspec)
 {
   g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
@@ -293,7 +293,7 @@ g_param_spec_get_name (GParamSpec *pspec)
  *
  * Returns: the nickname of @pspec.
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_param_spec_get_nick (GParamSpec *pspec)
 {
   g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
@@ -320,7 +320,7 @@ g_param_spec_get_nick (GParamSpec *pspec)
  *
  * Returns: the short description of @pspec.
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_param_spec_get_blurb (GParamSpec *pspec)
 {
   g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
diff --git a/gobject/gparam.h b/gobject/gparam.h
index 9b93c0af4..5ee41ab91 100644
--- a/gobject/gparam.h
+++ b/gobject/gparam.h
@@ -301,9 +301,9 @@ gboolean	g_param_value_convert		(GParamSpec    *pspec,
 gint		g_param_values_cmp		(GParamSpec    *pspec,
 						 const GValue  *value1,
 						 const GValue  *value2);
-G_CONST_RETURN gchar*	g_param_spec_get_name	(GParamSpec    *pspec);
-G_CONST_RETURN gchar*	g_param_spec_get_nick	(GParamSpec    *pspec);
-G_CONST_RETURN gchar*	g_param_spec_get_blurb	(GParamSpec    *pspec);
+const gchar *   g_param_spec_get_name           (GParamSpec    *pspec);
+const gchar *   g_param_spec_get_nick           (GParamSpec    *pspec);
+const gchar *   g_param_spec_get_blurb          (GParamSpec    *pspec);
 void            g_value_set_param               (GValue	       *value,
 						 GParamSpec    *param);
 GParamSpec*     g_value_get_param               (const GValue  *value);
diff --git a/gobject/gsignal.c b/gobject/gsignal.c
index 649120b80..03dd73d61 100644
--- a/gobject/gsignal.c
+++ b/gobject/gsignal.c
@@ -1223,7 +1223,7 @@ g_signal_list_ids (GType  itype,
  *
  * Returns: the signal name, or %NULL if the signal number was invalid.
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_signal_name (guint signal_id)
 {
   SignalNode *node;
diff --git a/gobject/gsignal.h b/gobject/gsignal.h
index 24ef842cc..8f1639e88 100644
--- a/gobject/gsignal.h
+++ b/gobject/gsignal.h
@@ -308,7 +308,7 @@ void                  g_signal_emit_by_name (gpointer            instance,
 					     ...);
 guint                 g_signal_lookup       (const gchar        *name,
 					     GType               itype);
-G_CONST_RETURN gchar* g_signal_name         (guint               signal_id);
+const gchar *         g_signal_name         (guint               signal_id);
 void                  g_signal_query        (guint               signal_id,
 					     GSignalQuery       *query);
 guint*                g_signal_list_ids     (GType               itype,
diff --git a/gobject/gtype.c b/gobject/gtype.c
index 894da15b1..d5431175e 100644
--- a/gobject/gtype.c
+++ b/gobject/gtype.c
@@ -3275,7 +3275,7 @@ g_type_default_interface_unref (gpointer g_iface)
  *
  * Returns: Static type name or %NULL.
  */
-G_CONST_RETURN gchar*
+const gchar *
 g_type_name (GType type)
 {
   TypeNode *node;
@@ -4197,7 +4197,7 @@ g_type_value_table_peek (GType type)
   return NULL;
 }
 
-G_CONST_RETURN gchar*
+const gchar *
 g_type_name_from_instance (GTypeInstance *instance)
 {
   if (!instance)
@@ -4206,7 +4206,7 @@ g_type_name_from_instance (GTypeInstance *instance)
     return g_type_name_from_class (instance->g_class);
 }
 
-G_CONST_RETURN gchar*
+const gchar *
 g_type_name_from_class (GTypeClass *g_class)
 {
   if (!g_class)
diff --git a/gobject/gtype.h b/gobject/gtype.h
index 22210d654..b52bdf37a 100644
--- a/gobject/gtype.h
+++ b/gobject/gtype.h
@@ -666,7 +666,7 @@ typedef enum	/*< skip >*/
 /* --- prototypes --- */
 void                  g_type_init                    (void);
 void                  g_type_init_with_debug_flags   (GTypeDebugFlags  debug_flags);
-G_CONST_RETURN gchar* g_type_name                    (GType            type);
+const gchar *         g_type_name                    (GType            type);
 GQuark                g_type_qname                   (GType            type);
 GType                 g_type_from_name               (const gchar     *name);
 GType                 g_type_parent                  (GType            type);
@@ -1657,8 +1657,8 @@ gboolean         g_type_test_flags              (GType               type,
 
 
 /* --- debugging functions --- */
-G_CONST_RETURN gchar* g_type_name_from_instance	(GTypeInstance	*instance);
-G_CONST_RETURN gchar* g_type_name_from_class	(GTypeClass	*g_class);
+const gchar *    g_type_name_from_instance      (GTypeInstance	*instance);
+const gchar *    g_type_name_from_class         (GTypeClass	*g_class);
 
 
 /* --- implementation bits --- */
diff --git a/gobject/gvaluetypes.h b/gobject/gvaluetypes.h
index 3d3f7b639..972c8689c 100644
--- a/gobject/gvaluetypes.h
+++ b/gobject/gvaluetypes.h
@@ -214,7 +214,7 @@ void		      g_value_set_string	(GValue	      *value,
 						 const gchar  *v_string);
 void		      g_value_set_static_string (GValue	      *value,
 						 const gchar  *v_string);
-G_CONST_RETURN gchar* g_value_get_string	(const GValue *value);
+const gchar *         g_value_get_string	(const GValue *value);
 gchar*		      g_value_dup_string	(const GValue *value);
 void		      g_value_set_pointer	(GValue	      *value,
 						 gpointer      v_pointer);