fix code style.

52 files changed, 132 insertions, 144 deletions

diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h
index 875184851..5f19dd5ab 100644
--- a/src/gui/windows/buydialog.h
+++ b/src/gui/windows/buydialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_BUYDIALOG_H
-#define GUI_BUYDIALOG_H
+#ifndef GUI_WINDOWS_BUYDIALOG_H
+#define GUI_WINDOWS_BUYDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -160,4 +160,4 @@ class BuyDialog final : public Window,
         DropDown *mSortDropDown;
 };
 
-#endif  // GUI_BUYDIALOG_H
+#endif  // GUI_WINDOWS_BUYDIALOG_H
diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h
index 193364ff8..e8fe80a06 100644
--- a/src/gui/windows/buyselldialog.h
+++ b/src/gui/windows/buyselldialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_BUYSELLDIALOG_H
-#define GUI_BUYSELLDIALOG_H
+#ifndef GUI_WINDOWS_BUYSELLDIALOG_H
+#define GUI_WINDOWS_BUYSELLDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -80,4 +80,4 @@ class BuySellDialog final : public Window, public gcn::ActionListener
         Button *mBuyButton;
 };
 
-#endif  // GUI_BUYSELLDIALOG_H
+#endif  // GUI_WINDOWS_BUYSELLDIALOG_H
diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h
index e61ac8bc5..41c611fb8 100644
--- a/src/gui/windows/changeemaildialog.h
+++ b/src/gui/windows/changeemaildialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_CHANGEEMAILDIALOG_H
-#define GUI_CHANGEEMAILDIALOG_H
+#ifndef GUI_WINDOWS_CHANGEEMAILDIALOG_H
+#define GUI_WINDOWS_CHANGEEMAILDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -77,4 +77,4 @@ class ChangeEmailDialog final : public Window, public gcn::ActionListener
         LoginData *mLoginData;
 };
 
-#endif  // GUI_CHANGEEMAILDIALOG_H
+#endif  // GUI_WINDOWS_CHANGEEMAILDIALOG_H
diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h
index fd70348a6..144f73cd7 100644
--- a/src/gui/windows/changepassworddialog.h
+++ b/src/gui/windows/changepassworddialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_CHANGEPASSWORDDIALOG_H
-#define GUI_CHANGEPASSWORDDIALOG_H
+#ifndef GUI_WINDOWS_CHANGEPASSWORDDIALOG_H
+#define GUI_WINDOWS_CHANGEPASSWORDDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -72,4 +72,4 @@ class ChangePasswordDialog final : public Window, public gcn::ActionListener
         LoginData *mLoginData;
 };
 
-#endif  // GUI_CHANGEPASSWORDDIALOG_H
+#endif  // GUI_WINDOWS_CHANGEPASSWORDDIALOG_H
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 3916a1ece..7c09b0dfb 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -41,7 +41,6 @@
 #include "resources/iteminfo.h"
 
 #include "resources/db/chardb.h"
-#include "resources/db/colordb.h"
 #include "resources/db/itemdb.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h
index 7bb96284e..fe4732725 100644
--- a/src/gui/windows/charcreatedialog.h
+++ b/src/gui/windows/charcreatedialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_CHARCREATEDIALOG_H
-#define GUI_CHARCREATEDIALOG_H
+#ifndef GUI_WINDOWS_CHARCREATEDIALOG_H
+#define GUI_WINDOWS_CHARCREATEDIALOG_H
 
 #include "being/being.h"
 
@@ -162,4 +162,4 @@ class CharCreateDialog final : public Window,
         unsigned mDirection;
 };
 
-#endif  // GUI_CHARCREATEDIALOG_H
+#endif  // GUI_WINDOWS_CHARCREATEDIALOG_H
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index 9556ba633..705cb831c 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_CHARSELECTDIALOG_H
-#define GUI_CHARSELECTDIALOG_H
+#ifndef GUI_WINDOWS_CHARSELECTDIALOG_H
+#define GUI_WINDOWS_CHARSELECTDIALOG_H
 
 #include "main.h"
 
