all: cleanup includes and let "nm-default.h" include "config.h"

- All internal source files (except "examples", which are not internal)
  should include "config.h" first. As also all internal source
  files should include "nm-default.h", let "config.h" be included
  by "nm-default.h" and include "nm-default.h" as first in every
  source file.
  We already wanted to include "nm-default.h" before other headers
  because it might contains some fixes (like "nm-glib.h" compatibility)
  that is required first.

- After including "nm-default.h", we optinally allow for including the
  corresponding header file for the source file at hand. The idea
  is to ensure that each header file is self contained.

- Don't include "config.h" or "nm-default.h" in any header file
  (except "nm-sd-adapt.h"). Public headers anyway must not include
  these headers, and internal headers are never included after
  "nm-default.h", as of the first previous point.

- Include all internal headers with quotes instead of angle brackets.
  In practice it doesn't matter, because in our public headers we must
  include other headers with angle brackets. As we use our public
  headers also to compile our interal source files, effectively the
  result must be the same. Still do it for consistency.

- Except for <config.h> itself. Include it with angle brackets as suggested by
  https://www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Headers

callouts/nm-dispatcher-utils.c

@@ -18,18 +18,16 @@
  * Copyright (C) 2008 - 2011 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 
+#include "nm-dbus-interface.h"
+#include "nm-connection.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
+#include "nm-setting-connection.h"
 
-#include <nm-dbus-interface.h>
-#include <nm-connection.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-connection.h>
-
-#include "nm-default.h"
 #include "nm-dispatcher-api.h"
 #include "nm-utils.h"
 

callouts/nm-dispatcher.c

@@ -18,8 +18,6 @@
  * Copyright (C) 2008 - 2012 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
 
 #include <syslog.h>

callouts/tests/test-dispatcher-envp.c

@@ -18,13 +18,12 @@
  *
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-default.h"
 #include "nm-core-internal.h"
 #include "nm-dispatcher-utils.h"
 #include "nm-dispatcher-api.h"

clients/cli/agent.c

@@ -19,16 +19,14 @@
  * Copyright 2014 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-default.h"
 #include "common.h"
 #include "utils.h"
 #include "nm-secret-agent-simple.h"

clients/cli/common.c

@@ -19,18 +19,16 @@
  * Copyright 2012 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <termios.h>
 #include <sys/ioctl.h>
-
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-default.h"
 #include "nm-vpn-helpers.h"
 #include "common.h"
 #include "utils.h"

clients/cli/connections.c

@@ -17,7 +17,7 @@
  * Copyright 2010 - 2015 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -29,7 +29,6 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-default.h"
 #include "utils.h"
 #include "common.h"
 #include "settings.h"

clients/cli/devices.c

@@ -17,7 +17,7 @@
  * Copyright 2010 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -25,7 +25,6 @@
 #include <errno.h>
 #include <readline/readline.h>
 
-#include "nm-default.h"
 #include "nm-secret-agent-simple.h"
 #include "polkit-agent.h"
 #include "utils.h"

clients/cli/general.c

@@ -17,12 +17,11 @@
  * Copyright 2010 - 2015 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <stdlib.h>
 
-#include "nm-default.h"
 #include "polkit-agent.h"
 #include "utils.h"
 #include "general.h"

clients/cli/nmcli.c

@@ -20,7 +20,7 @@
  */
 
 /* Generated configuration file */
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdio.h>
 #include <string.h>
@@ -33,7 +33,6 @@
 #include <readline/readline.h>
 #include <readline/history.h>
 
-#include "nm-default.h"
 #include "polkit-agent.h"
 #include "nmcli.h"
 #include "utils.h"

clients/cli/nmcli.h

@@ -20,8 +20,6 @@
 #ifndef NMC_NMCLI_H
 #define NMC_NMCLI_H
 
-#include "config.h"
-
 #include <NetworkManager.h>
 #include <nm-secret-agent-old.h>
 

clients/cli/polkit-agent.c

@@ -17,7 +17,7 @@
  * Copyright 2014 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #if WITH_POLKIT_AGENT
 
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include "nm-default.h"
 #include "polkit-agent.h"
 #include "nm-polkit-listener.h"
 #include "common.h"

clients/cli/settings.c

@@ -17,9 +17,8 @@
  * Copyright 2010 - 2015 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "settings.h"
 
 #include <stdlib.h>

clients/cli/utils.c

@@ -18,18 +18,17 @@
  */
 
 /* Generated configuration file */
