include: use double-quotes to include our own headers

In practice, this should only matter when there are multiple
header files with the same name. That is something we try
to avoid already, by giving headers a distinct name.

When building NetworkManager itself, we clearly want to use
double-quotes for including our own headers.
But we also want to do that in our public headers. For example:

  ./a.c
    #include <stdio.h>
    #include <nm-1.h>
    void main() {
        printf ("INCLUDED %s/nm-2.h\n", SYMB);
    }

  ./1/nm-1.h
    #include <nm-2.h>

  ./1/nm-2.h
    #define SYMB "1"

  ./2/nm-2.h
    #define SYMB "2"

$ cc -I./2 -I./1 ./a.c
$ ./a.out
INCLUDED 2/nm-2.h

Exceptions to this are
  - headers in "shared/nm-utils" that include <NetworkManager.h>. These
    headers are copied into projects and hence used like headers owned by
    those projects.
  - examples/C

clients/cli/nmcli.h

@@ -20,8 +20,8 @@
 #ifndef NMC_NMCLI_H
 #define NMC_NMCLI_H
 
-#include <NetworkManager.h>
-#include <nm-secret-agent-old.h>
+#include "NetworkManager.h"
+#include "nm-secret-agent-old.h"
 
 #if WITH_POLKIT_AGENT
 #include "nm-polkit-listener.h"

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

@@ -19,8 +19,8 @@
 #ifndef __NM_SECRET_AGENT_SIMPLE_H__
 #define __NM_SECRET_AGENT_SIMPLE_H__
 
-#include <NetworkManager.h>
-#include <nm-secret-agent-old.h>
+#include "NetworkManager.h"
+#include "nm-secret-agent-old.h"
 
 #define NM_TYPE_SECRET_AGENT_SIMPLE            (nm_secret_agent_simple_get_type ())
 #define NM_SECRET_AGENT_SIMPLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT_SIMPLE, NMSecretAgentSimple))

clients/common/nm-vpn-helpers.h

