diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 4a9cee09..9ca89e34 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DIST = plugin20.html Make.plugin plugin-conf.in \ xdcc/xdcc.c \ xdcc/Makefile.am -noinst_HEADERS = xchat-plugin.h +noinst_HEADERS = hexchat-plugin.h if DO_PYTHON pythondir = python diff --git a/plugins/checksum/checksum.c b/plugins/checksum/checksum.c index f84eb243..d00249b0 100644 --- a/plugins/checksum/checksum.c +++ b/plugins/checksum/checksum.c @@ -46,7 +46,7 @@ #include -#include "xchat-plugin.h" +#include "hexchat-plugin.h" #define BUFSIZE 32768 #define DEFAULT_LIMIT 256 /* default size is 256 MiB */ diff --git a/plugins/dns/dns.c b/plugins/dns/dns.c index eb9bb7ee..2d269b01 100644 --- a/plugins/dns/dns.c +++ b/plugins/dns/dns.c @@ -43,7 +43,7 @@ #include #endif -#include "xchat-plugin.h" +#include "hexchat-plugin.h" #include "thread.h" #define HELP "Usage: DNS \n" diff --git a/plugins/doat/doat.c b/plugins/doat/doat.c index a0b5707a..237233c5 100644 --- a/plugins/doat/doat.c +++ b/plugins/doat/doat.c @@ -8,7 +8,7 @@ #include #include #include -#include "xchat-plugin.h" +#include "hexchat-plugin.h" static xchat_plugin *ph; diff --git a/plugins/ewc/ewc.c b/plugins/ewc/ewc.c index 78e7e9ac..55366da6 100644 --- a/plugins/ewc/ewc.c +++ b/plugins/ewc/ewc.c @@ -17,8 +17,8 @@ License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "xchat-plugin.h" #include +#include "hexchat-plugin.h" static xchat_plugin *ph; /* plugin handle */ static int enable = 1; diff --git a/plugins/exec/exec.c b/plugins/exec/exec.c index 28bc13ab..6f3e350c 100644 --- a/plugins/exec/exec.c +++ b/plugins/exec/exec.c @@ -23,7 +23,7 @@ #include #include -#include "xchat-plugin.h" +#include "hexchat-plugin.h" static xchat_plugin *ph; /* plugin handle */ static const char name[] = "Exec"; diff --git a/plugins/fishlim/Makefile.am b/plugins/fishlim/Makefile.am index 0f1189de..913312b5 100644 --- a/plugins/fishlim/Makefile.am +++ b/plugins/fishlim/Makefile.am @@ -3,7 +3,7 @@ EXTRA_DIST = INSTALL LICENSE README libdir = $(hexchatlibdir)/plugins lib_LTLIBRARIES = fishlim.la -fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_xchat.c +fishlim_la_SOURCES = fish.c irc.c keystore.c misc.c plugin_hexchat.c fishlim_la_LDFLAGS = -avoid-version -module fishlim_la_LIBADD = AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(srcdir)/.. diff --git a/plugins/fishlim/fishlim-xp.vcxproj b/plugins/fishlim/fishlim-xp.vcxproj index cabcd2fd..8b19b6dc 100644 --- a/plugins/fishlim/fishlim-xp.vcxproj +++ b/plugins/fishlim/fishlim-xp.vcxproj @@ -106,14 +106,14 @@ - + - + diff --git a/plugins/fishlim/fishlim-xp.vcxproj.filters b/plugins/fishlim/fishlim-xp.vcxproj.filters index 72e9f017..7c13733b 100644 --- a/plugins/fishlim/fishlim-xp.vcxproj.filters +++ b/plugins/fishlim/fishlim-xp.vcxproj.filters @@ -35,7 +35,7 @@ Header Files - + Header Files @@ -52,7 +52,7 @@ Source Files - + Source Files diff --git a/plugins/fishlim/fishlim.vcxproj b/plugins/fishlim/fishlim.vcxproj index 0f166e6b..91925660 100644 --- a/plugins/fishlim/fishlim.vcxproj +++ b/plugins/fishlim/fishlim.vcxproj @@ -103,14 +103,14 @@ - + - + diff --git a/plugins/fishlim/fishlim.vcxproj.filters b/plugins/fishlim/fishlim.vcxproj.filters index 72e9f017..7c13733b 100644 --- a/plugins/fishlim/fishlim.vcxproj.filters +++ b/plugins/fishlim/fishlim.vcxproj.filters @@ -35,7 +35,7 @@ Header Files - + Header Files @@ -52,7 +52,7 @@ Source Files - + Source Files diff --git a/plugins/fishlim/keystore.c b/plugins/fishlim/keystore.c index c54b5dca..9f1c446e 100644 --- a/plugins/fishlim/keystore.c +++ b/plugins/fishlim/keystore.c @@ -29,7 +29,7 @@ #include "fish.h" #include "misc.h" #include "keystore.h" -#include "plugin_xchat.h" +#include "plugin_hexchat.h" static char *keystore_password = NULL; diff --git a/plugins/fishlim/plugin_xchat.c b/plugins/fishlim/plugin_hexchat.c similarity index 99% rename from plugins/fishlim/plugin_xchat.c rename to plugins/fishlim/plugin_hexchat.c index ff75fa93..91ba1d6a 100644 --- a/plugins/fishlim/plugin_xchat.c +++ b/plugins/fishlim/plugin_hexchat.c @@ -27,7 +27,7 @@ #include // #pragma GCC visibility push(default) -#include "xchat-plugin.h" +#include "hexchat-plugin.h" #define XCHAT_MAX_WORDS 32 // #pragma GCC visibility pop diff --git a/plugins/fishlim/plugin_xchat.h b/plugins/fishlim/plugin_hexchat.h similarity index 95% rename from plugins/fishlim/plugin_xchat.h rename to plugins/fishlim/plugin_hexchat.h index d606526d..04a1f4ff 100644 --- a/plugins/fishlim/plugin_xchat.h +++ b/plugins/fishlim/plugin_hexchat.h @@ -22,8 +22,8 @@ */ -#ifndef XCHAT_PLUGIN_H -#define XCHAT_PLUGIN_H +#ifndef PLUGIN_HEXCHAT_H +#define PLUGIN_HEXCHAT_H gchar *get_config_filename(); diff --git a/plugins/gtkpref/gtkpref.c b/plugins/gtkpref/gtkpref.c index 84f51726..1f6241c1 100644 --- a/plugins/gtkpref/gtkpref.c +++ b/plugins/gtkpref/gtkpref.c @@ -22,7 +22,7 @@ #include -#include "xchat-plugin.h" +#include "hexchat-plugin.h" static xchat_plugin *ph; /* plugin handle */ diff --git a/src/common/xchat-plugin.h b/plugins/hexchat-plugin.h similarity index 99% rename from src/common/xchat-plugin.h rename to plugins/hexchat-plugin.h index 1b7da8fb..43621f78 100644 --- a/src/common/xchat-plugin.h +++ b/plugins/hexchat-plugin.h @@ -1,6 +1,6 @@ /* You can distribute this header with your plugins for easy compilation */ -#ifndef XCHAT_PLUGIN_H -#define XCHAT_PLUGIN_H +#ifndef HEXCHAT_PLUGIN_H +#define HEXCHAT_PLUGIN_H #include diff --git a/plugins/hextray/callbacks.cpp b/plugins/hextray/callbacks.cpp index 96990050..e7dcfdba 100644 --- a/plugins/hextray/callbacks.cpp +++ b/plugins/hextray/callbacks.cpp @@ -23,10 +23,10 @@ #include #include -#include "xchat-plugin.h" +#include "hexchat-plugin.h" #include "utility.h" -#include "xtray.h" -#include "xchat.h" +#include "hextray.h" +#include "hexchat.h" #include "callbacks.h" #include "resource.h" #include "sdTray.h" @@ -45,7 +45,7 @@ BOOL CALLBACK EnumWindowsProc(HWND hWnd, LPARAM lParam) TCHAR szTitle[10]; GetWindowText(hWnd, szTitle, 9); - if(_tcsstr(szTitle, _T("XChat ["))) + if(_tcsstr(szTitle, _T("HexChat ["))) { g_hXchatWnd = hWnd; return false; diff --git a/plugins/hextray/xchat.cpp b/plugins/hextray/hexchat.cpp similarity index 93% rename from plugins/hextray/xchat.cpp rename to plugins/hextray/hexchat.cpp index 47ce46a9..b1defc1f 100644 --- a/plugins/hextray/xchat.cpp +++ b/plugins/hextray/hexchat.cpp @@ -22,10 +22,10 @@ #include #include -#include "xchat-plugin.h" -#include "xtray.h" +#include "hexchat-plugin.h" +#include "hextray.h" #include "resource.h" -#include "xchat.h" +#include "hexchat.h" #include "utility.h" // from util.c of xchat source code ( slightly modified to fit X-Tray Syntax ) diff --git a/plugins/hextray/xchat.h b/plugins/hextray/hexchat.h similarity index 100% rename from plugins/hextray/xchat.h rename to plugins/hextray/hexchat.h diff --git a/plugins/hextray/hextray-xp.vcxproj b/plugins/hextray/hextray-xp.vcxproj index cd7581d5..72d1599e 100644 --- a/plugins/hextray/hextray-xp.vcxproj +++ b/plugins/hextray/hextray-xp.vcxproj @@ -69,7 +69,7 @@ true true true - xtray.def + hextray.def ntstc_msvcrt.lib;%(AdditionalDependencies) @@ -89,7 +89,7 @@ true true true - xtray.def + hextray.def ntstc_msvcrt.lib;%(AdditionalDependencies) @@ -103,7 +103,7 @@ - + @@ -113,8 +113,8 @@ - - + + @@ -122,8 +122,8 @@ - - + + diff --git a/plugins/hextray/hextray-xp.vcxproj.filters b/plugins/hextray/hextray-xp.vcxproj.filters index b83dc813..1f9a4057 100644 --- a/plugins/hextray/hextray-xp.vcxproj.filters +++ b/plugins/hextray/hextray-xp.vcxproj.filters @@ -21,7 +21,7 @@ - + Resource Files @@ -70,10 +70,10 @@ Source Files - + Source Files - + Source Files @@ -93,10 +93,10 @@ Header Files - + Header Files - + Header Files diff --git a/plugins/hextray/xtray.cpp b/plugins/hextray/hextray.cpp similarity index 97% rename from plugins/hextray/xtray.cpp rename to plugins/hextray/hextray.cpp index df4a5c89..9741e5f7 100644 --- a/plugins/hextray/xtray.cpp +++ b/plugins/hextray/hextray.cpp @@ -23,11 +23,11 @@ #include #include -#include "xchat-plugin.h" +#include "hexchat-plugin.h" #include "resource.h" #include "callbacks.h" #include "utility.h" -#include "xtray.h" +#include "hextray.h" #include "sdTray.h" #include "sdAlerts.h" diff --git a/plugins/hextray/xtray.def b/plugins/hextray/hextray.def similarity index 100% rename from plugins/hextray/xtray.def rename to plugins/hextray/hextray.def diff --git a/plugins/hextray/xtray.h b/plugins/hextray/hextray.h similarity index 100% rename from plugins/hextray/xtray.h rename to plugins/hextray/hextray.h diff --git a/plugins/hextray/hextray.vcxproj b/plugins/hextray/hextray.vcxproj index 47f4c273..fd28aae3 100644 --- a/plugins/hextray/hextray.vcxproj +++ b/plugins/hextray/hextray.vcxproj @@ -66,7 +66,7 @@ true true true - xtray.def + hextray.def @@ -85,7 +85,7 @@ true true true - xtray.def + hextray.def @@ -98,7 +98,7 @@ - + @@ -108,8 +108,8 @@ - - + + @@ -117,8 +117,8 @@ - - + + diff --git a/plugins/hextray/hextray.vcxproj.filters b/plugins/hextray/hextray.vcxproj.filters index b83dc813..1f9a4057 100644 --- a/plugins/hextray/hextray.vcxproj.filters +++ b/plugins/hextray/hextray.vcxproj.filters @@ -21,7 +21,7 @@ - + Resource Files @@ -70,10 +70,10 @@ Source Files - + Source Files - + Source Files @@ -93,10 +93,10 @@ Header Files - + Header Files - + Header Files diff --git a/plugins/hextray/resource.rc b/plugins/hextray/resource.rc index 4b028421..01899ac7 100644 --- a/plugins/hextray/resource.rc +++ b/plugins/hextray/resource.rc @@ -201,7 +201,7 @@ END 3 TEXTINCLUDE BEGIN - "xtray.h\0" + "hextray.h\0" END 4 TEXTINCLUDE @@ -303,7 +303,7 @@ IDB_SD_LOGO BITMAP "bitmaps\\sd.bmp" // // Generated from the TEXTINCLUDE 3 resource. // -xtray.h +hextray.h ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/plugins/hextray/utility.cpp b/plugins/hextray/utility.cpp index 8f6caa27..4a2ddde7 100644 --- a/plugins/hextray/utility.cpp +++ b/plugins/hextray/utility.cpp @@ -21,9 +21,9 @@ #include #include -#include "xchat-plugin.h" +#include "hexchat-plugin.h" #include "utility.h" -#include "xtray.h" +#include "hextray.h" #include "callbacks.h" #include "resource.h" diff --git a/plugins/lua/lua.c b/plugins/lua/lua.c index 8fc55a26..3809e66e 100644 --- a/plugins/lua/lua.c +++ b/plugins/lua/lua.c @@ -65,7 +65,7 @@ #define lua_pop(L,n) lua_settop(L, -(n)-1) -#include "xchat-plugin.h" +#include "hexchat-plugin.h" static xchat_plugin *ph; /* plugin handle */ diff --git a/plugins/mailcheck/mailcheck.c b/plugins/mailcheck/mailcheck.c index 19011ab3..fb507539 100644 --- a/plugins/mailcheck/mailcheck.c +++ b/plugins/mailcheck/mailcheck.c @@ -7,7 +7,7 @@ #include #include -#include "xchat-plugin.h" +#include "hexchat-plugin.h" static xchat_plugin *ph; /* plugin handle */ diff --git a/plugins/mpcinfo/mpcInfo.c b/plugins/mpcinfo/mpcInfo.c index e467e516..cfbcc3b7 100644 --- a/plugins/mpcinfo/mpcInfo.c +++ b/plugins/mpcinfo/mpcInfo.c @@ -23,7 +23,7 @@ static char *VERSION="0.0.6"; #include #include #include -#include "xchat-plugin.h" +#include "hexchat-plugin.h" static xchat_plugin *ph; #include "functions.c" diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c index c9bfa5e9..38de8208 100644 --- a/plugins/perl/perl.c +++ b/plugins/perl/perl.c @@ -33,7 +33,7 @@ #undef PACKAGE #include "../../config.h" /* for #define OLD_PERL */ -#include "xchat-plugin.h" +#include "hexchat-plugin.h" static xchat_plugin *ph; /* plugin handle */ diff --git a/plugins/plugin-conf.in b/plugins/plugin-conf.in index 1e2c338e..f43f5c53 100644 --- a/plugins/plugin-conf.in +++ b/plugins/plugin-conf.in @@ -1,12 +1,12 @@ AC_INIT(@PLUGIN@-config.h.in) AM_CONFIG_HEADER(@PLUGIN@-config.h) -AM_INIT_AUTOMAKE(xchat-@PLUGIN@, @PLUGIN_VERSION@) +AM_INIT_AUTOMAKE(hexchat-@PLUGIN@, @PLUGIN_VERSION@) AM_MAINTAINER_MODE AM_DISABLE_STATIC AM_PROG_LIBTOOL AC_ARG_WITH(plugin-includes, -[ --with-plugin-includes directory containing xchat-plugin.h], +[ --with-plugin-includes directory containing hexchat-plugin.h], PLUGIN_INCLUDES=$enableval) AC_SUBST(PLUGIN_INCLUDES) diff --git a/plugins/plugin20.html b/plugins/plugin20.html index 2c2d106c..e17f3346 100644 --- a/plugins/plugin20.html +++ b/plugins/plugin20.html @@ -101,12 +101,12 @@ margin-right: 32px;

