diff --git a/docs/reference/gio/gio-sections.txt b/docs/reference/gio/gio-sections.txt
index 06d81999a..5fbeaeb33 100644
--- a/docs/reference/gio/gio-sections.txt
+++ b/docs/reference/gio/gio-sections.txt
@@ -2300,8 +2300,8 @@ g_dbus_message_new_method_error
 g_dbus_message_new_method_error_valist
 g_dbus_message_new_method_error_literal
 g_dbus_message_print
-g_dbus_message_get_type
-g_dbus_message_set_type
+g_dbus_message_get_message_type
+g_dbus_message_set_message_type
 g_dbus_message_get_serial
 g_dbus_message_set_serial
 g_dbus_message_get_flags
@@ -2338,7 +2338,7 @@ g_dbus_message_to_gerror
 G_DBUS_MESSAGE
 G_IS_DBUS_MESSAGE
 G_TYPE_DBUS_MESSAGE
-g_dbus_message_get_gtype
+g_dbus_message_get_type
 G_DBUS_MESSAGE_CLASS
 G_IS_DBUS_MESSAGE_CLASS
 G_DBUS_MESSAGE_GET_CLASS
diff --git a/docs/reference/gio/gio.types b/docs/reference/gio/gio.types
index e1d65a931..38ffb556f 100644
--- a/docs/reference/gio/gio.types
+++ b/docs/reference/gio/gio.types
@@ -107,7 +107,7 @@ g_volume_monitor_get_type
 g_zlib_compressor_get_type
 g_zlib_compressor_format_get_type
 g_zlib_decompressor_get_type
-g_dbus_message_get_gtype
+g_dbus_message_get_type
 g_dbus_connection_get_type
 g_bus_type_get_type
 g_bus_name_owner_flags_get_type
