7 files changed, 6 insertions, 53 deletions
diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp
index 85cf216e2..a45054856 100644
--- a/src/dyetool/client.cpp
+++ b/src/dyetool/client.cpp
@@ -22,26 +22,14 @@
 
 #include "client.h"
 
-#include "chatlogger.h"
 #include "configmanager.h"
 #include "dirs.h"
-#include "dropshortcut.h"
-#include "emoteshortcut.h"
 #include "eventsmanager.h"
-#include "game.h"
 #include "graphicsmanager.h"
-#include "itemshortcut.h"
-#include "party.h"
 #include "settings.h"
 #include "soundmanager.h"
-#include "spellshortcut.h"
-#include "statuseffect.h"
-#include "units.h"
 #include "touchmanager.h"
 
-#include "being/playerinfo.h"
-#include "being/playerrelations.h"
-
 #include "input/inputmanager.h"
 #include "input/joystick.h"
 #include "input/keyboardconfig.h"
@@ -56,7 +44,6 @@
 #include "gui/widgets/createwidget.h"
 #include "gui/widgets/desktop.h"
 #include "gui/widgets/windowcontainer.h"
-#include "gui/widgets/window.h"
 
 #include "resources/imagehelper.h"
 #include "resources/resourcemanager.h"
@@ -76,8 +63,6 @@
 
 #include "utils/translation/translationmanager.h"
 
-#include "listeners/errorlistener.h"
-
 #include "configuration.h"
 
 #include "net/ipc.h"
@@ -130,9 +115,7 @@ Client::Client() :
     mOldState(STATE_START),
     mSkin(nullptr),
     mButtonPadding(1),
-    mButtonSpacing(3),
-    mPing(0),
-    mConfigAutoSaved(false)
+    mButtonSpacing(3)
 {
     WindowManager::init();
 }
@@ -240,7 +223,7 @@ void Client::gameInit()
     ConfigManager::checkConfigVersion();
     logVars();
     Cpu::detect();
-#if defined(USE_OPENGL) 
+#if defined(USE_OPENGL)
 #if !defined(ANDROID) && !defined(__APPLE__) && !defined(__native_client__)
     if (!settings.options.safeMode && settings.options.test.empty()
         && !config.getBoolValue("videodetected"))
diff --git a/src/dyetool/client.h b/src/dyetool/client.h
index b0fb4229f..860df5cf2 100644
--- a/src/dyetool/client.h
+++ b/src/dyetool/client.h
@@ -27,8 +27,6 @@
 
 #include "listeners/actionlistener.h"
 
-#include "net/serverinfo.h"
-
 #ifdef USE_SDL2
 #include <SDL2_framerate.h>
 #else
@@ -115,8 +113,6 @@ class Client final : public ActionListener
         Skin *mSkin;
         int mButtonPadding;
         int mButtonSpacing;
-        int mPing;
-        bool mConfigAutoSaved;
 };
 
 extern Client *client;
diff --git a/src/dyetool/gui/viewport.cpp b/src/dyetool/gui/viewport.cpp
index 26de44a3a..6a19ab663 100644
--- a/src/dyetool/gui/viewport.cpp
+++ b/src/dyetool/gui/viewport.cpp
@@ -22,42 +22,17 @@
 
 #include "gui/viewport.h"
 
-#include "actormanager.h"
 #include "configuration.h"
-#include "game.h"
-#include "settings.h"
 #include "sdlshared.h"
-#include "textmanager.h"
-
-#include "enums/resources/map/mapitemtype.h"
-
-#include "resources/map/map.h"
-#include "resources/map/mapitem.h"
-#include "resources/map/speciallayer.h"
-
-#include "being/localplayer.h"
-#include "being/playerinfo.h"
-
-#include "input/inputmanager.h"
 
 #include "gui/gui.h"
 #include "gui/popupmanager.h"
-#include "gui/userpalette.h"
-
-#include "gui/fonts/font.h"
-
-#include "gui/popups/beingpopup.h"
-#include "gui/popups/popupmenu.h"
-#include "gui/popups/textpopup.h"
-
-#include "gui/windows/ministatuswindow.h"
 
 #include "debug.h"
 
 Viewport *viewport = nullptr;
 
 extern volatile int tick_time;
-extern MiniStatusWindow *miniStatusWindow;
 
 Viewport::Viewport() :
     WindowContainer(nullptr),
diff --git a/src/dyetool/gui/viewport.h b/src/dyetool/gui/viewport.h
index 12527d962..f3b042bd3 100644
--- a/src/dyetool/gui/viewport.h
+++ b/src/dyetool/gui/viewport.h
@@ -25,8 +25,6 @@
 
 #include "position.h"
 
-#include "enums/simpletypes/beingid.h"
-
 #include "gui/widgets/windowcontainer.h"
 
 #include "listeners/mouselistener.h"
diff --git a/src/enums/being/actortype.h b/src/enums/being/actortype.h
index d9bf7b3f5..26f467592 100644
--- a/src/enums/being/actortype.h
+++ b/src/enums/being/actortype.h
@@ -33,11 +33,13 @@ enumStart(ActorType)
     FloorItem,
     Portal,
     LocalPet,
-    Avatar,
 #ifdef EATHENA_SUPPORT
+    Avatar,
     Pet,
     Mercenary,
     Homunculus
+#else
+    Avatar
 #endif
 }
 enumEnd(ActorType);
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 94c34a154..59f7d6fd9 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -40,8 +40,6 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "configuration.h"
-
 #include "settings.h"
 
 #ifdef USE_OPENGL
diff --git a/src/maingui.cpp b/src/maingui.cpp
index 0e068a1e5..a59af6cc1 100644
--- a/src/maingui.cpp
+++ b/src/maingui.cpp
@@ -31,6 +31,7 @@
 #include "utils/delete2.h"
 #ifdef ANDROID
 #include "utils/mkdir.h"
+#include "utils/paths.h"
 #endif
 #include "utils/physfscheckutils.h"
 #include "utils/physfsrwops.h"