diff --git a/gio/gdelayedsettingsbackend.h b/gio/gdelayedsettingsbackend.h
index 50d126dc3..336cb7747 100644
--- a/gio/gdelayedsettingsbackend.h
+++ b/gio/gdelayedsettingsbackend.h
@@ -46,12 +46,18 @@ struct _GDelayedSettingsBackend
   GDelayedSettingsBackendPrivate *priv;
 };
 
+G_GNUC_INTERNAL
 GType                           g_delayed_settings_backend_get_type     (void);
+G_GNUC_INTERNAL
 GDelayedSettingsBackend *       g_delayed_settings_backend_new          (GSettingsBackend        *backend,
                                                                          gpointer                 owner);
+G_GNUC_INTERNAL
 void                            g_delayed_settings_backend_disown       (GDelayedSettingsBackend *backend);
+G_GNUC_INTERNAL
 void                            g_delayed_settings_backend_revert       (GDelayedSettingsBackend *delayed);
+G_GNUC_INTERNAL
 void                            g_delayed_settings_backend_apply        (GDelayedSettingsBackend *delayed);
+G_GNUC_INTERNAL
 gboolean                        g_delayed_settings_backend_get_has_unapplied (GDelayedSettingsBackend *delayed);
 
 #endif  /* __G_DELAYED_SETTINGS_BACKEND_H__ */
diff --git a/gio/gio.symbols b/gio/gio.symbols
index 62a99d7ac..dbf50fc1f 100644
--- a/gio/gio.symbols
+++ b/gio/gio.symbols
@@ -957,6 +957,7 @@ g_socket_protocol_get_type G_GNUC_CONST
 g_socket_msg_flags_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
 #endif
 #endif
 
@@ -1340,3 +1341,40 @@ g_file_descriptor_based_get_type G_GNUC_CONST
 g_file_descriptor_based_get_fd
 #endif
 #endif
+
+#if IN_HEADER(__G_SETTINGS_BACKEND_H__)
+#if IN_FILE(__G_SETTINGS_BACKEND_C__)
+g_settings_backend_get_type
+
+g_settings_backend_changed
+g_settings_backend_keys_changed
+g_settings_backend_path_changed
+g_settings_backend_path_writable_changed
+g_settings_backend_writable_changed
+
+g_settings_backend_changed_tree
+#endif
+#endif
+
+#if IN_HEADER(__G_SETTINGS_H__)
+#if IN_FILE(__G_SETTINGS_C__)
+g_settings_apply
+g_settings_bind
+g_settings_bind_with_mapping
+g_settings_delay
+g_settings_get
+g_settings_get_child
+g_settings_get_has_unapplied
+g_settings_get_type
+g_settings_get_value
+g_settings_is_writable
+g_settings_new
+g_settings_new_with_context
+g_settings_new_with_context_and_path
+g_settings_new_with_path
+g_settings_revert
+g_settings_set
+g_settings_set_value
+g_settings_unbind
+#endif
+#endif
diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c
index d7e9069d5..dddb56663 100644
--- a/gio/gkeyfilesettingsbackend.c
+++ b/gio/gkeyfilesettingsbackend.c
@@ -23,6 +23,8 @@
 
 #include "config.h"
 
+#include "gkeyfilesettingsbackend.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
@@ -33,7 +35,7 @@
 #include "gfileinfo.h"
 #include "gfilemonitor.h"
 
-#include "gkeyfilesettingsbackend.h"
+#include "gioalias.h"
 
 G_DEFINE_TYPE_WITH_CODE (GKeyfileSettingsBackend,
                          g_keyfile_settings_backend,
diff --git a/gio/gkeyfilesettingsbackend.h b/gio/gkeyfilesettingsbackend.h
index f18350447..cec4178b8 100644
--- a/gio/gkeyfilesettingsbackend.h
+++ b/gio/gkeyfilesettingsbackend.h
@@ -66,6 +66,7 @@ struct _GKeyfileSettingsBackend
   GKeyfileSettingsBackendPrivate *priv;
 };
 
+G_GNUC_INTERNAL
 GType g_keyfile_settings_backend_get_type (void);
 
 G_END_DECLS
diff --git a/gio/gnullsettingsbackend.c b/gio/gnullsettingsbackend.c
index e09ed9f88..28ffe8203 100644
--- a/gio/gnullsettingsbackend.c
+++ b/gio/gnullsettingsbackend.c
@@ -23,6 +23,8 @@
 
 #include "gnullsettingsbackend.h"
 
+#include "gioalias.h"
+
 #define G_TYPE_NULL_SETTINGS_BACKEND    (g_null_settings_backend_get_type ())
 #define G_NULL_SETTINGS_BACKEND(inst)   (G_TYPE_CHECK_INSTANCE_CAST ((inst), \
                                          G_TYPE_NULL_SETTINGS_BACKEND,       \
@@ -32,6 +34,7 @@
 typedef GSettingsBackendClass GNullSettingsBackendClass;
 typedef GSettingsBackend      GNullSettingsBackend;
 
+static GType g_null_settings_backend_get_type (void);
 G_DEFINE_TYPE (GNullSettingsBackend,
                g_null_settings_backend,
                G_TYPE_SETTINGS_BACKEND)
diff --git a/gio/gsettings.c b/gio/gsettings.c
index f3648d361..62e9a4071 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -1326,3 +1326,6 @@ g_settings_unbind (gpointer     object,
   binding_quark = g_settings_binding_quark (property);
   g_object_set_qdata (object, binding_quark, NULL);
 }
+
+#define __G_SETTINGS_C__
+#include "gioaliasdef.c"
diff --git a/gio/gsettingsschema.h b/gio/gsettingsschema.h
index f99637033..f57b01582 100644
--- a/gio/gsettingsschema.h
+++ b/gio/gsettingsschema.h
@@ -52,15 +52,22 @@ struct _GSettingsSchema
   GSettingsSchemaPrivate *priv;
 };
 
