diff --git a/src/devices/nm-device-adsl.c b/src/devices/nm-device-adsl.c
index 92f9e3341..99b34988a 100644
--- a/src/devices/nm-device-adsl.c
+++ b/src/devices/nm-device-adsl.c
@@ -40,7 +40,6 @@
 #include "nm-logging.h"
 #include "nm-enum-types.h"
 #include "nm-platform.h"
-#include "nm-system.h"
 #include "nm-dbus-manager.h"
 #include "nm-platform.h"
 
diff --git a/src/devices/nm-device-bridge.c b/src/devices/nm-device-bridge.c
index 85986f64a..8a4d09611 100644
--- a/src/devices/nm-device-bridge.c
+++ b/src/devices/nm-device-bridge.c
@@ -34,7 +34,6 @@
 #include "nm-dbus-manager.h"
 #include "nm-enum-types.h"
 #include "nm-platform.h"
-#include "nm-system.h"
 
 #include "nm-device-bridge-glue.h"
 
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 22f3e6b31..e5d3fb2e8 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -44,7 +44,6 @@
 #include "nm-supplicant-manager.h"
 #include "nm-supplicant-interface.h"
 #include "nm-supplicant-config.h"
-#include "nm-system.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wired.h"
 #include "nm-setting-8021x.h"
diff --git a/src/devices/nm-device-modem.c b/src/devices/nm-device-modem.c
index efffb7a52..f6e8c030c 100644
--- a/src/devices/nm-device-modem.c
+++ b/src/devices/nm-device-modem.c
@@ -28,7 +28,6 @@
 #include "nm-device-private.h"
 #include "nm-rfkill-manager.h"
 #include "nm-logging.h"
-#include "nm-system.h"
 #include "nm-dbus-manager.h"
 
 #if WITH_MODEM_MANAGER_1
diff --git a/src/devices/nm-device-olpc-mesh.c b/src/devices/nm-device-olpc-mesh.c
index 691b62950..4a5c5f949 100644
--- a/src/devices/nm-device-olpc-mesh.c
+++ b/src/devices/nm-device-olpc-mesh.c
@@ -50,7 +50,6 @@
 #include "nm-activation-request.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-olpc-mesh.h"
-#include "nm-system.h"
 #include "nm-manager.h"
 #include "nm-enum-types.h"
 #include "nm-dbus-manager.h"
diff --git a/src/devices/nm-device-vlan.c b/src/devices/nm-device-vlan.c
index 18c412e6e..a9a031544 100644
--- a/src/devices/nm-device-vlan.c
+++ b/src/devices/nm-device-vlan.c
@@ -33,7 +33,6 @@
 #include "NetworkManagerUtils.h"
 #include "nm-device-private.h"
 #include "nm-enum-types.h"
-#include "nm-system.h"
 #include "nm-dbus-manager.h"
 #include "nm-platform.h"
 
diff --git a/src/devices/nm-device-wifi.c b/src/devices/nm-device-wifi.c
index aae85cd3a..2935e27e6 100644
--- a/src/devices/nm-device-wifi.c
+++ b/src/devices/nm-device-wifi.c
@@ -54,7 +54,6 @@
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-platform.h"
-#include "nm-system.h"
 #include "nm-manager-auth.h"
 #include "nm-settings-connection.h"
 #include "nm-enum-types.h"
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 6be90c0e3..424356a38 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -43,7 +43,6 @@
 #include "nm-device-ethernet.h"
 #include "NetworkManagerUtils.h"
 #include "nm-platform.h"
-#include "nm-system.h"
 #include "nm-dhcp-manager.h"
 #include "nm-dbus-manager.h"
 #include "nm-utils.h"
diff --git a/src/devices/wimax/nm-device-wimax.c b/src/devices/wimax/nm-device-wimax.c
index 9e9fae2cd..ed54d74ac 100644
--- a/src/devices/wimax/nm-device-wimax.c
+++ b/src/devices/wimax/nm-device-wimax.c
@@ -35,7 +35,6 @@
 #include "nm-wimax-util.h"
 #include "nm-logging.h"
 #include "nm-device-private.h"
-#include "nm-system.h"
 #include "NetworkManagerUtils.h"
 #include "nm-dbus-manager.h"
 #include "nm-connection.h"
diff --git a/src/main.c b/src/main.c
index f31d97d55..b3e1130af 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,7 +55,6 @@
 #include "nm-policy-hosts.h"
 #include "nm-config.h"
 #include "nm-posix-signals.h"
-#include "nm-system.h"
 
 #if !defined(NM_DIST_VERSION)
 # define NM_DIST_VERSION VERSION
diff --git a/src/modem-manager/nm-modem-broadband.c b/src/modem-manager/nm-modem-broadband.c
index 5e13d7010..83370de6d 100644
--- a/src/modem-manager/nm-modem-broadband.c
+++ b/src/modem-manager/nm-modem-broadband.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include <libmm-glib.h>
 #include "nm-modem-broadband.h"
-#include "nm-system.h"
 #include "nm-setting-connection.h"
 #include "nm-logging.h"
 #include "NetworkManagerUtils.h"
diff --git a/src/modem-manager/nm-modem-old.c b/src/modem-manager/nm-modem-old.c
index bc6fe21ea..72432e27a 100644
--- a/src/modem-manager/nm-modem-old.c
+++ b/src/modem-manager/nm-modem-old.c
@@ -23,7 +23,6 @@
 #include <glib/gi18n.h>
 
 #include "nm-modem-old.h"
-#include "nm-system.h"
 #include "nm-dbus-manager.h"
 #include "nm-setting-connection.h"
 #include "nm-properties-changed-signal.h"
diff --git a/src/modem-manager/nm-modem.c b/src/modem-manager/nm-modem.c
index 44ff6161b..ff1f7e3c3 100644
--- a/src/modem-manager/nm-modem.c
+++ b/src/modem-manager/nm-modem.c
@@ -22,7 +22,6 @@
 #include <string.h>
 #include "nm-modem.h"
 #include "nm-platform.h"
-#include "nm-system.h"
 #include "nm-dbus-manager.h"
 #include "nm-setting-connection.h"
 #include "nm-properties-changed-signal.h"
diff --git a/src/nm-manager.c b/src/nm-manager.c
index d6025f069..06cab6712 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -56,7 +56,6 @@
 #include "nm-device-tun.h"
 #include "nm-device-macvlan.h"
 #include "nm-device-gre.h"
-#include "nm-system.h"
 #include "nm-setting-bluetooth.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wireless.h"
diff --git a/src/nm-policy.c b/src/nm-policy.c
index b6efbc7a6..8026261f8 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -37,7 +37,6 @@
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-connection.h"
 #include "nm-platform.h"
-#include "nm-system.h"
 #include "nm-dns-manager.h"
 #include "nm-vpn-manager.h"
 #include "nm-manager-auth.h"