diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c index 7c2bc78f59..b5a3d67cc0 100644 --- a/src/dhcp-manager/nm-dhcp-systemd.c +++ b/src/dhcp-manager/nm-dhcp-systemd.c @@ -36,6 +36,9 @@ #include "sd-dhcp-client.h" #include "sd-dhcp6-client.h" + +/* we use a private systemd header, thus need to include nm-sd-adapt.h. */ +#include "nm-sd-adapt.h" #include "dhcp-lease-internal.h" G_DEFINE_TYPE (NMDhcpSystemd, nm_dhcp_systemd, NM_TYPE_DHCP_CLIENT) diff --git a/src/systemd/nm-sd-adapt.c b/src/systemd/nm-sd-adapt.c index e10df9c746..fa7cd93878 100644 --- a/src/systemd/nm-sd-adapt.c +++ b/src/systemd/nm-sd-adapt.c @@ -18,7 +18,8 @@ #include "nm-default.h" -#include +#include "nm-sd-adapt.h" + #include #include diff --git a/src/systemd/src/basic/alloc-util.h b/src/systemd/src/basic/alloc-util.h index 8482baba2d..679ba7f398 100644 --- a/src/systemd/src/basic/alloc-util.h +++ b/src/systemd/src/basic/alloc-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/async.h b/src/systemd/src/basic/async.h index 8d096982b2..9bd13ff6e0 100644 --- a/src/systemd/src/basic/async.h +++ b/src/systemd/src/basic/async.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - int asynchronous_job(void* (*func)(void *p), void *arg); int asynchronous_sync(void); diff --git a/src/systemd/src/basic/escape.h b/src/systemd/src/basic/escape.h index 9f1bb45f77..ce51811173 100644 --- a/src/systemd/src/basic/escape.h +++ b/src/systemd/src/basic/escape.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/fd-util.h b/src/systemd/src/basic/fd-util.h index 13e8a9fe62..44528c6e35 100644 --- a/src/systemd/src/basic/fd-util.h +++ b/src/systemd/src/basic/fd-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/fileio.h b/src/systemd/src/basic/fileio.h index 503af45494..8084895ff3 100644 --- a/src/systemd/src/basic/fileio.h +++ b/src/systemd/src/basic/fileio.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/fs-util.h b/src/systemd/src/basic/fs-util.h index b9b0f3d7b5..0e2fcb21b9 100644 --- a/src/systemd/src/basic/fs-util.h +++ b/src/systemd/src/basic/fs-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/hash-funcs.h b/src/systemd/src/basic/hash-funcs.h index 607ff7a3ae..299189d143 100644 --- a/src/systemd/src/basic/hash-funcs.h +++ b/src/systemd/src/basic/hash-funcs.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include "macro.h" #include "siphash24.h" diff --git a/src/systemd/src/basic/hashmap.h b/src/systemd/src/basic/hashmap.h index 76643a3c9f..6d1ae48b21 100644 --- a/src/systemd/src/basic/hashmap.h +++ b/src/systemd/src/basic/hashmap.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/hexdecoct.h b/src/systemd/src/basic/hexdecoct.h index 263d6997db..1ba2f69ebd 100644 --- a/src/systemd/src/basic/hexdecoct.h +++ b/src/systemd/src/basic/hexdecoct.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/hostname-util.h b/src/systemd/src/basic/hostname-util.h index f0c1e2cea7..d062eddea1 100644 --- a/src/systemd/src/basic/hostname-util.h +++ b/src/systemd/src/basic/hostname-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include "macro.h" diff --git a/src/systemd/src/basic/in-addr-util.h b/src/systemd/src/basic/in-addr-util.h index 4b21264564..17798ce816 100644 --- a/src/systemd/src/basic/in-addr-util.h +++ b/src/systemd/src/basic/in-addr-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/io-util.h b/src/systemd/src/basic/io-util.h index b3cff3c000..142c940d92 100644 --- a/src/systemd/src/basic/io-util.h +++ b/src/systemd/src/basic/io-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/list.h b/src/systemd/src/basic/list.h index 781ea46797..c68185f587 100644 --- a/src/systemd/src/basic/list.h +++ b/src/systemd/src/basic/list.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#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/systemd/src/basic/log.h b/src/systemd/src/basic/log.h index 8018149a1b..d0ec4dfab0 100644 --- a/src/systemd/src/basic/log.h +++ b/src/systemd/src/basic/log.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/macro.h b/src/systemd/src/basic/macro.h index 0ae6eaeca1..d12e09a797 100644 --- a/src/systemd/src/basic/macro.h +++ b/src/systemd/src/basic/macro.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/mempool.h b/src/systemd/src/basic/mempool.h index 710f234d23..fea7841bcf 100644 --- a/src/systemd/src/basic/mempool.h +++ b/src/systemd/src/basic/mempool.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include struct pool; diff --git a/src/systemd/src/basic/parse-util.h b/src/systemd/src/basic/parse-util.h index 0163df5c60..d8dc26a36e 100644 --- a/src/systemd/src/basic/parse-util.h +++ b/src/systemd/src/basic/parse-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/path-util.h b/src/systemd/src/basic/path-util.h index 09d733c49b..2c2f87a9f2 100644 --- a/src/systemd/src/basic/path-util.h +++ b/src/systemd/src/basic/path-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/prioq.h b/src/systemd/src/basic/prioq.h index a4106b0416..113c73d040 100644 --- a/src/systemd/src/basic/prioq.h +++ b/src/systemd/src/basic/prioq.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include "hashmap.h" diff --git a/src/systemd/src/basic/random-util.h b/src/systemd/src/basic/random-util.h index 1ae76ef03d..3cee4c5014 100644 --- a/src/systemd/src/basic/random-util.h +++ b/src/systemd/src/basic/random-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/basic/refcnt.h b/src/systemd/src/basic/refcnt.h index 275cf9721e..1d77a6445a 100644 --- a/src/systemd/src/basic/refcnt.h +++ b/src/systemd/src/basic/refcnt.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - /* A type-safe atomic refcounter. * * DO NOT USE THIS UNLESS YOU ACTUALLY CARE ABOUT THREAD SAFETY! */ diff --git a/src/systemd/src/basic/set.h b/src/systemd/src/basic/set.h index 45ddd424f6..2bff5062da 100644 --- a/src/systemd/src/basic/set.h +++ b/src/systemd/src/basic/set.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include "hashmap.h" #include "macro.h" diff --git a/src/systemd/src/basic/siphash24.h b/src/systemd/src/basic/siphash24.h index d8d76083c3..54e2420cc6 100644 --- a/src/systemd/src/basic/siphash24.h +++ b/src/systemd/src/basic/siphash24.h @@ -1,7 +1,5 @@ #pragma once -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/socket-util.h b/src/systemd/src/basic/socket-util.h index 8ac915e7cd..92edc1dc22 100644 --- a/src/systemd/src/basic/socket-util.h +++ b/src/systemd/src/basic/socket-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/sparse-endian.h b/src/systemd/src/basic/sparse-endian.h index 02de0feca8..c913fda8c5 100644 --- a/src/systemd/src/basic/sparse-endian.h +++ b/src/systemd/src/basic/sparse-endian.h @@ -21,8 +21,6 @@ #ifndef SPARSE_ENDIAN_H #define SPARSE_ENDIAN_H -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/stdio-util.h b/src/systemd/src/basic/stdio-util.h index af65e223ba..0a675571ff 100644 --- a/src/systemd/src/basic/stdio-util.h +++ b/src/systemd/src/basic/stdio-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/string-table.h b/src/systemd/src/basic/string-table.h index 2eb266762d..b180488fe8 100644 --- a/src/systemd/src/basic/string-table.h +++ b/src/systemd/src/basic/string-table.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/string-util.h b/src/systemd/src/basic/string-util.h index 699e16b70f..ad0c813761 100644 --- a/src/systemd/src/basic/string-util.h +++ b/src/systemd/src/basic/string-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/strv.h b/src/systemd/src/basic/strv.h index e1e18a4e70..4a93818a42 100644 --- a/src/systemd/src/basic/strv.h +++ b/src/systemd/src/basic/strv.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/time-util.h b/src/systemd/src/basic/time-util.h index 05c5c250bd..9894e626c5 100644 --- a/src/systemd/src/basic/time-util.h +++ b/src/systemd/src/basic/time-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/umask-util.h b/src/systemd/src/basic/umask-util.h index b8ab47ed04..359d87d27c 100644 --- a/src/systemd/src/basic/umask-util.h +++ b/src/systemd/src/basic/umask-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/unaligned.h b/src/systemd/src/basic/unaligned.h index a34771eb3e..79be645bed 100644 --- a/src/systemd/src/basic/unaligned.h +++ b/src/systemd/src/basic/unaligned.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/basic/utf8.h b/src/systemd/src/basic/utf8.h index 8b917cb03e..a3c8558ea5 100644 --- a/src/systemd/src/basic/utf8.h +++ b/src/systemd/src/basic/utf8.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/basic/util.h b/src/systemd/src/basic/util.h index 9ec160302a..5033b02917 100644 --- a/src/systemd/src/basic/util.h +++ b/src/systemd/src/basic/util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/libsystemd-network/arp-util.h b/src/systemd/src/libsystemd-network/arp-util.h index 6ccb72c740..3ef56b002a 100644 --- a/src/systemd/src/libsystemd-network/arp-util.h +++ b/src/systemd/src/libsystemd-network/arp-util.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include "socket-util.h" diff --git a/src/systemd/src/libsystemd-network/dhcp-identifier.h b/src/systemd/src/libsystemd-network/dhcp-identifier.h index 8ef7ad16c3..93f06f5938 100644 --- a/src/systemd/src/libsystemd-network/dhcp-identifier.h +++ b/src/systemd/src/libsystemd-network/dhcp-identifier.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include "sd-id128.h" #include "macro.h" diff --git a/src/systemd/src/libsystemd-network/dhcp-internal.h b/src/systemd/src/libsystemd-network/dhcp-internal.h index 517ae11352..a3b842cda3 100644 --- a/src/systemd/src/libsystemd-network/dhcp-internal.h +++ b/src/systemd/src/libsystemd-network/dhcp-internal.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/libsystemd-network/dhcp-lease-internal.h b/src/systemd/src/libsystemd-network/dhcp-lease-internal.h index 00b701f013..82cae2300a 100644 --- a/src/systemd/src/libsystemd-network/dhcp-lease-internal.h +++ b/src/systemd/src/libsystemd-network/dhcp-lease-internal.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/libsystemd-network/dhcp-protocol.h b/src/systemd/src/libsystemd-network/dhcp-protocol.h index 421ae9bb32..3e32484c1d 100644 --- a/src/systemd/src/libsystemd-network/dhcp-protocol.h +++ b/src/systemd/src/libsystemd-network/dhcp-protocol.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/libsystemd-network/dhcp6-internal.h b/src/systemd/src/libsystemd-network/dhcp6-internal.h index af36480c1d..749086d33a 100644 --- a/src/systemd/src/libsystemd-network/dhcp6-internal.h +++ b/src/systemd/src/libsystemd-network/dhcp6-internal.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h b/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h index 83c62305b6..14e708ef63 100644 --- a/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h +++ b/src/systemd/src/libsystemd-network/dhcp6-lease-internal.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include "sd-dhcp6-lease.h" diff --git a/src/systemd/src/libsystemd-network/dhcp6-protocol.h b/src/systemd/src/libsystemd-network/dhcp6-protocol.h index b12df5543f..ee4bdfb07f 100644 --- a/src/systemd/src/libsystemd-network/dhcp6-protocol.h +++ b/src/systemd/src/libsystemd-network/dhcp6-protocol.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/libsystemd-network/lldp-internal.h b/src/systemd/src/libsystemd-network/lldp-internal.h index 6f1ea1050b..15b4a11b15 100644 --- a/src/systemd/src/libsystemd-network/lldp-internal.h +++ b/src/systemd/src/libsystemd-network/lldp-internal.h @@ -20,8 +20,6 @@ #pragma once -#include "nm-sd-adapt.h" - #include "sd-event.h" #include "list.h" diff --git a/src/systemd/src/libsystemd-network/lldp-network.h b/src/systemd/src/libsystemd-network/lldp-network.h index 3957002b41..dcf31faa95 100644 --- a/src/systemd/src/libsystemd-network/lldp-network.h +++ b/src/systemd/src/libsystemd-network/lldp-network.h @@ -20,8 +20,6 @@ #pragma once -#include "nm-sd-adapt.h" - #include "sd-event.h" int lldp_network_bind_raw_socket(int ifindex); diff --git a/src/systemd/src/libsystemd-network/lldp-port.h b/src/systemd/src/libsystemd-network/lldp-port.h index a09bf0c2eb..96092f8df9 100644 --- a/src/systemd/src/libsystemd-network/lldp-port.h +++ b/src/systemd/src/libsystemd-network/lldp-port.h @@ -20,8 +20,6 @@ #pragma once -#include "nm-sd-adapt.h" - #include #include "sd-event.h" diff --git a/src/systemd/src/libsystemd-network/lldp-tlv.h b/src/systemd/src/libsystemd-network/lldp-tlv.h index b5eba52dac..8e7706c612 100644 --- a/src/systemd/src/libsystemd-network/lldp-tlv.h +++ b/src/systemd/src/libsystemd-network/lldp-tlv.h @@ -20,8 +20,6 @@ #pragma once -#include "nm-sd-adapt.h" - #include #include "sd-lldp.h" diff --git a/src/systemd/src/libsystemd-network/lldp.h b/src/systemd/src/libsystemd-network/lldp.h index ce2c1323ca..d2c7164633 100644 --- a/src/systemd/src/libsystemd-network/lldp.h +++ b/src/systemd/src/libsystemd-network/lldp.h @@ -20,8 +20,6 @@ #pragma once -#include "nm-sd-adapt.h" - #define LLDP_MULTICAST_ADDR { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x0e } #define ETHERTYPE_LLDP 0x88cc diff --git a/src/systemd/src/libsystemd-network/network-internal.h b/src/systemd/src/libsystemd-network/network-internal.h index bb8c7b717c..fd16105612 100644 --- a/src/systemd/src/libsystemd-network/network-internal.h +++ b/src/systemd/src/libsystemd-network/network-internal.h @@ -19,8 +19,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include "sd-dhcp-lease.h" diff --git a/src/systemd/src/shared/dns-domain.h b/src/systemd/src/shared/dns-domain.h index ba0e001144..2de3642cb3 100644 --- a/src/systemd/src/shared/dns-domain.h +++ b/src/systemd/src/shared/dns-domain.h @@ -19,7 +19,6 @@ #pragma once -#include "nm-sd-adapt.h" #include #include diff --git a/src/systemd/src/systemd/_sd-common.h b/src/systemd/src/systemd/_sd-common.h index 59314265ee..2d4e1f26e1 100644 --- a/src/systemd/src/systemd/_sd-common.h +++ b/src/systemd/src/systemd/_sd-common.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#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/systemd/src/systemd/sd-dhcp-client.h b/src/systemd/src/systemd/sd-dhcp-client.h index ce863ecc3f..2b865a80e1 100644 --- a/src/systemd/src/systemd/sd-dhcp-client.h +++ b/src/systemd/src/systemd/sd-dhcp-client.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/systemd/sd-dhcp-lease.h b/src/systemd/src/systemd/sd-dhcp-lease.h index 9ceef46d0d..2f565ca825 100644 --- a/src/systemd/src/systemd/sd-dhcp-lease.h +++ b/src/systemd/src/systemd/sd-dhcp-lease.h @@ -21,8 +21,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/systemd/sd-dhcp6-client.h b/src/systemd/src/systemd/sd-dhcp6-client.h index bfa10540e4..9608060830 100644 --- a/src/systemd/src/systemd/sd-dhcp6-client.h +++ b/src/systemd/src/systemd/sd-dhcp6-client.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/systemd/sd-dhcp6-lease.h b/src/systemd/src/systemd/sd-dhcp6-lease.h index 691ee2de79..184fbb8e0d 100644 --- a/src/systemd/src/systemd/sd-dhcp6-lease.h +++ b/src/systemd/src/systemd/sd-dhcp6-lease.h @@ -21,8 +21,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/systemd/sd-event.h b/src/systemd/src/systemd/sd-event.h index 0d49067f97..1ea97e47f8 100644 --- a/src/systemd/src/systemd/sd-event.h +++ b/src/systemd/src/systemd/sd-event.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include #include diff --git a/src/systemd/src/systemd/sd-id128.h b/src/systemd/src/systemd/sd-id128.h index efecb268b7..a3bf5897b8 100644 --- a/src/systemd/src/systemd/sd-id128.h +++ b/src/systemd/src/systemd/sd-id128.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/systemd/sd-ipv4acd.h b/src/systemd/src/systemd/sd-ipv4acd.h index c028aea972..3a2219c82c 100644 --- a/src/systemd/src/systemd/sd-ipv4acd.h +++ b/src/systemd/src/systemd/sd-ipv4acd.h @@ -21,8 +21,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/systemd/sd-ipv4ll.h b/src/systemd/src/systemd/sd-ipv4ll.h index 8e44d3a245..67c566fe0d 100644 --- a/src/systemd/src/systemd/sd-ipv4ll.h +++ b/src/systemd/src/systemd/sd-ipv4ll.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/systemd/sd-lldp.h b/src/systemd/src/systemd/sd-lldp.h index 6dc97da64f..ea952ef187 100644 --- a/src/systemd/src/systemd/sd-lldp.h +++ b/src/systemd/src/systemd/sd-lldp.h @@ -21,8 +21,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include diff --git a/src/systemd/src/systemd/sd-ndisc.h b/src/systemd/src/systemd/sd-ndisc.h index e8ccf055e4..762947531d 100644 --- a/src/systemd/src/systemd/sd-ndisc.h +++ b/src/systemd/src/systemd/sd-ndisc.h @@ -20,8 +20,6 @@ along with systemd; If not, see . ***/ -#include "nm-sd-adapt.h" - #include #include