22 files changed, 2 insertions, 27 deletions
diff --git a/src/actions/chat.cpp b/src/actions/chat.cpp
index 0ea63a507..6e6f3cae1 100644
--- a/src/actions/chat.cpp
+++ b/src/actions/chat.cpp
@@ -37,7 +37,6 @@
 #include "net/guildhandler.h"
 #include "net/net.h"
 #include "net/partyhandler.h"
-#include "net/serverfeatures.h"
 
 #ifdef TMWA_SUPPORT
 #include "net/tmwa/guildmanager.h"
diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp
index 2271e12f8..2e6c8d78c 100644
--- a/src/actions/windows.cpp
+++ b/src/actions/windows.cpp
@@ -52,7 +52,6 @@
 #include "utils/gettext.h"
 
 #include "net/net.h"
-#include "net/serverfeatures.h"
 
 #include "debug.h"
 
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index bf1167b5e..d23036820 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -64,6 +64,8 @@
 
 #include "gui/widgets/tabs/chat/whispertab.h"
 
+#include "listeners/awaylistener.h"
+
 #include "net/beinghandler.h"
 #include "net/chathandler.h"
 #include "net/inventoryhandler.h"
@@ -83,12 +85,8 @@
 #include "resources/map/speciallayer.h"
 #include "resources/map/walklayer.h"
 
-#include "listeners/awaylistener.h"
-
 #include "resources/sprite/animatedsprite.h"
 
-#include "net/net.h"
-
 #include "utils/delete2.h"
 #include "utils/gettext.h"
 #include "utils/timer.h"
diff --git a/src/game.cpp b/src/game.cpp
index c9ef20ea2..e3e293151 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -106,7 +106,6 @@
 #include "net/gamehandler.h"
 #include "net/net.h"
 #include "net/packetcounters.h"
-#include "net/serverfeatures.h"
 
 #include "particle/particleengine.h"
 
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 7947934b7..17f955da0 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -51,7 +51,6 @@
 
 #include "net/beinghandler.h"
 #include "net/net.h"
-#include "net/serverfeatures.h"
 
 #include "utils/translation/podict.h"
 
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 33cbacfd2..fc75f31ab 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -72,7 +72,6 @@
 #include "net/npchandler.h"
 #include "net/net.h"
 #include "net/pethandler.h"
-#include "net/serverfeatures.h"
 
 #ifdef TMWA_SUPPORT
 #include "net/tmwa/guildmanager.h"
diff --git a/src/gui/widgets/attrs/changedisplay.cpp b/src/gui/widgets/attrs/changedisplay.cpp
index 1f55563e4..fead88dcd 100644
--- a/src/gui/widgets/attrs/changedisplay.cpp
+++ b/src/gui/widgets/attrs/changedisplay.cpp
@@ -32,7 +32,6 @@
 
 #include "net/net.h"
 #include "net/playerhandler.h"
-#include "net/serverfeatures.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index 4ac62e86e..2578f3530 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -48,7 +48,6 @@
 #include "net/inventoryhandler.h"
 #include "net/net.h"
 #include "net/npchandler.h"
-#include "net/serverfeatures.h"
 #include "net/tradehandler.h"
 
 #include "utils/delete2.h"
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 004263119..a105c1f5a 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -39,7 +39,6 @@
 #include "gui/windows/itemamountwindow.h"
 
 #include "net/net.h"
-#include "net/serverfeatures.h"
 
 #include "resources/inventory/inventory.h"
 
diff --git a/src/gui/widgets/tabs/chat/chattab.cpp b/src/gui/widgets/tabs/chat/chattab.cpp
index 9010d1406..e59d11eb4 100644
--- a/src/gui/widgets/tabs/chat/chattab.cpp
+++ b/src/gui/widgets/tabs/chat/chattab.cpp
@@ -45,7 +45,6 @@
 
 #include "net/chathandler.h"
 #include "net/net.h"
-#include "net/serverfeatures.h"
 
 #include "utils/chatutils.h"
 #include "utils/delete2.h"
