Remove undescore from variables and defines.

96 files changed, 192 insertions, 192 deletions

diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index a15a7ed56..ac845adc1 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -234,7 +234,7 @@ public:
         signalAfterUpdate();
     }
 
-    virtual void updateModelInRow(int row _UNUSED_)
+    virtual void updateModelInRow(int row A_UNUSED)
     {
     }
 
diff --git a/src/gui/botcheckerwindow.h b/src/gui/botcheckerwindow.h
index cb225d3e7..e378fffb0 100644
--- a/src/gui/botcheckerwindow.h
+++ b/src/gui/botcheckerwindow.h
@@ -32,9 +32,9 @@
 #include <vector>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 struct BOTCHK
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index 530c4020b..04dd425c1 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -247,7 +247,7 @@ void BuyDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void BuyDialog::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void BuyDialog::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
 {
     // Reset amount of items and update labels
     mAmountItems = 1;
diff --git a/src/gui/buydialog.h b/src/gui/buydialog.h
index eabf26ef8..0ba2e5cb3 100644
--- a/src/gui/buydialog.h
+++ b/src/gui/buydialog.h
@@ -31,9 +31,9 @@
 #include <guichan/selectionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class ShopItems;
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 1ff375299..29ce3bace 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -87,7 +87,7 @@ class ChatInput : public TextField, public gcn::FocusListener
          * Called if the chat input loses focus. It will set itself to
          * invisible as result.
          */
-        void focusLost(const gcn::Event &event _UNUSED_)
+        void focusLost(const gcn::Event &event A_UNUSED)
         {
             processVisible(false);
         }
@@ -653,7 +653,7 @@ void ChatWindow::mouseDragged(gcn::MouseEvent &event)
 }
 
 /*
-void ChatWindow::mouseReleased(gcn::MouseEvent &event _UNUSED_)
+void ChatWindow::mouseReleased(gcn::MouseEvent &event A_UNUSED)
 {
 
 }
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index 0c43dcd8e..05e039c60 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -39,9 +39,9 @@
 #include <set>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class BrowserBox;
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index b9f6edbf6..03188907f 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -101,8 +101,8 @@ void DidYouKnowWindow::action(const gcn::ActionEvent &event)
         config.setValue("showDidYouKnow", mOpenAgainCheckBox->isSelected());
 }
 
-void DidYouKnowWindow::handleLink(const std::string &link _UNUSED_,
-                                  gcn::MouseEvent *event _UNUSED_)
+void DidYouKnowWindow::handleLink(const std::string &link A_UNUSED,
+                                  gcn::MouseEvent *event A_UNUSED)
 {
 }
 
diff --git a/src/gui/didyouknowwindow.h b/src/gui/didyouknowwindow.h
index 28a992d73..b135103e8 100644
--- a/src/gui/didyouknowwindow.h
+++ b/src/gui/didyouknowwindow.h
@@ -29,9 +29,9 @@
 #include <guichan/actionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Button;
@@ -60,7 +60,7 @@ class DidYouKnowWindow : public Window, public LinkHandler,
          * Handles link action.
          */
         void handleLink(const std::string &link,
-                        gcn::MouseEvent *event _UNUSED_);
+                        gcn::MouseEvent *event A_UNUSED);
 
         void loadData(int num = 0);
 
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 7cbcc658d..5a2820550 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -287,7 +287,7 @@ void EquipmentWindow::mouseMoved(gcn::MouseEvent &event)
 }
 
 // Hide ItemTooltip
