fix guard header part1.

72 files changed, 214 insertions, 210 deletions

diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 579651d29..36950f3ab 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_AVATARLISTBOX_H
-#define GUI_AVATARLISTBOX_H
+#ifndef GUI_WIDGETS_AVATARLISTBOX_H
+#define GUI_WIDGETS_AVATARLISTBOX_H
 
 #include "avatar.h"
 
@@ -71,4 +71,4 @@ private:
     static Image *offlineIcon;
 };
 
-#endif
+#endif  // GUI_WIDGETS_AVATARLISTBOX_H
diff --git a/src/gui/widgets/battletab.h b/src/gui/widgets/battletab.h
index 83828f744..55b922f70 100644
--- a/src/gui/widgets/battletab.h
+++ b/src/gui/widgets/battletab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BATTLETAB_H
-#define BATTLETAB_H
+#ifndef GUI_WIDGETS_BATTLETAB_H
+#define GUI_WIDGETS_BATTLETAB_H
 
 #include "gui/widgets/chattab.h"
 
@@ -44,4 +44,5 @@ class BattleTab final : public ChatTab
 };
 
 extern BattleTab *battleChatTab;
-#endif
+
+#endif  // GUI_WIDGETS_BATTLETAB_H
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index e8975a40c..3fa8bf579 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -21,8 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BROWSERBOX_H
-#define BROWSERBOX_H
+#ifndef GUI_WIDGETS_BROWSERBOX_H
+#define GUI_WIDGETS_BROWSERBOX_H
 
 #include "gui/widgets/widget2.h"
 
@@ -273,4 +273,4 @@ class BrowserBox final : public gcn::Widget,
         static int mInstances;
 };
 
-#endif
+#endif  // GUI_WIDGETS_BROWSERBOX_H
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 2fa2d64ac..3509aeded 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef BUTTON_H
-#define BUTTON_H
+#ifndef GUI_WIDGETS_BUTTON_H
+#define GUI_WIDGETS_BUTTON_H
 
 #include "gui/widgets/widget2.h"
 
@@ -168,4 +168,4 @@ class Button final : public gcn::Button,
         bool mPressed;
 };
 
-#endif
+#endif  // GUI_WIDGETS_BUTTON_H
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index ed8a36031..2f8019e16 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WIDGETS_CHARACTER_DISPLAY_H
-#define WIDGETS_CHARACTER_DISPLAY_H
+#ifndef GUI_WIDGETS_CHARACTERDISPLAY_H
+#define GUI_WIDGETS_CHARACTERDISPLAY_H
 
 #include "gui/widgets/container.h"
 #include "gui/widgets/playerbox.h"
@@ -90,4 +90,4 @@ class CharacterDisplay final : public Container,
         TextPopup *mPopup;
 };
 
-#endif
+#endif  // GUI_WIDGETS_CHARACTERDISPLAY_H
diff --git a/src/gui/widgets/characterviewbase.h b/src/gui/widgets/characterviewbase.h
index 42e4025eb..0a179d619 100644
--- a/src/gui/widgets/characterviewbase.h
+++ b/src/gui/widgets/characterviewbase.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WIDGETS_CHARACTERVIEWBASE_H
-#define WIDGETS_CHARACTERVIEWBASE_H
+#ifndef GUI_WIDGETS_CHARACTERVIEWBASE_H
+#define GUI_WIDGETS_CHARACTERVIEWBASE_H
 
 #include "gui/charselectdialog.h"
 
@@ -62,4 +62,4 @@ class CharacterViewBase : public Container,
         int mSelected;
 };
 
-#endif
+#endif  // GUI_WIDGETS_CHARACTERVIEWBASE_H
diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h
index ab45bee8a..f404223e6 100644
--- a/src/gui/widgets/characterviewnormal.h
+++ b/src/gui/widgets/characterviewnormal.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WIDGETS_CHARACTERVIEWNORMAL_H
-#define WIDGETS_CHARACTERVIEWNORMAL_H
+#ifndef GUI_WIDGETS_CHARACTERVIEWNORMAL_H
+#define GUI_WIDGETS_CHARACTERVIEWNORMAL_H
 
 #include "gui/widgets/characterviewbase.h"
 
@@ -47,4 +47,4 @@ class CharacterViewNormal final : public CharacterViewBase
         std::vector<CharacterDisplay*> *mCharacterEntries;
 };
 
-#endif
+#endif  // GUI_WIDGETS_CHARACTERVIEWNORMAL_H
diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h
index f42500b79..2ad1f83d3 100644
--- a/src/gui/widgets/characterviewsmall.h
+++ b/src/gui/widgets/characterviewsmall.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WIDGETS_CHARACTERVIEWSMALL_H
-#define WIDGETS_CHARACTERVIEWSMALL_H
+#ifndef GUI_WIDGETS_CHARACTERVIEWSMALL_H
+#define GUI_WIDGETS_CHARACTERVIEWSMALL_H
 
 #include "gui/widgets/characterviewbase.h"
 
@@ -51,4 +51,4 @@ class CharacterViewSmall final : public CharacterViewBase
         std::vector<CharacterDisplay*> *mCharacterEntries;
 };
 
-#endif
+#endif  // GUI_WIDGETS_CHARACTERVIEWSMALL_H
diff --git a/src/gui/widgets/chattab.h b/src/gui/widgets/chattab.h
index 7f27615ae..7cec0c18d 100644
--- a/src/gui/widgets/chattab.h
+++ b/src/gui/widgets/chattab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CHATTAB_H
-#define CHATTAB_H
+#ifndef GUI_WIDGETS_CHATTAB_H
+#define GUI_WIDGETS_CHATTAB_H
 
 #include "gui/chatwindow.h"
 
@@ -209,4 +209,4 @@ class ChatTab : public Tab
 extern ChatTab *localChatTab;
 extern ChatTab *debugChatTab;
 
