diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h
index 9e184ac4b5..2d7bf03bab 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-lease-internal.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdint.h>
 #include <linux/if_packet.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h
index abca9422c5..da483feadf 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-protocol.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/udp.h>
 #include <netinet/ip.h>
 #include <stdint.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h
index eaa671711f..e46470d20e 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-protocol.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/ip6.h>
 #include <netinet/udp.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/async.h b/src/dhcp-manager/systemd-dhcp/src/shared/async.h
index 7f1ef79532..44b886a661 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/async.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/async.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 int asynchronous_job(void* (*func)(void *p), void *arg);
 
 int asynchronous_sync(void);
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h
index 5ae51c1e28..fccea7725a 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.h
@@ -20,6 +20,9 @@
   You should have received a copy of the GNU Lesser General Public License
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
+
+#include "nm-sd-adapt.h"
+
 #include <stddef.h>
 #include <stdio.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h b/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h
index 8da030ceb6..36afee2c42 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 
 #include "macro.h"
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/list.h b/src/dhcp-manager/systemd-dhcp/src/shared/list.h
index c020f7e936..dcb3e0d94c 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/list.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/list.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 /* The head of the linked list. Use this in the structure that shall
  * contain the head of the linked list */
 #define LIST_HEAD(t,name)                                               \
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/macro.h b/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
index 24d4e6cdd0..82469d81f0 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/macro.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <assert.h>
 #include <sys/param.h>
 #include <sys/types.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h b/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h
index 0502c20a2e..e6e9a6bd6e 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/refcnt.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 /* A type-safe atomic refcounter */
 
 typedef struct {
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
index f6757e4c3e..a26f8e28ca 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
@@ -14,6 +14,7 @@
 
    (Minimal changes made by Lennart Poettering, to make clean for inclusion in systemd)
 */
+
 #include "nm-sd-adapt.h"
 
 #include <stdint.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h
index 62e1168a79..3450d754fe 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "nm-sd-adapt.h"
+
 #include <inttypes.h>
 #include <sys/types.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h b/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h
index 07d0aff72b..550ed9853b 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/socket-util.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ether.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h b/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h
index c913fda8c5..02de0feca8 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/sparse-endian.h
@@ -21,6 +21,8 @@
 #ifndef SPARSE_ENDIAN_H
 #define SPARSE_ENDIAN_H
 
+#include "nm-sd-adapt.h"
+
 #include <byteswap.h>
 #include <endian.h>
 #include <stdint.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/strv.h b/src/dhcp-manager/systemd-dhcp/src/shared/strv.h
index 47618bd26c..15ef0f1740 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/strv.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/strv.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdarg.h>
 #include <stdbool.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h b/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h
index 578a0c1ca4..e3e84acbae 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/time-util.h
@@ -21,14 +21,14 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdio.h>
 #include <inttypes.h>
 
 typedef uint64_t usec_t;
 typedef uint64_t nsec_t;
 
-#include "nm-sd-adapt.h"
-
 #define NSEC_FMT "%" PRIu64
 #define USEC_FMT "%" PRIu64
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h b/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h
index d6181dd9a9..3b73a9c682 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/unaligned.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdint.h>
 
 static inline uint16_t unaligned_read_be16(const void *_u) {
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h b/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h
index c087995930..d7728a162f 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/utf8.h
@@ -21,6 +21,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <stdbool.h>
 
 #include "macro.h"
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h b/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h
index 896a027eb5..abcd57dbe4 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/_sd-common.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 /* This is a private header; never even think of including this directly! */
 
 #if __INCLUDE_LEVEL__ <= 1
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
index 951662e56c..527c4239d1 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-client.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 #include <net/ethernet.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
index 4296b91d8a..80d32134b1 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp-lease.h
@@ -23,6 +23,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 #include <net/ethernet.h>
 
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h
index 38c1c3fb12..301f306705 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-client.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <net/ethernet.h>
 
 #include "sd-event.h"
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h
index 1126f1ac2e..e72eb8be05 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-dhcp6-lease.h
@@ -23,6 +23,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <netinet/in.h>
 
 typedef struct sd_dhcp6_lease sd_dhcp6_lease;
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h
index 25a10f99ab..00bc0fc77e 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-event.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <sys/types.h>
 #include <sys/signalfd.h>
 #include <sys/epoll.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h
index 4fdbf3ab41..df9b83c4c0 100644
--- a/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h
+++ b/src/dhcp-manager/systemd-dhcp/src/systemd/sd-id128.h
@@ -22,6 +22,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#include "nm-sd-adapt.h"
+
 #include <inttypes.h>
 #include <string.h>