diff --git a/callouts/Makefile.am b/callouts/Makefile.am
index 385537ef62..7acb6f0230 100644
--- a/callouts/Makefile.am
+++ b/callouts/Makefile.am
@@ -54,10 +54,10 @@ nm_dispatcher_action_CPPFLAGS = \
 	-DLIBEXECDIR=\"$(libexecdir)\"
 
 nm_dispatcher_action_LDADD = \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS) \
 	$(top_builddir)/libnm-glib/libnm_glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
 
 nm-dispatcher-glue.h: nm-dispatcher.xml
 	dbus-binding-tool --prefix=nm_dispatcher --mode=glib-server --output=$@ $<
diff --git a/libnm-util/tests/Makefile.am b/libnm-util/tests/Makefile.am
index 1cf19cbc46..ea34ebc38a 100644
--- a/libnm-util/tests/Makefile.am
+++ b/libnm-util/tests/Makefile.am
@@ -14,9 +14,9 @@ test_settings_defaults_CPPFLAGS = \
 	$(DBUS_CFLAGS)
 
 test_settings_defaults_LDADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS) \
-	$(DBUS_LIBS) \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(DBUS_LIBS)
 
 test_crypto_SOURCES = \
 	test-crypto.c
@@ -25,8 +25,8 @@ test_crypto_CPPFLAGS = \
 	$(GLIB_CFLAGS)
 
 test_crypto_LDADD = \
-	$(GLIB_LIBS) \
-	$(top_builddir)/libnm-util/libtest-crypto.la
+	$(top_builddir)/libnm-util/libtest-crypto.la \
+	$(GLIB_LIBS)
 
 
 if WITH_TESTS
diff --git a/src/Makefile.am b/src/Makefile.am
index 915e972daa..7c198f46d8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,10 +44,10 @@ libtest_dhcp_la_CPPFLAGS = \
 	$(LIBNL_CFLAGS)
 
 libtest_dhcp_la_LIBADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS) \
 	$(DBUS_LIBS) \
-	$(LIBNL_LIBS) \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(LIBNL_LIBS)
 
 
 ###########################################
@@ -178,12 +178,6 @@ NetworkManager_CPPFLAGS = \
 	-DARP_DEBUG
 
 NetworkManager_LDADD = \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS) \
-	$(HAL_LIBS) \
-	$(GUDEV_LIBS) \
-	$(LIBNL_LIBS) \
-	$(GMODULE_LIBS) \
 	$(top_builddir)/marshallers/libmarshallers.la \
 	./named-manager/libnamed-manager.la \
 	./vpn-manager/libvpn-manager.la \
@@ -195,7 +189,13 @@ NetworkManager_LDADD = \
 	./bluez-manager/libbluez-manager.la \
 	./system-settings/libsystem-settings.la \
 	./backends/libnmbackend.la \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS) \
+	$(HAL_LIBS) \
+	$(GUDEV_LIBS) \
+	$(LIBNL_LIBS) \
+	$(GMODULE_LIBS)
 
 NetworkManager_LDFLAGS = -rdynamic
 
diff --git a/src/bluez-manager/Makefile.am b/src/bluez-manager/Makefile.am
index 17d149a68b..a96cbe8910 100644
--- a/src/bluez-manager/Makefile.am
+++ b/src/bluez-manager/Makefile.am
@@ -29,8 +29,8 @@ libbluez_manager_la_CPPFLAGS = \
 	-DLOCALSTATEDIR=\"$(localstatedir)\"
 
 libbluez_manager_la_LIBADD = \
+	$(top_builddir)/marshallers/libmarshallers.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
-	$(BLUEZ_LIBS) \
-	$(top_builddir)/marshallers/libmarshallers.la
+	$(BLUEZ_LIBS)
 
diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am
index 409e5a3133..518bc41097 100644
--- a/src/dhcp-manager/Makefile.am
+++ b/src/dhcp-manager/Makefile.am
@@ -26,9 +26,9 @@ libdhcp_manager_la_CPPFLAGS = \
 	-DDHCP_CLIENT_PATH=\"$(DHCP_CLIENT_PATH)\"
 
 libdhcp_manager_la_LIBADD = \