diff --git a/src/gui/widgets/tabs/chat/partytab.cpp b/src/gui/widgets/tabs/chat/partytab.cpp
index 463cd81c0..c8fee32ad 100644
--- a/src/gui/widgets/tabs/chat/partytab.cpp
+++ b/src/gui/widgets/tabs/chat/partytab.cpp
@@ -36,7 +36,6 @@
 
 #include "net/net.h"
 #include "net/partyhandler.h"
-#include "net/serverfeatures.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index 9bf074ef5..c93ac6aa2 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -52,7 +52,6 @@
 #include "net/markethandler.h"
 #include "net/net.h"
 #include "net/vendinghandler.h"
-#include "net/serverfeatures.h"
 #include "net/npchandler.h"
 
 #include "resources/iteminfo.h"
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index da4a256a1..0b58b88fc 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -72,7 +72,6 @@
 
 #include "net/chathandler.h"
 #include "net/net.h"
-#include "net/serverfeatures.h"
 
 #include "utils/copynpaste.h"
 #include "utils/delete2.h"
diff --git a/src/gui/windows/npcselldialog.cpp b/src/gui/windows/npcselldialog.cpp
index 28dacf1dc..7e964a7d1 100644
--- a/src/gui/windows/npcselldialog.cpp
+++ b/src/gui/windows/npcselldialog.cpp
@@ -36,7 +36,6 @@
 #include "net/buysellhandler.h"
 #include "net/net.h"
 #include "net/npchandler.h"
-#include "net/serverfeatures.h"
 
 #include "resources/iteminfo.h"
 
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 28260ce92..f3d187aa6 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -71,7 +71,6 @@
 #include "net/buyingstorehandler.h"
 #include "net/vendinghandler.h"
 #include "net/net.h"
-#include "net/serverfeatures.h"
 #ifdef TMWA_SUPPORT
 #include "net/tradehandler.h"
 #endif  // TMWA_SUPPORT
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index 34ee3699a..cdd5837d9 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -54,7 +54,6 @@
 #include "resources/item/item.h"
 
 #include "net/net.h"
-#include "net/serverfeatures.h"
 #include "net/tradehandler.h"
 
 #include "utils/delete2.h"
diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index a5bfeea27..4188fc803 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/ea/adminhandler.h"
 
-#include "net/serverfeatures.h"
-
 #include "utils/gmfunctions.h"
 #include "utils/stringutils.h"
 
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 94bfa748c..f985d12e1 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -26,8 +26,6 @@
 
 #include "const/gui/chat.h"
 
-#include "net/serverfeatures.h"
-
 #include "net/ea/chatrecv.h"
 
 #include "net/tmwa/messageout.h"
diff --git a/src/net/tmwa/guildmanager.cpp b/src/net/tmwa/guildmanager.cpp
index d440284c9..7615b02ab 100644
--- a/src/net/tmwa/guildmanager.cpp
+++ b/src/net/tmwa/guildmanager.cpp
@@ -38,7 +38,6 @@
 
 #include "net/chathandler.h"
 #include "net/packetlimiter.h"
-#include "net/serverfeatures.h"
 
 #include "utils/delete2.h"
 #include "utils/timer.h"
diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp
index e0616090d..12615a1a1 100644
--- a/src/resources/db/itemdb.cpp
+++ b/src/resources/db/itemdb.cpp
@@ -40,7 +40,6 @@
 #include "resources/sprite/spritereference.h"
 
 #include "net/net.h"
-#include "net/serverfeatures.h"
 
 #include "utils/checkutils.h"
 #include "utils/delete2.h"
diff --git a/src/resources/item/item.cpp b/src/resources/item/item.cpp
index 6b1f02ecf..86bd84aa4 100644
--- a/src/resources/item/item.cpp
+++ b/src/resources/item/item.cpp
@@ -35,7 +35,6 @@
 #include "resources/loaders/imageloader.h"
 
 #include "net/net.h"
-#include "net/serverfeatures.h"
 
 #include "utils/delete2.h"
 
diff --git a/src/resources/item/shopitem.cpp b/src/resources/item/shopitem.cpp
index 55926c46d..0c013ee89 100644
--- a/src/resources/item/shopitem.cpp
+++ b/src/resources/item/shopitem.cpp
@@ -27,7 +27,6 @@
 #include "utils/stringutils.h"
 
 #include "net/net.h"
-#include "net/serverfeatures.h"
 
 #include "resources/db/unitsdb.h"