diff --git a/src/common/cfgfiles.h b/src/common/cfgfiles.h
index 9371f572..2677562f 100644
--- a/src/common/cfgfiles.h
+++ b/src/common/cfgfiles.h
@@ -1,7 +1,7 @@
 /* cfgfiles.h */
 
-#ifndef XCHAT_CFGFILES_H
-#define XCHAT_CFGFILES_H
+#ifndef HEXCHAT_CFGFILES_H
+#define HEXCHAT_CFGFILES_H
 
 #include "hexchat.h"
 
diff --git a/src/common/ctcp.h b/src/common/ctcp.h
index 9acd80e3..296e6b1b 100644
--- a/src/common/ctcp.h
+++ b/src/common/ctcp.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_CTCP_H
-#define XCHAT_CTCP_H
+#ifndef HEXCHAT_CTCP_H
+#define HEXCHAT_CTCP_H
 
 void ctcp_handle (session *sess, char *to, char *nick, char *ip, char *msg, char *word[], char *word_eol[], int id);
 
diff --git a/src/common/dcc.h b/src/common/dcc.h
index 656c8fdc..6dcd53d5 100644
--- a/src/common/dcc.h
+++ b/src/common/dcc.h
@@ -2,8 +2,8 @@
 
 #include <time.h>						/* for time_t */
 
-#ifndef XCHAT_DCC_H
-#define XCHAT_DCC_H
+#ifndef HEXCHAT_DCC_H
+#define HEXCHAT_DCC_H
 
 #define STAT_QUEUED 0
 #define STAT_ACTIVE 1
diff --git a/src/common/fe.h b/src/common/fe.h
index 3fa4e2bc..e8cc6f8f 100644
--- a/src/common/fe.h
+++ b/src/common/fe.h
@@ -1,8 +1,8 @@
 #include "userlist.h"
 #include "dcc.h"
 
-#ifndef XCHAT_FE_H
-#define XCHAT_FE_H
+#ifndef HEXCHAT_FE_H
+#define HEXCHAT_FE_H
 
 /* for storage of /menu entries */
 typedef struct
diff --git a/src/common/hexchat.h b/src/common/hexchat.h
index 2980fc1c..ff7a8bf9 100644
--- a/src/common/hexchat.h
+++ b/src/common/hexchat.h
@@ -3,8 +3,8 @@
 #include <glib.h>
 #include <time.h>			/* need time_t */
 
-#ifndef XCHAT_H
-#define XCHAT_H
+#ifndef HEXCHAT_H
+#define HEXCHAT_H
 
 #include "history.h"
 
diff --git a/src/common/hexchatc.h b/src/common/hexchatc.h
index 1d955055..1e8eb85e 100644
--- a/src/common/hexchatc.h
+++ b/src/common/hexchatc.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_C_H
-#define XCHAT_C_H
+#ifndef HEXCHAT_C_H
+#define HEXCHAT_C_H
 
 extern struct hexchatprefs prefs;
 
diff --git a/src/common/history.h b/src/common/history.h
index 5267f1fc..c5696d70 100644
--- a/src/common/history.h
+++ b/src/common/history.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_HISTORY_H
-#define XCHAT_HISTORY_H
+#ifndef HEXCHAT_HISTORY_H
+#define HEXCHAT_HISTORY_H
 
 #define HISTORY_SIZE 100
 
diff --git a/src/common/ignore.h b/src/common/ignore.h
index 3a971a86..e4b14a3f 100644
--- a/src/common/ignore.h
+++ b/src/common/ignore.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_IGNORE_H
-#define XCHAT_IGNORE_H
+#ifndef HEXCHAT_IGNORE_H
+#define HEXCHAT_IGNORE_H
 
 extern GSList *ignore_list;
 
diff --git a/src/common/inbound.h b/src/common/inbound.h
index b972981f..e1e4e9bb 100644
--- a/src/common/inbound.h
+++ b/src/common/inbound.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_INBOUND_H
-#define XCHAT_INBOUND_H
+#ifndef HEXCHAT_INBOUND_H
+#define HEXCHAT_INBOUND_H
 
 void inbound_next_nick (session *sess, char *nick);
 void inbound_uback (server *serv);
diff --git a/src/common/modes.h b/src/common/modes.h
index 3f9c4a72..30ccbd72 100644
--- a/src/common/modes.h
+++ b/src/common/modes.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_MODES_H
-#define XCHAT_MODES_H
+#ifndef HEXCHAT_MODES_H
+#define HEXCHAT_MODES_H
 
 int is_channel (server *serv, char *chan);
 char get_nick_prefix (server *serv, unsigned int access);