diff --git a/gio/gcredentials.c b/gio/gcredentials.c
index 7a572251b..6adef3919 100644
--- a/gio/gcredentials.c
+++ b/gio/gcredentials.c
@@ -34,6 +34,7 @@
 #endif
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gcredentials
@@ -458,3 +459,6 @@ g_credentials_set_windows_user (GCredentials    *credentials,
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_CREDENTIALS_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index 8379b046e..692c551ea 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -36,6 +36,7 @@
 #endif
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusaddress
@@ -1015,3 +1016,6 @@ g_dbus_address_get_for_bus_sync (GBusType       bus_type,
  out:
   return ret;
 }
+
+#define __G_DBUS_ADDRESS_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
index 2cfb74ee2..e983f8df5 100644
--- a/gio/gdbusauth.c
+++ b/gio/gdbusauth.c
@@ -43,6 +43,7 @@
 #endif
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 #define DEBUG_ENABLED 1
 
@@ -1347,3 +1348,6 @@ _g_dbus_auth_run_server (GDBusAuth              *auth,
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_DBUS_AUTH_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusauthmechanism.c b/gio/gdbusauthmechanism.c
index a62b26775..23d315959 100644
--- a/gio/gdbusauthmechanism.c
+++ b/gio/gdbusauthmechanism.c
@@ -29,6 +29,7 @@
 #include "giostream.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
@@ -340,3 +341,6 @@ _g_dbus_auth_mechanism_client_shutdown (GDBusAuthMechanism   *mechanism)
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_DBUS_AUTH_MECHANISM_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusauthmechanismanon.c b/gio/gdbusauthmechanismanon.c
index c5a0f3c7f..fd6597d63 100644
--- a/gio/gdbusauthmechanismanon.c
+++ b/gio/gdbusauthmechanismanon.c
@@ -27,6 +27,7 @@
 #include "gioenumtypes.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 struct _GDBusAuthMechanismAnonPrivate
 {
@@ -325,3 +326,6 @@ mechanism_client_shutdown (GDBusAuthMechanism   *mechanism)
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_DBUS_AUTH_MECHANISM_ANON_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusauthmechanismexternal.c b/gio/gdbusauthmechanismexternal.c
index 3307e85ed..0bc94c138 100644
--- a/gio/gdbusauthmechanismexternal.c
+++ b/gio/gdbusauthmechanismexternal.c
@@ -35,6 +35,7 @@
 #endif
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 struct _GDBusAuthMechanismExternalPrivate
 {
@@ -416,3 +417,6 @@ mechanism_client_shutdown (GDBusAuthMechanism   *mechanism)
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_DBUS_AUTH_MECHANISM_EXTERNAL_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c
index bc9ed2596..e36c9f782 100644
--- a/gio/gdbusauthmechanismsha1.c
+++ b/gio/gdbusauthmechanismsha1.c
@@ -41,6 +41,7 @@
 #include <glib/gstdio.h>
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 struct _GDBusAuthMechanismSha1Private
 {
@@ -1216,3 +1217,6 @@ mechanism_client_shutdown (GDBusAuthMechanism   *mechanism)
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_DBUS_AUTH_MECHANISM_SHA1_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusauthobserver.c b/gio/gdbusauthobserver.c
index 54d335ffd..f32605844 100644
--- a/gio/gdbusauthobserver.c
+++ b/gio/gdbusauthobserver.c
@@ -29,6 +29,7 @@
 #include "giostream.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusauthobserver
@@ -222,3 +223,6 @@ g_dbus_auth_observer_deny_authenticated_peer (GDBusAuthObserver  *observer,
 }
 
 
+
+#define __G_DBUS_AUTH_OBSERVER_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 835291e66..24dbeac90 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -77,6 +77,7 @@
 #endif
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusconnection
@@ -1568,7 +1569,7 @@ on_worker_message_received (GDBusWorker  *worker,
     {
       GDBusMessageType message_type;
 
-      message_type = g_dbus_message_get_type (message);
+      message_type = g_dbus_message_get_message_type (message);
       if (message_type == G_DBUS_MESSAGE_TYPE_METHOD_RETURN || message_type == G_DBUS_MESSAGE_TYPE_ERROR)
         {
           guint32 reply_serial;
@@ -4152,7 +4153,7 @@ decode_method_reply (GDBusMessage *reply, GError **error)
   GVariant *result;
 
   result = NULL;
-  switch (g_dbus_message_get_type (reply))
+  switch (g_dbus_message_get_message_type (reply))
     {
     case G_DBUS_MESSAGE_TYPE_METHOD_RETURN:
       result = g_dbus_message_get_body (reply);
@@ -5024,7 +5025,7 @@ distribute_method_call (GDBusConnection  *connection,
   gchar *subtree_path;
   gchar *needle;
 
-  g_assert (g_dbus_message_get_type (message) == G_DBUS_MESSAGE_TYPE_METHOD_CALL);
+  g_assert (g_dbus_message_get_message_type (message) == G_DBUS_MESSAGE_TYPE_METHOD_CALL);
 
   interface_name = g_dbus_message_get_interface (message);
   member = g_dbus_message_get_member (message);
@@ -5365,3 +5366,6 @@ g_bus_get_finish (GAsyncResult  *res,
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_DBUS_CONNECTION_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c
index 0bfd9067c..675fbcb00 100644
--- a/gio/gdbuserror.c
+++ b/gio/gdbuserror.c
@@ -32,6 +32,7 @@
 #include "gdbusprivate.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbuserror
@@ -866,3 +867,6 @@ g_dbus_error_encode_gerror (const GError *error)
 
   return error_name;
 }
+
+#define __G_DBUS_ERROR_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
index b128d9f87..1f13f861b 100644
--- a/gio/gdbusintrospection.c
+++ b/gio/gdbusintrospection.c
@@ -28,6 +28,7 @@
 #include "gdbusintrospection.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusintrospection
@@ -60,6 +61,7 @@
 _MY_DEFINE_BOXED_TYPE (GDBusNodeInfo,       g_dbus_node_info);
 _MY_DEFINE_BOXED_TYPE (GDBusInterfaceInfo,  g_dbus_interface_info);
 _MY_DEFINE_BOXED_TYPE (GDBusMethodInfo,     g_dbus_method_info);
+_MY_DEFINE_BOXED_TYPE (GDBusSignalInfo,     g_dbus_signal_info);
 _MY_DEFINE_BOXED_TYPE (GDBusPropertyInfo,   g_dbus_property_info);
 _MY_DEFINE_BOXED_TYPE (GDBusArgInfo,        g_dbus_arg_info);
 _MY_DEFINE_BOXED_TYPE (GDBusAnnotationInfo, g_dbus_annotation_info);
@@ -2052,3 +2054,6 @@ g_dbus_node_info_lookup_interface (const GDBusNodeInfo *node_info,
  out:
   return result;
 }
+
+#define __G_DBUS_INTROSPECTION_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index 839ef55a5..557e2b674 100644
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -45,6 +45,7 @@
 #endif
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusmessage
@@ -68,9 +69,7 @@ struct _GDBusMessagePrivate
 #endif
 };
 
-#define g_dbus_message_get_type g_dbus_message_get_gtype
 G_DEFINE_TYPE (GDBusMessage, g_dbus_message, G_TYPE_OBJECT);
-#undef g_dbus_message_get_type
 
 static void
 g_dbus_message_finalize (GObject *object)
@@ -222,7 +221,7 @@ g_dbus_message_new_method_reply (GDBusMessage *method_call_message)
   const gchar *sender;
 
   g_return_val_if_fail (G_IS_DBUS_MESSAGE (method_call_message), NULL);
-  g_return_val_if_fail (g_dbus_message_get_type (method_call_message) == G_DBUS_MESSAGE_TYPE_METHOD_CALL, NULL);
+  g_return_val_if_fail (g_dbus_message_get_message_type (method_call_message) == G_DBUS_MESSAGE_TYPE_METHOD_CALL, NULL);
   g_return_val_if_fail (g_dbus_message_get_serial (method_call_message) != 0, NULL);
 
   message = g_dbus_message_new ();
@@ -292,7 +291,7 @@ g_dbus_message_new_method_error_literal (GDBusMessage  *method_call_message,
   const gchar *sender;
 
   g_return_val_if_fail (G_IS_DBUS_MESSAGE (method_call_message), NULL);
-  g_return_val_if_fail (g_dbus_message_get_type (method_call_message) == G_DBUS_MESSAGE_TYPE_METHOD_CALL, NULL);
+  g_return_val_if_fail (g_dbus_message_get_message_type (method_call_message) == G_DBUS_MESSAGE_TYPE_METHOD_CALL, NULL);
   g_return_val_if_fail (g_dbus_message_get_serial (method_call_message) != 0, NULL);
   g_return_val_if_fail (g_dbus_is_name (error_name), NULL);
   g_return_val_if_fail (error_message != NULL, NULL);
@@ -347,7 +346,7 @@ g_dbus_message_new_method_error_valist (GDBusMessage             *method_call_me
 /* TODO: need GI annotations to specify that any guchar value goes for the type */
 
 /**
- * g_dbus_message_get_type:
+ * g_dbus_message_get_message_type:
  * @message: A #GDBusMessage.
  *
  * Gets the type of @message.
@@ -357,14 +356,14 @@ g_dbus_message_new_method_error_valist (GDBusMessage             *method_call_me
  * Since: 2.26
  */
 GDBusMessageType
-g_dbus_message_get_type (GDBusMessage  *message)
+g_dbus_message_get_message_type (GDBusMessage  *message)
 {
   g_return_val_if_fail (G_IS_DBUS_MESSAGE (message), G_DBUS_MESSAGE_TYPE_INVALID);
   return message->priv->type;
 }
 
 /**
- * g_dbus_message_set_type:
+ * g_dbus_message_set_message_type:
  * @message: A #GDBusMessage.
  * @type: A 8-bit unsigned integer (typically a value from the #GDBusMessageType enumeration).
  *
@@ -373,8 +372,8 @@ g_dbus_message_get_type (GDBusMessage  *message)
  * Since: 2.26
  */
 void
-g_dbus_message_set_type (GDBusMessage      *message,
-                         GDBusMessageType   type)
+g_dbus_message_set_message_type (GDBusMessage      *message,
+                                 GDBusMessageType   type)
 {
   g_return_if_fail (G_IS_DBUS_MESSAGE (message));
   g_return_if_fail (type >=0 && type < 256);
@@ -2508,3 +2507,6 @@ g_dbus_message_print (GDBusMessage *message,
   return g_string_free (str, FALSE);
 }
 
+
+#define __G_DBUS_MESSAGE_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusmessage.h b/gio/gdbusmessage.h
index 747345d80..16b2a6c94 100644
--- a/gio/gdbusmessage.h
+++ b/gio/gdbusmessage.h
@@ -31,7 +31,7 @@
 
 G_BEGIN_DECLS
 
-#define G_TYPE_DBUS_MESSAGE         (g_dbus_message_get_gtype ())
+#define G_TYPE_DBUS_MESSAGE         (g_dbus_message_get_type ())
 #define G_DBUS_MESSAGE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), G_TYPE_DBUS_MESSAGE, GDBusMessage))
 #define G_DBUS_MESSAGE_CLASS(k)     (G_TYPE_CHECK_CLASS_CAST((k), G_TYPE_DBUS_MESSAGE, GDBusMessageClass))
 #define G_DBUS_MESSAGE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), G_TYPE_DBUS_MESSAGE, GDBusMessageClass))
@@ -69,7 +69,7 @@ struct _GDBusMessage
   GDBusMessagePrivate *priv;
 };
 
-GType                     g_dbus_message_get_gtype          (void) G_GNUC_CONST;
+GType                     g_dbus_message_get_type           (void) G_GNUC_CONST;
 GDBusMessage             *g_dbus_message_new                (void);
 GDBusMessage             *g_dbus_message_new_signal         (const gchar              *path,
                                                              const gchar              *interface,
@@ -93,8 +93,8 @@ GDBusMessage             *g_dbus_message_new_method_error_literal (GDBusMessage
 gchar                    *g_dbus_message_print              (GDBusMessage             *message,
                                                              guint                     indent);
 
-GDBusMessageType          g_dbus_message_get_type           (GDBusMessage             *message);
-void                      g_dbus_message_set_type           (GDBusMessage             *message,
+GDBusMessageType          g_dbus_message_get_message_type   (GDBusMessage             *message);
+void                      g_dbus_message_set_message_type   (GDBusMessage             *message,
                                                              GDBusMessageType          type);
 GDBusMessageFlags         g_dbus_message_get_flags          (GDBusMessage             *message);
 void                      g_dbus_message_set_flags          (GDBusMessage             *message,
diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c
index b2f99ef1b..4ff9b1807 100644
--- a/gio/gdbusmethodinvocation.c
+++ b/gio/gdbusmethodinvocation.c
@@ -33,6 +33,7 @@
 #include "gdbusprivate.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusmethodinvocation
@@ -844,3 +845,6 @@ g_dbus_method_invocation_return_dbus_error (GDBusMethodInvocation *invocation,
 
   g_object_unref (invocation);
 }
+
+#define __G_DBUS_METHOD_INVOCATION_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c
index e9474298a..3199d79db 100644
--- a/gio/gdbusnameowning.c
+++ b/gio/gdbusnameowning.c
@@ -31,6 +31,7 @@
 #include "gdbusconnection.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusnameowning
@@ -717,3 +718,6 @@ g_bus_unown_name (guint owner_id)
       client_unref (client);
     }
 }
+
+#define __G_DBUS_NAME_OWNING_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index a68255bfb..875e7295e 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@@ -32,6 +32,7 @@
 #include "gdbusconnection.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusnamewatching
@@ -623,3 +624,6 @@ g_bus_unwatch_name (guint watcher_id)
       client_unref (client);
     }
 }
+
+#define __G_DBUS_NAME_WATCHING_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index 64ea7d95e..20c6129f9 100644
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -51,6 +51,7 @@
 #endif
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
@@ -1050,3 +1051,6 @@ _g_dbus_compute_complete_signature (GDBusArgInfo **args,
 
   return g_string_free (s, FALSE);
 }
+
+#define __G_DBUS_PRIVATE_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index ded62c96c..fcb817300 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -41,6 +41,7 @@
 #include "gsimpleasyncresult.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusproxy
@@ -1595,3 +1596,6 @@ g_dbus_proxy_invoke_method_sync (GDBusProxy     *proxy,
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_DBUS_PROXY_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusproxywatching.c b/gio/gdbusproxywatching.c
index a3baa2244..28384042b 100644
--- a/gio/gdbusproxywatching.c
+++ b/gio/gdbusproxywatching.c
@@ -34,6 +34,7 @@
 #include "gcancellable.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusproxywatching
@@ -399,3 +400,6 @@ g_bus_unwatch_proxy (guint watcher_id)
       client_unref (client);
     }
 }
+
+#define __G_DBUS_PROXY_WATCHING_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index fda660af2..9d276596a 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -44,6 +44,7 @@
 #endif
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusserver
@@ -1073,3 +1074,6 @@ initable_iface_init (GInitableIface *initable_iface)
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_DBUS_SERVER_C__
+#include "gioaliasdef.c"
diff --git a/gio/gdbusutils.c b/gio/gdbusutils.c
index 265ec2ab5..d75081420 100644
--- a/gio/gdbusutils.c
+++ b/gio/gdbusutils.c
@@ -28,6 +28,7 @@
 #include "gdbusutils.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 /**
  * SECTION:gdbusutils
@@ -375,3 +376,6 @@ g_dbus_is_activated (void)
 }
 
 /* ---------------------------------------------------------------------------------------------------- */
+
+#define __G_DBUS_UTILS_C__
+#include "gioaliasdef.c"
diff --git a/gio/gio.symbols b/gio/gio.symbols
index 8c278fa77..daf71a0eb 100644
--- a/gio/gio.symbols
+++ b/gio/gio.symbols
@@ -987,6 +987,20 @@ g_unix_socket_address_type_get_type G_GNUC_CONST
 g_resolver_error_get_type G_GNUC_CONST
 g_zlib_compressor_format_get_type
 g_settings_bind_flags_get_type
+g_dbus_error_get_type G_GNUC_CONST
+g_bus_type_get_type G_GNUC_CONST
+g_bus_name_owner_flags_get_type G_GNUC_CONST
+g_bus_name_watcher_flags_get_type G_GNUC_CONST
+g_dbus_proxy_flags_get_type G_GNUC_CONST
+g_dbus_connection_flags_get_type G_GNUC_CONST
+g_dbus_capability_flags_get_type G_GNUC_CONST
+g_dbus_invoke_method_flags_get_type G_GNUC_CONST
+g_dbus_message_type_get_type G_GNUC_CONST
+g_dbus_message_flags_get_type G_GNUC_CONST
+g_dbus_message_header_field_get_type G_GNUC_CONST
+g_dbus_property_info_flags_get_type G_GNUC_CONST
+g_dbus_subtree_flags_get_type G_GNUC_CONST
+g_dbus_server_flags_get_type G_GNUC_CONST
 #endif
 #endif
 
@@ -1326,6 +1340,8 @@ g_tcp_connection_get_graceful_disconnect
 g_unix_connection_get_type G_GNUC_CONST
 g_unix_connection_receive_fd
 g_unix_connection_send_fd
+g_unix_connection_receive_credentials
+g_unix_connection_send_credentials
 #endif
 #endif
 #endif
@@ -1430,3 +1446,286 @@ g_settings_get_boolean
 g_settings_set_boolean
 #endif
 #endif
+
+#if IN_HEADER(__G_CREDENTIALS_H__)
+#if IN_FILE(__G_CREDENTIALS_C__)
+g_credentials_get_type G_GNUC_CONST
+g_credentials_new
+g_credentials_new_for_process
+g_credentials_new_for_string
+g_credentials_to_string
+g_credentials_get_unix_group
+g_credentials_get_unix_process
+g_credentials_get_unix_user
+g_credentials_get_windows_user
+g_credentials_has_unix_group
+g_credentials_has_unix_process
+g_credentials_has_unix_user
+g_credentials_has_windows_user
+g_credentials_set_unix_group
+g_credentials_set_unix_process
+g_credentials_set_unix_user
+g_credentials_set_windows_user
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_ADDRESS_H__)
+#if IN_FILE(__G_DBUS_ADDRESS_C__)
+g_dbus_is_address
+g_dbus_is_supported_address
+g_dbus_address_get_for_bus_sync
+g_dbus_address_get_stream
+g_dbus_address_get_stream_finish
+g_dbus_address_get_stream_sync
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_AUTH_OBSERVER_H__)
+#if IN_FILE(__G_DBUS_AUTH_OBSERVER_C__)
+g_dbus_auth_observer_get_type G_GNUC_CONST
+g_dbus_auth_observer_new
+g_dbus_auth_observer_deny_authenticated_peer
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_CONNECTION_H__)
+#if IN_FILE(__G_DBUS_CONNECTION_C__)
+g_dbus_connection_get_type G_GNUC_CONST
+g_bus_get
+g_bus_get_finish
+g_bus_get_sync
+g_dbus_connection_new
+g_dbus_connection_new_finish
+g_dbus_connection_new_for_address
+g_dbus_connection_new_for_address_finish
+g_dbus_connection_new_for_address_sync
+g_dbus_connection_new_sync
+g_dbus_connection_get_capabilities
+g_dbus_connection_get_exit_on_close
+g_dbus_connection_get_guid
+g_dbus_connection_get_peer_credentials
+g_dbus_connection_get_stream
+g_dbus_connection_get_unique_name
+g_dbus_connection_is_closed
+g_dbus_connection_set_exit_on_close
+g_dbus_connection_close
+g_dbus_connection_emit_signal
+g_dbus_connection_invoke_method
+g_dbus_connection_invoke_method_finish
+g_dbus_connection_invoke_method_sync
+g_dbus_connection_signal_subscribe
+g_dbus_connection_signal_unsubscribe
+g_dbus_connection_add_filter
+g_dbus_connection_remove_filter
+g_dbus_connection_send_message
+g_dbus_connection_send_message_with_reply
+g_dbus_connection_send_message_with_reply_finish
+g_dbus_connection_send_message_with_reply_sync
+g_dbus_connection_register_object
+g_dbus_connection_unregister_object
+g_dbus_connection_register_subtree
+g_dbus_connection_unregister_subtree
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_ERROR_H__)
+#if IN_FILE(__G_DBUS_ERROR_C__)
+g_dbus_error_quark
+g_dbus_error_new_for_dbus_error
+g_dbus_error_is_remote_error
+g_dbus_error_get_remote_error
+g_dbus_error_strip_remote_error
+g_dbus_error_encode_gerror
+g_dbus_error_register_error
+g_dbus_error_register_error_domain
+g_dbus_error_set_dbus_error
+g_dbus_error_set_dbus_error_valist
+g_dbus_error_unregister_error
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_INTROSPECTION_H__)
+#if IN_FILE(__G_DBUS_INTROSPECTION_C__)
+g_dbus_annotation_info_get_type G_GNUC_CONST
+g_dbus_arg_info_get_type G_GNUC_CONST
+g_dbus_property_info_get_type G_GNUC_CONST
+g_dbus_interface_info_get_type G_GNUC_CONST
+g_dbus_method_info_get_type G_GNUC_CONST
+g_dbus_signal_info_get_type G_GNUC_CONST
+g_dbus_node_info_get_type G_GNUC_CONST
+g_dbus_annotation_info_lookup
+g_dbus_annotation_info_ref
+g_dbus_annotation_info_unref
+g_dbus_interface_info_generate_xml
+g_dbus_interface_info_lookup_method
+g_dbus_interface_info_lookup_property
+g_dbus_interface_info_lookup_signal
+g_dbus_node_info_new_for_xml
+g_dbus_node_info_generate_xml
+g_dbus_node_info_lookup_interface
+g_dbus_arg_info_ref
+g_dbus_arg_info_unref
+g_dbus_property_info_ref
+g_dbus_property_info_unref
+g_dbus_signal_info_ref
+g_dbus_signal_info_unref
+g_dbus_method_info_ref
+g_dbus_method_info_unref
+g_dbus_interface_info_ref
+g_dbus_interface_info_unref
+g_dbus_node_info_ref
+g_dbus_node_info_unref
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_MESSAGE_H__)
+#if IN_FILE(__G_DBUS_MESSAGE_C__)
+g_dbus_message_get_type G_GNUC_CONST
+g_dbus_message_new
+g_dbus_message_new_from_blob
+g_dbus_message_new_method_call
+g_dbus_message_new_method_error
+g_dbus_message_new_method_error_literal
+g_dbus_message_new_method_error_valist
+g_dbus_message_new_method_reply
+g_dbus_message_new_signal
+g_dbus_message_bytes_needed
+g_dbus_message_get_arg0
+g_dbus_message_get_body
+g_dbus_message_get_destination
+g_dbus_message_get_error_name
+g_dbus_message_get_flags
+g_dbus_message_get_header
+g_dbus_message_get_header_fields
+g_dbus_message_get_interface
+g_dbus_message_get_member
+g_dbus_message_get_num_unix_fds
+g_dbus_message_get_path
+g_dbus_message_get_reply_serial
+g_dbus_message_get_sender
+g_dbus_message_get_serial
+g_dbus_message_get_signature
+g_dbus_message_get_message_type
+g_dbus_message_get_unix_fd_list
+g_dbus_message_print
+g_dbus_message_set_body
+g_dbus_message_set_destination
+g_dbus_message_set_error_name
+g_dbus_message_set_flags
+g_dbus_message_set_header
+g_dbus_message_set_interface
+g_dbus_message_set_member
+g_dbus_message_set_num_unix_fds
+g_dbus_message_set_path
+g_dbus_message_set_reply_serial
+g_dbus_message_set_sender
+g_dbus_message_set_serial
+g_dbus_message_set_signature
+g_dbus_message_set_message_type
+g_dbus_message_set_unix_fd_list
+g_dbus_message_to_blob
+g_dbus_message_to_gerror
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_METHOD_INVOCATION_H__)
+#if IN_FILE(__G_DBUS_METHOD_INVOCATION_C__)
+g_dbus_method_invocation_get_type G_GNUC_CONST
+g_dbus_method_invocation_new
+g_dbus_method_invocation_get_connection
+g_dbus_method_invocation_get_interface_name
+g_dbus_method_invocation_get_message
+g_dbus_method_invocation_get_method_info
+g_dbus_method_invocation_get_method_name
+g_dbus_method_invocation_get_object_path
+g_dbus_method_invocation_get_parameters
+g_dbus_method_invocation_get_sender
+g_dbus_method_invocation_get_user_data
+g_dbus_method_invocation_return_dbus_error
+g_dbus_method_invocation_return_error
+g_dbus_method_invocation_return_error_literal
+g_dbus_method_invocation_return_error_valist
+g_dbus_method_invocation_return_gerror
+g_dbus_method_invocation_return_value
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_NAME_OWNING_H__)
+#if IN_FILE(__G_DBUS_NAME_OWNING_C__)
+g_bus_own_name
+g_bus_own_name_on_connection
+g_bus_unown_name
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_NAME_WATCHING_H__)
+#if IN_FILE(__G_DBUS_NAME_WATCHING_C__)
+g_bus_watch_name
+g_bus_unwatch_name
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_PROXY_H__)
+#if IN_FILE(__G_DBUS_PROXY_C__)
+g_dbus_proxy_get_type G_GNUC_CONST
+g_dbus_proxy_new
+g_dbus_proxy_new_finish
+g_dbus_proxy_new_sync
+g_dbus_proxy_get_cached_property
+g_dbus_proxy_get_cached_property_names
+g_dbus_proxy_get_connection
+g_dbus_proxy_get_default_timeout
+g_dbus_proxy_get_flags
+g_dbus_proxy_get_interface_info
+g_dbus_proxy_get_interface_name
+g_dbus_proxy_get_object_path
+g_dbus_proxy_get_unique_bus_name
+g_dbus_proxy_set_default_timeout
+g_dbus_proxy_set_interface_info
+g_dbus_proxy_invoke_method
+g_dbus_proxy_invoke_method_finish
+g_dbus_proxy_invoke_method_sync
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_PROXY_WATCHING_H__)
+#if IN_FILE(__G_DBUS_PROXY_WATCHING_C__)
+g_bus_watch_proxy
+g_bus_unwatch_proxy
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_SERVER_H__)
+#if IN_FILE(__G_DBUS_SERVER_C__)
+g_dbus_server_get_type G_GNUC_CONST
+g_dbus_server_new_sync
+g_dbus_server_is_active
+g_dbus_server_start
+g_dbus_server_stop
+g_dbus_server_get_client_address
+g_dbus_server_get_flags
+g_dbus_server_get_guid
+#endif
+#endif
+
+#if IN_HEADER(__G_DBUS_UTILS_H__)
+#if IN_FILE(__G_DBUS_UTILS_C__)
+g_dbus_generate_guid
+g_dbus_is_activated
+g_dbus_is_guid
+g_dbus_is_interface_name
+g_dbus_is_member_name
+g_dbus_is_name
+g_dbus_is_unique_name
+#endif
+#endif
+
+#if IN_HEADER(__G_UNIX_CREDENTIALS_MESSAGE_H__)
+#if IN_FILE(__G_UNIX_CREDENTIALS_MESSAGE_C__)
+g_unix_credentials_message_get_type G_GNUC_CONST
+g_unix_credentials_message_new
+g_unix_credentials_message_new_with_credentials
+g_unix_credentials_message_get_credentials
+g_unix_credentials_message_is_supported
+#endif
+#endif
diff --git a/gio/gunixcredentialsmessage.c b/gio/gunixcredentialsmessage.c
index 2be5c5d8d..87c3da57e 100644
--- a/gio/gunixcredentialsmessage.c
+++ b/gio/gunixcredentialsmessage.c
@@ -57,6 +57,7 @@
 #include "gcredentials.h"
 
 #include "glibintl.h"
