22 files changed, 30 insertions, 22 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index 5d5ec271e..65c04c8b7 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -26,10 +26,12 @@
 #include <iosfwd>
 #include <string>
 
+#include "localconsts.h"
+
 namespace Net
 {
 
-class AdminHandler
+class AdminHandler notfinal
 {
     public:
         virtual ~AdminHandler()
diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index 57f5cda72..b2b3b96b0 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -29,7 +29,7 @@
 namespace Net
 {
 
-class BeingHandler
+class BeingHandler notfinal
 {
     public:
         virtual ~BeingHandler()
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index fd7c7b355..fde6cf835 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -30,7 +30,7 @@
 namespace Net
 {
 
-class BuySellHandler
+class BuySellHandler notfinal
 {
     public:
         virtual ~BuySellHandler()
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index f552f6ba7..8f78905c6 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -38,7 +38,7 @@ struct Character;
 
 typedef std::list<Character*> Characters;
 
-class CharServerHandler
+class CharServerHandler notfinal
 {
     public:
         A_DELETE_COPY(CharServerHandler)
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index bcea62cfe..b3acf6384 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -30,7 +30,7 @@
 
 namespace Net
 {
-class ChatHandler
+class ChatHandler notfinal
 {
     public:
         virtual ~ChatHandler()
diff --git a/src/net/ea/inventoryitem.h b/src/net/ea/inventoryitem.h
index 6b15a3fa2..2b8ac502a 100644
--- a/src/net/ea/inventoryitem.h
+++ b/src/net/ea/inventoryitem.h
@@ -29,7 +29,7 @@ namespace Ea
 /**
  * Used to cache storage data until we get size data for it.
  */
-class InventoryItem
+class InventoryItem final
 {
     public:
         int slot;
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index 80c0a4dbf..ff57d5c9f 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -35,7 +35,7 @@ namespace Net
 namespace Ea
 {
 
-class ItemHandler
+class ItemHandler notfinal
 {
     public:
         ItemHandler();
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 57102d7e3..84a4b0635 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -33,7 +33,7 @@
 namespace Ea
 {
 
-class Network
+class Network notfinal
 {
     public:
         Network();
diff --git a/src/net/gamehandler.h b/src/net/gamehandler.h
index 6cbd43af6..1752f7eea 100644
--- a/src/net/gamehandler.h
+++ b/src/net/gamehandler.h
@@ -30,7 +30,7 @@
 namespace Net
 {
 
-class GameHandler
+class GameHandler notfinal
 {
     public:
         virtual ~GameHandler()
diff --git a/src/net/generalhandler.h b/src/net/generalhandler.h
index 016ae4c28..5467c06e6 100644
--- a/src/net/generalhandler.h
+++ b/src/net/generalhandler.h
@@ -23,10 +23,12 @@
 #ifndef NET_GENERALHANDLER_H
 #define NET_GENERALHANDLER_H
 
+#include "localconsts.h"
+
 namespace Net
 {
 
-class GeneralHandler
+class GeneralHandler notfinal
 {
     public:
         virtual ~GeneralHandler()
diff --git a/src/net/guildhandler.h b/src/net/guildhandler.h
index fc07ba07a..d67e930b2 100644
--- a/src/net/guildhandler.h
+++ b/src/net/guildhandler.h
@@ -34,7 +34,7 @@ class Being;
 namespace Net
 {
 
-class GuildHandler
+class GuildHandler notfinal
 {
     public:
         virtual ~GuildHandler()
diff --git a/src/net/inventoryhandler.h b/src/net/inventoryhandler.h
index 42649bae6..c40cb5b54 100644
--- a/src/net/inventoryhandler.h
+++ b/src/net/inventoryhandler.h
@@ -32,7 +32,7 @@
 namespace Net
 {
 
-class InventoryHandler
+class InventoryHandler notfinal
 {
     public:
         virtual ~InventoryHandler()
diff --git a/src/net/loginhandler.h b/src/net/loginhandler.h
index 8992d7ba3..172dde361 100644
--- a/src/net/loginhandler.h
+++ b/src/net/loginhandler.h
@@ -33,7 +33,7 @@
 namespace Net
 {
 
-class LoginHandler
+class LoginHandler notfinal
 {
     public:
         void setServer(const ServerInfo &server)
diff --git a/src/net/messagehandler.h b/src/net/messagehandler.h
index 726fbbe64..bc74dfdc7 100644
--- a/src/net/messagehandler.h
+++ b/src/net/messagehandler.h
@@ -35,7 +35,7 @@ namespace Net
 /**
  * \ingroup Network
  */
-class MessageHandler
+class MessageHandler notfinal
 {
     public:
         const uint16_t *handledMessages;
diff --git a/src/net/messageout.h b/src/net/messageout.h
index b48cb2244..9d878db35 100644
--- a/src/net/messageout.h
+++ b/src/net/messageout.h
@@ -35,7 +35,7 @@ namespace Net
  *
  * \ingroup Network
  */
-class MessageOut
+class MessageOut notfinal
 {
     public:
         A_DELETE_COPY(MessageOut)
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 5cf2970e5..dbca9ab38 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -25,10 +25,12 @@
 
 #include <iosfwd>
 
+#include "localconsts.h"
+
 namespace Net
 {
 
-class NpcHandler
+class NpcHandler notfinal
 {
     public:
         virtual ~NpcHandler()
diff --git a/src/net/partyhandler.h b/src/net/partyhandler.h
index ef17f7ebd..d604f5eed 100644
--- a/src/net/partyhandler.h
+++ b/src/net/partyhandler.h
@@ -36,7 +36,7 @@ class Being;
 namespace Net
 {
 
-class PartyHandler
+class PartyHandler notfinal
 {
     public:
         virtual ~PartyHandler()
diff --git a/src/net/pethandler.h b/src/net/pethandler.h
index 688eb3034..ac9a6f980 100644
--- a/src/net/pethandler.h
+++ b/src/net/pethandler.h
@@ -26,7 +26,7 @@
 namespace Net
 {
 
-class PetHandler
+class PetHandler notfinal
 {
     public:
         virtual ~PetHandler()
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index de1314ddb..83a0c4e8d 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -31,7 +31,7 @@
 namespace Net
 {
 
-class PlayerHandler
+class PlayerHandler notfinal
 {
     public:
         virtual ~PlayerHandler()
diff --git a/src/net/sdltcpnet.cpp b/src/net/sdltcpnet.cpp
index 103620a5b..d42b533c4 100644
--- a/src/net/sdltcpnet.cpp
+++ b/src/net/sdltcpnet.cpp
@@ -45,7 +45,7 @@
 #include "debug.h"
 
 // because actual struct is hidden in SDL_net we reinroducing it here
-struct TCPsocketHack
+struct TCPsocketHack final
 {
     int ready;
     int channel;
diff --git a/src/net/skillhandler.h b/src/net/skillhandler.h
index 9f827a11d..aec1a77e6 100644
--- a/src/net/skillhandler.h
+++ b/src/net/skillhandler.h
@@ -25,9 +25,11 @@
 
 #include <iosfwd>
 
+#include "localconsts.h"
+
 namespace Net
 {
-class SkillHandler
+class SkillHandler notfinal
 {
     public:
         virtual ~SkillHandler()
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 21ca65e97..040d68179 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -33,7 +33,7 @@ class Item;
 
 namespace Net
 {
-class TradeHandler
+class TradeHandler notfinal
 {
     public:
         virtual ~TradeHandler()