all: merge branch 'th/include-nm-default'

Cleanup includes.

78 files changed, 21 insertions, 484 deletions

diff --git a/shared/nm-default.h b/shared/nm-default.h
index 48fb89cf..a673eb07 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -39,6 +39,11 @@
 
 /* always include these headers for our internal source files. */
 
+#ifndef ___CONFIG_H__
+#define ___CONFIG_H__
+#include <config.h>
+#endif
+
 #include <stdlib.h>
 
 #include "nm-glib.h"
@@ -46,6 +51,8 @@
 #include "gsystem-local-alloc.h"
 #include "nm-macros-internal.h"
 
+#include <gtk/gtk.h>
+
 /*****************************************************************************/
 
 #if ((NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB) || ((NETWORKMANAGER_COMPILATION) == NM_NETWORKMANAGER_COMPILATION_LIB_LEGACY)
diff --git a/shared/nm-macros-internal.h b/shared/nm-macros-internal.h
index fb8ab2ce..9971f15c 100644
--- a/shared/nm-macros-internal.h
+++ b/shared/nm-macros-internal.h
@@ -271,13 +271,16 @@ _NM_IN_STRSET_streq (const char *x, const char *s)
 
 /*****************************************************************************/
 
-#define NM_GOBJECT_PROPERTIES_DEFINE(obj_type, ...) \
+#define NM_GOBJECT_PROPERTIES_DEFINE_BASE(...) \
 typedef enum { \
 	_PROPERTY_ENUMS_0, \
 	__VA_ARGS__ \
 	_PROPERTY_ENUMS_LAST, \
 } _PropertyEnums; \
-static GParamSpec *obj_properties[_PROPERTY_ENUMS_LAST] = { NULL, }; \
+static GParamSpec *obj_properties[_PROPERTY_ENUMS_LAST] = { NULL, }
+
+#define NM_GOBJECT_PROPERTIES_DEFINE(obj_type, ...) \
+NM_GOBJECT_PROPERTIES_DEFINE_BASE (__VA_ARGS__); \
 static inline void \
 _notify (obj_type *obj, _PropertyEnums prop) \
 { \
@@ -429,7 +432,7 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro) {
 		 * It disallows a buffer size of sizeof(gpointer) to catch that. */ \
 		G_STATIC_ASSERT (G_N_ELEMENTS (buf) == sizeof (buf) && sizeof (buf) != sizeof (char *)); \
 		g_snprintf (_buf, sizeof (buf), \
-		            ""format"", __VA_ARGS__); \
+		            ""format"", ##__VA_ARGS__); \
 		_buf; \
 	})
 
@@ -440,7 +443,7 @@ nm_decode_version (guint version, guint *major, guint *minor, guint *micro) {
 		G_STATIC_ASSERT (sizeof (char[MAX ((n_elements), 1)]) == (n_elements)); \
 		_buf = g_alloca (n_elements); \
 		g_snprintf (_buf, n_elements, \
-		            ""format"", __VA_ARGS__); \
+		            ""format"", ##__VA_ARGS__); \
 		_buf; \
 	})
 
diff --git a/src/ap-menu-item.c b/src/ap-menu-item.c
index e80ad3a1..ee997f72 100644
--- a/src/ap-menu-item.c
+++ b/src/ap-menu-item.c
@@ -21,12 +21,9 @@
  * Copyright 2005 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdio.h>
-#include <glib/gi18n.h>
 #include <string.h>
 
 #include <NetworkManager.h>
diff --git a/src/applet-agent.c b/src/applet-agent.c
index b8268b46..1dcb0857 100644
--- a/src/applet-agent.c
+++ b/src/applet-agent.c
@@ -19,11 +19,8 @@
  * Copyright 2011 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
 #include <string.h>
 
 #define SECRET_API_SUBJECT_TO_CHANGE
diff --git a/src/applet-device-broadband.c b/src/applet-device-broadband.c
index 4de2b043..e2a809dc 100644
--- a/src/applet-device-broadband.c
+++ b/src/applet-device-broadband.c
@@ -18,15 +18,10 @@
  * (C) Copyright 2012 Aleksander Morgado <aleksander@gnu.org>
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <ctype.h>
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include <NetworkManager.h>
 
 #include "applet.h"
diff --git a/src/applet-device-bt.c b/src/applet-device-bt.c
index 1f665468..e53e0965 100644
--- a/src/applet-device-bt.c
+++ b/src/applet-device-bt.c
@@ -21,13 +21,8 @@
  * Copyright 2008 Novell, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include "applet.h"
 #include "applet-device-bt.h"
 #include "applet-dialogs.h"