+	$(top_builddir)/marshallers/libmarshallers.la \
 	$(DBUS_LIBS) \
-	$(GLIB_LIBS) \
-	$(top_builddir)/marshallers/libmarshallers.la
+	$(GLIB_LIBS)
 
 EXTRA_DIST = \
 	     nm-dhcp-dhclient.c \
diff --git a/src/modem-manager/Makefile.am b/src/modem-manager/Makefile.am
index 5b660d05b8..fef879ac44 100644
--- a/src/modem-manager/Makefile.am
+++ b/src/modem-manager/Makefile.am
@@ -21,8 +21,8 @@ libmodem_manager_la_CPPFLAGS = \
 	$(DBUS_CFLAGS)
 
 libmodem_manager_la_LIBADD = \
-	$(DBUS_LIBS) \
-	$(top_builddir)/marshallers/libmarshallers.la
+	$(top_builddir)/marshallers/libmarshallers.la \
+	$(DBUS_LIBS)
 
 nm-device-cdma-glue.h: $(top_srcdir)/introspection/nm-device-cdma.xml
 	dbus-binding-tool --prefix=nm_device_cdma --mode=glib-server --output=$@ $<
diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am
index e5274e679b..ed8c3e9290 100644
--- a/src/ppp-manager/Makefile.am
+++ b/src/ppp-manager/Makefile.am
@@ -28,9 +28,9 @@ libppp_manager_la_CPPFLAGS = \
 	-DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
 
 libppp_manager_la_LIBADD = \
+	$(top_builddir)/marshallers/libmarshallers.la \
 	$(DBUS_LIBS) \
-	$(GLIB_LIBS) \
-	$(top_builddir)/marshallers/libmarshallers.la
+	$(GLIB_LIBS)
 
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = nm-pppd-plugin.la
@@ -47,9 +47,9 @@ nm_pppd_plugin_la_CPPFLAGS = \
 nm_pppd_plugin_la_LDFLAGS = -module -avoid-version
 
 nm_pppd_plugin_la_LIBADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS) \
-	$(GLIB_LIBS) \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(GLIB_LIBS)
 
 BUILT_SOURCES = nm-ppp-manager-glue.h
 
diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am
index d613e836d6..f15ffa9dc5 100644
--- a/src/supplicant-manager/Makefile.am
+++ b/src/supplicant-manager/Makefile.am
@@ -30,7 +30,7 @@ libsupplicant_manager_la_CPPFLAGS = \
 	-DNM_LOCALSTATEDIR=\"$(localstatedir)\"
 
 libsupplicant_manager_la_LIBADD = \
+	$(top_builddir)/marshallers/libmarshallers.la \
 	$(DBUS_LIBS) \
-	$(GLIB_LIBS) \
-	$(top_builddir)/marshallers/libmarshallers.la
+	$(GLIB_LIBS)
 
diff --git a/src/supplicant-manager/tests/Makefile.am b/src/supplicant-manager/tests/Makefile.am
index 757f654d17..b5e4db61d5 100644
--- a/src/supplicant-manager/tests/Makefile.am
+++ b/src/supplicant-manager/tests/Makefile.am
@@ -14,9 +14,9 @@ test_supplicant_config_CPPFLAGS = \
 	$(DBUS_CFLAGS)
 
 test_supplicant_config_LDADD = \
-	$(DBUS_LIBS) \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la
+	$(top_builddir)/src/supplicant-manager/libsupplicant-manager.la \
+	$(DBUS_LIBS)
 
 if WITH_TESTS
 
diff --git a/src/system-settings/Makefile.am b/src/system-settings/Makefile.am
index e5c9313f6e..c5e1ce00ef 100644
--- a/src/system-settings/Makefile.am
+++ b/src/system-settings/Makefile.am
@@ -42,13 +42,13 @@ libsystem_settings_la_CPPFLAGS = \
 	-DPLUGINDIR=\"$(pkglibdir)\"
 
 libsystem_settings_la_LIBADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(top_builddir)/libnm-glib/libnm_glib.la \
+	$(top_builddir)/marshallers/libmarshallers.la \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
 	$(GMODULE_LIBS) \
