10 files changed, 6 insertions, 19 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 8495a39a0..e7ab0cb10 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -101,7 +101,6 @@
 
 #include "net/generalhandler.h"
 #include "net/gamehandler.h"
-#include "net/inventoryhandler.h"
 #include "net/packetcounters.h"
 #include "net/serverfeatures.h"
 
diff --git a/src/gui/mailmessage.h b/src/gui/mailmessage.h
index ce121963f..6784dac7b 100644
--- a/src/gui/mailmessage.h
+++ b/src/gui/mailmessage.h
@@ -21,6 +21,8 @@
 #ifndef GUI_MAILMESSAGE_H
 #define GUI_MAILMESSAGE_H
 
+#include <string>
+
 #include "localconsts.h"
 
 struct MailMessage final
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index 7f5c79cf5..540baffa8 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -44,7 +44,6 @@
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/shoplistbox.h"
 #include "gui/widgets/slider.h"
-#include "gui/widgets/textfield.h"
 
 #include "net/adminhandler.h"
 #include "net/buysellhandler.h"
diff --git a/src/gui/windows/maileditwindow.cpp b/src/gui/windows/maileditwindow.cpp
index 2a1e0dcaf..c3447fe9c 100644
--- a/src/gui/windows/maileditwindow.cpp
+++ b/src/gui/windows/maileditwindow.cpp
@@ -20,7 +20,6 @@
 
 #include "gui/windows/maileditwindow.h"
 
-#include "inventory.h"
 #include "item.h"
 
 #include "being/playerinfo.h"
@@ -28,21 +27,16 @@
 
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/itemamountwindow.h"
-#include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/inttextfield.h"
 #include "gui/widgets/itemcontainer.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/textfield.h"
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/gui/windows/mailviewwindow.cpp b/src/gui/windows/mailviewwindow.cpp
index e8aac252e..ba41a069c 100644
--- a/src/gui/windows/mailviewwindow.cpp
+++ b/src/gui/windows/mailviewwindow.cpp
@@ -33,13 +33,9 @@
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/icon.h"
 #include "gui/widgets/label.h"
-#include "gui/widgets/layout.h"
-#include "gui/widgets/layouttype.h"
-#include "gui/widgets/textfield.h"
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "resources/image.h"
 #include "resources/iteminfo.h"
diff --git a/src/gui/windows/mailviewwindow.h b/src/gui/windows/mailviewwindow.h
index 62d2daa67..70fcd35a8 100644
--- a/src/gui/windows/mailviewwindow.h
+++ b/src/gui/windows/mailviewwindow.h
@@ -30,7 +30,6 @@
 class Button;
 class Icon;
 class Label;
-class TextField;
 
 struct MailMessage;
 
@@ -38,7 +37,7 @@ class MailViewWindow final : public Window,
                              public ActionListener
 {
     public:
-        MailViewWindow(const MailMessage *const message);
+        explicit MailViewWindow(const MailMessage *const message);
 
         A_DELETE_COPY(MailViewWindow)
 
diff --git a/src/gui/windows/mailwindow.cpp b/src/gui/windows/mailwindow.cpp
index cf42b3170..3fd61f2a3 100644
--- a/src/gui/windows/mailwindow.cpp
+++ b/src/gui/windows/mailwindow.cpp
@@ -33,7 +33,6 @@
 #include "gui/widgets/button.h"
 #include "gui/widgets/containerplacer.h"
 #include "gui/widgets/extendedlistbox.h"
-#include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
 #include "gui/widgets/layouttype.h"
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/windows/mailwindow.h b/src/gui/windows/mailwindow.h
index 7df4be23f..6dba567ca 100644
--- a/src/gui/windows/mailwindow.h
+++ b/src/gui/windows/mailwindow.h
@@ -53,7 +53,7 @@ class MailWindow final : public Window,
 
         void addMail(MailMessage *const message);
 
-        void clear();
+        void clear() override final;
 
         void showMessage(MailMessage *const mail);
 
diff --git a/src/net/eathena/mailhandler.cpp b/src/net/eathena/mailhandler.cpp
index b17823064..e154ad406 100644
--- a/src/net/eathena/mailhandler.cpp
+++ b/src/net/eathena/mailhandler.cpp
@@ -20,7 +20,6 @@
 
 #include "net/eathena/mailhandler.h"
 
-#include "logger.h"
 #include "notifymanager.h"
 
 #include "gui/mailmessage.h"
@@ -175,7 +174,7 @@ void MailHandler::processReadMail(Net::MessageIn &msg)
 
 void MailHandler::processGetAttachment(Net::MessageIn &msg)
 {
-    switch(msg.readUInt8("flag"))
+    switch (msg.readUInt8("flag"))
     {
         case 0:
             NotifyManager::notify(NotifyTypes::MAIL_GET_ATTACH_OK);
diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp
index b6acf017a..244f8b8fd 100644
--- a/src/test/testlauncher.cpp
+++ b/src/test/testlauncher.cpp
@@ -478,7 +478,7 @@ int TestLauncher::testDyeSpeed()
 
     clock_gettime(CLOCK_MONOTONIC, &time2);
     long diff = ((static_cast<long int>(time2.tv_sec) * 1000000000L
-        + static_cast<long int>(time2.tv_nsec)) / 1) - 
+        + static_cast<long int>(time2.tv_nsec)) / 1) -
         ((static_cast<long int>(time1.tv_sec) * 1000000000L
         + static_cast<long int>(time1.tv_nsec)) / 1);
     printf("time: %ld\n", diff);