4 files changed, 24 insertions, 4 deletions
diff --git a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c
index e4d2d2e1..c5ef63eb 100644
--- a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c
+++ b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.c
@@ -8,6 +8,7 @@
 #include "nm-sd-adapt-core.h"
 
 #include "fd-util.h"
+#include "sd-device.h"
 
 /*****************************************************************************/
 
@@ -19,3 +20,17 @@ asynchronous_close(int fd)
 }
 
 /*****************************************************************************/
+
+sd_device *
+sd_device_ref(sd_device *self)
+{
+    g_return_val_if_fail(!self, self);
+    return self;
+}
+
+sd_device *
+sd_device_unref(sd_device *self)
+{
+    g_return_val_if_fail(!self, self);
+    return self;
+}
diff --git a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h
index 7ce1f8c9..9c317801 100644
--- a/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h
+++ b/src/libnm-systemd-core/sd-adapt-core/nm-sd-adapt-core.h
@@ -40,6 +40,8 @@
 #include <sys/syscall.h>
 #include <sys/ioctl.h>
 
+#define HAVE_EPOLL_PWAIT2 0
+
 /* Missing in Linux 3.2.0, in Ubuntu 12.04 */
 #ifndef BPF_XOR
 #define BPF_XOR 0xa0
@@ -85,8 +87,14 @@ sd_notify(int unset_environment, const char *state)
 #include "sd-id128.h"
 #include "sparse-endian.h"
 #include "async.h"
-#include "util.h"
 
 #endif /* (NETWORKMANAGER_COMPILATION) & NM_NETWORKMANAGER_COMPILATION_WITH_SYSTEMD */
 
+/*****************************************************************************/
+
+struct sd_device;
+
+struct sd_device *sd_device_ref(struct sd_device *self);
+struct sd_device *sd_device_unref(struct sd_device *self);
+
 #endif /* __NM_SD_ADAPT_CORE_H__ */
diff --git a/src/libnm-systemd-core/sd-adapt-core/sd-device.h b/src/libnm-systemd-core/sd-adapt-core/sd-device.h
deleted file mode 100644
index 637892c2..00000000
--- a/src/libnm-systemd-core/sd-adapt-core/sd-device.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-/* dummy header */
diff --git a/src/libnm-systemd-core/sd-adapt-core/device-util.h b/src/libnm-systemd-core/sd-adapt-core/sd-messages.h
index 637892c2..637892c2 100644
--- a/src/libnm-systemd-core/sd-adapt-core/device-util.h
+++ b/src/libnm-systemd-core/sd-adapt-core/sd-messages.h