-void EquipmentWindow::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void EquipmentWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 75118707d..84353dfd2 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -31,9 +31,9 @@
 #include <guichan/actionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Being;
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp
index e0e42c0bb..ae0a432ea 100644
--- a/src/gui/helpwindow.cpp
+++ b/src/gui/helpwindow.cpp
@@ -82,7 +82,7 @@ void HelpWindow::action(const gcn::ActionEvent &event)
 }
 
 void HelpWindow::handleLink(const std::string &link,
-                            gcn::MouseEvent *event _UNUSED_)
+                            gcn::MouseEvent *event A_UNUSED)
 {
     std::string helpFile = link;
     loadHelp(helpFile);
diff --git a/src/gui/helpwindow.h b/src/gui/helpwindow.h
index df7a867d2..d59289db0 100644
--- a/src/gui/helpwindow.h
+++ b/src/gui/helpwindow.h
@@ -29,9 +29,9 @@
 #include <guichan/actionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class BrowserBox;
@@ -58,7 +58,7 @@ class HelpWindow : public Window, public LinkHandler,
          * Handles link action.
          */
         void handleLink(const std::string &link,
-                        gcn::MouseEvent *event _UNUSED_);
+                        gcn::MouseEvent *event A_UNUSED);
 
         /**
          * Loads help in the dialog.
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 132f9cb87..5e1accc09 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -438,7 +438,7 @@ void InventoryWindow::keyReleased(gcn::KeyEvent &event)
     }
 }
 
-void InventoryWindow::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void InventoryWindow::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
 {
     if (!mInventory || !mInventory->isMainInventory())
         return;
@@ -531,7 +531,7 @@ void InventoryWindow::close()
     }
 }
 
-void InventoryWindow::event(Mana::Channels channel _UNUSED_,
+void InventoryWindow::event(Mana::Channels channel A_UNUSED,
                             const Mana::Event &event)
 {
     if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
diff --git a/src/gui/inventorywindow.h b/src/gui/inventorywindow.h
index 9ca45aaea..503423ad3 100644
--- a/src/gui/inventorywindow.h
+++ b/src/gui/inventorywindow.h
@@ -36,9 +36,9 @@
 #include <guichan/selectionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Item;
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index 908a861dd..a3f591634 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -310,7 +310,7 @@ void ItemAmountWindow::mouseMoved(gcn::MouseEvent &event)
 }
 
 // Hide ItemTooltip
-void ItemAmountWindow::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void ItemAmountWindow::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     if (mItemPopup)
         mItemPopup->setVisible(false);
@@ -414,7 +414,7 @@ void ItemAmountWindow::close()
     scheduleDelete();
 }
 
-void ItemAmountWindow::keyReleased(gcn::KeyEvent &keyEvent _UNUSED_)
+void ItemAmountWindow::keyReleased(gcn::KeyEvent &keyEvent A_UNUSED)
 {
     mItemAmountSlide->setValue(mItemAmountTextField->getValue());
 }
diff --git a/src/gui/itemamountwindow.h b/src/gui/itemamountwindow.h
index f51c074f7..2dffdc286 100644
--- a/src/gui/itemamountwindow.h
+++ b/src/gui/itemamountwindow.h
@@ -29,9 +29,9 @@
 #include <guichan/actionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Icon;
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 962e6032c..95e16127a 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -434,7 +434,7 @@ void KillStats::validateJacko()
     }
 }
 
-void KillStats::event(Mana::Channels channel _UNUSED_,
+void KillStats::event(Mana::Channels channel A_UNUSED,
                       const Mana::Event &event)
 {
     if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
diff --git a/src/gui/killstats.h b/src/gui/killstats.h
index 59b1ff653..3c7679ca9 100644
--- a/src/gui/killstats.h
+++ b/src/gui/killstats.h
@@ -77,7 +77,7 @@ class KillStats : public Window, gcn::ActionListener, public Mana::Listener
 
         void addLog(std::string str);
 
-        void event(Mana::Channels channel _UNUSED_,
+        void event(Mana::Channels channel A_UNUSED,
                    const Mana::Event &event);
 
     private:
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index feaf5e0ca..817cd74a5 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -218,7 +218,7 @@ void MiniStatusWindow::drawIcons(Graphics *graphics)
     }
 }
 
-void MiniStatusWindow::event(Mana::Channels channel _UNUSED_,
+void MiniStatusWindow::event(Mana::Channels channel A_UNUSED,
                              const Mana::Event &event)
 {
     if (event.getName() == Mana::EVENT_UPDATEATTRIBUTE)
diff --git a/src/gui/ministatus.h b/src/gui/ministatus.h
index 0915ba8d4..f19055305 100644
--- a/src/gui/ministatus.h
+++ b/src/gui/ministatus.h
@@ -32,9 +32,9 @@
 #include <vector>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class AnimatedSprite;
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index ad62f79a8..2739f13a9 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -773,7 +773,7 @@ void PopupMenu::showChangePos(int x, int y)
 }
 
 void PopupMenu::handleLink(const std::string &link,
-                           gcn::MouseEvent *event _UNUSED_)
+                           gcn::MouseEvent *event A_UNUSED)
 {
     if (!actorSpriteManager)
         return;
diff --git a/src/gui/popupmenu.h b/src/gui/popupmenu.h
index 8830bdd00..afa4bdfa2 100644
--- a/src/gui/popupmenu.h
+++ b/src/gui/popupmenu.h
@@ -29,9 +29,9 @@
 #include <guichan/actionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Being;
@@ -152,7 +152,7 @@ class PopupMenu : public Popup, public LinkHandler
          * Handles link action.
          */
         void handleLink(const std::string &link,
-                        gcn::MouseEvent *event _UNUSED_);
+                        gcn::MouseEvent *event A_UNUSED);
 
     private:
         BrowserBox* mBrowserBox;
diff --git a/src/gui/register.cpp b/src/gui/register.cpp
index b7bbc4ab2..80ddb7469 100644
--- a/src/gui/register.cpp
+++ b/src/gui/register.cpp
@@ -247,7 +247,7 @@ void RegisterDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent _UNUSED_)
+void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent A_UNUSED)
 {
     mRegisterButton->setEnabled(canSubmit());
 }
diff --git a/src/gui/register.h b/src/gui/register.h
index a44e51b2a..34bcadd6d 100644
--- a/src/gui/register.h
+++ b/src/gui/register.h
@@ -31,9 +31,9 @@
 #include <string>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class LoginData;
diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp
index fdbc53ea8..cf9bfb667 100644
--- a/src/gui/selldialog.cpp
+++ b/src/gui/selldialog.cpp
@@ -269,7 +269,7 @@ void SellDialog::action(const gcn::ActionEvent &event)
     }
 }
 
