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

139 files changed, 302 insertions, 304 deletions

diff --git a/clients/cli/nmcli.h b/clients/cli/nmcli.h
index 30600d21d1..7e33e3a70a 100644
--- a/clients/cli/nmcli.h
+++ b/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"
diff --git a/clients/common/nm-secret-agent-simple.h b/clients/common/nm-secret-agent-simple.h
index f85ba65c89..2989723dbf 100644
--- a/clients/common/nm-secret-agent-simple.h
+++ b/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))
diff --git a/clients/common/nm-vpn-helpers.h b/clients/common/nm-vpn-helpers.h
index 9ad6b3b61f..9e3b853929 100644
--- a/clients/common/nm-vpn-helpers.h
+++ b/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;
diff --git a/clients/tui/nm-editor-bindings.h b/clients/tui/nm-editor-bindings.h
index fd4fcd30cf..facbf1c604 100644
--- a/clients/tui/nm-editor-bindings.h
+++ b/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);
 
diff --git a/clients/tui/nm-editor-utils.h b/clients/tui/nm-editor-utils.h
index 15a16cd269..6f66edfeb0 100644
--- a/clients/tui/nm-editor-utils.h
+++ b/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;
diff --git a/clients/tui/nmt-device-entry.h b/clients/tui/nmt-device-entry.h
index 4945e7c2a5..9278244fdf 100644
--- a/clients/tui/nmt-device-entry.h
+++ b/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))
diff --git a/clients/tui/nmt-edit-connection-list.h b/clients/tui/nmt-edit-connection-list.h
index 241bbe3ab4..9726e287ef 100644
--- a/clients/tui/nmt-edit-connection-list.h
+++ b/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))
diff --git a/clients/tui/nmt-editor-page.h b/clients/tui/nmt-editor-page.h
index ae55128ac6..93a66155fd 100644
--- a/clients/tui/nmt-editor-page.h
+++ b/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"
diff --git a/clients/tui/nmt-editor.h b/clients/tui/nmt-editor.h
index b000f64e4e..5620c5e823 100644
--- a/clients/tui/nmt-editor.h
+++ b/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"
 
diff --git a/clients/tui/nmt-route-editor.h b/clients/tui/nmt-route-editor.h
index febcb402f2..8e63830e7c 100644
--- a/clients/tui/nmt-route-editor.h
+++ b/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"
 
diff --git a/clients/tui/nmtui.h b/clients/tui/nmtui.h
index 53c20cb47e..efb596221a 100644
--- a/clients/tui/nmtui.h
+++ b/clients/tui/nmtui.h
@@ -19,7 +19,7 @@
 #ifndef NMTUI_H
 #define NMTUI_H
 
-#include <NetworkManager.h>
+#include "NetworkManager.h"
 
 extern NMClient *nm_client;
 
diff --git a/docs/libnm-glib/libnm-glib.types b/docs/libnm-glib/libnm-glib.types
index 01ab1ce631..1cb7d40626 100644
--- a/docs/libnm-glib/libnm-glib.types
+++ b/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
diff --git a/examples/C/qt/add-connection-wired.cpp b/examples/C/qt/add-connection-wired.cpp
index fe790ecdbf..c06ed71f29 100644
--- a/examples/C/qt/add-connection-wired.cpp
+++ b/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)

