build: cleanup default includes

- "gsystem-local-alloc.h" and <gio/gio.h> are already included via
  "nm-default.h". No need to include them separately.

- include "nm-macros-internal.h" via "nm-default.h" and drop all
  explict includes.

- in the modified files, ensure that we always include "config.h"
  and "nm-default.h" first. As second, include the header file
  for the current source file (if applicable). Then follow external
  includes and finally internal nm includes.

- include nm headers inside source code files with quotes

- internal header files don't need to include default headers.
  They can savely assume that "nm-default.h" is already included
  and with it glib, nm-glib.h, nm-macros-internal.h, etc.

callouts/nm-dispatcher.c

@@ -20,6 +20,8 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <syslog.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -31,14 +33,10 @@
 #include <sys/wait.h>
 #include <errno.h>
 #include <arpa/inet.h>
-
 #include <glib-unix.h>
 
-#include "nm-default.h"
 #include "nm-dispatcher-api.h"
 #include "nm-dispatcher-utils.h"
-#include "nm-macros-internal.h"
-#include "gsystem-local-alloc.h"
 
 #include "nmdbus-dispatcher.h"
 

clients/cli/settings.c

@@ -19,15 +19,14 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "settings.h"
+
 #include <stdlib.h>
 #include <arpa/inet.h>
 
-#include "nm-default.h"
 #include "utils.h"
 #include "common.h"
-#include "settings.h"
-#include "nm-macros-internal.h"
-#include "gsystem-local-alloc.h"
 
 /* Forward declarations */
 static char *wep_key_type_to_string (NMWepKeyType type);

clients/common/nm-vpn-helpers.c

@@ -25,14 +25,13 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-vpn-helpers.h"
+
 #include <string.h>
 #include <gmodule.h>
 
-#include "nm-default.h"
 #include "nm-utils.h"
-#include "nm-vpn-helpers.h"
-
-#include "nm-macros-internal.h"
 
 static gboolean plugins_loaded;
 static GSList *plugins = NULL;

libnm-core/nm-keyfile-reader.c

@@ -21,6 +21,9 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-keyfile-internal.h"
+
 #include <errno.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ -29,10 +32,7 @@
 #include <arpa/inet.h>
 #include <string.h>
 
-#include "nm-default.h"
 #include "nm-core-internal.h"