-void SellDialog::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void SellDialog::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
 {
     // Reset amount of items and update labels
     mAmountItems = 1;
diff --git a/src/gui/selldialog.h b/src/gui/selldialog.h
index e40dd50c2..46cb077e1 100644
--- a/src/gui/selldialog.h
+++ b/src/gui/selldialog.h
@@ -31,9 +31,9 @@
 #include <SDL_types.h>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Item;
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp
index d11e996a5..7c0306f8f 100644
--- a/src/gui/setup_colors.cpp
+++ b/src/gui/setup_colors.cpp
@@ -236,7 +236,7 @@ void Setup_Colors::action(const gcn::ActionEvent &event)
     }
 }
 
-void Setup_Colors::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
 {
     if (!userPalette)
         return;
diff --git a/src/gui/setup_colors.h b/src/gui/setup_colors.h
index d71c8fc5c..850f23897 100644
--- a/src/gui/setup_colors.h
+++ b/src/gui/setup_colors.h
@@ -32,9 +32,9 @@
 #include <string>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class BrowserBox;
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 453c2412c..407eca42a 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -528,7 +528,7 @@ void Setup_Players::action(const gcn::ActionEvent &event)
     }
 }
 
-void Setup_Players::updatedPlayer(const std::string &name _UNUSED_)
+void Setup_Players::updatedPlayer(const std::string &name A_UNUSED)
 {
     mPlayerTableModel->playerRelationsUpdated();
     mDefaultTrading->setSelected(
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index a13218a36..83709d7bd 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -31,9 +31,9 @@
 #include <guichan/actionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class EditDialog;
diff --git a/src/gui/setupitem.cpp b/src/gui/setupitem.cpp
index e4f112068..182501e72 100644
--- a/src/gui/setupitem.cpp
+++ b/src/gui/setupitem.cpp
@@ -145,18 +145,18 @@ void SetupItem::action()
     fromWidget();
 }
 
-void SetupItem::apply(std::string eventName _UNUSED_)
+void SetupItem::apply(std::string eventName A_UNUSED)
 {
     save();
 }
 
-void SetupItem::cancel(std::string eventName _UNUSED_)
+void SetupItem::cancel(std::string eventName A_UNUSED)
 {
     load();
     toWidget();
 }
 
-void SetupItem::externalUpdated(std::string eventName _UNUSED_)
+void SetupItem::externalUpdated(std::string eventName A_UNUSED)
 {
     load();
     toWidget();
@@ -498,10 +498,10 @@ void SetupItemLabel::toWidget()
 {
 }
 
-void SetupItemLabel::action(const gcn::ActionEvent &event _UNUSED_)
+void SetupItemLabel::action(const gcn::ActionEvent &event A_UNUSED)
 {
 }
 
-void SetupItemLabel::apply(std::string eventName _UNUSED_)
+void SetupItemLabel::apply(std::string eventName A_UNUSED)
 {
 }
diff --git a/src/gui/setupitem.h b/src/gui/setupitem.h
index 33fcbbf78..3396edea3 100644
--- a/src/gui/setupitem.h
+++ b/src/gui/setupitem.h
@@ -34,9 +34,9 @@
 #include <list>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class CheckBox;
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index c6c41884d..68ea57314 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -255,7 +255,7 @@ void ShopWindow::startTrade()
     mTradeNick = "";
 }
 
-void ShopWindow::valueChanged(const gcn::SelectionEvent &event _UNUSED_)
+void ShopWindow::valueChanged(const gcn::SelectionEvent &event A_UNUSED)
 {
     updateButtonsAndLabels();
 }
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index 0f122a876..bad4a0a4e 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -31,9 +31,9 @@
 #include <guichan/selectionlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class CheckBox;
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index b28bb7e36..5b47a5494 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -231,7 +231,7 @@ public:
             skill->dispName);
     }
 