-#endif  // CHATTAB_H
+#endif  // GUI_WIDGETS_CHATTAB_H
diff --git a/src/gui/widgets/checkbox.h b/src/gui/widgets/checkbox.h
index c6701f52a..a18079bed 100644
--- a/src/gui/widgets/checkbox.h
+++ b/src/gui/widgets/checkbox.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef CHECKBOX_H
-#define CHECKBOX_H
+#ifndef GUI_WIDGETS_CHECKBOX_H
+#define GUI_WIDGETS_CHECKBOX_H
 
 #include "gui/widgets/widget2.h"
 
@@ -98,4 +98,4 @@ class CheckBox final : public gcn::CheckBox,
         static float mAlpha;
 };
 
-#endif
+#endif  // GUI_WIDGETS_CHECKBOX_H
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index 60da54672..8c1a0fec6 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_CONTAINER_H
-#define GUI_CONTAINER_H
+#ifndef GUI_WIDGETS_CONTAINER_H
+#define GUI_WIDGETS_CONTAINER_H
 
 #include "gui/widgets/widget2.h"
 
@@ -52,4 +52,4 @@ class Container : public gcn::Container,
         bool safeRemove(gcn::Widget *const widget);
 };
 
-#endif
+#endif  // GUI_WIDGETS_CONTAINER_H
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index d08127630..d0a853efb 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DESKTOP_H
-#define DESKTOP_H
+#ifndef GUI_WIDGETS_DESKTOP_H
+#define GUI_WIDGETS_DESKTOP_H
 
 #include "gui/widgets/container.h"
 
@@ -71,4 +71,4 @@ class Desktop final : public Container, private gcn::WidgetListener
         gcn::Color mBackgroundGrayColor;
 };
 
-#endif  // DESKTOP_H
+#endif  // GUI_WIDGETS_DESKTOP_H
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index ae74e571d..4c6120dfa 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DROPDOWN_H
-#define DROPDOWN_H
+#ifndef GUI_WIDGETS_DROPDOWN_H
+#define GUI_WIDGETS_DROPDOWN_H
 
 #include "gui/widgets/widget2.h"
 
@@ -171,4 +171,4 @@ class DropDown final : public gcn::ActionListener,
         static Skin *mSkin;
 };
 
-#endif  // end DROPDOWN_H
+#endif  // GUI_WIDGETS_DROPDOWN_H
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 62f52a858..c7dde87b9 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef DROPSHORTCUTCONTAINER_H
-#define DROPSHORTCUTCONTAINER_H
+#ifndef GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
+#define GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
 
 #include <guichan/mouselistener.hpp>
 
@@ -90,4 +90,4 @@ class DropShortcutContainer final : public ShortcutContainer
         gcn::Color mUnEquipedColor2;
 };
 
-#endif
+#endif  // GUI_WIDGETS_DROPSHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index f10d1b67f..3efd884a6 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EMOTESHORTCUTCONTAINER_H
-#define EMOTESHORTCUTCONTAINER_H
+#ifndef GUI_WIDGETS_EMOTESHORTCUTCONTAINER_H
+#define GUI_WIDGETS_EMOTESHORTCUTCONTAINER_H
 
 #include "gui/widgets/shortcutcontainer.h"
 
@@ -89,4 +89,4 @@ class EmoteShortcutContainer final : public ShortcutContainer
         unsigned char mEmoteMoved;
 };
 
-#endif
+#endif  // GUI_WIDGETS_EMOTESHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/extendedlistbox.h b/src/gui/widgets/extendedlistbox.h
index c5fca2e4c..1ac942a54 100644
--- a/src/gui/widgets/extendedlistbox.h
+++ b/src/gui/widgets/extendedlistbox.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EXTENDEDLISTBOX_H
-#define EXTENDEDLISTBOX_H
+#ifndef GUI_WIDGETS_EXTENDEDLISTBOX_H
+#define GUI_WIDGETS_EXTENDEDLISTBOX_H
 
 #include "gui/widgets/listbox.h"
 
@@ -56,4 +56,4 @@ class ExtendedListBox final : public ListBox
         int mItemPadding;
 };
 
-#endif
+#endif  // GUI_WIDGETS_EXTENDEDLISTBOX_H
diff --git a/src/gui/widgets/extendedlistmodel.h b/src/gui/widgets/extendedlistmodel.h
index c24382c5b..40decf9d3 100644
--- a/src/gui/widgets/extendedlistmodel.h
+++ b/src/gui/widgets/extendedlistmodel.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef EXTENDEDLISTMODEL_H
-#define EXTENDEDLISTMODEL_H
+#ifndef GUI_WIDGETS_EXTENDEDLISTMODEL_H
+#define GUI_WIDGETS_EXTENDEDLISTMODEL_H
 
 #include "resources/image.h"
 
@@ -31,4 +31,4 @@ class ExtendedListModel : public gcn::ListModel
         virtual const Image *getImageAt(int i) A_WARN_UNUSED = 0;
 };
 
-#endif
+#endif  // GUI_WIDGETS_EXTENDEDLISTMODEL_H
diff --git a/src/gui/widgets/extendednamesmodel.h b/src/gui/widgets/extendednamesmodel.h
index 0978f7302..3c08ef948 100644
--- a/src/gui/widgets/extendednamesmodel.h
+++ b/src/gui/widgets/extendednamesmodel.h
@@ -58,4 +58,4 @@ class ExtendedNamesModel : public ExtendedListModel
         std::vector<Image*> mImages;
 };
 
-#endif
+#endif  // GUI_WIDGETS_EXTENDEDNAMESMODEL_H
diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h
index 45f493d9b..d9678ccd0 100644
--- a/src/gui/widgets/flowcontainer.h
+++ b/src/gui/widgets/flowcontainer.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef FLOWCONTAINER_H
-#define FLOWCONTAINER_H
+#ifndef GUI_WIDGETS_FLOWCONTAINER_H
+#define GUI_WIDGETS_FLOWCONTAINER_H
 
 #include "gui/widgets/container.h"
 
