platform: drop unnecessary #include from platform code (2)

7 files changed, 14 insertions, 34 deletions

diff --git a/src/core/devices/nm-lldp-listener.c b/src/core/devices/nm-lldp-listener.c
index 5b0a72fdd9..9eeea0b2de 100644
--- a/src/core/devices/nm-lldp-listener.c
+++ b/src/core/devices/nm-lldp-listener.c
@@ -10,6 +10,8 @@
 #include <net/ethernet.h>
 
 #include "NetworkManagerUtils.h"
+#include "libnm-core-public/nm-errors.h"
+#include "libnm-glib-aux/nm-time-utils.h"
 #include "libnm-std-aux/unaligned.h"
 #include "platform/nm-platform.h"
 #include "libnm-glib-aux/nm-c-list.h"
diff --git a/src/core/nm-l3cfg.c b/src/core/nm-l3cfg.c
index 839213ad51..ab4bcdb737 100644
--- a/src/core/nm-l3cfg.c
+++ b/src/core/nm-l3cfg.c
@@ -9,6 +9,7 @@
 #include <linux/if_ether.h>
 #include <linux/rtnetlink.h>
 
+#include "libnm-glib-aux/nm-time-utils.h"
 #include "platform/nm-platform.h"
 #include "platform/nmp-object.h"
 #include "nm-netns.h"
diff --git a/src/core/platform/nm-fake-platform.c b/src/core/platform/nm-fake-platform.c
index 77a6e2cb77..2569e188bb 100644
--- a/src/core/platform/nm-fake-platform.c
+++ b/src/core/platform/nm-fake-platform.c
@@ -13,9 +13,6 @@
 #include <linux/if.h>
 #include <linux/rtnetlink.h>
 
-#include "nm-utils.h"
-
-#include "nm-core-utils.h"
 #include "libnm-platform/nm-platform-utils.h"
 #include "nm-platform-private.h"
 #include "nmp-object.h"
diff --git a/src/core/platform/nm-linux-platform.c b/src/core/platform/nm-linux-platform.c
index 75f34b2d20..3404c61c60 100644
--- a/src/core/platform/nm-linux-platform.c
+++ b/src/core/platform/nm-linux-platform.c
@@ -32,25 +32,20 @@
 #include <sys/statvfs.h>
 #include <unistd.h>
 
-#include "libnm-std-aux/unaligned.h"
-
-#include "nm-utils.h"
-#include "libnm-core-intern/nm-core-internal.h"
-#include "nm-setting-vlan.h"
-
-#include "libnm-glib-aux/nm-secret-utils.h"
 #include "libnm-glib-aux/nm-c-list.h"
+#include "libnm-glib-aux/nm-io-utils.h"
+#include "libnm-glib-aux/nm-secret-utils.h"
+#include "libnm-glib-aux/nm-time-utils.h"
 #include "libnm-platform/nm-netlink.h"
-#include "nm-core-utils.h"
-#include "nmp-object.h"
-#include "libnm-platform/nmp-netns.h"
 #include "libnm-platform/nm-platform-utils.h"
-#include "nm-platform-private.h"
-#include "libnm-platform/wifi/nm-wifi-utils.h"
+#include "libnm-platform/nmp-netns.h"
 #include "libnm-platform/wifi/nm-wifi-utils-wext.h"
+#include "libnm-platform/wifi/nm-wifi-utils.h"
 #include "libnm-platform/wpan/nm-wpan-utils.h"
-#include "libnm-glib-aux/nm-io-utils.h"
+#include "libnm-std-aux/unaligned.h"
 #include "libnm-udev-aux/nm-udev-utils.h"
+#include "nm-platform-private.h"
+#include "nmp-object.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/platform/nm-platform.c b/src/core/platform/nm-platform.c
index a3222be953..79cb02bfb8 100644
--- a/src/core/platform/nm-platform.c
+++ b/src/core/platform/nm-platform.c
@@ -22,17 +22,14 @@
 #include <linux/tc_act/tc_mirred.h>
 #include <libudev.h>
 
-#include "nm-utils.h"
-#include "libnm-core-intern/nm-core-internal.h"
 #include "libnm-glib-aux/nm-dedup-multi.h"
-#include "libnm-udev-aux/nm-udev-utils.h"
 #include "libnm-glib-aux/nm-secret-utils.h"
-
-#include "nm-core-utils.h"
+#include "libnm-glib-aux/nm-time-utils.h"
 #include "libnm-platform/nm-platform-utils.h"
+#include "libnm-platform/nmp-netns.h"
+#include "libnm-udev-aux/nm-udev-utils.h"
 #include "nm-platform-private.h"
 #include "nmp-object.h"
-#include "libnm-platform/nmp-netns.h"
 
 /*****************************************************************************/
 
diff --git a/src/core/platform/nm-platform.h b/src/core/platform/nm-platform.h
index 5b12160eff..981465b6ce 100644
--- a/src/core/platform/nm-platform.h
+++ b/src/core/platform/nm-platform.h
@@ -6,17 +6,9 @@
 #ifndef __NETWORKMANAGER_PLATFORM_H__
 #define __NETWORKMANAGER_PLATFORM_H__
 
-#include "nm-dbus-interface.h"
-
 #include "libnm-platform/nmp-base.h"
 #include "libnm-base/nm-base.h"
 
-#include "nm-core-utils.h"
-#include "nm-setting-vlan.h"
-#include "nm-setting-wired.h"
-#include "nm-setting-wireless.h"
-#include "nm-setting-ip-tunnel.h"
-
 #define NM_TYPE_PLATFORM (nm_platform_get_type())
 #define NM_PLATFORM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), NM_TYPE_PLATFORM, NMPlatform))
 #define NM_PLATFORM_CLASS(klass) \
diff --git a/src/core/platform/nmp-object.c b/src/core/platform/nmp-object.c
index 7b9ba4b6ec..4241ecf650 100644
--- a/src/core/platform/nmp-object.c
+++ b/src/core/platform/nmp-object.c
@@ -12,12 +12,8 @@
 #include <linux/if.h>
 #include <libudev.h>
 
-#include "nm-utils.h"
 #include "libnm-glib-aux/nm-secret-utils.h"
-
-#include "nm-core-utils.h"
 #include "libnm-platform/nm-platform-utils.h"
-
 #include "libnm-platform/wifi/nm-wifi-utils.h"
 #include "libnm-platform/wpan/nm-wpan-utils.h"