-	$(POLKIT_LIBS) \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm_glib.la \
-	$(top_builddir)/marshallers/libmarshallers.la
+	$(POLKIT_LIBS)
 
 libsystem_settings_la_LDFLAGS = -rdynamic
 
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 3354e1d08e..398042ccb5 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -16,11 +16,11 @@ test_dhcp_options_CPPFLAGS = \
 	$(DBUS_CFLAGS)
 
 test_dhcp_options_LDADD = \
-	$(GLIB_LIBS) \
-	$(DBUS_LIBS) \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/src/dhcp-manager/libdhcp-manager.la \
-	$(top_builddir)/src/libtest-dhcp.la
+	$(top_builddir)/src/libtest-dhcp.la \
+	$(GLIB_LIBS) \
+	$(DBUS_LIBS)
 
 if WITH_TESTS
 
diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am
index 9b962a6127..1078603382 100644
--- a/src/vpn-manager/Makefile.am
+++ b/src/vpn-manager/Makefile.am
@@ -23,11 +23,11 @@ libvpn_manager_la_CPPFLAGS =	\
 	$(GLIB_CFLAGS)		\
 	-DG_DISABLE_DEPRECATED
 
-libvpn_manager_la_LIBADD =	\
-	$(DBUS_LIBS)		\
-	$(GLIB_LIBS)		\
+libvpn_manager_la_LIBADD = \
 	$(top_builddir)/marshallers/libmarshallers.la \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
 
 nm-vpn-connection-glue.h: $(top_srcdir)/introspection/nm-vpn-connection.xml
 	dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-server --output=$@ $<
diff --git a/system-settings/plugins/ifcfg-rh/Makefile.am b/system-settings/plugins/ifcfg-rh/Makefile.am
index e2b0a83c99..7486b5d05b 100644
--- a/system-settings/plugins/ifcfg-rh/Makefile.am
+++ b/system-settings/plugins/ifcfg-rh/Makefile.am
@@ -52,12 +52,12 @@ libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = \
 
 libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm_glib.la \
 	$(top_builddir)/marshallers/libmarshallers.la \
-	libifcfg-rh-io.la
+	libifcfg-rh-io.la \
+	$(GLIB_LIBS) \
+	$(GMODULE_LIBS)
 
 if NO_GIO
 libnm_settings_plugin_ifcfg_rh_la_LIBADD += \
diff --git a/system-settings/plugins/ifcfg-rh/tests/Makefile.am b/system-settings/plugins/ifcfg-rh/tests/Makefile.am
index cc2d7fbe8c..20d2d5d0d4 100644
--- a/system-settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/system-settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -18,10 +18,10 @@ test_ifcfg_rh_CPPFLAGS = \
 	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
 
 test_ifcfg_rh_LDADD = \
-	$(DBUS_LIBS) \
 	$(top_builddir)/libnm-glib/libnm_glib.la \
 	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/system-settings/plugins/ifcfg-rh/libifcfg-rh-io.la
+	$(top_builddir)/system-settings/plugins/ifcfg-rh/libifcfg-rh-io.la \
+	$(DBUS_LIBS)
 
 if WITH_TESTS
 
diff --git a/system-settings/plugins/ifcfg-suse/Makefile.am b/system-settings/plugins/ifcfg-suse/Makefile.am
index b83a35abc0..2db852b096 100644
--- a/system-settings/plugins/ifcfg-suse/Makefile.am
+++ b/system-settings/plugins/ifcfg-suse/Makefile.am
@@ -26,12 +26,12 @@ libnm_settings_plugin_ifcfg_suse_la_CPPFLAGS = \
 
 libnm_settings_plugin_ifcfg_suse_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifcfg_suse_la_LIBADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(top_builddir)/libnm-glib/libnm_glib.la \
 	$(GLIB_LIBS) \
 	$(GMODULE_LIBS) \
 	$(POLKIT_LIBS) \
-	$(GUDEV_LIBS) \
-	$(top_builddir)/libnm-util/libnm-util.la \
-	$(top_builddir)/libnm-glib/libnm_glib.la
+	$(GUDEV_LIBS)
 
 if NO_GIO
 libnm_settings_plugin_ifcfg_suse_la_LIBADD += \