diff --git a/src/applet-device-ethernet.c b/src/applet-device-ethernet.c
index e1dfaca8..baa4b76b 100644
--- a/src/applet-device-ethernet.c
+++ b/src/applet-device-ethernet.c
@@ -21,13 +21,8 @@
  * Copyright 2008 Novell, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include "applet.h"
 #include "applet-device-ethernet.h"
 #include "ethernet-dialog.h"
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 12584c09..b768fb04 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -20,8 +20,6 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <netinet/in.h>
@@ -29,9 +27,6 @@
 #include <netinet/ether.h>
 #include <ctype.h>
 
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
 #include "applet.h"
 #include "applet-device-wifi.h"
 #include "ap-menu-item.h"
diff --git a/src/applet-dialogs.c b/src/applet-dialogs.c
index fb874186..ff5b1bd4 100644
--- a/src/applet-dialogs.c
+++ b/src/applet-dialogs.c
@@ -20,8 +20,6 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <netinet/in.h>
@@ -30,9 +28,6 @@
 
 #include <NetworkManager.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "applet-dialogs.h"
 #include "utils.h"
 
diff --git a/src/applet-vpn-request.c b/src/applet-vpn-request.c
index 8ba826ab..f83ef5a1 100644
--- a/src/applet-vpn-request.c
+++ b/src/applet-vpn-request.c
@@ -20,8 +20,6 @@
  * Copyright 2004 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdio.h>
@@ -29,12 +27,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <glib.h>
 #include <unistd.h>
 #include <errno.h>
 
-#include <glib-object.h>
-
 #include <NetworkManager.h>
 
 #include "applet-vpn-request.h"
diff --git a/src/applet.c b/src/applet.c
index df8b9602..dde4bcb0 100644
--- a/src/applet.c
+++ b/src/applet.c
@@ -27,21 +27,14 @@
  * Copyright 2001, 2002 Free Software Foundation
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <time.h>
 #include <string.h>
 #include <strings.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <stdlib.h>
-
-#include <gio/gio.h>
-
 #include <libnotify/notify.h>
 
 #include "applet.h"
diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
index 9d500e77..7e341438 100644
--- a/src/connection-editor/ce-page.c
+++ b/src/connection-editor/ce-page.c
@@ -20,8 +20,6 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <net/ethernet.h>
@@ -29,8 +27,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
-
 #include "ce-page.h"
 
 G_DEFINE_ABSTRACT_TYPE (CEPage, ce_page, G_TYPE_OBJECT)
diff --git a/src/connection-editor/ce-polkit-button.c b/src/connection-editor/ce-polkit-button.c
index f3b7bac9..677cffe0 100644
--- a/src/connection-editor/ce-polkit-button.c
+++ b/src/connection-editor/ce-polkit-button.c
@@ -20,15 +20,10 @@
  * Copyright 2009 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "ce-polkit-button.h"
 
 G_DEFINE_TYPE (CEPolkitButton, ce_polkit_button, GTK_TYPE_BUTTON)
diff --git a/src/connection-editor/connection-helpers.c b/src/connection-editor/connection-helpers.c
index 97ef88fd..4abaf37d 100644
--- a/src/connection-editor/connection-helpers.c
+++ b/src/connection-editor/connection-helpers.c
@@ -18,12 +18,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
-
 #include "connection-helpers.h"
 #include "nm-connection-list.h"
 #include "nm-connection-editor.h"
diff --git a/src/connection-editor/ip4-routes-dialog.c b/src/connection-editor/ip4-routes-dialog.c
index a15da8b7..e4d9b2ea 100644
--- a/src/connection-editor/ip4-routes-dialog.c
+++ b/src/connection-editor/ip4-routes-dialog.c
@@ -20,8 +20,6 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <netinet/in.h>
@@ -32,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
 #include "ip4-routes-dialog.h"
diff --git a/src/connection-editor/ip6-routes-dialog.c b/src/connection-editor/ip6-routes-dialog.c
index 6b28f53d..9f90e4b2 100644
--- a/src/connection-editor/ip6-routes-dialog.c
+++ b/src/connection-editor/ip6-routes-dialog.c
@@ -20,8 +20,6 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <netinet/in.h>
@@ -32,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
 
 #include <NetworkManager.h>
diff --git a/src/connection-editor/main.c b/src/connection-editor/main.c
index 9314afc6..34b0aebc 100644
--- a/src/connection-editor/main.c
+++ b/src/connection-editor/main.c
@@ -20,17 +20,13 @@
  * Copyright 2004 - 2014 Red Hat, Inc.
  */
 
-# include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <signal.h>
 
 #include <dbus/dbus.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n-lib.h>