@@ -71,4 +71,4 @@ class FlowContainer final : public Container,
         int mGridWidth, mGridHeight;
 };
 
-#endif
+#endif  // GUI_WIDGETS_FLOWCONTAINER_H
diff --git a/src/gui/widgets/gmtab.h b/src/gui/widgets/gmtab.h
index cadadca7e..c0a2ffdd8 100644
--- a/src/gui/widgets/gmtab.h
+++ b/src/gui/widgets/gmtab.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GMTAB_H
-#define GMTAB_H
+#ifndef GUI_WIDGETS_GMTAB_H
+#define GUI_WIDGETS_GMTAB_H
 
 #include "gui/widgets/chattab.h"
 
@@ -50,4 +50,4 @@ class GmTab final : public ChatTab
 
 extern GmTab *gmChatTab;
 
-#endif  // GMTAB_H
+#endif  // GUI_WIDGETS_GMTAB_H
diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h
index 6daada229..1303d6f39 100644
--- a/src/gui/widgets/guildchattab.h
+++ b/src/gui/widgets/guildchattab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_GUILDTAB_H
-#define GUI_GUILDTAB_H
+#ifndef GUI_WIDGETS_GUILDCHATTAB_H
+#define GUI_WIDGETS_GUILDCHATTAB_H
 
 #include "gui/widgets/chattab.h"
 
@@ -57,4 +57,4 @@ class GuildChatTab final : public ChatTab, public ConfigListener
         void getAutoCompleteList(StringVect &names) const override;
 };
 
-#endif
+#endif  // GUI_WIDGETS_GUILDCHATTAB_H
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index 3dfc23f1c..37b44410b 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TABLE_H
-#define TABLE_H
+#ifndef GUI_WIDGETS_GUITABLE_H
+#define GUI_WIDGETS_GUITABLE_H
 
 #include "localconsts.h"
 
@@ -193,4 +193,4 @@ private:
     gcn::Color mHighlightColor;
 };
 
-#endif  // TABLE_H
+#endif  // GUI_WIDGETS_GUITABLE_H
diff --git a/src/gui/widgets/horizontcontainer.h b/src/gui/widgets/horizontcontainer.h
index 486ba53db..c9b50a9b9 100644
--- a/src/gui/widgets/horizontcontainer.h
+++ b/src/gui/widgets/horizontcontainer.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_HORIZONTCONTAINER_H
-#define GUI_HORIZONTCONTAINER_H
+#ifndef GUI_WIDGETS_HORIZONTCONTAINER_H
+#define GUI_WIDGETS_HORIZONTCONTAINER_H
 
 #include "gui/widgets/container.h"
 
@@ -55,4 +55,4 @@ class HorizontContainer final : public Container, public gcn::WidgetListener
         int mLastX;
 };
 
-#endif
+#endif  // GUI_WIDGETS_HORIZONTCONTAINER_H
diff --git a/src/gui/widgets/icon.h b/src/gui/widgets/icon.h
index bae76bb72..a81fc8bc1 100644
--- a/src/gui/widgets/icon.h
+++ b/src/gui/widgets/icon.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ICON_H
-#define ICON_H
+#ifndef GUI_WIDGETS_ICON_H
+#define GUI_WIDGETS_ICON_H
 
 #include "gui/widgets/widget2.h"
 
@@ -74,4 +74,4 @@ class Icon final : public gcn::Widget,
         Image *mImage;
 };
 
-#endif  // ICON_H
+#endif  // GUI_WIDGETS_ICON_H
diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h
index 415c2806e..8919885e5 100644
--- a/src/gui/widgets/inttextfield.h
+++ b/src/gui/widgets/inttextfield.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef INTTEXTFIELD_H
-#define INTTEXTFIELD_H
+#ifndef GUI_WIDGETS_INTTEXTFIELD_H
+#define GUI_WIDGETS_INTTEXTFIELD_H
 
 #include "gui/widgets/textfield.h"
 
@@ -77,4 +77,4 @@ class IntTextField final : public TextField
         int mValue;          /**< Current value */
 };
 
-#endif
+#endif  // GUI_WIDGETS_INTTEXTFIELD_H
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 395f885eb..a422e654d 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ITEMCONTAINER_H
-#define ITEMCONTAINER_H
+#ifndef GUI_WIDGETS_ITEMCONTAINER_H
+#define GUI_WIDGETS_ITEMCONTAINER_H
 
 #include "gui/widgets/widget2.h"
 
@@ -227,4 +227,4 @@ class ItemContainer final : public gcn::Widget,
         gcn::Color mUnEquipedColor2;
 };
 
-#endif
+#endif  // GUI_WIDGETS_ITEMCONTAINER_H
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index 6d389b4b7..abeee0156 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ITEM_LINK_HANDLER_H
-#define ITEM_LINK_HANDLER_H
+#ifndef GUI_WIDGETS_ITEMLINKHANDLER_H
+#define GUI_WIDGETS_ITEMLINKHANDLER_H
 
 #include "gui/widgets/linkhandler.h"
 
@@ -45,4 +45,4 @@ class ItemLinkHandler final : public LinkHandler
         ItemPopup *mItemPopup;
 };
 
-#endif
+#endif  // GUI_WIDGETS_ITEMLINKHANDLER_H
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 97ad0db27..afd421b40 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef ITEMSHORTCUTCONTAINER_H
-#define ITEMSHORTCUTCONTAINER_H
+#ifndef GUI_WIDGETS_ITEMSHORTCUTCONTAINER_H
+#define GUI_WIDGETS_ITEMSHORTCUTCONTAINER_H
 
 #include "gui/widgets/shortcutcontainer.h"
 
