6 files changed, 12 insertions, 15 deletions
diff --git a/core/fxcrt/fx_ext.h b/core/fxcrt/fx_ext.h
index 20580760c6..9203938c2c 100644
--- a/core/fxcrt/fx_ext.h
+++ b/core/fxcrt/fx_ext.h
@@ -86,15 +86,14 @@ void FX_Random_GenerateMT(uint32_t* pBuffer, int32_t iCount);
 void FX_Random_GenerateCrypto(uint32_t* pBuffer, int32_t iCount);
 
 #ifdef PDF_ENABLE_XFA
-typedef struct FX_GUID {
+struct FX_GUID {
   uint32_t data1;
   uint16_t data2;
   uint16_t data3;
   uint8_t data4[8];
-} FX_GUID, *FX_LPGUID;
-typedef FX_GUID const* FX_LPCGUID;
-void FX_GUID_CreateV4(FX_LPGUID pGUID);
-void FX_GUID_ToString(FX_LPCGUID pGUID,
+};
+void FX_GUID_CreateV4(FX_GUID* pGUID);
+void FX_GUID_ToString(const FX_GUID* pGUID,
                       CFX_ByteString& bsStr,
                       bool bSeparator = true);
 #endif  // PDF_ENABLE_XFA
diff --git a/core/fxcrt/fx_extension.cpp b/core/fxcrt/fx_extension.cpp
index ba82b9b7f0..f1e2583b40 100644
--- a/core/fxcrt/fx_extension.cpp
+++ b/core/fxcrt/fx_extension.cpp
@@ -652,13 +652,13 @@ void FX_Random_GenerateCrypto(uint32_t* pBuffer, int32_t iCount) {
 }
 
 #ifdef PDF_ENABLE_XFA
-void FX_GUID_CreateV4(FX_LPGUID pGUID) {
+static const FX_CHAR gs_FX_pHexChars[] = "0123456789ABCDEF";
+void FX_GUID_CreateV4(FX_GUID* pGUID) {
   FX_Random_GenerateMT((uint32_t*)pGUID, 4);
   uint8_t& b = ((uint8_t*)pGUID)[6];
   b = (b & 0x0F) | 0x40;
 }
-const FX_CHAR* gs_FX_pHexChars = "0123456789ABCDEF";
-void FX_GUID_ToString(FX_LPCGUID pGUID,
+void FX_GUID_ToString(const FX_GUID* pGUID,
                       CFX_ByteString& bsStr,
                       bool bSeparator) {
   FX_CHAR* pBuf = bsStr.GetBuffer(40);
diff --git a/xfa/fgas/font/cfgas_fontmgr.cpp b/xfa/fgas/font/cfgas_fontmgr.cpp
index 72f7b88f95..add66899a7 100644
--- a/xfa/fgas/font/cfgas_fontmgr.cpp
+++ b/xfa/fgas/font/cfgas_fontmgr.cpp
@@ -47,7 +47,7 @@ int32_t GetSimilarityScore(FX_FONTDESCRIPTOR const* pFont,
   return iValue;
 }
 
-FX_FONTDESCRIPTOR const* MatchDefaultFont(FX_LPFONTMATCHPARAMS pParams,
+FX_FONTDESCRIPTOR const* MatchDefaultFont(FX_FONTMATCHPARAMS* pParams,
                                           const CFX_FontDescriptors& fonts) {
   FX_FONTDESCRIPTOR const* pBestFont = nullptr;
   int32_t iBestSimilar = 0;
diff --git a/xfa/fgas/font/cfgas_fontmgr.h b/xfa/fgas/font/cfgas_fontmgr.h
index 303d73404b..5e03af031f 100644
--- a/xfa/fgas/font/cfgas_fontmgr.h
+++ b/xfa/fgas/font/cfgas_fontmgr.h
@@ -52,8 +52,6 @@ struct FX_FONTMATCHPARAMS {
   uint16_t wCodePage;
 };
 
-typedef FX_FONTMATCHPARAMS* FX_LPFONTMATCHPARAMS;
-
 struct FX_FONTSIGNATURE {
   uint32_t fsUsb[4];
   uint32_t fsCsb[2];
diff --git a/xfa/fxfa/app/xfa_ffbarcode.cpp b/xfa/fxfa/app/xfa_ffbarcode.cpp
index de0638fb13..822029df3e 100644
--- a/xfa/fxfa/app/xfa_ffbarcode.cpp
+++ b/xfa/fxfa/app/xfa_ffbarcode.cpp
@@ -92,7 +92,7 @@ const XFA_BARCODETYPEENUMINFO g_XFABarCodeTypeEnumData[] = {
 const int32_t g_iXFABarcodeTypeCount =
     sizeof(g_XFABarCodeTypeEnumData) / sizeof(XFA_BARCODETYPEENUMINFO);
 
-XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName(
+const XFA_BARCODETYPEENUMINFO* XFA_GetBarcodeTypeByName(
     const CFX_WideStringC& wsName) {
   if (wsName.IsEmpty())
     return nullptr;
@@ -102,7 +102,7 @@ XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName(
   int32_t iEnd = g_iXFABarcodeTypeCount - 1;
   do {
     int32_t iMid = (iStart + iEnd) / 2;
-    XFA_LPCBARCODETYPEENUMINFO pInfo = g_XFABarCodeTypeEnumData + iMid;
+    const XFA_BARCODETYPEENUMINFO* pInfo = g_XFABarCodeTypeEnumData + iMid;
     if (uHash == pInfo->uHash) {
       return pInfo;
     } else if (uHash < pInfo->uHash) {
@@ -168,7 +168,7 @@ void CXFA_FFBarcode::UpdateWidgetProperty() {
   CXFA_FFTextEdit::UpdateWidgetProperty();
   CFWL_Barcode* pBarCodeWidget = (CFWL_Barcode*)m_pNormalWidget;
   CFX_WideString wsType = GetDataAcc()->GetBarcodeType();
-  XFA_LPCBARCODETYPEENUMINFO pBarcodeTypeInfo =
+  const XFA_BARCODETYPEENUMINFO* pBarcodeTypeInfo =
       XFA_GetBarcodeTypeByName(wsType.AsStringC());
   if (!pBarcodeTypeInfo)
     return;
diff --git a/xfa/fxfa/app/xfa_ffbarcode.h b/xfa/fxfa/app/xfa_ffbarcode.h
index d2b5df3517..4690b3d612 100644
--- a/xfa/fxfa/app/xfa_ffbarcode.h
+++ b/xfa/fxfa/app/xfa_ffbarcode.h
@@ -90,12 +90,12 @@ enum XFA_BARCODETYPEENUM {
   XFA_BARCODETYPE_upcean5,
   XFA_BARCODETYPE_upsMaxicode
 };
+
 struct XFA_BARCODETYPEENUMINFO {
   uint32_t uHash;
   const FX_WCHAR* pName;
   XFA_BARCODETYPEENUM eName;
   BC_TYPE eBCType;
 };
-typedef XFA_BARCODETYPEENUMINFO const* XFA_LPCBARCODETYPEENUMINFO;
 
 #endif  // XFA_FXFA_APP_XFA_FFBARCODE_H_