-#include "config.h"
+
+#include "nm-default.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 
-#include "nm-default.h"
 #include "utils.h"
 
 int

clients/common/nm-polkit-listener.c

@@ -31,13 +31,12 @@
  * https://github.com/lxde/lxqt-policykit/tree/master/src
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "nm-default.h"
 #include "nm-polkit-listener.h"
 
 G_DEFINE_TYPE (NMPolkitListener, nm_polkit_listener, POLKIT_AGENT_TYPE_LISTENER)

clients/common/nm-secret-agent-simple.c

@@ -29,14 +29,13 @@
  * replace ShellNetworkAgent.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 
-#include <NetworkManager.h>
-#include <nm-vpn-service-plugin.h>
+#include "NetworkManager.h"
+#include "nm-vpn-service-plugin.h"
 
-#include "nm-default.h"
 #include "nm-vpn-helpers.h"
 #include "nm-secret-agent-simple.h"
 

clients/common/nm-vpn-helpers.c

@@ -23,9 +23,8 @@
  * Some functions should probably eventually move into libnm.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nm-vpn-helpers.h"
 
 #include <string.h>

clients/nm-online.c

@@ -31,16 +31,14 @@
  * Robert Love <rml@novell.com>
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
 #include <locale.h>
 
-#include <NetworkManager.h>
-
-#include "nm-default.h"
+#include "NetworkManager.h"
 
 #define PROGRESS_STEPS 15
 #define WAIT_STARTUP_TAG "wait-startup"

clients/tui/newt/nmt-newt-button-box.c

@@ -29,7 +29,7 @@
  * within each of the two sections.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

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

@@ -23,7 +23,7 @@
  * #NmtNewtButton implements a button widget.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt-button.h"
 #include "nmt-newt-utils.h"

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

@@ -23,7 +23,7 @@
  * #NmtNewtCheckbox implements a checkbox widget.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt-checkbox.h"
 #include "nmt-newt-utils.h"

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

@@ -24,7 +24,7 @@
  * wrap a (single) #newtComponent.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt-component.h"
 #include "nmt-newt-form.h"

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

@@ -26,7 +26,7 @@
  * #NmtNewtGrid is the most generic container type.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

clients/tui/newt/nmt-newt-entry-numeric.c

@@ -26,7 +26,7 @@
  * #NmtNewtEntryValidator functions, so you should not set your own.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 

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

@@ -26,7 +26,7 @@
  * See also #NmtNewtEntryNumeric, for numeric-only entries.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

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

@@ -24,7 +24,7 @@
  * "form" (aka dialog) to the user.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <fcntl.h>
 #include <string.h>

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

@@ -40,7 +40,7 @@
  * must be implemented by the container...
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

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

@@ -24,7 +24,7 @@
  * functions that were added after 0.52.15.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt-hacks.h"
 

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

@@ -19,8 +19,6 @@
 #ifndef NMT_NEWT_HACKS_H
 #define NMT_NEWT_HACKS_H
 
-#include "config.h"
-
 #include <newt.h>
 
 #ifndef HAVE_NEWTCOMPONENTGETSIZE

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

@@ -25,7 +25,7 @@
  * See also #NmtNewtTextbox, for multiline.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

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

@@ -31,7 +31,7 @@
  * presses Return on a selection.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt-listbox.h"
 #include "nmt-newt-form.h"

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

@@ -26,7 +26,7 @@
  * #NmtNewtForm containing an #NmtNewtListbox to select from.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt-popup.h"
 #include "nmt-newt-form.h"

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

@@ -35,7 +35,7 @@
  * extent of the section.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

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

@@ -25,7 +25,7 @@
  * between widgets in containers that don't implement padding.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt-separator.h"
 

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

@@ -29,7 +29,7 @@
  * children.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

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

@@ -24,7 +24,7 @@
  * word-wrapping.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

clients/tui/newt/nmt-newt-toggle-button.c

@@ -23,7 +23,7 @@
  * #NmtNewtToggleButton implements a two-state toggle button.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt-toggle-button.h"
 

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

@@ -21,14 +21,13 @@
  * @short_description: Utility functions
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <errno.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/wait.h>
 
-#include "nm-default.h"
 #include "nmt-newt-utils.h"
 
 static void

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

@@ -34,7 +34,7 @@
  * FIXME: need RTL support
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt-widget.h"
 #include "nmt-newt-form.h"

clients/tui/nm-editor-bindings.c

