diff --git a/plugins/wmpa/hexchat-plugin.h b/plugins/wmpa/hexchat-plugin.h
index bb6b89ce..2046a379 100644
--- a/plugins/wmpa/hexchat-plugin.h
+++ b/plugins/wmpa/hexchat-plugin.h
@@ -291,39 +291,39 @@ extern "C" {
                void *ptr);
 
 #if !defined(PLUGIN_C) && defined(WIN32)
-#ifndef XCHAT_PLUGIN_HANDLE
-#define XCHAT_PLUGIN_HANDLE (ph)
+#ifndef HEXCHAT_PLUGIN_HANDLE
+#define HEXCHAT_PLUGIN_HANDLE (ph)
 #endif
-#define xchat_hook_command ((XCHAT_PLUGIN_HANDLE)->xchat_hook_command)
-#define xchat_hook_server ((XCHAT_PLUGIN_HANDLE)->xchat_hook_server)
-#define xchat_hook_print ((XCHAT_PLUGIN_HANDLE)->xchat_hook_print)
-#define xchat_hook_timer ((XCHAT_PLUGIN_HANDLE)->xchat_hook_timer)
-#define xchat_hook_fd ((XCHAT_PLUGIN_HANDLE)->xchat_hook_fd)
-#define xchat_unhook ((XCHAT_PLUGIN_HANDLE)->xchat_unhook)
-#define xchat_print ((XCHAT_PLUGIN_HANDLE)->xchat_print)
-#define xchat_printf ((XCHAT_PLUGIN_HANDLE)->xchat_printf)
-#define xchat_command ((XCHAT_PLUGIN_HANDLE)->xchat_command)
-#define xchat_commandf ((XCHAT_PLUGIN_HANDLE)->xchat_commandf)
-#define xchat_nickcmp ((XCHAT_PLUGIN_HANDLE)->xchat_nickcmp)
-#define xchat_set_context ((XCHAT_PLUGIN_HANDLE)->xchat_set_context)
-#define xchat_find_context ((XCHAT_PLUGIN_HANDLE)->xchat_find_context)
-#define xchat_get_context ((XCHAT_PLUGIN_HANDLE)->xchat_get_context)
-#define xchat_get_info ((XCHAT_PLUGIN_HANDLE)->xchat_get_info)
-#define xchat_get_prefs ((XCHAT_PLUGIN_HANDLE)->xchat_get_prefs)
-#define xchat_list_get ((XCHAT_PLUGIN_HANDLE)->xchat_list_get)
-#define xchat_list_free ((XCHAT_PLUGIN_HANDLE)->xchat_list_free)
-#define xchat_list_fields ((XCHAT_PLUGIN_HANDLE)->xchat_list_fields)
-#define xchat_list_str ((XCHAT_PLUGIN_HANDLE)->xchat_list_str)
-#define xchat_list_int ((XCHAT_PLUGIN_HANDLE)->xchat_list_int)
-#define xchat_list_time ((XCHAT_PLUGIN_HANDLE)->xchat_list_time)
-#define xchat_list_next ((XCHAT_PLUGIN_HANDLE)->xchat_list_next)
-#define xchat_plugingui_add ((XCHAT_PLUGIN_HANDLE)->xchat_plugingui_add)
-#define xchat_plugingui_remove ((XCHAT_PLUGIN_HANDLE)->xchat_plugingui_remove)
-#define xchat_emit_print ((XCHAT_PLUGIN_HANDLE)->xchat_emit_print)
-#define xchat_gettext ((XCHAT_PLUGIN_HANDLE)->xchat_gettext)
-#define xchat_send_modes ((XCHAT_PLUGIN_HANDLE)->xchat_send_modes)
-#define xchat_strip ((XCHAT_PLUGIN_HANDLE)->xchat_strip)
-#define xchat_free ((XCHAT_PLUGIN_HANDLE)->xchat_free)
+#define xchat_hook_command ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_command)
+#define xchat_hook_server ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_server)
+#define xchat_hook_print ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_print)
+#define xchat_hook_timer ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_timer)
+#define xchat_hook_fd ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_fd)
+#define xchat_unhook ((HEXCHAT_PLUGIN_HANDLE)->xchat_unhook)
+#define xchat_print ((HEXCHAT_PLUGIN_HANDLE)->xchat_print)
+#define xchat_printf ((HEXCHAT_PLUGIN_HANDLE)->xchat_printf)
+#define xchat_command ((HEXCHAT_PLUGIN_HANDLE)->xchat_command)
+#define xchat_commandf ((HEXCHAT_PLUGIN_HANDLE)->xchat_commandf)
+#define xchat_nickcmp ((HEXCHAT_PLUGIN_HANDLE)->xchat_nickcmp)
+#define xchat_set_context ((HEXCHAT_PLUGIN_HANDLE)->xchat_set_context)
+#define xchat_find_context ((HEXCHAT_PLUGIN_HANDLE)->xchat_find_context)
+#define xchat_get_context ((HEXCHAT_PLUGIN_HANDLE)->xchat_get_context)
+#define xchat_get_info ((HEXCHAT_PLUGIN_HANDLE)->xchat_get_info)
+#define xchat_get_prefs ((HEXCHAT_PLUGIN_HANDLE)->xchat_get_prefs)
+#define xchat_list_get ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_get)
+#define xchat_list_free ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_free)
+#define xchat_list_fields ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_fields)
+#define xchat_list_str ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_str)
+#define xchat_list_int ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_int)
+#define xchat_list_time ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_time)
+#define xchat_list_next ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_next)
+#define xchat_plugingui_add ((HEXCHAT_PLUGIN_HANDLE)->xchat_plugingui_add)
+#define xchat_plugingui_remove ((HEXCHAT_PLUGIN_HANDLE)->xchat_plugingui_remove)
+#define xchat_emit_print ((HEXCHAT_PLUGIN_HANDLE)->xchat_emit_print)
+#define xchat_gettext ((HEXCHAT_PLUGIN_HANDLE)->xchat_gettext)
+#define xchat_send_modes ((HEXCHAT_PLUGIN_HANDLE)->xchat_send_modes)
+#define xchat_strip ((HEXCHAT_PLUGIN_HANDLE)->xchat_strip)
+#define xchat_free ((HEXCHAT_PLUGIN_HANDLE)->xchat_free)
 #endif
 
 #ifdef __cplusplus
