8 files changed, 7 insertions, 6 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index d183dcdca..2cb0cc221 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -366,6 +366,9 @@ void PopupMenu::showPopup(const int x, const int y, const Being *const being)
                 mBrowserBox->addRow("##3---");
             }
             break;
+        case ActorType::SkillUnit:
+            // +++ need impliment menu
+            break;
 #endif
         case ActorType::Avatar:
         case ActorType::Unknown:
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 69a7dd1e8..630696e72 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -891,6 +891,7 @@ void Viewport::mouseMoved(MouseEvent &event)
             case ActorType::Pet:
             case ActorType::Mercenary:
             case ActorType::Homunculus:
+            case ActorType::SkillUnit:
 #endif
                 gui->setCursorType(mHoverBeing->getHoverCursor());
                 break;
diff --git a/src/gui/widgets/skilllistbox.h b/src/gui/widgets/skilllistbox.h
index 94485f5cf..74057ff32 100644
--- a/src/gui/widgets/skilllistbox.h
+++ b/src/gui/widgets/skilllistbox.h
@@ -28,7 +28,6 @@
 #include "gui/skin.h"
 #include "gui/viewport.h"
 
-#include "gui/widgets/createwidget.h"
 #include "gui/widgets/listbox.h"
 
 #include "gui/fonts/font.h"
diff --git a/src/gui/widgets/statuswindowattrs.h b/src/gui/widgets/statuswindowattrs.h
index 7359a1a86..e4406d67a 100644
--- a/src/gui/widgets/statuswindowattrs.h
+++ b/src/gui/widgets/statuswindowattrs.h
@@ -119,7 +119,6 @@ class ChangeDisplay final : public AttrDisplay,
         int mNeeded;
 
         Label *mPoints;
-        Button *mDec;
         Button *mInc;
 };
 
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index 65d7d19f6..ca15caf97 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -48,7 +48,6 @@
 #include "net/character.h"
 #include "net/charserverhandler.h"
 #include "net/logindata.h"
-#include "net/loginhandler.h"
 #include "net/serverfeatures.h"
 
 #include "debug.h"
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 09754420f..37e6bccc9 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -42,7 +42,6 @@
 #include "gui/widgets/progressbar.h"
 
 #include "net/playerhandler.h"
-#include "net/gamehandler.h"
 
 #include "utils/delete2.h"
 #include "utils/dtor.h"
@@ -79,7 +78,8 @@ MiniStatusWindow::MiniStatusWindow() :
         ? "mpprogressbar_fill.xml" : "nompprogressbar_fill.xml",
         // TRANSLATORS: status bar name
         "mp bar", _("mana bar"))),
-    mXpBar(createBar(0, 100, 0, ThemeColorId::XP_BAR, ProgressColorId::PROG_EXP,
+    mXpBar(createBar(0, 100, 0,
+        ThemeColorId::XP_BAR, ProgressColorId::PROG_EXP,
         "xpprogressbar.xml", "xpprogressbar_fill.xml",
         // TRANSLATORS: status bar name
         "xp bar", _("experience bar"))),
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 7a46cf313..36b72d051 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -34,6 +34,7 @@
 #include "gui/windows/shortcutwindow.h"
 
 #include "gui/widgets/button.h"
+#include "gui/widgets/createwidget.h"
 #include "gui/widgets/label.h"
 #include "gui/widgets/scrollarea.h"
 #include "gui/widgets/tabbedarea.h"
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 7a2a2c206..6ac5b34dc 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -46,7 +46,6 @@
 #include "gui/widgets/vertcontainer.h"
 #include "gui/widgets/windowcontainer.h"
 
-#include "net/gamehandler.h"
 #include "net/inventoryhandler.h"
 #include "net/playerhandler.h"