26 files changed, 251 insertions, 251 deletions

diff --git a/plugins/checksum/checksum.c b/plugins/checksum/checksum.c
index df9be2de..19130ed2 100644
--- a/plugins/checksum/checksum.c
+++ b/plugins/checksum/checksum.c
@@ -193,7 +193,7 @@ dccrecv_cb (char *word[], void *userdata)
 		xchat_printf (ph, "File access error!\n");
 	}
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
@@ -222,7 +222,7 @@ dccoffer_cb (char *word[], void *userdata)
 		xchat_printf (ph, "File access error!\n");
 	}
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
@@ -243,7 +243,7 @@ checksum (char *word[], char *word_eol[], void *userdata)
 		xchat_printf (ph, "  SET <filesize> - set the maximum file size (in MiB) to be hashed\n");
 	}
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 int
diff --git a/plugins/dns/dns.c b/plugins/dns/dns.c
index 535d4b76..211c760e 100644
--- a/plugins/dns/dns.c
+++ b/plugins/dns/dns.c
@@ -272,7 +272,7 @@ dns_cmd_cb (char *word[], char *word_eol[], void *ud)
 	if (!word[2][0])
 	{
 		xchat_print (ph, HELP);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	th = thread_new ();
@@ -298,7 +298,7 @@ dns_cmd_cb (char *word[], char *word_eol[], void *ud)
 		}
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 int
diff --git a/plugins/doat/doat.c b/plugins/doat/doat.c
index ab84c85e..c8fbd278 100644
--- a/plugins/doat/doat.c
+++ b/plugins/doat/doat.c
@@ -67,7 +67,7 @@ parse_command( char *word[], char *word_eol[], void *userdata ) {
 			}
 		}
 	}
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 
 int
diff --git a/plugins/ewc/ewc.c b/plugins/ewc/ewc.c
index d7ae3703..0b4c2af1 100644
--- a/plugins/ewc/ewc.c
+++ b/plugins/ewc/ewc.c
@@ -124,7 +124,7 @@ static int wcmd_cb(char *word[], char *word_eol[], void *userdata)
     }

   }

 

-  return XCHAT_EAT_ALL;

+  return HEXCHAT_EAT_ALL;

 }

 

 

@@ -146,21 +146,21 @@ static int wp_cb(char *word[], char *word_eol[], void *userdata)
 

     if ((samplerate = SendMessage(hwndWinamp, WM_USER, (WPARAM)0, (LPARAM)126)) == 0) {

       xchat_print(ph, "Could not get current song's samplerate... !?\n");

-      return XCHAT_EAT_ALL;

+      return HEXCHAT_EAT_ALL;

     }

     if ((bitrate = SendMessage(hwndWinamp, WM_USER, (WPARAM)1, (LPARAM)126)) == 0) {

       xchat_print(ph, "Could not get current song's bitrate... !?\n");

-      return XCHAT_EAT_ALL;

+      return HEXCHAT_EAT_ALL;

     }

     if ((nbchannels = SendMessage(hwndWinamp, WM_USER, (WPARAM)2, (LPARAM)126)) == 0) {

       xchat_print(ph, "Could not get the number of channels... !?\n");

-      return XCHAT_EAT_ALL;

+      return HEXCHAT_EAT_ALL;

     }

     if ((length = SendMessage(hwndWinamp, WM_USER, (WPARAM)1, (LPARAM)105)) == 0) {

       // Could be buggy when streaming audio or video, returned length is unexpected;

       // How to detect is Winamp is streaming, and display ??:?? in that case?

       xchat_print(ph, "Could not get current song's length... !?\n");

-      return XCHAT_EAT_ALL;

+      return HEXCHAT_EAT_ALL;

     }

     else {

       minutes = length/60;

@@ -173,7 +173,7 @@ static int wp_cb(char *word[], char *word_eol[], void *userdata)
     }

     if ((elapsed = SendMessage(hwndWinamp, WM_USER, (WPARAM)0, (LPARAM)105)) == 0) {

       xchat_print(ph, "Could not get current song's elapsed time... !?\n");

-      return XCHAT_EAT_ALL;

+      return HEXCHAT_EAT_ALL;

     }

     else {

       eminutes = (elapsed/1000)/60;   /* kinda stupid sounding, but e is for elapsed */

@@ -187,7 +187,7 @@ static int wp_cb(char *word[], char *word_eol[], void *userdata)
 

     if ((bitrate = SendMessage(hwndWinamp, WM_USER, (WPARAM)1, (LPARAM)126)) == 0) {

       xchat_print(ph, "Could not get current song's bitrate... !?\n");

-      return XCHAT_EAT_ALL;

+      return HEXCHAT_EAT_ALL;

     }

 

     GetCurrentSongsName(hwndWinamp, this_title, 1024);

@@ -195,7 +195,7 @@ static int wp_cb(char *word[], char *word_eol[], void *userdata)
     xchat_commandf(ph, "dispcurrsong %d %d %d %s %s %s", samplerate, bitrate, nbchannels, elapsedtime, totaltime, this_title);

   }

 

-  return XCHAT_EAT_ALL;   /* eat this command so xchat and other plugins can't process it */

+  return HEXCHAT_EAT_ALL;   /* eat this command so xchat and other plugins can't process it */

 }

 

 

diff --git a/plugins/exec/exec.c b/plugins/exec/exec.c
index a4d1a8f3..c9c64074 100644
--- a/plugins/exec/exec.c
+++ b/plugins/exec/exec.c
@@ -59,7 +59,7 @@ run_command (char *word[], char *word_eol[], void *userdata)
 		{
 			/*strcat (commandLine, word_eol[3]);*/
 			xchat_printf (ph, "Printing Exec output to others is not supported yet.\n");
-			return XCHAT_EAT_XCHAT;
+			return HEXCHAT_EAT_XCHAT;
 		}
 		else
 		{
@@ -112,7 +112,7 @@ run_command (char *word[], char *word_eol[], void *userdata)
 	CloseHandle (pInfo.hProcess);
 	CloseHandle (pInfo.hThread);
 
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 
 int
diff --git a/plugins/fishlim/plugin_hexchat.c b/plugins/fishlim/plugin_hexchat.c
index 155a3a57..82611850 100644
--- a/plugins/fishlim/plugin_hexchat.c
+++ b/plugins/fishlim/plugin_hexchat.c
@@ -79,7 +79,7 @@ static bool append(char **s, size_t *length, const char *data) {
         xchat_printf(ph, ">%s< ", word[i]);
     }
     xchat_printf(ph, "\n");
-    return XCHAT_EAT_NONE;
+    return HEXCHAT_EAT_NONE;
 }*/
 
 /**
@@ -90,7 +90,7 @@ static int handle_outgoing(char *word[], char *word_eol[], void *userdata) {
     // Encrypt the message if possible
     const char *channel = xchat_get_info(ph, "channel");
     char *encrypted = fish_encrypt_for_nick(channel, word_eol[1]);
-    if (!encrypted) return XCHAT_EAT_NONE;
+    if (!encrypted) return HEXCHAT_EAT_NONE;
     
     // Display message
     own_nick = xchat_get_info(ph, "nick");
@@ -100,7 +100,7 @@ static int handle_outgoing(char *word[], char *word_eol[], void *userdata) {
     xchat_commandf(ph, "PRIVMSG %s :+OK %s", channel, encrypted);
     
     free(encrypted);
-    return XCHAT_EAT_XCHAT;
+    return HEXCHAT_EAT_XCHAT;
 }
 
 /**
@@ -121,7 +121,7 @@ static int handle_incoming(char *word[], char *word_eol[], void *userdata) {
     size_t length;
 
     if (!irc_parse_message((const char **)word, &prefix, &command, &w))
-        return XCHAT_EAT_NONE;
+        return HEXCHAT_EAT_NONE;
     
     // Topic (command 332) has an extra parameter
     if (!strcmp(command, "332")) w++;
@@ -131,7 +131,7 @@ static int handle_incoming(char *word[], char *word_eol[], void *userdata) {
         const char *s = (ew == w+1 ? word[ew]+1 : word[ew]);
         if (strcmp(s, "+OK") == 0 || strcmp(s, "mcps") == 0) goto has_encrypted_data;
     }
-    return XCHAT_EAT_NONE;
+    return HEXCHAT_EAT_NONE;
   has_encrypted_data: ;
     // Extract sender nick and recipient nick/channel
     sender_nick = irc_prefix_get_nick(prefix);
@@ -178,12 +178,12 @@ static int handle_incoming(char *word[], char *word_eol[], void *userdata) {
     
     free(message);
     free(sender_nick);
-    return XCHAT_EAT_XCHAT;
+    return HEXCHAT_EAT_XCHAT;
   
   decrypt_error:
     free(decrypted);
     free(sender_nick);
-    return XCHAT_EAT_NONE;
+    return HEXCHAT_EAT_NONE;
 }
 
 /**
@@ -196,7 +196,7 @@ static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
     // Check syntax
     if (*word[2] == '\0') {
         xchat_printf(ph, "%s\n", usage_setkey);
-        return XCHAT_EAT_XCHAT;
+        return HEXCHAT_EAT_XCHAT;
     }
     
     if (*word[3] == '\0') {
@@ -216,7 +216,7 @@ static int handle_setkey(char *word[], char *word_eol[], void *userdata) {
         xchat_printf(ph, "\00305Failed to store key in blow.ini\n", nick, key);
     }
     
-    return XCHAT_EAT_XCHAT;
+    return HEXCHAT_EAT_XCHAT;
 }
 
 /**
@@ -228,7 +228,7 @@ static int handle_delkey(char *word[], char *word_eol[], void *userdata) {
     // Check syntax
     if (*word[2] == '\0' || *word[3] != '\0') {
         xchat_printf(ph, "%s\n", usage_delkey);
-        return XCHAT_EAT_XCHAT;
+        return HEXCHAT_EAT_XCHAT;
     }
     
     nick = word_eol[2];
@@ -240,7 +240,7 @@ static int handle_delkey(char *word[], char *word_eol[], void *userdata) {
         xchat_printf(ph, "\00305Failed to delete key in blow.ini!\n", nick);
     }
     
-    return XCHAT_EAT_XCHAT;
+    return HEXCHAT_EAT_XCHAT;
 }
 
 /**
diff --git a/plugins/hextray/callbacks.cpp b/plugins/hextray/callbacks.cpp
index e7dcfdba..53a706b2 100644
--- a/plugins/hextray/callbacks.cpp
+++ b/plugins/hextray/callbacks.cpp
@@ -63,7 +63,7 @@ int event_cb(char *word[], void *userdata)
 	int iEvent = (int)userdata;

 

 	if(iEvent > 10 && iEvent != 21)

-		return XCHAT_EAT_NONE;

+		return HEXCHAT_EAT_NONE;

 

 	/***************************************************************************************/

 	/***** if the window is minimized or if we're allowed to show alerts when its not	 **/