diff --git a/system-settings/plugins/ifupdown/Makefile.am b/system-settings/plugins/ifupdown/Makefile.am
index eca264be5a..ec50311554 100644
--- a/system-settings/plugins/ifupdown/Makefile.am
+++ b/system-settings/plugins/ifupdown/Makefile.am
@@ -27,8 +27,8 @@ libnm_settings_plugin_ifupdown_la_CPPFLAGS = \
 
 libnm_settings_plugin_ifupdown_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_ifupdown_la_LIBADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
 	$(GLIB_LIBS) \
 	$(GMODULE_LIBS) \
-	$(GUDEV_LIBS) \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(GUDEV_LIBS)
 
diff --git a/system-settings/plugins/keyfile/Makefile.am b/system-settings/plugins/keyfile/Makefile.am
index dccc9d617f..5e902b3135 100644
--- a/system-settings/plugins/keyfile/Makefile.am
+++ b/system-settings/plugins/keyfile/Makefile.am
@@ -27,12 +27,12 @@ libnm_settings_plugin_keyfile_la_CPPFLAGS = \
 
 libnm_settings_plugin_keyfile_la_LDFLAGS = -module -avoid-version
 libnm_settings_plugin_keyfile_la_LIBADD = \
-	$(GLIB_LIBS) \
-	$(GMODULE_LIBS) \
-	$(DBUS_LIBS) \
 	$(top_builddir)/libnm-util/libnm-util.la \
 	$(top_builddir)/libnm-glib/libnm_glib.la \
-	$(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la
+	$(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \
+	$(GLIB_LIBS) \
+	$(GMODULE_LIBS) \
+	$(DBUS_LIBS)
 
 if NO_GIO
 libnm_settings_plugin_keyfile_la_LIBADD += \
diff --git a/system-settings/plugins/keyfile/tests/Makefile.am b/system-settings/plugins/keyfile/tests/Makefile.am
index b744f46b56..abebbe3f35 100644
--- a/system-settings/plugins/keyfile/tests/Makefile.am
+++ b/system-settings/plugins/keyfile/tests/Makefile.am
@@ -18,10 +18,10 @@ test_keyfile_CPPFLAGS = \
 	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/keyfiles\"
 
 test_keyfile_LDADD = \
-	$(DBUS_LIBS) \
 	$(top_builddir)/system-settings/plugins/keyfile/io/libkeyfile-io.la \
 	$(top_builddir)/libnm-glib/libnm_glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS)
 
 if WITH_TESTS
 
diff --git a/test/Makefile.am b/test/Makefile.am
index 47bf2a56a6..e5f0c47846 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,11 +4,10 @@ INCLUDES = -I${top_srcdir}                    \
            -I${top_srcdir}/gnome/libnm_glib   \
            -I${top_srcdir}/include
 
-AM_CPPFLAGS =						\
-	$(DBUS_CFLAGS)					\
-	$(GLIB_CFLAGS)				\
-	$(HAL_CFLAGS)					\
-	-DBINDIR=\"$(bindir)\"			\
+AM_CPPFLAGS = \
+	$(DBUS_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	-DBINDIR=\"$(bindir)\" \
 	-DNM_RUN_DIR=\"$(rundir)\" \
 	-DDATADIR=\"$(datadir)\"
 
@@ -18,23 +17,21 @@ noinst_PROGRAMS = nm-online libnm_glib_test
 
 nm_tool_SOURCES = nm-tool.c
 nm_tool_LDADD = \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS) \
-	$(HAL_LIBS) \
 	$(top_builddir)/libnm-glib/libnm_glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)
 
 nm_online_SOURCES = nm-online.c
 nm_online_LDADD = \
+	$(top_builddir)/libnm-util/libnm-util.la \
 	$(DBUS_LIBS) \
-	$(GLIB_LIBS) \
-	$(HAL_LIBS) \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(GLIB_LIBS)
 
 libnm_glib_test_SOURCES = libnm_glib_test.c
 libnm_glib_test_LDADD = \
-	$(DBUS_LIBS) \
-	$(GLIB_LIBS) \
 	$(top_builddir)/libnm-glib/libnm_glib.la \
-	$(top_builddir)/libnm-util/libnm-util.la
+	$(top_builddir)/libnm-util/libnm-util.la \
+	$(DBUS_LIBS) \
+	$(GLIB_LIBS)