diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index 2b78824..a2f1c89 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -29,8 +29,7 @@
 #include "public/fpdf_fwlevent.h"
 #include "third_party/base/stl_util.h"
 
-CPWL_Edit::CPWL_Edit()
-    : m_pFillerNotify(nullptr), m_bFocus(false), m_pFormFiller(nullptr) {}
+CPWL_Edit::CPWL_Edit() : m_bFocus(false) {}
 
 CPWL_Edit::~CPWL_Edit() {
   ASSERT(!m_bFocus);
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.h b/fpdfsdk/pdfwindow/PWL_Edit.h
index 6f8c37b..6fc02ca 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/pdfwindow/PWL_Edit.h
@@ -7,17 +7,10 @@
 #ifndef FPDFSDK_PDFWINDOW_PWL_EDIT_H_
 #define FPDFSDK_PDFWINDOW_PWL_EDIT_H_
 
-#include <vector>
-
+#include "core/fpdfdoc/cpvt_wordrange.h"
 #include "core/fxcrt/cfx_unowned_ptr.h"
 #include "core/fxcrt/fx_basic.h"
-#include "fpdfsdk/fxedit/fx_edit.h"
 #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
-#include "fpdfsdk/pdfwindow/PWL_Wnd.h"
-
-class CPDF_PageObjectHolder;
-class CPDF_TextObject;
-class IFX_Edit_UndoItem;
 
 class IPWL_Filler_Notify {
  public:
@@ -136,9 +129,10 @@
   CPVT_WordRange GetSameWordsRange(const CPVT_WordPlace& place,
                                    bool bLatin,
                                    bool bArabic) const;
-  CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
+
   bool m_bFocus;
   CFX_FloatRect m_rcOldWindow;
+  CFX_UnownedPtr<IPWL_Filler_Notify> m_pFillerNotify;
   CFX_UnownedPtr<CFFL_FormFiller> m_pFormFiller;
 };
 
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.h b/fpdfsdk/pdfwindow/PWL_EditCtrl.h
index 0f2487b..623079b 100644
--- a/fpdfsdk/pdfwindow/PWL_EditCtrl.h
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.h
@@ -10,25 +10,17 @@
 #include <memory>
 
 #include "core/fxcrt/fx_string.h"
-#include "fpdfsdk/fxedit/fx_edit.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CFX_Edit;
 class CPWL_Caret;
-class CPWL_Edit;
-class CPWL_EditCtrl;
-struct CPVT_SecProps;
 struct CPVT_WordPlace;
-struct CPVT_WordProps;
-struct CPVT_WordRange;
 
 enum PWL_EDIT_ALIGNFORMAT_H { PEAH_LEFT = 0, PEAH_MIDDLE, PEAH_RIGHT };
 
 enum PWL_EDIT_ALIGNFORMAT_V { PEAV_TOP = 0, PEAV_CENTER, PEAV_BOTTOM };
 
 class CPWL_EditCtrl : public CPWL_Wnd {
-  friend class CPWL_Edit_Notify;
-
  public:
   CPWL_EditCtrl();
   ~CPWL_EditCtrl() override;