summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
167 files changed, 312 insertions, 59 deletions
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>