Introduction

-Plugins for XChat are written in C. The interface aims to keep 100% -binary compatability. This means that if you upgrade XChat, you will +Plugins for HexChat are written in C. The interface aims to keep 100% +binary compatability. This means that if you upgrade HexChat, you will not need to recompile your plugins, they'll continue to work. The interface doesn't depend on any structures and offsets, so compiler versions shouldn't have an impact either. The only real requirement of -an XChat plugin, is that it define a "xchat_plugin_init" symbol. This +an HexChat plugin, is that it define a "xchat_plugin_init" symbol. This is your entry point function, see the example below. You should make all your global variables and functions static, so that a symbol is not exported. There is no harm in exporting these symbols, but they @@ -130,7 +130,7 @@ of locale. What does this mean?

Sample plugin

This simple plugin autoOps anyone who joins a channel you're in. It also adds a new command /AUTOOPTOGGLE, which can be used to turn the feature ON -or OFF. Every XChat plugin must define an xchat_plugin_init function, this +or OFF. Every HexChat plugin must define an xchat_plugin_init function, this is the normal entry point. xchat_plugin_deinit is optional.
@@ -142,7 +142,7 @@ is the normal entry point. xchat_plugin_deinit is optional. #define PDESC "Auto Ops anyone that joins" #define PVERSION "0.1" -static xchat_plugin *ph; /* plugin handle */ +static hexchat_plugin *ph; /* plugin handle */ static int enable = 1; static int join_cb(char *word[], void *userdata) @@ -152,7 +152,7 @@ is the normal entry point. xchat_plugin_deinit is optional. xchat_commandf(ph, "OP %s", word[1]); /* word[1] is the nickname, as in the Settings->Advanced->TextEvents window in xchat */ - return XCHAT_EAT_NONE; /* don't eat this event, xchat needs to see it! */ + return XCHAT_EAT_NONE; /* don't eat this event, HexChat needs to see it! */ } static int autooptoggle_cb(char *word[], char *word_eol[], void *userdata) @@ -167,7 +167,7 @@ is the normal entry point. xchat_plugin_deinit is optional. xchat_print(ph, "AutoOping now disabled!\n"); } - return XCHAT_EAT_ALL; /* eat this command so xchat and other plugins can't process it */ + return XCHAT_EAT_ALL; /* eat this command so HexChat and other plugins can't process it */ } void xchat_plugin_get_info(char **name, char **desc, char **version, void **reserved) @@ -186,7 +186,7 @@ is the normal entry point. xchat_plugin_deinit is optional. /* we need to save this for use with any xchat_* functions */ ph = plugin_handle; - /* tell xchat our info */ + /* tell HexChat our info */ *plugin_name = PNAME; *plugin_desc = PDESC; *plugin_version = PVERSION; @@ -358,7 +358,7 @@ Yes, it can be done. All you need is either Simply compile your plugin as a DLL. You should have the following files:
    -
  • xchat-plugin.h - Main Plugin header
    • +
  • hexchat-plugin.h - Main Plugin header
  • plugin.c - Your plugin, you need to write this one :)
  • plugin.def - A simple text file containing the following:
