diff --git a/CHANGES b/CHANGES
index f18aa3db..2e9c0de0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+September 22, 2011
+* [mickael] WIP: fix build compilation error with windows platform about event_mgr management. 
+
 September 21, 2011
 + [mickael] WIP: clean the j2k_dump application and the lib regards to the event management
 + [mickael] Enhance the support of endianess with cmake and inside the code (credit to Winfried) 
diff --git a/libopenjpeg/event.c b/libopenjpeg/event.c
index 6346e39d..7deb023b 100644
--- a/libopenjpeg/event.c
+++ b/libopenjpeg/event.c
@@ -169,7 +169,7 @@ opj_bool opj_event_msg_v2(opj_event_mgr_t* event_mgr, int event_type, const char
 }
 
 /* ----------------------------------------------------------------------- */
-void opj_set_default_event_handler(opj_event_mgr_t * p_manager, opj_bool verbose)
+void OPJ_CALLCONV opj_set_default_event_handler(opj_event_mgr_t * p_manager, opj_bool verbose)
 {
 	p_manager->client_data = NULL;
 	p_manager->error_handler = opj_error_default_callback;
diff --git a/libopenjpeg/event.h b/libopenjpeg/event.h
index 2c80276e..e8e0a751 100644
--- a/libopenjpeg/event.h
+++ b/libopenjpeg/event.h
@@ -48,19 +48,10 @@ Write formatted data to a string and send the string to a user callback.
 @param event_type Event type or callback to use to send the message
 @param fmt Format-control string (plus optional arguments)
 @return Returns true if successful, returns false otherwise
-* FIXME Change by its v2 version this function after ended the merge (perhaps remove to the exported function)
+* FIXME Change by its v2 version this function after ended the merge 
 */
 opj_bool opj_event_msg(opj_common_ptr cinfo, int event_type, const char *fmt, ...);
 
-/**
- * Set the default event handler. This function set the output of message event to be stderr for warning and error output
- * and stdout for info output. It is optional, you can set your own event handler or provide a null structure to the
- * opj_setup_decoder function. In this last case no output will be displayed.
- *
- * @param	p_manager		a opj_event_mgr structure which will be pass to the codec.
- */
-void opj_set_default_event_handler(opj_event_mgr_t * p_manager, opj_bool verbose);
-
 /* ----------------------------------------------------------------------- */
 /*@}*/
 
diff --git a/libopenjpeg/openjpeg.h b/libopenjpeg/openjpeg.h
index 55b8c83a..13cc1568 100644
--- a/libopenjpeg/openjpeg.h
+++ b/libopenjpeg/openjpeg.h
@@ -1179,6 +1179,10 @@ OPJ_API opj_stream_t* OPJ_CALLCONV opj_stream_create_file_stream (FILE * p_file,
 ==========================================================
 */
 
+/**
+ * FIXME DOC 
+ * FIXME Need to adapt this function to the V2 framework
+ */
 OPJ_API opj_event_mgr_t* OPJ_CALLCONV opj_set_event_mgr(opj_common_ptr cinfo, opj_event_mgr_t *event_mgr, void *context);
 
 /**