9 files changed, 18 insertions, 10 deletions
diff --git a/src/gui/widgets/characterdisplay.cpp b/src/gui/widgets/characterdisplay.cpp
index c8a38337f..d88334973 100644
--- a/src/gui/widgets/characterdisplay.cpp
+++ b/src/gui/widgets/characterdisplay.cpp
@@ -26,7 +26,7 @@
 
 #include "gui/windows/charselectdialog.h"
 
-#include "gui/textpopup.h"
+#include "gui/popups/textpopup.h"
 
 #include "gui/widgets/label.h"
 #include "gui/widgets/layouthelper.h"
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index c040d4c3a..92daf8b77 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -28,9 +28,10 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/windows/inventorywindow.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 50b18beb1..6afa5fae4 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -27,9 +27,10 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/textpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/textpopup.h"
+
 #include "resources/image.h"
 
 #include <guichan/font.hpp>
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 64cafcd82..32e179226 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -30,9 +30,10 @@
 #include "being/playerinfo.h"
 
 #include "gui/gui.h"
-#include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/windows/chatwindow.h"
 #include "gui/windows/shopwindow.h"
 #include "gui/windows/shortcutwindow.h"
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index 0dff139f6..572e4dbf2 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -22,9 +22,10 @@
 
 #include "gui/widgets/itemlinkhandler.h"
 
-#include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/helpwindow.h"
 
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index e2901c3bb..aeae7dd95 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -33,10 +33,11 @@
 
 #include "input/inputmanager.h"
 
-#include "gui/itempopup.h"
-#include "gui/spellpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+#include "gui/popups/spellpopup.h"
+
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/skilldialog.h"
 
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index f719d132e..53e5f25e3 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -27,9 +27,10 @@
 
 #include "being/playerinfo.h"
 
-#include "gui/itempopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/itempopup.h"
+
 #include "gui/widgets/shopitems.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 8e77d3215..648a493b1 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -27,9 +27,10 @@
 #include "itemshortcut.h"
 #include "spellshortcut.h"
 
-#include "gui/spellpopup.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/spellpopup.h"
+
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/shortcutwindow.h"
 
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index 9390e3a24..bf5485a7b 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -31,10 +31,11 @@
 #include "input/keydata.h"
 #include "input/keyevent.h"
 
-#include "gui/popupmenu.h"
 #include "gui/sdlinput.h"
 #include "gui/viewport.h"
 
+#include "gui/popups/popupmenu.h"
+
 #include "resources/image.h"
 
 #include "utils/copynpaste.h"