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 97a366a1532db44fd744a6592eca3d233ee05140..55a6df85fb718bf30ad0e8fa22ffd44b18a33647 100644 (file)
--- 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 b725b53cb5a65e349193172b60e52ffc985b0ec0..96a3af68d27c653ca3954f9891a2479dd98ef34b 100644 (file)
--- 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 cf25efa5a5e454e24d6091594f4b23bd5ea8d2d3..1a79e6aa400d58ed2f77b44734b24cc51233f1a2 100644 (file)
--- 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 3aa213fbe4fda9f5d76aed1da736266be620baa1..2a4ccd93673dbb08690f37b130994657aa4f7e38 100644 (file)
--- 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 585cb787d092104dd59ab04d3291d0ac05a1df37..4658d91b0c83496f591f0744244e34a9df9cd713 100644 (file)
--- 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 db8a8dde79ff0172e5c792db7e2f0138d4178677..88d5531bb7102e5a2883fc1e4d9cd5479e989539 100644 (file)
--- 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],\