-#include "nm-macros-internal.h"
-#include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 
 typedef struct {

libnm-core/nm-keyfile-writer.c

@@ -21,6 +21,9 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-keyfile-internal.h"
+
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -30,7 +33,6 @@
 #include <string.h>
 
 #include "nm-core-internal.h"
-#include "nm-keyfile-internal.h"
 #include "nm-keyfile-utils.h"
 
 typedef struct {

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

@@ -22,16 +22,16 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "nm-default.h"
 #include "nm-setting-8021x.h"
+
+#include <string.h>
+
 #include "nm-utils.h"
 #include "crypto.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
-#include "nm-macros-internal.h"
 
 /**
  * SECTION:nm-setting-8021x

libnm-core/nm-setting-connection.c

@@ -22,18 +22,19 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-setting-connection.h"
+
 #include <string.h>
 
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-core-enum-types.h"
-#include "nm-setting-connection.h"
 #include "nm-connection-private.h"
 #include "nm-setting-bond.h"
 #include "nm-setting-bridge.h"
 #include "nm-setting-team.h"
 #include "nm-setting-vlan.h"
-#include "nm-macros-internal.h"
 
 /**
  * SECTION:nm-setting-connection

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

@@ -18,12 +18,12 @@
  * Copyright 2015 Red Hat, Inc.
  */
 
-#include "nm-setting-ip-tunnel.h"
-
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-setting-ip-tunnel.h"
+
 #include "nm-setting-private.h"
-#include "nm-macros-internal.h"
 #include "nm-utils.h"
 
 /**

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

@@ -21,12 +21,13 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-setting-ip6-config.h"
+
 #include <string.h>
 
-#include "nm-setting-ip6-config.h"
 #include "nm-setting-private.h"
 #include "nm-core-enum-types.h"
-#include "nm-macros-internal.h"
 
 /**
  * SECTION:nm-setting-ip6-config

libnm-core/nm-setting-vlan.c

@@ -21,12 +21,13 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-setting-vlan.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-setting-vlan.h"
 #include "nm-default.h"
-#include "nm-macros-internal.h"
 #include "nm-utils.h"
 #include "nm-core-types-internal.h"
 #include "nm-setting-connection.h"

libnm-core/nm-setting-wired.c

@@ -22,14 +22,15 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-setting-wired.h"
+
 #include <string.h>
 #include <net/ethernet.h>
 
-#include "nm-setting-wired.h"
 #include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
-#include "nm-macros-internal.h"
 
 /**
  * SECTION:nm-setting-wired

libnm-core/nm-setting.c

@@ -22,16 +22,16 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "nm-default.h"
 #include "nm-setting.h"
+
+#include <string.h>
+
 #include "nm-setting-private.h"
 #include "nm-utils.h"
 #include "nm-core-internal.h"
 #include "nm-utils-private.h"
 #include "nm-property-compare.h"
-#include "nm-macros-internal.h"
 
 #include "nm-setting-connection.h"
 #include "nm-setting-bond.h"

libnm-core/nm-utils.c

@@ -21,6 +21,9 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-utils.h"
+
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -31,13 +34,9 @@
 #include <gmodule.h>
 #include <sys/stat.h>
 
-#include "nm-default.h"
-#include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
 #include "crypto.h"
-#include "nm-macros-internal.h"
-
 #include "nm-setting-bond.h"
 #include "nm-setting-bridge.h"
 #include "nm-setting-infiniband.h"

libnm-core/nm-vpn-editor-plugin.c

@@ -22,12 +22,9 @@
 
 #include "config.h"
 
+#include "nm-default.h"
 #include "nm-vpn-editor-plugin.h"
 
-#include <gio/gio.h>
-
-#include "nm-macros-internal.h"
-#include "gsystem-local-alloc.h"
 #include "nm-core-internal.h"
 
 static void nm_vpn_editor_plugin_default_init (NMVpnEditorPluginInterface *iface);

libnm-core/nm-vpn-plugin-info.c

@@ -20,16 +20,14 @@
 
 #include "config.h"
 
+#include "nm-default.h"
 #include "nm-vpn-plugin-info.h"
 
-#include <gio/gio.h>
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
 
-#include "gsystem-local-alloc.h"
 #include "nm-errors.h"
-#include "nm-macros-internal.h"
 #include "nm-core-internal.h"
 
 #define DEFAULT_DIR_ETC     NMCONFDIR"/VPN"

libnm-core/tests/test-keyfile.c

@@ -21,10 +21,10 @@
 
 #include "config.h"
 
-#include "nm-macros-internal.h"
+#include "nm-default.h"
+
 #include "nm-keyfile-utils.h"
 #include "nm-keyfile-internal.h"
-
 #include "nm-simple-connection.h"
 #include "nm-setting-connection.h"
 #include "nm-setting-wired.h"

libnm-glib/nm-client.c

@@ -21,12 +21,13 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-client.h"
+
 #include <dbus/dbus-glib.h>
 #include <string.h>
 #include <nm-utils.h>
 
-#include "nm-default.h"
-#include "nm-client.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"
 #include "nm-device-private.h"
@@ -36,7 +37,6 @@
 #include "nm-vpn-connection.h"
 #include "nm-object-cache.h"
 #include "nm-dbus-glib-types.h"
-#include "gsystem-local-alloc.h"
 
 void _nm_device_wifi_set_wireless_enabled (NMDeviceWifi *device, gboolean enabled);
 

libnm-glib/nm-vpn-plugin.c

@@ -21,14 +21,15 @@
 
 #include "config.h"
 
-#include <signal.h>
 #include "nm-default.h"
 #include "nm-vpn-plugin.h"
+
+#include <signal.h>
+
 #include "nm-vpn-enum-types.h"
 #include "nm-utils.h"
 #include "nm-connection.h"
 #include "nm-dbus-glib-types.h"
-#include "nm-macros-internal.h"
 
 static gboolean impl_vpn_plugin_connect    (NMVPNPlugin *plugin,
                                             GHashTable *connection,

libnm-util/nm-setting-8021x.c

@@ -22,17 +22,18 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-setting-8021x.h"
+
 #include <string.h>
 #include <dbus/dbus-glib.h>
 
-#include "nm-setting-8021x.h"
 #include "nm-param-spec-specialized.h"
 #include "nm-utils.h"
 #include "nm-dbus-glib-types.h"
 #include "crypto.h"
 #include "nm-utils-private.h"
 #include "nm-setting-private.h"
-#include "nm-macros-internal.h"
 
 /**
  * SECTION:nm-setting-8021x

libnm-util/nm-utils.c

@@ -21,6 +21,9 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-utils.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <netinet/ether.h>
@@ -29,14 +32,11 @@
 #include <libintl.h>
 #include <gmodule.h>
 
-#include "nm-default.h"
 #include "nm-gvaluearray-compat.h"
-#include "nm-utils.h"
 #include "nm-utils-private.h"
 #include "nm-dbus-glib-types.h"
 #include "nm-setting-private.h"
 #include "crypto.h"
-#include "nm-macros-internal.h"
 
 /* Embed the commit id in the build binary */
 static const char *const __nm_git_sha = STRLEN (NM_GIT_SHA) > 0 ? "NM_GIT_SHA:"NM_GIT_SHA : "";

libnm/nm-access-point.c

@@ -21,19 +21,19 @@
 
 #include "config.h"
 
-#include <string.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-default.h"
 #include "nm-access-point.h"
+
+#include <string.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-dbus-interface.h"
 #include "nm-object-private.h"
-#include "nm-macros-internal.h"
 
 G_DEFINE_TYPE (NMAccessPoint, nm_access_point, NM_TYPE_OBJECT)
 

libnm/nm-dbus-helpers.c

@@ -20,12 +20,12 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "nm-default.h"
 #include "nm-dbus-helpers.h"
+
+#include <string.h>
+
 #include "nm-dbus-interface.h"
-#include "nm-macros-internal.h"
 
 static GBusType nm_bus = G_BUS_TYPE_SYSTEM;
 

libnm/nm-device-wifi.c

@@ -21,22 +21,22 @@
 
 #include "config.h"
 
-#include <string.h>
-
-#include <nm-setting-connection.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-utils.h>
-
 #include "nm-default.h"
 #include "nm-device-wifi.h"
+
+#include <string.h>
+
+#include "nm-setting-connection.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-utils.h"
+
 #include "nm-access-point.h"
 #include "nm-device-private.h"
 #include "nm-object-private.h"
 #include "nm-object-cache.h"
 #include "nm-core-internal.h"
 #include "nm-dbus-helpers.h"
-#include "nm-macros-internal.h"
 
 #include "nmdbus-device-wifi.h"
 

libnm/nm-device.c

@@ -21,11 +21,12 @@
 
 #include "config.h"
 
-#include <string.h>
+#include "nm-default.h"
+#include "nm-device.h"
 
+#include <string.h>
 #include <gudev/gudev.h>
 
-#include "nm-default.h"
 #include "nm-dbus-interface.h"
 #include "nm-active-connection.h"
 #include "nm-device-ethernet.h"
@@ -44,7 +45,6 @@
 #include "nm-device-generic.h"
 #include "nm-device-ip-tunnel.h"
 #include "nm-device-macvlan.h"
-#include "nm-device.h"
 #include "nm-device-private.h"
 #include "nm-dhcp4-config.h"
 #include "nm-dhcp6-config.h"
@@ -58,7 +58,6 @@
 #include "nm-dbus-helpers.h"
 #include "nm-device-tun.h"
 #include "nm-setting-connection.h"
-#include "nm-macros-internal.h"
 
 #include "nmdbus-device.h"
 

libnm/nm-manager.c

@@ -21,11 +21,12 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <nm-utils.h>
-
 #include "nm-default.h"
 #include "nm-manager.h"
+
+#include <string.h>
+
+#include "nm-utils.h"
 #include "nm-device-ethernet.h"
 #include "nm-device-wifi.h"
 #include "nm-device-private.h"
@@ -35,7 +36,6 @@
 #include "nm-vpn-connection.h"
 #include "nm-object-cache.h"
 #include "nm-dbus-helpers.h"
-#include "nm-macros-internal.h"
 
 #include "nmdbus-manager.h"
 

libnm/nm-object.c

@@ -21,19 +21,20 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-object.h"
+
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <nm-utils.h>
-#include "nm-default.h"
+
+#include "nm-utils.h"
 #include "nm-dbus-interface.h"
-#include "nm-object.h"
 #include "nm-object-cache.h"
 #include "nm-object-private.h"
 #include "nm-dbus-helpers.h"
 #include "nm-client.h"
 #include "nm-core-internal.h"
-#include "nm-macros-internal.h"
 
 static gboolean debug = FALSE;
 #define dbgmsg(f,...) if (G_UNLIKELY (debug)) { g_message (f, ## __VA_ARGS__ ); }

libnm/nm-remote-settings.c

@@ -21,12 +21,14 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <nm-dbus-interface.h>
-#include <nm-connection.h>
-
 #include "nm-default.h"
 #include "nm-remote-settings.h"
+
+#include <string.h>
+
+#include "nm-dbus-interface.h"
+#include "nm-connection.h"
+
 #include "nm-client.h"
 #include "nm-remote-connection.h"
 #include "nm-remote-connection-private.h"
@@ -34,7 +36,6 @@
 #include "nm-dbus-helpers.h"
 #include "nm-object-private.h"
 #include "nm-core-internal.h"
-#include "nm-macros-internal.h"
 
 #include "nmdbus-settings.h"
 

libnm/nm-vpn-plugin-old.c

@@ -21,19 +21,19 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-vpn-plugin-old.h"
+
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
 
-#include "nm-default.h"
-#include "nm-vpn-plugin-old.h"
 #include "nm-enum-types.h"
 #include "nm-utils.h"
 #include "nm-connection.h"
 #include "nm-dbus-helpers.h"
 #include "nm-core-internal.h"
 #include "nm-simple-connection.h"
-#include "nm-macros-internal.h"
 
 #include "nmdbus-vpn-plugin.h"
 

libnm/nm-vpn-service-plugin.c

@@ -21,20 +21,19 @@
 
 #include "config.h"
 
+#include "nm-default.h"
 #include "nm-vpn-service-plugin.h"
 
 #include <errno.h>
 #include <signal.h>
 #include <stdlib.h>
 
-#include "nm-glib.h"
 #include "nm-enum-types.h"
 #include "nm-utils.h"
 #include "nm-connection.h"
 #include "nm-dbus-helpers.h"
 #include "nm-core-internal.h"
 #include "nm-simple-connection.h"
-#include "nm-macros-internal.h"
 
 #include "nmdbus-vpn-plugin.h"
 

shared/nm-default.h

@@ -44,6 +44,7 @@
 #include "nm-glib.h"
 #include "nm-version.h"
 #include "gsystem-local-alloc.h"
+#include "nm-macros-internal.h"
 
 /*****************************************************************************/
 

shared/nm-test-utils.h

@@ -88,6 +88,8 @@
  *
  *******************************************************************************/
 
+#include "nm-default.h"
+
 #include <arpa/inet.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -95,9 +97,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include "nm-default.h"
 #include "nm-utils.h"
-#include "nm-macros-internal.h"
 
 #ifdef __NETWORKMANAGER_LOGGING_H__
 /* We are running tests under src/. Let's include some files by default.

src/devices/nm-arping-manager.h

@@ -19,9 +19,6 @@
 
 #include <netinet/in.h>
 
-#include "nm-glib.h"
-#include "nm-types.h"
-
 G_BEGIN_DECLS
 
 #define NM_TYPE_ARPING_MANAGER            (nm_arping_manager_get_type ())

src/devices/nm-lldp-listener.h

@@ -21,9 +21,6 @@
 #ifndef __NM_LLDP_LISTENER__
 #define __NM_LLDP_LISTENER__
 
-#include "nm-glib.h"
-#include "nm-types.h"
-
 G_BEGIN_DECLS
 
 #define NM_TYPE_LLDP_LISTENER            (nm_lldp_listener_get_type ())

src/devices/wwan/nm-modem.c

@@ -21,9 +21,11 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-modem.h"
+
 #include <string.h>
 
-#include "nm-modem.h"
 #include "nm-core-internal.h"
 #include "nm-platform.h"
 #include "nm-setting-connection.h"
@@ -32,7 +34,6 @@
 #include "nm-device-private.h"
 #include "nm-modem-enum-types.h"
 #include "nm-route-manager.h"
-#include "gsystem-local-alloc.h"
 
 G_DEFINE_TYPE (NMModem, nm_modem, G_TYPE_OBJECT)
 

src/dhcp-manager/nm-dhcp-client.c

@@ -19,6 +19,9 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-dhcp-client.h"
+
 #include <string.h>
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -28,13 +31,10 @@
 #include <stdlib.h>
 #include <uuid/uuid.h>
 
-#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-utils.h"
-#include "nm-dhcp-client.h"
 #include "nm-dhcp-utils.h"
 #include "nm-platform.h"
-#include "gsystem-local-alloc.h"
 
 typedef struct {
 	char *       iface;

src/dhcp-manager/nm-dhcp-dhclient-utils.c

@@ -19,18 +19,18 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-dhcp-dhclient-utils.h"
+
 #include <string.h>
 #include <ctype.h>
 #include <arpa/inet.h>
 
-#include "nm-default.h"
-#include "nm-dhcp-dhclient-utils.h"
 #include "nm-dhcp-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-utils.h"
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"
-#include "nm-macros-internal.h"
 
 #define CLIENTID_TAG            "send dhcp-client-identifier"
 

src/dhcp-manager/tests/test-dhcp-dhclient.c

@@ -20,18 +20,18 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+
 #include <string.h>
 #include <unistd.h>
 #include <arpa/inet.h>
 
-#include "nm-default.h"
 #include "NetworkManagerUtils.h"
 #include "nm-dhcp-dhclient-utils.h"
 #include "nm-dhcp-utils.h"
 #include "nm-utils.h"
 #include "nm-ip4-config.h"
 #include "nm-platform.h"
-#include "nm-macros-internal.h"
 
 #include "nm-test-utils.h"
 

src/nm-audit-manager.c

@@ -20,19 +20,17 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-audit-manager.h"
+
 #include <errno.h>
 #include <string.h>
 #if HAVE_LIBAUDIT
 #include <libaudit.h>
 #endif
 
-#include "gsystem-local-alloc.h"
-#include "nm-audit-manager.h"
-#include "nm-glib.h"
 #include "nm-auth-subject.h"
 #include "nm-config.h"
-#include "nm-logging.h"
-#include "nm-macros-internal.h"
 #include "nm-settings-connection.h"
 
 #define AUDIT_LOG_LEVEL LOGL_INFO

src/nm-config-data.c

@@ -21,6 +21,7 @@
 
 #include "config.h"
 
+#include "nm-default.h"
 #include "nm-config-data.h"
 
 #include <string.h>
@@ -29,8 +30,6 @@
 #include "nm-device.h"
 #include "nm-core-internal.h"
 #include "nm-keyfile-internal.h"
-#include "nm-macros-internal.h"
-#include "nm-default.h"
 
 typedef struct {
 	char *group_name;

src/nm-firewall-manager.c

@@ -20,11 +20,11 @@
 
 #include "config.h"
 
-#include <string.h>
-
 #include "nm-default.h"
 #include "nm-firewall-manager.h"
-#include "gsystem-local-alloc.h"
+
+#include <string.h>
+
 #include "NetworkManagerUtils.h"
 
 #define NM_FIREWALL_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), \

src/nm-ip4-config.c

@@ -21,19 +21,17 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "nm-ip4-config.h"
+
 #include <string.h>
 #include <arpa/inet.h>
 
-#include "nm-ip4-config.h"
-
-#include "nm-default.h"
 #include "nm-utils.h"
 #include "nm-platform.h"
 #include "NetworkManagerUtils.h"
-#include "nm-core-internal.h"
 #include "nm-route-manager.h"
 #include "nm-core-internal.h"
-#include "nm-macros-internal.h"
 
 #include "nmdbus-ip4-config.h"
 

src/nm-ip6-config.c

@@ -21,18 +21,17 @@
 
 #include "config.h"
 
-#include <string.h>
-#include <arpa/inet.h>
-
 #include "nm-default.h"
 #include "nm-ip6-config.h"
 
+#include <string.h>
+#include <arpa/inet.h>
+
 #include "nm-utils.h"
 #include "nm-platform.h"
 #include "nm-route-manager.h"
 #include "nm-core-internal.h"
 #include "NetworkManagerUtils.h"
-#include "nm-macros-internal.h"
 
 #include "nmdbus-ip6-config.h"
 

src/nm-logging.h

@@ -26,11 +26,6 @@
 #error nm-test-utils.h must be included as last header
 #endif
 
-#include "nm-logging.h"
-
-#include "nm-default.h"
-#include "nm-macros-internal.h"
-
 /* Log domains */
 typedef enum  { /*< skip >*/
 	LOGD_NONE       = 0LL,

src/nm-multi-index.c

@@ -25,8 +25,6 @@
 
 #include <string.h>
 
-#include "nm-macros-internal.h"
-
 struct NMMultiIndex {
 	NMMultiIndexFuncEqual equal_fcn;
 	NMMultiIndexFuncClone clone_fcn;

src/platform/nmp-object.h

@@ -21,15 +21,11 @@
 #ifndef __NMP_OBJECT_H__
 #define __NMP_OBJECT_H__
 
-#include "config.h"
-
-#include "nm-platform.h"
-#include "nm-multi-index.h"
-#include "nm-macros-internal.h"
-
 #include <netlink/netlink.h>
 #include <gudev/gudev.h>
 
+#include "nm-platform.h"
+#include "nm-multi-index.h"
 
 typedef enum { /*< skip >*/
 	NMP_OBJECT_TO_STRING_ID,

src/platform/tests/test-nmp-object.c

@@ -18,9 +18,10 @@
  * Copyright (C) 2015 Red Hat, Inc.
  */
 
-#include "nmp-object.h"
+#include "config.h"
 
 #include "nm-default.h"
+#include "nmp-object.h"
 
 #include "nm-test-utils.h"
 

src/settings/plugins/ifcfg-rh/utils.c

@@ -20,15 +20,14 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "utils.h"
+
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-default.h"
 #include "nm-core-internal.h"
-#include "nm-macros-internal.h"
 #include "NetworkManagerUtils.h"
-
-#include "utils.h"
 #include "shvar.h"
 
 /*

src/settings/plugins/ifcfg-rh/writer.c

@@ -20,6 +20,9 @@
 
 #include "config.h"
 
+#include "nm-default.h"
+#include "writer.h"
+
 #include <string.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -30,26 +33,23 @@
 #include <unistd.h>
 #include <stdio.h>
 
-#include <nm-setting-connection.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-8021x.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-vlan.h>
-#include <nm-setting-team.h>
-#include <nm-setting-team-port.h>
+#include "nm-setting-connection.h"
+#include "nm-setting-wired.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-8021x.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
+#include "nm-setting-pppoe.h"
+#include "nm-setting-vlan.h"
+#include "nm-setting-team.h"
+#include "nm-setting-team-port.h"
 #include "nm-core-internal.h"
-#include <nm-utils.h>
+#include "nm-utils.h"
 #include "nm-core-internal.h"
-#include "nm-macros-internal.h"
 
-#include "nm-default.h"
 #include "common.h"
 #include "shvar.h"
 #include "reader.h"
-#include "writer.h"
 #include "utils.h"
 #include "crypto.h"