From 92133d287842dbd7c6d5efc8bd850a47221ebddd Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Nov 2019 18:22:48 +0900
Subject: tree-wide: drop socket.h when socket-util.h is included

---
 src/activate/activate.c                             | 1 -
 src/basic/fd-util.c                                 | 1 -
 src/basic/log.c                                     | 1 -
 src/basic/socket-label.c                            | 1 -
 src/basic/terminal-util.c                           | 1 -
 src/cgroups-agent/cgroups-agent.c                   | 1 -
 src/core/execute.c                                  | 1 -
 src/journal-remote/journal-remote.c                 | 1 -
 src/journal/journal-send.c                          | 1 -
 src/libsystemd-network/dhcp-network.c               | 1 -
 src/libsystemd-network/dhcp6-network.c              | 1 -
 src/libsystemd-network/icmp6-util.c                 | 1 -
 src/libsystemd-network/test-dhcp6-client.c          | 1 -
 src/libsystemd-network/test-ipv4ll.c                | 1 -
 src/libsystemd/sd-bus/bus-internal.h                | 1 -
 src/libsystemd/sd-daemon/sd-daemon.c                | 1 -
 src/libsystemd/sd-device/device-monitor.c           | 1 -
 src/libsystemd/sd-netlink/sd-netlink.c              | 1 -
 src/libsystemd/sd-resolve/test-resolve.c            | 1 -
 src/reply-password/reply-password.c                 | 1 -
 src/shared/ask-password-api.c                       | 1 -
 src/shared/firewall-util.c                          | 1 -
 src/socket-proxy/socket-proxyd.c                    | 1 -
 src/systemctl/systemctl.c                           | 1 -
 src/timesync/timesyncd-manager.c                    | 1 -
 src/tty-ask-password-agent/tty-ask-password-agent.c | 1 -
 src/udev/udev-ctrl.c                                | 1 -
 src/udev/udevd.c                                    | 1 -
 28 files changed, 28 deletions(-)

diff --git a/src/activate/activate.c b/src/activate/activate.c
index 2fe312f5a0..9948520c1f 100644
--- a/src/activate/activate.c
+++ b/src/activate/activate.c
@@ -3,7 +3,6 @@
 #include <getopt.h>
 #include <sys/epoll.h>
 #include <sys/prctl.h>
-#include <sys/socket.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
diff --git a/src/basic/fd-util.c b/src/basic/fd-util.c
index 1024490f23..5d78fab834 100644
--- a/src/basic/fd-util.c
+++ b/src/basic/fd-util.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/resource.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/src/basic/log.c b/src/basic/log.c
index 6bf6fad541..13691be67b 100644
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <sys/signalfd.h>
-#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/un.h>
diff --git a/src/basic/socket-label.c b/src/basic/socket-label.c
index 64b1855deb..8c087268e4 100644
--- a/src/basic/socket-label.c
+++ b/src/basic/socket-label.c
@@ -5,7 +5,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 264f15425e..98c3ff04ef 100644
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <sys/inotify.h>
 #include <sys/ioctl.h>
-#include <sys/socket.h>
 #include <sys/sysmacros.h>
 #include <sys/time.h>
 #include <sys/types.h>
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 9721a32ed6..ace7d6c5ae 100644
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <stdlib.h>
-#include <sys/socket.h>
 
 #include "fd-util.h"
 #include "log.h"
diff --git a/src/core/execute.c b/src/core/execute.c
index fadb651def..b4463e2382 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -10,7 +10,6 @@
 #include <sys/personality.h>
 #include <sys/prctl.h>
 #include <sys/shm.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 6cbaf722c6..8ad1239e98 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -5,7 +5,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/prctl.h>
-#include <sys/socket.h>
 #include <stdint.h>
 
 #include "sd-daemon.h"
diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c
index 5ef11fa1a4..912ecef73c 100644
--- a/src/journal/journal-send.c
+++ b/src/journal/journal-send.c
@@ -4,7 +4,6 @@
 #include <fcntl.h>
 #include <printf.h>
 #include <stddef.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
diff --git a/src/libsystemd-network/dhcp-network.c b/src/libsystemd-network/dhcp-network.c
index 8e7f8a65ab..f48e7c3490 100644
--- a/src/libsystemd-network/dhcp-network.c
+++ b/src/libsystemd-network/dhcp-network.c
@@ -9,7 +9,6 @@
 #include <net/if_arp.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <linux/filter.h>
 #include <linux/if_infiniband.h>
 #include <linux/if_packet.h>
diff --git a/src/libsystemd-network/dhcp6-network.c b/src/libsystemd-network/dhcp6-network.c
index 580f43ba40..f82afe6a09 100644
--- a/src/libsystemd-network/dhcp6-network.c
+++ b/src/libsystemd-network/dhcp6-network.c
@@ -8,7 +8,6 @@
 #include <netinet/ip6.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <linux/if_packet.h>
