all: fix up multiple-include-guard defines

Previously, src/nm-ip4-config.h, libnm/nm-ip4-config.h, and
libnm-glib/nm-ip4-config.h all used "NM_IP4_CONFIG_H" as an include
guard, which meant that nm-test-utils.h could not tell which of them
was being included (and so, eg, if you tried to include
nm-ip4-config.h in a libnm test, it would fail to compile because
nm-test-utils.h was referring to symbols in src/nm-ip4-config.h).

Fix this by changing the include guards in the non-API-stable parts of
the tree:

  - libnm-glib/nm-ip4-config.h remains   NM_IP4_CONFIG_H
  - libnm/nm-ip4-config.h now uses     __NM_IP4_CONFIG_H__
  - src/nm-ip4-config.h now uses       __NETWORKMANAGER_IP4_CONFIG_H__

And likewise for all other headers.

The two non-"nm"-prefixed headers, libnm/NetworkManager.h and
src/NetworkManagerUtils.h are now __NETWORKMANAGER_H__ and
__NETWORKMANAGER_UTILS_H__ respectively, which, while not entirely
consistent with the general scheme, do still mostly make sense in
isolation.

callouts/nm-dispatcher-utils.h

@@ -18,8 +18,8 @@
  * Copyright (C) 2008 - 2011 Red Hat, Inc.
  */
 
-#ifndef NM_DISPATCHER_UTILS_H
+#ifndef __NETWORKMANAGER_DISPATCHER_UTILS_H__
-#define NM_DISPATCHER_UTILS_H
+#define __NETWORKMANAGER_DISPATCHER_UTILS_H__
 
 #include <glib.h>
 
@@ -37,5 +37,5 @@ nm_dispatcher_utils_construct_envp (const char *action,
                                     GHashTable *vpn_ip6_props,
                                     char **out_iface);
 
-#endif  /* NM_DISPATCHER_UTILS_H */
+#endif  /* __NETWORKMANAGER_DISPATCHER_UTILS_H__ */
 

include/nm-dbus-glib-types.h

@@ -17,8 +17,8 @@
  * Copyright 2008 Red Hat, Inc.
  */
 
-#ifndef DBUS_GLIB_TYPES_H
+#ifndef __NM_DBUS_GLIB_TYPES_H__
-#define DBUS_GLIB_TYPES_H
+#define __NM_DBUS_GLIB_TYPES_H__
 
 #include <dbus/dbus-glib.h>
 
@@ -37,4 +37,4 @@
 #define DBUS_TYPE_G_IP6_ROUTE               (dbus_g_type_get_struct ("GValueArray", DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, DBUS_TYPE_G_UCHAR_ARRAY, G_TYPE_UINT, G_TYPE_INVALID))
 #define DBUS_TYPE_G_ARRAY_OF_IP6_ROUTE      (dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_IP6_ROUTE))
 
-#endif /* DBUS_GLIB_TYPES_H */
+#endif /* __NM_DBUS_GLIB_TYPES_H__ */

include/nm-glib-compat.h

@@ -17,8 +17,8 @@
  * Copyright 2008 - 2011 Red Hat, Inc.
  */
 
-#ifndef NM_GLIB_COMPAT_H
+#ifndef __NM_GLIB_COMPAT_H__
-#define NM_GLIB_COMPAT_H
+#define __NM_GLIB_COMPAT_H__
 
 
 #include <glib.h>
@@ -124,4 +124,4 @@ __nmtst_g_test_skip (const gchar *msg)
 }
 #define g_test_skip __nmtst_g_test_skip
 
-#endif  /* NM_GLIB_COMPAT_H */
+#endif  /* __NM_GLIB_COMPAT_H__ */

include/nm-gvaluearray-compat.h

@@ -17,8 +17,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_GVALUEARRAY_COMPAT_H
+#ifndef __NM_GVALUEARRAY_COMPAT_H__
-#define NM_GVALUEARRAY_COMPAT_H
+#define __NM_GVALUEARRAY_COMPAT_H__
 
 #include <glib.h>
 
@@ -105,4 +105,4 @@ __g_value_array_free (GValueArray *value_array)
     G_GNUC_END_IGNORE_DEPRECATIONS \
   })
 
-#endif  /* NM_GVALUEARRAY_COMPAT_H */
+#endif  /* __NM_GVALUEARRAY_COMPAT_H__ */

include/nm-test-utils.h

@@ -243,7 +243,7 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
 
 	if (!__nmtst_internal.assert_logging) {
 		gboolean success = TRUE;
-#ifdef NM_LOGGING_H
+#ifdef __NETWORKMANAGER_LOGGING_H__
 		success = nm_logging_setup (log_level, log_domains, NULL, NULL);
 #endif
 		g_assert (success);
@@ -293,13 +293,13 @@ __nmtst_init (int *argc, char ***argv, gboolean assert_logging, const char *log_
 		g_once_init_leave (&atexit_registered, 1);
 	}
 
-#ifdef NETWORK_MANAGER_UTILS_H
+#ifdef __NETWORKMANAGER_UTILS_H__
 	/* ensure that monotonic timestamp is called (because it initially logs a line) */
 	nm_utils_get_monotonic_timestamp_s ();
 #endif
 }
 
