From 631a86df9453247fd1338706a83eb90584ee24e3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Fri, 25 Feb 2011 16:29:14 +0100
Subject: [PATCH] s3-includes: only include system/iconv.h when needed.

Guenther
(cherry picked from commit 310d26852705c79194566eba971377bbac5f1c52)
---
 source3/include/includes.h            | 1 -
 source3/registry/reg_parse_internal.h | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 677369e8263..4827d98b2d2 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -72,7 +72,6 @@
 #include "system/dir.h"
 #include "system/filesys.h"
 #include "system/glob.h"
-#include "system/iconv.h"
 #include "system/locale.h"
 #include "system/network.h"
 #include "system/passwd.h"
diff --git a/source3/registry/reg_parse_internal.h b/source3/registry/reg_parse_internal.h
index 153d48cb318..ef591617569 100644
--- a/source3/registry/reg_parse_internal.h
+++ b/source3/registry/reg_parse_internal.h
@@ -25,6 +25,7 @@
 #define __REG_PARSE_INTERNAL_H
 
 #include "includes.h"
+#include "system/iconv.h"
 
 struct cbuf;
 
-- 
2.11.4.GIT