@@ -395,16 +395,16 @@ xchat_command(ph, "GUI .....");.

- - + + - - + + - +
GUI ATTACHSame function as "Attach Window" in the XChat menu (new for 2.6.2).
GUI DETACHSame function as "Detach Tab" in the XChat menu (new for 2.6.2).
GUI ATTACHSame function as "Attach Window" in the HexChat menu (new for 2.6.2).
GUI DETACHSame function as "Detach Tab" in the HexChat menu (new for 2.6.2).
GUI APPLYSimilar to clicking OK in the settings window. Execute this after /SET to activate GUI changes (new for 2.8.0)
GUI COLOR nChange the tab color of the current context, where n is a number from 0 to 3.
GUI FOCUSFocus the current window or tab.
GUI FLASHFlash the taskbar button. It will flash only if the window isn't focused and will stop when it is focused by the user.
GUI HIDEHide the main xchat window completely (this is used by the Systray plugin).
GUI ICONIFYIconify (minimize to taskbar) the current xchat window.
GUI HIDEHide the main HexChat window completely (this is used by the Systray plugin).
GUI ICONIFYIconify (minimize to taskbar) the current HexChat window.
GUI MSGBOX textDisplays a asynchronous message box with your text (new for 2.4.5).
GUI SHOWShow the main xchat window (if currently hidden).
GUI SHOWShow the main HexChat window (if currently hidden).

@@ -439,11 +439,11 @@ Parameters and flags: If you want to change an item's toggle state or enabled flag, just ADD an item with exactly the same name and command and specify the -tX -eX parameters you need. -

It's also possible to add items to XChat's existing menus, for example:
+

It's also possible to add items to HexChat's existing menus, for example:

	MENU ADD "Settings/Sub Menu"
 	MENU -t0 ADD "Settings/Sub Menu/My Setting" myseton mysetoff
-However, internal names and layouts of XChat's menu may change in the future, so use at own risk. +However, internal names and layouts of HexChat's menu may change in the future, so use at own risk.

Here is an example of Radio items: 
	MENU ADD "Language"
@@ -468,10 +468,10 @@ From 2.8.0, you can also change menus other than the main one (i.e popup menus).

-Starting from 2.8.0 you can manipulate XChat's system tray icon using the /TRAY command: +Starting from 2.8.0 you can manipulate HexChat's system tray icon using the /TRAY command: 
  Usage: 
- TRAY -f <timeout> <file1> [<file2>] Flash tray between two icons. Leave off file2 to use default xchat icon.
+ TRAY -f <timeout> <file1> [<file2>] Flash tray between two icons. Leave off file2 to use default HexChat icon.
  TRAY -f <filename>                  Set tray to a fixed icon.
  TRAY -i <number>                    Flash tray with an internal icon.
                                      2=Message 5=Highlight 8=Private 11=File
@@ -479,12 +479,12 @@ From 2.8.0, you can also change menus other than the main one (i.e popup menus).
  TRAY -b <title> <text>              Set the tray balloon.
                                      Supported on Windows from 2.8.1 and 2.8.2 on Linux (libnotify required on Linux).
