Removed the TMW branding from header guards

70 files changed, 149 insertions, 149 deletions

diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h
index c2c427f4..4290f0a2 100644
--- a/src/gui/browserbox.h
+++ b/src/gui/browserbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_BROWSERBOX_H__
-#define __TMW_BROWSERBOX_H__
+#ifndef BROWSERBOX_H
+#define BROWSERBOX_H
 
 #include <iosfwd>
 #include <vector>
diff --git a/src/gui/button.h b/src/gui/button.h
index 51f6cffc..d8ed9fa7 100644
--- a/src/gui/button.h
+++ b/src/gui/button.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUTTON_H
-#define _TMW_BUTTON_H
+#ifndef BUTTON_H
+#define BUTTON_H
 
 #include <iosfwd>
 
diff --git a/src/gui/buttonbox.h b/src/gui/buttonbox.h
index 1741f7ba..6d0e46b6 100644
--- a/src/gui/buttonbox.h
+++ b/src/gui/buttonbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUTTONBOX_H
-#define _TMW_BUTTONBOX_H
+#ifndef BUTTONBOX_H
+#define BUTTONBOX_H
 
 #include <string>
 
diff --git a/src/gui/buy.h b/src/gui/buy.h
index 1b7ebe43..423918ce 100644
--- a/src/gui/buy.h
+++ b/src/gui/buy.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUY_H
-#define _TMW_BUY_H
+#ifndef BUY_H
+#define BUY_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/buysell.h b/src/gui/buysell.h
index 0f41e9ed..60a6398d 100644
--- a/src/gui/buysell.h
+++ b/src/gui/buysell.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_BUYSELL_H
-#define _TMW_BUYSELL_H
+#ifndef BUYSELL_H
+#define BUYSELL_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/chat.h b/src/gui/chat.h
index e5d0a4a9..176fccb7 100644
--- a/src/gui/chat.h
+++ b/src/gui/chat.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CHAT_H
-#define _TMW_CHAT_H
+#ifndef CHAT_H
+#define CHAT_H
 
 #include <fstream>
 #include <list>
diff --git a/src/gui/chatinput.h b/src/gui/chatinput.h
index fc5c18a3..d98e120b 100644
--- a/src/gui/chatinput.h
+++ b/src/gui/chatinput.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CHATINPUT_H
-#define _TMW_CHATINPUT_H
+#ifndef CHATINPUT_H
+#define CHATINPUT_H
 
 #include <guichan/focuslistener.hpp>
 
diff --git a/src/gui/checkbox.h b/src/gui/checkbox.h
index ea67ec02..d92fc822 100644
--- a/src/gui/checkbox.h
+++ b/src/gui/checkbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CHECKBOX_H
-#define _TMW_CHECKBOX_H
+#ifndef CHECKBOX_H
+#define CHECKBOX_H
 
 #include <iosfwd>
 
diff --git a/src/gui/confirm_dialog.h b/src/gui/confirm_dialog.h
index 63a867da..fb8290c8 100644
--- a/src/gui/confirm_dialog.h
+++ b/src/gui/confirm_dialog.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_OPTION_DIALOG_H
-#define _TMW_OPTION_DIALOG_H
+#ifndef OPTION_DIALOG_H
+#define OPTION_DIALOG_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/connection.h b/src/gui/connection.h
index 0cbb8768..3caa611f 100644
--- a/src/gui/connection.h
+++ b/src/gui/connection.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_CONNECTION_H
-#define _TMW_CONNECTION_H
+#ifndef CONNECTION_H
+#define CONNECTION_H
 
 #include "window.h"
 
diff --git a/src/gui/debugwindow.h b/src/gui/debugwindow.h
index 185915a2..00119d15 100644
--- a/src/gui/debugwindow.h
+++ b/src/gui/debugwindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_DEBUGWINDOW_H
-#define _TMW_DEBUGWINDOW_H
+#ifndef DEBUGWINDOW_H
+#define DEBUGWINDOW_H
 
 #include <iosfwd>
 
