16 files changed, 9 insertions, 9 deletions
diff --git a/source4/lib/charset/charcnv.c b/lib/util/charset/charcnv.c
index 3e384304cf..3e384304cf 100644
--- a/source4/lib/charset/charcnv.c
+++ b/lib/util/charset/charcnv.c
diff --git a/source4/lib/charset/charset.h b/lib/util/charset/charset.h
index 041eaeace7..041eaeace7 100644
--- a/source4/lib/charset/charset.h
+++ b/lib/util/charset/charset.h
diff --git a/source4/lib/charset/config.m4 b/lib/util/charset/config.m4
index 453de9fe26..453de9fe26 100644
--- a/source4/lib/charset/config.m4
+++ b/lib/util/charset/config.m4
diff --git a/source4/lib/charset/config.mk b/lib/util/charset/config.mk
index 12c2f5f321..12c2f5f321 100644
--- a/source4/lib/charset/config.mk
+++ b/lib/util/charset/config.mk
diff --git a/source4/lib/charset/iconv.c b/lib/util/charset/iconv.c
index 150383e7f9..150383e7f9 100644
--- a/source4/lib/charset/iconv.c
+++ b/lib/util/charset/iconv.c
diff --git a/source4/lib/charset/tests/charset.c b/lib/util/charset/tests/charset.c
index 5e42ca2932..5e42ca2932 100644
--- a/source4/lib/charset/tests/charset.c
+++ b/lib/util/charset/tests/charset.c
diff --git a/source4/lib/charset/tests/iconv.c b/lib/util/charset/tests/iconv.c
index aeb42c2fa1..aeb42c2fa1 100644
--- a/source4/lib/charset/tests/iconv.c
+++ b/lib/util/charset/tests/iconv.c
diff --git a/source4/lib/charset/util_unistr.c b/lib/util/charset/util_unistr.c
index e4f4bb551a..e4f4bb551a 100644
--- a/source4/lib/charset/util_unistr.c
+++ b/lib/util/charset/util_unistr.c
diff --git a/lib/util/util.h b/lib/util/util.h
index c2407ae9c9..1cf60bae39 100644
--- a/lib/util/util.h
+++ b/lib/util/util.h
@@ -22,7 +22,7 @@
 #define _SAMBA_UTIL_H_
 
 #if _SAMBA_BUILD_ == 4
-#include "lib/charset/charset.h"
+#include "../lib/util/charset/charset.h"
 #endif
 #include "../lib/util/attr.h"
 
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 05455da084..127f6734e3 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -29,7 +29,7 @@
 #include <sys/time.h>
 #if _SAMBA_BUILD_ == 4
 #include "../lib/util/util.h" /* for discard_const */
-#include "lib/charset/charset.h"
+#include "../lib/util/charset/charset.h"
 #endif
 
 /*
diff --git a/source4/Makefile b/source4/Makefile
index 26cab668c8..be41d02a38 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -59,7 +59,7 @@ authsrcdir := auth
 nsswitchsrcdir := nsswitch
 libsrcdir := lib
 libsocketsrcdir := lib/socket
-libcharsetsrcdir := lib/charset
+libcharsetsrcdir := ../lib/util/charset
 ldb_sambasrcdir := lib/ldb-samba
 tdbsrcdir := ../lib/tdb
 ldbsrcdir := lib/ldb
diff --git a/source4/configure.ac b/source4/configure.ac
index 9d387fcb4c..cf85b13225 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -22,7 +22,7 @@ m4_include(../lib/util/xattr.m4)
 m4_include(../lib/util/capability.m4)
 m4_include(../lib/util/time.m4)
 m4_include(../lib/popt/samba.m4)
-m4_include(lib/charset/config.m4)
+m4_include(../lib/util/charset/config.m4)
 m4_include(lib/socket/config.m4)
 m4_include(../lib/zlib/zlib.m4)
 AC_ZLIB([
diff --git a/source4/dsdb/schema/schema_syntax.c b/source4/dsdb/schema/schema_syntax.c
index 97cd0020a9..b0018c8161 100644
--- a/source4/dsdb/schema/schema_syntax.c
+++ b/source4/dsdb/schema/schema_syntax.c
@@ -25,7 +25,7 @@
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
-#include "lib/charset/charset.h"
+#include "../lib/util/charset/charset.h"
 #include "librpc/ndr/libndr.h"
 #include "param/param.h"
 
diff --git a/source4/lib/tdr/tdr.h b/source4/lib/tdr/tdr.h
index 301cd3002e..c983cd35c1 100644
--- a/source4/lib/tdr/tdr.h
+++ b/source4/lib/tdr/tdr.h
@@ -21,7 +21,7 @@
 #define __TDR_H__
 
 #include <talloc.h>
-#include "charset/charset.h"
+#include "../lib/util/charset/charset.h"
 
 #define TDR_BIG_ENDIAN			0x01
 #define TDR_ALIGN2			0x02
diff --git a/source4/main.mk b/source4/main.mk
index 8ce86b91ca..278c38454d 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -9,7 +9,7 @@ mkinclude auth/config.mk
 mkinclude nsswitch/config.mk
 mkinclude lib/samba3/config.mk
 mkinclude lib/socket/config.mk
-mkinclude lib/charset/config.mk
+mkinclude ../lib/util/charset/config.mk
 mkinclude lib/ldb-samba/config.mk
 mkinclude lib/tls/config.mk
 mkinclude lib/registry/config.mk
diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index 9ea212dfa5..def391ba4e 100644
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -19,7 +19,7 @@ PRIVATE_DEPENDENCIES = \
 #################################
 
 TORTURE_LOCAL_OBJ_FILES = \
-		$(torturesrcdir)/../lib/charset/tests/iconv.o \
+		$(torturesrcdir)/../../lib/util/charset/tests/iconv.o \
 		$(torturesrcdir)/../../lib/talloc/testsuite.o \
 		$(torturesrcdir)/../../lib/replace/test/getifaddrs.o \
 		$(torturesrcdir)/../../lib/replace/test/os2_delete.o \
@@ -39,7 +39,7 @@ TORTURE_LOCAL_OBJ_FILES = \
 		$(torturesrcdir)/../../lib/util/tests/file.o \
 		$(torturesrcdir)/../../lib/util/tests/genrand.o \
 		$(torturesrcdir)/../../lib/compression/testsuite.o \
-		$(torturesrcdir)/../lib/charset/tests/charset.o \
+		$(torturesrcdir)/../../lib/util/charset/tests/charset.o \
 		$(torturesrcdir)/../libcli/security/tests/sddl.o \
 		$(torturesrcdir)/../lib/tdr/testsuite.o \
 		$(torturesrcdir)/../lib/events/testsuite.o \