7 files changed, 20 insertions, 6 deletions
diff --git a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
index ff94f307254..ec8913ba1bc 100644
--- a/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
+++ b/src/server/shared/Cryptography/Authentication/AuthCrypt.cpp
@@ -20,6 +20,8 @@
 #include "Cryptography/HMACSHA1.h"
 #include "Cryptography/BigNumber.h"
 
+#include <cstring>
+
 AuthCrypt::AuthCrypt() :
     _clientDecrypt(SHA_DIGEST_LENGTH), _serverEncrypt(SHA_DIGEST_LENGTH),
     _initialized(false)
diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp
index c5e0635c5ec..1319e116159 100644
--- a/src/server/shared/Cryptography/BigNumber.cpp
+++ b/src/server/shared/Cryptography/BigNumber.cpp
@@ -19,6 +19,7 @@
 #include "Cryptography/BigNumber.h"
 #include <openssl/bn.h>
 #include <openssl/crypto.h>
+#include <cstring>
 #include <algorithm>
 #include <memory>
 
diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp
index c89469bafb5..d47b13067cd 100644
--- a/src/server/shared/Cryptography/SHA1.cpp
+++ b/src/server/shared/Cryptography/SHA1.cpp
@@ -18,6 +18,7 @@
 
 #include "SHA1.h"
 #include "BigNumber.h"
+#include <cstring>
 #include <stdarg.h>
 
 SHA1Hash::SHA1Hash()
diff --git a/src/server/shared/Cryptography/WardenKeyGeneration.h b/src/server/shared/Cryptography/WardenKeyGeneration.h
index 11bc00d641a..9832d5a9c72 100644
--- a/src/server/shared/Cryptography/WardenKeyGeneration.h
+++ b/src/server/shared/Cryptography/WardenKeyGeneration.h
@@ -18,6 +18,8 @@
 
 #include "SHA1.h"
 
+#include <cstring>
+
 #ifndef _WARDEN_KEY_GENERATION_H
 #define _WARDEN_KEY_GENERATION_H
 
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h
index e173925f314..c04a2a81629 100644
--- a/src/server/shared/Define.h
+++ b/src/server/shared/Define.h
@@ -21,15 +21,16 @@
 
 #include "CompilerDefs.h"
 
+#include <cstddef>
+#include <cinttypes>
+#include <climits>
+
 #if COMPILER == COMPILER_GNU
 #  if !defined(__STDC_FORMAT_MACROS)
 #    define __STDC_FORMAT_MACROS
 #  endif
 #endif
 
-#include <cstddef>
-#include <cinttypes>
-
 #define TRINITY_LITTLEENDIAN 0
 #define TRINITY_BIGENDIAN    1
 
diff --git a/src/server/shared/Logging/AppenderConsole.cpp b/src/server/shared/Logging/AppenderConsole.cpp
index 8102d3b6021..20923162906 100644
--- a/src/server/shared/Logging/AppenderConsole.cpp
+++ b/src/server/shared/Logging/AppenderConsole.cpp
@@ -16,14 +16,14 @@
  */
 
 #include <sstream>
-#if PLATFORM == PLATFORM_WINDOWS
-    #include <windows.h>
-#endif
 
 #include "AppenderConsole.h"
 #include "Config.h"
 #include "Util.h"
 
+#if PLATFORM == PLATFORM_WINDOWS
+  #include <Windows.h>
+#endif
 
 AppenderConsole::AppenderConsole(uint8 id, std::string const& name, LogLevel level, AppenderFlags flags):
 Appender(id, name, APPENDER_CONSOLE, level, flags), _colored(false)
diff --git a/src/server/shared/Utilities/Util.cpp b/src/server/shared/Utilities/Util.cpp
index a65f54f87fc..d1799913d41 100644
--- a/src/server/shared/Utilities/Util.cpp
+++ b/src/server/shared/Utilities/Util.cpp
@@ -21,8 +21,15 @@
 #include "utf8.h"
 #include "SFMT.h"
 #include "Errors.h" // for ASSERT
+#include <stdarg.h>
 #include <boost/thread/tss.hpp>
 
+#if PLATFORM == PLATFORM_UNIX
+  #include <sys/socket.h>
+  #include <netinet/in.h>
+  #include <arpa/inet.h>
+#endif
+
 static boost::thread_specific_ptr<SFMTRand> sfmtRand;
 
 static SFMTRand* GetRng()