Rename private nm_* functions to _nm_*

git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4012 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

48 files changed, 257 insertions, 257 deletions

diff --git a/gfilemonitor/gfilemonitor.c b/gfilemonitor/gfilemonitor.c
index c5b18741fc..10166e4fae 100644
--- a/gfilemonitor/gfilemonitor.c
+++ b/gfilemonitor/gfilemonitor.c
@@ -198,7 +198,7 @@ g_file_monitor_class_init (GFileMonitorClass *klass)
 		  G_SIGNAL_RUN_LAST,
 		  G_STRUCT_OFFSET (GFileMonitorClass, changed),
 		  NULL, NULL,
-		  nm_marshal_VOID__OBJECT_OBJECT_ENUM,
+		  _nm_marshal_VOID__OBJECT_OBJECT_ENUM,
 		  G_TYPE_NONE, 3,
 		  G_TYPE_FILE, G_TYPE_FILE, G_TYPE_FILE_MONITOR_EVENT);
 
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index fba7532501..81ada47119 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -91,7 +91,7 @@ nm_access_point_get_flags (NMAccessPoint *ap)
 
 	priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	if (!priv->flags) {
-		priv->flags = nm_object_get_uint_property (NM_OBJECT (ap),
+		priv->flags = _nm_object_get_uint_property (NM_OBJECT (ap),
 		                                           NM_DBUS_INTERFACE_ACCESS_POINT,
 		                                           DBUS_PROP_FLAGS);
 	}
@@ -116,7 +116,7 @@ nm_access_point_get_wpa_flags (NMAccessPoint *ap)
 
 	priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	if (!priv->wpa_flags) {
-		priv->wpa_flags = nm_object_get_uint_property (NM_OBJECT (ap),
+		priv->wpa_flags = _nm_object_get_uint_property (NM_OBJECT (ap),
 		                                               NM_DBUS_INTERFACE_ACCESS_POINT,
 		                                               DBUS_PROP_WPA_FLAGS);
 	}
@@ -141,7 +141,7 @@ nm_access_point_get_rsn_flags (NMAccessPoint *ap)
 
 	priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	if (!priv->rsn_flags) {
-		priv->rsn_flags = nm_object_get_uint_property (NM_OBJECT (ap),
+		priv->rsn_flags = _nm_object_get_uint_property (NM_OBJECT (ap),
 		                                               NM_DBUS_INTERFACE_ACCESS_POINT,
 		                                               DBUS_PROP_RSN_FLAGS);
 	}
@@ -167,7 +167,7 @@ nm_access_point_get_ssid (NMAccessPoint *ap)
 
 	priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	if (!priv->ssid) {
-		priv->ssid = nm_object_get_byte_array_property (NM_OBJECT (ap),
+		priv->ssid = _nm_object_get_byte_array_property (NM_OBJECT (ap),
 		                                                NM_DBUS_INTERFACE_ACCESS_POINT,
 		                                                DBUS_PROP_SSID);
 	}
@@ -192,7 +192,7 @@ nm_access_point_get_frequency (NMAccessPoint *ap)
 
 	priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	if (!priv->frequency) {
-		priv->frequency = nm_object_get_uint_property (NM_OBJECT (ap),
+		priv->frequency = _nm_object_get_uint_property (NM_OBJECT (ap),
 		                                               NM_DBUS_INTERFACE_ACCESS_POINT,
 		                                               DBUS_PROP_FREQUENCY);
 	}
@@ -218,7 +218,7 @@ nm_access_point_get_hw_address (NMAccessPoint *ap)
 
 	priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	if (!priv->hw_address) {
-		priv->hw_address = nm_object_get_string_property (NM_OBJECT (ap),
+		priv->hw_address = _nm_object_get_string_property (NM_OBJECT (ap),
 		                                                  NM_DBUS_INTERFACE_ACCESS_POINT,
 		                                                  DBUS_PROP_HW_ADDRESS);
 	}
@@ -243,7 +243,7 @@ nm_access_point_get_mode (NMAccessPoint *ap)
 
 	priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	if (!priv->mode) {
-		priv->mode = nm_object_get_uint_property (NM_OBJECT (ap),
+		priv->mode = _nm_object_get_uint_property (NM_OBJECT (ap),
 		                                          NM_DBUS_INTERFACE_ACCESS_POINT,
 		                                          DBUS_PROP_MODE);
 	}
@@ -268,7 +268,7 @@ nm_access_point_get_max_bitrate (NMAccessPoint *ap)
 
 	priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	if (!priv->max_bitrate) {
-		priv->max_bitrate = nm_object_get_uint_property (NM_OBJECT (ap),
+		priv->max_bitrate = _nm_object_get_uint_property (NM_OBJECT (ap),
 		                                              NM_DBUS_INTERFACE_ACCESS_POINT,
 		                                              DBUS_PROP_MAX_BITRATE);
 	}
@@ -293,7 +293,7 @@ nm_access_point_get_strength (NMAccessPoint *ap)
 
 	priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	if (!priv->strength) {
-		priv->strength = nm_object_get_byte_property (NM_OBJECT (ap),
+		priv->strength = _nm_object_get_byte_property (NM_OBJECT (ap),
 		                                              NM_DBUS_INTERFACE_ACCESS_POINT,
 		                                              DBUS_PROP_STRENGTH);
 	}
@@ -384,10 +384,10 @@ get_property (GObject *object,
 static gboolean
 demarshal_ssid (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field)
 {
-	if (!nm_ssid_demarshal (value, (GByteArray **) field))
+	if (!_nm_ssid_demarshal (value, (GByteArray **) field))
 		return FALSE;
 
-	nm_object_queue_notify (object, NM_ACCESS_POINT_SSID);
+	_nm_object_queue_notify (object, NM_ACCESS_POINT_SSID);
 	return TRUE;
 }
 
@@ -396,19 +396,19 @@ register_for_property_changed (NMAccessPoint *ap)
 {
 	NMAccessPointPrivate *priv = NM_ACCESS_POINT_GET_PRIVATE (ap);
 	const NMPropertiesChangedInfo property_changed_info[] = {
-		{ NM_ACCESS_POINT_FLAGS,       nm_object_demarshal_generic, &priv->flags },
-		{ NM_ACCESS_POINT_WPA_FLAGS,   nm_object_demarshal_generic, &priv->wpa_flags },
-		{ NM_ACCESS_POINT_RSN_FLAGS,   nm_object_demarshal_generic, &priv->rsn_flags },
+		{ NM_ACCESS_POINT_FLAGS,       _nm_object_demarshal_generic, &priv->flags },
+		{ NM_ACCESS_POINT_WPA_FLAGS,   _nm_object_demarshal_generic, &priv->wpa_flags },
+		{ NM_ACCESS_POINT_RSN_FLAGS,   _nm_object_demarshal_generic, &priv->rsn_flags },
 		{ NM_ACCESS_POINT_SSID,        demarshal_ssid,              &priv->ssid },
-		{ NM_ACCESS_POINT_FREQUENCY,   nm_object_demarshal_generic, &priv->frequency },
-		{ NM_ACCESS_POINT_HW_ADDRESS,  nm_object_demarshal_generic, &priv->hw_address },
-		{ NM_ACCESS_POINT_MODE,        nm_object_demarshal_generic, &priv->mode },
-		{ NM_ACCESS_POINT_MAX_BITRATE, nm_object_demarshal_generic, &priv->max_bitrate },
-		{ NM_ACCESS_POINT_STRENGTH,    nm_object_demarshal_generic, &priv->strength },
+		{ NM_ACCESS_POINT_FREQUENCY,   _nm_object_demarshal_generic, &priv->frequency },
+		{ NM_ACCESS_POINT_HW_ADDRESS,  _nm_object_demarshal_generic, &priv->hw_address },
+		{ NM_ACCESS_POINT_MODE,        _nm_object_demarshal_generic, &priv->mode },
+		{ NM_ACCESS_POINT_MAX_BITRATE, _nm_object_demarshal_generic, &priv->max_bitrate },
+		{ NM_ACCESS_POINT_STRENGTH,    _nm_object_demarshal_generic, &priv->strength },
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (ap),
+	_nm_object_handle_properties_changed (NM_OBJECT (ap),
 	                                     priv->proxy,
 	                                     property_changed_info);
 }
diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c
index 3d3e3b67e3..52e0c49f6b 100644
--- a/libnm-glib/nm-active-connection.c
+++ b/libnm-glib/nm-active-connection.c
@@ -100,7 +100,7 @@ nm_active_connection_get_service_name (NMActiveConnection *connection)
 
 	priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (connection);
 	if (!priv->service_name) {
-		priv->service_name = nm_object_get_string_property (NM_OBJECT (connection),
+		priv->service_name = _nm_object_get_string_property (NM_OBJECT (connection),
 		                                                    NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
 		                                                    DBUS_PROP_SERVICE_NAME);
 		priv->scope = get_scope_for_service_name (priv->service_name);
@@ -145,7 +145,7 @@ nm_active_connection_get_connection (NMActiveConnection *connection)
 
 	priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (connection);
 	if (!priv->connection) {
-		priv->connection = nm_object_get_string_property (NM_OBJECT (connection),
+		priv->connection = _nm_object_get_string_property (NM_OBJECT (connection),
 		                                                  NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
 		                                                  DBUS_PROP_CONNECTION);
 	}
@@ -171,7 +171,7 @@ nm_active_connection_get_specific_object (NMActiveConnection *connection)
 
 	priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (connection);
 	if (!priv->specific_object) {
-		priv->specific_object = nm_object_get_string_property (NM_OBJECT (connection),
+		priv->specific_object = _nm_object_get_string_property (NM_OBJECT (connection),
 		                                                       NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
 		                                                       DBUS_PROP_SPECIFIC_OBJECT);
 	}
@@ -200,7 +200,7 @@ nm_active_connection_get_devices (NMActiveConnection *connection)
 	if (priv->devices)
 		return handle_ptr_array_return (priv->devices);
 
-	if (!nm_object_get_property (NM_OBJECT (connection),
+	if (!_nm_object_get_property (NM_OBJECT (connection),
 	                             NM_DBUS_INTERFACE,
 	                             DBUS_PROP_DEVICES,
 	                             &value)) {
@@ -230,7 +230,7 @@ nm_active_connection_get_state (NMActiveConnection *connection)
 
 	priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (connection);
 	if (!priv->state) {
-		priv->state = nm_object_get_uint_property (NM_OBJECT (connection),
+		priv->state = _nm_object_get_uint_property (NM_OBJECT (connection),
 		                                           NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
 		                                           DBUS_PROP_STATE);
 	}
@@ -256,7 +256,7 @@ nm_active_connection_get_default (NMActiveConnection *connection)
 
 	priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (connection);
 	if (!priv->is_default) {
-		priv->is_default = nm_object_get_boolean_property (NM_OBJECT (connection),
+		priv->is_default = _nm_object_get_boolean_property (NM_OBJECT (connection),
 		                                                   NM_DBUS_INTERFACE_ACTIVE_CONNECTION,
 		                                                   DBUS_PROP_DEFAULT);
 	}
@@ -341,10 +341,10 @@ demarshal_devices (NMObject *object, GParamSpec *pspec, GValue *value, gpointer
 	DBusGConnection *connection;
 
 	connection = nm_object_get_connection (object);
-	if (!nm_object_array_demarshal (value, (GPtrArray **) field, connection, nm_device_new))
+	if (!_nm_object_array_demarshal (value, (GPtrArray **) field, connection, nm_device_new))
 		return FALSE;
 
-	nm_object_queue_notify (object, NM_ACTIVE_CONNECTION_DEVICES);
+	_nm_object_queue_notify (object, NM_ACTIVE_CONNECTION_DEVICES);
 	return TRUE;
 }
 
@@ -353,7 +353,7 @@ demarshal_service (NMObject *object, GParamSpec *pspec, GValue *value, gpointer
 {
 	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (object);
 
-	if (nm_object_demarshal_generic (object, pspec, value, field)) {
+	if (_nm_object_demarshal_generic (object, pspec, value, field)) {
 		priv->scope = get_scope_for_service_name (priv->service_name);
 		return TRUE;
 	}
@@ -366,15 +366,15 @@ register_for_property_changed (NMActiveConnection *connection)
 	NMActiveConnectionPrivate *priv = NM_ACTIVE_CONNECTION_GET_PRIVATE (connection);
 	const NMPropertiesChangedInfo property_changed_info[] = {
 		{ NM_ACTIVE_CONNECTION_SERVICE_NAME,        demarshal_service,           &priv->service_name },
-		{ NM_ACTIVE_CONNECTION_CONNECTION,          nm_object_demarshal_generic, &priv->connection },
-		{ NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT,     nm_object_demarshal_generic, &priv->specific_object },
+		{ NM_ACTIVE_CONNECTION_CONNECTION,          _nm_object_demarshal_generic, &priv->connection },
+		{ NM_ACTIVE_CONNECTION_SPECIFIC_OBJECT,     _nm_object_demarshal_generic, &priv->specific_object },
 		{ NM_ACTIVE_CONNECTION_DEVICES,             demarshal_devices,           &priv->devices },
-		{ NM_ACTIVE_CONNECTION_STATE,               nm_object_demarshal_generic, &priv->state },
-		{ NM_ACTIVE_CONNECTION_DEFAULT,             nm_object_demarshal_generic, &priv->is_default },
+		{ NM_ACTIVE_CONNECTION_STATE,               _nm_object_demarshal_generic, &priv->state },
+		{ NM_ACTIVE_CONNECTION_DEFAULT,             _nm_object_demarshal_generic, &priv->is_default },
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (connection),
+	_nm_object_handle_properties_changed (NM_OBJECT (connection),
 	                                     priv->proxy,
 	                                     property_changed_info);
 }
diff --git a/libnm-glib/nm-cdma-device.c b/libnm-glib/nm-cdma-device.c
index afd2b6a4ae..556591a3e8 100644
--- a/libnm-glib/nm-cdma-device.c
+++ b/libnm-glib/nm-cdma-device.c
@@ -27,7 +27,7 @@ register_for_property_changed (NMCdmaDevice *device)
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (device),
+	_nm_object_handle_properties_changed (NM_OBJECT (device),
 	                                     priv->proxy,
 	                                     property_changed_info);
 }
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index 0def21e045..fad65082bd 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -20,7 +20,7 @@
 
 #include "nm-client-bindings.h"
 
-void nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
+void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
 
 
 G_DEFINE_TYPE (NMClient, nm_client, NM_TYPE_OBJECT)
@@ -88,7 +88,7 @@ poke_wireless_devices_with_rf_status (NMClient *client)
 		NMDevice *device = g_ptr_array_index (priv->devices, i);
 
 		if (NM_IS_DEVICE_WIFI (device))
-			nm_device_wifi_set_wireless_enabled (NM_DEVICE_WIFI (device), priv->wireless_enabled);
+			_nm_device_wifi_set_wireless_enabled (NM_DEVICE_WIFI (device), priv->wireless_enabled);
 	}
 }
 
@@ -99,27 +99,27 @@ update_wireless_status (NMClient *client, gboolean notify)
 	gboolean val;
 	gboolean poke = FALSE;
 
-	val = nm_object_get_boolean_property (NM_OBJECT (client),
+	val = _nm_object_get_boolean_property (NM_OBJECT (client),
 										  NM_DBUS_INTERFACE,
 										  "WirelessHardwareEnabled");
 	if (val != priv->wireless_hw_enabled) {
 		priv->wireless_hw_enabled = val;
 		poke = TRUE;
 		if (notify)
-			nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_WIRELESS_HARDWARE_ENABLED);
+			_nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_WIRELESS_HARDWARE_ENABLED);
 	}
 
 	if (priv->wireless_hw_enabled == FALSE)
 		val = FALSE;
 	else
-		val = nm_object_get_boolean_property (NM_OBJECT (client),
+		val = _nm_object_get_boolean_property (NM_OBJECT (client),
 				                              NM_DBUS_INTERFACE,
 				                              "WirelessEnabled");
 	if (val != priv->wireless_enabled) {
 		priv->wireless_enabled = val;
 		poke = TRUE;
 		if (notify)
-			nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_WIRELESS_ENABLED);
+			_nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_WIRELESS_ENABLED);
 	}
 
 	if (poke)
@@ -181,10 +181,10 @@ demarshal_active_connections (NMObject *object,
 	DBusGConnection *connection;
 
 	connection = nm_object_get_connection (object);
-	if (!nm_object_array_demarshal (value, (GPtrArray **) field, connection, new_active_connection))
+	if (!_nm_object_array_demarshal (value, (GPtrArray **) field, connection, new_active_connection))
 		return FALSE;
 
-	nm_object_queue_notify (object, NM_CLIENT_ACTIVE_CONNECTIONS);
+	_nm_object_queue_notify (object, NM_CLIENT_ACTIVE_CONNECTIONS);
 	return TRUE;
 }
 
@@ -193,14 +193,14 @@ register_for_property_changed (NMClient *client)
 {
 	NMClientPrivate *priv = NM_CLIENT_GET_PRIVATE (client);
 	const NMPropertiesChangedInfo property_changed_info[] = {
-		{ NM_CLIENT_STATE,                     nm_object_demarshal_generic,  &priv->state },
-		{ NM_CLIENT_WIRELESS_ENABLED,          nm_object_demarshal_generic,  &priv->wireless_enabled },
-		{ NM_CLIENT_WIRELESS_HARDWARE_ENABLED, nm_object_demarshal_generic,  &priv->wireless_hw_enabled },
+		{ NM_CLIENT_STATE,                     _nm_object_demarshal_generic,  &priv->state },
+		{ NM_CLIENT_WIRELESS_ENABLED,          _nm_object_demarshal_generic,  &priv->wireless_enabled },
+		{ NM_CLIENT_WIRELESS_HARDWARE_ENABLED, _nm_object_demarshal_generic,  &priv->wireless_hw_enabled },
 		{ NM_CLIENT_ACTIVE_CONNECTIONS,        demarshal_active_connections, &priv->active_connections },
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (client),
+	_nm_object_handle_properties_changed (NM_OBJECT (client),
 	                                     priv->client_proxy,
 	                                     property_changed_info);
 }
@@ -320,14 +320,14 @@ set_property (GObject *object, guint prop_id,
 		b = g_value_get_boolean (value);
 		if (priv->wireless_enabled != b) {
 			priv->wireless_enabled = b;
-			nm_object_queue_notify (NM_OBJECT (object), NM_CLIENT_WIRELESS_ENABLED);
+			_nm_object_queue_notify (NM_OBJECT (object), NM_CLIENT_WIRELESS_ENABLED);
 		}
 		break;
 	case PROP_WIRELESS_HARDWARE_ENABLED:
 		b = g_value_get_boolean (value);
 		if (priv->wireless_hw_enabled != b) {
 			priv->wireless_hw_enabled = b;
-			nm_object_queue_notify (NM_OBJECT (object), NM_CLIENT_WIRELESS_HARDWARE_ENABLED);
+			_nm_object_queue_notify (NM_OBJECT (object), NM_CLIENT_WIRELESS_HARDWARE_ENABLED);
 		}
 		break;
 	default:
@@ -537,14 +537,14 @@ proxy_name_owner_changed (DBusGProxy *proxy,
 	priv->manager_running = new_running;
 	if (!priv->manager_running) {
 		priv->state = NM_STATE_UNKNOWN;
-		nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_MANAGER_RUNNING);
+		_nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_MANAGER_RUNNING);
 		poke_wireless_devices_with_rf_status (client);
 		free_object_array (&priv->devices);
 		free_object_array (&priv->active_connections);
 		priv->wireless_enabled = FALSE;
 		priv->wireless_hw_enabled = FALSE;
 	} else {
-		nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_MANAGER_RUNNING);
+		_nm_object_queue_notify (NM_OBJECT (client), NM_CLIENT_MANAGER_RUNNING);
 		update_wireless_status (client, TRUE);
 	}
 }
@@ -560,7 +560,7 @@ client_device_added_proxy (DBusGProxy *proxy, char *path, gpointer user_data)
 	if (!device) {
 		DBusGConnection *connection = nm_object_get_connection (NM_OBJECT (client));
 
-		device = G_OBJECT (nm_object_cache_get (path));
+		device = G_OBJECT (_nm_object_cache_get (path));
 		if (device) {
 			g_ptr_array_add (priv->devices, g_object_ref (device));
 		} else {
@@ -622,7 +622,7 @@ nm_client_get_devices (NMClient *client)
 	g_value_init (&value, DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH);
 	g_value_take_boxed (&value, temp);
 	connection = nm_object_get_connection (NM_OBJECT (client));
-	nm_object_array_demarshal (&value, &priv->devices, connection, nm_device_new);
+	_nm_object_array_demarshal (&value, &priv->devices, connection, nm_device_new);
 	g_value_unset (&value);
 
 	return handle_ptr_array_return (priv->devices);
@@ -782,7 +782,7 @@ nm_client_get_active_connections (NMClient *client)
 	if (!priv->manager_running)
 		return NULL;
 
-	if (!nm_object_get_property (NM_OBJECT (client),
+	if (!_nm_object_get_property (NM_OBJECT (client),
 	                             "org.freedesktop.DBus.Properties",
 	                             "ActiveConnections",
 	                             &value)) {
@@ -828,7 +828,7 @@ nm_client_wireless_set_enabled (NMClient *client, gboolean enabled)
 	g_value_init (&value, G_TYPE_BOOLEAN);
 	g_value_set_boolean (&value, enabled);
 
-	nm_object_set_property (NM_OBJECT (client),
+	_nm_object_set_property (NM_OBJECT (client),
 					    NM_DBUS_INTERFACE,
 					    "WirelessEnabled",
 					    &value);
@@ -871,7 +871,7 @@ nm_client_get_state (NMClient *client)
 		return NM_STATE_UNKNOWN;
 
 	if (priv->state == NM_STATE_UNKNOWN)
-		priv->state = nm_object_get_uint_property (NM_OBJECT (client), NM_DBUS_INTERFACE, "State");
+		priv->state = _nm_object_get_uint_property (NM_OBJECT (client), NM_DBUS_INTERFACE, "State");
 
 	return priv->state;
 }
diff --git a/libnm-glib/nm-dbus-utils.c b/libnm-glib/nm-dbus-utils.c
index 1620464c5d..f77ea820cf 100644
--- a/libnm-glib/nm-dbus-utils.c
+++ b/libnm-glib/nm-dbus-utils.c
@@ -1,7 +1,7 @@
 #include "nm-dbus-utils.h"
 
 char *
-nm_dbus_get_string_property (DBusGProxy *proxy,
+_nm_dbus_get_string_property (DBusGProxy *proxy,
 							 const char *interface,
 							 const char *prop_name)
 {
@@ -27,7 +27,7 @@ nm_dbus_get_string_property (DBusGProxy *proxy,
 }
 
 char *
-nm_dbus_get_object_path_property (DBusGProxy *proxy,
+_nm_dbus_get_object_path_property (DBusGProxy *proxy,
 								  const char *interface,
 								  const char *prop_name)
 {
@@ -53,7 +53,7 @@ nm_dbus_get_object_path_property (DBusGProxy *proxy,
 }
 
 gint32
-nm_dbus_get_int_property (DBusGProxy *proxy,
+_nm_dbus_get_int_property (DBusGProxy *proxy,
 						  const char *interface,
 						  const char *prop_name)
 {
@@ -79,7 +79,7 @@ nm_dbus_get_int_property (DBusGProxy *proxy,
 }
 
 guint32
-nm_dbus_get_uint_property (DBusGProxy *proxy,
+_nm_dbus_get_uint_property (DBusGProxy *proxy,
 						   const char *interface,
 						   const char *prop_name)
 {
@@ -105,7 +105,7 @@ nm_dbus_get_uint_property (DBusGProxy *proxy,
 }
 
 gboolean
-nm_dbus_get_property (DBusGProxy *proxy,
+_nm_dbus_get_property (DBusGProxy *proxy,
 					  const char *interface,
 					  const char *prop_name,
 					  GValue *value)
@@ -139,7 +139,7 @@ nm_dbus_get_property (DBusGProxy *proxy,
 }
 
 void
-nm_dbus_set_property (DBusGProxy *proxy,
+_nm_dbus_set_property (DBusGProxy *proxy,
 					  const char *interface,
 					  const char *prop_name,
 					  GValue *value)
@@ -164,7 +164,7 @@ nm_dbus_set_property (DBusGProxy *proxy,
 }
 
 char *
-nm_dbus_introspect (DBusGConnection *connection,
+_nm_dbus_introspect (DBusGConnection *connection,
 					const char *interface,
 					const char *path)
 {
diff --git a/libnm-glib/nm-dbus-utils.h b/libnm-glib/nm-dbus-utils.h
index 723c23e9a3..5449bbd693 100644
--- a/libnm-glib/nm-dbus-utils.h
+++ b/libnm-glib/nm-dbus-utils.h
@@ -3,32 +3,32 @@
 
 #include <dbus/dbus-glib.h>
 
-char *nm_dbus_get_string_property (DBusGProxy *proxy,
+char *_nm_dbus_get_string_property (DBusGProxy *proxy,
 								   const char *interface,
 								   const char *prop_name);
 
-char *nm_dbus_get_object_path_property (DBusGProxy *proxy,
+char *_nm_dbus_get_object_path_property (DBusGProxy *proxy,
 										const char *interface,
 										const char *prop_name);
 
-gint32 nm_dbus_get_int_property (DBusGProxy *proxy,
+gint32 _nm_dbus_get_int_property (DBusGProxy *proxy,
 								 const char *interface,
 								 const char *prop_name);
 
-guint32 nm_dbus_get_uint_property (DBusGProxy *proxy,
+guint32 _nm_dbus_get_uint_property (DBusGProxy *proxy,
 								   const char *interface,
 								   const char *prop_name);
 
-gboolean  nm_dbus_get_property (DBusGProxy *proxy,
+gboolean  _nm_dbus_get_property (DBusGProxy *proxy,
 								const char *interface,
 								const char *prop_name,
 								GValue *value);
-void      nm_dbus_set_property (DBusGProxy *proxy,
+void      _nm_dbus_set_property (DBusGProxy *proxy,
 								const char *interface,
 								const char *prop_name,
 								GValue *value);
 
-char     *nm_dbus_introspect   (DBusGConnection *connection,
+char     *_nm_dbus_introspect   (DBusGConnection *connection,
 								const char *interface,
 								const char *path);
 
diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c
index 57c423f8b5..2e23d0c1f8 100644
--- a/libnm-glib/nm-device-ethernet.c
+++ b/libnm-glib/nm-device-ethernet.c
@@ -71,7 +71,7 @@ nm_device_ethernet_get_hw_address (NMDeviceEthernet *device)
 
 	priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
 	if (!priv->hw_address) {
-		priv->hw_address = nm_object_get_string_property (NM_OBJECT (device),
+		priv->hw_address = _nm_object_get_string_property (NM_OBJECT (device),
 		                                                  NM_DBUS_INTERFACE_DEVICE_WIRED,
 		                                                  DBUS_PROP_HW_ADDRESS);
 	}
@@ -96,7 +96,7 @@ nm_device_ethernet_get_speed (NMDeviceEthernet *device)
 
 	priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
 	if (!priv->speed) {
-		priv->speed = nm_object_get_uint_property (NM_OBJECT (device),
+		priv->speed = _nm_object_get_uint_property (NM_OBJECT (device),
 		                                           NM_DBUS_INTERFACE_DEVICE_WIRED,
 		                                           DBUS_PROP_SPEED);
 	}
@@ -121,7 +121,7 @@ nm_device_ethernet_get_carrier (NMDeviceEthernet *device)
 
 	priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
 	if (!priv->carrier_valid) {
-		priv->carrier = nm_object_get_boolean_property (NM_OBJECT (device),
+		priv->carrier = _nm_object_get_boolean_property (NM_OBJECT (device),
 		                                                NM_DBUS_INTERFACE_DEVICE_WIRED,
 		                                                DBUS_PROP_CARRIER);
 		priv->carrier_valid = TRUE;
@@ -145,13 +145,13 @@ register_for_property_changed (NMDeviceEthernet *device)
 {
 	NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
 	const NMPropertiesChangedInfo property_changed_info[] = {
-		{ NM_DEVICE_ETHERNET_HW_ADDRESS, nm_object_demarshal_generic, &priv->hw_address },
-		{ NM_DEVICE_ETHERNET_SPEED,      nm_object_demarshal_generic, &priv->speed },
-		{ NM_DEVICE_ETHERNET_CARRIER,    nm_object_demarshal_generic, &priv->carrier },
+		{ NM_DEVICE_ETHERNET_HW_ADDRESS, _nm_object_demarshal_generic, &priv->hw_address },
+		{ NM_DEVICE_ETHERNET_SPEED,      _nm_object_demarshal_generic, &priv->speed },
+		{ NM_DEVICE_ETHERNET_CARRIER,    _nm_object_demarshal_generic, &priv->carrier },
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (device),
+	_nm_object_handle_properties_changed (NM_OBJECT (device),
 	                                     priv->proxy,
 	                                     property_changed_info);
 }
diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c
index ac6b93e251..7359749e48 100644
--- a/libnm-glib/nm-device-wifi.c
+++ b/libnm-glib/nm-device-wifi.c
@@ -17,7 +17,7 @@ G_DEFINE_TYPE (NMDeviceWifi, nm_device_wifi, NM_TYPE_DEVICE)
 
 static gboolean demarshal_active_ap (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field);
 
-void nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
+void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
 
 typedef struct {
 	gboolean disposed;
@@ -99,7 +99,7 @@ nm_device_wifi_get_hw_address (NMDeviceWifi *device)
 
 	priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
 	if (!priv->hw_address) {
-		priv->hw_address = nm_object_get_string_property (NM_OBJECT (device),
+		priv->hw_address = _nm_object_get_string_property (NM_OBJECT (device),
 		                                                  NM_DBUS_INTERFACE_DEVICE_WIRELESS,
 		                                                  DBUS_PROP_HW_ADDRESS);
 	}
@@ -124,7 +124,7 @@ nm_device_wifi_get_mode (NMDeviceWifi *device)
 
 	priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
 	if (!priv->mode) {
-		priv->mode = nm_object_get_uint_property (NM_OBJECT (device),
+		priv->mode = _nm_object_get_uint_property (NM_OBJECT (device),
 		                                          NM_DBUS_INTERFACE_DEVICE_WIRELESS,
 		                                          DBUS_PROP_MODE);
 	}
@@ -163,7 +163,7 @@ nm_device_wifi_get_bitrate (NMDeviceWifi *device)
 
 	priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
 	if (!priv->rate) {
-		priv->rate = nm_object_get_uint_property (NM_OBJECT (device),
+		priv->rate = _nm_object_get_uint_property (NM_OBJECT (device),
 		                                         NM_DBUS_INTERFACE_DEVICE_WIRELESS,
 		                                         DBUS_PROP_BITRATE);
 	}
@@ -188,7 +188,7 @@ nm_device_wifi_get_capabilities (NMDeviceWifi *device)
 
 	priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
 	if (!priv->wireless_caps) {
-		priv->wireless_caps = nm_object_get_uint_property (NM_OBJECT (device),
+		priv->wireless_caps = _nm_object_get_uint_property (NM_OBJECT (device),
 		                                                   NM_DBUS_INTERFACE_DEVICE_WIRELESS,
 		                                                   DBUS_PROP_WIRELESS_CAPABILITIES);
 	}
@@ -233,7 +233,7 @@ nm_device_wifi_get_active_access_point (NMDeviceWifi *self)
 	if (priv->null_active_ap)
 		return NULL;
 
-	path = nm_object_get_object_path_property (NM_OBJECT (self),
+	path = _nm_object_get_object_path_property (NM_OBJECT (self),
 	                                           NM_DBUS_INTERFACE_DEVICE_WIRELESS,
 	                                           DBUS_PROP_ACTIVE_ACCESS_POINT);
 	if (path) {
@@ -279,7 +279,7 @@ nm_device_wifi_get_access_points (NMDeviceWifi *self)
 	g_value_init (&value, DBUS_TYPE_G_ARRAY_OF_OBJECT_PATH);
 	g_value_take_boxed (&value, temp);
 	connection = nm_object_get_connection (NM_OBJECT (self));
-	nm_object_array_demarshal (&value, &priv->aps, connection, nm_access_point_new);
+	_nm_object_array_demarshal (&value, &priv->aps, connection, nm_access_point_new);
 	g_value_unset (&value);
 
 	return handle_ptr_array_return (priv->aps);
@@ -334,7 +334,7 @@ access_point_added_proxy (DBusGProxy *proxy, char *path, gpointer user_data)
 		DBusGConnection *connection = nm_object_get_connection (NM_OBJECT (self));
 
 		priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
-		ap = G_OBJECT (nm_object_cache_get (path));
+		ap = G_OBJECT (_nm_object_cache_get (path));
 		if (ap) {
 			g_ptr_array_add (priv->aps, g_object_ref (ap));
 		} else {
@@ -392,14 +392,14 @@ clean_up_aps (NMDeviceWifi *self, gboolean notify)
 }
 
 /**
- * nm_device_wifi_set_wireless_enabled:
+ * _nm_device_wifi_set_wireless_enabled:
  * @device: a #NMDeviceWifi
  * @enabled: %TRUE to enable the device
  *
  * Enables or disables the wireless device.
  **/
 void
-nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device,
+_nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device,
                                                 gboolean enabled)
 {
 	g_return_if_fail (NM_IS_DEVICE_WIFI (device));
@@ -467,9 +467,9 @@ state_changed_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data)
 			priv->active_ap = NULL;
 			priv->null_active_ap = FALSE;
 		}
-		nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT);
+		_nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT);
 		priv->rate = 0;
-		nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_WIFI_BITRATE);
+		_nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_WIFI_BITRATE);
 		break;
 	default:
 		break;
@@ -494,7 +494,7 @@ demarshal_active_ap (NMObject *object, GParamSpec *pspec, GValue *value, gpointe
 		if (!strcmp (path, "/"))
 			priv->null_active_ap = TRUE;
 		else {
-			ap = NM_ACCESS_POINT (nm_object_cache_get (path));
+			ap = NM_ACCESS_POINT (_nm_object_cache_get (path));
 			if (ap)
 				ap = g_object_ref (ap);
 			else {
@@ -512,7 +512,7 @@ demarshal_active_ap (NMObject *object, GParamSpec *pspec, GValue *value, gpointe
 	if (ap)
 		priv->active_ap = ap;
 
-	nm_object_queue_notify (object, NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT);
+	_nm_object_queue_notify (object, NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT);
 	return TRUE;
 }
 
@@ -521,15 +521,15 @@ register_for_property_changed (NMDeviceWifi *device)
 {
 	NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (device);
 	const NMPropertiesChangedInfo property_changed_info[] = {
-		{ NM_DEVICE_WIFI_HW_ADDRESS,          nm_object_demarshal_generic, &priv->hw_address },
-		{ NM_DEVICE_WIFI_MODE,                nm_object_demarshal_generic, &priv->mode },
-		{ NM_DEVICE_WIFI_BITRATE,             nm_object_demarshal_generic, &priv->rate },
+		{ NM_DEVICE_WIFI_HW_ADDRESS,          _nm_object_demarshal_generic, &priv->hw_address },
+		{ NM_DEVICE_WIFI_MODE,                _nm_object_demarshal_generic, &priv->mode },
+		{ NM_DEVICE_WIFI_BITRATE,             _nm_object_demarshal_generic, &priv->rate },
 		{ NM_DEVICE_WIFI_ACTIVE_ACCESS_POINT, demarshal_active_ap,         &priv->active_ap },
-		{ NM_DEVICE_WIFI_CAPABILITIES,        nm_object_demarshal_generic, &priv->wireless_caps },
+		{ NM_DEVICE_WIFI_CAPABILITIES,        _nm_object_demarshal_generic, &priv->wireless_caps },
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (device),
+	_nm_object_handle_properties_changed (NM_OBJECT (device),
 	                                     priv->proxy,
 	                                     property_changed_info);
 }
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index d142bfe29f..c180abc640 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -87,7 +87,7 @@ demarshal_ip4_config (NMObject *object, GParamSpec *pspec, GValue *value, gpoint
 		if (!strcmp (path, "/"))
 			priv->null_ip4_config = TRUE;
 		else {
-			config = NM_IP4_CONFIG (nm_object_cache_get (path));
+			config = NM_IP4_CONFIG (_nm_object_cache_get (path));
 			if (config)
 				config = g_object_ref (config);
 			else {
@@ -105,7 +105,7 @@ demarshal_ip4_config (NMObject *object, GParamSpec *pspec, GValue *value, gpoint
 	if (config)
 		priv->ip4_config = config;
 
-	nm_object_queue_notify (object, NM_DEVICE_IP4_CONFIG);
+	_nm_object_queue_notify (object, NM_DEVICE_IP4_CONFIG);
 	return TRUE;
 }
 
@@ -127,7 +127,7 @@ demarshal_dhcp4_config (NMObject *object, GParamSpec *pspec, GValue *value, gpoi
 		if (!strcmp (path, "/"))
 			priv->null_dhcp4_config = TRUE;
 		else {
-			config = NM_DHCP4_CONFIG (nm_object_cache_get (path));
+			config = NM_DHCP4_CONFIG (_nm_object_cache_get (path));
 			if (config)
 				config = g_object_ref (config);
 			else {
@@ -145,7 +145,7 @@ demarshal_dhcp4_config (NMObject *object, GParamSpec *pspec, GValue *value, gpoi
 	if (config)
 		priv->dhcp4_config = config;
 
-	nm_object_queue_notify (object, NM_DEVICE_DHCP4_CONFIG);
+	_nm_object_queue_notify (object, NM_DEVICE_DHCP4_CONFIG);
 	return TRUE;
 }
 
@@ -154,17 +154,17 @@ register_for_property_changed (NMDevice *device)
 {
 	NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (device);
 	const NMPropertiesChangedInfo property_changed_info[] = {
-		{ NM_DEVICE_UDI,          nm_object_demarshal_generic, &priv->udi },
-		{ NM_DEVICE_INTERFACE,    nm_object_demarshal_generic, &priv->iface },
-		{ NM_DEVICE_DRIVER,       nm_object_demarshal_generic, &priv->driver },
-		{ NM_DEVICE_CAPABILITIES, nm_object_demarshal_generic, &priv->capabilities },
-		{ NM_DEVICE_MANAGED,      nm_object_demarshal_generic, &priv->managed },
+		{ NM_DEVICE_UDI,          _nm_object_demarshal_generic, &priv->udi },
+		{ NM_DEVICE_INTERFACE,    _nm_object_demarshal_generic, &priv->iface },
+		{ NM_DEVICE_DRIVER,       _nm_object_demarshal_generic, &priv->driver },
+		{ NM_DEVICE_CAPABILITIES, _nm_object_demarshal_generic, &priv->capabilities },
+		{ NM_DEVICE_MANAGED,      _nm_object_demarshal_generic, &priv->managed },
 		{ NM_DEVICE_IP4_CONFIG,   demarshal_ip4_config,        &priv->ip4_config },
 		{ NM_DEVICE_DHCP4_CONFIG, demarshal_dhcp4_config,      &priv->dhcp4_config },
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (device),
+	_nm_object_handle_properties_changed (NM_OBJECT (device),
 	                                     priv->proxy,
 	                                     property_changed_info);
 }
@@ -182,7 +182,7 @@ device_state_changed (DBusGProxy *proxy,
 	if (priv->state != new_state) {
 		priv->state = new_state;
 		g_signal_emit (self, signals[STATE_CHANGED], 0, new_state, old_state, reason);
-		nm_object_queue_notify (NM_OBJECT (self), "state");
+		_nm_object_queue_notify (NM_OBJECT (self), "state");
 	}
 }
 
@@ -209,7 +209,7 @@ constructor (GType type,
 
 	register_for_property_changed (NM_DEVICE (object));
 
-	dbus_g_object_register_marshaller (nm_marshal_VOID__UINT_UINT_UINT,
+	dbus_g_object_register_marshaller (_nm_marshal_VOID__UINT_UINT_UINT,
 									   G_TYPE_NONE,
 									   G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT,
 									   G_TYPE_INVALID);
@@ -467,7 +467,7 @@ nm_device_class_init (NMDeviceClass *device_class)
 				    G_SIGNAL_RUN_FIRST,
 				    G_STRUCT_OFFSET (NMDeviceClass, state_changed),
 				    NULL, NULL,
-				    nm_marshal_VOID__UINT_UINT_UINT,
+				    _nm_marshal_VOID__UINT_UINT_UINT,
 				    G_TYPE_NONE, 3,
 				    G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
 }
@@ -561,7 +561,7 @@ nm_device_get_iface (NMDevice *device)
 
 	priv = NM_DEVICE_GET_PRIVATE (device);
 	if (!priv->iface) {
-		priv->iface = nm_object_get_string_property (NM_OBJECT (device),
+		priv->iface = _nm_object_get_string_property (NM_OBJECT (device),
 		                                             NM_DBUS_INTERFACE_DEVICE,
 		                                             "Interface");
 	}
@@ -587,7 +587,7 @@ nm_device_get_udi (NMDevice *device)
 
 	priv = NM_DEVICE_GET_PRIVATE (device);
 	if (!priv->udi) {
-		priv->udi = nm_object_get_string_property (NM_OBJECT (device),
+		priv->udi = _nm_object_get_string_property (NM_OBJECT (device),
 		                                           NM_DBUS_INTERFACE_DEVICE,
 		                                           "Udi");
 	}
@@ -613,7 +613,7 @@ nm_device_get_driver (NMDevice *device)
 
 	priv = NM_DEVICE_GET_PRIVATE (device);
 	if (!priv->driver) {
-		priv->driver = nm_object_get_string_property (NM_OBJECT (device),
+		priv->driver = _nm_object_get_string_property (NM_OBJECT (device),
 		                                              NM_DBUS_INTERFACE_DEVICE,
 		                                              "Driver");
 	}
@@ -638,7 +638,7 @@ nm_device_get_capabilities (NMDevice *device)
 
 	priv = NM_DEVICE_GET_PRIVATE (device);
 	if (!priv->capabilities) {
-		priv->capabilities = nm_object_get_uint_property (NM_OBJECT (device),
+		priv->capabilities = _nm_object_get_uint_property (NM_OBJECT (device),
 		                                                  NM_DBUS_INTERFACE_DEVICE,
 		                                                  "Capabilities");
 	}
@@ -663,7 +663,7 @@ nm_device_get_managed (NMDevice *device)
 
 	priv = NM_DEVICE_GET_PRIVATE (device);
 	if (!priv->managed) {
-		priv->managed = nm_object_get_boolean_property (NM_OBJECT (device),
+		priv->managed = _nm_object_get_boolean_property (NM_OBJECT (device),
 		                                                NM_DBUS_INTERFACE_DEVICE,
 		                                                "Managed");
 	}
@@ -694,7 +694,7 @@ nm_device_get_ip4_config (NMDevice *device)
 	if (priv->null_ip4_config)
 		return NULL;
 
-	path = nm_object_get_object_path_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE, "Ip4Config");
+	path = _nm_object_get_object_path_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE, "Ip4Config");
 	if (path) {
 		g_value_init (&value, DBUS_TYPE_G_OBJECT_PATH);
 		g_value_take_boxed (&value, path);
@@ -729,7 +729,7 @@ nm_device_get_dhcp4_config (NMDevice *device)
 	if (priv->null_dhcp4_config)
 		return NULL;
 
-	path = nm_object_get_object_path_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE, "Dhcp4Config");
+	path = _nm_object_get_object_path_property (NM_OBJECT (device), NM_DBUS_INTERFACE_DEVICE, "Dhcp4Config");
 	if (path) {
 		g_value_init (&value, DBUS_TYPE_G_OBJECT_PATH);
 		g_value_take_boxed (&value, path);
@@ -757,7 +757,7 @@ nm_device_get_state (NMDevice *device)
 
 	priv = NM_DEVICE_GET_PRIVATE (device);
 	if (priv->state == NM_DEVICE_STATE_UNKNOWN) {
-		priv->state = nm_object_get_uint_property (NM_OBJECT (device), 
+		priv->state = _nm_object_get_uint_property (NM_OBJECT (device), 
 		                                           NM_DBUS_INTERFACE_DEVICE,
 		                                           "State");
 	}
@@ -939,8 +939,8 @@ nm_device_update_description (NMDevice *device)
 
 	g_free (orig_dev_udi);
 
-	nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_VENDOR);
-	nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_PRODUCT);
+	_nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_VENDOR);
+	_nm_object_queue_notify (NM_OBJECT (device), NM_DEVICE_PRODUCT);
 }
 
 /**
diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c
index a01be523c2..bd02ea6362 100644
--- a/libnm-glib/nm-dhcp4-config.c
+++ b/libnm-glib/nm-dhcp4-config.c
@@ -49,7 +49,7 @@ demarshal_dhcp4_options (NMObject *object, GParamSpec *pspec, GValue *value, gpo
 	if (new_options)
 		g_hash_table_foreach (new_options, copy_options, priv->options);
 
-	nm_object_queue_notify (object, NM_DHCP4_CONFIG_OPTIONS);
+	_nm_object_queue_notify (object, NM_DHCP4_CONFIG_OPTIONS);
 	return TRUE;
 }
 
@@ -62,7 +62,7 @@ register_for_property_changed (NMDHCP4Config *config)
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (config),
+	_nm_object_handle_properties_changed (NM_OBJECT (config),
 	                                     priv->proxy,
 	                                     property_changed_info);
 }
@@ -190,7 +190,7 @@ nm_dhcp4_config_get_options (NMDHCP4Config *self)
 	if (g_hash_table_size (priv->options))
 		return priv->options;
 
-	if (!nm_object_get_property (NM_OBJECT (self),
+	if (!_nm_object_get_property (NM_OBJECT (self),
 	                             "org.freedesktop.DBus.Properties",
 	                             "Options",
 	                             &value))
diff --git a/libnm-glib/nm-gsm-device.c b/libnm-glib/nm-gsm-device.c
index 7db338c8a7..93ae869b45 100644
--- a/libnm-glib/nm-gsm-device.c
+++ b/libnm-glib/nm-gsm-device.c
@@ -27,7 +27,7 @@ register_for_property_changed (NMGsmDevice *device)
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (device),
+	_nm_object_handle_properties_changed (NM_OBJECT (device),
 	                                     priv->proxy,
 	                                     property_changed_info);
 }
diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c
index dac3085eaa..74b7b031db 100644
--- a/libnm-glib/nm-ip4-config.c
+++ b/libnm-glib/nm-ip4-config.c
@@ -46,7 +46,7 @@ demarshal_ip4_address_array (NMObject *object, GParamSpec *pspec, GValue *value,
 	priv->addresses = NULL;
 
 	priv->addresses = nm_utils_ip4_addresses_from_gvalue (value);
-	nm_object_queue_notify (object, NM_IP4_CONFIG_ADDRESSES);
+	_nm_object_queue_notify (object, NM_IP4_CONFIG_ADDRESSES);
 
 	return TRUE;
 }
@@ -54,21 +54,21 @@ demarshal_ip4_address_array (NMObject *object, GParamSpec *pspec, GValue *value,
 static gboolean
 demarshal_ip4_array (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field)
 {
-	if (!nm_uint_array_demarshal (value, (GArray **) field))
+	if (!_nm_uint_array_demarshal (value, (GArray **) field))
 		return FALSE;
 
 	if (!strcmp (pspec->name, NM_IP4_CONFIG_NAMESERVERS))
-		nm_object_queue_notify (object, NM_IP4_CONFIG_NAMESERVERS);
+		_nm_object_queue_notify (object, NM_IP4_CONFIG_NAMESERVERS);
 	return TRUE;
 }
 
 static gboolean
 demarshal_domains (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field)
 {
-	if (!nm_string_array_demarshal (value, (GPtrArray **) field))
+	if (!_nm_string_array_demarshal (value, (GPtrArray **) field))
 		return FALSE;
 
-	nm_object_queue_notify (object, NM_IP4_CONFIG_DOMAINS);
+	_nm_object_queue_notify (object, NM_IP4_CONFIG_DOMAINS);
 	return TRUE;
 }
 
@@ -82,7 +82,7 @@ demarshal_ip4_routes_array (NMObject *object, GParamSpec *pspec, GValue *value,
 	priv->routes = NULL;
 
 	priv->routes = nm_utils_ip4_routes_from_gvalue (value);
-	nm_object_queue_notify (object, NM_IP4_CONFIG_ROUTES);
+	_nm_object_queue_notify (object, NM_IP4_CONFIG_ROUTES);
 
 	return TRUE;
 }
@@ -93,14 +93,14 @@ register_for_property_changed (NMIP4Config *config)
 	NMIP4ConfigPrivate *priv = NM_IP4_CONFIG_GET_PRIVATE (config);
 	const NMPropertiesChangedInfo property_changed_info[] = {
 		{ NM_IP4_CONFIG_ADDRESSES,   demarshal_ip4_address_array,  &priv->addresses },
-		{ NM_IP4_CONFIG_HOSTNAME,    nm_object_demarshal_generic,  &priv->hostname },
+		{ NM_IP4_CONFIG_HOSTNAME,    _nm_object_demarshal_generic,  &priv->hostname },
 		{ NM_IP4_CONFIG_NAMESERVERS, demarshal_ip4_array,          &priv->nameservers },
 		{ NM_IP4_CONFIG_DOMAINS,     demarshal_domains,            &priv->domains },
 		{ NM_IP4_CONFIG_ROUTES,      demarshal_ip4_routes_array,   &priv->routes },
 		{ NULL },
 	};
 
-	nm_object_handle_properties_changed (NM_OBJECT (config),
+	_nm_object_handle_properties_changed (NM_OBJECT (config),
 	                                     priv->proxy,
 	                                     property_changed_info);
 }
@@ -304,7 +304,7 @@ nm_ip4_config_get_addresses (NMIP4Config *config)
 	if (priv->addresses)
 		return priv->addresses;
 
-	if (!nm_object_get_property (NM_OBJECT (config),
+	if (!_nm_object_get_property (NM_OBJECT (config),
 	                             "org.freedesktop.DBus.Properties",
 	                             "Addresses",
 	                             &value)) {
@@ -335,7 +335,7 @@ nm_ip4_config_get_hostname (NMIP4Config *config)
 
 	priv = NM_IP4_CONFIG_GET_PRIVATE (config);
 	if (!priv->hostname) {
-		priv->hostname = nm_object_get_string_property (NM_OBJECT (config),
+		priv->hostname = _nm_object_get_string_property (NM_OBJECT (config),
 		                                                NM_DBUS_INTERFACE_IP4_CONFIG,
 		                                                "Hostname");
 	}
@@ -363,7 +363,7 @@ nm_ip4_config_get_nameservers (NMIP4Config *config)
 
 	priv = NM_IP4_CONFIG_GET_PRIVATE (config);
 	if (!priv->nameservers) {
-		if (nm_object_get_property (NM_OBJECT (config),
+		if (_nm_object_get_property (NM_OBJECT (config),
 		                            NM_DBUS_INTERFACE_IP4_CONFIG,
 		                            "Nameservers",
 		                            &value)) {
@@ -399,7 +399,7 @@ nm_ip4_config_get_domains (NMIP4Config *config)
 	if (priv->domains)
 		return handle_ptr_array_return (priv->domains);
 
-	if (nm_object_get_property (NM_OBJECT (config),
+	if (_nm_object_get_property (NM_OBJECT (config),
 								NM_DBUS_INTERFACE_IP4_CONFIG,
 								"Domains",
 								&value)) {
@@ -438,7 +438,7 @@ nm_ip4_config_get_routes (NMIP4Config *config)
 	if (priv->routes)
 		return priv->routes;
 
-	if (!nm_object_get_property (NM_OBJECT (config),
+	if (!_nm_object_get_property (NM_OBJECT (config),
 	                             "org.freedesktop.DBus.Properties",
 	                             "Routes",
 	                             &value)) {
diff --git a/libnm-glib/nm-object-cache.c b/libnm-glib/nm-object-cache.c
index 3f542261ae..b7c5d7ec73 100644
--- a/libnm-glib/nm-object-cache.c
+++ b/libnm-glib/nm-object-cache.c
@@ -35,21 +35,21 @@ _init_cache (void)
 }
 
 void
-nm_object_cache_remove_by_path (const char *path)
+_nm_object_cache_remove_by_path (const char *path)
 {
 	_init_cache ();
 	g_hash_table_remove (cache, path);
 }
 
 void
-nm_object_cache_remove_by_object (NMObject *object)
+_nm_object_cache_remove_by_object (NMObject *object)
 {
 	_init_cache ();
 	g_hash_table_remove (cache, nm_object_get_path (object));
 }
 
 void
-nm_object_cache_add (NMObject *object)
+_nm_object_cache_add (NMObject *object)
 {
 	char *path;
 
@@ -57,11 +57,11 @@ nm_object_cache_add (NMObject *object)
 	path = g_strdup (nm_object_get_path (object));
 	g_hash_table_insert (cache, path, object);
 	g_object_set_data_full (G_OBJECT (object), "nm-object-cache-tag",
-	                        path, (GDestroyNotify) nm_object_cache_remove_by_path);
+	                        path, (GDestroyNotify) _nm_object_cache_remove_by_path);
 }
 
 NMObject *
-nm_object_cache_get (const char *path)
+_nm_object_cache_get (const char *path)
 {
 	NMObject *object;
 
diff --git a/libnm-glib/nm-object-cache.h b/libnm-glib/nm-object-cache.h
index be5f267e6f..b882cb7d35 100644
--- a/libnm-glib/nm-object-cache.h
+++ b/libnm-glib/nm-object-cache.h
@@ -29,10 +29,10 @@
 
 G_BEGIN_DECLS
 
-NMObject *nm_object_cache_get (const char *path);
-void nm_object_cache_add (NMObject *object);
-void nm_object_cache_remove_by_object (NMObject *object);
-void nm_object_cache_remove_by_path (const char *path);
+NMObject *_nm_object_cache_get (const char *path);
+void _nm_object_cache_add (NMObject *object);
+void _nm_object_cache_remove_by_object (NMObject *object);
+void _nm_object_cache_remove_by_path (const char *path);
 
 G_END_DECLS
 
diff --git a/libnm-glib/nm-object-private.h b/libnm-glib/nm-object-private.h
index 5633ab1647..288fddf6d4 100644
--- a/libnm-glib/nm-object-private.h
+++ b/libnm-glib/nm-object-private.h
@@ -15,55 +15,55 @@ typedef struct {
 } NMPropertiesChangedInfo;
 
 
-void             nm_object_handle_properties_changed (NMObject *object,
+void             _nm_object_handle_properties_changed (NMObject *object,
                                                       DBusGProxy *proxy,
                                                       const NMPropertiesChangedInfo *info);
 
-gboolean nm_object_demarshal_generic (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field);
+gboolean _nm_object_demarshal_generic (NMObject *object, GParamSpec *pspec, GValue *value, gpointer field);
 
-void nm_object_queue_notify (NMObject *object, const char *property);
+void _nm_object_queue_notify (NMObject *object, const char *property);
 
 /* DBus property accessors */
 
-gboolean nm_object_get_property (NMObject *object,
+gboolean _nm_object_get_property (NMObject *object,
 								 const char *interface,
 								 const char *prop_name,
 								 GValue *value);
 
-void nm_object_set_property (NMObject *object,
+void _nm_object_set_property (NMObject *object,
 							 const char *interface,
 							 const char *prop_name,
 							 GValue *value);
 
-char *nm_object_get_string_property (NMObject *object,
+char *_nm_object_get_string_property (NMObject *object,
 									 const char *interface,
 									 const char *prop_name);
 
-char *nm_object_get_object_path_property (NMObject *object,
+char *_nm_object_get_object_path_property (NMObject *object,
 										  const char *interface,
 										  const char *prop_name);
 
-gint32 nm_object_get_int_property (NMObject *object,
+gint32 _nm_object_get_int_property (NMObject *object,
 								   const char *interface,
 								   const char *prop_name);
 
-guint32 nm_object_get_uint_property (NMObject *object,
+guint32 _nm_object_get_uint_property (NMObject *object,
 									 const char *interface,
 									 const char *prop_name);
 
-gboolean nm_object_get_boolean_property (NMObject *object,
+gboolean _nm_object_get_boolean_property (NMObject *object,
 										const char *interface,
 										const char *prop_name);
 
-gint8 nm_object_get_byte_property (NMObject *object,
+gint8 _nm_object_get_byte_property (NMObject *object,
 								   const char *interface,
 								   const char *prop_name);
 
-gdouble nm_object_get_double_property (NMObject *object,
+gdouble _nm_object_get_double_property (NMObject *object,
 									   const char *interface,
 									   const char *prop_name);
 
-GByteArray *nm_object_get_byte_array_property (NMObject *object,
+GByteArray *_nm_object_get_byte_array_property (NMObject *object,
 											   const char *interface,
 											   const char *prop_name);
 
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index b981306ed2..b4cf9c7067 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -57,7 +57,7 @@ constructor (GType type,
 	if (!object)
 		return NULL;
 
-	nm_object_cache_add (NM_OBJECT (object));
+	_nm_object_cache_add (NM_OBJECT (object));
 
 	priv = NM_OBJECT_GET_PRIVATE (object);
 
@@ -250,7 +250,7 @@ deferred_notify_cb (gpointer data)
 }
 
 void
-nm_object_queue_notify (NMObject *object, const char *property)
+_nm_object_queue_notify (NMObject *object, const char *property)
 {
 	NMObjectPrivate *priv;
 	gboolean found = FALSE;
@@ -345,7 +345,7 @@ properties_changed_proxy (DBusGProxy *proxy,
 }
 
 void
-nm_object_handle_properties_changed (NMObject *object,
+_nm_object_handle_properties_changed (NMObject *object,
                                      DBusGProxy *proxy,
                                      const NMPropertiesChangedInfo *info)
 {
@@ -397,7 +397,7 @@ nm_object_handle_properties_changed (NMObject *object,
 		}
 
 gboolean
-nm_object_demarshal_generic (NMObject *object,
+_nm_object_demarshal_generic (NMObject *object,
                              GParamSpec *pspec,
                              GValue *value,
                              gpointer field)
@@ -436,7 +436,7 @@ nm_object_demarshal_generic (NMObject *object,
 
 done:
 	if (success) {
-		nm_object_queue_notify (object, pspec->name);
+		_nm_object_queue_notify (object, pspec->name);
 	} else {
 		g_warning ("%s: %s/%s (type %s) couldn't be set with type %s.",
 		           __func__, G_OBJECT_TYPE_NAME (object), pspec->name,
@@ -446,7 +446,7 @@ done:
 }
 
 gboolean
-nm_object_get_property (NMObject *object,
+_nm_object_get_property (NMObject *object,
 						const char *interface,
 						const char *prop_name,
 						GValue *value)
@@ -478,7 +478,7 @@ nm_object_get_property (NMObject *object,
 }
 
 void
-nm_object_set_property (NMObject *object,
+_nm_object_set_property (NMObject *object,
 						const char *interface,
 						const char *prop_name,
 						GValue *value)
@@ -497,14 +497,14 @@ nm_object_set_property (NMObject *object,
 }
 
 char *
-nm_object_get_string_property (NMObject *object,
+_nm_object_get_string_property (NMObject *object,
 							   const char *interface,
 							   const char *prop_name)
 {
 	char *str = NULL;
 	GValue value = {0,};
 
-	if (nm_object_get_property (object, interface, prop_name, &value)) {
+	if (_nm_object_get_property (object, interface, prop_name, &value)) {
 		if (G_VALUE_HOLDS_STRING (&value))
 			str = g_strdup (g_value_get_string (&value));
 		else if (G_VALUE_HOLDS (&value, DBUS_TYPE_G_OBJECT_PATH))
@@ -516,14 +516,14 @@ nm_object_get_string_property (NMObject *object,
 }
 
 char *
-nm_object_get_object_path_property (NMObject *object,
+_nm_object_get_object_path_property (NMObject *object,
 									const char *interface,
 									const char *prop_name)
 {
 	char *path = NULL;
 	GValue value = {0,};
 
-	if (nm_object_get_property (object, interface, prop_name, &value)) {
+	if (_nm_object_get_property (object, interface, prop_name, &value)) {
 		path = g_strdup (g_value_get_boxed (&value));
 		g_value_unset (&value);
 	}
@@ -532,14 +532,14 @@ nm_object_get_object_path_property (NMObject *object,
 }
 
 gint32
-nm_object_get_int_property (NMObject *object,
+_nm_object_get_int_property (NMObject *object,
 							const char *interface,
 							const char *prop_name)
 {
 	gint32 i = 0;
 	GValue value = {0,};
 
-	if (nm_object_get_property (object, interface, prop_name, &value)) {
+	if (_nm_object_get_property (object, interface, prop_name, &value)) {
 		i = g_value_get_int (&value);
 		g_value_unset (&value);
 	}
@@ -548,14 +548,14 @@ nm_object_get_int_property (NMObject *object,
 }
 
 guint32
-nm_object_get_uint_property (NMObject *object,
+_nm_object_get_uint_property (NMObject *object,
 							 const char *interface,
 							 const char *prop_name)
 {
 	guint32 i = 0;
 	GValue value = {0,};
 
-	if (nm_object_get_property (object, interface, prop_name, &value)) {
+	if (_nm_object_get_property (object, interface, prop_name, &value)) {
 		i = g_value_get_uint (&value);
 		g_value_unset (&value);
 	}
@@ -564,14 +564,14 @@ nm_object_get_uint_property (NMObject *object,
 }
 
 gboolean
-nm_object_get_boolean_property (NMObject *object,
+_nm_object_get_boolean_property (NMObject *object,
 								const char *interface,
 								const char *prop_name)
 {
 	gboolean b = FALSE;  // FIXME: somehow convey failure if needed
 	GValue value = {0,};
 
-	if (nm_object_get_property (object, interface, prop_name, &value)) {
+	if (_nm_object_get_property (object, interface, prop_name, &value)) {
 		b = g_value_get_boolean (&value);
 		g_value_unset (&value);
 	}
@@ -580,14 +580,14 @@ nm_object_get_boolean_property (NMObject *object,
 }
 
 gint8
-nm_object_get_byte_property (NMObject *object,
+_nm_object_get_byte_property (NMObject *object,
 							 const char *interface,
 							 const char *prop_name)
 {
 	gint8 b = G_MAXINT8;
 	GValue value = {0,};
 
-	if (nm_object_get_property (object, interface, prop_name, &value)) {
+	if (_nm_object_get_property (object, interface, prop_name, &value)) {
 		b = g_value_get_uchar (&value);
 		g_value_unset (&value);
 	}
@@ -596,14 +596,14 @@ nm_object_get_byte_property (NMObject *object,
 }
 
 gdouble
-nm_object_get_double_property (NMObject *object,
+_nm_object_get_double_property (NMObject *object,
 							   const char *interface,
 							   const char *prop_name)
 {
 	gdouble d = G_MAXDOUBLE;
 	GValue value = {0,};
 
-	if (nm_object_get_property (object, interface, prop_name, &value)) {
+	if (_nm_object_get_property (object, interface, prop_name, &value)) {
 		d = g_value_get_double (&value);
 		g_value_unset (&value);
 	}
@@ -612,14 +612,14 @@ nm_object_get_double_property (NMObject *object,
 }
 
 GByteArray *
-nm_object_get_byte_array_property (NMObject *object,
+_nm_object_get_byte_array_property (NMObject *object,
 								   const char *interface,
 								   const char *prop_name)
 {
 	GByteArray * array = NULL;
 	GValue value = {0,};
 
-	if (nm_object_get_property (object, interface, prop_name, &value)) {
+	if (_nm_object_get_property (object, interface, prop_name, &value)) {
 		GArray * tmp = g_value_get_boxed (&value);
 		int i;
 		unsigned char byte;
diff --git a/libnm-glib/nm-serial-device.c b/libnm-glib/nm-serial-device.c
index 2baf1a2751..a5c1b21421 100644
--- a/libnm-glib/nm-serial-device.c
+++ b/libnm-glib/nm-serial-device.c
@@ -118,7 +118,7 @@ constructor (GType type,
 											 nm_object_get_path (NM_OBJECT (object)),
 											 NM_DBUS_INTERFACE_SERIAL_DEVICE);
 
-	dbus_g_object_register_marshaller (nm_marshal_VOID__UINT_UINT,
+	dbus_g_object_register_marshaller (_nm_marshal_VOID__UINT_UINT,
 	                                   G_TYPE_NONE,
 	                                   G_TYPE_UINT, G_TYPE_UINT,
 	                                   G_TYPE_INVALID);
@@ -181,7 +181,7 @@ nm_serial_device_class_init (NMSerialDeviceClass *device_class)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMSerialDeviceClass, ppp_stats),
 					  NULL, NULL,
-					  nm_marshal_VOID__UINT_UINT,
+					  _nm_marshal_VOID__UINT_UINT,
 					  G_TYPE_NONE, 2,
 					  G_TYPE_UINT, G_TYPE_UINT);
 }
diff --git a/libnm-glib/nm-types-private.h b/libnm-glib/nm-types-private.h
index 42edad345b..817955d22e 100644
--- a/libnm-glib/nm-types-private.h
+++ b/libnm-glib/nm-types-private.h
@@ -6,10 +6,10 @@
 #include "nm-types.h"
 #include "nm-object-private.h"
 
-gboolean nm_ssid_demarshal (GValue *value, GByteArray **dest);
-gboolean nm_uint_array_demarshal (GValue *value, GArray **dest);
-gboolean nm_string_array_demarshal (GValue *value, GPtrArray **dest);
-gboolean nm_object_array_demarshal (GValue *value,
+gboolean _nm_ssid_demarshal (GValue *value, GByteArray **dest);
+gboolean _nm_uint_array_demarshal (GValue *value, GArray **dest);
+gboolean _nm_string_array_demarshal (GValue *value, GPtrArray **dest);
+gboolean _nm_object_array_demarshal (GValue *value,
                                     GPtrArray **dest,
                                     DBusGConnection *connection,
                                     NMObjectCreatorFunc func);
diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c
index 19512a20b7..f83d00a5ba 100644
--- a/libnm-glib/nm-types.c
+++ b/libnm-glib/nm-types.c
@@ -37,7 +37,7 @@ nm_ssid_get_type (void)
 }
 
 gboolean
-nm_ssid_demarshal (GValue *value, GByteArray **dest)
+_nm_ssid_demarshal (GValue *value, GByteArray **dest)
 {
 	GByteArray *array;
 
@@ -90,7 +90,7 @@ nm_uint_array_get_type (void)
 }
 
 gboolean
-nm_uint_array_demarshal (GValue *value, GArray **dest)
+_nm_uint_array_demarshal (GValue *value, GArray **dest)
 {
 	GArray *array;
 
@@ -148,7 +148,7 @@ nm_string_array_get_type (void)
 }
 
 gboolean
-nm_string_array_demarshal (GValue *value, GPtrArray **dest)
+_nm_string_array_demarshal (GValue *value, GPtrArray **dest)
 {
 	GPtrArray *array;
 
@@ -209,7 +209,7 @@ nm_object_array_get_type (void)
 }
 
 gboolean
-nm_object_array_demarshal (GValue *value,
+_nm_object_array_demarshal (GValue *value,
                            GPtrArray **dest,
                            DBusGConnection *connection,
                            NMObjectCreatorFunc func)
@@ -230,7 +230,7 @@ nm_object_array_demarshal (GValue *value,
 			GObject *object;
 
 			path = g_ptr_array_index (array, i);
-			object = G_OBJECT (nm_object_cache_get (path));
+			object = G_OBJECT (_nm_object_cache_get (path));
 			if (object) {
 				g_ptr_array_add (temp, g_object_ref (object));
 			} else {
diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c
index d9c3aa0e0c..6016da714a 100644
--- a/libnm-glib/nm-vpn-connection.c
+++ b/libnm-glib/nm-vpn-connection.c
@@ -72,7 +72,7 @@ nm_vpn_connection_get_banner (NMVPNConnection *vpn)
 		return NULL;
 
 	if (!priv->banner) {
-		priv->banner = nm_object_get_string_property (NM_OBJECT (vpn),
+		priv->banner = _nm_object_get_string_property (NM_OBJECT (vpn),
 		                                              NM_DBUS_INTERFACE_VPN_CONNECTION,
 		                                              "Banner");
 		if (priv->banner && !strlen (priv->banner)) {
@@ -92,7 +92,7 @@ nm_vpn_connection_get_vpn_state (NMVPNConnection *vpn)
 
 	priv = NM_VPN_CONNECTION_GET_PRIVATE (vpn);
 	if (priv->vpn_state == NM_VPN_CONNECTION_STATE_UNKNOWN) {
-		priv->vpn_state = nm_object_get_uint_property (NM_OBJECT (vpn),
+		priv->vpn_state = _nm_object_get_uint_property (NM_OBJECT (vpn),
 		                                           NM_DBUS_INTERFACE_VPN_CONNECTION,
 		                                           "VpnState");
 	}
@@ -145,7 +145,7 @@ constructor (GType type,
 									 nm_object_get_path (object),
 									 NM_DBUS_INTERFACE_VPN_CONNECTION);
 
-	dbus_g_object_register_marshaller (nm_marshal_VOID__UINT_UINT,
+	dbus_g_object_register_marshaller (_nm_marshal_VOID__UINT_UINT,
 	                                   G_TYPE_NONE,
 	                                   G_TYPE_UINT, G_TYPE_UINT,
 	                                   G_TYPE_INVALID);
@@ -189,7 +189,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class)
 				    G_SIGNAL_RUN_FIRST,
 				    G_STRUCT_OFFSET (NMVPNConnectionClass, vpn_state_changed),
 				    NULL, NULL,
-				    nm_marshal_VOID__UINT_UINT,
+				    _nm_marshal_VOID__UINT_UINT,
 				    G_TYPE_NONE, 2,
 				    G_TYPE_UINT, G_TYPE_UINT);
 }
diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index 9bd593f48c..2443693261 100644
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -30,7 +30,7 @@
 #include "crypto.h"
 
 GQuark
-nm_crypto_error_quark (void)
+_nm_crypto_error_quark (void)
 {
 	static GQuark quark;
 
diff --git a/libnm-util/crypto.h b/libnm-util/crypto.h
index 236a414309..0481efa4b1 100644
--- a/libnm-util/crypto.h
+++ b/libnm-util/crypto.h
@@ -51,8 +51,8 @@ enum {
 };
 
 
-#define NM_CRYPTO_ERROR nm_crypto_error_quark ()
-GQuark nm_crypto_error_quark (void);
+#define NM_CRYPTO_ERROR _nm_crypto_error_quark ()
+GQuark _nm_crypto_error_quark (void);
 
 gboolean crypto_init (GError **error);
 
diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c
index a1d6bfeb9d..d8f218dc79 100644
--- a/libnm-util/nm-param-spec-specialized.c
+++ b/libnm-util/nm-param-spec-specialized.c
@@ -446,7 +446,7 @@ param_specialized_values_cmp (GParamSpec *pspec,
 }
 
 GType
-nm_param_spec_specialized_get_type (void)
+_nm_param_spec_specialized_get_type (void)
 {
 	static GType type;
 
@@ -468,7 +468,7 @@ nm_param_spec_specialized_get_type (void)
 }
 
 GParamSpec *
-nm_param_spec_specialized (const char *name,
+_nm_param_spec_specialized (const char *name,
 					  const char *nick,
 					  const char *blurb,
 					  GType specialized_type,
diff --git a/libnm-util/nm-param-spec-specialized.h b/libnm-util/nm-param-spec-specialized.h
index 3b4109119f..a6173674da 100644
--- a/libnm-util/nm-param-spec-specialized.h
+++ b/libnm-util/nm-param-spec-specialized.h
@@ -30,14 +30,14 @@
 
 typedef struct _NMParamSpecSpecialized NMParamSpecSpecialized;
 
-#define NM_TYPE_PARAM_SPEC_SPECIALIZED (nm_param_spec_specialized_get_type ())
+#define NM_TYPE_PARAM_SPEC_SPECIALIZED (_nm_param_spec_specialized_get_type ())
 
 #define NM_IS_PARAM_SPEC_SPECIALIZED(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), NM_TYPE_PARAM_SPEC_SPECIALIZED))
 #define NM_PARAM_SPEC_SPECIALIZED(pspec)    (G_TYPE_CHECK_INSTANCE_CAST ((pspec), NM_TYPE_PARAM_SPEC_SPECIALIZED, NMParamSpecSpecialized))
 
-GType nm_param_spec_specialized_get_type (void);
+GType _nm_param_spec_specialized_get_type (void);
 
-GParamSpec *nm_param_spec_specialized (const char *name,
+GParamSpec *_nm_param_spec_specialized (const char *name,
 							    const char *nick,
 							    const char *blurb,
 							    GType specialized_type,
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 1e537a942e..fd12f7820e 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -767,7 +767,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 	/* Properties */
 	g_object_class_install_property
 		(object_class, PROP_EAP,
-		 nm_param_spec_specialized (NM_SETTING_802_1X_EAP,
+		 _nm_param_spec_specialized (NM_SETTING_802_1X_EAP,
 							   "EAP",
 							   "EAP",
 							   DBUS_TYPE_G_LIST_OF_STRING,
@@ -791,7 +791,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_CA_CERT,
-		 nm_param_spec_specialized (NM_SETTING_802_1X_CA_CERT,
+		 _nm_param_spec_specialized (NM_SETTING_802_1X_CA_CERT,
 							   "CA certificate",
 							   "CA certificate",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -807,7 +807,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_CLIENT_CERT,
-		 nm_param_spec_specialized (NM_SETTING_802_1X_CLIENT_CERT,
+		 _nm_param_spec_specialized (NM_SETTING_802_1X_CLIENT_CERT,
 							   "Client certificate",
 							   "Client certificate",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -855,7 +855,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_PHASE2_CA_CERT,
-		 nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CA_CERT,
+		 _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CA_CERT,
 							   "Phase2 CA certificate",
 							   "Phase2 CA certificate",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -871,7 +871,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_PHASE2_CLIENT_CERT,
-		 nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CLIENT_CERT,
+		 _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CLIENT_CERT,
 							   "Phase2 client certificate",
 							   "Phase2 client certificate",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -887,7 +887,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_PRIVATE_KEY,
-		 nm_param_spec_specialized (NM_SETTING_802_1X_PRIVATE_KEY,
+		 _nm_param_spec_specialized (NM_SETTING_802_1X_PRIVATE_KEY,
 							   "Private key",
 							   "Private key",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -895,7 +895,7 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_PHASE2_PRIVATE_KEY,
-		 nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY,
+		 _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY,
 							   "Phase2 private key",
 							   "Phase2 private key",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index 2e3873d509..7e8966850f 100644
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -344,7 +344,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_DNS,
-		 nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS,
+		 _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS,
 							   "DNS",
 							   "List of DNS servers",
 							   DBUS_TYPE_G_UINT_ARRAY,
@@ -352,7 +352,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_DNS_SEARCH,
-		 nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS_SEARCH,
+		 _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS_SEARCH,
 							   "DNS search",
 							   "List of DNS search domains",
 							   DBUS_TYPE_G_LIST_OF_STRING,
@@ -360,7 +360,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_ADDRESSES,
-		 nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ADDRESSES,
+		 _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ADDRESSES,
 							   "Addresses",
 							   "List of NMSettingIP4Addresses",
 							   DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT,
@@ -368,7 +368,7 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_ROUTES,
-		 nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ROUTES,
+		 _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ROUTES,
 							   "Routes",
 							   "List of NMSettingIP4Routes",
 							   DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UINT,
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 0488815171..fc6c5c7ac2 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -285,7 +285,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_DNS,
-		 nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS,
+		 _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS,
 							   "DNS",
 							   "List of DNS servers",
 							   DBUS_TYPE_G_ARRAY_OF_ARRAY_OF_UCHAR,
@@ -293,7 +293,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_DNS_SEARCH,
-		 nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS_SEARCH,
+		 _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS_SEARCH,
 							   "DNS search",
 							   "List of DNS search domains",
 							   DBUS_TYPE_G_LIST_OF_STRING,
@@ -301,7 +301,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_ADDRESSES,
-		 nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ADDRESSES,
+		 _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ADDRESSES,
 							   "Addresses",
 							   "List of NMSettingIP6Addresses",
 							   DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS,
@@ -309,7 +309,7 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_ROUTES,
-		 nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ROUTES,
+		 _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ROUTES,
 							   "Routes",
 							   "List of NMSettingIP6Addresses",
 							   DBUS_TYPE_G_ARRAY_OF_IP6_ADDRESS,
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index aa2fcfd6d2..ef9ebe15f3 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -233,7 +233,7 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_DATA,
-		 nm_param_spec_specialized (NM_SETTING_VPN_DATA,
+		 _nm_param_spec_specialized (NM_SETTING_VPN_DATA,
 							   "Data",
 							   "VPN Service specific data",
 							   DBUS_TYPE_G_MAP_OF_STRING,
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c
index f016ce77f8..0555d1264d 100644
--- a/libnm-util/nm-setting-wired.c
+++ b/libnm-util/nm-setting-wired.c
@@ -250,7 +250,7 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_MAC_ADDRESS,
-		 nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS,
+		 _nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS,
 							   "MAC Address",
 							   "Harware address",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index 83aeb25997..a2bc65a38c 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -556,7 +556,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
 
 	g_object_class_install_property
 		(object_class, PROP_PROTO,
-		 nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PROTO,
+		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PROTO,
 							   "Proto",
 							   "Proto",
 							   DBUS_TYPE_G_LIST_OF_STRING,
@@ -564,7 +564,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
 
 	g_object_class_install_property
 		(object_class, PROP_PAIRWISE,
-		 nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PAIRWISE,
+		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PAIRWISE,
 							   "Pairwise",
 							   "Pairwise",
 							   DBUS_TYPE_G_LIST_OF_STRING,
@@ -572,7 +572,7 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting
 
 	g_object_class_install_property
 		(object_class, PROP_GROUP,
-		 nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_GROUP,
+		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_GROUP,
 							   "Group",
 							   "Group",
 							   DBUS_TYPE_G_LIST_OF_STRING,
diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c
index a356bc48f5..6d06a0ee30 100644
--- a/libnm-util/nm-setting-wireless.c
+++ b/libnm-util/nm-setting-wireless.c
@@ -530,7 +530,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
 	/* Properties */
 	g_object_class_install_property
 		(object_class, PROP_SSID,
-		 nm_param_spec_specialized (NM_SETTING_WIRELESS_SSID,
+		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_SSID,
 							   "SSID",
 							   "SSID",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -562,7 +562,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_BSSID,
-		 nm_param_spec_specialized (NM_SETTING_WIRELESS_BSSID,
+		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_BSSID,
 							   "BSSID",
 							   "BSSID",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -586,7 +586,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_MAC_ADDRESS,
-		 nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS,
+		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS,
 							   "MAC Address",
 							   "Harware address",
 							   DBUS_TYPE_G_UCHAR_ARRAY,
@@ -594,7 +594,7 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class)
 
 	g_object_class_install_property
 		(object_class, PROP_SEEN_BSSIDS,
-		 nm_param_spec_specialized (NM_SETTING_WIRELESS_SEEN_BSSIDS,
+		 _nm_param_spec_specialized (NM_SETTING_WIRELESS_SEEN_BSSIDS,
 							   "Seen BSSIDS",
 							   "Seen BSSIDs",
 							   DBUS_TYPE_G_LIST_OF_STRING,
diff --git a/marshallers/Makefile.am b/marshallers/Makefile.am
index efccf5c41a..1ebda83896 100644
--- a/marshallers/Makefile.am
+++ b/marshallers/Makefile.am
@@ -18,10 +18,10 @@ EXTRA_DIST = nm-marshal.list
 CLEANFILES = $(BUILT_SOURCES)
 
 nm-marshal.h: nm-marshal.list
-	$(GLIB_GENMARSHAL) $< --prefix=nm_marshal --header > $@
+	$(GLIB_GENMARSHAL) $< --prefix=_nm_marshal --header > $@
 
 nm-marshal.c: nm-marshal.list
-	$(GLIB_GENMARSHAL) $< --prefix=nm_marshal --body > $@
+	$(GLIB_GENMARSHAL) $< --prefix=_nm_marshal --body > $@
 
 nm-marshal-main.c: nm-marshal.c nm-marshal.h
 
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index e3661a9e77..56b08bccad 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -116,7 +116,7 @@ nm_dhcp_manager_class_init (NMDHCPManagerClass *manager_class)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMDHCPManagerClass, state_changed),
 					  NULL, NULL,
-					  nm_marshal_VOID__STRING_UCHAR,
+					  _nm_marshal_VOID__STRING_UCHAR,
 					  G_TYPE_NONE, 2,
 					  G_TYPE_STRING,
 					  G_TYPE_UCHAR);
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c
index 071511792e..4e21fba746 100644
--- a/src/nm-activation-request.c
+++ b/src/nm-activation-request.c
@@ -365,7 +365,7 @@ nm_act_request_class_init (NMActRequestClass *req_class)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMActRequestClass, connection_secrets_updated),
 					  NULL, NULL,
-					  nm_marshal_VOID__OBJECT_POINTER_UINT,
+					  _nm_marshal_VOID__OBJECT_POINTER_UINT,
 					  G_TYPE_NONE, 3,
 					  G_TYPE_OBJECT, G_TYPE_POINTER, G_TYPE_UINT);
 
@@ -375,7 +375,7 @@ nm_act_request_class_init (NMActRequestClass *req_class)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMActRequestClass, connection_secrets_failed),
 					  NULL, NULL,
-					  nm_marshal_VOID__OBJECT_STRING_UINT,
+					  _nm_marshal_VOID__OBJECT_STRING_UINT,
 					  G_TYPE_NONE, 3,
 					  G_TYPE_OBJECT, G_TYPE_STRING, G_TYPE_UINT);
 
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index f2a0207f03..b0904b8624 100644
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -98,7 +98,7 @@ nm_dbus_manager_class_init (NMDBusManagerClass *klass)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMDBusManagerClass, dbus_connection_changed),
-		              NULL, NULL, nm_marshal_VOID__POINTER,
+		              NULL, NULL, _nm_marshal_VOID__POINTER,
 		              G_TYPE_NONE, 1, G_TYPE_POINTER);
 
 	nm_dbus_manager_signals[NAME_OWNER_CHANGED] =
@@ -106,7 +106,7 @@ nm_dbus_manager_class_init (NMDBusManagerClass *klass)
 		              G_OBJECT_CLASS_TYPE (object_class),
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMDBusManagerClass, name_owner_changed),
-		              NULL, NULL, nm_marshal_VOID__STRING_STRING_STRING,
+		              NULL, NULL, _nm_marshal_VOID__STRING_STRING_STRING,
 		              G_TYPE_NONE, 3, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
 	g_type_class_add_private (klass, sizeof (NMDBusManagerPrivate));
diff --git a/src/nm-device-interface.c b/src/nm-device-interface.c
index c3d578c2e8..bf5af59e8e 100644
--- a/src/nm-device-interface.c
+++ b/src/nm-device-interface.c
@@ -133,7 +133,7 @@ nm_device_interface_init (gpointer g_iface)
 				  G_SIGNAL_RUN_FIRST,
 				  G_STRUCT_OFFSET (NMDeviceInterface, state_changed),
 				  NULL, NULL,
-				  nm_marshal_VOID__UINT_UINT_UINT,
+				  _nm_marshal_VOID__UINT_UINT_UINT,
 				  G_TYPE_NONE, 3,
 				  G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);
 
diff --git a/src/nm-hal-manager.c b/src/nm-hal-manager.c
index 7286a06894..32cb705900 100644
--- a/src/nm-hal-manager.c
+++ b/src/nm-hal-manager.c
@@ -873,7 +873,7 @@ nm_hal_manager_class_init (NMHalManagerClass *klass)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMHalManagerClass, udi_added),
 					  NULL, NULL,
-					  nm_marshal_VOID__STRING_STRING_POINTER,
+					  _nm_marshal_VOID__STRING_STRING_POINTER,
 					  G_TYPE_NONE, 3,
 					  G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
 
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 4ba0c7ac75..62fbb0cf78 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -285,7 +285,7 @@ nm_manager_init (NMManager *manager)
 	                                              "/",
 	                                              NM_AUTOIP_DBUS_IFACE);
 	if (priv->aipd_proxy) {
-		dbus_g_object_register_marshaller (nm_marshal_VOID__STRING_STRING_STRING,
+		dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_STRING_STRING,
 										   G_TYPE_NONE,
 										   G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
 										   G_TYPE_INVALID);
@@ -630,7 +630,7 @@ nm_manager_class_init (NMManagerClass *manager_class)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMManagerClass, connection_added),
 					  NULL, NULL,
-				    nm_marshal_VOID__OBJECT_UINT,
+				    _nm_marshal_VOID__OBJECT_UINT,
 					  G_TYPE_NONE, 2,
 				    G_TYPE_OBJECT, G_TYPE_UINT);
 
@@ -640,7 +640,7 @@ nm_manager_class_init (NMManagerClass *manager_class)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMManagerClass, connection_updated),
 					  NULL, NULL,
-				      nm_marshal_VOID__OBJECT_UINT,
+				      _nm_marshal_VOID__OBJECT_UINT,
 					  G_TYPE_NONE, 2,
 				      G_TYPE_OBJECT, G_TYPE_UINT);
 
@@ -650,7 +650,7 @@ nm_manager_class_init (NMManagerClass *manager_class)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMManagerClass, connection_removed),
 					  NULL, NULL,
-				    nm_marshal_VOID__OBJECT_UINT,
+				    _nm_marshal_VOID__OBJECT_UINT,
 					  G_TYPE_NONE, 2,
 				    G_TYPE_OBJECT, G_TYPE_UINT);
 
diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c
index 0e9c87294f..6f1246c06c 100644
--- a/src/nm-netlink-monitor.c
+++ b/src/nm-netlink-monitor.c
@@ -173,7 +173,7 @@ nm_netlink_monitor_class_init (NMNetlinkMonitorClass *monitor_class)
 					  G_OBJECT_CLASS_TYPE (object_class),
 					  G_SIGNAL_RUN_LAST,
 					  G_STRUCT_OFFSET (NMNetlinkMonitorClass, error),
-					  NULL, NULL, nm_marshal_VOID__POINTER,
+					  NULL, NULL, _nm_marshal_VOID__POINTER,
 					  G_TYPE_NONE, 1, G_TYPE_POINTER);
 }
 
diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c
index db8dc7be60..4fa4cb4925 100644
--- a/src/nm-serial-device.c
+++ b/src/nm-serial-device.c
@@ -1142,7 +1142,7 @@ nm_serial_device_class_init (NMSerialDeviceClass *klass)
 				    G_SIGNAL_RUN_FIRST,
 				    G_STRUCT_OFFSET (NMSerialDeviceClass, ppp_stats),
 				    NULL, NULL,
-				    nm_marshal_VOID__UINT_UINT,
+				    _nm_marshal_VOID__UINT_UINT,
 				    G_TYPE_NONE, 2,
 				    G_TYPE_UINT, G_TYPE_UINT);
 
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 7693117a03..0421e2b33a 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -262,7 +262,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class)
 				    G_SIGNAL_RUN_FIRST,
 				    G_STRUCT_OFFSET (NMPPPManagerClass, ip4_config),
 				    NULL, NULL,
-				    nm_marshal_VOID__STRING_OBJECT,
+				    _nm_marshal_VOID__STRING_OBJECT,
 				    G_TYPE_NONE, 2,
 				    G_TYPE_STRING,
 				    G_TYPE_OBJECT);
@@ -273,7 +273,7 @@ nm_ppp_manager_class_init (NMPPPManagerClass *manager_class)
 				    G_SIGNAL_RUN_FIRST,
 				    G_STRUCT_OFFSET (NMPPPManagerClass, stats),
 				    NULL, NULL,
-				    nm_marshal_VOID__UINT_UINT,
+				    _nm_marshal_VOID__UINT_UINT,
 				    G_TYPE_NONE, 2,
 				    G_TYPE_UINT, G_TYPE_UINT);
 
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index 43cd167a5a..64ef224bb3 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -400,7 +400,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantInterfaceClass, state),
 		              NULL, NULL,
-		              nm_marshal_VOID__UINT_UINT,
+		              _nm_marshal_VOID__UINT_UINT,
 		              G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
 	nm_supplicant_interface_signals[REMOVED] =
@@ -436,7 +436,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantInterfaceClass, connection_state),
 		              NULL, NULL,
-		              nm_marshal_VOID__UINT_UINT,
+		              _nm_marshal_VOID__UINT_UINT,
 		              G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 
 	nm_supplicant_interface_signals[CONNECTION_ERROR] =
@@ -445,7 +445,7 @@ nm_supplicant_interface_class_init (NMSupplicantInterfaceClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantInterfaceClass, connection_error),
 		              NULL, NULL,
-		              nm_marshal_VOID__STRING_STRING,
+		              _nm_marshal_VOID__STRING_STRING,
 		              G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 }
 
@@ -703,7 +703,7 @@ nm_supplicant_interface_add_cb (DBusGProxy *proxy, DBusGProxyCall *call_id, gpoi
 
 		dbus_g_proxy_add_signal (priv->iface_proxy, "ScanResultsAvailable", G_TYPE_INVALID);
 
-		dbus_g_object_register_marshaller (nm_marshal_VOID__STRING_STRING,
+		dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_STRING,
 										   G_TYPE_NONE,
 										   G_TYPE_STRING, G_TYPE_STRING,
 										   G_TYPE_INVALID);
diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c
index 3d5d9a74a3..da4e108898 100644
--- a/src/supplicant-manager/nm-supplicant-manager.c
+++ b/src/supplicant-manager/nm-supplicant-manager.c
@@ -179,7 +179,7 @@ nm_supplicant_manager_class_init (NMSupplicantManagerClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMSupplicantManagerClass, state),
 		              NULL, NULL,
-		              nm_marshal_VOID__UINT_UINT,
+		              _nm_marshal_VOID__UINT_UINT,
 		              G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
 }
 
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index b073e977ef..78491787dc 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -1059,7 +1059,7 @@ nm_vpn_connection_class_init (NMVPNConnectionClass *connection_class)
 				    G_SIGNAL_RUN_FIRST,
 				    G_STRUCT_OFFSET (NMVPNConnectionClass, vpn_state_changed),
 				    NULL, NULL,
-				    nm_marshal_VOID__UINT_UINT,
+				    _nm_marshal_VOID__UINT_UINT,
 				    G_TYPE_NONE, 2,
 				    G_TYPE_UINT, G_TYPE_UINT);
 
diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c
index cef4a19803..26c84e402a 100644
--- a/src/vpn-manager/nm-vpn-manager.c
+++ b/src/vpn-manager/nm-vpn-manager.c
@@ -307,7 +307,7 @@ nm_vpn_manager_class_init (NMVPNManagerClass *manager_class)
 				    G_SIGNAL_RUN_FIRST,
 				    G_STRUCT_OFFSET (NMVPNManagerClass, connection_deactivated),
 				    NULL, NULL,
-				    nm_marshal_VOID__OBJECT_UINT_UINT,
+				    _nm_marshal_VOID__OBJECT_UINT_UINT,
 				    G_TYPE_NONE, 3,
 				    G_TYPE_OBJECT, G_TYPE_UINT, G_TYPE_UINT);
 
diff --git a/system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c b/system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c
index 5b5fb7a5f9..589dbd6917 100644
--- a/system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c
+++ b/system-settings/plugins/ifcfg-fedora/nm-inotify-helper.c
@@ -205,7 +205,7 @@ nm_inotify_helper_class_init (NMInotifyHelperClass *klass)
 		              G_SIGNAL_RUN_LAST,
 		              G_STRUCT_OFFSET (NMInotifyHelperClass, event),
 		              NULL, NULL,
-		              nm_marshal_VOID__POINTER_STRING,
+		              _nm_marshal_VOID__POINTER_STRING,
 		              G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_STRING);
 }
 
diff --git a/system-settings/src/nm-system-config-hal-manager.c b/system-settings/src/nm-system-config-hal-manager.c
index 70c09edca1..cb6c502f11 100644
--- a/system-settings/src/nm-system-config-hal-manager.c
+++ b/system-settings/src/nm-system-config-hal-manager.c
@@ -206,7 +206,7 @@ init_dbus (NMSystemConfigHalManager *manager, DBusGConnection *g_connection)
 	dbus_g_proxy_add_signal (priv->proxy, "DeviceRemoved", G_TYPE_STRING, G_TYPE_INVALID);
 	dbus_g_proxy_connect_signal (priv->proxy, "DeviceRemoved", G_CALLBACK (device_removed_cb), manager, NULL);
 
-	dbus_g_object_register_marshaller (nm_marshal_VOID__STRING_STRING,
+	dbus_g_object_register_marshaller (_nm_marshal_VOID__STRING_STRING,
 									   G_TYPE_NONE,
 									   G_TYPE_STRING, G_TYPE_STRING,
 									   G_TYPE_INVALID);
@@ -307,7 +307,7 @@ nm_system_config_hal_manager_class_init (NMSystemConfigHalManagerClass *manager_
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMSystemConfigHalManagerClass, device_added),
 					  NULL, NULL,
-					  nm_marshal_VOID__STRING_UINT,
+					  _nm_marshal_VOID__STRING_UINT,
 					  G_TYPE_NONE, 2,
 					  G_TYPE_STRING,
 					  G_TYPE_UINT);
@@ -318,7 +318,7 @@ nm_system_config_hal_manager_class_init (NMSystemConfigHalManagerClass *manager_
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMSystemConfigHalManagerClass, device_removed),
 					  NULL, NULL,
-					  nm_marshal_VOID__STRING_UINT,
+					  _nm_marshal_VOID__STRING_UINT,
 					  G_TYPE_NONE, 2,
 					  G_TYPE_STRING,
 					  G_TYPE_UINT);