-Filenames can be ICO or PNG format. PNG format is supported on Linux/BSD and Windows XP (but requires installation of GDI+ on Windows 2000). Set a timeout of -1 to use XChat's default. +Filenames can be ICO or PNG format. PNG format is supported on Linux/BSD and Windows XP (but requires installation of GDI+ on Windows 2000). Set a timeout of -1 to use HexChat's default.

Handling UTF-8/Unicode strings

-The XChat plugin API specifies that strings passed to and from xchat must be encoded in UTF-8. +The HexChat plugin API specifies that strings passed to and from HexChat must be encoded in UTF-8.

What does this mean for the plugin programmer? You just have to be a little careful when passing strings obtained from IRC to system calls. For example, if you're writing a file-server @@ -512,7 +512,7 @@ static void get_file_name(char *nick, char *fname) char buf[256]; FILE *fp; - /* the fname is in UTF-8, because it came from the xchat API */ + /* the fname is in UTF-8, because it came from the HexChat API */ #ifdef _WIN32

 	wchar_t wide_name[MAX_PATH];
 
@@ -601,7 +601,7 @@ xchat_hook_command(ph, "ONOTICE", XCHAT_PRI_NORM, onotice_cb,
 
ph: Plugin handle (as given to xchat_plugin_init).
 
fd: The file descriptor or socket.
 
flags: One or more of XCHAT_FD_READ, XCHAT_FD_WRITE, XCHAT_FD_EXCEPTION, XCHAT_FD_NOTSOCKET. Use bitwise OR to combine them.
-XCHAT_FD_NOTSOCKET tells xchat that the provided fd is not a socket, but a "MSVCRT.DLL" pipe.
+XCHAT_FD_NOTSOCKET tells HexChat that the provided fd is not a socket, but a "MSVCRT.DLL" pipe.
 
callb: Callback function. This will be called when the socket is available for reading/writing or exception (depending on your chosen flags)
 
userdata: Pointer passed to the callback function.

 Returns: Pointer to the hook. Can be passed to xchat_unhook.
@@ -644,7 +644,7 @@ tab-window is focused by the window manager.
 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 xchat do its normal printing */
+	return XCHAT_EAT_XCHAT;	/* dont let HexChat do its normal printing */
 }
 
 xchat_hook_print(ph, "You Part", XCHAT_PRI_NORM, youpart_cb, NULL);
@@ -673,7 +673,7 @@ hook every line that comes from the IRC server, you may use the special name of
 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 xchat see it too */
+	return XCHAT_EAT_NONE;	/* don't eat this event, let other plugins and HexChat see it too */
 }
 
 xchat_hook_server(ph, "KICK", XCHAT_PRI_NORM, kick_cb, NULL);
@@ -737,7 +737,7 @@ removed, so you don't need to call this within your xchat_plugin_deinit() functi
 
 xchat_command() 

 Prototype: void xchat_command(xchat_plugin *ph, const char *command);
 

-
Description: Executes a command as if it were typed in xchat's input box.
+
Description: Executes a command as if it were typed in HexChat's input box.
 

 
Arguments:
 
ph: Plugin handle (as given to xchat_plugin_init).
@@ -748,7 +748,7 @@ removed, so you don't need to call this within your xchat_plugin_deinit() functi
 
 xchat_commandf() 

 Prototype: void xchat_commandf(xchat_plugin *ph, const char *format, ...);
 

-
Description: Executes a command as if it were typed in xchat's input box and provides string formating like printf.
+
Description: Executes a command as if it were typed in HexChat's input box and provides string formating like printf.
 

 
Arguments:
 
ph: Plugin handle (as given to xchat_plugin_init).
@@ -877,7 +877,7 @@ Changed in 2.6.1. If servname is NULL, it finds the channel (or query) by the gi
 	win_ptrnative window pointer. Unix: (GtkWindow *) Win32: HWND (since 2.6.0).
 	win_statuswindow status: "active", "hidden" or "normal" (since 2.0.9).
 	xchatdirxchat config directory, e.g.: /home/user/.xchat2 This string is encoded in UTF-8, which means you _should_ convert it to "locale" encoding before using functions like open() or OpenFile(). For best Unicode support on Linux, convert this string using g_filename_from_utf8 and on Windows convert this string to UTF-16LE (wide) and use OpenFileW() etc.
-	xchatdirfsxchat config directory, e.g.: /home/user/.xchat2 (since 2.0.9).This string is encoded in local file system encoding, making it ideal for direct use with functions like open() or OpenFile(). For real Unicode support on Windows, it's best not to use xchatdirfs, but xchatdir instead.
+	xchatdirfsxchat config directory, e.g.: /home/user/.xchat2 (since 2.0.9).This string is encoded in local file system encoding, making it ideal for direct use with functions like open() or OpenFile(). For real Unicode support on Windows, it's best not to use HexChatdirfs, but HexChatdir instead.
 	
 	

 

diff --git a/plugins/python/python.c b/plugins/python/python.c
index 4a594e05..9f3dd211 100644
--- a/plugins/python/python.c
+++ b/plugins/python/python.c
@@ -64,7 +64,7 @@
 #include 
 #endif
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include "Python.h"
 #include "structmember.h"
 #include "pythread.h"
diff --git a/plugins/sasl/sasl.c b/plugins/sasl/sasl.c
index 5e2ea5c4..7978251e 100644
--- a/plugins/sasl/sasl.c
+++ b/plugins/sasl/sasl.c
@@ -38,7 +38,7 @@
 #include 
 #include 
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;   /* plugin handle */
 static const char name[] = "SASL";
diff --git a/plugins/sysinfo/sysinfo.cpp b/plugins/sysinfo/sysinfo.cpp
index 5cb4b766..d525e6b3 100644
--- a/plugins/sysinfo/sysinfo.cpp
+++ b/plugins/sysinfo/sysinfo.cpp
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;   /* plugin handle */
 static char name[] = "SysInfo";
diff --git a/plugins/sysinfo/xsys.c b/plugins/sysinfo/xsys.c
index f328b9b0..1d867dd1 100644
--- a/plugins/sysinfo/xsys.c
+++ b/plugins/sysinfo/xsys.c
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include "parse.h"
 #include "match.h"
 #include "xsys.h"
diff --git a/plugins/tcl/tclplugin.c b/plugins/tcl/tclplugin.c
index 17b0b99b..fe507bee 100644
--- a/plugins/tcl/tclplugin.c
+++ b/plugins/tcl/tclplugin.c
@@ -36,7 +36,7 @@ static char RCSID[] = "$Id: tclplugin.c,v 1.65 2012/07/26 20:02:12 mooooooo Exp
 #include 
 #endif
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include "tclplugin.h"
 #include "printevents.h"
 
diff --git a/plugins/upd/upd.c b/plugins/upd/upd.c
index f0ed0a2d..f6030910 100644
--- a/plugins/upd/upd.c
+++ b/plugins/upd/upd.c
@@ -23,7 +23,7 @@
 #include 
 #include 
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 static xchat_plugin *ph;   /* plugin handle */
 static const char name[] = "Update Checker";
diff --git a/plugins/winamp/winamp.c b/plugins/winamp/winamp.c
index 67907eba..eb9493a6 100644
--- a/plugins/winamp/winamp.c
+++ b/plugins/winamp/winamp.c
@@ -14,7 +14,7 @@
 #include 
 #include 
 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 #define PLAYING 1
 #define PAUSED 3
