diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c
index 657a1d9b8d..ca57ae595a 100644
--- a/src/dhcp-manager/nm-dhcp-listener.c
+++ b/src/dhcp-manager/nm-dhcp-listener.c
@@ -194,16 +194,7 @@ dis_connection_cb (NMDBusManager *mgr,
 
 /***************************************************/
 
-NMDhcpListener *
-nm_dhcp_listener_get (void)
-{
-	static NMDhcpListener *singleton = NULL;
-
-	if (G_UNLIKELY (singleton == NULL))
-		singleton = g_object_new (NM_TYPE_DHCP_LISTENER, NULL);
-	g_assert (singleton);
-	return singleton;
-}
+NM_DEFINE_SINGLETON_GETTER (NMDhcpListener, nm_dhcp_listener_get, NM_TYPE_DHCP_LISTENER);
 
 static void
 nm_dhcp_listener_init (NMDhcpListener *self)
diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c
index a55ad5b00f..82cc463518 100644
--- a/src/nm-default-route-manager.c
+++ b/src/nm-default-route-manager.c
@@ -60,7 +60,7 @@ typedef struct {
 
 G_DEFINE_TYPE (NMDefaultRouteManager, nm_default_route_manager, G_TYPE_OBJECT)
 
-static NMDefaultRouteManager *singleton_instance;
+NM_DEFINE_SINGLETON_GETTER (NMDefaultRouteManager, nm_default_route_manager_get, NM_TYPE_DEFAULT_ROUTE_MANAGER);
 
 #define _LOG(level, addr_family, ...) \
     G_STMT_START { \
@@ -1173,18 +1173,6 @@ static const VTableIP vtable_ip6 = {
 
 /***********************************************************************************/
 
-NMDefaultRouteManager *
-nm_default_route_manager_get ()
-{
-	if (G_UNLIKELY (!singleton_instance)) {
-		singleton_instance = NM_DEFAULT_ROUTE_MANAGER (g_object_new (NM_TYPE_DEFAULT_ROUTE_MANAGER, NULL));
-		g_object_add_weak_pointer (G_OBJECT (singleton_instance), (gpointer *) &singleton_instance);
-	}
-	return singleton_instance;
-}
-
-/***********************************************************************************/
-
 static gboolean
 _resync_idle_now (NMDefaultRouteManager *self)
 {