diff --git a/Makefile.am b/Makefile.am
index 814f0a97dd..2ff7f5dd9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -950,17 +950,6 @@ src_cppflags = \
 	-I$(top_builddir)/introspection \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src/devices \
-	-I$(top_srcdir)/src/dhcp \
-	-I$(top_srcdir)/src/dns \
-	-I$(top_srcdir)/src/dnsmasq \
-	-I$(top_srcdir)/src/platform \
-	-I$(top_srcdir)/src/platform/wifi \
-	-I$(top_srcdir)/src/ppp \
-	-I$(top_srcdir)/src/ndisc \
-	-I$(top_srcdir)/src/settings \
-	-I$(top_srcdir)/src/supplicant \
-	-I$(top_srcdir)/src/vpn \
 	\
 	-DPREFIX=\"$(prefix)\" \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
@@ -1429,8 +1418,7 @@ src_libNetworkManager_la_LIBADD = \
 check_ltlibraries += src/libNetworkManagerTest.la
 
 src_tests_cppflags = \
-	$(src_cppflags) \
-	-I$(top_srcdir)/src/platform/tests
+	$(src_cppflags)
 
 if REQUIRE_ROOT_TESTS
 src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1
@@ -1599,7 +1587,6 @@ check_programs += src/settings/plugins/keyfile/tests/test-keyfile
 
 src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
 	$(src_tests_cppflags) \
-	-I$(top_srcdir)/src/settings/plugins/keyfile \
 	-DTEST_KEYFILES_DIR=\"$(abs_srcdir)/src/settings/plugins/keyfile/tests/keyfiles\" \
 	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/keyfile/tests/keyfiles\"
 
@@ -1660,8 +1647,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ibft/libnms-ibft-core.la
 
 src_settings_plugins_ibft_cppflags = \
 	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/platform \
-	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/shared \
 	-I$(top_builddir)/shared \
 	-I$(top_srcdir)/libnm-core \
@@ -1703,9 +1688,6 @@ src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
 	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/platform \
-	-I$(top_srcdir)/src/settings \
-	-I$(srcdir)/src/settings/plugins/ibft \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
 	-DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \
@@ -1751,10 +1733,7 @@ noinst_LTLIBRARIES += \
 
 src_settings_plugins_ifcfg_rh_cppflags = \
 	-I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/platform \
-	-I$(top_srcdir)/src/settings \
-	-I$(top_srcdir)/src/settings/plugins/ifcfg-rh \
-	-I$(top_builddir)/src/settings/plugins/ifcfg-rh \
+	-I$(top_builddir)/src/ \
 	-I$(top_srcdir)/shared \
 	-I$(top_builddir)/shared \
 	-I$(top_srcdir)/libnm-core \
@@ -1840,7 +1819,6 @@ src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
 
 src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
 	$(src_tests_cppflags) \
-	-I$(top_srcdir)/src/settings/plugins/ifcfg-rh \
 	-DTEST_IFCFG_DIR=\"$(abs_srcdir)/src/settings/plugins/ifcfg-rh/tests\" \
 	-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ifcfg-rh/tests\"
 
@@ -2047,7 +2025,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la
 
 src_settings_plugins_ifupdown_cppflags = \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/shared \
 	-I$(top_builddir)/shared \
 	-I$(top_srcdir)/libnm-core \
@@ -2098,8 +2075,6 @@ src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/settings \
-	-I$(srcdir)/src/settings/plugins/ifupdown \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
 	$(GLIB_CFLAGS) \
@@ -2152,8 +2127,6 @@ noinst_LTLIBRARIES += src/settings/plugins/ifnet/libnms-ifnet-core.la
 
 src_settings_plugins_ifnet_cppflags = \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/platform \
-	-I$(top_srcdir)/src/settings \
 	-I$(top_srcdir)/shared \
 	-I$(top_builddir)/shared \
 	-I$(top_srcdir)/libnm-core \
@@ -2206,9 +2179,6 @@ src_settings_plugins_ifnet_tests_test_ifnet_CPPFLAGS = \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/settings \
-	-I$(top_srcdir)/src/platform \
-	-I$(top_srcdir)/src/settings/plugins/ifnet \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
 	$(GLIB_CFLAGS) \
@@ -2249,8 +2219,6 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
 src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/platform \
 	-I${top_builddir}/introspection \
 	-I${top_srcdir}/shared \
 	-I$(top_builddir)/shared \
@@ -2283,16 +2251,11 @@ if WITH_MODEM_MANAGER_1
 src_devices_wwan_cppflags = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/settings \
-	-I${top_srcdir}/src/platform \
 	-I${top_builddir}/introspection \
 	-I${top_srcdir}/shared \
 	-I$(top_builddir)/shared \
 	-I${top_srcdir}/libnm-core \
 	-I${top_builddir}/libnm-core \
-	-I${top_srcdir}/src/devices/wwan \
-	-I${top_builddir}/src/devices/wwan \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
 	$(GLIB_CFLAGS) \
@@ -2385,17 +2348,11 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
 src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/settings \
-	-I${top_srcdir}/src/platform \
-	-I${top_srcdir}/src/devices/wwan \
 	-I${top_builddir}/introspection \
 	-I${top_srcdir}/shared \
 	-I$(top_builddir)/shared \
 	-I${top_builddir}/libnm-core \
 	-I${top_srcdir}/libnm-core \
-	-I${top_srcdir}/src/devices/bluetooth \
-	-I${top_builddir}/src/devices/bluetooth \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
 	$(GLIB_CFLAGS)
@@ -2450,10 +2407,6 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
 src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/settings \
-	-I${top_srcdir}/src/platform \
-	-I${top_srcdir}/src/supplicant \
 	-I${top_builddir}/introspection \
 	-I${top_srcdir}/shared \
 	-I$(top_builddir)/shared \
@@ -2493,9 +2446,7 @@ src_devices_wifi_tests_test_general_CPPFLAGS = \
 	-I$(top_builddir)/shared \
 	-I$(top_srcdir)/libnm-core \
 	-I$(top_builddir)/libnm-core \
-	-I${top_srcdir}/src/platform \
 	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/src/devices/wifi \
 	-I$(top_builddir)/src \
 	-DG_LOG_DOMAIN=\""NetworkManager"\" \
 	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
