5 files changed, 8 insertions, 7 deletions
diff --git a/src/server/shared/Common.h b/src/server/shared/Common.h
index ab268835046..27e6cb63514 100644
--- a/src/server/shared/Common.h
+++ b/src/server/shared/Common.h
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <math.h>
+#include <cmath>
 #include <errno.h>
 #include <signal.h>
 #include <assert.h>
@@ -136,7 +136,7 @@ typedef std::vector<std::string> StringVector;
 #endif
 
 #ifndef M_PI
-#define M_PI            3.14159265358979323846f
+#define M_PI            3.14159265358979323846
 #endif
 
 #define MAX_QUERY_LEN 32*1024
diff --git a/src/server/shared/Define.h b/src/server/shared/Define.h
index ad1231ec9f9..c33c8222ebb 100644
--- a/src/server/shared/Define.h
+++ b/src/server/shared/Define.h
@@ -50,6 +50,7 @@
 
 #if PLATFORM == PLATFORM_WINDOWS
 #  define TRINITY_PATH_MAX MAX_PATH
+#  define _USE_MATH_DEFINES
 #  ifndef DECLSPEC_NORETURN
 #    define DECLSPEC_NORETURN __declspec(noreturn)
 #  endif //DECLSPEC_NORETURN
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 456223d744d..046fdc0c8e9 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -31,7 +31,7 @@
 #include <vector>
 #include <cstring>
 #include <time.h>
-#include <math.h>
+#include <cmath>
 #include <boost/asio/buffer.hpp>
 
 class MessageBuffer;
diff --git a/src/server/shared/Utilities/Timer.h b/src/server/shared/Utilities/Timer.h
index 7c62de5f5ed..0e2d6ddbff5 100644
--- a/src/server/shared/Utilities/Timer.h
+++ b/src/server/shared/Utilities/Timer.h
@@ -27,7 +27,7 @@ inline uint32 getMSTime()
 {
     static const system_clock::time_point ApplicationStartTime = system_clock::now();
 
-    return duration_cast<milliseconds>(system_clock::now() - ApplicationStartTime).count();
+    return uint32(duration_cast<milliseconds>(system_clock::now() - ApplicationStartTime).count());
 }
 
 inline uint32 getMSTimeDiff(uint32 oldMSTime, uint32 newMSTime)
diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index 0680b91e0fe..20c17b14023 100644
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -618,7 +618,7 @@ class EventMap
             if (!phase)
                 _phase = 0;
             else if (phase <= 8)
-                _phase = (1 << (phase - 1));
+                _phase = uint8(1 << (phase - 1));
         }
 
         /**
@@ -629,7 +629,7 @@ class EventMap
         void AddPhase(uint8 phase)
         {
             if (phase && phase <= 8)
-                _phase |= (1 << (phase - 1));
+                _phase |= uint8(1 << (phase - 1));
         }
 
         /**
@@ -640,7 +640,7 @@ class EventMap
         void RemovePhase(uint8 phase)
         {
             if (phase && phase <= 8)
-                _phase &= ~(1 << (phase - 1));
+                _phase &= uint8(~(1 << (phase - 1)));
         }
 
         /**