diff --git a/cli/src/connections.c b/cli/src/connections.c
index a28004dbe..fa95adc65 100644
--- a/cli/src/connections.c
+++ b/cli/src/connections.c
@@ -17,6 +17,8 @@
  * (C) Copyright 2010 - 2011 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <dbus/dbus.h>
diff --git a/cli/src/devices.c b/cli/src/devices.c
index d0fa6b4fb..c6228ba1a 100644
--- a/cli/src/devices.c
+++ b/cli/src/devices.c
@@ -17,6 +17,8 @@
  * (C) Copyright 2010 - 2011 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/cli/src/network-manager.c b/cli/src/network-manager.c
index b17a9f46c..5ecfde3a1 100644
--- a/cli/src/network-manager.c
+++ b/cli/src/network-manager.c
@@ -17,6 +17,8 @@
  * (C) Copyright 2010 - 2011 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/cli/src/settings.c b/cli/src/settings.c
index fbec9ab34..c23853702 100644
--- a/cli/src/settings.c
+++ b/cli/src/settings.c
@@ -17,6 +17,8 @@
  * (C) Copyright 2010 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <libnm-util/nm-utils.h>
diff --git a/libnm-util/crypto.c b/libnm-util/crypto.c
index e68b5c64a..ffb3cbdd8 100644
--- a/libnm-util/crypto.c
+++ b/libnm-util/crypto.c
@@ -21,6 +21,8 @@
  * (C) Copyright 2007 - 2011 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <glib.h>
 #include <string.h>
 #include <strings.h>
diff --git a/libnm-util/crypto_gnutls.c b/libnm-util/crypto_gnutls.c
index edfc16af1..5b18f9ff9 100644
--- a/libnm-util/crypto_gnutls.c
+++ b/libnm-util/crypto_gnutls.c
@@ -21,6 +21,7 @@
  * (C) Copyright 2007 - 2009 Red Hat, Inc.
  */
 
+#include "config.h"
 #include <glib.h>
 #include <glib/gi18n.h>
 
diff --git a/libnm-util/nm-utils.c b/libnm-util/nm-utils.c
index 9bfaf6592..71f20dfdd 100644
--- a/libnm-util/nm-utils.c
+++ b/libnm-util/nm-utils.c
@@ -24,6 +24,7 @@
  * (C) Copyright 2005 - 2010 Red Hat, Inc.
  */
 
+#include "config.h"
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/dhcp-manager/nm-dhcp-manager.c b/src/dhcp-manager/nm-dhcp-manager.c
index 1eae19a61..fa6948d26 100644
--- a/src/dhcp-manager/nm-dhcp-manager.c
+++ b/src/dhcp-manager/nm-dhcp-manager.c
@@ -20,7 +20,7 @@
  *
  */
 
-
+#include "config.h"
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <dbus/dbus.h>
diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h
index eb1c73a7c..66ee59404 100644
--- a/src/dns-manager/nm-dns-manager.h
+++ b/src/dns-manager/nm-dns-manager.h
@@ -24,7 +24,6 @@
 #ifndef NM_DNS_MANAGER_H
 #define NM_DNS_MANAGER_H
 
-#include "config.h"
 #include <glib-object.h>
 #include <dbus/dbus.h>
 #include "nm-ip4-config.h"
diff --git a/src/logging/nm-logging.c b/src/logging/nm-logging.c
index 9e643cdfe..fa113ffab 100644
--- a/src/logging/nm-logging.c
+++ b/src/logging/nm-logging.c
@@ -19,7 +19,8 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#define _GNU_SOURCE
+#include "config.h"
+
 #include <dlfcn.h>
 #include <syslog.h>
 #include <execinfo.h>
diff --git a/src/modem-manager/nm-modem-cdma.c b/src/modem-manager/nm-modem-cdma.c
index fd2d2e0e1..5db6a84f3 100644
--- a/src/modem-manager/nm-modem-cdma.c
+++ b/src/modem-manager/nm-modem-cdma.c
@@ -19,6 +19,8 @@
  * Copyright (C) 2009 Novell, Inc.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <glib/gi18n.h>
 
diff --git a/src/modem-manager/nm-modem-gsm.c b/src/modem-manager/nm-modem-gsm.c
index 7f6c4af14..9a96ae99c 100644
--- a/src/modem-manager/nm-modem-gsm.c
+++ b/src/modem-manager/nm-modem-gsm.c
@@ -19,6 +19,8 @@
  * Copyright (C) 2009 Novell, Inc.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <glib/gi18n.h>
 
diff --git a/src/nm-activation-request.c b/src/nm-activation-request.c
index 6a36975a8..d36ee8d41 100644
--- a/src/nm-activation-request.c
+++ b/src/nm-activation-request.c
@@ -19,6 +19,8 @@
  * Copyright (C) 2007 - 2008 Novell, Inc.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <sys/wait.h>