diff --git a/src/common/network.h b/src/common/network.h
index f45f210a..d7957568 100644
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_NETWORK_H
-#define XCHAT_NETWORK_H
+#ifndef HEXCHAT_NETWORK_H
+#define HEXCHAT_NETWORK_H
 
 typedef struct netstore_
 {
diff --git a/src/common/notify.h b/src/common/notify.h
index 37674fe5..eefb30e8 100644
--- a/src/common/notify.h
+++ b/src/common/notify.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_NOTIFY_H
-#define XCHAT_NOTIFY_H
+#ifndef HEXCHAT_NOTIFY_H
+#define HEXCHAT_NOTIFY_H
 
 struct notify
 {
diff --git a/src/common/outbound.h b/src/common/outbound.h
index a2047845..def3868d 100644
--- a/src/common/outbound.h
+++ b/src/common/outbound.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_OUTBOUND_H
-#define XCHAT_OUTBOUND_H
+#ifndef HEXCHAT_OUTBOUND_H
+#define HEXCHAT_OUTBOUND_H
 
 extern const struct commands xc_cmds[];
 extern GSList *menu_list;
diff --git a/src/common/plugin-timer.h b/src/common/plugin-timer.h
index e3530c8d..4b4f0d8d 100644
--- a/src/common/plugin-timer.h
+++ b/src/common/plugin-timer.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_PLUGIN_TIMER_H
-#define XCHAT_PLUGIN_TIMER_H
+#ifndef HEXCHAT_PLUGIN_TIMER_H
+#define HEXCHAT_PLUGIN_TIMER_H
 
 int timer_plugin_init (xchat_plugin *plugin_handle, char **plugin_name,
 				char **plugin_desc, char **plugin_version, char *arg);
diff --git a/src/common/plugin.h b/src/common/plugin.h
index b2799d93..8b2b00dc 100644
--- a/src/common/plugin.h
+++ b/src/common/plugin.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_COMMONPLUGIN_H
-#define XCHAT_COMMONPLUGIN_H
+#ifndef HEXCHAT_COMMONPLUGIN_H
+#define HEXCHAT_COMMONPLUGIN_H
 
 #ifdef PLUGIN_C
 struct _xchat_plugin
diff --git a/src/common/proto-irc.h b/src/common/proto-irc.h
index 90803594..1070fd71 100644
--- a/src/common/proto-irc.h
+++ b/src/common/proto-irc.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_PROTO_H
-#define XCHAT_PROTO_H
+#ifndef HEXCHAT_PROTO_H
+#define HEXCHAT_PROTO_H
 
 void proto_fill_her_up (server *serv);
 
diff --git a/src/common/server.h b/src/common/server.h
index 874d27b2..e5c70636 100644
--- a/src/common/server.h
+++ b/src/common/server.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_SERVER_H
-#define XCHAT_SERVER_H
+#ifndef HEXCHAT_SERVER_H
+#define HEXCHAT_SERVER_H
 
 extern GSList *serv_list;
 
diff --git a/src/common/servlist.h b/src/common/servlist.h
index 855c3b09..e78f94b1 100644
--- a/src/common/servlist.h
+++ b/src/common/servlist.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_SERVLIST_H
-#define XCHAT_SERVLIST_H
+#ifndef HEXCHAT_SERVLIST_H
+#define HEXCHAT_SERVLIST_H
 
 typedef struct ircserver
 {
diff --git a/src/common/text.h b/src/common/text.h
index 86e3bff0..ccbae785 100644
--- a/src/common/text.h
+++ b/src/common/text.h
@@ -1,7 +1,7 @@
 #include "textenums.h"
 
-#ifndef XCHAT_TEXT_H
-#define XCHAT_TEXT_H
+#ifndef HEXCHAT_TEXT_H
+#define HEXCHAT_TEXT_H
 
 #define EMIT_SIGNAL(i, sess, a, b, c, d, e) text_emit(i, sess, a, b, c, d)
 
diff --git a/src/common/tree.h b/src/common/tree.h
index 44e06672..4a158052 100644
--- a/src/common/tree.h
+++ b/src/common/tree.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_TREE_H
-#define XCHAT_TREE_H
+#ifndef HEXCHAT_TREE_H
+#define HEXCHAT_TREE_H
 
 typedef struct _tree tree;
 
diff --git a/src/common/url.h b/src/common/url.h
index 8263b61c..dc5a65f8 100644
--- a/src/common/url.h
+++ b/src/common/url.h
@@ -1,5 +1,5 @@
-#ifndef XCHAT_URL_H
-#define XCHAT_URL_H
+#ifndef HEXCHAT_URL_H
+#define HEXCHAT_URL_H
 
 extern void *url_tree;
 
diff --git a/src/common/userlist.h b/src/common/userlist.h
index 91eb62c0..74ab4029 100644
--- a/src/common/userlist.h
+++ b/src/common/userlist.h
@@ -1,7 +1,7 @@
 #include <time.h>
 
-#ifndef XCHAT_USERLIST_H
-#define XCHAT_USERLIST_H
+#ifndef HEXCHAT_USERLIST_H
+#define HEXCHAT_USERLIST_H
 
 struct User
 {
diff --git a/src/common/util.h b/src/common/util.h
index a2799832..484cd617 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -11,8 +11,8 @@
  *        --+ Dagmar d'Surreal
  */
 
-#ifndef XCHAT_UTIL_H
-#define XCHAT_UTIL_H
+#ifndef HEXCHAT_UTIL_H
+#define HEXCHAT_UTIL_H
 
 #include "strlutil.h"
 #define rfc_tolower(c) (rfc_tolowertab[(unsigned char)(c)])