-#include <glib.h>
-#include <glib-object.h>
 #include <glib-unix.h>
 
 #include "gsystem-local-alloc.h"
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index bb8e9ad7..430ce8ff 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -23,17 +23,12 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#include <glib/gi18n.h>
 
 #include "nm-connection-editor.h"
 
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index cb60b7d1..c561f666 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -21,17 +21,12 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <sys/types.h>
 #include <unistd.h>
-
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
-#include <glib/gi18n.h>
 
 #include "ce-page.h"
 #include "nm-connection-editor.h"
diff --git a/src/connection-editor/page-8021x-security.c b/src/connection-editor/page-8021x-security.c
index b1a26604..5af6111a 100644
--- a/src/connection-editor/page-8021x-security.c
+++ b/src/connection-editor/page-8021x-security.c
@@ -20,15 +20,10 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "wireless-security.h"
 #include "page-ethernet.h"
 #include "page-8021x-security.h"
diff --git a/src/connection-editor/page-bluetooth.c b/src/connection-editor/page-bluetooth.c
index 37495aa2..ff3ca439 100644
--- a/src/connection-editor/page-bluetooth.c
+++ b/src/connection-editor/page-bluetooth.c
@@ -20,15 +20,10 @@
  * Copyright 2014 - 2015 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include <NetworkManager.h>
 
 #include "page-bluetooth.h"
diff --git a/src/connection-editor/page-bond.c b/src/connection-editor/page-bond.c
index fe08bcd0..392fa5ff 100644
--- a/src/connection-editor/page-bond.c
+++ b/src/connection-editor/page-bond.c
@@ -18,13 +18,9 @@
  * Copyright 2012 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
 
 #include "page-bond.h"
 #include "page-infiniband.h"
diff --git a/src/connection-editor/page-bridge-port.c b/src/connection-editor/page-bridge-port.c
index 0620fb13..09bae1fd 100644
--- a/src/connection-editor/page-bridge-port.c
+++ b/src/connection-editor/page-bridge-port.c
@@ -20,15 +20,10 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-bridge-port.h"
 
 G_DEFINE_TYPE (CEPageBridgePort, ce_page_bridge_port, CE_TYPE_PAGE)
diff --git a/src/connection-editor/page-bridge.c b/src/connection-editor/page-bridge.c
index 10f6632b..cc4fefec 100644
--- a/src/connection-editor/page-bridge.c
+++ b/src/connection-editor/page-bridge.c
@@ -18,13 +18,9 @@
  * Copyright 2012 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
 
 #include "page-bridge.h"
 #include "nm-connection-editor.h"
diff --git a/src/connection-editor/page-dcb.c b/src/connection-editor/page-dcb.c
index c760b2b1..05ba4310 100644
--- a/src/connection-editor/page-dcb.c
+++ b/src/connection-editor/page-dcb.c
@@ -20,17 +20,12 @@
  * Copyright 2013 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-dcb.h"
 
 G_DEFINE_TYPE (CEPageDcb, ce_page_dcb, CE_TYPE_PAGE)
diff --git a/src/connection-editor/page-dsl.c b/src/connection-editor/page-dsl.c
index 4dcef6ce..f6a0e453 100644
--- a/src/connection-editor/page-dsl.c
+++ b/src/connection-editor/page-dsl.c
@@ -20,15 +20,10 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-dsl.h"
 #include "nm-connection-editor.h"
 
diff --git a/src/connection-editor/page-ethernet.c b/src/connection-editor/page-ethernet.c
index 9bc87bf7..536ae9cb 100644
--- a/src/connection-editor/page-ethernet.c
+++ b/src/connection-editor/page-ethernet.c
@@ -20,16 +20,11 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <net/ethernet.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-ethernet.h"
 
 G_DEFINE_TYPE (CEPageEthernet, ce_page_ethernet, CE_TYPE_PAGE)
diff --git a/src/connection-editor/page-general.c b/src/connection-editor/page-general.c
index a94cf809..3b8b0022 100644
--- a/src/connection-editor/page-general.c
+++ b/src/connection-editor/page-general.c
@@ -18,15 +18,9 @@
  * Copyright 2012 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-general.h"
-#include "nm-glib-compat.h"
 
 G_DEFINE_TYPE (CEPageGeneral, ce_page_general, CE_TYPE_PAGE)
 
diff --git a/src/connection-editor/page-infiniband.c b/src/connection-editor/page-infiniband.c
index f544e4ad..3f934a26 100644
--- a/src/connection-editor/page-infiniband.c
+++ b/src/connection-editor/page-infiniband.c
@@ -18,13 +18,8 @@
  * Copyright 2012 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include <net/if_arp.h>
 #include <linux/if_infiniband.h>
 
diff --git a/src/connection-editor/page-ip4.c b/src/connection-editor/page-ip4.c
index dc7097d3..b457448d 100644
--- a/src/connection-editor/page-ip4.c
+++ b/src/connection-editor/page-ip4.c
@@ -20,17 +20,12 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -38,7 +33,6 @@
 #include "page-ip4.h"
 #include "ip4-routes-dialog.h"
 #include "connection-helpers.h"
