9 files changed, 2 insertions, 18 deletions
diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h
index 215666394..b70d1031b 100644
--- a/src/gui/windows/editserverdialog.h
+++ b/src/gui/windows/editserverdialog.h
@@ -35,8 +35,6 @@ class TypeListModel;
 #include "listeners/actionlistener.h"
 #include "listeners/keylistener.h"
 
-#include "gui/models/listmodel.h"
-
 /**
  * The custom server addition dialog.
  *
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 5323854fb..ee8c85f06 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -36,7 +36,6 @@
 #include "gui/gui.h"
 #include "gui/viewport.h"
 
-#include "gui/models/listmodel.h"
 #include "gui/models/sortlistmodelinv.h"
 
 #include "gui/popups/textpopup.h"
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index dba69b424..fc0c5880b 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -34,7 +34,6 @@
 #include "gui/viewport.h"
 
 #include "gui/models/itemsmodel.h"
-#include "gui/models/listmodel.h"
 
 #include "gui/popups/itempopup.h"
 
diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp
index be0c840f6..6fcea7d3a 100644
--- a/src/gui/windows/outfitwindow.cpp
+++ b/src/gui/windows/outfitwindow.cpp
@@ -325,7 +325,7 @@ void OutfitWindow::draw(Graphics *graphics)
     {
         const int itemX = mPadding + ((i % mGridWidth) * mBoxWidth);
         const int itemY = mPadding + mTitleBarHeight
-            + ((i / mGridWidth) * mBoxHeight);
+            + ((i / static_cast<unsigned int>(mGridWidth)) * mBoxHeight);
 
         graphics->setColor(mBorderColor);
         graphics->drawRectangle(Rect(itemX, itemY, 32, 32));
diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp
index 319bf5df0..eee3e4259 100644
--- a/src/gui/windows/questswindow.cpp
+++ b/src/gui/windows/questswindow.cpp
@@ -29,7 +29,6 @@
 #include "gui/font.h"
 #include "gui/gui.h"
 
-#include "gui/models/extendednamesmodel.h"
 #include "gui/models/questsmodel.h"
 
 #include "gui/widgets/browserbox.h"
diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h
index 07e2b5dcc..39c82279e 100644
--- a/src/gui/windows/serverdialog.h
+++ b/src/gui/windows/serverdialog.h
@@ -34,16 +34,12 @@
 #include "listeners/keylistener.h"
 #include "listeners/selectionlistener.h"
 
-#include "gui/models/listmodel.h"
-
 #include <string>
-#include <vector>
 
 class Button;
 class CheckBox;
 class Label;
 class ListBox;
-class ServerDialog;
 class ServersListModel;
 
 /**
diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp
index 17703388f..dead469bc 100644
--- a/src/gui/windows/textcommandeditor.cpp
+++ b/src/gui/windows/textcommandeditor.cpp
@@ -28,7 +28,6 @@
 #include "input/keyboardconfig.h"
 
 #include "gui/models/iconsmodel.h"
-#include "gui/models/listmodel.h"
 #include "gui/models/magicschoolmodel.h"
 #include "gui/models/targettypemodel.h"
 
@@ -41,10 +40,6 @@
 
 #include "utils/gettext.h"
 
-#include "resources/iteminfo.h"
-
-#include "resources/db/itemdb.h"
-
 #include "debug.h"
 
 TextCommandEditor::TextCommandEditor(TextCommand *const command) :
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index 7fe1a1e36..506f25c17 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -130,8 +130,7 @@ TradeWindow::TradeWindow():
     place(1, 0, mMoneyLabel);
     place(0, 1, myScroll).setPadding(3);
     place(1, 1, partnerScroll).setPadding(3);
-    ContainerPlacer placer;
-    placer = getPlacer(0, 0);
+    ContainerPlacer placer = getPlacer(0, 0);
     placer(0, 0, moneyLabel2);
     placer(1, 0, mMoneyField, 2);
     placer(3, 0, mMoneyChangeButton).setHAlign(LayoutCell::LEFT);
diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp
index db17820db..77d167c82 100644
--- a/src/gui/windows/worldselectdialog.cpp
+++ b/src/gui/windows/worldselectdialog.cpp
@@ -33,7 +33,6 @@
 #include "gui/widgets/listbox.h"
 #include "gui/widgets/scrollarea.h"
 
-#include "gui/models/listmodel.h"
 #include "gui/models/worldlistmodel.h"
 
 #include "net/loginhandler.h"