3 files changed, 11 insertions, 9 deletions
diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h
index 18cac4405b..0274acb2cc 100644
--- a/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h
+++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_app.h
@@ -9,7 +9,7 @@
 
 #include "xfa/fxfa/include/fxfa.h"
 
-class CPDFDoc_Environment;
+class CPDFSDK_Environment;
 class IFXJS_Runtime;
 
 class CPDFXFA_App : public IXFA_AppProvider {
@@ -23,8 +23,8 @@ class CPDFXFA_App : public IXFA_AppProvider {
   FX_BOOL Initialize(v8::Isolate* pIsolate);
   CXFA_FFApp* GetXFAApp() { return m_pXFAApp.get(); }
 
-  FX_BOOL AddFormFillEnv(CPDFDoc_Environment* pEnv);
-  FX_BOOL RemoveFormFillEnv(CPDFDoc_Environment* pEnv);
+  FX_BOOL AddFormFillEnv(CPDFSDK_Environment* pEnv);
+  FX_BOOL RemoveFormFillEnv(CPDFSDK_Environment* pEnv);
 
   FX_BOOL IsJavaScriptInitialized() const { return m_bJavaScriptInitialized; }
   void SetJavaScriptInitialized(FX_BOOL bInitialized) {
@@ -70,7 +70,7 @@ class CPDFXFA_App : public IXFA_AppProvider {
   void LoadString(int32_t iStringID, CFX_WideString& wsString) override;
   IFWL_AdapterTimerMgr* GetTimerMgr() override;
 
-  CFX_ArrayTemplate<CPDFDoc_Environment*> m_pEnvList;
+  CFX_ArrayTemplate<CPDFSDK_Environment*> m_pEnvList;
 
  protected:
   FX_BOOL m_bJavaScriptInitialized;
diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
index acced2c434..77597d47c2 100644
--- a/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
+++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h
@@ -12,11 +12,13 @@
 #include "fpdfsdk/fpdfxfa/include/cpdfxfa_docenvironment.h"
 #include "xfa/fxfa/include/xfa_ffdoc.h"
 
+class CPDFSDK_Document;
+class CPDFSDK_Environment;
 class CPDFXFA_App;
 class CPDFXFA_Page;
-class CPDFSDK_Document;
-class CPDFDoc_Environment;
 class CXFA_FFDocHandler;
+class IJS_Runtime;
+class IJS_Context;
 
 enum LoadStatus {
   FXFA_LOADSTATUS_PRELOAD = 0,
@@ -45,7 +47,7 @@ class CPDFXFA_Document {
   void RemovePage(CPDFXFA_Page* page);
   int GetDocType() { return m_iDocType; }
 
-  CPDFSDK_Document* GetSDKDocument(CPDFDoc_Environment* pFormFillEnv);
+  CPDFSDK_Document* GetSDKDocument(CPDFSDK_Environment* pFormFillEnv);
 
   void ClearChangeMark();
 
diff --git a/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h b/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h
index fb5bd0d1b7..fd7a678fdd 100644
--- a/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h
+++ b/fpdfsdk/fpdfxfa/include/fpdfxfa_util.h
@@ -21,7 +21,7 @@ struct CFWL_TimerInfo;
 
 class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
  public:
-  CXFA_FWLAdapterTimerMgr(CPDFDoc_Environment* pEnv) : m_pEnv(pEnv) {}
+  CXFA_FWLAdapterTimerMgr(CPDFSDK_Environment* pEnv) : m_pEnv(pEnv) {}
 
   FWL_Error Start(IFWL_Timer* pTimer,
                   uint32_t dwElapse,
@@ -33,7 +33,7 @@ class CXFA_FWLAdapterTimerMgr : public IFWL_AdapterTimerMgr {
   static void TimerProc(int32_t idEvent);
 
   static std::vector<CFWL_TimerInfo*>* s_TimerArray;
-  CPDFDoc_Environment* const m_pEnv;
+  CPDFSDK_Environment* const m_pEnv;
 };
 
 struct CFWL_TimerInfo : public IFWL_TimerInfo {