7 files changed, 7 insertions, 7 deletions
diff --git a/lib/async_req/async_sock.c b/lib/async_req/async_sock.c
index 3c68a1c4de..545d21378f 100644
--- a/lib/async_req/async_sock.c
+++ b/lib/async_req/async_sock.c
@@ -30,7 +30,7 @@
 
 /* Note: lib/util/ is currently GPL */
 #include "lib/util/tevent_unix.h"
-#include "lib/util/util.h"
+#include "lib/util/samba_util.h"
 
 #ifndef TALLOC_FREE
 #define TALLOC_FREE(ctx) do { talloc_free(ctx); ctx=NULL; } while(0)
diff --git a/lib/crypto/hmacmd5test.c b/lib/crypto/hmacmd5test.c
index a6621a6e13..a951409cad 100644
--- a/lib/crypto/hmacmd5test.c
+++ b/lib/crypto/hmacmd5test.c
@@ -17,7 +17,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "replace.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;
diff --git a/lib/crypto/md4test.c b/lib/crypto/md4test.c
index 7516e826ab..4ee05c1f8b 100644
--- a/lib/crypto/md4test.c
+++ b/lib/crypto/md4test.c
@@ -18,7 +18,7 @@
 */
 
 #include "replace.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;
diff --git a/lib/crypto/md5test.c b/lib/crypto/md5test.c
index 0457d4d4ea..38e65317ff 100644
--- a/lib/crypto/md5test.c
+++ b/lib/crypto/md5test.c
@@ -18,7 +18,7 @@
 */
 
 #include "replace.h"
-#include "../lib/util/util.h"
+#include "../lib/util/samba_util.h"
 #include "../lib/crypto/crypto.h"
 
 struct torture_context;
diff --git a/lib/util/rfc1738.c b/lib/util/rfc1738.c
index b45310a34b..c8f0472541 100644
--- a/lib/util/rfc1738.c
+++ b/lib/util/rfc1738.c
@@ -50,7 +50,7 @@
 
 #include "includes.h"
 
-#include "util.h"
+#include "lib/util/samba_util.h"
 
 /*
  *  RFC 1738 defines that these characters should be escaped, as well
diff --git a/lib/util/util.h b/lib/util/samba_util.h
index 9a76fa9f04..9a76fa9f04 100644
--- a/lib/util/util.h
+++ b/lib/util/samba_util.h
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 553748a22e..70a639d2d7 100755
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -10,8 +10,8 @@ bld.SAMBA_LIBRARY('samba-util',
                     server_id.c dprintf.c parmlist.c bitmap.c''',
                   deps='DYNCONFIG',
                   public_deps='talloc execinfo uid_wrapper pthread LIBCRYPTO charset',
-                  public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h util.h string_wrappers.h',
-                  header_path= [ ('dlinklist.h util.h', '.'), ('*', 'util') ],
+                  public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h xfile.h dlinklist.h samba_util.h string_wrappers.h',
+                  header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
                   local_include=False,
                   vnum='0.0.1',
                   pc_files='samba-util.pc'