diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c
index 237854c148d..99fd72225bf 100644
--- a/libcli/util/doserr.c
+++ b/libcli/util/doserr.c
@@ -125,7 +125,7 @@ const char *win_errstr(WERROR werror)
 
 const char *get_friendly_werror_msg(WERROR werror)
 {
-	int i = 0;
+	size_t i = 0;
 
 	for (i = 0; i < ARRAY_SIZE(dos_err_strs); i++) {
 		if (W_ERROR_V(dos_err_strs[i].werror) ==
diff --git a/libcli/util/errmap_unix.c b/libcli/util/errmap_unix.c
index 8f9f89835ed..9ac680919d8 100644
--- a/libcli/util/errmap_unix.c
+++ b/libcli/util/errmap_unix.c
@@ -142,7 +142,7 @@ static const struct {
 *********************************************************************/
 NTSTATUS map_nt_error_from_unix_common(int unix_error)
 {
-	int i;
+	size_t i;
 
 	/* Look through list */
 	for (i=0;i<ARRAY_SIZE(unix_nt_errmap);i++) {
diff --git a/libcli/util/hresult.c b/libcli/util/hresult.c
index 2bea98936f8..0ac116430b4 100644
--- a/libcli/util/hresult.c
+++ b/libcli/util/hresult.c
@@ -14676,7 +14676,7 @@ static const struct {
 const char *hresult_errstr_const(HRESULT err_code)
 {
 	const char *result = NULL;
-	int i;
+	size_t i;
 	for (i = 0; i < ARRAY_SIZE(hresult_errs); ++i) {
 		if (HRES_IS_EQUAL(err_code, hresult_errs[i].error_code)) {
 			result = hresult_errs[i].error_message;
@@ -14694,7 +14694,7 @@ const char *hresult_errstr_const(HRESULT err_code)
 const char *hresult_errstr(HRESULT err_code)
 {
 	static char msg[22];
-	int i;
+	size_t i;
 
 	for (i = 0; i < ARRAY_SIZE(hresult_errs); i++) {
 		if (HRES_IS_EQUAL(err_code, hresult_errs[i].error_code)) {