diff --git a/src/common/Cryptography/CryptoGenerics.h b/src/common/Cryptography/CryptoGenerics.h
index e927139215d..439e8c3a1a1 100644
--- a/src/common/Cryptography/CryptoGenerics.h
+++ b/src/common/Cryptography/CryptoGenerics.h
@@ -18,10 +18,10 @@
 #ifndef TRINITY_CRYPTO_GENERICS_HPP
 #define TRINITY_CRYPTO_GENERICS_HPP
 
-#include "advstd.h"
 #include "BigNumber.h"
 #include "Define.h"
 #include "Errors.h"
+#include <iterator>
 #include <vector>
 #include <openssl/rand.h>
 
diff --git a/src/common/Encoding/BaseEncoding.h b/src/common/Encoding/BaseEncoding.h
index ef484015936..fd89e3778b5 100644
--- a/src/common/Encoding/BaseEncoding.h
+++ b/src/common/Encoding/BaseEncoding.h
@@ -18,9 +18,9 @@
 #ifndef TRINITY_BASE_ENCODING_HPP
 #define TRINITY_BASE_ENCODING_HPP
 
-#include "advstd.h"
 #include "Define.h"
 #include "Optional.h"
+#include <numeric>
 #include <string>
 #include <vector>
 
diff --git a/src/common/Utilities/Containers.h b/src/common/Utilities/Containers.h
index ad3887e2123..5cab071db99 100644
--- a/src/common/Utilities/Containers.h
+++ b/src/common/Utilities/Containers.h
@@ -18,12 +18,12 @@
 #ifndef TRINITY_CONTAINERS_H
 #define TRINITY_CONTAINERS_H
 
-#include "advstd.h"
 #include "Define.h"
 #include "Random.h"
 #include <algorithm>
 #include <exception>
 #include <iterator>
+#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/src/common/Utilities/EventProcessor.h b/src/common/Utilities/EventProcessor.h
index a64bd4ffc2d..17aeaf16e7c 100644
--- a/src/common/Utilities/EventProcessor.h
+++ b/src/common/Utilities/EventProcessor.h
@@ -18,11 +18,12 @@
 #ifndef __EVENTPROCESSOR_H
 #define __EVENTPROCESSOR_H
 
+#include "advstd.h"
 #include "Define.h"
 #include "Duration.h"
 #include "Random.h"
-#include "advstd.h"
 #include <map>
+#include <type_traits>
 
 class EventProcessor;
 
diff --git a/src/common/Utilities/FuzzyFind.h b/src/common/Utilities/FuzzyFind.h
index 69dfd351d56..9b70fc7cb39 100644
--- a/src/common/Utilities/FuzzyFind.h
+++ b/src/common/Utilities/FuzzyFind.h
@@ -18,9 +18,9 @@
 #ifndef TRINITY_FUZZYFIND_H
 #define TRINITY_FUZZYFIND_H
 
-#include "advstd.h"
 #include <map>
 #include <string>
+#include <type_traits>
 
 namespace Trinity
 {
diff --git a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h
index 44ee429b081..26ee15a0957 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommandHelpers.h
@@ -18,7 +18,6 @@
 #ifndef TRINITY_CHATCOMMANDHELPERS_H
 #define TRINITY_CHATCOMMANDHELPERS_H
 
-#include "advstd.h"
 #include <type_traits>
 
 namespace Trinity
diff --git a/src/server/game/Chat/ChatCommands/ChatCommandTags.h b/src/server/game/Chat/ChatCommands/ChatCommandTags.h
index 1870b9a0c3f..feffc25aa25 100644
--- a/src/server/game/Chat/ChatCommands/ChatCommandTags.h
+++ b/src/server/game/Chat/ChatCommands/ChatCommandTags.h
@@ -18,6 +18,7 @@
 #ifndef TRINITY_CHATCOMMANDTAGS_H
 #define TRINITY_CHATCOMMANDTAGS_H
 
+#include "advstd.h"
 #include "ChatCommandHelpers.h"
 #include "Hyperlinks.h"
 #include "Optional.h"
diff --git a/src/server/game/Chat/Hyperlinks.h b/src/server/game/Chat/Hyperlinks.h
index cc7b175ff11..58d5816c6d3 100644
--- a/src/server/game/Chat/Hyperlinks.h
+++ b/src/server/game/Chat/Hyperlinks.h
@@ -18,9 +18,9 @@
 #ifndef TRINITY_HYPERLINKS_H
 #define TRINITY_HYPERLINKS_H
 
-#include "advstd.h"
 #include "ObjectGuid.h"
 #include <string>
+#include <type_traits>
 #include <utility>
 
 struct AchievementEntry;