@@ -25,7 +25,7 @@
  * shared between nmtui, nm-connection-editor, and gnome-control-center.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <arpa/inet.h>
 #include <netinet/in.h>

clients/tui/nm-editor-utils.c

@@ -25,11 +25,10 @@
  * nm-connection-editor, and gnome-control-center.
  */
 
-#include "config.h"
-
-#include <NetworkManager.h>
-
 #include "nm-default.h"
+
+#include "NetworkManager.h"
+
 #include "nm-editor-utils.h"
 #if 0
 #include "nm-vpn-helpers.h"

clients/tui/nmt-address-list.c

@@ -28,7 +28,7 @@
  * functions.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <arpa/inet.h>
 #include <netinet/in.h>

clients/tui/nmt-connect-connection-list.c

@@ -24,11 +24,11 @@
  * access points displayed by "nmtui connect".
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmtui.h"
 #include "nmt-connect-connection-list.h"

clients/tui/nmt-device-entry.c

@@ -34,13 +34,13 @@
  * to implement that then we should make it just an #NmtNewtEntry.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <sys/socket.h>
 #include <linux/if_arp.h>
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmtui.h"
 #include "nmt-device-entry.h"

clients/tui/nmt-edit-connection-list.c

@@ -24,7 +24,7 @@
  * "nmtui edit".
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmtui.h"
 #include "nmtui-edit.h"

clients/tui/nmt-editor-grid.c

@@ -37,7 +37,7 @@
  * section border into account as well.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

clients/tui/nmt-editor-page-device.c

@@ -28,7 +28,7 @@
  * an actual page type.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-editor-page-device.h"
 

clients/tui/nmt-editor-page.c

@@ -24,7 +24,7 @@
  * A "page" is a set of related #NmtEditorSections.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-editor-page.h"
 

clients/tui/nmt-editor-section.c

@@ -23,7 +23,7 @@
  * #NmtEditorSection is the abstract base class for #NmtEditor sections.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-editor-section.h"
 #include "nmt-newt-toggle-button.h"

clients/tui/nmt-editor.c

@@ -23,13 +23,12 @@
  * #NmtEditor is the top-level form for editing a connection.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-editor.h"
 
-#include <nm-utils.h>
+#include "nm-utils.h"
 
-#include "nm-default.h"
 #include "nmtui.h"
 
 #include "nm-editor-utils.h"

clients/tui/nmt-ip-entry.c

@@ -27,7 +27,7 @@
  * contains a valid IP address.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <arpa/inet.h>
 #include <netinet/in.h>

clients/tui/nmt-mac-entry.c

@@ -26,11 +26,11 @@
  * on whether it currently contains a valid hardware address.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmt-mac-entry.h"
 

clients/tui/nmt-mtu-entry.c

@@ -30,7 +30,7 @@
  * indicating the units used by the entry.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 

clients/tui/nmt-page-bond.c

@@ -25,9 +25,8 @@
  * can't just use #GBinding.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nmt-page-bond.h"
 
 #include "nmt-address-list.h"

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

@@ -21,9 +21,8 @@
  * @short_description: The editor page for Bridge ports
  */
 
-#include "config.h"
-
 #include "nm-default.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

@@ -21,9 +21,8 @@
  * @short_description: The editor page for Bridge connections
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nmt-page-bridge.h"
 
 #include "nmt-address-list.h"

clients/tui/nmt-page-dsl.c

@@ -21,9 +21,8 @@
  * @short_description: The editor page for DSL connections
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nmt-page-dsl.h"
 #include "nmt-page-ethernet.h"
 #include "nmt-page-ppp.h"

clients/tui/nmt-page-ethernet.c

@@ -21,9 +21,8 @@
  * @short_description: The editor page for Ethernet connections
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nmt-page-ethernet.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

clients/tui/nmt-page-infiniband.c

@@ -21,9 +21,8 @@
  * @short_description: The editor page for InfiniBand connections
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nmt-page-infiniband.h"
 #include "nmt-mtu-entry.h"
 

clients/tui/nmt-page-ip4.c

@@ -21,11 +21,10 @@
  * @short_description: The editor page for IP4 configuration
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 
-#include "nm-default.h"
 #include "nmt-page-ip4.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

clients/tui/nmt-page-ip6.c

@@ -21,11 +21,10 @@
  * @short_description: The editor page for IP6 configuration
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 
-#include "nm-default.h"
 #include "nmt-page-ip6.h"
 #include "nmt-ip-entry.h"
 #include "nmt-address-list.h"

