diff --git a/libopenjpeg/j2k.c b/libopenjpeg/j2k.c
index 482e6c2f..ae27be4b 100644
--- a/libopenjpeg/j2k.c
+++ b/libopenjpeg/j2k.c
@@ -559,12 +559,10 @@ static OPJ_UINT32 j2k_get_max_coc_size(opj_j2k_v2_t *p_j2k);
  * @param	p_header_size	the size of the data contained in the COC marker.
  * @param	p_manager		the user event manager.
 */
-static opj_bool j2k_read_coc_v2 (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					);
+static opj_bool opj_j2k_read_coc (  opj_j2k_v2_t *p_j2k,
+                                    OPJ_BYTE * p_header_data,
+                                    OPJ_UINT32 p_header_size,
+                                    opj_event_mgr_t * p_manager );
 
 /**
 Write the value concerning the specified component in the marker QCD and QCC
@@ -1436,7 +1434,7 @@ const opj_dec_memory_marker_handler_t j2k_memory_marker_handler_tab [] =
 #endif
   {J2K_MS_SOT, J2K_STATE_MH | J2K_STATE_TPHSOT, opj_j2k_read_sot},
   {J2K_MS_COD, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_cod},
-  {J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_coc_v2},
+  {J2K_MS_COC, J2K_STATE_MH | J2K_STATE_TPH, opj_j2k_read_coc},
   {J2K_MS_RGN, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_rgn_v2},
   {J2K_MS_QCD, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcd_v2},
   {J2K_MS_QCC, J2K_STATE_MH | J2K_STATE_TPH, j2k_read_qcc_v2},
@@ -3108,12 +3106,11 @@ OPJ_UINT32 j2k_get_max_coc_size(opj_j2k_v2_t *p_j2k)
  * @param	p_header_size	the size of the data contained in the COC marker.
  * @param	p_manager		the user event manager.
 */
-opj_bool j2k_read_coc_v2 (
-					opj_j2k_v2_t *p_j2k,
-					OPJ_BYTE * p_header_data,
-					OPJ_UINT32 p_header_size,
-					struct opj_event_mgr * p_manager
-					)
+static opj_bool opj_j2k_read_coc (  opj_j2k_v2_t *p_j2k,
+                                    OPJ_BYTE * p_header_data,
+                                    OPJ_UINT32 p_header_size,
+                                    opj_event_mgr_t * p_manager 
+                                    )
 {
 	opj_cp_v2_t *l_cp = NULL;
 	opj_tcp_v2_t *l_tcp = NULL;