@@ -123,4 +123,4 @@ class CharSelectDialog final : public Window,
         bool mSmallScreen;
 };
 
-#endif  // GUI_CHARSELECTDIALOG_H
+#endif  // GUI_WINDOWS_CHARSELECTDIALOG_H
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index ee68e53c1..353212025 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -38,7 +38,6 @@
 #include "input/inputmanager.h"
 #include "input/keyevent.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 7137af08f..19a5022ab 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -20,15 +20,13 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_CHATWINDOW_H
-#define GUI_CHATWINDOW_H
+#ifndef GUI_WINDOWS_CHATWINDOW_H
+#define GUI_WINDOWS_CHATWINDOW_H
 
 #include "depricatedlistener.h"
 
 #include "configlistener.h"
 
-#include "utils/stringvector.h"
-
 #include "gui/widgets/window.h"
 
 #include <guichan/actionlistener.hpp>
@@ -375,4 +373,4 @@ class ChatWindow final : public Window,
 
 extern ChatWindow *chatWindow;
 
-#endif  // GUI_CHATWINDOW_H
+#endif  // GUI_WINDOWS_CHATWINDOW_H
diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h
index 76e3c2d18..015117fac 100644
--- a/src/gui/windows/confirmdialog.h
+++ b/src/gui/windows/confirmdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_CONFIRMDIALOG_H
-#define GUI_CONFIRMDIALOG_H
+#ifndef GUI_WINDOWS_CONFIRMDIALOG_H
+#define GUI_WINDOWS_CONFIRMDIALOG_H
 
 #include "localconsts.h"
 
@@ -62,4 +62,4 @@ class ConfirmDialog : public Window, public gcn::ActionListener
         TextBox *mTextBox;
 };
 
-#endif  // GUI_CONFIRMDIALOG_H
+#endif  // GUI_WINDOWS_CONFIRMDIALOG_H
diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h
index 21f29712c..6c7d298c5 100644
--- a/src/gui/windows/connectiondialog.h
+++ b/src/gui/windows/connectiondialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_CONNECTIONDIALOG_H
-#define GUI_CONNECTIONDIALOG_H
+#ifndef GUI_WINDOWS_CONNECTIONDIALOG_H
+#define GUI_WINDOWS_CONNECTIONDIALOG_H
 
 #include "client.h"
 
@@ -61,4 +61,4 @@ class ConnectionDialog final : public Window, private gcn::ActionListener
         State mCancelState;
 };
 
-#endif  // GUI_CONNECTIONDIALOG_H
+#endif  // GUI_WINDOWS_CONNECTIONDIALOG_H
diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h
index ef67df432..cd76c7a76 100644
--- a/src/gui/windows/debugwindow.h
+++ b/src/gui/windows/debugwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_DEBUGWINDOW_H
-#define GUI_DEBUGWINDOW_H
+#ifndef GUI_WINDOWS_DEBUGWINDOW_H
+#define GUI_WINDOWS_DEBUGWINDOW_H
 
 #include "gui/widgets/container.h"
 #include "gui/widgets/window.h"
@@ -162,4 +162,4 @@ class DebugWindow final : public Window
 
 extern DebugWindow *debugWindow;
 
-#endif  // GUI_DEBUGWINDOW_H
+#endif  // GUI_WINDOWS_DEBUGWINDOW_H
diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp
index 8c900d119..88c579d57 100644
--- a/src/gui/windows/didyouknowwindow.cpp
+++ b/src/gui/windows/didyouknowwindow.cpp
@@ -24,7 +24,6 @@
 
 #include "configuration.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 
 #include "gui/windows/setup.h"
diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h
index 49cb07a8b..ed5b82913 100644
--- a/src/gui/windows/didyouknowwindow.h
+++ b/src/gui/windows/didyouknowwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_DIDYOUKNOWWINDOW_H
-#define GUI_DIDYOUKNOWWINDOW_H
+#ifndef GUI_WINDOWS_DIDYOUKNOWWINDOW_H
+#define GUI_WINDOWS_DIDYOUKNOWWINDOW_H
 
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
@@ -75,4 +75,4 @@ class DidYouKnowWindow final : public Window,
 
 extern DidYouKnowWindow *didYouKnowWindow;
 
-#endif  // GUI_DIDYOUKNOWWINDOW_H
+#endif  // GUI_WINDOWS_DIDYOUKNOWWINDOW_H
diff --git a/src/gui/windows/editdialog.h b/src/gui/windows/editdialog.h
index 6d3d191bc..4199b6791 100644
--- a/src/gui/windows/editdialog.h
+++ b/src/gui/windows/editdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_EDITDIALOG_H
-#define GUI_EDITDIALOG_H
+#ifndef GUI_WINDOWS_EDITDIALOG_H
+#define GUI_WINDOWS_EDITDIALOG_H
 
 #include "localconsts.h"
 
@@ -66,4 +66,4 @@ class EditDialog final : public Window, public gcn::ActionListener
         TextField *mTextField;
 };
 
-#endif  // GUI_EDITDIALOG_H
+#endif  // GUI_WINDOWS_EDITDIALOG_H
diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h
index 531bb009a..6ab784eb3 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_EDITSERVERDIALOG_H
-#define GUI_EDITSERVERDIALOG_H
+#ifndef GUI_WINDOWS_EDITSERVERDIALOG_H
+#define GUI_WINDOWS_EDITSERVERDIALOG_H
 
 class Button;
 class TextField;
@@ -110,4 +110,4 @@ class EditServerDialog final : public Window,
         int mIndex;
 };
 
-#endif  // GUI_EDITSERVERDIALOG_H
+#endif  // GUI_WINDOWS_EDITSERVERDIALOG_H
diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h
index b65c0c13c..44a401a88 100644
--- a/src/gui/windows/emotewindow.h
+++ b/src/gui/windows/emotewindow.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_EMOTEWINDOW_H
-#define GUI_EMOTEWINDOW_H
+#ifndef GUI_WINDOWS_EMOTEWINDOW_H
+#define GUI_WINDOWS_EMOTEWINDOW_H
 
 #include "gui/widgets/window.h"
 
@@ -77,4 +77,4 @@ class EmoteWindow final : public Window
 
 extern EmoteWindow *emoteWindow;
 
-#endif  // GUI_EMOTEWINDOW_H
+#endif  // GUI_WINDOWS_EMOTEWINDOW_H
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index 5fd69c23a..4100206ed 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_EQUIPMENTWINDOW_H
-#define GUI_EQUIPMENTWINDOW_H
+#ifndef GUI_WINDOWS_EQUIPMENTWINDOW_H
+#define GUI_WINDOWS_EQUIPMENTWINDOW_H
 
 #include "equipment.h"
 #include "localconsts.h"
@@ -152,4 +152,4 @@ class EquipmentWindow final : public Window, public gcn::ActionListener
 extern EquipmentWindow *equipmentWindow;
 extern EquipmentWindow *beingEquipmentWindow;
 
-#endif  // GUI_EQUIPMENTWINDOW_H
+#endif  // GUI_WINDOWS_EQUIPMENTWINDOW_H
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index db85ea0bd..ae9d783fb 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -24,7 +24,6 @@
 
 #include "configuration.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 
 #include "gui/windows/didyouknowwindow.h"
diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h
index 1419e0a10..c40390bc8 100644
--- a/src/gui/windows/helpwindow.h
+++ b/src/gui/windows/helpwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_HELPWINDOW_H
-#define GUI_HELPWINDOW_H
+#ifndef GUI_WINDOWS_HELPWINDOW_H
+#define GUI_WINDOWS_HELPWINDOW_H
 
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
@@ -90,4 +90,4 @@ class HelpWindow final : public Window, public LinkHandler,
 
 extern HelpWindow *helpWindow;
 