clients/tui/nmt-page-ppp.c

@@ -21,11 +21,10 @@
  * @short_description: The editor page for PPP configuration
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 
-#include "nm-default.h"
 #include "nmt-page-ppp.h"
 #include "nmt-newt-section.h"
 #include "nmt-newt-separator.h"

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

@@ -21,9 +21,8 @@
  * @short_description: The editor page for Team ports.
  */
 
-#include "config.h"
-
 #include "nm-default.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

@@ -21,9 +21,8 @@
  * @short_description: The editor page for Team connections
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nmt-page-team.h"
 
 #include "nmt-slave-list.h"

clients/tui/nmt-page-vlan.c

@@ -21,9 +21,8 @@
  * @short_description: The editor page for VLAN connections
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nm-editor-bindings.h"
 
 #include "nmt-page-vlan.h"

clients/tui/nmt-page-wifi.c

@@ -25,11 +25,10 @@
  * properties.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 
-#include "nm-default.h"
 #include "nmt-page-wifi.h"
 #include "nmt-mac-entry.h"
 #include "nmt-mtu-entry.h"

clients/tui/nmt-password-dialog.c

@@ -24,7 +24,7 @@
  * secrets when activating a connection.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-password-dialog.h"
 #include "nm-secret-agent-simple.h"

clients/tui/nmt-password-fields.c

@@ -25,7 +25,7 @@
  * "Show password" checkbox that toggles whether the password is visible.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-password-fields.h"
 

clients/tui/nmt-route-editor.c

@@ -25,9 +25,8 @@
  * wide to fit into the main window.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nmt-route-editor.h"
 #include "nmt-route-table.h"
 

clients/tui/nmt-route-entry.c

@@ -26,13 +26,13 @@
  * This is used as a building block by #NmtRouteTable.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmt-route-entry.h"
 #include "nmt-ip-entry.h"

clients/tui/nmt-route-table.c

@@ -24,13 +24,13 @@
  * and buttons to add and remove entries.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmt-route-table.h"
 #include "nmt-route-entry.h"

clients/tui/nmt-slave-list.c

@@ -24,9 +24,9 @@
  * slaves of a connection.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmt-slave-list.h"
 

clients/tui/nmt-utils.c

@@ -21,7 +21,7 @@
  * @short_description: Miscellaneous nmtui-specific utilities
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

clients/tui/nmt-widget-list.c

@@ -30,7 +30,7 @@
  * FIXME: The way this works is sort of weird.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <arpa/inet.h>
 #include <netinet/in.h>

clients/tui/nmtui-connect.c

@@ -24,7 +24,7 @@
  * including presenting a password dialog if necessary.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 

clients/tui/nmtui-edit.c

@@ -23,11 +23,11 @@
  * nmtui-edit implements editing #NMConnections.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmtui.h"
 #include "nmtui-edit.h"

clients/tui/nmtui-hostname.c

@@ -23,7 +23,7 @@
  * nmtui-hostname implements the "set hostname" functionality
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include "nmt-newt.h"
 

clients/tui/nmtui.c

@@ -24,15 +24,14 @@
  * nmtui_edit(), and nmtui_hostname().
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <locale.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
-#include "nm-default.h"
 #include "nmt-newt.h"
 #include "nm-editor-bindings.h"
 

examples/C/glib/add-connection-gdbus.c

@@ -27,8 +27,6 @@
  *   gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` -luuid add-connection-gdbus.c -o add-connection-gdbus
  */
 
-#include "config.h"
-
 #include <gio/gio.h>
 #include <uuid/uuid.h>
 #include <NetworkManager.h>

examples/C/glib/add-connection-libnm.c

@@ -27,8 +27,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` add-connection-libnm.c -o add-connection-libnm
  */
 
-#include "config.h"
-
 #include <glib.h>
 #include <NetworkManager.h>
 

examples/C/glib/get-active-connections-gdbus.c

@@ -26,8 +26,6 @@
  *   gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` get-active-connections-gdbus.c -o get-active-connections-gdbus
  */
 
-#include "config.h"
-
 #include <string.h>
 #include <gio/gio.h>
 #include <NetworkManager.h>

examples/C/glib/get-ap-info-libnm.c

@@ -25,8 +25,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` get-ap-info-libnm.c -o get-ap-info-libnm
  */
 
-#include "config.h"
-
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>

examples/C/glib/list-connections-gdbus.c