@@ -2521,9 +2472,6 @@ src_devices_team_libnm_device_plugin_team_la_SOURCES = \
 src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
 	-I${top_srcdir}/src \
 	-I${top_builddir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/platform \
-	-I${top_srcdir}/src/settings \
 	-I${top_builddir}/introspection \
 	-I${top_srcdir}/shared \
 	-I$(top_builddir)/shared \
diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
index ad90fb7118..55b660db83 100644
--- a/src/NetworkManagerUtils.c
+++ b/src/NetworkManagerUtils.c
@@ -30,7 +30,7 @@
 #include "nm-setting-ip6-config.h"
 #include "nm-core-internal.h"
 
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-exported-object.h"
 #include "nm-auth-utils.h"
 
diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c
index c70a6601b1..2ff2fc1840 100644
--- a/src/devices/adsl/nm-atm-manager.c
+++ b/src/devices/adsl/nm-atm-manager.c
@@ -26,8 +26,8 @@
 
 #include "nm-setting-adsl.h"
 #include "nm-device-adsl.h"
-#include "nm-device-factory.h"
-#include "nm-platform.h"
+#include "devices/nm-device-factory.h"
+#include "platform/nm-platform.h"
 
 /*****************************************************************************/
 
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index 07eb7a2e7f..be398923d1 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -32,8 +32,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-device-private.h"
-#include "nm-platform.h"
+#include "devices/nm-device-private.h"
+#include "platform/nm-platform.h"
 #include "ppp/nm-ppp-manager.h"
 #include "ppp/nm-ppp-status.h"
 #include "nm-setting-adsl.h"
@@ -41,7 +41,7 @@
 
 #include "nmdbus-device-adsl.h"
 
-#include "nm-device-logging.h"
+#include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF (NMDeviceAdsl);
 
 /*****************************************************************************/
diff --git a/src/devices/adsl/nm-device-adsl.h b/src/devices/adsl/nm-device-adsl.h
index ff8d1f999d..351c8e7ae1 100644
--- a/src/devices/adsl/nm-device-adsl.h
+++ b/src/devices/adsl/nm-device-adsl.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_ADSL_H__
 #define __NETWORKMANAGER_DEVICE_ADSL_H__
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 
 #define NM_TYPE_DEVICE_ADSL            (nm_device_adsl_get_type ())
 #define NM_DEVICE_ADSL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_ADSL, NMDeviceAdsl))
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index 6e705f93da..4d2e9b1d7e 100644
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -28,8 +28,8 @@
 #include "nm-core-internal.h"
 #include "nm-bt-error.h"
 #include "nm-bluez-common.h"
-#include "nm-settings.h"
-#include "nm-settings-connection.h"
+#include "settings/nm-settings.h"
+#include "settings/nm-settings-connection.h"
 #include "NetworkManagerUtils.h"
 
 #if WITH_BLUEZ5_DUN
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index 7a7093ce2a..58fa9b016d 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -25,16 +25,16 @@
 #include <stdlib.h>
 #include <gmodule.h>
 
-#include "nm-device-factory.h"
+#include "devices/nm-device-factory.h"
 #include "nm-setting-bluetooth.h"
-#include "nm-settings.h"
+#include "settings/nm-settings.h"
 #include "nm-bluez4-manager.h"
 #include "nm-bluez5-manager.h"
 #include "nm-bluez-device.h"
 #include "nm-bluez-common.h"
 #include "nm-device-bt.h"
 #include "nm-core-internal.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-dbus-compat.h"
 
 /*****************************************************************************/
diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c
index dd684f29c2..b781def3a7 100644
--- a/src/devices/bluetooth/nm-bluez4-adapter.c
+++ b/src/devices/bluetooth/nm-bluez4-adapter.c
@@ -28,7 +28,7 @@
 #include "nm-bluez-device.h"
 #include "nm-bluez-common.h"
 #include "nm-core-internal.h"
-#include "nm-settings.h"
+#include "settings/nm-settings.h"
 
 /*****************************************************************************/
 
diff --git a/src/devices/bluetooth/nm-bluez4-manager.c b/src/devices/bluetooth/nm-bluez4-manager.c
index 78e892e40a..a9079a2fc0 100644
--- a/src/devices/bluetooth/nm-bluez4-manager.c
+++ b/src/devices/bluetooth/nm-bluez4-manager.c
@@ -30,7 +30,7 @@
 #include "nm-bluez4-adapter.h"
 #include "nm-bluez-common.h"
 #include "nm-core-internal.h"
-#include "nm-settings.h"
+#include "settings/nm-settings.h"
 
 /*****************************************************************************/
 
diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c
index 9859f74bad..88759301d5 100644
--- a/src/devices/bluetooth/nm-bluez5-manager.c
+++ b/src/devices/bluetooth/nm-bluez5-manager.c
@@ -32,7 +32,7 @@
 
 #include "nm-bluez-device.h"
 #include "nm-bluez-common.h"
-#include "nm-settings.h"
+#include "settings/nm-settings.h"
 
 /*****************************************************************************/
 
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c
index d5ae399470..982936dab0 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -27,7 +27,7 @@
 
 #include "nm-bluez-common.h"
 #include "nm-bluez-device.h"
-#include "nm-device-private.h"
+#include "devices/nm-device-private.h"
 #include "ppp/nm-ppp-manager.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-bluetooth.h"
@@ -38,11 +38,11 @@
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 #include "nm-bt-error.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 
 #include "nmdbus-device-bt.h"
 
-#include "nm-device-logging.h"
+#include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceBt);
 
 #define MM_DBUS_SERVICE   "org.freedesktop.ModemManager1"
diff --git a/src/devices/bluetooth/nm-device-bt.h b/src/devices/bluetooth/nm-device-bt.h
index 2308f0e8a3..43bd42576b 100644
--- a/src/devices/bluetooth/nm-device-bt.h
+++ b/src/devices/bluetooth/nm-device-bt.h
@@ -21,9 +21,10 @@
 #ifndef __NETWORKMANAGER_DEVICE_BT_H__
 #define __NETWORKMANAGER_DEVICE_BT_H__
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-bluez-device.h"
-#include "nm-modem.h"
+
+#include "devices/wwan/nm-modem.h"
 
 #define NM_TYPE_DEVICE_BT                   (nm_device_bt_get_type ())
 #define NM_DEVICE_BT(obj)                   (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_BT, NMDeviceBt))
diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c
index e4cbb39e9e..7b765844ad 100644
--- a/src/devices/nm-arping-manager.c
+++ b/src/devices/nm-arping-manager.c
@@ -22,7 +22,7 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 
diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
index 853158d483..1abe60b9fa 100644
--- a/src/devices/nm-device-bond.c
+++ b/src/devices/nm-device-bond.c
@@ -27,7 +27,7 @@
 
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.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 8bef03be9a..72986f9396 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-platform.h"
+#include "platform/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 c1c63f1608..c3baf79510 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -35,18 +35,18 @@
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
 #include "NetworkManagerUtils.h"
-#include "nm-supplicant-manager.h"
-#include "nm-supplicant-interface.h"
-#include "nm-supplicant-config.h"
+#include "supplicant/nm-supplicant-manager.h"
+#include "supplicant/nm-supplicant-interface.h"
+#include "supplicant/nm-supplicant-config.h"
 #include "ppp/nm-ppp-manager.h"
 #include "ppp/nm-ppp-status.h"
-#include "nm-platform.h"
-#include "nm-platform-utils.h"
+#include "platform/nm-platform.h"
+#include "platform/nm-platform-utils.h"
 #include "nm-dcb.h"
-#include "nm-settings-connection.h"
+#include "settings/nm-settings-connection.h"
 #include "nm-config.h"
 #include "nm-device-ethernet-utils.h"
-#include "nm-settings.h"
+#include "settings/nm-settings.h"
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index 87f60a716a..7049c698f8 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -28,7 +28,7 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-utils.h"
 
 /*****************************************************************************/
diff --git a/src/devices/nm-device-generic.c b/src/devices/nm-device-generic.c
index 8116d9edd7..3666ad1cc2 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-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-core-internal.h"
 
 #include "nmdbus-device-generic.h"
diff --git a/src/devices/nm-device-infiniband.c b/src/devices/nm-device-infiniband.c
index 88bd7c0aef..a5b2fc97ce 100644
--- a/src/devices/nm-device-infiniband.c
+++ b/src/devices/nm-device-infiniband.c
@@ -28,7 +28,7 @@
 #include "nm-device-private.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
 
diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c
index ee3725434e..1ab885e022 100644
--- a/src/devices/nm-device-ip-tunnel.c
+++ b/src/devices/nm-device-ip-tunnel.c
@@ -30,10 +30,10 @@
 
 #include "nm-device-private.h"
 #include "nm-manager.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-device-factory.h"
 #include "nm-core-internal.h"
-#include "nm-settings.h"
+#include "settings/nm-settings.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
 
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index 7b240ec6ae..3ca3f9cd73 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/devices/nm-device-macvlan.c
@@ -25,10 +25,10 @@
 #include <string.h>
 
 #include "nm-device-private.h"
-#include "nm-settings.h"
+#include "settings/nm-settings.h"
 #include "nm-act-request.h"
 #include "nm-manager.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-device-factory.h"
 #include "nm-setting-macvlan.h"
 #include "nm-setting-wired.h"
diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c
index d32caa402d..4746a3957e 100644
--- a/src/devices/nm-device-tun.c
+++ b/src/devices/nm-device-tun.c
@@ -29,7 +29,7 @@
 #include "nm-act-request.h"
 #include "nm-device-private.h"
 #include "nm-ip4-config.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-device-factory.h"
 #include "nm-setting-tun.h"
 #include "nm-core-internal.h"
diff --git a/src/devices/nm-device-veth.c b/src/devices/nm-device-veth.c
index bb23fdaa6c..2a9e9d5fe6 100644
--- a/src/devices/nm-device-veth.c
+++ b/src/devices/nm-device-veth.c
@@ -30,7 +30,7 @@
 #include "nm-device-veth.h"
 #include "nm-device-private.h"
 #include "nm-manager.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-device-factory.h"
 
 #include "nmdbus-device-veth.h"
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index f80f8efff1..2dcbe8a851 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -28,14 +28,14 @@
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
-#include "nm-settings.h"
+#include "settings/nm-settings.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-device-factory.h"
 #include "nm-manager.h"
 #include "nm-core-internal.h"
-#include "nmp-object.h"
+#include "platform/nmp-object.h"
 
 #include "nmdbus-device-vlan.h"
 
diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c
index a49e64c6af..4fb985f16f 100644
--- a/src/devices/nm-device-vxlan.c
+++ b/src/devices/nm-device-vxlan.c
@@ -26,12 +26,12 @@
 
 #include "nm-device-private.h"
 #include "nm-manager.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-utils.h"
 #include "nm-device-factory.h"
 #include "nm-setting-vxlan.h"
 #include "nm-setting-wired.h"
-#include "nm-settings.h"
+#include "settings/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 358d1c9f1f..5ddc390393 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -39,26 +39,26 @@
 #include "nm-device-private.h"
 #include "NetworkManagerUtils.h"
 #include "nm-manager.h"
-#include "nm-platform.h"
-#include "nm-ndisc.h"
-#include "nm-lndp-ndisc.h"
-#include "nm-dhcp-manager.h"
+#include "platform/nm-platform.h"
+#include "ndisc/nm-ndisc.h"
+#include "ndisc/nm-lndp-ndisc.h"
+#include "dhcp/nm-dhcp-manager.h"
 #include "nm-act-request.h"
 #include "nm-proxy-config.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-pacrunner-manager.h"
-#include "nm-dnsmasq-manager.h"
+#include "dnsmasq/nm-dnsmasq-manager.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"
 #include "nm-rfkill-manager.h"
 #include "nm-firewall-manager.h"
-#include "nm-settings-connection.h"
-#include "nm-settings.h"
+#include "settings/nm-settings-connection.h"
+#include "settings/nm-settings.h"
 #include "nm-auth-utils.h"
 #include "nm-dispatcher.h"
 #include "nm-config.h"
-#include "nm-dns-manager.h"
+#include "dns/nm-dns-manager.h"
 #include "nm-core-internal.h"
 #include "nm-default-route-manager.h"
 #include "nm-route-manager.h"
diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c
index 0c295cac92..ceec6063b0 100644
--- a/src/devices/nm-lldp-listener.c
+++ b/src/devices/nm-lldp-listener.c
@@ -25,7 +25,7 @@
 #include <net/ethernet.h>
 #include <errno.h>
 
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-utils.h"
 
 #include "systemd/nm-sd.h"
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index ab195c886a..1addd2cc60 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -30,15 +30,15 @@
 #include <stdlib.h>
 
 #include "NetworkManagerUtils.h"
-#include "nm-device-private.h"
-#include "nm-platform.h"
+#include "devices/nm-device-private.h"
+#include "platform/nm-platform.h"
 #include "nm-core-internal.h"
 #include "nm-ip4-config.h"
 #include "nm-dbus-compat.h"
 
 #include "nmdbus-device-team.h"
 
-#include "nm-device-logging.h"
+#include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceTeam);
 
 /*****************************************************************************/
diff --git a/src/devices/team/nm-device-team.h b/src/devices/team/nm-device-team.h
index 90af2e87c5..bbb1417f0e 100644
--- a/src/devices/team/nm-device-team.h
+++ b/src/devices/team/nm-device-team.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_TEAM_H__
 #define __NETWORKMANAGER_DEVICE_TEAM_H__
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 
 #define NM_TYPE_DEVICE_TEAM            (nm_device_team_get_type ())
 #define NM_DEVICE_TEAM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_TEAM, NMDeviceTeam))
diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c
index 4a6f7b54c1..d062429f26 100644
--- a/src/devices/team/nm-team-factory.c
+++ b/src/devices/team/nm-team-factory.c
@@ -24,9 +24,9 @@
 #include <gmodule.h>
 
 #include "nm-manager.h"
-#include "nm-device-factory.h"
+#include "devices/nm-device-factory.h"
 #include "nm-device-team.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-core-internal.h"
 
 /*****************************************************************************/
diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c
index 35bf749342..59223f11fd 100644
--- a/src/devices/tests/test-arping.c
+++ b/src/devices/tests/test-arping.c
@@ -20,8 +20,8 @@
 
 #include "nm-default.h"
 
-#include "nm-arping-manager.h"
-#include "test-common.h"
+#include "devices/nm-arping-manager.h"
+#include "platform/tests/test-common.h"
 
 #define IFACE_VETH0 "nm-test-veth0"
 #define IFACE_VETH1 "nm-test-veth1"
diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c
index 1fbab316e3..5d28d461df 100644
--- a/src/devices/tests/test-lldp.c
+++ b/src/devices/tests/test-lldp.c
@@ -26,10 +26,10 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "nm-lldp-listener.h"
+#include "devices/nm-lldp-listener.h"
 #include "systemd/nm-sd.h"
 
-#include "test-common.h"
+#include "platform/tests/test-common.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index 78bb4ca678..456b2f114a 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -37,23 +37,23 @@
 #include <sys/ioctl.h>
 #include <errno.h>
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-device-wifi.h"
-#include "nm-device-private.h"
+#include "devices/nm-device-private.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-act-request.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-olpc-mesh.h"
 #include "nm-manager.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 
 /* This is a bug; but we can't really change API now... */
 #include "nm-vpn-dbus-interface.h"
 
 #include "nmdbus-device-olpc-mesh.h"
 
-#include "nm-device-logging.h"
+#include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceOlpcMesh);
 
 /*****************************************************************************/
diff --git a/src/devices/wifi/nm-device-olpc-mesh.h b/src/devices/wifi/nm-device-olpc-mesh.h
index b58dfdf7be..bf0e4da9e1 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.h
+++ b/src/devices/wifi/nm-device-olpc-mesh.h
@@ -28,7 +28,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_OLPC_MESH_H__
 #define __NETWORKMANAGER_DEVICE_OLPC_MESH_H__
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 
 #define NM_TYPE_DEVICE_OLPC_MESH            (nm_device_olpc_mesh_get_type ())
 #define NM_DEVICE_OLPC_MESH(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DEVICE_OLPC_MESH, NMDeviceOlpcMesh))
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 44267125b0..997808bd6f 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -29,14 +29,14 @@
 #include <errno.h>
 
 #include "nm-common-macros.h"
-#include "nm-device.h"
-#include "nm-device-private.h"
+#include "devices/nm-device.h"
+#include "devices/nm-device-private.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-act-request.h"
-#include "nm-supplicant-manager.h"
-#include "nm-supplicant-interface.h"
-#include "nm-supplicant-config.h"
+#include "supplicant/nm-supplicant-manager.h"
+#include "supplicant/nm-supplicant-interface.h"
+#include "supplicant/nm-supplicant-config.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
@@ -44,16 +44,16 @@
 #include "nm-setting-ip4-config.h"
 #include "nm-ip4-config.h"
 #include "nm-setting-ip6-config.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-auth-utils.h"
-#include "nm-settings-connection.h"
-#include "nm-settings.h"
+#include "settings/nm-settings-connection.h"
+#include "settings/nm-settings.h"
 #include "nm-core-internal.h"
 #include "nm-config.h"
 
 #include "nmdbus-device-wifi.h"
 
-#include "nm-device-logging.h"
+#include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceWifi);
 
 /* All of these are in seconds */
diff --git a/src/devices/wifi/nm-device-wifi.h b/src/devices/wifi/nm-device-wifi.h
index d2914fa21a..024fe0efe8 100644
--- a/src/devices/wifi/nm-device-wifi.h
+++ b/src/devices/wifi/nm-device-wifi.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_WIFI_H__
 #define __NETWORKMANAGER_DEVICE_WIFI_H__
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-wifi-ap.h"
 
 #define NM_TYPE_DEVICE_WIFI             (nm_device_wifi_get_type ())
diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/devices/wifi/nm-wifi-factory.c
index 64ecca0827..a1752634bc 100644
--- a/src/devices/wifi/nm-wifi-factory.c
+++ b/src/devices/wifi/nm-wifi-factory.c
@@ -22,13 +22,13 @@
 
 #include <gmodule.h>
 
-#include "nm-device-factory.h"
+#include "devices/nm-device-factory.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-olpc-mesh.h"
 #include "nm-device-wifi.h"
 #include "nm-device-olpc-mesh.h"
-#include "nm-settings-connection.h"
-#include "nm-platform.h"
+#include "settings/nm-settings-connection.h"
+#include "platform/nm-platform.h"
 
 /*****************************************************************************/
 
diff --git a/src/devices/wifi/tests/test-general.c b/src/devices/wifi/tests/test-general.c
index 227ff5b7eb..3e61c5f0ac 100644
--- a/src/devices/wifi/tests/test-general.c
+++ b/src/devices/wifi/tests/test-general.c
@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "nm-wifi-utils.h"
+#include "devices/wifi/nm-wifi-utils.h"
 
 #include "nm-core-internal.h"
 
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index 3f28581b3f..ad730ba5da 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -25,16 +25,16 @@
 #include <string.h>
 
 #include "nm-modem.h"
-#include "nm-device-private.h"
+#include "devices/nm-device-private.h"
 #include "nm-rfkill-manager.h"
-#include "nm-settings-connection.h"
+#include "settings/nm-settings-connection.h"
 #include "nm-modem-broadband.h"
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"
 
 #include "nmdbus-device-modem.h"
 
-#include "nm-device-logging.h"
+#include "devices/nm-device-logging.h"
 _LOG_DECLARE_SELF(NMDeviceModem);
 
 /*****************************************************************************/
diff --git a/src/devices/wwan/nm-device-modem.h b/src/devices/wwan/nm-device-modem.h
index fe53de62c4..65bda8b6ef 100644
--- a/src/devices/wwan/nm-device-modem.h
+++ b/src/devices/wwan/nm-device-modem.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DEVICE_MODEM_H__
 #define __NETWORKMANAGER_DEVICE_MODEM_H__
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-modem.h"
 
 #define NM_TYPE_DEVICE_MODEM            (nm_device_modem_get_type ())
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index e3f097977a..e1fc45467c 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -28,8 +28,8 @@
 
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
-#include "nm-device-private.h"
-#include "nm-platform.h"
+#include "devices/nm-device-private.h"
+#include "platform/nm-platform.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 
diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/devices/wwan/nm-modem-ofono.c
index c7796e5126..41d422aab4 100644
--- a/src/devices/wwan/nm-modem-ofono.c
+++ b/src/devices/wwan/nm-modem-ofono.c
@@ -25,9 +25,9 @@
 #include <string.h>
 
 #include "nm-core-internal.h"
-#include "nm-device-private.h"
+#include "devices/nm-device-private.h"
 #include "nm-modem.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-ip4-config.h"
 
 #define VARIANT_IS_OF_TYPE_BOOLEAN(v)      ((v) != NULL && ( g_variant_is_of_type ((v), G_VARIANT_TYPE_BOOLEAN) ))
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index be35eee39c..6c137c0cd1 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -28,10 +28,10 @@
 #include <termios.h>
 
 #include "nm-core-internal.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-setting-connection.h"
 #include "NetworkManagerUtils.h"
-#include "nm-device-private.h"
+#include "devices/nm-device-private.h"
 #include "nm-route-manager.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
diff --git a/src/devices/wwan/nm-modem.h b/src/devices/wwan/nm-modem.h
index 97c4e4cc73..c590b9e440 100644
--- a/src/devices/wwan/nm-modem.h
+++ b/src/devices/wwan/nm-modem.h
@@ -23,7 +23,7 @@
 #define __NETWORKMANAGER_MODEM_H__
 
 #include "ppp/nm-ppp-manager.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 
 #define NM_TYPE_MODEM            (nm_modem_get_type ())
 #define NM_MODEM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MODEM, NMModem))
diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c
index 458ab2e17a..fa4c8dbbf6 100644
--- a/src/devices/wwan/nm-wwan-factory.c
+++ b/src/devices/wwan/nm-wwan-factory.c
@@ -23,12 +23,12 @@
 #include <string.h>
 #include <gmodule.h>
 
-#include "nm-device-factory.h"
+#include "devices/nm-device-factory.h"
 #include "nm-setting-gsm.h"
 #include "nm-setting-cdma.h"
 #include "nm-modem-manager.h"
 #include "nm-device-modem.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 
 /*****************************************************************************/
 
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index ec981e0ead..31eb8276c5 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -33,7 +33,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 #include "nm-dhcp-utils.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 
 #include "nm-dhcp-client-logging.h"
 
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c
index 706f5291f0..8cc25ab5a7 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp/nm-dhcp-dhclient-utils.c
@@ -28,7 +28,7 @@
 #include "nm-dhcp-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-utils.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "NetworkManagerUtils.h"
 
 #define CLIENTID_TAG            "send dhcp-client-identifier"
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index b6c9e27c17..7067275bc3 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -31,7 +31,7 @@
 #include "nm-utils.h"
 #include "nm-dhcp-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-dhcp-client-logging.h"
 #include "systemd/nm-sd.h"
 
diff --git a/src/dhcp/nm-dhcp-utils.c b/src/dhcp/nm-dhcp-utils.c
index 4205d021b7..e020ca3318 100644
--- a/src/dhcp/nm-dhcp-utils.c
+++ b/src/dhcp/nm-dhcp-utils.c
@@ -27,7 +27,7 @@
 #include "nm-dhcp-utils.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-dhcp-client-logging.h"
 #include "nm-core-internal.h"
 
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
index 22a27cdec0..82f0c080bf 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/dhcp/tests/test-dhcp-dhclient.c
@@ -25,11 +25,11 @@
 #include <arpa/inet.h>
 
 #include "NetworkManagerUtils.h"
-#include "nm-dhcp-dhclient-utils.h"
-#include "nm-dhcp-utils.h"
+#include "dhcp/nm-dhcp-dhclient-utils.h"
+#include "dhcp/nm-dhcp-utils.h"
 #include "nm-utils.h"
 #include "nm-ip4-config.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/dhcp/tests/test-dhcp-utils.c b/src/dhcp/tests/test-dhcp-utils.c
index 89d693ed11..ffd6349361 100644
--- a/src/dhcp/tests/test-dhcp-utils.c
+++ b/src/dhcp/tests/test-dhcp-utils.c
@@ -25,8 +25,8 @@
 
 #include "nm-utils.h"
 
-#include "nm-dhcp-utils.h"
-#include "nm-platform.h"
+#include "dhcp/nm-dhcp-utils.h"
+#include "platform/nm-platform.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/dns/nm-dns-dnsmasq.c b/src/dns/nm-dns-dnsmasq.c
index 9db6ed856a..9ef7972fee 100644
--- a/src/dns/nm-dns-dnsmasq.c
+++ b/src/dns/nm-dns-dnsmasq.c
@@ -31,7 +31,7 @@
 #include <linux/if.h>
 
 #include "nm-core-internal.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
diff --git a/src/dns/nm-dns-systemd-resolved.c b/src/dns/nm-dns-systemd-resolved.c
index 55a3398cad..325088e2f9 100644
--- a/src/dns/nm-dns-systemd-resolved.c
+++ b/src/dns/nm-dns-systemd-resolved.c
@@ -32,13 +32,13 @@
 #include <linux/if.h>
 
 #include "nm-core-internal.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-bus-manager.h"
 #include "nm-manager.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "NetworkManagerUtils.h"
 
 #define SYSTEMD_RESOLVED_DBUS_SERVICE "org.freedesktop.resolve1"
diff --git a/src/dnsmasq/nm-dnsmasq-utils.c b/src/dnsmasq/nm-dnsmasq-utils.c
index 3786f37d44..e4f4324b85 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.c
+++ b/src/dnsmasq/nm-dnsmasq-utils.c
@@ -24,7 +24,7 @@
 #include <arpa/inet.h>
 
 #include "nm-dnsmasq-utils.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-utils.h"
 
 gboolean
diff --git a/src/dnsmasq/nm-dnsmasq-utils.h b/src/dnsmasq/nm-dnsmasq-utils.h
index 459dda0475..54b90309cf 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.h
+++ b/src/dnsmasq/nm-dnsmasq-utils.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DNSMASQ_UTILS_H__
 #define __NETWORKMANAGER_DNSMASQ_UTILS_H__
 
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 
 gboolean nm_dnsmasq_utils_get_range (const NMPlatformIP4Address *addr,
                                      char *out_first,
diff --git a/src/dnsmasq/tests/test-dnsmasq-utils.c b/src/dnsmasq/tests/test-dnsmasq-utils.c
index a826abaf30..00ff66102a 100644
--- a/src/dnsmasq/tests/test-dnsmasq-utils.c
+++ b/src/dnsmasq/tests/test-dnsmasq-utils.c
@@ -22,7 +22,7 @@
 
 #include <arpa/inet.h>
 
-#include "nm-dnsmasq-utils.h"
+#include "dnsmasq/nm-dnsmasq-utils.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/main.c b/src/main.c
index 47dc613009..cfac7fb621 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,14 +38,14 @@
 #include "nm-dbus-interface.h"
 #include "NetworkManagerUtils.h"
 #include "nm-manager.h"
-#include "nm-linux-platform.h"
+#include "platform/nm-linux-platform.h"
 #include "nm-bus-manager.h"
-#include "nm-device.h"
-#include "nm-dhcp-manager.h"
+#include "devices/nm-device.h"
+#include "dhcp/nm-dhcp-manager.h"
 #include "nm-config.h"
 #include "nm-session-monitor.h"
 #include "nm-dispatcher.h"
-#include "nm-settings.h"
+#include "settings/nm-settings.h"
 #include "nm-auth-manager.h"
 #include "nm-core-internal.h"
 #include "nm-exported-object.h"
diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c
index c8cfb798e3..6378c90039 100644
--- a/src/ndisc/nm-lndp-ndisc.c
+++ b/src/ndisc/nm-lndp-ndisc.c
@@ -31,8 +31,8 @@
 
 #include "nm-ndisc-private.h"
 #include "NetworkManagerUtils.h"
-#include "nm-platform.h"
-#include "nmp-netns.h"
+#include "platform/nm-platform.h"
+#include "platform/nmp-netns.h"
 
 #define _NMLOG_PREFIX_NAME                "ndisc-lndp"
 
diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c
index 1294c9974b..775bb61139 100644
--- a/src/ndisc/nm-ndisc.c
+++ b/src/ndisc/nm-ndisc.c
@@ -30,8 +30,8 @@
 
 #include "nm-ndisc-private.h"
 #include "nm-utils.h"
-#include "nm-platform.h"
-#include "nmp-netns.h"
+#include "platform/nm-platform.h"
+#include "platform/nmp-netns.h"
 
 #define _NMLOG_PREFIX_NAME                "ndisc"
 
diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/ndisc/tests/test-ndisc-fake.c
index dce066eaf8..006aea7f40 100644
--- a/src/ndisc/tests/test-ndisc-fake.c
+++ b/src/ndisc/tests/test-ndisc-fake.c
@@ -23,10 +23,10 @@
 #include <string.h>
 #include <syslog.h>
 
-#include "nm-ndisc.h"
-#include "nm-fake-ndisc.h"
+#include "ndisc/nm-ndisc.h"
+#include "ndisc/nm-fake-ndisc.h"
 
-#include "nm-fake-platform.h"
+#include "platform/nm-fake-platform.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/ndisc/tests/test-ndisc-linux.c b/src/ndisc/tests/test-ndisc-linux.c
index e621eba952..2764b6c040 100644
--- a/src/ndisc/tests/test-ndisc-linux.c
+++ b/src/ndisc/tests/test-ndisc-linux.c
@@ -23,10 +23,10 @@
 #include <string.h>
 #include <syslog.h>
 
-#include "nm-ndisc.h"
-#include "nm-lndp-ndisc.h"
+#include "ndisc/nm-ndisc.h"
+#include "ndisc/nm-lndp-ndisc.h"
 
-#include "nm-linux-platform.h"
+#include "platform/nm-linux-platform.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/nm-act-request.c b/src/nm-act-request.c
index 40c1efa2e6..b746e45baf 100644
--- a/src/nm-act-request.c
+++ b/src/nm-act-request.c
@@ -30,9 +30,9 @@
 
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-active-connection.h"
-#include "nm-settings-connection.h"
+#include "settings/nm-settings-connection.h"
 #include "nm-auth-subject.h"
 
 typedef struct {
diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c
index 1eba44959f..c543b1d7b3 100644
--- a/src/nm-active-connection.c
+++ b/src/nm-active-connection.c
@@ -24,8 +24,8 @@
 
 #include "nm-common-macros.h"
 #include "nm-dbus-interface.h"
-#include "nm-device.h"
-#include "nm-settings-connection.h"
+#include "devices/nm-device.h"
+#include "settings/nm-settings-connection.h"
 #include "nm-simple-connection.h"
 #include "nm-auth-utils.h"
 #include "nm-auth-subject.h"
diff --git a/src/nm-audit-manager.c b/src/nm-audit-manager.c
index c8bbc5ccc5..eeb9d2ba80 100644
--- a/src/nm-audit-manager.c
+++ b/src/nm-audit-manager.c
@@ -30,7 +30,7 @@
 
 #include "nm-auth-subject.h"
 #include "nm-config.h"
-#include "nm-settings-connection.h"
+#include "settings/nm-settings-connection.h"
 
 /*****************************************************************************/
 
diff --git a/src/nm-audit-manager.h b/src/nm-audit-manager.h
index d157ff122a..29bde1a50d 100644
--- a/src/nm-audit-manager.h
+++ b/src/nm-audit-manager.h
@@ -22,7 +22,7 @@
 #define __NM_AUDIT_MANAGER_H__
 
 #include "nm-connection.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-types.h"
 
 #define NM_TYPE_AUDIT_MANAGER            (nm_audit_manager_get_type ())
diff --git a/src/nm-checkpoint-manager.c b/src/nm-checkpoint-manager.c
index b5dac7ada7..7f9aa398db 100644
--- a/src/nm-checkpoint-manager.c
+++ b/src/nm-checkpoint-manager.c
@@ -25,7 +25,7 @@
 #include "nm-checkpoint.h"
 #include "nm-connection.h"
 #include "nm-core-utils.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-exported-object.h"
 #include "nm-manager.h"
 #include "nm-utils.h"
diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c
index ad00b68797..ee30f9bdc4 100644
--- a/src/nm-checkpoint.c
+++ b/src/nm-checkpoint.c
@@ -27,10 +27,10 @@
 #include "nm-auth-subject.h"
 #include "nm-core-utils.h"
 #include "nm-dbus-interface.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-manager.h"
-#include "nm-settings.h"
-#include "nm-settings-connection.h"
+#include "settings/nm-settings.h"
+#include "settings/nm-settings-connection.h"
 #include "nm-simple-connection.h"
 #include "nm-utils.h"
 #include "nmdbus-checkpoint.h"
diff --git a/src/nm-config-data.c b/src/nm-config-data.c
index 5a2bebcdb5..ce13b27f3d 100644
--- a/src/nm-config-data.c
+++ b/src/nm-config-data.c
@@ -26,7 +26,7 @@
 #include <string.h>
 
 #include "nm-config.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-internal.h"
 
diff --git a/src/nm-config.c b/src/nm-config.c
index 3f492026a1..f1ea02bacb 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 
 #include "nm-utils.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "NetworkManagerUtils.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-internal.h"
diff --git a/src/nm-dcb.c b/src/nm-dcb.c
index d8f3d3e7ec..140e7c3649 100644
--- a/src/nm-dcb.c
+++ b/src/nm-dcb.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include "nm-dcb.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "NetworkManagerUtils.h"
 
 static const char *helper_names[] = { "dcbtool", "fcoeadm" };
diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c
index cf0fae0769..5944654cff 100644
--- a/src/nm-default-route-manager.c
+++ b/src/nm-default-route-manager.c
@@ -25,9 +25,9 @@
 
 #include <string.h>
 
-#include "nm-device.h"
-#include "nm-vpn-connection.h"
-#include "nm-platform.h"
+#include "devices/nm-device.h"
+#include "vpn/nm-vpn-connection.h"
+#include "platform/nm-platform.h"
 #include "nm-manager.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index 552eed8501..6c0c4bb44d 100644
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -29,15 +29,15 @@
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
 #include "nm-connectivity.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"
 #include "nm-proxy-config.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
 #include "nm-manager.h"
-#include "nm-settings-connection.h"
-#include "nm-platform.h"
+#include "settings/nm-settings-connection.h"
+#include "platform/nm-platform.h"
 #include "nm-core-internal.h"
 
 #define CALL_TIMEOUT (1000 * 60 * 10)  /* 10 minutes for all scripts */
diff --git a/src/nm-exported-object.c b/src/nm-exported-object.c
index 5dffb02f42..9af4a3f2f4 100644
--- a/src/nm-exported-object.c
+++ b/src/nm-exported-object.c
@@ -27,7 +27,7 @@
 
 #include "nm-bus-manager.h"
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-active-connection.h"
 #include "nmdbus-device-statistics.h"
 
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index cd437752fd..b9498d3172 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -38,10 +38,10 @@ extern unsigned int if_nametoindex (const char *__ifname);
 
 #include "main-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-linux-platform.h"
-#include "nm-dhcp-manager.h"
-#include "nm-ndisc.h"
-#include "nm-lndp-ndisc.h"
+#include "platform/nm-linux-platform.h"
+#include "dhcp/nm-dhcp-manager.h"
+#include "ndisc/nm-ndisc.h"
+#include "ndisc/nm-lndp-ndisc.h"
 #include "nm-utils.h"
 #include "nm-setting-ip6-config.h"
 #include "systemd/nm-sd.h"
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 28f670bb12..6e7f262be5 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -27,8 +27,8 @@
 #include <arpa/inet.h>
 
 #include "nm-utils.h"
-#include "nm-platform.h"
-#include "nm-platform-utils.h"
+#include "platform/nm-platform.h"
+#include "platform/nm-platform-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-route-manager.h"
 #include "nm-core-internal.h"
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index bd65501aef..988689d8e8 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -27,8 +27,8 @@
 #include <arpa/inet.h>
 
 #include "nm-utils.h"
-#include "nm-platform.h"
-#include "nm-platform-utils.h"
+#include "platform/nm-platform.h"
+#include "platform/nm-platform-utils.h"
 #include "nm-route-manager.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/nm-manager.c b/src/nm-manager.c
index e6b60d1863..f3344e4528 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -31,18 +31,18 @@
 
 #include "nm-common-macros.h"
 #include "nm-bus-manager.h"
-#include "nm-vpn-manager.h"
-#include "nm-device.h"
-#include "nm-device-generic.h"
-#include "nm-platform.h"
+#include "vpn/nm-vpn-manager.h"
+#include "devices/nm-device.h"
+#include "devices/nm-device-generic.h"
+#include "platform/nm-platform.h"
 #include "nm-rfkill-manager.h"
-#include "nm-dhcp-manager.h"
-#include "nm-settings.h"
-#include "nm-settings-connection.h"
+#include "dhcp/nm-dhcp-manager.h"
+#include "settings/nm-settings.h"
+#include "settings/nm-settings-connection.h"
 #include "nm-auth-utils.h"
 #include "nm-auth-manager.h"
 #include "NetworkManagerUtils.h"
-#include "nm-device-factory.h"
+#include "devices/nm-device-factory.h"
 #include "nm-sleep-monitor.h"
 #include "nm-connectivity.h"
 #include "nm-policy.h"
diff --git a/src/nm-manager.h b/src/nm-manager.h
index 90041ccd7d..963e22798c 100644
--- a/src/nm-manager.h
+++ b/src/nm-manager.h
@@ -23,7 +23,7 @@
 #define __NETWORKMANAGER_MANAGER_H__
 
 #include "nm-exported-object.h"
-#include "nm-settings-connection.h"
+#include "settings/nm-settings-connection.h"
 
 #define NM_TYPE_MANAGER            (nm_manager_get_type ())
 #define NM_MANAGER(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_MANAGER, NMManager))
diff --git a/src/nm-pacrunner-manager.c b/src/nm-pacrunner-manager.c
index 8ae9144df0..2d1f7deebe 100644
--- a/src/nm-pacrunner-manager.c
+++ b/src/nm-pacrunner-manager.c
@@ -23,7 +23,7 @@
 #include "nm-pacrunner-manager.h"
 
 #include "nm-utils.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-proxy-config.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
diff --git a/src/nm-policy.c b/src/nm-policy.c
index f9cd578444..5b53f8a1ed 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -30,21 +30,21 @@
 
 #include "NetworkManagerUtils.h"
 #include "nm-act-request.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-default-route-manager.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-connection.h"
-#include "nm-platform.h"
-#include "nm-dns-manager.h"
-#include "nm-vpn-manager.h"
+#include "platform/nm-platform.h"
+#include "dns/nm-dns-manager.h"
+#include "vpn/nm-vpn-manager.h"
 #include "nm-auth-utils.h"
 #include "nm-firewall-manager.h"
 #include "nm-dispatcher.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"
 #include "nm-manager.h"
-#include "nm-settings.h"
-#include "nm-settings-connection.h"
+#include "settings/nm-settings.h"
+#include "settings/nm-settings-connection.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"
 
diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c
index 2181a57c71..344ebc46c1 100644
--- a/src/nm-route-manager.c
+++ b/src/nm-route-manager.c
@@ -24,8 +24,8 @@
 
 #include <string.h>
 
-#include "nm-platform.h"
-#include "nmp-object.h"
+#include "platform/nm-platform.h"
+#include "platform/nmp-object.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 
diff --git a/src/platform/tests/monitor.c b/src/platform/tests/monitor.c
index 937eea1154..d0c58aebb0 100644
--- a/src/platform/tests/monitor.c
+++ b/src/platform/tests/monitor.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <syslog.h>
 
-#include "nm-linux-platform.h"
+#include "platform/nm-linux-platform.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h
index 16b2f8b8af..a9f4959091 100644
--- a/src/platform/tests/test-common.h
+++ b/src/platform/tests/test-common.h
@@ -4,9 +4,9 @@
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "nm-platform.h"
-#include "nm-fake-platform.h"
-#include "nm-linux-platform.h"
+#include "platform/nm-platform.h"
+#include "platform/nm-fake-platform.h"
+#include "platform/nm-linux-platform.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/platform/tests/test-general.c b/src/platform/tests/test-general.c
index c67f2e0410..658aad264e 100644
--- a/src/platform/tests/test-general.c
+++ b/src/platform/tests/test-general.c
@@ -22,8 +22,8 @@
 
 #include <linux/rtnetlink.h>
 
-#include "nm-platform-utils.h"
-#include "nm-linux-platform.h"
+#include "platform/nm-platform-utils.h"
+#include "platform/nm-linux-platform.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c
index 89bdcc7b35..e3b55e73c8 100644
--- a/src/platform/tests/test-link.c
+++ b/src/platform/tests/test-link.c
@@ -25,9 +25,9 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "nmp-object.h"
-#include "nmp-netns.h"
-#include "nm-platform-utils.h"
+#include "platform/nmp-object.h"
+#include "platform/nmp-netns.h"
+#include "platform/nm-platform-utils.h"
 
 #include "test-common.h"
 #include "nm-test-utils-core.h"
diff --git a/src/platform/tests/test-nmp-object.c b/src/platform/tests/test-nmp-object.c
index ccc256ada7..f7b209dee2 100644
--- a/src/platform/tests/test-nmp-object.c
+++ b/src/platform/tests/test-nmp-object.c
@@ -20,7 +20,7 @@
 
 #include "nm-default.h"
 
-#include "nmp-object.h"
+#include "platform/nmp-object.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c
index 65cc699a8a..59a05bd492 100644
--- a/src/platform/tests/test-route.c
+++ b/src/platform/tests/test-route.c
@@ -23,7 +23,7 @@
 #include <linux/rtnetlink.h>
 
 #include "nm-core-utils.h"
-#include "nm-platform-utils.h"
+#include "platform/nm-platform-utils.h"
 
 #include "test-common.h"
 
diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c
index 2e222eb801..ac51678ff7 100644
--- a/src/platform/wifi/wifi-utils-nl80211.c
+++ b/src/platform/wifi/wifi-utils-nl80211.c
@@ -34,7 +34,7 @@
 
 #include "wifi-utils-private.h"
 #include "wifi-utils-nl80211.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-utils.h"
 
 
diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c
index df1d989c6b..3936bbe37c 100644
--- a/src/platform/wifi/wifi-utils-wext.c
+++ b/src/platform/wifi/wifi-utils-wext.c
@@ -31,7 +31,7 @@
 #include "wifi-utils-private.h"
 #include "wifi-utils-wext.h"
 #include "nm-utils.h"
-#include "nm-platform-utils.h"
+#include "platform/nm-platform-utils.h"
 
 /* Hacks necessary to #include wireless.h; yay for WEXT */
 #ifndef __user
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c
index 9b212a1acb..793209c601 100644
--- a/src/ppp/nm-ppp-manager.c
+++ b/src/ppp/nm-ppp-manager.c
@@ -44,7 +44,7 @@
 #include <linux/if_ppp.h>
 
 #include "NetworkManagerUtils.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-core-internal.h"
 #include "nm-act-request.h"
 #include "nm-ip4-config.h"
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index ff7fea0152..c99d6b9e58 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -62,7 +62,7 @@
 #include "nm-utils.h"
 #include "nm-core-internal.h"
 
-#include "nm-device-ethernet.h"
+#include "devices/nm-device-ethernet.h"
 #include "nm-settings-connection.h"
 #include "nm-settings-plugin.h"
 #include "nm-bus-manager.h"
diff --git a/src/settings/plugins/ibft/nms-ibft-connection.h b/src/settings/plugins/ibft/nms-ibft-connection.h
index 7b9061f777..de0506624b 100644
--- a/src/settings/plugins/ibft/nms-ibft-connection.h
+++ b/src/settings/plugins/ibft/nms-ibft-connection.h
@@ -21,7 +21,7 @@
 #ifndef __NMS_IBFT_CONNECTION_H__
 #define __NMS_IBFT_CONNECTION_H__
 
-#include <nm-settings-connection.h>
+#include "settings/nm-settings-connection.h"
 
 #define NMS_TYPE_IBFT_CONNECTION            (nms_ibft_connection_get_type ())
 #define NMS_IBFT_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMS_TYPE_IBFT_CONNECTION, NMSIbftConnection))
diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c
index 95aa2f4623..c9069dc74c 100644
--- a/src/settings/plugins/ibft/nms-ibft-plugin.c
+++ b/src/settings/plugins/ibft/nms-ibft-plugin.c
@@ -28,7 +28,7 @@
 #include <gmodule.h>
 
 #include "nm-setting-connection.h"
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 #include "NetworkManagerUtils.h"
 
 #include "nms-ibft-reader.h"
diff --git a/src/settings/plugins/ibft/nms-ibft-reader.c b/src/settings/plugins/ibft/nms-ibft-reader.c
index fa4d7ddb3d..d26c833473 100644
--- a/src/settings/plugins/ibft/nms-ibft-reader.c
+++ b/src/settings/plugins/ibft/nms-ibft-reader.c
@@ -34,7 +34,7 @@
 #include <unistd.h>
 
 #include "nm-core-internal.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "NetworkManagerUtils.h"
 
 /*****************************************************************************/
diff --git a/src/settings/plugins/ibft/tests/test-ibft.c b/src/settings/plugins/ibft/tests/test-ibft.c
index 3d61817612..72d1a7db48 100644
--- a/src/settings/plugins/ibft/tests/test-ibft.c
+++ b/src/settings/plugins/ibft/tests/test-ibft.c
@@ -32,7 +32,7 @@
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 
-#include "nms-ibft-reader.h"
+#include "settings/plugins/ibft/nms-ibft-reader.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
index ea8f337661..92593644d7 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
@@ -35,8 +35,8 @@
 #include "nm-setting-pppoe.h"
 #include "nm-setting-wireless-security.h"
 #include "nm-setting-8021x.h"
-#include "nm-platform.h"
-#include "nm-inotify-helper.h"
+#include "platform/nm-platform.h"
+#include "settings/nm-inotify-helper.h"
 #include "nm-config.h"
 
 #include "nms-ifcfg-rh-common.h"
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h
index c706d2a20a..fd68f2d3bc 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.h
@@ -22,7 +22,7 @@
 #define __NETWORKMANAGER_IFCFG_CONNECTION_H__
 
 #include "nm-dbus-interface.h"
-#include "nm-settings-connection.h"
+#include "settings/nm-settings-connection.h"
 
 #define NM_TYPE_IFCFG_CONNECTION            (nm_ifcfg_connection_get_type ())
 #define NM_IFCFG_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_IFCFG_CONNECTION, NMIfcfgConnection))
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index 7532da75e6..ada0493535 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
@@ -34,7 +34,7 @@
 
 #include "nm-dbus-compat.h"
 #include "nm-setting-connection.h"
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 #include "nm-config.h"
 #include "NetworkManagerUtils.h"
 #include "nm-exported-object.h"
@@ -46,7 +46,7 @@
 #include "nms-ifcfg-rh-utils.h"
 #include "shvar.h"
 
-#include "nmdbus-ifcfg-rh.h"
+#include "settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h"
 
 #define IFCFGRH1_DBUS_SERVICE_NAME "com.redhat.ifcfgrh1"
 #define IFCFGRH1_DBUS_OBJECT_PATH "/com/redhat/ifcfgrh1"
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index 8bd6fb4519..b48da212f7 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -53,7 +53,7 @@
 #include "nm-core-internal.h"
 #include "nm-utils.h"
 
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "NetworkManagerUtils.h"
 
 #include "nms-ifcfg-rh-common.h"
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index 0a58da6bd1..6e974e1e59 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -50,10 +50,10 @@
 
 #include "NetworkManagerUtils.h"
 
-#include "nms-ifcfg-rh-common.h"
-#include "nms-ifcfg-rh-reader.h"
-#include "nms-ifcfg-rh-writer.h"
-#include "nms-ifcfg-rh-utils.h"
+#include "settings/plugins/ifcfg-rh/nms-ifcfg-rh-common.h"
+#include "settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.h"
+#include "settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h"
+#include "settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
index f336c1ccea..84f2d3f4cc 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.c
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <errno.h>
 
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
 
diff --git a/src/settings/plugins/ifnet/nms-ifnet-connection.c b/src/settings/plugins/ifnet/nms-ifnet-connection.c
index bea5d11287..ba87d46c4a 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-connection.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-connection.c
@@ -29,8 +29,8 @@
 #include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-setting-wireless-security.h"
-#include "nm-settings-connection.h"
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-connection.h"
+#include "settings/nm-settings-plugin.h"
 
 #include "nms-ifnet-connection-parser.h"
 #include "nms-ifnet-net-parser.h"
diff --git a/src/settings/plugins/ifnet/nms-ifnet-connection.h b/src/settings/plugins/ifnet/nms-ifnet-connection.h
index 1718dcb93e..1bc066449a 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-connection.h
+++ b/src/settings/plugins/ifnet/nms-ifnet-connection.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_IFNET_CONNECTION_H__
 #define __NETWORKMANAGER_IFNET_CONNECTION_H__
 
-#include <nm-settings-connection.h>
+#include "settings/nm-settings-connection.h"
 
 #include "nms-ifnet-net-parser.h"
 
diff --git a/src/settings/plugins/ifnet/nms-ifnet-net-parser.c b/src/settings/plugins/ifnet/nms-ifnet-net-parser.c
index e4b0ad6ba8..0007f9cdd5 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-net-parser.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-net-parser.c
@@ -28,8 +28,8 @@
 #include <sys/ioctl.h>
 #include <unistd.h>
 
-#include "nm-settings-plugin.h"
-#include "nm-platform.h"
+#include "settings/nm-settings-plugin.h"
+#include "platform/nm-platform.h"
 
 #include "nms-ifnet-plugin.h"
 #include "nms-ifnet-net-utils.h"
diff --git a/src/settings/plugins/ifnet/nms-ifnet-net-utils.c b/src/settings/plugins/ifnet/nms-ifnet-net-utils.c
index deb8cef3b2..db3c642ad1 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-net-utils.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-net-utils.c
@@ -30,7 +30,7 @@
 
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 #include "nm-config.h"
 
 #include "nms-ifnet-wpa-parser.h"
diff --git a/src/settings/plugins/ifnet/nms-ifnet-plugin.c b/src/settings/plugins/ifnet/nms-ifnet-plugin.c
index 4835e3a554..77f3b0bf52 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-plugin.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-plugin.c
@@ -30,7 +30,7 @@
 #include "nm-utils.h"
 #include "nm-setting-connection.h"
 #include "nm-dbus-interface.h"
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 #include "nm-config.h"
 #include "NetworkManagerUtils.h"
 
diff --git a/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c b/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
index 1d654d5181..61e4da7cf4 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 
 #include "nms-ifnet-net-parser.h"
 #include "nms-ifnet-net-utils.h"
diff --git a/src/settings/plugins/ifnet/tests/test-ifnet.c b/src/settings/plugins/ifnet/tests/test-ifnet.c
index 7ab11ba55f..93727af72a 100644
--- a/src/settings/plugins/ifnet/tests/test-ifnet.c
+++ b/src/settings/plugins/ifnet/tests/test-ifnet.c
@@ -31,12 +31,12 @@
 #include "nm-utils.h"
 
 #include "nm-config.h"
-#include "nm-linux-platform.h"
+#include "platform/nm-linux-platform.h"
 
-#include "nms-ifnet-net-parser.h"
-#include "nms-ifnet-net-utils.h"
-#include "nms-ifnet-wpa-parser.h"
-#include "nms-ifnet-connection-parser.h"
+#include "settings/plugins/ifnet/nms-ifnet-net-parser.h"
+#include "settings/plugins/ifnet/nms-ifnet-net-utils.h"
+#include "settings/plugins/ifnet/nms-ifnet-wpa-parser.h"
+#include "settings/plugins/ifnet/nms-ifnet-connection-parser.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-connection.c b/src/settings/plugins/ifupdown/nms-ifupdown-connection.c
index 1c3333bddd..c3d231fe16 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-connection.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-connection.c
@@ -30,8 +30,8 @@
 #include "nm-dbus-interface.h"
 #include "nm-utils.h"
 #include "nm-setting-wireless-security.h"
-#include "nm-settings-connection.h"
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-connection.h"
+#include "settings/nm-settings-plugin.h"
 
 #include "nms-ifupdown-parser.h"
 
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-connection.h b/src/settings/plugins/ifupdown/nms-ifupdown-connection.h
index 107cd69697..7536c23e11 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-connection.h
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-connection.h
@@ -24,7 +24,7 @@
 #ifndef __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__
 #define __NETWORKMANAGER_IFUPDOWN_CONNECTION_H__
 
-#include <nm-settings-connection.h>
+#include "settings/nm-settings-connection.h"
 
 #include "nms-ifupdown-interface-parser.h"
 
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
index 00d56508cc..a21a7955ab 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
@@ -32,7 +32,7 @@
 #include <ctype.h>
 
 #include "nm-core-internal.h"
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 
 #include "nms-ifupdown-plugin.h"
 #include "nms-ifupdown-parser.h"
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index 35ae88e9f3..211e5d5736 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
@@ -33,7 +33,7 @@
 
 #include "nm-setting-connection.h"
 #include "nm-dbus-interface.h"
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-wired.h"
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
index eaf7a67f96..d037b8a650 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -24,8 +24,8 @@
 
 #include "nm-core-internal.h"
 
-#include "nms-ifupdown-interface-parser.h"
-#include "nms-ifupdown-parser.h"
+#include "settings/plugins/ifupdown/nms-ifupdown-interface-parser.h"
+#include "settings/plugins/ifupdown/nms-ifupdown-parser.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/settings/plugins/keyfile/nms-keyfile-connection.c b/src/settings/plugins/keyfile/nms-keyfile-connection.c
index 948290fa60..ff654acf8e 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-connection.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-connection.c
@@ -30,7 +30,7 @@
 #include "nm-setting-connection.h"
 #include "nm-utils.h"
 
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 
 #include "nms-keyfile-reader.h"
 #include "nms-keyfile-writer.h"
diff --git a/src/settings/plugins/keyfile/nms-keyfile-connection.h b/src/settings/plugins/keyfile/nms-keyfile-connection.h
index 3520f4212b..f96d7590f0 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-connection.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-connection.h
@@ -22,7 +22,7 @@
 #ifndef __NMS_KEYFILE_CONNECTION_H__
 #define __NMS_KEYFILE_CONNECTION_H__
 
-#include <nm-settings-connection.h>
+#include "settings/nm-settings-connection.h"
 
 #define NMS_TYPE_KEYFILE_CONNECTION            (nms_keyfile_connection_get_type ())
 #define NMS_KEYFILE_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMS_TYPE_KEYFILE_CONNECTION, NMSKeyfileConnection))
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
index 4c8dfad43a..6f01149aeb 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -37,7 +37,7 @@
 #include "nm-config.h"
 #include "nm-core-internal.h"
 
-#include "nm-settings-plugin.h"
+#include "settings/nm-settings-plugin.h"
 
 #include "nms-keyfile-connection.h"
 #include "nms-keyfile-writer.h"
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index 68a4ba1532..05979f774c 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -30,9 +30,9 @@
 
 #include "nm-core-internal.h"
 
-#include "nms-keyfile-reader.h"
-#include "nms-keyfile-writer.h"
-#include "nms-keyfile-utils.h"
+#include "settings/plugins/keyfile/nms-keyfile-reader.h"
+#include "settings/plugins/keyfile/nms-keyfile-writer.h"
+#include "settings/plugins/keyfile/nms-keyfile-utils.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/supplicant/nm-supplicant-manager.h b/src/supplicant/nm-supplicant-manager.h
index 9cc7e50b97..3c1627b5aa 100644
--- a/src/supplicant/nm-supplicant-manager.h
+++ b/src/supplicant/nm-supplicant-manager.h
@@ -23,7 +23,7 @@
 #define __NETWORKMANAGER_SUPPLICANT_MANAGER_H__
 
 #include "nm-supplicant-types.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 
 #define NM_TYPE_SUPPLICANT_MANAGER              (nm_supplicant_manager_get_type ())
 #define NM_SUPPLICANT_MANAGER(obj)              (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SUPPLICANT_MANAGER, NMSupplicantManager))
diff --git a/src/supplicant/tests/test-supplicant-config.c b/src/supplicant/tests/test-supplicant-config.c
index e8f8444863..fd91e92177 100644
--- a/src/supplicant/tests/test-supplicant-config.c
+++ b/src/supplicant/tests/test-supplicant-config.c
@@ -32,8 +32,8 @@
 
 #include "nm-core-internal.h"
 
-#include "nm-supplicant-config.h"
-#include "nm-supplicant-settings-verify.h"
+#include "supplicant/nm-supplicant-config.h"
+#include "supplicant/nm-supplicant-settings-verify.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/tests/config/nm-test-device.c b/src/tests/config/nm-test-device.c
index 33df46c285..3ec866f5e5 100644
--- a/src/tests/config/nm-test-device.c
+++ b/src/tests/config/nm-test-device.c
@@ -24,7 +24,7 @@
 
 #include <string.h>
 
-#include "nm-device-private.h"
+#include "devices/nm-device-private.h"
 #include "nm-utils.h"
 
 /*****************************************************************************/
diff --git a/src/tests/config/nm-test-device.h b/src/tests/config/nm-test-device.h
index c200b728f4..c193b86089 100644
--- a/src/tests/config/nm-test-device.h
+++ b/src/tests/config/nm-test-device.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_TEST_DEVICE_H__
 #define __NETWORKMANAGER_TEST_DEVICE_H__
 
-#include "nm-device.h"
+#include "devices/nm-device.h"
 
 #define NM_TYPE_TEST_DEVICE            (nm_test_device_get_type ())
 #define NM_TEST_DEVICE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_TEST_DEVICE, NMTestDevice))
diff --git a/src/tests/config/test-config.c b/src/tests/config/test-config.c
index a3cbc3ec7c..ee935ea85a 100644
--- a/src/tests/config/test-config.c
+++ b/src/tests/config/test-config.c
@@ -24,7 +24,7 @@
 
 #include "nm-config.h"
 #include "nm-test-device.h"
-#include "nm-fake-platform.h"
+#include "platform/nm-fake-platform.h"
 #include "nm-bus-manager.h"
 
 #include "nm-test-utils-core.h"
diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c
index 23dd1ab331..bff715e02e 100644
--- a/src/tests/test-ip4-config.c
+++ b/src/tests/test-ip4-config.c
@@ -24,7 +24,7 @@
 #include <arpa/inet.h>
 
 #include "nm-ip4-config.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c
index 8e34f6c945..d7a79a0575 100644
--- a/src/tests/test-ip6-config.c
+++ b/src/tests/test-ip6-config.c
@@ -25,7 +25,7 @@
 
 #include "nm-ip6-config.h"
 
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-test-utils-core.h"
 
 static NMIP6Config *
diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c
index 749eb664fb..ccbdafa63d 100644
--- a/src/tests/test-resolvconf-capture.c
+++ b/src/tests/test-resolvconf-capture.c
@@ -26,7 +26,7 @@
 #include "NetworkManagerUtils.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/tests/test-route-manager.c b/src/tests/test-route-manager.c
index c42544aa16..df43dd987a 100644
--- a/src/tests/test-route-manager.c
+++ b/src/tests/test-route-manager.c
@@ -23,11 +23,11 @@
 #include <arpa/inet.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-platform.h"
-#include "nm-platform-utils.h"
+#include "platform/nm-platform.h"
+#include "platform/nm-platform-utils.h"
 #include "nm-route-manager.h"
 
-#include "test-common.h"
+#include "platform/tests/test-common.h"
 
 typedef struct {
 	int ifindex0, ifindex1;
diff --git a/src/tests/test-wired-defname.c b/src/tests/test-wired-defname.c
index 7f7e41f926..a966ed2181 100644
--- a/src/tests/test-wired-defname.c
+++ b/src/tests/test-wired-defname.c
@@ -22,7 +22,7 @@
 
 #include "nm-simple-connection.h"
 #include "nm-setting-connection.h"
-#include "nm-device-ethernet-utils.h"
+#include "devices/nm-device-ethernet-utils.h"
 
 #include "nm-test-utils-core.h"
 
diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c
index 4158831007..782ad16897 100644
--- a/src/vpn/nm-vpn-connection.c
+++ b/src/vpn/nm-vpn-connection.c
@@ -35,12 +35,12 @@
 #include "nm-proxy-config.h"
 #include "nm-ip4-config.h"
 #include "nm-ip6-config.h"
-#include "nm-platform.h"
+#include "platform/nm-platform.h"
 #include "nm-active-connection.h"
 #include "NetworkManagerUtils.h"
 #include "settings/nm-settings-connection.h"
 #include "nm-dispatcher.h"
-#include "nm-agent-manager.h"
+#include "settings/nm-agent-manager.h"
 #include "nm-core-internal.h"
 #include "nm-pacrunner-manager.h"
 #include "nm-default-route-manager.h"
@@ -49,7 +49,7 @@
 #include "nm-config.h"
 #include "nm-vpn-plugin-info.h"
 #include "nm-vpn-manager.h"
-#include "nm-dns-manager.h"
+#include "dns/nm-dns-manager.h"
 
 #include "nmdbus-vpn-connection.h"
 
diff --git a/src/vpn/nm-vpn-connection.h b/src/vpn/nm-vpn-connection.h
index 6037295e22..8393f08125 100644
--- a/src/vpn/nm-vpn-connection.h
+++ b/src/vpn/nm-vpn-connection.h
@@ -23,7 +23,7 @@
 #define __NM_VPN_CONNECTION_H__
 
 #include "nm-vpn-dbus-interface.h"
-#include "nm-device.h"
+#include "devices/nm-device.h"
 #include "nm-auth-subject.h"
 #include "nm-active-connection.h"
 #include "nm-vpn-plugin-info.h"