11 files changed, 11 insertions, 12 deletions
diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp
index 383b6a63e..ea9084c5c 100644
--- a/src/gui/windows/changepassworddialog.cpp
+++ b/src/gui/windows/changepassworddialog.cpp
@@ -30,7 +30,7 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/passwordfield.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 
 #include "net/logindata.h"
 #include "net/loginhandler.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 1984bacd7..c9801e26a 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -43,7 +43,7 @@
 #include "gui/widgets/characterviewnormal.h"
 #include "gui/widgets/characterviewsmall.h"
 #include "gui/widgets/containerplacer.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 
 #include "net/logindata.h"
 #include "net/loginhandler.h"
diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp
index fece71b0a..93b7f7e7b 100644
--- a/src/gui/windows/connectiondialog.cpp
+++ b/src/gui/windows/connectiondialog.cpp
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/progressindicator.h"
 
 #include "utils/gettext.h"
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 26514575b..62a82704c 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -35,7 +35,7 @@
 
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/layouthelper.h"
 #include "gui/widgets/tabbedarea.h"
 
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index ffce4ee8b..b8d1cb606 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -45,7 +45,7 @@
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/icon.h"
 #include "gui/widgets/inttextfield.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/slider.h"
 
diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp
index 199c1d84c..7bb0b7397 100644
--- a/src/gui/windows/killstats.cpp
+++ b/src/gui/windows/killstats.cpp
@@ -24,7 +24,7 @@
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 
 #include "actormanager.h"
 #include "client.h"
diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp
index d1202dea7..f3fcec167 100644
--- a/src/gui/windows/logindialog.cpp
+++ b/src/gui/windows/logindialog.cpp
@@ -38,8 +38,8 @@
 #include "gui/widgets/checkbox.h"
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
 #include "gui/widgets/passwordfield.h"
+#include "gui/widgets/layoutcell.h"
 
 #include "net/charserverhandler.h"
 #include "net/logindata.h"
diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp
index 9ed503664..ccb3e469c 100644
--- a/src/gui/windows/quitdialog.cpp
+++ b/src/gui/windows/quitdialog.cpp
@@ -35,7 +35,7 @@
 #include "gui/viewport.h"
 
 #include "gui/widgets/containerplacer.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/button.h"
 #include "gui/widgets/radiobutton.h"
 
diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp
index e1c78141b..375a34137 100644
--- a/src/gui/windows/registerdialog.cpp
+++ b/src/gui/windows/registerdialog.cpp
@@ -33,7 +33,7 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/passwordfield.h"
 #include "gui/widgets/radiobutton.h"
 
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 67270ef36..7e4f71e50 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -25,6 +25,7 @@
 #include "gui/chatconsts.h"
 
 #include "gui/windows/buydialog.h"
+#include "gui/windows/chatwindow.h"
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/itemamountwindow.h"
 #include "gui/windows/selldialog.h"
@@ -41,8 +42,6 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shoplistbox.h"
 
-#include "gui/widgets/tabs/chattab.h"
-
 #include "actormanager.h"
 #include "auctionmanager.h"
 #include "client.h"
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index dce17dede..d35334e36 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -36,7 +36,7 @@
 #include "gui/widgets/dropdown.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
+#include "gui/widgets/layoutcell.h"
 #include "gui/widgets/radiobutton.h"
 
 #include "utils/delete2.h"