summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-01-31 13:44:13 +0100
committerThomas Haller <thaller@redhat.com>2019-02-12 08:50:28 +0100
commita3370af3a8a965e41950c5022182730d79614df2 (patch)
tree78f971ab718bd6005f26ccefaf618c5faed5600f
parent32a847a61f031813865199366318d047ca38c2f1 (diff)
downloadNetworkManager-a3370af3a8a965e41950c5022182730d79614df2.tar.gz
all: drop unnecessary includes of <errno.h> and <string.h>
"nm-macros-interal.h" already includes <errno.h> and <string.h>. No need to include it everywhere else too.
-rw-r--r--clients/cli/agent.c1
-rw-r--r--clients/cli/common.c1
-rw-r--r--clients/cli/connections.c2
-rw-r--r--clients/cli/devices.c2
-rw-r--r--clients/cli/general.c1
-rw-r--r--clients/cli/nmcli.c1
-rw-r--r--clients/cli/polkit-agent.c1
-rw-r--r--clients/cli/utils.c2
-rw-r--r--clients/common/nm-polkit-listener.c1
-rw-r--r--clients/common/nm-secret-agent-simple.c1
-rw-r--r--clients/common/nm-vpn-helpers.c2
-rw-r--r--clients/tui/newt/nmt-newt-button-box.c3
-rw-r--r--clients/tui/newt/nmt-newt-container.c3
-rw-r--r--clients/tui/newt/nmt-newt-entry.c2
-rw-r--r--clients/tui/newt/nmt-newt-form.c1
-rw-r--r--clients/tui/newt/nmt-newt-grid.c2
-rw-r--r--clients/tui/newt/nmt-newt-label.c3
-rw-r--r--clients/tui/newt/nmt-newt-section.c3
-rw-r--r--clients/tui/newt/nmt-newt-stack.c2
-rw-r--r--clients/tui/newt/nmt-newt-textbox.c3
-rw-r--r--clients/tui/newt/nmt-newt-utils.c1
-rw-r--r--clients/tui/nm-editor-bindings.c5
-rw-r--r--clients/tui/nmt-address-list.c4
-rw-r--r--clients/tui/nmt-device-entry.c4
-rw-r--r--clients/tui/nmt-editor-grid.c2
-rw-r--r--clients/tui/nmt-mac-entry.c2
-rw-r--r--clients/tui/nmt-utils.c2
-rw-r--r--clients/tui/nmt-widget-list.c4
-rw-r--r--clients/tui/nmtui.c4
-rw-r--r--dispatcher/nm-dispatcher-utils.c4
-rw-r--r--dispatcher/nm-dispatcher.c2
-rw-r--r--dispatcher/tests/test-dispatcher-envp.c1
-rw-r--r--libnm-core/nm-connection.c1
-rw-r--r--libnm-core/nm-crypto.c1
-rw-r--r--libnm-core/nm-dbus-utils.c2
-rw-r--r--libnm-core/nm-errors.c3
-rw-r--r--libnm-core/nm-keyfile-utils.c4
-rw-r--r--libnm-core/nm-keyfile.c2
-rw-r--r--libnm-core/nm-property-compare.c5
-rw-r--r--libnm-core/nm-setting-8021x.c2
-rw-r--r--libnm-core/nm-setting-adsl.c2
-rw-r--r--libnm-core/nm-setting-bluetooth.c1
-rw-r--r--libnm-core/nm-setting-bond.c2
-rw-r--r--libnm-core/nm-setting-bridge-port.c1
-rw-r--r--libnm-core/nm-setting-bridge.c1
-rw-r--r--libnm-core/nm-setting-cdma.c2
-rw-r--r--libnm-core/nm-setting-connection.c2
-rw-r--r--libnm-core/nm-setting-dcb.c2
-rw-r--r--libnm-core/nm-setting-gsm.c2
-rw-r--r--libnm-core/nm-setting-ip-config.c1
-rw-r--r--libnm-core/nm-setting-ip4-config.c2
-rw-r--r--libnm-core/nm-setting-ip6-config.c1
-rw-r--r--libnm-core/nm-setting-macsec.c1
-rw-r--r--libnm-core/nm-setting-macvlan.c1
-rw-r--r--libnm-core/nm-setting-olpc-mesh.c2
-rw-r--r--libnm-core/nm-setting-pppoe.c2
-rw-r--r--libnm-core/nm-setting-serial.c2
-rw-r--r--libnm-core/nm-setting-team-port.c1
-rw-r--r--libnm-core/nm-setting-team.c1
-rw-r--r--libnm-core/nm-setting-tun.c1
-rw-r--r--libnm-core/nm-setting-vlan.c1
-rw-r--r--libnm-core/nm-setting-vpn.c2
-rw-r--r--libnm-core/nm-setting-vxlan.c1
-rw-r--r--libnm-core/nm-setting-wifi-p2p.c1
-rw-r--r--libnm-core/nm-setting-wimax.c1
-rw-r--r--libnm-core/nm-setting-wired.c1
-rw-r--r--libnm-core/nm-setting-wireless-security.c2
-rw-r--r--libnm-core/nm-setting-wireless.c1
-rw-r--r--libnm-core/nm-setting.c2
-rw-r--r--libnm-core/nm-utils.c2
-rw-r--r--libnm-core/nm-vpn-plugin-info.c2
-rw-r--r--libnm-core/tests/test-crypto.c1
-rw-r--r--libnm-core/tests/test-general.c2
-rw-r--r--libnm-core/tests/test-secrets.c2
-rw-r--r--libnm-core/tests/test-setting.c1
-rw-r--r--libnm-core/tests/test-settings-defaults.c2
-rw-r--r--libnm-glib/nm-vpn-plugin-utils.c1
-rw-r--r--libnm-util/nm-setting-bond.c1
-rw-r--r--libnm-util/nm-setting-vpn.c1
-rw-r--r--libnm/nm-access-point.c2
-rw-r--r--libnm/nm-active-connection.c3
-rw-r--r--libnm/nm-client.c4
-rw-r--r--libnm/nm-dbus-helpers.c2
-rw-r--r--libnm/nm-device-adsl.c3
-rw-r--r--libnm/nm-device-bond.c4
-rw-r--r--libnm/nm-device-bridge.c4
-rw-r--r--libnm/nm-device-bt.c4
-rw-r--r--libnm/nm-device-dummy.c3
-rw-r--r--libnm/nm-device-ethernet.c4
-rw-r--r--libnm/nm-device-generic.c3
-rw-r--r--libnm/nm-device-infiniband.c4
-rw-r--r--libnm/nm-device-ip-tunnel.c4
-rw-r--r--libnm/nm-device-macsec.c3
-rw-r--r--libnm/nm-device-macvlan.c4
-rw-r--r--libnm/nm-device-modem.c4
-rw-r--r--libnm/nm-device-olpc-mesh.c4
-rw-r--r--libnm/nm-device-ovs-bridge.c3
-rw-r--r--libnm/nm-device-ovs-interface.c3
-rw-r--r--libnm/nm-device-ovs-port.c3
-rw-r--r--libnm/nm-device-team.c4
-rw-r--r--libnm/nm-device-tun.c5
-rw-r--r--libnm/nm-device-vlan.c4
-rw-r--r--libnm/nm-device-vxlan.c4
-rw-r--r--libnm/nm-device-wifi-p2p.c3
-rw-r--r--libnm/nm-device-wifi.c3
-rw-r--r--libnm/nm-device-wimax.c4
-rw-r--r--libnm/nm-device-wpan.c3
-rw-r--r--libnm/nm-device.c1
-rw-r--r--libnm/nm-dhcp-config.c3
-rw-r--r--libnm/nm-dhcp4-config.c1
-rw-r--r--libnm/nm-dhcp6-config.c1
-rw-r--r--libnm/nm-dns-manager.c3
-rw-r--r--libnm/nm-ip-config.c3
-rw-r--r--libnm/nm-ip4-config.c1
-rw-r--r--libnm/nm-ip6-config.c1
-rw-r--r--libnm/nm-manager.c2
-rw-r--r--libnm/nm-object.c1
-rw-r--r--libnm/nm-remote-connection.c4
-rw-r--r--libnm/nm-remote-settings.c3
-rw-r--r--libnm/nm-secret-agent-old.c2
-rw-r--r--libnm/nm-vpn-connection.c3
-rw-r--r--libnm/nm-vpn-plugin-old.c1
-rw-r--r--libnm/nm-vpn-service-plugin.c1
-rw-r--r--libnm/nm-wifi-p2p-peer.c3
-rw-r--r--libnm/nm-wimax-nsp.c4
-rw-r--r--libnm/tests/test-nm-client.c1
-rw-r--r--libnm/tests/test-remote-settings-client.c1
-rw-r--r--libnm/tests/test-secret-agent.c1
-rw-r--r--shared/nm-test-utils-impl.c1
-rw-r--r--shared/nm-utils/nm-shared-utils.c1
-rw-r--r--src/devices/adsl/nm-atm-manager.c1
-rw-r--r--src/devices/adsl/nm-device-adsl.c2
-rw-r--r--src/devices/bluetooth/nm-bluez-device.c2
-rw-r--r--src/devices/bluetooth/nm-bluez-manager.c1
-rw-r--r--src/devices/bluetooth/nm-bluez4-adapter.c2
-rw-r--r--src/devices/bluetooth/nm-bluez4-manager.c1
-rw-r--r--src/devices/bluetooth/nm-bluez5-dun.c1
-rw-r--r--src/devices/bluetooth/nm-bluez5-manager.c1
-rw-r--r--src/devices/bluetooth/nm-device-bt.c1
-rw-r--r--src/devices/nm-device-bond.c1
-rw-r--r--src/devices/nm-device-dummy.c1
-rw-r--r--src/devices/nm-device-ethernet.c2
-rw-r--r--src/devices/nm-device-factory.c2
-rw-r--r--src/devices/nm-device-ip-tunnel.c1
-rw-r--r--src/devices/nm-device-macvlan.c1
-rw-r--r--src/devices/nm-device-tun.c1
-rw-r--r--src/devices/nm-device-veth.c2
-rw-r--r--src/devices/nm-device-vxlan.c2
-rw-r--r--src/devices/nm-device-wpan.c1
-rw-r--r--src/devices/nm-device.c2
-rw-r--r--src/devices/nm-lldp-listener.c1
-rw-r--r--src/devices/ovs/nm-ovsdb.c1
-rw-r--r--src/devices/team/nm-team-factory.c1
-rw-r--r--src/devices/wifi/nm-device-iwd.c2
-rw-r--r--src/devices/wifi/nm-device-olpc-mesh.c2
-rw-r--r--src/devices/wifi/nm-device-wifi.c2
-rw-r--r--src/devices/wifi/nm-iwd-manager.c1
-rw-r--r--src/devices/wifi/nm-wifi-ap.c1
-rw-r--r--src/devices/wifi/nm-wifi-p2p-peer.c1
-rw-r--r--src/devices/wifi/nm-wifi-utils.c1
-rw-r--r--src/devices/wifi/tests/test-general.c3
-rw-r--r--src/devices/wwan/nm-device-modem.c2
-rw-r--r--src/devices/wwan/nm-modem-broadband.c1
-rw-r--r--src/devices/wwan/nm-modem-manager.c1
-rw-r--r--src/devices/wwan/nm-modem-ofono.c2
-rw-r--r--src/devices/wwan/nm-modem.c1
-rw-r--r--src/devices/wwan/nm-wwan-factory.c1
-rw-r--r--src/dhcp/nm-dhcp-client.c2
-rw-r--r--src/dhcp/nm-dhcp-dhclient-utils.c1
-rw-r--r--src/dhcp/nm-dhcp-dhclient.c2
-rw-r--r--src/dhcp/nm-dhcp-dhcpcanon.c2
-rw-r--r--src/dhcp/nm-dhcp-dhcpcd.c2
-rw-r--r--src/dhcp/nm-dhcp-helper.c1
-rw-r--r--src/dhcp/nm-dhcp-listener.c2
-rw-r--r--src/dhcp/nm-dhcp-manager.c2
-rw-r--r--src/dhcp/nm-dhcp-systemd.c2
-rw-r--r--src/dhcp/nm-dhcp-utils.c2
-rw-r--r--src/dhcp/tests/test-dhcp-dhclient.c1
-rw-r--r--src/dhcp/tests/test-dhcp-utils.c1
-rw-r--r--src/dns/nm-dns-manager.c1
-rw-r--r--src/dns/nm-dns-plugin.c1
-rw-r--r--src/dnsmasq/nm-dnsmasq-manager.c1
-rw-r--r--src/dnsmasq/nm-dnsmasq-utils.c1
-rw-r--r--src/initrd/nmi-cmdline-reader.c4
-rw-r--r--src/initrd/nmi-ibft-reader.c2
-rw-r--r--src/initrd/tests/test-cmdline-reader.c1
-rw-r--r--src/initrd/tests/test-ibft-reader.c1
-rw-r--r--src/main-utils.c1
-rw-r--r--src/main.c2
-rw-r--r--src/ndisc/nm-fake-ndisc.c1
-rw-r--r--src/ndisc/nm-lndp-ndisc.c1
-rw-r--r--src/ndisc/nm-ndisc.c1
-rw-r--r--src/ndisc/tests/test-ndisc-fake.c1
-rw-r--r--src/ndisc/tests/test-ndisc-linux.c1
-rw-r--r--src/nm-act-request.c1
-rw-r--r--src/nm-audit-manager.c2
-rw-r--r--src/nm-auth-subject.c1
-rw-r--r--src/nm-auth-utils.c3
-rw-r--r--src/nm-checkpoint.c2
-rw-r--r--src/nm-config-data.c2
-rw-r--r--src/nm-config.c1
-rw-r--r--src/nm-connectivity.c2
-rw-r--r--src/nm-core-utils.c2
-rw-r--r--src/nm-dbus-manager.c2
-rw-r--r--src/nm-dcb.c1
-rw-r--r--src/nm-dhcp4-config.c2
-rw-r--r--src/nm-dhcp6-config.c2
-rw-r--r--src/nm-dispatcher.c3
-rw-r--r--src/nm-firewall-manager.c2
-rw-r--r--src/nm-hostname-manager.c2
-rw-r--r--src/nm-iface-helper.c2
-rw-r--r--src/nm-ip4-config.c1
-rw-r--r--src/nm-ip6-config.c1
-rw-r--r--src/nm-keep-alive.c2
-rw-r--r--src/nm-logging.c2
-rw-r--r--src/nm-manager.c2
-rw-r--r--src/nm-policy.c2
-rw-r--r--src/nm-rfkill-manager.c1
-rw-r--r--src/nm-session-monitor.c2
-rw-r--r--src/nm-sleep-monitor.c2
-rw-r--r--src/platform/nm-fake-platform.c1
-rw-r--r--src/platform/nm-linux-platform.c1
-rw-r--r--src/platform/nm-platform-utils.c2
-rw-r--r--src/platform/nm-platform.c2
-rw-r--r--src/platform/nmp-netns.c1
-rw-r--r--src/platform/tests/test-common.h1
-rw-r--r--src/platform/wifi/nm-wifi-utils-nl80211.c2
-rw-r--r--src/platform/wifi/nm-wifi-utils-wext.c2
-rw-r--r--src/platform/wifi/nm-wifi-utils.c1
-rw-r--r--src/ppp/nm-ppp-manager-call.c1
-rw-r--r--src/ppp/nm-ppp-manager.c2
-rw-r--r--src/ppp/nm-pppd-plugin.c1
-rw-r--r--src/settings/nm-agent-manager.c1
-rw-r--r--src/settings/nm-settings-connection.c2
-rw-r--r--src/settings/nm-settings.c2
-rw-r--r--src/settings/plugins/ibft/nms-ibft-connection.c1
-rw-r--r--src/settings/plugins/ibft/nms-ibft-plugin.c2
-rw-r--r--src/settings/plugins/ibft/nms-ibft-reader.c2
-rw-r--r--src/settings/plugins/ibft/tests/test-ibft.c1
-rw-r--r--src/settings/plugins/ifcfg-rh/nm-inotify-helper.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c1
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c1
-rw-r--r--src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/shvar.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c1
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-connection.c1
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c1
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-parser.c2
-rw-r--r--src/settings/plugins/ifupdown/nms-ifupdown-plugin.c1
-rw-r--r--src/settings/plugins/ifupdown/tests/test-ifupdown.c2
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-connection.c1
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-plugin.c2
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-reader.c1
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-utils.c1
-rw-r--r--src/settings/plugins/keyfile/nms-keyfile-writer.c2
-rw-r--r--src/settings/plugins/keyfile/tests/test-keyfile.c1
-rw-r--r--src/supplicant/nm-supplicant-config.c1
-rw-r--r--src/supplicant/nm-supplicant-interface.c1
-rw-r--r--src/supplicant/nm-supplicant-manager.c2
-rw-r--r--src/supplicant/nm-supplicant-settings-verify.c2
-rw-r--r--src/supplicant/tests/test-supplicant-config.c1
-rw-r--r--src/systemd/src/libsystemd-network/dhcp-network.c1
-rw-r--r--src/systemd/src/libsystemd-network/dhcp-option.c1
-rw-r--r--src/systemd/src/libsystemd-network/dhcp-packet.c1
-rw-r--r--src/systemd/src/libsystemd-network/dhcp6-network.c1
-rw-r--r--src/systemd/src/libsystemd-network/dhcp6-option.c1
-rw-r--r--src/systemd/src/libsystemd-network/sd-dhcp-client.c1
-rw-r--r--src/systemd/src/libsystemd-network/sd-dhcp-lease.c1
-rw-r--r--src/systemd/src/libsystemd-network/sd-dhcp6-client.c1
-rw-r--r--src/systemd/src/libsystemd-network/sd-dhcp6-lease.c1
-rw-r--r--src/systemd/src/libsystemd-network/sd-ipv4acd.c1
-rw-r--r--src/systemd/src/libsystemd-network/sd-ipv4ll.c1
-rw-r--r--src/systemd/src/libsystemd/sd-event/event-util.c1
-rw-r--r--src/systemd/src/libsystemd/sd-id128/id128-util.c1
-rw-r--r--src/systemd/src/libsystemd/sd-id128/sd-id128.c1
-rw-r--r--src/systemd/src/shared/dns-domain.h1
-rw-r--r--src/tests/config/nm-test-device.c2
-rw-r--r--src/tests/test-dcb.c2
-rw-r--r--src/tests/test-general-with-expect.c2
-rw-r--r--src/tests/test-general.c2
-rw-r--r--src/tests/test-ip4-config.c1
-rw-r--r--src/tests/test-ip6-config.c1
-rw-r--r--src/tests/test-utils.c2
-rw-r--r--src/vpn/nm-vpn-connection.c2
-rw-r--r--src/vpn/nm-vpn-manager.c2
287 files changed, 56 insertions, 467 deletions
diff --git a/clients/cli/agent.c b/clients/cli/agent.c
index 55a5ba6b85..a18eecc52d 100644
--- a/clients/cli/agent.c
+++ b/clients/cli/agent.c
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <errno.h>
#include <readline/readline.h>
#include <readline/history.h>
diff --git a/clients/cli/common.c b/clients/cli/common.c
index 56e5062f52..b3342c1935 100644
--- a/clients/cli/common.c
+++ b/clients/cli/common.c
@@ -25,7 +25,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <errno.h>
#include <sys/ioctl.h>
#include <readline/readline.h>
#include <readline/history.h>
diff --git a/clients/cli/connections.c b/clients/cli/connections.c
index 0e6201dd9e..ff7d020303 100644
--- a/clients/cli/connections.c
+++ b/clients/cli/connections.c
@@ -22,10 +22,8 @@
#include "connections.h"
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-#include <errno.h>
#include <signal.h>
#include <netinet/ether.h>
#include <readline/readline.h>
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index c9906d3b0c..04a8c98891 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -22,9 +22,7 @@
#include "devices.h"
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <readline/readline.h>
#include "nm-secret-agent-simple.h"
diff --git a/clients/cli/general.c b/clients/cli/general.c
index d9128c7670..d0cfc844aa 100644
--- a/clients/cli/general.c
+++ b/clients/cli/general.c
@@ -21,7 +21,6 @@
#include "general.h"
-#include <string.h>
#include <stdlib.h>
#include "nm-common-macros.h"
diff --git a/clients/cli/nmcli.c b/clients/cli/nmcli.c
index c8253fff9a..d7bc2a4629 100644
--- a/clients/cli/nmcli.c
+++ b/clients/cli/nmcli.c
@@ -24,7 +24,6 @@
#include "nmcli.h"
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
#include <signal.h>
#include <termios.h>
diff --git a/clients/cli/polkit-agent.c b/clients/cli/polkit-agent.c
index b895599be4..accb567fe3 100644
--- a/clients/cli/polkit-agent.c
+++ b/clients/cli/polkit-agent.c
@@ -22,7 +22,6 @@
#include "polkit-agent.h"
#include <stdio.h>
-#include <string.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/clients/cli/utils.c b/clients/cli/utils.c
index 1b940467ce..f23e079c96 100644
--- a/clients/cli/utils.c
+++ b/clients/cli/utils.c
@@ -23,9 +23,7 @@
#include "utils.h"
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/clients/common/nm-polkit-listener.c b/clients/common/nm-polkit-listener.c
index dccf1d38bb..7367459d7d 100644
--- a/clients/common/nm-polkit-listener.c
+++ b/clients/common/nm-polkit-listener.c
@@ -35,7 +35,6 @@
#include "nm-polkit-listener.h"
-#include <string.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/clients/common/nm-secret-agent-simple.c b/clients/common/nm-secret-agent-simple.c
index 43b1155487..1393793e4c 100644
--- a/clients/common/nm-secret-agent-simple.c
+++ b/clients/common/nm-secret-agent-simple.c
@@ -35,7 +35,6 @@
#include <gio/gunixoutputstream.h>
#include <gio/gunixinputstream.h>
-#include <string.h>
#include "nm-vpn-service-plugin.h"
#include "nm-vpn-helpers.h"
diff --git a/clients/common/nm-vpn-helpers.c b/clients/common/nm-vpn-helpers.c
index a840d97f97..a2e7dc0374 100644
--- a/clients/common/nm-vpn-helpers.c
+++ b/clients/common/nm-vpn-helpers.c
@@ -25,8 +25,6 @@
#include "nm-vpn-helpers.h"
-#include <string.h>
-
#include "nm-utils.h"
/*****************************************************************************/
diff --git a/clients/tui/newt/nmt-newt-button-box.c b/clients/tui/newt/nmt-newt-button-box.c
index 5341c76a54..02d8f5cbb2 100644
--- a/clients/tui/newt/nmt-newt-button-box.c
+++ b/clients/tui/newt/nmt-newt-button-box.c
@@ -31,9 +31,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-newt-button-box.h"
+
#include "nmt-newt-button.h"
G_DEFINE_TYPE (NmtNewtButtonBox, nmt_newt_button_box, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/newt/nmt-newt-container.c b/clients/tui/newt/nmt-newt-container.c
index 927f187e86..402590258a 100644
--- a/clients/tui/newt/nmt-newt-container.c
+++ b/clients/tui/newt/nmt-newt-container.c
@@ -28,9 +28,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-newt-container.h"
+
#include "nmt-newt-component.h"
G_DEFINE_ABSTRACT_TYPE (NmtNewtContainer, nmt_newt_container, NMT_TYPE_NEWT_WIDGET)
diff --git a/clients/tui/newt/nmt-newt-entry.c b/clients/tui/newt/nmt-newt-entry.c
index 2715a7389f..90c2e467b5 100644
--- a/clients/tui/newt/nmt-newt-entry.c
+++ b/clients/tui/newt/nmt-newt-entry.c
@@ -28,8 +28,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-newt-entry.h"
#include "nmt-newt-form.h"
#include "nmt-newt-hacks.h"
diff --git a/clients/tui/newt/nmt-newt-form.c b/clients/tui/newt/nmt-newt-form.c
index ccf447eada..cd87a2160a 100644
--- a/clients/tui/newt/nmt-newt-form.c
+++ b/clients/tui/newt/nmt-newt-form.c
@@ -27,7 +27,6 @@
#include "nm-default.h"
#include <fcntl.h>
-#include <string.h>
#include <unistd.h>
#include "nmt-newt-form.h"
diff --git a/clients/tui/newt/nmt-newt-grid.c b/clients/tui/newt/nmt-newt-grid.c
index 4333e0dc6f..e6c487f5f7 100644
--- a/clients/tui/newt/nmt-newt-grid.c
+++ b/clients/tui/newt/nmt-newt-grid.c
@@ -42,8 +42,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-newt-grid.h"
G_DEFINE_TYPE (NmtNewtGrid, nmt_newt_grid, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/newt/nmt-newt-label.c b/clients/tui/newt/nmt-newt-label.c
index f9aed8a3dd..63bd28da9d 100644
--- a/clients/tui/newt/nmt-newt-label.c
+++ b/clients/tui/newt/nmt-newt-label.c
@@ -27,9 +27,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-newt-label.h"
+
#include "nmt-newt-utils.h"
G_DEFINE_TYPE (NmtNewtLabel, nmt_newt_label, NMT_TYPE_NEWT_COMPONENT)
diff --git a/clients/tui/newt/nmt-newt-section.c b/clients/tui/newt/nmt-newt-section.c
index 34073454ce..9b7e44e4b5 100644
--- a/clients/tui/newt/nmt-newt-section.c
+++ b/clients/tui/newt/nmt-newt-section.c
@@ -37,9 +37,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-newt-section.h"
+
#include "nmt-newt-grid.h"
#include "nmt-newt-label.h"
#include "nmt-newt-utils.h"
diff --git a/clients/tui/newt/nmt-newt-stack.c b/clients/tui/newt/nmt-newt-stack.c
index 3abf00b199..da4beb8b70 100644
--- a/clients/tui/newt/nmt-newt-stack.c
+++ b/clients/tui/newt/nmt-newt-stack.c
@@ -31,8 +31,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-newt-stack.h"
G_DEFINE_TYPE (NmtNewtStack, nmt_newt_stack, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/newt/nmt-newt-textbox.c b/clients/tui/newt/nmt-newt-textbox.c
index 73794f5eb3..0850e60c50 100644
--- a/clients/tui/newt/nmt-newt-textbox.c
+++ b/clients/tui/newt/nmt-newt-textbox.c
@@ -26,9 +26,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-newt-textbox.h"
+
#include "nmt-newt-utils.h"
G_DEFINE_TYPE (NmtNewtTextbox, nmt_newt_textbox, NMT_TYPE_NEWT_COMPONENT)
diff --git a/clients/tui/newt/nmt-newt-utils.c b/clients/tui/newt/nmt-newt-utils.c
index e886650036..475faf7ee8 100644
--- a/clients/tui/newt/nmt-newt-utils.c
+++ b/clients/tui/newt/nmt-newt-utils.c
@@ -23,7 +23,6 @@
#include "nm-default.h"
-#include <errno.h>
#include <stdarg.h>
#include <unistd.h>
#include <sys/wait.h>
diff --git a/clients/tui/nm-editor-bindings.c b/clients/tui/nm-editor-bindings.c
index 16ea60d31d..df6387c329 100644
--- a/clients/tui/nm-editor-bindings.c
+++ b/clients/tui/nm-editor-bindings.c
@@ -27,12 +27,11 @@
#include "nm-default.h"
+#include "nm-editor-bindings.h"
+
#include <arpa/inet.h>
#include <netinet/in.h>
#include <stdlib.h>
-#include <string.h>
-
-#include "nm-editor-bindings.h"
static void
value_transform_string_int (const GValue *src_value,
diff --git a/clients/tui/nmt-address-list.c b/clients/tui/nmt-address-list.c
index 53990d6a53..ae1a6b2fcc 100644
--- a/clients/tui/nmt-address-list.c
+++ b/clients/tui/nmt-address-list.c
@@ -30,12 +30,12 @@
#include "nm-default.h"
+#include "nmt-address-list.h"
+
#include <arpa/inet.h>
#include <netinet/in.h>
#include <stdlib.h>
-#include <string.h>
-#include "nmt-address-list.h"
#include "nmt-ip-entry.h"
G_DEFINE_TYPE (NmtAddressList, nmt_address_list, NMT_TYPE_WIDGET_LIST)
diff --git a/clients/tui/nmt-device-entry.c b/clients/tui/nmt-device-entry.c
index a4d63e4f34..43fbbc1649 100644
--- a/clients/tui/nmt-device-entry.c
+++ b/clients/tui/nmt-device-entry.c
@@ -36,12 +36,12 @@
#include "nm-default.h"
-#include <string.h>
+#include "nmt-device-entry.h"
+
#include <sys/socket.h>
#include <linux/if_arp.h>
#include "nmtui.h"
-#include "nmt-device-entry.h"
G_DEFINE_TYPE (NmtDeviceEntry, nmt_device_entry, NMT_TYPE_EDITOR_GRID)
diff --git a/clients/tui/nmt-editor-grid.c b/clients/tui/nmt-editor-grid.c
index bc8a784336..bb3e78b851 100644
--- a/clients/tui/nmt-editor-grid.c
+++ b/clients/tui/nmt-editor-grid.c
@@ -39,8 +39,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-editor-grid.h"
G_DEFINE_TYPE (NmtEditorGrid, nmt_editor_grid, NMT_TYPE_NEWT_CONTAINER)
diff --git a/clients/tui/nmt-mac-entry.c b/clients/tui/nmt-mac-entry.c
index 23c2ab1cbe..70c8c30796 100644
--- a/clients/tui/nmt-mac-entry.c
+++ b/clients/tui/nmt-mac-entry.c
@@ -30,8 +30,6 @@
#include "nmt-mac-entry.h"
-#include <string.h>
-
#include "nm-common-macros.h"
G_DEFINE_TYPE (NmtMacEntry, nmt_mac_entry, NMT_TYPE_NEWT_ENTRY)
diff --git a/clients/tui/nmt-utils.c b/clients/tui/nmt-utils.c
index 7cd71be2b4..96b97158e1 100644
--- a/clients/tui/nmt-utils.c
+++ b/clients/tui/nmt-utils.c
@@ -23,8 +23,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nmt-utils.h"
/**
diff --git a/clients/tui/nmt-widget-list.c b/clients/tui/nmt-widget-list.c
index 2fd5af02c7..ad35f3de1f 100644
--- a/clients/tui/nmt-widget-list.c
+++ b/clients/tui/nmt-widget-list.c
@@ -32,12 +32,12 @@
#include "nm-default.h"
+#include "nmt-widget-list.h"
+
#include <arpa/inet.h>
#include <netinet/in.h>
#include <stdlib.h>
-#include <string.h>
-#include "nmt-widget-list.h"
#include "nmt-newt.h"
G_DEFINE_TYPE (NmtWidgetList, nmt_widget_list, NMT_TYPE_NEWT_GRID)
diff --git a/clients/tui/nmtui.c b/clients/tui/nmtui.c
index 97c528e705..aacc07cb15 100644
--- a/clients/tui/nmtui.c
+++ b/clients/tui/nmtui.c
@@ -26,14 +26,14 @@
#include "nm-default.h"
+#include "nmtui.h"
+
#include <locale.h>
#include <stdlib.h>
-#include <string.h>
#include "nmt-newt.h"
#include "nm-editor-bindings.h"
-#include "nmtui.h"
#include "nmtui-edit.h"
#include "nmtui-connect.h"
#include "nmtui-hostname.h"
diff --git a/dispatcher/nm-dispatcher-utils.c b/dispatcher/nm-dispatcher-utils.c
index 4d04eeca97..dee00612d7 100644
--- a/dispatcher/nm-dispatcher-utils.c
+++ b/dispatcher/nm-dispatcher-utils.c
@@ -20,7 +20,7 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-dispatcher-utils.h"
#include "nm-dbus-interface.h"
#include "nm-connection.h"
@@ -31,8 +31,6 @@
#include "nm-dispatcher-api.h"
#include "nm-utils.h"
-#include "nm-dispatcher-utils.h"
-
/*****************************************************************************/
static gboolean
diff --git a/dispatcher/nm-dispatcher.c b/dispatcher/nm-dispatcher.c
index 9139ffe5c7..d395942a38 100644
--- a/dispatcher/nm-dispatcher.c
+++ b/dispatcher/nm-dispatcher.c
@@ -24,12 +24,10 @@
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/types.h>
#include <signal.h>
#include <sys/stat.h>
#include <sys/wait.h>
-#include <errno.h>
#include <arpa/inet.h>
#include <glib-unix.h>
diff --git a/dispatcher/tests/test-dispatcher-envp.c b/dispatcher/tests/test-dispatcher-envp.c
index 78bcd233ef..89ddadbbaa 100644
--- a/dispatcher/tests/test-dispatcher-envp.c
+++ b/dispatcher/tests/test-dispatcher-envp.c
@@ -22,7 +22,6 @@
#include <arpa/inet.h>
#include <stdlib.h>
-#include <string.h>
#include "nm-dispatcher-utils.h"
#include "nm-dispatcher-api.h"
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index 5bafe2d7c0..5e84cf45b6 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -24,7 +24,6 @@
#include "nm-connection.h"
-#include <string.h>
#include <arpa/inet.h>
#include "nm-connection-private.h"
diff --git a/libnm-core/nm-crypto.c b/libnm-core/nm-crypto.c
index 1af2ea2840..67f206c46d 100644
--- a/libnm-core/nm-crypto.c
+++ b/libnm-core/nm-crypto.c
@@ -25,7 +25,6 @@
#include "nm-crypto.h"
-#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/libnm-core/nm-dbus-utils.c b/libnm-core/nm-dbus-utils.c
index 69f4bb2f8a..8c455971bc 100644
--- a/libnm-core/nm-dbus-utils.c
+++ b/libnm-core/nm-dbus-utils.c
@@ -20,8 +20,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-core-internal.h"
typedef struct {
diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c
index 351bc1d096..beef95c7fb 100644
--- a/libnm-core/nm-errors.c
+++ b/libnm-core/nm-errors.c
@@ -20,9 +20,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-errors.h"
+
#include "nm-vpn-dbus-interface.h"
#include "nm-core-internal.h"
diff --git a/libnm-core/nm-keyfile-utils.c b/libnm-core/nm-keyfile-utils.c
index 9543ebde6e..e243150d02 100644
--- a/libnm-core/nm-keyfile-utils.c
+++ b/libnm-core/nm-keyfile-utils.c
@@ -20,10 +20,10 @@
#include "nm-default.h"
+#include "nm-keyfile-utils.h"
+
#include <stdlib.h>
-#include <string.h>
-#include "nm-keyfile-utils.h"
#include "nm-keyfile-internal.h"
#include "nm-setting-wired.h"
#include "nm-setting-wireless.h"
diff --git a/libnm-core/nm-keyfile.c b/libnm-core/nm-keyfile.c
index e20681300b..b81020a3bc 100644
--- a/libnm-core/nm-keyfile.c
+++ b/libnm-core/nm-keyfile.c
@@ -23,14 +23,12 @@
#include "nm-keyfile-internal.h"
-#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
#include <arpa/inet.h>
-#include <string.h>
#include <linux/pkt_sched.h>
#include "nm-utils/nm-secret-utils.h"
diff --git a/libnm-core/nm-property-compare.c b/libnm-core/nm-property-compare.c
index 2a3ee39732..d3a19ec748 100644
--- a/libnm-core/nm-property-compare.c
+++ b/libnm-core/nm-property-compare.c
@@ -22,11 +22,10 @@
#include "nm-default.h"
-#include <string.h>
-#include <netinet/in.h>
-
#include "nm-property-compare.h"
+#include <netinet/in.h>
+
static int
_nm_property_compare_collection (GVariant *value1, GVariant *value2)
{
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 19741fdf9b..45fb711c5e 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -24,8 +24,6 @@
#include "nm-setting-8021x.h"
-#include <string.h>
-
#include "nm-utils/nm-secret-utils.h"
#include "nm-utils.h"
#include "nm-crypto.h"
diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c
index b7f7d746a6..b2de702728 100644
--- a/libnm-core/nm-setting-adsl.c
+++ b/libnm-core/nm-setting-adsl.c
@@ -23,8 +23,6 @@
#include "nm-setting-adsl.h"
-#include <string.h>
-
#include "nm-setting-ppp.h"
#include "nm-setting-private.h"
#include "nm-utils.h"
diff --git a/libnm-core/nm-setting-bluetooth.c b/libnm-core/nm-setting-bluetooth.c
index a31928403a..bc4f8bd069 100644
--- a/libnm-core/nm-setting-bluetooth.c
+++ b/libnm-core/nm-setting-bluetooth.c
@@ -24,7 +24,6 @@
#include "nm-setting-bluetooth.h"
-#include <string.h>
#include <net/ethernet.h>
#include "nm-connection-private.h"
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c
index fa55c06f28..b36ed20851 100644
--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@@ -23,9 +23,7 @@
#include "nm-setting-bond.h"
-#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c
index b8670afded..614c883cbd 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -23,7 +23,6 @@
#include "nm-setting-bridge-port.h"
-#include <string.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c
index 2544b19c1f..e418013cb6 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -23,7 +23,6 @@
#include "nm-setting-bridge.h"
-#include <string.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/libnm-core/nm-setting-cdma.c b/libnm-core/nm-setting-cdma.c
index 1e5cd81ec6..b05daaffd9 100644
--- a/libnm-core/nm-setting-cdma.c
+++ b/libnm-core/nm-setting-cdma.c
@@ -23,8 +23,6 @@
#include "nm-setting-cdma.h"
-#include <string.h>
-
#include "nm-utils.h"
#include "nm-setting-private.h"
#include "nm-core-enum-types.h"
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index ee91ed5d96..e8d008e33d 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -24,8 +24,6 @@
#include "nm-setting-connection.h"
-#include <string.h>
-
#include "nm-utils.h"
#include "nm-utils-private.h"
#include "nm-core-enum-types.h"
diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c
index c8026c696d..419d9825e8 100644
--- a/libnm-core/nm-setting-dcb.c
+++ b/libnm-core/nm-setting-dcb.c
@@ -23,8 +23,6 @@
#include "nm-setting-dcb.h"
-#include <string.h>
-
#include "nm-utils.h"
#include "nm-utils-private.h"
#include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c
index 68d2903240..e6784e4265 100644
--- a/libnm-core/nm-setting-gsm.c
+++ b/libnm-core/nm-setting-gsm.c
@@ -24,8 +24,6 @@
#include "nm-setting-gsm.h"
-#include <string.h>
-
#include "nm-utils.h"
#include "nm-setting-private.h"
#include "nm-core-enum-types.h"
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index 8fff030ea9..a10fcbe4c0 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -24,7 +24,6 @@
#include "nm-setting-ip-config.h"
-#include <string.h>
#include <arpa/inet.h>
#include "nm-setting-ip4-config.h"
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 59529bc270..dd3b79b752 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -23,8 +23,6 @@
#include "nm-setting-ip4-config.h"
-#include <string.h>
-
#include "nm-setting-private.h"
/**
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index bf3acf96b0..d6c085ac8c 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -23,7 +23,6 @@
#include "nm-setting-ip6-config.h"
-#include <string.h>
#include <arpa/inet.h>
#include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-macsec.c b/libnm-core/nm-setting-macsec.c
index 3d93ac5ae6..040aa17df7 100644
--- a/libnm-core/nm-setting-macsec.c
+++ b/libnm-core/nm-setting-macsec.c
@@ -23,7 +23,6 @@
#include "nm-setting-macsec.h"
#include <stdlib.h>
-#include <string.h>
#include "nm-utils/nm-secret-utils.h"
diff --git a/libnm-core/nm-setting-macvlan.c b/libnm-core/nm-setting-macvlan.c
index a25e105598..332dc00774 100644
--- a/libnm-core/nm-setting-macvlan.c
+++ b/libnm-core/nm-setting-macvlan.c
@@ -24,7 +24,6 @@
#include "nm-setting-macvlan.h"
#include <stdlib.h>
-#include <string.h>
#include "nm-utils.h"
#include "nm-setting-connection.h"
diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c
index eb87e1ff21..f6a32dbb0b 100644
--- a/libnm-core/nm-setting-olpc-mesh.c
+++ b/libnm-core/nm-setting-olpc-mesh.c
@@ -24,8 +24,6 @@
#include "nm-setting-olpc-mesh.h"
-#include <string.h>
-
#include "nm-utils.h"
#include "nm-utils-private.h"
#include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c
index e316688856..e2d516c5d4 100644
--- a/libnm-core/nm-setting-pppoe.c
+++ b/libnm-core/nm-setting-pppoe.c
@@ -24,8 +24,6 @@
#include "nm-setting-pppoe.h"
-#include <string.h>
-
#include "nm-setting-ppp.h"
#include "nm-setting-private.h"
#include "nm-core-enum-types.h"
diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c
index 8b8bb76d64..36bc4f69ba 100644
--- a/libnm-core/nm-setting-serial.c
+++ b/libnm-core/nm-setting-serial.c
@@ -24,8 +24,6 @@
#include "nm-setting-serial.h"
-#include <string.h>
-
#include "nm-setting-private.h"
/**
diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c
index be88eb8350..1db8f22a66 100644
--- a/libnm-core/nm-setting-team-port.c
+++ b/libnm-core/nm-setting-team-port.c
@@ -23,7 +23,6 @@
#include "nm-setting-team-port.h"
-#include <string.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c
index 96fdd10dcb..42ee3eec89 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -23,7 +23,6 @@
#include "nm-setting-team.h"
-#include <string.h>
#include <stdlib.h>
#include "nm-utils.h"
diff --git a/libnm-core/nm-setting-tun.c b/libnm-core/nm-setting-tun.c
index 348c9fc1ba..9801f5cfa1 100644
--- a/libnm-core/nm-setting-tun.c
+++ b/libnm-core/nm-setting-tun.c
@@ -24,7 +24,6 @@
#include "nm-setting-tun.h"
#include <stdlib.h>
-#include <string.h>
#include "nm-utils.h"
#include "nm-setting-connection.h"
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index 4eba1626fe..5b8a49d48b 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -24,7 +24,6 @@
#include "nm-setting-vlan.h"
#include <stdlib.h>
-#include <string.h>
#include "nm-utils.h"
#include "nm-core-types-internal.h"
diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c
index e3612c13bd..e9501ab1f7 100644
--- a/libnm-core/nm-setting-vpn.c
+++ b/libnm-core/nm-setting-vpn.c
@@ -23,8 +23,6 @@
#include "nm-setting-vpn.h"
-#include <string.h>
-#include <errno.h>
#include <stdlib.h>
#include "nm-utils/nm-secret-utils.h"
diff --git a/libnm-core/nm-setting-vxlan.c b/libnm-core/nm-setting-vxlan.c
index 0c21be27db..0c116f0611 100644
--- a/libnm-core/nm-setting-vxlan.c
+++ b/libnm-core/nm-setting-vxlan.c
@@ -24,7 +24,6 @@
#include "nm-setting-vxlan.h"
#include <stdlib.h>
-#include <string.h>
#include "nm-utils.h"
#include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-wifi-p2p.c b/libnm-core/nm-setting-wifi-p2p.c
index 893170fc28..f215f47d5a 100644
--- a/libnm-core/nm-setting-wifi-p2p.c
+++ b/libnm-core/nm-setting-wifi-p2p.c
@@ -21,7 +21,6 @@
#include "nm-setting-wifi-p2p.h"
-#include <string.h>
#include <net/ethernet.h>
#include "nm-utils.h"
diff --git a/libnm-core/nm-setting-wimax.c b/libnm-core/nm-setting-wimax.c
index aa574a56de..a700f7fe77 100644
--- a/libnm-core/nm-setting-wimax.c
+++ b/libnm-core/nm-setting-wimax.c
@@ -24,7 +24,6 @@
#include "nm-setting-wimax.h"
-#include <string.h>
#include <net/ethernet.h>
#include "nm-setting-private.h"
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index ef99425511..471c65f653 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -24,7 +24,6 @@
#include "nm-setting-wired.h"
-#include <string.h>
#include <net/ethernet.h>
#include "nm-utils.h"
diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c
index 65b55db351..f689751e4d 100644
--- a/libnm-core/nm-setting-wireless-security.c
+++ b/libnm-core/nm-setting-wireless-security.c
@@ -24,8 +24,6 @@
#include "nm-setting-wireless-security.h"
-#include <string.h>
-
#include "nm-setting-8021x.h"
#include "nm-utils.h"
#include "nm-utils-private.h"
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index 5d3f8fe817..b4cb105607 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -24,7 +24,6 @@
#include "nm-setting-wireless.h"
-#include <string.h>
#include <net/ethernet.h>
#include "nm-utils.h"
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index fe6808bcdc..269f83175c 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -24,8 +24,6 @@
#include "nm-setting.h"
-#include <string.h>
-
#include "nm-setting-private.h"
#include "nm-utils.h"
#include "nm-core-internal.h"
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c
index b0f84aab22..b1d5761ff3 100644
--- a/libnm-core/nm-utils.c
+++ b/libnm-core/nm-utils.c
@@ -23,8 +23,6 @@
#include "nm-utils.h"
-#include <string.h>
-#include <errno.h>
#include <stdlib.h>
#include <netinet/ether.h>
#include <arpa/inet.h>
diff --git a/libnm-core/nm-vpn-plugin-info.c b/libnm-core/nm-vpn-plugin-info.c
index 275a9dd5eb..627d5f8963 100644
--- a/libnm-core/nm-vpn-plugin-info.c
+++ b/libnm-core/nm-vpn-plugin-info.c
@@ -22,8 +22,6 @@
#include "nm-vpn-plugin-info.h"
-#include <string.h>
-#include <errno.h>
#include <sys/stat.h>
#include "nm-errors.h"
diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c
index 6b63e6fdd4..4ac9679b05 100644
--- a/libnm-core/tests/test-crypto.c
+++ b/libnm-core/tests/test-crypto.c
@@ -26,7 +26,6 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
-#include <string.h>
#include "nm-crypto-impl.h"
#include "nm-utils.h"
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index efbcf6274e..96eafa3a68 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -23,8 +23,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-utils/c-list-util.h"
#include "nm-utils/nm-enum-utils.h"
diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c
index d31c43d2ce..5debe5cfb0 100644
--- a/libnm-core/tests/test-secrets.c
+++ b/libnm-core/tests/test-secrets.c
@@ -21,8 +21,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-setting-8021x.h"
#include "nm-setting-cdma.h"
#include "nm-setting-connection.h"
diff --git a/libnm-core/tests/test-setting.c b/libnm-core/tests/test-setting.c
index d8784d31ef..4518c55e5d 100644
--- a/libnm-core/tests/test-setting.c
+++ b/libnm-core/tests/test-setting.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
#include <linux/pkt_sched.h>
-#include <string.h>
#include "nm-utils.h"
#include "nm-utils-private.h"
diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c
index 95570b0380..9e6405434f 100644
--- a/libnm-core/tests/test-settings-defaults.c
+++ b/libnm-core/tests/test-settings-defaults.c
@@ -21,8 +21,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-utils.h"
#include "nm-setting-8021x.h"
#include "nm-setting-cdma.h"
diff --git a/libnm-glib/nm-vpn-plugin-utils.c b/libnm-glib/nm-vpn-plugin-utils.c
index ca652d1be9..e2bc42896c 100644
--- a/libnm-glib/nm-vpn-plugin-utils.c
+++ b/libnm-glib/nm-vpn-plugin-utils.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index a54e93c3a5..9a1c5c7391 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -23,7 +23,6 @@
#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <dbus/dbus-glib.h>
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index 1fed9eca38..626ba4ca84 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -22,7 +22,6 @@
#include "nm-default.h"
#include <string.h>
-#include <errno.h>
#include <stdlib.h>
#include <dbus/dbus-glib.h>
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index 25281c9282..ac00d6e1bb 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -23,8 +23,6 @@
#include "nm-access-point.h"
-#include <string.h>
-
#include "nm-connection.h"
#include "nm-setting-connection.h"
#include "nm-setting-wireless.h"
diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index 5b238b3bcc..fdade4bc24 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -21,10 +21,9 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-active-connection.h"
#include "nm-dbus-interface.h"
-#include "nm-active-connection.h"
#include "nm-object-private.h"
#include "nm-core-internal.h"
#include "nm-device.h"
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 870adfc750..b2f76ee60a 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -21,11 +21,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-client.h"
+
#include <libudev.h>
#include "nm-utils.h"
-#include "nm-client.h"
#include "nm-manager.h"
#include "nm-dns-manager.h"
#include "nm-remote-settings.h"
diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c
index 44eed0c83c..a507c65834 100644
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -22,8 +22,6 @@
#include "nm-dbus-helpers.h"
-#include <string.h>
-
#include "nm-dbus-interface.h"
static GBusType nm_bus = G_BUS_TYPE_SYSTEM;
diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c
index a82aa8d061..f63468aa89 100644
--- a/libnm/nm-device-adsl.c
+++ b/libnm/nm-device-adsl.c
@@ -23,10 +23,7 @@
#include "nm-device-adsl.h"
-#include <string.h>
-
#include "nm-object-private.h"
-
#include "nm-setting-adsl.h"
#include "nm-setting-connection.h"
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 83b7c3b418..4cc47b5c4b 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -20,12 +20,10 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-setting-bond.h"
#include "nm-setting-connection.h"
-#include "nm-setting-bond.h"
#include "nm-utils.h"
-
#include "nm-device-bond.h"
#include "nm-object-private.h"
#include "nm-core-internal.h"
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 39c48d2ac8..2db3a2384d 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -20,12 +20,10 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-setting-bridge.h"
#include "nm-setting-connection.h"
-#include "nm-setting-bridge.h"
#include "nm-utils.h"
-
#include "nm-device-bridge.h"
#include "nm-object-private.h"
#include "nm-core-internal.h"
diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index a47e39580f..d0af0ff623 100644
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -21,13 +21,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-bt.h"
#include "nm-setting-connection.h"
#include "nm-setting-bluetooth.h"
#include "nm-utils.h"
-
-#include "nm-device-bt.h"
#include "nm-object-private.h"
#include "nm-enum-types.h"
diff --git a/libnm/nm-device-dummy.c b/libnm/nm-device-dummy.c
index 4c20202595..8a37214330 100644
--- a/libnm/nm-device-dummy.c
+++ b/libnm/nm-device-dummy.c
@@ -20,9 +20,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-device-dummy.h"
+
#include "nm-object-private.h"
#include "nm-setting-dummy.h"
#include "nm-setting-connection.h"
diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index ebb019dcf3..5d2acdb265 100644
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -21,14 +21,12 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-ethernet.h"
#include "nm-setting-connection.h"
#include "nm-setting-wired.h"
#include "nm-setting-pppoe.h"
#include "nm-utils.h"
-
-#include "nm-device-ethernet.h"
#include "nm-object-private.h"
G_DEFINE_TYPE (NMDeviceEthernet, nm_device_ethernet, NM_TYPE_DEVICE)
diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c
index 62cb89ebf7..c0bf4d7077 100644
--- a/libnm/nm-device-generic.c
+++ b/libnm/nm-device-generic.c
@@ -20,9 +20,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-device-generic.h"
+
#include "nm-object-private.h"
#include "nm-setting-generic.h"
#include "nm-setting-connection.h"
diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index 1ed942b5be..aaf5ff8623 100644
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -20,13 +20,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-infiniband.h"
#include "nm-setting-connection.h"
#include "nm-setting-infiniband.h"
#include "nm-utils.h"
-
-#include "nm-device-infiniband.h"
#include "nm-object-private.h"
G_DEFINE_TYPE (NMDeviceInfiniband, nm_device_infiniband, NM_TYPE_DEVICE)
diff --git a/libnm/nm-device-ip-tunnel.c b/libnm/nm-device-ip-tunnel.c
index 2f7efe9d8d..150dc9891c 100644
--- a/libnm/nm-device-ip-tunnel.c
+++ b/libnm/nm-device-ip-tunnel.c
@@ -20,13 +20,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-ip-tunnel.h"
#include "nm-setting-connection.h"
#include "nm-setting-ip-tunnel.h"
#include "nm-utils.h"
-
-#include "nm-device-ip-tunnel.h"
#include "nm-object-private.h"
#include "nm-core-internal.h"
diff --git a/libnm/nm-device-macsec.c b/libnm/nm-device-macsec.c
index 16bbbebb2e..493bff874c 100644
--- a/libnm/nm-device-macsec.c
+++ b/libnm/nm-device-macsec.c
@@ -20,9 +20,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-device-macsec.h"
+
#include "nm-device-private.h"
#include "nm-object-private.h"
#include "nm-utils.h"
diff --git a/libnm/nm-device-macvlan.c b/libnm/nm-device-macvlan.c
index 23c649cc24..37484770b6 100644
--- a/libnm/nm-device-macvlan.c
+++ b/libnm/nm-device-macvlan.c
@@ -20,13 +20,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-setting-macvlan.h"
#include "nm-setting-connection.h"
-#include "nm-setting-macvlan.h"
#include "nm-setting-wired.h"
#include "nm-utils.h"
-
#include "nm-device-macvlan.h"
#include "nm-object-private.h"
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index 7fc843f6df..0373b3c08a 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -21,13 +21,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-modem.h"
#include "nm-setting-connection.h"
#include "nm-setting-gsm.h"
#include "nm-setting-cdma.h"
-
-#include "nm-device-modem.h"
#include "nm-object-private.h"
#include "nm-enum-types.h"
diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c
index 875f11a99c..6258916421 100644
--- a/libnm/nm-device-olpc-mesh.c
+++ b/libnm/nm-device-olpc-mesh.c
@@ -20,12 +20,10 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-olpc-mesh.h"
#include "nm-setting-connection.h"
#include "nm-setting-olpc-mesh.h"
-
-#include "nm-device-olpc-mesh.h"
#include "nm-object-private.h"
#include "nm-device-wifi.h"
diff --git a/libnm/nm-device-ovs-bridge.c b/libnm/nm-device-ovs-bridge.c
index 27ee97cf35..4671c8a9f2 100644
--- a/libnm/nm-device-ovs-bridge.c
+++ b/libnm/nm-device-ovs-bridge.c
@@ -19,9 +19,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-device-ovs-bridge.h"
+
#include "nm-object-private.h"
#include "nm-setting-ovs-bridge.h"
#include "nm-setting-ovs-port.h"
diff --git a/libnm/nm-device-ovs-interface.c b/libnm/nm-device-ovs-interface.c
index ed3dbd4ca4..b07373e130 100644
--- a/libnm/nm-device-ovs-interface.c
+++ b/libnm/nm-device-ovs-interface.c
@@ -19,9 +19,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-device-ovs-interface.h"
+
#include "nm-object-private.h"
#include "nm-setting-ovs-interface.h"
#include "nm-setting-ovs-port.h"
diff --git a/libnm/nm-device-ovs-port.c b/libnm/nm-device-ovs-port.c
index 8be5549a7c..39ecaee599 100644
--- a/libnm/nm-device-ovs-port.c
+++ b/libnm/nm-device-ovs-port.c
@@ -19,9 +19,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-device-ovs-port.h"
+
#include "nm-object-private.h"
#include "nm-setting-ovs-port.h"
#include "nm-setting-ovs-port.h"
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index 101e3160e7..749739ffcf 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -20,13 +20,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-team.h"
#include "nm-setting-connection.h"
#include "nm-setting-team.h"
#include "nm-utils.h"
-
-#include "nm-device-team.h"
#include "nm-object-private.h"
#include "nm-core-internal.h"
diff --git a/libnm/nm-device-tun.c b/libnm/nm-device-tun.c
index 2c88bf3393..166aa1dfb5 100644
--- a/libnm/nm-device-tun.c
+++ b/libnm/nm-device-tun.c
@@ -20,14 +20,13 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-tun.h"
+
#include <arpa/inet.h>
#include "nm-setting-connection.h"
#include "nm-setting-tun.h"
#include "nm-utils.h"
-
-#include "nm-device-tun.h"
#include "nm-object-private.h"
G_DEFINE_TYPE (NMDeviceTun, nm_device_tun, NM_TYPE_DEVICE)
diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index 5728d404d6..e043724597 100644
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -20,14 +20,12 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-vlan.h"
#include "nm-setting-connection.h"
#include "nm-setting-vlan.h"
#include "nm-setting-wired.h"
#include "nm-utils.h"
-
-#include "nm-device-vlan.h"
#include "nm-object-private.h"
G_DEFINE_TYPE (NMDeviceVlan, nm_device_vlan, NM_TYPE_DEVICE)
diff --git a/libnm/nm-device-vxlan.c b/libnm/nm-device-vxlan.c
index 9a87ad137a..8dbf13365d 100644
--- a/libnm/nm-device-vxlan.c
+++ b/libnm/nm-device-vxlan.c
@@ -20,13 +20,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-vxlan.h"
#include "nm-setting-connection.h"
#include "nm-setting-vxlan.h"
#include "nm-utils.h"
-
-#include "nm-device-vxlan.h"
#include "nm-object-private.h"
G_DEFINE_TYPE (NMDeviceVxlan, nm_device_vxlan, NM_TYPE_DEVICE)
diff --git a/libnm/nm-device-wifi-p2p.c b/libnm/nm-device-wifi-p2p.c
index 039a8684cb..c368fe3f46 100644
--- a/libnm/nm-device-wifi-p2p.c
+++ b/libnm/nm-device-wifi-p2p.c
@@ -21,12 +21,9 @@
#include "nm-device-wifi-p2p.h"
-#include <string.h>
-
#include "nm-setting-connection.h"
#include "nm-setting-wifi-p2p.h"
#include "nm-utils.h"
-
#include "nm-wifi-p2p-peer.h"
#include "nm-object-private.h"
#include "nm-core-internal.h"
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 9fb1eebfba..9af3639d70 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -23,13 +23,10 @@
#include "nm-device-wifi.h"
-#include <string.h>
-
#include "nm-setting-connection.h"
#include "nm-setting-wireless.h"
#include "nm-setting-wireless-security.h"
#include "nm-utils.h"
-
#include "nm-access-point.h"
#include "nm-object-private.h"
#include "nm-core-internal.h"
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index 08624594a3..36cebcf270 100644
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -21,13 +21,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-device-wimax.h"
#include "nm-setting-connection.h"
#include "nm-setting-wimax.h"
#include "nm-utils.h"
-
-#include "nm-device-wimax.h"
#include "nm-wimax-nsp.h"
#include "nm-object-private.h"
#include "nm-core-internal.h"
diff --git a/libnm/nm-device-wpan.c b/libnm/nm-device-wpan.c
index 6118362316..d6acda6184 100644
--- a/libnm/nm-device-wpan.c
+++ b/libnm/nm-device-wpan.c
@@ -19,9 +19,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-device-wpan.h"
+
#include "nm-object-private.h"
#include "nm-setting-wpan.h"
#include "nm-setting-connection.h"
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 4bcd7c6ca4..0834f6dfc6 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -23,7 +23,6 @@
#include "nm-device.h"
-#include <string.h>
#include <libudev.h>
#include "nm-libnm-utils.h"
diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c
index 3f835670dd..e13bbd3473 100644
--- a/libnm/nm-dhcp-config.c
+++ b/libnm/nm-dhcp-config.c
@@ -21,9 +21,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-dhcp-config.h"
+
#include "nm-dhcp4-config.h"
#include "nm-dhcp6-config.h"
#include "nm-dbus-interface.h"
diff --git a/libnm/nm-dhcp4-config.c b/libnm/nm-dhcp4-config.c
index 0e783576b3..b01e1677b0 100644
--- a/libnm/nm-dhcp4-config.c
+++ b/libnm/nm-dhcp4-config.c
@@ -21,6 +21,7 @@
#include "nm-default.h"
#include "nm-dhcp4-config.h"
+
#include "nm-object-private.h"
G_DEFINE_TYPE (NMDhcp4Config, nm_dhcp4_config, NM_TYPE_DHCP_CONFIG)
diff --git a/libnm/nm-dhcp6-config.c b/libnm/nm-dhcp6-config.c
index 9252e734f8..03dbcc3062 100644
--- a/libnm/nm-dhcp6-config.c
+++ b/libnm/nm-dhcp6-config.c
@@ -21,6 +21,7 @@
#include "nm-default.h"
#include "nm-dhcp6-config.h"
+
#include "nm-object-private.h"
G_DEFINE_TYPE (NMDhcp6Config, nm_dhcp6_config, NM_TYPE_DHCP_CONFIG)
diff --git a/libnm/nm-dns-manager.c b/libnm/nm-dns-manager.c
index 37117b723e..a3c2bba3a8 100644
--- a/libnm/nm-dns-manager.c
+++ b/libnm/nm-dns-manager.c
@@ -22,11 +22,8 @@
#include "nm-dns-manager.h"
-#include <string.h>
-
#include "nm-dbus-interface.h"
#include "nm-connection.h"
-
#include "nm-client.h"
#include "nm-object-private.h"
#include "nm-dbus-helpers.h"
diff --git a/libnm/nm-ip-config.c b/libnm/nm-ip-config.c
index c1e888be39..618b05f170 100644
--- a/libnm/nm-ip-config.c
+++ b/libnm/nm-ip-config.c
@@ -21,9 +21,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-ip-config.h"
+
#include "nm-ip4-config.h"
#include "nm-ip6-config.h"
#include "nm-setting-ip-config.h"
diff --git a/libnm/nm-ip4-config.c b/libnm/nm-ip4-config.c
index 322ea4e808..ac16ef6a07 100644
--- a/libnm/nm-ip4-config.c
+++ b/libnm/nm-ip4-config.c
@@ -21,6 +21,7 @@
#include "nm-default.h"
#include "nm-ip4-config.h"
+
#include "nm-object-private.h"
G_DEFINE_TYPE (NMIP4Config, nm_ip4_config, NM_TYPE_IP_CONFIG)
diff --git a/libnm/nm-ip6-config.c b/libnm/nm-ip6-config.c
index 93cdf332b6..773faf6ab8 100644
--- a/libnm/nm-ip6-config.c
+++ b/libnm/nm-ip6-config.c
@@ -21,6 +21,7 @@
#include "nm-default.h"
#include "nm-ip6-config.h"
+
#include "nm-object-private.h"
G_DEFINE_TYPE (NMIP6Config, nm_ip6_config, NM_TYPE_IP_CONFIG)
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index 3254d4a094..4d8c223a48 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -23,8 +23,6 @@
#include "nm-manager.h"
-#include <string.h>
-
#include "nm-utils.h"
#include "nm-checkpoint.h"
#include "nm-common-macros.h"
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index d2ae25aab1..f54dac5df2 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -23,7 +23,6 @@
#include "nm-object.h"
-#include <string.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 08faa77e3e..a011ca8745 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -21,14 +21,12 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-remote-connection.h"
#include "nm-dbus-interface.h"
#include "nm-utils.h"
#include "nm-setting-connection.h"
#include "nm-core-internal.h"
-
-#include "nm-remote-connection.h"
#include "nm-remote-connection-private.h"
#include "nm-object-private.h"
#include "nm-dbus-helpers.h"
diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c
index f2b26215c9..6b2d6e9248 100644
--- a/libnm/nm-remote-settings.c
+++ b/libnm/nm-remote-settings.c
@@ -23,11 +23,8 @@
#include "nm-remote-settings.h"
-#include <string.h>
-
#include "nm-dbus-interface.h"
#include "nm-connection.h"
-
#include "nm-client.h"
#include "nm-remote-connection.h"
#include "nm-remote-connection-private.h"
diff --git a/libnm/nm-secret-agent-old.c b/libnm/nm-secret-agent-old.c
index 5f4565c076..56a88b004f 100644
--- a/libnm/nm-secret-agent-old.c
+++ b/libnm/nm-secret-agent-old.c
@@ -22,8 +22,6 @@
#include "nm-secret-agent-old.h"
-#include <string.h>
-
#include "nm-dbus-interface.h"
#include "nm-enum-types.h"
#include "nm-dbus-helpers.h"
diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c
index bc26d0b959..9fc32ed612 100644
--- a/libnm/nm-vpn-connection.c
+++ b/libnm/nm-vpn-connection.c
@@ -21,9 +21,8 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-vpn-connection.h"
+
#include "nm-dbus-interface.h"
#include "nm-utils.h"
#include "nm-object-private.h"
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index bfafc7b775..80900cecb5 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -23,7 +23,6 @@
#include "nm-vpn-plugin-old.h"
-#include <errno.h>
#include <signal.h>
#include <stdlib.h>
diff --git a/libnm/nm-vpn-service-plugin.c b/libnm/nm-vpn-service-plugin.c
index ed9da7f787..57b36e69b5 100644
--- a/libnm/nm-vpn-service-plugin.c
+++ b/libnm/nm-vpn-service-plugin.c
@@ -23,7 +23,6 @@
#include "nm-vpn-service-plugin.h"
-#include <errno.h>
#include <signal.h>
#include <stdlib.h>
diff --git a/libnm/nm-wifi-p2p-peer.c b/libnm/nm-wifi-p2p-peer.c
index d17010ce0f..91bc29d016 100644
--- a/libnm/nm-wifi-p2p-peer.c
+++ b/libnm/nm-wifi-p2p-peer.c
@@ -21,13 +21,10 @@
#include "nm-wifi-p2p-peer.h"
-#include <string.h>
-
#include "nm-connection.h"
#include "nm-setting-connection.h"
#include "nm-setting-wifi-p2p.h"
#include "nm-utils.h"
-
#include "nm-dbus-interface.h"
#include "nm-object-private.h"
diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c
index 90c2c2bba0..7baf7f0272 100644
--- a/libnm/nm-wimax-nsp.c
+++ b/libnm/nm-wimax-nsp.c
@@ -20,13 +20,11 @@
#include "nm-default.h"
-#include <string.h>
+#include "nm-wimax-nsp.h"
#include "nm-connection.h"
#include "nm-setting-connection.h"
#include "nm-setting-wimax.h"
-
-#include "nm-wimax-nsp.h"
#include "nm-dbus-interface.h"
#include "nm-object-private.h"
#include "nm-enum-types.h"
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 21272e4d4f..35ae33be26 100644
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <sys/types.h>
#include <signal.h>
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index 45d60c069a..1b2114942e 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <sys/types.h>
#include <signal.h>
diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c
index 53110be6cd..35a215ca33 100644
--- a/libnm/tests/test-secret-agent.c
+++ b/libnm/tests/test-secret-agent.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <sys/types.h>
#include <signal.h>
diff --git a/shared/nm-test-utils-impl.c b/shared/nm-test-utils-impl.c
index 1da9014e19..509b235a0f 100644
--- a/shared/nm-test-utils-impl.c
+++ b/shared/nm-test-utils-impl.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <sys/wait.h>
#include "NetworkManager.h"
diff --git a/shared/nm-utils/nm-shared-utils.c b/shared/nm-utils/nm-shared-utils.c
index 288c96a4f8..db97111193 100644
--- a/shared/nm-utils/nm-shared-utils.c
+++ b/shared/nm-utils/nm-shared-utils.c
@@ -23,7 +23,6 @@
#include "nm-shared-utils.h"
-#include <errno.h>
#include <arpa/inet.h>
#include <poll.h>
#include <fcntl.h>
diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c
index 0ff4603df5..dddb834249 100644
--- a/src/devices/adsl/nm-atm-manager.c
+++ b/src/devices/adsl/nm-atm-manager.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <gmodule.h>
#include <libudev.h>
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index ddc03ce3b1..e0501a74b3 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -25,12 +25,10 @@
#include <sys/socket.h>
#include <linux/atmdev.h>
#include <linux/atmbr2684.h>
-#include <errno.h>
#include <sys/ioctl.h>
#include <sys/types.h>
#include <unistd.h>
#include <stdlib.h>
-#include <string.h>
#include "devices/nm-device-private.h"
#include "platform/nm-platform.h"
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index 8e2a96b78f..377ee478a0 100644
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -23,8 +23,6 @@
#include "nm-bluez-device.h"
-#include <string.h>
-
#include "nm-core-internal.h"
#include "nm-bt-error.h"
#include "nm-bluez-common.h"
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index 711f2e5786..dc85a8b287 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -21,7 +21,6 @@
#include "nm-default.h"
#include <signal.h>
-#include <string.h>
#include <stdlib.h>
#include <gmodule.h>
diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c
index c8ef7a2716..3a456debc5 100644
--- a/src/devices/bluetooth/nm-bluez4-adapter.c
+++ b/src/devices/bluetooth/nm-bluez4-adapter.c
@@ -22,8 +22,6 @@
#include "nm-bluez4-adapter.h"
-#include <string.h>
-
#include "nm-dbus-interface.h"
#include "nm-bluez-device.h"
#include "nm-bluez-common.h"
diff --git a/src/devices/bluetooth/nm-bluez4-manager.c b/src/devices/bluetooth/nm-bluez4-manager.c
index 1fe02f1860..82d995bed0 100644
--- a/src/devices/bluetooth/nm-bluez4-manager.c
+++ b/src/devices/bluetooth/nm-bluez4-manager.c
@@ -24,7 +24,6 @@
#include "nm-bluez4-manager.h"
#include <signal.h>
-#include <string.h>
#include <stdlib.h>
#include "nm-bluez4-adapter.h"
diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c
index 32f8da65eb..b85a410e8d 100644
--- a/src/devices/bluetooth/nm-bluez5-dun.c
+++ b/src/devices/bluetooth/nm-bluez5-dun.c
@@ -27,7 +27,6 @@
#include <net/ethernet.h>
#include <sys/ioctl.h>
#include <unistd.h>
-#include <errno.h>
#include <fcntl.h>
#include "nm-bluez5-dun.h"
diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c
index e984212bb6..be15d8243b 100644
--- a/src/devices/bluetooth/nm-bluez5-manager.c
+++ b/src/devices/bluetooth/nm-bluez5-manager.c
@@ -25,7 +25,6 @@
#include "nm-bluez5-manager.h"
#include <signal.h>
-#include <string.h>
#include <stdlib.h>
#include "nm-core-internal.h"
diff --git a/src/devices/bluetooth/nm-device-bt.c b/src/devices/bluetooth/nm-device-bt.c
index 68209d8ab9..5dcafee9ed 100644
--- a/src/devices/bluetooth/nm-device-bt.c
+++ b/src/devices/bluetooth/nm-device-bt.c
@@ -23,7 +23,6 @@
#include "nm-device-bt.h"
#include <stdio.h>
-#include <string.h>
#include "nm-bluez-common.h"
#include "nm-bluez-device.h"
diff --git a/src/devices/nm-device-bond.c b/src/devices/nm-device-bond.c
index 78cba9bb1d..6dabdfe855 100644
--- a/src/devices/nm-device-bond.c
+++ b/src/devices/nm-device-bond.c
@@ -22,7 +22,6 @@
#include "nm-device-bond.h"
-#include <errno.h>
#include <stdlib.h>
#include "NetworkManagerUtils.h"
diff --git a/src/devices/nm-device-dummy.c b/src/devices/nm-device-dummy.c
index eb90456a97..47a45342d8 100644
--- a/src/devices/nm-device-dummy.c
+++ b/src/devices/nm-device-dummy.c
@@ -17,7 +17,6 @@
#include "nm-device-dummy.h"
#include <stdlib.h>
-#include <string.h>
#include <sys/types.h>
#include "nm-act-request.h"
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index 3b6fb35b32..f93ff1a483 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -24,10 +24,8 @@
#include "nm-device-ethernet.h"
#include <netinet/in.h>
-#include <string.h>
#include <stdlib.h>
#include <unistd.h>
-#include <errno.h>
#include <libudev.h>
#include "nm-device-private.h"
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index a11ead6e4c..30aca03850 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -24,8 +24,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
#include <gmodule.h>
#include "platform/nm-platform.h"
diff --git a/src/devices/nm-device-ip-tunnel.c b/src/devices/nm-device-ip-tunnel.c
index 1dc2bc964b..9627594748 100644
--- a/src/devices/nm-device-ip-tunnel.c
+++ b/src/devices/nm-device-ip-tunnel.c
@@ -22,7 +22,6 @@
#include "nm-device-ip-tunnel.h"
-#include <string.h>
#include <netinet/in.h>
#include <linux/if.h>
#include <linux/ip.h>
diff --git a/src/devices/nm-device-macvlan.c b/src/devices/nm-device-macvlan.c
index bb629713fc..aa2a0ac05f 100644
--- a/src/devices/nm-device-macvlan.c
+++ b/src/devices/nm-device-macvlan.c
@@ -22,7 +22,6 @@
#include "nm-device-macvlan.h"
-#include <string.h>
#include <linux/if_link.h>
#include "nm-device-private.h"
diff --git a/src/devices/nm-device-tun.c b/src/devices/nm-device-tun.c
index 3fe3dfd4a4..90360c9ea1 100644
--- a/src/devices/nm-device-tun.c
+++ b/src/devices/nm-device-tun.c
@@ -23,7 +23,6 @@
#include "nm-device-tun.h"
#include <stdlib.h>
-#include <string.h>
#include <sys/types.h>
#include <linux/if_tun.h>
diff --git a/src/devices/nm-device-veth.c b/src/devices/nm-device-veth.c
index 6f90758cd5..d7a59baec7 100644
--- a/src/devices/nm-device-veth.c
+++ b/src/devices/nm-device-veth.c
@@ -20,9 +20,7 @@
#include "nm-default.h"
-#include <errno.h>
#include <stdlib.h>
-#include <string.h>
#include "nm-device-veth.h"
#include "nm-device-private.h"
diff --git a/src/devices/nm-device-vxlan.c b/src/devices/nm-device-vxlan.c
index 50730320e0..fc73c09975 100644
--- a/src/devices/nm-device-vxlan.c
+++ b/src/devices/nm-device-vxlan.c
@@ -22,8 +22,6 @@
#include "nm-device-vxlan.h"
-#include <string.h>
-
#include "nm-device-private.h"
#include "nm-manager.h"
#include "platform/nm-platform.h"
diff --git a/src/devices/nm-device-wpan.c b/src/devices/nm-device-wpan.c
index c2fa7f4e8d..cdfd1f70aa 100644
--- a/src/devices/nm-device-wpan.c
+++ b/src/devices/nm-device-wpan.c
@@ -23,7 +23,6 @@
#include "nm-device-wpan.h"
#include <stdlib.h>
-#include <string.h>
#include <sys/types.h>
#include <linux/if.h>
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index bff35ddd43..317be5b5bd 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -24,9 +24,7 @@
#include "nm-device.h"
#include <netinet/in.h>
-#include <string.h>
#include <unistd.h>
-#include <errno.h>
#include <sys/ioctl.h>
#include <signal.h>
#include <sys/types.h>
diff --git a/src/devices/nm-lldp-listener.c b/src/devices/nm-lldp-listener.c
index ae18063709..f26a2d5cde 100644
--- a/src/devices/nm-lldp-listener.c
+++ b/src/devices/nm-lldp-listener.c
@@ -23,7 +23,6 @@
#include "nm-lldp-listener.h"
#include <net/ethernet.h>
-#include <errno.h>
#include "platform/nm-platform.h"
#include "nm-utils.h"
diff --git a/src/devices/ovs/nm-ovsdb.c b/src/devices/ovs/nm-ovsdb.c
index 48f6b4f3f9..47cae7d990 100644
--- a/src/devices/ovs/nm-ovsdb.c
+++ b/src/devices/ovs/nm-ovsdb.c
@@ -21,7 +21,6 @@
#include "nm-ovsdb.h"
-#include <string.h>
#include <gmodule.h>
#include <gio/gunixsocketaddress.h>
diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c
index d062429f26..f18b943db5 100644
--- a/src/devices/team/nm-team-factory.c
+++ b/src/devices/team/nm-team-factory.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <gmodule.h>
#include "nm-manager.h"
diff --git a/src/devices/wifi/nm-device-iwd.c b/src/devices/wifi/nm-device-iwd.c
index 5b150e0ca4..68116ef65e 100644
--- a/src/devices/wifi/nm-device-iwd.c
+++ b/src/devices/wifi/nm-device-iwd.c
@@ -22,8 +22,6 @@
#include "nm-device-iwd.h"
-#include <string.h>
-
#include "nm-common-macros.h"
#include "devices/nm-device.h"
#include "devices/nm-device-private.h"
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index 193779a7fc..1172a61337 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -29,13 +29,11 @@
#include "nm-device-olpc-mesh.h"
#include <netinet/in.h>
-#include <string.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <signal.h>
#include <unistd.h>
#include <sys/ioctl.h>
-#include <errno.h>
#include "devices/nm-device.h"
#include "nm-device-wifi.h"
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index edc099493d..aaa101a67a 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -24,9 +24,7 @@
#include "nm-device-wifi.h"
#include <netinet/in.h>
-#include <string.h>
#include <unistd.h>
-#include <errno.h>
#include "nm-device-wifi-p2p.h"
#include "nm-wifi-ap.h"
diff --git a/src/devices/wifi/nm-iwd-manager.c b/src/devices/wifi/nm-iwd-manager.c
index 736a1a2398..c6e2d644e7 100644
--- a/src/devices/wifi/nm-iwd-manager.c
+++ b/src/devices/wifi/nm-iwd-manager.c
@@ -22,7 +22,6 @@
#include "nm-iwd-manager.h"
-#include <string.h>
#include <net/if.h>
#include "nm-logging.h"
diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c
index d6920bafb1..87daff596e 100644
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/devices/wifi/nm-wifi-ap.c
@@ -23,7 +23,6 @@
#include "nm-wifi-ap.h"
-#include <string.h>
#include <stdlib.h>
#include "nm-setting-wireless.h"
diff --git a/src/devices/wifi/nm-wifi-p2p-peer.c b/src/devices/wifi/nm-wifi-p2p-peer.c
index db114381b0..4b524623c4 100644
--- a/src/devices/wifi/nm-wifi-p2p-peer.c
+++ b/src/devices/wifi/nm-wifi-p2p-peer.c
@@ -22,7 +22,6 @@
#include "nm-wifi-p2p-peer.h"
-#include <string.h>
#include <stdlib.h>
#include "nm-setting-wireless.h"
diff --git a/src/devices/wifi/nm-wifi-utils.c b/src/devices/wifi/nm-wifi-utils.c
index 1eb13127a9..c6e8b3e0df 100644
--- a/src/devices/wifi/nm-wifi-utils.c
+++ b/src/devices/wifi/nm-wifi-utils.c
@@ -22,7 +22,6 @@
#include "nm-wifi-utils.h"
-#include <string.h>
#include <stdlib.h>
#include "nm-utils.h"
diff --git a/src/devices/wifi/tests/test-general.c b/src/devices/wifi/tests/test-general.c
index f752bbfcd9..e08998379e 100644
--- a/src/devices/wifi/tests/test-general.c
+++ b/src/devices/wifi/tests/test-general.c
@@ -20,10 +20,7 @@
#include "nm-default.h"
-#include <string.h>
-
#include "devices/wifi/nm-wifi-utils.h"
-
#include "nm-core-internal.h"
#include "nm-test-utils-core.h"
diff --git a/src/devices/wwan/nm-device-modem.c b/src/devices/wwan/nm-device-modem.c
index bd9ee3bb8e..a98c0ce916 100644
--- a/src/devices/wwan/nm-device-modem.c
+++ b/src/devices/wwan/nm-device-modem.c
@@ -22,8 +22,6 @@
#include "nm-device-modem.h"
-#include <string.h>
-
#include "nm-modem.h"
#include "devices/nm-device-private.h"
#include "nm-rfkill-manager.h"
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index e8699c5b26..1cb549b017 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -22,7 +22,6 @@
#include "nm-modem-broadband.h"
-#include <string.h>
#include <arpa/inet.h>
#include <libmm-glib.h>
diff --git a/src/devices/wwan/nm-modem-manager.c b/src/devices/wwan/nm-modem-manager.c
index dfc102f3e5..fac14d69d6 100644
--- a/src/devices/wwan/nm-modem-manager.c
+++ b/src/devices/wwan/nm-modem-manager.c
@@ -24,7 +24,6 @@
#include "nm-modem-manager.h"
-#include <string.h>
#include <libmm-glib.h>
#if HAVE_LIBSYSTEMD
diff --git a/src/devices/wwan/nm-modem-ofono.c b/src/devices/wwan/nm-modem-ofono.c
index f3c4d7a304..8d0f0b0148 100644
--- a/src/devices/wwan/nm-modem-ofono.c
+++ b/src/devices/wwan/nm-modem-ofono.c
@@ -22,8 +22,6 @@
#include "nm-modem-ofono.h"
-#include <string.h>
-
#include "nm-core-internal.h"
#include "devices/nm-device-private.h"
#include "nm-modem.h"
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index 1ad12b9d8e..74c212ae29 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -24,7 +24,6 @@
#include "nm-modem.h"
#include <fcntl.h>
-#include <string.h>
#include <termios.h>
#include <linux/rtnetlink.h>
diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c
index a561b58a62..c9ee27ff2f 100644
--- a/src/devices/wwan/nm-wwan-factory.c
+++ b/src/devices/wwan/nm-wwan-factory.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <gmodule.h>
#include "devices/nm-device-factory.h"
diff --git a/src/dhcp/nm-dhcp-client.c b/src/dhcp/nm-dhcp-client.c
index 7ed7a68660..39175dab38 100644
--- a/src/dhcp/nm-dhcp-client.c
+++ b/src/dhcp/nm-dhcp-client.c
@@ -21,10 +21,8 @@
#include "nm-dhcp-client.h"
-#include <string.h>
#include <sys/types.h>
#include <sys/wait.h>
-#include <errno.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.c b/src/dhcp/nm-dhcp-dhclient-utils.c
index 99762ee18e..cbd706fa69 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp/nm-dhcp-dhclient-utils.c
@@ -21,7 +21,6 @@
#include "nm-dhcp-dhclient-utils.h"
-#include <string.h>
#include <ctype.h>
#include <arpa/inet.h>
#include <net/if.h>
diff --git a/src/dhcp/nm-dhcp-dhclient.c b/src/dhcp/nm-dhcp-dhclient.c
index 0146c8b465..6673f9ae9a 100644
--- a/src/dhcp/nm-dhcp-dhclient.c
+++ b/src/dhcp/nm-dhcp-dhclient.c
@@ -29,9 +29,7 @@
#if WITH_DHCLIENT
-#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <unistd.h>
#include <stdio.h>
#include <netinet/in.h>
diff --git a/src/dhcp/nm-dhcp-dhcpcanon.c b/src/dhcp/nm-dhcp-dhcpcanon.c
index 0f033e2250..e1495cc6cc 100644
--- a/src/dhcp/nm-dhcp-dhcpcanon.c
+++ b/src/dhcp/nm-dhcp-dhcpcanon.c
@@ -22,9 +22,7 @@
#if WITH_DHCPCANON
-#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <unistd.h>
#include "nm-utils.h"
diff --git a/src/dhcp/nm-dhcp-dhcpcd.c b/src/dhcp/nm-dhcp-dhcpcd.c
index e2a1354f2c..b3d87ee00a 100644
--- a/src/dhcp/nm-dhcp-dhcpcd.c
+++ b/src/dhcp/nm-dhcp-dhcpcd.c
@@ -24,9 +24,7 @@
#if WITH_DHCPCD
-#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <unistd.h>
#include <stdio.h>
#include <netinet/in.h>
diff --git a/src/dhcp/nm-dhcp-helper.c b/src/dhcp/nm-dhcp-helper.c
index 83cc4600b8..8f753a6177 100644
--- a/src/dhcp/nm-dhcp-helper.c
+++ b/src/dhcp/nm-dhcp-helper.c
@@ -22,7 +22,6 @@
#include <unistd.h>
#include <stdlib.h>
-#include <string.h>
#include <signal.h>
#include "nm-utils/nm-vpn-plugin-macros.h"
diff --git a/src/dhcp/nm-dhcp-listener.c b/src/dhcp/nm-dhcp-listener.c
index 1770ead34f..049c4e552e 100644
--- a/src/dhcp/nm-dhcp-listener.c
+++ b/src/dhcp/nm-dhcp-listener.c
@@ -24,9 +24,7 @@
#include <sys/socket.h>
#include <sys/wait.h>
#include <signal.h>
-#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <unistd.h>
#include "nm-dhcp-helper-api.h"
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c
index c13c3043a5..7063c82cfa 100644
--- a/src/dhcp/nm-dhcp-manager.c
+++ b/src/dhcp/nm-dhcp-manager.c
@@ -27,9 +27,7 @@
#include <sys/socket.h>
#include <sys/wait.h>
#include <signal.h>
-#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c
index 3d93d3ac03..ddba34f392 100644
--- a/src/dhcp/nm-dhcp-systemd.c
+++ b/src/dhcp/nm-dhcp-systemd.c
@@ -18,9 +18,7 @@
#include "nm-default.h"
-#include <string.h>
#include <stdlib.h>
-#include <errno.h>
#include <unistd.h>
#include <stdio.h>
#include <netinet/in.h>
diff --git a/src/dhcp/nm-dhcp-utils.c b/src/dhcp/nm-dhcp-utils.c
index 768f9fd790..efd8422b36 100644
--- a/src/dhcp/nm-dhcp-utils.c
+++ b/src/dhcp/nm-dhcp-utils.c
@@ -19,8 +19,6 @@
#include "nm-default.h"
-#include <string.h>
-#include <errno.h>
#include <unistd.h>
#include <arpa/inet.h>
diff --git a/src/dhcp/tests/test-dhcp-dhclient.c b/src/dhcp/tests/test-dhcp-dhclient.c
index a65cbc4ef0..55d712b0a5 100644
--- a/src/dhcp/tests/test-dhcp-dhclient.c
+++ b/src/dhcp/tests/test-dhcp-dhclient.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <unistd.h>
#include <arpa/inet.h>
#include <linux/rtnetlink.h>
diff --git a/src/dhcp/tests/test-dhcp-utils.c b/src/dhcp/tests/test-dhcp-utils.c
index 617a3c6c42..240d868c7f 100644
--- a/src/dhcp/tests/test-dhcp-utils.c
+++ b/src/dhcp/tests/test-dhcp-utils.c
@@ -21,7 +21,6 @@
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <string.h>
#include <linux/rtnetlink.h>
#include "nm-utils/nm-dedup-multi.h"
diff --git a/src/dns/nm-dns-manager.c b/src/dns/nm-dns-manager.c
index 2a30a5407b..a6a10f59e4 100644
--- a/src/dns/nm-dns-manager.c
+++ b/src/dns/nm-dns-manager.c
@@ -23,7 +23,6 @@
#include "nm-default.h"
-#include <errno.h>
#include <fcntl.h>
#include <resolv.h>
#include <stdlib.h>
diff --git a/src/dns/nm-dns-plugin.c b/src/dns/nm-dns-plugin.c
index 48f04b004d..ce81418690 100644
--- a/src/dns/nm-dns-plugin.c
+++ b/src/dns/nm-dns-plugin.c
@@ -21,7 +21,6 @@
#include "nm-dns-plugin.h"
-#include <string.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/src/dnsmasq/nm-dnsmasq-manager.c b/src/dnsmasq/nm-dnsmasq-manager.c
index 1afc6e0d71..43bc66fcae 100644
--- a/src/dnsmasq/nm-dnsmasq-manager.c
+++ b/src/dnsmasq/nm-dnsmasq-manager.c
@@ -25,7 +25,6 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
-#include <string.h>
#include <unistd.h>
#include <arpa/inet.h>
#include <stdlib.h>
diff --git a/src/dnsmasq/nm-dnsmasq-utils.c b/src/dnsmasq/nm-dnsmasq-utils.c
index 382b3aeb49..ec5545d3ec 100644
--- a/src/dnsmasq/nm-dnsmasq-utils.c
+++ b/src/dnsmasq/nm-dnsmasq-utils.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <arpa/inet.h>
#include "nm-dnsmasq-utils.h"
diff --git a/src/initrd/nmi-cmdline-reader.c b/src/initrd/nmi-cmdline-reader.c
index ffd460509b..b9c75c1ba2 100644
--- a/src/initrd/nmi-cmdline-reader.c
+++ b/src/initrd/nmi-cmdline-reader.c
@@ -19,12 +19,10 @@
*/
#include "nm-default.h"
-#include "nm-core-internal.h"
+#include "nm-core-internal.h"
#include "nm-initrd-generator.h"
-#include <string.h>
-
/*****************************************************************************/
#define _NMLOG(level, domain, ...) \
diff --git a/src/initrd/nmi-ibft-reader.c b/src/initrd/nmi-ibft-reader.c
index c927546746..03a129ef46 100644
--- a/src/initrd/nmi-ibft-reader.c
+++ b/src/initrd/nmi-ibft-reader.c
@@ -22,13 +22,11 @@
#include "nm-initrd-generator.h"
#include <stdlib.h>
-#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/wait.h>
#include <sys/inotify.h>
-#include <errno.h>
#include <sys/ioctl.h>
#include <unistd.h>
diff --git a/src/initrd/tests/test-cmdline-reader.c b/src/initrd/tests/test-cmdline-reader.c
index 95084e9213..1a87505aec 100644
--- a/src/initrd/tests/test-cmdline-reader.c
+++ b/src/initrd/tests/test-cmdline-reader.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
-#include <string.h>
#include <netinet/ether.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/src/initrd/tests/test-ibft-reader.c b/src/initrd/tests/test-ibft-reader.c
index 340b3896c8..fd99b074d9 100644
--- a/src/initrd/tests/test-ibft-reader.c
+++ b/src/initrd/tests/test-ibft-reader.c
@@ -22,7 +22,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
-#include <string.h>
#include <netinet/ether.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/src/main-utils.c b/src/main-utils.c
index a597ede7c6..753f2c7de4 100644
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -22,7 +22,6 @@
#include "nm-default.h"
#include <stdio.h>
-#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/main.c b/src/main.c
index cf95a4ed67..b52b9347c4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,14 +23,12 @@
#include <getopt.h>
#include <locale.h>
-#include <errno.h>
#include <stdlib.h>
#include <signal.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <string.h>
#include <sys/resource.h>
#include "main-utils.h"
diff --git a/src/ndisc/nm-fake-ndisc.c b/src/ndisc/nm-fake-ndisc.c
index 6e9a72c6f4..f471923175 100644
--- a/src/ndisc/nm-fake-ndisc.c
+++ b/src/ndisc/nm-fake-ndisc.c
@@ -22,7 +22,6 @@
#include "nm-fake-ndisc.h"
-#include <string.h>
#include <arpa/inet.h>
#include "nm-ndisc-private.h"
diff --git a/src/ndisc/nm-lndp-ndisc.c b/src/ndisc/nm-lndp-ndisc.c
index a5bb017133..d608a2dc68 100644
--- a/src/ndisc/nm-lndp-ndisc.c
+++ b/src/ndisc/nm-lndp-ndisc.c
@@ -22,7 +22,6 @@
#include "nm-lndp-ndisc.h"
-#include <string.h>
#include <arpa/inet.h>
#include <netinet/icmp6.h>
/* stdarg.h included because of a bug in ndp.h */
diff --git a/src/ndisc/nm-ndisc.c b/src/ndisc/nm-ndisc.c
index 038ecb806b..dd535630b4 100644
--- a/src/ndisc/nm-ndisc.c
+++ b/src/ndisc/nm-ndisc.c
@@ -24,7 +24,6 @@
#include <stdlib.h>
#include <arpa/inet.h>
-#include <string.h>
#include "nm-setting-ip6-config.h"
diff --git a/src/ndisc/tests/test-ndisc-fake.c b/src/ndisc/tests/test-ndisc-fake.c
index 268f3b49b4..d2291d4495 100644
--- a/src/ndisc/tests/test-ndisc-fake.c
+++ b/src/ndisc/tests/test-ndisc-fake.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <syslog.h>
#include "ndisc/nm-ndisc.h"
diff --git a/src/ndisc/tests/test-ndisc-linux.c b/src/ndisc/tests/test-ndisc-linux.c
index 2764b6c040..d47c001852 100644
--- a/src/ndisc/tests/test-ndisc-linux.c
+++ b/src/ndisc/tests/test-ndisc-linux.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <syslog.h>
#include "ndisc/nm-ndisc.h"
diff --git a/src/nm-act-request.c b/src/nm-act-request.c
index 584eceab12..a79167f211 100644
--- a/src/nm-act-request.c
+++ b/src/nm-act-request.c
@@ -23,7 +23,6 @@
#include "nm-act-request.h"
-#include <string.h>
#include <stdlib.h>
#include <sys/wait.h>
#include <unistd.h>
diff --git a/src/nm-audit-manager.c b/src/nm-audit-manager.c
index 64d9bf4a49..64b8b52513 100644
--- a/src/nm-audit-manager.c
+++ b/src/nm-audit-manager.c
@@ -22,8 +22,6 @@
#include "nm-audit-manager.h"
-#include <errno.h>
-#include <string.h>
#if HAVE_LIBAUDIT
#include <libaudit.h>
#endif
diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index 9ed65e2dd2..dff331a8d8 100644
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -30,7 +30,6 @@
#include "nm-auth-subject.h"
-#include <string.h>
#include <stdlib.h>
#include "nm-dbus-manager.h"
diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c
index 0c4a4bac4d..146f6883f4 100644
--- a/src/nm-auth-utils.c
+++ b/src/nm-auth-utils.c
@@ -22,10 +22,7 @@
#include "nm-auth-utils.h"
-#include <string.h>
-
#include "nm-utils/nm-c-list.h"
-
#include "nm-setting-connection.h"
#include "nm-auth-subject.h"
#include "nm-auth-manager.h"
diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c
index 5489ed4956..9b1622ec25 100644
--- a/src/nm-checkpoint.c
+++ b/src/nm-checkpoint.c
@@ -22,8 +22,6 @@
#include "nm-checkpoint.h"
-#include <string.h>
-
#include "nm-active-connection.h"
#include "nm-act-request.h"
#include "nm-auth-subject.h"
diff --git a/src/nm-config-data.c b/src/nm-config-data.c
index 8ef915163f..3e75e1aa71 100644
--- a/src/nm-config-data.c
+++ b/src/nm-config-data.c
@@ -23,8 +23,6 @@
#include "nm-config-data.h"
-#include <string.h>
-
#include "nm-config.h"
#include "devices/nm-device.h"
#include "nm-core-internal.h"
diff --git a/src/nm-config.c b/src/nm-config.c
index d028be6733..3e82bdec05 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -23,7 +23,6 @@
#include "nm-config.h"
-#include <string.h>
#include <stdio.h>
#include "nm-utils.h"
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index bc0e1d94cf..59fe042e1c 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -24,8 +24,6 @@
#include "nm-connectivity.h"
-#include <string.h>
-
#if WITH_CONCHECK
#include <curl/curl.h>
#endif
diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 911babd5d0..2798b07f21 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -23,10 +23,8 @@
#include "nm-core-utils.h"
-#include <errno.h>
#include <fcntl.h>
#include <fnmatch.h>
-#include <string.h>
#include <unistd.h>
#include <stdlib.h>
#include <resolv.h>
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index 9c8d6570f7..00fa6617b5 100644
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -26,8 +26,6 @@
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
#include "c-list/src/c-list.h"
#include "nm-dbus-interface.h"
diff --git a/src/nm-dcb.c b/src/nm-dcb.c
index 5a46fa00c9..a63fdf3d96 100644
--- a/src/nm-dcb.c
+++ b/src/nm-dcb.c
@@ -21,7 +21,6 @@
#include "nm-default.h"
#include <sys/wait.h>
-#include <string.h>
#include "nm-dcb.h"
#include "platform/nm-platform.h"
diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c
index ceafddf56e..fe0df3a755 100644
--- a/src/nm-dhcp4-config.c
+++ b/src/nm-dhcp4-config.c
@@ -22,8 +22,6 @@
#include "nm-dhcp4-config.h"
-#include <string.h>
-
#include "nm-dbus-interface.h"
#include "nm-utils.h"
#include "nm-dbus-object.h"
diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c
index d477521afe..59266d55fa 100644
--- a/src/nm-dhcp6-config.c
+++ b/src/nm-dhcp6-config.c
@@ -22,8 +22,6 @@
#include "nm-dhcp6-config.h"
-#include <string.h>
-
#include "nm-dbus-interface.h"
#include "nm-utils.h"
#include "nm-dbus-object.h"
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index 368b781ad1..4d8d9f8a8e 100644
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -23,9 +23,6 @@
#include "nm-dispatcher.h"
-#include <string.h>
-#include <errno.h>
-
#include "nm-dispatcher-api.h"
#include "NetworkManagerUtils.h"
#include "nm-utils.h"
diff --git a/src/nm-firewall-manager.c b/src/nm-firewall-manager.c
index 5b5e7cfa20..a4b079b4de 100644
--- a/src/nm-firewall-manager.c
+++ b/src/nm-firewall-manager.c
@@ -22,8 +22,6 @@
#include "nm-firewall-manager.h"
-#include <string.h>
-
#include "NetworkManagerUtils.h"
#include "c-list/src/c-list.h"
diff --git a/src/nm-hostname-manager.c b/src/nm-hostname-manager.c
index 88ff1604dd..d405a32016 100644
--- a/src/nm-hostname-manager.c
+++ b/src/nm-hostname-manager.c
@@ -23,8 +23,6 @@
#include "nm-hostname-manager.h"
#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
#if HAVE_SELINUX
#include <selinux/selinux.h>
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 5b2f6726e9..2dd606a822 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -23,11 +23,9 @@
#include <glib-unix.h>
#include <getopt.h>
#include <locale.h>
-#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <fcntl.h>
-#include <string.h>
#include <sys/resource.h>
#include <sys/stat.h>
#include <signal.h>
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 722144bab9..e362c20def 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -23,7 +23,6 @@
#include "nm-ip4-config.h"
-#include <string.h>
#include <arpa/inet.h>
#include <resolv.h>
#include <linux/rtnetlink.h>
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 703043886c..5247938986 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -23,7 +23,6 @@
#include "nm-ip6-config.h"
-#include <string.h>
#include <arpa/inet.h>
#include <resolv.h>
#include <linux/rtnetlink.h>
diff --git a/src/nm-keep-alive.c b/src/nm-keep-alive.c
index d34c524cd1..cfec138a30 100644
--- a/src/nm-keep-alive.c
+++ b/src/nm-keep-alive.c
@@ -23,8 +23,6 @@
#include "nm-keep-alive.h"
-#include <string.h>
-
#include "settings/nm-settings-connection.h"
/*****************************************************************************/
diff --git a/src/nm-logging.c b/src/nm-logging.c
index 8388e603e2..d870732641 100644
--- a/src/nm-logging.c
+++ b/src/nm-logging.c
@@ -28,11 +28,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include <errno.h>
#include <sys/wait.h>
#include <sys/stat.h>
#include <strings.h>
-#include <string.h>
#if SYSTEMD_JOURNAL
#define SD_JOURNAL_SUPPRESS_LOCATION
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 67d94fdecc..5f490c83a7 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -25,8 +25,6 @@
#include <stdlib.h>
#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
#include <unistd.h>
#include "nm-utils/nm-c-list.h"
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 77fc929c10..9372965f03 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -23,9 +23,7 @@
#include "nm-policy.h"
-#include <string.h>
#include <unistd.h>
-#include <errno.h>
#include <netdb.h>
#include "NetworkManagerUtils.h"
diff --git a/src/nm-rfkill-manager.c b/src/nm-rfkill-manager.c
index 557f4cd93e..534ad36939 100644
--- a/src/nm-rfkill-manager.c
+++ b/src/nm-rfkill-manager.c
@@ -22,7 +22,6 @@
#include "nm-rfkill-manager.h"
-#include <string.h>
#include <libudev.h>
#include "nm-utils/nm-udev-utils.h"
diff --git a/src/nm-session-monitor.c b/src/nm-session-monitor.c
index b67c537c8b..aadfa6b91d 100644
--- a/src/nm-session-monitor.c
+++ b/src/nm-session-monitor.c
@@ -24,8 +24,6 @@
#include "nm-session-monitor.h"
#include <pwd.h>
-#include <errno.h>
-#include <string.h>
#include <sys/stat.h>
#if SESSION_TRACKING_SYSTEMD && SESSION_TRACKING_ELOGIND
diff --git a/src/nm-sleep-monitor.c b/src/nm-sleep-monitor.c
index 54d757730f..7e0ebe6c1c 100644
--- a/src/nm-sleep-monitor.c
+++ b/src/nm-sleep-monitor.c
@@ -21,8 +21,6 @@
#include "nm-sleep-monitor.h"
-#include <errno.h>
-#include <string.h>
#include <sys/stat.h>
#include <gio/gunixfdlist.h>
diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c
index 814d9cea24..3046615954 100644
--- a/src/platform/nm-fake-platform.c
+++ b/src/platform/nm-fake-platform.c
@@ -22,7 +22,6 @@
#include "nm-fake-platform.h"
-#include <errno.h>
#include <unistd.h>
#include <netinet/icmp6.h>
#include <netinet/in.h>
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index f1508d5502..748d2c572d 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -23,7 +23,6 @@
#include <poll.h>
#include <endian.h>
-#include <errno.h>
#include <unistd.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
diff --git a/src/platform/nm-platform-utils.c b/src/platform/nm-platform-utils.c
index d4a598f08c..75eba0ba08 100644
--- a/src/platform/nm-platform-utils.c
+++ b/src/platform/nm-platform-utils.c
@@ -22,9 +22,7 @@
#include "nm-platform-utils.h"
-#include <string.h>
#include <unistd.h>
-#include <errno.h>
#include <sys/ioctl.h>
#include <linux/ethtool.h>
#include <linux/sockios.h>
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index 4bb31b1742..ba7357020f 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -23,13 +23,11 @@
#include "nm-platform.h"
#include <stdlib.h>
-#include <errno.h>
#include <unistd.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
#include <netdb.h>
-#include <string.h>
#include <linux/ip.h>
#include <linux/if.h>
#include <linux/if_tun.h>
diff --git a/src/platform/nmp-netns.c b/src/platform/nmp-netns.c
index 3e71cb9462..8a71ff61d5 100644
--- a/src/platform/nmp-netns.c
+++ b/src/platform/nmp-netns.c
@@ -23,7 +23,6 @@
#include "nmp-netns.h"
#include <fcntl.h>
-#include <errno.h>
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/src/platform/tests/test-common.h b/src/platform/tests/test-common.h
index 048fd9dd8d..aa1f54606b 100644
--- a/src/platform/tests/test-common.h
+++ b/src/platform/tests/test-common.h
@@ -19,7 +19,6 @@
#include <stdlib.h>
#include <unistd.h>
#include <syslog.h>
-#include <string.h>
#include <arpa/inet.h>
#include <linux/if.h>
#include <linux/if_link.h>
diff --git a/src/platform/wifi/nm-wifi-utils-nl80211.c b/src/platform/wifi/nm-wifi-utils-nl80211.c
index 0df3d2d823..80f316f880 100644
--- a/src/platform/wifi/nm-wifi-utils-nl80211.c
+++ b/src/platform/wifi/nm-wifi-utils-nl80211.c
@@ -24,8 +24,6 @@
#include "nm-wifi-utils-nl80211.h"
-#include <errno.h>
-#include <string.h>
#include <sys/ioctl.h>
#include <net/ethernet.h>
#include <unistd.h>
diff --git a/src/platform/wifi/nm-wifi-utils-wext.c b/src/platform/wifi/nm-wifi-utils-wext.c
index 597f315249..9b8be8de6a 100644
--- a/src/platform/wifi/nm-wifi-utils-wext.c
+++ b/src/platform/wifi/nm-wifi-utils-wext.c
@@ -23,8 +23,6 @@
#include "nm-wifi-utils-wext.h"
-#include <errno.h>
-#include <string.h>
#include <sys/ioctl.h>
#include <net/ethernet.h>
#include <unistd.h>
diff --git a/src/platform/wifi/nm-wifi-utils.c b/src/platform/wifi/nm-wifi-utils.c
index 25d71c6a88..96071faa25 100644
--- a/src/platform/wifi/nm-wifi-utils.c
+++ b/src/platform/wifi/nm-wifi-utils.c
@@ -25,7 +25,6 @@
#include <sys/stat.h>
#include <stdio.h>
-#include <string.h>
#include <fcntl.h>
#include "nm-wifi-utils-private.h"
diff --git a/src/ppp/nm-ppp-manager-call.c b/src/ppp/nm-ppp-manager-call.c
index 8f6584167a..d951e4fd1a 100644
--- a/src/ppp/nm-ppp-manager-call.c
+++ b/src/ppp/nm-ppp-manager-call.c
@@ -24,7 +24,6 @@
#include <sys/types.h>
#include <sys/stat.h>
-#include <errno.h>
#include "nm-manager.h"
#include "nm-core-utils.h"
diff --git a/src/ppp/nm-ppp-manager.c b/src/ppp/nm-ppp-manager.c
index 548f46606f..2f6cb03294 100644
--- a/src/ppp/nm-ppp-manager.c
+++ b/src/ppp/nm-ppp-manager.c
@@ -26,11 +26,9 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
-#include <string.h>
#include <unistd.h>
#include <arpa/inet.h>
#include <stdlib.h>
-#include <errno.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <asm/types.h>
diff --git a/src/ppp/nm-pppd-plugin.c b/src/ppp/nm-pppd-plugin.c
index 5e99be4112..a8d6749a43 100644
--- a/src/ppp/nm-pppd-plugin.c
+++ b/src/ppp/nm-pppd-plugin.c
@@ -22,7 +22,6 @@
#include <config.h>
#define ___CONFIG_H__
-#include <string.h>
#include <pppd/pppd.h>
#include <pppd/fsm.h>
#include <pppd/ipcp.h>
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index edadee14bf..8924c39f42 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -22,7 +22,6 @@
#include "nm-agent-manager.h"
-#include <string.h>
#include <pwd.h>
#include "nm-common-macros.h"
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index 04ad5bf9cd..8d1f95833f 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -23,8 +23,6 @@
#include "nm-settings-connection.h"
-#include <string.h>
-
#include "c-list/src/c-list.h"
#include "nm-common-macros.h"
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 74de6cc2ad..da910368cb 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -29,8 +29,6 @@
#include <unistd.h>
#include <sys/stat.h>
-#include <errno.h>
-#include <string.h>
#include <gmodule.h>
#include <pwd.h>
diff --git a/src/settings/plugins/ibft/nms-ibft-connection.c b/src/settings/plugins/ibft/nms-ibft-connection.c
index fb7f18f8d3..a36d8a3101 100644
--- a/src/settings/plugins/ibft/nms-ibft-connection.c
+++ b/src/settings/plugins/ibft/nms-ibft-connection.c
@@ -22,7 +22,6 @@
#include "nms-ibft-connection.h"
-#include <string.h>
#include <net/ethernet.h>
#include <netinet/ether.h>
#include <glib/gstdio.h>
diff --git a/src/settings/plugins/ibft/nms-ibft-plugin.c b/src/settings/plugins/ibft/nms-ibft-plugin.c
index 69dd3733e9..00b25068fc 100644
--- a/src/settings/plugins/ibft/nms-ibft-plugin.c
+++ b/src/settings/plugins/ibft/nms-ibft-plugin.c
@@ -22,9 +22,7 @@
#include "nms-ibft-plugin.h"
-#include <string.h>
#include <unistd.h>
-#include <errno.h>
#include <gmodule.h>
#include "nm-setting-connection.h"
diff --git a/src/settings/plugins/ibft/nms-ibft-reader.c b/src/settings/plugins/ibft/nms-ibft-reader.c
index ac5824a167..c6c1437651 100644
--- a/src/settings/plugins/ibft/nms-ibft-reader.c
+++ b/src/settings/plugins/ibft/nms-ibft-reader.c
@@ -23,13 +23,11 @@
#include "nms-ibft-reader.h"
#include <stdlib.h>
-#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/wait.h>
#include <sys/inotify.h>
-#include <errno.h>
#include <sys/ioctl.h>
#include <unistd.h>
diff --git a/src/settings/plugins/ibft/tests/test-ibft.c b/src/settings/plugins/ibft/tests/test-ibft.c
index 5e46be2eb5..4c45f574d2 100644
--- a/src/settings/plugins/ibft/tests/test-ibft.c
+++ b/src/settings/plugins/ibft/tests/test-ibft.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
-#include <string.h>
#include <netinet/ether.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/src/settings/plugins/ifcfg-rh/nm-inotify-helper.c b/src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
index e7a74a1aea..bed127fa43 100644
--- a/src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
+++ b/src/settings/plugins/ifcfg-rh/nm-inotify-helper.c
@@ -23,9 +23,7 @@
#include "nm-inotify-helper.h"
#include <unistd.h>
-#include <string.h>
#include <sys/inotify.h>
-#include <errno.h>
#include "NetworkManagerUtils.h"
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
index ca319ddc61..4f769c5f7a 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-connection.c
@@ -22,7 +22,6 @@
#include "nms-ifcfg-rh-connection.h"
-#include <string.h>
#include <sys/inotify.h>
#include <glib/gstdio.h>
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
index 05d4d7386b..89272edbb3 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c
@@ -25,9 +25,7 @@
#include "nms-ifcfg-rh-plugin.h"
-#include <string.h>
#include <unistd.h>
-#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <gmodule.h>
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
index eafb0af37c..d7fc5da1ba 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c
@@ -23,13 +23,11 @@
#include "nms-ifcfg-rh-reader.h"
#include <stdlib.h>
-#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <sys/wait.h>
#include <sys/inotify.h>
-#include <errno.h>
#include <sys/ioctl.h>
#include <unistd.h>
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
index 49096d262f..22c9061b8a 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-utils.c
@@ -23,7 +23,6 @@
#include "nms-ifcfg-rh-utils.h"
#include <stdlib.h>
-#include <string.h>
#include "nm-core-internal.h"
#include "NetworkManagerUtils.h"
diff --git a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
index 90311e90c7..ee7fd16157 100644
--- a/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
+++ b/src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c
@@ -22,11 +22,9 @@
#include "nms-ifcfg-rh-writer.h"
-#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <arpa/inet.h>
-#include <errno.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
index 1995d72474..ac150b74f1 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/settings/plugins/ifcfg-rh/shvar.c
@@ -27,11 +27,9 @@
#include "shvar.h"
-#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
index e46ea0ee10..108e7f677e 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
-#include <string.h>
#include <linux/pkt_sched.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-connection.c b/src/settings/plugins/ifupdown/nms-ifupdown-connection.c
index 1b81704420..d06078a97d 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-connection.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-connection.c
@@ -24,7 +24,6 @@
#include "nms-ifupdown-connection.h"
-#include <string.h>
#include <glib/gstdio.h>
#include "nm-dbus-interface.h"
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
index 73ecc2f9c6..6587fc8491 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c
@@ -26,7 +26,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <wordexp.h>
#include <libgen.h>
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
index 2ee3f17532..fd5561ae7f 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.c
@@ -25,10 +25,8 @@
#include "nms-ifupdown-parser.h"
-#include <string.h>
#include <arpa/inet.h>
#include <stdlib.h>
-#include <errno.h>
#include <ctype.h>
#include "nm-core-internal.h"
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
index b66eedc70a..317de633a2 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c
@@ -26,7 +26,6 @@
#include "nms-ifupdown-plugin.h"
-#include <string.h>
#include <arpa/inet.h>
#include <gmodule.h>
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
index 82ee1c4acc..674cb19c49 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -20,8 +20,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-core-internal.h"
#include "settings/plugins/ifupdown/nms-ifupdown-interface-parser.h"
diff --git a/src/settings/plugins/keyfile/nms-keyfile-connection.c b/src/settings/plugins/keyfile/nms-keyfile-connection.c
index 7511f206ad..3b362978a2 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-connection.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-connection.c
@@ -23,7 +23,6 @@
#include "nms-keyfile-connection.h"
-#include <string.h>
#include <glib/gstdio.h>
#include "nm-dbus-interface.h"
diff --git a/src/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
index ae9bea13f3..c13cc1ff95 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -26,8 +26,6 @@
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
-#include <string.h>
-
#include <glib/gstdio.h>
#include "nm-connection.h"
diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.c b/src/settings/plugins/keyfile/nms-keyfile-reader.c
index 314b103392..5778f13c15 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-reader.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-reader.c
@@ -23,7 +23,6 @@
#include "nms-keyfile-reader.h"
#include <sys/stat.h>
-#include <string.h>
#include "nm-keyfile-internal.h"
diff --git a/src/settings/plugins/keyfile/nms-keyfile-utils.c b/src/settings/plugins/keyfile/nms-keyfile-utils.c
index 8d4ec943c4..3e83e16be9 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-utils.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-utils.c
@@ -23,7 +23,6 @@
#include "nms-keyfile-utils.h"
#include <stdlib.h>
-#include <string.h>
#include <sys/stat.h>
#include "nm-keyfile-internal.h"
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.c b/src/settings/plugins/keyfile/nms-keyfile-writer.c
index 23a6a77c27..6e2f5b1909 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.c
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.c
@@ -26,8 +26,6 @@
#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
-#include <errno.h>
-#include <string.h>
#include "nm-keyfile-internal.h"
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index cdc9bfb0c6..15c7f5b3b1 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
-#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
diff --git a/src/supplicant/nm-supplicant-config.c b/src/supplicant/nm-supplicant-config.c
index f004968e70..0b269f11c9 100644
--- a/src/supplicant/nm-supplicant-config.c
+++ b/src/supplicant/nm-supplicant-config.c
@@ -23,7 +23,6 @@
#include "nm-supplicant-config.h"
-#include <string.h>
#include <stdlib.h>
#include "nm-core-internal.h"
diff --git a/src/supplicant/nm-supplicant-interface.c b/src/supplicant/nm-supplicant-interface.c
index 8a362e947f..82354df01b 100644
--- a/src/supplicant/nm-supplicant-interface.c
+++ b/src/supplicant/nm-supplicant-interface.c
@@ -25,7 +25,6 @@
#include "nm-supplicant-manager.h"
#include <stdio.h>
-#include <string.h>
#include "NetworkManagerUtils.h"
#include "nm-supplicant-config.h"
diff --git a/src/supplicant/nm-supplicant-manager.c b/src/supplicant/nm-supplicant-manager.c
index 97b3f4cec8..2af825e43e 100644
--- a/src/supplicant/nm-supplicant-manager.c
+++ b/src/supplicant/nm-supplicant-manager.c
@@ -23,8 +23,6 @@
#include "nm-supplicant-manager.h"
-#include <string.h>
-
#include "nm-supplicant-interface.h"
#include "nm-supplicant-types.h"
#include "nm-core-internal.h"
diff --git a/src/supplicant/nm-supplicant-settings-verify.c b/src/supplicant/nm-supplicant-settings-verify.c
index 857a6b6b42..2ed918b602 100644
--- a/src/supplicant/nm-supplicant-settings-verify.c
+++ b/src/supplicant/nm-supplicant-settings-verify.c
@@ -24,8 +24,6 @@
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
struct Opt {
const char * key;
diff --git a/src/supplicant/tests/test-supplicant-config.c b/src/supplicant/tests/test-supplicant-config.c
index a4d798ca85..2c7a71a3ea 100644
--- a/src/supplicant/tests/test-supplicant-config.c
+++ b/src/supplicant/tests/test-supplicant-config.c
@@ -23,7 +23,6 @@
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
-#include <string.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <sys/socket.h>
diff --git a/src/systemd/src/libsystemd-network/dhcp-network.c b/src/systemd/src/libsystemd-network/dhcp-network.c
index ba59690817..2eedd4dd4b 100644
--- a/src/systemd/src/libsystemd-network/dhcp-network.c
+++ b/src/systemd/src/libsystemd-network/dhcp-network.c
@@ -5,7 +5,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include <net/ethernet.h>
#include <net/if.h>
#include <net/if_arp.h>
diff --git a/src/systemd/src/libsystemd-network/dhcp-option.c b/src/systemd/src/libsystemd-network/dhcp-option.c
index b065ae499e..c5fbe749de 100644
--- a/src/systemd/src/libsystemd-network/dhcp-option.c
+++ b/src/systemd/src/libsystemd-network/dhcp-option.c
@@ -5,7 +5,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include <stdint.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/systemd/src/libsystemd-network/dhcp-packet.c b/src/systemd/src/libsystemd-network/dhcp-packet.c
index 9e565e2887..91e8a54eca 100644
--- a/src/systemd/src/libsystemd-network/dhcp-packet.c
+++ b/src/systemd/src/libsystemd-network/dhcp-packet.c
@@ -5,7 +5,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <string.h>
diff --git a/src/systemd/src/libsystemd-network/dhcp6-network.c b/src/systemd/src/libsystemd-network/dhcp6-network.c
index 73c195a71a..d786756e85 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-network.c
+++ b/src/systemd/src/libsystemd-network/dhcp6-network.c
@@ -5,7 +5,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include <netinet/in.h>
#include <netinet/ip6.h>
#include <stdio.h>
diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c
index 5a83aaaa45..3d5abe64af 100644
--- a/src/systemd/src/libsystemd-network/dhcp6-option.c
+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c
@@ -5,7 +5,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include <netinet/in.h>
#include <string.h>
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-client.c b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
index 2f9244d871..20429306bd 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp-client.c
@@ -5,7 +5,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include <net/ethernet.h>
#include <net/if_arp.h>
#include <stdio.h>
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
index fc5077c2b2..8359d077ee 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp-lease.c
@@ -6,7 +6,6 @@
#include "nm-sd-adapt-core.h"
#include <arpa/inet.h>
-#include <errno.h>
#include <stdio.h>
#include <stdio_ext.h>
#include <stdlib.h>
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
index 6b55083ec6..39dc881a41 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-client.c
@@ -5,7 +5,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include <string.h>
#include <sys/ioctl.h>
#include <linux/if_infiniband.h>
diff --git a/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c b/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
index 48188bf3ec..7263c96f0d 100644
--- a/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
+++ b/src/systemd/src/libsystemd-network/sd-dhcp6-lease.c
@@ -5,7 +5,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include "alloc-util.h"
#include "dhcp6-lease-internal.h"
diff --git a/src/systemd/src/libsystemd-network/sd-ipv4acd.c b/src/systemd/src/libsystemd-network/sd-ipv4acd.c
index b43da6b496..6de4adb535 100644
--- a/src/systemd/src/libsystemd-network/sd-ipv4acd.c
+++ b/src/systemd/src/libsystemd-network/sd-ipv4acd.c
@@ -6,7 +6,6 @@
#include "nm-sd-adapt-core.h"
#include <arpa/inet.h>
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/systemd/src/libsystemd-network/sd-ipv4ll.c b/src/systemd/src/libsystemd-network/sd-ipv4ll.c
index f1b94829af..8b1e966589 100644
--- a/src/systemd/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/systemd/src/libsystemd-network/sd-ipv4ll.c
@@ -6,7 +6,6 @@
#include "nm-sd-adapt-core.h"
#include <arpa/inet.h>
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/systemd/src/libsystemd/sd-event/event-util.c b/src/systemd/src/libsystemd/sd-event/event-util.c
index e8384cfd6b..2afacfe64a 100644
--- a/src/systemd/src/libsystemd/sd-event/event-util.c
+++ b/src/systemd/src/libsystemd/sd-event/event-util.c
@@ -2,7 +2,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include "event-source.h"
#include "event-util.h"
diff --git a/src/systemd/src/libsystemd/sd-id128/id128-util.c b/src/systemd/src/libsystemd/sd-id128/id128-util.c
index f8f0883caf..6245e9dfff 100644
--- a/src/systemd/src/libsystemd/sd-id128/id128-util.c
+++ b/src/systemd/src/libsystemd/sd-id128/id128-util.c
@@ -2,7 +2,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/systemd/src/libsystemd/sd-id128/sd-id128.c b/src/systemd/src/libsystemd/sd-id128/sd-id128.c
index a476017b35..13a2829112 100644
--- a/src/systemd/src/libsystemd/sd-id128/sd-id128.c
+++ b/src/systemd/src/libsystemd/sd-id128/sd-id128.c
@@ -2,7 +2,6 @@
#include "nm-sd-adapt-core.h"
-#include <errno.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/src/systemd/src/shared/dns-domain.h b/src/systemd/src/shared/dns-domain.h
index 88b3eb112c..17db7c5274 100644
--- a/src/systemd/src/shared/dns-domain.h
+++ b/src/systemd/src/shared/dns-domain.h
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
-#include <errno.h>
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
diff --git a/src/tests/config/nm-test-device.c b/src/tests/config/nm-test-device.c
index 4963158340..c21317692a 100644
--- a/src/tests/config/nm-test-device.c
+++ b/src/tests/config/nm-test-device.c
@@ -22,8 +22,6 @@
#include "nm-test-device.h"
-#include <string.h>
-
#include "devices/nm-device-private.h"
#include "nm-utils.h"
diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c
index 2ab0f89056..6291f254c7 100644
--- a/src/tests/test-dcb.c
+++ b/src/tests/test-dcb.c
@@ -20,8 +20,6 @@
#include "nm-default.h"
-#include <string.h>
-
#include "nm-dcb.h"
#include "nm-test-utils-core.h"
diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c
index ba8e3ce4cb..dd720ac712 100644
--- a/src/tests/test-general-with-expect.c
+++ b/src/tests/test-general-with-expect.c
@@ -20,8 +20,6 @@
#include "nm-default.h"
-#include <string.h>
-#include <errno.h>
#include <time.h>
#include <netinet/ether.h>
#include <sys/types.h>
diff --git a/src/tests/test-general.c b/src/tests/test-general.c
index 79e73cdc55..f4bb820d9c 100644
--- a/src/tests/test-general.c
+++ b/src/tests/test-general.c
@@ -20,8 +20,6 @@
#include "nm-default.h"
-#include <string.h>
-#include <errno.h>
#include <net/if.h>
#include <byteswap.h>
diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c
index 9fea6af5b1..f98c84c3ba 100644
--- a/src/tests/test-ip4-config.c
+++ b/src/tests/test-ip4-config.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <arpa/inet.h>
#include "nm-ip4-config.h"
diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c
index 51807dea6b..8f5f41d73f 100644
--- a/src/tests/test-ip6-config.c
+++ b/src/tests/test-ip6-config.c
@@ -20,7 +20,6 @@
#include "nm-default.h"
-#include <string.h>
#include <arpa/inet.h>
#include <linux/if_addr.h>
diff --git a/src/tests/test-utils.c b/src/tests/test-utils.c
index 9572ec7a51..c326f790cb 100644
--- a/src/tests/test-utils.c
+++ b/src/tests/test-utils.c
@@ -20,8 +20,6 @@
#include "nm-default.h"
-#include <string.h>
-#include <errno.h>
#include <arpa/inet.h>
#include "nm-test-utils-core.h"
diff --git a/src/vpn/nm-vpn-connection.c b/src/vpn/nm-vpn-connection.c
index c7cfcdcdfd..b2ed6999bd 100644
--- a/src/vpn/nm-vpn-connection.c
+++ b/src/vpn/nm-vpn-connection.c
@@ -23,11 +23,9 @@
#include "nm-vpn-connection.h"
-#include <string.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <syslog.h>
diff --git a/src/vpn/nm-vpn-manager.c b/src/vpn/nm-vpn-manager.c
index d063916873..0b27b9de3b 100644
--- a/src/vpn/nm-vpn-manager.c
+++ b/src/vpn/nm-vpn-manager.c
@@ -23,8 +23,6 @@
#include "nm-vpn-manager.h"
-#include <string.h>
-
#include "nm-vpn-plugin-info.h"
#include "nm-vpn-connection.h"
#include "nm-setting-vpn.h"