diff --git a/lib/gssapi/cfx.c b/lib/gssapi/cfx.c
index 3efa19e0c..7a34cd66f 100644
--- a/lib/gssapi/cfx.c
+++ b/lib/gssapi/cfx.c
@@ -93,7 +93,7 @@ wrap_length_cfx(krb5_crypto crypto,
     return 0;
 }
 
-OM_uint32 wrap_size_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_wrap_size_cfx(OM_uint32 *minor_status,
 	    const gss_ctx_id_t context_handle,
 	    int conf_req_flag,
 	    gss_qop_t qop_req,
@@ -172,7 +172,7 @@ static krb5_error_code rrc_rotate(void *data, size_t len, u_int16_t rrc)
     return 0;
 }
 
-OM_uint32 wrap_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_wrap_cfx(OM_uint32 *minor_status,
 	   const gss_ctx_id_t context_handle,
 	   int conf_req_flag,
 	   gss_qop_t qop_req,
@@ -358,7 +358,7 @@ OM_uint32 wrap_cfx(OM_uint32 *minor_status,
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 unwrap_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_unwrap_cfx(OM_uint32 *minor_status,
 	     const gss_ctx_id_t context_handle,
 	     const gss_buffer_t input_message_buffer,
 	     gss_buffer_t output_message_buffer,
@@ -571,7 +571,7 @@ OM_uint32 unwrap_cfx(OM_uint32 *minor_status,
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 mic_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_mic_cfx(OM_uint32 *minor_status,
 	  const gss_ctx_id_t context_handle,
 	  gss_qop_t qop_req,
 	  const gss_buffer_t message_buffer,
@@ -665,7 +665,7 @@ OM_uint32 mic_cfx(OM_uint32 *minor_status,
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 verify_mic_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_verify_mic_cfx(OM_uint32 *minor_status,
 	     const gss_ctx_id_t context_handle,
 	     const gss_buffer_t message_buffer,
 	     const gss_buffer_t token_buffer,
diff --git a/lib/gssapi/cfx.h b/lib/gssapi/cfx.h
index f7c7c3613..ea3fe8d41 100644
--- a/lib/gssapi/cfx.h
+++ b/lib/gssapi/cfx.h
@@ -62,43 +62,43 @@ typedef struct gss_cfx_delete_token_desc_struct {
 	u_char SND_SEQ[8];
 } gss_cfx_delete_token_desc, *gss_cfx_delete_token;
 
-OM_uint32 wrap_size_cfx(OM_uint32 *minor_status,
-			const gss_ctx_id_t context_handle,
-			int conf_req_flag,
-			gss_qop_t qop_req,
-			OM_uint32 req_output_size,
-			OM_uint32 *max_input_size,
-			krb5_keyblock *key);
+OM_uint32 _gssapi_wrap_size_cfx(OM_uint32 *,
+				const gss_ctx_id_t,
+				int,
+				gss_qop_t,
+				OM_uint32,
+				OM_uint32 *,
+				krb5_keyblock *);
 
-OM_uint32 wrap_cfx(OM_uint32 *minor_status,
-		   const gss_ctx_id_t context_handle,
-		   int conf_req_flag,
-		   gss_qop_t qop_req,
-		   const gss_buffer_t input_message_buffer,
-		   int *conf_state,
-		   gss_buffer_t output_message_buffer,
-		   krb5_keyblock *key);
+OM_uint32 _gssapi_wrap_cfx(OM_uint32 *,
+			   const gss_ctx_id_t,
+			   int,
+			   gss_qop_t,
+			   const gss_buffer_t,
+			   int *,
+			   gss_buffer_t,
+			   krb5_keyblock *);
 
-OM_uint32 unwrap_cfx(OM_uint32 *minor_status,
-		     const gss_ctx_id_t context_handle,
-		     const gss_buffer_t input_message_buffer,
-		     gss_buffer_t output_message_buffer,
-		     int *conf_state,
-		     gss_qop_t *qop_state,
-		     krb5_keyblock *key);
+OM_uint32 _gssapi_unwrap_cfx(OM_uint32 *,
+			     const gss_ctx_id_t,
+			     const gss_buffer_t,
+			     gss_buffer_t,
+			     int *,
+			     gss_qop_t *,
+			     krb5_keyblock *);
 
-OM_uint32 mic_cfx(OM_uint32 *minor_status,
-		  const gss_ctx_id_t context_handle,
-		  gss_qop_t qop_req,
-		  const gss_buffer_t message_buffer,
-		  gss_buffer_t message_token,
-		  krb5_keyblock *key);
+OM_uint32 _gssapi_mic_cfx(OM_uint32 *,
+			  const gss_ctx_id_t,
+			  gss_qop_t,
+			  const gss_buffer_t,
+			  gss_buffer_t,
+			  krb5_keyblock *);
 
-OM_uint32 verify_mic_cfx(OM_uint32 *minor_status,
-			 const gss_ctx_id_t context_handle,
-			 const gss_buffer_t message_buffer,
-			 const gss_buffer_t token_buffer,
-			 gss_qop_t *qop_state,
-			 krb5_keyblock *key);
+OM_uint32 _gssapi_verify_mic_cfx(OM_uint32 *,
+				 const gss_ctx_id_t,
+				 const gss_buffer_t,
+				 const gss_buffer_t,
+				 gss_qop_t *,
+				 krb5_keyblock *);
 
 #endif /* GSSAPI_CFX_H_ */
diff --git a/lib/gssapi/get_mic.c b/lib/gssapi/get_mic.c
index ea85bb80a..da99794c0 100644
--- a/lib/gssapi/get_mic.c
+++ b/lib/gssapi/get_mic.c
@@ -293,8 +293,8 @@ OM_uint32 gss_get_mic
       break;
   default :
 #ifdef HAVE_GSSAPI_CFX
-      ret = mic_cfx (minor_status, context_handle, qop_req,
-		     message_buffer, message_token, key);
+      ret = _gssapi_mic_cfx (minor_status, context_handle, qop_req,
+			     message_buffer, message_token, key);
 #else
       *minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
       ret = GSS_S_FAILURE;
diff --git a/lib/gssapi/krb5/cfx.c b/lib/gssapi/krb5/cfx.c
index 3efa19e0c..7a34cd66f 100644
--- a/lib/gssapi/krb5/cfx.c
+++ b/lib/gssapi/krb5/cfx.c
@@ -93,7 +93,7 @@ wrap_length_cfx(krb5_crypto crypto,
     return 0;
 }
 
-OM_uint32 wrap_size_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_wrap_size_cfx(OM_uint32 *minor_status,
 	    const gss_ctx_id_t context_handle,
 	    int conf_req_flag,
 	    gss_qop_t qop_req,
@@ -172,7 +172,7 @@ static krb5_error_code rrc_rotate(void *data, size_t len, u_int16_t rrc)
     return 0;
 }
 
-OM_uint32 wrap_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_wrap_cfx(OM_uint32 *minor_status,
 	   const gss_ctx_id_t context_handle,
 	   int conf_req_flag,
 	   gss_qop_t qop_req,
@@ -358,7 +358,7 @@ OM_uint32 wrap_cfx(OM_uint32 *minor_status,
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 unwrap_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_unwrap_cfx(OM_uint32 *minor_status,
 	     const gss_ctx_id_t context_handle,
 	     const gss_buffer_t input_message_buffer,
 	     gss_buffer_t output_message_buffer,
@@ -571,7 +571,7 @@ OM_uint32 unwrap_cfx(OM_uint32 *minor_status,
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 mic_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_mic_cfx(OM_uint32 *minor_status,
 	  const gss_ctx_id_t context_handle,
 	  gss_qop_t qop_req,
 	  const gss_buffer_t message_buffer,
@@ -665,7 +665,7 @@ OM_uint32 mic_cfx(OM_uint32 *minor_status,
     return GSS_S_COMPLETE;
 }
 
-OM_uint32 verify_mic_cfx(OM_uint32 *minor_status,
+OM_uint32 _gssapi_verify_mic_cfx(OM_uint32 *minor_status,
 	     const gss_ctx_id_t context_handle,
 	     const gss_buffer_t message_buffer,
 	     const gss_buffer_t token_buffer,
diff --git a/lib/gssapi/krb5/cfx.h b/lib/gssapi/krb5/cfx.h
index f7c7c3613..ea3fe8d41 100644
--- a/lib/gssapi/krb5/cfx.h
+++ b/lib/gssapi/krb5/cfx.h
@@ -62,43 +62,43 @@ typedef struct gss_cfx_delete_token_desc_struct {
 	u_char SND_SEQ[8];
 } gss_cfx_delete_token_desc, *gss_cfx_delete_token;
 
-OM_uint32 wrap_size_cfx(OM_uint32 *minor_status,
-			const gss_ctx_id_t context_handle,
-			int conf_req_flag,
-			gss_qop_t qop_req,
-			OM_uint32 req_output_size,
-			OM_uint32 *max_input_size,
-			krb5_keyblock *key);
+OM_uint32 _gssapi_wrap_size_cfx(OM_uint32 *,
+				const gss_ctx_id_t,
+				int,
+				gss_qop_t,
+				OM_uint32,
+				OM_uint32 *,
+				krb5_keyblock *);
 
-OM_uint32 wrap_cfx(OM_uint32 *minor_status,
-		   const gss_ctx_id_t context_handle,
-		   int conf_req_flag,
-		   gss_qop_t qop_req,
-		   const gss_buffer_t input_message_buffer,
-		   int *conf_state,
-		   gss_buffer_t output_message_buffer,
-		   krb5_keyblock *key);
+OM_uint32 _gssapi_wrap_cfx(OM_uint32 *,
+			   const gss_ctx_id_t,
+			   int,
+			   gss_qop_t,
+			   const gss_buffer_t,
+			   int *,
+			   gss_buffer_t,
+			   krb5_keyblock *);
 
-OM_uint32 unwrap_cfx(OM_uint32 *minor_status,
-		     const gss_ctx_id_t context_handle,
-		     const gss_buffer_t input_message_buffer,
-		     gss_buffer_t output_message_buffer,
-		     int *conf_state,
-		     gss_qop_t *qop_state,
-		     krb5_keyblock *key);
+OM_uint32 _gssapi_unwrap_cfx(OM_uint32 *,
+			     const gss_ctx_id_t,
+			     const gss_buffer_t,
+			     gss_buffer_t,
+			     int *,
+			     gss_qop_t *,
+			     krb5_keyblock *);
 
-OM_uint32 mic_cfx(OM_uint32 *minor_status,
-		  const gss_ctx_id_t context_handle,
-		  gss_qop_t qop_req,
-		  const gss_buffer_t message_buffer,
-		  gss_buffer_t message_token,
-		  krb5_keyblock *key);
+OM_uint32 _gssapi_mic_cfx(OM_uint32 *,
+			  const gss_ctx_id_t,
+			  gss_qop_t,
+			  const gss_buffer_t,
+			  gss_buffer_t,
+			  krb5_keyblock *);
 
-OM_uint32 verify_mic_cfx(OM_uint32 *minor_status,
-			 const gss_ctx_id_t context_handle,
-			 const gss_buffer_t message_buffer,
-			 const gss_buffer_t token_buffer,
-			 gss_qop_t *qop_state,
-			 krb5_keyblock *key);
+OM_uint32 _gssapi_verify_mic_cfx(OM_uint32 *,
+				 const gss_ctx_id_t,
+				 const gss_buffer_t,
+				 const gss_buffer_t,
+				 gss_qop_t *,
+				 krb5_keyblock *);
 
 #endif /* GSSAPI_CFX_H_ */
diff --git a/lib/gssapi/krb5/get_mic.c b/lib/gssapi/krb5/get_mic.c
index ea85bb80a..da99794c0 100644
--- a/lib/gssapi/krb5/get_mic.c
+++ b/lib/gssapi/krb5/get_mic.c
@@ -293,8 +293,8 @@ OM_uint32 gss_get_mic
       break;
   default :
 #ifdef HAVE_GSSAPI_CFX
-      ret = mic_cfx (minor_status, context_handle, qop_req,
-		     message_buffer, message_token, key);
+      ret = _gssapi_mic_cfx (minor_status, context_handle, qop_req,
+			     message_buffer, message_token, key);
 #else
       *minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
       ret = GSS_S_FAILURE;
diff --git a/lib/gssapi/krb5/unwrap.c b/lib/gssapi/krb5/unwrap.c
index 6134d61f3..25a593623 100644
--- a/lib/gssapi/krb5/unwrap.c
+++ b/lib/gssapi/krb5/unwrap.c
@@ -428,9 +428,9 @@ OM_uint32 gss_unwrap
       break;
   default :
 #ifdef HAVE_GSSAPI_CFX
-      ret = unwrap_cfx (minor_status, context_handle,
-			input_message_buffer, output_message_buffer,
-			conf_state, qop_state, key);
+      ret = _gssapi_unwrap_cfx (minor_status, context_handle,
+				input_message_buffer, output_message_buffer,
+				conf_state, qop_state, key);
 #else
       *minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
       ret = GSS_S_FAILURE;
diff --git a/lib/gssapi/krb5/verify_mic.c b/lib/gssapi/krb5/verify_mic.c
index 976a3e820..8013876e1 100644
--- a/lib/gssapi/krb5/verify_mic.c
+++ b/lib/gssapi/krb5/verify_mic.c
@@ -304,8 +304,9 @@ gss_verify_mic_internal
 	break;
     default :
 #ifdef HAVE_GSSAPI_CFX
-	ret = verify_mic_cfx (minor_status, context_handle,
-			      message_buffer, token_buffer, qop_state, key);
+	ret = _gssapi_verify_mic_cfx (minor_status, context_handle,
+				      message_buffer, token_buffer, qop_state,
+				      key);
 #else
 	*minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
 	ret = GSS_S_FAILURE;
diff --git a/lib/gssapi/krb5/wrap.c b/lib/gssapi/krb5/wrap.c
index ded439a31..57206d3cf 100644
--- a/lib/gssapi/krb5/wrap.c
+++ b/lib/gssapi/krb5/wrap.c
@@ -467,9 +467,9 @@ OM_uint32 gss_wrap
       break;
   default :
 #ifdef HAVE_GSSAPI_CFX
-      ret = wrap_cfx (minor_status, context_handle, conf_req_flag,
-		      qop_req, input_message_buffer, conf_state,
-		      output_message_buffer, key);
+      ret = _gssapi_wrap_cfx (minor_status, context_handle, conf_req_flag,
+			      qop_req, input_message_buffer, conf_state,
+			      output_message_buffer, key);
 #else
       *minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
       ret = GSS_S_FAILURE;
diff --git a/lib/gssapi/unwrap.c b/lib/gssapi/unwrap.c
index 6134d61f3..25a593623 100644
--- a/lib/gssapi/unwrap.c
+++ b/lib/gssapi/unwrap.c
@@ -428,9 +428,9 @@ OM_uint32 gss_unwrap
       break;
   default :
 #ifdef HAVE_GSSAPI_CFX
-      ret = unwrap_cfx (minor_status, context_handle,
-			input_message_buffer, output_message_buffer,
-			conf_state, qop_state, key);
+      ret = _gssapi_unwrap_cfx (minor_status, context_handle,
+				input_message_buffer, output_message_buffer,
+				conf_state, qop_state, key);
 #else
       *minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
       ret = GSS_S_FAILURE;
diff --git a/lib/gssapi/verify_mic.c b/lib/gssapi/verify_mic.c
index 976a3e820..8013876e1 100644
--- a/lib/gssapi/verify_mic.c
+++ b/lib/gssapi/verify_mic.c
@@ -304,8 +304,9 @@ gss_verify_mic_internal
 	break;
     default :
 #ifdef HAVE_GSSAPI_CFX
-	ret = verify_mic_cfx (minor_status, context_handle,
-			      message_buffer, token_buffer, qop_state, key);
+	ret = _gssapi_verify_mic_cfx (minor_status, context_handle,
+				      message_buffer, token_buffer, qop_state,
+				      key);
 #else
 	*minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
 	ret = GSS_S_FAILURE;
diff --git a/lib/gssapi/wrap.c b/lib/gssapi/wrap.c
index ded439a31..57206d3cf 100644
--- a/lib/gssapi/wrap.c
+++ b/lib/gssapi/wrap.c
@@ -467,9 +467,9 @@ OM_uint32 gss_wrap
       break;
   default :
 #ifdef HAVE_GSSAPI_CFX
-      ret = wrap_cfx (minor_status, context_handle, conf_req_flag,
-		      qop_req, input_message_buffer, conf_state,
-		      output_message_buffer, key);
+      ret = _gssapi_wrap_cfx (minor_status, context_handle, conf_req_flag,
+			      qop_req, input_message_buffer, conf_state,
+			      output_message_buffer, key);
 #else
       *minor_status = (OM_uint32)KRB5_PROG_ETYPE_NOSUPP;
       ret = GSS_S_FAILURE;