diff --git a/src/gui/emotecontainer.h b/src/gui/emotecontainer.h
index 2231e01a..8e52a206 100644
--- a/src/gui/emotecontainer.h
+++ b/src/gui/emotecontainer.h
@@ -19,8 +19,8 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _AETHYRA_EMOTECONTAINER_H__
-#define _AETHYRA_EMOTECONTAINER_H__
+#ifndef EMOTECONTAINER_H__
+#define EMOTECONTAINER_H__
 
 #include <list>
 #include <vector>
diff --git a/src/gui/emoteshortcutcontainer.h b/src/gui/emoteshortcutcontainer.h
index f8a07dcc..71485259 100644
--- a/src/gui/emoteshortcutcontainer.h
+++ b/src/gui/emoteshortcutcontainer.h
@@ -19,8 +19,8 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _AETHYRA_EMOTESHORTCUTCONTAINER_H__
-#define _AETHYRA_EMOTESHORTCUTCONTAINER_H__
+#ifndef EMOTESHORTCUTCONTAINER_H__
+#define EMOTESHORTCUTCONTAINER_H__
 
 #include <vector>
 
diff --git a/src/gui/emotewindow.h b/src/gui/emotewindow.h
index e92808dc..eaea1f7c 100644
--- a/src/gui/emotewindow.h
+++ b/src/gui/emotewindow.h
@@ -19,8 +19,8 @@
  *  Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _AETHYRA_EMOTEWINDOW_H
-#define _AETHYRA_EMOTEWINDOW_H
+#ifndef EMOTEWINDOW_H
+#define EMOTEWINDOW_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index c50e154e..3a3f37f4 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_EQUIPMENT_H
-#define _TMW_EQUIPMENT_H
+#ifndef EQUIPMENTWINDOW_H
+#define EQUIPMENTWINDOW_H
 
 #include "window.h"
 #include "../inventory.h"
diff --git a/src/gui/focushandler.h b/src/gui/focushandler.h
index a183a1c8..124b5472 100644
--- a/src/gui/focushandler.h
+++ b/src/gui/focushandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_FOCUSHANDLER_H
-#define _TMW_FOCUSHANDLER_H
+#ifndef FOCUSHANDLER_H
+#define FOCUSHANDLER_H
 
 #include <list>
 
diff --git a/src/gui/gccontainer.h b/src/gui/gccontainer.h
index 03dcb785..0a573645 100644
--- a/src/gui/gccontainer.h
+++ b/src/gui/gccontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_GCCONTAINER_H
-#define _TMW_GUI_GCCONTAINER_H
+#ifndef GUI_GCCONTAINER_H
+#define GUI_GCCONTAINER_H
 
 #include <list>
 
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 9f45a3f3..9681d44a 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI
-#define _TMW_GUI
+#ifndef GUI
+#define GUI
 
 #include <guichan/gui.hpp>
 
diff --git a/src/gui/help.h b/src/gui/help.h
index b4627389..2ba74c0a 100644
--- a/src/gui/help.h
+++ b/src/gui/help.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_HELP_H
-#define _TMW_HELP_H
+#ifndef HELP_H
+#define HELP_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index da549841..64227c2d 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -109,7 +109,7 @@ void InventoryWindow::logic()
 
         // Adjust widgets
         mWeight = _("Weight: ") + mTotalWeight + " g / " +
-                  mMaxWeight + _(" g  Slots: ") + 
+                  mMaxWeight + _(" g Slots: ") + 
                  toString(player_node->getInventory()->getNumberOfSlotsUsed()) + 
                  "/" + toString(player_node->getInventory()->getInventorySize());
 
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index e14994df..000112e8 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_INVENTORYWINDOW_H
-#define _TMW_INVENTORYWINDOW_H
+#ifndef INVENTORYWINDOW_H
+#define INVENTORYWINDOW_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/item_amount.h b/src/gui/item_amount.h
index e6086f82..d8eedadb 100644
--- a/src/gui/item_amount.h
+++ b/src/gui/item_amount.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEM_AMOUNT_WINDOW_H
-#define _TMW_ITEM_AMOUNT_WINDOW_H
+#ifndef ITEM_AMOUNT_WINDOW_H
+#define ITEM_AMOUNT_WINDOW_H
 
 #include <iosfwd>
 