@@ -176,7 +176,7 @@ int event_cb(char *word[], void *userdata)
 	/***********************************/

 	/***** pass the events to xchat ****/

 	/***********************************/

-	return XCHAT_EAT_NONE;

+	return HEXCHAT_EAT_NONE;

 }

 

 int command_cb(char *word[], char *word_eol[], void *userdata)

@@ -207,7 +207,7 @@ int command_cb(char *word[], char *word_eol[], void *userdata)
 

 	free(szTemp);

 

-	return XCHAT_EAT_ALL;

+	return HEXCHAT_EAT_ALL;

 }

 

 LRESULT CALLBACK WindowProc(HWND hWnd, UINT msg, WPARAM wparam, LPARAM lparam)

diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c
index ebd2c697..2ec21c22 100644
--- a/plugins/lua/lua.c
+++ b/plugins/lua/lua.c
@@ -175,10 +175,10 @@ static struct {
 	const char *name;
 	long value;
 } lxc_consts[] = {
-	{"EAT_NONE", 	XCHAT_EAT_NONE},
-	{"EAT_XCHAT", 	XCHAT_EAT_XCHAT},
-	{"EAT_PLUGIN",	XCHAT_EAT_PLUGIN},
-	{"EAT_ALL",		XCHAT_EAT_ALL},
+	{"EAT_NONE", 	HEXCHAT_EAT_NONE},
+	{"EAT_XCHAT", 	HEXCHAT_EAT_XCHAT},
+	{"EAT_PLUGIN",	HEXCHAT_EAT_PLUGIN},
+	{"EAT_ALL",		HEXCHAT_EAT_ALL},
 
 /* unused until hook_fd is done 
 	{"FD_READ",			HEXCHAT_FD_READ},
@@ -493,19 +493,19 @@ static int lxc_cb_load(char *word[], char *word_eol[], void *userdata)
 	struct stat *st;
 
 	if (word_eol[2][0] == 0)
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 	
 	buf = malloc(PATH_MAX + 1);
 	if (!buf) {
 		xchat_printf(ph, "malloc() failed: %s\n", strerror(errno));
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 	}
 
 	st = malloc(sizeof(struct stat));
 	if (!st) {
 		xchat_printf(ph, "malloc() failed: %s\n", strerror(errno));
 		free(buf);
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 	}
 
  	len = strlen(word[2]);
@@ -532,7 +532,7 @@ static int lxc_cb_load(char *word[], char *word_eol[], void *userdata)
 		if (lxc_load_file((const char *)file) == 0) {
 			free(st);
 			free(buf);
-			return XCHAT_EAT_ALL;
+			return HEXCHAT_EAT_ALL;
 		}
 
 		state = lxc_states;
@@ -548,7 +548,7 @@ static int lxc_cb_load(char *word[], char *word_eol[], void *userdata)
 					lua_pop(L, 1);
 					free(st);
 					free(buf);
-					return XCHAT_EAT_ALL;
+					return HEXCHAT_EAT_ALL;
 				}
 
 				name = lua_tostring(L, -3);
@@ -573,14 +573,14 @@ static int lxc_cb_load(char *word[], char *word_eol[], void *userdata)
 				}
 				free(st);
 				free(buf);
-				return XCHAT_EAT_ALL;
+				return HEXCHAT_EAT_ALL;
 			}
 			state = state->next;
 		}
 	}
 	free(st);
 	free(buf);
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int lxc_cb_unload(char *word[], char *word_eol[], void *userdata)
@@ -591,7 +591,7 @@ static int lxc_cb_unload(char *word[], char *word_eol[], void *userdata)
 	char *file;
 
 	if (word_eol[2][0] == 0)
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 
 	len = strlen(word[2]);
 	if (len > 4 && strcasecmp(".lua", word[2] + len - 4) == 0) {
@@ -614,13 +614,13 @@ static int lxc_cb_unload(char *word[], char *word_eol[], void *userdata)
 					lxc_states = state->next;
 				xchat_printf(ph, "Lua script %s unloaded", file);
 				free(state);
-				return XCHAT_EAT_ALL;
+				return HEXCHAT_EAT_ALL;
 			}
 			prev  = state;
 			state = state->next;
 		}
 	}
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int lxc_cb_lua(char *word[], char *word_eol[], void *userdata)
@@ -628,7 +628,7 @@ static int lxc_cb_lua(char *word[], char *word_eol[], void *userdata)
 	lua_State *L = lxc_new_state();
 	if (word[2][0] == '\0') {
 		xchat_printf(ph, "LUA: Usage: /LUA LUA_CODE... execute LUA_CODE");
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	if (luaL_loadbuffer(L, word_eol[2], strlen(word_eol[2]), "/LUA")) {
 		xchat_printf(ph, "LUA: error loading line %s", lua_tostring(L, -1));
@@ -652,7 +652,7 @@ static int lxc_cb_lua(char *word[], char *word_eol[], void *userdata)
 	}
 
 	lua_close(L);
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 int xchat_plugin_init(xchat_plugin *plugin_handle,
@@ -805,12 +805,12 @@ static int lxc_run_hook(char *word[], char *word_eol[], void *data)
 				word[1], lua_tostring(L, -1)
 			);
 		lua_pop(L, 1);
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 	}
 
 	if (lua_type(L, -1) != LUA_TNUMBER) {
 		xchat_printf(ph, "callback for '%s' did not return number...", word[1]);
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 	}
 
 	i = (int)lua_tonumber(L, -1);
@@ -1022,7 +1022,7 @@ static int lxc_run_print(char *word[], void *data)
 
 	if (lua_type(L, -1) != LUA_TNUMBER) {
 		xchat_printf(ph, "callback for '%s' didn't return number...", word[1]);
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 	}
 	i = (int)lua_tonumber(L, -1);
 	lua_pop(L, 1);
diff --git a/plugins/mpcinfo/mpcInfo.c b/plugins/mpcinfo/mpcInfo.c
index 1499c0e3..f0909766 100644
--- a/plugins/mpcinfo/mpcInfo.c
+++ b/plugins/mpcinfo/mpcInfo.c
@@ -33,20 +33,20 @@ static xchat_plugin *ph;
 
 static int print_themes (char *word[], char *word_eol[], void *userdata){
        printThemes();
-       return XCHAT_EAT_ALL;
+       return HEXCHAT_EAT_ALL;
 }
 
 static int mpc_themeReload(char *word[], char *word_eol[], void *userdata){
    themeInit();
    loadThemes();
-   return XCHAT_EAT_ALL;
+   return HEXCHAT_EAT_ALL;
 }
 
 static int mpc_tell(char *word[], char *word_eol[], void *userdata){
        char *tTitle, *zero, *oggLine, *line;
 	   struct tagInfo info;
 	   HWND hwnd = FindWindow("MediaPlayerClassicW",NULL);
-       if (hwnd==0) {xchat_command(ph, randomLine(notRunTheme));return XCHAT_EAT_ALL;}
+       if (hwnd==0) {xchat_command(ph, randomLine(notRunTheme));return HEXCHAT_EAT_ALL;}
        
        tTitle=(char*)malloc(sizeof(char)*1024);
        GetWindowText(hwnd, tTitle, 1024);
@@ -83,7 +83,7 @@ static int mpc_tell(char *word[], char *word_eol[], void *userdata){
                 //mp3Line=replace(mp3Line,"%plTitle",title);
                 mp3Line=replace(mp3Line,"%file",tTitle);
                 xchat_command(ph, mp3Line);
-                return XCHAT_EAT_ALL;
+                return HEXCHAT_EAT_ALL;
              }
           }
           if (endsWith(tTitle,".ogg")==1){
@@ -112,14 +112,14 @@ static int mpc_tell(char *word[], char *word_eol[], void *userdata){
                 //oggLine=replace(oggLine,"%plTitle",title);
                 oggLine=replace(oggLine,"%file",tTitle);
                 xchat_command(ph, oggLine);
-                return XCHAT_EAT_ALL;
+                return HEXCHAT_EAT_ALL;
              }
           }
        }
        line=randomLine(titleTheme);
        line=replace(line,"%title", tTitle);
        xchat_command(ph,line); 
-       return XCHAT_EAT_ALL;
+       return HEXCHAT_EAT_ALL;
 }
 
 int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg){
diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c
index f81dcdd5..7d6912d6 100644
--- a/plugins/perl/perl.c
+++ b/plugins/perl/perl.c
@@ -356,11 +356,11 @@ fd_cb (int fd, int flags, void *userdata)
 	if (SvTRUE (ERRSV)) {
 		xchat_printf (ph, "Error in fd callback %s", SvPV_nolen (ERRSV));
 		if (!SvOK (POPs)) {}		  /* remove undef from the top of the stack */
-		retVal = XCHAT_EAT_ALL;
+		retVal = HEXCHAT_EAT_ALL;
 	} else {
 		if (count != 1) {
 			xchat_print (ph, "Fd handler should only return 1 value.");
-			retVal = XCHAT_EAT_NONE;
+			retVal = HEXCHAT_EAT_NONE;
 		} else {
 			retVal = POPi;
 			if (retVal == 0) {
@@ -417,11 +417,11 @@ timer_cb (void *userdata)
 	if (SvTRUE (ERRSV)) {
 		xchat_printf (ph, "Error in timer callback %s", SvPV_nolen (ERRSV));
 		if (!SvOK (POPs)) {}		  /* remove undef from the top of the stack */
-		retVal = XCHAT_EAT_ALL;
+		retVal = HEXCHAT_EAT_ALL;
 	} else {
 		if (count != 1) {
 			xchat_print (ph, "Timer handler should only return 1 value.");
-			retVal = XCHAT_EAT_NONE;
+			retVal = HEXCHAT_EAT_NONE;
 		} else {
 			retVal = POPi;
 			if (retVal == 0) {
@@ -457,7 +457,7 @@ server_cb (char *word[], char *word_eol[], void *userdata)
 	SAVETMPS;
 
 	if (data->depth)
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 
 	/*               xchat_printf (ph, */
 	/*                               "Recieved %d words in server callback", av_len (wd)); */
@@ -476,11 +476,11 @@ server_cb (char *word[], char *word_eol[], void *userdata)
 	if (SvTRUE (ERRSV)) {
 		xchat_printf (ph, "Error in server callback %s", SvPV_nolen (ERRSV));
 		if (!SvOK (POPs)) {}		  /* remove undef from the top of the stack */
-		retVal = XCHAT_EAT_NONE;
+		retVal = HEXCHAT_EAT_NONE;
 	} else {
 		if (count != 1) {
 			xchat_print (ph, "Server handler should only return 1 value.");
-			retVal = XCHAT_EAT_NONE;
+			retVal = HEXCHAT_EAT_NONE;
 		} else {
 			retVal = POPi;
 		}
@@ -506,7 +506,7 @@ command_cb (char *word[], char *word_eol[], void *userdata)
 	SAVETMPS;
 	
 	if (data->depth)
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 
 	/*               xchat_printf (ph, "Recieved %d words in command callback", */
 	/*                               av_len (wd)); */
@@ -525,11 +525,11 @@ command_cb (char *word[], char *word_eol[], void *userdata)
 	if (SvTRUE (ERRSV)) {
 		xchat_printf (ph, "Error in command callback %s", SvPV_nolen (ERRSV));
 		if (!SvOK (POPs)) {}		  /* remove undef from the top of the stack */
-		retVal = XCHAT_EAT_XCHAT;
+		retVal = HEXCHAT_EAT_XCHAT;
 	} else {
 		if (count != 1) {
 			xchat_print (ph, "Command handler should only return 1 value.");
-			retVal = XCHAT_EAT_NONE;
+			retVal = HEXCHAT_EAT_NONE;
 		} else {
 			retVal = POPi;
 		}
@@ -560,7 +560,7 @@ print_cb (char *word[], void *userdata)
 	SAVETMPS;
 
 	if (data->depth)
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 
 	wd = newAV ();
 	sv_2mortal ((SV *) wd);
@@ -601,11 +601,11 @@ print_cb (char *word[], void *userdata)
 	if (SvTRUE (ERRSV)) {
 		xchat_printf (ph, "Error in print callback %s", SvPV_nolen (ERRSV));
 		if (!SvOK (POPs)) {}		  /* remove undef from the top of the stack */
-		retVal = XCHAT_EAT_NONE;
+		retVal = HEXCHAT_EAT_NONE;
 	} else {
 		if (count != 1) {
 			xchat_print (ph, "Print handler should only return 1 value.");
-			retVal = XCHAT_EAT_NONE;
+			retVal = HEXCHAT_EAT_NONE;
 		} else {
 			retVal = POPi;
 		}
@@ -1328,10 +1328,10 @@ xs_init (pTHX)
 	newCONSTSUB (stash, "PRI_LOW", newSViv (HEXCHAT_PRI_LOW));
 	newCONSTSUB (stash, "PRI_LOWEST", newSViv (HEXCHAT_PRI_LOWEST));
 
-	newCONSTSUB (stash, "EAT_NONE", newSViv (XCHAT_EAT_NONE));
-	newCONSTSUB (stash, "EAT_XCHAT", newSViv (XCHAT_EAT_XCHAT));
-	newCONSTSUB (stash, "EAT_PLUGIN", newSViv (XCHAT_EAT_PLUGIN));
-	newCONSTSUB (stash, "EAT_ALL", newSViv (XCHAT_EAT_ALL));
+	newCONSTSUB (stash, "EAT_NONE", newSViv (HEXCHAT_EAT_NONE));
+	newCONSTSUB (stash, "EAT_XCHAT", newSViv (HEXCHAT_EAT_XCHAT));
+	newCONSTSUB (stash, "EAT_PLUGIN", newSViv (HEXCHAT_EAT_PLUGIN));
+	newCONSTSUB (stash, "EAT_ALL", newSViv (HEXCHAT_EAT_ALL));
 	newCONSTSUB (stash, "FD_READ", newSViv (HEXCHAT_FD_READ));
 	newCONSTSUB (stash, "FD_WRITE", newSViv (HEXCHAT_FD_WRITE));
 	newCONSTSUB (stash, "FD_EXCEPTION", newSViv (HEXCHAT_FD_EXCEPTION));
@@ -1475,10 +1475,10 @@ perl_command_unloadall (char *word[], char *word_eol[], void *userdata)
 {
 	if (my_perl != NULL) {
 		execute_perl (sv_2mortal (newSVpv ("Xchat::Embed::unload_all", 0)), "");
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 
 static int
@@ -1487,11 +1487,11 @@ perl_command_reloadall (char *word[], char *word_eol[], void *userdata)
 	if (my_perl != NULL) {
 		execute_perl (sv_2mortal (newSVpv ("Xchat::Embed::reload_all", 0)), "");
 
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	} else {
 		perl_auto_load( NULL );
 	}
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 
 static int
@@ -1502,10 +1502,10 @@ perl_command_load (char *word[], char *word_eol[], void *userdata)
 	if (file != NULL )
 	{
 		perl_load_file (file);
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
@@ -1515,10 +1515,10 @@ perl_command_unload (char *word[], char *word_eol[], void *userdata)
 	
 	if (my_perl != NULL && file != NULL) {
 		execute_perl (sv_2mortal (newSVpv ("Xchat::Embed::unload", 0)), file);
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
@@ -1528,10 +1528,10 @@ perl_command_reload (char *word[], char *word_eol[], void *userdata)
 	
 	if (my_perl != NULL && file != NULL) {
 		execute_perl (sv_2mortal (newSVpv ("Xchat::Embed::reload", 0)), file);
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 	
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 
 void
diff --git a/plugins/python/python.c b/plugins/python/python.c
index a1822a8c..8b8b47c4 100644
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@@ -503,7 +503,7 @@ Callback_Command(char *word[], char *word_eol[], void *userdata)
 	Py_DECREF(word_eol_list);
 
 	if (retobj == Py_None) {
-		ret = XCHAT_EAT_NONE;
+		ret = HEXCHAT_EAT_NONE;
 		Py_DECREF(retobj);
 	} else if (retobj) {
 		ret = PyInt_AsLong(retobj);
@@ -589,7 +589,7 @@ Callback_Print(char *word[], void *userdata)
 	g_free(word_eol_raw);
 	g_free(word_eol);
 	if (retobj == Py_None) {
-		ret = XCHAT_EAT_NONE;
+		ret = HEXCHAT_EAT_NONE;
 		Py_DECREF(retobj);
 	} else if (retobj) {
 		ret = PyInt_AsLong(retobj);
@@ -1170,10 +1170,10 @@ Plugin_New(char *filename, PyMethodDef *xchat_methods, PyObject *xcoobj)
 		goto error;
 	}
 
-	PyModule_AddIntConstant(m, "EAT_NONE", XCHAT_EAT_NONE);
-	PyModule_AddIntConstant(m, "EAT_XCHAT", XCHAT_EAT_XCHAT);
-	PyModule_AddIntConstant(m, "EAT_PLUGIN", XCHAT_EAT_PLUGIN);
-	PyModule_AddIntConstant(m, "EAT_ALL", XCHAT_EAT_ALL);
+	PyModule_AddIntConstant(m, "EAT_NONE", HEXCHAT_EAT_NONE);
+	PyModule_AddIntConstant(m, "EAT_XCHAT", HEXCHAT_EAT_XCHAT);
+	PyModule_AddIntConstant(m, "EAT_PLUGIN", HEXCHAT_EAT_PLUGIN);
+	PyModule_AddIntConstant(m, "EAT_ALL", HEXCHAT_EAT_ALL);
 	PyModule_AddIntConstant(m, "PRI_HIGHEST", HEXCHAT_PRI_HIGHEST);
 	PyModule_AddIntConstant(m, "PRI_HIGH", HEXCHAT_PRI_HIGH);
 	PyModule_AddIntConstant(m, "PRI_NORM", HEXCHAT_PRI_NORM);
@@ -2183,7 +2183,7 @@ Command_Py(char *word[], char *word_eol[], void *userdata)
 	}
 	if (!ok)
 		xchat_print(ph, usage);
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -2192,9 +2192,9 @@ Command_Load(char *word[], char *word_eol[], void *userdata)
 	int len = strlen(word[2]);
 	if (len > 3 && strcasecmp(".py", word[2]+len-3) == 0) {
 		Command_PyLoad(word[2]);
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
@@ -2203,9 +2203,9 @@ Command_Unload(char *word[], char *word_eol[], void *userdata)
 	int len = strlen(word[2]);
 	if (len > 3 && strcasecmp(".py", word[2]+len-3) == 0) {
 		Command_PyUnload(word[2]);
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 /* ===================================================================== */
diff --git a/plugins/sasl/sasl.c b/plugins/sasl/sasl.c
index a3f1eef6..8460f072 100644
--- a/plugins/sasl/sasl.c
+++ b/plugins/sasl/sasl.c
@@ -140,7 +140,7 @@ authend_cb (char *word[], char *word_eol[], void *userdata)
 		xchat_commandf (ph, "QUOTE CAP END");
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 /*
@@ -148,7 +148,7 @@ static int
 disconnect_cb (char *word[], void *userdata)
 {
 	xchat_printf (ph, "disconnected\n");
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 */
 
@@ -166,7 +166,7 @@ server_cb (char *word[], char *word_eol[], void *userdata)
 
 		if (!p)
 		{
-			return XCHAT_EAT_NONE;
+			return HEXCHAT_EAT_NONE;
 		}
 
 		xchat_printf (ph, "%s\tAuthenticating as %s\n", name, p->login);
@@ -184,10 +184,10 @@ server_cb (char *word[], char *word_eol[], void *userdata)
 		free (enc);
 		free (buf);
 
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
@@ -201,7 +201,7 @@ cap_cb (char *word[], char *word_eol[], void *userdata)
 		xchat_commandf (ph, "QUOTE AUTHENTICATE PLAIN");
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -221,7 +221,7 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata)
 		if (!network || !*network)	/* only check for the last word, if it's there, the previous ones will be there, too */
 		{
 			xchat_printf (ph, "%s", sasl_help);
-			return XCHAT_EAT_ALL;
+			return HEXCHAT_EAT_ALL;
 		}
 
 		if (add_info (login, password, network))
@@ -233,7 +233,7 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata)
 			xchat_printf (ph, "%s\tFailed to enable SASL authentication for the \"%s\" network\n", name, network);
 		}
 
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("DEL", mode))
 	{
@@ -242,7 +242,7 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata)
 		if (!network || !*network)
 		{
 			xchat_printf (ph, "%s", sasl_help);
-			return XCHAT_EAT_ALL;
+			return HEXCHAT_EAT_ALL;
 		}
 
 		if (del_info (network))
@@ -254,17 +254,17 @@ sasl_cmd_cb (char *word[], char *word_eol[], void *userdata)
 			xchat_printf (ph, "%s\tFailed to disable SASL authentication for the \"%s\" network\n", name, network);
 		}
 
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("LIST", mode))
 	{
 		print_info ();
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else
 	{
 		xchat_printf (ph, "%s", sasl_help);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 }
 
@@ -277,7 +277,7 @@ connect_cb (char *word[], void *userdata)
 		xchat_commandf (ph, "QUOTE CAP REQ :sasl");
 	}
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 int
diff --git a/plugins/sysinfo/sysinfo.cpp b/plugins/sysinfo/sysinfo.cpp
index c14089e7..b11ee9ff 100644
--- a/plugins/sysinfo/sysinfo.cpp
+++ b/plugins/sysinfo/sysinfo.cpp
@@ -383,7 +383,7 @@ printInfo (char *word[], char *word_eol[], void *user_data)
 		xchat_printf (ph, " * Uptime:  %.2f Hours\n", (float) GetTickCount() / 1000 / 60 / 60);
 	}
 
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 
 int
diff --git a/plugins/sysinfo/xsys.c b/plugins/sysinfo/xsys.c
index b8a6c7d5..322173ca 100644
--- a/plugins/sysinfo/xsys.c
+++ b/plugins/sysinfo/xsys.c
@@ -100,7 +100,7 @@ print_summary (int announce, char* format)
 	if (xs_parse_os (os_user, os_host, os_kernel) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_os()", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	snprintf (buffer, bsize, "%s", os_kernel);
@@ -122,7 +122,7 @@ print_summary (int announce, char* format)
 	if (xs_parse_cpu (cpu_model, cpu_vendor, &cpu_freq, cpu_cache, &count) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_cpu()", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	if (cpu_freq > 1000)
@@ -148,7 +148,7 @@ print_summary (int announce, char* format)
 	if (xs_parse_meminfo (&mem_total, &mem_free, 0) == 1)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_meminfo!", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	snprintf (buffer, bsize, "%s", pretty_freespace ("Physical", &mem_free, &mem_total));
@@ -160,7 +160,7 @@ print_summary (int announce, char* format)
 	if (xs_parse_df (NULL, buffer))
 	{
 		xchat_printf (ph, "%s\tERROR in parse_df", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	format_output ("Disk", buffer, format);
@@ -171,7 +171,7 @@ print_summary (int announce, char* format)
 	if (xs_parse_video (buffer))
 	{
 		xchat_printf (ph, "%s\tERROR in parse_video", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	format_output ("VGA", buffer, format);
@@ -202,7 +202,7 @@ print_summary (int announce, char* format)
 	if (xs_parse_uptime (&weeks, &days, &hours, &minutes, &seconds))
 	{
 		xchat_printf (ph, "%s\tERROR in parse_uptime()", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	if (minutes != 0 || hours != 0 || days != 0 || weeks != 0)
@@ -244,7 +244,7 @@ print_summary (int announce, char* format)
 		xchat_printf (ph, "%s", sysinfo);
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -258,7 +258,7 @@ print_os (int announce, char* format)
 	if (xs_parse_os (user, host, kernel) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_os()", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	snprintf (buffer, bsize, "%s@%s, %s", user, host, kernel);
@@ -273,7 +273,7 @@ print_os (int announce, char* format)
 		xchat_printf (ph, "%s", buffer);
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -284,7 +284,7 @@ print_distro (int announce, char* format)
 	if (xs_parse_distro (name) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_distro()!", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	format_output("Distro", name, format);
@@ -297,7 +297,7 @@ print_distro (int announce, char* format)
 	{
 		xchat_printf (ph, "%s", name);
 	}
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -314,7 +314,7 @@ print_cpu (int announce, char* format)
 	if (xs_parse_cpu (model, vendor, &freq, cache, &count) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_cpu()", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	if (freq > 1000)
@@ -343,7 +343,7 @@ print_cpu (int announce, char* format)
 		xchat_printf (ph, "%s", buffer);
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -358,12 +358,12 @@ print_ram (int announce, char* format)
 	if (xs_parse_meminfo (&mem_total, &mem_free, 0) == 1)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_meminfo!", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	if (xs_parse_meminfo (&swap_total, &swap_free, 1) == 1)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_meminfo!", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	snprintf (string, bsize, "%s - %s", pretty_freespace ("Physical", &mem_free, &mem_total), pretty_freespace ("Swap", &swap_free, &swap_total));
@@ -378,7 +378,7 @@ print_ram (int announce, char* format)
 		xchat_printf (ph, "%s", string);
 	}
 	
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -392,7 +392,7 @@ print_disk (int announce, char* format)
 		if (xs_parse_df (NULL, string))
 		{
 			xchat_printf (ph, "ERROR in parse_df");
-			return XCHAT_EAT_ALL;
+			return HEXCHAT_EAT_ALL;
 		}
 	}
 	else
@@ -400,7 +400,7 @@ print_disk (int announce, char* format)
 		if (xs_parse_df (*word, string))
 		{
 			xchat_printf (ph, "ERROR in parse_df");
-			return XCHAT_EAT_ALL;
+			return HEXCHAT_EAT_ALL;
 		}
 	}
 #endif
@@ -408,7 +408,7 @@ print_disk (int announce, char* format)
 	if (xs_parse_df (NULL, string))
 	{
 		xchat_printf (ph, "%s\tERROR in parse_df", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	format_output ("Disk", string, format);
@@ -422,7 +422,7 @@ print_disk (int announce, char* format)
 		xchat_printf (ph, "%s", string);
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -436,7 +436,7 @@ print_vga (int announce, char* format)
 	if ((ret = xs_parse_video (vid_card)) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_video! %d", name, ret);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	if (xs_parse_agpbridge (agp_bridge) != 0)
@@ -459,7 +459,7 @@ print_vga (int announce, char* format)
 		xchat_printf (ph, "%s", buffer);
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -470,7 +470,7 @@ print_sound (int announce, char* format)
 	if (xs_parse_sound (sound) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_asound()!", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	format_output ("Sound", sound, format);
@@ -484,7 +484,7 @@ print_sound (int announce, char* format)
 		xchat_printf (ph, "%s", sound);
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 
@@ -509,7 +509,7 @@ print_ethernet (int announce, char* format)
 		xchat_printf (ph, "%s", ethernet_card);
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -525,7 +525,7 @@ print_uptime (int announce, char* format)
 	if (xs_parse_uptime (&weeks, &days, &hours, &minutes, &seconds))
 	{
 		xchat_printf (ph, "%s\tERROR in parse_uptime()", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	if (minutes != 0 || hours != 0 || days != 0 || weeks != 0)
@@ -565,7 +565,7 @@ print_uptime (int announce, char* format)
 		xchat_printf (ph, "%s", buffer);
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -579,13 +579,13 @@ netdata_cb (char *word[], char *word_eol[], void *userdata)
 	if (*word[2] == '\0')
 	{
 		xchat_printf (ph, "%s\tYou must specify a network device (e.g. /NETDATA eth0)!", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	if (xs_parse_netdev (word[2], &bytes_recv, &bytes_sent) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_netdev", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	bytes_recv /= 1024;
@@ -604,7 +604,7 @@ netdata_cb (char *word[], char *word_eol[], void *userdata)
 		xchat_printf (ph, "%s", netdata);
 	}
 	
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -624,13 +624,13 @@ netstream_cb (char *word[], char *word_eol[], void *userdata)
 	if (*word[2] == '\0')
 	{
 		xchat_printf (ph, "%s\tYou must specify a network device (e.g. /NETSTREAM eth0)!", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	if (xs_parse_netdev(word[2], &bytes_recv, &bytes_sent) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_netdev", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	while (nanosleep (&ts, &ts) < 0);
@@ -638,7 +638,7 @@ netstream_cb (char *word[], char *word_eol[], void *userdata)
 	if (xs_parse_netdev(word[2], &bytes_recv_p, &bytes_sent_p) != 0)
 	{
 		xchat_printf (ph, "%s\tERROR in parse_netdev", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	bytes_recv = (bytes_recv_p - bytes_recv);
@@ -677,7 +677,7 @@ netstream_cb (char *word[], char *word_eol[], void *userdata)
 		xchat_printf (ph, "%s", netstream);
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static void
@@ -718,7 +718,7 @@ sysinfo_cb (char *word[], char *word_eol[], void *userdata)
 	if (!xchat_pluginpref_get_str (ph, "format", format))
 	{
 		xchat_printf (ph, "%s\tError reading config file!", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	if (xchat_list_int (ph, NULL, "type") >= 2)
@@ -729,19 +729,19 @@ sysinfo_cb (char *word[], char *word_eol[], void *userdata)
 	if (!g_ascii_strcasecmp ("HELP", word[2]))
 	{
 		xchat_printf (ph, sysinfo_help);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("LIST", word[2]))
 	{
 		list_settings ();
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("SET", word[2]))
 	{
 		if (!g_ascii_strcasecmp ("", word_eol[4]))
 		{
 			xchat_printf (ph, "%s\tEnter a value!\n", name);
-			return XCHAT_EAT_ALL;
+			return HEXCHAT_EAT_ALL;
 		}
 		if (!g_ascii_strcasecmp ("format", word[3]))
 		{
@@ -770,71 +770,71 @@ sysinfo_cb (char *word[], char *word_eol[], void *userdata)
 		else
 		{
 			xchat_printf (ph, "%s\tInvalid variable name! Use 'pciids', 'format' or 'percent'!\n", name);
-			return XCHAT_EAT_ALL;
+			return HEXCHAT_EAT_ALL;
 		}
 
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("RESET", word[2]))
 	{
 		reset_settings ();
 		xchat_printf (ph, "%s\tSettings have been restored to defaults.\n", name);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("OS", word[2]))
 	{
 		print_os (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("DISTRO", word[2]))
 	{
 		print_distro (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("CPU", word[2]))
 	{
 		print_cpu (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("RAM", word[2]))
 	{
 		print_ram (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("DISK", word[2]))
 	{
 		print_disk (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("VGA", word[2]))
 	{
 		print_vga (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("SOUND", word[2]))
 	{
 		print_sound (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("ETHERNET", word[2]))
 	{
 		print_ethernet (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("UPTIME", word[2]))
 	{
 		print_uptime (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else if (!g_ascii_strcasecmp ("", word[2]))
 	{
 		print_summary (announce, format);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	else
 	{
 		xchat_printf (ph, sysinfo_help);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 }
 
diff --git a/plugins/tcl/tclplugin.c b/plugins/tcl/tclplugin.c
index 03b73825..0e8973f9 100644
--- a/plugins/tcl/tclplugin.c
+++ b/plugins/tcl/tclplugin.c
@@ -441,14 +441,14 @@ static int Server_raw_line(char *word[], char *word_eol[], void *userdata)
     int private = 0;
 
     if (word[0][0] == 0)
-        return XCHAT_EAT_NONE;
+        return HEXCHAT_EAT_NONE;
 
     if (complete_level == MAX_COMPLETES)
-        return XCHAT_EAT_NONE;
+        return HEXCHAT_EAT_NONE;
 
     complete_level++;
-    complete[complete_level].defresult = XCHAT_EAT_NONE;     /* XCHAT_EAT_PLUGIN; */
-    complete[complete_level].result = XCHAT_EAT_NONE;
+    complete[complete_level].defresult = HEXCHAT_EAT_NONE;     /* HEXCHAT_EAT_PLUGIN; */
+    complete[complete_level].result = HEXCHAT_EAT_NONE;
     complete[complete_level].word = word;
 	complete[complete_level].word_eol = word_eol;
 
@@ -541,7 +541,7 @@ static int Server_raw_line(char *word[], char *word_eol[], void *userdata)
 
                 Tcl_Free((char *) proc_argv);
 
-                if ((complete[complete_level].result ==  XCHAT_EAT_PLUGIN) || (complete[complete_level].result == XCHAT_EAT_ALL))
+                if ((complete[complete_level].result ==  HEXCHAT_EAT_PLUGIN) || (complete[complete_level].result == HEXCHAT_EAT_ALL))
                     break;
 
             }
@@ -573,11 +573,11 @@ static int Print_Hook(char *word[], void *userdata)
     int x;
 
     if (complete_level == MAX_COMPLETES)
-        return XCHAT_EAT_NONE;
+        return HEXCHAT_EAT_NONE;
 
     complete_level++;
-    complete[complete_level].defresult = XCHAT_EAT_NONE;     /* XCHAT_EAT_PLUGIN; */
-    complete[complete_level].result = XCHAT_EAT_NONE;
+    complete[complete_level].defresult = HEXCHAT_EAT_NONE;     /* HEXCHAT_EAT_PLUGIN; */
+    complete[complete_level].result = HEXCHAT_EAT_NONE;
     complete[complete_level].word = word;
 	complete[complete_level].word_eol = word;
 
@@ -621,7 +621,7 @@ static int Print_Hook(char *word[], void *userdata)
 
                 Tcl_Free((char *) proc_argv);
 
-                if ((complete[complete_level].result ==  XCHAT_EAT_PLUGIN) || (complete[complete_level].result ==  XCHAT_EAT_ALL))
+                if ((complete[complete_level].result ==  HEXCHAT_EAT_PLUGIN) || (complete[complete_level].result ==  HEXCHAT_EAT_ALL))
                     break;
 
             }
@@ -986,13 +986,13 @@ static int tcl_complete(ClientData cd, Tcl_Interp * irp, int argc, const char *a
     if (argc == 2) {
         if (Tcl_GetInt(irp, argv[1], &complete[complete_level].result) != TCL_OK) {
             if (strcasecmp("EAT_NONE", argv[1]) == 0)
-                complete[complete_level].result = XCHAT_EAT_NONE;
+                complete[complete_level].result = HEXCHAT_EAT_NONE;
             else if (strcasecmp("EAT_XCHAT", argv[1]) == 0)
-                complete[complete_level].result = XCHAT_EAT_XCHAT;
+                complete[complete_level].result = HEXCHAT_EAT_XCHAT;
             else if (strcasecmp("EAT_PLUGIN", argv[1]) == 0)
-                complete[complete_level].result = XCHAT_EAT_PLUGIN;
+                complete[complete_level].result = HEXCHAT_EAT_PLUGIN;
             else if (strcasecmp("EAT_ALL", argv[1]) == 0)
-                complete[complete_level].result = XCHAT_EAT_ALL;
+                complete[complete_level].result = HEXCHAT_EAT_ALL;
             else
                 BADARGS(1, 2, " ?EAT_NONE|EAT_XCHAT|EAT_PLUGIN|EAT_ALL?");
         }
@@ -1914,11 +1914,11 @@ static int Command_Alias(char *word[], char *word_eol[], void *userdata)
     char *string;
 
     if (complete_level == MAX_COMPLETES)
-        return XCHAT_EAT_NONE;
+        return HEXCHAT_EAT_NONE;
 
     complete_level++;
-    complete[complete_level].defresult = XCHAT_EAT_ALL;
-    complete[complete_level].result = XCHAT_EAT_NONE;
+    complete[complete_level].defresult = HEXCHAT_EAT_ALL;
+    complete[complete_level].result = HEXCHAT_EAT_NONE;
     complete[complete_level].word = word;
 	complete[complete_level].word_eol = word_eol;
 
@@ -1953,14 +1953,14 @@ static int Null_Command_Alias(char *word[], char *word_eol[], void *userdata)
     static int recurse = 0;
 
     if (recurse)
-        return XCHAT_EAT_NONE;
+        return HEXCHAT_EAT_NONE;
 
     if (complete_level == MAX_COMPLETES)
-        return XCHAT_EAT_NONE;
+        return HEXCHAT_EAT_NONE;
 
     complete_level++;
-    complete[complete_level].defresult = XCHAT_EAT_ALL;
-    complete[complete_level].result = XCHAT_EAT_NONE;
+    complete[complete_level].defresult = HEXCHAT_EAT_ALL;
+    complete[complete_level].result = HEXCHAT_EAT_NONE;
     complete[complete_level].word = word;
 	complete[complete_level].word_eol = word_eol;
 
@@ -2008,7 +2008,7 @@ static int Command_TCL(char *word[], char *word_eol[], void *userdata)
 
     complete_level--;
 
-    return XCHAT_EAT_ALL;
+    return HEXCHAT_EAT_ALL;
 }
 
 static int Command_Source(char *word[], char *word_eol[], void *userdata)
@@ -2020,7 +2020,7 @@ static int Command_Source(char *word[], char *word_eol[], void *userdata)
     const char *errorInfo;
 
     if (!strlen(word_eol[2]))
-        return XCHAT_EAT_NONE;
+        return HEXCHAT_EAT_NONE;
 
     complete_level++;
     complete[complete_level].word = word;
@@ -2054,11 +2054,11 @@ static int Command_Source(char *word[], char *word_eol[], void *userdata)
 
         complete_level--;
 
-        return XCHAT_EAT_XCHAT;
+        return HEXCHAT_EAT_XCHAT;
 
     } else {
         complete_level--;
-        return XCHAT_EAT_NONE;
+        return HEXCHAT_EAT_NONE;
     }
 
 }
@@ -2070,7 +2070,7 @@ static int Command_Reloadall(char *word[], char *word_eol[], void *userdata)
 
     xchat_print(ph, "\0039Tcl plugin\003\tRehashed\n");
 
-    return XCHAT_EAT_ALL;
+    return HEXCHAT_EAT_ALL;
 }
 
 static int TCL_Event_Handler(void *userdata)
diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c
index 60e869cd..e0782ec0 100644
--- a/plugins/upd/upd.c
+++ b/plugins/upd/upd.c
@@ -163,14 +163,14 @@ print_version (char *word[], char *word_eol[], void *userdata)
 	if (!g_ascii_strcasecmp ("HELP", word[2]))
 	{
 		xchat_printf (ph, upd_help);
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 	else if (!g_ascii_strcasecmp ("SET", word[2]))
 	{
 		if (!g_ascii_strcasecmp ("", word_eol[4]))
 		{
 			xchat_printf (ph, "%s\tEnter a value!\n", name);
-			return XCHAT_EAT_XCHAT;
+			return HEXCHAT_EAT_XCHAT;
 		}
 		if (!g_ascii_strcasecmp ("delay", word[3]))
 		{
@@ -205,10 +205,10 @@ print_version (char *word[], char *word_eol[], void *userdata)
 		else
 		{
 			xchat_printf (ph, "%s\tInvalid variable name! Use 'delay' or 'freq'!\n", name);
-			return XCHAT_EAT_XCHAT;
+			return HEXCHAT_EAT_XCHAT;
 		}
 
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 	else if (!g_ascii_strcasecmp ("", word[2]))
 	{
@@ -230,12 +230,12 @@ print_version (char *word[], char *word_eol[], void *userdata)
 			xchat_printf (ph, "%s\tA HexChat update is available! You can download it from here:\nhttps://github.com/downloads/hexchat/hexchat/HexChat%%20%s%%20x86.exe\n", name, version);
 #endif
 		}
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 	else
 	{
 		xchat_printf (ph, upd_help);
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 }
 
diff --git a/plugins/winamp/winamp.c b/plugins/winamp/winamp.c
index ebabf276..1357ac83 100644
--- a/plugins/winamp/winamp.c
+++ b/plugins/winamp/winamp.c
@@ -155,7 +155,7 @@ HWND hwndWinamp = FindWindow("Winamp v1.x",NULL);
 	{
        xchat_print(ph, "Winamp not found.\n");
 	}
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 int
diff --git a/plugins/wmpa/hexchat-plugin.cpp b/plugins/wmpa/hexchat-plugin.cpp
index dcf82965..38f6456c 100644
--- a/plugins/wmpa/hexchat-plugin.cpp
+++ b/plugins/wmpa/hexchat-plugin.cpp
@@ -146,7 +146,7 @@ int wmpaAuto(char *word[], char *word_eol[], void *user_data)
    char *state;
 
    pDialog = GetWMPADialog();
-   if (pDialog == NULL) return(XCHAT_EAT_ALL);
+   if (pDialog == NULL) return(HEXCHAT_EAT_ALL);
 
    if (CString(word[2]).IsEmpty()) {
       if (pDialog->autoAnnounce) {
@@ -169,7 +169,7 @@ int wmpaAuto(char *word[], char *word_eol[], void *user_data)
 
    xchat_printf(ph, "WMPA: auto is %s", state);
 
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -179,7 +179,7 @@ int wmpaCurr(char *word[], char *word_eol[], void *user_data)
 {
    xchat_printf(ph, "WMPA: Playing %s", (LPCTSTR) wmpaGetSongTitle());
 
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -243,7 +243,7 @@ int wmpaFind(char *word[], char *word_eol[], void *user_data)
 
    }
 
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -289,7 +289,7 @@ int wmpaList(char *word[], char *word_eol[], void *user_data)
 
    }
 
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -301,7 +301,7 @@ int wmpaNext(char *word[], char *word_eol[], void *user_data)
       wmp->GetControls().next();
       xchat_printf(ph, "WMPA: Playing %s", (LPCTSTR) wmpaGetSongTitle());
    }
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -313,7 +313,7 @@ int wmpaPlay(char *word[], char *word_eol[], void *user_data)
       wmp->GetControls().play();
       xchat_printf(ph, "WMPA: Playing %s", (LPCTSTR) wmpaGetSongTitle());
    }
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -325,7 +325,7 @@ int wmpaPause(char *word[], char *word_eol[], void *user_data)
       wmp->GetControls().pause();
       xchat_printf(ph, "WMPA: Pausing %s", (LPCTSTR) wmpaGetSongTitle());
    }
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -337,7 +337,7 @@ int wmpaPrev(char *word[], char *word_eol[], void *user_data)
       wmp->GetControls().previous();
       xchat_printf(ph, "WMPA: Playing %s", (LPCTSTR) wmpaGetSongTitle());
    }
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -349,7 +349,7 @@ int wmpaSong(char *word[], char *word_eol[], void *user_data)
 
    xchat_commandf(ph, "me is playing %s", (LPCTSTR) songTitle);
 
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -361,7 +361,7 @@ int wmpaStop(char *word[], char *word_eol[], void *user_data)
       wmp->GetControls().stop();
       xchat_printf(ph, "WMPA: Stopping %s", (LPCTSTR) wmpaGetSongTitle());
    }
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -374,7 +374,7 @@ int wmpaHelp(char *word[], char *word_eol[], void *user_data)
    wmpaCommands();
    xchat_printf(ph, "\n");
 
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -399,7 +399,7 @@ int wmpaVolume(char *word[], char *word_eol[], void *user_data)
 
    xchat_printf(ph, "WMPA: volume is %d", volume);
 
-   return(XCHAT_EAT_ALL);
+   return(HEXCHAT_EAT_ALL);
 }
 
 /******************************************************************
@@ -472,7 +472,7 @@ CString wmpaGetSongTitle(void)
    CWMPMedia media      = wmp->GetCurrentMedia();
    if (media == NULL) {
       xchat_printf(ph, "WMPA: Could not get current media");
-      return(XCHAT_EAT_ALL);
+      return(HEXCHAT_EAT_ALL);
    }
 
    CString artist       = media.getItemInfo("Artist");
diff --git a/plugins/wmpa/hexchat-plugin.h b/plugins/wmpa/hexchat-plugin.h
index fb398b3a..bb6b89ce 100644
--- a/plugins/wmpa/hexchat-plugin.h
+++ b/plugins/wmpa/hexchat-plugin.h
@@ -20,10 +20,10 @@
 #define HEXCHAT_FD_EXCEPTION 4
 #define HEXCHAT_FD_NOTSOCKET 8
 
-#define XCHAT_EAT_NONE     0                                   /* pass it on through! */
-#define XCHAT_EAT_XCHAT    1                                   /* don't let xchat see this event */
-#define XCHAT_EAT_PLUGIN   2                                   /* don't let other plugins see this event */
-#define XCHAT_EAT_ALL      (XCHAT_EAT_XCHAT|XCHAT_EAT_PLUGIN)  /* don't let anything see this event */
+#define HEXCHAT_EAT_NONE     0                                   /* pass it on through! */
+#define HEXCHAT_EAT_XCHAT    1                                   /* don't let xchat see this event */
+#define HEXCHAT_EAT_PLUGIN   2                                   /* don't let other plugins see this event */
+#define HEXCHAT_EAT_ALL      (HEXCHAT_EAT_XCHAT|HEXCHAT_EAT_PLUGIN)  /* don't let anything see this event */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/plugins/xdcc/xdcc.c b/plugins/xdcc/xdcc.c
index d26eb43b..9ccfebfe 100644
--- a/plugins/xdcc/xdcc.c
+++ b/plugins/xdcc/xdcc.c
@@ -158,13 +158,13 @@ static int xdcc_command(char *word[], char *word_eol[], void *userdata)
 			else
 				xchat_printf(ph, "Cannot read %s\n", word[4]);
 		}
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
 	if(strcasecmp(word[2], "DEL") == 0)
 	{
 		xdcc_del(word[3]);
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
 	if(strcasecmp(word[2], "SLOTS") == 0)
@@ -177,27 +177,27 @@ static int xdcc_command(char *word[], char *word_eol[], void *userdata)
 		{
 			xchat_printf(ph, "XDCC slots: %d\n", xdcc_slots);
 		}
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
 	if(strcasecmp(word[2], "ON") == 0)
 	{
 		xdcc_on = TRUE;
 		xchat_print(ph, "XDCC now ON\n");
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
 	if(strcasecmp(word[2], "LIST") == 0)
 	{
 		xdcc_list("", "", "", "echo");
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
 	if(strcasecmp(word[2], "OFF") == 0)
 	{
 		xdcc_on = FALSE;
 		xchat_print(ph, "XDCC now OFF\n");
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
 	xchat_print(ph, "Syntax: XDCC ADD <name> <fullpath> <description>\n"
@@ -207,7 +207,7 @@ static int xdcc_command(char *word[], char *word_eol[], void *userdata)
 						 "        XDCC ON\n"
 						 "        XDCC OFF\n\n");
 
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 
 static void xdcc_remote(char *from, char *msg)
@@ -243,7 +243,7 @@ static int ctcp_cb(char *word[], void *userdata)
 	if(strncasecmp(msg, "XDCC ", 5) == 0)
 		xdcc_remote(from, msg + 5);
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static void xdcc_save(void)
diff --git a/share/doc/plugins.md b/share/doc/plugins.md
index e49fe643..dafeb559 100644
--- a/share/doc/plugins.md
+++ b/share/doc/plugins.md
@@ -51,7 +51,7 @@ join_cb (char *word[], void *userdata)
 	}
 	/* word[1] is the nickname, as in the Settings->Advanced->TextEvents window in xchat */
 
-	return XCHAT_EAT_NONE;		/* don't eat this event, HexChat needs to see it! */
+	return HEXCHAT_EAT_NONE;		/* don't eat this event, HexChat needs to see it! */
 }
 
 static int
@@ -68,7 +68,7 @@ autooptoggle_cb (char *word[], char *word_eol[], void *userdata)
 		xchat_print (ph, "AutoOping now disabled!\n");
 	}
 
-	return XCHAT_EAT_ALL;		/* eat this command so HexChat and other plugins can't process it */
+	return HEXCHAT_EAT_ALL;		/* eat this command so HexChat and other plugins can't process it */
 }
 
 void
@@ -407,7 +407,7 @@ ctcp_cb (char *word[], char *word_eol[], void *userdata)
 		get_file_name (nick, word[2]);
 	}
 
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 
 static void
@@ -495,11 +495,11 @@ onotice_cb (char *word[], char *word_eol[], void *userdata)
 	if (word_eol[2][0] == 0)
 	{
 		xchat_printf (ph, "Second arg must be the message!\n");
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 
 	xchat_commandf (ph, "NOTICE @%s :%s", xchat_get_info (ph, "channel"), word_eol[2]);
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 xchat_hook_command (ph, "ONOTICE", HEXCHAT_PRI_NORM, onotice_cb, "Usage: ONOTICE &lt;message> Sends a notice to all ops", NULL);
@@ -569,7 +569,7 @@ static int
 youpart_cb (char *word[], void *userdata)
 {
 	xchat_printf (ph, "You have left channel %s\n", word[3]);
-	return XCHAT_EAT_XCHAT;		/* dont let HexChat do its normal printing */
+	return HEXCHAT_EAT_XCHAT;		/* dont let HexChat do its normal printing */
 }
 
 xchat_hook_print (ph, "You Part", HEXCHAT_PRI_NORM, youpart_cb, NULL);
@@ -601,7 +601,7 @@ static int
 kick_cb (char *word[], char *word_eol[], void *userdata)
 {
 	xchat_printf (ph, "%s was kicked from %s (reason=%s)\n", word[4], word[3], word_eol[5]);
-	return XCHAT_EAT_NONE;		/* don't eat this event, let other plugins and HexChat see it too */
+	return HEXCHAT_EAT_NONE;		/* don't eat this event, let other plugins and HexChat see it too */
 }
 
 xchat_hook_server (ph, "KICK", HEXCHAT_PRI_NORM, kick_cb, NULL);
@@ -639,7 +639,7 @@ stop_cb (char *word[], char *word_eol[], void *userdata)
 		xchat_print (ph, "Timeout removed!\n");
 	}
 
-	return XCHAT_EAT_ALL;
+	return HEXCHAT_EAT_ALL;
 }
 
 static int
@@ -1076,7 +1076,7 @@ saveint_cb (char *word[], char *word_eol[], void *user_data)
 		xchat_printf (ph, "Invalid input!\n");
 	}
 
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 </pre>
 
diff --git a/src/common/dbus/dbus-plugin.c b/src/common/dbus/dbus-plugin.c
index 5f38fba8..c1cca2fc 100644
--- a/src/common/dbus/dbus-plugin.c
+++ b/src/common/dbus/dbus-plugin.c
@@ -1000,7 +1000,7 @@ open_context_cb (char *word[],
 	info->context = xchat_get_context (ph);
 	contexts = g_list_prepend (contexts, info);
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
@@ -1018,7 +1018,7 @@ close_context_cb (char *word[],
 		}
 	}
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static gboolean
@@ -1042,10 +1042,10 @@ unload_plugin_cb (char *word[], char *word_eol[], void *userdata)
 		g_signal_emit (obj, 
 			       signals[UNLOAD_SIGNAL],
 			       0);
-		return XCHAT_EAT_ALL;
+		return HEXCHAT_EAT_ALL;
 	}
 	
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 int
diff --git a/src/common/hexchat-plugin.h b/src/common/hexchat-plugin.h
index 459b1c03..423061f2 100644
--- a/src/common/hexchat-plugin.h
+++ b/src/common/hexchat-plugin.h
@@ -15,10 +15,10 @@
 #define HEXCHAT_FD_EXCEPTION	4
 #define HEXCHAT_FD_NOTSOCKET	8
 
-#define XCHAT_EAT_NONE		0	/* pass it on through! */
-#define XCHAT_EAT_XCHAT		1	/* don't let xchat see this event */
-#define XCHAT_EAT_PLUGIN	2	/* don't let other plugins see this event */
-#define XCHAT_EAT_ALL		(XCHAT_EAT_XCHAT|XCHAT_EAT_PLUGIN)	/* don't let anything see this event */
+#define HEXCHAT_EAT_NONE		0	/* pass it on through! */
+#define HEXCHAT_EAT_XCHAT		1	/* don't let xchat see this event */
+#define HEXCHAT_EAT_PLUGIN	2	/* don't let other plugins see this event */
+#define HEXCHAT_EAT_ALL		(HEXCHAT_EAT_XCHAT|HEXCHAT_EAT_PLUGIN)	/* don't let anything see this event */
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/common/plugin-timer.c b/src/common/plugin-timer.c
index 8da1edbf..b294c005 100644
--- a/src/common/plugin-timer.c
+++ b/src/common/plugin-timer.c
@@ -148,7 +148,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata)
 	if (!word[2][0])
 	{
 		timer_showlist ();
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
 	if (g_ascii_strcasecmp (word[2], "-quiet") == 0)
@@ -160,7 +160,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata)
 	if (g_ascii_strcasecmp (word[2 + offset], "-delete") == 0)
 	{
 		timer_del_ref (atoi (word[3 + offset]), quiet);
-		return XCHAT_EAT_XCHAT;
+		return HEXCHAT_EAT_XCHAT;
 	}
 
 	if (g_ascii_strcasecmp (word[2 + offset], "-refnum") == 0)
@@ -183,7 +183,7 @@ timer_cb (char *word[], char *word_eol[], void *userdata)
 	else
 		timer_add (ref, timeout, repeat, command);
 
-	return XCHAT_EAT_XCHAT;
+	return HEXCHAT_EAT_XCHAT;
 }
 
 int
diff --git a/src/common/plugin.c b/src/common/plugin.c
index b2b79386..8961f0d2 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -562,14 +562,14 @@ plugin_hook_run (session *sess, char *name, char *word[], char *word_eol[], int
 			break;
 		}
 
-		if ((ret & XCHAT_EAT_XCHAT) && (ret & XCHAT_EAT_PLUGIN))
+		if ((ret & HEXCHAT_EAT_XCHAT) && (ret & HEXCHAT_EAT_PLUGIN))
 		{
 			eat = 1;
 			goto xit;
 		}
-		if (ret & XCHAT_EAT_PLUGIN)
+		if (ret & HEXCHAT_EAT_PLUGIN)
 			goto xit;	/* stop running plugins */
-		if (ret & XCHAT_EAT_XCHAT)
+		if (ret & HEXCHAT_EAT_XCHAT)
 			eat = 1;	/* eventually we'll return 1, but continue running plugins */
 
 		list = next;
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index 581e9dfc..76154492 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -576,7 +576,7 @@ static int
 tray_hilight_cb (char *word[], void *userdata)
 {
 	/*if (tray_status == TS_HIGHLIGHT)
-		return XCHAT_EAT_NONE;*/
+		return HEXCHAT_EAT_NONE;*/
 
 	if (prefs.hex_input_tray_hilight && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
 	{
@@ -596,14 +596,14 @@ tray_hilight_cb (char *word[], void *userdata)
 		tray_set_balloonf (word[2], _(DISPLAY_NAME": Highlighted message from: %s (%s)"),
 								 word[1], xchat_get_info (ph, "channel"));
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
 tray_message_cb (char *word[], void *userdata)
 {
 	if (/*tray_status == TS_MESSAGE ||*/ tray_status == TS_HIGHLIGHT)
-		return XCHAT_EAT_NONE;
+		return HEXCHAT_EAT_NONE;
 
 	if (prefs.hex_input_tray_chans && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
 	{
@@ -621,7 +621,7 @@ tray_message_cb (char *word[], void *userdata)
 		tray_set_balloonf (word[2], _(DISPLAY_NAME": New public message from: %s (%s)"),
 								 word[1], xchat_get_info (ph, "channel"));
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static void
@@ -655,24 +655,24 @@ static int
 tray_priv_cb (char *word[], void *userdata)
 {
 	/*if (tray_status == TS_HIGHLIGHT)
-		return XCHAT_EAT_NONE;*/
+		return HEXCHAT_EAT_NONE;*/
 
 	if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
 		tray_priv (word[1], word[2]);
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
 tray_invited_cb (char *word[], void *userdata)
 {
 	/*if (tray_status == TS_HIGHLIGHT)
-		return XCHAT_EAT_NONE;*/
+		return HEXCHAT_EAT_NONE;*/
 
 	if (prefs.hex_input_tray_priv && (!prefs.hex_away_omit_alerts || tray_find_away_status () != 1))
 		tray_priv (word[2], "Invited");
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
@@ -681,7 +681,7 @@ tray_dcc_cb (char *word[], void *userdata)
 	const char *network;
 
 /*	if (tray_status == TS_FILEOFFER)
-		return XCHAT_EAT_NONE;*/
+		return HEXCHAT_EAT_NONE;*/
 
 	network = xchat_get_info (ph, "network");
 	if (!network)
@@ -704,7 +704,7 @@ tray_dcc_cb (char *word[], void *userdata)
 		tray_set_balloonf ("", _(DISPLAY_NAME": File offer from: %s (%s)"),
 								word[1], network);
 
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static int
@@ -712,7 +712,7 @@ tray_focus_cb (char *word[], void *userdata)
 {
 	tray_stop_flash ();
 	tray_reset_counts ();
-	return XCHAT_EAT_NONE;
+	return HEXCHAT_EAT_NONE;
 }
 
 static void