-#ifdef NM_LOGGING_H
+#ifdef __NETWORKMANAGER_LOGGING_H__
 inline static void
 nmtst_init_with_logging (int *argc, char ***argv, const char *log_level, const char *log_domains)
 {
@@ -544,7 +544,7 @@ __nmtst_spawn_sync (const char *working_directory, char **standard_out, char **s
 
 /*******************************************************************************/
 
-#ifdef NM_PLATFORM_H
+#ifdef __NETWORKMANAGER_PLATFORM_H__
 
 inline static NMPlatformIP6Address *
 nmtst_platform_ip6_address (const char *address, const char *peer_address, guint plen)
@@ -649,7 +649,7 @@ nmtst_platform_ip6_routes_equal (const NMPlatformIP6Route *a, const NMPlatformIP
 #endif
 
 
-#ifdef NM_IP4_CONFIG_H
+#ifdef __NETWORKMANAGER_IP4_CONFIG_H__
 
 inline static NMIP4Config *
 nmtst_ip4_config_clone (NMIP4Config *config)
@@ -665,7 +665,7 @@ nmtst_ip4_config_clone (NMIP4Config *config)
 #endif
 
 
-#ifdef NM_IP6_CONFIG_H
+#ifdef __NETWORKMANAGER_IP6_CONFIG_H__
 
 inline static NMIP6Config *
 nmtst_ip6_config_clone (NMIP6Config *config)
@@ -680,7 +680,7 @@ nmtst_ip6_config_clone (NMIP6Config *config)
 
 #endif
 
-#ifdef NM_CONNECTION_H
+#ifdef __NM_CONNECTION_H__
 
 inline static NMConnection *
 nmtst_create_minimal_connection (const char *id, const char *uuid, const char *type, NMSettingConnection **out_s_con)

libnm-core/nm-connection.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_CONNECTION_H
+#ifndef __NM_CONNECTION_H__
-#define NM_CONNECTION_H
+#define __NM_CONNECTION_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -251,4 +251,4 @@ NMSettingVlan *            nm_connection_get_setting_vlan              (NMConnec
 
 G_END_DECLS
 
-#endif /* NM_CONNECTION_H */
+#endif /* __NM_CONNECTION_H__ */

libnm-core/nm-dbus-interface.h

@@ -23,8 +23,8 @@
  * used by some external code that does not link to libnm.
  */
 
-#ifndef NM_DBUS_INTERFACE_H
+#ifndef __NM_DBUS_INTERFACE_H__
-#define NM_DBUS_INTERFACE_H
+#define __NM_DBUS_INTERFACE_H__
 
 #include "nm-version.h"
 
@@ -607,4 +607,4 @@ typedef enum /*< flags >*/ {
 	NM_SECRET_AGENT_CAPABILITY_LAST = NM_SECRET_AGENT_CAPABILITY_VPN_HINTS
 } NMSecretAgentCapabilities;
 
-#endif /* NM_DBUS_INTERFACE_H */
+#endif /* __NM_DBUS_INTERFACE_H__ */

libnm-core/nm-param-spec-specialized.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_PARAM_SPEC_SPECIALIZED_H
+#ifndef __NM_PARAM_SPEC_SPECIALIZED_H__
-#define NM_PARAM_SPEC_SPECIALIZED_H
+#define __NM_PARAM_SPEC_SPECIALIZED_H__
 
 #include <glib-object.h>
 
@@ -40,4 +40,4 @@ GParamSpec *_nm_param_spec_specialized (const char *name,
                                         GType specialized_type,
                                         GParamFlags flags);
 
-#endif /* NM_PARAM_SPEC_SPECIALIZED_H */
+#endif /* __NM_PARAM_SPEC_SPECIALIZED_H__ */

libnm-core/nm-setting-8021x.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_8021X_H
+#ifndef __NM_SETTING_8021X_H__
-#define NM_SETTING_8021X_H
+#define __NM_SETTING_8021X_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -292,4 +292,4 @@ NMSetting8021xCKFormat nm_setting_802_1x_get_phase2_private_key_format   (NMSett
 
 G_END_DECLS
 
-#endif /* NM_SETTING_8021X_H */
+#endif /* __NM_SETTING_8021X_H__ */

libnm-core/nm-setting-adsl.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2008 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_ADSL_H
+#ifndef __NM_SETTING_ADSL_H__
-#define NM_SETTING_ADSL_H
+#define __NM_SETTING_ADSL_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -94,4 +94,4 @@ NMSettingSecretFlags nm_setting_adsl_get_password_flags (NMSettingAdsl *setting)
 
 G_END_DECLS
 
-#endif /* NM_SETTING_ADSL_H */
+#endif /* __NM_SETTING_ADSL_H__ */

libnm-core/nm-setting-bluetooth.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_BLUETOOTH_H
+#ifndef __NM_SETTING_BLUETOOTH_H__
-#define NM_SETTING_BLUETOOTH_H
+#define __NM_SETTING_BLUETOOTH_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -98,4 +98,4 @@ const char *      nm_setting_bluetooth_get_connection_type (NMSettingBluetooth *
 
 G_END_DECLS
 
-#endif /* NM_SETTING_BLUETOOTH_H */
+#endif /* __NM_SETTING_BLUETOOTH_H__ */

libnm-core/nm-setting-bond.h

@@ -19,8 +19,8 @@
  * Copyright 2011 - 2013 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_BOND_H
+#ifndef __NM_SETTING_BOND_H__
-#define NM_SETTING_BOND_H
+#define __NM_SETTING_BOND_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -114,4 +114,4 @@ const char * nm_setting_bond_get_option_default (NMSettingBond *setting,
 
 G_END_DECLS
 
-#endif /* NM_SETTING_BOND_H */
+#endif /* __NM_SETTING_BOND_H__ */

libnm-core/nm-setting-bridge-port.h

@@ -19,8 +19,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_BRIDGE_PORT_H
+#ifndef __NM_SETTING_BRIDGE_PORT_H__
-#define NM_SETTING_BRIDGE_PORT_H
+#define __NM_SETTING_BRIDGE_PORT_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -82,4 +82,4 @@ gboolean    nm_setting_bridge_port_get_hairpin_mode (NMSettingBridgePort *settin
 
 G_END_DECLS
 
-#endif /* NM_SETTING_BRIDGE_PORT_H */
+#endif /* __NM_SETTING_BRIDGE_PORT_H__ */

libnm-core/nm-setting-bridge.h

@@ -19,8 +19,8 @@
  * Copyright 2011 - 2012 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_BRIDGE_H
+#ifndef __NM_SETTING_BRIDGE_H__
-#define NM_SETTING_BRIDGE_H
+#define __NM_SETTING_BRIDGE_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -97,4 +97,4 @@ guint32      nm_setting_bridge_get_ageing_time    (NMSettingBridge *setting);
 
 G_END_DECLS
 
-#endif /* NM_SETTING_BRIDGE_H */
+#endif /* __NM_SETTING_BRIDGE_H__ */

libnm-core/nm-setting-cdma.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_CDMA_H
+#ifndef __NM_SETTING_CDMA_H__
-#define NM_SETTING_CDMA_H
+#define __NM_SETTING_CDMA_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -85,4 +85,4 @@ NMSettingSecretFlags nm_setting_cdma_get_password_flags (NMSettingCdma *setting)
 
 G_END_DECLS
 
-#endif /* NM_SETTING_CDMA_H */
+#endif /* __NM_SETTING_CDMA_H__ */

libnm-core/nm-setting-connection.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_CONNECTION_H
+#ifndef __NM_SETTING_CONNECTION_H__
-#define NM_SETTING_CONNECTION_H
+#define __NM_SETTING_CONNECTION_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -145,4 +145,4 @@ guint32     nm_setting_connection_get_gateway_ping_timeout (NMSettingConnection
 
 G_END_DECLS
 
-#endif /* NM_SETTING_CONNECTION_H */
+#endif /* __NM_SETTING_CONNECTION_H__ */

libnm-core/nm-setting-dcb.h

@@ -19,8 +19,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_DCB_H
+#ifndef __NM_SETTING_DCB_H__
-#define NM_SETTING_DCB_H
+#define __NM_SETTING_DCB_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -177,4 +177,4 @@ void     nm_setting_dcb_set_priority_traffic_class    (NMSettingDcb *setting,
 
 G_END_DECLS
 
-#endif /* NM_SETTING_DCB_H */
+#endif /* __NM_SETTING_DCB_H__ */

libnm-core/nm-setting-generic.h

@@ -19,8 +19,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_GENERIC_H
+#ifndef __NM_SETTING_GENERIC_H__
-#define NM_SETTING_GENERIC_H
+#define __NM_SETTING_GENERIC_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -72,4 +72,4 @@ NMSetting * nm_setting_generic_new              (void);
 
 G_END_DECLS
 
-#endif /* NM_SETTING_GENERIC_H */
+#endif /* __NM_SETTING_GENERIC_H__ */

libnm-core/nm-setting-gsm.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_GSM_H
+#ifndef __NM_SETTING_GSM_H__
-#define NM_SETTING_GSM_H
+#define __NM_SETTING_GSM_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -100,4 +100,4 @@ NMSettingSecretFlags nm_setting_gsm_get_password_flags (NMSettingGsm *setting);
 
 G_END_DECLS
 
-#endif /* NM_SETTING_GSM_H */
+#endif /* __NM_SETTING_GSM_H__ */

libnm-core/nm-setting-infiniband.h

@@ -19,8 +19,8 @@
  * Copyright 2011 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_INFINIBAND_H
+#ifndef __NM_SETTING_INFINIBAND_H__
-#define NM_SETTING_INFINIBAND_H
+#define __NM_SETTING_INFINIBAND_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -83,4 +83,4 @@ const char *      nm_setting_infiniband_get_parent         (NMSettingInfiniband
 
 G_END_DECLS
 
-#endif /* NM_SETTING_INFINIBAND_H */
+#endif /* __NM_SETTING_INFINIBAND_H__ */

libnm-core/nm-setting-ip4-config.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_IP4_CONFIG_H
+#ifndef __NM_SETTING_IP4_CONFIG_H__
-#define NM_SETTING_IP4_CONFIG_H
+#define __NM_SETTING_IP4_CONFIG_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -223,4 +223,4 @@ gboolean      nm_setting_ip4_config_get_may_fail           (NMSettingIP4Config *
 
 G_END_DECLS
 
-#endif /* NM_SETTING_IP4_CONFIG_H */
+#endif /* __NM_SETTING_IP4_CONFIG_H__ */

libnm-core/nm-setting-ip6-config.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2014 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_IP6_CONFIG_H
+#ifndef __NM_SETTING_IP6_CONFIG_H__
-#define NM_SETTING_IP6_CONFIG_H
+#define __NM_SETTING_IP6_CONFIG_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -250,4 +250,4 @@ NMSettingIP6ConfigPrivacy nm_setting_ip6_config_get_ip6_privacy (NMSettingIP6Con
 
 G_END_DECLS
 
-#endif /* NM_SETTING_IP6_CONFIG_H */
+#endif /* __NM_SETTING_IP6_CONFIG_H__ */

libnm-core/nm-setting-olpc-mesh.h

@@ -20,8 +20,8 @@
  * Copyright 2009 One Laptop per Child
  */
 
-#ifndef NM_SETTING_OLPC_MESH_H
+#ifndef __NM_SETTING_OLPC_MESH_H__
-#define NM_SETTING_OLPC_MESH_H
+#define __NM_SETTING_OLPC_MESH_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -80,4 +80,4 @@ const GByteArray *nm_setting_olpc_mesh_get_dhcp_anycast_address (NMSettingOlpcMe
 
 G_END_DECLS
 
-#endif /* NM_SETTING_OLPC_MESH_H */
+#endif /* __NM_SETTING_OLPC_MESH_H__ */

libnm-core/nm-setting-ppp.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_PPP_H
+#ifndef __NM_SETTING_PPP_H__
-#define NM_SETTING_PPP_H
+#define __NM_SETTING_PPP_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -113,4 +113,4 @@ guint32    nm_setting_ppp_get_lcp_echo_interval (NMSettingPpp *setting);
 
 G_END_DECLS
 
-#endif /* NM_SETTING_PPP_H */
+#endif /* __NM_SETTING_PPP_H__ */

libnm-core/nm-setting-pppoe.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_PPPOE_H
+#ifndef __NM_SETTING_PPPOE_H__
-#define NM_SETTING_PPPOE_H
+#define __NM_SETTING_PPPOE_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -85,4 +85,4 @@ NMSettingSecretFlags nm_setting_pppoe_get_password_flags (NMSettingPppoe *settin
 
 G_END_DECLS
 
-#endif /* NM_SETTING_PPPOE_H */
+#endif /* __NM_SETTING_PPPOE_H__ */

libnm-core/nm-setting-private.h

@@ -18,8 +18,8 @@
  * Copyright 2011 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_PRIVATE_H
+#ifndef __NM_SETTING_PRIVATE_H__
-#define NM_SETTING_PRIVATE_H
+#define __NM_SETTING_PRIVATE_H__
 
 #include "nm-setting.h"
 #include "nm-glib-compat.h"

libnm-core/nm-setting-serial.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_SERIAL_H
+#ifndef __NM_SETTING_SERIAL_H__
-#define NM_SETTING_SERIAL_H
+#define __NM_SETTING_SERIAL_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -87,4 +87,4 @@ guint64    nm_setting_serial_get_send_delay (NMSettingSerial *setting);
 
 G_END_DECLS
 
-#endif /* NM_SETTING_SERIAL_H */
+#endif /* __NM_SETTING_SERIAL_H__ */

libnm-core/nm-setting-team-port.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Jiri Pirko <jiri@resnulli.us>
  */
 
-#ifndef NM_SETTING_TEAM_PORT_H
+#ifndef __NM_SETTING_TEAM_PORT_H__
-#define NM_SETTING_TEAM_PORT_H
+#define __NM_SETTING_TEAM_PORT_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -75,4 +75,4 @@ const char * nm_setting_team_port_get_config (NMSettingTeamPort *setting);
 
 G_END_DECLS
 
-#endif /* NM_SETTING_TEAM_PORT_H */
+#endif /* __NM_SETTING_TEAM_PORT_H__ */

libnm-core/nm-setting-team.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Jiri Pirko <jiri@resnulli.us>
  */
 
-#ifndef NM_SETTING_TEAM_H
+#ifndef __NM_SETTING_TEAM_H__
-#define NM_SETTING_TEAM_H
+#define __NM_SETTING_TEAM_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -77,4 +77,4 @@ const char * nm_setting_team_get_config (NMSettingTeam *setting);
 
 G_END_DECLS
 
-#endif /* NM_SETTING_TEAM_H */
+#endif /* __NM_SETTING_TEAM_H__ */

libnm-core/nm-setting-vlan.h

@@ -19,8 +19,8 @@
  * Copyright 2011 - 2014 Red Hat, Inc.
  */
 
-#ifndef NM_SETTING_VLAN_H
+#ifndef __NM_SETTING_VLAN_H__
-#define NM_SETTING_VLAN_H
+#define __NM_SETTING_VLAN_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -152,4 +152,4 @@ gboolean nm_setting_vlan_add_priority_str   (NMSettingVlan *setting,
 
 G_END_DECLS
 
-#endif /* NM_SETTING_VLAN_H */
+#endif /* __NM_SETTING_VLAN_H__ */

libnm-core/nm-setting-vpn.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_VPN_H
+#ifndef __NM_SETTING_VPN_H__
-#define NM_SETTING_VPN_H
+#define __NM_SETTING_VPN_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -113,4 +113,4 @@ void              nm_setting_vpn_foreach_secret    (NMSettingVpn *setting,
 
 G_END_DECLS
 
-#endif /* NM_SETTING_VPN_H */
+#endif /* __NM_SETTING_VPN_H__ */

libnm-core/nm-setting-wimax.h

@@ -19,8 +19,8 @@
  * Copyright 2009 Novell, Inc.
  */
 
-#ifndef NM_SETTING_WIMAX_H
+#ifndef __NM_SETTING_WIMAX_H__
-#define NM_SETTING_WIMAX_H
+#define __NM_SETTING_WIMAX_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -77,4 +77,4 @@ const GByteArray *nm_setting_wimax_get_mac_address  (NMSettingWimax *setting);
 
 G_END_DECLS
 
-#endif /* NM_SETTING_WIMAX_H */
+#endif /* __NM_SETTING_WIMAX_H__ */

libnm-core/nm-setting-wired.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_WIRED_H
+#ifndef __NM_SETTING_WIRED_H__
-#define NM_SETTING_WIRED_H
+#define __NM_SETTING_WIRED_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -122,4 +122,4 @@ const char **     nm_setting_wired_get_valid_s390_options (NMSettingWired *setti
 
 G_END_DECLS
 
-#endif /* NM_SETTING_WIRED_H */
+#endif /* __NM_SETTING_WIRED_H__ */

libnm-core/nm-setting-wireless-security.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_WIRELESS_SECURITY_H
+#ifndef __NM_SETTING_WIRELESS_SECURITY_H__
-#define NM_SETTING_WIRELESS_SECURITY_H
+#define __NM_SETTING_WIRELESS_SECURITY_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -173,4 +173,4 @@ NMWepKeyType nm_setting_wireless_security_get_wep_key_type (NMSettingWirelessSec
 
 G_END_DECLS
 
-#endif /* NM_SETTING_WIRELESS_SECURITY_H */
+#endif /* __NM_SETTING_WIRELESS_SECURITY_H__ */

libnm-core/nm-setting-wireless.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_WIRELESS_H
+#ifndef __NM_SETTING_WIRELESS_H__
-#define NM_SETTING_WIRELESS_H
+#define __NM_SETTING_WIRELESS_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -160,4 +160,4 @@ gboolean          nm_setting_wireless_ap_security_compatible (NMSettingWireless
 
 G_END_DECLS
 
-#endif /* NM_SETTING_WIRELESS_H */
+#endif /* __NM_SETTING_WIRELESS_H__ */

libnm-core/nm-setting.h

@@ -20,8 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#ifndef NM_SETTING_H
+#ifndef __NM_SETTING_H__
-#define NM_SETTING_H
+#define __NM_SETTING_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -315,4 +315,4 @@ const char *nm_setting_get_virtual_iface_name (NMSetting *setting);
 
 G_END_DECLS
 
-#endif /* NM_SETTING_H */
+#endif /* __NM_SETTING_H__ */

libnm-core/nm-utils.h

@@ -18,8 +18,8 @@
  * Copyright 2005 - 2013 Red Hat, Inc.
  */
 
-#ifndef NM_UTILS_H
+#ifndef __NM_UTILS_H__
-#define NM_UTILS_H
+#define __NM_UTILS_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -173,4 +173,4 @@ gboolean nm_utils_check_virtual_device_compatibility (GType virtual_type, GType
 
 G_END_DECLS
 
-#endif /* NM_UTILS_H */
+#endif /* __NM_UTILS_H__ */

libnm-core/nm-vpn-dbus-interface.h

@@ -23,8 +23,8 @@
  * used by some external code that does not link to libnm.
  */
 
-#ifndef NM_VPN_DBUS_INTERFACE_H
+#ifndef __NM_VPN_DBUS_INTERFACE_H__
-#define NM_VPN_DBUS_INTERFACE_H
+#define __NM_VPN_DBUS_INTERFACE_H__
 
 /*
  * dbus services details
@@ -299,4 +299,4 @@ typedef enum {
 /* boolean: prevent this VPN connection from ever getting the default route */
 #define NM_VPN_PLUGIN_IP6_CONFIG_NEVER_DEFAULT "never-default"
 
-#endif /* NM_VPN_DBUS_INTERFACE_H */
+#endif /* __NM_VPN_DBUS_INTERFACE_H__ */

libnm/NetworkManager.h

@@ -18,8 +18,8 @@
  * Copyright 2014 Red Hat, Inc.
  */
 
-#ifndef NETWORKMANAGER_H
+#ifndef __NETWORKMANAGER_H__
-#define NETWORKMANAGER_H
+#define __NETWORKMANAGER_H__
 
 #define __NETWORKMANAGER_H_INSIDE__
 
@@ -88,4 +88,4 @@
 
 #undef __NETWORKMANAGER_H_INSIDE__
 
-#endif /* NETWORKMANAGER_H */
+#endif /* __NETWORKMANAGER_H__ */

libnm/nm-access-point.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2011 Red Hat, Inc.
  */
 
-#ifndef NM_ACCESS_POINT_H
+#ifndef __NM_ACCESS_POINT_H__
-#define NM_ACCESS_POINT_H
+#define __NM_ACCESS_POINT_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -86,4 +86,4 @@ gboolean               nm_access_point_connection_valid   (NMAccessPoint *ap,
 
 G_END_DECLS
 
-#endif /* NM_ACCESS_POINT_H */
+#endif /* __NM_ACCESS_POINT_H__ */

libnm/nm-active-connection.h

@@ -19,8 +19,8 @@
  * Copyright 2008 Novell, Inc.
  */
 
-#ifndef NM_ACTIVE_CONNECTION_H
+#ifndef __NM_ACTIVE_CONNECTION_H__
-#define NM_ACTIVE_CONNECTION_H
+#define __NM_ACTIVE_CONNECTION_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -92,4 +92,4 @@ gboolean       nm_active_connection_get_vpn               (NMActiveConnection *c
 
 G_END_DECLS
 
-#endif /* NM_ACTIVE_CONNECTION_H */
+#endif /* __NM_ACTIVE_CONNECTION_H__ */

libnm/nm-client.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2012 Red Hat, Inc.
  */
 
-#ifndef NM_CLIENT_H
+#ifndef __NM_CLIENT_H__
-#define NM_CLIENT_H
+#define __NM_CLIENT_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -249,4 +249,4 @@ NMActiveConnection *nm_client_get_activating_connection (NMClient *client);
 
 G_END_DECLS
 
-#endif /* NM_CLIENT_H */
+#endif /* __NM_CLIENT_H__ */

libnm/nm-dbus-helpers-private.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_DBUS_HELPERS_PRIVATE_H
+#ifndef __NM_DBUS_HELPERS_PRIVATE_H__
-#define NM_DBUS_HELPERS_PRIVATE_H
+#define __NM_DBUS_HELPERS_PRIVATE_H__
 
 #include <gio/gio.h>
 #include <dbus/dbus.h>
@@ -33,4 +33,4 @@ DBusGProxy *     _nm_dbus_new_proxy_for_connection (DBusGConnection *connection,
                                                     const char *path,
                                                     const char *interface);
 
-#endif /* NM_DBUS_HELPERS_PRIVATE_H */
+#endif /* __NM_DBUS_HELPERS_PRIVATE_H__ */

libnm/nm-device-adsl.h

@@ -18,8 +18,8 @@
  * Copyright 2011 Pantelis Koukousoulas <pktoss@gmail.com>
  */
 
-#ifndef NM_DEVICE_ADSL_H
+#ifndef __NM_DEVICE_ADSL_H__
-#define NM_DEVICE_ADSL_H
+#define __NM_DEVICE_ADSL_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -70,4 +70,4 @@ gboolean nm_device_adsl_get_carrier (NMDeviceAdsl *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_ADSL_H */
+#endif /* __NM_DEVICE_ADSL_H__ */

libnm/nm-device-bond.h

@@ -18,8 +18,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_BOND_H
+#ifndef __NM_DEVICE_BOND_H__
-#define NM_DEVICE_BOND_H
+#define __NM_DEVICE_BOND_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -76,4 +76,4 @@ const GPtrArray *nm_device_bond_get_slaves     (NMDeviceBond *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_BOND_H */
+#endif /* __NM_DEVICE_BOND_H__ */

libnm/nm-device-bridge.h

@@ -18,8 +18,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_BRIDGE_H
+#ifndef __NM_DEVICE_BRIDGE_H__
-#define NM_DEVICE_BRIDGE_H
+#define __NM_DEVICE_BRIDGE_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -78,4 +78,4 @@ const GPtrArray *nm_device_bridge_get_slaves     (NMDeviceBridge *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_BRIDGE_H */
+#endif /* __NM_DEVICE_BRIDGE_H__ */

libnm/nm-device-bt.h

@@ -19,8 +19,8 @@
  * Copyright 2008 Novell, Inc.
  */
 
-#ifndef NM_DEVICE_BT_H
+#ifndef __NM_DEVICE_BT_H__
-#define NM_DEVICE_BT_H
+#define __NM_DEVICE_BT_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -84,4 +84,4 @@ NMBluetoothCapabilities nm_device_bt_get_capabilities (NMDeviceBt *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_BT_H */
+#endif /* __NM_DEVICE_BT_H__ */

libnm/nm-device-ethernet.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_ETHERNET_H
+#ifndef __NM_DEVICE_ETHERNET_H__
-#define NM_DEVICE_ETHERNET_H
+#define __NM_DEVICE_ETHERNET_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -81,4 +81,4 @@ gboolean     nm_device_ethernet_get_carrier (NMDeviceEthernet *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_ETHERNET_H */
+#endif /* __NM_DEVICE_ETHERNET_H__ */

libnm/nm-device-generic.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_GENERIC_H
+#ifndef __NM_DEVICE_GENERIC_H__
-#define NM_DEVICE_GENERIC_H
+#define __NM_DEVICE_GENERIC_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -71,4 +71,4 @@ const char *nm_device_generic_get_hw_address (NMDeviceGeneric *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_GENERIC_H */
+#endif /* __NM_DEVICE_GENERIC_H__ */

libnm/nm-device-infiniband.h

@@ -18,8 +18,8 @@
  * Copyright 2011 - 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_INFINIBAND_H
+#ifndef __NM_DEVICE_INFINIBAND_H__
-#define NM_DEVICE_INFINIBAND_H
+#define __NM_DEVICE_INFINIBAND_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -76,4 +76,4 @@ gboolean     nm_device_infiniband_get_carrier (NMDeviceInfiniband *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_INFINIBAND_H */
+#endif /* __NM_DEVICE_INFINIBAND_H__ */

libnm/nm-device-modem.h

@@ -19,8 +19,8 @@
  * Copyright 2008 Novell, Inc.
  */
 
-#ifndef NM_DEVICE_MODEM_H
+#ifndef __NM_DEVICE_MODEM_H__
-#define NM_DEVICE_MODEM_H
+#define __NM_DEVICE_MODEM_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -75,4 +75,4 @@ NMDeviceModemCapabilities nm_device_modem_get_current_capabilities (NMDeviceMode
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_MODEM_H */
+#endif /* __NM_DEVICE_MODEM_H__ */

libnm/nm-device-olpc-mesh.h

@@ -18,8 +18,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_OLPC_MESH_H
+#ifndef __NM_DEVICE_OLPC_MESH_H__
-#define NM_DEVICE_OLPC_MESH_H
+#define __NM_DEVICE_OLPC_MESH_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -75,4 +75,4 @@ guint32       nm_device_olpc_mesh_get_active_channel (NMDeviceOlpcMesh *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_OLPC_MESH_H */
+#endif /* __NM_DEVICE_OLPC_MESH_H__ */

libnm/nm-device-private.h

@@ -18,9 +18,9 @@
  * Copyright 2007 - 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_PRIVATE_H
+#ifndef __NM_DEVICE_PRIVATE_H__
-#define NM_DEVICE_PRIVATE_H
+#define __NM_DEVICE_PRIVATE_H__
 
 void _nm_device_set_device_type (NMDevice *device, NMDeviceType dtype);
 
-#endif /* NM_DEVICE_PRIVATE_H */
+#endif /* __NM_DEVICE_PRIVATE_H__ */

libnm/nm-device-team.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Jiri Pirko <jiri@resnulli.us>
  */
 
-#ifndef NM_DEVICE_TEAM_H
+#ifndef __NM_DEVICE_TEAM_H__
-#define NM_DEVICE_TEAM_H
+#define __NM_DEVICE_TEAM_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -76,4 +76,4 @@ const GPtrArray *nm_device_team_get_slaves     (NMDeviceTeam *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_TEAM_H */
+#endif /* __NM_DEVICE_TEAM_H__ */

libnm/nm-device-vlan.h

@@ -18,8 +18,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_VLAN_H
+#ifndef __NM_DEVICE_VLAN_H__
-#define NM_DEVICE_VLAN_H
+#define __NM_DEVICE_VLAN_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -80,4 +80,4 @@ guint        nm_device_vlan_get_vlan_id (NMDeviceVlan *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_VLAN_H */
+#endif /* __NM_DEVICE_VLAN_H__ */

libnm/nm-device-wifi.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_WIFI_H
+#ifndef __NM_DEVICE_WIFI_H__
-#define NM_DEVICE_WIFI_H
+#define __NM_DEVICE_WIFI_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -109,4 +109,4 @@ void                     nm_device_wifi_request_scan_simple      (NMDeviceWifi *
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_WIFI_H */
+#endif /* __NM_DEVICE_WIFI_H__ */

libnm/nm-device-wimax.h

@@ -19,8 +19,8 @@
  * Copyright 2009 Novell, Inc.
  */
 
-#ifndef NM_DEVICE_WIMAX_H
+#ifndef __NM_DEVICE_WIMAX_H__
-#define NM_DEVICE_WIMAX_H
+#define __NM_DEVICE_WIMAX_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -98,4 +98,4 @@ const char *     nm_device_wimax_get_bsid        (NMDeviceWimax *self);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_WIMAX_H */
+#endif /* __NM_DEVICE_WIMAX_H__ */

libnm/nm-device.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2013 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_H
+#ifndef __NM_DEVICE_H__
-#define NM_DEVICE_H
+#define __NM_DEVICE_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -170,4 +170,4 @@ GType                nm_device_get_setting_type     (NMDevice *device);
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_H */
+#endif /* __NM_DEVICE_H__ */

libnm/nm-dhcp4-config.h

@@ -19,8 +19,8 @@
  * Copyright 2008 Novell, Inc.
  */
 
-#ifndef NM_DHCP4_CONFIG_H
+#ifndef __NM_DHCP4_CONFIG_H__
-#define NM_DHCP4_CONFIG_H
+#define __NM_DHCP4_CONFIG_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -60,4 +60,4 @@ const char * nm_dhcp4_config_get_one_option (NMDhcp4Config *config, const char *
 
 G_END_DECLS
 
-#endif /* NM_DHCP4_CONFIG_H */
+#endif /* __NM_DHCP4_CONFIG_H__ */

libnm/nm-dhcp6-config.h

@@ -19,8 +19,8 @@
  * Copyright 2008 Novell, Inc.
  */
 
-#ifndef NM_DHCP6_CONFIG_H
+#ifndef __NM_DHCP6_CONFIG_H__
-#define NM_DHCP6_CONFIG_H
+#define __NM_DHCP6_CONFIG_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -60,4 +60,4 @@ const char * nm_dhcp6_config_get_one_option (NMDhcp6Config *config, const char *
 
 G_END_DECLS
 
-#endif /* NM_DHCP6_CONFIG_H */
+#endif /* __NM_DHCP6_CONFIG_H__ */

libnm/nm-ip4-config.h

@@ -19,8 +19,8 @@
  * Copyright 2008 Red Hat, Inc.
  */
 
-#ifndef NM_IP4_CONFIG_H
+#ifndef __NM_IP4_CONFIG_H__
-#define NM_IP4_CONFIG_H
+#define __NM_IP4_CONFIG_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -71,4 +71,4 @@ const GArray *   nm_ip4_config_get_wins_servers (NMIP4Config *config);
 
 G_END_DECLS
 
-#endif /* NM_IP4_CONFIG_H */
+#endif /* __NM_IP4_CONFIG_H__ */

libnm/nm-ip6-config.h

@@ -19,8 +19,8 @@
  * Copyright 2008 - 2014 Red Hat, Inc.
  */
 
-#ifndef NM_IP6_CONFIG_H
+#ifndef __NM_IP6_CONFIG_H__
-#define NM_IP6_CONFIG_H
+#define __NM_IP6_CONFIG_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -71,4 +71,4 @@ const GPtrArray *      nm_ip6_config_get_searches        (NMIP6Config *config);
 
 G_END_DECLS
 
-#endif /* NM_IP6_CONFIG_H */
+#endif /* __NM_IP6_CONFIG_H__ */

libnm/nm-object-cache.h

@@ -18,8 +18,8 @@
  * Copyright 2008 Red Hat, Inc.
  */
 
-#ifndef NM_OBJECT_CACHE_H
+#ifndef __NM_OBJECT_CACHE_H__
-#define NM_OBJECT_CACHE_H
+#define __NM_OBJECT_CACHE_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -34,4 +34,4 @@ void _nm_object_cache_clear (void);
 
 G_END_DECLS
 
-#endif /* NM_OBJECT_CACHE_H */
+#endif /* __NM_OBJECT_CACHE_H__ */

libnm/nm-object-private.h

@@ -18,8 +18,8 @@
  * Copyright 2008 - 2011 Red Hat, Inc.
  */
 
-#ifndef NM_OBJECT_PRIVATE_H
+#ifndef __NM_OBJECT_PRIVATE_H__
-#define NM_OBJECT_PRIVATE_H
+#define __NM_OBJECT_PRIVATE_H__
 
 #include <gio/gio.h>
 #include "nm-object.h"
@@ -90,4 +90,4 @@ void _nm_object_register_type_func (GType base_type, NMObjectTypeFunc type_func,
 #define NM_OBJECT_NM_RUNNING "nm-running-internal"
 gboolean _nm_object_get_nm_running (NMObject *self);
 
-#endif /* NM_OBJECT_PRIVATE_H */
+#endif /* __NM_OBJECT_PRIVATE_H__ */

libnm/nm-object.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2012 Red Hat, Inc.
  */
 
-#ifndef NM_OBJECT_H
+#ifndef __NM_OBJECT_H__
-#define NM_OBJECT_H
+#define __NM_OBJECT_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -90,4 +90,4 @@ const char      *nm_object_get_path       (NMObject *object);
 
 G_END_DECLS
 
-#endif /* NM_OBJECT_H */
+#endif /* __NM_OBJECT_H__ */

libnm/nm-remote-settings.h

@@ -19,8 +19,8 @@
  * Copyright 2009 - 2011 Red Hat, Inc.
  */
 
-#ifndef NM_REMOTE_SETTINGS_H
+#ifndef __NM_REMOTE_SETTINGS_H__
-#define NM_REMOTE_SETTINGS_H
+#define __NM_REMOTE_SETTINGS_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -154,4 +154,4 @@ gboolean nm_remote_settings_save_hostname (NMRemoteSettings *settings,
 
 G_END_DECLS
 
-#endif /* NM_REMOTE_SETTINGS_H */
+#endif /* __NM_REMOTE_SETTINGS_H__ */

libnm/nm-secret-agent.h

@@ -18,8 +18,8 @@
  * Copyright 2010 - 2011 Red Hat, Inc.
  */
 
-#ifndef NM_SECRET_AGENT_H
+#ifndef __NM_SECRET_AGENT_H__
-#define NM_SECRET_AGENT_H
+#define __NM_SECRET_AGENT_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -257,4 +257,4 @@ void nm_secret_agent_delete_secrets (NMSecretAgent *self,
 
 G_END_DECLS
 
-#endif /* NM_SECRET_AGENT_H */
+#endif /* __NM_SECRET_AGENT_H__ */

libnm/nm-types-private.h

@@ -18,8 +18,8 @@
  * Copyright 2007 - 2008 Red Hat, Inc.
  */
 
-#ifndef NM_TYPES_PRIVATE_H
+#ifndef __NM_TYPES_PRIVATE_H__
-#define NM_TYPES_PRIVATE_H
+#define __NM_TYPES_PRIVATE_H__
 
 #include <dbus/dbus-glib.h>
 #include "nm-types.h"
@@ -34,4 +34,4 @@ gboolean _nm_object_array_demarshal (GValue *value,
                                      NMObjectCreatorFunc func);
 gboolean _nm_ip6_address_array_demarshal (GValue *value, GSList **dest);
 
-#endif /* NM_TYPES_PRIVATE_H */
+#endif /* __NM_TYPES_PRIVATE_H__ */

libnm/nm-types.h

@@ -18,8 +18,8 @@
  * Copyright 2008 Red Hat, Inc.
  */
 
-#ifndef NM_TYPES_H
+#ifndef __NM_TYPES_H__
-#define NM_TYPES_H
+#define __NM_TYPES_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -55,4 +55,4 @@ GType     nm_ip6_route_object_array_get_type (void) G_GNUC_CONST;
 
 G_END_DECLS
 
-#endif /* NM_TYPES_H */
+#endif /* __NM_TYPES_H__ */

libnm/nm-vpn-connection.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2010 Red Hat, Inc.
  */
 
-#ifndef NM_VPN_CONNECTION_H
+#ifndef __NM_VPN_CONNECTION_H__
-#define NM_VPN_CONNECTION_H
+#define __NM_VPN_CONNECTION_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -67,4 +67,4 @@ const char *          nm_vpn_connection_get_banner (NMVpnConnection *vpn);
 
 G_END_DECLS
 
-#endif /* NM_VPN_CONNECTION_H */
+#endif /* __NM_VPN_CONNECTION_H__ */

libnm/nm-vpn-plugin-ui-interface.h

@@ -19,8 +19,8 @@
  * Copyright 2008 Novell, Inc.
  */
 
-#ifndef NM_VPN_PLUGIN_UI_INTERFACE_H
+#ifndef __NM_VPN_PLUGIN_UI_INTERFACE_H__
-#define NM_VPN_PLUGIN_UI_INTERFACE_H
+#define __NM_VPN_PLUGIN_UI_INTERFACE_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."

libnm/nm-vpn-plugin-utils.h

@@ -18,8 +18,8 @@
  * Copyright 2011 Red Hat, Inc.
  */
 
-#ifndef NM_VPN_PLUGIN_UTILS_H
+#ifndef __NM_VPN_PLUGIN_UTILS_H__
-#define NM_VPN_PLUGIN_UTILS_H
+#define __NM_VPN_PLUGIN_UTILS_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -40,4 +40,4 @@ gboolean nm_vpn_plugin_utils_get_secret_flags (GHashTable *data,
 
 G_END_DECLS
 
-#endif /* NM_VPN_PLUGIN_UTILS_H */
+#endif /* __NM_VPN_PLUGIN_UTILS_H__ */

libnm/nm-vpn-plugin.h

@@ -19,8 +19,8 @@
  * Copyright 2007 - 2013 Red Hat, Inc.
  */
 
-#ifndef NM_VPN_PLUGIN_H
+#ifndef __NM_VPN_PLUGIN_H__
-#define NM_VPN_PLUGIN_H
+#define __NM_VPN_PLUGIN_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -173,4 +173,4 @@ gboolean           nm_vpn_plugin_disconnect     (NMVpnPlugin *plugin,
 
 G_END_DECLS
 
-#endif /* NM_VPN_PLUGIN_H */
+#endif /* __NM_VPN_PLUGIN_H__ */

libnm/nm-wimax-nsp.h

@@ -19,8 +19,8 @@
  * Copyright 2009 Novell, Inc.
  */
 
-#ifndef NM_WIMAX_NSP_H
+#ifndef __NM_WIMAX_NSP_H__
-#define NM_WIMAX_NSP_H
+#define __NM_WIMAX_NSP_H__
 
 #if !defined (__NETWORKMANAGER_H_INSIDE__) && !defined (NETWORKMANAGER_COMPILATION)
 #error "Only <NetworkManager.h> can be included directly."
@@ -76,4 +76,4 @@ gboolean               nm_wimax_nsp_connection_valid   (NMWimaxNsp *nsp,
 
 G_END_DECLS
 
-#endif /* NM_WIMAX_NSP_H */
+#endif /* __NM_WIMAX_NSP_H__ */

src/NetworkManagerUtils.h

@@ -19,8 +19,8 @@
  * Copyright (C) 2005 - 2008 Novell, Inc.
  */
 
-#ifndef NETWORK_MANAGER_UTILS_H
+#ifndef __NETWORKMANAGER_UTILS_H__
-#define NETWORK_MANAGER_UTILS_H
+#define __NETWORKMANAGER_UTILS_H__
 
 #include <glib.h>
 #include <stdio.h>
@@ -162,4 +162,4 @@ void nm_utils_ipv6_addr_set_interface_identfier (struct in6_addr *addr,
 void nm_utils_ipv6_interface_identfier_get_from_addr (NMUtilsIPv6IfaceId *iid,
                                                       const struct in6_addr *addr);
 
-#endif /* NETWORK_MANAGER_UTILS_H */
+#endif /* __NETWORKMANAGER_UTILS_H__ */

src/devices/adsl/nm-atm-manager.h

@@ -19,8 +19,8 @@
  * Copyright (C) 2007 - 2014 Red Hat, Inc.
  */
 
-#ifndef NM_ATM_MANAGER_H
+#ifndef __NETWORKMANAGER_ATM_MANAGER_H__
-#define NM_ATM_MANAGER_H
+#define __NETWORKMANAGER_ATM_MANAGER_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -38,5 +38,5 @@ typedef struct {
 	GObjectClass parent;
 } NMAtmManagerClass;
 
-#endif /* NM_ATM_MANAGER_H */
+#endif /* __NETWORKMANAGER_ATM_MANAGER_H__ */
 

src/devices/adsl/nm-device-adsl.h

@@ -19,8 +19,8 @@
  * Copyright (C) 2009 - 2011 Red Hat Inc.
  */
 
-#ifndef NM_DEVICE_ADSL_H
+#ifndef __NETWORKMANAGER_DEVICE_ADSL_H__
-#define NM_DEVICE_ADSL_H
+#define __NETWORKMANAGER_DEVICE_ADSL_H__
 
 #include <glib-object.h>
 

src/devices/bluetooth/nm-bluez-common.h

@@ -18,8 +18,8 @@
  * Copyright (C) 2009 Red Hat, Inc.
  */
 
-#ifndef NM_BLUEZ_COMMON_H
+#ifndef __NETWORKMANAGER_BLUEZ_COMMON_H__
-#define NM_BLUEZ_COMMON_H
+#define __NETWORKMANAGER_BLUEZ_COMMON_H__
 
 #include <config.h>
 

src/devices/bluetooth/nm-bluez-device.h

@@ -18,8 +18,8 @@
  * Copyright (C) 2009 - 2014 Red Hat, Inc.
  */
 
-#ifndef NM_BLUEZ_DEVICE_H
+#ifndef __NETWORKMANAGER_BLUEZ_DEVICE_H__
-#define NM_BLUEZ_DEVICE_H
+#define __NETWORKMANAGER_BLUEZ_DEVICE_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -94,5 +94,5 @@ nm_bluez_device_connect_finish (NMBluezDevice *self,
 void
 nm_bluez_device_disconnect (NMBluezDevice *self);
 
-#endif /* NM_BLUEZ_DEVICE_H */
+#endif /* __NETWORKMANAGER_BLUEZ_DEVICE_H__ */
 

src/devices/bluetooth/nm-bluez-manager.h

@@ -19,8 +19,8 @@
  * Copyright (C) 2007 - 2014 Red Hat, Inc.
  */
 
-#ifndef NM_BLUEZ_MANAGER_H
+#ifndef __NETWORKMANAGER_BLUEZ_MANAGER_H__
-#define NM_BLUEZ_MANAGER_H
+#define __NETWORKMANAGER_BLUEZ_MANAGER_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -40,5 +40,5 @@ typedef struct {
 	GObjectClass parent;
 } NMBluezManagerClass;
 
-#endif /* NM_BLUEZ_MANAGER_H */
+#endif /* __NETWORKMANAGER_BLUEZ_MANAGER_H__ */
 

src/devices/bluetooth/nm-bluez4-adapter.h

@@ -18,8 +18,8 @@
  * Copyright (C) 2009 - 2012 Red Hat, Inc.
  */
 
-#ifndef NM_BLUEZ4_ADAPTER_H
+#ifndef __NETWORKMANAGER_BLUEZ4_ADAPTER_H__
-#define NM_BLUEZ4_ADAPTER_H
+#define __NETWORKMANAGER_BLUEZ4_ADAPTER_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -65,5 +65,5 @@ gboolean nm_bluez4_adapter_get_initialized (NMBluez4Adapter *self);
 
 GSList *nm_bluez4_adapter_get_devices (NMBluez4Adapter *self);
 
-#endif /* NM_BLUEZ4_ADAPTER_H */
+#endif /* __NETWORKMANAGER_BLUEZ4_ADAPTER_H__ */
 

src/devices/bluetooth/nm-bluez4-manager.h

@@ -19,8 +19,8 @@
  * Copyright (C) 2007 - 2013 Red Hat, Inc.
  */
 
-#ifndef NM_BLUEZ4_MANAGER_H
+#ifndef __NETWORKMANAGER_BLUEZ4_MANAGER_H__
-#define NM_BLUEZ4_MANAGER_H
+#define __NETWORKMANAGER_BLUEZ4_MANAGER_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -58,5 +58,5 @@ NMBluez4Manager *nm_bluez4_manager_new (NMConnectionProvider *provider);
 
 void nm_bluez4_manager_query_devices (NMBluez4Manager *manager);
 
-#endif /* NM_BLUEZ4_MANAGER_H */
+#endif /* __NETWORKMANAGER_BLUEZ4_MANAGER_H__ */
 

src/devices/bluetooth/nm-bluez5-manager.h

@@ -19,8 +19,8 @@
  * Copyright (C) 2007 - 2013 Red Hat, Inc.
  */
 
-#ifndef NM_BLUEZ5_MANAGER_H
+#ifndef __NETWORKMANAGER_BLUEZ5_MANAGER_H__
-#define NM_BLUEZ5_MANAGER_H
+#define __NETWORKMANAGER_BLUEZ5_MANAGER_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -58,5 +58,5 @@ NMBluez5Manager *nm_bluez5_manager_new (NMConnectionProvider *provider);
 
 void nm_bluez5_manager_query_devices (NMBluez5Manager *manager);
 
-#endif /* NM_BLUEZ5_MANAGER_H */
+#endif /* __NETWORKMANAGER_BLUEZ5_MANAGER_H__ */
 

src/devices/bluetooth/nm-device-bt.h

@@ -18,8 +18,8 @@
  * Copyright (C) 2009 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_BT_H
+#ifndef __NETWORKMANAGER_DEVICE_BT_H__
-#define NM_DEVICE_BT_H
+#define __NETWORKMANAGER_DEVICE_BT_H__
 
 #include <nm-device.h>
 #include "nm-bluez-device.h"
@@ -71,4 +71,4 @@ gboolean nm_device_bt_modem_added (NMDeviceBt *device,
 
 G_END_DECLS
 
-#endif /* NM_DEVICE_BT_H */
+#endif /* __NETWORKMANAGER_DEVICE_BT_H__ */

src/devices/nm-device-bond.h

@@ -18,8 +18,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_BOND_H
+#ifndef __NETWORKMANAGER_DEVICE_BOND_H__
-#define NM_DEVICE_BOND_H
+#define __NETWORKMANAGER_DEVICE_BOND_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-bridge.h

@@ -18,8 +18,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_BRIDGE_H
+#ifndef __NETWORKMANAGER_DEVICE_BRIDGE_H__
-#define NM_DEVICE_BRIDGE_H
+#define __NETWORKMANAGER_DEVICE_BRIDGE_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-ethernet.h

@@ -19,8 +19,8 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#ifndef NM_DEVICE_ETHERNET_H
+#ifndef __NETWORKMANAGER_DEVICE_ETHERNET_H__
-#define NM_DEVICE_ETHERNET_H
+#define __NETWORKMANAGER_DEVICE_ETHERNET_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-factory.h

@@ -18,8 +18,8 @@
  * Copyright (C) 2007 - 2014 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_FACTORY_H
+#ifndef __NETWORKMANAGER_DEVICE_FACTORY_H__
-#define NM_DEVICE_FACTORY_H
+#define __NETWORKMANAGER_DEVICE_FACTORY_H__
 
 #include <glib.h>
 #include <glib-object.h>
@@ -153,5 +153,5 @@ NMDevice * nm_device_factory_create_virtual_device_for_connection (NMDeviceFacto
 gboolean   nm_device_factory_emit_component_added (NMDeviceFactory *factory,
                                                    GObject *component);
 
-#endif /* NM_DEVICE_FACTORY_H */
+#endif /* __NETWORKMANAGER_DEVICE_FACTORY_H__ */
 

src/devices/nm-device-generic.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_GENERIC_H
+#ifndef __NETWORKMANAGER_DEVICE_GENERIC_H__
-#define NM_DEVICE_GENERIC_H
+#define __NETWORKMANAGER_DEVICE_GENERIC_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-gre.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_GRE_H
+#ifndef __NETWORKMANAGER_DEVICE_GRE_H__
-#define NM_DEVICE_GRE_H
+#define __NETWORKMANAGER_DEVICE_GRE_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-infiniband.h

@@ -18,8 +18,8 @@
  * Copyright 2011 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_INFINIBAND_H
+#ifndef __NETWORKMANAGER_DEVICE_INFINIBAND_H__
-#define NM_DEVICE_INFINIBAND_H
+#define __NETWORKMANAGER_DEVICE_INFINIBAND_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-logging.h

@@ -18,8 +18,8 @@
  * Copyright (C) 2014 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_LOGGING_H
+#ifndef __NETWORKMANAGER_DEVICE_LOGGING_H__
-#define NM_DEVICE_LOGGING_H
+#define __NETWORKMANAGER_DEVICE_LOGGING_H__
 
 #include "nm-logging.h"
 #include "nm-device.h"
@@ -42,4 +42,4 @@ _nm_device_log_self_to_device (t *self) \
 #define _LOGW(domain, ...)      _LOG (LOGL_WARN,  domain, __VA_ARGS__)
 #define _LOGE(domain, ...)      _LOG (LOGL_ERR,   domain, __VA_ARGS__)
 
-#endif /* NM_DEVICE_LOGGING_H */
+#endif /* __NETWORKMANAGER_DEVICE_LOGGING_H__ */

src/devices/nm-device-macvlan.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_MACVLAN_H
+#ifndef __NETWORKMANAGER_DEVICE_MACVLAN_H__
-#define NM_DEVICE_MACVLAN_H
+#define __NETWORKMANAGER_DEVICE_MACVLAN_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-private.h

@@ -19,8 +19,8 @@
  * Copyright (C) 2007 - 2011 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_PRIVATE_H
+#ifndef __NETWORKMANAGER_DEVICE_PRIVATE_H__
-#define NM_DEVICE_PRIVATE_H
+#define __NETWORKMANAGER_DEVICE_PRIVATE_H__
 
 #include "nm-device.h"
 

src/devices/nm-device-tun.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_TUN_H
+#ifndef __NETWORKMANAGER_DEVICE_TUN_H__
-#define NM_DEVICE_TUN_H
+#define __NETWORKMANAGER_DEVICE_TUN_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-veth.h

@@ -18,8 +18,8 @@
  * Copyright 2013 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_VETH_H
+#ifndef __NETWORKMANAGER_DEVICE_VETH_H__
-#define NM_DEVICE_VETH_H
+#define __NETWORKMANAGER_DEVICE_VETH_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-vlan.h

@@ -18,8 +18,8 @@
  * Copyright 2012 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_VLAN_H
+#ifndef __NETWORKMANAGER_DEVICE_VLAN_H__
-#define NM_DEVICE_VLAN_H
+#define __NETWORKMANAGER_DEVICE_VLAN_H__
 
 #include <glib-object.h>
 

src/devices/nm-device-vxlan.h

@@ -18,8 +18,8 @@
  * Copyright 2013, 2014 Red Hat, Inc.
  */
 
-#ifndef NM_DEVICE_VXLAN_H
+#ifndef __NETWORKMANAGER_DEVICE_VXLAN_H__
-#define NM_DEVICE_VXLAN_H
+#define __NETWORKMANAGER_DEVICE_VXLAN_H__
 
 #include <glib-object.h>
 

src/devices/nm-device.h

@@ -19,8 +19,8 @@
  * Copyright (C) 2006 - 2008 Novell, Inc.
  */
 
-#ifndef NM_DEVICE_H
+#ifndef __NETWORKMANAGER_DEVICE_H__
-#define NM_DEVICE_H
+#define __NETWORKMANAGER_DEVICE_H__
 
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>

src/devices/team/nm-device-team.h

@@ -18,8 +18,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#ifndef NM_DEVICE_TEAM_H
+#ifndef __NETWORKMANAGER_DEVICE_TEAM_H__
-#define NM_DEVICE_TEAM_H
+#define __NETWORKMANAGER_DEVICE_TEAM_H__
 
 #include <glib-object.h>