-    void mouseExited(gcn::MouseEvent &event _UNUSED_)
+    void mouseExited(gcn::MouseEvent &event A_UNUSED)
     {
         mPopup->hide();
     }
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index 0b8287643..55dfafc38 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -43,9 +43,9 @@ class TabbedArea;
 struct SkillInfo;
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 /**
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index fcb33542b..adcfe4d70 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -99,7 +99,7 @@ protected:
 
     virtual void resetDamage(std::string name) = 0;
 
-    virtual void selectIndex(unsigned num _UNUSED_)
+    virtual void selectIndex(unsigned num A_UNUSED)
     { }
 
     TextDialog *mInviteDialog;
@@ -172,11 +172,11 @@ public:
     {
     }
 
-    void updateAvatar(std::string name _UNUSED_)
+    void updateAvatar(std::string name A_UNUSED)
     {
     }
 
-    void resetDamage(std::string name _UNUSED_)
+    void resetDamage(std::string name A_UNUSED)
     {
     }
 
@@ -269,11 +269,11 @@ public:
     {
     }
 
-    void updateAvatar(std::string name _UNUSED_)
+    void updateAvatar(std::string name A_UNUSED)
     {
     }
 
-    void resetDamage(std::string name _UNUSED_)
+    void resetDamage(std::string name A_UNUSED)
     {
     }
 
@@ -941,11 +941,11 @@ public:
 
     }
 
-    void updateAvatar(std::string name _UNUSED_)
+    void updateAvatar(std::string name A_UNUSED)
     {
     }
 
-    void resetDamage(std::string name _UNUSED_)
+    void resetDamage(std::string name A_UNUSED)
     {
     }
 
@@ -978,7 +978,7 @@ public:
                        mBrowserBox->getHeight() + 8);
     }
 
-    void handleLink(const std::string &link, gcn::MouseEvent *event _UNUSED_)
+    void handleLink(const std::string &link, gcn::MouseEvent *event A_UNUSED)
     {
         if (link == "guild" && socialWindow)
         {
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index c9cd296dc..04692d843 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -31,9 +31,9 @@
 #include <map>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class AttackTab;
diff --git a/src/gui/specialswindow.h b/src/gui/specialswindow.h
index 2c7434f40..030c1343b 100644
--- a/src/gui/specialswindow.h
+++ b/src/gui/specialswindow.h
@@ -35,9 +35,9 @@
 #include <map>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Label;
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index bfd18c40f..b96720341 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -262,7 +262,7 @@ StatusWindow::StatusWindow():
     mLvlLabel->adjustSize();
 }
 
-void StatusWindow::event(Mana::Channels channel _UNUSED_,
+void StatusWindow::event(Mana::Channels channel A_UNUSED,
                          const Mana::Event &event)
 {
     static bool blocked = false;
@@ -402,7 +402,7 @@ void StatusWindow::setPointsNeeded(int id, int needed)
 
 void StatusWindow::addAttribute(int id, const std::string &name,
                                 bool modifiable,
-                                const std::string &description _UNUSED_)
+                                const std::string &description A_UNUSED)
 {
     AttrDisplay *disp;
 
@@ -620,7 +620,7 @@ std::string StatusWindow::translateLetter(char* letters)
     return std::string(buf);
 }
 
-void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent _UNUSED_)
+void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent A_UNUSED)
 {
     if (!player_node || !viewport)
         return;
diff --git a/src/gui/statuswindow.h b/src/gui/statuswindow.h
index 79126a095..74eb2c401 100644
--- a/src/gui/statuswindow.h
+++ b/src/gui/statuswindow.h
@@ -38,9 +38,9 @@ class ScrollArea;
 class VertContainer;
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 /**
diff --git a/src/gui/updatewindow.h b/src/gui/updatewindow.h
index 03fd57d1c..a1dc556d5 100644
--- a/src/gui/updatewindow.h
+++ b/src/gui/updatewindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _UPDATERWINDOW_H
-#define _UPDATERWINDOW_H
+#ifndef UPDATERWINDOW_H
+#define UPDATERWINDOW_H
 
 #include "gui/widgets/window.h"
 
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 1b8769602..79e536c2f 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -561,7 +561,7 @@ void Viewport::mouseDragged(gcn::MouseEvent &event)
     }
 }
 
-void Viewport::mouseReleased(gcn::MouseEvent &event _UNUSED_)
+void Viewport::mouseReleased(gcn::MouseEvent &event A_UNUSED)
 {
     mPlayerFollowMouse = false;
 
@@ -667,14 +667,14 @@ void Viewport::closePopupMenu()
         mPopupMenu->handleLink("cancel", 0);
 }
 
-void Viewport::optionChanged(const std::string &name _UNUSED_)
+void Viewport::optionChanged(const std::string &name A_UNUSED)
 {
     mScrollLaziness = config.getIntValue("ScrollLaziness");
     mScrollRadius = config.getIntValue("ScrollRadius");
     mShowBeingPopup = config.getBoolValue("showBeingPopup");
 }
 
-void Viewport::mouseMoved(gcn::MouseEvent &event _UNUSED_)
+void Viewport::mouseMoved(gcn::MouseEvent &event A_UNUSED)
 {
     // Check if we are on the map
     if (!mMap || !player_node || !actorSpriteManager)
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index 774392cc0..6657b98f3 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -32,9 +32,9 @@
 #include <guichan/mouselistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class ActorSprite;
diff --git a/src/gui/whoisonline.h b/src/gui/whoisonline.h
index d6ac177d6..644121d08 100644
--- a/src/gui/whoisonline.h
+++ b/src/gui/whoisonline.h
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef _WHOISONLINE_H
-#define _WHOISONLINE_H
+#ifndef WHOISONLINE_H
+#define WHOISONLINE_H
 
 #include <string>
 #include <set>
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 0bc5ec9ef..0570630c3 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -286,12 +286,12 @@ void Button::mouseReleased(gcn::MouseEvent& mouseEvent)
     }
 }
 
-void Button::widgetResized(const gcn::Event &event _UNUSED_)
+void Button::widgetResized(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Button::widgetMoved(const gcn::Event &event _UNUSED_)
+void Button::widgetMoved(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 5cbb71d79..4e077fafb 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -29,9 +29,9 @@
 #include "gui/widgets/tab.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class ScrollArea;
@@ -115,8 +115,8 @@ class ChatTab : public Tab
          * @returns true  if the command was handled
          *          false if the command was not handled
          */
