diff --git a/src/include/switch.h b/src/include/switch.h
index a144a13163..27087bc261 100644
--- a/src/include/switch.h
+++ b/src/include/switch.h
@@ -37,10 +37,10 @@
 
 #ifdef __cplusplus
 #define SWITCH_BEGIN_EXTERN_C       extern "C" {
-#define END_EXTERN_C         }
+#define SWITCH_END_EXTERN_C         }
 #else
 #define SWITCH_BEGIN_EXTERN_C
-#define END_EXTERN_C
+#define SWITCH_END_EXTERN_C
 #endif
 
 
diff --git a/src/include/switch_apr.h b/src/include/switch_apr.h
index 192f318d49..ffb0cc5a49 100644
--- a/src/include/switch_apr.h
+++ b/src/include/switch_apr.h
@@ -1433,6 +1433,6 @@ SWITCH_DECLARE(switch_status_t) switch_mutex_init(switch_mutex_t **lock,
 /** @} */
 /** @} */
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_bitpack.h b/src/include/switch_bitpack.h
index 1f8a964ea8..fe731f189f 100644
--- a/src/include/switch_bitpack.h
+++ b/src/include/switch_bitpack.h
@@ -278,5 +278,5 @@ static inline int8_t switch_bitpack_in(switch_bitpack_t *pack, switch_byte_t in)
 }
 ///\}
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 #endif
diff --git a/src/include/switch_buffer.h b/src/include/switch_buffer.h
index c2e491c0ec..ac06c9ef3b 100644
--- a/src/include/switch_buffer.h
+++ b/src/include/switch_buffer.h
@@ -109,6 +109,6 @@ SWITCH_DECLARE(switch_size_t) switch_buffer_toss(switch_buffer_t *buffer, switch
 SWITCH_DECLARE(void) switch_buffer_zero(switch_buffer_t *buffer);
 /** @} */
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_caller.h b/src/include/switch_caller.h
index fb2a44cf95..4a26cf9b22 100644
--- a/src/include/switch_caller.h
+++ b/src/include/switch_caller.h
@@ -195,7 +195,7 @@ SWITCH_DECLARE(switch_caller_profile_t *) switch_caller_profile_clone(switch_cor
 
 SWITCH_DECLARE(void) switch_caller_profile_event_set_data(switch_caller_profile_t *caller_profile, char *prefix, switch_event_t *event);
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 /** @} */
 
diff --git a/src/include/switch_channel.h b/src/include/switch_channel.h
index 375497464f..c28c0c3156 100644
--- a/src/include/switch_channel.h
+++ b/src/include/switch_channel.h
@@ -393,6 +393,6 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_raw_mode (switch_channel_t *c
 SWITCH_DECLARE(switch_status_t) switch_channel_get_raw_mode (switch_channel_t *channel, int *freq, int *bits, int *channels, int *ms, int *kbps);
 /** @} */
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_config.h b/src/include/switch_config.h
index 98607415f7..e40a34de6d 100644
--- a/src/include/switch_config.h
+++ b/src/include/switch_config.h
@@ -104,7 +104,7 @@ SWITCH_DECLARE(void) switch_config_close_file(switch_config_t *cfg);
 */
 SWITCH_DECLARE(int) switch_config_next_pair(switch_config_t *cfg, char **var, char **val);
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 /** @} */
 
diff --git a/src/include/switch_console.h b/src/include/switch_console.h
index 62e1195d0a..ffb0be8660 100644
--- a/src/include/switch_console.h
+++ b/src/include/switch_console.h
@@ -68,6 +68,6 @@ SWITCH_DECLARE(void) switch_console_printf(switch_text_channel_t channel, char *
   \brief A method akin to printf for dealing with api streams
 */
 SWITCH_DECLARE(switch_status_t) switch_console_stream_write(switch_stream_handle_t *handle, char *fmt, ...);
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_core.h b/src/include/switch_core.h
index 5756cd6edc..2ab0a9b9f5 100644
--- a/src/include/switch_core.h
+++ b/src/include/switch_core.h
@@ -1170,6 +1170,6 @@ SWITCH_DECLARE(void) switch_core_set_globals(void);
   \}
 */
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_event.h b/src/include/switch_event.h
index 93b9a85826..b9d165dc44 100644
--- a/src/include/switch_event.h
+++ b/src/include/switch_event.h
@@ -310,6 +310,6 @@ SWITCH_DECLARE(void) switch_event_deliver(switch_event_t **event);
 #define switch_event_fire_data(event, data) switch_event_fire_detailed(__FILE__, (char * )__FUNCTION__, __LINE__, event, data)
 ///\}
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_frame.h b/src/include/switch_frame.h
index 659cd6d062..5fbaebcacc 100644
--- a/src/include/switch_frame.h
+++ b/src/include/switch_frame.h
@@ -68,6 +68,6 @@ struct switch_frame {
 	switch_frame_flag_t flags;
 };
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index 21a09b749f..6e02752572 100644
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -216,7 +216,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_session_transfer(switch_core_session_
 
 /** @} */
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
 
diff --git a/src/include/switch_loadable_module.h b/src/include/switch_loadable_module.h
index 68b86e8202..e0347d20c2 100644
--- a/src/include/switch_loadable_module.h
+++ b/src/include/switch_loadable_module.h
@@ -230,6 +230,6 @@ SWITCH_MOD_DECLARE(switch_status_t) switch_module_runtime(void);
 SWITCH_MOD_DECLARE(switch_status_t) switch_module_shutdown(void);
 ///\}
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_log.h b/src/include/switch_log.h
index 317ca6dc14..27e3143de6 100644
--- a/src/include/switch_log.h
+++ b/src/include/switch_log.h
@@ -117,6 +117,6 @@ SWITCH_DECLARE(const char *) switch_log_level2str(switch_log_level_t level);
 SWITCH_DECLARE(switch_log_level_t) switch_log_str2level(const char *str);
 
 ///\}
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h
index f932754e1f..8b8f1bf603 100644
--- a/src/include/switch_module_interfaces.h
+++ b/src/include/switch_module_interfaces.h
@@ -536,6 +536,6 @@ struct switch_api_interface {
 	const struct switch_api_interface *next;
 };
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_platform.h b/src/include/switch_platform.h
index b969eae7cf..54b159d0ff 100644
--- a/src/include/switch_platform.h
+++ b/src/include/switch_platform.h
@@ -141,6 +141,6 @@ typedef unsigned long	in_addr_t;
 #define DoxyDefine(x)
 #endif
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_resample.h b/src/include/switch_resample.h
index d9dd41e582..a61bba120a 100644
--- a/src/include/switch_resample.h
+++ b/src/include/switch_resample.h
@@ -156,7 +156,7 @@ SWITCH_DECLARE(void) switch_swap_linear(int16_t *buf, int len);
 
 ///\}
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
 
diff --git a/src/include/switch_rtp.h b/src/include/switch_rtp.h
index e252bf0b23..6bbed70fde 100644
--- a/src/include/switch_rtp.h
+++ b/src/include/switch_rtp.h
@@ -373,6 +373,6 @@ SWITCH_DECLARE(void *)switch_rtp_get_private(switch_rtp_t *rtp_session);
   \}
 */
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_sqlite.h b/src/include/switch_sqlite.h
index 2665ac357b..653b3fafcc 100644
--- a/src/include/switch_sqlite.h
+++ b/src/include/switch_sqlite.h
@@ -1804,6 +1804,6 @@ DoxyDefine(void switch_core_db_free(char *z);)
 /** @} */
 /** @} */
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_stun.h b/src/include/switch_stun.h
index 55807dcd90..a97adf3eb6 100644
--- a/src/include/switch_stun.h
+++ b/src/include/switch_stun.h
@@ -240,6 +240,6 @@ SWITCH_DECLARE(switch_status_t) switch_stun_lookup (char **ip,
 #define switch_stun_packet_length(packet) ntohs(packet->header.length) + sizeof(switch_stun_packet_header_t)
 ///\}
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 45279da11f..6019e1166c 100644
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -783,6 +783,6 @@ struct switch_channel;
 /*! \brief A core session representing a call and all of it's resources */
 struct switch_core_session;
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_utils.h b/src/include/switch_utils.h
index c5125d284d..b008c62ad2 100644
--- a/src/include/switch_utils.h
+++ b/src/include/switch_utils.h
@@ -210,6 +210,6 @@ SWITCH_DECLARE(switch_status_t) switch_string_match(const char *string, size_t s
 #define SWITCH_READ_ACCEPTABLE(status) status == SWITCH_STATUS_SUCCESS || status == SWITCH_STATUS_BREAK
 SWITCH_DECLARE(size_t) switch_url_encode(char *url, char *buf, size_t len);
 SWITCH_DECLARE(char *) switch_url_decode(char *s);
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 #endif
diff --git a/src/include/switch_xml.h b/src/include/switch_xml.h
index b6193d03fd..29229e98de 100644
--- a/src/include/switch_xml.h
+++ b/src/include/switch_xml.h
@@ -331,7 +331,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_bind_search_function(switch_xml_searc
 ///\return the section mask
 SWITCH_DECLARE(switch_xml_section_t) switch_xml_parse_section_string(char *str);
 
-END_EXTERN_C
+SWITCH_END_EXTERN_C
 
 ///\}