diff --git a/Zend/zend.c b/Zend/zend.c
index 8854be62c73..f6a804a2a9f 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -466,12 +466,14 @@ void zend_deactivate(CLS_D ELS_DC)
 }
 
 
+BEGIN_EXTERN_C()
 ZEND_API void zend_message_dispatcher(long message, void *data)
 {
 	if (zend_message_dispatcher_p) {
 		zend_message_dispatcher_p(message, data);
 	}
 }
+END_EXTERN_C()
 
 
 ZEND_API int zend_get_ini_entry(char *name, uint name_length, zval *contents)
diff --git a/Zend/zend.h b/Zend/zend.h
index 3f1474cef51..61041463379 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -298,7 +298,10 @@ END_EXTERN_C()
 #define HANDLE_BLOCK_INTERRUPTIONS()		if (zend_block_interruptions) { zend_block_interruptions(); }
 #define HANDLE_UNBLOCK_INTERRUPTIONS()		if (zend_unblock_interruptions) { zend_unblock_interruptions(); }
 
+BEGIN_EXTERN_C()
 ZEND_API void zend_message_dispatcher(long message, void *data);
+END_EXTERN_C()
+
 ZEND_API int zend_get_ini_entry(char *name, uint name_length, zval *contents);