4 files changed, 9 insertions, 9 deletions
diff --git a/xfa/fgas/crt/fgas_codepage.h b/xfa/fgas/crt/fgas_codepage.h
index 479ad37417..ec01816386 100644
--- a/xfa/fgas/crt/fgas_codepage.h
+++ b/xfa/fgas/crt/fgas_codepage.h
@@ -163,7 +163,7 @@ int32_t FX_UTF8Decode(const FX_CHAR* pSrc,
 
 struct FX_STR2CPHASH {
   uint32_t uHash;
-  uint32_t uCodePage;
+  uint16_t uCodePage;
 };
 
 struct FX_CHARSET_MAP {
@@ -172,8 +172,8 @@ struct FX_CHARSET_MAP {
 };
 
 struct FX_LANG2CPMAP {
-  FX_WORD wLanguage;
-  FX_WORD wCodepage;
+  uint16_t wLanguage;
+  uint16_t wCodepage;
 };
 
 #endif  // XFA_FGAS_CRT_FGAS_CODEPAGE_H_
diff --git a/xfa/fgas/font/fgas_fontutils.h b/xfa/fgas/font/fgas_fontutils.h
index 75c50c8d4a..ab567aee6b 100644
--- a/xfa/fgas/font/fgas_fontutils.h
+++ b/xfa/fgas/font/fgas_fontutils.h
@@ -10,10 +10,10 @@
 #include "core/include/fxcrt/fx_string.h"
 
 struct FGAS_FONTUSB {
-  FX_WCHAR wStartUnicode;
-  FX_WCHAR wEndUnicode;
-  FX_WORD wBitField;
-  FX_WORD wCodePage;
+  uint16_t wStartUnicode;
+  uint16_t wEndUnicode;
+  uint16_t wBitField;
+  uint16_t wCodePage;
 };
 
 FX_DWORD FGAS_GetFontHashCode(FX_WORD wCodePage, FX_DWORD dwFontStyles);
diff --git a/xfa/fgas/layout/fgas_linebreak.h b/xfa/fgas/layout/fgas_linebreak.h
index dc80e0dd67..f1ecad74d0 100644
--- a/xfa/fgas/layout/fgas_linebreak.h
+++ b/xfa/fgas/layout/fgas_linebreak.h
@@ -10,7 +10,7 @@
 #include "core/include/fxcrt/fx_system.h"
 #include "xfa/fgas/crt/fgas_utils.h"
 
-enum FX_LINEBREAKTYPE {
+enum FX_LINEBREAKTYPE : uint8_t {
   FX_LBT_UNKNOWN = 0x00,
   FX_LBT_DIRECT_BRK = 0x1A,
   FX_LBT_INDIRECT_BRK = 0x2B,
diff --git a/xfa/fgas/layout/fgas_unicode.h b/xfa/fgas/layout/fgas_unicode.h
index 536895d870..dd574026c9 100644
--- a/xfa/fgas/layout/fgas_unicode.h
+++ b/xfa/fgas/layout/fgas_unicode.h
@@ -26,7 +26,7 @@ typedef CFX_MassArrayTemplate<FX_TPO> CFX_TPOArray;
 void FX_TEXTLAYOUT_PieceSort(CFX_TPOArray& tpos, int32_t iStart, int32_t iEnd);
 
 struct FX_JAPCHARPROPERTYEX {
-  FX_WCHAR wChar;
+  uint16_t wChar;
   uint8_t uAlign;
 };