7 files changed, 3 insertions, 12 deletions
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index de2bd0c8b..581dd3a9e 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -68,8 +68,6 @@
 #include "graphicsvertexes.h"
 #include "settings.h"
 
-#include "events/keyevent.h"
-
 #include "input/inputaction.h"
 
 #include "resources/image.h"
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 7957b0587..db951692e 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -24,8 +24,6 @@
 
 #include "settings.h"
 
-#include "events/keyevent.h"
-
 #include "input/inputaction.h"
 
 #include "gui/gui.h"
diff --git a/src/gui/widgets/equipmentpage.h b/src/gui/widgets/equipmentpage.h
index bbafca15d..a62159cd1 100644
--- a/src/gui/widgets/equipmentpage.h
+++ b/src/gui/widgets/equipmentpage.h
@@ -25,9 +25,10 @@
 
 #include "localconsts.h"
 
-class EquipmentBox;
 class PlayerBox;
 
+struct EquipmentBox;
+
 struct EquipmentPage final
 {
     EquipmentPage() :
diff --git a/src/gui/widgets/inttextfield.cpp b/src/gui/widgets/inttextfield.cpp
index c2d84c66a..b268f3ce6 100644
--- a/src/gui/widgets/inttextfield.cpp
+++ b/src/gui/widgets/inttextfield.cpp
@@ -26,8 +26,6 @@
 #include "gui/sdlinput.h"
 #endif
 
-#include "events/keyevent.h"
-
 #include "input/inputaction.h"
 
 #include "utils/stringutils.h"
diff --git a/src/gui/widgets/slider.cpp b/src/gui/widgets/slider.cpp
index e36c24b2c..4a7bf6ad1 100644
--- a/src/gui/widgets/slider.cpp
+++ b/src/gui/widgets/slider.cpp
@@ -68,8 +68,6 @@
 #include "graphicsvertexes.h"
 #include "settings.h"
 
-#include "events/keyevent.h"
-
 #include "input/inputaction.h"
 
 #include "gui/gui.h"
diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp
index 36e3aa093..cbe304970 100644
--- a/src/gui/widgets/tabbedarea.cpp
+++ b/src/gui/widgets/tabbedarea.cpp
@@ -65,8 +65,6 @@
 
 #include "gui/widgets/tabbedarea.h"
 
-#include "events/keyevent.h"
-
 #include "input/inputaction.h"
 
 #include "gui/gui.h"
diff --git a/src/gui/widgets/tabstrip.cpp b/src/gui/widgets/tabstrip.cpp
index a5b5fd7e6..7c6627fbf 100644
--- a/src/gui/widgets/tabstrip.cpp
+++ b/src/gui/widgets/tabstrip.cpp
@@ -49,7 +49,7 @@ Widget *TabStrip::createWidget(const std::string &text) const
     widget->adjustSize();
     if (!mCount)
         widget->setPressed(true);
-    widget->setTag(mWidgets.size());
+    widget->setTag(static_cast<int>(mWidgets.size()));
     return widget;
 }