all: include "nm-utils/nm-hash-utils.h" by default

Next we will use siphash24() instead of the glib version g_direct_hash() or
g_str_hash(). Hence, the "nm-utils/nm-hash-utils.h" header becomes very
fundamental and will be needed basically everywhere.

Instead of requiring the users to include them, let it be included via
"nm-default.h" header.

14 files changed, 4 insertions, 19 deletions

diff --git a/clients/cli/common.c b/clients/cli/common.c
index 0f5aea575c..4f369f458b 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -31,7 +31,6 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-utils/nm-hash-utils.h"
 #include "nm-vpn-helpers.h"
 #include "nm-client-utils.h"
 
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index d85901e6fd..91f96b262c 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -31,8 +31,6 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-utils/nm-hash-utils.h"
-
 #include "nm-client-utils.h"
 #include "nm-vpn-helpers.h"
 #include "nm-meta-setting-access.h"
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index ee621ca3bb..b0b31261c0 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -36,8 +36,6 @@
 
 #include "nm-client-utils.h"
 
-#include "nm-utils/nm-hash-utils.h"
-
 #include "polkit-agent.h"
 #include "utils.h"
 #include "common.h"
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c
index ea339dd62e..f4bfe99913 100644
--- a/clients/common/nm-meta-setting-desc.c
+++ b/clients/common/nm-meta-setting-desc.c
@@ -25,7 +25,6 @@
 #include <arpa/inet.h>
 
 #include "nm-common-macros.h"
-#include "nm-utils/nm-hash-utils.h"
 #include "nm-utils/nm-enum-utils.h"
 
 #include "NetworkManager.h"
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index 4ef1be239a..21aaf99540 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -33,8 +33,6 @@
 
 #include <string.h>
 
-#include "nm-utils/nm-hash-utils.h"
-
 #include "NetworkManager.h"
 #include "nm-vpn-service-plugin.h"
 
diff --git a/clients/common/tests/test-general.c b/clients/common/tests/test-general.c
index 64efd14d2a..e6a06ca535 100644
--- a/clients/common/tests/test-general.c
+++ b/clients/common/tests/test-general.c
@@ -21,8 +21,6 @@
 
 #include "NetworkManager.h"
 
-#include "nm-utils/nm-hash-utils.h"
-
 #include "nm-meta-setting-access.h"
 
 #include "nm-utils/nm-test-utils.h"
diff --git a/clients/tui/nmt-connect-connection-list.c b/clients/tui/nmt-connect-connection-list.c
index 6e69a04b8f..263bc96c8d 100644
--- a/clients/tui/nmt-connect-connection-list.c
+++ b/clients/tui/nmt-connect-connection-list.c
@@ -30,8 +30,6 @@
 
 #include "NetworkManager.h"
 
-#include "nm-utils/nm-hash-utils.h"
-
 #include "nmtui.h"
 #include "nmt-connect-connection-list.h"
 
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index a3c363c52a..52e320421e 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -36,7 +36,6 @@
 
 #include "nm-utils/nm-jansson.h"
 #include "nm-utils/nm-enum-utils.h"
-#include "nm-utils/nm-hash-utils.h"
 #include "nm-common-macros.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 4294e5e833..59af87d324 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include "nm-utils/c-list-util.h"
-#include "nm-utils/nm-hash-utils.h"
 
 #include "nm-utils.h"
 #include "nm-setting-private.h"
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 9e2377cf80..eb4fbc9e17 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -178,6 +178,10 @@ _nm_g_return_if_fail_warning (const char *log_domain,
 #include "nm-utils/nm-macros-internal.h"
 #include "nm-utils/nm-shared-utils.h"
 
+#if ((NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY) == 0
+#include "nm-utils/nm-hash-utils.h"
+#endif
+
 #include "nm-version.h"
 
 /*****************************************************************************/
diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c
index 0f19f9981a..c8ef7a2716 100644
--- a/src/devices/bluetooth/nm-bluez4-adapter.c
+++ b/src/devices/bluetooth/nm-bluez4-adapter.c
@@ -25,7 +25,6 @@
 #include <string.h>
 
 #include "nm-dbus-interface.h"
-#include "nm-utils/nm-hash-utils.h"
 #include "nm-bluez-device.h"
 #include "nm-bluez-common.h"
 #include "nm-core-internal.h"
diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c
index f1aff43029..f4279b1dfa 100644
--- a/src/nm-auth-utils.c
+++ b/src/nm-auth-utils.c
@@ -24,7 +24,6 @@
 
 #include <string.h>
 
-#include "nm-utils/nm-hash-utils.h"
 #include "nm-setting-connection.h"
 #include "nm-auth-subject.h"
 #include "nm-auth-manager.h"
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index cc78472442..7078153e99 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -25,8 +25,6 @@
 #include <stdio.h>
 #include <arpa/inet.h>
 
-#include "nm-utils/nm-hash-utils.h"
-
 #include "nm-connection.h"
 
 /*****************************************************************************/
diff --git a/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c b/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
index 2b62e88659..9253a2aa10 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
+++ b/src/settings/plugins/ifnet/nms-ifnet-wpa-parser.c
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "nm-utils/nm-hash-utils.h"
 #include "settings/nm-settings-plugin.h"
 
 #include "nms-ifnet-net-parser.h"