systemd: don't include "nm-sd-adapt.h" in systemd header files

The header files are not compiled directly, but always included while compiling
other source files. We already require every source file to include "nm-sd-adapt.h"
as first, thus we don't need the include in the headers too.

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)

src/systemd/nm-sd-adapt.c

@@ -18,7 +18,8 @@
 
 #include "nm-default.h"
 
-#include <glib.h>
+#include "nm-sd-adapt.h"
+
 #include <unistd.h>
 #include <errno.h>
 

src/systemd/src/basic/alloc-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <alloca.h>
 #include <stddef.h>
 #include <stdlib.h>

src/systemd/src/basic/async.h

@@ -19,8 +19,6 @@
   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);

src/systemd/src/basic/escape.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>

src/systemd/src/basic/fd-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <dirent.h>
 #include <stdbool.h>
 #include <stdio.h>

src/systemd/src/basic/fileio.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <dirent.h>
 #include <stdbool.h>
 #include <stddef.h>

src/systemd/src/basic/fs-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <fcntl.h>
 #include <limits.h>
 #include <stdbool.h>

src/systemd/src/basic/hash-funcs.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include "macro.h"
 #include "siphash24.h"
 

src/systemd/src/basic/hashmap.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <limits.h>
 #include <stdbool.h>
 #include <stddef.h>

src/systemd/src/basic/hexdecoct.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdio.h>

src/systemd/src/basic/hostname-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stdbool.h>
 
 #include "macro.h"

src/systemd/src/basic/in-addr-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <netinet/in.h>
 #include <stddef.h>
 #include <sys/socket.h>

src/systemd/src/basic/io-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

src/systemd/src/basic/list.h

@@ -19,8 +19,6 @@
   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)                                               \

src/systemd/src/basic/log.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <errno.h>
 #include <stdarg.h>
 #include <stdbool.h>

src/systemd/src/basic/macro.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>

src/systemd/src/basic/mempool.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stddef.h>
 
 struct pool;

src/systemd/src/basic/parse-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <limits.h>
 #include <stddef.h>

src/systemd/src/basic/path-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <alloca.h>
 #include <stdbool.h>
 #include <stddef.h>

src/systemd/src/basic/prioq.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stdbool.h>
 
 #include "hashmap.h"

src/systemd/src/basic/random-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stddef.h>
 #include <stdint.h>
 

src/systemd/src/basic/refcnt.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 /* A type-safe atomic refcounter.
  *
  * DO NOT USE THIS UNLESS YOU ACTUALLY CARE ABOUT THREAD SAFETY! */

src/systemd/src/basic/set.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include "hashmap.h"
 #include "macro.h"
 

src/systemd/src/basic/siphash24.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <stddef.h>
 #include <stdint.h>

src/systemd/src/basic/socket-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <netinet/ether.h>
 #include <netinet/in.h>
 #include <stdbool.h>

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 <byteswap.h>
 #include <endian.h>
 #include <stdint.h>

src/systemd/src/basic/stdio-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <printf.h>
 #include <stdarg.h>
 #include <stdio.h>

src/systemd/src/basic/string-table.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <errno.h>
 #include <stddef.h>
 #include <stdio.h>

src/systemd/src/basic/string-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <alloca.h>
 #include <stdbool.h>
 #include <stddef.h>

src/systemd/src/basic/strv.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <fnmatch.h>
 #include <stdarg.h>
 #include <stdbool.h>

src/systemd/src/basic/time-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stddef.h>

src/systemd/src/basic/umask-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <sys/types.h>

src/systemd/src/basic/unaligned.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <endian.h>
 #include <stdint.h>
 

src/systemd/src/basic/utf8.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>

src/systemd/src/basic/util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <alloca.h>
 #include <errno.h>
 #include <fcntl.h>

src/systemd/src/libsystemd-network/arp-util.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <netinet/if_ether.h>
 
 #include "socket-util.h"

src/systemd/src/libsystemd-network/dhcp-identifier.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include "sd-id128.h"
 
 #include "macro.h"

src/systemd/src/libsystemd-network/dhcp-internal.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <linux/if_packet.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>

src/systemd/src/libsystemd-network/dhcp-lease-internal.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stdint.h>
 #include <linux/if_packet.h>
 

src/systemd/src/libsystemd-network/dhcp-protocol.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <netinet/ip.h>
 #include <netinet/udp.h>
 #include <stdint.h>

src/systemd/src/libsystemd-network/dhcp6-internal.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <net/ethernet.h>
 #include <netinet/in.h>
 

src/systemd/src/libsystemd-network/dhcp6-lease-internal.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stdint.h>
 
 #include "sd-dhcp6-lease.h"

src/systemd/src/libsystemd-network/dhcp6-protocol.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <netinet/ip6.h>
 #include <netinet/udp.h>
 

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"

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);

src/systemd/src/libsystemd-network/lldp-port.h

@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "nm-sd-adapt.h"
-
 #include <net/ethernet.h>
 
 #include "sd-event.h"

src/systemd/src/libsystemd-network/lldp-tlv.h

@@ -20,8 +20,6 @@
 
 #pragma once
 
-#include "nm-sd-adapt.h"
-
 #include <net/ethernet.h>
 
 #include "sd-lldp.h"

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

src/systemd/src/libsystemd-network/network-internal.h

@@ -19,8 +19,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <stdbool.h>
 
 #include "sd-dhcp-lease.h"

src/systemd/src/shared/dns-domain.h

@@ -19,7 +19,6 @@
 
 #pragma once
 
-#include "nm-sd-adapt.h"
 
 #include <errno.h>
 #include <stdbool.h>

src/systemd/src/systemd/_sd-common.h

@@ -20,8 +20,6 @@
   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

src/systemd/src/systemd/sd-dhcp-client.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <net/ethernet.h>
 #include <netinet/in.h>

src/systemd/src/systemd/sd-dhcp-lease.h

@@ -21,8 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <net/ethernet.h>
 #include <netinet/in.h>

src/systemd/src/systemd/sd-dhcp6-client.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <net/ethernet.h>
 #include <sys/types.h>

src/systemd/src/systemd/sd-dhcp6-lease.h

@@ -21,8 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <netinet/in.h>
 

src/systemd/src/systemd/sd-event.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <signal.h>
 #include <sys/epoll.h>

src/systemd/src/systemd/sd-id128.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <string.h>
 

src/systemd/src/systemd/sd-ipv4acd.h

@@ -21,8 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <net/ethernet.h>
 #include <netinet/in.h>
 

src/systemd/src/systemd/sd-ipv4ll.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <net/ethernet.h>
 #include <netinet/in.h>
 

src/systemd/src/systemd/sd-lldp.h

@@ -21,8 +21,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <net/ethernet.h>
 

src/systemd/src/systemd/sd-ndisc.h

@@ -20,8 +20,6 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "nm-sd-adapt.h"
-
 #include <inttypes.h>
 #include <net/ethernet.h>