-#endif  // GUI_HELPWINDOW_H
+#endif  // GUI_WINDOWS_HELPWINDOW_H
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 50d40dfbc..75bd90edc 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -31,7 +31,6 @@
 #include "input/inputmanager.h"
 #include "input/keyevent.h"
 
-#include "gui/gui.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/textpopup.h"
@@ -56,8 +55,6 @@
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 
-#include "resources/db/itemdb.h"
-
 #include "utils/gettext.h"
 
 #include <guichan/font.hpp>
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 7bd4ce466..7a2d1ec9f 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_INVENTORYWINDOW_H
-#define GUI_INVENTORYWINDOW_H
+#ifndef GUI_WINDOWS_INVENTORYWINDOW_H
+#define GUI_WINDOWS_INVENTORYWINDOW_H
 
 #include "inventory.h"
 #include "depricatedlistener.h"
@@ -193,4 +193,4 @@ class InventoryWindow final : public Window,
 
 extern InventoryWindow *inventoryWindow;
 
-#endif  // GUI_INVENTORYWINDOW_H
+#endif  // GUI_WINDOWS_INVENTORYWINDOW_H
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index 1c95980fb..2e741a6cd 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_ITEMAMOUNTWINDOW_H
-#define GUI_ITEMAMOUNTWINDOW_H
+#ifndef GUI_WINDOWS_ITEMAMOUNTWINDOW_H
+#define GUI_WINDOWS_ITEMAMOUNTWINDOW_H
 
 #include "gui/widgets/window.h"
 
@@ -123,4 +123,4 @@ class ItemAmountWindow final : public Window,
         bool mEnabledKeyboard;
 };
 
-#endif  // GUI_ITEMAMOUNTWINDOW_H
+#endif  // GUI_WINDOWS_ITEMAMOUNTWINDOW_H
diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h
index a5b59affb..160eebc1e 100644
--- a/src/gui/windows/killstats.h
+++ b/src/gui/windows/killstats.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_KILLSTATS_H
-#define GUI_KILLSTATS_H
+#ifndef GUI_WINDOWS_KILLSTATS_H
+#define GUI_WINDOWS_KILLSTATS_H
 
 #include <guichan/actionlistener.hpp>
 
@@ -129,4 +129,4 @@ class KillStats final : public Window,
 
 extern KillStats *killStats;
 
-#endif  // GUI_KILLSTATS_H
+#endif  // GUI_WINDOWS_KILLSTATS_H
diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h
index fee0d4016..c520c89ce 100644
--- a/src/gui/windows/logindialog.h
+++ b/src/gui/windows/logindialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_LOGINDIALOG_H
-#define GUI_LOGINDIALOG_H
+#ifndef GUI_WINDOWS_LOGINDIALOG_H
+#define GUI_WINDOWS_LOGINDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -105,4 +105,4 @@ class LoginDialog final : public Window, public gcn::ActionListener,
         std::string mServerName;
 };
 
-#endif  // GUI_LOGINDIALOG_H
+#endif  // GUI_WINDOWS_LOGINDIALOG_H
diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h
index decacfec4..72517dae5 100644
--- a/src/gui/windows/minimap.h
+++ b/src/gui/windows/minimap.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_MINIMAP_H
-#define GUI_MINIMAP_H
+#ifndef GUI_WINDOWS_MINIMAP_H
+#define GUI_WINDOWS_MINIMAP_H
 
 #include "gui/widgets/window.h"
 
@@ -86,4 +86,4 @@ class Minimap final : public Window, public ConfigListener
 
 extern Minimap *minimap;
 