-        virtual bool handleCommand(const std::string &type _UNUSED_,
-                                   const std::string &args _UNUSED_)
+        virtual bool handleCommand(const std::string &type A_UNUSED,
+                                   const std::string &args A_UNUSED)
         { return false; }
 
         /**
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 0422345f7..61e5d9118 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -179,12 +179,12 @@ void CheckBox::drawBox(gcn::Graphics* graphics)
         static_cast<Graphics*>(graphics)->drawImage(box, 2, 2);
 }
 
-void CheckBox::mouseEntered(gcn::MouseEvent& event _UNUSED_)
+void CheckBox::mouseEntered(gcn::MouseEvent& event A_UNUSED)
 {
     mHasMouse = true;
 }
 
-void CheckBox::mouseExited(gcn::MouseEvent& event _UNUSED_)
+void CheckBox::mouseExited(gcn::MouseEvent& event A_UNUSED)
 {
     mHasMouse = false;
 }
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index a8324e2fa..a16ab242c 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -26,9 +26,9 @@
 #include <guichan/widgets/checkbox.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Image;
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 6ba6477d6..3ade3b37f 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -72,7 +72,7 @@ void Desktop::reloadWallpaper()
     setBestFittingWallpaper();
 }
 
-void Desktop::widgetResized(const gcn::Event &event _UNUSED_)
+void Desktop::widgetResized(const gcn::Event &event A_UNUSED)
 {
     setBestFittingWallpaper();
 }
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 7666b9e22..962cc3c01 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -28,9 +28,9 @@
 #include <guichan/widgetlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Image;
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 7fec6bf44..257f4837c 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -307,7 +307,7 @@ void DropShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 }
 
 // Hide ItemTooltip
-void DropShortcutContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void DropShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     mItemPopup->setVisible(false);
 }
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index c072f0613..77de914ea 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -28,9 +28,9 @@
 #include "gui/widgets/shortcutcontainer.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Image;
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index bdba4a807..bb5af4b1c 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -258,7 +258,7 @@ void EmoteShortcutContainer::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void EmoteShortcutContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void EmoteShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     if (mEmotePopup)
         mEmotePopup->setVisible(false);
diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp
index 98b90cdc7..33e3790a0 100644
--- a/src/gui/widgets/flowcontainer.cpp
+++ b/src/gui/widgets/flowcontainer.cpp
@@ -34,7 +34,7 @@ FlowContainer::FlowContainer(int boxWidth, int boxHeight):
         mBoxHeight = 1;
 }
 
-void FlowContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void FlowContainer::widgetResized(const gcn::Event &event A_UNUSED)
 {
     if (getWidth() < mBoxWidth)
     {
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 6d2a716ef..2ef6035f0 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -27,9 +27,9 @@
 #include <guichan/widgetlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 /**
diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp
index 95320055c..dbb02498a 100644
--- a/src/gui/widgets/horizontcontainer.cpp
+++ b/src/gui/widgets/horizontcontainer.cpp
@@ -50,6 +50,6 @@ void HorizontContainer::clear()
     mCount = 0;
 }
 
-void HorizontContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void HorizontContainer::widgetResized(const gcn::Event &event A_UNUSED)
 {
 }
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 99d05b11c..4a959190e 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -27,9 +27,9 @@
 #include <guichan/widgetlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 /**
diff --git a/src/gui/widgets/inventoryfilter.h b/src/gui/widgets/inventoryfilter.h
index ed49ba39b..da7b7af1e 100644
--- a/src/gui/widgets/inventoryfilter.h
+++ b/src/gui/widgets/inventoryfilter.h
@@ -28,9 +28,9 @@
 #include "gui/widgets/horizontcontainer.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class InventoryFilter : public HorizontContainer, public gcn::ActionListener
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index a9d1f5279..7818432f8 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -265,7 +265,7 @@ void ItemContainer::distributeValueChangedEvent()
     }
 }
 
-void ItemContainer::keyPressed(gcn::KeyEvent &event _UNUSED_)
+void ItemContainer::keyPressed(gcn::KeyEvent &event A_UNUSED)
 {
     /*switch (event.getKey().getValue())
     {
@@ -294,7 +294,7 @@ void ItemContainer::keyPressed(gcn::KeyEvent &event _UNUSED_)
     }*/
 }
 