-#include "nm-glib-compat.h"
 
 G_DEFINE_TYPE (CEPageIP4, ce_page_ip4, CE_TYPE_PAGE)
 
diff --git a/src/connection-editor/page-ip6.c b/src/connection-editor/page-ip6.c
index de6283d4..124269ee 100644
--- a/src/connection-editor/page-ip6.c
+++ b/src/connection-editor/page-ip6.c
@@ -20,24 +20,18 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
-
-#include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
-#include <glib/gi18n.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
 #include "page-ip6.h"
 #include "ip6-routes-dialog.h"
-#include "nm-glib-compat.h"
 
 G_DEFINE_TYPE (CEPageIP6, ce_page_ip6, CE_TYPE_PAGE)
 
diff --git a/src/connection-editor/page-master.c b/src/connection-editor/page-master.c
index 2b790071..d85bed76 100644
--- a/src/connection-editor/page-master.c
+++ b/src/connection-editor/page-master.c
@@ -18,13 +18,9 @@
  * Copyright 2012 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
 
 #include <NetworkManager.h>
 
diff --git a/src/connection-editor/page-mobile.c b/src/connection-editor/page-mobile.c
index add16708..8a1aa64f 100644
--- a/src/connection-editor/page-mobile.c
+++ b/src/connection-editor/page-mobile.c
@@ -20,15 +20,10 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-mobile.h"
 #include "nm-connection-editor.h"
 #include "nma-mobile-wizard.h"
diff --git a/src/connection-editor/page-ppp.c b/src/connection-editor/page-ppp.c
index 60f413ec..e9b4ac67 100644
--- a/src/connection-editor/page-ppp.c
+++ b/src/connection-editor/page-ppp.c
@@ -20,19 +20,13 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-ppp.h"
 #include "ppp-auth-methods-dialog.h"
 #include "nm-connection-editor.h"
-#include "nm-glib-compat.h"
 
 G_DEFINE_TYPE (CEPagePpp, ce_page_ppp, CE_TYPE_PAGE)
 
diff --git a/src/connection-editor/page-team-port.c b/src/connection-editor/page-team-port.c
index 8078b568..e033ccf8 100644
--- a/src/connection-editor/page-team-port.c
+++ b/src/connection-editor/page-team-port.c
@@ -18,15 +18,10 @@
  * Copyright 2013 - 2014  Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-team-port.h"
 
 G_DEFINE_TYPE (CEPageTeamPort, ce_page_team_port, CE_TYPE_PAGE)
diff --git a/src/connection-editor/page-team.c b/src/connection-editor/page-team.c
index 0759bab0..cc14533c 100644
--- a/src/connection-editor/page-team.c
+++ b/src/connection-editor/page-team.c
@@ -20,13 +20,9 @@
  * Copyright 2013 - 2014  Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdlib.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
 
 #include "page-team.h"
 #include "page-infiniband.h"
diff --git a/src/connection-editor/page-vlan.c b/src/connection-editor/page-vlan.c
index 39a36921..9dea191c 100644
--- a/src/connection-editor/page-vlan.c
+++ b/src/connection-editor/page-vlan.c
@@ -18,17 +18,12 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdlib.h>
 #include <string.h>
 #include <net/ethernet.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-vlan.h"
 #include "connection-helpers.h"
 #include "nm-connection-editor.h"
diff --git a/src/connection-editor/page-vpn.c b/src/connection-editor/page-vpn.c
index 78593f84..d07f491f 100644
--- a/src/connection-editor/page-vpn.c
+++ b/src/connection-editor/page-vpn.c
@@ -20,20 +20,14 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "page-vpn.h"
 #include "connection-helpers.h"
 #include "nm-connection-editor.h"
 #include "vpn-helpers.h"
-#include "nm-glib-compat.h"
 
 G_DEFINE_TYPE (CEPageVpn, ce_page_vpn, CE_TYPE_PAGE)
 
diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
index a19553fc..405ca3d7 100644
--- a/src/connection-editor/page-wifi-security.c
+++ b/src/connection-editor/page-wifi-security.c
@@ -20,15 +20,10 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "wireless-security.h"
 #include "page-wifi.h"
 #include "page-wifi-security.h"
diff --git a/src/connection-editor/page-wifi.c b/src/connection-editor/page-wifi.c
index fc550f91..44dd4d3e 100644
--- a/src/connection-editor/page-wifi.c
+++ b/src/connection-editor/page-wifi.c
@@ -20,16 +20,11 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <math.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "nm-connection-editor.h"
 #include "page-wifi.h"
 
