9 files changed, 15 insertions, 19 deletions
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index ae16d8eb2..c455640d6 100644
--- a/src/gui/popups/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -24,7 +24,6 @@
 #include "being/being.h"
 #include "being/playerrelations.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 
 #include "gui/widgets/label.h"
diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h
index 3ac46d30c..12ba49aa0 100644
--- a/src/gui/popups/beingpopup.h
+++ b/src/gui/popups/beingpopup.h
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_BEINGPOPUP_H
-#define GUI_BEINGPOPUP_H
+#ifndef GUI_POPUPS_BEINGPOPUP_H
+#define GUI_POPUPS_BEINGPOPUP_H
 
 #include "gui/widgets/popup.h"
 
@@ -62,4 +62,4 @@ class BeingPopup final : public Popup
         Label *mBeingComment;
 };
 
-#endif  // GUI_BEINGPOPUP_H
+#endif  // GUI_POPUPS_BEINGPOPUP_H
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 63fe3628c..c05073750 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -28,7 +28,6 @@
 #include "item.h"
 #include "units.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 
 #include "gui/widgets/icon.h"
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index d0b313e26..5c06cbf5a 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -21,8 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_ITEMPOPUP_H
-#define GUI_ITEMPOPUP_H
+#ifndef GUI_POPUPS_ITEMPOPUP_H
+#define GUI_POPUPS_ITEMPOPUP_H
 
 #include "gui/widgets/popup.h"
 
@@ -73,4 +73,4 @@ class ItemPopup final : public Popup
         void setLabelColor(Label *label, const ItemType type) const;
 };
 
-#endif  // GUI_ITEMPOPUP_H
+#endif  // GUI_POPUPS_ITEMPOPUP_H
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 3865c2bd3..f5ff7fb84 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_POPUPMENU_H
-#define GUI_POPUPMENU_H
+#ifndef GUI_POPUPS_POPUPMENU_H
+#define GUI_POPUPS_POPUPMENU_H
 
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
@@ -238,4 +238,4 @@ class PopupMenu final : public Popup, public LinkHandler
         void showPopup(int x, int y);
 };
 
-#endif  // GUI_POPUPMENU_H
+#endif  // GUI_POPUPS_POPUPMENU_H
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index 510bb9eae..989ebb551 100644
--- a/src/gui/popups/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -23,7 +23,6 @@
 
 #include "gui/popups/speechbubble.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 
 #include "gui/widgets/label.h"
diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h
index ca3c9668b..3753ee82d 100644
--- a/src/gui/popups/speechbubble.h
+++ b/src/gui/popups/speechbubble.h
@@ -21,8 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SPEECHBUBBLE_H
-#define GUI_SPEECHBUBBLE_H
+#ifndef GUI_POPUPS_SPEECHBUBBLE_H
+#define GUI_POPUPS_SPEECHBUBBLE_H
 
 #include "gui/theme.h"
 
@@ -61,4 +61,4 @@ class SpeechBubble final : public Popup
         TextBox *mSpeechBox;
 };
 
-#endif  // GUI_SPEECHBUBBLE_H
+#endif  // GUI_POPUPS_SPEECHBUBBLE_H
diff --git a/src/gui/popups/spellpopup.cpp b/src/gui/popups/spellpopup.cpp
index 4e06b3d87..5db8ceafb 100644
--- a/src/gui/popups/spellpopup.cpp
+++ b/src/gui/popups/spellpopup.cpp
@@ -23,7 +23,6 @@
 
 #include "gui/popups/spellpopup.h"
 
-#include "gui/gui.h"
 #include "gui/sdlfont.h"
 
 #include "gui/widgets/label.h"
diff --git a/src/gui/popups/spellpopup.h b/src/gui/popups/spellpopup.h
index b7a1f83b3..abd542461 100644
--- a/src/gui/popups/spellpopup.h
+++ b/src/gui/popups/spellpopup.h
@@ -21,8 +21,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_SPELLPOPUP_H
-#define GUI_SPELLPOPUP_H
+#ifndef GUI_POPUPS_SPELLPOPUP_H
+#define GUI_POPUPS_SPELLPOPUP_H
 
 #include "gui/widgets/popup.h"
 
@@ -66,4 +66,4 @@ class SpellPopup final : public Popup
         Label *mItemComment;
 };
 
-#endif  // GUI_SPELLPOPUP_H
+#endif  // GUI_POPUPS_SPELLPOPUP_H