-#endif  // GUI_MINIMAP_H
+#endif  // GUI_WINDOWS_MINIMAP_H
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index 39d1e689d..947e71cb8 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_MINISTATUSWINDOW_H
-#define GUI_MINISTATUSWINDOW_H
+#ifndef GUI_WINDOWS_MINISTATUSWINDOW_H
+#define GUI_WINDOWS_MINISTATUSWINDOW_H
 
 #include "inventory.h"
 #include "depricatedlistener.h"
@@ -132,4 +132,4 @@ class MiniStatusWindow final : public Popup,
 
 extern MiniStatusWindow *miniStatusWindow;
 
-#endif  // GUI_MINISTATUSWINDOW_H
+#endif  // GUI_WINDOWS_MINISTATUSWINDOW_H
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h
index d67407ac9..f48e782d9 100644
--- a/src/gui/windows/npcdialog.h
+++ b/src/gui/windows/npcdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_NPCDIALOG_H
-#define GUI_NPCDIALOG_H
+#ifndef GUI_WINDOWS_NPCDIALOG_H
+#define GUI_WINDOWS_NPCDIALOG_H
 
 #include "configlistener.h"
 
@@ -298,4 +298,4 @@ class NpcDialog final : public Window,
         bool mLogInteraction;
 };
 
-#endif  // GUI_NPCDIALOG_H
+#endif  // GUI_WINDOWS_NPCDIALOG_H
diff --git a/src/gui/windows/npcpostdialog.h b/src/gui/windows/npcpostdialog.h
index d9c31d6fd..9ac3537e2 100644
--- a/src/gui/windows/npcpostdialog.h
+++ b/src/gui/windows/npcpostdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_NPCPOSTDIALOG_H
-#define GUI_NPCPOSTDIALOG_H
+#ifndef GUI_WINDOWS_NPCPOSTDIALOG_H
+#define GUI_WINDOWS_NPCPOSTDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -71,4 +71,4 @@ class NpcPostDialog final : public Window,
         TextField *mSender;
 };
 
-#endif  // GUI_NPCPOSTDIALOG_H
+#endif  // GUI_WINDOWS_NPCPOSTDIALOG_H
diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h
index 851590595..5917c8c3a 100644
--- a/src/gui/windows/okdialog.h
+++ b/src/gui/windows/okdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_OKDIALOG_H
-#define GUI_OKDIALOG_H
+#ifndef GUI_WINDOWS_OKDIALOG_H
+#define GUI_WINDOWS_OKDIALOG_H
 
 #include "localconsts.h"
 
@@ -68,4 +68,4 @@ class OkDialog final : public Window,
         TextBox *mTextBox;
 };
 
-#endif  // GUI_OKDIALOG_H
+#endif  // GUI_WINDOWS_OKDIALOG_H
diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h
index 5f7d32e02..8aac4b1ac 100644
--- a/src/gui/windows/outfitwindow.h
+++ b/src/gui/windows/outfitwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_OUTFITWINDOW_H
-#define GUI_OUTFITWINDOW_H
+#ifndef GUI_WINDOWS_OUTFITWINDOW_H
+#define GUI_WINDOWS_OUTFITWINDOW_H
 
 #include "gui/widgets/window.h"
 
@@ -126,4 +126,4 @@ class OutfitWindow final : public Window,
 
 extern OutfitWindow *outfitWindow;
 
-#endif  // GUI_OUTFITWINDOW_H
+#endif  // GUI_WINDOWS_OUTFITWINDOW_H
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index 8baa2454c..7f320c18c 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -26,7 +26,6 @@
 
 #include "being/localplayer.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 
 #include "gui/widgets/browserbox.h"
diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h
index 72fdb7bb6..b5deb283f 100644
--- a/src/gui/windows/questswindow.h
+++ b/src/gui/windows/questswindow.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_QUESTSWINDOW_H
-#define GUI_QUESTSWINDOW_H
+#ifndef GUI_WINDOWS_QUESTSWINDOW_H
+#define GUI_WINDOWS_QUESTSWINDOW_H
 
 #include "localconsts.h"
 