diff --git a/src/connection-editor/ppp-auth-methods-dialog.c b/src/connection-editor/ppp-auth-methods-dialog.c
index 918a7b3f..36134428 100644
--- a/src/connection-editor/ppp-auth-methods-dialog.c
+++ b/src/connection-editor/ppp-auth-methods-dialog.c
@@ -20,8 +20,6 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <netinet/in.h>
@@ -32,7 +30,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n.h>
 
 #include <NetworkManager.h>
 
diff --git a/src/connection-editor/vpn-helpers.c b/src/connection-editor/vpn-helpers.c
index e4aad6fc..ecfc850c 100644
--- a/src/connection-editor/vpn-helpers.c
+++ b/src/connection-editor/vpn-helpers.c
@@ -20,15 +20,10 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
-#include <glib.h>
 #include <gmodule.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
 
 #include "vpn-helpers.h"
 #include "utils.h"
diff --git a/src/ethernet-dialog.c b/src/ethernet-dialog.c
index e613d807..6cbe4551 100644
--- a/src/ethernet-dialog.c
+++ b/src/ethernet-dialog.c
@@ -21,11 +21,8 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
 
 #include "ethernet-dialog.h"
 #include "wireless-security.h"
diff --git a/src/libnm-gtk/init.c b/src/libnm-gtk/init.c
index e5aff7c6..d8664867 100644
--- a/src/libnm-gtk/init.c
+++ b/src/libnm-gtk/init.c
@@ -18,12 +18,9 @@
  * Copyright 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <libintl.h>
-#include <glib/gi18n-lib.h>
 
 static void __attribute__((constructor))
 _libnm_gtk_init (void)
diff --git a/src/libnm-gtk/nm-mobile-providers.c b/src/libnm-gtk/nm-mobile-providers.c
index 532654a6..996d61a7 100644
--- a/src/libnm-gtk/nm-mobile-providers.c
+++ b/src/libnm-gtk/nm-mobile-providers.c
@@ -22,16 +22,12 @@
  * Copyright (C) 2012 Lanedo GmbH
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nm-mobile-providers.h"
 
 #ifndef MOBILE_BROADBAND_PROVIDER_INFO
diff --git a/src/libnm-gtk/nm-mobile-wizard.c b/src/libnm-gtk/nm-mobile-wizard.c
index 891cfe05..afc6cc0c 100644
--- a/src/libnm-gtk/nm-mobile-wizard.c
+++ b/src/libnm-gtk/nm-mobile-wizard.c
@@ -20,17 +20,10 @@
  * (C) Copyright 2008 - 2012 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdlib.h>
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <gtk/gtk.h>
-
 #include <NetworkManager.h>
 #include <nm-setting-gsm.h>
 #include <nm-setting-cdma.h>
diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c
index c042e669..451de53c 100644
--- a/src/libnm-gtk/nm-ui-utils.c
+++ b/src/libnm-gtk/nm-ui-utils.c
@@ -18,13 +18,10 @@
  * Copyright 2007 - 2015 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
 #include <nm-device.h>
diff --git a/src/libnm-gtk/nm-vpn-password-dialog.c b/src/libnm-gtk/nm-vpn-password-dialog.c
index 9928a44d..1f5ff376 100644
--- a/src/libnm-gtk/nm-vpn-password-dialog.c
+++ b/src/libnm-gtk/nm-vpn-password-dialog.c
@@ -22,13 +22,8 @@
  *          Dan Williams <dcbw@redhat.com>
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
 #include "nm-vpn-password-dialog.h"
 
 G_DEFINE_TYPE (NMAVpnPasswordDialog, nma_vpn_password_dialog, GTK_TYPE_DIALOG)
