diff --git a/Makefile.am b/Makefile.am
index 9e10524a9b..35c355b951 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,6 +13,8 @@ AUTOMAKE_OPTIONS = subdir-objects
 noinst_LTLIBRARIES =
 noinst_PROGRAMS =
 noinst_DATA =
+sbin_PROGRAMS =
+libexec_PROGRAMS =
 lib_LTLIBRARIES =
 CLEANFILES =
 DISTCLEANFILES =
@@ -35,6 +37,9 @@ libnminclude_HEADERS =
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
 
+rundir=$(runstatedir)/NetworkManager
+statedir=$(localstatedir)/lib/NetworkManager
+
 SUBDIRS = \
 	. \
 	src \
@@ -861,6 +866,612 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
 libnm_tests_libnm_vpn_plugin_utils_test_la_LIBADD = \
     $(GLIB_LIBS)
 
+###############################################################################
+# src/
+###############################################################################
+
+src_cppflags = \
+	-I$(top_srcdir)/shared \
+	-I$(top_builddir)/shared \
+	-I$(top_builddir)/introspection \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
+	-I$(top_srcdir)/src \
+	-I$(top_builddir)/src \
+	\
+	 $(foreach d,$(sort $(dir $(src_libNetworkManager_la_SOURCES))),-I$(srcdir)/$d) \
+	\
+	-DPREFIX=\"$(prefix)\"          \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	\
+	-DBINDIR=\"$(bindir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\" \
+	-DRUNSTATEDIR=\"$(runstatedir)\" \
+	-DSBINDIR=\"$(sbindir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DRUNDIR=\"$(rundir)\" \
+	\
+	-DNMCONFDIR=\"$(nmconfdir)\" \
+	-DNMLOCALEDIR=\"$(datadir)/locale\" \
+	-DNMPLUGINDIR=\"$(pkglibdir)\" \
+	-DNMRUNDIR=\"$(nmrundir)\" \
+	-DNMSTATEDIR=\"$(nmstatedir)\" \
+	-DNMLIBDIR=\"$(nmlibdir)\" \
+	\
+	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
+	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
+	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
+	\
+	$(GLIB_CFLAGS) \
+	$(GUDEV_CFLAGS) \
+	$(LIBNL_CFLAGS) \
+	$(LIBNDP_CFLAGS) \
+	$(LIBSOUP_CFLAGS) \
+	$(SELINUX_CFLAGS) \
+	$(LIBAUDIT_CFLAGS) \
+	$(SYSTEMD_LOGIN_CFLAGS) \
+	$(SYSTEMD_JOURNAL_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) \
+	\
+	$(NULL)
+
+src_ldflags = $(CODE_COVERAGE_LDFLAGS)
+
+sbin_PROGRAMS += \
+	src/NetworkManager
+
+libexec_PROGRAMS += \
+	src/nm-iface-helper
+
+noinst_LTLIBRARIES += \
+	src/libNetworkManagerBase.la \
+	src/libNetworkManager.la \
+	src/libNetworkManagerTest.la \
+	src/libsystemd-nm.la
+
+###############################################################################
+
+src_libsystemd_nm_la_SOURCES = \
+	src/systemd/nm-sd.c \
+	src/systemd/nm-sd.h \
+	src/systemd/sd-adapt/nm-sd-adapt.c \
+	src/systemd/sd-adapt/nm-sd-adapt.h \
+	src/systemd/sd-adapt/build.h \
+	src/systemd/sd-adapt/cgroup-util.h \
+	src/systemd/sd-adapt/condition.h \
+	src/systemd/sd-adapt/conf-parser.h \
+	src/systemd/sd-adapt/def.h \
+	src/systemd/sd-adapt/dirent-util.h \
+	src/systemd/sd-adapt/formats-util.h \
+	src/systemd/sd-adapt/gunicode.h \
+	src/systemd/sd-adapt/libudev.h \
+	src/systemd/sd-adapt/missing.h \
+	src/systemd/sd-adapt/mkdir.h \
+	src/systemd/sd-adapt/process-util.h \
+	src/systemd/sd-adapt/sd-daemon.h \
+	src/systemd/sd-adapt/stat-util.h \
+	src/systemd/sd-adapt/udev-util.h \
+	src/systemd/sd-adapt/udev.h \
+	src/systemd/sd-adapt/user-util.h \
+	src/systemd/sd-adapt/virt.h \
+	src/systemd/src/basic/alloc-util.c \
+	src/systemd/src/basic/alloc-util.h \
+	src/systemd/src/basic/async.h \
+	src/systemd/src/basic/escape.c \
+	src/systemd/src/basic/escape.h \
+	src/systemd/src/basic/ether-addr-util.c \
+	src/systemd/src/basic/ether-addr-util.h \
+	src/systemd/src/basic/extract-word.c \
+	src/systemd/src/basic/extract-word.h \
+	src/systemd/src/basic/fd-util.c \
+	src/systemd/src/basic/fd-util.h \
+	src/systemd/src/basic/fileio.c \
+	src/systemd/src/basic/fileio.h \
+	src/systemd/src/basic/fs-util.c \
+	src/systemd/src/basic/fs-util.h \
+	src/systemd/src/basic/hash-funcs.c \
+	src/systemd/src/basic/hash-funcs.h \
+	src/systemd/src/basic/hashmap.c \
+	src/systemd/src/basic/hashmap.h \
+	src/systemd/src/basic/hexdecoct.c \
+	src/systemd/src/basic/hexdecoct.h \
+	src/systemd/src/basic/hostname-util.c \
+	src/systemd/src/basic/hostname-util.h \
+	src/systemd/src/basic/in-addr-util.c \
+	src/systemd/src/basic/in-addr-util.h \
+	src/systemd/src/basic/io-util.c \
+	src/systemd/src/basic/io-util.h \
+	src/systemd/src/basic/list.h \
+	src/systemd/src/basic/log.h \
+	src/systemd/src/basic/macro.h \
+	src/systemd/src/basic/mempool.c \
+	src/systemd/src/basic/mempool.h \
+	src/systemd/src/basic/parse-util.c \
+	src/systemd/src/basic/parse-util.h \
+	src/systemd/src/basic/path-util.c \
+	src/systemd/src/basic/path-util.h \
+	src/systemd/src/basic/prioq.c \
+	src/systemd/src/basic/prioq.h \
+	src/systemd/src/basic/random-util.c \
+	src/systemd/src/basic/random-util.h \
+	src/systemd/src/basic/refcnt.h \
+	src/systemd/src/basic/set.h \
+	src/systemd/src/basic/signal-util.h \
+	src/systemd/src/basic/siphash24.c \
+	src/systemd/src/basic/siphash24.h \
+	src/systemd/src/basic/socket-util.c \
+	src/systemd/src/basic/socket-util.h \
+	src/systemd/src/basic/sparse-endian.h \
+	src/systemd/src/basic/stdio-util.h \
+	src/systemd/src/basic/string-table.c \
+	src/systemd/src/basic/string-table.h \
+	src/systemd/src/basic/string-util.c \
+	src/systemd/src/basic/string-util.h \
+	src/systemd/src/basic/strv.c \
+	src/systemd/src/basic/strv.h \
+	src/systemd/src/basic/time-util.c \
+	src/systemd/src/basic/time-util.h \
+	src/systemd/src/basic/umask-util.h \
+	src/systemd/src/basic/unaligned.h \
+	src/systemd/src/basic/utf8.c \
+	src/systemd/src/basic/utf8.h \
+	src/systemd/src/basic/util.c \
+	src/systemd/src/basic/util.h \
+	src/systemd/src/libsystemd-network/arp-util.c \
+	src/systemd/src/libsystemd-network/arp-util.h \
+	src/systemd/src/libsystemd-network/dhcp-identifier.c \
+	src/systemd/src/libsystemd-network/dhcp-identifier.h \
+	src/systemd/src/libsystemd-network/dhcp-internal.h \
+	src/systemd/src/libsystemd-network/dhcp-lease-internal.h \
+	src/systemd/src/libsystemd-network/dhcp-network.c \
+	src/systemd/src/libsystemd-network/dhcp-option.c \
+	src/systemd/src/libsystemd-network/dhcp-packet.c \
+	src/systemd/src/libsystemd-network/dhcp-protocol.h \
+	src/systemd/src/libsystemd-network/dhcp6-internal.h \
+	src/systemd/src/libsystemd-network/dhcp6-lease-internal.h \
+	src/systemd/src/libsystemd-network/dhcp6-network.c \
+	src/systemd/src/libsystemd-network/dhcp6-option.c \
+	src/systemd/src/libsystemd-network/dhcp6-protocol.h \
+	src/systemd/src/libsystemd-network/lldp-internal.h \
+	src/systemd/src/libsystemd-network/lldp-neighbor.c \
+	src/systemd/src/libsystemd-network/lldp-neighbor.h \
+	src/systemd/src/libsystemd-network/lldp-network.c \
+	src/systemd/src/libsystemd-network/lldp-network.h \
+	src/systemd/src/libsystemd-network/network-internal.c \
+	src/systemd/src/libsystemd-network/network-internal.h \
+	src/systemd/src/libsystemd-network/sd-dhcp-client.c \
+	src/systemd/src/libsystemd-network/sd-dhcp-lease.c \
+	src/systemd/src/libsystemd-network/sd-dhcp6-client.c \
+	src/systemd/src/libsystemd-network/sd-dhcp6-lease.c \
+	src/systemd/src/libsystemd-network/sd-ipv4acd.c \
+	src/systemd/src/libsystemd-network/sd-ipv4ll.c \
+	src/systemd/src/libsystemd-network/sd-lldp.c \
+	src/systemd/src/libsystemd/sd-event/sd-event.c \
+	src/systemd/src/libsystemd/sd-id128/id128-util.c \
+	src/systemd/src/libsystemd/sd-id128/id128-util.h \
+	src/systemd/src/libsystemd/sd-id128/sd-id128.c \
+	src/systemd/src/shared/dns-domain.c \
+	src/systemd/src/shared/dns-domain.h \
+	src/systemd/src/systemd/_sd-common.h \
+	src/systemd/src/systemd/sd-dhcp-client.h \
+	src/systemd/src/systemd/sd-dhcp-lease.h \
+	src/systemd/src/systemd/sd-dhcp6-client.h \
+	src/systemd/src/systemd/sd-dhcp6-lease.h \
+	src/systemd/src/systemd/sd-event.h \
+	src/systemd/src/systemd/sd-id128.h \
+	src/systemd/src/systemd/sd-ipv4acd.h \
+	src/systemd/src/systemd/sd-ipv4ll.h \
+	src/systemd/src/systemd/sd-lldp.h \
+	src/systemd/src/systemd/sd-ndisc.h
+
+src_libsystemd_nm_la_CPPFLAGS = \
+	-I$(top_srcdir)/shared/ \
+	-I$(top_builddir)/shared/ \
+	-I$(top_srcdir)/libnm-core \
+	-I$(top_builddir)/libnm-core \
+	-I$(srcdir)/src \
+	-I$(top_srcdir)/src/systemd/sd-adapt/ \
+	-I$(top_srcdir)/src/systemd/src/systemd/ \
+	-I$(top_srcdir)/src/systemd/src/basic/ \
+	-I$(top_srcdir)/src/systemd/src/shared/ \
+	-I$(top_srcdir)/src/systemd/src/libsystemd-network/ \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
+	$(GLIB_CFLAGS)
+
+src_libsystemd_nm_la_LIBADD = \
+	$(GLIB_LIBS)
+
+###############################################################################
+
+src_libNetworkManagerBase_la_CPPFLAGS = $(src_cppflags)
+
+src_libNetworkManagerBase_la_SOURCES = \
+	src/nm-core-utils.c \
+	src/nm-core-utils.h \
+	src/nm-logging.c \
+	src/nm-logging.h
+
+src_libNetworkManagerBase_la_LIBADD = \
+	$(top_builddir)/libnm-core/libnm-core.la \
+	$(GLIB_LIBS) \
+	$(SYSTEMD_JOURNAL_LIBS) \
+	$(NULL)
+
+###############################################################################
+
+src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
+
+src_libNetworkManager_la_SOURCES = \
+	\
+	src/nm-checkpoint-manager.c \
+	src/nm-checkpoint-manager.h \
+	src/nm-checkpoint.c \
+	src/nm-checkpoint.h \
+	\
+	src/devices/nm-device.c \
+	src/devices/nm-device.h \
+	src/devices/nm-lldp-listener.c \
+	src/devices/nm-lldp-listener.h \
+	src/devices/nm-arping-manager.c \
+	src/devices/nm-arping-manager.h \
+	src/devices/nm-device-ethernet-utils.c \
+	src/devices/nm-device-ethernet-utils.h \
+	src/devices/nm-device-factory.c \
+	src/devices/nm-device-factory.h \
+	src/devices/nm-device-generic.c \
+	src/devices/nm-device-generic.h \
+	src/devices/nm-device-logging.h \
+	src/devices/nm-device-private.h \
+	\
+	src/devices/nm-device-bond.c \
+	src/devices/nm-device-bond.h \
+	src/devices/nm-device-bridge.c \
+	src/devices/nm-device-bridge.h \
+	src/devices/nm-device-ethernet.c \
+	src/devices/nm-device-ethernet.h \
+	src/devices/nm-device-infiniband.c \
+	src/devices/nm-device-infiniband.h \
+	src/devices/nm-device-ip-tunnel.c \
+	src/devices/nm-device-ip-tunnel.h \
+	src/devices/nm-device-macvlan.c \
+	src/devices/nm-device-macvlan.h \
+	src/devices/nm-device-tun.c \
+	src/devices/nm-device-tun.h \
+	src/devices/nm-device-veth.c \
+	src/devices/nm-device-veth.h \
+	src/devices/nm-device-vlan.c \
+	src/devices/nm-device-vlan.h \
+	src/devices/nm-device-vxlan.c \
+	src/devices/nm-device-vxlan.h \
+	\
+	src/dhcp-manager/nm-dhcp-client.c \
+	src/dhcp-manager/nm-dhcp-client.h \
+	src/dhcp-manager/nm-dhcp-client-logging.h \
+	src/dhcp-manager/nm-dhcp-utils.c \
+	src/dhcp-manager/nm-dhcp-manager.c \
+	src/dhcp-manager/nm-dhcp-manager.h \
+	src/dhcp-manager/nm-dhcp-utils.h \
+	src/dhcp-manager/nm-dhcp-dhclient.c \
+	src/dhcp-manager/nm-dhcp-dhcpcd.c \
+	src/dhcp-manager/nm-dhcp-systemd.c \
+	src/dhcp-manager/nm-dhcp-helper-api.h \
+	src/dhcp-manager/nm-dhcp-listener.c \
+	src/dhcp-manager/nm-dhcp-listener.h \
+	src/dhcp-manager/nm-dhcp-dhclient-utils.c \
+	src/dhcp-manager/nm-dhcp-dhclient-utils.h \
+	\
+	src/dns-manager/nm-dns-dnsmasq.c \
+	src/dns-manager/nm-dns-dnsmasq.h \
+	src/dns-manager/nm-dns-systemd-resolved.c \
+	src/dns-manager/nm-dns-systemd-resolved.h \
+	src/dns-manager/nm-dns-unbound.c \
+	src/dns-manager/nm-dns-unbound.h \
+	src/dns-manager/nm-dns-manager.c \
+	src/dns-manager/nm-dns-manager.h \
+	src/dns-manager/nm-dns-plugin.c \
+	src/dns-manager/nm-dns-plugin.h \
+	\
+	src/dnsmasq-manager/nm-dnsmasq-manager.c \
+	src/dnsmasq-manager/nm-dnsmasq-manager.h \
+	src/dnsmasq-manager/nm-dnsmasq-utils.c \
+	src/dnsmasq-manager/nm-dnsmasq-utils.h \
+	\
+	src/platform/nmp-netns.c \
+	src/platform/nmp-netns.h \
+	src/platform/nmp-object.c \
+	src/platform/nmp-object.h \
+	src/platform/nm-platform-utils.c \
+	src/platform/nm-platform-utils.h \
+	src/platform/nm-platform.c \
+	src/platform/nm-platform.h \
+	src/platform/nm-linux-platform.c \
+	src/platform/nm-linux-platform.h \
+	src/platform/wifi/wifi-utils-nl80211.c \
+	src/platform/wifi/wifi-utils-nl80211.h \
+	src/platform/wifi/wifi-utils-private.h \
+	src/platform/wifi/wifi-utils.c \
+	src/platform/wifi/wifi-utils.h \
+	\
+	src/rdisc/nm-lndp-rdisc.c \
+	src/rdisc/nm-lndp-rdisc.h \
+	src/rdisc/nm-rdisc.c \
+	src/rdisc/nm-rdisc.h \
+	src/rdisc/nm-rdisc-private.h \
+	\
+	src/ppp-manager/nm-ppp-manager.c \
+	src/ppp-manager/nm-ppp-manager.h \
+	src/ppp-manager/nm-ppp-status.h \
+	\
+	src/settings/nm-agent-manager.c \
+	src/settings/nm-agent-manager.h \
+	src/settings/nm-inotify-helper.c \
+	src/settings/nm-inotify-helper.h \
+	src/settings/nm-secret-agent.c \
+	src/settings/nm-secret-agent.h \
+	src/settings/nm-settings-connection.c \
+	src/settings/nm-settings-connection.h \
+	src/settings/nm-settings-plugin.c \
+	src/settings/nm-settings-plugin.h \
+	src/settings/nm-settings.c \
+	src/settings/nm-settings.h \
+	\
+	src/settings/plugins/keyfile/nms-keyfile-connection.c \
+	src/settings/plugins/keyfile/nms-keyfile-connection.h \
+	src/settings/plugins/keyfile/nms-keyfile-plugin.c \
+	src/settings/plugins/keyfile/nms-keyfile-plugin.h \
+	src/settings/plugins/keyfile/nms-keyfile-reader.c \
+	src/settings/plugins/keyfile/nms-keyfile-reader.h \
+	src/settings/plugins/keyfile/nms-keyfile-utils.c \
+	src/settings/plugins/keyfile/nms-keyfile-utils.h \
+	src/settings/plugins/keyfile/nms-keyfile-writer.c \
+	src/settings/plugins/keyfile/nms-keyfile-writer.h \
+	\
+	src/supplicant-manager/nm-supplicant-config.c \
+	src/supplicant-manager/nm-supplicant-config.h \
+	src/supplicant-manager/nm-supplicant-interface.c \
+	src/supplicant-manager/nm-supplicant-interface.h \
+	src/supplicant-manager/nm-supplicant-manager.c \
+	src/supplicant-manager/nm-supplicant-manager.h \
+	src/supplicant-manager/nm-supplicant-settings-verify.c \
+	src/supplicant-manager/nm-supplicant-settings-verify.h \
+	src/supplicant-manager/nm-supplicant-types.h \
+	\
+	src/vpn-manager/nm-vpn-connection.c \
+	src/vpn-manager/nm-vpn-connection.h \
+	src/vpn-manager/nm-vpn-manager.c \
+	src/vpn-manager/nm-vpn-manager.h \
+	\
+	src/nm-act-request.c \
+	src/nm-act-request.h \
+	src/nm-active-connection.c \
+	src/nm-active-connection.h \
+	src/nm-audit-manager.c \
+	src/nm-audit-manager.h \
+	src/nm-bus-manager.c \
+	src/nm-bus-manager.h \
+	src/nm-config.c \
+	src/nm-config.h \
+	src/nm-config-data.c \
+	src/nm-config-data.h \
+	src/nm-connectivity.c \
+	src/nm-connectivity.h \
+	src/nm-dcb.c \
+	src/nm-dcb.h \
+	src/nm-route-manager.c \
+	src/nm-route-manager.h \
+	src/nm-default-route-manager.c \
+	src/nm-default-route-manager.h \
+	src/nm-dhcp4-config.c \
+	src/nm-dhcp4-config.h \
+	src/nm-dhcp6-config.c \
+	src/nm-dhcp6-config.h \
+	src/nm-dispatcher.c \
+	src/nm-dispatcher.h \
+	src/nm-src-enum-types.c \
+	src/nm-src-enum-types.h \
+	src/nm-exported-object.c \
+	src/nm-exported-object.h \
+	src/nm-firewall-manager.c \
+	src/nm-firewall-manager.h \
+	src/nm-proxy-config.c \
+	src/nm-proxy-config.h \
+	src/nm-ip4-config.c \
+	src/nm-ip4-config.h \
+	src/nm-ip6-config.c \
+	src/nm-ip6-config.h \
+	src/nm-auth-manager.c \
+	src/nm-auth-manager.h \
+	src/nm-auth-subject.c \
+	src/nm-auth-subject.h \
+	src/nm-auth-utils.c \
+	src/nm-auth-utils.h \
+	src/nm-manager.c \
+	src/nm-manager.h \
+	src/nm-multi-index.c \
+	src/nm-multi-index.h \
+	src/nm-pacrunner-manager.c \
+	src/nm-pacrunner-manager.h \
+	src/nm-policy.c \
+	src/nm-policy.h \
+	src/nm-rfkill-manager.c \
+	src/nm-rfkill-manager.h \
+	src/nm-session-monitor.h \
+	src/nm-session-monitor.c \
+	src/nm-sleep-monitor.c \
+	src/nm-sleep-monitor.h \
+	src/nm-types.h \
+	src/NetworkManagerUtils.c \
+	src/NetworkManagerUtils.h \
+	$(NULL)
+
+if WITH_WEXT
+src_libNetworkManager_la_SOURCES += \
+	src/platform/wifi/wifi-utils-wext.c \
+	src/platform/wifi/wifi-utils-wext.h
+endif
+
+
+src_libNetworkManager_la_LIBADD = \
+	libnm-core/libnm-core.la \
+	introspection/libnmdbus.la \
+	src/libNetworkManagerBase.la \
+	src/libsystemd-nm.la \
+	$(GLIB_LIBS) \
+	$(GUDEV_LIBS) \
+	$(LIBNL_LIBS) \
+	$(SYSTEMD_LOGIN_LIBS) \
+	$(LIBNDP_LIBS) \
+	$(DL_LIBS) \
+	$(LIBM) \
+	$(SELINUX_LIBS) \
+	$(LIBAUDIT_LIBS)
+
+if WITH_LIBSOUP
+src_libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS)
+endif
+
+###############################################################################
+
+src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags)
+
+src_libNetworkManagerTest_la_SOURCES = \
+	src/rdisc/nm-fake-rdisc.c \
+	src/rdisc/nm-fake-rdisc.h \
+	src/platform/nm-fake-platform.c \
+	src/platform/nm-fake-platform.h
+
+src_libNetworkManagerTest_la_LIBADD = \
+	src/libNetworkManager.la
+
+###############################################################################
+
+EXTRA_src_NetworkManager_DEPENDENCIES = \
+	src/NetworkManager.ver
+
+src_NetworkManager_CPPFLAGS = $(src_cppflags)
+
+src_NetworkManager_SOURCES = \
+	src/main-utils.c \
+	src/main-utils.h \
+	src/main.c
+
+src_NetworkManager_LDADD = \
+	src/libNetworkManager.la
+
+src_NetworkManager_LDFLAGS = \
+	-rdynamic \
+	-Wl,--version-script="$(srcdir)/src/NetworkManager.ver"
+
+###############################################################################
+
+src_nm_iface_helper_CPPFLAGS = \
+	$(src_cppflags) \
+	-DNM_DHCP_INTERNAL_ONLY
+
+src_nm_iface_helper_SOURCES = \
+	\
+	src/dhcp-manager/nm-dhcp-client.c \
+	src/dhcp-manager/nm-dhcp-client.h \
+	src/dhcp-manager/nm-dhcp-client-logging.h \
+	src/dhcp-manager/nm-dhcp-utils.c \
+	src/dhcp-manager/nm-dhcp-utils.h \
+	src/dhcp-manager/nm-dhcp-manager.c \
+	src/dhcp-manager/nm-dhcp-manager.h \
+	src/dhcp-manager/nm-dhcp-systemd.c \
+	\
+	src/platform/nmp-netns.c \
+	src/platform/nmp-netns.h \
+	src/platform/nmp-object.c \
+	src/platform/nmp-object.h \
+	src/platform/nm-platform-utils.c \
+	src/platform/nm-platform-utils.h \
+	src/platform/nm-platform.c \
+	src/platform/nm-platform.h \
+	src/platform/nm-linux-platform.c \
+	src/platform/nm-linux-platform.h \
+	src/platform/wifi/wifi-utils-nl80211.c \
+	src/platform/wifi/wifi-utils-nl80211.h \
+	src/platform/wifi/wifi-utils-private.h \
+	src/platform/wifi/wifi-utils.c \
+	src/platform/wifi/wifi-utils.h \
+	\
+	src/nm-pacrunner-manager.c \
+	src/nm-pacrunner-manager.h \
+	\
+	src/rdisc/nm-lndp-rdisc.c \
+	src/rdisc/nm-lndp-rdisc.h \
+	src/rdisc/nm-rdisc.c \
+	src/rdisc/nm-rdisc.h \
+	\
+	src/nm-route-manager.c \
+	src/nm-route-manager.h \
+	\
+	src/nm-exported-object.c \
+	src/nm-exported-object.h \
+	src/nm-proxy-config.c \
+	src/nm-proxy-config.h \
+	src/nm-ip4-config.c \
+	src/nm-ip4-config.h \
+	src/nm-ip6-config.c \
+	src/nm-ip6-config.h \
+	\
+	src/nm-src-enum-types.c \
+	src/nm-src-enum-types.h \
+	src/nm-multi-index.c \
+	src/nm-multi-index.h \
+	src/NetworkManagerUtils.c \
+	src/NetworkManagerUtils.h \
+	\
+	src/nm-iface-helper.c \
+	src/main-utils.c \
+	src/main-utils.h
+
+if WITH_WEXT
+src_nm_iface_helper_SOURCES += \
+	src/platform/wifi/wifi-utils-wext.c \
+	src/platform/wifi/wifi-utils-wext.h
+endif
+
+src_nm_iface_helper_LDADD = \
+	libnm-core/libnm-core.la \
+	introspection/libnmdbus.la \
+	src/libNetworkManagerBase.la \
+	src/libsystemd-nm.la \
+	$(GLIB_LIBS) \
+	$(GUDEV_LIBS) \
+	$(LIBNL_LIBS) \
+	$(LIBNDP_LIBS) \
+	$(DL_LIBS) \
+	$(LIBM)
+
+src_nm_iface_helper_LDFLAGS = \
+	-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
+
+###############################################################################
+
+GLIB_GENERATED += \
+	src/nm-src-enum-types.h \
+	src/nm-src-enum-types.c
+nm_src_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
+nm_src_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
+nm_src_enum_types_sources = $(filter-out \
+                              %/nm-device-private.h \
+                              %/nm-rdisc-private.h \
+                              %/wifi-utils-private.h \
+                              %/nm-dhcp-client-logging.h \
+                              %/nm-device-logging.h \
+                              , $(src_libNetworkManager_la_SOURCES))
+
+###############################################################################
+
+EXTRA_DIST += \
+	src/org.freedesktop.NetworkManager.conf \
+	src/nm-test-utils-core.h \
+	src/NetworkManager.ver
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
@@ -869,6 +1480,9 @@ gir_DATA = $(INTROSPECTION_GIRS)
 typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