diff --git a/plugins/wmpa/xchat-plugin.cpp b/plugins/wmpa/hexchat-plugin.cpp
similarity index 99%
rename from plugins/wmpa/xchat-plugin.cpp
rename to plugins/wmpa/hexchat-plugin.cpp
index 7b3bc737..b8a21135 100644
--- a/plugins/wmpa/xchat-plugin.cpp
+++ b/plugins/wmpa/hexchat-plugin.cpp
@@ -7,7 +7,7 @@
 *
 ******************************************************************/
 #include "stdafx.h"
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include 
 #include 
 #include "wmpa.h"
diff --git a/plugins/wmpa/xchat-plugin.h b/plugins/wmpa/hexchat-plugin.h
similarity index 99%
rename from plugins/wmpa/xchat-plugin.h
rename to plugins/wmpa/hexchat-plugin.h
index ee189ffe..cec27a6f 100644
--- a/plugins/wmpa/xchat-plugin.h
+++ b/plugins/wmpa/hexchat-plugin.h
@@ -1,6 +1,6 @@
 /* You can distribute this header with your plugins for easy compilation */
-#ifndef XCHAT_PLUGIN_H
-#define XCHAT_PLUGIN_H
+#ifndef HEXCHAT_PLUGIN_H
+#define HEXCHAT_PLUGIN_H
 
 #define VER_STRING _T("1.0.2 (BETA)")
 
diff --git a/plugins/wmpa/wmpa-xp.vcxproj b/plugins/wmpa/wmpa-xp.vcxproj
index fb367520..15fed71d 100644
--- a/plugins/wmpa/wmpa-xp.vcxproj
+++ b/plugins/wmpa/wmpa-xp.vcxproj
@@ -118,7 +118,7 @@
     
     
     
-    
+    
   
   
     
@@ -142,7 +142,7 @@
     
     
     
-    
+    
   
   
     
diff --git a/plugins/wmpa/wmpa-xp.vcxproj.filters b/plugins/wmpa/wmpa-xp.vcxproj.filters
index 2be9d82f..7910f0d8 100644
--- a/plugins/wmpa/wmpa-xp.vcxproj.filters
+++ b/plugins/wmpa/wmpa-xp.vcxproj.filters
@@ -78,7 +78,7 @@
     
       Source Files
     
-    
+    
       Source Files
     
   
@@ -146,7 +146,7 @@
     
       Header Files
     
-    
+    
       Header Files
     
   
diff --git a/plugins/wmpa/wmpa.vcxproj b/plugins/wmpa/wmpa.vcxproj
index 7dafe2a6..0e5db7dc 100644
--- a/plugins/wmpa/wmpa.vcxproj
+++ b/plugins/wmpa/wmpa.vcxproj
@@ -115,7 +115,7 @@
     
     
     
-    
+    
   
   
     
@@ -139,7 +139,7 @@
     
     
     
-    
+    
   
   
     
diff --git a/plugins/wmpa/wmpa.vcxproj.filters b/plugins/wmpa/wmpa.vcxproj.filters
index 2be9d82f..7910f0d8 100644
--- a/plugins/wmpa/wmpa.vcxproj.filters
+++ b/plugins/wmpa/wmpa.vcxproj.filters
@@ -78,7 +78,7 @@
     
       Source Files
     
-    
+    
       Source Files
     
   
@@ -146,7 +146,7 @@
     
       Header Files
     
-    
+    
       Header Files
     
   
diff --git a/plugins/wmpa/wmpadialog.cpp b/plugins/wmpa/wmpadialog.cpp
index b0cdd16e..90bae309 100644
--- a/plugins/wmpa/wmpadialog.cpp
+++ b/plugins/wmpa/wmpadialog.cpp
@@ -10,7 +10,7 @@
 #include "wmpa.h"
 #include "WMPADialog.h"
 #include "shellapi.h"
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 #ifdef _DEBUG
 #define new DEBUG_NEW
diff --git a/plugins/xdcc/xdcc.c b/plugins/xdcc/xdcc.c
index 060dbbe3..9233f12b 100644
--- a/plugins/xdcc/xdcc.c
+++ b/plugins/xdcc/xdcc.c
@@ -9,8 +9,8 @@
 #include 
 #endif
 
-#include "xchat-plugin.h"
-#include "../../src/common/xchat.h"
+#include "hexchat-plugin.h"
+#include "../../src/common/hexchat.h"
 
 static xchat_plugin *ph;	/* plugin handle */
 
diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index 830d73eb..22534bdd 100644
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -10,6 +10,9 @@ EXTRA_DIST = \
 	ctcp.h \
 	dcc.h \
 	fe.h \
+	hexchat.h \
+	hexchatc.h \
+	hexchat-plugin.h \
 	history.h \
 	identd.c \
 	ignore.h \
@@ -36,10 +39,7 @@ EXTRA_DIST = \
 	tree.h \
 	url.h \
 	userlist.h \
-	util.h \
-	xchat.h \
-	xchatc.h \
-	xchat-plugin.h
+	util.h
 
 if USE_OPENSSL
 ssl_c = ssl.c
@@ -52,10 +52,10 @@ libhexchatcommon_a_LIBADD =				\
 endif
 SUBDIRS = $(dbusdir) .
 
-libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c history.c ignore.c \
-	inbound.c modes.c msproxy.c network.c notify.c outbound.c \
-	plugin.c plugin-timer.c proto-irc.c server.c servlist.c $(ssl_c) \
-	strlutil.c text.c tree.c url.c userlist.c util.c xchat.c
+libhexchatcommon_a_SOURCES = cfgfiles.c chanopt.c ctcp.c dcc.c hexchat.c \
+	history.c ignore.c inbound.c modes.c msproxy.c network.c notify.c \
+	outbound.c plugin.c plugin-timer.c proto-irc.c server.c servlist.c \
+	$(ssl_c) strlutil.c text.c tree.c url.c userlist.c util.c
 libhexchatcommon_a_CFLAGS = $(LIBPROXY_CFLAGS)
 
 textevents: make-te
diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c
index 2312dada..9f3bc920 100644
--- a/src/common/cfgfiles.c
+++ b/src/common/cfgfiles.c
@@ -23,12 +23,12 @@
 #include 
 #include 
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "cfgfiles.h"
 #include "util.h"
 #include "fe.h"
 #include "text.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 
 #ifdef WIN32
 #include 
diff --git a/src/common/cfgfiles.h b/src/common/cfgfiles.h
index 2cb4a4e2..9371f572 100644
--- a/src/common/cfgfiles.h
+++ b/src/common/cfgfiles.h
@@ -3,7 +3,7 @@
 #ifndef XCHAT_CFGFILES_H
 #define XCHAT_CFGFILES_H
 
-#include "xchat.h"
+#include "hexchat.h"
 
 extern char *xdir_fs;
 extern char *xdir_utf;
diff --git a/src/common/chanopt.c b/src/common/chanopt.c
index 8e8b0312..d6d47fb2 100644
--- a/src/common/chanopt.c
+++ b/src/common/chanopt.c
@@ -14,13 +14,13 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 
 #include "cfgfiles.h"
 #include "server.h"
 #include "text.h"
 #include "util.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 
 
 static GSList *chanopt_list = NULL;
diff --git a/src/common/common-xp.vcxproj b/src/common/common-xp.vcxproj
index 6eec3b12..736eacb1 100644
--- a/src/common/common-xp.vcxproj
+++ b/src/common/common-xp.vcxproj
@@ -43,9 +43,9 @@
     
     
     
-    
-    
-    
+    
+    
+    
   
   
     
@@ -74,7 +74,7 @@
     
     
     
-    
+    
   
   
     {87554B59-006C-4D94-9714-897B27067BA3}
