11 files changed, 22 insertions, 11 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index f8f1086396..19ea9f6580 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -130,7 +130,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM ldb
 [LIBRARY::ldb]
 VERSION = 0.0.1
-SO_VERSION = 0.0.1
+SO_VERSION = 0
 DESCRIPTION = LDAP-like embedded database library
 INIT_FUNCTION_TYPE = int (*) (void)
 OBJ_FILES = \
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 02071d721b..13700939cb 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -84,7 +84,7 @@ REQUIRED_SUBSYSTEMS = \
 # Start SUBSYSTEM registry
 [LIBRARY::registry]
 VERSION = 0.0.1
-SO_VERSION = 0.0.1
+SO_VERSION = 0
 DESCRIPTION = Windows-style registry library
 OBJ_FILES = \
 		common/reg_interface.o \
diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk
index 9411f12913..5ec76c1339 100644
--- a/source4/lib/samba3/config.mk
+++ b/source4/lib/samba3/config.mk
@@ -2,7 +2,7 @@
 # Start SUBSYSTEM LIBSAMBA3
 [LIBRARY::LIBSAMBA3]
 VERSION = 0.0.1
-SO_VERSION = 0.0.1
+SO_VERSION = 0
 DESCRIPTION = Library for reading Samba3 data files
 PRIVATE_PROTO_HEADER = samba3_proto.h
 PUBLIC_HEADERS = samba3.h
diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index fd2fc92b31..baa11b4675 100644
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -2,7 +2,7 @@
 # Start SUBSYSTEM SOCKET_WRAPPER
 [LIBRARY::SOCKET_WRAPPER]
 VERSION = 0.0.1
-SO_VERSION = 0.0.1
+SO_VERSION = 0
 DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
 PUBLIC_HEADERS = socket_wrapper.h
 OBJ_FILES = socket_wrapper.o
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 86a6f4bd56..95d3ac359d 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -2,7 +2,7 @@
 # Start LIBRARY LIBTALLOC
 [LIBRARY::LIBTALLOC]
 VERSION = 0.0.1
-SO_VERSION = 0.0.1
+SO_VERSION = 0
 OBJ_FILES = talloc.o
 REQUIRED_SUBSYSTEMS = LIBREPLACE
 MANPAGE = talloc.3
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 8eb127f8ae..82119d04ca 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -2,7 +2,7 @@
 # Start SUBSYSTEM LIBTDB
 [LIBRARY::LIBTDB]
 VERSION = 0.0.1
-SO_VERSION = 0.0.1
+SO_VERSION = 0
 DESCRIPTION = Trivial Database Library
 OBJ_FILES = \
 	common/tdb.o common/dump.o common/io.o common/lock.o \
diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk
index 4160ad1ce9..7ecbab35d1 100644
--- a/source4/lib/tdr/config.mk
+++ b/source4/lib/tdr/config.mk
@@ -1,7 +1,7 @@
 [LIBRARY::TDR]
 PUBLIC_HEADERS = tdr.h
 VERSION = 0.0.1
-SO_VERSION = 0.0.1
+SO_VERSION = 0
 DESCRIPTION = Simple marshall/unmarshall library
 PUBLIC_PROTO_HEADER = tdr_proto.h
 OBJ_FILES = tdr.o
diff --git a/source4/lib/tdr/tdr.c b/source4/lib/tdr/tdr.c
index cd1650e30d..e108473708 100644
--- a/source4/lib/tdr/tdr.c
+++ b/source4/lib/tdr/tdr.c
@@ -129,7 +129,7 @@ NTSTATUS tdr_print_uint32(struct tdr_print *tdr, const char *name, uint32_t *v)
 	return NT_STATUS_OK;
 }
 
-NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, int chset)
+NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
 {
 	int ret;
 
@@ -165,7 +165,7 @@ NTSTATUS tdr_pull_charset(struct tdr_pull *tdr, TALLOC_CTX *ctx, const char **v,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, int chset)
+NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
 {
 	ssize_t ret, required;
 
@@ -192,7 +192,7 @@ NTSTATUS tdr_push_charset(struct tdr_push *tdr, const char **v, uint32_t length,
 	return NT_STATUS_OK;
 }
 
-NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, int chset)
+NTSTATUS tdr_print_charset(struct tdr_print *tdr, const char *name, const char **v, uint32_t length, uint32_t el_size, charset_t chset)
 {
 	tdr->print(tdr, "%-25s: %s", name, *v);
 	return NT_STATUS_OK;
diff --git a/source4/lib/tdr/tdr.h b/source4/lib/tdr/tdr.h
index 8ca6717cee..4c0280d9d6 100644
--- a/source4/lib/tdr/tdr.h
+++ b/source4/lib/tdr/tdr.h
@@ -18,6 +18,13 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef __TDR_H__
+#define __TDR_H__
+
+#include "core.h"
+#include "lib/talloc/talloc.h"
+#include "charset/charset.h"
+
 #define TDR_BIG_ENDIAN			0x01
 #define TDR_ALIGN2			0x02
 #define TDR_ALIGN4			0x04
@@ -56,3 +63,5 @@ typedef NTSTATUS (*tdr_push_fn_t) (struct tdr_push *, const void *);
 typedef NTSTATUS (*tdr_pull_fn_t) (struct tdr_pull *, TALLOC_CTX *, void *);
 
 #include "tdr/tdr_proto.h"
+
+#endif /* __TDR_H__ */
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index e4a3784a91..a0eabaaf31 100644
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -1,6 +1,6 @@
 [LIBRARY::LIBBASIC]
 VERSION = 0.0.1
-SO_VERSION = 0.0.1
+SO_VERSION = 0
 DESCRIPTION = Generic utility functions
 PUBLIC_PROTO_HEADER = util_proto.h
 PUBLIC_HEADERS = util.h \
diff --git a/source4/lib/util/util.h b/source4/lib/util/util.h
index e0255c692c..60cba737a9 100644
--- a/source4/lib/util/util.h
+++ b/source4/lib/util/util.h
@@ -24,6 +24,8 @@
 #ifndef _SAMBA_UTIL_H_
 #define _SAMBA_UTIL_H_
 
+#include "charset/charset.h"
+
 /**
  * @file
  * @brief Helpful macros