@@ -69,4 +69,4 @@ class ItemAmountWindow : public Window, public gcn::ActionListener
         gcn::Slider *mItemAmountSlide;
 };
 
-#endif /* _TMW_ITEM_AMOUNT_WINDOW_H */
+#endif /* ITEM_AMOUNT_WINDOW_H */
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index 0eb940f5..aac06bae 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEMCONTAINER_H__
-#define _TMW_ITEMCONTAINER_H__
+#ifndef ITEMCONTAINER_H
+#define ITEMCONTAINER_H
 
 #include <list>
 
diff --git a/src/gui/itemlinkhandler.h b/src/gui/itemlinkhandler.h
index 973aab75..cd6fd900 100644
--- a/src/gui/itemlinkhandler.h
+++ b/src/gui/itemlinkhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEM_LINK_HANDLER_H_
-#define _TMW_ITEM_LINK_HANDLER_H_
+#ifndef ITEM_LINK_HANDLER_H_
+#define ITEM_LINK_HANDLER_H_
 
 #include "linkhandler.h"
 
diff --git a/src/gui/itempopup.h b/src/gui/itempopup.h
index 4206671e..8ae2c98f 100644
--- a/src/gui/itempopup.h
+++ b/src/gui/itempopup.h
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEMPOPUP_H__
-#define _TMW_ITEMPOPUP_H__
+#ifndef ITEMPOPUP_H__
+#define ITEMPOPUP_H__
 
 #include "scrollarea.h"
 #include "textbox.h"
@@ -46,4 +46,4 @@ class ItemPopup : public Window
         ScrollArea *mItemEffectScroll;
 };
 
-#endif // _TMW_ITEMPOPUP_H__
+#endif // ITEMPOPUP_H__
diff --git a/src/gui/itemshortcutcontainer.h b/src/gui/itemshortcutcontainer.h
index d8ddf110..9b61ca86 100644
--- a/src/gui/itemshortcutcontainer.h
+++ b/src/gui/itemshortcutcontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_ITEMSHORTCUTCONTAINER_H__
-#define _TMW_ITEMSHORTCUTCONTAINER_H__
+#ifndef ITEMSHORTCUTCONTAINER_H
+#define ITEMSHORTCUTCONTAINER_H
 
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
diff --git a/src/gui/linkhandler.h b/src/gui/linkhandler.h
index b238f38b..ecc05b13 100644
--- a/src/gui/linkhandler.h
+++ b/src/gui/linkhandler.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_LINK_HANDLER_H_
-#define _TMW_LINK_HANDLER_H_
+#ifndef LINK_HANDLER_H
+#define LINK_HANDLER_H
 
 #include <string>
 
diff --git a/src/gui/listbox.h b/src/gui/listbox.h
index 69ba45f4..3d0062bc 100644
--- a/src/gui/listbox.h
+++ b/src/gui/listbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_LISTBOX_H
-#define _TMW_LISTBOX_H
+#ifndef LISTBOX_H
+#define LISTBOX_H
 
 #include <guichan/widgets/listbox.hpp>
 
diff --git a/src/gui/login.h b/src/gui/login.h
index c8fcc267..b85e5ae1 100644
--- a/src/gui/login.h
+++ b/src/gui/login.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_LOGIN_H
-#define _TMW_LOGIN_H
+#ifndef LOGIN_H
+#define LOGIN_H
 
 #include <iosfwd>
 #include <string>
diff --git a/src/gui/menuwindow.h b/src/gui/menuwindow.h
index 539cdc24..9b784c35 100644
--- a/src/gui/menuwindow.h
+++ b/src/gui/menuwindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MENU_H
-#define _TMW_MENU_H
+#ifndef MENU_H
+#define MENU_H
 
 #include "window.h"
 
diff --git a/src/gui/minimap.h b/src/gui/minimap.h
index 6b2b7f52..b4574ad5 100644
--- a/src/gui/minimap.h
+++ b/src/gui/minimap.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_MINIMAP_H
-#define _TMW_MINIMAP_H
+#ifndef MINIMAP_H
+#define MINIMAP_H
 
 #include "window.h"
 
diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h
index f6b059ea..b4b6f1af 100644
--- a/src/gui/npc_text.h
+++ b/src/gui/npc_text.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_NPC_TEXT_H
-#define _TMW_NPC_TEXT_H
+#ifndef NPC_TEXT_H
+#define NPC_TEXT_H
 
 #include <iosfwd>
 
@@ -77,4 +77,4 @@ class NpcTextDialog : public Window, public gcn::ActionListener
         BrowserBox *mBrowserBox;
 };
 
-#endif // _TMW_NPC_TEXT_H
+#endif // NPC_TEXT_H
diff --git a/src/gui/npcintegerdialog.h b/src/gui/npcintegerdialog.h
index d2c5f058..983c46fe 100644
--- a/src/gui/npcintegerdialog.h
+++ b/src/gui/npcintegerdialog.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_NPCINTEGERDIALOG_H
-#define _TMW_GUI_NPCINTEGERDIALOG_H
+#ifndef GUI_NPCINTEGERDIALOG_H
+#define GUI_NPCINTEGERDIALOG_H
 
 #include <iosfwd>
 #include <vector>
@@ -77,4 +77,4 @@ class NpcIntegerDialog : public Window, public gcn::ActionListener,
         gcn::Button *resetButton;
 };
 
-#endif // _TMW_GUI_NPCINTEGERDIALOG_H
+#endif // GUI_NPCINTEGERDIALOG_H
diff --git a/src/gui/npclistdialog.h b/src/gui/npclistdialog.h
index 242e3a95..ffeced3d 100644
--- a/src/gui/npclistdialog.h
+++ b/src/gui/npclistdialog.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_NPCLISTDIALOG_H
-#define _TMW_GUI_NPCLISTDIALOG_H
+#ifndef GUI_NPCLISTDIALOG_H
+#define GUI_NPCLISTDIALOG_H
 
 #include <iosfwd>
 #include <vector>
@@ -86,4 +86,4 @@ class NpcListDialog : public Window, public gcn::ActionListener,
         std::vector<std::string> mItems;
 };
 
-#endif // _TMW_GUI_NPCLISTDIALOG_H
+#endif // GUI_NPCLISTDIALOG_H
diff --git a/src/gui/npcstringdialog.h b/src/gui/npcstringdialog.h
index e57003e9..5aea2de0 100644
--- a/src/gui/npcstringdialog.h
+++ b/src/gui/npcstringdialog.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_NPCSTRINGDIALOG_H
-#define _TMW_GUI_NPCSTRINGDIALOG_H
+#ifndef GUI_NPCSTRINGDIALOG_H
+#define GUI_NPCSTRINGDIALOG_H
 
 #include <iosfwd>
 #include <vector>
@@ -75,4 +75,4 @@ class NpcStringDialog : public Window, public gcn::ActionListener
         gcn::Button *cancelButton;
 };
 
-#endif // _TMW_GUI_NPCSTRINGDIALOG_H
+#endif // GUI_NPCSTRINGDIALOG_H
diff --git a/src/gui/passwordfield.h b/src/gui/passwordfield.h
index 033c4bf9..e01bedbd 100644
--- a/src/gui/passwordfield.h
+++ b/src/gui/passwordfield.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_PASSWORDFIELD_H_
-#define _TMW_PASSWORDFIELD_H_
+#ifndef PASSWORDFIELD_H
+#define PASSWORDFIELD_H
 
 #include "textfield.h"
 
diff --git a/src/gui/playerbox.h b/src/gui/playerbox.h
index 75dfe14c..5aacd26f 100644
--- a/src/gui/playerbox.h
+++ b/src/gui/playerbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_PLAYERBOX_H__
-#define __TMW_PLAYERBOX_H__
+#ifndef PLAYERBOX_H
+#define PLAYERBOX_H
 
 #include <guichan/widgets/scrollarea.hpp>
 
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 734b826f..715a9bb5 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_POPUP_MENU_H
-#define _TMW_POPUP_MENU_H
+#ifndef POPUP_MENU_H
+#define POPUP_MENU_H
 
 #include "linkhandler.h"
 #include "window.h"