@@ -42,7 +37,7 @@ typedef struct {
 	gboolean show_password;
 	gboolean show_password_secondary;
 	gboolean show_password_ternary;
-	
+
 	/* Internal widgetry and flags */
 	GtkWidget *password_entry;
 	GtkWidget *password_entry_secondary;
@@ -52,7 +47,7 @@ typedef struct {
 	GtkWidget *grid_alignment;
 	GtkWidget *grid;
 	GtkSizeGroup *group;
-	
+
 	char *primary_password_label;
 	char *secondary_password_label;
 	char *ternary_password_label;
diff --git a/src/libnm-gtk/nm-wifi-dialog.c b/src/libnm-gtk/nm-wifi-dialog.c
index 777aca9e..1bf1bf45 100644
--- a/src/libnm-gtk/nm-wifi-dialog.c
+++ b/src/libnm-gtk/nm-wifi-dialog.c
@@ -20,14 +20,9 @@
  * (C) Copyright 2007 - 2012 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
 #include <netinet/ether.h>
 
 #include <nm-client.h>
diff --git a/src/libnm-gtk/nm-wireless-dialog.c b/src/libnm-gtk/nm-wireless-dialog.c
index aa0aa942..03c50279 100644
--- a/src/libnm-gtk/nm-wireless-dialog.c
+++ b/src/libnm-gtk/nm-wireless-dialog.c
@@ -20,8 +20,6 @@
  * (C) Copyright 2007 - 2012 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <nm-client.h>
diff --git a/src/libnm-gtk/tests/test-mobile-providers.c b/src/libnm-gtk/tests/test-mobile-providers.c
index 1f74e35b..1a7e23c8 100644
--- a/src/libnm-gtk/tests/test-mobile-providers.c
+++ b/src/libnm-gtk/tests/test-mobile-providers.c
@@ -13,8 +13,6 @@
  * Copyright (C) 2012 Aleksander Morgado <aleksander@gnu.org>
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <locale.h>
diff --git a/src/libnma/init.c b/src/libnma/init.c
index ff33b553..f70e1c4f 100644
--- a/src/libnma/init.c
+++ b/src/libnma/init.c
@@ -18,12 +18,9 @@
  * Copyright 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <libintl.h>
-#include <glib/gi18n-lib.h>
 
 static void __attribute__((constructor))
 _libnma_init (void)
diff --git a/src/libnma/nma-mobile-providers.c b/src/libnma/nma-mobile-providers.c
index 5159852d..d6b44fd5 100644
--- a/src/libnma/nma-mobile-providers.c
+++ b/src/libnma/nma-mobile-providers.c
@@ -22,16 +22,12 @@
  * Copyright (C) 2012 Lanedo GmbH
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nma-mobile-providers.h"
 
 #ifndef MOBILE_BROADBAND_PROVIDER_INFO
diff --git a/src/libnma/nma-mobile-wizard.c b/src/libnma/nma-mobile-wizard.c
index fbfc5380..ddfb129e 100644
--- a/src/libnma/nma-mobile-wizard.c
+++ b/src/libnma/nma-mobile-wizard.c
@@ -20,17 +20,10 @@
  * (C) Copyright 2008 - 2012 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdlib.h>
 
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-
-#include <gtk/gtk.h>
-
 #include <NetworkManager.h>
 #include <nm-setting-gsm.h>
 #include <nm-setting-cdma.h>
diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
index d26ab22a..65344159 100644
--- a/src/libnma/nma-ui-utils.c
+++ b/src/libnma/nma-ui-utils.c
@@ -17,14 +17,10 @@
  * Copyright 2015 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <glib/gi18n-lib.h>
-
 #include "nma-ui-utils.h"
 
 /*---------------------------------------------------------------------------*/
diff --git a/src/libnma/nma-vpn-password-dialog.c b/src/libnma/nma-vpn-password-dialog.c
index e50bc504..7a7f2bfb 100644
--- a/src/libnma/nma-vpn-password-dialog.c
+++ b/src/libnma/nma-vpn-password-dialog.c
@@ -22,13 +22,8 @@
  *          Dan Williams <dcbw@redhat.com>
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
-
 #include "nma-vpn-password-dialog.h"
 
 G_DEFINE_TYPE (NMAVpnPasswordDialog, nma_vpn_password_dialog, GTK_TYPE_DIALOG)
@@ -42,7 +37,7 @@ typedef struct {
 	gboolean show_password;
 	gboolean show_password_secondary;
 	gboolean show_password_ternary;
-	
+
 	/* Internal widgetry and flags */
 	GtkWidget *password_entry;
 	GtkWidget *password_entry_secondary;
@@ -52,7 +47,7 @@ typedef struct {
 	GtkWidget *grid_alignment;
 	GtkWidget *grid;
 	GtkSizeGroup *group;
-	
+
 	char *primary_password_label;
 	char *secondary_password_label;
 	char *ternary_password_label;
diff --git a/src/libnma/nma-wifi-dialog.c b/src/libnma/nma-wifi-dialog.c
index 15f65b27..d92fc1c5 100644
--- a/src/libnma/nma-wifi-dialog.c
+++ b/src/libnma/nma-wifi-dialog.c
@@ -20,14 +20,9 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
-
-#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
 #include <netinet/ether.h>
 
 #include <NetworkManager.h>
diff --git a/src/main.c b/src/main.c
index 59d7b873..ee3de68e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,14 +22,11 @@
  * (C) Copyright 2005 Red Hat, Inc.
  */
 
-# include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <stdlib.h>
 
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "applet.h"
 
 gboolean shell_debug = FALSE;
diff --git a/src/mb-menu-item.c b/src/mb-menu-item.c
index 5fbe383b..e1bcde5d 100644
--- a/src/mb-menu-item.c
+++ b/src/mb-menu-item.c
@@ -21,12 +21,9 @@
  * Copyright (C) 2005 - 2010 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <stdio.h>
-#include <glib/gi18n.h>
 #include <string.h>
 
 #include "mb-menu-item.h"
diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
index 7c3cf181..7a6b61d4 100644
--- a/src/mobile-helpers.c
+++ b/src/mobile-helpers.c
@@ -20,12 +20,9 @@
  * Copyright 2010 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <ctype.h>
-#include <glib/gi18n.h>
 
 #define SECRET_API_SUBJECT_TO_CHANGE
 #include <libsecret/secret.h>
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index 0f7b4ca1..47c360cd 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -5,7 +5,6 @@ noinst_LTLIBRARIES = \
 	libutils-libnm.la
 
 libutils_libnm_glib_la_SOURCES = \
-	nm-glib-compat.h \
 	utils.c \
 	utils.h
 
diff --git a/src/utils/nm-glib-compat.h b/src/utils/nm-glib-compat.h
deleted file mode 100644
index 18454c71..00000000
--- a/src/utils/nm-glib-compat.h
+++ /dev/null
@@ -1,156 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* NetworkManager -- Network link manager
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Copyright 2013-2014 Red Hat, Inc.
- */
-
-#ifndef NM_GLIB_COMPAT_H
-#define NM_GLIB_COMPAT_H
-
-#include <glib.h>
-
-
-/*************************************************************/
-
-#ifdef __clang__
-
-#undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-#undef G_GNUC_END_IGNORE_DEPRECATIONS
-
-#define G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    _Pragma("clang diagnostic push") \
-    _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
-
-#define G_GNUC_END_IGNORE_DEPRECATIONS \
-    _Pragma("clang diagnostic pop")
-
-#endif
-
-
-/*************************************************************
- * undeprecate GValueArray
- *************************************************************/
-
-#define g_value_array_get_type() \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_get_type (); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_get_nth(value_array, index_) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_get_nth (value_array, index_); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_new(n_prealloced) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_new (n_prealloced); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_free(value_array) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_free (value_array); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_copy(value_array) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_copy (value_array); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_prepend(value_array, value) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_prepend (value_array, value); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_append(value_array, value) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_append (value_array, value); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_insert(value_array, index_, value) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_insert (value_array, index_, value); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_remove(value_array, index_) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_remove (value_array, index_); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_sort(value_array, compare_func) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_sort (value_array, compare_func); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-#define g_value_array_sort_with_data(value_array, compare_func, user_data) \
-  G_GNUC_EXTENSION ({ \
-    G_GNUC_BEGIN_IGNORE_DEPRECATIONS \
-    g_value_array_sort_with_data (value_array, compare_func, user_data); \
-    G_GNUC_END_IGNORE_DEPRECATIONS \
-  })
-
-
-/*************************************************************
- * Define g_clear_pointer() if it doesn't exist (glib < 2.34)
- *************************************************************/
-
-#if !GLIB_CHECK_VERSION(2,34,0)
-
-#define g_clear_pointer(pp, destroy)	  \
-	G_STMT_START { \
-		G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
-		/* Only one access, please */ \
-		gpointer *_pp = (gpointer *) (pp); \
-		gpointer _p; \
-		/* This assignment is needed to avoid a gcc warning */ \
-		GDestroyNotify _destroy = (GDestroyNotify) (destroy); \
-	  \
-		(void) (0 ? (gpointer) *(pp) : 0); \
-		do \
-			_p = g_atomic_pointer_get (_pp); \
-		while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \
-	  \
-		if (_p) \
-			_destroy (_p); \
-	} G_STMT_END
-
-#endif
-
-
-/*************************************************************/
-
-
-#endif  /* NM_GLIB_COMPAT_H */
diff --git a/src/utils/tests/test-utils.c b/src/utils/tests/test-utils.c
index 496bd9df..c63b1ef2 100644
--- a/src/utils/tests/test-utils.c
+++ b/src/utils/tests/test-utils.c
@@ -20,11 +20,8 @@
  * (C) Copyright 2009 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include "utils.h"
diff --git a/src/utils/utils.c b/src/utils/utils.c
index 2dbf8c4f..fd573cc9 100644
--- a/src/utils/utils.c
+++ b/src/utils/utils.c
@@ -20,15 +20,10 @@
  * Copyright 2007 - 2015 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 #include <netinet/ether.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
 
 #include "utils.h"
 
@@ -63,7 +58,7 @@ utils_ether_addr_valid (const struct ether_addr *test_addr)
 
 	if (test_addr->ether_addr_octet[0] & 1)			/* Multicast addresses */
 		return FALSE;
-	
+
 	return TRUE;
 }
 
diff --git a/src/wireless-security/eap-method-fast.c b/src/wireless-security/eap-method-fast.c
index 002c5ab5..c895cbc6 100644
--- a/src/wireless-security/eap-method-fast.c
+++ b/src/wireless-security/eap-method-fast.c
@@ -20,11 +20,8 @@
  * Copyright 2012 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/wireless-security/eap-method-leap.c b/src/wireless-security/eap-method-leap.c
index c0e71902..e52c7a2d 100644
--- a/src/wireless-security/eap-method-leap.c
+++ b/src/wireless-security/eap-method-leap.c
@@ -20,13 +20,10 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <ctype.h>
 #include <string.h>
-#include <glib/gi18n.h>
 
 #include "eap-method.h"
 #include "wireless-security.h"
diff --git a/src/wireless-security/eap-method-peap.c b/src/wireless-security/eap-method-peap.c
index 4d65e44f..867fcba3 100644
--- a/src/wireless-security/eap-method-peap.c
+++ b/src/wireless-security/eap-method-peap.c
@@ -20,11 +20,8 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c
index 0deea1ed..692695bc 100644
--- a/src/wireless-security/eap-method-simple.c
+++ b/src/wireless-security/eap-method-simple.c
@@ -20,13 +20,10 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <ctype.h>
 #include <string.h>
-#include <glib/gi18n.h>
 
 #include "eap-method.h"
 #include "wireless-security.h"
diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
index a8976b00..114e5be9 100644
--- a/src/wireless-security/eap-method-tls.c
+++ b/src/wireless-security/eap-method-tls.c
@@ -20,11 +20,8 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/wireless-security/eap-method-ttls.c b/src/wireless-security/eap-method-ttls.c
index e01490da..31b631df 100644
--- a/src/wireless-security/eap-method-ttls.c
+++ b/src/wireless-security/eap-method-ttls.c
@@ -20,11 +20,8 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
index cc921278..e771b58a 100644
--- a/src/wireless-security/eap-method.c
+++ b/src/wireless-security/eap-method.c
@@ -21,13 +21,8 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/wireless-security/helpers.c b/src/wireless-security/helpers.c
index c4d37c5c..aff9db24 100644
--- a/src/wireless-security/helpers.c
+++ b/src/wireless-security/helpers.c
@@ -20,8 +20,6 @@
  * Copyright 2009 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include "helpers.h"
diff --git a/src/wireless-security/wireless-security.c b/src/wireless-security/wireless-security.c
index 29a6847d..515c9917 100644
--- a/src/wireless-security/wireless-security.c
+++ b/src/wireless-security/wireless-security.c
@@ -20,16 +20,10 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
 
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <glib/gi18n.h>
-
 #include "wireless-security.h"
 #include "eap-method.h"
 #include "utils.h"
diff --git a/src/wireless-security/ws-dynamic-wep.c b/src/wireless-security/ws-dynamic-wep.c
index ec348af5..db55119c 100644
--- a/src/wireless-security/ws-dynamic-wep.c
+++ b/src/wireless-security/ws-dynamic-wep.c
@@ -20,11 +20,8 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/wireless-security/ws-leap.c b/src/wireless-security/ws-leap.c
index bd145f9f..0bf1707f 100644
--- a/src/wireless-security/ws-leap.c
+++ b/src/wireless-security/ws-leap.c
@@ -20,12 +20,9 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
 
 #include "wireless-security.h"
 #include "helpers.h"
diff --git a/src/wireless-security/ws-wep-key.c b/src/wireless-security/ws-wep-key.c
index eef9121d..a95695bb 100644
--- a/src/wireless-security/ws-wep-key.c
+++ b/src/wireless-security/ws-wep-key.c
@@ -20,13 +20,9 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <string.h>
-#include <glib.h>
-#include <glib/gi18n.h>
 
 #include "wireless-security.h"
 #include "utils.h"
diff --git a/src/wireless-security/ws-wpa-eap.c b/src/wireless-security/ws-wpa-eap.c
index ddf10095..d83218df 100644
--- a/src/wireless-security/ws-wpa-eap.c
+++ b/src/wireless-security/ws-wpa-eap.c
@@ -20,11 +20,8 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
-#include <glib/gi18n.h>
 #include <ctype.h>
 #include <string.h>
 
diff --git a/src/wireless-security/ws-wpa-psk.c b/src/wireless-security/ws-wpa-psk.c
index 5f560363..aec5563e 100644
--- a/src/wireless-security/ws-wpa-psk.c
+++ b/src/wireless-security/ws-wpa-psk.c
@@ -20,13 +20,10 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <ctype.h>
 #include <string.h>
-#include <glib/gi18n.h>
 
 #include "wireless-security.h"
 #include "helpers.h"