@@ -103,4 +103,4 @@ class QuestsWindow final : public Window,
 
 extern QuestsWindow *questsWindow;
 
-#endif  // GUI_QUESTSWINDOW_H
+#endif  // GUI_WINDOWS_QUESTSWINDOW_H
diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h
index b0bde98fc..efbdc586d 100644
--- a/src/gui/windows/quitdialog.h
+++ b/src/gui/windows/quitdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_QUITDIALOG_H
-#define GUI_QUITDIALOG_H
+#ifndef GUI_WINDOWS_QUITDIALOG_H
+#define GUI_WINDOWS_QUITDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -80,4 +80,4 @@ class QuitDialog final : public Window, public gcn::ActionListener,
         bool mNeedForceQuit;
 };
 
-#endif  // GUI_QUITDIALOG_H
+#endif  // GUI_WINDOWS_QUITDIALOG_H
diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h
index 0bc06b92d..7d2156f32 100644
--- a/src/gui/windows/registerdialog.h
+++ b/src/gui/windows/registerdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_REGISTERDIALOG_H
-#define GUI_REGISTERDIALOG_H
+#ifndef GUI_WINDOWS_REGISTERDIALOG_H
+#define GUI_WINDOWS_REGISTERDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -109,4 +109,4 @@ class RegisterDialog final : public Window,
         WrongDataNoticeListener *mWrongDataNoticeListener;
 };
 
-#endif  // GUI_REGISTERDIALOG_H
+#endif  // GUI_WINDOWS_REGISTERDIALOG_H
diff --git a/src/gui/windows/selldialog.h b/src/gui/windows/selldialog.h
index 532244845..3f51aad76 100644
--- a/src/gui/windows/selldialog.h
+++ b/src/gui/windows/selldialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SELLDIALOG_H
-#define GUI_SELLDIALOG_H
+#ifndef GUI_WINDOWS_SELLDIALOG_H
+#define GUI_WINDOWS_SELLDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -144,4 +144,4 @@ class SellDialog final : public Window,
         std::string mNick;
 };
 
-#endif  // GUI_SELLDIALOG_H
+#endif  // GUI_WINDOWS_SELLDIALOG_H
diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp
index 96eb20562..d69471eac 100644
--- a/src/gui/windows/serverdialog.cpp
+++ b/src/gui/windows/serverdialog.cpp
@@ -30,7 +30,6 @@
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 
 #include "gui/windows/editserverdialog.h"
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index ea6954e15..95bcda706 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SERVERDIALOG_H
-#define GUI_SERVERDIALOG_H
+#ifndef GUI_WINDOWS_SERVERDIALOG_H
+#define GUI_WINDOWS_SERVERDIALOG_H
 
 #include "gui/widgets/window.h"
 #include "gui/widgets/checkbox.h"
@@ -191,4 +191,4 @@ class ServerDialog final : public Window,
         CheckBox *mPersistentIPCheckBox;
 };
 
-#endif  // GUI_SERVERDIALOG_H
+#endif  // GUI_WINDOWS_SERVERDIALOG_H
diff --git a/src/gui/windows/setup.h b/src/gui/windows/setup.h
index aeb7cc635..5b299511b 100644
--- a/src/gui/windows/setup.h
+++ b/src/gui/windows/setup.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUP_H
-#define GUI_SETUP_H
+#ifndef GUI_WINDOWS_SETUP_H
+#define GUI_WINDOWS_SETUP_H
 
 #include "gui/widgets/tabbedarea.h"
 
@@ -79,4 +79,4 @@ class Setup final : public Window, public gcn::ActionListener
 
 extern Setup* setupWindow;
 
-#endif  // GUI_SETUP_H
+#endif  // GUI_WINDOWS_SETUP_H
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 6352f6721..bf7a61c4a 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SHOPWINDOW_H
-#define GUI_SHOPWINDOW_H
+#ifndef GUI_WINDOWS_SHOPWINDOW_H
+#define GUI_WINDOWS_SHOPWINDOW_H
 
 #include "gui/widgets/window.h"
 
