7 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index 32aa11454..07d4b064a 100644
--- a/src/gui/popups/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -25,6 +25,7 @@
 #include "being/playerrelations.h"
 
 #include "gui/font.h"
+#include "gui/gui.h"
 
 #include "gui/widgets/label.h"
 
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index d6ea5a48a..0a65ce3bc 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -28,6 +28,7 @@
 #include "units.h"
 
 #include "gui/font.h"
+#include "gui/gui.h"
 
 #include "gui/widgets/icon.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h
index 714e0305c..f1cedf046 100644
--- a/src/gui/popups/itempopup.h
+++ b/src/gui/popups/itempopup.h
@@ -29,6 +29,7 @@
 #include "resources/iteminfo.h"
 
 class Icon;
+class Item;
 class Label;
 class TextBox;
 
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 450bd504f..a37994884 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -23,6 +23,7 @@
 #include "gui/popups/popupmenu.h"
 
 #include "actormanager.h"
+#include "commands.h"
 #include "commandhandler.h"
 #include "configuration.h"
 #include "dropshortcut.h"
@@ -56,6 +57,7 @@
 
 #include "gui/viewport.h"
 
+#include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/tabs/chattab.h"
 #include "gui/widgets/progressbar.h"
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 1ebb0dd89..70f8b7885 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -29,6 +29,7 @@
 #include "being/actorsprite.h"
 
 #include "listeners/actionlistener.h"
+
 #include "gui/base/listmodel.hpp"
 
 #include "localconsts.h"
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index c74f3f5e6..9bb6157bc 100644
--- a/src/gui/popups/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -24,11 +24,11 @@
 #include "gui/popups/speechbubble.h"
 
 #include "gui/font.h"
+#include "gui/gui.h"
 #include "gui/viewport.h"
 
 #include "gui/widgets/browserbox.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/textbox.h"
 
 #include "debug.h"
 
diff --git a/src/gui/popups/spellpopup.cpp b/src/gui/popups/spellpopup.cpp
index 141879da4..8849a53cb 100644
--- a/src/gui/popups/spellpopup.cpp
+++ b/src/gui/popups/spellpopup.cpp
@@ -24,6 +24,7 @@
 #include "gui/popups/spellpopup.h"
 
 #include "gui/font.h"
+#include "gui/gui.h"
 
 #include "gui/widgets/label.h"