18 files changed, 3 insertions, 27 deletions
diff --git a/src/gui/widgets/characterdisplay.h b/src/gui/widgets/characterdisplay.h
index 47959e365..866e3e580 100644
--- a/src/gui/widgets/characterdisplay.h
+++ b/src/gui/widgets/characterdisplay.h
@@ -32,7 +32,6 @@
 
 class CharSelectDialog;
 class Label;
-class TextPopup;
 
 namespace Net
 {
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index c07482e1b..d76683256 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -39,7 +39,6 @@
 #include "resources/db/emotedb.h"
 
 #include "utils/stringutils.h"
-#include "utils/delete2.h"
 
 #include "debug.h"
 
diff --git a/src/gui/widgets/emoteshortcutcontainer.h b/src/gui/widgets/emoteshortcutcontainer.h
index 8a2ea498e..dea9e6dec 100644
--- a/src/gui/widgets/emoteshortcutcontainer.h
+++ b/src/gui/widgets/emoteshortcutcontainer.h
@@ -26,8 +26,6 @@
 
 #include <vector>
 
-class TextPopup;
-
 struct EmoteSprite;
 
 /**
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 37e0c0ffd..54bb74596 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -52,8 +52,6 @@
 
 #include "listeners/selectionlistener.h"
 
-#include "utils/delete2.h"
-
 #include <algorithm>
 
 #include "debug.h"
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 3f56f8855..42b4fa036 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -36,7 +36,6 @@
 class Image;
 class Inventory;
 class Item;
-class ItemPopup;
 class SelectionListener;
 
 /**
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 589f8f6d1..6c04ca41f 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -22,7 +22,6 @@
 
 #include "gui/widgets/itemlinkhandler.h"
 
-#include "gui/popupmanager.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/itempopup.h"
@@ -31,7 +30,6 @@
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/helpwindow.h"
 
-#include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
 
diff --git a/src/gui/widgets/itemlinkhandler.h b/src/gui/widgets/itemlinkhandler.h
index c07ede9ad..956bd3df4 100644
--- a/src/gui/widgets/itemlinkhandler.h
+++ b/src/gui/widgets/itemlinkhandler.h
@@ -27,8 +27,6 @@
 
 #include "localconsts.h"
 
-class ItemPopup;
-
 class ItemLinkHandler final : public LinkHandler
 {
     public:
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index df86c45ae..03242d484 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -33,7 +33,6 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/popupmanager.h"
 #include "gui/viewport.h"
 
 #include "gui/fonts/font.h"
@@ -50,7 +49,6 @@
 #include "resources/image.h"
 #include "resources/skillconsts.h"
 
-#include "utils/delete2.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index d1f959bcd..29aec0a8c 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -25,9 +25,6 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-class ItemPopup;
-class SpellPopup;
-
 /**
  * An item shortcut container. Used to quickly use items.
  *
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index a2161d96d..f35c83663 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -27,7 +27,6 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/popupmanager.h"
 #include "gui/viewport.h"
 
 #include "gui/fonts/font.h"
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 808528cc5..9f6d21e79 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -26,7 +26,6 @@
 #include "gui/widgets/listbox.h"
 
 class ShopItems;
-class ItemPopup;
 
 /**
  * A list box, meant to be used inside a scroll area. Same as the Guichan list
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 0257cea08..bbfb8f497 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -27,7 +27,6 @@
 #include "settings.h"
 #include "spellshortcut.h"
 
-#include "gui/popupmanager.h"
 #include "gui/viewport.h"
 
 #include "gui/fonts/font.h"
@@ -39,8 +38,6 @@
 
 #include "resources/image.h"
 
-#include "utils/delete2.h"
-
 #include "debug.h"
 
 SpellShortcutContainer::SpellShortcutContainer(Widget2 *const widget,
diff --git a/src/gui/widgets/spellshortcutcontainer.h b/src/gui/widgets/spellshortcutcontainer.h
index 939e315af..b7a68d18d 100644
--- a/src/gui/widgets/spellshortcutcontainer.h
+++ b/src/gui/widgets/spellshortcutcontainer.h
@@ -25,8 +25,6 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-class SpellPopup;
-
 /**
  * An item shortcut container. Used to quickly use items.
  *
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 5185ad4eb..3c467f046 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -29,11 +29,11 @@
 #include "input/keyboardconfig.h"
 
 #include "input/pages/emotes.h"
-#include "input/pages/gui.h"
 #include "input/pages/move.h"
 #include "input/pages/outfits.h"
 #include "input/pages/shortcuts.h"
 
+#include "gui/dialogtype.h"
 #include "gui/gui.h"
 #include "gui/setupinputpages.h"
 
diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp
index c74a8bade..47fa7374e 100644
--- a/src/gui/widgets/tabs/setup_theme.cpp
+++ b/src/gui/widgets/tabs/setup_theme.cpp
@@ -22,6 +22,7 @@
 
 #include "gui/widgets/tabs/setup_theme.h"
 
+#include "gui/dialogtype.h"
 #include "gui/gui.h"
 #include "gui/themeinfo.h"
 
diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp
index 41cf19a7f..2ef45e6b6 100644
--- a/src/gui/widgets/tabs/setup_video.cpp
+++ b/src/gui/widgets/tabs/setup_video.cpp
@@ -26,6 +26,7 @@
 
 #include "graphicsmanager.h"
 
+#include "gui/dialogtype.h"
 #include "gui/windowmanager.h"
 
 #include "gui/windows/okdialog.h"
diff --git a/src/gui/widgets/virtshortcutcontainer.cpp b/src/gui/widgets/virtshortcutcontainer.cpp
index 2b0353148..d786289b0 100644
--- a/src/gui/widgets/virtshortcutcontainer.cpp
+++ b/src/gui/widgets/virtshortcutcontainer.cpp
@@ -28,7 +28,6 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/popupmanager.h"
 #include "gui/viewport.h"
 
 #include "gui/fonts/font.h"
@@ -40,7 +39,6 @@
 
 #include "resources/image.h"
 
-#include "utils/delete2.h"
 #include "utils/stringutils.h"
 
 #include "debug.h"
diff --git a/src/gui/widgets/virtshortcutcontainer.h b/src/gui/widgets/virtshortcutcontainer.h
index e740b9661..330d53171 100644
--- a/src/gui/widgets/virtshortcutcontainer.h
+++ b/src/gui/widgets/virtshortcutcontainer.h
@@ -25,7 +25,6 @@
 
 #include "gui/widgets/shortcutcontainer.h"
 
-class ItemPopup;
 class ShortcutBase;
 
 /**