@@ -94,4 +94,4 @@ class ItemShortcutContainer final : public ShortcutContainer
         gcn::Color mForegroundColor2;
 };
 
-#endif
+#endif  // GUI_WIDGETS_ITEMSHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/label.h b/src/gui/widgets/label.h
index 39146ffd2..31d75b6ff 100644
--- a/src/gui/widgets/label.h
+++ b/src/gui/widgets/label.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LABEL_H
-#define LABEL_H
+#ifndef GUI_WIDGETS_LABEL_H
+#define GUI_WIDGETS_LABEL_H
 
 #include "gui/widgets/widget2.h"
 
@@ -76,4 +76,4 @@ class Label final : public gcn::Label, public Widget2
         int mPadding;
 };
 
-#endif
+#endif  // GUI_WIDGETS_LABEL_H
diff --git a/src/gui/widgets/langtab.h b/src/gui/widgets/langtab.h
index 04c77cac2..c594981ad 100644
--- a/src/gui/widgets/langtab.h
+++ b/src/gui/widgets/langtab.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LANGTAB_H
-#define LANGTAB_H
+#ifndef GUI_WIDGETS_LANGTAB_H
+#define GUI_WIDGETS_LANGTAB_H
 
 #include "gui/widgets/chattab.h"
 
@@ -39,4 +39,5 @@ class LangTab final : public ChatTab
 };
 
 extern LangTab *langChatTab;
-#endif
+
+#endif  // GUI_WIDGETS_LANGTAB_H
diff --git a/src/gui/widgets/layout.h b/src/gui/widgets/layout.h
index 7dbb61384..33930c69e 100644
--- a/src/gui/widgets/layout.h
+++ b/src/gui/widgets/layout.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WIDGET_LAYOUT_H
-#define WIDGET_LAYOUT_H
+#ifndef GUI_WIDGETS_LAYOUT_H
+#define GUI_WIDGETS_LAYOUT_H
 
 #include "localconsts.h"
 
@@ -363,4 +363,4 @@ class Layout final : public LayoutCell
         bool mComputed;
 };
 
-#endif  // WIDGET_LAYOUT_H
+#endif  // GUI_WIDGETS_LAYOUT_H
diff --git a/src/gui/widgets/layouthelper.h b/src/gui/widgets/layouthelper.h
index fea4efdd6..9831abc28 100644
--- a/src/gui/widgets/layouthelper.h
+++ b/src/gui/widgets/layouthelper.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LAYOUTHELPER_H
-#define LAYOUTHELPER_H
+#ifndef GUI_WIDGETS_LAYOUTHELPER_H
+#define GUI_WIDGETS_LAYOUTHELPER_H
 
 #include "gui/widgets/layout.h"
 
@@ -85,4 +85,4 @@ class LayoutHelper final : public gcn::WidgetListener
         gcn::Container *mContainer;  /**< Managed container */
 };
 
-#endif  // LAYOUTHELPER_H
+#endif  // GUI_WIDGETS_LAYOUTHELPER_H
diff --git a/src/gui/widgets/linkhandler.h b/src/gui/widgets/linkhandler.h
index 7411facc3..1114f5a21 100644
--- a/src/gui/widgets/linkhandler.h
+++ b/src/gui/widgets/linkhandler.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LINK_HANDLER_H
-#define LINK_HANDLER_H
+#ifndef GUI_WIDGETS_LINKHANDLER_H
+#define GUI_WIDGETS_LINKHANDLER_H
 
 #include <string>
 
@@ -41,4 +41,4 @@ class LinkHandler
                                 gcn::MouseEvent *event) = 0;
 };
 
-#endif
+#endif  // GUI_WIDGETS_LINKHANDLER_H
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index ea48c6f16..287090c92 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LISTBOX_H
-#define LISTBOX_H
+#ifndef GUI_WIDGETS_LISTBOX_H
+#define GUI_WIDGETS_LISTBOX_H
 
 #include "gui/widgets/widget2.h"
 
@@ -101,4 +101,4 @@ class ListBox : public gcn::ListBox,
         Skin *mSkin;
 };
 
-#endif
+#endif  // GUI_WIDGETS_LISTBOX_H
diff --git a/src/gui/widgets/mouseevent.h b/src/gui/widgets/mouseevent.h
index 0d1a10096..fd3bb0ac8 100644
--- a/src/gui/widgets/mouseevent.h
+++ b/src/gui/widgets/mouseevent.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_MOUSEEVENT_H
-#define GUI_MOUSEEVENT_H
+#ifndef GUI_WIDGETS_MOUSEEVENT_H
+#define GUI_WIDGETS_MOUSEEVENT_H
 
 #include <guichan/mouseevent.hpp>
 #include <guichan/widget.hpp>
@@ -45,4 +45,4 @@ class MouseEvent final : public gcn::MouseEvent
         { mY = n; }
 };
 
-#endif
+#endif  // GUI_WIDGETS_MOUSEEVENT_H
diff --git a/src/gui/widgets/namesmodel.h b/src/gui/widgets/namesmodel.h
index 4a1754ef0..9bf024a9e 100644
--- a/src/gui/widgets/namesmodel.h
+++ b/src/gui/widgets/namesmodel.h
@@ -55,4 +55,4 @@ class NamesModel : public gcn::ListModel
         StringVect mNames;
 };
 
-#endif
+#endif  // GUI_WIDGETS_NAMESMODEL_H
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index 46ed865f2..d605d7d38 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PASSWORDFIELD_H
-#define PASSWORDFIELD_H
+#ifndef GUI_WIDGETS_PASSWORDFIELD_H
+#define GUI_WIDGETS_PASSWORDFIELD_H
 
 #include "gui/widgets/textfield.h"
 
@@ -50,4 +50,4 @@ class PasswordField final : public TextField
         int mPasswordChar;
 };
 