+G_GNUC_INTERNAL
 GType                   g_settings_schema_get_type                      (void);
+G_GNUC_INTERNAL
 GSettingsSchema *       g_settings_schema_new                           (const gchar      *name);
+G_GNUC_INTERNAL
 const gchar *           g_settings_schema_get_path                      (GSettingsSchema  *schema);
+G_GNUC_INTERNAL
 const gchar *           g_settings_schema_get_gettext_domain            (GSettingsSchema  *schema);
+G_GNUC_INTERNAL
 GVariant *              g_settings_schema_get_value                     (GSettingsSchema  *schema,
                                                                          const gchar      *key,
                                                                          GVariant        **options);
+G_GNUC_INTERNAL
 gboolean                g_settings_schema_has_key                       (GSettingsSchema  *schema,
                                                                          const gchar      *key);
+G_GNUC_INTERNAL
 const GQuark *          g_settings_schema_list                          (GSettingsSchema  *schema,
                                                                          gint             *n_items);
 
diff --git a/gio/pltcheck.sh b/gio/pltcheck.sh
index ae2b9b693..db96cfba4 100755
--- a/gio/pltcheck.sh
+++ b/gio/pltcheck.sh
@@ -9,7 +9,7 @@ if ! which readelf 2>/dev/null >/dev/null; then
 	exit 0
 fi
 
-SKIP='\<g_access\|\<g_array_\|\<g_ascii\|\<g_list_\|\<g_assertion_message\|\<g_warn_message\|\<g_atomic\|\<g_bit_\|\<g_boxed\|\<g_build_filename\|\<g_byte_array\|\<g_checksum\|\<g_child_watch\|\<g_clear_error\|\<g_convert\|\<g_dir_\|\<g_enum_\|\<g_error_\|\<g_prefix_error\|\<g_file_error_quark\|\<g_file_get_contents\|\<g_file_set_contents\|\<g_file_test\|\<g_file_read_link\|\<g_filename_\|\<g_find_program_in_path\|\<g_flags_\|\<g_free\|\<g_get_\|\<g_getenv\|\<g_setenv\|\<g_hash_table_\|\<g_hostname_\|\<g_iconv\|\<g_idle_\|\<g_intern_static_string\|\<g_io_add_watch\|\<g_io_channel_\|\<g_io_create_watch\|\<g_key_file_\|\<g_listenv\|\<g_locale_to_utf8\|\<g_log\|\<g_main_context_\|\<g_main_current_source\|\<g_main_loop_\|\<g_malloc\|\<g_markup_\|\<g_mkdir_\|\<g_mkstemp\|\<g_module_\|\<g_object_\|\<g_once_\|\<g_param_spec_\|\<g_path_\|\<g_poll\|\<g_printerr\|\<g_propagate_error\|\<g_ptr_array_\|\<g_qsort_\|\<g_quark_\|\<g_queue_\|\<g_random_int_range\|\<g_realloc\|\<g_return_if_fail\|\<g_set_error\|\<g_shell_\|\<g_signal_\|\<g_slice_\|\<g_slist_\|\<g_snprintf\|\<g_source_\|\<g_spawn_\|\<g_static_\|\<g_str\|\<g_thread_pool_\|\<g_time_val_add\|\<g_timeout_\|\<g_type_\|\<g_unlink\|\<g_uri_\|\<g_utf8_\|\<g_value_'
+SKIP='\<g_access\|\<g_array_\|\<g_ascii\|\<g_list_\|\<g_assertion_message\|\<g_warn_message\|\<g_atomic\|\<g_bit_\|\<g_boxed\|\<g_build_filename\|\<g_byte_array\|\<g_checksum\|\<g_child_watch\|\<g_clear_error\|\<g_convert\|\<g_dir_\|\<g_enum_\|\<g_error_\|\<g_prefix_error\|\<g_file_error_quark\|\<g_file_get_contents\|\<g_file_set_contents\|\<g_file_test\|\<g_file_read_link\|\<g_filename_\|\<g_find_program_in_path\|\<g_flags_\|\<g_free\|\<g_get_\|\<g_getenv\|\<g_setenv\|\<g_hash_table_\|\<g_hostname_\|\<g_iconv\|\<g_idle_\|\<g_intern_\|\<g_io_add_watch\|\<g_io_channel_\|\<g_io_create_watch\|\<g_key_file_\|\<g_listenv\|\<g_locale_to_utf8\|\<g_log\|\<g_main_context_\|\<g_main_current_source\|\<g_main_loop_\|\<g_malloc\|\<g_markup_\|\<g_mkdir_\|\<g_mkstemp\|\<g_module_\|\<g_object_\|\<g_once_\|\<g_param_spec_\|\<g_path_\|\<g_poll\|\<g_printerr\|\<g_propagate_error\|\<g_ptr_array_\|\<g_qsort_\|\<g_quark_\|\<g_queue_\|\<g_random_int_range\|\<g_realloc\|\<g_return_if_fail\|\<g_set_error\|\<g_shell_\|\<g_signal_\|\<g_slice_\|\<g_slist_\|\<g_snprintf\|\<g_source_\|\<g_spawn_\|\<g_static_\|\<g_str\|\<g_thread_pool_\|\<g_time_val_add\|\<g_timeout_\|\<g_type_\|\<g_unlink\|\<g_uri_\|\<g_utf8_\|\<g_value_\|\<g_tree_\|\<g_mapped_file_\|\<g_variant_\|\<g_compute_checksum'
 
 for so in .libs/lib*.so; do
 	echo Checking $so for local PLT entries