diff --git a/source/include/vfs.h b/source/include/vfs.h
index 768c9fbcabb..a5fe4afe6a8 100644
--- a/source/include/vfs.h
+++ b/source/include/vfs.h
@@ -296,7 +296,7 @@ struct vfs_ops {
 							  void *private_data,
 							  struct notify_event *ev),
 					 void *private_data, void *handle_p);
-		int (*chflags)(struct vfs_handle_struct *handle, const char *path, uint flags);
+		int (*chflags)(struct vfs_handle_struct *handle, const char *path, unsigned int flags);
 		struct file_id (*file_id_create)(struct vfs_handle_struct *handle, SMB_DEV_T dev, SMB_INO_T inode);
 
 		/* NT ACL operations. */
diff --git a/source/modules/vfs_aixacl.c b/source/modules/vfs_aixacl.c
index 8e0e1589574..a60470ffc95 100644
--- a/source/modules/vfs_aixacl.c
+++ b/source/modules/vfs_aixacl.c
@@ -137,7 +137,7 @@ int aixacl_sys_acl_set_file(vfs_handle_struct *handle,
 			      SMB_ACL_T theacl)
 {
 	struct acl *file_acl = NULL;
-	uint rc;
+	unsigned int rc;
 	
 	file_acl = aixacl_smb_to_aixacl(type, theacl);
 	if (!file_acl)
@@ -157,7 +157,7 @@ int aixacl_sys_acl_set_fd(vfs_handle_struct *handle,
 			    int fd, SMB_ACL_T theacl)
 {
 	struct acl *file_acl = NULL;
-	uint rc;
+	unsigned int rc;
 
 	file_acl = aixacl_smb_to_aixacl(SMB_ACL_TYPE_ACCESS, theacl);
 	if (!file_acl)
diff --git a/source/modules/vfs_aixacl_util.c b/source/modules/vfs_aixacl_util.c
index e1a8eb6fe28..b2329fe9c65 100644
--- a/source/modules/vfs_aixacl_util.c
+++ b/source/modules/vfs_aixacl_util.c
@@ -209,9 +209,9 @@ struct acl *aixacl_smb_to_aixacl(SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
 	struct acl *file_acl_temp = NULL;
 	struct acl_entry *acl_entry = NULL;
 	struct ace_id *ace_id = NULL;
-	uint id_type;
-	uint user_id;
-	uint acl_length;
+	unsigned int id_type;
+	unsigned int user_id;
+	unsigned int acl_length;
 	int	i;
  
 	DEBUG(10,("Entering aixacl_smb_to_aixacl\n"));
diff --git a/source/modules/vfs_full_audit.c b/source/modules/vfs_full_audit.c
index 3e99e526377..18180bf3ef9 100644
--- a/source/modules/vfs_full_audit.c
+++ b/source/modules/vfs_full_audit.c
@@ -183,7 +183,7 @@ static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
 					struct notify_event *ev),
 			void *private_data, void *handle_p);
 static int smb_full_audit_chflags(vfs_handle_struct *handle,
-			    const char *path, uint flags);
+			    const char *path, unsigned int flags);
 static struct file_id smb_full_audit_file_id_create(struct vfs_handle_struct *handle,
 						    SMB_DEV_T dev, SMB_INO_T inode);
 static size_t smb_full_audit_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
@@ -1460,7 +1460,7 @@ static NTSTATUS smb_full_audit_notify_watch(struct vfs_handle_struct *handle,
 }
 
 static int smb_full_audit_chflags(vfs_handle_struct *handle,
-			    const char *path, uint flags)
+			    const char *path, unsigned int flags)
 {
 	int result;
 
diff --git a/source/printing/printing.c b/source/printing/printing.c
index e793651cb6d..868a72cb32d 100644
--- a/source/printing/printing.c
+++ b/source/printing/printing.c
@@ -957,7 +957,7 @@ static void store_queue_struct(struct tdb_print_db *pdb, struct traverse_struct
 	print_queue_struct *queue = pts->queue;
 	size_t len;
 	size_t i;
-	uint qcount;
+	unsigned int qcount;
 
 	if (max_reported_jobs && (max_reported_jobs < pts->qcount))
 		pts->qcount = max_reported_jobs;
diff --git a/source/rpc_parse/parse_spoolss.c b/source/rpc_parse/parse_spoolss.c
index 84304603124..04e760607e8 100644
--- a/source/rpc_parse/parse_spoolss.c
+++ b/source/rpc_parse/parse_spoolss.c
@@ -2405,8 +2405,8 @@ BOOL smb_io_printer_info_3(const char *desc, RPC_BUFFER *buffer, PRINTER_INFO_3
 	
 	if (MARSHALLING(ps)) {
 		/* Ensure the SD is 8 byte aligned in the buffer. */
-		uint start = prs_offset(ps); /* Remember the start position. */
-		uint off_val = 0;
+		uint32 start = prs_offset(ps); /* Remember the start position. */
+		uint32 off_val = 0;
 
 		/* Write a dummy value. */
 		if (!prs_uint32("offset", ps, depth, &off_val))