@@ -357,5 +357,5 @@ CString wmpaGetSongTitle(void);
 BOOL SaveSetting(LPCTSTR name, DWORD type, CONST BYTE *value, DWORD size);
 BOOL GetSetting(LPCTSTR name, DWORD *type, LPBYTE value, DWORD *size);
 
-#endif /* XCHAT_PLUGIN_H */
+#endif /* HEXCHAT_PLUGIN_H */
 
diff --git a/src/common/hexchat-plugin.h b/src/common/hexchat-plugin.h
index 423061f2..b1dc64b8 100644
--- a/src/common/hexchat-plugin.h
+++ b/src/common/hexchat-plugin.h
@@ -327,45 +327,45 @@ xchat_pluginpref_list (xchat_plugin *ph,
 		char *dest);
 
 #if !defined(PLUGIN_C) && defined(WIN32)
-#ifndef XCHAT_PLUGIN_HANDLE
-#define XCHAT_PLUGIN_HANDLE (ph)
+#ifndef HEXCHAT_PLUGIN_HANDLE
+#define HEXCHAT_PLUGIN_HANDLE (ph)
 #endif
-#define xchat_hook_command ((XCHAT_PLUGIN_HANDLE)->xchat_hook_command)
-#define xchat_hook_server ((XCHAT_PLUGIN_HANDLE)->xchat_hook_server)
-#define xchat_hook_print ((XCHAT_PLUGIN_HANDLE)->xchat_hook_print)
-#define xchat_hook_timer ((XCHAT_PLUGIN_HANDLE)->xchat_hook_timer)
-#define xchat_hook_fd ((XCHAT_PLUGIN_HANDLE)->xchat_hook_fd)
-#define xchat_unhook ((XCHAT_PLUGIN_HANDLE)->xchat_unhook)
-#define xchat_print ((XCHAT_PLUGIN_HANDLE)->xchat_print)
-#define xchat_printf ((XCHAT_PLUGIN_HANDLE)->xchat_printf)
-#define xchat_command ((XCHAT_PLUGIN_HANDLE)->xchat_command)
-#define xchat_commandf ((XCHAT_PLUGIN_HANDLE)->xchat_commandf)
-#define xchat_nickcmp ((XCHAT_PLUGIN_HANDLE)->xchat_nickcmp)
-#define xchat_set_context ((XCHAT_PLUGIN_HANDLE)->xchat_set_context)
-#define xchat_find_context ((XCHAT_PLUGIN_HANDLE)->xchat_find_context)
-#define xchat_get_context ((XCHAT_PLUGIN_HANDLE)->xchat_get_context)
-#define xchat_get_info ((XCHAT_PLUGIN_HANDLE)->xchat_get_info)
-#define xchat_get_prefs ((XCHAT_PLUGIN_HANDLE)->xchat_get_prefs)
-#define xchat_list_get ((XCHAT_PLUGIN_HANDLE)->xchat_list_get)
-#define xchat_list_free ((XCHAT_PLUGIN_HANDLE)->xchat_list_free)
-#define xchat_list_fields ((XCHAT_PLUGIN_HANDLE)->xchat_list_fields)
-#define xchat_list_next ((XCHAT_PLUGIN_HANDLE)->xchat_list_next)
-#define xchat_list_str ((XCHAT_PLUGIN_HANDLE)->xchat_list_str)
-#define xchat_list_int ((XCHAT_PLUGIN_HANDLE)->xchat_list_int)
-#define xchat_plugingui_add ((XCHAT_PLUGIN_HANDLE)->xchat_plugingui_add)
-#define xchat_plugingui_remove ((XCHAT_PLUGIN_HANDLE)->xchat_plugingui_remove)
-#define xchat_emit_print ((XCHAT_PLUGIN_HANDLE)->xchat_emit_print)
-#define xchat_list_time ((XCHAT_PLUGIN_HANDLE)->xchat_list_time)
-#define xchat_gettext ((XCHAT_PLUGIN_HANDLE)->xchat_gettext)
-#define xchat_send_modes ((XCHAT_PLUGIN_HANDLE)->xchat_send_modes)
-#define xchat_strip ((XCHAT_PLUGIN_HANDLE)->xchat_strip)
-#define xchat_free ((XCHAT_PLUGIN_HANDLE)->xchat_free)
-#define xchat_pluginpref_set_str ((XCHAT_PLUGIN_HANDLE)->xchat_pluginpref_set_str)
-#define xchat_pluginpref_get_str ((XCHAT_PLUGIN_HANDLE)->xchat_pluginpref_get_str)
-#define xchat_pluginpref_set_int ((XCHAT_PLUGIN_HANDLE)->xchat_pluginpref_set_int)
-#define xchat_pluginpref_get_int ((XCHAT_PLUGIN_HANDLE)->xchat_pluginpref_get_int)
-#define xchat_pluginpref_delete ((XCHAT_PLUGIN_HANDLE)->xchat_pluginpref_delete)
-#define xchat_pluginpref_list ((XCHAT_PLUGIN_HANDLE)->xchat_pluginpref_list)
+#define xchat_hook_command ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_command)
+#define xchat_hook_server ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_server)
+#define xchat_hook_print ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_print)
+#define xchat_hook_timer ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_timer)
+#define xchat_hook_fd ((HEXCHAT_PLUGIN_HANDLE)->xchat_hook_fd)
+#define xchat_unhook ((HEXCHAT_PLUGIN_HANDLE)->xchat_unhook)
+#define xchat_print ((HEXCHAT_PLUGIN_HANDLE)->xchat_print)
+#define xchat_printf ((HEXCHAT_PLUGIN_HANDLE)->xchat_printf)
+#define xchat_command ((HEXCHAT_PLUGIN_HANDLE)->xchat_command)
+#define xchat_commandf ((HEXCHAT_PLUGIN_HANDLE)->xchat_commandf)
+#define xchat_nickcmp ((HEXCHAT_PLUGIN_HANDLE)->xchat_nickcmp)
+#define xchat_set_context ((HEXCHAT_PLUGIN_HANDLE)->xchat_set_context)
+#define xchat_find_context ((HEXCHAT_PLUGIN_HANDLE)->xchat_find_context)
+#define xchat_get_context ((HEXCHAT_PLUGIN_HANDLE)->xchat_get_context)
+#define xchat_get_info ((HEXCHAT_PLUGIN_HANDLE)->xchat_get_info)
+#define xchat_get_prefs ((HEXCHAT_PLUGIN_HANDLE)->xchat_get_prefs)
+#define xchat_list_get ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_get)
+#define xchat_list_free ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_free)
+#define xchat_list_fields ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_fields)
+#define xchat_list_next ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_next)
+#define xchat_list_str ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_str)
+#define xchat_list_int ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_int)
+#define xchat_plugingui_add ((HEXCHAT_PLUGIN_HANDLE)->xchat_plugingui_add)
+#define xchat_plugingui_remove ((HEXCHAT_PLUGIN_HANDLE)->xchat_plugingui_remove)
+#define xchat_emit_print ((HEXCHAT_PLUGIN_HANDLE)->xchat_emit_print)
+#define xchat_list_time ((HEXCHAT_PLUGIN_HANDLE)->xchat_list_time)
+#define xchat_gettext ((HEXCHAT_PLUGIN_HANDLE)->xchat_gettext)
+#define xchat_send_modes ((HEXCHAT_PLUGIN_HANDLE)->xchat_send_modes)
+#define xchat_strip ((HEXCHAT_PLUGIN_HANDLE)->xchat_strip)
+#define xchat_free ((HEXCHAT_PLUGIN_HANDLE)->xchat_free)
+#define xchat_pluginpref_set_str ((HEXCHAT_PLUGIN_HANDLE)->xchat_pluginpref_set_str)
+#define xchat_pluginpref_get_str ((HEXCHAT_PLUGIN_HANDLE)->xchat_pluginpref_get_str)
+#define xchat_pluginpref_set_int ((HEXCHAT_PLUGIN_HANDLE)->xchat_pluginpref_set_int)
+#define xchat_pluginpref_get_int ((HEXCHAT_PLUGIN_HANDLE)->xchat_pluginpref_get_int)
+#define xchat_pluginpref_delete ((HEXCHAT_PLUGIN_HANDLE)->xchat_pluginpref_delete)
+#define xchat_pluginpref_list ((HEXCHAT_PLUGIN_HANDLE)->xchat_pluginpref_list)
 #endif
 
 #ifdef __cplusplus