diff --git a/src/gui/progressbar.h b/src/gui/progressbar.h
index e874b56d..ee0a5f81 100644
--- a/src/gui/progressbar.h
+++ b/src/gui/progressbar.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_PROGRESSBAR_H
-#define _TMW_PROGRESSBAR_H
+#ifndef PROGRESSBAR_H
+#define PROGRESSBAR_H
 
 #include <guichan/widget.hpp>
 
diff --git a/src/gui/radiobutton.h b/src/gui/radiobutton.h
index 84c552b9..dcd62802 100644
--- a/src/gui/radiobutton.h
+++ b/src/gui/radiobutton.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RADIOBUTTON_H
-#define _TMW_RADIOBUTTON_H
+#ifndef RADIOBUTTON_H
+#define RADIOBUTTON_H
 
 #include <guichan/widgets/radiobutton.hpp>
 
@@ -63,4 +63,4 @@ class RadioButton : public gcn::RadioButton {
         static Image *radioDisabledChecked;
 };
 
-#endif /* _TMW_RADIOBUTTON_H */
+#endif /* RADIOBUTTON_H */
diff --git a/src/gui/register.h b/src/gui/register.h
index 58106a41..4b95a07b 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_REGISTER_H
-#define _TMW_REGISTER_H
+#ifndef REGISTER_H
+#define REGISTER_H
 
 #include <iosfwd>
 
diff --git a/src/gui/scrollarea.h b/src/gui/scrollarea.h
index 26cba4a6..4fababfa 100644
--- a/src/gui/scrollarea.h
+++ b/src/gui/scrollarea.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_SCROLLAREA_H__
-#define __TMW_SCROLLAREA_H__
+#ifndef SCROLLAREA_H
+#define SCROLLAREA_H
 
 #include <guichan/widgets/scrollarea.hpp>
 
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 67eb13a8..3901589a 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -55,8 +55,8 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _TMW_SDLINPUT_
-#define _TMW_SDLINPUT_
+#ifndef SDLINPUT_
+#define SDLINPUT_
 
 #include <queue>
 
diff --git a/src/gui/sell.h b/src/gui/sell.h
index 0aba2909..8e639a3d 100644
--- a/src/gui/sell.h
+++ b/src/gui/sell.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SELL_H
-#define _TMW_SELL_H
+#ifndef SELL_H
+#define SELL_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/selectionlistener.hpp>
diff --git a/src/gui/setup.h b/src/gui/setup.h
index 1e0359aa..e4eb0902 100644
--- a/src/gui/setup.h
+++ b/src/gui/setup.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SETUP_H
-#define _TMW_SETUP_H
+#ifndef SETUP_H
+#define SETUP_H
 
 #include <list>
 
diff --git a/src/gui/setup_audio.h b/src/gui/setup_audio.h
index a91cb6cb..2f5cd736 100644
--- a/src/gui/setup_audio.h
+++ b/src/gui/setup_audio.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_AUDIO_H
-#define _TMW_GUI_SETUP_AUDIO_H
+#ifndef GUI_SETUP_AUDIO_H
+#define GUI_SETUP_AUDIO_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_joystick.h b/src/gui/setup_joystick.h
index fec38353..2dc56439 100644
--- a/src/gui/setup_joystick.h
+++ b/src/gui/setup_joystick.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_JOYSTICK_H
-#define _TMW_GUI_SETUP_JOYSTICK_H
+#ifndef GUI_SETUP_JOYSTICK_H
+#define GUI_SETUP_JOYSTICK_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_keyboard.h b/src/gui/setup_keyboard.h
index 86dd920b..d4966053 100644
--- a/src/gui/setup_keyboard.h
+++ b/src/gui/setup_keyboard.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_KEYBOARD_H
-#define _TMW_GUI_SETUP_KEYBOARD_H
+#ifndef GUI_SETUP_KEYBOARD_H
+#define GUI_SETUP_KEYBOARD_H
 
 #include <string>
 
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index a1f1e8aa..22c8a9b6 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_PLAYERS_H
-#define _TMW_GUI_SETUP_PLAYERS_H
+#ifndef GUI_SETUP_PLAYERS_H
+#define GUI_SETUP_PLAYERS_H
 
 #include <guichan/actionlistener.hpp>
 
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index e9cfb36e..d863fb64 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUP_VIDEO_H
-#define _TMW_GUI_SETUP_VIDEO_H
+#ifndef GUI_SETUP_VIDEO_H
+#define GUI_SETUP_VIDEO_H
 
 #include <guichan/actionlistener.hpp>
 #include <guichan/keylistener.hpp>
