diff --git a/lib/gssapi/gssapi/gssapi.h b/lib/gssapi/gssapi/gssapi.h
index 671ce457f..8aa3e10fc 100644
--- a/lib/gssapi/gssapi/gssapi.h
+++ b/lib/gssapi/gssapi/gssapi.h
@@ -780,7 +780,7 @@ gss_wrap_iov(OM_uint32 * /* minor_status */,
 	     int /* conf_req_flag */,
 	     gss_qop_t /* qop_req */,
 	     int * /* conf_state */,
-	     size_t /* iov_count */,
+	     int /* iov_count */,
 	     gss_iov_buffer_desc * /*iov */);
 
 OM_uint32 GSSAPI_LIB_FUNCTION
@@ -788,7 +788,7 @@ gss_unwrap_iov(OM_uint32 * /* minor_status */,
 	       gss_ctx_id_t /* context_handle */,
 	       int * /* conf_state */,
 	       gss_qop_t * /* qop_state */,
-	       size_t /* iov_count */,
+	       int /* iov_count */,
 	       gss_iov_buffer_desc * /* iov */);
     
 OM_uint32  GSSAPI_LIB_FUNCTION
@@ -796,12 +796,12 @@ gss_wrap_iov_length(OM_uint32 * /* minor_status */,
 		    gss_ctx_id_t /* context_handle */,
 		    int /* conf_req_flag */,
 		    gss_qop_t /* qop_req */,
-		    size_t /* iov_count */,
+		    int /* iov_count */,
 		    gss_iov_buffer_desc * /* iov */);
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_release_iov_buffer(OM_uint32 * /* minor_status */,
-		       size_t /* iov_count */,
+		       int /* iov_count */,
 		       gss_iov_buffer_desc * /* iov */);
 
 /*
diff --git a/lib/gssapi/gssapi_mech.h b/lib/gssapi/gssapi_mech.h
index 8680aa21a..4e19125fe 100644
--- a/lib/gssapi/gssapi_mech.h
+++ b/lib/gssapi/gssapi_mech.h
@@ -313,23 +313,23 @@ _gss_wrap_iov_t(OM_uint32 *minor_status,
 		int conf_req_flag,
 		gss_qop_t qop_req,
 		int * conf_state,
-		size_t iov_count,
+		int iov_count,
 		gss_iov_buffer_desc *iov);
 
 typedef OM_uint32
 _gss_unwrap_iov_t(OM_uint32 *minor_status,
-	       gss_ctx_id_t context_handle,
-	       int *conf_state,
-	       gss_qop_t *qop_state,
-	       size_t iov_count,
-	       gss_iov_buffer_desc *iov);
+		  gss_ctx_id_t context_handle,
+		  int *conf_state,
+		  gss_qop_t *qop_state,
+		  int iov_count,
+		  gss_iov_buffer_desc *iov);
 
 typedef OM_uint32
 _gss_wrap_iov_length_t(OM_uint32 * minor_status,
 		       gss_ctx_id_t context_handle,
 		       int conf_req_flag,
 		       gss_qop_t qop_req,
-		       size_t iov_count,
+		       int iov_count,
 		       gss_iov_buffer_desc *iov);
 
 
diff --git a/lib/gssapi/krb5/aeap.c b/lib/gssapi/krb5/aeap.c
index 65392e9ae..9000554cb 100644
--- a/lib/gssapi/krb5/aeap.c
+++ b/lib/gssapi/krb5/aeap.c
@@ -36,7 +36,7 @@
 #include <roken.h>
 
 static OM_uint32
-iov_allocate(OM_uint32 *minor_status, gss_iov_buffer_desc *iov, size_t iov_count)
+iov_allocate(OM_uint32 *minor_status, gss_iov_buffer_desc *iov, int iov_count)
 {
     unsigned int i;
     
@@ -54,7 +54,7 @@ iov_allocate(OM_uint32 *minor_status, gss_iov_buffer_desc *iov, size_t iov_count
 }
 
 static OM_uint32
-iov_map(OM_uint32 *minor_status, size_t iov_count,
+iov_map(OM_uint32 *minor_status, int iov_count,
 	const gss_iov_buffer_desc *iov,
 	krb5_crypto_iov *data)
 {
@@ -99,7 +99,7 @@ _gk_wrap_iov(OM_uint32 * minor_status,
 	     int conf_req_flag,
 	     gss_qop_t qop_req,
 	     int * conf_state,
-	     size_t iov_count,
+	     int iov_count,
 	     gss_iov_buffer_desc *iov)
 {
     gsskrb5_ctx ctx = (gsskrb5_ctx) context_handle;
@@ -152,7 +152,7 @@ _gk_unwrap_iov(OM_uint32 *minor_status,
 	       gss_ctx_id_t context_handle,
 	       int *conf_state,
 	       gss_qop_t *qop_state,
-	       size_t iov_count,
+	       int iov_count,
 	       gss_iov_buffer_desc *iov)
 {
     gsskrb5_ctx ctx = (gsskrb5_ctx) context_handle;
@@ -205,7 +205,7 @@ _gk_wrap_iov_length(OM_uint32 * minor_status,
 		    gss_ctx_id_t context_handle,
 		    int conf_req_flag,
 		    gss_qop_t qop_req,
-		    size_t iov_count,
+		    int iov_count,
 		    gss_iov_buffer_desc *iov)
 {
     krb5_context context;
diff --git a/lib/gssapi/mech/gss_aeap.c b/lib/gssapi/mech/gss_aeap.c
index 0887ebbee..bd537b9c0 100644
--- a/lib/gssapi/mech/gss_aeap.c
+++ b/lib/gssapi/mech/gss_aeap.c
@@ -11,7 +11,7 @@ gss_wrap_iov(OM_uint32 * minor_status,
 	     int conf_req_flag,
 	     gss_qop_t qop_req,
 	     int * conf_state,
-	     size_t iov_count,
+	     int iov_count,
 	     gss_iov_buffer_desc *iov)
 {
 	struct _gss_context *ctx = (struct _gss_context *) context_handle;
@@ -37,7 +37,7 @@ gss_unwrap_iov(OM_uint32 *minor_status,
 	       gss_ctx_id_t context_handle,
 	       int *conf_state,
 	       gss_qop_t *qop_state,
-	       size_t iov_count,
+	       int iov_count,
 	       gss_iov_buffer_desc *iov)
 {
 	struct _gss_context *ctx = (struct _gss_context *) context_handle;
@@ -65,7 +65,7 @@ gss_wrap_iov_length(OM_uint32 * minor_status,
 		    gss_ctx_id_t context_handle,
 		    int conf_req_flag,
 		    gss_qop_t qop_req,
-		    size_t iov_count,
+		    int iov_count,
 		    gss_iov_buffer_desc *iov)
 {
 	struct _gss_context *ctx = (struct _gss_context *) context_handle;
@@ -86,7 +86,7 @@ gss_wrap_iov_length(OM_uint32 * minor_status,
 
 OM_uint32 GSSAPI_LIB_FUNCTION
 gss_release_iov_buffer(OM_uint32 *minor_status,
-		       size_t  iov_count,
+		       int iov_count,
 		       gss_iov_buffer_desc *iov)
 {
     OM_uint32 junk;