diff --git a/src/common/Collision/Management/IVMapManager.h b/src/common/Collision/Management/IVMapManager.h
index 2acac1744..4dd9eca03 100644
--- a/src/common/Collision/Management/IVMapManager.h
+++ b/src/common/Collision/Management/IVMapManager.h
@@ -39,7 +39,7 @@ namespace VMAP
     public:
         IVMapManager() : iEnableLineOfSightCalc(true), iEnableHeightCalc(true) { }
 
-        virtual ~IVMapManager(void) { }
+        virtual ~IVMapManager() { }
 
         virtual int loadMap(const char* pBasePath, unsigned int pMapId, int x, int y) = 0;
 
diff --git a/src/common/Collision/Management/VMapManager2.h b/src/common/Collision/Management/VMapManager2.h
index 02ced8514..2953bb3f5 100644
--- a/src/common/Collision/Management/VMapManager2.h
+++ b/src/common/Collision/Management/VMapManager2.h
@@ -85,7 +85,7 @@ namespace VMAP
         static std::string getMapFileName(unsigned int mapId);
 
         VMapManager2();
-        ~VMapManager2(void) override;
+        ~VMapManager2() override;
 
         int loadMap(const char* pBasePath, unsigned int mapId, int x, int y) override;
 
diff --git a/src/common/Cryptography/BigNumber.h b/src/common/Cryptography/BigNumber.h
index 03cc43858..75698bffb 100644
--- a/src/common/Cryptography/BigNumber.h
+++ b/src/common/Cryptography/BigNumber.h
@@ -72,7 +72,7 @@ public:
     BigNumber ModExp(BigNumber const& bn1, BigNumber const& bn2);
     BigNumber Exp(BigNumber const&);
 
-    int32 GetNumBytes(void);
+    int32 GetNumBytes();
 
     struct bignum_st* BN() { return _bn; }
 
diff --git a/src/common/Cryptography/SHA1.h b/src/common/Cryptography/SHA1.h
index 8f7890056..a641115cb 100644
--- a/src/common/Cryptography/SHA1.h
+++ b/src/common/Cryptography/SHA1.h
@@ -27,8 +27,8 @@ public:
     void Initialize();
     void Finalize();
 
-    uint8* GetDigest(void) { return mDigest; };
-    [[nodiscard]] int GetLength(void) const { return SHA_DIGEST_LENGTH; };
+    uint8* GetDigest() { return mDigest; };
+    [[nodiscard]] int GetLength() const { return SHA_DIGEST_LENGTH; };
 
 private:
     SHA_CTX mC;
diff --git a/src/common/Dynamic/TypeContainer.h b/src/common/Dynamic/TypeContainer.h
index 8fcbe7bd3..a54f958a7 100644
--- a/src/common/Dynamic/TypeContainer.h
+++ b/src/common/Dynamic/TypeContainer.h
@@ -102,8 +102,8 @@ public:
     //    return (t != NULL);
     //}
 
-    ContainerMapList<OBJECT_TYPES>& GetElements(void) { return i_elements; }
-    [[nodiscard]] const ContainerMapList<OBJECT_TYPES>& GetElements(void) const { return i_elements;}
+    ContainerMapList<OBJECT_TYPES>& GetElements() { return i_elements; }
+    [[nodiscard]] const ContainerMapList<OBJECT_TYPES>& GetElements() const { return i_elements;}
 
 private:
     ContainerMapList<OBJECT_TYPES> i_elements;
diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp
index 3ffc33441..3b1cfc3f9 100644
--- a/src/server/authserver/Server/AuthSocket.cpp
+++ b/src/server/authserver/Server/AuthSocket.cpp
@@ -118,7 +118,7 @@ typedef struct AuthHandler
 {
     eAuthCmd cmd;
     uint32 status;
-    bool (AuthSocket::*handler)(void);
+    bool (AuthSocket::*handler)();
 } AuthHandler;
 
 // GCC have alternative #pragma pack() syntax and old gcc version not support pack(pop), also any gcc version not support it at some paltform
@@ -188,15 +188,15 @@ AuthSocket::AuthSocket(RealmSocket& socket) :
 }
 
 // Close patch file descriptor before leaving
-AuthSocket::~AuthSocket(void) { }
+AuthSocket::~AuthSocket() { }
 
 // Accept the connection