diff --git a/src/gui/setuptab.h b/src/gui/setuptab.h
index c1171fdb..3e0c51e2 100644
--- a/src/gui/setuptab.h
+++ b/src/gui/setuptab.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_GUI_SETUPTAB_H
-#define _TMW_GUI_SETUPTAB_H
+#ifndef GUI_SETUPTAB_H
+#define GUI_SETUPTAB_H
 
 #include "gccontainer.h"
 
diff --git a/src/gui/shoplistbox.h b/src/gui/shoplistbox.h
index c55db889..733af4eb 100644
--- a/src/gui/shoplistbox.h
+++ b/src/gui/shoplistbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SHOPLISTBOX_H
-#define _TMW_SHOPLISTBOX_H
+#ifndef SHOPLISTBOX_H
+#define SHOPLISTBOX_H
 
 #include "listbox.h"
 #include "shop.h"
diff --git a/src/gui/shortcutcontainer.h b/src/gui/shortcutcontainer.h
index 9d0584d3..d841f4d8 100644
--- a/src/gui/shortcutcontainer.h
+++ b/src/gui/shortcutcontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SHORTCUTCONTAINER_H__
-#define _TMW_SHORTCUTCONTAINER_H__
+#ifndef SHORTCUTCONTAINER_H__
+#define SHORTCUTCONTAINER_H__
 
 #include <guichan/mouselistener.hpp>
 #include <guichan/widget.hpp>
diff --git a/src/gui/shortcutwindow.h b/src/gui/shortcutwindow.h
index 3c9bfbea..0168669e 100644
--- a/src/gui/shortcutwindow.h
+++ b/src/gui/shortcutwindow.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SHORTCUTWINDOW_H
-#define _TMW_SHORTCUTWINDOW_H
+#ifndef SHORTCUTWINDOW_H
+#define SHORTCUTWINDOW_H
 
 #include "window.h"
 
diff --git a/src/gui/skill.h b/src/gui/skill.h
index 33298e96..955666d9 100644
--- a/src/gui/skill.h
+++ b/src/gui/skill.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SKILL_H
-#define _TMW_SKILL_H
+#ifndef SKILL_H
+#define SKILL_H
 
 #include <vector>
 
diff --git a/src/gui/slider.h b/src/gui/slider.h
index c2add662..c14c5be9 100644
--- a/src/gui/slider.h
+++ b/src/gui/slider.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_SLIDER_H
-#define _TMW_SLIDER_H
+#ifndef SLIDER_H
+#define SLIDER_H
 
 #include <guichan/widgets/slider.hpp>
 
diff --git a/src/gui/status.h b/src/gui/status.h
index 795ed533..14a7617e 100644
--- a/src/gui/status.h
+++ b/src/gui/status.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_STATUS_H
-#define _TMW_STATUS_H
+#ifndef STATUS_H
+#define STATUS_H
 
 #include <iosfwd>
 
diff --git a/src/gui/table.h b/src/gui/table.h
index 39a48dd5..e3fd8cf6 100644
--- a/src/gui/table.h
+++ b/src/gui/table.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TMW_TABLE_H_
-#define TMW_TABLE_H_
+#ifndef TABLE_H
+#define TABLE_H
 
 #include <vector>
 
@@ -148,4 +148,4 @@ private:
 };
 
 
-#endif /* !defined(TMW_TABLE_H_) */
+#endif /* !defined(TABLE_H) */
diff --git a/src/gui/table_model.h b/src/gui/table_model.h
index cd4bc6db..1c36ca46 100644
--- a/src/gui/table_model.h
+++ b/src/gui/table_model.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef TMW_TABLE_MODEL_H_
-#define TMW_TABLE_MODEL_H_
+#ifndef TABLE_MODEL_H
+#define TABLE_MODEL_H
 
 #include <set>
 #include <vector>
@@ -176,4 +176,4 @@ protected:
     virtual void drawBackground(gcn::Graphics *graphics);
 };
 