-#endif
+#endif  // GUI_WIDGETS_PASSWORDFIELD_H
diff --git a/src/gui/widgets/playerbox.h b/src/gui/widgets/playerbox.h
index f2b0a0616..7368bb2d7 100644
--- a/src/gui/widgets/playerbox.h
+++ b/src/gui/widgets/playerbox.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PLAYERBOX_H
-#define PLAYERBOX_H
+#ifndef GUI_WIDGETS_PLAYERBOX_H
+#define GUI_WIDGETS_PLAYERBOX_H
 
 #include "gui/widgets/widget2.h"
 
@@ -101,4 +101,4 @@ class PlayerBox final : public Widget2,
         bool mSelected;
 };
 
-#endif
+#endif  // GUI_WIDGETS_PLAYERBOX_H
diff --git a/src/gui/widgets/popup.h b/src/gui/widgets/popup.h
index 57772f642..c5f8bd3c1 100644
--- a/src/gui/widgets/popup.h
+++ b/src/gui/widgets/popup.h
@@ -21,8 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef POPUP_H
-#define POPUP_H
+#ifndef GUI_WIDGETS_POPUP_H
+#define GUI_WIDGETS_POPUP_H
 
 #include "configuration.h"
 #include "gui/widgets/container.h"
@@ -186,4 +186,4 @@ class Popup : public Container, public gcn::MouseListener,
         bool mRedraw;
 };
 
-#endif
+#endif  // GUI_WIDGETS_POPUP_H
diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h
index 59e04df63..a9d2c7593 100644
--- a/src/gui/widgets/popuplist.h
+++ b/src/gui/widgets/popuplist.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef POPUP_LIST_H
-#define POPUP_LIST_H
+#ifndef GUI_WIDGETS_POPUPLIST_H
+#define GUI_WIDGETS_POPUPLIST_H
 
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
@@ -75,4 +75,4 @@ class PopupList final : public Popup,
         bool mModal;
 };
 
-#endif
+#endif  // GUI_WIDGETS_POPUPLIST_H
diff --git a/src/gui/widgets/progressbar.h b/src/gui/widgets/progressbar.h
index c5486f294..c1cd2afb7 100644
--- a/src/gui/widgets/progressbar.h
+++ b/src/gui/widgets/progressbar.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PROGRESSBAR_H
-#define PROGRESSBAR_H
+#ifndef GUI_WIDGETS_PROGRESSBAR_H
+#define GUI_WIDGETS_PROGRESSBAR_H
 
 #include "gui/widgets/widget2.h"
 
@@ -161,4 +161,4 @@ class ProgressBar final : public gcn::Widget,
         static const gcn::Color TEXT_COLOR;
 };
 
-#endif
+#endif  // GUI_WIDGETS_PROGRESSBAR_H
diff --git a/src/gui/widgets/progressindicator.h b/src/gui/widgets/progressindicator.h
index da80f59ec..66f6c8a0e 100644
--- a/src/gui/widgets/progressindicator.h
+++ b/src/gui/widgets/progressindicator.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PROGRESSINDICATOR_H
-#define PROGRESSINDICATOR_H
+#ifndef GUI_WIDGETS_PROGRESSINDICATOR_H
+#define GUI_WIDGETS_PROGRESSINDICATOR_H
 
 #include "gui/widgets/widget2.h"
 
@@ -52,4 +52,4 @@ class ProgressIndicator final : public gcn::Widget,
         SimpleAnimation *mIndicator;
 };
 
-#endif  // PROGRESSINDICATOR_H
+#endif  // GUI_WIDGETS_PROGRESSINDICATOR_H
diff --git a/src/gui/widgets/radiobutton.h b/src/gui/widgets/radiobutton.h
index 50372e8c2..01bbb438e 100644
--- a/src/gui/widgets/radiobutton.h
+++ b/src/gui/widgets/radiobutton.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef RADIOBUTTON_H
-#define RADIOBUTTON_H
+#ifndef GUI_WIDGETS_RADIOBUTTON_H
+#define GUI_WIDGETS_RADIOBUTTON_H
 
 #include "gui/widgets/widget2.h"
 
@@ -91,4 +91,4 @@ class RadioButton final : public gcn::RadioButton,
         gcn::Color mForegroundColor2;
 };
 
-#endif  // RADIOBUTTON_H
+#endif  // GUI_WIDGETS_RADIOBUTTON_H
diff --git a/src/gui/widgets/radiogroup.h b/src/gui/widgets/radiogroup.h
index db2cd6dbb..60348e4ac 100644
--- a/src/gui/widgets/radiogroup.h
+++ b/src/gui/widgets/radiogroup.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_RADIOGROUP_H
-#define GUI_RADIOGROUP_H
+#ifndef GUI_WIDGETS_RADIOGROUP_H
+#define GUI_WIDGETS_RADIOGROUP_H
 
 #include "gui/widgets/widgetgroup.h"
 
@@ -38,4 +38,4 @@ class RadioGroup final : public WidgetGroup
                                   override A_WARN_UNUSED;
 };
 
-#endif
+#endif  // GUI_WIDGETS_RADIOGROUP_H
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 6772e9e0c..6455d1af8 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SCROLLAREA_H
-#define SCROLLAREA_H
+#ifndef GUI_WIDGETS_SCROLLAREA_H
+#define GUI_WIDGETS_SCROLLAREA_H
 
 #include "gui/widgets/widget2.h"
 
@@ -196,4 +196,4 @@ class ScrollArea final : public gcn::ScrollArea,
         int mDrawHeight;
 };
 
-#endif
+#endif  // GUI_WIDGETS_SCROLLAREA_H
diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h
index d91f0ac2e..2acf8a422 100644
--- a/src/gui/widgets/setupitem.h
+++ b/src/gui/widgets/setupitem.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SETUPITEM_H
-#define SETUPITEM_H
+#ifndef GUI_WIDGETS_SETUPITEM_H
+#define GUI_WIDGETS_SETUPITEM_H
 
 #include "gui/widgets/tabbedarea.h"
 
