[network-manager-openvpn/nm-1-2] build: drop direct includes of "nm-macros-internal.h" and "nm-utils.h"

[Thomas Haller <thaller src gnome org>]

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

    build: drop direct includes of "nm-macros-internal.h" and "nm-utils.h"
    
    "nm-macros-internal.h" and "nm-utils.h" is already provided via
    "nm-default.h" (and in libnm, "nm-utils.h" cannot be included
    directly).
    
    (cherry picked from commit 06cea6478ae7dd4eaa1015bf0bf93eb0924ad8b3)

 properties/import-export.c              |    1 -
 shared/utils.c                          |    2 --
 src/nm-openvpn-service-openvpn-helper.c |    1 -
 src/nm-openvpn-service.c                |    2 --
 4 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/properties/import-export.c b/properties/import-export.c
index 33db2dd..4b97b58 100644
--- a/properties/import-export.c
+++ b/properties/import-export.c
@@ -36,7 +36,6 @@
 
 #include "nm-openvpn.h"
 #include "utils.h"
-#include "nm-macros-internal.h"
 #include "nm-shared-utils.h"
 
 
diff --git a/shared/utils.c b/shared/utils.c
index edd3171..f61cd42 100644
--- a/shared/utils.c
+++ b/shared/utils.c
@@ -26,8 +26,6 @@
 #include <string.h>
 #include <errno.h>
 
-#include "nm-macros-internal.h"
-
 gboolean
 is_pkcs12 (const char *filepath)
 {
diff --git a/src/nm-openvpn-service-openvpn-helper.c b/src/nm-openvpn-service-openvpn-helper.c
index 1cf34e1..6deead7 100644
--- a/src/nm-openvpn-service-openvpn-helper.c
+++ b/src/nm-openvpn-service-openvpn-helper.c
@@ -40,7 +40,6 @@
 #include <netdb.h>
 
 #include "nm-openvpn-service.h"
-#include "nm-utils.h"
 
 extern char **environ;
 
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index a3d2c87..84e10b9 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -46,9 +46,7 @@
 #include <grp.h>
 #include "glib-unix.h"
 
-#include "nm-utils.h"
 #include "utils.h"
-#include "nm-macros-internal.h"
 
 #if !defined(DIST_VERSION)
 # define DIST_VERSION VERSION