[network-manager-openvpn/nm-1-2] build: include "nm-openvpn-service-defines.h" via "nm-default.h"

[Thomas Haller <thaller src gnome org>]

commit a63c985f7aa82bc7d3db0f896c5912cc7c564bb3
Author: Thomas Haller <thaller redhat com>
Date:   Thu Apr 28 19:28:28 2016 +0200

    build: include "nm-openvpn-service-defines.h" via "nm-default.h"
    
    "nm-openvpn-service-defines.h" is a very simple header file, and used basically everywhere.
    Include it once via "nm-default.h".
    
    (cherry picked from commit 54a4aafd5cf9d1270e973099d5b050aa2997ed27)

 auth-dialog/main.c                    |    1 -
 properties/auth-helpers.c             |    1 -
 properties/import-export.c            |    1 -
 properties/nm-openvpn.c               |    1 -
 properties/tests/test-import-export.c |    1 -
 shared/nm-default.h                   |    1 +
 src/nm-openvpn-service.h              |    2 --
 7 files changed, 1 insertions(+), 7 deletions(-)
---
diff --git a/auth-dialog/main.c b/auth-dialog/main.c
index e1723e2..8f95a83 100644
--- a/auth-dialog/main.c
+++ b/auth-dialog/main.c
@@ -35,7 +35,6 @@
 #include <nma-vpn-password-dialog.h>
 
 #include "utils.h"
-#include "nm-openvpn-service-defines.h"
 
 #define KEYRING_UUID_TAG "connection-uuid"
 #define KEYRING_SN_TAG "setting-name"
diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
index 31f1254..9a85aa4 100644
--- a/properties/auth-helpers.c
+++ b/properties/auth-helpers.c
@@ -34,7 +34,6 @@
 #include <errno.h>
 
 #include "nm-openvpn.h"
-#include "nm-openvpn-service-defines.h"
 #include "utils.h"
 
 #define BLOCK_HANDLER_ID "block-handler-id"
diff --git a/properties/import-export.c b/properties/import-export.c
index de918ed..33db2dd 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -35,7 +35,6 @@
 #include <stdio.h>
 
 #include "nm-openvpn.h"
-#include "nm-openvpn-service-defines.h"
 #include "utils.h"
 #include "nm-macros-internal.h"
 #include "nm-shared-utils.h"
diff --git a/properties/nm-openvpn.c b/properties/nm-openvpn.c
index c7c2715..bde45c9 100644
--- a/properties/nm-openvpn.c
+++ b/properties/nm-openvpn.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <gtk/gtk.h>
 
-#include "nm-openvpn-service-defines.h"
 #include "auth-helpers.h"
 #include "import-export.h"
 
diff --git a/properties/tests/test-import-export.c b/properties/tests/test-import-export.c
index 3fcb822..8a3008f 100644
--- a/properties/tests/test-import-export.c
+++ b/properties/tests/test-import-export.c
@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 
 #include "nm-openvpn.h"
-#include "nm-openvpn-service-defines.h"
 #include "import-export.h"
 #include "utils.h"
 
diff --git a/shared/nm-default.h b/shared/nm-default.h
index 058dc14..1fa1d05 100644
--- a/shared/nm-default.h
+++ b/shared/nm-default.h
@@ -44,6 +44,7 @@
 #include "nm-version.h"
 #include "gsystem-local-alloc.h"
 #include "nm-macros-internal.h"
+#include "nm-openvpn-service-defines.h"
 
 /*****************************************************************************/
 
diff --git a/src/nm-openvpn-service.h b/src/nm-openvpn-service.h
index 2b3c54a..28bb4db 100644
--- a/src/nm-openvpn-service.h
+++ b/src/nm-openvpn-service.h
@@ -23,8 +23,6 @@
 #ifndef NM_OPENVPN_SERVICE_H
 #define NM_OPENVPN_SERVICE_H
 
-#include "nm-openvpn-service-defines.h"
-
 #define NM_TYPE_OPENVPN_PLUGIN            (nm_openvpn_plugin_get_type ())
 #define NM_OPENVPN_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), NM_TYPE_OPENVPN_PLUGIN, 
NMOpenvpnPlugin))
 #define NM_OPENVPN_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), NM_TYPE_OPENVPN_PLUGIN, 
NMOpenvpnPluginClass))