8 files changed, 7 insertions, 10 deletions
diff --git a/libnm-util/meson.build b/libnm-util/meson.build
index e9e263a8..468064c1 100644
--- a/libnm-util/meson.build
+++ b/libnm-util/meson.build
@@ -89,12 +89,11 @@ sources = files(
   'nm-utils.c',
   'nm-value-transforms.c',
 )
-sources += shared_files_libnm_util
 
 deps = [
   dbus_dep,
   dbus_glib_dep,
-  shared_dep,
+  shared_nm_utils_base_dep,
   uuid_dep,
 ]
 
@@ -202,7 +201,7 @@ sources = files(
 )
 
 deps = [
-  shared_dep,
+  shared_nm_utils_base_dep,
 ]
 
 libtest_crypto = static_library(
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index a54e93c3..9a1c5c73 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -23,7 +23,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <errno.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <dbus/dbus-glib.h>
diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
index cc189c57..ceebb982 100644
--- a/libnm-util/nm-setting-bridge.c
+++ b/libnm-util/nm-setting-bridge.c
@@ -254,7 +254,7 @@ nm_setting_bridge_get_ageing_time (NMSettingBridge *setting)
 #define BR_MIN_AGEING_TIME   0
 #define BR_MAX_AGEING_TIME   1000000
 
-static inline gboolean
+static gboolean
 check_range (guint32 val,
              guint32 min,
              guint32 max,
diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c
index 17a3a871..c3cf89dd 100644
--- a/libnm-util/nm-setting-dcb.c
+++ b/libnm-util/nm-setting-dcb.c
@@ -802,7 +802,7 @@ nm_setting_dcb_init (NMSettingDcb *setting)
 {
 }
 
-static inline void
+static void
 set_uint_array (const GValue *v, uint *a, size_t len)
 {
 	GArray *src = g_value_get_boxed (v);
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index 1fed9eca..626ba4ca 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -22,7 +22,6 @@
 #include "nm-default.h"
 
 #include <string.h>
-#include <errno.h>
 #include <stdlib.h>
 #include <dbus/dbus-glib.h>
 
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index dfff2fe5..3edf4005 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -650,7 +650,7 @@ nm_setting_compare (NMSetting *a,
 	return same;
 }
 
-static inline gboolean
+static gboolean
 should_compare_prop (NMSetting *setting,
                      const char *prop_name,
                      NMSettingCompareFlags comp_flags,
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index e2a4bfb0..eae80a04 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -1736,7 +1736,7 @@ nm_utils_file_is_pkcs12 (const char *filename)
  * @predicate: (scope call): if given, pass the file name to this function
  *   for additional checks. This check is performed after the check for
  *   @file_test_flags. You cannot omit both @file_test_flags and @predicate.
- * @user_data: (closure): (allow-none): user data for @predicate function.
+ * @user_data: (closure) (allow-none): user data for @predicate function.
  * @error: (allow-none): on failure, set a "not found" error %G_IO_ERROR %G_IO_ERROR_NOT_FOUND.
  *
  * Searches for a @progname file in a list of search @paths.
diff --git a/libnm-util/tests/meson.build b/libnm-util/tests/meson.build
index 048ec3bb..5e8b84fa 100644
--- a/libnm-util/tests/meson.build
+++ b/libnm-util/tests/meson.build
@@ -2,7 +2,7 @@ deps = [
   dbus_dep,
   dbus_glib_dep,
   libnm_util_dep,
-  shared_dep,
+  shared_nm_utils_base_dep,
 ]
 
 cflags = common_cflags + [