@@ -19,7 +19,7 @@
 #ifndef __NM_VPN_HELPERS_H__
 #define __NM_VPN_HELPERS_H__
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 typedef struct {
 	const char *name;

clients/tui/nm-editor-bindings.h

@@ -19,7 +19,7 @@
 #ifndef NM_EDITOR_BINDINGS_H
 #define NM_EDITOR_BINDINGS_H
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 void nm_editor_bindings_init (void);
 

clients/tui/nm-editor-utils.h

@@ -19,7 +19,7 @@
 #ifndef NM_EDITOR_UTILS_H
 #define NM_EDITOR_UTILS_H
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 typedef struct {
 	const char *name;

clients/tui/nmt-device-entry.h

@@ -21,7 +21,7 @@
 
 #include "nmt-editor-grid.h"
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #define NMT_TYPE_DEVICE_ENTRY            (nmt_device_entry_get_type ())
 #define NMT_DEVICE_ENTRY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_DEVICE_ENTRY, NmtDeviceEntry))

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

@@ -21,7 +21,7 @@
 
 #include "nmt-newt.h"
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #define NMT_TYPE_EDIT_CONNECTION_LIST            (nmt_edit_connection_list_get_type ())
 #define NMT_EDIT_CONNECTION_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NMT_TYPE_EDIT_CONNECTION_LIST, NmtEditConnectionList))

clients/tui/nmt-editor-page.h

@@ -19,7 +19,7 @@
 #ifndef NMT_EDITOR_PAGE_H
 #define NMT_EDITOR_PAGE_H
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmt-editor-grid.h"
 #include "nmt-editor-section.h"

clients/tui/nmt-editor.h

@@ -19,7 +19,7 @@
 #ifndef NMT_EDITOR_H
 #define NMT_EDITOR_H
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmt-newt.h"
 

clients/tui/nmt-route-editor.h

@@ -19,7 +19,7 @@
 #ifndef NMT_ROUTE_EDITOR_H
 #define NMT_ROUTE_EDITOR_H
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 #include "nmt-newt.h"
 

clients/tui/nmtui.h

@@ -19,7 +19,7 @@
 #ifndef NMTUI_H
 #define NMTUI_H
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 extern NMClient *nm_client;
 

docs/libnm-glib/libnm-glib.types

@@ -1,29 +1,29 @@
-#include <nm-client.h>
-#include <nm-object.h>
-#include <nm-device.h>
-#include <nm-device-ethernet.h>
-#include <nm-device-wifi.h>
-#include <nm-device-modem.h>
-#include <nm-device-bt.h>
-#include <nm-device-wimax.h>
-#include <nm-device-olpc-mesh.h>
-#include <nm-device-adsl.h>
-#include <nm-device-infiniband.h>
-#include <nm-device-bond.h>
-#include <nm-device-bridge.h>
-#include <nm-device-team.h>
-#include <nm-device-generic.h>
-#include <nm-device-vlan.h>
-#include <nm-access-point.h>
-#include <nm-ip4-config.h>
-#include <nm-ip6-config.h>
-#include <nm-active-connection.h>
-#include <nm-dhcp4-config.h>
-#include <nm-dhcp6-config.h>
-#include <nm-remote-settings.h>
-#include <nm-remote-connection.h>
-#include <nm-secret-agent.h>
-#include <nm-vpn-connection.h>
+#include "nm-client.h"
+#include "nm-object.h"
+#include "nm-device.h"
+#include "nm-device-ethernet.h"
+#include "nm-device-wifi.h"
+#include "nm-device-modem.h"
+#include "nm-device-bt.h"
+#include "nm-device-wimax.h"
+#include "nm-device-olpc-mesh.h"
+#include "nm-device-adsl.h"
+#include "nm-device-infiniband.h"
+#include "nm-device-bond.h"
+#include "nm-device-bridge.h"
+#include "nm-device-team.h"
+#include "nm-device-generic.h"
+#include "nm-device-vlan.h"
+#include "nm-access-point.h"
+#include "nm-ip4-config.h"
+#include "nm-ip6-config.h"
+#include "nm-active-connection.h"
+#include "nm-dhcp4-config.h"
+#include "nm-dhcp6-config.h"
+#include "nm-remote-settings.h"
+#include "nm-remote-connection.h"
+#include "nm-secret-agent.h"
+#include "nm-vpn-connection.h"
 
 nm_client_get_type
 nm_object_get_type

examples/C/qt/add-connection-wired.cpp

@@ -28,10 +28,9 @@
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusMetaType>
 #include <QtDBus/QDBusReply>
-
 #include <QtCore/QDebug>
 
-#include "nm-dbus-interface.h"
+#include <nm-dbus-interface.h>
 
 typedef QMap<QString, QMap<QString, QVariant> > Connection;
 Q_DECLARE_METATYPE(Connection)

examples/C/qt/change-ipv4-addresses.cpp

@@ -38,9 +38,9 @@
 #include <QtCore/QDebug>
 #include <QtNetwork/QHostAddress>
 
-#include "arpa/inet.h"
+#include <arpa/inet.h>
 
-#include "nm-dbus-interface.h"
+#include <nm-dbus-interface.h>
 
 typedef QMap<QString, QMap<QString, QVariant> > Connection;
 Q_DECLARE_METATYPE(Connection)

examples/C/qt/list-connections.cpp

@@ -25,10 +25,9 @@
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusInterface>
 #include <QtDBus/QDBusReply>
-
 #include <QtCore/QDebug>
 
-#include "nm-dbus-interface.h"
+#include <nm-dbus-interface.h>
 
 
 void listConnections(QDBusInterface& interface) {

libnm-core/nm-connection.h

@@ -27,9 +27,9 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-core-types.h>
-#include <nm-setting.h>
-#include <nm-errors.h>
+#include "nm-core-types.h"
+#include "nm-setting.h"
+#include "nm-errors.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-core-types.h

@@ -23,9 +23,9 @@
 
 #include <glib-object.h>
 
-#include <nm-version.h>
-#include <nm-dbus-interface.h>
-#include <nm-core-enum-types.h>
+#include "nm-version.h"
+#include "nm-dbus-interface.h"
+#include "nm-core-enum-types.h"
 
 typedef struct _NMConnection              NMConnection;
 typedef struct _NMSetting                 NMSetting;

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

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-adsl.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-bond.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

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

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-bridge.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-cdma.h

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-dcb.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-generic.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-gsm.h

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-infiniband.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

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

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

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

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-ppp.h

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-pppoe.h

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-proxy.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-serial.h

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

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

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-team.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-vpn.h

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-wimax.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-wired.h

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

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

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting-wireless.h

@@ -27,8 +27,8 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-setting.h>
-#include <nm-setting-wireless-security.h>
+#include "nm-setting.h"
+#include "nm-setting-wireless-security.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-setting.h

@@ -27,7 +27,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-core-types.h>
+#include "nm-core-types.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-simple-connection.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 

libnm-core/nm-version.h

@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <nm-version-macros.h>
+#include "nm-version-macros.h"
 
 /* Deprecation / Availability macros */
 

libnm-glib/nm-access-point.c

@@ -24,11 +24,11 @@
 #include <string.h>
 #include <netinet/ether.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-connection.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 "NetworkManager.h"

libnm-glib/nm-access-point.h

@@ -24,8 +24,8 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <NetworkManager.h>
-#include <nm-connection.h>
+#include "NetworkManager.h"
+#include "nm-connection.h"
 #include "nm-object.h"
 
 G_BEGIN_DECLS

libnm-glib/nm-active-connection.h

@@ -25,8 +25,8 @@
 #include <glib.h>
 #include <glib-object.h>
 #include "nm-object.h"
-#include <nm-connection.h>
-#include <NetworkManager.h>
+#include "nm-connection.h"
+#include "NetworkManager.h"
 #include "nm-ip4-config.h"
 #include "nm-dhcp4-config.h"
 #include "nm-ip6-config.h"

libnm-glib/nm-client.h

@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 #include <dbus/dbus-glib.h>
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 #include "nm-object.h"
 #include "nm-device.h"
 #include "nm-active-connection.h"

libnm-glib/nm-object.h

@@ -26,7 +26,7 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 
-#include <nm-version.h>
+#include "nm-version.h"
 
 G_BEGIN_DECLS
 

libnm-glib/nm-remote-connection.h

@@ -25,7 +25,7 @@
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 

libnm-glib/nm-remote-settings.h

@@ -24,8 +24,8 @@
 
 #include <gio/gio.h>
 #include <dbus/dbus-glib.h>
-#include <nm-connection.h>
-#include <nm-remote-connection.h>
+#include "nm-connection.h"
+#include "nm-remote-connection.h"
 
 G_BEGIN_DECLS
 

libnm-glib/nm-secret-agent.h

@@ -21,7 +21,7 @@
 #ifndef NM_SECRET_AGENT_H
 #define NM_SECRET_AGENT_H
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 

libnm-glib/nm-types.h

@@ -24,7 +24,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <nm-glib-enum-types.h>
+#include "nm-glib-enum-types.h"
 
 G_BEGIN_DECLS
 

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

@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 

libnm-glib/nm-vpn-plugin-utils.h

@@ -22,7 +22,7 @@
 #define NM_VPN_PLUGIN_UTILS_H
 
 #include <glib.h>
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-glib/nm-vpn-plugin.h

@@ -25,8 +25,8 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <dbus/dbus-glib.h>
-#include <NetworkManagerVPN.h>
-#include <nm-connection.h>
+#include "NetworkManagerVPN.h"
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 

libnm-glib/nm-wimax-nsp.h

@@ -24,7 +24,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 #include "nm-object.h"
 
 G_BEGIN_DECLS

libnm-util/NetworkManager.h

@@ -28,7 +28,7 @@
 
 /* This header must not include glib or libnm. */
 
-#include <nm-version-macros.h>
+#include "nm-version-macros.h"
 
 /*
  * dbus services details

libnm-util/nm-connection.h

@@ -25,34 +25,34 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <nm-setting.h>
+#include "nm-setting.h"
 
-#include <nm-setting-8021x.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-bond.h>
-#include <nm-setting-team.h>
-#include <nm-setting-team-port.h>
-#include <nm-setting-bridge.h>
-#include <nm-setting-bridge-port.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-dcb.h>
-#include <nm-setting-generic.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-infiniband.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-olpc-mesh.h>
-#include <nm-setting-ppp.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-serial.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-wimax.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-adsl.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-setting-vlan.h>
+#include "nm-setting-8021x.h"
+#include "nm-setting-bluetooth.h"
+#include "nm-setting-bond.h"
+#include "nm-setting-team.h"
+#include "nm-setting-team-port.h"
+#include "nm-setting-bridge.h"
+#include "nm-setting-bridge-port.h"
+#include "nm-setting-cdma.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-dcb.h"
+#include "nm-setting-generic.h"
+#include "nm-setting-gsm.h"
+#include "nm-setting-infiniband.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
+#include "nm-setting-olpc-mesh.h"
+#include "nm-setting-ppp.h"
+#include "nm-setting-pppoe.h"
+#include "nm-setting-serial.h"
+#include "nm-setting-vpn.h"
+#include "nm-setting-wimax.h"
+#include "nm-setting-wired.h"
+#include "nm-setting-adsl.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-setting-vlan.h"
 
 G_BEGIN_DECLS
 

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

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_8021X_H
 #define NM_SETTING_8021X_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-adsl.h

@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_ADSL_H
 #define NM_SETTING_ADSL_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-bond.h

@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_BOND_H
 #define NM_SETTING_BOND_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

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

@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_BRIDGE_PORT_H
 #define NM_SETTING_BRIDGE_PORT_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-bridge.h

@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_BRIDGE_H
 #define NM_SETTING_BRIDGE_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-cdma.h

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_CDMA_H
 #define NM_SETTING_CDMA_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-dcb.h

@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_DCB_H
 #define NM_SETTING_DCB_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-generic.h

@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_GENERIC_H
 #define NM_SETTING_GENERIC_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-gsm.h

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_GSM_H
 #define NM_SETTING_GSM_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-infiniband.h

@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_INFINIBAND_H
 #define NM_SETTING_INFINIBAND_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

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

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_OLPC_MESH_H
 #define NM_SETTING_OLPC_MESH_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-ppp.h

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_PPP_H
 #define NM_SETTING_PPP_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-pppoe.h

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_PPPOE_H
 #define NM_SETTING_PPPOE_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-serial.h

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_SERIAL_H
 #define NM_SETTING_SERIAL_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

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

@@ -21,7 +21,7 @@
 #ifndef NM_SETTING_TEAM_PORT_H
 #define NM_SETTING_TEAM_PORT_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-team.h

@@ -21,7 +21,7 @@
 #ifndef NM_SETTING_TEAM_H
 #define NM_SETTING_TEAM_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-template.h

@@ -30,7 +30,7 @@
 #ifndef NM_SETTING_TEMPLATE_H
 #define NM_SETTING_TEMPLATE_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-vpn.h

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_VPN_H
 #define NM_SETTING_VPN_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-wimax.h

@@ -22,7 +22,7 @@
 #ifndef NM_SETTING_WIMAX_H
 #define NM_SETTING_WIMAX_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-wired.h

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_WIRED_H
 #define NM_SETTING_WIRED_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

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

@@ -23,7 +23,7 @@
 #ifndef NM_SETTING_WIRELESS_SECURITY_H
 #define NM_SETTING_WIRELESS_SECURITY_H
 
-#include <nm-setting.h>
+#include "nm-setting.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting-wireless.h

@@ -23,9 +23,9 @@
 #ifndef NM_SETTING_WIRELESS_H
 #define NM_SETTING_WIRELESS_H
 
-#include <NetworkManager.h>
-#include <nm-setting.h>
-#include <nm-setting-wireless-security.h>
+#include "NetworkManager.h"
+#include "nm-setting.h"
+#include "nm-setting-wireless-security.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-setting.h

@@ -26,7 +26,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <nm-version.h>
+#include "nm-version.h"
 
 G_BEGIN_DECLS
 

libnm-util/nm-version.h

@@ -23,7 +23,7 @@
 
 #include <glib.h>
 
-#include <nm-version-macros.h>
+#include "nm-version-macros.h"
 
 /* Deprecation / Availability macros */
 

libnm/NetworkManager.h

@@ -23,81 +23,81 @@
 
 #define __NETWORKMANAGER_H_INSIDE__
 
-#include <nm-access-point.h>
-#include <nm-active-connection.h>
-#include <nm-client.h>
-#include <nm-connection.h>
-#include <nm-core-enum-types.h>
-#include <nm-dbus-interface.h>
-#include <nm-device-adsl.h>
-#include <nm-device-bond.h>
-#include <nm-device-bridge.h>
-#include <nm-device-bt.h>
-#include <nm-device-dummy.h>
-#include <nm-device-ethernet.h>
-#include <nm-device-generic.h>
-#include <nm-device-infiniband.h>
-#include <nm-device-ip-tunnel.h>
-#include <nm-device-macvlan.h>
-#include <nm-device-modem.h>
-#include <nm-device-olpc-mesh.h>
-#include <nm-device-team.h>
-#include <nm-device-tun.h>
-#include <nm-device-vlan.h>
-#include <nm-device-vxlan.h>
-#include <nm-device-wifi.h>
-#include <nm-device-wimax.h>
-#include <nm-device.h>
-#include <nm-dhcp-config.h>
-#include <nm-enum-types.h>
-#include <nm-ip-config.h>
-#include <nm-object.h>
-#include <nm-remote-connection.h>
-#include <nm-setting-8021x.h>
-#include <nm-setting-adsl.h>
-#include <nm-setting-bluetooth.h>
-#include <nm-setting-bond.h>
-#include <nm-setting-bridge.h>
-#include <nm-setting-bridge-port.h>
-#include <nm-setting-cdma.h>
-#include <nm-setting-connection.h>
-#include <nm-setting-dcb.h>
-#include <nm-setting-dummy.h>
-#include <nm-setting-generic.h>
-#include <nm-setting-gsm.h>
-#include <nm-setting-infiniband.h>
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-ip-config.h>
-#include <nm-setting-ip-tunnel.h>
-#include <nm-setting-macsec.h>
-#include <nm-setting-macvlan.h>
-#include <nm-setting-olpc-mesh.h>
-#include <nm-setting-ppp.h>
-#include <nm-setting-pppoe.h>
-#include <nm-setting-proxy.h>
-#include <nm-setting-serial.h>
-#include <nm-setting-team.h>
-#include <nm-setting-team-port.h>
-#include <nm-setting-tun.h>
-#include <nm-setting-vlan.h>
-#include <nm-setting-vpn.h>
-#include <nm-setting-vxlan.h>
-#include <nm-setting-wimax.h>
-#include <nm-setting-wired.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-setting.h>
-#include <nm-simple-connection.h>
-#include <nm-utils.h>
-#include <nm-version.h>
-#include <nm-vpn-connection.h>
-#include <nm-vpn-dbus-interface.h>
-#include <nm-vpn-editor.h>
-#include <nm-vpn-editor-plugin.h>
-#include <nm-vpn-plugin-info.h>
-#include <nm-vpn-service-plugin.h>
-#include <nm-wimax-nsp.h>
+#include "nm-access-point.h"
+#include "nm-active-connection.h"
+#include "nm-client.h"
+#include "nm-connection.h"
+#include "nm-core-enum-types.h"
+#include "nm-dbus-interface.h"
+#include "nm-device-adsl.h"
+#include "nm-device-bond.h"
+#include "nm-device-bridge.h"
+#include "nm-device-bt.h"
+#include "nm-device-dummy.h"
+#include "nm-device-ethernet.h"
+#include "nm-device-generic.h"
+#include "nm-device-infiniband.h"
+#include "nm-device-ip-tunnel.h"
+#include "nm-device-macvlan.h"
+#include "nm-device-modem.h"
+#include "nm-device-olpc-mesh.h"
+#include "nm-device-team.h"
+#include "nm-device-tun.h"
+#include "nm-device-vlan.h"
+#include "nm-device-vxlan.h"
+#include "nm-device-wifi.h"
+#include "nm-device-wimax.h"
+#include "nm-device.h"
+#include "nm-dhcp-config.h"
+#include "nm-enum-types.h"
+#include "nm-ip-config.h"
+#include "nm-object.h"
+#include "nm-remote-connection.h"
+#include "nm-setting-8021x.h"
+#include "nm-setting-adsl.h"
+#include "nm-setting-bluetooth.h"
+#include "nm-setting-bond.h"
+#include "nm-setting-bridge.h"
+#include "nm-setting-bridge-port.h"
+#include "nm-setting-cdma.h"
+#include "nm-setting-connection.h"
+#include "nm-setting-dcb.h"
+#include "nm-setting-dummy.h"
+#include "nm-setting-generic.h"
+#include "nm-setting-gsm.h"
+#include "nm-setting-infiniband.h"
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
+#include "nm-setting-ip-config.h"
+#include "nm-setting-ip-tunnel.h"
+#include "nm-setting-macsec.h"
+#include "nm-setting-macvlan.h"
+#include "nm-setting-olpc-mesh.h"
+#include "nm-setting-ppp.h"
+#include "nm-setting-pppoe.h"
+#include "nm-setting-proxy.h"
+#include "nm-setting-serial.h"
+#include "nm-setting-team.h"
+#include "nm-setting-team-port.h"
+#include "nm-setting-tun.h"
+#include "nm-setting-vlan.h"
+#include "nm-setting-vpn.h"
+#include "nm-setting-vxlan.h"
+#include "nm-setting-wimax.h"
+#include "nm-setting-wired.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-setting.h"
+#include "nm-simple-connection.h"
+#include "nm-utils.h"
+#include "nm-version.h"
+#include "nm-vpn-connection.h"
+#include "nm-vpn-dbus-interface.h"
+#include "nm-vpn-editor.h"
+#include "nm-vpn-editor-plugin.h"
+#include "nm-vpn-plugin-info.h"
+#include "nm-vpn-service-plugin.h"
+#include "nm-wimax-nsp.h"
 
 #undef __NETWORKMANAGER_H_INSIDE__
 

libnm/nm-access-point.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-object.h>
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 

libnm/nm-active-connection.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-object.h>
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 

libnm/nm-client.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-types.h>
+#include "nm-types.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-adsl.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-bond.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-bridge.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-bt.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-dummy.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-ethernet.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-generic.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-infiniband.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-ip-tunnel.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-macsec.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-macvlan.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-modem.h

@@ -26,7 +26,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-olpc-mesh.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS
 

libnm/nm-device-team.h

@@ -25,7 +25,7 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-device.h>
+#include "nm-device.h"
 
 G_BEGIN_DECLS