diff --git a/Minecraft.Client/Platform/Common/Minecraft_Macros.h b/Minecraft.Client/Platform/Common/Minecraft_Macros.h
index 4f1f096a4..1c5b83e76 100644
--- a/Minecraft.Client/Platform/Common/Minecraft_Macros.h
+++ b/Minecraft.Client/Platform/Common/Minecraft_Macros.h
@@ -1,6 +1,8 @@
 
 #pragma once
 
+#include <cstdint>
+
 // 3 bit user index
 // 5 bits alpha
 // 1 bit decoration
@@ -35,8 +37,8 @@
 #define MAKE_SKIN_BITMASK(bDlcSkin, dwSkinId) ( (bDlcSkin?0x80000000:0) | (dwSkinId & 0x7FFFFFFF) )
 #define IS_SKIN_ID_IN_RANGE(dwSkinId) (dwSkinId <= 0x7FFFFFFF)
 
-#define GET_DLC_SKIN_ID_FROM_BITMASK(uiBitmask)		(((DWORD)uiBitmask)&0x7FFFFFFF)
-#define GET_UGC_SKIN_ID_FROM_BITMASK(uiBitmask)		(((DWORD)uiBitmask)&0x7FFFFFE0)
-#define GET_DEFAULT_SKIN_ID_FROM_BITMASK(uiBitmask)		(((DWORD)uiBitmask)&0x0000001F)
-#define GET_IS_DLC_SKIN_FROM_BITMASK(uiBitmask) ((((DWORD)uiBitmask)&0x80000000)?true:false)
+#define GET_DLC_SKIN_ID_FROM_BITMASK(uiBitmask)		(static_cast<std::uint32_t>(uiBitmask) & 0x7FFFFFFF)
+#define GET_UGC_SKIN_ID_FROM_BITMASK(uiBitmask)		(static_cast<std::uint32_t>(uiBitmask) & 0x7FFFFFE0)
+#define GET_DEFAULT_SKIN_ID_FROM_BITMASK(uiBitmask)		(static_cast<std::uint32_t>(uiBitmask) & 0x0000001F)
+#define GET_IS_DLC_SKIN_FROM_BITMASK(uiBitmask) ((static_cast<std::uint32_t>(uiBitmask) & 0x80000000) ? true : false)