diff --git a/examples/C/qt/change-ipv4-addresses.cpp b/examples/C/qt/change-ipv4-addresses.cpp
index 8ca3dde2fb..d403900ad1 100644
--- a/examples/C/qt/change-ipv4-addresses.cpp
+++ b/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)
diff --git a/examples/C/qt/list-connections.cpp b/examples/C/qt/list-connections.cpp
index 66f309c83c..48dd685ef8 100644
--- a/examples/C/qt/list-connections.cpp
+++ b/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) {
diff --git a/libnm-core/nm-connection.h b/libnm-core/nm-connection.h
index 032d9d7eb0..fae9862a40 100644
--- a/libnm-core/nm-connection.h
+++ b/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
 
diff --git a/libnm-core/nm-core-types.h b/libnm-core/nm-core-types.h
index dc13cf0779..3726061a60 100644
--- a/libnm-core/nm-core-types.h
+++ b/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;
diff --git a/libnm-core/nm-setting-8021x.h b/libnm-core/nm-setting-8021x.h
index a47c26a722..ac38d94e98 100644
--- a/libnm-core/nm-setting-8021x.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-adsl.h b/libnm-core/nm-setting-adsl.h
index 5afbe5bffc..d1f975e962 100644
--- a/libnm-core/nm-setting-adsl.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-bond.h b/libnm-core/nm-setting-bond.h
index 8ee31888a8..ee2da97778 100644
--- a/libnm-core/nm-setting-bond.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-bridge-port.h b/libnm-core/nm-setting-bridge-port.h
index b43f636608..690f9d0df9 100644
--- a/libnm-core/nm-setting-bridge-port.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-bridge.h b/libnm-core/nm-setting-bridge.h
index 844c06ad38..918b9c16c8 100644
--- a/libnm-core/nm-setting-bridge.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-cdma.h b/libnm-core/nm-setting-cdma.h
index 16f937db44..85ad3e4c86 100644
--- a/libnm-core/nm-setting-cdma.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-dcb.h b/libnm-core/nm-setting-dcb.h
index 6cc2ce41b5..4a3c7329d1 100644
--- a/libnm-core/nm-setting-dcb.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-generic.h b/libnm-core/nm-setting-generic.h
index 0ce3b1605f..a5e94f6251 100644
--- a/libnm-core/nm-setting-generic.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-gsm.h b/libnm-core/nm-setting-gsm.h
index 5db60fce59..8dd4793efa 100644
--- a/libnm-core/nm-setting-gsm.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-infiniband.h b/libnm-core/nm-setting-infiniband.h
index f19983b462..30e1158fe1 100644
--- a/libnm-core/nm-setting-infiniband.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-ip-tunnel.h b/libnm-core/nm-setting-ip-tunnel.h
index 3ee4aafe44..081b171b04 100644
--- a/libnm-core/nm-setting-ip-tunnel.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-olpc-mesh.h b/libnm-core/nm-setting-olpc-mesh.h
index 2506cec9c5..162373b3e4 100644
--- a/libnm-core/nm-setting-olpc-mesh.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-ppp.h b/libnm-core/nm-setting-ppp.h
index a835ef8a05..39b578b35e 100644
--- a/libnm-core/nm-setting-ppp.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-pppoe.h b/libnm-core/nm-setting-pppoe.h
index 1f5b6ed97c..56d42efd3b 100644
--- a/libnm-core/nm-setting-pppoe.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-proxy.h b/libnm-core/nm-setting-proxy.h
index 2009dfab98..e80789b4ac 100644
--- a/libnm-core/nm-setting-proxy.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-serial.h b/libnm-core/nm-setting-serial.h
index 182efc6176..16cad3fae2 100644
--- a/libnm-core/nm-setting-serial.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-team-port.h b/libnm-core/nm-setting-team-port.h
index 546cc69a9a..3b9dc09e2f 100644
--- a/libnm-core/nm-setting-team-port.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-team.h b/libnm-core/nm-setting-team.h
index 726f84202a..baaa073d4c 100644
--- a/libnm-core/nm-setting-team.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-vpn.h b/libnm-core/nm-setting-vpn.h
index 539656f826..79f3d642b7 100644
--- a/libnm-core/nm-setting-vpn.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-wimax.h b/libnm-core/nm-setting-wimax.h
index 3f0767e969..b9c86f3ace 100644
--- a/libnm-core/nm-setting-wimax.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-wired.h b/libnm-core/nm-setting-wired.h
index 30b0b6c254..0978ae90fc 100644
--- a/libnm-core/nm-setting-wired.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-wireless-security.h b/libnm-core/nm-setting-wireless-security.h
index 093cb386cb..290d4f265f 100644
--- a/libnm-core/nm-setting-wireless-security.h
+++ b/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
 
diff --git a/libnm-core/nm-setting-wireless.h b/libnm-core/nm-setting-wireless.h
index 35fa79c179..1d58903fc1 100644
--- a/libnm-core/nm-setting-wireless.h
+++ b/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
 
diff --git a/libnm-core/nm-setting.h b/libnm-core/nm-setting.h
index 3083ef6029..bf3f8e561d 100644
--- a/libnm-core/nm-setting.h
+++ b/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
 
diff --git a/libnm-core/nm-simple-connection.h b/libnm-core/nm-simple-connection.h
index d6a6044713..4166d4ca63 100644
--- a/libnm-core/nm-simple-connection.h
+++ b/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
 
diff --git a/libnm-core/nm-version.h b/libnm-core/nm-version.h
index 8d4dd9c030..c6cd28924c 100644
--- a/libnm-core/nm-version.h
+++ b/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 */
 
diff --git a/libnm-glib/nm-access-point.c b/libnm-glib/nm-access-point.c
index 0aef3ee400..892b4a8309 100644
--- a/libnm-glib/nm-access-point.c
+++ b/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"
diff --git a/libnm-glib/nm-access-point.h b/libnm-glib/nm-access-point.h
index 7ea8f8120a..5750c76c53 100644
--- a/libnm-glib/nm-access-point.h
+++ b/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
diff --git a/libnm-glib/nm-active-connection.h b/libnm-glib/nm-active-connection.h
index e29415649c..cdf02a94e8 100644
--- a/libnm-glib/nm-active-connection.h
+++ b/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"
diff --git a/libnm-glib/nm-client.h b/libnm-glib/nm-client.h
index f10b6e54b4..fbbc3d92f5 100644
--- a/libnm-glib/nm-client.h
+++ b/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"
diff --git a/libnm-glib/nm-object.h b/libnm-glib/nm-object.h
index 07348f2491..73aa9de541 100644
--- a/libnm-glib/nm-object.h
+++ b/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
 
diff --git a/libnm-glib/nm-remote-connection.h b/libnm-glib/nm-remote-connection.h
index 8292c23545..5b746a4450 100644
--- a/libnm-glib/nm-remote-connection.h
+++ b/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
 
diff --git a/libnm-glib/nm-remote-settings.h b/libnm-glib/nm-remote-settings.h
index 92049adee0..af6cc60369 100644
--- a/libnm-glib/nm-remote-settings.h
+++ b/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
 
diff --git a/libnm-glib/nm-secret-agent.h b/libnm-glib/nm-secret-agent.h
index b7df874531..621e5e7bf9 100644
--- a/libnm-glib/nm-secret-agent.h
+++ b/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
 
diff --git a/libnm-glib/nm-types.h b/libnm-glib/nm-types.h
index 81bd299e69..9b58cd81e9 100644
--- a/libnm-glib/nm-types.h
+++ b/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
 
diff --git a/libnm-glib/nm-vpn-plugin-ui-interface.h b/libnm-glib/nm-vpn-plugin-ui-interface.h
index 37fde91f8c..b5ea2a7ef2 100644
--- a/libnm-glib/nm-vpn-plugin-ui-interface.h
+++ b/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
 
diff --git a/libnm-glib/nm-vpn-plugin-utils.h b/libnm-glib/nm-vpn-plugin-utils.h
index d87ef16aa4..dfb621cad4 100644
--- a/libnm-glib/nm-vpn-plugin-utils.h
+++ b/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
 
diff --git a/libnm-glib/nm-vpn-plugin.h b/libnm-glib/nm-vpn-plugin.h
index 323017f035..a33349a195 100644
--- a/libnm-glib/nm-vpn-plugin.h
+++ b/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
 
diff --git a/libnm-glib/nm-wimax-nsp.h b/libnm-glib/nm-wimax-nsp.h
index 74008d18e0..336f331dd5 100644
--- a/libnm-glib/nm-wimax-nsp.h
+++ b/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
diff --git a/libnm-util/NetworkManager.h b/libnm-util/NetworkManager.h
index 77c09ae356..5e1c3f9f6d 100644
--- a/libnm-util/NetworkManager.h
+++ b/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
diff --git a/libnm-util/nm-connection.h b/libnm-util/nm-connection.h
index 2cee2be560..6e119c2c0b 100644
--- a/libnm-util/nm-connection.h
+++ b/libnm-util/nm-connection.h
@@ -25,34 +25,34 @@
 
 #include <glib.h>
 #include <glib-object.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.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
 
diff --git a/libnm-util/nm-setting-8021x.h b/libnm-util/nm-setting-8021x.h
index 62b4390502..3de8f4c37d 100644
--- a/libnm-util/nm-setting-8021x.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-adsl.h b/libnm-util/nm-setting-adsl.h
index 82af6ebdd0..777f0b3636 100644
--- a/libnm-util/nm-setting-adsl.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-bond.h b/libnm-util/nm-setting-bond.h
index 172bb4cfb5..efef82c882 100644
--- a/libnm-util/nm-setting-bond.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-bridge-port.h b/libnm-util/nm-setting-bridge-port.h
index fcaf22ed09..76527aefdf 100644
--- a/libnm-util/nm-setting-bridge-port.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-bridge.h b/libnm-util/nm-setting-bridge.h
index f6b59262b8..bd74141591 100644
--- a/libnm-util/nm-setting-bridge.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-cdma.h b/libnm-util/nm-setting-cdma.h
index eee4420592..e2c0376eb4 100644
--- a/libnm-util/nm-setting-cdma.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-dcb.h b/libnm-util/nm-setting-dcb.h
index ac34521e0d..626f815d91 100644
--- a/libnm-util/nm-setting-dcb.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-generic.h b/libnm-util/nm-setting-generic.h
index 1cabae088c..f3b07f69bd 100644
--- a/libnm-util/nm-setting-generic.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-gsm.h b/libnm-util/nm-setting-gsm.h
index 564a8b4b9d..438c6b3b32 100644
--- a/libnm-util/nm-setting-gsm.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-infiniband.h b/libnm-util/nm-setting-infiniband.h
index dff3845036..95d343e963 100644
--- a/libnm-util/nm-setting-infiniband.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-olpc-mesh.h b/libnm-util/nm-setting-olpc-mesh.h
index 54b268e2c6..1764406ef6 100644
--- a/libnm-util/nm-setting-olpc-mesh.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-ppp.h b/libnm-util/nm-setting-ppp.h
index 5733902b83..52856463a4 100644
--- a/libnm-util/nm-setting-ppp.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-pppoe.h b/libnm-util/nm-setting-pppoe.h
index 9d04af9e24..9f8add4e63 100644
--- a/libnm-util/nm-setting-pppoe.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-serial.h b/libnm-util/nm-setting-serial.h
index 44d46cf37a..bca9abae92 100644
--- a/libnm-util/nm-setting-serial.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-team-port.h b/libnm-util/nm-setting-team-port.h
index 4e8022202a..2da6518b7a 100644
--- a/libnm-util/nm-setting-team-port.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-team.h b/libnm-util/nm-setting-team.h
index d67c8c71b6..87aa769506 100644
--- a/libnm-util/nm-setting-team.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-template.h b/libnm-util/nm-setting-template.h
index d1db77bc65..8e8a270be5 100644
--- a/libnm-util/nm-setting-template.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-vpn.h b/libnm-util/nm-setting-vpn.h
index acce6e63b4..ba952f4263 100644
--- a/libnm-util/nm-setting-vpn.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-wimax.h b/libnm-util/nm-setting-wimax.h
index 9d7a07af75..45e533527b 100644
--- a/libnm-util/nm-setting-wimax.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-wired.h b/libnm-util/nm-setting-wired.h
index 33d6d54dde..08a39153af 100644
--- a/libnm-util/nm-setting-wired.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-wireless-security.h b/libnm-util/nm-setting-wireless-security.h
index 97a456b048..1140582b56 100644
--- a/libnm-util/nm-setting-wireless-security.h
+++ b/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
 
diff --git a/libnm-util/nm-setting-wireless.h b/libnm-util/nm-setting-wireless.h
index 77eff73e30..5a64f0a0f1 100644
--- a/libnm-util/nm-setting-wireless.h
+++ b/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
 
diff --git a/libnm-util/nm-setting.h b/libnm-util/nm-setting.h
index 28c6975a8d..ce5cf3f529 100644
--- a/libnm-util/nm-setting.h
+++ b/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
 
diff --git a/libnm-util/nm-version.h b/libnm-util/nm-version.h
index a44d44e607..d4c66ea011 100644
--- a/libnm-util/nm-version.h
+++ b/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 */
 
diff --git a/libnm/NetworkManager.h b/libnm/NetworkManager.h
index 4bf35df714..fc58bc9ed5 100644
--- a/libnm/NetworkManager.h
+++ b/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__
 
diff --git a/libnm/nm-access-point.h b/libnm/nm-access-point.h
index 142ab2955e..177b6a9aa8 100644
--- a/libnm/nm-access-point.h
+++ b/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
 
diff --git a/libnm/nm-active-connection.h b/libnm/nm-active-connection.h
index 13e50a0602..8478b3dd7c 100644
--- a/libnm/nm-active-connection.h
+++ b/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
 
diff --git a/libnm/nm-client.h b/libnm/nm-client.h
index 65e0bac88e..5da16490ee 100644
--- a/libnm/nm-client.h
+++ b/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
 
diff --git a/libnm/nm-device-adsl.h b/libnm/nm-device-adsl.h
index 113d25b12d..0c92229916 100644
--- a/libnm/nm-device-adsl.h
+++ b/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
 
diff --git a/libnm/nm-device-bond.h b/libnm/nm-device-bond.h
index 67f64280bf..da666b6e31 100644
--- a/libnm/nm-device-bond.h
+++ b/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
 
diff --git a/libnm/nm-device-bridge.h b/libnm/nm-device-bridge.h
index df0cb30359..b860da7c75 100644
--- a/libnm/nm-device-bridge.h
+++ b/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
 
diff --git a/libnm/nm-device-bt.h b/libnm/nm-device-bt.h
index 773cb14872..8d6da684ec 100644
--- a/libnm/nm-device-bt.h
+++ b/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
 
diff --git a/libnm/nm-device-dummy.h b/libnm/nm-device-dummy.h
index 0d37e57557..85ee2babdf 100644
--- a/libnm/nm-device-dummy.h
+++ b/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
 
diff --git a/libnm/nm-device-ethernet.h b/libnm/nm-device-ethernet.h
index 76f4fde193..8623178161 100644
--- a/libnm/nm-device-ethernet.h
+++ b/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
 
diff --git a/libnm/nm-device-generic.h b/libnm/nm-device-generic.h
index 2a4a1160f4..c37c949534 100644
--- a/libnm/nm-device-generic.h
+++ b/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
 
diff --git a/libnm/nm-device-infiniband.h b/libnm/nm-device-infiniband.h
index 1f4ea217e4..38c81d9e69 100644
--- a/libnm/nm-device-infiniband.h
+++ b/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
 
diff --git a/libnm/nm-device-ip-tunnel.h b/libnm/nm-device-ip-tunnel.h
index 142518498a..6d748d966b 100644
--- a/libnm/nm-device-ip-tunnel.h
+++ b/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
 
diff --git a/libnm/nm-device-macsec.h b/libnm/nm-device-macsec.h
index d6d7c0ef79..60f7d7f04a 100644
--- a/libnm/nm-device-macsec.h
+++ b/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
 
diff --git a/libnm/nm-device-macvlan.h b/libnm/nm-device-macvlan.h
index aec280bdfb..5ccdbd2c16 100644
--- a/libnm/nm-device-macvlan.h
+++ b/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
 
diff --git a/libnm/nm-device-modem.h b/libnm/nm-device-modem.h
index fdf5c41fa7..a5af03460d 100644
--- a/libnm/nm-device-modem.h
+++ b/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
 
diff --git a/libnm/nm-device-olpc-mesh.h b/libnm/nm-device-olpc-mesh.h
index fc88beb972..5089bfd1a0 100644
--- a/libnm/nm-device-olpc-mesh.h
+++ b/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
 
diff --git a/libnm/nm-device-team.h b/libnm/nm-device-team.h
index 522e3d29c0..deecf07281 100644
--- a/libnm/nm-device-team.h
+++ b/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
 
diff --git a/libnm/nm-device-tun.h b/libnm/nm-device-tun.h
index 71649f8fe1..2fea454498 100644
--- a/libnm/nm-device-tun.h
+++ b/libnm/nm-device-tun.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
 
diff --git a/libnm/nm-device-vlan.h b/libnm/nm-device-vlan.h
index 1ee03bd52f..158a89aa96 100644
--- a/libnm/nm-device-vlan.h
+++ b/libnm/nm-device-vlan.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
 
diff --git a/libnm/nm-device-vxlan.h b/libnm/nm-device-vxlan.h
index 70c7ed5151..bd84f6f0f7 100644
--- a/libnm/nm-device-vxlan.h
+++ b/libnm/nm-device-vxlan.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
 
diff --git a/libnm/nm-device-wifi.h b/libnm/nm-device-wifi.h
index ee0238df0c..8cfea1f307 100644
--- a/libnm/nm-device-wifi.h
+++ b/libnm/nm-device-wifi.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
 
diff --git a/libnm/nm-device-wimax.h b/libnm/nm-device-wimax.h
index 424779bd30..cc3fc6e1d3 100644
--- a/libnm/nm-device-wimax.h
+++ b/libnm/nm-device-wimax.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
 
diff --git a/libnm/nm-device.h b/libnm/nm-device.h
index 5ffeb42ee3..91f31b8754 100644
--- a/libnm/nm-device.h
+++ b/libnm/nm-device.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
 
diff --git a/libnm/nm-dhcp-config.h b/libnm/nm-dhcp-config.h
index be32992f75..ef64048aa8 100644
--- a/libnm/nm-dhcp-config.h
+++ b/libnm/nm-dhcp-config.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
 
diff --git a/libnm/nm-dhcp4-config.h b/libnm/nm-dhcp4-config.h
index 4978f84883..2cbbdc9ebd 100644
--- a/libnm/nm-dhcp4-config.h
+++ b/libnm/nm-dhcp4-config.h
@@ -21,7 +21,7 @@
 #ifndef __NM_DHCP4_CONFIG_H__
 #define __NM_DHCP4_CONFIG_H__
 
-#include <nm-dhcp-config.h>
+#include "nm-dhcp-config.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-dhcp6-config.h b/libnm/nm-dhcp6-config.h
index b7c7c822e1..2d6568e12d 100644
--- a/libnm/nm-dhcp6-config.h
+++ b/libnm/nm-dhcp6-config.h
@@ -21,7 +21,7 @@
 #ifndef __NM_DHCP6_CONFIG_H__
 #define __NM_DHCP6_CONFIG_H__
 
-#include <nm-dhcp-config.h>
+#include "nm-dhcp-config.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-dns-manager.h b/libnm/nm-dns-manager.h
index 9ed3dfbed9..63989451e4 100644
--- a/libnm/nm-dns-manager.h
+++ b/libnm/nm-dns-manager.h
@@ -21,7 +21,7 @@
 #ifndef __NM_DNS_MANAGER_H__
 #define __NM_DNS_MANAGER_H__
 
-#include <nm-object.h>
+#include "nm-object.h"
 #include "nm-client.h"
 
 G_BEGIN_DECLS
diff --git a/libnm/nm-ip-config.h b/libnm/nm-ip-config.h
index 38d5b454fd..c407c7fe67 100644
--- a/libnm/nm-ip-config.h
+++ b/libnm/nm-ip-config.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
 
diff --git a/libnm/nm-ip4-config.h b/libnm/nm-ip4-config.h
index 196fe09a88..d99b21138d 100644
--- a/libnm/nm-ip4-config.h
+++ b/libnm/nm-ip4-config.h
@@ -22,7 +22,7 @@
 #ifndef __NM_IP4_CONFIG_H__
 #define __NM_IP4_CONFIG_H__
 
-#include <nm-ip-config.h>
+#include "nm-ip-config.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-ip6-config.h b/libnm/nm-ip6-config.h
index fa67517c18..12e723b2fc 100644
--- a/libnm/nm-ip6-config.h
+++ b/libnm/nm-ip6-config.h
@@ -22,7 +22,7 @@
 #ifndef __NM_IP6_CONFIG_H__
 #define __NM_IP6_CONFIG_H__
 
-#include <nm-ip-config.h>
+#include "nm-ip-config.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-manager.h b/libnm/nm-manager.h
index 362b5f2f43..7c63a3335f 100644
--- a/libnm/nm-manager.h
+++ b/libnm/nm-manager.h
@@ -22,8 +22,8 @@
 #ifndef __NM_MANAGER_H__
 #define __NM_MANAGER_H__
 
-#include <nm-object.h>
-#include <nm-client.h>
+#include "nm-object.h"
+#include "nm-client.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-object.h b/libnm/nm-object.h
index bcf47ba6e1..5b4580ebd7 100644
--- a/libnm/nm-object.h
+++ b/libnm/nm-object.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
 
diff --git a/libnm/nm-remote-connection.h b/libnm/nm-remote-connection.h
index a723575555..c04ae36779 100644
--- a/libnm/nm-remote-connection.h
+++ b/libnm/nm-remote-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
 
diff --git a/libnm/nm-remote-settings.h b/libnm/nm-remote-settings.h
index f8eddc5bae..06d3ac0a39 100644
--- a/libnm/nm-remote-settings.h
+++ b/libnm/nm-remote-settings.h
@@ -22,7 +22,7 @@
 #ifndef __NM_REMOTE_SETTINGS_H__
 #define __NM_REMOTE_SETTINGS_H__
 
-#include <nm-object.h>
+#include "nm-object.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-secret-agent-old.h b/libnm/nm-secret-agent-old.h
index 476cc2a259..4f6665d1d6 100644
--- a/libnm/nm-secret-agent-old.h
+++ b/libnm/nm-secret-agent-old.h
@@ -21,7 +21,7 @@
 #ifndef __NM_SECRET_AGENT_OLD_H__
 #define __NM_SECRET_AGENT_OLD_H__
 
-#include <nm-types.h>
+#include "nm-types.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-types.h b/libnm/nm-types.h
index 05fea1746b..84cf48f4c5 100644
--- a/libnm/nm-types.h
+++ b/libnm/nm-types.h
@@ -23,8 +23,8 @@
 
 #include <gio/gio.h>
 
-#include <nm-dbus-interface.h>
-#include <nm-connection.h>
+#include "nm-dbus-interface.h"
+#include "nm-connection.h"
 
 typedef struct _NMAccessPoint       NMAccessPoint;
 typedef struct _NMActiveConnection  NMActiveConnection;
diff --git a/libnm/nm-vpn-connection.h b/libnm/nm-vpn-connection.h
index 79ec90a0d1..0857035a5f 100644
--- a/libnm/nm-vpn-connection.h
+++ b/libnm/nm-vpn-connection.h
@@ -26,8 +26,8 @@
 #error "Only <NetworkManager.h> can be included directly."
 #endif
 
-#include <nm-active-connection.h>
-#include <nm-vpn-dbus-interface.h>
+#include "nm-active-connection.h"
+#include "nm-vpn-dbus-interface.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-vpn-editor.h b/libnm/nm-vpn-editor.h
index d450bbd6ad..26e48662b5 100644
--- a/libnm/nm-vpn-editor.h
+++ b/libnm/nm-vpn-editor.h
@@ -28,9 +28,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <nm-types.h>
+#include "nm-types.h"
 
-#include <nm-vpn-editor-plugin.h>
+#include "nm-vpn-editor-plugin.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-vpn-plugin-old.h b/libnm/nm-vpn-plugin-old.h
index 50e34450ad..48f3fba10f 100644
--- a/libnm/nm-vpn-plugin-old.h
+++ b/libnm/nm-vpn-plugin-old.h
@@ -23,8 +23,8 @@
 #define __NM_VPN_PLUGIN_OLD_H__
 
 #include <gio/gio.h>
-#include <nm-vpn-dbus-interface.h>
-#include <nm-connection.h>
+#include "nm-vpn-dbus-interface.h"
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-vpn-service-plugin.h b/libnm/nm-vpn-service-plugin.h
index 0b65529630..329345ea19 100644
--- a/libnm/nm-vpn-service-plugin.h
+++ b/libnm/nm-vpn-service-plugin.h
@@ -27,8 +27,8 @@
 #endif
 
 #include <gio/gio.h>
-#include <nm-vpn-dbus-interface.h>
-#include <nm-connection.h>
+#include "nm-vpn-dbus-interface.h"
+#include "nm-connection.h"
 
 G_BEGIN_DECLS
 
diff --git a/libnm/nm-wimax-nsp.h b/libnm/nm-wimax-nsp.h
index e1f63400e0..ed3993464d 100644
--- a/libnm/nm-wimax-nsp.h
+++ b/libnm/nm-wimax-nsp.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
 
diff --git a/src/devices/wifi/nm-wifi-utils.h b/src/devices/wifi/nm-wifi-utils.h
index 39c7fa177c..1b6c2f4bfb 100644
--- a/src/devices/wifi/nm-wifi-utils.h
+++ b/src/devices/wifi/nm-wifi-utils.h
@@ -21,11 +21,11 @@
 #ifndef __NM_WIFI_UTILS_H__
 #define __NM_WIFI_UTILS_H__
 
-#include <nm-dbus-interface.h>
-#include <nm-connection.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-setting-8021x.h>
+#include "nm-dbus-interface.h"
+#include "nm-connection.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-setting-8021x.h"
 
 gboolean nm_wifi_utils_complete_connection (const GByteArray *ssid,
                                             const char *bssid,
diff --git a/src/dhcp/nm-dhcp-client.h b/src/dhcp/nm-dhcp-client.h
index 7a083ae7a3..23ea349e88 100644
--- a/src/dhcp/nm-dhcp-client.h
+++ b/src/dhcp/nm-dhcp-client.h
@@ -19,10 +19,10 @@
 #ifndef __NETWORKMANAGER_DHCP_CLIENT_H__
 #define __NETWORKMANAGER_DHCP_CLIENT_H__
 
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
-#include <nm-ip4-config.h>
-#include <nm-ip6-config.h>
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
+#include "nm-ip4-config.h"
+#include "nm-ip6-config.h"
 
 #define NM_TYPE_DHCP_CLIENT            (nm_dhcp_client_get_type ())
 #define NM_DHCP_CLIENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_DHCP_CLIENT, NMDhcpClient))
diff --git a/src/dhcp/nm-dhcp-dhclient-utils.h b/src/dhcp/nm-dhcp-dhclient-utils.h
index 83d5a23daf..d1ab1ba968 100644
--- a/src/dhcp/nm-dhcp-dhclient-utils.h
+++ b/src/dhcp/nm-dhcp-dhclient-utils.h
@@ -19,8 +19,8 @@
 #ifndef __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__
 #define __NETWORKMANAGER_DHCP_DHCLIENT_UTILS_H__
 
-#include <nm-setting-ip4-config.h>
-#include <nm-setting-ip6-config.h>
+#include "nm-setting-ip4-config.h"
+#include "nm-setting-ip6-config.h"
 
 char *nm_dhcp_dhclient_create_config (const char *interface,
                                       gboolean is_ip6,
diff --git a/src/dhcp/nm-dhcp-utils.h b/src/dhcp/nm-dhcp-utils.h
index b45c5e89a2..05982b166d 100644
--- a/src/dhcp/nm-dhcp-utils.h
+++ b/src/dhcp/nm-dhcp-utils.h
@@ -21,8 +21,8 @@
 
 #include <stdlib.h>
 
-#include <nm-ip4-config.h>
-#include <nm-ip6-config.h>
+#include "nm-ip4-config.h"
+#include "nm-ip6-config.h"
 
 NMIP4Config *nm_dhcp_utils_ip4_config_from_options (int ifindex,
                                                     const char *iface,
diff --git a/src/settings/nm-secret-agent.h b/src/settings/nm-secret-agent.h
index 0b6da136a4..54c5b39827 100644
--- a/src/settings/nm-secret-agent.h
+++ b/src/settings/nm-secret-agent.h
@@ -21,7 +21,7 @@
 #ifndef __NETWORKMANAGER_SECRET_AGENT_H__
 #define __NETWORKMANAGER_SECRET_AGENT_H__
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 #define NM_TYPE_SECRET_AGENT            (nm_secret_agent_get_type ())
 #define NM_SECRET_AGENT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SECRET_AGENT, NMSecretAgent))
diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h
index e1ae9ab277..7b59c5edcd 100644
--- a/src/settings/nm-settings-connection.h
+++ b/src/settings/nm-settings-connection.h
@@ -25,7 +25,7 @@
 #include <net/ethernet.h>
 
 #include "nm-exported-object.h"
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 #define NM_TYPE_SETTINGS_CONNECTION            (nm_settings_connection_get_type ())
 #define NM_SETTINGS_CONNECTION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_SETTINGS_CONNECTION, NMSettingsConnection))
diff --git a/src/settings/nm-settings-plugin.h b/src/settings/nm-settings-plugin.h
index 8abd72eaeb..97bb7b65e7 100644
--- a/src/settings/nm-settings-plugin.h
+++ b/src/settings/nm-settings-plugin.h
@@ -22,7 +22,7 @@
 #ifndef __NETWORKMANAGER_SETTINGS_PLUGIN_H__
 #define __NETWORKMANAGER_SETTINGS_PLUGIN_H__
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 /* Plugin's factory function that returns a GObject that implements
  * NMSettingsPlugin.
diff --git a/src/settings/nm-settings.h b/src/settings/nm-settings.h
index 0771edee13..406e305767 100644
--- a/src/settings/nm-settings.h
+++ b/src/settings/nm-settings.h
@@ -26,7 +26,7 @@
 #ifndef __NM_SETTINGS_H__
 #define __NM_SETTINGS_H__
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 #include "nm-exported-object.h"
 
diff --git a/src/settings/plugins/ibft/nms-ibft-reader.h b/src/settings/plugins/ibft/nms-ibft-reader.h
index e2be7b02f5..27500cc50b 100644
--- a/src/settings/plugins/ibft/nms-ibft-reader.h
+++ b/src/settings/plugins/ibft/nms-ibft-reader.h
@@ -21,7 +21,7 @@
 #ifndef __NMS_IBFT_READER_H__
 #define __NMS_IBFT_READER_H__
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 gboolean nms_ibft_reader_load_blocks (const char *iscsiadm_path,
                                       GSList **out_blocks,
diff --git a/src/settings/plugins/ifnet/nms-ifnet-connection-parser.h b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.h
index e6c0e88c81..51bc34b98e 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-connection-parser.h
+++ b/src/settings/plugins/ifnet/nms-ifnet-connection-parser.h
@@ -22,7 +22,7 @@
 #ifndef _CONNECTION_PARSER_H
 #define _CONNECTION_PARSER_H
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 #include "nms-ifnet-net-parser.h"
 
diff --git a/src/settings/plugins/ifnet/nms-ifnet-net-utils.h b/src/settings/plugins/ifnet/nms-ifnet-net-utils.h
index 79d4464256..cc273aa78f 100644
--- a/src/settings/plugins/ifnet/nms-ifnet-net-utils.h
+++ b/src/settings/plugins/ifnet/nms-ifnet-net-utils.h
@@ -26,8 +26,8 @@
 
 #include <arpa/inet.h>
 
-#include <nm-setting-ip6-config.h>
-#include <nm-setting-ip4-config.h>
+#include "nm-setting-ip6-config.h"
+#include "nm-setting-ip4-config.h"
 
 #include "nms-ifnet-net-parser.h"
 
diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-parser.h b/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
index 36e52e2cbc..6a86bf8670 100644
--- a/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
+++ b/src/settings/plugins/ifupdown/nms-ifupdown-parser.h
@@ -24,7 +24,7 @@
 #ifndef __PARSER_H__
 #define __PARSER_H__
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 #include "nms-ifupdown-interface-parser.h"
 
diff --git a/src/settings/plugins/keyfile/nms-keyfile-reader.h b/src/settings/plugins/keyfile/nms-keyfile-reader.h
index f8b3fac8f4..b60c1e691d 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-reader.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-reader.h
@@ -22,7 +22,7 @@
 #ifndef __NMS_KEYFILE_READER_H__
 #define __NMS_KEYFILE_READER_H__
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 NMConnection *nms_keyfile_reader_from_keyfile (GKeyFile *key_file,
                                                const char *filename,
diff --git a/src/settings/plugins/keyfile/nms-keyfile-writer.h b/src/settings/plugins/keyfile/nms-keyfile-writer.h
index ca2e2a461f..ac41dfa2f1 100644
--- a/src/settings/plugins/keyfile/nms-keyfile-writer.h
+++ b/src/settings/plugins/keyfile/nms-keyfile-writer.h
@@ -22,7 +22,7 @@
 #ifndef __NMS_KEYFILE_WRITER_H__
 #define __NMS_KEYFILE_WRITER_H__
 
-#include <nm-connection.h>
+#include "nm-connection.h"
 
 gboolean nms_keyfile_writer_connection (NMConnection *connection,
                                         const char *existing_path,
diff --git a/src/supplicant/nm-supplicant-config.h b/src/supplicant/nm-supplicant-config.h
index 40fca61b03..6acfb7ee14 100644
--- a/src/supplicant/nm-supplicant-config.h
+++ b/src/supplicant/nm-supplicant-config.h
@@ -22,10 +22,10 @@
 #ifndef __NETWORKMANAGER_SUPPLICANT_CONFIG_H__
 #define __NETWORKMANAGER_SUPPLICANT_CONFIG_H__
 
-#include <nm-setting-macsec.h>
-#include <nm-setting-wireless.h>
-#include <nm-setting-wireless-security.h>
-#include <nm-setting-8021x.h>
+#include "nm-setting-macsec.h"
+#include "nm-setting-wireless.h"
+#include "nm-setting-wireless-security.h"
+#include "nm-setting-8021x.h"
 
 #include "nm-supplicant-types.h"