From 737ab51472a95df32d5f47633c0f01e22ff43950 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 31 Jan 2019 17:17:10 +0100
Subject: [PATCH] all: include "nm-utils/nm-errno.h" via "nm-default.h"

---
 shared/nm-default.h                       | 1 +
 src/ndisc/nm-lndp-ndisc.c                 | 1 -
 src/platform/nm-linux-platform.c          | 1 -
 src/platform/nm-netlink.c                 | 2 --
 src/platform/nm-platform.c                | 1 -
 src/platform/nm-platform.h                | 1 -
 src/platform/wifi/nm-wifi-utils-nl80211.c | 1 -
 src/platform/wpan/nm-wpan-utils.c         | 1 -
 8 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/shared/nm-default.h b/shared/nm-default.h
index c006f33d35..26d6476a95 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -292,6 +292,7 @@ _nm_g_return_if_fail_warning (const char *log_domain,
 
 #include "nm-utils/nm-macros-internal.h"
 #include "nm-utils/nm-shared-utils.h"
+#include "nm-utils/nm-errno.h"
 
 #if (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_UTIL
 /* no hash-utils in legacy code. */
diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c
index 1ba35b0e94..4c125d4c77 100644
--- a/src/ndisc/nm-lndp-ndisc.c
+++ b/src/ndisc/nm-lndp-ndisc.c
@@ -32,7 +32,6 @@
 #include "NetworkManagerUtils.h"
 #include "platform/nm-platform.h"
 #include "platform/nmp-netns.h"
-#include "nm-utils/nm-errno.h"
 
 #define _NMLOG_PREFIX_NAME                "ndisc-lndp"
 
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index cfa1b8bc6a..1da9611003 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -43,7 +43,6 @@
 #include "nm-core-internal.h"
 #include "nm-setting-vlan.h"
 
-#include "nm-utils/nm-errno.h"
 #include "nm-utils/nm-secret-utils.h"
 #include "nm-netlink.h"
 #include "nm-core-utils.h"
diff --git a/src/platform/nm-netlink.c b/src/platform/nm-netlink.c
index 80d8b9eeb0..ec41d2308c 100644
--- a/src/platform/nm-netlink.c
+++ b/src/platform/nm-netlink.c
@@ -25,8 +25,6 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "nm-utils/nm-errno.h"
-
 /*****************************************************************************/
 
 #ifndef SOL_NETLINK
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index ba7357020f..021b45d73e 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -39,7 +39,6 @@
 #include "nm-core-internal.h"
 #include "nm-utils/nm-dedup-multi.h"
 #include "nm-utils/nm-udev-utils.h"
-#include "nm-utils/nm-errno.h"
 
 #include "nm-core-utils.h"
 #include "nm-platform-utils.h"
diff --git a/src/platform/nm-platform.h b/src/platform/nm-platform.h
index 412ac597ab..568b1f4b46 100644
--- a/src/platform/nm-platform.h
+++ b/src/platform/nm-platform.h
@@ -29,7 +29,6 @@
 #include "nm-setting-wired.h"
 #include "nm-setting-wireless.h"
 #include "nm-setting-ip-tunnel.h"
-#include "nm-utils/nm-errno.h"
 
 #define NM_TYPE_PLATFORM            (nm_platform_get_type ())
 #define NM_PLATFORM(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_PLATFORM, NMPlatform))
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/platform/wifi/nm-wifi-utils-nl80211.c
index 80f316f880..f03ae9c1f7 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/platform/wifi/nm-wifi-utils-nl80211.c
@@ -30,7 +30,6 @@
 #include <linux/nl80211.h>
 #include <linux/if.h>
 
-#include "nm-utils/nm-errno.h"
 #include "platform/nm-netlink.h"
 #include "nm-wifi-utils-private.h"
 #include "platform/nm-platform.h"
diff --git a/src/platform/wpan/nm-wpan-utils.c b/src/platform/wpan/nm-wpan-utils.c
index f8708bc6aa..4ae1770ffe 100644
--- a/src/platform/wpan/nm-wpan-utils.c
+++ b/src/platform/wpan/nm-wpan-utils.c
@@ -23,7 +23,6 @@
 
 #include <linux/if.h>
 
-#include "nm-utils/nm-errno.h"
 #include "platform/linux/nl802154.h"
 #include "platform/nm-netlink.h"
 #include "platform/nm-platform-utils.h"