@@ -27,8 +27,6 @@
  *   gcc -Wall `pkg-config --cflags libnm` `pkg-config --cflags --libs gio-2.0` list-connections-gdbus.c -o list-connections-gdbus
  */
 
-#include "config.h"
-
 #include <gio/gio.h>
 #include <NetworkManager.h>
 

examples/C/glib/list-connections-libnm.c

@@ -26,8 +26,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 libnm` list-connections-libnm.c -o list-connections-libnm
  */
 
-#include "config.h"
-
 #include <glib.h>
 #include <stdio.h>
 #include <stdlib.h>

examples/C/glib/monitor-nm-running-gdbus.c

@@ -28,8 +28,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` monitor-nm-running-gdbus.c -o monitor-nm-running-gdbus
  */
 
-#include "config.h"
-
 #include <gio/gio.h>
 
 static void

examples/C/glib/monitor-nm-state-gdbus.c

@@ -29,8 +29,6 @@
  *   gcc -Wall `pkg-config --libs --cflags glib-2.0 gio-2.0` `pkg-config --cflags libnm` monitor-nm-state-gdbus.c -o monitor-nm-state-gdbus
  */
 
-#include "config.h"
-
 #include <gio/gio.h>
 #include <string.h>
 #include <nm-dbus-interface.h>

libnm-core/crypto.c

@@ -21,14 +21,13 @@
  * Copyright 2007 - 2011 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
 #include <stdlib.h>
 
-#include "nm-default.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/crypto_gnutls.c

@@ -21,14 +21,13 @@
  * Copyright 2007 - 2015 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 #include <gnutls/x509.h>
 #include <gnutls/pkcs12.h>
 
-#include "nm-default.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/crypto_nss.c

@@ -21,7 +21,7 @@
  * Copyright 2007 - 2009 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <prinit.h>
 #include <nss.h>
@@ -33,7 +33,6 @@
 #include <ciferfam.h>
 #include <p12plcy.h>
 
-#include "nm-default.h"
 #include "crypto.h"
 #include "nm-errors.h"
 

libnm-core/nm-connection.c

@@ -20,10 +20,10 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
-#include "nm-default.h"
+
 #include "nm-connection.h"
 #include "nm-connection-private.h"
 #include "nm-utils.h"

libnm-core/nm-dbus-utils.c

@@ -18,11 +18,10 @@
  * Copyright 2015 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 
-#include "nm-default.h"
 #include "nm-core-internal.h"
 
 typedef struct {

libnm-core/nm-errors.c

@@ -18,11 +18,10 @@
  * Copyright 2004 - 2014 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 
-#include "nm-default.h"
 #include "nm-errors.h"
 #include "nm-vpn-dbus-interface.h"
 #include "nm-core-internal.h"

libnm-core/nm-keyfile-reader.c

@@ -19,9 +19,8 @@
  * Copyright (C) 2008 - 2015 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nm-keyfile-internal.h"
 
 #include <errno.h>

libnm-core/nm-keyfile-utils.c

@@ -18,12 +18,11 @@
  * (C) Copyright 2010 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "nm-default.h"
 #include "nm-keyfile-utils.h"
 #include "nm-keyfile-internal.h"
 #include "nm-setting-wired.h"

libnm-core/nm-keyfile-writer.c

@@ -19,9 +19,8 @@
  * Copyright (C) 2008 - 2015 Red Hat, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nm-keyfile-internal.h"
 
 #include <stdlib.h>

libnm-core/nm-property-compare.c

@@ -20,14 +20,13 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <math.h>
 #include <netinet/in.h>
 
 #include "nm-property-compare.h"
-#include "nm-default.h"
 
 static gint
 _nm_property_compare_collection (GVariant *value1, GVariant *value2)

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

@@ -20,9 +20,8 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#include "config.h"
-
 #include "nm-default.h"
+
 #include "nm-setting-8021x.h"
 
 #include <string.h>

libnm-core/nm-setting-adsl.c

@@ -19,7 +19,7 @@
  * Copyright 2011 - 2013 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 

libnm-core/nm-setting-bluetooth.c

@@ -20,7 +20,7 @@
  * Copyright 2007 - 2008 Novell, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <net/ethernet.h>

libnm-core/nm-setting-bond.c

@@ -19,7 +19,7 @@
  * Copyright 2011 - 2013 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <stdlib.h>

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

@@ -19,7 +19,7 @@
  * Copyright 2012 - 2013 Red Hat, Inc.
  */
 
-#include "config.h"
+#include "nm-default.h"
 
 #include <string.h>
 #include <ctype.h>