+#include "gioalias.h"
 
 struct _GUnixCredentialsMessagePrivate
 {
@@ -343,3 +344,6 @@ g_unix_credentials_message_get_credentials (GUnixCredentialsMessage *message)
   return message->priv->credentials;
 }
 
+
+#define __G_UNIX_CREDENTIALS_MESSAGE_C__
+#include "gioaliasdef.c"
diff --git a/gio/tests/gdbus-example-unix-fd-client.c b/gio/tests/gdbus-example-unix-fd-client.c
index 6a66431c3..b89da8cb3 100644
--- a/gio/tests/gdbus-example-unix-fd-client.c
+++ b/gio/tests/gdbus-example-unix-fd-client.c
@@ -49,7 +49,7 @@ get_server_stdout (GDBusConnection  *connection,
   if (method_reply_message == NULL)
       goto out;
 
-  if (g_dbus_message_get_type (method_reply_message) == G_DBUS_MESSAGE_TYPE_ERROR)
+  if (g_dbus_message_get_message_type (method_reply_message) == G_DBUS_MESSAGE_TYPE_ERROR)
     {
       g_dbus_message_to_gerror (method_reply_message, error);
       goto out;
diff --git a/gio/tests/gdbus-peer.c b/gio/tests/gdbus-peer.c
index ae6d68dd4..50b9a492b 100644
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
@@ -593,7 +593,7 @@ test_peer (void)
                                                                            NULL, /* cancellable */
                                                                            &error);
     g_assert_no_error (error);
-    g_assert (g_dbus_message_get_type (method_reply_message) == G_DBUS_MESSAGE_TYPE_METHOD_RETURN);
+    g_assert (g_dbus_message_get_message_type (method_reply_message) == G_DBUS_MESSAGE_TYPE_METHOD_RETURN);
     fd_list = g_dbus_message_get_unix_fd_list (method_reply_message);
     g_assert (fd_list != NULL);
     g_assert_cmpint (g_unix_fd_list_get_length (fd_list), ==, 1);
diff --git a/gio/tests/gdbus-serialization.c b/gio/tests/gdbus-serialization.c
index 91b79f81b..782ddacdb 100644
--- a/gio/tests/gdbus-serialization.c
+++ b/gio/tests/gdbus-serialization.c
@@ -509,7 +509,7 @@ check_serialization (GVariant *value,
 
   message = g_dbus_message_new ();
   g_dbus_message_set_body (message, value);
-  g_dbus_message_set_type (message, G_DBUS_MESSAGE_TYPE_METHOD_CALL);
+  g_dbus_message_set_message_type (message, G_DBUS_MESSAGE_TYPE_METHOD_CALL);
   g_dbus_message_set_serial (message, 0x41);
   s = get_body_signature (value);
   g_dbus_message_set_header (message, G_DBUS_MESSAGE_HEADER_FIELD_PATH, g_variant_new_object_path ("/foo/bar"));