-#endif /* !defined(TMW_TABLE_MODEL_H_) */
+#endif /* !defined(TABLE_MODEL_H) */
diff --git a/src/gui/textbox.h b/src/gui/textbox.h
index 62385b1e..98b60402 100644
--- a/src/gui/textbox.h
+++ b/src/gui/textbox.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_TEXTBOX_H__
-#define __TMW_TEXTBOX_H__
+#ifndef TEXTBOX_H
+#define TEXTBOX_H
 
 #include <guichan/widgets/textbox.hpp>
 
diff --git a/src/gui/textfield.h b/src/gui/textfield.h
index 4c887546..a2432175 100644
--- a/src/gui/textfield.h
+++ b/src/gui/textfield.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef __TMW_TEXTFIELD_H__
-#define __TMW_TEXTFIELD_H__
+#ifndef TEXTFIELD_H
+#define TEXTFIELD_H
 
 #include <guichan/widgets/textfield.hpp>
 
diff --git a/src/gui/trade.h b/src/gui/trade.h
index 910a5183..df724038 100644
--- a/src/gui/trade.h
+++ b/src/gui/trade.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TRADE_H
-#define _TMW_TRADE_H
+#ifndef TRADE_H
+#define TRADE_H
 
 #include <memory>
 
diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h
index bb3663cd..288be49a 100644
--- a/src/gui/truetypefont.h
+++ b/src/gui/truetypefont.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TRUETYPEFONT_H
-#define _TMW_TRUETYPEFONT_H
+#ifndef TRUETYPEFONT_H
+#define TRUETYPEFONT_H
 
 #include <string>
 
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 0a140ff9..5ed40166 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_VIEWPORT_H_
-#define _TMW_VIEWPORT_H_
+#ifndef VIEWPORT_H
+#define VIEWPORT_H
 
 #include <guichan/mouselistener.hpp>
 
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index b9b8b0f8..20a4222d 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_WIDGET_LAYOUT_H__
-#define _TMW_WIDGET_LAYOUT_H__
+#ifndef WIDGET_LAYOUT_H
+#define WIDGET_LAYOUT_H
 
 #include <vector>
 
@@ -317,4 +317,4 @@ class Layout: public LayoutCell
         bool mComputed;
 };
 
-#endif // _TMW_WIDGET_LAYOUT_H__
+#endif // WIDGET_LAYOUT_H
diff --git a/src/gui/widgets/resizegrip.h b/src/gui/widgets/resizegrip.h
index 6c517de8..7f1329a2 100644
--- a/src/gui/widgets/resizegrip.h
+++ b/src/gui/widgets/resizegrip.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_RESIZEGRIP_H
-#define _TMW_RESIZEGRIP_H
+#ifndef RESIZEGRIP_H
+#define RESIZEGRIP_H
 
 #include <guichan/widget.hpp>
 
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 6b6e06af..8382df83 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TAB_H
-#define _TMW_TAB_H
+#ifndef TAB_H
+#define TAB_H
 
 #include <guichan/widgets/tab.hpp>
 
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 8d60409a..01d70380 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_TABBEDAREA_H
-#define _TMW_TABBEDAREA_H
+#ifndef TABBEDAREA_H
+#define TABBEDAREA_H
 
 #include <guichan/widget.hpp>
 #include <guichan/widgets/tabbedarea.hpp>
diff --git a/src/gui/window.h b/src/gui/window.h
index fc808cf4..51b5186d 100644
--- a/src/gui/window.h
+++ b/src/gui/window.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_WINDOW_H__
-#define _TMW_WINDOW_H__
+#ifndef WINDOW_H
+#define WINDOW_H
 
 #include <guichan/widgetlistener.hpp>
 
diff --git a/src/gui/windowcontainer.h b/src/gui/windowcontainer.h
index f087db2c..a3e80223 100644
--- a/src/gui/windowcontainer.h
+++ b/src/gui/windowcontainer.h
@@ -19,8 +19,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _TMW_WINDOWCONTAINER_H_
-#define _TMW_WINDOWCONTAINER_H_
+#ifndef WINDOWCONTAINER_H
+#define WINDOWCONTAINER_H
 
 #include <guichan/widgets/container.hpp>