diff --git a/src/libsystemd-network/icmp6-util.c b/src/libsystemd-network/icmp6-util.c
index e1f193ab24..dbb1e51a0e 100644
--- a/src/libsystemd-network/icmp6-util.c
+++ b/src/libsystemd-network/icmp6-util.c
@@ -9,7 +9,6 @@
 #include <netinet/ip6.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <net/if.h>
diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c
index 0983d7b51b..4b89b320b7 100644
--- a/src/libsystemd-network/test-dhcp6-client.c
+++ b/src/libsystemd-network/test-dhcp6-client.c
@@ -7,7 +7,6 @@
 #include <net/if_arp.h>
 #include <stdbool.h>
 #include <stdio.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c
index 156718f209..2f319bf7d9 100644
--- a/src/libsystemd-network/test-ipv4ll.c
+++ b/src/libsystemd-network/test-ipv4ll.c
@@ -7,7 +7,6 @@
 #include <netinet/if_ether.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
diff --git a/src/libsystemd/sd-bus/bus-internal.h b/src/libsystemd/sd-bus/bus-internal.h
index 6d2c1e8405..352a419e25 100644
--- a/src/libsystemd/sd-bus/bus-internal.h
+++ b/src/libsystemd/sd-bus/bus-internal.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include <pthread.h>
-#include <sys/socket.h>
 
 #include "sd-bus.h"
 
diff --git a/src/libsystemd/sd-daemon/sd-daemon.c b/src/libsystemd/sd-daemon/sd-daemon.c
index 93984d1c59..ff71194331 100644
--- a/src/libsystemd/sd-daemon/sd-daemon.c
+++ b/src/libsystemd/sd-daemon/sd-daemon.c
@@ -8,7 +8,6 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
 #include <unistd.h>
diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c
index 52e51fdd66..42753abe08 100644
--- a/src/libsystemd/sd-device/device-monitor.c
+++ b/src/libsystemd/sd-device/device-monitor.c
@@ -3,7 +3,6 @@
 #include <errno.h>
 #include <linux/filter.h>
 #include <linux/netlink.h>
-#include <sys/socket.h>
 #include <unistd.h>
 
 #include "sd-device.h"
diff --git a/src/libsystemd/sd-netlink/sd-netlink.c b/src/libsystemd/sd-netlink/sd-netlink.c
index 013e8ae957..87350e8591 100644
--- a/src/libsystemd/sd-netlink/sd-netlink.c
+++ b/src/libsystemd/sd-netlink/sd-netlink.c
@@ -1,7 +1,6 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include <poll.h>
-#include <sys/socket.h>
 
 #include "sd-netlink.h"
 
diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c
index 3446f0f778..38a78ee8a2 100644
--- a/src/libsystemd/sd-resolve/test-resolve.c
+++ b/src/libsystemd/sd-resolve/test-resolve.c
@@ -5,7 +5,6 @@
 #include <netinet/in.h>
 #include <resolv.h>
 #include <stdio.h>
-#include <sys/socket.h>
 
 #include "sd-resolve.h"
 
diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index 97b8e30aa3..3a0eb5c4b8 100644
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <stddef.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 
 #include "alloc-util.h"
diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c
index aa08e0b4ef..e00981872d 100644
--- a/src/shared/ask-password-api.c
+++ b/src/shared/ask-password-api.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <sys/inotify.h>
 #include <sys/signalfd.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/uio.h>
diff --git a/src/shared/firewall-util.c b/src/shared/firewall-util.c
index c142b2e9a1..4d4d615bb7 100644
--- a/src/shared/firewall-util.c
+++ b/src/shared/firewall-util.c
@@ -10,7 +10,6 @@
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <net/if.h>
 #ifndef IFNAMSIZ
 #define IFNAMSIZ 16
diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c
index 262f899aa0..2fb9c854fa 100644
--- a/src/socket-proxy/socket-proxyd.c
+++ b/src/socket-proxy/socket-proxyd.c
@@ -6,7 +6,6 @@
 #include <netdb.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 5b2d9d72e7..257b6d9f12 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -9,7 +9,6 @@
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/reboot.h>
-#include <sys/socket.h>
 #include <unistd.h>
 
 #include "sd-bus.h"
diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c
index e7682281a3..da6b410476 100644
--- a/src/timesync/timesyncd-manager.c
+++ b/src/timesync/timesyncd-manager.c
@@ -6,7 +6,6 @@
 #include <netinet/ip.h>
 #include <resolv.h>
 #include <stdlib.h>
-#include <sys/socket.h>
 #include <sys/timerfd.h>
 #include <sys/timex.h>
 #include <sys/types.h>
diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 236c191034..5fa0b8dca1 100644
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -12,7 +12,6 @@
 #include <stddef.h>
 #include <sys/prctl.h>
 #include <sys/signalfd.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/un.h>
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index f1befc7304..b8c0d83a02 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -13,7 +13,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/socket.h>
 #include <sys/un.h>
 #include <unistd.h>
 
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index e635e5b110..867422ad36 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -20,7 +20,6 @@
 #include <sys/mount.h>
 #include <sys/prctl.h>
 #include <sys/signalfd.h>
-#include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/wait.h>
-- 
cgit v1.2.1