all: rename nm-glib-compat.h to nm-glib.h, use everywhere

Rather than randomly including one or more of <glib.h>,
<glib-object.h>, and <gio/gio.h> everywhere (and forgetting to include
"nm-glib-compat.h" most of the time), rename nm-glib-compat.h to
nm-glib.h, include <gio/gio.h> from there, and then change all .c
files in NM to include "nm-glib.h" rather than including the glib
headers directly.

(Public headers files still have to include the real glib headers,
since nm-glib.h isn't installed...)

Also, remove glib includes from header files that are already
including a base object header file (which must itself already include
the glib headers).

callouts/nm-dispatcher-utils.c

@@ -22,7 +22,6 @@
 
 #include <string.h>
 
-#include <glib-object.h>
 
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>
@@ -30,6 +29,7 @@
 #include <nm-setting-ip6-config.h>
 #include <nm-setting-connection.h>
 
+#include "nm-glib.h"
 #include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 

callouts/nm-dispatcher-utils.h

@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
 #define __NETWORKMANAGER_DISPATCHER_UTILS_H__
 
-#include <glib.h>
+#include "nm-glib.h"
 
 char **
 nm_dispatcher_utils_construct_envp (const char *action,

callouts/nm-dispatcher.c

@@ -32,13 +32,11 @@
 #include <errno.h>
 #include <arpa/inet.h>
 
-#include <glib.h>
 #include <glib-unix.h>
 
-
+#include "nm-glib.h"
 #include "nm-dispatcher-api.h"
 #include "nm-dispatcher-utils.h"
-#include "nm-glib-compat.h"
 
 #include "nmdbus-dispatcher.h"
 

callouts/tests/test-dispatcher-envp.c

@@ -23,9 +23,8 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
-#include <glib-object.h>
 
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 #include "nm-dispatcher-utils.h"
 #include "nm-dispatcher-api.h"

clients/cli/agent.c

@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,6 +29,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
+#include "nm-glib.h"
 #include "common.h"
 #include "utils.h"
 #include "nm-secret-agent-simple.h"

clients/cli/common.c

@@ -21,7 +21,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,8 +29,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-glib-compat.h"
-
+#include "nm-glib.h"
 #include "common.h"
 #include "utils.h"
 

clients/cli/connections.c

@@ -19,7 +19,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
@@ -31,6 +30,7 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "utils.h"
 #include "common.h"

clients/cli/devices.c

@@ -25,9 +25,9 @@
 #include <errno.h>
 #include <readline/readline.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "nm-secret-agent-simple.h"
 #include "polkit-agent.h"
 #include "utils.h"

clients/cli/general.c

@@ -22,14 +22,13 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "polkit-agent.h"
 #include "utils.h"
 #include "general.h"
 
-
 /* Available fields for 'general status' */
 static NmcOutputField nmc_fields_nm_status[] = {
 	{"RUNNING",      N_("RUNNING"),      15},  /* 0 */

clients/cli/nmcli.c

@@ -33,12 +33,11 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "polkit-agent.h"
 #include "nmcli.h"
-#include "nm-glib-compat.h"
 #include "utils.h"
 #include "common.h"
 #include "connections.h"

clients/cli/polkit-agent.c

@@ -27,9 +27,9 @@
 #include <unistd.h>
 #include <termios.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "polkit-agent.h"
 #include "nm-polkit-listener.h"
 #include "common.h"
@@ -142,7 +142,7 @@ nmc_start_polkit_agent_start_try (NmCli *nmc)
 #else
 /* polkit agent is not avalable; implement stub functions. */
 
-#include <glib.h>
+#include "nm-glib.h"
 #include "nmcli.h"
 #include "polkit-agent.h"
 

clients/cli/settings.c

@@ -22,13 +22,12 @@
 #include <stdlib.h>
 #include <arpa/inet.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "utils.h"
 #include "common.h"
 #include "settings.h"
-#include "nm-glib-compat.h"
 #include "nm-macros-internal.h"
 #include "gsystem-local-alloc.h"
 

clients/cli/utils.c

@@ -29,9 +29,9 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include <glib.h>
 #include <glib/gi18n.h>
 
+#include "nm-glib.h"
 #include "utils.h"
 
 int

clients/common/nm-polkit-listener.c

@@ -36,10 +36,9 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-polkit-listener.h"
 
 G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, POLKIT_AGENT_TYPE_LISTENER)

clients/common/nm-polkit-listener.h

@@ -19,11 +19,11 @@
 #ifndef __NM_POLKIT_LISTENER_H__
 #define __NM_POLKIT_LISTENER_H__
 
-#include <glib.h>
-
 #define POLKIT_AGENT_I_KNOW_API_IS_SUBJECT_TO_CHANGE
 #include <polkitagent/polkitagent.h>
 
+#include "nm-glib.h"
+
 G_BEGIN_DECLS
 
 #define NM_TYPE_POLKIT_LISTENER            (nm_polkit_listener_get_type ())

clients/nm-online.c

@@ -41,7 +41,8 @@
 #include <glib/gi18n.h>
 
 #include <NetworkManager.h>
-#include "nm-glib-compat.h"
+
+#include "nm-glib.h"
 
 #define PROGRESS_STEPS 15
 #define WAIT_STARTUP_TAG "wait-startup"

clients/tui/newt/nmt-newt-types.h

@@ -19,9 +19,9 @@
 #ifndef NMT_NEWT_TYPES_H
 #define NMT_NEWT_TYPES_H
 
-#include <glib-object.h>
 #include <newt.h>
-#include "nm-glib-compat.h"
+
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

clients/tui/newt/nmt-newt-utils.c

@@ -30,7 +30,7 @@
 
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nmt-newt-utils.h"
 
 static void

clients/tui/newt/nmt-newt-utils.h

@@ -20,7 +20,8 @@
 #define NMT_NEWT_UTILS_H
 
 #include <newt.h>
-#include <glib.h>
+
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

clients/tui/nm-editor-bindings.c

@@ -33,7 +33,6 @@
 #include <string.h>
 
 #include "nm-editor-bindings.h"
-#include "nm-gvaluearray-compat.h"
 
 static void
 value_transform_string_int (const GValue *src_value,

clients/tui/nmt-editor.c

@@ -27,10 +27,10 @@
 
 #include "nmt-editor.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nmtui.h"
 
 #include "nm-editor-utils.h"

clients/tui/nmt-mac-entry.h

@@ -19,6 +19,7 @@
 #ifndef NMT_MAC_ENTRY_H
 #define NMT_MAC_ENTRY_H
 
+#include "nm-glib.h"
 #include "nm-utils.h"
 #include "nmt-newt.h"
 

clients/tui/nmt-page-bond.c

@@ -27,9 +27,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-bond.h"
 
 #include "nmt-address-list.h"

clients/tui/nmt-page-bridge-port.c

@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-bridge-port.h"
 
 G_DEFINE_TYPE (NmtPageBridgePort, nmt_page_bridge_port, NMT_TYPE_EDITOR_PAGE)

clients/tui/nmt-page-bridge.c

@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-bridge.h"
 
 #include "nmt-address-list.h"

clients/tui/nmt-page-dsl.c

@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-dsl.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-page-ppp.h"

clients/tui/nmt-page-dsl.h

@@ -19,6 +19,7 @@
 #ifndef NMT_PAGE_DSL_H
 #define NMT_PAGE_DSL_H
 
+#include "nm-glib.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS

clients/tui/nmt-page-ethernet.c

@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

clients/tui/nmt-page-infiniband.c

@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-infiniband.h"
 #include "nmt-mtu-entry.h"
 

clients/tui/nmt-page-ip4.c

@@ -25,9 +25,9 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-ip4.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

clients/tui/nmt-page-ip6.c

@@ -25,9 +25,9 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-ip6.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

clients/tui/nmt-page-ppp.c

@@ -25,9 +25,9 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-ppp.h"
 #include "nmt-newt-section.h"
 #include "nmt-newt-separator.h"

clients/tui/nmt-page-team-port.c

@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-team-port.h"
 
 G_DEFINE_TYPE (NmtPageTeamPort, nmt_page_team_port, NMT_TYPE_EDITOR_PAGE)

clients/tui/nmt-page-team.c

@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-team.h"
 
 #include "nmt-slave-list.h"

clients/tui/nmt-page-team.h

@@ -19,6 +19,7 @@
 #ifndef NMT_PAGE_TEAM_H
 #define NMT_PAGE_TEAM_H
 
+#include "nm-glib.h"
 #include "nmt-editor-page-device.h"
 
 G_BEGIN_DECLS

clients/tui/nmt-page-vlan.c

@@ -23,9 +23,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-editor-bindings.h"
 
 #include "nmt-page-vlan.h"

clients/tui/nmt-page-wifi.c

@@ -29,9 +29,9 @@
 
 #include <stdlib.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-page-wifi.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

clients/tui/nmt-route-editor.c

@@ -27,9 +27,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nmt-route-editor.h"
 #include "nmt-route-table.h"
 

clients/tui/nmt-utils.h

@@ -19,7 +19,7 @@
 #ifndef NMT_UTILS_H
 #define NMT_UTILS_H
 
-#include <glib-object.h>
+#include "nm-glib.h"
 
 G_BEGIN_DECLS
 

clients/tui/nmtui.c

@@ -30,11 +30,11 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #include <NetworkManager.h>
 
+#include "nm-glib.h"
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
 

clients/tui/vpn-helpers.c

@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
 #include <gmodule.h>
 #include <glib/gi18n.h>
 
@@ -39,6 +38,7 @@
 #include <nm-setting-connection.h>
 #include <nm-setting-vpn.h>
 
+#include "nm-glib.h"
 #include "vpn-helpers.h"
 
 #define NM_VPN_API_SUBJECT_TO_CHANGE

clients/tui/vpn-helpers.h

@@ -19,12 +19,13 @@
 #ifndef _VPN_HELPERS_H_
 #define _VPN_HELPERS_H_
 
-#include <glib.h>
 #include <nm-connection.h>
 
 #define NM_VPN_API_SUBJECT_TO_CHANGE
 #include <nm-vpn-plugin-ui-interface.h>
 
+#include "nm-glib.h"
+
 GHashTable *vpn_get_plugins (GError **error);
 
 NMVpnPluginUiInterface *vpn_get_plugin_by_service (const char *service);

configure.ac

@@ -297,7 +297,7 @@ PKG_CHECK_MODULES(GLIB, [gio-unix-2.0 >= 2.37.6 gmodule-2.0],
 
 dnl GLIB_VERSION_MIN_REQUIRED should match the version above.
 dnl GLIB_VERSION_MAX_ALLOWED should be set to the same version;
-dnl nm-glib-compat.h will cause it to be overridden for the functions
+dnl nm-glib.h will cause it to be overridden for the functions
 dnl we have compat versions of.
 GLIB_CFLAGS="$GLIB_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32"
 

include/Makefile.am

@@ -2,7 +2,7 @@ EXTRA_DIST = \
      gsystem-local-alloc.h \
      nm-dbus-compat.h \
      nm-dbus-glib-types.h \
-     nm-glib-compat.h \
+     nm-glib.h \
      nm-gvaluearray-compat.h \
      nm-test-utils.h \
      nm-macros-internal.h

include/nm-glib.h

@@ -17,15 +17,13 @@
  * Copyright 2008 - 2011 Red Hat, Inc.
  */
 
-#ifndef __NM_GLIB_COMPAT_H__
-#define __NM_GLIB_COMPAT_H__
+#ifndef __NM_GLIB_H__
+#define __NM_GLIB_H__
 
 
-#include <glib.h>
-#include <glib-object.h>
+#include <gio/gio.h>
 #include <string.h>
 
-
 #ifdef __clang__
 
 #undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS
@@ -43,7 +41,6 @@
 
 #include "nm-gvaluearray-compat.h"
 
-
 static inline void
 __g_type_ensure (GType type)
 {
@@ -261,4 +258,4 @@ _g_key_file_save_to_file (GKeyFile     *key_file,
 #endif
 
 
-#endif  /* __NM_GLIB_COMPAT_H__ */
+#endif  /* __NM_GLIB_H__ */

include/nm-gvaluearray-compat.h

@@ -20,10 +20,6 @@
 #ifndef __NM_GVALUEARRAY_COMPAT_H__
 #define __NM_GVALUEARRAY_COMPAT_H__
 
-#include <glib.h>
-
-#include "nm-glib-compat.h"
-
 #define g_value_array_get_type() \
   G_GNUC_EXTENSION ({ \
     G_GNUC_BEGIN_IGNORE_DEPRECATIONS \

include/nm-macros-internal.h

@@ -22,8 +22,7 @@
 #ifndef __NM_MACROS_INTERNAL_H__
 #define __NM_MACROS_INTERNAL_H__
 
-
-#include <glib.h>
+#include "nm-glib.h"
 
 /********************************************************/
 

include/nm-test-utils.h

@@ -86,14 +86,12 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <glib.h>
-#include <glib-object.h>
 #include <string.h>
 #include <errno.h>
 
+#include "nm-glib.h"
 #include "nm-utils.h"
 #include "nm-macros-internal.h"
-#include "nm-glib-compat.h"
 #include "gsystem-local-alloc.h"
 
 #ifdef __NETWORKMANAGER_LOGGING_H__

libnm-core/crypto.c

@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/crypto.h

@@ -24,7 +24,7 @@
 #ifndef __CRYPTO_H__
 #define __CRYPTO_H__
 
-#include <glib.h>
+#include "nm-glib.h"
 
 #define MD5_HASH_LEN 20
 #define CIPHER_DES_EDE3_CBC "DES-EDE3-CBC"

libnm-core/crypto_gnutls.c

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #include <gnutls/gnutls.h>
@@ -31,6 +30,7 @@
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/crypto_nss.c

@@ -23,7 +23,6 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <glib/gi18n-lib.h>
 
 #include <prinit.h>
@@ -36,6 +35,7 @@
 #include <ciferfam.h>
 #include <p12plcy.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/nm-connection.c

@@ -22,9 +22,9 @@
 
 #include "config.h"
 
-#include <glib-object.h>
 #include <glib/gi18n-lib.h>
 #include <string.h>
+#include "nm-glib.h"
 #include "nm-connection.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"

libnm-core/nm-core-internal.h

@@ -33,8 +33,8 @@
  * and some test programs.
  **/
 
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
 #include "nm-dbus-interface.h"

libnm-core/nm-dbus-utils.c

@@ -21,10 +21,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 
 typedef struct {

libnm-core/nm-errors.c

@@ -21,10 +21,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-errors.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-interface.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"

libnm-core/nm-keyfile-internal.h

@@ -22,13 +22,12 @@
 #ifndef __NM_KEYFILE_INTERNAL_H__
 #define __NM_KEYFILE_INTERNAL_H__
 
-#include <glib.h>
 #include <sys/types.h>
 
+#include "nm-glib.h"
 #include "nm-connection.h"
 #include "nm-setting-8021x.h"
 
-
 /*********************************************************/
 
 #define NM_KEYFILE_CERT_SCHEME_PREFIX_BLOB "data:;base64,"

libnm-core/nm-keyfile-reader.c

@@ -30,14 +30,13 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-core-internal.h"
 #include "nm-macros-internal.h"
 #include "gsystem-local-alloc.h"
-#include "nm-glib-compat.h"
 #include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 
-
 typedef struct {
 	NMConnection *connection;
 	GKeyFile *keyfile;

libnm-core/nm-keyfile-utils.c

@@ -20,10 +20,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 #include "nm-keyfile-utils.h"
 #include "nm-keyfile-internal.h"
@@ -31,7 +31,6 @@
 #include "nm-setting-wireless.h"
 #include "nm-setting-wireless-security.h"
 
-
 typedef struct {
 	const char *setting;
 	const char *alias;

libnm-core/nm-keyfile-writer.c

@@ -30,6 +30,7 @@
 #include <string.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-setting.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-ip4-config.h"
@@ -43,7 +44,6 @@
 #include "nm-utils.h"
 
 #include "gsystem-local-alloc.h"
-#include "nm-glib-compat.h"
 #include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 

libnm-core/nm-property-compare.c

@@ -22,13 +22,12 @@
 
 #include "config.h"
 
-#include "nm-property-compare.h"
-#include "nm-glib-compat.h"
-
 #include <string.h>
 #include <math.h>
 #include <netinet/in.h>
-#include <gio/gio.h>
+
+#include "nm-property-compare.h"
+#include "nm-glib.h"
 
 static gint
 _nm_property_compare_collection (GVariant *value1, GVariant *value2)

libnm-core/nm-property-compare.h

@@ -23,7 +23,7 @@
 #ifndef __NM_PROPERTY_COMPARE_H__
 #define __NM_PROPERTY_COMPARE_H__
 
-#include <glib.h>
+#include "nm-glib.h"
 
 int nm_property_compare (GVariant *value1, GVariant *value2);
 

libnm-core/nm-setting-ip-config.c

@@ -26,11 +26,11 @@
 #include <arpa/inet.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-setting-ip-config.h"
 #include "nm-setting-ip4-config.h"
 #include "nm-setting-ip6-config.h"
 #include "nm-utils.h"
-#include "nm-glib-compat.h"
 #include "nm-setting-private.h"
 #include "nm-utils-private.h"
 

libnm-core/nm-setting-private.h

@@ -21,10 +21,10 @@
 #ifndef __NM_SETTING_PRIVATE_H__
 #define __NM_SETTING_PRIVATE_H__
 
+#include "nm-glib.h"
 #include "nm-setting.h"
 #include "nm-connection.h"
 #include "nm-core-enum-types.h"
-#include "nm-glib-compat.h"
 
 #include "nm-core-internal.h"
 

libnm-core/nm-setting-serial.c

@@ -24,8 +24,8 @@
 
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-setting-serial.h"
-#include "nm-glib-compat.h"
 #include "nm-setting-private.h"
 
 /**

libnm-core/nm-setting.c

@@ -24,8 +24,8 @@
 
 #include <string.h>
 #include <glib/gi18n-lib.h>
-#include <gio/gio.h>
 
+#include "nm-glib.h"
 #include "nm-setting.h"
 #include "nm-setting-private.h"
 #include "nm-utils.h"

libnm-core/nm-utils.c

@@ -31,9 +31,9 @@
 #include <gmodule.h>
 #include <glib/gi18n-lib.h>
 
+#include "nm-glib.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
-#include "nm-glib-compat.h"
 #include "nm-setting-private.h"
 #include "crypto.h"
 #include "gsystem-local-alloc.h"

libnm-core/tests/test-compare.c

@@ -24,8 +24,7 @@
 #include <arpa/inet.h>
 #include <netinet/in.h>
 
-#include "nm-glib-compat.h"
-
+#include "nm-glib.h"
 #include "nm-property-compare.h"
 
 #include "nm-test-utils.h"

libnm-core/tests/test-crypto.c

@@ -23,13 +23,13 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <glib/gi18n.h>
 #include <stdio.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "crypto.h"
 #include "nm-utils.h"
 #include "nm-errors.h"

libnm-core/tests/test-general.c

@@ -23,10 +23,10 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include <nm-utils.h>
+#include "nm-glib.h"
 #include "gsystem-local-alloc.h"
 
 #include "nm-setting-private.h"
@@ -62,7 +62,6 @@
 #include "nm-setting-wireless-security.h"
 #include "nm-simple-connection.h"
 #include "nm-keyfile-internal.h"
-#include "nm-glib-compat.h"
 
 #include "nm-test-utils.h"
 #include "test-general-enums.h"

libnm-core/tests/test-secrets.c

@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
+#include "nm-glib.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"

libnm-core/tests/test-setting-8021x.c

@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-8021x.h"
 

libnm-core/tests/test-setting-dcb.c

@@ -21,9 +21,9 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 #include <nm-utils.h>
+#include "nm-glib.h"
 #include "nm-setting-dcb.h"
 #include "nm-connection.h"
 #include "nm-errors.h"

libnm-core/tests/test-settings-defaults.c

@@ -21,11 +21,11 @@
 
 #include "config.h"
 
-#include <glib.h>
 #include <string.h>
 
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-setting-8021x.h"
 #include "nm-setting-cdma.h"
 #include "nm-setting-connection.h"

libnm-glib/libnm-glib-test.c

@@ -30,6 +30,8 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
+
+#include "nm-glib.h"
 #include "nm-client.h"
 #include "nm-device.h"
 #include "nm-device-ethernet.h"
@@ -38,7 +40,6 @@
 #include "nm-active-connection.h"
 #include "nm-vpn-connection.h"
 #include "nm-setting-ip4-config.h"
-#include "nm-glib-compat.h"
 
 static gboolean
 test_wireless_enabled (NMClient *client)

libnm-glib/libnm_glib.c

@@ -26,14 +26,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <glib.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "libnm_glib.h"
 
-#include "nm-glib-compat.h"
-
 #define	DBUS_NO_SERVICE_ERROR			"org.freedesktop.DBus.Error.ServiceDoesNotExist"
 
 

libnm-glib/nm-access-point.c

@@ -24,14 +24,13 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-connection.h>
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-access-point.h"
 #include "NetworkManager.h"
 #include "nm-types-private.h"

libnm-glib/nm-active-connection.c

@@ -23,6 +23,7 @@
 
 #include <string.h>
 
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "nm-active-connection.h"
 #include "nm-object-private.h"
@@ -31,7 +32,6 @@
 #include "nm-device-private.h"
 #include "nm-connection.h"
 #include "nm-vpn-connection.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-helpers-private.h"
 
 static GType _nm_active_connection_type_for_path (DBusGConnection *connection,

libnm-glib/nm-client.c

@@ -25,6 +25,7 @@
 #include <string.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-client.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"
@@ -35,7 +36,6 @@
 #include "nm-vpn-connection.h"
 #include "nm-object-cache.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 
 void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
 

libnm-glib/nm-dbus-helpers-private.h

@@ -21,10 +21,11 @@
 #ifndef NM_DBUS_HELPERS_PRIVATE_H
 #define NM_DBUS_HELPERS_PRIVATE_H
 
-#include <gio/gio.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
+#include "nm-glib.h"
+
 DBusGConnection *_nm_dbus_new_connection (GError **error);
 
 gboolean         _nm_dbus_is_connection_private (DBusGConnection *connection);

libnm-glib/nm-dbus-helpers.c

@@ -21,9 +21,9 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <dbus/dbus.h>
 #include <dbus/dbus-glib-lowlevel.h>
+#include "nm-glib.h"
 #include "nm-dbus-helpers-private.h"
 #include "NetworkManager.h"
 

libnm-glib/nm-device-bond.c

@@ -23,12 +23,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-bond.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-bond.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-bridge.c

@@ -23,12 +23,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-bridge.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-bridge.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-bt.c

@@ -24,11 +24,10 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-bluetooth.h>
 
+#include "nm-glib.h"
 #include "nm-device-bt.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-ethernet.c

@@ -24,12 +24,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-wired.h>
 #include <nm-setting-pppoe.h>
 
+#include "nm-glib.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-infiniband.c

@@ -24,12 +24,11 @@
 #include <linux/if_infiniband.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-infiniband.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-infiniband.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-modem.c

@@ -23,12 +23,11 @@
 
 #include <string.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-gsm.h>
 #include <nm-setting-cdma.h>
 
+#include "nm-glib.h"
 #include "nm-device-modem.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-olpc-mesh.c

@@ -22,11 +22,10 @@
 
 #include <string.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-olpc-mesh.h>
 
+#include "nm-glib.h"
 #include "nm-device-olpc-mesh.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-team.c

@@ -23,12 +23,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-team.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-team.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-vlan.c

@@ -23,12 +23,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-vlan.h>
 #include <nm-utils.h>
 
+#include "nm-glib.h"
 #include "nm-device-vlan.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-wifi.c

@@ -24,12 +24,11 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-wireless.h>
 #include <nm-setting-wireless-security.h>
 
+#include "nm-glib.h"
 #include "nm-device-wifi.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"

libnm-glib/nm-device-wimax.c

@@ -24,11 +24,10 @@
 #include <string.h>
 #include <netinet/ether.h>
 
-#include "nm-glib-compat.h"
-
 #include <nm-setting-connection.h>
 #include <nm-setting-wimax.h>
 
+#include "nm-glib.h"
 #include "nm-device-wimax.h"
 #include "nm-object-private.h"
 #include "nm-object-cache.h"

libnm-glib/nm-device.c

@@ -26,6 +26,7 @@
 #include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-adsl.h"
@@ -47,7 +48,6 @@
 #include "nm-remote-connection.h"
 #include "nm-types.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-utils.h"
 #include "nm-dbus-helpers-private.h"
 

libnm-glib/nm-object-cache.c

@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib.h>
+#include "nm-glib.h"
 #include "nm-object-cache.h"
 #include "nm-object.h"
 

libnm-glib/nm-object-cache.h

@@ -21,8 +21,7 @@
 #ifndef NM_OBJECT_CACHE_H
 #define NM_OBJECT_CACHE_H
 
-#include <glib.h>
-#include <glib-object.h>
+#include "nm-glib.h"
 #include "nm-object.h"
 
 G_BEGIN_DECLS

libnm-glib/nm-object-private.h

@@ -21,7 +21,7 @@
 #ifndef NM_OBJECT_PRIVATE_H
 #define NM_OBJECT_PRIVATE_H
 
-#include <gio/gio.h>
+#include "nm-glib.h"
 #include "nm-object.h"
 
 void _nm_object_ensure_inited (NMObject *object);

libnm-glib/nm-object.c

@@ -22,16 +22,15 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <nm-utils.h>
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "nm-object.h"
 #include "nm-object-cache.h"
 #include "nm-object-private.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-types.h"
 #include "nm-dbus-helpers-private.h"
 

libnm-glib/nm-remote-connection.c

@@ -22,17 +22,16 @@
 #include "config.h"
 
 #include <string.h>
-#include <gio/gio.h>
 #include <glib/gi18n-lib.h>
 
 #include <NetworkManager.h>
 #include <nm-utils.h>
 #include <nm-setting-connection.h>
+#include "nm-glib.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-connection-private.h"
 #include "nm-object-private.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-glib-compat.h"
 #include "nm-dbus-helpers-private.h"
 
 #define NM_REMOTE_CONNECTION_BUS "bus"

libnm-glib/nm-remote-settings.c

@@ -25,12 +25,12 @@
 #include <NetworkManager.h>
 #include <nm-connection.h>
 
+#include "nm-glib.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-remote-settings.h"
 #include "nm-remote-connection-private.h"
 #include "nm-object-private.h"
 #include "nm-dbus-helpers-private.h"
-#include "nm-glib-compat.h"
 #include "nm-object-private.h"
 
 /**

libnm-glib/nm-secret-agent.c

@@ -23,7 +23,7 @@
 #include <string.h>
 #include <dbus/dbus-glib-lowlevel.h>
 
-#include "nm-glib-compat.h"
+#include "nm-glib.h"
 #include "NetworkManager.h"
 #include "nm-secret-agent.h"
 #include "nm-glib-enum-types.h"