8 files changed, 13 insertions, 87 deletions
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h
index a515c40185..cb14397be5 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h
@@ -7,8 +7,9 @@
 #ifndef FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
 #define FPDFSDK_INCLUDE_FORMFILLER_FFL_FORMFILLER_H_
 
-#include "FFL_IFormFiller.h"
-#include "FFL_CBA_Fontmap.h"
+#include "fpdfsdk/include/formfiller/FFL_CBA_Fontmap.h"
+#include "fpdfsdk/include/formfiller/FFL_IFormFiller.h"
+#include "fpdfsdk/include/fsdk_baseform.h"
 
 class CPDFDoc_Environment;
 class CPDFSDK_Annot;
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
index 5f6ac5cac3..93e7505f9c 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
@@ -9,10 +9,15 @@
 
 #include <map>
 
-#include "FormFiller.h"
+#include "fpdfsdk/include/fsdk_define.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
 
 class CFFL_FormFiller;
 class CFFL_PrivateData;
+class CPDFDoc_Environment;
+class CPDFSDK_Annot;
+class CPDFSDK_PageView;
+class CPDFSDK_Widget;
 
 class CFFL_IFormFiller : public IPWL_Filler_Notify {
  public:
diff --git a/fpdfsdk/include/formfiller/FormFiller.h b/fpdfsdk/include/formfiller/FormFiller.h
deleted file mode 100644
index 1f517d56e9..0000000000
--- a/fpdfsdk/include/formfiller/FormFiller.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
-#define FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
-
-#include "core/include/fpdfapi/fpdf_module.h"
-#include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fpdfdoc/fpdf_vt.h"
-#include "fpdfsdk/include/fsdk_mgr.h"
-#include "fpdfsdk/include/fxedit/fx_edit.h"
-#include "fpdfsdk/include/pdfwindow/IPDFWindow.h"
-
-#endif  // FPDFSDK_INCLUDE_FORMFILLER_FORMFILLER_H_
diff --git a/fpdfsdk/include/fsdk_define.h b/fpdfsdk/include/fsdk_define.h
index 0d63b642d4..831e499f00 100644
--- a/fpdfsdk/include/fsdk_define.h
+++ b/fpdfsdk/include/fsdk_define.h
@@ -12,7 +12,6 @@
 #include "core/include/fpdfapi/fpdf_parser.h"
 #include "core/include/fpdfapi/fpdf_render.h"
 #include "core/include/fpdfapi/fpdf_serial.h"
-#include "core/include/fpdfapi/fpdfapi.h"
 #include "core/include/fpdfdoc/fpdf_doc.h"
 #include "core/include/fpdfdoc/fpdf_vt.h"
 #include "core/include/fxge/fx_ge.h"
@@ -50,7 +49,7 @@ class IFSDK_PAUSE_Adapter;
 
 class CPDF_CustomAccess final : public IFX_FileRead {
  public:
-  CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess);
+  explicit CPDF_CustomAccess(FPDF_FILEACCESS* pFileAccess);
   ~CPDF_CustomAccess() override {}
 
   // IFX_FileRead
diff --git a/fpdfsdk/include/fxedit/fxet_stub.h b/fpdfsdk/include/fxedit/fxet_stub.h
deleted file mode 100644
index a5a512bb1c..0000000000
--- a/fpdfsdk/include/fxedit/fxet_stub.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
-#define FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
-
-#include "core/include/fpdfapi/fpdf_module.h"
-#include "core/include/fpdfapi/fpdf_pageobj.h"
-#include "core/include/fpdfapi/fpdf_render.h"
-#include "core/include/fpdfdoc/fpdf_vt.h"
-#include "fpdfsdk/include/fx_systemhandler.h"
-
-#endif  // FPDFSDK_INCLUDE_FXEDIT_FXET_STUB_H_
diff --git a/fpdfsdk/include/pdfwindow/IPDFWindow.h b/fpdfsdk/include/pdfwindow/IPDFWindow.h
deleted file mode 100644
index 2774f70e7c..0000000000
--- a/fpdfsdk/include/pdfwindow/IPDFWindow.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_
-
-#include "PWL_Button.h"
-#include "PWL_Caret.h"
-#include "PWL_ComboBox.h"
-#include "PWL_Edit.h"
-#include "PWL_EditCtrl.h"
-#include "PWL_FontMap.h"
-#include "PWL_Icon.h"
-#include "PWL_IconList.h"
-#include "PWL_Label.h"
-#include "PWL_ListBox.h"
-#include "PWL_ListCtrl.h"
-#include "PWL_Note.h"
-#include "PWL_ScrollBar.h"
-#include "PWL_Signature.h"
-#include "PWL_SpecialButton.h"
-#include "PWL_Utils.h"
-#include "PWL_Wnd.h"
-
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_IPDFWINDOW_H_
diff --git a/fpdfsdk/include/pdfwindow/PDFWindow.h b/fpdfsdk/include/pdfwindow/PDFWindow.h
deleted file mode 100644
index fe9723b913..0000000000
--- a/fpdfsdk/include/pdfwindow/PDFWindow.h
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
-#define FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
-
-#include "core/include/fpdfapi/fpdf_module.h"
-#include "core/include/fpdfdoc/fpdf_doc.h"
-#include "core/include/fpdfdoc/fpdf_vt.h"
-#include "fpdfsdk/include/fx_systemhandler.h"
-#include "fpdfsdk/include/fxedit/fx_edit.h"
-#include "public/fpdf_fwlevent.h"
-
-#endif  // FPDFSDK_INCLUDE_PDFWINDOW_PDFWINDOW_H_
diff --git a/fpdfsdk/include/pdfwindow/PWL_Edit.h b/fpdfsdk/include/pdfwindow/PWL_Edit.h
index 1912a63748..e7be15639d 100644
--- a/fpdfsdk/include/pdfwindow/PWL_Edit.h
+++ b/fpdfsdk/include/pdfwindow/PWL_Edit.h
@@ -7,12 +7,11 @@
 #ifndef FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
 #define FPDFSDK_INCLUDE_PDFWINDOW_PWL_EDIT_H_
 
-#include "PWL_EditCtrl.h"
-#include "PWL_Wnd.h"
 #include "core/include/fxcrt/fx_basic.h"
+#include "fpdfsdk/include/fxedit/fx_edit.h"
+#include "fpdfsdk/include/pdfwindow/PWL_EditCtrl.h"
+#include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
-class CPWL_Edit;
-class IPWL_Filler_Notify;
 class IPWL_SpellCheck;
 
 class IPWL_Filler_Notify {