-void ItemContainer::keyReleased(gcn::KeyEvent &event _UNUSED_)
+void ItemContainer::keyReleased(gcn::KeyEvent &event A_UNUSED)
 {
     /*switch (event.getKey().getValue())
     {
@@ -414,12 +414,12 @@ void ItemContainer::mouseMoved(gcn::MouseEvent &event)
 }
 
 // Hide ItemTooltip
-void ItemContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void ItemContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     mItemPopup->setVisible(false);
 }
 
-void ItemContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void ItemContainer::widgetResized(const gcn::Event &event A_UNUSED)
 {
     mGridColumns = std::max(1, getWidth() / BOX_WIDTH);
     adjustHeight();
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 05988b742..5fd897a29 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -32,9 +32,9 @@
 #include <algorithm>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Image;
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 0d6ef9990..6ae0f6b5b 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -46,7 +46,7 @@ ItemLinkHandler::~ItemLinkHandler()
 }
 
 void ItemLinkHandler::handleLink(const std::string &link,
-                                 gcn::MouseEvent *event _UNUSED_)
+                                 gcn::MouseEvent *event A_UNUSED)
 {
     if (!mItemPopup)
         return;
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index b48f87978..8dd2f62f5 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -26,9 +26,9 @@
 #include "gui/widgets/linkhandler.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class ItemPopup;
@@ -39,7 +39,7 @@ class ItemLinkHandler : public LinkHandler
         ItemLinkHandler();
         ~ItemLinkHandler();
         void handleLink(const std::string &link,
-                        gcn::MouseEvent *event _UNUSED_);
+                        gcn::MouseEvent *event A_UNUSED);
 
     private:
         ItemPopup *mItemPopup;
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index ab089ca45..328d5ae4d 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -378,7 +378,7 @@ void ItemShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 }
 
 // Hide ItemTooltip
-void ItemShortcutContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void ItemShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     mItemPopup->setVisible(false);
     mSpellPopup->setVisible(false);
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index bd3df56e5..7eac431ec 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -30,9 +30,9 @@
 #include <guichan/mouselistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Image;
diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp
index cded6313a..ace204143 100644
--- a/src/gui/widgets/layouthelper.cpp
+++ b/src/gui/widgets/layouthelper.cpp
@@ -57,7 +57,7 @@ void LayoutHelper::reflowLayout(int w, int h)
     mContainer->setSize(w, h);
 }
 
-void LayoutHelper::widgetResized(const gcn::Event &event _UNUSED_)
+void LayoutHelper::widgetResized(const gcn::Event &event A_UNUSED)
 {
     const gcn::Rectangle area = mContainer->getChildrenArea();
     int w = area.width;
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index f4f0d25c9..9b2795be7 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -28,9 +28,9 @@
 #include <guichan/widgetlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 /**
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index ae75d469e..de8707406 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -129,11 +129,11 @@ void ListBox::keyPressed(gcn::KeyEvent& keyEvent)
 
 // Don't do anything on scrollwheel. ScrollArea will deal with that.
 
-void ListBox::mouseWheelMovedUp(gcn::MouseEvent &mouseEvent _UNUSED_)
+void ListBox::mouseWheelMovedUp(gcn::MouseEvent &mouseEvent A_UNUSED)
 {
 }
 
-void ListBox::mouseWheelMovedDown(gcn::MouseEvent &mouseEvent _UNUSED_)
+void ListBox::mouseWheelMovedDown(gcn::MouseEvent &mouseEvent A_UNUSED)
 {
 }
 
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 7a372e7e2..5f8c20059 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -26,9 +26,9 @@
 #include <guichan/widgets/listbox.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class SelectionListener;
diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp
index f81b4ac7b..ea51c146a 100644
--- a/src/gui/widgets/popup.cpp
+++ b/src/gui/widgets/popup.cpp
@@ -201,7 +201,7 @@ void Popup::position(int x, int y)
     mRedraw = true;
 }
 
-void Popup::mouseMoved(gcn::MouseEvent &event _UNUSED_)
+void Popup::mouseMoved(gcn::MouseEvent &event A_UNUSED)
 {
     if (viewport)
         viewport->hideBeingPopup();
@@ -214,12 +214,12 @@ void Popup::hide()
     mRedraw = true;
 }
 
-void Popup::widgetResized(const gcn::Event &event _UNUSED_)
+void Popup::widgetResized(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Popup::widgetMoved(const gcn::Event &event _UNUSED_)
+void Popup::widgetMoved(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 963477fbb..0ac50f69e 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -33,9 +33,9 @@
 #include <guichan/widgetlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class GraphicsVertexes;
diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp
index 363bab319..c1d6a9531 100644
--- a/src/gui/widgets/progressbar.cpp
+++ b/src/gui/widgets/progressbar.cpp
@@ -281,12 +281,12 @@ void ProgressBar::render(Graphics *graphics, const gcn::Rectangle &area,
     graphics->setColor(oldColor);
 }
 
-void ProgressBar::widgetResized(const gcn::Event &event _UNUSED_)
+void ProgressBar::widgetResized(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void ProgressBar::widgetMoved(const gcn::Event &event _UNUSED_)
+void ProgressBar::widgetMoved(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index 8e3fdb9bb..a82ec3e8d 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -155,12 +155,12 @@ void RadioButton::draw(gcn::Graphics* graphics)
     graphics->drawText(getCaption(), 16, 0);
 }
 
-void RadioButton::mouseEntered(gcn::MouseEvent& event _UNUSED_)
+void RadioButton::mouseEntered(gcn::MouseEvent& event A_UNUSED)
 {
     mHasMouse = true;
 }
 
-void RadioButton::mouseExited(gcn::MouseEvent& event _UNUSED_)
+void RadioButton::mouseExited(gcn::MouseEvent& event A_UNUSED)
 {
     mHasMouse = false;
 }
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 32a06c97d..677195bd6 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -26,9 +26,9 @@
 #include <guichan/widgets/radiobutton.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Image;
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index e290be21a..df39854da 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -320,7 +320,7 @@ void ScrollArea::draw(gcn::Graphics *graphics)
     drawChildren(graphics);
 }
 
-//void ScrollArea::drawFrame(gcn::Graphics *graphics _UNUSED_)
+//void ScrollArea::drawFrame(gcn::Graphics *graphics A_UNUSED)
 void ScrollArea::drawFrame(gcn::Graphics *graphics)
 {
     if (mOpaque)
@@ -490,24 +490,24 @@ void ScrollArea::mouseMoved(gcn::MouseEvent& event)
     mY = event.getY();
 }
 
-void ScrollArea::mouseEntered(gcn::MouseEvent& event _UNUSED_)
+void ScrollArea::mouseEntered(gcn::MouseEvent& event A_UNUSED)
 {
     mHasMouse = true;
 }
 
-void ScrollArea::mouseExited(gcn::MouseEvent& event _UNUSED_)
+void ScrollArea::mouseExited(gcn::MouseEvent& event A_UNUSED)
 {
     mHasMouse = false;
 }
 
-void ScrollArea::widgetResized(const gcn::Event &event _UNUSED_)
+void ScrollArea::widgetResized(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
     getContent()->setSize(getWidth() - 2 * getFrameSize(),
                           getHeight() - 2 * getFrameSize());
 }
 
-void ScrollArea::widgetMoved(const gcn::Event& event _UNUSED_)
+void ScrollArea::widgetMoved(const gcn::Event& event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 0e5a8f850..440fcec15 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -27,9 +27,9 @@
 #include <guichan/widgetlistener.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class GraphicsVertexes;
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h
index 78391f29b..d2aa7002f 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/setuptabscroll.h
@@ -27,9 +27,9 @@
 #include <set>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class SetupItem;
@@ -56,7 +56,7 @@ class SetupTabScroll : public SetupTab
 
         virtual void externalUpdated();
 
-        virtual void action(const gcn::ActionEvent &event _UNUSED_)
+        virtual void action(const gcn::ActionEvent &event A_UNUSED)
         { }
 
     protected:
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 81a3b7b58..2fe28181b 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -179,7 +179,7 @@ void ShopListBox::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void ShopListBox::mouseExited(gcn::MouseEvent& mouseEvent _UNUSED_)
+void ShopListBox::mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED)
 {
     if (!mItemPopup)
         return;
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 095625731..917f46729 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -26,9 +26,9 @@
 #include "gui/widgets/listbox.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class ShopItems;
@@ -82,7 +82,7 @@ class ShopListBox : public ListBox
 
         void mouseMoved(gcn::MouseEvent &event);
 
-        void mouseExited(gcn::MouseEvent& mouseEvent _UNUSED_);
+        void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED);
 
     private:
         int mPlayerMoney;
diff --git a/src/gui/widgets/shortcutcontainer.cpp b/src/gui/widgets/shortcutcontainer.cpp
index d4065677a..9fd9b26c6 100644
--- a/src/gui/widgets/shortcutcontainer.cpp
+++ b/src/gui/widgets/shortcutcontainer.cpp
@@ -44,7 +44,7 @@ ShortcutContainer::ShortcutContainer():
 {
 }
 
-void ShortcutContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void ShortcutContainer::widgetResized(const gcn::Event &event A_UNUSED)
 {
     mGridWidth = getWidth() / mBoxWidth;
 
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 42454fe2b..df8529bd5 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -30,9 +30,9 @@
 #include "gui/widgets/tab.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Image;
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index 7950f6a24..d29c2211f 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -289,12 +289,12 @@ void Slider::drawMarker(gcn::Graphics *graphics)
        (getHeight() - (mHasMouse?hGripHi:hGrip)->getHeight()) / 2);
 }
 
-void Slider::mouseEntered(gcn::MouseEvent& event _UNUSED_)
+void Slider::mouseEntered(gcn::MouseEvent& event A_UNUSED)
 {
     mHasMouse = true;
 }
 
-void Slider::mouseExited(gcn::MouseEvent& event _UNUSED_)
+void Slider::mouseExited(gcn::MouseEvent& event A_UNUSED)
 {
     mHasMouse = false;
 }
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index bcc5de3c7..619c0c795 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -26,9 +26,9 @@
 #include <guichan/widgets/slider.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Image;
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index bfeecbfa0..0f4814429 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -287,7 +287,7 @@ void SpellShortcutContainer::mouseMoved(gcn::MouseEvent &event)
 }
 
 // Hide SpellTooltip
-void SpellShortcutContainer::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void SpellShortcutContainer::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     mSpellPopup->setVisible(false);
 }
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index a4ad1576a..28016cbad 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -29,9 +29,9 @@
 //#include "textcommand.h"
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Image;
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index 610bf7e68..1b548a6a3 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -220,12 +220,12 @@ void Tab::setFlash(int flash)
     mFlash = flash;
 }
 
-void Tab::widgetResized(const gcn::Event &event _UNUSED_)
+void Tab::widgetResized(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Tab::widgetMoved(const gcn::Event &event _UNUSED_)
+void Tab::widgetMoved(const gcn::Event &event A_UNUSED)
 {
     mRedraw = true;
 }
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index b20237c1b..d3539a115 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -241,7 +241,7 @@ void TabbedArea::setSelectedTab(gcn::Tab *tab)
     widgetResized(NULL);
 }
 
-void TabbedArea::widgetResized(const gcn::Event &event _UNUSED_)
+void TabbedArea::widgetResized(const gcn::Event &event A_UNUSED)
 {
     int width = getWidth() - 2 * getFrameSize()
                 - 2 * mWidgetContainer->getFrameSize();
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index d6f0783df..a91b4c199 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -33,9 +33,9 @@
 #include <string>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class Tab;
diff --git a/src/gui/widgets/table.cpp b/src/gui/widgets/table.cpp
index d5325679f..04ae41ad7 100644
--- a/src/gui/widgets/table.cpp
+++ b/src/gui/widgets/table.cpp
@@ -81,7 +81,7 @@ GuiTableActionListener::~GuiTableActionListener()
 }
 
 void GuiTableActionListener::action(const gcn::ActionEvent
-                                    &actionEvent _UNUSED_)
+                                    &actionEvent A_UNUSED)
 {
     mTable->setSelected(mRow, mColumn);
     mTable->distributeActionEvent();
diff --git a/src/gui/widgets/table.h b/src/gui/widgets/table.h
index 48075d53a..c4fab6a0d 100644
--- a/src/gui/widgets/table.h
+++ b/src/gui/widgets/table.h
@@ -32,9 +32,9 @@
 #include <vector>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class GuiTableActionListener;
diff --git a/src/gui/widgets/vertcontainer.cpp b/src/gui/widgets/vertcontainer.cpp
index 3dd258ad3..d65274f20 100644
--- a/src/gui/widgets/vertcontainer.cpp
+++ b/src/gui/widgets/vertcontainer.cpp
@@ -71,7 +71,7 @@ void VertContainer::clear()
     mCount = 0;
 }
 
-void VertContainer::widgetResized(const gcn::Event &event _UNUSED_)
+void VertContainer::widgetResized(const gcn::Event &event A_UNUSED)
 {
     for (std::vector<gcn::Widget*>::iterator it = mResizableWidgets.begin();
         it != mResizableWidgets.end(); ++ it)
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index cccd772b8..3b0ceeca7 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -29,9 +29,9 @@
 #include <vector>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 /**
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 7b88f0421..14448ea86 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -341,7 +341,7 @@ void Window::setResizable(bool r)
     }
 }
 
-void Window::widgetResized(const gcn::Event &event _UNUSED_)
+void Window::widgetResized(const gcn::Event &event A_UNUSED)
 {
     const gcn::Rectangle area = getChildrenArea();
 
@@ -361,12 +361,12 @@ void Window::widgetResized(const gcn::Event &event _UNUSED_)
     mRedraw = true;
 }
 
-void Window::widgetMoved(const gcn::Event& event _UNUSED_)
+void Window::widgetMoved(const gcn::Event& event A_UNUSED)
 {
     mRedraw = true;
 }
 
-void Window::widgetHidden(const gcn::Event &event _UNUSED_)
+void Window::widgetHidden(const gcn::Event &event A_UNUSED)
 {
     if (gui)
         gui->setCursorType(Gui::CURSOR_POINTER);
@@ -492,7 +492,7 @@ void Window::close()
     setVisible(false);
 }
 
-void Window::mouseReleased(gcn::MouseEvent &event _UNUSED_)
+void Window::mouseReleased(gcn::MouseEvent &event A_UNUSED)
 {
     if (mGrip && mouseResize)
     {
@@ -505,7 +505,7 @@ void Window::mouseReleased(gcn::MouseEvent &event _UNUSED_)
     mMoved = false;
 }
 
-void Window::mouseExited(gcn::MouseEvent &event _UNUSED_)
+void Window::mouseExited(gcn::MouseEvent &event A_UNUSED)
 {
     if (mGrip && !mouseResize && gui)
         gui->setCursorType(Gui::CURSOR_POINTER);
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 4e9a6d87b..d36d6c5ad 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -31,9 +31,9 @@
 #include <guichan/widgets/window.hpp>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class ContainerPlacer;
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index e47888a3a..0d81ba3a9 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -307,7 +307,7 @@ void WindowMenu::mouseMoved(gcn::MouseEvent &event)
     }
 }
 
-void WindowMenu::mouseExited(gcn::MouseEvent& mouseEvent _UNUSED_)
+void WindowMenu::mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED)
 {
     if (!mTextPopup)
         return;
diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h
index 503a8c1ad..6572fe470 100644
--- a/src/gui/windowmenu.h
+++ b/src/gui/windowmenu.h
@@ -33,9 +33,9 @@
 #include <vector>
 
 #ifdef __GNUC__
-#define _UNUSED_  __attribute__ ((unused))
+#define A_UNUSED  __attribute__ ((unused))
 #else
-#define _UNUSED_
+#define A_UNUSED
 #endif
 
 class EmotePopup;
@@ -64,7 +64,7 @@ class WindowMenu : public Container,
 
         void mouseMoved(gcn::MouseEvent &event);
 
-        void mouseExited(gcn::MouseEvent& mouseEvent _UNUSED_);
+        void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED);
 
         std::map <std::string, gcn::Button*> &getButtonNames()
         { return mButtonNames; }