@@ -456,4 +456,4 @@ class SetupItemSound final : public SetupItemSliderList
         Button *mButton;
 };
 
-#endif
+#endif  // GUI_WIDGETS_SETUPITEM_H
diff --git a/src/gui/widgets/setuptab.h b/src/gui/widgets/setuptab.h
index a388daf82..8e656234f 100644
--- a/src/gui/widgets/setuptab.h
+++ b/src/gui/widgets/setuptab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUPTAB_H
-#define GUI_SETUPTAB_H
+#ifndef GUI_WIDGETS_SETUPTAB_H
+#define GUI_WIDGETS_SETUPTAB_H
 
 #include "gui/widgets/container.h"
 
@@ -71,4 +71,4 @@ class SetupTab : public Container,
         std::string mName;
 };
 
-#endif
+#endif  // GUI_WIDGETS_SETUPTAB_H
diff --git a/src/gui/widgets/setuptabscroll.h b/src/gui/widgets/setuptabscroll.h
index e177ba6cb..6e73e7a70 100644
--- a/src/gui/widgets/setuptabscroll.h
+++ b/src/gui/widgets/setuptabscroll.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SETUPTABSCROLL_H
-#define GUI_SETUPTABSCROLL_H
+#ifndef GUI_WIDGETS_SETUPTABSCROLL_H
+#define GUI_WIDGETS_SETUPTABSCROLL_H
 
 #include "gui/widgets/setuptab.h"
 
@@ -72,4 +72,4 @@ class SetupTabScroll : public SetupTab
         int mPreferredFirstItemSize;
 };
 
-#endif
+#endif  // GUI_WIDGETS_SETUPTABSCROLL_H
diff --git a/src/gui/widgets/setuptouchitem.h b/src/gui/widgets/setuptouchitem.h
index 72c0cba0c..ac9264467 100644
--- a/src/gui/widgets/setuptouchitem.h
+++ b/src/gui/widgets/setuptouchitem.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SETUPTOUCHITEM_H
-#define SETUPTOUCHITEM_H
+#ifndef GUI_WIDGETS_SETUPTOUCHITEM_H
+#define GUI_WIDGETS_SETUPTOUCHITEM_H
 
 #include "gui/setupactiondata.h"
 
@@ -81,4 +81,4 @@ class SetupActionDropDown final : public SetupItem
         int mWidth;
 };
 
-#endif
+#endif  // GUI_WIDGETS_SETUPTOUCHITEM_H
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index e577916a2..c3ce2ff4b 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SHOPITEMS_H
-#define SHOPITEMS_H
+#ifndef GUI_WIDGETS_SHOPITEMS_H
+#define GUI_WIDGETS_SHOPITEMS_H
 
 #include <guichan/listmodel.hpp>
 
@@ -138,4 +138,4 @@ class ShopItems final : public gcn::ListModel
         bool mMergeDuplicates;
 };
 
-#endif  // SHOPITEMS_H
+#endif  // GUI_WIDGETS_SHOPITEMS_H
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 5bc63ca85..3f2cc6a27 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SHOPLISTBOX_H
-#define SHOPLISTBOX_H
+#ifndef GUI_WIDGETS_SHOPLISTBOX_H
+#define GUI_WIDGETS_SHOPLISTBOX_H
 
 #include "gui/widgets/listbox.h"
 
@@ -106,4 +106,4 @@ class ShopListBox final : public ListBox
         static float mAlpha;
 };
 
-#endif  // SHOPLISTBOX_H
+#endif  // GUI_WIDGETS_SHOPLISTBOX_H
diff --git a/src/gui/widgets/shortcutcontainer.h b/src/gui/widgets/shortcutcontainer.h
index 5872f765d..176c1837c 100644
--- a/src/gui/widgets/shortcutcontainer.h
+++ b/src/gui/widgets/shortcutcontainer.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SHORTCUTCONTAINER_H
-#define SHORTCUTCONTAINER_H
+#ifndef GUI_WIDGETS_SHORTCUTCONTAINER_H
+#define GUI_WIDGETS_SHORTCUTCONTAINER_H
 
 #include "gui/widgets/tab.h"
 
@@ -120,4 +120,4 @@ class ShortcutContainer : public gcn::Widget,
         bool mRedraw;
 };
 
-#endif
+#endif  // GUI_WIDGETS_SHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/skilldata.h b/src/gui/widgets/skilldata.h
index 63a73abed..bef377e9e 100644
--- a/src/gui/widgets/skilldata.h
+++ b/src/gui/widgets/skilldata.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SKILLDATA_H
-#define SKILLDATA_H
+#ifndef GUI_WIDGETS_SKILLDATA_H
+#define GUI_WIDGETS_SKILLDATA_H
 
 #include "gui/theme.h"
 
@@ -47,4 +47,4 @@ struct SkillData final
     void setIcon(const std::string &iconPath);
 };
 
-#endif
+#endif  // GUI_WIDGETS_SKILLDATA_H
diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h
index 21c310ea1..cfc55d053 100644
--- a/src/gui/widgets/skillinfo.h
+++ b/src/gui/widgets/skillinfo.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SKILLINFO_H
-#define SKILLINFO_H
+#ifndef GUI_WIDGETS_SKILLINFO_H
+#define GUI_WIDGETS_SKILLINFO_H
 
 #include "gui/widgets/skilldata.h"
 
@@ -65,4 +65,4 @@ struct SkillInfo final
 typedef std::vector<SkillInfo*> SkillList;
 typedef SkillList::iterator SkillListIter;
 