diff --git a/src/common/common-xp.vcxproj.filters b/src/common/common-xp.vcxproj.filters
index 4940a6fd..3707caa0 100644
--- a/src/common/common-xp.vcxproj.filters
+++ b/src/common/common-xp.vcxproj.filters
@@ -98,13 +98,13 @@
     
       Header Files
     
-    
+    
       Header Files
     
-    
+    
       Header Files
     
-    
+    
       Header Files
     
     
@@ -193,7 +193,7 @@
     
       Source Files
     
-    
+    
       Source Files
     
     
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 55116995..9bb79ac5 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -43,9 +43,9 @@
     
     
     
-    
-    
-    
+    
+    
+    
   
   
     
@@ -74,7 +74,7 @@
     
     
     
-    
+    
   
   
     {87554B59-006C-4D94-9714-897B27067BA3}
diff --git a/src/common/common.vcxproj.filters b/src/common/common.vcxproj.filters
index 4940a6fd..3707caa0 100644
--- a/src/common/common.vcxproj.filters
+++ b/src/common/common.vcxproj.filters
@@ -98,13 +98,13 @@
     
       Header Files
     
-    
+    
       Header Files
     
-    
+    
       Header Files
     
-    
+    
       Header Files
     
     
@@ -193,7 +193,7 @@
     
       Source Files
     
-    
+    
       Source Files
     
     
diff --git a/src/common/ctcp.c b/src/common/ctcp.c
index c0d1ce49..f950a901 100644
--- a/src/common/ctcp.c
+++ b/src/common/ctcp.c
@@ -24,7 +24,7 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "cfgfiles.h"
 #include "util.h"
 #include "modes.h"
@@ -35,7 +35,7 @@
 #include "text.h"
 #include "ctcp.h"
 #include "server.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 
 
 static void
diff --git a/src/common/dcc.c b/src/common/dcc.c
index 4aa581a7..d9b1b855 100644
--- a/src/common/dcc.c
+++ b/src/common/dcc.c
@@ -48,7 +48,7 @@
 #include 
 #include 
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "util.h"
 #include "fe.h"
 #include "outbound.h"
@@ -58,7 +58,7 @@
 #include "server.h"
 #include "text.h"
 #include "url.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 
 #ifdef USE_DCC64
 #define BIG_STR_TO_INT(x) strtoull(x,NULL,10)
diff --git a/plugins/xchat-plugin.h b/src/common/hexchat-plugin.h
similarity index 99%
rename from plugins/xchat-plugin.h
rename to src/common/hexchat-plugin.h
index 1b7da8fb..43621f78 100644
--- a/plugins/xchat-plugin.h
+++ b/src/common/hexchat-plugin.h
@@ -1,6 +1,6 @@
 /* You can distribute this header with your plugins for easy compilation */
-#ifndef XCHAT_PLUGIN_H
-#define XCHAT_PLUGIN_H
+#ifndef HEXCHAT_PLUGIN_H
+#define HEXCHAT_PLUGIN_H
 
 #include 
 
diff --git a/src/common/xchat.c b/src/common/hexchat.c
similarity index 99%
rename from src/common/xchat.c
rename to src/common/hexchat.c
index d1916384..66612a30 100644
--- a/src/common/xchat.c
+++ b/src/common/hexchat.c
@@ -34,13 +34,13 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "fe.h"
 #include "util.h"
 #include "cfgfiles.h"
 #include "chanopt.h"
 #include "ignore.h"
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include "plugin.h"
 #include "plugin-timer.h"
 #include "notify.h"
@@ -49,7 +49,7 @@
 #include "outbound.h"
 #include "text.h"
 #include "url.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 
 #ifdef USE_OPENSSL
 #include 		  /* SSL_() */
diff --git a/src/common/xchat.h b/src/common/hexchat.h
similarity index 100%
rename from src/common/xchat.h
rename to src/common/hexchat.h
diff --git a/src/common/xchatc.h b/src/common/hexchatc.h
similarity index 100%
rename from src/common/xchatc.h
rename to src/common/hexchatc.h
diff --git a/src/common/identd.c b/src/common/identd.c
index 5ef5e0c6..db08ff90 100644
--- a/src/common/identd.c
+++ b/src/common/identd.c
@@ -1,8 +1,8 @@
 /* simple identd server for xchat under win32 */
 
 #include "inet.h"
-#include "xchat.h"
-#include "xchatc.h"
+#include "hexchat.h"
+#include "hexchatc.h"
 #include "text.h"
 
 static int identd_is_running = FALSE;
diff --git a/src/common/ignore.c b/src/common/ignore.c
index 12a2926a..b6eae41a 100644
--- a/src/common/ignore.c
+++ b/src/common/ignore.c
@@ -29,13 +29,13 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "ignore.h"
 #include "cfgfiles.h"
 #include "fe.h"
 #include "text.h"
 #include "util.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 
 
 int ignored_ctcp = 0;			  /* keep a count of all we ignore */
diff --git a/src/common/inbound.c b/src/common/inbound.c
index 9d39e5cd..3d42279f 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -33,7 +33,7 @@
 #define WANTDNS
 #include "inet.h"
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "util.h"
 #include "ignore.h"
 #include "fe.h"
@@ -46,7 +46,7 @@
 #include "text.h"
 #include "ctcp.h"
 #include "plugin.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 
 
 void
diff --git a/src/common/modes.c b/src/common/modes.c
index 07a5cea4..b84b2b84 100644
--- a/src/common/modes.c
+++ b/src/common/modes.c
@@ -22,8 +22,8 @@
 #include 
 #include 
 
-#include "xchat.h"
-#include "xchatc.h"
+#include "hexchat.h"
+#include "hexchatc.h"
 #include "modes.h"
 #include "server.h"
 #include "text.h"
diff --git a/src/common/msproxy.c b/src/common/msproxy.c
index 01b6120a..9febe8d0 100644
--- a/src/common/msproxy.c
+++ b/src/common/msproxy.c
@@ -36,9 +36,9 @@
 #define WANTARPA
 #include "inet.h"
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "network.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 #include "server.h"
 #include "msproxy.h"
 
diff --git a/src/common/notify.c b/src/common/notify.c
index f9fbe121..1dff8ec7 100644
--- a/src/common/notify.c
+++ b/src/common/notify.c
@@ -30,14 +30,14 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "notify.h"
 #include "cfgfiles.h"
 #include "fe.h"
 #include "server.h"
 #include "text.h"
 #include "util.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 
 
 GSList *notify_list = 0;
diff --git a/src/common/outbound.c b/src/common/outbound.c
index bb652aad..ed97886e 100644
--- a/src/common/outbound.c
+++ b/src/common/outbound.c
@@ -38,7 +38,7 @@
 #include 
 #include 
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "plugin.h"
 #include "ignore.h"
 #include "util.h"
@@ -49,7 +49,7 @@
 #include "notify.h"
 #include "inbound.h"
 #include "text.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 #include "servlist.h"
 #include "server.h"
 #include "tree.h"
diff --git a/src/common/plugin-timer.c b/src/common/plugin-timer.c
index 431ce8ab..eaf6cde6 100644
--- a/src/common/plugin-timer.c
+++ b/src/common/plugin-timer.c
@@ -1,7 +1,7 @@
 #include 
 #include 
 #include 
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 
 #ifdef WIN32
 #define g_ascii_strcasecmp stricmp
diff --git a/src/common/plugin.c b/src/common/plugin.c
index 7111289c..cc626659 100644
--- a/src/common/plugin.c
+++ b/src/common/plugin.c
@@ -29,7 +29,7 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "fe.h"
 #include "util.h"
 #include "outbound.h"