diff --git a/src/nm-dbus-manager.h b/src/nm-dbus-manager.h
index 3c4d283d9..83ffa9667 100644
--- a/src/nm-dbus-manager.h
+++ b/src/nm-dbus-manager.h
@@ -22,7 +22,6 @@
 #ifndef __NM_DBUS_MANAGER_H__
 #define __NM_DBUS_MANAGER_H__
 
-#include "config.h"
 #include <glib-object.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib.h>
diff --git a/src/nm-device-bt.c b/src/nm-device-bt.c
index 5a0d1fdf4..8ce7f93a8 100644
--- a/src/nm-device-bt.c
+++ b/src/nm-device-bt.c
@@ -18,6 +18,8 @@
  * Copyright (C) 2009 - 2011 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <net/ethernet.h>
diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c
index 1bec392a8..284df271a 100644
--- a/src/nm-device-ethernet.c
+++ b/src/nm-device-ethernet.c
@@ -19,6 +19,7 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
+#include "config.h"
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <netinet/in.h>
diff --git a/src/nm-device-olpc-mesh.c b/src/nm-device-olpc-mesh.c
index 4019a6fd1..0f3ea15e3 100644
--- a/src/nm-device-olpc-mesh.c
+++ b/src/nm-device-olpc-mesh.c
@@ -24,6 +24,7 @@
  * (C) Copyright 2009 One Laptop per Child
  */
 
+#include "config.h"
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <dbus/dbus.h>
diff --git a/src/settings/nm-default-wired-connection.c b/src/settings/nm-default-wired-connection.c
index e8b9a1554..c84d413e9 100644
--- a/src/settings/nm-default-wired-connection.c
+++ b/src/settings/nm-default-wired-connection.c
@@ -19,6 +19,8 @@
  * (C) Copyright 2009 - 2011 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <netinet/ether.h>
 
 #include <glib/gi18n.h>
diff --git a/src/settings/nm-polkit-helpers.h b/src/settings/nm-polkit-helpers.h
index dfe9ecefc..d812e9445 100644
--- a/src/settings/nm-polkit-helpers.h
+++ b/src/settings/nm-polkit-helpers.h
@@ -22,7 +22,6 @@
 #ifndef NM_POLKIT_HELPERS_H
 #define NM_POLKIT_HELPERS_H
 
-#include <config.h>
 #include <polkit/polkit.h>
 
 /* Fix for polkit 0.97 and later */
diff --git a/src/settings/nm-settings-connection.c b/src/settings/nm-settings-connection.c
index adf1550cd..9505644aa 100644
--- a/src/settings/nm-settings-connection.c
+++ b/src/settings/nm-settings-connection.c
@@ -19,6 +19,8 @@
  * (C) Copyright 2008 - 2011 Red Hat, Inc.
  */
 
+#include "config.h"
+
 #include <string.h>
 
 #include <NetworkManager.h>
diff --git a/src/settings/nm-settings.c b/src/settings/nm-settings.c
index 78012a087..6f8cc15ff 100644
--- a/src/settings/nm-settings.c
+++ b/src/settings/nm-settings.c
@@ -23,6 +23,8 @@
  * (C) Copyright 2008 Novell, Inc.
  */
 
+#include "config.h"
+
 #include <unistd.h>
 #include <string.h>
 #include <gmodule.h>
diff --git a/src/settings/plugins/ifnet/connection_parser.c b/src/settings/plugins/ifnet/connection_parser.c
index 877957729..982bf7c3b 100644
--- a/src/settings/plugins/ifnet/connection_parser.c
+++ b/src/settings/plugins/ifnet/connection_parser.c
@@ -19,6 +19,8 @@
  * Copyright (C) 1999-2010 Gentoo Foundation, Inc.
  */
 
+#include "config.h"
+
 #include <string.h>
 #include <arpa/inet.h>
 #include <stdlib.h>
diff --git a/src/settings/plugins/ifupdown/interface_parser.c b/src/settings/plugins/ifupdown/interface_parser.c
index 9be853a4c..b7c642423 100644
--- a/src/settings/plugins/ifupdown/interface_parser.c
+++ b/src/settings/plugins/ifupdown/interface_parser.c
@@ -20,7 +20,7 @@
  * (C) Copyright 2004 Tom Parker
  */
 
-
+#include "config.h"
 #include "interface_parser.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/settings/plugins/ifupdown/interface_parser.h b/src/settings/plugins/ifupdown/interface_parser.h
index ea991c32d..0c1de23a5 100644
--- a/src/settings/plugins/ifupdown/interface_parser.h
+++ b/src/settings/plugins/ifupdown/interface_parser.h
@@ -24,8 +24,6 @@
 #ifndef _INTERFACE_PARSER_H
 #define _INTERFACE_PARSER_H
 
-#include "config.h"
-
 typedef struct _if_data
 {
 	char *key;