5 files changed, 9 insertions, 11 deletions
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index 11c573be6e..277286c80c 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -205,10 +205,10 @@ class CFX_FileBufferArchive {
 
 class CFX_CharMap {
  public:
-  static CFX_ByteString GetByteString(FX_WORD codepage,
+  static CFX_ByteString GetByteString(uint16_t codepage,
                                       const CFX_WideString& wstr);
 
-  static CFX_WideString GetWideString(FX_WORD codepage,
+  static CFX_WideString GetWideString(uint16_t codepage,
                                       const CFX_ByteString& bstr);
 
   CFX_CharMap() = delete;
@@ -402,7 +402,6 @@ typedef CFX_ArrayTemplate<FX_DWORD> CFX_DWordArray;
 
 #ifdef PDF_ENABLE_XFA
 typedef CFX_ArrayTemplate<CFX_WideStringC> CFX_WideStringCArray;
-typedef CFX_ArrayTemplate<FX_WORD> CFX_WordArray;
 typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray;
 typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray;
 typedef CFX_ArrayTemplate<int32_t> CFX_Int32Array;
diff --git a/core/include/fxcrt/fx_ext.h b/core/include/fxcrt/fx_ext.h
index 0deb4266c8..08f735b910 100644
--- a/core/include/fxcrt/fx_ext.h
+++ b/core/include/fxcrt/fx_ext.h
@@ -97,8 +97,8 @@ void FX_Random_GenerateCrypto(FX_DWORD* pBuffer, int32_t iCount);
 #ifdef PDF_ENABLE_XFA
 typedef struct FX_GUID {
   FX_DWORD data1;
-  FX_WORD data2;
-  FX_WORD data3;
+  uint16_t data2;
+  uint16_t data3;
   uint8_t data4[8];
 } FX_GUID, *FX_LPGUID;
 typedef FX_GUID const* FX_LPCGUID;
diff --git a/core/include/fxcrt/fx_string.h b/core/include/fxcrt/fx_string.h
index 9b623b9e71..afaf94b538 100644
--- a/core/include/fxcrt/fx_string.h
+++ b/core/include/fxcrt/fx_string.h
@@ -569,7 +569,7 @@ class CFX_WideString {
   static CFX_WideString FromLocal(const CFX_ByteString& str);
 
   static CFX_WideString FromCodePage(const CFX_ByteString& str,
-                                     FX_WORD codepage);
+                                     uint16_t codepage);
 
   static CFX_WideString FromUTF8(const char* str, FX_STRSIZE len);
 
diff --git a/core/include/fxcrt/fx_system.h b/core/include/fxcrt/fx_system.h
index f62e126fbb..770b1e7b2f 100644
--- a/core/include/fxcrt/fx_system.h
+++ b/core/include/fxcrt/fx_system.h
@@ -68,7 +68,6 @@
 extern "C" {
 #endif
 typedef void* FX_POSITION;       // Keep until fxcrt containers gone
-typedef uint16_t FX_WORD;        // Keep - "an efficient small type"
 typedef uint32_t FX_DWORD;       // Keep - "an efficient type"
 typedef float FX_FLOAT;          // Keep, allow upgrade to doubles.
 typedef double FX_DOUBLE;        // Keep, allow downgrade to floats.
@@ -266,8 +265,8 @@ wchar_t* FXSYS_wcsupr(wchar_t* str);
    (static_cast<FX_DWORD>(p[2]) << 8) | (static_cast<FX_DWORD>(p[3])))
 #define FXSYS_HIBYTE(word) ((uint8_t)((word) >> 8))
 #define FXSYS_LOBYTE(word) ((uint8_t)(word))
-#define FXSYS_HIWORD(dword) ((FX_WORD)((dword) >> 16))
-#define FXSYS_LOWORD(dword) ((FX_WORD)(dword))
+#define FXSYS_HIWORD(dword) ((uint16_t)((dword) >> 16))
+#define FXSYS_LOWORD(dword) ((uint16_t)(dword))
 int32_t FXSYS_atoi(const FX_CHAR* str);
 uint32_t FXSYS_atoui(const FX_CHAR* str);
 int32_t FXSYS_wtoi(const FX_WCHAR* str);
diff --git a/core/include/fxcrt/fx_ucd.h b/core/include/fxcrt/fx_ucd.h
index 969f116d60..de7feccf58 100644
--- a/core/include/fxcrt/fx_ucd.h
+++ b/core/include/fxcrt/fx_ucd.h
@@ -124,7 +124,7 @@ class CFX_Char {
         m_iCharWidth(0),
         m_iHorizontalScale(100),
         m_iVertialScale(100) {}
-  CFX_Char(FX_WORD wCharCode, FX_DWORD dwCharProps)
+  CFX_Char(uint16_t wCharCode, FX_DWORD dwCharProps)
       : m_wCharCode(wCharCode),
         m_nBreakType(0),
         m_nRotation(0),
@@ -134,7 +134,7 @@ class CFX_Char {
         m_iHorizontalScale(100),
         m_iVertialScale(100) {}
   FX_DWORD GetCharType() const { return m_dwCharProps & FX_CHARTYPEBITSMASK; }
-  FX_WORD m_wCharCode;
+  uint16_t m_wCharCode;
   uint8_t m_nBreakType;
   int8_t m_nRotation;
   FX_DWORD m_dwCharProps;