@@ -42,11 +42,11 @@
 #include "text.h"
 #define PLUGIN_C
 typedef struct session xchat_context;
-#include "xchat-plugin.h"
+#include "hexchat-plugin.h"
 #include "plugin.h"
 
 
-#include "xchatc.h"
+#include "hexchatc.h"
 
 /* the USE_PLUGIN define only removes libdl stuff */
 
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
index ed7d9a4d..8967504e 100644
--- a/src/common/proto-irc.c
+++ b/src/common/proto-irc.c
@@ -28,7 +28,7 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "ctcp.h"
 #include "fe.h"
 #include "ignore.h"
@@ -40,7 +40,7 @@
 #include "text.h"
 #include "outbound.h"
 #include "util.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 #include "url.h"
 
 
diff --git a/src/common/server.c b/src/common/server.c
index 8c831ad0..04b955bb 100644
--- a/src/common/server.c
+++ b/src/common/server.c
@@ -42,12 +42,12 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "fe.h"
 #include "cfgfiles.h"
 #include "network.h"
 #include "notify.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 #include "inbound.h"
 #include "outbound.h"
 #include "text.h"
diff --git a/src/common/servlist.c b/src/common/servlist.c
index 201652da..86a78ebf 100644
--- a/src/common/servlist.c
+++ b/src/common/servlist.c
@@ -26,7 +26,7 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 #include 
 
 #include "cfgfiles.h"
@@ -34,7 +34,7 @@
 #include "server.h"
 #include "text.h"
 #include "util.h" /* token_foreach */
-#include "xchatc.h"
+#include "hexchatc.h"
 
 #include "servlist.h"
 
diff --git a/src/common/text.c b/src/common/text.c
index 1076f8a0..39dd92c2 100644
--- a/src/common/text.c
+++ b/src/common/text.c
@@ -32,7 +32,7 @@
 #include 
 #endif
 
-#include "xchat.h"
+#include "hexchat.h"
 #include 
 #include "cfgfiles.h"
 #include "chanopt.h"
@@ -41,7 +41,7 @@
 #include "server.h"
 #include "util.h"
 #include "outbound.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 #include "text.h"
 #ifdef WIN32
 #include 
diff --git a/src/common/url.c b/src/common/url.c
index 32d282db..f722ca34 100644
--- a/src/common/url.c
+++ b/src/common/url.c
@@ -20,8 +20,8 @@
 #include 
 #include 
 #include 
-#include "xchat.h"
-#include "xchatc.h"
+#include "hexchat.h"
+#include "hexchatc.h"
 #include "cfgfiles.h"
 #include "fe.h"
 #include "tree.h"
diff --git a/src/common/userlist.c b/src/common/userlist.c
index 2dedb997..620ed4aa 100644
--- a/src/common/userlist.c
+++ b/src/common/userlist.c
@@ -20,12 +20,12 @@
 #include 
 #include 
 
-#include "xchat.h"
+#include "hexchat.h"
 #include "modes.h"
 #include "fe.h"
 #include "notify.h"
 #include "tree.h"
-#include "xchatc.h"
+#include "hexchatc.h"
 #include "util.h"
 
 
diff --git a/src/common/util.c b/src/common/util.c
index 15184250..38a87f26 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -43,8 +43,8 @@
 
 #include 
 #include 
-#include "xchat.h"
-#include "xchatc.h"
+#include "hexchat.h"
+#include "hexchatc.h"
 #include 
 #include 
 #include "util.h"
diff --git a/src/fe-gtk/about.c b/src/fe-gtk/about.c
index f63cf80e..d33c6ae3 100644
--- a/src/fe-gtk/about.c
+++ b/src/fe-gtk/about.c
@@ -37,9 +37,9 @@
 #include 
 #endif
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/util.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "palette.h"
 #include "pixmaps.h"
 #include "gtkutil.h"
diff --git a/src/fe-gtk/ascii.c b/src/fe-gtk/ascii.c
index f1adbdfc..85dcf26d 100644
--- a/src/fe-gtk/ascii.c
+++ b/src/fe-gtk/ascii.c
@@ -28,8 +28,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "gtkutil.h"
 #include "ascii.h"
 #include "maingui.h"
diff --git a/src/fe-gtk/banlist.c b/src/fe-gtk/banlist.c
index 43bc9e42..f91be2fc 100644
--- a/src/fe-gtk/banlist.c
+++ b/src/fe-gtk/banlist.c
@@ -37,11 +37,11 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/modes.h"
 #include "../common/outbound.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "gtkutil.h"
 #include "maingui.h"
 #include "banlist.h"
diff --git a/src/fe-gtk/chanlist.c b/src/fe-gtk/chanlist.c
index 54348565..8a431ebc 100644
--- a/src/fe-gtk/chanlist.c
+++ b/src/fe-gtk/chanlist.c
@@ -47,8 +47,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
 #include "../common/outbound.h"
 #include "../common/util.h"
diff --git a/src/fe-gtk/chanview-tree.c b/src/fe-gtk/chanview-tree.c
index 5a678550..bceabc8f 100644
--- a/src/fe-gtk/chanview-tree.c
+++ b/src/fe-gtk/chanview-tree.c
@@ -6,8 +6,8 @@ typedef struct
 	GtkWidget *scrollw;	/* scrolledWindow */
 } treeview;
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "fe-gtk.h"
 #include "maingui.h"
 
diff --git a/src/fe-gtk/dccgui.c b/src/fe-gtk/dccgui.c
index 737963d5..60881959 100644
--- a/src/fe-gtk/dccgui.c
+++ b/src/fe-gtk/dccgui.c
@@ -44,8 +44,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/fe.h"
 #include "../common/util.h"
 #include "../common/network.h"
diff --git a/src/fe-gtk/editlist.c b/src/fe-gtk/editlist.c
index 05be3128..2ce48ee4 100644
--- a/src/fe-gtk/editlist.c
+++ b/src/fe-gtk/editlist.c
@@ -37,9 +37,9 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/cfgfiles.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "../common/fe.h"
 #include "menu.h"
 #include "gtkutil.h"
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c
index 9272c6b3..f89bb650 100644
--- a/src/fe-gtk/fe-gtk.c
+++ b/src/fe-gtk/fe-gtk.c
@@ -37,12 +37,12 @@
 #include 
 #endif
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/util.h"
 #include "../common/text.h"
 #include "../common/cfgfiles.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "../common/plugin.h"
 #include "../common/server.h"
 #include "../common/url.h"
diff --git a/src/fe-gtk/fkeys.c b/src/fe-gtk/fkeys.c
index 3018667d..eee48b8d 100644
--- a/src/fe-gtk/fkeys.c
+++ b/src/fe-gtk/fkeys.c
@@ -46,8 +46,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
 #include "../common/fe.h"
 #include "../common/userlist.h"
diff --git a/src/fe-gtk/gtkutil.c b/src/fe-gtk/gtkutil.c
index 58f7b804..8de4325d 100644
--- a/src/fe-gtk/gtkutil.c
+++ b/src/fe-gtk/gtkutil.c
@@ -46,11 +46,11 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/util.h"
 #include "../common/cfgfiles.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "gtkutil.h"
 #include "pixmaps.h"
 
diff --git a/src/fe-gtk/ignoregui.c b/src/fe-gtk/ignoregui.c
index 13cd8f0b..6531bd27 100644
--- a/src/fe-gtk/ignoregui.c
+++ b/src/fe-gtk/ignoregui.c
@@ -39,7 +39,7 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/ignore.h"
 #include "../common/cfgfiles.h"
 #include "../common/fe.h"
