22 files changed, 18 insertions, 18 deletions
diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp
index 3df98f589..84da15ead 100644
--- a/src/gui/windows/changeemaildialog.cpp
+++ b/src/gui/windows/changeemaildialog.cpp
@@ -24,6 +24,8 @@
 
 #include "client.h"
 
+#include "gui/dialogtype.h"
+
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index 0ec8999dc..875fb2c3d 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -24,6 +24,8 @@
 
 #include "client.h"
 
+#include "gui/dialogtype.h"
+
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 765436ffb..e1c1cd7ed 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -28,6 +28,8 @@
 
 #include "input/inputaction.h"
 
+#include "gui/dialogtype.h"
+
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 17e2510bb..134aa2712 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -32,6 +32,8 @@
 
 #include "being/attributes.h"
 
+#include "gui/dialogtype.h"
+
 #include "gui/windows/charcreatedialog.h"
 #include "gui/windows/chardeleteconfirm.h"
 #include "gui/windows/logindialog.h"
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index d18f28a9e..e5be2fc65 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -42,7 +42,6 @@
 #include "gui/chatconsts.h"
 #include "gui/focushandler.h"
 #include "gui/gui.h"
-#include "gui/popupmanager.h"
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp
index a89b36562..11f22fafe 100644
--- a/src/gui/windows/editserverdialog.cpp
+++ b/src/gui/windows/editserverdialog.cpp
@@ -25,6 +25,8 @@
 
 #include "input/inputaction.h"
 
+#include "gui/dialogtype.h"
+
 #include "gui/models/typelistmodel.h"
 
 #include "gui/windows/okdialog.h"
diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h
index b90c39d81..30fdcc366 100644
--- a/src/gui/windows/equipmentwindow.h
+++ b/src/gui/windows/equipmentwindow.h
@@ -39,7 +39,6 @@ class Button;
 class Image;
 class ImageSet;
 class Item;
-class ItemPopup;
 class PlayerBox;
 
 struct EquipmentBox;
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index 91e05bcdb..d4fece698 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -28,7 +28,6 @@
 
 #include "gui/gui.h"
 
-#include "gui/windows/didyouknowwindow.h"
 #include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 3865647e0..2c38c0358 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -34,7 +34,6 @@
 #include "input/inputmanager.h"
 
 #include "gui/gui.h"
-#include "gui/popupmanager.h"
 
 #include "gui/fonts/font.h"
 
@@ -43,11 +42,8 @@
 #include "gui/popups/popupmenu.h"
 #include "gui/popups/textpopup.h"
 
-#include "gui/windows/equipmentwindow.h"
 #include "gui/windows/itemamountwindow.h"
-#include "gui/windows/outfitwindow.h"
 #include "gui/windows/setupwindow.h"
-#include "gui/windows/shopwindow.h"
 #include "gui/windows/tradewindow.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h
index 509b74390..98cac78a6 100644
--- a/src/gui/windows/inventorywindow.h
+++ b/src/gui/windows/inventorywindow.h
@@ -42,7 +42,6 @@ class ProgressBar;
 class SortListModelInv;
 class TabStrip;
 class TextField;
-class TextPopup;
 
 /**
  * Inventory dialog.
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 67dc5ee75..d7760444a 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -48,8 +48,6 @@
 #include "gui/widgets/label.h"
 #include "gui/widgets/slider.h"
 
-#include "utils/delete2.h"
-
 #include <cmath>
 
 #include "debug.h"
diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h
index 04d08613d..d4f7fb3bc 100644
--- a/src/gui/windows/itemamountwindow.h
+++ b/src/gui/windows/itemamountwindow.h
@@ -33,7 +33,6 @@ class Icon;
 class IntTextField;
 class Item;
 class ItemsModal;
-class ItemPopup;
 class Label;
 class Slider;
 
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 31d8169d1..b3a131960 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -44,7 +44,6 @@
 #include "resources/map/map.h"
 #include "resources/map/metatile.h"
 
-#include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/physfstools.h"
 #include "utils/sdlcheckutils.h"
diff --git a/src/gui/windows/minimap.h b/src/gui/windows/minimap.h
index becf50f7b..6556274a7 100644
--- a/src/gui/windows/minimap.h
+++ b/src/gui/windows/minimap.h
@@ -27,7 +27,6 @@
 
 class Image;
 class Map;
-class TextPopup;
 
 /**
  * Minimap window. Shows a minimap image and the name of the current map.
diff --git a/src/gui/windows/ministatuswindow.h b/src/gui/windows/ministatuswindow.h
index e97d90ed0..18acb41fb 100644
--- a/src/gui/windows/ministatuswindow.h
+++ b/src/gui/windows/ministatuswindow.h
@@ -38,7 +38,6 @@ class Graphics;
 class Inventory;
 class ProgressBar;
 class StatusPopup;
-class TextPopup;
 
 /**
  * The player mini-status dialog.
diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp
index 584776726..ef6a1b1ad 100644
--- a/src/gui/windows/npcdialog.cpp
+++ b/src/gui/windows/npcdialog.cpp
@@ -33,7 +33,6 @@
 #include "being/being.h"
 
 #include "gui/gui.h"
-#include "gui/popupmanager.h"
 #include "gui/viewport.h"
 
 #include "gui/fonts/font.h"
diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp
index 549723e14..b6c3bfc41 100644
--- a/src/gui/windows/okdialog.cpp
+++ b/src/gui/windows/okdialog.cpp
@@ -25,6 +25,8 @@
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "gui/dialogtype.h"
+
 #include "gui/widgets/button.h"
 #include "gui/widgets/textbox.h"
 
diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h
index f3fb09030..cbe3a7886 100644
--- a/src/gui/windows/okdialog.h
+++ b/src/gui/windows/okdialog.h
@@ -23,8 +23,6 @@
 #ifndef GUI_WINDOWS_OKDIALOG_H
 #define GUI_WINDOWS_OKDIALOG_H
 
-#include "gui/dialogtype.h"
-
 #include "gui/widgets/window.h"
 
 #include "listeners/actionlistener.h"
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index cc162d0ca..5a773c58d 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -33,7 +33,6 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/popupmanager.h"
 #include "gui/viewport.h"
 
 #include "gui/popups/popupmenu.h"
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index aca34dd5d..6ac30634b 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -30,6 +30,8 @@
 
 #include "listeners/wrongdatanoticelistener.h"
 
+#include "gui/dialogtype.h"
+
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index 790bad68d..be5cbea11 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -28,6 +28,8 @@
 #include "being/localplayer.h"
 #include "being/playerrelations.h"
 
+#include "gui/dialogtype.h"
+
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/okdialog.h"
 #include "gui/windows/setupwindow.h"
diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp
index aa7c67148..0135cb7c9 100644
--- a/src/gui/windows/unregisterdialog.cpp
+++ b/src/gui/windows/unregisterdialog.cpp
@@ -24,6 +24,8 @@
 
 #include "client.h"
 
+#include "gui/dialogtype.h"
+
 #include "gui/windows/okdialog.h"
 
 #include "gui/widgets/button.h"