-#endif
+#endif  // GUI_WIDGETS_SKILLINFO_H
diff --git a/src/gui/widgets/skillmodel.h b/src/gui/widgets/skillmodel.h
index 7bd113a18..da5779672 100644
--- a/src/gui/widgets/skillmodel.h
+++ b/src/gui/widgets/skillmodel.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SKILLMODEL_H
-#define SKILLMODEL_H
+#ifndef GUI_WIDGETS_SKILLMODEL_H
+#define GUI_WIDGETS_SKILLMODEL_H
 
 #include "configuration.h"
 #include "effectmanager.h"
@@ -83,4 +83,4 @@ class SkillModel final : public gcn::ListModel
         SkillList mVisibleSkills;
 };
 
-#endif
+#endif  // GUI_WIDGETS_SKILLMODEL_H
diff --git a/src/gui/widgets/slider.h b/src/gui/widgets/slider.h
index f1cc5b1b0..0adb05291 100644
--- a/src/gui/widgets/slider.h
+++ b/src/gui/widgets/slider.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SLIDER_H
-#define SLIDER_H
+#ifndef GUI_WIDGETS_SLIDER_H
+#define GUI_WIDGETS_SLIDER_H
 
 #include "gui/widgets/widget2.h"
 
@@ -110,4 +110,4 @@ class Slider final : public gcn::Slider,
         static int mInstances;
 };
 
-#endif
+#endif  // GUI_WIDGETS_SLIDER_H
diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h
index 4a0a9b351..f9394b3d6 100644
--- a/src/gui/widgets/sliderlist.h
+++ b/src/gui/widgets/sliderlist.h
@@ -83,4 +83,4 @@ class SliderList final : public Container,
         int mSelectedIndex;
 };
 
-#endif  // end GUI_WIDGETS_SLIDERLIST_H
+#endif  // GUI_WIDGETS_SLIDERLIST_H
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 81d6d5d73..de1572d1a 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SPELLSHORTCUTCONTAINER_H
-#define SPELLSHORTCUTCONTAINER_H
+#ifndef GUI_WIDGETS_SPELLSHORTCUTCONTAINER_H
+#define GUI_WIDGETS_SPELLSHORTCUTCONTAINER_H
 
 #include <guichan/mouselistener.hpp>
 
@@ -87,4 +87,4 @@ class SpellShortcutContainer final : public ShortcutContainer
         bool mSpellClicked;
 };
 
-#endif
+#endif  // GUI_WIDGETS_SPELLSHORTCUTCONTAINER_H
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 40f47f6ff..6cd2a3e2d 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TAB_H
-#define TAB_H
+#ifndef GUI_WIDGETS_TAB_H
+#define GUI_WIDGETS_TAB_H
 
 #include "gui/widgets/widget2.h"
 
@@ -181,4 +181,4 @@ class Tab : public gcn::BasicContainer,
         int mMode;
 };
 
-#endif
+#endif  // GUI_WIDGETS_TAB_H
diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h
index 40c60bd49..b30b9cb85 100644
--- a/src/gui/widgets/tabbedarea.h
+++ b/src/gui/widgets/tabbedarea.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TABBEDAREA_H
-#define TABBEDAREA_H
+#ifndef GUI_WIDGETS_TABBEDAREA_H
+#define GUI_WIDGETS_TABBEDAREA_H
 
 #include "gui/widgets/widget2.h"
 
@@ -239,4 +239,4 @@ class TabbedArea final : public Widget2,
         bool mBlockSwitching;
 };
 
-#endif
+#endif  // GUI_WIDGETS_TABBEDAREA_H
diff --git a/src/gui/widgets/tablemodel.h b/src/gui/widgets/tablemodel.h
index dace35a14..dccce65ad 100644
--- a/src/gui/widgets/tablemodel.h
+++ b/src/gui/widgets/tablemodel.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TABLE_MODEL_H
-#define TABLE_MODEL_H
+#ifndef GUI_WIDGETS_TABLEMODEL_H
+#define GUI_WIDGETS_TABLEMODEL_H
 
 #include <set>
 #include <vector>
@@ -163,4 +163,4 @@ protected:
     std::vector<int> mWidths;
 };
 
-#endif  // TABLE_MODEL_H
+#endif  // GUI_WIDGETS_TABLEMODEL_H
diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h
index f6852df23..a61dab42b 100644
--- a/src/gui/widgets/tabstrip.h
+++ b/src/gui/widgets/tabstrip.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_TABSTRIP_H
-#define GUI_TABSTRIP_H
+#ifndef GUI_WIDGETS_TABSTRIP_H
+#define GUI_WIDGETS_TABSTRIP_H
 
 #include "gui/widgets/widgetgroup.h"
 
@@ -44,4 +44,4 @@ class TabStrip final : public WidgetGroup
         void action(const gcn::ActionEvent &event) override;
 };
 
-#endif
+#endif  // GUI_WIDGETS_TABSTRIP_H
diff --git a/src/gui/widgets/textbox.h b/src/gui/widgets/textbox.h
index 327a7a900..669ae6515 100644
--- a/src/gui/widgets/textbox.h
+++ b/src/gui/widgets/textbox.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TEXTBOX_H
-#define TEXTBOX_H
+#ifndef GUI_WIDGETS_TEXTBOX_H
+#define GUI_WIDGETS_TEXTBOX_H
 
 #include "gui/widgets/widget2.h"
 
@@ -73,4 +73,4 @@ class TextBox final : public gcn::TextBox,
         int mMinWidth;
 };
 
-#endif
+#endif  // GUI_WIDGETS_TEXTBOX_H
diff --git a/src/gui/widgets/textfield.h b/src/gui/widgets/textfield.h
index 0569d5d30..d26d16d21 100644
--- a/src/gui/widgets/textfield.h
+++ b/src/gui/widgets/textfield.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TEXTFIELD_H
-#define TEXTFIELD_H
+#ifndef GUI_WIDGETS_TEXTFIELD_H
+#define GUI_WIDGETS_TEXTFIELD_H
 
 #include "gui/widgets/widget2.h"
 
