3 files changed, 3 insertions, 6 deletions
diff --git a/fpdfsdk/pdfwindow/cpwl_appstream.cpp b/fpdfsdk/pdfwindow/cpwl_appstream.cpp
index 969c521d68..f7ba4c465c 100644
--- a/fpdfsdk/pdfwindow/cpwl_appstream.cpp
+++ b/fpdfsdk/pdfwindow/cpwl_appstream.cpp
@@ -577,8 +577,7 @@ CFX_ByteString GetEditAppStream(CFX_Edit* pEdit,
           nCurFontIndex = word.nFontIndex;
         }
 
-        sWords << GetPDFWordString(pEdit->GetFontMap(), nCurFontIndex,
-                                   word.Word, SubWord);
+        sWords << pEdit->GetPDFWordString(nCurFontIndex, word.Word, SubWord);
       }
 
       oldplace = place;
@@ -600,8 +599,8 @@ CFX_ByteString GetEditAppStream(CFX_Edit* pEdit,
           nCurFontIndex = word.nFontIndex;
         }
 
-        sEditStream << GetWordRenderString(GetPDFWordString(
-            pEdit->GetFontMap(), nCurFontIndex, word.Word, SubWord));
+        sEditStream << GetWordRenderString(
+            pEdit->GetPDFWordString(nCurFontIndex, word.Word, SubWord));
       }
     }
   }
diff --git a/fpdfsdk/pdfwindow/cpwl_font_map.h b/fpdfsdk/pdfwindow/cpwl_font_map.h
index de7a944425..e1a3edeb79 100644
--- a/fpdfsdk/pdfwindow/cpwl_font_map.h
+++ b/fpdfsdk/pdfwindow/cpwl_font_map.h
@@ -13,7 +13,6 @@
 #include "core/fpdfdoc/ipvt_fontmap.h"
 #include "core/fxcrt/fx_codepage.h"
 #include "core/fxge/fx_font.h"
-#include "fpdfsdk/fxedit/fx_edit.h"
 #include "public/fpdf_sysfontinfo.h"
 
 class CPDF_Document;
diff --git a/fpdfsdk/pdfwindow/cpwl_list_box.h b/fpdfsdk/pdfwindow/cpwl_list_box.h
index 8bc7651ada..f41a6dd87f 100644
--- a/fpdfsdk/pdfwindow/cpwl_list_box.h
+++ b/fpdfsdk/pdfwindow/cpwl_list_box.h
@@ -10,7 +10,6 @@
 #include <memory>
 
 #include "core/fxcrt/cfx_unowned_ptr.h"
-#include "fpdfsdk/fxedit/fx_edit.h"
 #include "fpdfsdk/pdfwindow/cpwl_wnd.h"
 
 class CFX_ListCtrl;