summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 48969df1b9..b28dae5d21 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 8d7274329c..ab7fda660e 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 19220654f9..dafe4f6e63 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 423d29fd83..460174b230 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 d4397042bb..bb0c970663 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 fb0ee6f7f8..ab6469183c 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 7a4d593945..d390327399 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 f206340e0c..75048bd8f1 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 6a19bf895e..9b34f6b210 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 5868c27904..90bc2d5e78 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 f5922582ea..634bd90c82 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 f09c028b6b..d5cdf361d7 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 2e1a11c0c8..e4b3bbbfc9 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 05596399d9..aeabcfe16e 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 28d9bf79b8..97609f0a76 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 e2c06c1765..b7d0c9e9fa 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 2fead92e77..229f14a00c 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 d3ff94de3d..5d270706e8 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 6b202dd4ff..29fc2b84aa 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 dfd1e0107c..bc56d481c3 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 6b169301ba..7c852d6bb2 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 ab026aac78..d16b3cb88d 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 d1ffdca3d3..5ffa8c0fbc 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 100804a017..d34f330d8f 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 f611cc601c..2d37f652bc 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 e7f8518d43..8d7b9af959 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 8a99ec07bb..e7fcdff2b7 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 d537376db5..fbcdca1bc7 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 ed80a13609..c098164b0f 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 8db1d603c0..64f3cdfbaf 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 6d897b56de..d2f6c69277 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 6e3ff6164e..94605fcc30 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 968be898bb..43383abf59 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 c3511fb896..d67d6329bd 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 403560221a..93e26ff91b 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 8676cb4e6a..2ca96edbfa 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 cbdae158e1..834f7b3cca 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 91d80b178b..231d80d673 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 b0d19c7520..b9f2274d6d 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 4130412b65..1f2ffc9126 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 ccc46fe4ef..2a2f29ee26 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 7bf1ae2f26..1047d23ee6 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 35ef2fdcbe..05eb0c4705 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 d374d91b7c..564023b9b1 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 f8fb3e95ef..cbbc4408f5 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 03e5a92d81..93cc4c786a 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 e6ab047d64..12db9c23b3 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 b1dd3f4e09..a61042e664 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 522c6eb15f..829fb3926a 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 bb4b4daea5..1254dfffed 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 a0c006de51..637ab81c1c 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 8d861a0390..1489919075 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 c13416c122..73e707158d 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 e38457f06b..7dc6823e20 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 a2a6d26ed0..fed8016066 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 b462a6b169..abf61cc923 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 358264fd25..7067a1100d 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 f4efc607e5..ac26143d18 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 25004310d9..00e04ab435 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 eb54957413..6812168370 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 0529ccb932..786d4f1680 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 bf19737555..ef69fb2647 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 00616a95a8..58d483443a 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 690041a515..d27a980fe9 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 875ea8eb39..a17a67355a 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 3aa6e03ab5..663b36516d 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 7d286190f3..524d86cea0 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 666ddc2636..e68fda6261 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 e9ff548c35..d9a5fce088 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 93bf12763b..8f8750e22d 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 a4c108fb08..28609c79df 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 8fac2a5ac7..f0187fdc17 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 64b5dd1861..88d9ce8a9e 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 4fccee9034..5847937426 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 32cc3b4755..e55c14166e 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 3ac75254cf..ffaef74163 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 21156090bd..d44056a1cf 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 fe388803e7..752c606a93 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 3550677df6..fb25c1ac40 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 e3050b0169..4feba8b10e 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 d9c65d773f..74ed083f9b 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 9627d7311d..04f8dd8b1f 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 cb0ff8ba6c..5b434aa97b 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 689f58fd8d..16e8db5e94 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 a4a10836e8..b94084e2b6 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 0e800e9c16..9aafb19f07 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 08fb647ada..7848c131c4 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 1cbd3eefd0..1735ab3eec 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 0dbdac54c2..540d43afa6 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 eebf8358c7..989c097667 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 987845c1bb..237e287f85 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 be16d135af..9c20f589e8 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 e59f8f50a6..1268d20ca3 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 2b4ca230a0..acb8aec335 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 0f7f6bd56b..94a26e18fd 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 76fa63b910..5b0ae2baf9 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 506ecbddee..487f366e18 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 7d82d31d23..515f3d5980 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 aaa172d4ae..366efe016d 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 50f6cdbcb2..fda46842be 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 976a59680a..f60869a589 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 f54b47ed5f..c767170aae 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 6d2d7ee634..6192d76399 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 51ad390249..5b91a4c0ff 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 d51973adfa..71942c60ea 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 c7a730769c..c86e061fb9 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 94233bf975..e13587bb7b 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 408f6833f5..e67ac9601c 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 0e7c598b90..041253a96a 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 a3923336c1..08a0ea2975 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 0f03e29ffe..20b1a01036 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 73cdf5c142..c2914ce2bb 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 3edeeefc17..27a9e8a668 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 7944fd9b8f..3c90a49eca 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 b7a35fa3d8..a42c60e096 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 77c64ce48f..ea44d9988b 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 1a4a6ec384..12e60a46d2 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 02cf7fbf32..a852b25ac8 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 70217e021c..555b8955ca 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 bbb0c66449..87a9b55b8c 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 5c3dc1e105..f5026a4c0a 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 677f116209..9be9f2ae56 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 eea22b5f3b..c0cdb70a12 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 68c90e9f0f..9738d44d7f 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 b829d12eed..085f10bfc4 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 ddd76f018c..4b37d92b78 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 4b114ada35..1c7d78b8c8 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 9104b4bc6c..7441e1ff5f 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 dfc7240192..29c7001258 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 6988f44c67..31f513280d 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 4e4f194f5c..2483ece0bb 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 5b24b2a366..7a99e70d25 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 af0afa52d1..b509335837 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 7f2ada911d..af6d3d18f7 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 5a3782e742..6d5367402e 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 5673792cfb..0f949372e8 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 c240aa9681..a8db0ffc06 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 a2a4935361..93c9dccc9b 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 1409e0b298..2d755ba44f 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 25c63f753e..a2911f0841 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 6b5df27ca8..b881687ffc 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 d76baf22a6..e892d827cc 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 51bf901364..57acb7a8ef 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 c57c19c3f9..493bd79b56 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 13097198c3..e400057ab4 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 a6d5fe3067..66e9cc078d 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 5b72fbc10f..86cbdc3e3c 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 6bbd8d6b54..808edaa647 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 c332dcaa8a..0bd924c402 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 fb50ac0393..e8c450fa39 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 8a7e007bfe..26797dd7ca 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 cd64e7594f..8a6c966c39 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 fc558620c7..e0301fd34c 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 fe388803e7..752c606a93 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 4bc82b8b1e..21a6ad7f8b 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 a8592231cd..0c5370588f 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 754fbe1303..633d25dba9 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 2dfde7a093..0830ba1d84 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 8e7605aef3..f46dc0ca08 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 02393fa8e8..904a6be483 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 e43dbacb1f..c4d7de4326 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 9532b17627..0fed1c6e4c 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 79308329a0..a28e5112b3 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 35836e6bd3..48b16b4690 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 d3af020526..8f9dc27f2e 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 76f8a02e20..b008e2139b 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 1c8ea6b6b6..6f34c02bbd 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 abe2b3301f..fac6ce0e6f 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 6e80708d87..fe1a97bbab 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 f054e5b308..e176a4b462 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 dd3304eab5..9d1cfe1fee 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 2660cbd924..23b13d32df 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 5bdd801453..a97eaa770f 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 8653c285ea..b856852397 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 d014a107c3..e3b8e7f583 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 631dd34d8b..585f6a0e0e 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 eb1f75b455..541c12c01c 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 80488aec37..abfb8d4a67 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 263e1f64d3..39a9f282b2 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 8f6930aa23..cb887cac24 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 d801795985..0f5aa16487 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 3e8d02d0e1..440f1225dd 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 85d76d2187..9ac7052e96 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 c775940f09..ee07cf40dd 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 bca588e6eb..4093c61239 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 35920e932e..fb335b8982 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 2508088819..1c2c682145 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 34c2d2a54d..466cd97930 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 9205919842..39e9a28738 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 aa4ca5fa03..f4db63f028 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 3c90ebae96..0ae285aed1 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 cf61a077f4..f8239b7990 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 ba01d5ca46..ba1db8a4e0 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 a2f3d3576a..2b9c3d4dd0 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 28959da3df..4e56550028 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 3c3c42c84a..ec40bbd296 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 4cabb2257b..31e48331ec 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 9aacba7667..e5a40c2fba 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 a9c8f396e3..7855f68c96 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 07c153e72a..b995c3485e 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 70372c90d8..968d783df3 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 3910339e5d..ecb4282dc1 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 4b8c44a452..5aa25ff0c4 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 dbc922e9eb..cc5ad2abd2 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 26e6e9f3df..971b3aa180 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 50ecf87383..9759e575a2 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 e6ebf86ae1..5bb065ba1c 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 626a4d6a7f..fbb20ef94b 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 c18fb2a660..17398a5a49 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 f870e3bb42..7fc49b4ce8 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 18c23f15c1..30c5c940cc 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 e61ae051f3..d2b83a2500 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 f9a9d5e9e5..935bc947ed 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 6a1cb22daa..0df6984d60 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 ffdc122110..75437d08fe 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 5fbee6caf2..49882d06b8 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 f68bd283a1..f9e59c6f59 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 9d1e6b22ea..dbb4cbb7a7 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 184f57bdc6..c8fa1acba6 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 dd3adf0add..5bfeeac2d3 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 56fea661ae..c872170b02 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 544bd89efe..5d360f54e4 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 2c87664fa9..4ff8caad77 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 416cfe3b01..f26ccfaa3f 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 62a362105e..b083b1058e 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 137fd20b09..533290c11d 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 334866cb69..4a5255a421 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 8cc397eac0..2f38ea7104 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 7036b40932..4394ae7b55 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 07dbc0f724..f8120ffec3 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 d3e3777d44..bb033818c6 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 55da4dfe41..5b13f6c590 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 476d2a7711..dd06f8f70a 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 ff70d802bf..d0b5b8753f 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 df849d58d6..fc8f8cda10 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 779b711e63..209f98e175 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 77b0fd1088..9ace162921 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 aba4fa1a1b..e8cb086493 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 f6ee7454d9..51caf400f1 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 fee62e4fcd..8a324a5c16 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 1dcdfb8dad..1cceb9b518 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 3dfa306c4c..6faec5c532 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 ebe60c4df0..8afdbb487a 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 45cf5c5cf2..096cf16d99 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 6a644a95f7..f93e9644c4 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 e77cca6f5d..ae451768da 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 62f1b2aba4..5e5de1f71f 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 7b59160a36..7b4ca19c8b 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 60ed7672dc..99a5ec9a2f 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 d8973b7337..04192a98b1 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 963be3099b..0a8f54e370 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 6e07c25709..7ba62aa2d3 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 b02f85f549..27f3ca0124 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 6b8f66f042..964874bf8d 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 5d8ecaaf1a..bffb75d356 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 f195c1e775..dcb0004dcf 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 e70f69ed1d..eb156fad0e 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 d3dfaa52e7..e3844aec14 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 58402abd42..39cce5958d 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 17304544be..bf0c9c4cd2 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 37eb5c7cce..007e7953b2 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 b4d09ca073..70c7e1f960 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 8aea3aec59..3bb61da415 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 d56cc2bf82..9aff104763 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 a70d43601d..a4b10a1830 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 8d297e501c..3ef13b8ec3 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 6bf7f12396..c15f0c14e2 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 59a770c63f..ab40f65240 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 66ee51a819..8bd2ef44d4 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 299eddda95..7a7e5a8116 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 722f4e9c54..1c745112b4 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 73dc7f0118..e0331de7c6 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 679b17a041..3fb457bed9 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 2118589ffe..4fac96dcd2 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 183f5dbe00..d5e8d70725 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 bdd207ca46..e631f28d65 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 d265076999..ff1bd33ded 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 a326e6f03f..8729fa63df 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 26237093df..d577a63ae4 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 3028e42871..117fb2150a 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 7231b57ec8..85b3c4000b 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 3099f4518b..054e07a8c7 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 4ab16e24b8..637c301e3f 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 858c67f216..2f0b20a08b 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 bc5c06e99d..9945e13b56 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 23f37c74e6..ee45440a53 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 f0a9ea2102..41e5c498de 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 5558f0e7ab..5459a70504 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 54af90503f..303971e05b 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 340e197bff..9bb1f471a8 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 5fc63b1180..2ff249af34 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 a10743d64b..7596cbd5f1 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 097ad0c902..2f47845276 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 f97c84c782..73430e0ad9 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 bdfd40a31f..6c9769b2c8 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 39c81027fe..d82a327032 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 fbb0b9686a..4a6940d0d0 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 919a048438..5b9e9d7965 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 6857c1f70a..f4ffffd6a8 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 a45ecd523c..a1667f6455 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 95add14fc2..1cf46fbf93 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 c4302418ec..019124ae1a 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 3a7cc810a4..c84ad5ed95 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 d376bbfc21..3eb1ed52f7 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 ed44a01cf8..9c3991287d 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 02d7ea8e6d..3f912da876 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 ee233c93a3..32d27c57b5 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 43fa670a61..c6073bd7e5 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 4ccfb62f8a..c6421d92e9 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 20928c6826..1b5642afb4 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 0752ec4bbc..59b16e0066 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 661b6745e0..c852f02806 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 562beeaeb1..371fa47a7d 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 c4a2a5d9bc..c9ca27c684 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 a38a3bd0f0..eba3e7a07a 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 844d9c08c9..3361d55448 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 02f2d7ff77..6fdbc4d2aa 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 950d199e3a..6e910a96b4 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 2b857517a3..9ae8709557 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 77924b3e7a..02b82b7ee2 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 c50691d9f5..01e35929d4 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 3571c575ee..1328fd5113 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 4f1950128f..5aa3fa2db6 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 c28f05b920..dacb1f521f 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 2d19cedf96..bee266f343 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 968a4bae87..c67db87cf1 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 68de1e3ea6..657f7e05b9 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 f8ecefc93b..9e1d5651d3 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 555f10c016..f5cb298b9f 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 968971d981..a05588b8a4 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 c581874880..682e1dc5b7 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 7daa8cec96..1f3798c7fc 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 142644a2d0..29a8ac32a1 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>