From: Volker Lendecke <vl@samba.org>
Date: Sat, 9 Jan 2021 17:22:15 +0000 (+0100)
Subject: lib: Avoid "includes.h" in lib/util/charset/
X-Git-Tag: samba-4.14.0rc1~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1701041d532bb6684c33e89420273631c063a2fa;p=thirdparty%2Fsamba.git

lib: Avoid "includes.h" in lib/util/charset/

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/lib/util/charset/charset_macosxfs.c b/lib/util/charset/charset_macosxfs.c
index 97a366a1532..55a6df85fb7 100644
--- a/lib/util/charset/charset_macosxfs.c
+++ b/lib/util/charset/charset_macosxfs.c
@@ -29,7 +29,8 @@
  * source.
  */
 
-#include "includes.h"
+#include "replace.h"
+#include "charset.h"
 #include "charset_proto.h"
 #undef realloc
 
diff --git a/lib/util/charset/convert_string.c b/lib/util/charset/convert_string.c
index b725b53cb5a..96a3af68d27 100644
--- a/lib/util/charset/convert_string.c
+++ b/lib/util/charset/convert_string.c
@@ -21,8 +21,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "includes.h"
+#include "replace.h"
 #include "system/iconv.h"
+#include "charset.h"
+#include "lib/util/debug.h"
+#include "lib/util/fault.h"
 
 /**
  * @file
diff --git a/lib/util/charset/pull_push.c b/lib/util/charset/pull_push.c
index cf25efa5a5e..1a79e6aa400 100644
--- a/lib/util/charset/pull_push.c
+++ b/lib/util/charset/pull_push.c
@@ -21,8 +21,9 @@
 
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/locale.h"
+#include "charset.h"
 
 /**
  * Copy a string from a unix char* src to a UCS2 destination,
diff --git a/lib/util/charset/util_str.c b/lib/util/charset/util_str.c
index 3aa213fbe4f..2a4ccd93673 100644
--- a/lib/util/charset/util_str.c
+++ b/lib/util/charset/util_str.c
@@ -22,8 +22,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/locale.h"
+#include "charset.h"
+#include "lib/util/fault.h"
 
 #ifdef strcasecmp
 #undef strcasecmp
diff --git a/lib/util/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index 585cb787d09..4658d91b0c8 100644
--- a/lib/util/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
@@ -18,8 +18,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/locale.h"
+#include "charset.h"
+#include "lib/util/byteorder.h"
+#include "lib/util/fault.h"
 
 /**
  String replace.
diff --git a/lib/util/charset/util_unistr_w.c b/lib/util/charset/util_unistr_w.c
index db8a8dde79f..88d5531bb71 100644
--- a/lib/util/charset/util_unistr_w.c
+++ b/lib/util/charset/util_unistr_w.c
@@ -19,7 +19,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "charset.h"
+#include "lib/util/byteorder.h"
+#include "lib/util/debug.h"
+#include "lib/util/fault.h"
 
 /* Copy into a smb_ucs2_t from a possibly unaligned buffer. Return the copied smb_ucs2_t */
 #define COPY_UCS2_CHAR(dest,src) (((unsigned char *)(dest))[0] = ((const unsigned char *)(src))[0],\