diff --git a/source3/client/client.c b/source3/client/client.c
index 4f24f3761db..fde5b49ebe5 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -360,7 +360,7 @@ static int do_cd(const char *new_dir)
 	char *targetpath = NULL;
 	struct cli_state *targetcli = NULL;
 	SMB_STRUCT_STAT sbuf;
-	uint32 attributes;
+	uint32_t attributes;
 	int ret = 1;
 	TALLOC_CTX *ctx = talloc_stackframe();
 	NTSTATUS status;
@@ -813,7 +813,7 @@ static NTSTATUS do_list_helper(const char *mntpoint, struct file_info *f,
 ****************************************************************************/
 
 NTSTATUS do_list(const char *mask,
-			uint16 attribute,
+			uint16_t attribute,
 			NTSTATUS (*fn)(struct cli_state *cli_state, struct file_info *,
 				   const char *dir),
 			bool rec,
@@ -929,7 +929,7 @@ NTSTATUS do_list(const char *mask,
 static int cmd_dir(void)
 {
 	TALLOC_CTX *ctx = talloc_tos();
-	uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
+	uint16_t attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
 	char *mask = NULL;
 	char *buf = NULL;
 	int rc = 1;
@@ -979,7 +979,7 @@ static int cmd_dir(void)
 static int cmd_du(void)
 {
 	TALLOC_CTX *ctx = talloc_tos();
-	uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
+	uint16_t attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
 	char *mask = NULL;
 	char *buf = NULL;
 	NTSTATUS status;
@@ -1063,7 +1063,7 @@ static int do_get(const char *rname, const char *lname_in, bool reget)
 	uint16_t fnum;
 	bool newhandle = false;
 	struct timespec tp_start;
-	uint16 attr;
+	uint16_t attr;
 	off_t size;
 	off_t start = 0;
 	off_t nread = 0;
@@ -1158,7 +1158,7 @@ static int do_get(const char *rname, const char *lname_in, bool reget)
 	}
 
 	if (archive_level >= 2 && (attr & FILE_ATTRIBUTE_ARCHIVE)) {
-		cli_setatr(cli, rname, attr & ~(uint16)FILE_ATTRIBUTE_ARCHIVE, 0);
+		cli_setatr(cli, rname, attr & ~(uint16_t)FILE_ATTRIBUTE_ARCHIVE, 0);
 	}
 
 	{
@@ -1419,7 +1419,7 @@ static int cmd_more(void)
 static int cmd_mget(void)
 {
 	TALLOC_CTX *ctx = talloc_tos();
-	uint16 attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
+	uint16_t attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
 	char *mget_mask = NULL;
 	char *buf = NULL;
 	NTSTATUS status = NT_STATUS_OK;
@@ -2390,7 +2390,7 @@ static int cmd_del(void)
 	char *mask = NULL;
 	char *buf = NULL;
 	NTSTATUS status = NT_STATUS_OK;
-	uint16 attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
+	uint16_t attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN;
 
 	if (recurse) {
 		attribute |= FILE_ATTRIBUTE_DIRECTORY;
@@ -2425,7 +2425,7 @@ static int cmd_wdel(void)
 	TALLOC_CTX *ctx = talloc_tos();
 	char *mask = NULL;
 	char *buf = NULL;
-	uint16 attribute;
+	uint16_t attribute;
 	struct cli_state *targetcli;
 	char *targetname = NULL;
 	NTSTATUS status;
@@ -2435,7 +2435,7 @@ static int cmd_wdel(void)
 		return 1;
 	}
 
-	attribute = (uint16)strtol(buf, (char **)NULL, 16);
+	attribute = (uint16_t)strtol(buf, (char **)NULL, 16);
 
 	if (!next_token_talloc(ctx, &cmd_ptr,&buf,NULL)) {
 		d_printf("wdel 0x<attrib> <wcard>\n");
@@ -2767,8 +2767,8 @@ static int cmd_close(void)
 static int cmd_posix(void)
 {
 	TALLOC_CTX *ctx = talloc_tos();
-	uint16 major, minor;
-	uint32 caplow, caphigh;
+	uint16_t major, minor;
+	uint32_t caplow, caphigh;
 	char *caps;
 	NTSTATUS status;
 
@@ -3321,14 +3321,14 @@ static int cmd_getfacl(void)
 	char *name = NULL;
 	char *targetname = NULL;
 	struct cli_state *targetcli;
-	uint16 major, minor;
-	uint32 caplow, caphigh;
+	uint16_t major, minor;
+	uint32_t caplow, caphigh;
 	char *retbuf = NULL;
 	size_t rb_size = 0;
 	SMB_STRUCT_STAT sbuf;
-	uint16 num_file_acls = 0;
-	uint16 num_dir_acls = 0;
-	uint16 i;
+	uint16_t num_file_acls = 0;
+	uint16_t num_dir_acls = 0;
+	uint16_t i;
 	NTSTATUS status;
 
 	if (!next_token_talloc(ctx, &cmd_ptr,&name,NULL)) {
@@ -3408,7 +3408,7 @@ static int cmd_getfacl(void)
 	}
 
 	for (i = 0; i < num_file_acls; i++) {
-		uint32 uorg;
+		uint32_t uorg;
 		fstring permstring;
 		unsigned char tagtype = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+(i*SMB_POSIX_ACL_ENTRY_SIZE));
 		unsigned char perms = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+(i*SMB_POSIX_ACL_ENTRY_SIZE)+1);
@@ -3445,7 +3445,7 @@ static int cmd_getfacl(void)
 	}
 
 	for (i = 0; i < num_dir_acls; i++) {
-		uint32 uorg;
+		uint32_t uorg;
 		fstring permstring;
 		unsigned char tagtype = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+((i+num_file_acls)*SMB_POSIX_ACL_ENTRY_SIZE));
 		unsigned char perms = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+((i+num_file_acls)*SMB_POSIX_ACL_ENTRY_SIZE)+1);
@@ -4181,7 +4181,7 @@ static int cmd_reput(void)
  List a share name.
  ****************************************************************************/
 
-static void browse_fn(const char *name, uint32 m,
+static void browse_fn(const char *name, uint32_t m,
                       const char *comment, void *state)
 {
 	const char *typestr = "";
@@ -4295,7 +4295,7 @@ static bool browse_host(bool sort)
  List a server name.
 ****************************************************************************/
 
-static void server_fn(const char *name, uint32 m,
+static void server_fn(const char *name, uint32_t m,
                       const char *comment, void *state)
 {
 
diff --git a/source3/client/client_proto.h b/source3/client/client_proto.h
index 3e91ff0fb35..86f1d186492 100644
--- a/source3/client/client_proto.h
+++ b/source3/client/client_proto.h
@@ -31,7 +31,7 @@ struct file_info;
 const char *client_get_cur_dir(void);
 const char *client_set_cur_dir(const char *newdir);
 NTSTATUS do_list(const char *mask,
-			uint16 attribute,
+			uint16_t attribute,
 			NTSTATUS (*fn)(struct cli_state *cli_state, struct file_info *,
 				   const char *dir),
 			bool rec,
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index e4d391a16fc..55618454142 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -216,7 +216,7 @@ static int make_remote_path(const char *full_path);
 static int max_token (const char *str);
 static NTSTATUS is_subpath(const char *sub, const char *full,
 			   bool *_subpath_match);
-static int set_remote_attr(const char *filename, uint16 new_attr, int mode);
+static int set_remote_attr(const char *filename, uint16_t new_attr, int mode);
 
 /**
  * tar_get_ctx - retrieve global tar context handle
@@ -394,7 +394,7 @@ int cmd_setmode(void)
 	const extern char *cmd_ptr;
 	char *buf;
 	char *fname = NULL;
-	uint16 attr[2] = {0};
+	uint16_t attr[2] = {0};
 	int mode = ATTR_SET;
 	int err = 0;
 	bool ok;
@@ -1639,10 +1639,10 @@ out:
  *
  * Update the file attributes with the one provided.
  */
-static int set_remote_attr(const char *filename, uint16 new_attr, int mode)
+static int set_remote_attr(const char *filename, uint16_t new_attr, int mode)
 {
 	extern struct cli_state *cli;
-	uint16 old_attr;
+	uint16_t old_attr;
 	NTSTATUS status;
 
 	status = cli_getatr(cli, filename, &old_attr, NULL, NULL);
diff --git a/source3/client/tree.c b/source3/client/tree.c
index e0b8c91949a..0e51f6105b9 100644
--- a/source3/client/tree.c
+++ b/source3/client/tree.c
@@ -30,7 +30,7 @@ static GtkWidget *clist;
 
 struct tree_data {
 
-  guint32 type;    /* Type of tree item, an SMBC_TYPE */
+  guint32_t type;    /* Type of tree item, an SMBC_TYPE */
   char name[256];  /* May need to change this later   */
 
 };
@@ -128,7 +128,7 @@ char *get_path(TALLOC_CTX *ctx, GtkWidget *item)
 
 }
 
-struct tree_data *make_tree_data(guint32 type, const char *name)
+struct tree_data *make_tree_data(guint32_t type, const char *name)
 {
   struct tree_data *p = SMB_MALLOC_P(struct tree_data);
 
diff --git a/source3/include/client.h b/source3/include/client.h
index 25c44ba64db..0024c04a5ad 100644
--- a/source3/include/client.h
+++ b/source3/include/client.h
@@ -32,8 +32,8 @@
  */
 
 struct print_job_info {
-	uint16 id;
-	uint16 priority;
+	uint16_t id;
+	uint16_t priority;
 	size_t size;
 	fstring user;
 	fstring name;
@@ -106,7 +106,7 @@ struct cli_state {
 
 struct file_info {
 	uint64_t size;
-	uint16 mode;
+	uint16_t mode;
 	uid_t uid;
 	gid_t gid;
 	/* these times are normally kept in GMT */