diff --git a/src/fe-gtk/joind.c b/src/fe-gtk/joind.c
index 5c591070..41f3f405 100644
--- a/src/fe-gtk/joind.c
+++ b/src/fe-gtk/joind.c
@@ -28,8 +28,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/server.h"
 #include "../common/fe.h"
 #include "fe-gtk.h"
diff --git a/src/fe-gtk/maingui.c b/src/fe-gtk/maingui.c
index c1b60c27..27f26d2b 100644
--- a/src/fe-gtk/maingui.c
+++ b/src/fe-gtk/maingui.c
@@ -44,10 +44,10 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/server.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "../common/outbound.h"
 #include "../common/inbound.h"
 #include "../common/plugin.h"
diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c
index bf12f25d..572335ab 100644
--- a/src/fe-gtk/menu.c
+++ b/src/fe-gtk/menu.c
@@ -44,8 +44,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
 #include "../common/outbound.h"
 #include "../common/ignore.h"
diff --git a/src/fe-gtk/notifygui.c b/src/fe-gtk/notifygui.c
index 679b3f02..7daf2484 100644
--- a/src/fe-gtk/notifygui.c
+++ b/src/fe-gtk/notifygui.c
@@ -38,7 +38,7 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/notify.h"
 #include "../common/cfgfiles.h"
 #include "../common/fe.h"
diff --git a/src/fe-gtk/palette.c b/src/fe-gtk/palette.c
index 80e0a11d..072646dd 100644
--- a/src/fe-gtk/palette.c
+++ b/src/fe-gtk/palette.c
@@ -31,7 +31,7 @@
 #include "fe-gtk.h"
 #include "palette.h"
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/util.h"
 #include "../common/cfgfiles.h"
 
diff --git a/src/fe-gtk/pixmaps.c b/src/fe-gtk/pixmaps.c
index 4211c6f5..b7fc40e2 100644
--- a/src/fe-gtk/pixmaps.c
+++ b/src/fe-gtk/pixmaps.c
@@ -22,7 +22,7 @@
 
 #include "fe-gtk.h"
 #include "../common/cfgfiles.h"
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/fe.h"
 
 #include 
diff --git a/src/fe-gtk/plugin-tray.c b/src/fe-gtk/plugin-tray.c
index 922515fe..581e9dfc 100644
--- a/src/fe-gtk/plugin-tray.c
+++ b/src/fe-gtk/plugin-tray.c
@@ -1,9 +1,9 @@
 /* Copyright (C) 2006-2007 Peter Zelezny. */
 
 #include 
-#include "../common/xchat-plugin.h"
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat-plugin.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/inbound.h"
 #include "../common/server.h"
 #include "../common/fe.h"
diff --git a/src/fe-gtk/plugingui.c b/src/fe-gtk/plugingui.c
index 00566533..401abfbf 100644
--- a/src/fe-gtk/plugingui.c
+++ b/src/fe-gtk/plugingui.c
@@ -32,15 +32,15 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #define PLUGIN_C
 typedef struct session xchat_context;
-#include "../common/xchat-plugin.h"
+#include "../common/hexchat-plugin.h"
 #include "../common/plugin.h"
 #include "../common/util.h"
 #include "../common/outbound.h"
 #include "../common/fe.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
 #include "gtkutil.h"
 
diff --git a/src/fe-gtk/rawlog.c b/src/fe-gtk/rawlog.c
index 60b359a0..945facdf 100644
--- a/src/fe-gtk/rawlog.c
+++ b/src/fe-gtk/rawlog.c
@@ -35,8 +35,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
 #include "../common/server.h"
 #include "gtkutil.h"
diff --git a/src/fe-gtk/search.c b/src/fe-gtk/search.c
index f90b685d..e0839f79 100644
--- a/src/fe-gtk/search.c
+++ b/src/fe-gtk/search.c
@@ -34,10 +34,10 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/util.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "gtkutil.h"
 #include "xtext.h"
 #include "maingui.h"
diff --git a/src/fe-gtk/servlistgui.c b/src/fe-gtk/servlistgui.c
index c0c504f6..fe8aa319 100644
--- a/src/fe-gtk/servlistgui.c
+++ b/src/fe-gtk/servlistgui.c
@@ -32,8 +32,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/servlist.h"
 #include "../common/cfgfiles.h"
 #include "../common/fe.h"
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c
index 1f940d9f..a83e423a 100644
--- a/src/fe-gtk/setup.c
+++ b/src/fe-gtk/setup.c
@@ -8,13 +8,13 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/cfgfiles.h"
 #include "../common/fe.h"
 #include "../common/text.h"
 #include "../common/userlist.h"
 #include "../common/util.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "fe-gtk.h"
 #include "gtkutil.h"
 #include "maingui.h"
diff --git a/src/fe-gtk/sexy-spell-entry.c b/src/fe-gtk/sexy-spell-entry.c
index 22404855..190c62e7 100644
--- a/src/fe-gtk/sexy-spell-entry.c
+++ b/src/fe-gtk/sexy-spell-entry.c
@@ -41,7 +41,7 @@
 #endif
 
 #include "../common/cfgfiles.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 
 /*
  * Bunch of poop to make enchant into a runtime dependency rather than a
diff --git a/src/fe-gtk/textgui.c b/src/fe-gtk/textgui.c
index 851ad392..7d4c38bd 100644
--- a/src/fe-gtk/textgui.c
+++ b/src/fe-gtk/textgui.c
@@ -36,8 +36,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
 #include "../common/outbound.h"
 #include "../common/fe.h"
diff --git a/src/fe-gtk/urlgrab.c b/src/fe-gtk/urlgrab.c
index a5bb4e0a..68d796eb 100644
--- a/src/fe-gtk/urlgrab.c
+++ b/src/fe-gtk/urlgrab.c
@@ -32,8 +32,8 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
 #include "../common/fe.h"
 #include "../common/url.h"
diff --git a/src/fe-gtk/userlistgui.c b/src/fe-gtk/userlistgui.c
index d4834581..e6d57891 100644
--- a/src/fe-gtk/userlistgui.c
+++ b/src/fe-gtk/userlistgui.c
@@ -34,12 +34,12 @@
 #include 
 #include 
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/util.h"
 #include "../common/userlist.h"
 #include "../common/modes.h"
 #include "../common/notify.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "../common/fe.h"
 #include "gtkutil.h"
 #include "palette.h"
diff --git a/src/fe-gtk/xtext.c b/src/fe-gtk/xtext.c
index e45d47f0..656a4c92 100644
--- a/src/fe-gtk/xtext.c
+++ b/src/fe-gtk/xtext.c
@@ -65,10 +65,10 @@
 #include "mmx_cmod.h"
 #endif
 
-#include "../common/xchat.h"
+#include "../common/hexchat.h"
 #include "../common/fe.h"
 #include "../common/util.h"
-#include "../common/xchatc.h"
+#include "../common/hexchatc.h"
 #include "fe-gtk.h"
 #include "xtext.h"
 #include "fkeys.h"
diff --git a/src/fe-text/fe-text.c b/src/fe-text/fe-text.c
index 173ef438..0eb68dce 100644
--- a/src/fe-text/fe-text.c
+++ b/src/fe-text/fe-text.c
@@ -32,8 +32,8 @@
 #include 
 #include 
 #include 
-#include "../common/xchat.h"
-#include "../common/xchatc.h"
+#include "../common/hexchat.h"
+#include "../common/hexchatc.h"
 #include "../common/cfgfiles.h"
 #include "../common/outbound.h"
 #include "../common/util.h"