@@ -154,4 +154,4 @@ class TextField : public gcn::TextField,
         PopupMenu *mPopupMenu;
 };
 
-#endif
+#endif  // GUI_WIDGETS_TEXTFIELD_H
diff --git a/src/gui/widgets/textpreview.h b/src/gui/widgets/textpreview.h
index 782fcc2e0..59f14bb9a 100644
--- a/src/gui/widgets/textpreview.h
+++ b/src/gui/widgets/textpreview.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TEXTPREVIEW_H
-#define TEXTPREVIEW_H
+#ifndef GUI_WIDGETS_TEXTPREVIEW_H
+#define GUI_WIDGETS_TEXTPREVIEW_H
 
 #include "gui/widgets/widget2.h"
 
@@ -141,4 +141,4 @@ class TextPreview final : public gcn::Widget,
         static Skin *mSkin;
 };
 
-#endif
+#endif  // GUI_WIDGETS_TEXTPREVIEW_H
diff --git a/src/gui/widgets/tradetab.h b/src/gui/widgets/tradetab.h
index c790a42bb..e7fe67bf3 100644
--- a/src/gui/widgets/tradetab.h
+++ b/src/gui/widgets/tradetab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef TRADETAB_H
-#define TRADETAB_H
+#ifndef GUI_WIDGETS_TRADETAB_H
+#define GUI_WIDGETS_TRADETAB_H
 
 #include "gui/widgets/chattab.h"
 
@@ -47,4 +47,5 @@ class TradeTab final : public ChatTab
 };
 
 extern TradeTab *tradeChatTab;
-#endif
+
+#endif  // GUI_WIDGETS_TRADETAB_H
diff --git a/src/gui/widgets/vertcontainer.h b/src/gui/widgets/vertcontainer.h
index 4399504f2..a03df0f8f 100644
--- a/src/gui/widgets/vertcontainer.h
+++ b/src/gui/widgets/vertcontainer.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_VERTCONTAINER_H
-#define GUI_VERTCONTAINER_H
+#ifndef GUI_WIDGETS_VERTCONTAINER_H
+#define GUI_WIDGETS_VERTCONTAINER_H
 
 #include "gui/widgets/container.h"
 
@@ -63,4 +63,4 @@ class VertContainer final : public Container, public gcn::WidgetListener
         bool mResizable;
 };
 
-#endif
+#endif  // GUI_WIDGETS_VERTCONTAINER_H
diff --git a/src/gui/widgets/whispertab.h b/src/gui/widgets/whispertab.h
index 5bc9fe2c2..9bfc1ce20 100644
--- a/src/gui/widgets/whispertab.h
+++ b/src/gui/widgets/whispertab.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WHISPERTAB_H
-#define WHISPERTAB_H
+#ifndef GUI_WIDGETS_WHISPERTAB_H
+#define GUI_WIDGETS_WHISPERTAB_H
 
 #include "gui/widgets/chattab.h"
 
@@ -73,4 +73,4 @@ class WhisperTab final : public ChatTab
         std::string mNick;
 };
 
-#endif  // CHANNELTAB_H
+#endif  // GUI_WIDGETS_WHISPERTAB_H
diff --git a/src/gui/widgets/widget2.h b/src/gui/widgets/widget2.h
index d657567ad..94cc7760e 100644
--- a/src/gui/widgets/widget2.h
+++ b/src/gui/widgets/widget2.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGET2_H
-#define GUI_WIDGET2_H
+#ifndef GUI_WIDGETS_WIDGET2_H
+#define GUI_WIDGETS_WIDGET2_H
 
 #include "gui/theme.h"
 
@@ -95,4 +95,5 @@ class Widget2
 };
 
 extern int openGLMode;
-#endif
+
+#endif  // GUI_WIDGETS_WIDGET2_H
diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h
index 9c59cc9c0..a247f0bb8 100644
--- a/src/gui/widgets/widgetgroup.h
+++ b/src/gui/widgets/widgetgroup.h
@@ -18,8 +18,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETGROUP_H
-#define GUI_WIDGETGROUP_H
+#ifndef GUI_WIDGETS_WIDGETGROUP_H
+#define GUI_WIDGETS_WIDGETGROUP_H
 
 #include "gui/widgets/container.h"
 
@@ -64,4 +64,4 @@ class WidgetGroup : public Container,
         int mLastX;
 };
 
-#endif
+#endif  // GUI_WIDGETS_WIDGETGROUP_H
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index 8ff32d273..3bea54bbb 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WINDOW_H
-#define WINDOW_H
+#ifndef GUI_WIDGETS_WINDOW_H
+#define GUI_WIDGETS_WINDOW_H
 
 #include "graphics.h"
 #include "localconsts.h"
@@ -507,4 +507,4 @@ class Window : public gcn::Window,
         gcn::Font *mCaptionFont;
 };
 
-#endif
+#endif  // GUI_WIDGETS_WINDOW_H
diff --git a/src/gui/widgets/windowcontainer.h b/src/gui/widgets/windowcontainer.h
index 27fc065fe..3645b94b6 100644
--- a/src/gui/widgets/windowcontainer.h
+++ b/src/gui/widgets/windowcontainer.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef WINDOWCONTAINER_H
-#define WINDOWCONTAINER_H
+#ifndef GUI_WIDGETS_WINDOWCONTAINER_H
+#define GUI_WIDGETS_WINDOWCONTAINER_H
 
 #include "gui/widgets/container.h"
 
@@ -68,4 +68,4 @@ class WindowContainer : public Container
 
 extern WindowContainer *windowContainer;
 
-#endif
+#endif  // GUI_WIDGETS_WINDOWCONTAINER_H