3 files changed, 9 insertions, 7 deletions
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 70f8b7885..1ce274122 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -26,14 +26,11 @@
 #include "gui/widgets/linkhandler.h"
 #include "gui/widgets/popup.h"
 
-#include "being/actorsprite.h"
-
 #include "listeners/actionlistener.h"
 
-#include "gui/base/listmodel.hpp"
-
 #include "localconsts.h"
 
+class ActorSprite;
 class Being;
 class BrowserBox;
 class Button;
@@ -48,6 +45,11 @@ class TextField;
 class ProgressBar;
 class Window;
 
+namespace gcn
+{
+    class ListModel;
+}
+
 class RenameListener final : public ActionListener
 {
     public:
diff --git a/src/gui/popups/spellpopup.cpp b/src/gui/popups/spellpopup.cpp
index 8849a53cb..07bcc2330 100644
--- a/src/gui/popups/spellpopup.cpp
+++ b/src/gui/popups/spellpopup.cpp
@@ -23,7 +23,8 @@
 
 #include "gui/popups/spellpopup.h"
 
-#include "gui/font.h"
+#include "textcommand.h"
+
 #include "gui/gui.h"
 
 #include "gui/widgets/label.h"
diff --git a/src/gui/popups/spellpopup.h b/src/gui/popups/spellpopup.h
index 152dfb306..cbbd53703 100644
--- a/src/gui/popups/spellpopup.h
+++ b/src/gui/popups/spellpopup.h
@@ -26,9 +26,8 @@
 
 #include "gui/widgets/popup.h"
 
-#include "textcommand.h"
-
 class Label;
+class TextCommand;
 
 /**
  * A popup that displays information about an item.