diff --git a/Code/Framework/AzCore/AzCore/Math/Guid.h b/Code/Framework/AzCore/AzCore/Math/Guid.h
index 53bab4d7ed..a061858265 100644
--- a/Code/Framework/AzCore/AzCore/Math/Guid.h
+++ b/Code/Framework/AzCore/AzCore/Math/Guid.h
@@ -22,7 +22,7 @@ typedef struct _GUID {
 
     _GUID() = default;
 
-    uint32_t       Data1;
+    unsigned long  Data1;
     unsigned short Data2;
     unsigned short Data3;
     unsigned char  Data4[ 8 ];
diff --git a/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h
index f58e772155..0e798b531d 100644
--- a/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h
+++ b/Code/Framework/AzCore/Platform/Windows/AzCore/PlatformIncl_Windows.h
@@ -34,7 +34,6 @@
 ////#define NOMB              //- MB_* and MessageBox()
 //#define NOMEMMGR          //- GMEM_*, LMEM_*, GHND, LHND, associated routines
 //#define NOMETAFILE        //- typedef METAFILEPICT
-////#define NOMINMAX          //- Macros min(a,b) and max(a,b)
 //#define NOMSG             //- typedef MSG and associated routines
 //#define NOOPENFILE        //- OpenFile(), OemToAnsi, AnsiToOem, and OF_*
 //#define NOSCROLL          //- SB_* and scrolling routines
@@ -50,27 +49,29 @@
 //#define NODEFERWINDOWPOS  //- DeferWindowPos routines
 //#define NOMCX             //- Modem Configuration Extensions
 
-//  //declare intrinsics to make sure we get the inline intrinsic versions and not a function call
 #if !defined(_WIN32_WINNT) || (_WIN32_WINNT < 0x0602)
-#   undef _WIN32_WINNT
-#   define _WIN32_WINNT 0x0602   // Windows Server 2012 and later
+    #undef _WIN32_WINNT
+    #define _WIN32_WINNT 0x0602   // Windows Server 2012 and later
 #endif
-#ifdef NOMINMAX
-#   include <WinSock2.h>
-#   include <windows.h>
-#else
-#   define NOMINMAX
-#       include <WinSock2.h>
-#       include <windows.h>
-#   undef NOMINMAX
+#if !defined(NOMINMAX)
+    #define NOMINMAX    // - Dont define Macros min(a,b) and max(a,b)
 #endif
+
+#pragma warning(push)
+#pragma warning(disable: 5032) // winioctl.h(161,17): error C5032: detected #pragma warning(push) with no corresponding #pragma warning(pop)
+
+#include <WinSock2.h>
+#include <windows.h>
+
+#pragma warning(pop)
+
 // Undef common function names that Windows.h defines
 #if defined(SetJob)
-#undef SetJob
+    #undef SetJob
 #endif
 #if defined(GetObject)
-#undef GetObject
+    #undef GetObject
 #endif
 #if defined(GetCommandLine)
-#undef GetCommandLine
+    #undef GetCommandLine
 #endif
diff --git a/Code/Legacy/CryCommon/platform_impl.cpp b/Code/Legacy/CryCommon/platform_impl.cpp
index 13aa67ca21..d61bfe6ee4 100644
--- a/Code/Legacy/CryCommon/platform_impl.cpp
+++ b/Code/Legacy/CryCommon/platform_impl.cpp
@@ -340,7 +340,7 @@ inline void CryDebugStr([[maybe_unused]] const char* format, ...)
      */
 }
 
-_MS_ALIGN(64) uint32  BoxSides[0x40 * 8] = {
+alignas(64) uint32  BoxSides[0x40 * 8] = {
     0, 0, 0, 0, 0, 0, 0, 0, //00
     0, 4, 6, 2, 0, 0, 0, 4, //01
     7, 5, 1, 3, 0, 0, 0, 4, //02