-void AuthSocket::OnAccept(void)
+void AuthSocket::OnAccept()
 {
     sLog->outBasic("'%s:%d' Accepting connection", socket().getRemoteAddress().c_str(), socket().getRemotePort());
 }
 
-void AuthSocket::OnClose(void)
+void AuthSocket::OnClose()
 {
 #if defined(ENABLE_EXTRAS) && defined(ENABLE_EXTRA_LOGS)
     sLog->outDebug(LOG_FILTER_NETWORKIO, "AuthSocket::OnClose");
diff --git a/src/server/authserver/Server/AuthSocket.h b/src/server/authserver/Server/AuthSocket.h
index 5a78ece91..e1eeb0d49 100644
--- a/src/server/authserver/Server/AuthSocket.h
+++ b/src/server/authserver/Server/AuthSocket.h
@@ -31,11 +31,11 @@ public:
     const static int s_BYTE_SIZE = 32;
 
     AuthSocket(RealmSocket& socket);
-    ~AuthSocket(void) override;
+    ~AuthSocket() override;
 
-    void OnRead(void) override;
-    void OnAccept(void) override;
-    void OnClose(void) override;
+    void OnRead() override;
+    void OnAccept() override;
+    void OnClose() override;
 
     static ACE_INET_Addr const& GetAddressForClient(Realm const& realm, ACE_INET_Addr const& clientAddr);
 
@@ -57,7 +57,7 @@ public:
 
 private:
     RealmSocket& socket_;
-    RealmSocket& socket(void) { return socket_; }
+    RealmSocket& socket() { return socket_; }
 
     BigNumber N, s, g, v;
     BigNumber b, B;
diff --git a/src/server/authserver/Server/RealmAcceptor.h b/src/server/authserver/Server/RealmAcceptor.h
index ca5c80183..13802271d 100644
--- a/src/server/authserver/Server/RealmAcceptor.h
+++ b/src/server/authserver/Server/RealmAcceptor.h
@@ -16,8 +16,8 @@
 class RealmAcceptor : public ACE_Acceptor<RealmSocket, ACE_SOCK_Acceptor>
 {
 public:
-    RealmAcceptor(void) { }
-    virtual ~RealmAcceptor(void)
+    RealmAcceptor() { }
+    virtual ~RealmAcceptor()
     {
         if (reactor())
             reactor()->cancel_timer(this, 1);
@@ -41,7 +41,7 @@ protected:
         return reactor()->register_handler(this, ACE_Event_Handler::ACCEPT_MASK);
     }
 
-    virtual int handle_accept_error(void)
+    virtual int handle_accept_error()
     {
 #if defined(ENFILE) && defined(EMFILE)
         if (errno == ENFILE || errno == EMFILE)
diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h
index f237943fb..7c5910c52 100644
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2127,7 +2127,7 @@ public:
             m_DelayedOperations |= operation;
     }
 
-    void CheckAreaExploreAndOutdoor(void);
+    void CheckAreaExploreAndOutdoor();
 
     static TeamId TeamIdForRace(uint8 race);
     [[nodiscard]] TeamId GetTeamId(bool original = false) const { return original ? TeamIdForRace(getRace(true)) : m_team; };
diff --git a/src/server/game/Grids/NGrid.h b/src/server/game/Grids/NGrid.h
index ab68e24fb..583413e4d 100644
--- a/src/server/game/Grids/NGrid.h
+++ b/src/server/game/Grids/NGrid.h
@@ -43,7 +43,7 @@ public:
         return i_cells[x][y];
     }
 
-    [[nodiscard]] uint32 GetGridId(void) const { return i_gridId; }
+    [[nodiscard]] uint32 GetGridId() const { return i_gridId; }
     [[nodiscard]] int32 getX() const { return i_x; }
     [[nodiscard]] int32 getY() const { return i_y; }
 
diff --git a/src/server/game/Maps/Map.h b/src/server/game/Maps/Map.h
index 3d4c33eb0..ad58f648b 100644
--- a/src/server/game/Maps/Map.h
+++ b/src/server/game/Maps/Map.h
@@ -336,7 +336,7 @@ public:
     bool UnloadGrid(NGridType& ngrid);
     virtual void UnloadAll();
 
-    [[nodiscard]] uint32 GetId(void) const { return i_mapEntry->MapID; }
+    [[nodiscard]] uint32 GetId() const { return i_mapEntry->MapID; }
 
     static bool ExistMap(uint32 mapid, int gx, int gy);
     static bool ExistVMap(uint32 mapid, int gx, int gy);
diff --git a/src/server/shared/Network/RealmSocket.cpp b/src/server/shared/Network/RealmSocket.cpp
index 3fcf7c38f..649bc7edc 100644
--- a/src/server/shared/Network/RealmSocket.cpp
+++ b/src/server/shared/Network/RealmSocket.cpp
@@ -11,11 +11,11 @@
 #include "RealmSocket.h"
 #include "Log.h"
 
-RealmSocket::Session::Session(void) { }
+RealmSocket::Session::Session() { }
 
-RealmSocket::Session::~Session(void) { }
+RealmSocket::Session::~Session() { }
 
-RealmSocket::RealmSocket(void) :
+RealmSocket::RealmSocket() :
     input_buffer_(4096), session_(nullptr),
     _remoteAddress(), _remotePort(0)
 {
@@ -25,7 +25,7 @@ RealmSocket::RealmSocket(void) :
     msg_queue()->low_water_mark(8 * 1024 * 1024);
 }
 
-RealmSocket::~RealmSocket(void)
+RealmSocket::~RealmSocket()
 {
     if (msg_queue())
         msg_queue()->close();
@@ -75,17 +75,17 @@ int RealmSocket::close(u_long)
     return 0;
 }
 
-const std::string& RealmSocket::getRemoteAddress(void) const
+const std::string& RealmSocket::getRemoteAddress() const
 {
     return _remoteAddress;
 }
 
-uint16 RealmSocket::getRemotePort(void) const
+uint16 RealmSocket::getRemotePort() const
 {
     return _remotePort;
 }
 
-size_t RealmSocket::recv_len(void) const
+size_t RealmSocket::recv_len() const
 {
     return input_buffer_.length();
 }
diff --git a/src/server/shared/Network/RealmSocket.h b/src/server/shared/Network/RealmSocket.h
index adffdd3cc..532faaca5 100644
--- a/src/server/shared/Network/RealmSocket.h
+++ b/src/server/shared/Network/RealmSocket.h
@@ -22,27 +22,27 @@ public:
     class Session
     {
     public:
-        Session(void);
-        virtual ~Session(void);
+        Session();
+        virtual ~Session();
 
-        virtual void OnRead(void) = 0;
-        virtual void OnAccept(void) = 0;
-        virtual void OnClose(void) = 0;
+        virtual void OnRead() = 0;
+        virtual void OnAccept() = 0;
+        virtual void OnClose() = 0;
     };
 
-    RealmSocket(void);
-    ~RealmSocket(void) override;
+    RealmSocket();
+    ~RealmSocket() override;
 
-    [[nodiscard]] size_t recv_len(void) const;
+    [[nodiscard]] size_t recv_len() const;
     bool recv_soft(char* buf, size_t len);
     bool recv(char* buf, size_t len);
     void recv_skip(size_t len);
 
     bool send(const char* buf, size_t len);
 
-    [[nodiscard]] const std::string& getRemoteAddress(void) const;
+    [[nodiscard]] const std::string& getRemoteAddress() const;
 
-    [[nodiscard]] uint16 getRemotePort(void) const;
+    [[nodiscard]] uint16 getRemotePort() const;
 
     int open(void*) override;
 
diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp
index bff4a6dc6..3d745cb20 100644
--- a/src/tools/vmap4_extractor/wdtfile.cpp
+++ b/src/tools/vmap4_extractor/wdtfile.cpp
@@ -101,7 +101,7 @@ bool WDTFile::init(char* /*map_id*/, unsigned int mapID)
     return true;
 }
 
-WDTFile::~WDTFile(void)
+WDTFile::~WDTFile()
 {
     WDT.close();
 }
diff --git a/src/tools/vmap4_extractor/wdtfile.h b/src/tools/vmap4_extractor/wdtfile.h
index 21dd5bb2c..8be12adf3 100644
--- a/src/tools/vmap4_extractor/wdtfile.h
+++ b/src/tools/vmap4_extractor/wdtfile.h
@@ -21,7 +21,7 @@ private:
     string filename;
 public:
     WDTFile(char* file_name, char* file_name1);
-    ~WDTFile(void);
+    ~WDTFile();
     bool init(char* map_id, unsigned int mapID);
 
     string* gWmoInstansName;