diff --git a/include/freerdp/locale/keyboard.h b/include/freerdp/locale/keyboard.h
index bb548af73..82b13c3f4 100644
--- a/include/freerdp/locale/keyboard.h
+++ b/include/freerdp/locale/keyboard.h
@@ -201,30 +201,30 @@ typedef enum
 	KBD_PERSIAN = 0x00050429,
 	KBD_US_ENGLISH_TABLE_FOR_IBM_ARABIC_238_L = 0x00050409,
 	KBD_GREEK_POLYTONIC = 0x00060408,
-	KBD_FRENCH_BEPO = 0xa000040c,
-	KBD_GERMAN_NEO = 0xB0000407
+	KBD_FRENCH_BEPO = WINPR_CXX_COMPAT_CAST(int, 0xa000040c),
+	KBD_GERMAN_NEO = WINPR_CXX_COMPAT_CAST(int, 0xB0000407)
 } FREERDP_KBD_LAYPUT_VARIANT_ID;
 
 /* Global Input Method Editor (IME) IDs */
 typedef enum
 {
-	KBD_CHINESE_TRADITIONAL_PHONETIC = 0xE0010404,
-	KBD_JAPANESE_INPUT_SYSTEM_MS_IME2002 = 0xE0010411,
-	KBD_KOREAN_INPUT_SYSTEM_IME_2000 = 0xE0010412,
-	KBD_CHINESE_SIMPLIFIED_QUANPIN = 0xE0010804,
-	KBD_CHINESE_TRADITIONAL_CHANGJIE = 0xE0020404,
-	KBD_CHINESE_SIMPLIFIED_SHUANGPIN = 0xE0020804,
-	KBD_CHINESE_TRADITIONAL_QUICK = 0xE0030404,
-	KBD_CHINESE_SIMPLIFIED_ZHENGMA = 0xE0030804,
-	KBD_CHINESE_TRADITIONAL_BIG5_CODE = 0xE0040404,
-	KBD_CHINESE_TRADITIONAL_ARRAY = 0xE0050404,
-	KBD_CHINESE_SIMPLIFIED_NEIMA = 0xE0050804,
-	KBD_CHINESE_TRADITIONAL_DAYI = 0xE0060404,
-	KBD_CHINESE_TRADITIONAL_UNICODE = 0xE0070404,
-	KBD_CHINESE_TRADITIONAL_NEW_PHONETIC = 0xE0080404,
-	KBD_CHINESE_TRADITIONAL_NEW_CHANGJIE = 0xE0090404,
-	KBD_CHINESE_TRADITIONAL_MICROSOFT_PINYIN_IME_3 = 0xE00E0804,
-	KBD_CHINESE_TRADITIONAL_ALPHANUMERIC = 0xE00F0404
+	KBD_CHINESE_TRADITIONAL_PHONETIC = WINPR_CXX_COMPAT_CAST(int, 0xE0010404),
+	KBD_JAPANESE_INPUT_SYSTEM_MS_IME2002 = WINPR_CXX_COMPAT_CAST(int, 0xE0010411),
+	KBD_KOREAN_INPUT_SYSTEM_IME_2000 = WINPR_CXX_COMPAT_CAST(int, 0xE0010412),
+	KBD_CHINESE_SIMPLIFIED_QUANPIN = WINPR_CXX_COMPAT_CAST(int, 0xE0010804),
+	KBD_CHINESE_TRADITIONAL_CHANGJIE = WINPR_CXX_COMPAT_CAST(int, 0xE0020404),
+	KBD_CHINESE_SIMPLIFIED_SHUANGPIN = WINPR_CXX_COMPAT_CAST(int, 0xE0020804),
+	KBD_CHINESE_TRADITIONAL_QUICK = WINPR_CXX_COMPAT_CAST(int, 0xE0030404),
+	KBD_CHINESE_SIMPLIFIED_ZHENGMA = WINPR_CXX_COMPAT_CAST(int, 0xE0030804),
+	KBD_CHINESE_TRADITIONAL_BIG5_CODE = WINPR_CXX_COMPAT_CAST(int, 0xE0040404),
+	KBD_CHINESE_TRADITIONAL_ARRAY = WINPR_CXX_COMPAT_CAST(int, 0xE0050404),
+	KBD_CHINESE_SIMPLIFIED_NEIMA = WINPR_CXX_COMPAT_CAST(int, 0xE0050804),
+	KBD_CHINESE_TRADITIONAL_DAYI = WINPR_CXX_COMPAT_CAST(int, 0xE0060404),
+	KBD_CHINESE_TRADITIONAL_UNICODE = WINPR_CXX_COMPAT_CAST(int, 0xE0070404),
+	KBD_CHINESE_TRADITIONAL_NEW_PHONETIC = WINPR_CXX_COMPAT_CAST(int, 0xE0080404),
+	KBD_CHINESE_TRADITIONAL_NEW_CHANGJIE = WINPR_CXX_COMPAT_CAST(int, 0xE0090404),
+	KBD_CHINESE_TRADITIONAL_MICROSOFT_PINYIN_IME_3 = WINPR_CXX_COMPAT_CAST(int, 0xE00E0804),
+	KBD_CHINESE_TRADITIONAL_ALPHANUMERIC = WINPR_CXX_COMPAT_CAST(int, 0xE00F0404)
 } FREERDP_KBD_IME_ID;
 
 /** @brief Deallocation function for a \b RDP_KEYBOARD_LAYOUT array of \b count size