From 88a0c401fce6fb3cde13b532a5a9972f40876421 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Fri, 20 Dec 2013 17:22:23 +0100
Subject: [PATCH] libgpo: only use libgpo/gpext/gpext.h where really needed.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
---
 libgpo/gpo.h                    | 2 --
 libgpo/gpo_util.c               | 1 +
 source3/libgpo/gpext/registry.c | 1 +
 source3/libgpo/gpext/scripts.c  | 1 +
 source3/libgpo/gpext/security.c | 1 +
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/libgpo/gpo.h b/libgpo/gpo.h
index 4f856fd8f08..dfded119980 100644
--- a/libgpo/gpo.h
+++ b/libgpo/gpo.h
@@ -265,6 +265,4 @@ NTSTATUS gpo_copy(TALLOC_CTX *mem_ctx,
 		  const struct GROUP_POLICY_OBJECT *gpo_src,
 		  struct GROUP_POLICY_OBJECT **gpo_dst);
 
-#include "../libgpo/gpext/gpext.h"
-
 #endif
diff --git a/libgpo/gpo_util.c b/libgpo/gpo_util.c
index 4d87eb3afca..05288c63cb1 100644
--- a/libgpo/gpo_util.c
+++ b/libgpo/gpo_util.c
@@ -25,6 +25,7 @@
 #include "../libcli/security/security.h"
 #include "registry.h"
 #include "libgpo/gpo_proto.h"
+#include "libgpo/gpext/gpext.h"
 
 #if 0
 #define DEFAULT_DOMAIN_POLICY "Default Domain Policy"
diff --git a/source3/libgpo/gpext/registry.c b/source3/libgpo/gpext/registry.c
index 1c76c0d8f52..ad511a527da 100644
--- a/source3/libgpo/gpext/registry.c
+++ b/source3/libgpo/gpext/registry.c
@@ -23,6 +23,7 @@
 #include "libgpo/gpo_proto.h"
 #include "registry.h"
 #include "../librpc/gen_ndr/ndr_preg.h"
+#include "libgpo/gpext/gpext.h"
 
 #define GP_EXT_NAME "registry"
 
diff --git a/source3/libgpo/gpext/scripts.c b/source3/libgpo/gpext/scripts.c
index 2d054c1767c..16af3a23f93 100644
--- a/source3/libgpo/gpext/scripts.c
+++ b/source3/libgpo/gpext/scripts.c
@@ -24,6 +24,7 @@
 #include "registry.h"
 #include "registry/reg_api.h"
 #include "../libcli/registry/util_reg.h"
+#include "libgpo/gpext/gpext.h"
 
 #define GP_EXT_NAME "scripts"
 
diff --git a/source3/libgpo/gpext/security.c b/source3/libgpo/gpext/security.c
index a63c626c57b..f303622bb14 100644
--- a/source3/libgpo/gpext/security.c
+++ b/source3/libgpo/gpext/security.c
@@ -21,6 +21,7 @@
 #include "../libgpo/gpo_ini.h"
 #include "../libgpo/gpo.h"
 #include "libgpo/gpo_proto.h"
+#include "libgpo/gpext/gpext.h"
 
 #define GP_EXT_NAME "security"
 
-- 
2.11.4.GIT