summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Winship <danw@gnome.org>2014-11-13 10:07:02 -0500
committerDan Winship <danw@gnome.org>2014-11-13 17:18:42 -0500
commit3bfb163a74fb98698b03d8a605b0164869a2ed4a (patch)
tree9aff34e20cafdfdce5fed6dc98e2e1a1b07e7a3c
parent125f7c4d40b7048209d031b3322e46e081d7c328 (diff)
all: consistently include config.h
config.h should be included from every .c file, and it should be included before any other include. Fix that. (As a side effect of how I did this, this also changes us to consistently use "config.h" rather than <config.h>. To the extent that it matters [which is not much], quotes are more correct anyway, since we're talking about a file in our own build tree, not a system include.)
-rw-r--r--callouts/nm-avahi-autoipd-action.c2
-rw-r--r--callouts/nm-dispatcher-utils.c3
-rw-r--r--callouts/nm-dispatcher.c2
-rw-r--r--callouts/tests/test-dispatcher-envp.c3
-rw-r--r--clients/nm-online.c2
-rw-r--r--clients/tui/vpn-helpers.c2
-rw-r--r--examples/C/glib/add-connection-gdbus.c2
-rw-r--r--examples/C/glib/add-connection-libnm.c2
-rw-r--r--examples/C/glib/get-active-connections-gdbus.c2
-rw-r--r--examples/C/glib/get-ap-info-libnm.c2
-rw-r--r--examples/C/glib/list-connections-gdbus.c2
-rw-r--r--examples/C/glib/list-connections-libnm.c2
-rw-r--r--examples/C/glib/monitor-nm-running-gdbus.c2
-rw-r--r--examples/C/glib/monitor-nm-state-gdbus.c2
-rw-r--r--libnm-core/crypto_gnutls.c1
-rw-r--r--libnm-core/nm-connection.c2
-rw-r--r--libnm-core/nm-errors.c2
-rw-r--r--libnm-core/nm-property-compare.c2
-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.c2
-rw-r--r--libnm-core/nm-setting-bond.c2
-rw-r--r--libnm-core/nm-setting-bridge-port.c2
-rw-r--r--libnm-core/nm-setting-bridge.c2
-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-infiniband.c2
-rw-r--r--libnm-core/nm-setting-ip-config.c2
-rw-r--r--libnm-core/nm-setting-ip4-config.c2
-rw-r--r--libnm-core/nm-setting-ip6-config.c2
-rw-r--r--libnm-core/nm-setting-olpc-mesh.c2
-rw-r--r--libnm-core/nm-setting-ppp.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.c2
-rw-r--r--libnm-core/nm-setting-team.c2
-rw-r--r--libnm-core/nm-setting-vlan.c2
-rw-r--r--libnm-core/nm-setting-vpn.c2
-rw-r--r--libnm-core/nm-setting-wimax.c2
-rw-r--r--libnm-core/nm-setting-wired.c2
-rw-r--r--libnm-core/nm-setting-wireless-security.c3
-rw-r--r--libnm-core/nm-setting-wireless.c2
-rw-r--r--libnm-core/nm-setting.c2
-rw-r--r--libnm-core/nm-simple-connection.c2
-rw-r--r--libnm-core/tests/test-compare.c2
-rw-r--r--libnm-core/tests/test-crypto.c2
-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-8021x.c2
-rw-r--r--libnm-core/tests/test-setting-dcb.c2
-rw-r--r--libnm-core/tests/test-settings-defaults.c2
-rw-r--r--libnm-glib/libnm-glib-test.c2
-rw-r--r--libnm-glib/libnm_glib.c2
-rw-r--r--libnm-glib/nm-access-point.c3
-rw-r--r--libnm-glib/nm-active-connection.c2
-rw-r--r--libnm-glib/nm-client.c2
-rw-r--r--libnm-glib/nm-dbus-helpers.c3
-rw-r--r--libnm-glib/nm-device-adsl.c2
-rw-r--r--libnm-glib/nm-device-bond.c3
-rw-r--r--libnm-glib/nm-device-bridge.c3
-rw-r--r--libnm-glib/nm-device-bt.c3
-rw-r--r--libnm-glib/nm-device-ethernet.c3
-rw-r--r--libnm-glib/nm-device-generic.c2
-rw-r--r--libnm-glib/nm-device-infiniband.c3
-rw-r--r--libnm-glib/nm-device-modem.c3
-rw-r--r--libnm-glib/nm-device-olpc-mesh.c3
-rw-r--r--libnm-glib/nm-device-team.c3
-rw-r--r--libnm-glib/nm-device-vlan.c3
-rw-r--r--libnm-glib/nm-device-wifi.c3
-rw-r--r--libnm-glib/nm-device-wimax.c3
-rw-r--r--libnm-glib/nm-device.c2
-rw-r--r--libnm-glib/nm-dhcp4-config.c2
-rw-r--r--libnm-glib/nm-dhcp6-config.c2
-rw-r--r--libnm-glib/nm-ip4-config.c2
-rw-r--r--libnm-glib/nm-ip6-config.c2
-rw-r--r--libnm-glib/nm-object-cache.c2
-rw-r--r--libnm-glib/nm-object.c2
-rw-r--r--libnm-glib/nm-remote-connection.c2
-rw-r--r--libnm-glib/nm-remote-settings.c2
-rw-r--r--libnm-glib/nm-secret-agent.c3
-rw-r--r--libnm-glib/nm-types.c2
-rw-r--r--libnm-glib/nm-vpn-connection.c2
-rw-r--r--libnm-glib/nm-vpn-plugin-ui-interface.c2
-rw-r--r--libnm-glib/nm-vpn-plugin-utils.c2
-rw-r--r--libnm-glib/nm-vpn-plugin.c2
-rw-r--r--libnm-glib/nm-wimax-nsp.c3
-rw-r--r--libnm-glib/tests/common.c2
-rw-r--r--libnm-glib/tests/test-nm-client.c2
-rw-r--r--libnm-glib/tests/test-remote-settings-client.c2
-rw-r--r--libnm-util/crypto_gnutls.c1
-rw-r--r--libnm-util/nm-connection.c2
-rw-r--r--libnm-util/nm-param-spec-specialized.c2
-rw-r--r--libnm-util/nm-setting-8021x.c2
-rw-r--r--libnm-util/nm-setting-adsl.c2
-rw-r--r--libnm-util/nm-setting-bluetooth.c2
-rw-r--r--libnm-util/nm-setting-bond.c2
-rw-r--r--libnm-util/nm-setting-bridge-port.c2
-rw-r--r--libnm-util/nm-setting-bridge.c2
-rw-r--r--libnm-util/nm-setting-cdma.c2
-rw-r--r--libnm-util/nm-setting-connection.c2
-rw-r--r--libnm-util/nm-setting-dcb.c2
-rw-r--r--libnm-util/nm-setting-gsm.c2
-rw-r--r--libnm-util/nm-setting-infiniband.c2
-rw-r--r--libnm-util/nm-setting-ip4-config.c2
-rw-r--r--libnm-util/nm-setting-ip6-config.c2
-rw-r--r--libnm-util/nm-setting-olpc-mesh.c2
-rw-r--r--libnm-util/nm-setting-ppp.c2
-rw-r--r--libnm-util/nm-setting-pppoe.c2
-rw-r--r--libnm-util/nm-setting-serial.c2
-rw-r--r--libnm-util/nm-setting-team-port.c2
-rw-r--r--libnm-util/nm-setting-team.c2
-rw-r--r--libnm-util/nm-setting-template.c2
-rw-r--r--libnm-util/nm-setting-vlan.c2
-rw-r--r--libnm-util/nm-setting-vpn.c2
-rw-r--r--libnm-util/nm-setting-wimax.c2
-rw-r--r--libnm-util/nm-setting-wired.c2
-rw-r--r--libnm-util/nm-setting-wireless-security.c3
-rw-r--r--libnm-util/nm-setting-wireless.c2
-rw-r--r--libnm-util/nm-setting.c2
-rw-r--r--libnm-util/tests/test-crypto.c2
-rw-r--r--libnm-util/tests/test-general.c2
-rw-r--r--libnm-util/tests/test-libnm-linking.c2
-rw-r--r--libnm-util/tests/test-secrets.c2
-rw-r--r--libnm-util/tests/test-setting-8021x.c2
-rw-r--r--libnm-util/tests/test-setting-dcb.c2
-rw-r--r--libnm-util/tests/test-settings-defaults.c2
-rw-r--r--libnm/nm-access-point.c3
-rw-r--r--libnm/nm-active-connection.c2
-rw-r--r--libnm/nm-client.c2
-rw-r--r--libnm/nm-dbus-helpers.c3
-rw-r--r--libnm/nm-device-adsl.c2
-rw-r--r--libnm/nm-device-bond.c3
-rw-r--r--libnm/nm-device-bridge.c3
-rw-r--r--libnm/nm-device-bt.c3
-rw-r--r--libnm/nm-device-ethernet.c3
-rw-r--r--libnm/nm-device-generic.c2
-rw-r--r--libnm/nm-device-infiniband.c3
-rw-r--r--libnm/nm-device-modem.c3
-rw-r--r--libnm/nm-device-olpc-mesh.c3
-rw-r--r--libnm/nm-device-team.c3
-rw-r--r--libnm/nm-device-vlan.c3
-rw-r--r--libnm/nm-device-wifi.c3
-rw-r--r--libnm/nm-device-wimax.c3
-rw-r--r--libnm/nm-device.c2
-rw-r--r--libnm/nm-dhcp-config.c2
-rw-r--r--libnm/nm-dhcp4-config.c2
-rw-r--r--libnm/nm-dhcp6-config.c2
-rw-r--r--libnm/nm-ip-config.c2
-rw-r--r--libnm/nm-ip4-config.c2
-rw-r--r--libnm/nm-ip6-config.c2
-rw-r--r--libnm/nm-manager.c2
-rw-r--r--libnm/nm-object-cache.c2
-rw-r--r--libnm/nm-object.c2
-rw-r--r--libnm/nm-remote-connection.c2
-rw-r--r--libnm/nm-remote-settings.c2
-rw-r--r--libnm/nm-secret-agent.c3
-rw-r--r--libnm/nm-vpn-connection.c2
-rw-r--r--libnm/nm-vpn-editor-plugin.c2
-rw-r--r--libnm/nm-vpn-plugin-old.c2
-rw-r--r--libnm/nm-wimax-nsp.c3
-rw-r--r--libnm/tests/common.c2
-rw-r--r--libnm/tests/test-nm-client.c2
-rw-r--r--libnm/tests/test-remote-settings-client.c2
-rw-r--r--libnm/tests/test-secret-agent.c2
-rw-r--r--src/devices/adsl/nm-atm-manager.c2
-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.c2
-rw-r--r--src/devices/bluetooth/nm-bluez4-adapter.c2
-rw-r--r--src/devices/bluetooth/nm-bluez4-manager.c2
-rw-r--r--src/devices/bluetooth/nm-bluez5-dun.c3
-rw-r--r--src/devices/bluetooth/nm-bluez5-manager.c2
-rw-r--r--src/devices/bluetooth/nm-bt-error.c2
-rw-r--r--src/devices/nm-device-ethernet-utils.c2
-rw-r--r--src/devices/nm-device-ethernet.c1
-rw-r--r--src/devices/nm-device-factory.c2
-rw-r--r--src/devices/nm-device.c3
-rw-r--r--src/devices/team/nm-team-factory.c3
-rw-r--r--src/devices/wifi/nm-device-olpc-mesh.c1
-rw-r--r--src/devices/wifi/nm-device-wifi.c2
-rw-r--r--src/devices/wifi/nm-wifi-ap-utils.c3
-rw-r--r--src/devices/wifi/nm-wifi-ap.c2
-rw-r--r--src/devices/wifi/nm-wifi-factory.c2
-rw-r--r--src/devices/wifi/tests/test-wifi-ap-utils.c2
-rw-r--r--src/devices/wimax/iwmxsdk.c4
-rw-r--r--src/devices/wimax/nm-device-wimax.c2
-rw-r--r--src/devices/wimax/nm-wimax-factory.c2
-rw-r--r--src/devices/wimax/nm-wimax-nsp.c2
-rw-r--r--src/devices/wimax/nm-wimax-util.c2
-rw-r--r--src/devices/wwan/nm-modem-broadband.c2
-rw-r--r--src/devices/wwan/nm-modem.c2
-rw-r--r--src/devices/wwan/nm-wwan-factory.c3
-rw-r--r--src/dhcp-manager/nm-dhcp-client.c3
-rw-r--r--src/dhcp-manager/nm-dhcp-dhclient-utils.c2
-rw-r--r--src/dhcp-manager/nm-dhcp-dhclient.c4
-rw-r--r--src/dhcp-manager/nm-dhcp-dhcpcd.c3
-rw-r--r--src/dhcp-manager/nm-dhcp-helper.c2
-rw-r--r--src/dhcp-manager/nm-dhcp-listener.c3
-rw-r--r--src/dhcp-manager/nm-dhcp-manager.c1
-rw-r--r--src/dhcp-manager/nm-dhcp-systemd.c2
-rw-r--r--src/dhcp-manager/nm-dhcp-utils.c3
-rw-r--r--src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c3
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/shared/fileio.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/shared/strv.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/shared/time-util.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/shared/utf8.c2
-rw-r--r--src/dhcp-manager/systemd-dhcp/src/shared/util.c2
-rw-r--r--src/dhcp-manager/tests/test-dhcp-dhclient.c2
-rw-r--r--src/dhcp-manager/tests/test-dhcp-utils.c2
-rw-r--r--src/dns-manager/nm-dns-dnsmasq.c3
-rw-r--r--src/dns-manager/nm-dns-plugin.c3
-rw-r--r--src/dns-manager/nm-dns-unbound.c2
-rw-r--r--src/dns-manager/nm-dns-utils.c2
-rw-r--r--src/dnsmasq-manager/nm-dnsmasq-manager.c3
-rw-r--r--src/dnsmasq-manager/nm-dnsmasq-utils.c3
-rw-r--r--src/dnsmasq-manager/tests/test-dnsmasq-utils.c2
-rw-r--r--src/firewall-manager/nm-firewall-manager.c2
-rw-r--r--src/main-utils.c3
-rw-r--r--src/main.c3
-rw-r--r--src/nm-active-connection.c2
-rw-r--r--src/nm-auth-manager.c2
-rw-r--r--src/nm-auth-subject.c2
-rw-r--r--src/nm-auth-utils.c3
-rw-r--r--src/nm-config.c3
-rw-r--r--src/nm-connection-provider.c2
-rw-r--r--src/nm-connectivity.c2
-rw-r--r--src/nm-dbus-manager.c1
-rw-r--r--src/nm-dcb.c3
-rw-r--r--src/nm-default-route-manager.c4
-rw-r--r--src/nm-dhcp4-config.c2
-rw-r--r--src/nm-dhcp6-config.c2
-rw-r--r--src/nm-dispatcher.c2
-rw-r--r--src/nm-iface-helper.c3
-rw-r--r--src/nm-ip4-config.c2
-rw-r--r--src/nm-ip6-config.c2
-rw-r--r--src/nm-manager.c2
-rw-r--r--src/nm-policy.c3
-rw-r--r--src/nm-properties-changed-signal.c2
-rw-r--r--src/nm-rfkill-manager.c2
-rw-r--r--src/nm-session-monitor-ck.c1
-rw-r--r--src/nm-session-monitor-null.c1
-rw-r--r--src/nm-session-monitor-systemd.c1
-rw-r--r--src/nm-session-utils.c2
-rw-r--r--src/nm-sleep-monitor-systemd.c1
-rw-r--r--src/nm-sleep-monitor-upower.c1
-rw-r--r--src/platform/nm-fake-platform.c2
-rw-r--r--src/platform/nm-linux-platform.c2
-rw-r--r--src/platform/nm-platform.c2
-rw-r--r--src/platform/tests/dump.c2
-rw-r--r--src/platform/tests/monitor.c2
-rw-r--r--src/platform/tests/platform.c2
-rw-r--r--src/platform/tests/test-address.c2
-rw-r--r--src/platform/tests/test-cleanup.c2
-rw-r--r--src/platform/tests/test-common.c2
-rw-r--r--src/platform/tests/test-link.c2
-rw-r--r--src/platform/tests/test-route.c2
-rw-r--r--src/platform/wifi/wifi-utils-nl80211.c3
-rw-r--r--src/platform/wifi/wifi-utils-wext.c3
-rw-r--r--src/platform/wifi/wifi-utils.c3
-rw-r--r--src/ppp-manager/nm-ppp-manager.c3
-rw-r--r--src/ppp-manager/nm-pppd-plugin.c3
-rw-r--r--src/rdisc/nm-fake-rdisc.c2
-rw-r--r--src/rdisc/nm-lndp-rdisc.c2
-rw-r--r--src/rdisc/nm-rdisc.c2
-rw-r--r--src/rdisc/tests/rdisc.c2
-rw-r--r--src/settings/nm-agent-manager.c3
-rw-r--r--src/settings/nm-inotify-helper.c2
-rw-r--r--src/settings/nm-secret-agent.c2
-rw-r--r--src/settings/nm-system-config-interface.c2
-rw-r--r--src/settings/plugins/example/nm-example-connection.c2
-rw-r--r--src/settings/plugins/example/plugin.c3
-rw-r--r--src/settings/plugins/example/reader.c3
-rw-r--r--src/settings/plugins/example/writer.c3
-rw-r--r--src/settings/plugins/ibft/nm-ibft-connection.c2
-rw-r--r--src/settings/plugins/ibft/plugin.c3
-rw-r--r--src/settings/plugins/ibft/reader.c3
-rw-r--r--src/settings/plugins/ibft/tests/test-ibft.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/plugin.c3
-rw-r--r--src/settings/plugins/ifcfg-rh/reader.c3
-rw-r--r--src/settings/plugins/ifcfg-rh/shvar.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/utils.c2
-rw-r--r--src/settings/plugins/ifcfg-rh/writer.c2
-rw-r--r--src/settings/plugins/ifcfg-suse/plugin.c3
-rw-r--r--src/settings/plugins/ifnet/net_parser.c2
-rw-r--r--src/settings/plugins/ifnet/net_utils.c2
-rw-r--r--src/settings/plugins/ifnet/nm-ifnet-connection.c2
-rw-r--r--src/settings/plugins/ifnet/plugin.c2
-rw-r--r--src/settings/plugins/ifnet/tests/test_all.c2
-rw-r--r--src/settings/plugins/ifnet/wpa_parser.c2
-rw-r--r--src/settings/plugins/ifupdown/interface_parser.c1
-rw-r--r--src/settings/plugins/ifupdown/nm-ifupdown-connection.c2
-rw-r--r--src/settings/plugins/ifupdown/parser.c2
-rw-r--r--src/settings/plugins/ifupdown/plugin.c2
-rw-r--r--src/settings/plugins/ifupdown/tests/test-ifupdown.c2
-rw-r--r--src/settings/plugins/keyfile/nm-keyfile-connection.c2
-rw-r--r--src/settings/plugins/keyfile/plugin.c3
-rw-r--r--src/settings/plugins/keyfile/reader.c2
-rw-r--r--src/settings/plugins/keyfile/tests/test-keyfile.c2
-rw-r--r--src/settings/plugins/keyfile/utils.c2
-rw-r--r--src/settings/plugins/keyfile/writer.c3
-rw-r--r--src/supplicant-manager/nm-call-store.c2
-rw-r--r--src/supplicant-manager/nm-supplicant-config.c4
-rw-r--r--src/supplicant-manager/nm-supplicant-interface.c3
-rw-r--r--src/supplicant-manager/nm-supplicant-manager.c2
-rw-r--r--src/supplicant-manager/nm-supplicant-settings-verify.c2
-rw-r--r--src/supplicant-manager/tests/test-supplicant-config.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.c2
-rw-r--r--src/tests/test-ip6-config.c2
-rw-r--r--src/tests/test-resolvconf-capture.c2
-rw-r--r--src/tests/test-wired-defname.c2
-rw-r--r--src/vpn-manager/nm-vpn-connection.c2
-rw-r--r--src/vpn-manager/nm-vpn-manager.c2
-rw-r--r--src/vpn-manager/nm-vpn-service.c3
333 files changed, 639 insertions, 96 deletions
diff --git a/callouts/nm-avahi-autoipd-action.c b/callouts/nm-avahi-autoipd-action.c
index 48969df1b..b28dae5d2 100644
--- a/callouts/nm-avahi-autoipd-action.c
+++ b/callouts/nm-avahi-autoipd-action.c
@@ -18,6 +18,8 @@
* Copyright 2008, 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
diff --git a/callouts/nm-dispatcher-utils.c b/callouts/nm-dispatcher-utils.c
index 8d7274329..ab7fda660 100644
--- a/callouts/nm-dispatcher-utils.c
+++ b/callouts/nm-dispatcher-utils.c
@@ -18,7 +18,8 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib-object.h>
diff --git a/callouts/nm-dispatcher.c b/callouts/nm-dispatcher.c
index 19220654f..dafe4f6e6 100644
--- a/callouts/nm-dispatcher.c
+++ b/callouts/nm-dispatcher.c
@@ -18,6 +18,8 @@
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <syslog.h>
#include <stdio.h>
#include <unistd.h>
diff --git a/callouts/tests/test-dispatcher-envp.c b/callouts/tests/test-dispatcher-envp.c
index 423d29fd8..460174b23 100644
--- a/callouts/tests/test-dispatcher-envp.c
+++ b/callouts/tests/test-dispatcher-envp.c
@@ -18,7 +18,8 @@
*
*/
-#include <config.h>
+#include "config.h"
+
#include <arpa/inet.h>
#include <stdlib.h>
#include <string.h>
diff --git a/clients/nm-online.c b/clients/nm-online.c
index d4397042b..bb0c97066 100644
--- a/clients/nm-online.c
+++ b/clients/nm-online.c
@@ -31,7 +31,7 @@
* Robert Love <rml@novell.com>
*/
-#include <config.h>
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/clients/tui/vpn-helpers.c b/clients/tui/vpn-helpers.c
index fb0ee6f7f..ab6469183 100644
--- a/clients/tui/vpn-helpers.c
+++ b/clients/tui/vpn-helpers.c
@@ -28,6 +28,8 @@
* FIXME.
*/
+#include "config.h"
+
#include <string.h>
#include <glib.h>
#include <gmodule.h>
diff --git a/examples/C/glib/add-connection-gdbus.c b/examples/C/glib/add-connection-gdbus.c
index 7a4d59394..d39032739 100644
--- a/examples/C/glib/add-connection-gdbus.c
+++ b/examples/C/glib/add-connection-gdbus.c
@@ -27,6 +27,8 @@
* gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` -luuid add-connection-gdbus.c -o add-connection-gdbus
*/
+#include "config.h"
+
#include <gio/gio.h>
#include <uuid/uuid.h>
#include <NetworkManager.h>
diff --git a/examples/C/glib/add-connection-libnm.c b/examples/C/glib/add-connection-libnm.c
index f206340e0..75048bd8f 100644
--- a/examples/C/glib/add-connection-libnm.c
+++ b/examples/C/glib/add-connection-libnm.c
@@ -27,6 +27,8 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` add-connection-libnm.c -o add-connection-libnm
*/
+#include "config.h"
+
#include <glib.h>
#include <NetworkManager.h>
diff --git a/examples/C/glib/get-active-connections-gdbus.c b/examples/C/glib/get-active-connections-gdbus.c
index 6a19bf895..9b34f6b21 100644
--- a/examples/C/glib/get-active-connections-gdbus.c
+++ b/examples/C/glib/get-active-connections-gdbus.c
@@ -26,6 +26,8 @@
* gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` get-active-connections-gdbus.c -o get-active-connections-gdbus
*/
+#include "config.h"
+
#include <string.h>
#include <gio/gio.h>
#include <NetworkManager.h>
diff --git a/examples/C/glib/get-ap-info-libnm.c b/examples/C/glib/get-ap-info-libnm.c
index 5868c2790..90bc2d5e7 100644
--- a/examples/C/glib/get-ap-info-libnm.c
+++ b/examples/C/glib/get-ap-info-libnm.c
@@ -25,6 +25,8 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` get-ap-info-libnm.c -o get-ap-info-libnm
*/
+#include "config.h"
+
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/C/glib/list-connections-gdbus.c b/examples/C/glib/list-connections-gdbus.c
index f5922582e..634bd90c8 100644
--- a/examples/C/glib/list-connections-gdbus.c
+++ b/examples/C/glib/list-connections-gdbus.c
@@ -27,6 +27,8 @@
* gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` list-connections-gdbus.c -o list-connections-gdbus
*/
+#include "config.h"
+
#include <gio/gio.h>
#include <NetworkManager.h>
diff --git a/examples/C/glib/list-connections-libnm.c b/examples/C/glib/list-connections-libnm.c
index f09c028b6..d5cdf361d 100644
--- a/examples/C/glib/list-connections-libnm.c
+++ b/examples/C/glib/list-connections-libnm.c
@@ -26,6 +26,8 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` list-connections-libnm.c -o list-connections-libnm
*/
+#include "config.h"
+
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/examples/C/glib/monitor-nm-running-gdbus.c b/examples/C/glib/monitor-nm-running-gdbus.c
index 2e1a11c0c..e4b3bbbfc 100644
--- a/examples/C/glib/monitor-nm-running-gdbus.c
+++ b/examples/C/glib/monitor-nm-running-gdbus.c
@@ -28,6 +28,8 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` monitor-nm-running-gdbus.c -o monitor-nm-running-gdbus
*/
+#include "config.h"
+
#include <gio/gio.h>
static void
diff --git a/examples/C/glib/monitor-nm-state-gdbus.c b/examples/C/glib/monitor-nm-state-gdbus.c
index 05596399d..aeabcfe16 100644
--- a/examples/C/glib/monitor-nm-state-gdbus.c
+++ b/examples/C/glib/monitor-nm-state-gdbus.c
@@ -29,6 +29,8 @@
* gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` `pkg-config --cflags libnm` monitor-nm-state-gdbus.c -o monitor-nm-state-gdbus
*/
+#include "config.h"
+
#include <gio/gio.h>
#include <string.h>
#include <nm-dbus-interface.h>
diff --git a/libnm-core/crypto_gnutls.c b/libnm-core/crypto_gnutls.c
index 28d9bf79b..97609f0a7 100644
--- a/libnm-core/crypto_gnutls.c
+++ b/libnm-core/crypto_gnutls.c
@@ -22,6 +22,7 @@
*/
#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-connection.c b/libnm-core/nm-connection.c
index e2c06c176..b7d0c9e9f 100644
--- a/libnm-core/nm-connection.c
+++ b/libnm-core/nm-connection.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <glib-object.h>
#include <glib/gi18n.h>
#include <string.h>
diff --git a/libnm-core/nm-errors.c b/libnm-core/nm-errors.c
index 2fead92e7..229f14a00 100644
--- a/libnm-core/nm-errors.c
+++ b/libnm-core/nm-errors.c
@@ -18,6 +18,8 @@
* Copyright 2004 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gio/gio.h>
diff --git a/libnm-core/nm-property-compare.c b/libnm-core/nm-property-compare.c
index d3ff94de3..5d270706e 100644
--- a/libnm-core/nm-property-compare.c
+++ b/libnm-core/nm-property-compare.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include "nm-property-compare.h"
#include "nm-glib-compat.h"
diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c
index 6b202dd4f..29fc2b84a 100644
--- a/libnm-core/nm-setting-8021x.c
+++ b/libnm-core/nm-setting-8021x.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-adsl.c b/libnm-core/nm-setting-adsl.c
index dfd1e0107..bc56d481c 100644
--- a/libnm-core/nm-setting-adsl.c
+++ b/libnm-core/nm-setting-adsl.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-bluetooth.c b/libnm-core/nm-setting-bluetooth.c
index 6b169301b..7c852d6bb 100644
--- a/libnm-core/nm-setting-bluetooth.c
+++ b/libnm-core/nm-setting-bluetooth.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <net/ethernet.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c
index ab026aac7..d16b3cb88 100644
--- a/libnm-core/nm-setting-bond.c
+++ b/libnm-core/nm-setting-bond.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c
index d1ffdca3d..5ffa8c0fb 100644
--- a/libnm-core/nm-setting-bridge-port.c
+++ b/libnm-core/nm-setting-bridge-port.c
@@ -19,6 +19,8 @@
* Copyright 2012 - 2013 Red Hat, Inc.
*/
+#include "config.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 100804a01..d34f330d8 100644
--- a/libnm-core/nm-setting-bridge.c
+++ b/libnm-core/nm-setting-bridge.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc.
*/
+#include "config.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 f611cc601..2d37f652b 100644
--- a/libnm-core/nm-setting-cdma.c
+++ b/libnm-core/nm-setting-cdma.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c
index e7f8518d4..8d7b9af95 100644
--- a/libnm-core/nm-setting-connection.c
+++ b/libnm-core/nm-setting-connection.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c
index 8a99ec07b..e7fcdff2b 100644
--- a/libnm-core/nm-setting-dcb.c
+++ b/libnm-core/nm-setting-dcb.c
@@ -19,6 +19,8 @@
* Copyright 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-gsm.c b/libnm-core/nm-setting-gsm.c
index d537376db..fbcdca1bc 100644
--- a/libnm-core/nm-setting-gsm.c
+++ b/libnm-core/nm-setting-gsm.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c
index ed80a1360..c098164b0 100644
--- a/libnm-core/nm-setting-infiniband.c
+++ b/libnm-core/nm-setting-infiniband.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-ip-config.c b/libnm-core/nm-setting-ip-config.c
index 8db1d603c..64f3cdfba 100644
--- a/libnm-core/nm-setting-ip-config.c
+++ b/libnm-core/nm-setting-ip-config.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <arpa/inet.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c
index 6d897b56d..d2f6c6927 100644
--- a/libnm-core/nm-setting-ip4-config.c
+++ b/libnm-core/nm-setting-ip4-config.c
@@ -19,6 +19,8 @@
* Copyright 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c
index 6e3ff6164..94605fcc3 100644
--- a/libnm-core/nm-setting-ip6-config.c
+++ b/libnm-core/nm-setting-ip6-config.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-olpc-mesh.c b/libnm-core/nm-setting-olpc-mesh.c
index 968be898b..43383abf5 100644
--- a/libnm-core/nm-setting-olpc-mesh.c
+++ b/libnm-core/nm-setting-olpc-mesh.c
@@ -20,6 +20,8 @@
* Copyright 2009 One Laptop per Child
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-ppp.c b/libnm-core/nm-setting-ppp.c
index c3511fb89..d67d6329b 100644
--- a/libnm-core/nm-setting-ppp.c
+++ b/libnm-core/nm-setting-ppp.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <glib/gi18n.h>
#include "nm-setting-ppp.h"
diff --git a/libnm-core/nm-setting-pppoe.c b/libnm-core/nm-setting-pppoe.c
index 403560221..93e26ff91 100644
--- a/libnm-core/nm-setting-pppoe.c
+++ b/libnm-core/nm-setting-pppoe.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c
index 8676cb4e6..2ca96edbf 100644
--- a/libnm-core/nm-setting-serial.c
+++ b/libnm-core/nm-setting-serial.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-setting-serial.h"
diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c
index cbdae158e..834f7b3cc 100644
--- a/libnm-core/nm-setting-team-port.c
+++ b/libnm-core/nm-setting-team-port.c
@@ -18,6 +18,8 @@
* Copyright 2013 Jiri Pirko <jiri@resnulli.us>
*/
+#include "config.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 91d80b178..231d80d67 100644
--- a/libnm-core/nm-setting-team.c
+++ b/libnm-core/nm-setting-team.c
@@ -18,6 +18,8 @@
* Copyright 2013 Jiri Pirko <jiri@resnulli.us>
*/
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c
index b0d19c752..b9f2274d6 100644
--- a/libnm-core/nm-setting-vlan.c
+++ b/libnm-core/nm-setting-vlan.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c
index 4130412b6..1f2ffc912 100644
--- a/libnm-core/nm-setting-vpn.c
+++ b/libnm-core/nm-setting-vpn.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/libnm-core/nm-setting-wimax.c b/libnm-core/nm-setting-wimax.c
index ccc46fe4e..2a2f29ee2 100644
--- a/libnm-core/nm-setting-wimax.c
+++ b/libnm-core/nm-setting-wimax.c
@@ -20,6 +20,8 @@
* Copyright 2009 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <net/ethernet.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c
index 7bf1ae2f2..1047d23ee 100644
--- a/libnm-core/nm-setting-wired.c
+++ b/libnm-core/nm-setting-wired.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <net/ethernet.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c
index 35ef2fdcb..05eb0c470 100644
--- a/libnm-core/nm-setting-wireless-security.c
+++ b/libnm-core/nm-setting-wireless-security.c
@@ -20,7 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c
index d374d91b7..564023b9b 100644
--- a/libnm-core/nm-setting-wireless.c
+++ b/libnm-core/nm-setting-wireless.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <net/ethernet.h>
#include <glib/gi18n.h>
diff --git a/libnm-core/nm-setting.c b/libnm-core/nm-setting.c
index f8fb3e95e..cbbc4408f 100644
--- a/libnm-core/nm-setting.c
+++ b/libnm-core/nm-setting.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
diff --git a/libnm-core/nm-simple-connection.c b/libnm-core/nm-simple-connection.c
index 03e5a92d8..93cc4c786 100644
--- a/libnm-core/nm-simple-connection.c
+++ b/libnm-core/nm-simple-connection.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-simple-connection.h"
#include "nm-setting-private.h"
diff --git a/libnm-core/tests/test-compare.c b/libnm-core/tests/test-compare.c
index e6ab047d6..12db9c23b 100644
--- a/libnm-core/tests/test-compare.c
+++ b/libnm-core/tests/test-compare.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <arpa/inet.h>
#include <netinet/in.h>
diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c
index b1dd3f4e0..a61042e66 100644
--- a/libnm-core/tests/test-crypto.c
+++ b/libnm-core/tests/test-crypto.c
@@ -21,6 +21,8 @@
* Copyright 2007 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c
index 522c6eb15..829fb3926 100644
--- a/libnm-core/tests/test-general.c
+++ b/libnm-core/tests/test-general.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c
index bb4b4daea..1254dfffe 100644
--- a/libnm-core/tests/test-secrets.c
+++ b/libnm-core/tests/test-secrets.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/libnm-core/tests/test-setting-8021x.c b/libnm-core/tests/test-setting-8021x.c
index a0c006de5..637ab81c1 100644
--- a/libnm-core/tests/test-setting-8021x.c
+++ b/libnm-core/tests/test-setting-8021x.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/libnm-core/tests/test-setting-dcb.c b/libnm-core/tests/test-setting-dcb.c
index 8d861a039..148991907 100644
--- a/libnm-core/tests/test-setting-dcb.c
+++ b/libnm-core/tests/test-setting-dcb.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <nm-utils.h>
diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c
index c13416c12..73e707158 100644
--- a/libnm-core/tests/test-settings-defaults.c
+++ b/libnm-core/tests/test-settings-defaults.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/libnm-glib/libnm-glib-test.c b/libnm-glib/libnm-glib-test.c
index e38457f06..7dc6823e2 100644
--- a/libnm-glib/libnm-glib-test.c
+++ b/libnm-glib/libnm-glib-test.c
@@ -20,6 +20,8 @@
* Copyright (C) 2007 - 2008 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <signal.h>
#include <string.h>
diff --git a/libnm-glib/libnm_glib.c b/libnm-glib/libnm_glib.c
index a2a6d26ed..fed801606 100644
--- a/libnm-glib/libnm_glib.c
+++ b/libnm-glib/libnm_glib.c
@@ -21,6 +21,8 @@
* Copyright (C) 2005 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index b462a6b16..abf61cc92 100644
--- a/libnm-glib/nm-access-point.c
+++ b/libnm-glib/nm-access-point.c
@@ -19,7 +19,8 @@
* Copyright 2007 - 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-active-connection.c b/libnm-glib/nm-active-connection.c
index 358264fd2..7067a1100 100644
--- a/libnm-glib/nm-active-connection.c
+++ b/libnm-glib/nm-active-connection.c
@@ -19,6 +19,8 @@
* Copyright 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "NetworkManager.h"
diff --git a/libnm-glib/nm-client.c b/libnm-glib/nm-client.c
index f4efc607e..ac26143d1 100644
--- a/libnm-glib/nm-client.c
+++ b/libnm-glib/nm-client.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <dbus/dbus-glib.h>
#include <string.h>
#include <nm-utils.h>
diff --git a/libnm-glib/nm-dbus-helpers.c b/libnm-glib/nm-dbus-helpers.c
index 25004310d..00e04ab43 100644
--- a/libnm-glib/nm-dbus-helpers.c
+++ b/libnm-glib/nm-dbus-helpers.c
@@ -18,8 +18,9 @@
* Copyright 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
-#include <config.h>
#include <gio/gio.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/libnm-glib/nm-device-adsl.c b/libnm-glib/nm-device-adsl.c
index eb5495741..681216837 100644
--- a/libnm-glib/nm-device-adsl.c
+++ b/libnm-glib/nm-device-adsl.c
@@ -19,6 +19,8 @@
* Copyright 2009 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-device-adsl.h"
#include "nm-device-private.h"
#include "nm-object-private.h"
diff --git a/libnm-glib/nm-device-bond.c b/libnm-glib/nm-device-bond.c
index 0529ccb93..786d4f168 100644
--- a/libnm-glib/nm-device-bond.c
+++ b/libnm-glib/nm-device-bond.c
@@ -18,7 +18,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-device-bridge.c b/libnm-glib/nm-device-bridge.c
index bf1973755..ef69fb264 100644
--- a/libnm-glib/nm-device-bridge.c
+++ b/libnm-glib/nm-device-bridge.c
@@ -18,7 +18,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-device-bt.c b/libnm-glib/nm-device-bt.c
index 00616a95a..58d483443 100644
--- a/libnm-glib/nm-device-bt.c
+++ b/libnm-glib/nm-device-bt.c
@@ -19,7 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-device-ethernet.c b/libnm-glib/nm-device-ethernet.c
index 690041a51..d27a980fe 100644
--- a/libnm-glib/nm-device-ethernet.c
+++ b/libnm-glib/nm-device-ethernet.c
@@ -19,7 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-device-generic.c b/libnm-glib/nm-device-generic.c
index 875ea8eb3..a17a67355 100644
--- a/libnm-glib/nm-device-generic.c
+++ b/libnm-glib/nm-device-generic.c
@@ -18,7 +18,7 @@
* Copyright 2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
diff --git a/libnm-glib/nm-device-infiniband.c b/libnm-glib/nm-device-infiniband.c
index 3aa6e03ab..663b36516 100644
--- a/libnm-glib/nm-device-infiniband.c
+++ b/libnm-glib/nm-device-infiniband.c
@@ -18,7 +18,8 @@
* Copyright 2011 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <linux/if_infiniband.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-device-modem.c b/libnm-glib/nm-device-modem.c
index 7d286190f..524d86cea 100644
--- a/libnm-glib/nm-device-modem.c
+++ b/libnm-glib/nm-device-modem.c
@@ -19,7 +19,8 @@
* Copyright 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include "nm-glib-compat.h"
diff --git a/libnm-glib/nm-device-olpc-mesh.c b/libnm-glib/nm-device-olpc-mesh.c
index 666ddc263..e68fda626 100644
--- a/libnm-glib/nm-device-olpc-mesh.c
+++ b/libnm-glib/nm-device-olpc-mesh.c
@@ -18,7 +18,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include "nm-glib-compat.h"
diff --git a/libnm-glib/nm-device-team.c b/libnm-glib/nm-device-team.c
index e9ff548c3..d9a5fce08 100644
--- a/libnm-glib/nm-device-team.c
+++ b/libnm-glib/nm-device-team.c
@@ -18,7 +18,8 @@
* Copyright 2013 Jiri Pirko <jiri@resnulli.us>
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-device-vlan.c b/libnm-glib/nm-device-vlan.c
index 93bf12763..8f8750e22 100644
--- a/libnm-glib/nm-device-vlan.c
+++ b/libnm-glib/nm-device-vlan.c
@@ -18,7 +18,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-device-wifi.c b/libnm-glib/nm-device-wifi.c
index a4c108fb0..28609c79d 100644
--- a/libnm-glib/nm-device-wifi.c
+++ b/libnm-glib/nm-device-wifi.c
@@ -19,7 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-device-wimax.c b/libnm-glib/nm-device-wimax.c
index 8fac2a5ac..f0187fdc1 100644
--- a/libnm-glib/nm-device-wimax.c
+++ b/libnm-glib/nm-device-wimax.c
@@ -19,7 +19,8 @@
* Copyright 2009 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
diff --git a/libnm-glib/nm-device.c b/libnm-glib/nm-device.c
index 64b5dd186..88d9ce8a9 100644
--- a/libnm-glib/nm-device.c
+++ b/libnm-glib/nm-device.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-glib/nm-dhcp4-config.c b/libnm-glib/nm-dhcp4-config.c
index 4fccee903..584793742 100644
--- a/libnm-glib/nm-dhcp4-config.c
+++ b/libnm-glib/nm-dhcp4-config.c
@@ -19,6 +19,8 @@
* Copyright 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-dhcp4-config.h"
diff --git a/libnm-glib/nm-dhcp6-config.c b/libnm-glib/nm-dhcp6-config.c
index 32cc3b475..e55c14166 100644
--- a/libnm-glib/nm-dhcp6-config.c
+++ b/libnm-glib/nm-dhcp6-config.c
@@ -19,6 +19,8 @@
* Copyright 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-dhcp6-config.h"
diff --git a/libnm-glib/nm-ip4-config.c b/libnm-glib/nm-ip4-config.c
index 3ac75254c..ffaef7416 100644
--- a/libnm-glib/nm-ip4-config.c
+++ b/libnm-glib/nm-ip4-config.c
@@ -19,6 +19,8 @@
* Copyright 2008 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <nm-setting-ip4-config.h>
diff --git a/libnm-glib/nm-ip6-config.c b/libnm-glib/nm-ip6-config.c
index 21156090b..d44056a1c 100644
--- a/libnm-glib/nm-ip6-config.c
+++ b/libnm-glib/nm-ip6-config.c
@@ -19,6 +19,8 @@
* Copyright 2008 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <nm-setting-ip6-config.h>
diff --git a/libnm-glib/nm-object-cache.c b/libnm-glib/nm-object-cache.c
index fe388803e..752c606a9 100644
--- a/libnm-glib/nm-object-cache.c
+++ b/libnm-glib/nm-object-cache.c
@@ -18,6 +18,8 @@
* Copyright 2008 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib.h>
#include "nm-object-cache.h"
diff --git a/libnm-glib/nm-object.c b/libnm-glib/nm-object.c
index 3550677df..fb25c1ac4 100644
--- a/libnm-glib/nm-object.c
+++ b/libnm-glib/nm-object.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gio/gio.h>
#include <stdlib.h>
diff --git a/libnm-glib/nm-remote-connection.c b/libnm-glib/nm-remote-connection.c
index e3050b016..4feba8b10 100644
--- a/libnm-glib/nm-remote-connection.c
+++ b/libnm-glib/nm-remote-connection.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gio/gio.h>
#include <glib/gi18n.h>
diff --git a/libnm-glib/nm-remote-settings.c b/libnm-glib/nm-remote-settings.c
index d9c65d773..74ed083f9 100644
--- a/libnm-glib/nm-remote-settings.c
+++ b/libnm-glib/nm-remote-settings.c
@@ -19,6 +19,8 @@
* Copyright 2009 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <NetworkManager.h>
#include <nm-connection.h>
diff --git a/libnm-glib/nm-secret-agent.c b/libnm-glib/nm-secret-agent.c
index 9627d7311..04f8dd8b1 100644
--- a/libnm-glib/nm-secret-agent.c
+++ b/libnm-glib/nm-secret-agent.c
@@ -18,7 +18,8 @@
* Copyright 2010 - 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/libnm-glib/nm-types.c b/libnm-glib/nm-types.c
index cb0ff8ba6..5b434aa97 100644
--- a/libnm-glib/nm-types.c
+++ b/libnm-glib/nm-types.c
@@ -18,6 +18,8 @@
* Copyright 2008 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <dbus/dbus-glib.h>
#include <string.h>
diff --git a/libnm-glib/nm-vpn-connection.c b/libnm-glib/nm-vpn-connection.c
index 689f58fd8..16e8db5e9 100644
--- a/libnm-glib/nm-vpn-connection.c
+++ b/libnm-glib/nm-vpn-connection.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-vpn-connection.h"
#include "NetworkManager.h"
diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.c b/libnm-glib/nm-vpn-plugin-ui-interface.c
index a4a10836e..b94084e2b 100644
--- a/libnm-glib/nm-vpn-plugin-ui-interface.c
+++ b/libnm-glib/nm-vpn-plugin-ui-interface.c
@@ -19,6 +19,8 @@
* Copyright 2008 Novell, Inc.
*/
+#include "config.h"
+
#include "nm-vpn-plugin-ui-interface.h"
static void
diff --git a/libnm-glib/nm-vpn-plugin-utils.c b/libnm-glib/nm-vpn-plugin-utils.c
index 0e800e9c1..9aafb19f0 100644
--- a/libnm-glib/nm-vpn-plugin-utils.c
+++ b/libnm-glib/nm-vpn-plugin-utils.c
@@ -18,6 +18,8 @@
* Copyright 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/libnm-glib/nm-vpn-plugin.c b/libnm-glib/nm-vpn-plugin.c
index 08fb647ad..7848c131c 100644
--- a/libnm-glib/nm-vpn-plugin.c
+++ b/libnm-glib/nm-vpn-plugin.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2008 Red Hat, Inc.
*/
+#include "config.h"
+
#include <signal.h>
#include "nm-glib-compat.h"
#include "nm-vpn-plugin.h"
diff --git a/libnm-glib/nm-wimax-nsp.c b/libnm-glib/nm-wimax-nsp.c
index 1cbd3eefd..1735ab3ee 100644
--- a/libnm-glib/nm-wimax-nsp.c
+++ b/libnm-glib/nm-wimax-nsp.c
@@ -18,7 +18,8 @@
* Copyright 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include "nm-glib-compat.h"
diff --git a/libnm-glib/tests/common.c b/libnm-glib/tests/common.c
index 0dbdac54c..540d43afa 100644
--- a/libnm-glib/tests/common.c
+++ b/libnm-glib/tests/common.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <dbus/dbus.h>
#include <glib.h>
#include <string.h>
diff --git a/libnm-glib/tests/test-nm-client.c b/libnm-glib/tests/test-nm-client.c
index eebf8358c..989c09766 100644
--- a/libnm-glib/tests/test-nm-client.c
+++ b/libnm-glib/tests/test-nm-client.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/libnm-glib/tests/test-remote-settings-client.c b/libnm-glib/tests/test-remote-settings-client.c
index 987845c1b..237e287f8 100644
--- a/libnm-glib/tests/test-remote-settings-client.c
+++ b/libnm-glib/tests/test-remote-settings-client.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <dbus/dbus.h>
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c
index be16d135a..9c20f589e 100644
--- a/libnm-util/crypto_gnutls.c
+++ b/libnm-util/crypto_gnutls.c
@@ -22,6 +22,7 @@
*/
#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-connection.c b/libnm-util/nm-connection.c
index e59f8f50a..1268d20ca 100644
--- a/libnm-util/nm-connection.c
+++ b/libnm-util/nm-connection.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <glib-object.h>
#include <glib/gi18n.h>
#include <dbus/dbus-glib.h>
diff --git a/libnm-util/nm-param-spec-specialized.c b/libnm-util/nm-param-spec-specialized.c
index 2b4ca230a..acb8aec33 100644
--- a/libnm-util/nm-param-spec-specialized.c
+++ b/libnm-util/nm-param-spec-specialized.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include "nm-param-spec-specialized.h"
#include "nm-glib-compat.h"
diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c
index 0f7f6bd56..94a26e18f 100644
--- a/libnm-util/nm-setting-8021x.c
+++ b/libnm-util/nm-setting-8021x.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-adsl.c b/libnm-util/nm-setting-adsl.c
index 76fa63b91..5b0ae2baf 100644
--- a/libnm-util/nm-setting-adsl.c
+++ b/libnm-util/nm-setting-adsl.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-bluetooth.c b/libnm-util/nm-setting-bluetooth.c
index 506ecbdde..487f366e1 100644
--- a/libnm-util/nm-setting-bluetooth.c
+++ b/libnm-util/nm-setting-bluetooth.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <net/ethernet.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c
index 7d82d31d2..515f3d598 100644
--- a/libnm-util/nm-setting-bond.c
+++ b/libnm-util/nm-setting-bond.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c
index aaa172d4a..366efe016 100644
--- a/libnm-util/nm-setting-bridge-port.c
+++ b/libnm-util/nm-setting-bridge-port.c
@@ -19,6 +19,8 @@
* Copyright 2012 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c
index 50f6cdbcb..fda46842b 100644
--- a/libnm-util/nm-setting-bridge.c
+++ b/libnm-util/nm-setting-bridge.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/libnm-util/nm-setting-cdma.c b/libnm-util/nm-setting-cdma.c
index 976a59680..f60869a58 100644
--- a/libnm-util/nm-setting-cdma.c
+++ b/libnm-util/nm-setting-cdma.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c
index f54b47ed5..c767170aa 100644
--- a/libnm-util/nm-setting-connection.c
+++ b/libnm-util/nm-setting-connection.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c
index 6d2d7ee63..6192d7639 100644
--- a/libnm-util/nm-setting-dcb.c
+++ b/libnm-util/nm-setting-dcb.c
@@ -19,6 +19,8 @@
* Copyright 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-gsm.c b/libnm-util/nm-setting-gsm.c
index 51ad39024..5b91a4c0f 100644
--- a/libnm-util/nm-setting-gsm.c
+++ b/libnm-util/nm-setting-gsm.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c
index d51973adf..71942c60e 100644
--- a/libnm-util/nm-setting-infiniband.c
+++ b/libnm-util/nm-setting-infiniband.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <dbus/dbus-glib.h>
#include <linux/if_infiniband.h>
diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c
index c7a730769..c86e061fb 100644
--- a/libnm-util/nm-setting-ip4-config.c
+++ b/libnm-util/nm-setting-ip4-config.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c
index 94233bf97..e13587bb7 100644
--- a/libnm-util/nm-setting-ip6-config.c
+++ b/libnm-util/nm-setting-ip6-config.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-olpc-mesh.c b/libnm-util/nm-setting-olpc-mesh.c
index 408f6833f..e67ac9601 100644
--- a/libnm-util/nm-setting-olpc-mesh.c
+++ b/libnm-util/nm-setting-olpc-mesh.c
@@ -20,6 +20,8 @@
* Copyright 2009 One Laptop per Child
*/
+#include "config.h"
+
#include <string.h>
#include <netinet/ether.h>
#include <dbus/dbus-glib.h>
diff --git a/libnm-util/nm-setting-ppp.c b/libnm-util/nm-setting-ppp.c
index 0e7c598b9..041253a96 100644
--- a/libnm-util/nm-setting-ppp.c
+++ b/libnm-util/nm-setting-ppp.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <glib/gi18n.h>
#include "nm-setting-ppp.h"
diff --git a/libnm-util/nm-setting-pppoe.c b/libnm-util/nm-setting-pppoe.c
index a3923336c..08a0ea297 100644
--- a/libnm-util/nm-setting-pppoe.c
+++ b/libnm-util/nm-setting-pppoe.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c
index 0f03e29ff..20b1a0103 100644
--- a/libnm-util/nm-setting-serial.c
+++ b/libnm-util/nm-setting-serial.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-setting-serial.h"
diff --git a/libnm-util/nm-setting-team-port.c b/libnm-util/nm-setting-team-port.c
index 73cdf5c14..c2914ce2b 100644
--- a/libnm-util/nm-setting-team-port.c
+++ b/libnm-util/nm-setting-team-port.c
@@ -18,6 +18,8 @@
* Copyright 2013 Jiri Pirko <jiri@resnulli.us>
*/
+#include "config.h"
+
#include <string.h>
#include <ctype.h>
#include <stdlib.h>
diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c
index 3edeeefc1..27a9e8a66 100644
--- a/libnm-util/nm-setting-team.c
+++ b/libnm-util/nm-setting-team.c
@@ -18,6 +18,8 @@
* Copyright 2013 Jiri Pirko <jiri@resnulli.us>
*/
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
#include <dbus/dbus-glib.h>
diff --git a/libnm-util/nm-setting-template.c b/libnm-util/nm-setting-template.c
index 7944fd9b8..3c90a49ec 100644
--- a/libnm-util/nm-setting-template.c
+++ b/libnm-util/nm-setting-template.c
@@ -27,6 +27,8 @@
remove this comment, and you're almost done.
*/
+#include "config.h"
+
#include "nm-setting-template.h"
G_DEFINE_TYPE (NMSettingTemplate, nm_setting_template, NM_TYPE_SETTING)
diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c
index b7a35fa3d..a42c60e09 100644
--- a/libnm-util/nm-setting-vlan.c
+++ b/libnm-util/nm-setting-vlan.c
@@ -19,6 +19,8 @@
* Copyright 2011 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <dbus/dbus-glib.h>
diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c
index 77c64ce48..ea44d9988 100644
--- a/libnm-util/nm-setting-vpn.c
+++ b/libnm-util/nm-setting-vpn.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c
index 1a4a6ec38..12e60a46d 100644
--- a/libnm-util/nm-setting-wimax.c
+++ b/libnm-util/nm-setting-wimax.c
@@ -20,6 +20,8 @@
* Copyright 2009 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <net/ethernet.h>
#include <dbus/dbus-glib.h>
diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c
index 02cf7fbf3..a852b25ac 100644
--- a/libnm-util/nm-setting-wired.c
+++ b/libnm-util/nm-setting-wired.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <net/ethernet.h>
#include <netinet/ether.h>
diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c
index 70217e021..555b8955c 100644
--- a/libnm-util/nm-setting-wireless-security.c
+++ b/libnm-util/nm-setting-wireless-security.c
@@ -20,7 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <dbus/dbus-glib.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c
index bbb0c6644..87a9b55b8 100644
--- a/libnm-util/nm-setting-wireless.c
+++ b/libnm-util/nm-setting-wireless.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <net/ethernet.h>
#include <netinet/ether.h>
diff --git a/libnm-util/nm-setting.c b/libnm-util/nm-setting.c
index 5c3dc1e10..f5026a4c0 100644
--- a/libnm-util/nm-setting.c
+++ b/libnm-util/nm-setting.c
@@ -20,6 +20,8 @@
* Copyright 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm-util/tests/test-crypto.c b/libnm-util/tests/test-crypto.c
index 677f11620..9be9f2ae5 100644
--- a/libnm-util/tests/test-crypto.c
+++ b/libnm-util/tests/test-crypto.c
@@ -21,6 +21,8 @@
* Copyright 2007 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <unistd.h>
#include <stdlib.h>
diff --git a/libnm-util/tests/test-general.c b/libnm-util/tests/test-general.c
index eea22b5f3..c0cdb70a1 100644
--- a/libnm-util/tests/test-general.c
+++ b/libnm-util/tests/test-general.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <dbus/dbus-glib.h>
#include <string.h>
diff --git a/libnm-util/tests/test-libnm-linking.c b/libnm-util/tests/test-libnm-linking.c
index 68c90e9f0..9738d44d7 100644
--- a/libnm-util/tests/test-libnm-linking.c
+++ b/libnm-util/tests/test-libnm-linking.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <nm-utils.h>
diff --git a/libnm-util/tests/test-secrets.c b/libnm-util/tests/test-secrets.c
index b829d12ee..085f10bfc 100644
--- a/libnm-util/tests/test-secrets.c
+++ b/libnm-util/tests/test-secrets.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/libnm-util/tests/test-setting-8021x.c b/libnm-util/tests/test-setting-8021x.c
index ddd76f018..4b37d92b7 100644
--- a/libnm-util/tests/test-setting-8021x.c
+++ b/libnm-util/tests/test-setting-8021x.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/libnm-util/tests/test-setting-dcb.c b/libnm-util/tests/test-setting-dcb.c
index 4b114ada3..1c7d78b8c 100644
--- a/libnm-util/tests/test-setting-dcb.c
+++ b/libnm-util/tests/test-setting-dcb.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <nm-utils.h>
diff --git a/libnm-util/tests/test-settings-defaults.c b/libnm-util/tests/test-settings-defaults.c
index 9104b4bc6..7441e1ff5 100644
--- a/libnm-util/tests/test-settings-defaults.c
+++ b/libnm-util/tests/test-settings-defaults.c
@@ -19,6 +19,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/libnm/nm-access-point.c b/libnm/nm-access-point.c
index dfc724019..29c700125 100644
--- a/libnm/nm-access-point.c
+++ b/libnm/nm-access-point.c
@@ -19,7 +19,8 @@
* Copyright 2007 - 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include "nm-glib-compat.h"
diff --git a/libnm/nm-active-connection.c b/libnm/nm-active-connection.c
index 6988f44c6..31f513280 100644
--- a/libnm/nm-active-connection.c
+++ b/libnm/nm-active-connection.c
@@ -19,6 +19,8 @@
* Copyright 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-dbus-interface.h"
diff --git a/libnm/nm-client.c b/libnm/nm-client.c
index 4e4f194f5..2483ece0b 100644
--- a/libnm/nm-client.c
+++ b/libnm/nm-client.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <nm-utils.h>
diff --git a/libnm/nm-dbus-helpers.c b/libnm/nm-dbus-helpers.c
index 5b24b2a36..7a99e70d2 100644
--- a/libnm/nm-dbus-helpers.c
+++ b/libnm/nm-dbus-helpers.c
@@ -18,8 +18,9 @@
* Copyright 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
-#include <config.h>
#include <gio/gio.h>
#include "nm-dbus-helpers.h"
#include "nm-dbus-interface.h"
diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c
index af0afa52d..b50933583 100644
--- a/libnm/nm-device-adsl.c
+++ b/libnm/nm-device-adsl.c
@@ -19,6 +19,8 @@
* Copyright 2009 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-device-adsl.h"
#include "nm-device-private.h"
#include "nm-object-private.h"
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index 7f2ada911..af6d3d18f 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -18,7 +18,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 5a3782e74..6d5367402 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -18,7 +18,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index 5673792cf..0f949372e 100644
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -19,7 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index c240aa968..a8db0ffc0 100644
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -19,7 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c
index a2a493536..93c9dccc9 100644
--- a/libnm/nm-device-generic.c
+++ b/libnm/nm-device-generic.c
@@ -18,7 +18,7 @@
* Copyright 2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index 1409e0b29..2d755ba44 100644
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -18,7 +18,8 @@
* Copyright 2011 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index 25c63f753..a2911f084 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -19,7 +19,8 @@
* Copyright 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c
index 6b5df27ca..b881687ff 100644
--- a/libnm/nm-device-olpc-mesh.c
+++ b/libnm/nm-device-olpc-mesh.c
@@ -18,7 +18,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index d76baf22a..e892d827c 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -18,7 +18,8 @@
* Copyright 2013 Jiri Pirko <jiri@resnulli.us>
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index 51bf90136..57acb7a8e 100644
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -18,7 +18,8 @@
* Copyright 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index c57c19c3f..493bd79b5 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -19,7 +19,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index 13097198c..e400057ab 100644
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -19,7 +19,8 @@
* Copyright 2009 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index a6d5fe306..66e9cc078 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-dhcp-config.c b/libnm/nm-dhcp-config.c
index 5b72fbc10..86cbdc3e3 100644
--- a/libnm/nm-dhcp-config.c
+++ b/libnm/nm-dhcp-config.c
@@ -19,6 +19,8 @@
* Copyright 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-dhcp-config.h"
diff --git a/libnm/nm-dhcp4-config.c b/libnm/nm-dhcp4-config.c
index 6bbd8d6b5..808edaa64 100644
--- a/libnm/nm-dhcp4-config.c
+++ b/libnm/nm-dhcp4-config.c
@@ -18,6 +18,8 @@
* Copyright 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-dhcp4-config.h"
#include "nm-object-private.h"
diff --git a/libnm/nm-dhcp6-config.c b/libnm/nm-dhcp6-config.c
index c332dcaa8..0bd924c40 100644
--- a/libnm/nm-dhcp6-config.c
+++ b/libnm/nm-dhcp6-config.c
@@ -18,6 +18,8 @@
* Copyright 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-dhcp6-config.h"
#include "nm-object-private.h"
diff --git a/libnm/nm-ip-config.c b/libnm/nm-ip-config.c
index fb50ac039..e8c450fa3 100644
--- a/libnm/nm-ip-config.c
+++ b/libnm/nm-ip-config.c
@@ -19,6 +19,8 @@
* Copyright 2008 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-ip-config.h"
diff --git a/libnm/nm-ip4-config.c b/libnm/nm-ip4-config.c
index 8a7e007bf..26797dd7c 100644
--- a/libnm/nm-ip4-config.c
+++ b/libnm/nm-ip4-config.c
@@ -18,6 +18,8 @@
* Copyright 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-ip4-config.h"
#include "nm-object-private.h"
diff --git a/libnm/nm-ip6-config.c b/libnm/nm-ip6-config.c
index cd64e7594..8a6c966c3 100644
--- a/libnm/nm-ip6-config.c
+++ b/libnm/nm-ip6-config.c
@@ -18,6 +18,8 @@
* Copyright 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-ip6-config.h"
#include "nm-object-private.h"
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index fc558620c..e0301fd34 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
#include <nm-utils.h>
diff --git a/libnm/nm-object-cache.c b/libnm/nm-object-cache.c
index fe388803e..752c606a9 100644
--- a/libnm/nm-object-cache.c
+++ b/libnm/nm-object-cache.c
@@ -18,6 +18,8 @@
* Copyright 2008 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib.h>
#include "nm-object-cache.h"
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 4bc82b8b1..21a6ad7f8 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gio/gio.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index a8592231c..0c5370588 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gio/gio.h>
#include <glib/gi18n.h>
diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c
index 754fbe130..633d25dba 100644
--- a/libnm/nm-remote-settings.c
+++ b/libnm/nm-remote-settings.c
@@ -19,6 +19,8 @@
* Copyright 2009 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gi18n.h>
#include <nm-dbus-interface.h>
diff --git a/libnm/nm-secret-agent.c b/libnm/nm-secret-agent.c
index 2dfde7a09..0830ba1d8 100644
--- a/libnm/nm-secret-agent.c
+++ b/libnm/nm-secret-agent.c
@@ -18,7 +18,8 @@
* Copyright 2010 - 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include "nm-glib-compat.h"
diff --git a/libnm/nm-vpn-connection.c b/libnm/nm-vpn-connection.c
index 8e7605aef..f46dc0ca0 100644
--- a/libnm/nm-vpn-connection.c
+++ b/libnm/nm-vpn-connection.c
@@ -19,6 +19,8 @@
* Copyright 2007 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-vpn-connection.h"
#include "nm-dbus-interface.h"
diff --git a/libnm/nm-vpn-editor-plugin.c b/libnm/nm-vpn-editor-plugin.c
index 02393fa8e..904a6be48 100644
--- a/libnm/nm-vpn-editor-plugin.c
+++ b/libnm/nm-vpn-editor-plugin.c
@@ -19,6 +19,8 @@
* Copyright 2008 Novell, Inc.
*/
+#include "config.h"
+
#include "nm-vpn-editor-plugin.h"
static void nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface);
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index e43dbacb1..c4d7de432 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -23,6 +23,8 @@
* will be a new "NMVpnPlugin" class to replace it.
*/
+#include "config.h"
+
#include <errno.h>
#include <signal.h>
#include <stdlib.h>
diff --git a/libnm/nm-wimax-nsp.c b/libnm/nm-wimax-nsp.c
index 9532b1762..0fed1c6e4 100644
--- a/libnm/nm-wimax-nsp.c
+++ b/libnm/nm-wimax-nsp.c
@@ -18,7 +18,8 @@
* Copyright 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include "nm-glib-compat.h"
diff --git a/libnm/tests/common.c b/libnm/tests/common.c
index 79308329a..a28e5112b 100644
--- a/libnm/tests/common.c
+++ b/libnm/tests/common.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/libnm/tests/test-nm-client.c b/libnm/tests/test-nm-client.c
index 35836e6bd..48b16b469 100644
--- a/libnm/tests/test-nm-client.c
+++ b/libnm/tests/test-nm-client.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <sys/types.h>
diff --git a/libnm/tests/test-remote-settings-client.c b/libnm/tests/test-remote-settings-client.c
index d3af02052..8f9dc27f2 100644
--- a/libnm/tests/test-remote-settings-client.c
+++ b/libnm/tests/test-remote-settings-client.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <sys/types.h>
diff --git a/libnm/tests/test-secret-agent.c b/libnm/tests/test-secret-agent.c
index 76f8a02e2..b008e2139 100644
--- a/libnm/tests/test-secret-agent.c
+++ b/libnm/tests/test-secret-agent.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <sys/types.h>
diff --git a/src/devices/adsl/nm-atm-manager.c b/src/devices/adsl/nm-atm-manager.c
index 1c8ea6b6b..6f34c02bb 100644
--- a/src/devices/adsl/nm-atm-manager.c
+++ b/src/devices/adsl/nm-atm-manager.c
@@ -18,7 +18,7 @@
* Copyright (C) 2009 - 2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
#include <gudev/gudev.h>
diff --git a/src/devices/adsl/nm-device-adsl.c b/src/devices/adsl/nm-device-adsl.c
index abe2b3301..fac6ce0e6 100644
--- a/src/devices/adsl/nm-device-adsl.c
+++ b/src/devices/adsl/nm-device-adsl.c
@@ -18,7 +18,7 @@
* Pantelis Koukousoulas <pktoss@gmail.com>
*/
-#include <config.h>
+#include "config.h"
#include <sys/socket.h>
#include <linux/atmdev.h>
diff --git a/src/devices/bluetooth/nm-bluez-device.c b/src/devices/bluetooth/nm-bluez-device.c
index 6e80708d8..fe1a97bba 100644
--- a/src/devices/bluetooth/nm-bluez-device.c
+++ b/src/devices/bluetooth/nm-bluez-device.c
@@ -19,6 +19,8 @@
* Copyright (C) 2013 Intel Corporation.
*/
+#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
#include <gio/gio.h>
diff --git a/src/devices/bluetooth/nm-bluez-manager.c b/src/devices/bluetooth/nm-bluez-manager.c
index f054e5b30..e176a4b46 100644
--- a/src/devices/bluetooth/nm-bluez-manager.c
+++ b/src/devices/bluetooth/nm-bluez-manager.c
@@ -18,6 +18,8 @@
* Copyright (C) 2013 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <signal.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/devices/bluetooth/nm-bluez4-adapter.c b/src/devices/bluetooth/nm-bluez4-adapter.c
index dd3304eab..9d1cfe1fe 100644
--- a/src/devices/bluetooth/nm-bluez4-adapter.c
+++ b/src/devices/bluetooth/nm-bluez4-adapter.c
@@ -18,6 +18,8 @@
* Copyright (C) 2009 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/src/devices/bluetooth/nm-bluez4-manager.c b/src/devices/bluetooth/nm-bluez4-manager.c
index 2660cbd92..23b13d32d 100644
--- a/src/devices/bluetooth/nm-bluez4-manager.c
+++ b/src/devices/bluetooth/nm-bluez4-manager.c
@@ -19,6 +19,8 @@
* Copyright (C) 2007 - 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <signal.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/devices/bluetooth/nm-bluez5-dun.c b/src/devices/bluetooth/nm-bluez5-dun.c
index 5bdd80145..a97eaa770 100644
--- a/src/devices/bluetooth/nm-bluez5-dun.c
+++ b/src/devices/bluetooth/nm-bluez5-dun.c
@@ -18,7 +18,8 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <sys/socket.h>
#include <bluetooth/sdp.h>
#include <bluetooth/sdp_lib.h>
diff --git a/src/devices/bluetooth/nm-bluez5-manager.c b/src/devices/bluetooth/nm-bluez5-manager.c
index 8653c285e..b85685239 100644
--- a/src/devices/bluetooth/nm-bluez5-manager.c
+++ b/src/devices/bluetooth/nm-bluez5-manager.c
@@ -20,6 +20,8 @@
* Copyright (C) 2013 Intel Corporation.
*/
+#include "config.h"
+
#include <signal.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/devices/bluetooth/nm-bt-error.c b/src/devices/bluetooth/nm-bt-error.c
index d014a107c..e3b8e7f58 100644
--- a/src/devices/bluetooth/nm-bt-error.c
+++ b/src/devices/bluetooth/nm-bt-error.c
@@ -18,6 +18,8 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include "nm-bt-error.h"
diff --git a/src/devices/nm-device-ethernet-utils.c b/src/devices/nm-device-ethernet-utils.c
index 631dd34d8..585f6a0e0 100644
--- a/src/devices/nm-device-ethernet-utils.c
+++ b/src/devices/nm-device-ethernet-utils.c
@@ -16,6 +16,8 @@
* (C) Copyright 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib.h>
#include <glib/gi18n.h>
diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
index eb1f75b45..541c12c01 100644
--- a/src/devices/nm-device-ethernet.c
+++ b/src/devices/nm-device-ethernet.c
@@ -20,6 +20,7 @@
*/
#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
#include <netinet/in.h>
diff --git a/src/devices/nm-device-factory.c b/src/devices/nm-device-factory.c
index 80488aec3..abfb8d4a6 100644
--- a/src/devices/nm-device-factory.c
+++ b/src/devices/nm-device-factory.c
@@ -18,6 +18,8 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-device-factory.h"
enum {
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 263e1f64d..39a9f282b 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -19,7 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
#include <dbus/dbus.h>
diff --git a/src/devices/team/nm-team-factory.c b/src/devices/team/nm-team-factory.c
index 8f6930aa2..cb887cac2 100644
--- a/src/devices/team/nm-team-factory.c
+++ b/src/devices/team/nm-team-factory.c
@@ -18,10 +18,11 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gmodule.h>
-#include "config.h"
#include "nm-device-factory.h"
#include "nm-team-factory.h"
#include "nm-device-team.h"
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index d80179598..0f5aa1648 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -25,6 +25,7 @@
*/
#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
#include <dbus/dbus.h>
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 3e8d02d0e..440f1225d 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -19,6 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
#include <dbus/dbus.h>
diff --git a/src/devices/wifi/nm-wifi-ap-utils.c b/src/devices/wifi/nm-wifi-ap-utils.c
index 85d76d218..9ac7052e9 100644
--- a/src/devices/wifi/nm-wifi-ap-utils.c
+++ b/src/devices/wifi/nm-wifi-ap-utils.c
@@ -18,7 +18,8 @@
* (C) Copyright 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
diff --git a/src/devices/wifi/nm-wifi-ap.c b/src/devices/wifi/nm-wifi-ap.c
index c775940f0..ee07cf40d 100644
--- a/src/devices/wifi/nm-wifi-ap.c
+++ b/src/devices/wifi/nm-wifi-ap.c
@@ -19,6 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
diff --git a/src/devices/wifi/nm-wifi-factory.c b/src/devices/wifi/nm-wifi-factory.c
index bca588e6e..4093c6123 100644
--- a/src/devices/wifi/nm-wifi-factory.c
+++ b/src/devices/wifi/nm-wifi-factory.c
@@ -18,6 +18,8 @@
* Copyright (C) 2011 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <gmodule.h>
#include "nm-device-factory.h"
diff --git a/src/devices/wifi/tests/test-wifi-ap-utils.c b/src/devices/wifi/tests/test-wifi-ap-utils.c
index 35920e932..fb335b898 100644
--- a/src/devices/wifi/tests/test-wifi-ap-utils.c
+++ b/src/devices/wifi/tests/test-wifi-ap-utils.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/src/devices/wimax/iwmxsdk.c b/src/devices/wimax/iwmxsdk.c
index 250808881..1c2c68214 100644
--- a/src/devices/wimax/iwmxsdk.c
+++ b/src/devices/wimax/iwmxsdk.c
@@ -19,9 +19,7 @@
*
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/devices/wimax/nm-device-wimax.c b/src/devices/wimax/nm-device-wimax.c
index 34c2d2a54..466cd9793 100644
--- a/src/devices/wimax/nm-device-wimax.c
+++ b/src/devices/wimax/nm-device-wimax.c
@@ -19,6 +19,8 @@
* Copyright (C) 2009 Novell, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
diff --git a/src/devices/wimax/nm-wimax-factory.c b/src/devices/wimax/nm-wimax-factory.c
index 920591984..39e9a2873 100644
--- a/src/devices/wimax/nm-wimax-factory.c
+++ b/src/devices/wimax/nm-wimax-factory.c
@@ -18,6 +18,8 @@
* Copyright (C) 2011 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <gmodule.h>
#include "nm-device-factory.h"
diff --git a/src/devices/wimax/nm-wimax-nsp.c b/src/devices/wimax/nm-wimax-nsp.c
index aa4ca5fa0..f4db63f02 100644
--- a/src/devices/wimax/nm-wimax-nsp.c
+++ b/src/devices/wimax/nm-wimax-nsp.c
@@ -19,6 +19,8 @@
* Copyright (C) 2009 Novell, Inc.
*/
+#include "config.h"
+
#include "nm-wimax-nsp.h"
#include "nm-dbus-interface.h"
#include "nm-dbus-manager.h"
diff --git a/src/devices/wimax/nm-wimax-util.c b/src/devices/wimax/nm-wimax-util.c
index 3c90ebae9..0ae285aed 100644
--- a/src/devices/wimax/nm-wimax-util.c
+++ b/src/devices/wimax/nm-wimax-util.c
@@ -18,6 +18,8 @@
* Copyright (C) 2009 Novell, Inc.
*/
+#include "config.h"
+
#include "nm-wimax-util.h"
#include "nm-utils.h"
#include "iwmxsdk.h"
diff --git a/src/devices/wwan/nm-modem-broadband.c b/src/devices/wwan/nm-modem-broadband.c
index cf61a077f..f8239b799 100644
--- a/src/devices/wwan/nm-modem-broadband.c
+++ b/src/devices/wwan/nm-modem-broadband.c
@@ -18,6 +18,8 @@
* Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
*/
+#include "config.h"
+
#include <glib/gi18n.h>
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/devices/wwan/nm-modem.c b/src/devices/wwan/nm-modem.c
index ba01d5ca4..ba1db8a4e 100644
--- a/src/devices/wwan/nm-modem.c
+++ b/src/devices/wwan/nm-modem.c
@@ -19,6 +19,8 @@
* Copyright (C) 2009 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include "nm-modem.h"
#include "nm-platform.h"
diff --git a/src/devices/wwan/nm-wwan-factory.c b/src/devices/wwan/nm-wwan-factory.c
index a2f3d3576..2b9c3d4dd 100644
--- a/src/devices/wwan/nm-wwan-factory.c
+++ b/src/devices/wwan/nm-wwan-factory.c
@@ -18,10 +18,11 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gmodule.h>
-#include "config.h"
#include "nm-device-factory.h"
#include "nm-wwan-factory.h"
#include "nm-modem-manager.h"
diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c
index 28959da3d..4e5655002 100644
--- a/src/dhcp-manager/nm-dhcp-client.c
+++ b/src/dhcp-manager/nm-dhcp-client.c
@@ -17,7 +17,8 @@
*
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <sys/types.h>
diff --git a/src/dhcp-manager/nm-dhcp-dhclient-utils.c b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
index 3c3c42c84..ec40bbd29 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient-utils.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient-utils.c
@@ -17,7 +17,7 @@
* Copyright (C) 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <glib.h>
#include <glib/gi18n.h>
diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c
index 4cabb2257..31e48331e 100644
--- a/src/dhcp-manager/nm-dhcp-dhclient.c
+++ b/src/dhcp-manager/nm-dhcp-dhclient.c
@@ -18,6 +18,8 @@
* Copyright (C) 2005 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#define _XOPEN_SOURCE
#include <time.h>
#undef _XOPEN_SOURCE
@@ -34,8 +36,6 @@
#include <arpa/inet.h>
#include <ctype.h>
-#include <config.h>
-
#include "nm-dhcp-dhclient.h"
#include "nm-utils.h"
#include "nm-logging.h"
diff --git a/src/dhcp-manager/nm-dhcp-dhcpcd.c b/src/dhcp-manager/nm-dhcp-dhcpcd.c
index 9aacba766..e5a40c2fb 100644
--- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
@@ -21,7 +21,8 @@
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
#include <string.h>
diff --git a/src/dhcp-manager/nm-dhcp-helper.c b/src/dhcp-manager/nm-dhcp-helper.c
index a9c8f396e..7855f68c9 100644
--- a/src/dhcp-manager/nm-dhcp-helper.c
+++ b/src/dhcp-manager/nm-dhcp-helper.c
@@ -18,7 +18,7 @@
* Copyright (C) 2007 - 2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <unistd.h>
#include <stdlib.h>
diff --git a/src/dhcp-manager/nm-dhcp-listener.c b/src/dhcp-manager/nm-dhcp-listener.c
index 07c153e72..b995c3485 100644
--- a/src/dhcp-manager/nm-dhcp-listener.c
+++ b/src/dhcp-manager/nm-dhcp-listener.c
@@ -17,7 +17,8 @@
*
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
#include <dbus/dbus.h>
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 70372c90d..968d783df 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -21,6 +21,7 @@
*/
#include "config.h"
+
#include <glib.h>
#include <glib/gi18n.h>
#include <sys/socket.h>
diff --git a/src/dhcp-manager/nm-dhcp-systemd.c b/src/dhcp-manager/nm-dhcp-systemd.c
index 3910339e5..ecb4282dc 100644
--- a/src/dhcp-manager/nm-dhcp-systemd.c
+++ b/src/dhcp-manager/nm-dhcp-systemd.c
@@ -16,7 +16,7 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <glib.h>
#include <glib/gi18n.h>
diff --git a/src/dhcp-manager/nm-dhcp-utils.c b/src/dhcp-manager/nm-dhcp-utils.c
index 4b8c44a45..5aa25ff0c 100644
--- a/src/dhcp-manager/nm-dhcp-utils.c
+++ b/src/dhcp-manager/nm-dhcp-utils.c
@@ -17,7 +17,8 @@
*
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c
index dbc922e9e..cc5ad2abd 100644
--- a/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c
+++ b/src/dhcp-manager/systemd-dhcp/nm-sd-adapt.c
@@ -16,7 +16,8 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <unistd.h>
#include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c
index 26e6e9f3d..971b3aa18 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-network.c
@@ -17,6 +17,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c
index 50ecf8738..9759e575a 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-option.c
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <stdint.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c
index e6ebf86ae..5bb065ba1 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp-packet.c
@@ -18,6 +18,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <stdlib.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c
index 626a4d6a7..fbb20ef94 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-network.c
@@ -17,6 +17,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c
index c18fb2a66..17398a5a4 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/dhcp6-option.c
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <netinet/in.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c
index f870e3bb4..7fc49b4ce 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/network-internal.c
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <netinet/ether.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
index 18c23f15c..30c5c940c 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-client.c
@@ -17,6 +17,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <stdlib.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
index e61ae051f..d2b83a250 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp-lease.c
@@ -18,6 +18,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <stdlib.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
index f9a9d5e9e..935bc947e 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-client.c
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c
index 6a1cb22da..0df6984d6 100644
--- a/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c
+++ b/src/dhcp-manager/systemd-dhcp/src/libsystemd-network/sd-dhcp6-lease.c
@@ -18,6 +18,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
index ffdc12211..75437d08f 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/fileio.c
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include <unistd.h>
#include <sys/sendfile.h>
#include "fileio.h"
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c b/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c
index 5fbee6caf..49882d06b 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/in-addr-util.c
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include <arpa/inet.h>
#include "in-addr-util.h"
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
index f68bd283a..f9e59c6f5 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/siphash24.c
@@ -14,6 +14,8 @@
(Minimal changes made by Lennart Poettering, to make clean for inclusion in systemd)
*/
+#include "config.h"
+
#include <stdint.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/strv.c b/src/dhcp-manager/systemd-dhcp/src/shared/strv.c
index 9d1e6b22e..dbb4cbb7a 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/strv.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/strv.c
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <assert.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c b/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c
index 184f57bdc..c8fa1acba 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/time-util.c
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <time.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c b/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c
index dd3adf0ad..5bfeeac2d 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/utf8.c
@@ -43,6 +43,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <errno.h>
diff --git a/src/dhcp-manager/systemd-dhcp/src/shared/util.c b/src/dhcp-manager/systemd-dhcp/src/shared/util.c
index 56fea661a..c872170b0 100644
--- a/src/dhcp-manager/systemd-dhcp/src/shared/util.c
+++ b/src/dhcp-manager/systemd-dhcp/src/shared/util.c
@@ -19,6 +19,8 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
+#include "config.h"
+
#include "nm-sd-adapt.h"
#include <assert.h>
diff --git a/src/dhcp-manager/tests/test-dhcp-dhclient.c b/src/dhcp-manager/tests/test-dhcp-dhclient.c
index 544bd89ef..5d360f54e 100644
--- a/src/dhcp-manager/tests/test-dhcp-dhclient.c
+++ b/src/dhcp-manager/tests/test-dhcp-dhclient.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <unistd.h>
diff --git a/src/dhcp-manager/tests/test-dhcp-utils.c b/src/dhcp-manager/tests/test-dhcp-utils.c
index 2c87664fa..4ff8caad7 100644
--- a/src/dhcp-manager/tests/test-dhcp-utils.c
+++ b/src/dhcp-manager/tests/test-dhcp-utils.c
@@ -17,6 +17,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <netinet/in.h>
#include <arpa/inet.h>
diff --git a/src/dns-manager/nm-dns-dnsmasq.c b/src/dns-manager/nm-dns-dnsmasq.c
index 416cfe3b0..f26ccfaa3 100644
--- a/src/dns-manager/nm-dns-dnsmasq.c
+++ b/src/dns-manager/nm-dns-dnsmasq.c
@@ -18,7 +18,8 @@
*
*/
-#include <config.h>
+#include "config.h"
+
#include <stdlib.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/src/dns-manager/nm-dns-plugin.c b/src/dns-manager/nm-dns-plugin.c
index 62a362105..b083b1058 100644
--- a/src/dns-manager/nm-dns-plugin.c
+++ b/src/dns-manager/nm-dns-plugin.c
@@ -17,7 +17,8 @@
*
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/dns-manager/nm-dns-unbound.c b/src/dns-manager/nm-dns-unbound.c
index 137fd20b0..533290c11 100644
--- a/src/dns-manager/nm-dns-unbound.c
+++ b/src/dns-manager/nm-dns-unbound.c
@@ -17,6 +17,8 @@
* Copyright (C) 2014 Red Hat, Inc.
* Author: Pavel Šimerda <psimerda@redhat.com>
*/
+#include "config.h"
+
#include "nm-dns-unbound.h"
#include "NetworkManagerUtils.h"
diff --git a/src/dns-manager/nm-dns-utils.c b/src/dns-manager/nm-dns-utils.c
index 334866cb6..4a5255a42 100644
--- a/src/dns-manager/nm-dns-utils.c
+++ b/src/dns-manager/nm-dns-utils.c
@@ -17,6 +17,8 @@
*
*/
+#include "config.h"
+
#include <arpa/inet.h>
#include <string.h>
diff --git a/src/dnsmasq-manager/nm-dnsmasq-manager.c b/src/dnsmasq-manager/nm-dnsmasq-manager.c
index 8cc397eac..2f38ea710 100644
--- a/src/dnsmasq-manager/nm-dnsmasq-manager.c
+++ b/src/dnsmasq-manager/nm-dnsmasq-manager.c
@@ -18,7 +18,8 @@
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
diff --git a/src/dnsmasq-manager/nm-dnsmasq-utils.c b/src/dnsmasq-manager/nm-dnsmasq-utils.c
index 7036b4093..4394ae7b5 100644
--- a/src/dnsmasq-manager/nm-dnsmasq-utils.c
+++ b/src/dnsmasq-manager/nm-dnsmasq-utils.c
@@ -18,7 +18,8 @@
* Copyright (C) 2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c
index 07dbc0f72..f8120ffec 100644
--- a/src/dnsmasq-manager/tests/test-dnsmasq-utils.c
+++ b/src/dnsmasq-manager/tests/test-dnsmasq-utils.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <arpa/inet.h>
diff --git a/src/firewall-manager/nm-firewall-manager.c b/src/firewall-manager/nm-firewall-manager.c
index d3e3777d4..bb033818c 100644
--- a/src/firewall-manager/nm-firewall-manager.c
+++ b/src/firewall-manager/nm-firewall-manager.c
@@ -18,6 +18,8 @@
* Copyright (C) 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib.h>
#include <dbus/dbus.h>
diff --git a/src/main-utils.c b/src/main-utils.c
index 55da4dfe4..5b13f6c59 100644
--- a/src/main-utils.c
+++ b/src/main-utils.c
@@ -19,7 +19,8 @@
* Copyright (C) 2005 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <stdio.h>
#include <errno.h>
#include <fcntl.h>
diff --git a/src/main.c b/src/main.c
index 476d2a771..dd06f8f70 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,7 +19,8 @@
* Copyright (C) 2005 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h>
diff --git a/src/nm-active-connection.c b/src/nm-active-connection.c
index ff70d802b..d0b5b8753 100644
--- a/src/nm-active-connection.c
+++ b/src/nm-active-connection.c
@@ -18,6 +18,8 @@
* Copyright (C) 2008 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include "nm-types.h"
diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c
index df849d58d..fc8f8cda1 100644
--- a/src/nm-auth-manager.c
+++ b/src/nm-auth-manager.c
@@ -18,6 +18,8 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-auth-manager.h"
#include "nm-logging.h"
diff --git a/src/nm-auth-subject.c b/src/nm-auth-subject.c
index 779b711e6..209f98e17 100644
--- a/src/nm-auth-subject.c
+++ b/src/nm-auth-subject.c
@@ -26,6 +26,8 @@
* makes requests, like process identifier and user UID.
*/
+#include "config.h"
+
#include "nm-auth-subject.h"
#include <string.h>
diff --git a/src/nm-auth-utils.c b/src/nm-auth-utils.c
index 77b0fd108..9ace16292 100644
--- a/src/nm-auth-utils.c
+++ b/src/nm-auth-utils.c
@@ -18,7 +18,8 @@
* Copyright (C) 2010 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <gio/gio.h>
diff --git a/src/nm-config.c b/src/nm-config.c
index aba4fa1a1..e8cb08649 100644
--- a/src/nm-config.c
+++ b/src/nm-config.c
@@ -19,7 +19,8 @@
* Copyright (C) 2013 Thomas Bechtold <thomasbechtold@jpberlin.de>
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <stdio.h>
diff --git a/src/nm-connection-provider.c b/src/nm-connection-provider.c
index f6ee7454d..51caf400f 100644
--- a/src/nm-connection-provider.c
+++ b/src/nm-connection-provider.c
@@ -13,6 +13,8 @@
* Copyright (C) 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-connection-provider.h"
#include "nm-utils.h"
diff --git a/src/nm-connectivity.c b/src/nm-connectivity.c
index fee62e4fc..8a324a5c1 100644
--- a/src/nm-connectivity.c
+++ b/src/nm-connectivity.c
@@ -19,7 +19,7 @@
* Copyright (C) 2011 Dan Williams <dcbw@redhat.com>
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
#if WITH_CONCHECK
diff --git a/src/nm-dbus-manager.c b/src/nm-dbus-manager.c
index 1dcdfb8da..1cceb9b51 100644
--- a/src/nm-dbus-manager.c
+++ b/src/nm-dbus-manager.c
@@ -20,6 +20,7 @@
*/
#include "config.h"
+
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/src/nm-dcb.c b/src/nm-dcb.c
index 3dfa306c4..6faec5c53 100644
--- a/src/nm-dcb.c
+++ b/src/nm-dcb.c
@@ -18,7 +18,8 @@
* Copyright (C) 2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <sys/wait.h>
#include <string.h>
diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c
index ebe60c4df..8afdbb487 100644
--- a/src/nm-default-route-manager.c
+++ b/src/nm-default-route-manager.c
@@ -19,10 +19,10 @@
*/
-#include "nm-default-route-manager.h"
-
#include "config.h"
+#include "nm-default-route-manager.h"
+
#include "string.h"
#include "nm-logging.h"
diff --git a/src/nm-dhcp4-config.c b/src/nm-dhcp4-config.c
index 45cf5c5cf..096cf16d9 100644
--- a/src/nm-dhcp4-config.c
+++ b/src/nm-dhcp4-config.c
@@ -18,6 +18,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/src/nm-dhcp6-config.c b/src/nm-dhcp6-config.c
index 6a644a95f..f93e9644c 100644
--- a/src/nm-dhcp6-config.c
+++ b/src/nm-dhcp6-config.c
@@ -18,6 +18,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/src/nm-dispatcher.c b/src/nm-dispatcher.c
index e77cca6f5..ae451768d 100644
--- a/src/nm-dispatcher.c
+++ b/src/nm-dispatcher.c
@@ -19,6 +19,8 @@
* Copyright (C) 2005 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <gio/gio.h>
#include <string.h>
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index 62f1b2aba..5e5de1f71 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -18,7 +18,8 @@
* Copyright (C) 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <glib-unix.h>
#include <getopt.h>
diff --git a/src/nm-ip4-config.c b/src/nm-ip4-config.c
index 7b59160a3..7b4ca19c8 100644
--- a/src/nm-ip4-config.c
+++ b/src/nm-ip4-config.c
@@ -19,6 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/nm-ip6-config.c b/src/nm-ip6-config.c
index 60ed7672d..99a5ec9a2 100644
--- a/src/nm-ip6-config.c
+++ b/src/nm-ip6-config.c
@@ -19,6 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/nm-manager.c b/src/nm-manager.c
index d8973b733..04192a98b 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -19,7 +19,7 @@
* Copyright (C) 2007 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <stdlib.h>
#include <fcntl.h>
diff --git a/src/nm-policy.c b/src/nm-policy.c
index 963be3099..0a8f54e37 100644
--- a/src/nm-policy.c
+++ b/src/nm-policy.c
@@ -19,7 +19,8 @@
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <unistd.h>
#include <errno.h>
diff --git a/src/nm-properties-changed-signal.c b/src/nm-properties-changed-signal.c
index 6e07c2570..7ba62aa2d 100644
--- a/src/nm-properties-changed-signal.c
+++ b/src/nm-properties-changed-signal.c
@@ -19,6 +19,8 @@
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <stdio.h>
diff --git a/src/nm-rfkill-manager.c b/src/nm-rfkill-manager.c
index b02f85f54..27f3ca012 100644
--- a/src/nm-rfkill-manager.c
+++ b/src/nm-rfkill-manager.c
@@ -18,7 +18,7 @@
* Copyright (C) 2009 - 2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <string.h>
#include <gudev/gudev.h>
diff --git a/src/nm-session-monitor-ck.c b/src/nm-session-monitor-ck.c
index 6b8f66f04..964874bf8 100644
--- a/src/nm-session-monitor-ck.c
+++ b/src/nm-session-monitor-ck.c
@@ -19,6 +19,7 @@
*/
#include "config.h"
+
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
diff --git a/src/nm-session-monitor-null.c b/src/nm-session-monitor-null.c
index 5d8ecaaf1..bffb75d35 100644
--- a/src/nm-session-monitor-null.c
+++ b/src/nm-session-monitor-null.c
@@ -19,6 +19,7 @@
*/
#include "config.h"
+
#include <string.h>
#include "nm-logging.h"
diff --git a/src/nm-session-monitor-systemd.c b/src/nm-session-monitor-systemd.c
index f195c1e77..dcb0004dc 100644
--- a/src/nm-session-monitor-systemd.c
+++ b/src/nm-session-monitor-systemd.c
@@ -21,6 +21,7 @@
*/
#include "config.h"
+
#include <errno.h>
#include <pwd.h>
#include <grp.h>
diff --git a/src/nm-session-utils.c b/src/nm-session-utils.c
index e70f69ed1..eb156fad0 100644
--- a/src/nm-session-utils.c
+++ b/src/nm-session-utils.c
@@ -17,6 +17,8 @@
* Author: Dan Williams <dcbw@redhat.com>
*/
+#include "config.h"
+
#include <pwd.h>
#include <sys/types.h>
diff --git a/src/nm-sleep-monitor-systemd.c b/src/nm-sleep-monitor-systemd.c
index d3dfaa52e..e3844aec1 100644
--- a/src/nm-sleep-monitor-systemd.c
+++ b/src/nm-sleep-monitor-systemd.c
@@ -18,6 +18,7 @@
*/
#include "config.h"
+
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
index 58402abd4..39cce5958 100644
--- a/src/nm-sleep-monitor-upower.c
+++ b/src/nm-sleep-monitor-upower.c
@@ -18,6 +18,7 @@
*/
#include "config.h"
+
#include <errno.h>
#include <string.h>
#include <sys/stat.h>
diff --git a/src/platform/nm-fake-platform.c b/src/platform/nm-fake-platform.c
index 17304544b..bf0c9c4cd 100644
--- a/src/platform/nm-fake-platform.c
+++ b/src/platform/nm-fake-platform.c
@@ -18,6 +18,8 @@
* Copyright (C) 2012–2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <errno.h>
#include <unistd.h>
#include <netinet/icmp6.h>
diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c
index 37eb5c7cc..007e7953b 100644
--- a/src/platform/nm-linux-platform.c
+++ b/src/platform/nm-linux-platform.c
@@ -17,7 +17,7 @@
*
* Copyright (C) 2012-2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <errno.h>
#include <unistd.h>
diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c
index b4d09ca07..70c7e1f96 100644
--- a/src/platform/nm-platform.c
+++ b/src/platform/nm-platform.c
@@ -18,6 +18,8 @@
* Copyright (C) 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
diff --git a/src/platform/tests/dump.c b/src/platform/tests/dump.c
index 8aea3aec5..3bb61da41 100644
--- a/src/platform/tests/dump.c
+++ b/src/platform/tests/dump.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include <stdio.h>
#include <stdlib.h>
#include <arpa/inet.h>
diff --git a/src/platform/tests/monitor.c b/src/platform/tests/monitor.c
index d56cc2bf8..9aff10476 100644
--- a/src/platform/tests/monitor.c
+++ b/src/platform/tests/monitor.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include <stdlib.h>
#include <syslog.h>
diff --git a/src/platform/tests/platform.c b/src/platform/tests/platform.c
index a70d43601..a4b10a183 100644
--- a/src/platform/tests/platform.c
+++ b/src/platform/tests/platform.c
@@ -18,6 +18,8 @@
* Copyright (C) 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/platform/tests/test-address.c b/src/platform/tests/test-address.c
index 8d297e501..3ef13b8ec 100644
--- a/src/platform/tests/test-address.c
+++ b/src/platform/tests/test-address.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include "test-common.h"
#define DEVICE_NAME "nm-test-device"
diff --git a/src/platform/tests/test-cleanup.c b/src/platform/tests/test-cleanup.c
index 6bf7f1239..c15f0c14e 100644
--- a/src/platform/tests/test-cleanup.c
+++ b/src/platform/tests/test-cleanup.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include "test-common.h"
#define DEVICE_NAME "nm-test-device"
diff --git a/src/platform/tests/test-common.c b/src/platform/tests/test-common.c
index 59a770c63..ab40f6524 100644
--- a/src/platform/tests/test-common.c
+++ b/src/platform/tests/test-common.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include "test-common.h"
#include "nm-test-utils.h"
diff --git a/src/platform/tests/test-link.c b/src/platform/tests/test-link.c
index 66ee51a81..8bd2ef44d 100644
--- a/src/platform/tests/test-link.c
+++ b/src/platform/tests/test-link.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include "test-common.h"
#include "nm-test-utils.h"
diff --git a/src/platform/tests/test-route.c b/src/platform/tests/test-route.c
index 299eddda9..7a7e5a811 100644
--- a/src/platform/tests/test-route.c
+++ b/src/platform/tests/test-route.c
@@ -1,3 +1,5 @@
+#include "config.h"
+
#include "test-common.h"
#include "nm-test-utils.h"
diff --git a/src/platform/wifi/wifi-utils-nl80211.c b/src/platform/wifi/wifi-utils-nl80211.c
index 722f4e9c5..1c745112b 100644
--- a/src/platform/wifi/wifi-utils-nl80211.c
+++ b/src/platform/wifi/wifi-utils-nl80211.c
@@ -20,7 +20,8 @@
* Copyright (C) 2011 Intel Corporation. All rights reserved.
*/
-#include <config.h>
+#include "config.h"
+
#include <errno.h>
#include <string.h>
#include <sys/ioctl.h>
diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c
index 73dc7f011..e0331de7c 100644
--- a/src/platform/wifi/wifi-utils-wext.c
+++ b/src/platform/wifi/wifi-utils-wext.c
@@ -19,7 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <errno.h>
#include <string.h>
#include <sys/ioctl.h>
diff --git a/src/platform/wifi/wifi-utils.c b/src/platform/wifi/wifi-utils.c
index 679b17a04..3fb457bed 100644
--- a/src/platform/wifi/wifi-utils.c
+++ b/src/platform/wifi/wifi-utils.c
@@ -19,7 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <sys/stat.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 2118589ff..4fac96dcd 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -19,7 +19,8 @@
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <sys/types.h>
#include <sys/wait.h>
#include <signal.h>
diff --git a/src/ppp-manager/nm-pppd-plugin.c b/src/ppp-manager/nm-pppd-plugin.c
index 183f5dbe0..d5e8d7072 100644
--- a/src/ppp-manager/nm-pppd-plugin.c
+++ b/src/ppp-manager/nm-pppd-plugin.c
@@ -19,7 +19,8 @@
* Copyright (C) 2008 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <pppd/pppd.h>
#include <pppd/fsm.h>
diff --git a/src/rdisc/nm-fake-rdisc.c b/src/rdisc/nm-fake-rdisc.c
index bdd207ca4..e631f28d6 100644
--- a/src/rdisc/nm-fake-rdisc.c
+++ b/src/rdisc/nm-fake-rdisc.c
@@ -18,6 +18,8 @@
* Copyright (C) 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/rdisc/nm-lndp-rdisc.c b/src/rdisc/nm-lndp-rdisc.c
index d26507699..ff1bd33de 100644
--- a/src/rdisc/nm-lndp-rdisc.c
+++ b/src/rdisc/nm-lndp-rdisc.c
@@ -18,6 +18,8 @@
* Copyright (C) 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <arpa/inet.h>
/* stdarg.h included because of a bug in ndp.h */
diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c
index a326e6f03..8729fa63d 100644
--- a/src/rdisc/nm-rdisc.c
+++ b/src/rdisc/nm-rdisc.c
@@ -18,6 +18,8 @@
* Copyright (C) 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <arpa/inet.h>
diff --git a/src/rdisc/tests/rdisc.c b/src/rdisc/tests/rdisc.c
index 26237093d..d577a63ae 100644
--- a/src/rdisc/tests/rdisc.c
+++ b/src/rdisc/tests/rdisc.c
@@ -18,6 +18,8 @@
* Copyright (C) 2013 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <syslog.h>
diff --git a/src/settings/nm-agent-manager.c b/src/settings/nm-agent-manager.c
index 3028e4287..117fb2150 100644
--- a/src/settings/nm-agent-manager.c
+++ b/src/settings/nm-agent-manager.c
@@ -18,7 +18,8 @@
* Copyright (C) 2010 - 2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <pwd.h>
diff --git a/src/settings/nm-inotify-helper.c b/src/settings/nm-inotify-helper.c
index 7231b57ec..85b3c4000 100644
--- a/src/settings/nm-inotify-helper.c
+++ b/src/settings/nm-inotify-helper.c
@@ -18,6 +18,8 @@
* (C) Copyright 2008 Red Hat, Inc.
*/
+#include "config.h"
+
#include <unistd.h>
#include <string.h>
#include <sys/inotify.h>
diff --git a/src/settings/nm-secret-agent.c b/src/settings/nm-secret-agent.c
index 3099f4518..054e07a8c 100644
--- a/src/settings/nm-secret-agent.c
+++ b/src/settings/nm-secret-agent.c
@@ -18,7 +18,7 @@
* Copyright (C) 2010 - 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
#include <sys/types.h>
#include <pwd.h>
diff --git a/src/settings/nm-system-config-interface.c b/src/settings/nm-system-config-interface.c
index 4ab16e24b..637c301e3 100644
--- a/src/settings/nm-system-config-interface.c
+++ b/src/settings/nm-system-config-interface.c
@@ -19,6 +19,8 @@
* Copyright (C) 2008 Novell, Inc.
*/
+#include "config.h"
+
#include "nm-system-config-interface.h"
#include "nm-settings-connection.h"
diff --git a/src/settings/plugins/example/nm-example-connection.c b/src/settings/plugins/example/nm-example-connection.c
index 858c67f21..2f0b20a08 100644
--- a/src/settings/plugins/example/nm-example-connection.c
+++ b/src/settings/plugins/example/nm-example-connection.c
@@ -18,6 +18,8 @@
* Copyright (C) 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gstdio.h>
#include <nm-dbus-interface.h>
diff --git a/src/settings/plugins/example/plugin.c b/src/settings/plugins/example/plugin.c
index bc5c06e99..9945e13b5 100644
--- a/src/settings/plugins/example/plugin.c
+++ b/src/settings/plugins/example/plugin.c
@@ -18,7 +18,8 @@
* Copyright (C) 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/src/settings/plugins/example/reader.c b/src/settings/plugins/example/reader.c
index 23f37c74e..ee45440a5 100644
--- a/src/settings/plugins/example/reader.c
+++ b/src/settings/plugins/example/reader.c
@@ -18,7 +18,8 @@
* Copyright (C) 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <nm-connection.h>
diff --git a/src/settings/plugins/example/writer.c b/src/settings/plugins/example/writer.c
index f0a9ea210..41e5c498d 100644
--- a/src/settings/plugins/example/writer.c
+++ b/src/settings/plugins/example/writer.c
@@ -18,7 +18,8 @@
* Copyright (C) 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <nm-connection.h>
diff --git a/src/settings/plugins/ibft/nm-ibft-connection.c b/src/settings/plugins/ibft/nm-ibft-connection.c
index 5558f0e7a..5459a7050 100644
--- a/src/settings/plugins/ibft/nm-ibft-connection.c
+++ b/src/settings/plugins/ibft/nm-ibft-connection.c
@@ -18,6 +18,8 @@
* Copyright 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <net/ethernet.h>
#include <netinet/ether.h>
diff --git a/src/settings/plugins/ibft/plugin.c b/src/settings/plugins/ibft/plugin.c
index 54af90503..303971e05 100644
--- a/src/settings/plugins/ibft/plugin.c
+++ b/src/settings/plugins/ibft/plugin.c
@@ -18,7 +18,8 @@
* Copyright 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <unistd.h>
#include <errno.h>
diff --git a/src/settings/plugins/ibft/reader.c b/src/settings/plugins/ibft/reader.c
index 340e197bf..9bb1f471a 100644
--- a/src/settings/plugins/ibft/reader.c
+++ b/src/settings/plugins/ibft/reader.c
@@ -18,7 +18,8 @@
* Copyright 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
diff --git a/src/settings/plugins/ibft/tests/test-ibft.c b/src/settings/plugins/ibft/tests/test-ibft.c
index 5fc63b118..2ff249af3 100644
--- a/src/settings/plugins/ibft/tests/test-ibft.c
+++ b/src/settings/plugins/ibft/tests/test-ibft.c
@@ -18,6 +18,8 @@
* Copyright 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
diff --git a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
index a10743d64..7596cbd5f 100644
--- a/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
+++ b/src/settings/plugins/ifcfg-rh/nm-ifcfg-connection.c
@@ -18,6 +18,8 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gstdio.h>
diff --git a/src/settings/plugins/ifcfg-rh/plugin.c b/src/settings/plugins/ifcfg-rh/plugin.c
index 097ad0c90..2f4784527 100644
--- a/src/settings/plugins/ifcfg-rh/plugin.c
+++ b/src/settings/plugins/ifcfg-rh/plugin.c
@@ -21,7 +21,8 @@
* Copyright (C) 2007 - 2011 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <unistd.h>
#include <errno.h>
diff --git a/src/settings/plugins/ifcfg-rh/reader.c b/src/settings/plugins/ifcfg-rh/reader.c
index f97c84c78..73430e0ad 100644
--- a/src/settings/plugins/ifcfg-rh/reader.c
+++ b/src/settings/plugins/ifcfg-rh/reader.c
@@ -18,7 +18,8 @@
* Copyright 2008 - 2014 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
diff --git a/src/settings/plugins/ifcfg-rh/shvar.c b/src/settings/plugins/ifcfg-rh/shvar.c
index bdfd40a31..6c9769b2c 100644
--- a/src/settings/plugins/ifcfg-rh/shvar.c
+++ b/src/settings/plugins/ifcfg-rh/shvar.c
@@ -23,6 +23,8 @@
*
*/
+#include "config.h"
+
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
diff --git a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c
index 39c81027f..d82a32703 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh-utils.c
@@ -18,6 +18,8 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdarg.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 fbb0b9686..4a6940d0d 100644
--- a/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
+++ b/src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
@@ -18,6 +18,8 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
diff --git a/src/settings/plugins/ifcfg-rh/utils.c b/src/settings/plugins/ifcfg-rh/utils.c
index 919a04843..5b9e9d796 100644
--- a/src/settings/plugins/ifcfg-rh/utils.c
+++ b/src/settings/plugins/ifcfg-rh/utils.c
@@ -18,6 +18,8 @@
* (C) Copyright 2008 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/settings/plugins/ifcfg-rh/writer.c b/src/settings/plugins/ifcfg-rh/writer.c
index 6857c1f70..f4ffffd6a 100644
--- a/src/settings/plugins/ifcfg-rh/writer.c
+++ b/src/settings/plugins/ifcfg-rh/writer.c
@@ -18,6 +18,8 @@
* Copyright 2009 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <sys/types.h>
#include <sys/socket.h>
diff --git a/src/settings/plugins/ifcfg-suse/plugin.c b/src/settings/plugins/ifcfg-suse/plugin.c
index a45ecd523..a1667f645 100644
--- a/src/settings/plugins/ifcfg-suse/plugin.c
+++ b/src/settings/plugins/ifcfg-suse/plugin.c
@@ -22,7 +22,8 @@
* (C) Copyright 2007 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <string.h>
#include <gmodule.h>
diff --git a/src/settings/plugins/ifnet/net_parser.c b/src/settings/plugins/ifnet/net_parser.c
index 95add14fc..1cf46fbf9 100644
--- a/src/settings/plugins/ifnet/net_parser.c
+++ b/src/settings/plugins/ifnet/net_parser.c
@@ -19,6 +19,8 @@
* Copyright (C) 1999-2010 Gentoo Foundation, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <stdio.h>
#include <sys/ioctl.h>
diff --git a/src/settings/plugins/ifnet/net_utils.c b/src/settings/plugins/ifnet/net_utils.c
index c4302418e..019124ae1 100644
--- a/src/settings/plugins/ifnet/net_utils.c
+++ b/src/settings/plugins/ifnet/net_utils.c
@@ -19,6 +19,8 @@
* Copyright (C) 1999-2010 Gentoo Foundation, Inc.
*/
+#include "config.h"
+
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/settings/plugins/ifnet/nm-ifnet-connection.c b/src/settings/plugins/ifnet/nm-ifnet-connection.c
index 3a7cc810a..c84ad5ed9 100644
--- a/src/settings/plugins/ifnet/nm-ifnet-connection.c
+++ b/src/settings/plugins/ifnet/nm-ifnet-connection.c
@@ -19,6 +19,8 @@
* Copyright (C) 1999-2010 Gentoo Foundation, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gstdio.h>
#include <nm-dbus-interface.h>
diff --git a/src/settings/plugins/ifnet/plugin.c b/src/settings/plugins/ifnet/plugin.c
index d376bbfc2..3eb1ed52f 100644
--- a/src/settings/plugins/ifnet/plugin.c
+++ b/src/settings/plugins/ifnet/plugin.c
@@ -20,6 +20,8 @@
* Copyright (C) 1999-2010 Gentoo Foundation, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gmodule.h>
diff --git a/src/settings/plugins/ifnet/tests/test_all.c b/src/settings/plugins/ifnet/tests/test_all.c
index ed44a01cf..9c3991287 100644
--- a/src/settings/plugins/ifnet/tests/test_all.c
+++ b/src/settings/plugins/ifnet/tests/test_all.c
@@ -20,6 +20,8 @@
* Copyright (C) 1999-2010 Gentoo Foundation, Inc.
*/
+#include "config.h"
+
#include <stdio.h>
#include <string.h>
#include <glib.h>
diff --git a/src/settings/plugins/ifnet/wpa_parser.c b/src/settings/plugins/ifnet/wpa_parser.c
index 02d7ea8e6..3f912da87 100644
--- a/src/settings/plugins/ifnet/wpa_parser.c
+++ b/src/settings/plugins/ifnet/wpa_parser.c
@@ -19,6 +19,8 @@
* Copyright (C) 1999-2010 Gentoo Foundation, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <stdlib.h>
#include <nm-system-config-interface.h>
diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c
index ee233c93a..32d27c57b 100644
--- a/src/settings/plugins/ifupdown/interface_parser.c
+++ b/src/settings/plugins/ifupdown/interface_parser.c
@@ -21,6 +21,7 @@
*/
#include "config.h"
+
#include "interface_parser.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
index 43fa670a6..c6073bd7e 100644
--- a/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
+++ b/src/settings/plugins/ifupdown/nm-ifupdown-connection.c
@@ -21,6 +21,8 @@
* (C) Copyright 2007,2008 Canonical Ltd.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gstdio.h>
#include <nm-dbus-interface.h>
diff --git a/src/settings/plugins/ifupdown/parser.c b/src/settings/plugins/ifupdown/parser.c
index 4ccfb62f8..c6421d92e 100644
--- a/src/settings/plugins/ifupdown/parser.c
+++ b/src/settings/plugins/ifupdown/parser.c
@@ -21,6 +21,8 @@
* (C) Copyright 2008 Canonical Ltd.
*/
+#include "config.h"
+
#include <string.h>
#include <arpa/inet.h>
#include <stdlib.h>
diff --git a/src/settings/plugins/ifupdown/plugin.c b/src/settings/plugins/ifupdown/plugin.c
index 20928c682..1b5642afb 100644
--- a/src/settings/plugins/ifupdown/plugin.c
+++ b/src/settings/plugins/ifupdown/plugin.c
@@ -22,6 +22,8 @@
* (C) Copyright 2009 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <sys/inotify.h>
diff --git a/src/settings/plugins/ifupdown/tests/test-ifupdown.c b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
index 0752ec4bb..59b16e006 100644
--- a/src/settings/plugins/ifupdown/tests/test-ifupdown.c
+++ b/src/settings/plugins/ifupdown/tests/test-ifupdown.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/src/settings/plugins/keyfile/nm-keyfile-connection.c b/src/settings/plugins/keyfile/nm-keyfile-connection.c
index 661b6745e..c852f0280 100644
--- a/src/settings/plugins/keyfile/nm-keyfile-connection.c
+++ b/src/settings/plugins/keyfile/nm-keyfile-connection.c
@@ -19,6 +19,8 @@
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib/gstdio.h>
#include <nm-dbus-interface.h>
diff --git a/src/settings/plugins/keyfile/plugin.c b/src/settings/plugins/keyfile/plugin.c
index 562beeaeb..371fa47a7 100644
--- a/src/settings/plugins/keyfile/plugin.c
+++ b/src/settings/plugins/keyfile/plugin.c
@@ -19,7 +19,8 @@
* Copyright (C) 2008 - 2013 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <sys/stat.h>
#include <unistd.h>
#include <sys/types.h>
diff --git a/src/settings/plugins/keyfile/reader.c b/src/settings/plugins/keyfile/reader.c
index c4a2a5d9b..c9ca27c68 100644
--- a/src/settings/plugins/keyfile/reader.c
+++ b/src/settings/plugins/keyfile/reader.c
@@ -19,6 +19,8 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <errno.h>
#include <stdlib.h>
#include <sys/stat.h>
diff --git a/src/settings/plugins/keyfile/tests/test-keyfile.c b/src/settings/plugins/keyfile/tests/test-keyfile.c
index a38a3bd0f..eba3e7a07 100644
--- a/src/settings/plugins/keyfile/tests/test-keyfile.c
+++ b/src/settings/plugins/keyfile/tests/test-keyfile.c
@@ -18,6 +18,8 @@
* Copyright (C) 2008 - 2014 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
diff --git a/src/settings/plugins/keyfile/utils.c b/src/settings/plugins/keyfile/utils.c
index 844d9c08c..3361d5544 100644
--- a/src/settings/plugins/keyfile/utils.c
+++ b/src/settings/plugins/keyfile/utils.c
@@ -18,6 +18,8 @@
* (C) Copyright 2010 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/settings/plugins/keyfile/writer.c b/src/settings/plugins/keyfile/writer.c
index 02f2d7ff7..6fdbc4d2a 100644
--- a/src/settings/plugins/keyfile/writer.c
+++ b/src/settings/plugins/keyfile/writer.c
@@ -19,7 +19,8 @@
* Copyright (C) 2008 - 2012 Red Hat, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <stdlib.h>
#include <sys/stat.h>
#include <unistd.h>
diff --git a/src/supplicant-manager/nm-call-store.c b/src/supplicant-manager/nm-call-store.c
index 950d199e3..6e910a96b 100644
--- a/src/supplicant-manager/nm-call-store.c
+++ b/src/supplicant-manager/nm-call-store.c
@@ -19,6 +19,8 @@
* Copyright (C) 2010 Red Hat, Inc.
*/
+#include "config.h"
+
#include "nm-call-store.h"
#include "nm-logging.h"
diff --git a/src/supplicant-manager/nm-supplicant-config.c b/src/supplicant-manager/nm-supplicant-config.c
index 2b857517a..9ae870955 100644
--- a/src/supplicant-manager/nm-supplicant-config.c
+++ b/src/supplicant-manager/nm-supplicant-config.c
@@ -19,9 +19,7 @@
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "config.h"
#include <string.h>
#include <stdlib.h>
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index 77924b3e7..02b82b7ee 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -19,7 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <stdio.h>
#include <string.h>
#include <glib.h>
diff --git a/src/supplicant-manager/nm-supplicant-manager.c b/src/supplicant-manager/nm-supplicant-manager.c
index c50691d9f..01e35929d 100644
--- a/src/supplicant-manager/nm-supplicant-manager.c
+++ b/src/supplicant-manager/nm-supplicant-manager.c
@@ -19,6 +19,8 @@
* Copyright (C) 2007 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <glib.h>
#include <dbus/dbus.h>
diff --git a/src/supplicant-manager/nm-supplicant-settings-verify.c b/src/supplicant-manager/nm-supplicant-settings-verify.c
index 3571c575e..1328fd511 100644
--- a/src/supplicant-manager/nm-supplicant-settings-verify.c
+++ b/src/supplicant-manager/nm-supplicant-settings-verify.c
@@ -18,6 +18,8 @@
* Copyright (C) 2006 - 2012 Red Hat, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <stdio.h>
#include <stdlib.h>
diff --git a/src/supplicant-manager/tests/test-supplicant-config.c b/src/supplicant-manager/tests/test-supplicant-config.c
index 4f1950128..5aa3fa2db 100644
--- a/src/supplicant-manager/tests/test-supplicant-config.c
+++ b/src/supplicant-manager/tests/test-supplicant-config.c
@@ -18,6 +18,8 @@
* Copyright (C) 2008 - 2011 Red Hat, Inc.
*/
+#include "config.h"
+
#include <stdio.h>
#include <stdarg.h>
#include <unistd.h>
diff --git a/src/tests/test-dcb.c b/src/tests/test-dcb.c
index c28f05b92..dacb1f521 100644
--- a/src/tests/test-dcb.c
+++ b/src/tests/test-dcb.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
diff --git a/src/tests/test-general-with-expect.c b/src/tests/test-general-with-expect.c
index 2d19cedf9..bee266f34 100644
--- a/src/tests/test-general-with-expect.c
+++ b/src/tests/test-general-with-expect.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <errno.h>
diff --git a/src/tests/test-general.c b/src/tests/test-general.c
index 968a4bae8..c67db87cf 100644
--- a/src/tests/test-general.c
+++ b/src/tests/test-general.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <errno.h>
diff --git a/src/tests/test-ip4-config.c b/src/tests/test-ip4-config.c
index 68de1e3ea..657f7e05b 100644
--- a/src/tests/test-ip4-config.c
+++ b/src/tests/test-ip4-config.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/tests/test-ip6-config.c b/src/tests/test-ip6-config.c
index f8ecefc93..9e1d5651d 100644
--- a/src/tests/test-ip6-config.c
+++ b/src/tests/test-ip6-config.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/tests/test-resolvconf-capture.c b/src/tests/test-resolvconf-capture.c
index 555f10c01..f5cb298b9 100644
--- a/src/tests/test-resolvconf-capture.c
+++ b/src/tests/test-resolvconf-capture.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <arpa/inet.h>
diff --git a/src/tests/test-wired-defname.c b/src/tests/test-wired-defname.c
index 968971d98..a05588b8a 100644
--- a/src/tests/test-wired-defname.c
+++ b/src/tests/test-wired-defname.c
@@ -18,6 +18,8 @@
*
*/
+#include "config.h"
+
#include <glib.h>
#include <glib-object.h>
diff --git a/src/vpn-manager/nm-vpn-connection.c b/src/vpn-manager/nm-vpn-connection.c
index c58187488..682e1dc5b 100644
--- a/src/vpn-manager/nm-vpn-connection.c
+++ b/src/vpn-manager/nm-vpn-connection.c
@@ -19,6 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <sys/socket.h>
diff --git a/src/vpn-manager/nm-vpn-manager.c b/src/vpn-manager/nm-vpn-manager.c
index 7daa8cec9..1f3798c7f 100644
--- a/src/vpn-manager/nm-vpn-manager.c
+++ b/src/vpn-manager/nm-vpn-manager.c
@@ -19,6 +19,8 @@
* Copyright (C) 2006 - 2008 Novell, Inc.
*/
+#include "config.h"
+
#include <string.h>
#include <gio/gio.h>
diff --git a/src/vpn-manager/nm-vpn-service.c b/src/vpn-manager/nm-vpn-service.c
index 142644a2d..29a8ac32a 100644
--- a/src/vpn-manager/nm-vpn-service.c
+++ b/src/vpn-manager/nm-vpn-service.c
@@ -19,7 +19,8 @@
* Copyright (C) 2005 - 2008 Novell, Inc.
*/
-#include <config.h>
+#include "config.h"
+
#include <glib.h>
#include <string.h>
#include <sys/types.h>