@@ -176,4 +176,4 @@ class ShopWindow final : public Window,
 
 extern ShopWindow *shopWindow;
 
-#endif  // GUI_SHOPWINDOW_H
+#endif  // GUI_WINDOWS_SHOPWINDOW_H
diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h
index cc2ba97b0..c8fb91b4c 100644
--- a/src/gui/windows/shortcutwindow.h
+++ b/src/gui/windows/shortcutwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SHORTCUTWINDOW_H
-#define GUI_SHORTCUTWINDOW_H
+#ifndef GUI_WINDOWS_SHORTCUTWINDOW_H
+#define GUI_WINDOWS_SHORTCUTWINDOW_H
 
 #include "gui/widgets/window.h"
 
@@ -87,4 +87,4 @@ extern ShortcutWindow *itemShortcutWindow;
 extern ShortcutWindow *emoteShortcutWindow;
 extern ShortcutWindow *dropShortcutWindow;
 
-#endif  // GUI_SHORTCUTWINDOW_H
+#endif  // GUI_WINDOWS_SHORTCUTWINDOW_H
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 9715a3bf3..1569bd5b9 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SKILLDIALOG_H
-#define GUI_SKILLDIALOG_H
+#ifndef GUI_WINDOWS_SKILLDIALOG_H
+#define GUI_WINDOWS_SKILLDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -106,4 +106,4 @@ class SkillDialog final : public Window, public gcn::ActionListener
 
 extern SkillDialog *skillDialog;
 
-#endif  // GUI_SKILLDIALOG_H
+#endif  // GUI_WINDOWS_SKILLDIALOG_H
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index 31d1b676a..c1833cd0a 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SOCIALWINDOW_H
-#define GUI_SOCIALWINDOW_H
+#ifndef GUI_WINDOWS_SOCIALWINDOW_H
+#define GUI_WINDOWS_SOCIALWINDOW_H
 
 #include "gui/widgets/window.h"
 
@@ -167,4 +167,4 @@ protected:
 
 extern SocialWindow *socialWindow;
 
-#endif  // GUI_SOCIALWINDOW_H
+#endif  // GUI_WINDOWS_SOCIALWINDOW_H
diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h
index eebcd12ca..5acccd9ff 100644
--- a/src/gui/windows/statuswindow.h
+++ b/src/gui/windows/statuswindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_STATUSWINDOW_H
-#define GUI_STATUSWINDOW_H
+#ifndef GUI_WINDOWS_STATUSWINDOW_H
+#define GUI_WINDOWS_STATUSWINDOW_H
 
 #include "depricatedlistener.h"
 
@@ -122,4 +122,4 @@ class StatusWindow final : public Window,
 
 extern StatusWindow *statusWindow;
 
-#endif  // GUI_STATUSWINDOW_H
+#endif  // GUI_WINDOWS_STATUSWINDOW_H
diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h
index 610b014d5..1a1138b3a 100644
--- a/src/gui/windows/textcommandeditor.h
+++ b/src/gui/windows/textcommandeditor.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_TEXTCOMMANDEDITOR_H
-#define GUI_TEXTCOMMANDEDITOR_H
+#ifndef GUI_WINDOWS_TEXTCOMMANDEDITOR_H
+#define GUI_WINDOWS_TEXTCOMMANDEDITOR_H
 
 #include "gui/widgets/window.h"
 
@@ -100,4 +100,4 @@ class TextCommandEditor final : public Window, public gcn::ActionListener
         bool mEnabledKeyboard;
 };
 