+dbusservicedir = $(DBUS_SYS_DIR)
+dbusservice_DATA = src/org.freedesktop.NetworkManager.conf
+
 ###############################################################################
 
 
@@ -928,6 +1542,13 @@ check-local: $(check_local)
 
 ###############################################################################
 
+install-data-hook:
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(rundir)
+	$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
+
+###############################################################################
+
 cscope:
 	cscope -b -q -R -sshared -ssrc -slibnm-core -slibnm -slibnm-glib -slibnm-util -sclients;
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 0aeb35109e..ed59423998 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,4 @@
-include $(GLIB_MAKEFILE)
-
-@GNOME_CODE_COVERAGE_RULES@
-
 SUBDIRS = \
-	. \
 	dhcp-manager \
 	ppp-manager \
 	settings/plugins \
@@ -31,607 +26,3 @@ SUBDIRS += \
 	supplicant-manager/tests \
 	tests
 endif
-
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/shared \
-	-I$(top_builddir)/shared \
-	-I$(top_builddir)/introspection \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	\
-	 $(foreach d,$(sort $(dir $(libNetworkManager_la_SOURCES))),-I$(top_srcdir)/src/$d) \
-	\
-	-DPREFIX=\"$(prefix)\"          \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	\
-	-DBINDIR=\"$(bindir)\" \
-	-DDATADIR=\"$(datadir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\" \
-	-DLOCALSTATEDIR=\"$(localstatedir)\" \
-	-DRUNSTATEDIR=\"$(runstatedir)\" \
-	-DSBINDIR=\"$(sbindir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DRUNDIR=\"$(rundir)\" \
-	\
-	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DNMLOCALEDIR=\"$(datadir)/locale\" \
-	-DNMPLUGINDIR=\"$(pkglibdir)\" \
-	-DNMRUNDIR=\"$(nmrundir)\" \
-	-DNMSTATEDIR=\"$(nmstatedir)\" \
-	-DNMLIBDIR=\"$(nmlibdir)\" \
-	\
-	-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
-	-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
-	-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
-	\
-	$(GLIB_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	$(LIBNL_CFLAGS) \
-	$(LIBNDP_CFLAGS) \
-	$(LIBSOUP_CFLAGS) \
-	$(SELINUX_CFLAGS) \
-	$(LIBAUDIT_CFLAGS) \
-	$(SYSTEMD_LOGIN_CFLAGS) \
-	$(SYSTEMD_JOURNAL_CFLAGS) \
-	$(CODE_COVERAGE_CFLAGS) \
-	\
-	$(NULL)
-
-AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
-
-sbin_PROGRAMS = \
-	NetworkManager
-
-libexec_PROGRAMS = \
-	nm-iface-helper
-
-noinst_LTLIBRARIES = \
-	libNetworkManagerBase.la \
-	libNetworkManager.la \
-	libNetworkManagerTest.la \
-	libsystemd-nm.la
-
-###############################################################################
-
-libsystemd_nm_la_SOURCES = \
-	systemd/nm-sd.c \
-	systemd/nm-sd.h \
-	systemd/sd-adapt/nm-sd-adapt.c \
-	systemd/sd-adapt/nm-sd-adapt.h \
-	systemd/sd-adapt/build.h \
-	systemd/sd-adapt/cgroup-util.h \
-	systemd/sd-adapt/condition.h \
-	systemd/sd-adapt/conf-parser.h \
-	systemd/sd-adapt/def.h \
-	systemd/sd-adapt/dirent-util.h \
-	systemd/sd-adapt/formats-util.h \
-	systemd/sd-adapt/gunicode.h \
-	systemd/sd-adapt/libudev.h \
-	systemd/sd-adapt/missing.h \
-	systemd/sd-adapt/mkdir.h \
-	systemd/sd-adapt/process-util.h \
-	systemd/sd-adapt/sd-daemon.h \
-	systemd/sd-adapt/stat-util.h \
-	systemd/sd-adapt/udev-util.h \
-	systemd/sd-adapt/udev.h \
-	systemd/sd-adapt/user-util.h \
-	systemd/sd-adapt/virt.h \
-	systemd/src/basic/alloc-util.c \
-	systemd/src/basic/alloc-util.h \
-	systemd/src/basic/async.h \
-	systemd/src/basic/escape.c \
-	systemd/src/basic/escape.h \
-	systemd/src/basic/ether-addr-util.c \
-	systemd/src/basic/ether-addr-util.h \
-	systemd/src/basic/extract-word.c \
-	systemd/src/basic/extract-word.h \
-	systemd/src/basic/fd-util.c \
-	systemd/src/basic/fd-util.h \
-	systemd/src/basic/fileio.c \
-	systemd/src/basic/fileio.h \
-	systemd/src/basic/fs-util.c \
-	systemd/src/basic/fs-util.h \
-	systemd/src/basic/hash-funcs.c \
-	systemd/src/basic/hash-funcs.h \
-	systemd/src/basic/hashmap.c \
-	systemd/src/basic/hashmap.h \
-	systemd/src/basic/hexdecoct.c \
-	systemd/src/basic/hexdecoct.h \
-	systemd/src/basic/hostname-util.c \
-	systemd/src/basic/hostname-util.h \
-	systemd/src/basic/in-addr-util.c \
-	systemd/src/basic/in-addr-util.h \
-	systemd/src/basic/io-util.c \
-	systemd/src/basic/io-util.h \
-	systemd/src/basic/list.h \
-	systemd/src/basic/log.h \
-	systemd/src/basic/macro.h \
-	systemd/src/basic/mempool.c \
-	systemd/src/basic/mempool.h \
-	systemd/src/basic/parse-util.c \
-	systemd/src/basic/parse-util.h \
-	systemd/src/basic/path-util.c \
-	systemd/src/basic/path-util.h \
-	systemd/src/basic/prioq.c \
-	systemd/src/basic/prioq.h \
-	systemd/src/basic/random-util.c \
-	systemd/src/basic/random-util.h \
-	systemd/src/basic/refcnt.h \
-	systemd/src/basic/set.h \
-	systemd/src/basic/signal-util.h \
-	systemd/src/basic/siphash24.c \
-	systemd/src/basic/siphash24.h \
-	systemd/src/basic/socket-util.c \
-	systemd/src/basic/socket-util.h \
-	systemd/src/basic/sparse-endian.h \
-	systemd/src/basic/stdio-util.h \
-	systemd/src/basic/string-table.c \
-	systemd/src/basic/string-table.h \
-	systemd/src/basic/string-util.c \
-	systemd/src/basic/string-util.h \
-	systemd/src/basic/strv.c \
-	systemd/src/basic/strv.h \
-	systemd/src/basic/time-util.c \
-	systemd/src/basic/time-util.h \
-	systemd/src/basic/umask-util.h \
-	systemd/src/basic/unaligned.h \
-	systemd/src/basic/utf8.c \
-	systemd/src/basic/utf8.h \
-	systemd/src/basic/util.c \
-	systemd/src/basic/util.h \
-	systemd/src/libsystemd-network/arp-util.c \
-	systemd/src/libsystemd-network/arp-util.h \
-	systemd/src/libsystemd-network/dhcp-identifier.c \
-	systemd/src/libsystemd-network/dhcp-identifier.h \
-	systemd/src/libsystemd-network/dhcp-internal.h \
-	systemd/src/libsystemd-network/dhcp-lease-internal.h \
-	systemd/src/libsystemd-network/dhcp-network.c \
-	systemd/src/libsystemd-network/dhcp-option.c \
-	systemd/src/libsystemd-network/dhcp-packet.c \
-	systemd/src/libsystemd-network/dhcp-protocol.h \
-	systemd/src/libsystemd-network/dhcp6-internal.h \
-	systemd/src/libsystemd-network/dhcp6-lease-internal.h \
-	systemd/src/libsystemd-network/dhcp6-network.c \
-	systemd/src/libsystemd-network/dhcp6-option.c \
-	systemd/src/libsystemd-network/dhcp6-protocol.h \
-	systemd/src/libsystemd-network/lldp-internal.h \
-	systemd/src/libsystemd-network/lldp-neighbor.c \
-	systemd/src/libsystemd-network/lldp-neighbor.h \
-	systemd/src/libsystemd-network/lldp-network.c \
-	systemd/src/libsystemd-network/lldp-network.h \
-	systemd/src/libsystemd-network/network-internal.c \
-	systemd/src/libsystemd-network/network-internal.h \
-	systemd/src/libsystemd-network/sd-dhcp-client.c \
-	systemd/src/libsystemd-network/sd-dhcp-lease.c \
-	systemd/src/libsystemd-network/sd-dhcp6-client.c \
-	systemd/src/libsystemd-network/sd-dhcp6-lease.c \
-	systemd/src/libsystemd-network/sd-ipv4acd.c \
-	systemd/src/libsystemd-network/sd-ipv4ll.c \
-	systemd/src/libsystemd-network/sd-lldp.c \
-	systemd/src/libsystemd/sd-event/sd-event.c \
-	systemd/src/libsystemd/sd-id128/id128-util.c \
-	systemd/src/libsystemd/sd-id128/id128-util.h \
-	systemd/src/libsystemd/sd-id128/sd-id128.c \
-	systemd/src/shared/dns-domain.c \
-	systemd/src/shared/dns-domain.h \
-	systemd/src/systemd/_sd-common.h \
-	systemd/src/systemd/sd-dhcp-client.h \
-	systemd/src/systemd/sd-dhcp-lease.h \
-	systemd/src/systemd/sd-dhcp6-client.h \
-	systemd/src/systemd/sd-dhcp6-lease.h \
-	systemd/src/systemd/sd-event.h \
-	systemd/src/systemd/sd-id128.h \
-	systemd/src/systemd/sd-ipv4acd.h \
-	systemd/src/systemd/sd-ipv4ll.h \
-	systemd/src/systemd/sd-lldp.h \
-	systemd/src/systemd/sd-ndisc.h
-
-libsystemd_nm_la_CPPFLAGS = \
-	-I$(top_srcdir)/shared/ \
-	-I$(top_builddir)/shared/ \
-	-I$(top_srcdir)/libnm-core \
-	-I$(top_builddir)/libnm-core \
-	-I$(top_srcdir)/src/systemd/sd-adapt/ \
-	-I$(top_srcdir)/src/systemd/src/systemd/ \
-	-I$(top_srcdir)/src/systemd/src/basic/ \
-	-I$(top_srcdir)/src/systemd/src/shared/ \
-	-I$(top_srcdir)/src/systemd/src/libsystemd-network/ \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_SYSTEMD \
-	$(GLIB_CFLAGS)
-
-libsystemd_nm_la_LIBADD = \
-	$(GLIB_LIBS)
-
-###############################################################################
-
-libNetworkManagerBase_la_SOURCES = \
-	nm-core-utils.c \
-	nm-core-utils.h \
-	nm-logging.c \
-	nm-logging.h
-
-libNetworkManagerBase_la_LIBADD = \
-	$(top_builddir)/libnm-core/libnm-core.la \
-	$(GLIB_LIBS) \
-	$(SYSTEMD_JOURNAL_LIBS) \
-	$(NULL)
-
-###############################################################################
-
-libNetworkManager_la_SOURCES = \
-	\
-	nm-checkpoint-manager.c \
-	nm-checkpoint-manager.h \
-	nm-checkpoint.c \
-	nm-checkpoint.h \
-	\
-	devices/nm-device.c \
-	devices/nm-device.h \
-	devices/nm-lldp-listener.c \
-	devices/nm-lldp-listener.h \
-	devices/nm-arping-manager.c \
-	devices/nm-arping-manager.h \
-	devices/nm-device-ethernet-utils.c \
-	devices/nm-device-ethernet-utils.h \
-	devices/nm-device-factory.c \
-	devices/nm-device-factory.h \
-	devices/nm-device-generic.c \
-	devices/nm-device-generic.h \
-	devices/nm-device-logging.h \
-	devices/nm-device-private.h \
-	\
-	devices/nm-device-bond.c \
-	devices/nm-device-bond.h \
-	devices/nm-device-bridge.c \
-	devices/nm-device-bridge.h \
-	devices/nm-device-ethernet.c \
-	devices/nm-device-ethernet.h \
-	devices/nm-device-infiniband.c \
-	devices/nm-device-infiniband.h \
-	devices/nm-device-ip-tunnel.c \
-	devices/nm-device-ip-tunnel.h \
-	devices/nm-device-macvlan.c \
-	devices/nm-device-macvlan.h \
-	devices/nm-device-tun.c \
-	devices/nm-device-tun.h \
-	devices/nm-device-veth.c \
-	devices/nm-device-veth.h \
-	devices/nm-device-vlan.c \
-	devices/nm-device-vlan.h \
-	devices/nm-device-vxlan.c \
-	devices/nm-device-vxlan.h \
-	\
-	dhcp-manager/nm-dhcp-client.c \
-	dhcp-manager/nm-dhcp-client.h \
-	dhcp-manager/nm-dhcp-client-logging.h \
-	dhcp-manager/nm-dhcp-utils.c \
-	dhcp-manager/nm-dhcp-manager.c \
-	dhcp-manager/nm-dhcp-manager.h \
-	dhcp-manager/nm-dhcp-utils.h \
-	dhcp-manager/nm-dhcp-dhclient.c \
-	dhcp-manager/nm-dhcp-dhcpcd.c \
-	dhcp-manager/nm-dhcp-systemd.c \
-	dhcp-manager/nm-dhcp-helper-api.h \
-	dhcp-manager/nm-dhcp-listener.c \
-	dhcp-manager/nm-dhcp-listener.h \
-	dhcp-manager/nm-dhcp-dhclient-utils.c \
-	dhcp-manager/nm-dhcp-dhclient-utils.h \
-	\
-	dns-manager/nm-dns-dnsmasq.c \
-	dns-manager/nm-dns-dnsmasq.h \
-	dns-manager/nm-dns-systemd-resolved.c \
-	dns-manager/nm-dns-systemd-resolved.h \
-	dns-manager/nm-dns-unbound.c \
-	dns-manager/nm-dns-unbound.h \
-	dns-manager/nm-dns-manager.c \
-	dns-manager/nm-dns-manager.h \
-	dns-manager/nm-dns-plugin.c \
-	dns-manager/nm-dns-plugin.h \
-	\
-	dnsmasq-manager/nm-dnsmasq-manager.c \
-	dnsmasq-manager/nm-dnsmasq-manager.h \
-	dnsmasq-manager/nm-dnsmasq-utils.c \
-	dnsmasq-manager/nm-dnsmasq-utils.h \
-	\
-	platform/nmp-netns.c \
-	platform/nmp-netns.h \
-	platform/nmp-object.c \
-	platform/nmp-object.h \
-	platform/nm-platform-utils.c \
-	platform/nm-platform-utils.h \
-	platform/nm-platform.c \
-	platform/nm-platform.h \
-	platform/nm-linux-platform.c \
-	platform/nm-linux-platform.h \
-	platform/wifi/wifi-utils-nl80211.c \
-	platform/wifi/wifi-utils-nl80211.h \
-	platform/wifi/wifi-utils-private.h \
-	platform/wifi/wifi-utils.c \
-	platform/wifi/wifi-utils.h \
-	\
-	rdisc/nm-lndp-rdisc.c \
-	rdisc/nm-lndp-rdisc.h \
-	rdisc/nm-rdisc.c \
-	rdisc/nm-rdisc.h \
-	rdisc/nm-rdisc-private.h \
-	\
-	ppp-manager/nm-ppp-manager.c \
-	ppp-manager/nm-ppp-manager.h \
-	ppp-manager/nm-ppp-status.h \
-	\
-	settings/nm-agent-manager.c \
-	settings/nm-agent-manager.h \
-	settings/nm-inotify-helper.c \
-	settings/nm-inotify-helper.h \
-	settings/nm-secret-agent.c \
-	settings/nm-secret-agent.h \
-	settings/nm-settings-connection.c \
-	settings/nm-settings-connection.h \
-	settings/nm-settings-plugin.c \
-	settings/nm-settings-plugin.h \
-	settings/nm-settings.c \
-	settings/nm-settings.h \
-	\
-	settings/plugins/keyfile/nms-keyfile-connection.c \
-	settings/plugins/keyfile/nms-keyfile-connection.h \
-	settings/plugins/keyfile/nms-keyfile-plugin.c \
-	settings/plugins/keyfile/nms-keyfile-plugin.h \
-	settings/plugins/keyfile/nms-keyfile-reader.c \
-	settings/plugins/keyfile/nms-keyfile-reader.h \
-	settings/plugins/keyfile/nms-keyfile-utils.c \
-	settings/plugins/keyfile/nms-keyfile-utils.h \
-	settings/plugins/keyfile/nms-keyfile-writer.c \
-	settings/plugins/keyfile/nms-keyfile-writer.h \
-	\
-	supplicant-manager/nm-supplicant-config.c \
-	supplicant-manager/nm-supplicant-config.h \
-	supplicant-manager/nm-supplicant-interface.c \
-	supplicant-manager/nm-supplicant-interface.h \
-	supplicant-manager/nm-supplicant-manager.c \
-	supplicant-manager/nm-supplicant-manager.h \
-	supplicant-manager/nm-supplicant-settings-verify.c \
-	supplicant-manager/nm-supplicant-settings-verify.h \
-	supplicant-manager/nm-supplicant-types.h \
-	\
-	vpn-manager/nm-vpn-connection.c \
-	vpn-manager/nm-vpn-connection.h \
-	vpn-manager/nm-vpn-manager.c \
-	vpn-manager/nm-vpn-manager.h \
-	\
-	nm-act-request.c \
-	nm-act-request.h \
-	nm-active-connection.c \
-	nm-active-connection.h \
-	nm-audit-manager.c \
-	nm-audit-manager.h \
-	nm-bus-manager.c \
-	nm-bus-manager.h \
-	nm-config.c \
-	nm-config.h \
-	nm-config-data.c \
-	nm-config-data.h \
-	nm-connectivity.c \
-	nm-connectivity.h \
-	nm-dcb.c \
-	nm-dcb.h \
-	nm-route-manager.c \
-	nm-route-manager.h \
-	nm-default-route-manager.c \
-	nm-default-route-manager.h \
-	nm-dhcp4-config.c \
-	nm-dhcp4-config.h \
-	nm-dhcp6-config.c \
-	nm-dhcp6-config.h \
-	nm-dispatcher.c \
-	nm-dispatcher.h \
-	nm-enum-types.c \
-	nm-enum-types.h \
-	nm-exported-object.c \
-	nm-exported-object.h \
-	nm-firewall-manager.c \
-	nm-firewall-manager.h \
-	nm-proxy-config.c \
-	nm-proxy-config.h \
-	nm-ip4-config.c \
-	nm-ip4-config.h \
-	nm-ip6-config.c \
-	nm-ip6-config.h \
-	nm-auth-manager.c \
-	nm-auth-manager.h \
-	nm-auth-subject.c \
-	nm-auth-subject.h \
-	nm-auth-utils.c \
-	nm-auth-utils.h \
-	nm-manager.c \
-	nm-manager.h \
-	nm-multi-index.c \
-	nm-multi-index.h \
-	nm-pacrunner-manager.c \
-	nm-pacrunner-manager.h \
-	nm-policy.c \
-	nm-policy.h \
-	nm-rfkill-manager.c \
-	nm-rfkill-manager.h \
-	nm-session-monitor.h \
-	nm-session-monitor.c \
-	nm-sleep-monitor.c \
-	nm-sleep-monitor.h \
-	nm-types.h \
-	NetworkManagerUtils.c \
-	NetworkManagerUtils.h \
-	$(NULL)
-
-if WITH_WEXT
-libNetworkManager_la_SOURCES += \
-	platform/wifi/wifi-utils-wext.c \
-	platform/wifi/wifi-utils-wext.h
-endif
-
-
-libNetworkManager_la_LIBADD = \
-	$(top_builddir)/libnm-core/libnm-core.la \
-	$(top_builddir)/introspection/libnmdbus.la \
-	libNetworkManagerBase.la \
-	libsystemd-nm.la \
-	$(GLIB_LIBS) \
-	$(GUDEV_LIBS) \
-	$(LIBNL_LIBS) \
-	$(SYSTEMD_LOGIN_LIBS) \
-	$(LIBNDP_LIBS) \
-	$(DL_LIBS) \
-	$(LIBM) \
-	$(SELINUX_LIBS) \
-	$(LIBAUDIT_LIBS)
-
-if WITH_LIBSOUP
-libNetworkManager_la_LIBADD += $(LIBSOUP_LIBS)
-endif
-
-###############################################################################
-
-libNetworkManagerTest_la_SOURCES = \
-	rdisc/nm-fake-rdisc.c \
-	rdisc/nm-fake-rdisc.h \
-	platform/nm-fake-platform.c \
-	platform/nm-fake-platform.h
-
-libNetworkManagerTest_la_LIBADD = \
-	libNetworkManager.la
-
-###############################################################################
-
-EXTRA_NetworkManager_DEPENDENCIES = \
-	NetworkManager.ver
-
-NetworkManager_SOURCES = \
-	main-utils.c \
-	main-utils.h \
-	main.c
-
-NetworkManager_LDADD = \
-	libNetworkManager.la
-
-NetworkManager_LDFLAGS = \
-	-rdynamic \
-	-Wl,--version-script="$(srcdir)/NetworkManager.ver"
-
-###############################################################################
-
-nm_iface_helper_CFLAGS = \
-	-DNM_DHCP_INTERNAL_ONLY
-
-nm_iface_helper_SOURCES = \
-	\
-	dhcp-manager/nm-dhcp-client.c \
-	dhcp-manager/nm-dhcp-client.h \
-	dhcp-manager/nm-dhcp-client-logging.h \
-	dhcp-manager/nm-dhcp-utils.c \
-	dhcp-manager/nm-dhcp-utils.h \
-	dhcp-manager/nm-dhcp-manager.c \
-	dhcp-manager/nm-dhcp-manager.h \
-	dhcp-manager/nm-dhcp-systemd.c \
-	\
-	platform/nmp-netns.c \
-	platform/nmp-netns.h \
-	platform/nmp-object.c \
-	platform/nmp-object.h \
-	platform/nm-platform-utils.c \
-	platform/nm-platform-utils.h \
-	platform/nm-platform.c \
-	platform/nm-platform.h \
-	platform/nm-linux-platform.c \
-	platform/nm-linux-platform.h \
-	platform/wifi/wifi-utils-nl80211.c \
-	platform/wifi/wifi-utils-nl80211.h \
-	platform/wifi/wifi-utils-private.h \
-	platform/wifi/wifi-utils.c \
-	platform/wifi/wifi-utils.h \
-	\
-	nm-pacrunner-manager.c \
-	nm-pacrunner-manager.h \
-	\
-	rdisc/nm-lndp-rdisc.c \
-	rdisc/nm-lndp-rdisc.h \
-	rdisc/nm-rdisc.c \
-	rdisc/nm-rdisc.h \
-	\
-	nm-route-manager.c \
-	nm-route-manager.h \
-	\
-	nm-exported-object.c \
-	nm-exported-object.h \
-	nm-proxy-config.c \
-	nm-proxy-config.h \
-	nm-ip4-config.c \
-	nm-ip4-config.h \
-	nm-ip6-config.c \
-	nm-ip6-config.h \
-	\
-	nm-enum-types.c \
-	nm-enum-types.h \
-	nm-multi-index.c \
-	nm-multi-index.h \
-	NetworkManagerUtils.c \
-	NetworkManagerUtils.h \
-	\
-	nm-iface-helper.c \
-	main-utils.c \
-	main-utils.h
-
-if WITH_WEXT
-nm_iface_helper_SOURCES += \
-	platform/wifi/wifi-utils-wext.c \
-	platform/wifi/wifi-utils-wext.h
-endif
-
-nm_iface_helper_LDADD = \
-	$(top_builddir)/libnm-core/libnm-core.la \
-	$(top_builddir)/introspection/libnmdbus.la \
-	libNetworkManagerBase.la \
-	libsystemd-nm.la \
-	$(GLIB_LIBS) \
-	$(GUDEV_LIBS) \
-	$(LIBNL_LIBS) \
-	$(LIBNDP_LIBS) \
-	$(DL_LIBS) \
-	$(LIBM)
-
-nm_iface_helper_LDFLAGS = \
-	-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
-
-###############################################################################
-
-GLIB_GENERATED = nm-enum-types.h nm-enum-types.c
-GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
-GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
-nm_enum_types_sources = $(filter-out \
-                              %/nm-device-private.h \
-                              %/nm-rdisc-private.h \
-                              %/wifi-utils-private.h \
-                              %/nm-dhcp-client-logging.h \
-                              %/nm-device-logging.h \
-                              , $(libNetworkManager_la_SOURCES))
-
-BUILT_SOURCES = $(GLIB_GENERATED)
-
-###############################################################################
-
-dbusservicedir = $(DBUS_SYS_DIR)
-dbusservice_DATA = org.freedesktop.NetworkManager.conf
-
-EXTRA_DIST = \
-	$(dbusservice_DATA) \
-	$(NetworkManager_DATA) \
-	nm-test-utils-core.h \
-	NetworkManager.ver
-
-rundir=$(runstatedir)/NetworkManager
-statedir=$(localstatedir)/lib/NetworkManager
-install-data-hook:
-	$(mkinstalldirs) -m 0755 $(DESTDIR)$(rundir)
-	$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
-	$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)
-
-CLEANFILES = \
-	$(BUILT_SOURCES)
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index d1d0a9b0de..ff4e4cd92a 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -33,7 +33,7 @@
 #include <string.h>
 
 #include "nm-device-private.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 #include "ppp-manager/nm-ppp-manager.h"
 #include "ppp-manager/nm-ppp-status.h"
diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
index ae029438c8..69045e6ddd 100644
--- a/src/devices/nm-device-bond.c
+++ b/src/devices/nm-device-bond.c
@@ -28,7 +28,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-platform.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
 #include "nm-ip4-config.h"
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 682c260b17..f727f5c34a 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -26,7 +26,7 @@
 
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index a4a560f049..0c23b3dc07 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -40,7 +40,7 @@
 #include "nm-supplicant-config.h"
 #include "ppp-manager/nm-ppp-manager.h"
 #include "ppp-manager/nm-ppp-status.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 #include "nm-platform-utils.h"
 #include "nm-dcb.h"
diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c
index dc8828a96d..457b92aeac 100644
--- a/src/devices/nm-device-generic.c
+++ b/src/devices/nm-device-generic.c
@@ -23,7 +23,7 @@
 #include "nm-device-generic.h"
 
 #include "nm-device-private.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 #include "nm-core-internal.h"
 
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index bc6051569c..c8805729c9 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -26,7 +26,7 @@
 
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index 0f241e8388..de580ed988 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -28,7 +28,7 @@
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-settings.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 55e1ff5344..c508dcc0b4 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -53,7 +53,7 @@
 #include "nm-dhcp6-config.h"
 #include "nm-rfkill-manager.h"
 #include "nm-firewall-manager.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-settings-connection.h"
 #include "nm-settings.h"
 #include "nm-auth-utils.h"
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index 0ed80f84c8..ff3a6f0b26 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -32,7 +32,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-platform.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-core-internal.h"
 #include "nm-ip4-config.h"
 #include "nm-dbus-compat.h"
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index cac8b068cd..95d6dd8d95 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -46,7 +46,7 @@
 #include "nm-setting-connection.h"
 #include "nm-setting-olpc-mesh.h"
 #include "nm-manager.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-platform.h"
 
 /* This is a bug; but we can't really change API now... */
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index bfb0780477..38b4501fe2 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -48,7 +48,7 @@
 #include "nm-auth-utils.h"
 #include "nm-settings-connection.h"
 #include "nm-settings.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-core-internal.h"
 #include "nm-config.h"
 
diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index 2a5f007066..04c2a6f9a3 100644
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 
 #include "nm-bus-manager.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "NetworkManagerUtils.h"
 
 enum {
diff --git a/src/nm-config.c b/src/nm-config.c
index 6338eb617d..2d7237faa8 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -29,7 +29,7 @@
 #include "nm-utils.h"
 #include "nm-device.h"
 #include "NetworkManagerUtils.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-internal.h"
 
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 5ce72acf4d..1d70561777 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -43,7 +43,7 @@
 #include "nm-auth-manager.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-factory.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-sleep-monitor.h"
 #include "nm-connectivity.h"
 #include "nm-policy.h"
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 01bdcf3e4a..d1bd44886f 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -37,7 +37,7 @@
 #include "nm-core-internal.h"
 
 #include "nm-core-utils.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-platform-utils.h"
 #include "nmp-object.h"
 #include "nmp-netns.h"
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index fa5c59d54a..24ecf07991 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -30,7 +30,7 @@
 #include "nm-secret-agent.h"
 #include "nm-auth-utils.h"
 #include "nm-setting-vpn.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 #include "nm-auth-manager.h"
 #include "nm-bus-manager.h"
 #include "nm-session-monitor.h"
diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c
index 35f93fd859..0b092a67a1 100644
--- a/src/vpn-manager/nm-vpn-manager.c
+++ b/src/vpn-manager/nm-vpn-manager.c
@@ -30,7 +30,7 @@
 #include "nm-setting-vpn.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"
-#include "nm-enum-types.h"
+#include "nm-src-enum-types.h"
 
 typedef struct {
 	GSList *plugins;