-#endif  // GUI_TEXTCOMMANDEDITOR_H
+#endif  // GUI_WINDOWS_TEXTCOMMANDEDITOR_H
diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h
index 9f9292ef6..f3f4612de 100644
--- a/src/gui/windows/textdialog.h
+++ b/src/gui/windows/textdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_TEXTDIALOG_H
-#define GUI_TEXTDIALOG_H
+#ifndef GUI_WINDOWS_TEXTDIALOG_H
+#define GUI_WINDOWS_TEXTDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -77,4 +77,4 @@ private:
     bool mEnabledKeyboard;
 };
 
-#endif  // GUI_TEXTDIALOG_H
+#endif  // GUI_WINDOWS_TEXTDIALOG_H
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index 3f0159340..1e25ae862 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -31,7 +31,6 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 
 #include "gui/windows/inventorywindow.h"
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index df6d8a80a..fbd516d9d 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_TRADEWINDOW_H
-#define GUI_TRADEWINDOW_H
+#ifndef GUI_WINDOWS_TRADEWINDOW_H
+#define GUI_WINDOWS_TRADEWINDOW_H
 
 #include "gui/widgets/window.h"
 
@@ -184,4 +184,4 @@ class TradeWindow final : public Window,
 
 extern TradeWindow *tradeWindow;
 
-#endif  // GUI_TRADEWINDOW_H
+#endif  // GUI_WINDOWS_TRADEWINDOW_H
diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h
index de0da27bb..63155d2eb 100644
--- a/src/gui/windows/unregisterdialog.h
+++ b/src/gui/windows/unregisterdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_UNREGISTERDIALOG_H
-#define GUI_UNREGISTERDIALOG_H
+#ifndef GUI_WINDOWS_UNREGISTERDIALOG_H
+#define GUI_WINDOWS_UNREGISTERDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -67,4 +67,4 @@ class UnRegisterDialog final : public Window, public gcn::ActionListener
         WrongDataNoticeListener *mWrongDataNoticeListener;
 };
 
-#endif  // GUI_UNREGISTERDIALOG_H
+#endif  // GUI_WINDOWS_UNREGISTERDIALOG_H
diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h
index e317e3f95..b96616cbc 100644
--- a/src/gui/windows/updaterwindow.h
+++ b/src/gui/windows/updaterwindow.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_UPDATERWINDOW_H
-#define GUI_UPDATERWINDOW_H
+#ifndef GUI_WINDOWS_UPDATERWINDOW_H
+#define GUI_WINDOWS_UPDATERWINDOW_H
 
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/window.h"
@@ -255,4 +255,4 @@ private:
     std::string mUpdateServerPath;
 };
 
-#endif  // GUI_UPDATERWINDOW_H
+#endif  // GUI_WINDOWS_UPDATERWINDOW_H
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index 5a48a8a03..847cd0f32 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WHOISONLINE_H
-#define GUI_WHOISONLINE_H
+#ifndef GUI_WINDOWS_WHOISONLINE_H
+#define GUI_WINDOWS_WHOISONLINE_H
 
 #include "configlistener.h"
 
@@ -220,4 +220,4 @@ private:
 
 extern WhoIsOnline *whoIsOnline;
 
-#endif  // GUI_WHOISONLINE_H
+#endif  // GUI_WINDOWS_WHOISONLINE_H
diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h
index ace7fd63c..d3107a807 100644
--- a/src/gui/windows/worldselectdialog.h
+++ b/src/gui/windows/worldselectdialog.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WORLDSELECTDIALOG_H
-#define GUI_WORLDSELECTDIALOG_H
+#ifndef GUI_WINDOWS_WORLDSELECTDIALOG_H
+#define GUI_WINDOWS_WORLDSELECTDIALOG_H
 
 #include "gui/widgets/window.h"
 
@@ -71,4 +71,4 @@ class WorldSelectDialog final : public Window, public gcn::ActionListener,
         Button *mChooseWorld;
 };
 
-#endif  // GUI_WORLDSELECTDIALOG_H
+#endif  // GUI_WINDOWS_WORLDSELECTDIALOG_H