Cleanup forward declarations.

This CL removes duplicate forward declarations, removes extraneous declarations
and adds a couple of missing declarations.

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/1741003002 .

77 files changed, 6 insertions, 139 deletions

diff --git a/core/include/fpdfapi/fpdf_module.h b/core/include/fpdfapi/fpdf_module.h
index dffef9606e..e8cbb0d201 100644
--- a/core/include/fpdfapi/fpdf_module.h
+++ b/core/include/fpdfapi/fpdf_module.h
@@ -13,27 +13,19 @@
 #include "core/include/fxcrt/fx_system.h"
 
 class CCodec_ModuleMgr;
-class CFX_BitmapDevice;
-class CFX_DIBSource;
-class CFX_Matrix;
 class CPDF_ColorSpace;
-class CPDF_Dictionary;
 class CPDF_DocPageData;
 class CPDF_DocRenderData;
 class CPDF_Document;
 class CPDF_FontGlobals;
-class CPDF_Image;
 class CPDF_Page;
 class CPDF_PageRenderCache;
-class CPDF_RenderOptions;
-class CPDF_Stream;
 class ICodec_FaxModule;
 class ICodec_FlateModule;
 class ICodec_IccModule;
 class ICodec_Jbig2Module;
 class ICodec_JpegModule;
 class ICodec_JpxModule;
-class IPDF_FontMapper;
 class IPDF_PageModule;
 class IPDF_RenderModule;
 
diff --git a/core/include/fpdfapi/fpdf_objects.h b/core/include/fpdfapi/fpdf_objects.h
index 5791b7e6b3..238f57de59 100644
--- a/core/include/fpdfapi/fpdf_objects.h
+++ b/core/include/fpdfapi/fpdf_objects.h
@@ -15,9 +15,7 @@
 
 class CPDF_Array;
 class CPDF_Boolean;
-class CPDF_CryptoHandler;
 class CPDF_Dictionary;
-class CPDF_Document;
 class CPDF_IndirectObjectHolder;
 class CPDF_Name;
 class CPDF_Null;
@@ -26,7 +24,6 @@ class CPDF_Parser;
 class CPDF_Reference;
 class CPDF_Stream;
 class CPDF_StreamAcc;
-class CPDF_StreamFilter;
 class CPDF_String;
 class IFX_FileRead;
 
diff --git a/core/include/fpdfapi/fpdf_page.h b/core/include/fpdfapi/fpdf_page.h
index 973a28030f..4c880525f1 100644
--- a/core/include/fpdfapi/fpdf_page.h
+++ b/core/include/fpdfapi/fpdf_page.h
@@ -19,10 +19,9 @@ class CPDF_Form;
 class CPDF_ParseOptions;
 class CPDF_PageObject;
 class CPDF_PageRenderCache;
-class CPDF_StreamFilter;
 class CPDF_AllStates;
 class CPDF_ContentParser;
-class CPDF_StreamContentParser;
+class CPDF_ImageObject;
 
 #define PDFTRANS_GROUP 0x0100
 #define PDFTRANS_ISOLATED 0x0200
diff --git a/core/include/fpdfapi/fpdf_render.h b/core/include/fpdfapi/fpdf_render.h
index cc9b9413ea..298e5e2fc7 100644
--- a/core/include/fpdfapi/fpdf_render.h
+++ b/core/include/fpdfapi/fpdf_render.h
@@ -16,13 +16,8 @@
 class CFX_GraphStateData;
 class CFX_PathData;
 class CFX_RenderDevice;
-class CPDF_FormObject;
 class CPDF_ImageCacheEntry;
-class CPDF_ImageObject;
-class CPDF_PathObject;
 class CPDF_RenderStatus;
-class CPDF_ShadingObject;
-class CPDF_TextObject;
 class IFX_Pause;
 
 class IPDF_OCContext {
diff --git a/core/include/fpdfapi/fpdf_resource.h b/core/include/fpdfapi/fpdf_resource.h
index 7dbc3fd618..393a9cc0bf 100644
--- a/core/include/fpdfapi/fpdf_resource.h
+++ b/core/include/fpdfapi/fpdf_resource.h
@@ -22,12 +22,10 @@ class CPDF_CIDFont;
 class CPDF_CMap;
 class CPDF_Color;
 class CPDF_ColorSpace;
-class CPDF_Face;
 class CPDF_FontEncoding;
 class CPDF_Form;
 class CPDF_Function;
 class CPDF_Image;
-class CPDF_ImageObject;
 class CPDF_Page;
 class CPDF_Pattern;
 class CPDF_RenderContext;
diff --git a/core/include/fpdfapi/fpdf_serial.h b/core/include/fpdfapi/fpdf_serial.h
index 5f493c4365..ccbea36404 100644
--- a/core/include/fpdfapi/fpdf_serial.h
+++ b/core/include/fpdfapi/fpdf_serial.h
@@ -10,7 +10,6 @@
 #include "core/include/fpdfapi/fpdf_page.h"
 #include "core/include/fpdfapi/fpdf_pageobj.h"
 
-class CPDF_ObjectStream;
 class CPDF_XRefStream;
 
 CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& buf, const CPDF_Object* pObj);
diff --git a/core/include/fpdfdoc/fpdf_doc.h b/core/include/fpdfdoc/fpdf_doc.h
index 15616be4d5..e1766e0c38 100644
--- a/core/include/fpdfdoc/fpdf_doc.h
+++ b/core/include/fpdfdoc/fpdf_doc.h
@@ -34,11 +34,9 @@ class CPDF_IconFit;
 class CPDF_InterForm;
 class CPDF_Link;
 class CPDF_Metadata;
-class CPDF_NumberTree;
 class CPDF_OCContext;
 class CPDF_Page;
 class CPDF_RenderOptions;
-class CPDF_TextObject;
 class CPDF_ViewerPreferences;
 class CXML_Element;
 
diff --git a/core/include/fpdfdoc/fpdf_tagged.h b/core/include/fpdfdoc/fpdf_tagged.h
index 45277fb434..82ac64db9e 100644
--- a/core/include/fpdfdoc/fpdf_tagged.h
+++ b/core/include/fpdfdoc/fpdf_tagged.h
@@ -8,10 +8,8 @@
 #define CORE_INCLUDE_FPDFDOC_FPDF_TAGGED_H_
 
 class CPDF_Document;
-class CPDF_Page;
 class CPDF_StructElement;
 class CPDF_StructTree;
-class IPDF_ReflowedPage;
 struct CPDF_StructKid;
 
 class CPDF_StructTree {
diff --git a/core/include/fxcodec/fx_codec.h b/core/include/fxcodec/fx_codec.h
index c1842626f0..5c289c1a48 100644
--- a/core/include/fxcodec/fx_codec.h
+++ b/core/include/fxcodec/fx_codec.h
@@ -18,7 +18,6 @@
 class CFX_DIBSource;
 class CJPX_Decoder;
 class CPDF_ColorSpace;
-class CPDF_PrivateData;
 class CPDF_StreamAcc;
 class ICodec_BasicModule;
 class ICodec_FaxModule;
diff --git a/core/include/fxge/fx_font.h b/core/include/fxge/fx_font.h
index 29a4304129..67ca1a7f4e 100644
--- a/core/include/fxge/fx_font.h
+++ b/core/include/fxge/fx_font.h
@@ -24,7 +24,6 @@ class CFX_PathData;
 class CFX_SizeGlyphCache;
 class CFX_SubstFont;
 class CTTFontDesc;
-class IFX_FontEncoding;
 class IFX_SystemFontInfo;
 
 #define FXFONT_FIXED_PITCH 0x01
diff --git a/core/src/fpdftext/text_int.h b/core/src/fpdftext/text_int.h
index ef742a38be..dd30148094 100644
--- a/core/src/fpdftext/text_int.h
+++ b/core/src/fpdftext/text_int.h
@@ -15,7 +15,6 @@
 #include "core/include/fxcrt/fx_basic.h"
 
 class CFX_BidiChar;
-class CPDF_DocProgressiveSearch;
 class CPDF_FormObject;
 class CPDF_LinkExtract;
 class CPDF_TextPageFind;
diff --git a/core/src/fxcodec/jbig2/JBig2_GrrdProc.h b/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
index 42b4eb66d9..5d8eabb164 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_GrrdProc.h
@@ -11,7 +11,6 @@
 
 class CJBig2_ArithDecoder;
 class CJBig2_Image;
-class IFX_Pause;
 struct JBig2ArithCtx;
 
 class CJBig2_GRRDProc {
diff --git a/core/src/fxge/android/fpf_skiafont.h b/core/src/fxge/android/fpf_skiafont.h
index c88f2407c1..12d5fa520b 100644
--- a/core/src/fxge/android/fpf_skiafont.h
+++ b/core/src/fxge/android/fpf_skiafont.h
@@ -13,7 +13,6 @@
 
 class CFPF_SkiaFontDescriptor;
 class CFPF_SkiaFontMgr;
-class SkTypeface;
 class CFPF_SkiaFont : public IFPF_Font {
  public:
   CFPF_SkiaFont();
diff --git a/fpdfsdk/include/formfiller/FFL_ComboBox.h b/fpdfsdk/include/formfiller/FFL_ComboBox.h
index 672b0b2b7c..a5ef01b0ea 100644
--- a/fpdfsdk/include/formfiller/FFL_ComboBox.h
+++ b/fpdfsdk/include/formfiller/FFL_ComboBox.h
@@ -11,7 +11,6 @@
 #include "fpdfsdk/include/formfiller/FFL_FormFiller.h"
 
 class CBA_FontMap;
-class CPDFSDK_Document;
 
 struct FFL_ComboBoxState {
   int nIndex;
diff --git a/fpdfsdk/include/formfiller/FFL_FormFiller.h b/fpdfsdk/include/formfiller/FFL_FormFiller.h
index 4ea8fdaa8b..3ad1e9d8c4 100644
--- a/fpdfsdk/include/formfiller/FFL_FormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_FormFiller.h
@@ -13,7 +13,6 @@
 
 class CPDFDoc_Environment;
 class CPDFSDK_Annot;
-class CPDFSDK_Document;
 class CPDFSDK_PageView;
 class CPDFSDK_Widget;
 
diff --git a/fpdfsdk/include/formfiller/FFL_IFormFiller.h b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
index cea61bf20e..95e4cbed17 100644
--- a/fpdfsdk/include/formfiller/FFL_IFormFiller.h
+++ b/fpdfsdk/include/formfiller/FFL_IFormFiller.h
@@ -13,7 +13,6 @@
 #include "fpdfsdk/include/pdfwindow/PWL_Edit.h"
 
 class CFFL_FormFiller;
-class CFFL_PrivateData;
 class CPDFDoc_Environment;
 class CPDFSDK_Annot;
 class CPDFSDK_PageView;
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
index 0956fcfa7e..9d1b1cef62 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_app.h
@@ -9,6 +9,7 @@
 
 #include "xfa/include/fxfa/fxfa.h"
 
+class CPDFDoc_Environment;
 class IFXJS_Runtime;
 
 class CPDFXFA_App : public IXFA_AppProvider {
diff --git a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
index 2e3c51cbd0..5f11d5e5aa 100644
--- a/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
+++ b/fpdfsdk/include/fpdfxfa/fpdfxfa_page.h
@@ -7,6 +7,8 @@
 #ifndef FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGE_H_
 #define FPDFSDK_INCLUDE_FPDFXFA_FPDFXFA_PAGE_H_
 
+class CPDF_Page;
+
 class CPDFXFA_Page {
  public:
   CPDFXFA_Page(CPDFXFA_Document* pDoc, int page_index);
diff --git a/fpdfsdk/include/fsdk_baseform.h b/fpdfsdk/include/fsdk_baseform.h
index ac34528d4d..481627ea9b 100644
--- a/fpdfsdk/include/fsdk_baseform.h
+++ b/fpdfsdk/include/fsdk_baseform.h
@@ -22,9 +22,7 @@
 #include "core/include/fxge/fx_dib.h"
 #include "fpdfsdk/include/fsdk_baseannot.h"
 
-class CFFL_FormFiller;
 class CPDFSDK_Annot;
-class CPDFSDK_DateTime;
 class CPDFSDK_Document;
 class CPDFSDK_InterForm;
 class CPDFSDK_PageView;
diff --git a/fpdfsdk/include/pdfwindow/PWL_ListBox.h b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
index c1d3bd7218..ced4e73d03 100644
--- a/fpdfsdk/include/pdfwindow/PWL_ListBox.h
+++ b/fpdfsdk/include/pdfwindow/PWL_ListBox.h
@@ -10,7 +10,6 @@
 #include "fpdfsdk/include/fxedit/fx_edit.h"
 #include "fpdfsdk/include/pdfwindow/PWL_Wnd.h"
 
-class CPDF_ListCtrl;
 class CPWL_List_Notify;
 class CPWL_ListBox;
 class IPWL_Filler_Notify;
diff --git a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
index 454763a23b..327c92e7e1 100644
--- a/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
+++ b/xfa/include/fwl/adapter/fwl_adapterwidgetmgr.h
@@ -17,7 +17,6 @@ class IFWL_MenuDP;
 class CFX_Path;
 class CFX_DIBitmap;
 class IFWL_AdapterMessageHook;
-class IFWL_AppDelegate;
 
 class IFWL_AdapterWidgetMgr {
  public:
diff --git a/xfa/include/fwl/basewidget/fwl_barcode.h b/xfa/include/fwl/basewidget/fwl_barcode.h
index b7d3cecb60..944dd4aa6c 100644
--- a/xfa/include/fwl/basewidget/fwl_barcode.h
+++ b/xfa/include/fwl/basewidget/fwl_barcode.h
@@ -11,8 +11,6 @@
 #include "xfa/include/fxbarcode/BC_BarCode.h"
 
 class CFWL_WidgetImpProperties;
-class IFWL_Widget;
-class IFWL_BarcodeDP;
 class IFWL_Barcode;
 #define FWL_CLASS_Barcode L"FWL_BARCODE"
 #define FWL_CLASSHASH_Barcode 366886968
diff --git a/xfa/include/fwl/basewidget/fwl_combobox.h b/xfa/include/fwl/basewidget/fwl_combobox.h
index c28a6582aa..194d0b12e1 100644
--- a/xfa/include/fwl/basewidget/fwl_combobox.h
+++ b/xfa/include/fwl/basewidget/fwl_combobox.h
@@ -10,7 +10,6 @@
 #include "xfa/include/fwl/basewidget/fwl_listbox.h"
 
 class CFWL_WidgetImpProperties;
-class IFWL_ComboBoxDP;
 class IFWL_ComboBox;
 
 #define FWL_CLASS_ComboBox L"FWL_COMBOBOX"
diff --git a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h
index 7963e64aaa..0a775dbd7c 100644
--- a/xfa/include/fwl/basewidget/fwl_tooltipctrl.h
+++ b/xfa/include/fwl/basewidget/fwl_tooltipctrl.h
@@ -10,7 +10,6 @@
 #include "xfa/include/fwl/core/fwl_form.h"
 
 class CFWL_WidgetImpProperties;
-class IFWL_ToolTipDP;
 class IFWL_ToolTip;
 
 #define FWL_CLASS_ToolTip L"FWL_TOOLTIP"
diff --git a/xfa/include/fwl/core/fwl_note.h b/xfa/include/fwl/core/fwl_note.h
index 5d74c1e451..182c56fe3c 100644
--- a/xfa/include/fwl/core/fwl_note.h
+++ b/xfa/include/fwl/core/fwl_note.h
@@ -10,10 +10,8 @@
 #include "xfa/include/fwl/core/fwl_error.h"
 #include "xfa/include/fxgraphics/fx_graphics.h"
 
-class IFWL_Target;
 class IFWL_Widget;
 class IFWL_NoteThread;
-class IFWL_ThemeProvider;
 class CFWL_Note;
 class CFWL_Message;
 class CFWL_MsgActivate;
diff --git a/xfa/include/fwl/theme/widgettp.h b/xfa/include/fwl/theme/widgettp.h
index e7dee4d8be..b451d4f373 100644
--- a/xfa/include/fwl/theme/widgettp.h
+++ b/xfa/include/fwl/theme/widgettp.h
@@ -17,7 +17,6 @@
 #include "xfa/include/fwl/core/fwl_widget.h"
 #include "xfa/include/fwl/theme/utils.h"
 
-class IFWL_ThemeProvider;
 class IFWL_Widget;
 class IFDE_TextOut;
 class IFX_Font;
diff --git a/xfa/include/fxfa/fxfa.h b/xfa/include/fxfa/fxfa.h
index 0a9de02aa4..191056cd82 100644
--- a/xfa/include/fxfa/fxfa.h
+++ b/xfa/include/fxfa/fxfa.h
@@ -17,7 +17,6 @@ class CPDF_Document;
 class CXFA_Node;
 class CXFA_NodeList;
 class CXFA_WidgetAcc;
-class IFDE_XMLElement;
 class IFWL_AdapterTimerMgr;
 class IFX_Font;
 class IXFA_App;
@@ -29,7 +28,6 @@ class IXFA_DocView;
 class IXFA_FontMgr;
 class IXFA_MenuHandler;
 class IXFA_PageView;
-class IXFA_PageViewRender;
 class IXFA_WidgetAccIterator;
 class IXFA_WidgetHandler;
 class IXFA_WidgetIterator;
diff --git a/xfa/include/fxfa/fxfa_widget.h b/xfa/include/fxfa/fxfa_widget.h
index 74a611d74b..7b9241832c 100644
--- a/xfa/include/fxfa/fxfa_widget.h
+++ b/xfa/include/fxfa/fxfa_widget.h
@@ -13,11 +13,9 @@ class CXFA_Node;
 class CXFA_FFDocView;
 class CXFA_FFDoc;
 class CXFA_FFApp;
-class CXFA_Node;
 class CXFA_EventParam;
 class CXFA_FFWidget;
 class CXFA_TextLayout;
-class CXFA_TextProvider;
 class CXFA_WidgetLayoutData;
 class IFX_Font;
 class IXFA_AppProvider;
diff --git a/xfa/include/fxgraphics/fx_graphics.h b/xfa/include/fxgraphics/fx_graphics.h
index 51acdcea48..c22d00995e 100644
--- a/xfa/include/fxgraphics/fx_graphics.h
+++ b/xfa/include/fxgraphics/fx_graphics.h
@@ -100,7 +100,6 @@ class CFX_DIBSource;
 class CFX_DIBitmap;
 class CFX_Font;
 class CFX_WideString;
-class IFX_FileRead;
 class CFX_PathGenerator;
 class CAGG_Graphics;
 class CFX_Graphics;
diff --git a/xfa/include/fxjse/fxjse.h b/xfa/include/fxjse/fxjse.h
index 76f624e2a6..5466582022 100644
--- a/xfa/include/fxjse/fxjse.h
+++ b/xfa/include/fxjse/fxjse.h
@@ -11,8 +11,6 @@
 #include "core/include/fxcrt/fx_string.h"
 #include "core/include/fxcrt/fx_system.h"
 
-class CPDFDoc_Environment;
-class CPDF_Page;
 struct FXJSE_CLASS;
 
 typedef struct FXJSE_HRUNTIME_ { void* pData; } * FXJSE_HRUNTIME;
diff --git a/xfa/src/fdp/include/fde_brs.h b/xfa/src/fdp/include/fde_brs.h
index daea23f7d9..7cae2f0e2d 100644
--- a/xfa/src/fdp/include/fde_brs.h
+++ b/xfa/src/fdp/include/fde_brs.h
@@ -11,7 +11,6 @@
 #include "core/include/fxge/fx_dib.h"
 
 class IFDE_Image;
-class IFDE_Path;
 
 #define FDE_BRUSHTYPE_Unknown -1
 #define FDE_BRUSHTYPE_Solid 0
diff --git a/xfa/src/fdp/include/fde_css.h b/xfa/src/fdp/include/fde_css.h
index 825a2a65f7..cc5ec2dbb1 100644
--- a/xfa/src/fdp/include/fde_css.h
+++ b/xfa/src/fdp/include/fde_css.h
@@ -12,16 +12,11 @@
 #include "xfa/src/fgas/include/fx_stm.h"
 #include "xfa/src/fgas/include/fx_utl.h"
 
-class IFDE_HTMNotify;
 class IFDE_CSSValue;
-class IFDE_CSSPrimitiveValue;
 class IFDE_CSSValueList;
 class IFDE_CSSDeclaration;
 class IFDE_CSSSelector;
 class IFDE_CSSRule;
-class IFDE_CSSStyleRule;
-class IFDE_CSSMediaRule;
-class IFDE_CSSFontFaceRule;
 class IFDE_CSSStyleSheet;
 class IFDE_CSSStyleSheetCache;
 class IFDE_CSSSyntaxParser;
@@ -40,12 +35,6 @@ class IFDE_CSSComputedStyle;
 class IFDE_CSSTagProvider;
 class IFDE_CSSAccelerator;
 class IFDE_CSSStyleSelector;
-class IFDE_CSSCounterContext;
-class IFDE_CSSCounterManager;
-class IFDE_CSSQuoteContext;
-class IFDE_CSSContentContext;
-class IFDE_CSSMultiColumnContext;
-class IFDE_CSSFloatContext;
 
 enum FDE_CSSVALUETYPE {
   FDE_CSSVALUETYPE_Primitive = 1,
diff --git a/xfa/src/fdp/include/fde_rdr.h b/xfa/src/fdp/include/fde_rdr.h
index 085a78e4c1..48101a9b4e 100644
--- a/xfa/src/fdp/include/fde_rdr.h
+++ b/xfa/src/fdp/include/fde_rdr.h
@@ -10,7 +10,6 @@
 #include "core/include/fxcrt/fx_coordinates.h"
 #include "xfa/src/fdp/include/fde_psr.h"
 
-class IFDE_Page;
 class IFDE_RenderDevice;
 
 void FDE_GetPageMatrix(CFX_Matrix& pageMatrix,
diff --git a/xfa/src/fdp/include/fde_rdv.h b/xfa/src/fdp/include/fde_rdv.h
index bfd92f5fa8..ee11923011 100644
--- a/xfa/src/fdp/include/fde_rdv.h
+++ b/xfa/src/fdp/include/fde_rdv.h
@@ -15,7 +15,6 @@
 
 class IFDE_Pen;
 class IFDE_Brush;
-class IFDE_Image;
 class CFX_DIBitmap;
 class CFX_DIBSource;
 
diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h
index cc08179270..625914dd6e 100644
--- a/xfa/src/fdp/include/fde_xml.h
+++ b/xfa/src/fdp/include/fde_xml.h
@@ -13,13 +13,6 @@
 class IFDE_XMLNode;
 class IFDE_XMLInstruction;
 class IFDE_XMLDeclaration;
-class IFDE_XMLDeclComment;
-class IFDE_XMLDeclCharData;
-class IFDE_XMLDeclDocType;
-class IFDE_XMLDeclElement;
-class IFDE_XMLDeclAttriList;
-class IFDE_XMLDeclNotition;
-class IFDE_XMLDeclEntity;
 class IFDE_XMLElement;
 class IFDE_XMLText;
 class IFDE_XMLDoc;
diff --git a/xfa/src/fdp/src/fde/fde_geobject.h b/xfa/src/fdp/src/fde/fde_geobject.h
index cf8ed51387..a22817f183 100644
--- a/xfa/src/fdp/src/fde/fde_geobject.h
+++ b/xfa/src/fdp/src/fde/fde_geobject.h
@@ -9,7 +9,6 @@
 
 #include "xfa/src/foxitlib.h"
 
-class CFDE_GEFontMgr;
 class CFDE_Path : public IFDE_Path, public CFX_Target {
  public:
   virtual void Release() { delete this; }
diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/include/ifde_txtedtengine.h
index 6773b50195..d4319d27ee 100644
--- a/xfa/src/fee/include/ifde_txtedtengine.h
+++ b/xfa/src/fee/include/ifde_txtedtengine.h
@@ -10,7 +10,6 @@
 #include "core/include/fxge/fx_dib.h"
 #include "xfa/src/fgas/include/fx_fnt.h"
 
-class IFDE_TxtEdtBuf;
 class IFDE_TxtEdtPage;
 class IFDE_TxtEdtEngine;
 class IFDE_TxtEdtEventSink;
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/src/fee/fde_txtedtengine.h
index de836ca3b8..69390ddd2f 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.h
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.h
@@ -7,14 +7,8 @@
 #ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
 #define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
 
-class CFDE_TxtEdtBuf;
-class CFDE_TxtEdtPage;
 class IFX_TxtBreak;
 class CFDE_TxtEdtParag;
-class CFDE_TxtEdtKMPMatch;
-class IFDE_TxtEdtFormator;
-class CFDE_TxtEdtField;
-class CFDE_TxtEdtBlock;
 class IFX_CharIter;
 class CFDE_TxtEdtEngine;
 class CFDE_TxtEdtDoRecord_Insert;
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/src/fee/fde_txtedtpage.h
index 0dc50d1b15..5f04e20611 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.h
+++ b/xfa/src/fee/src/fee/fde_txtedtpage.h
@@ -10,7 +10,6 @@
 class CFDE_TxtEdtEngine;
 class IFX_CharIter;
 class CFDE_TxtEdtPage;
-class CFDE_TxtEdtLineExt;
 class CFDE_TxtEdtTextSet;
 class CFDE_TxtEdtParag;
 enum FDE_TXTEDT_CHARTYPE {
diff --git a/xfa/src/fgas/include/fx_rbk.h b/xfa/src/fgas/include/fx_rbk.h
index 5ce93960c9..c655111f9c 100644
--- a/xfa/src/fgas/include/fx_rbk.h
+++ b/xfa/src/fgas/include/fx_rbk.h
@@ -13,8 +13,6 @@
 
 class IFX_Unknown;
 class IFX_Font;
-class CFX_Char;
-class CFX_RTFBreakPiece;
 class IFX_RTFBreak;
 
 #define FX_RTFBREAKPOLICY_None 0x00
diff --git a/xfa/src/fgas/src/layout/fx_textbreak.h b/xfa/src/fgas/src/layout/fx_textbreak.h
index b1baae493e..670b86c00b 100644
--- a/xfa/src/fgas/src/layout/fx_textbreak.h
+++ b/xfa/src/fgas/src/layout/fx_textbreak.h
@@ -11,7 +11,6 @@
 #include "xfa/src/fgas/src/layout/fx_unicode.h"
 
 class IFX_ArabicChar;
-class CFX_Txtbreak;
 
 class CFX_TxtLine {
  public:
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h
index 5405ed9b97..48556aee7d 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_datetimepickerimp.h
@@ -20,7 +20,6 @@
 class CFWL_WidgetImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
-class CFWL_FormProxyImp;
 class CFWL_DateTimeEdit;
 class CFWL_DateTimeEditImpDelegate;
 class CFWL_DateTimeCalendar;
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
index db74020adc..a19dd055d0 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_editimp.h
@@ -16,9 +16,7 @@
 
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetImpDelegate;
-class CFWL_ScrollBarImp;
 class IFWL_Caret;
-class IFWL_AdapterTextField;
 class CFWL_EditImp;
 class CFWL_EditImpDelegate;
 
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h b/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
index 5d1fd4c9cd..57db256baf 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_monthcalendarimp.h
@@ -12,8 +12,6 @@
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
-class IFDE_DateTime;
-class CFDE_DateTime;
 class CFWL_MonthCalendarImpDelegate;
 
 extern uint8_t FX_DaysInMonth(int32_t iYear, uint8_t iMonth);
diff --git a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
index 781075cefe..265c22d806 100644
--- a/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
+++ b/xfa/src/fwl/src/basewidget/include/fwl_scrollbarimp.h
@@ -12,7 +12,6 @@
 
 class CFWL_WidgetImpProperties;
 class IFWL_Widget;
-class IFWL_TimerDelegate;
 class CFWL_ScrollBarImpDelegate;
 
 class CFWL_ScrollBarImp : public CFWL_WidgetImp, public IFWL_Timer {
diff --git a/xfa/src/fwl/src/core/include/fwl_noteimp.h b/xfa/src/fwl/src/core/include/fwl_noteimp.h
index 32a8f91a59..eeb86b6026 100644
--- a/xfa/src/fwl/src/core/include/fwl_noteimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_noteimp.h
@@ -9,9 +9,7 @@
 
 #include "xfa/include/fwl/core/fwl_note.h"
 
-class CFWL_TargetImp;
 class CFWL_WidgetImp;
-class CFWL_NoteThreadImp;
 class CFWL_ToolTipImp;
 class CFWL_CoreToopTipDP;
 class CFWL_NoteDriver;
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetimp.h b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
index 22cba226d2..65cd75e151 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetimp.h
@@ -10,7 +10,6 @@
 #include "xfa/include/fwl/core/fwl_widget.h"
 #include "xfa/src/fwl/src/core/include/fwl_targetimp.h"
 
-class CFWL_NoteTarget;
 class CFWL_NoteThreadImp;
 class CFWL_WidgetImpProperties;
 class CFWL_WidgetMgr;
diff --git a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
index c1c07d8b36..5c951777e8 100644
--- a/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
+++ b/xfa/src/fwl/src/core/include/fwl_widgetmgrimp.h
@@ -9,7 +9,6 @@
 
 #include "xfa/include/fwl/core/fwl_widgetmgr.h"
 
-class CFWL_TargetImp;
 class IFWL_Widget;
 class IFWL_AdapterWidgetMgr;
 class CFWL_WidgetMgrDelegate;
diff --git a/xfa/src/fxbarcode/BC_Binarizer.h b/xfa/src/fxbarcode/BC_Binarizer.h
index 281f4ae5d4..ed1ac9c19c 100644
--- a/xfa/src/fxbarcode/BC_Binarizer.h
+++ b/xfa/src/fxbarcode/BC_Binarizer.h
@@ -12,7 +12,6 @@
 class CBC_LuminanceSource;
 class CBC_CommonBitMatrix;
 class CBC_CommonBitArray;
-class CBC_BinaryBitmap;
 
 class CBC_Binarizer {
  public:
diff --git a/xfa/src/fxbarcode/BC_UtilRSS.h b/xfa/src/fxbarcode/BC_UtilRSS.h
index cbcad946c7..825a555744 100644
--- a/xfa/src/fxbarcode/BC_UtilRSS.h
+++ b/xfa/src/fxbarcode/BC_UtilRSS.h
@@ -11,7 +11,6 @@
 
 #include "core/include/fxcrt/fx_basic.h"
 
-class CBC_RssPair;
 class CBC_UtilRSS {
  public:
   virtual ~CBC_UtilRSS();
diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
index c0ffaaa28d..56c2794fbe 100644
--- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
+++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
@@ -10,7 +10,6 @@
 #include "core/include/fxcrt/fx_basic.h"
 #include "xfa/src/fxbarcode/BC_Binarizer.h"
 
-class CBC_CommonBinarizer;
 class CBC_CommonBitArray;
 class CBC_CommonBitMatrix;
 class CBC_LuminanceSource;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
index a688d1a65a..a99c0e89f8 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
@@ -9,7 +9,6 @@
 
 class CBC_OneDReader;
 class CBC_CommonBitArray;
-class CBC_OnedCoda128Reader;
 class CBC_OnedCode128Reader : public CBC_OneDReader {
  public:
   CBC_OnedCode128Reader();
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
index d31cc00af1..333d3c563b 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
@@ -8,7 +8,6 @@
 #define XFA_SRC_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
 
 class CBC_OneDimWriter;
-class CBC_OnedCoda128Writer;
 class CBC_OnedCode128Writer : public CBC_OneDimWriter {
  public:
   CBC_OnedCode128Writer();
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
index 424cbe52d6..b3fa803cd7 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
@@ -9,7 +9,6 @@
 
 class CBC_OneDReader;
 class CBC_CommonBitArray;
-class CBC_OnedCoda39Reader;
 class CBC_OnedCode39Reader : public CBC_OneDReader {
  public:
   static const FX_CHAR* ALPHABET_STRING;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
index f984b9bc0b..d453b49b48 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
@@ -9,7 +9,6 @@
 
 enum BC_TEXT_LOC;
 class CBC_OneDimWriter;
-class CBC_OnedCoda39Writer;
 class CBC_OnedCode39Writer : public CBC_OneDimWriter {
  public:
   CBC_OnedCode39Writer();
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
index 1b5ce48040..6146425b0b 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
@@ -7,7 +7,6 @@
 #ifndef XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
 #define XFA_SRC_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
 
-class CBC_Writer;
 class CBC_OnedEAN13Writer;
 class CBC_OnedUPCAWriter;
 class CBC_OnedUPCAWriter : public CBC_OneDimWriter {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.h b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
index 55b9b6c483..a7a4649461 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
@@ -10,7 +10,6 @@
 #include "core/include/fxcrt/fx_basic.h"
 #include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
 
-class CBC_Compaction;
 class CBC_BarcodeRow;
 class CBC_BarcodeMatrix;
 
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
index c73f3eb9fa..f5d245b0e3 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
@@ -8,7 +8,6 @@
 #define XFA_SRC_FXBARCODE_PDF417_BC_PDF417ECMODULUSGF_H_
 
 class CBC_PDF417ECModulusPoly;
-class CBC_PDF417Common;
 class CBC_PDF417ECModulusGF {
  public:
   CBC_PDF417ECModulusGF(int32_t modulus, int32_t generator, int32_t& e);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
index a0ac8888b1..ca310d2c44 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
@@ -9,12 +9,10 @@
 
 class CBC_CommonDecoderResult;
 class CBC_CommonBitMatrix;
-class CBC_ErrorCorrection;
 class CBC_Codeword;
 class CBC_BoundingBox;
 class CBC_ResultPoint;
 class CBC_BarcodeMetadata;
-class CBC_BarcodeValue;
 class CBC_DetectionResult;
 class CBC_DetectionResultRowIndicatorColumn;
 
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h
index a32fd3500b..f40d371631 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h
@@ -6,9 +6,7 @@
 
 #ifndef XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERN_H_
 #define XFA_SRC_FXBARCODE_QRCODE_BC_QRALIGNMENTPATTERN_H_
-class CBC_CommonBitArray;
 class CBC_ResultPoint;
-class CBC_REAI013x0x1xDecoder;
 class CBC_QRAlignmentPattern : public CBC_ResultPoint {
  private:
   FX_FLOAT m_moduleSize;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
index 8964b86d62..c93be6db9a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
@@ -12,7 +12,6 @@
 class CBC_CommonBitMatrix;
 class CBC_QRCoderVersion;
 class CBC_QRCoderFormatInformation;
-class CBC_QRDataMask;
 
 class CBC_QRBitMatrixParser {
  private:
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h
index bcb08fa21e..7edb12b937 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h
@@ -12,17 +12,8 @@
 #include "core/include/fxcrt/fx_string.h"
 #include "xfa/src/fxbarcode/BC_Reader.h"
 
-class CBC_QRDetector;
 class CBC_BinaryBitmap;
 class CBC_QRCoderDecoder;
-class CBC_ResultPoint;
-class CBC_ReedSolomonGF256;
-class CBC_QRCoderVersion;
-class CBC_QRDetector;
-class CBC_QRDetectorResult;
-class CBC_QRCoderErrorCorrectionLevel;
-class CBC_QRCoderMode;
-class CBC_QRDataMask;
 class CFX_DIBitmap;
 
 class CBC_QRCodeReader : public CBC_Reader {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
index acae014158..ceb6547640 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
@@ -10,8 +10,6 @@
 #include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
 
 class CBC_TwoDimWriter;
-class CBC_MultiBarCodes;
-class CBC_QRCoderWriter;
 class CBC_QRCodeWriter : public CBC_TwoDimWriter {
  public:
   CBC_QRCodeWriter();
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
index 27e5b65494..70dad949c6 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
@@ -10,7 +10,6 @@
 #include "core/include/fxcrt/fx_basic.h"
 #include "core/include/fxcrt/fx_string.h"
 
-class Make_Pair;
 class CBC_QRCoder;
 class CBC_QRCoderErrorCorrectionLevel;
 class CBC_QRCoderMode;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
index 6146c41465..de53ca49d4 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
@@ -10,8 +10,6 @@
 #include "core/include/fxcrt/fx_basic.h"
 
 class CBC_QRCoderVersion;
-class CBC_QRCoderECBlocks;
-class CBC_QRCoderECB;
 class CBC_QRCoderErrorCorrectionLevel;
 class CBC_QRDataBlock {
  private:
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.h b/xfa/src/fxbarcode/qrcode/BC_QRDetector.h
index b76a656f07..67cbeb44d6 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.h
@@ -14,11 +14,6 @@ class CBC_CommonBitMatrix;
 class CBC_QRDetectorResult;
 class CBC_QRFinderPatternInfo;
 class CBC_QRAlignmentPattern;
-class CBC_QRFinderPatternFinder;
-class CBC_QRCoderVersion;
-class CBC_QRGridSampler;
-class CBC_QRAlignmentPatternFinder;
-class CBC_QRAlignmentPattern;
 
 class CBC_QRDetector {
  private:
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
index 50381d9742..e2397db7ef 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
@@ -10,7 +10,6 @@
 #include "core/include/fxcrt/fx_basic.h"
 
 class CBC_CommonBitMatrix;
-class CBC_ResultPoint;
 
 class CBC_QRDetectorResult {
  private:
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
index 8d6b96a2b2..ce75ac8d05 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
@@ -10,8 +10,6 @@
 #include "core/include/fxcrt/fx_basic.h"
 
 class CBC_CommonBitMatrix;
-class CBC_CommonPerspectiveTransform;
-class CBC_CommonDefaultGridSampler;
 
 class CBC_QRGridSampler {
  private:
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
index 3a41d3ae06..0d482b1c3f 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
+++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.h
@@ -10,7 +10,6 @@
 #include "xfa/src/fxfa/src/app/xfa_fffield.h"
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 
-class CXFA_FFExclGroup;
 class CXFA_FFCheckButton : public CXFA_FFField {
  public:
   CXFA_FFCheckButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.h b/xfa/src/fxfa/src/app/xfa_ffdoc.h
index 8d2063e66e..74c202eb8b 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.h
@@ -13,7 +13,6 @@
 class CXFA_FFApp;
 class CXFA_FFNotify;
 class CXFA_FFDocView;
-class IXFA_Locale;
 
 struct FX_IMAGEDIB_AND_DPI {
   CFX_DIBSource* pDibSource;
diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.h b/xfa/src/fxfa/src/app/xfa_ffdocview.h
index 6aec6a4ecc..6044aa54f5 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdocview.h
+++ b/xfa/src/fxfa/src/app/xfa_ffdocview.h
@@ -9,7 +9,6 @@
 
 #include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
 
-class CXFA_FFPageView;
 class CXFA_FFWidgetHandler;
 class CXFA_FFDoc;
 class CXFA_FFWidget;
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.h b/xfa/src/fxfa/src/app/xfa_fffield.h
index 4c6318e29c..99db117f82 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.h
+++ b/xfa/src/fxfa/src/app/xfa_fffield.h
@@ -16,7 +16,6 @@
 #define XFA_MINUI_HEIGHT 4.32f
 #define XFA_DEFAULTUI_HEIGHT 2.0f
 
-class CXFA_TextLayout;
 
 class CXFA_FFField : public CXFA_FFWidget, public IFWL_WidgetDelegate {
  public:
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
index 9e5d768265..fca02fad97 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
+++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.h
@@ -14,6 +14,8 @@
 #define XFA_FWL_PSBSTYLEEXT_HilitePush (2L << 0)
 #define XFA_FWL_PSBSTYLEEXT_HiliteOutLine (4L << 0)
 
+class CXFA_TextProvider;
+
 class CXFA_FFPushButton : public CXFA_FFField {
  public:
   CXFA_FFPushButton(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc);
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.h b/xfa/src/fxfa/src/app/xfa_fftext.h
index 7fd8d653b4..bb4b5a9f0c 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.h
+++ b/xfa/src/fxfa/src/app/xfa_fftext.h
@@ -9,7 +9,6 @@
 
 #include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
 
-class CXFA_TextLayout;
 
 class CXFA_FFText : public CXFA_FFDraw {
  public:
diff --git a/xfa/src/fxfa/src/common/xfa_document.h b/xfa/src/fxfa/src/common/xfa_document.h
index 60706ade98..62e7e8ce6e 100644
--- a/xfa/src/fxfa/src/common/xfa_document.h
+++ b/xfa/src/fxfa/src/common/xfa_document.h
@@ -20,7 +20,6 @@ class IXFA_DocParser;
 class IXFA_LayoutPage;
 class IXFA_Notify;
 class IXFA_ObjFactory;
-class IXFA_PageContent;
 class IXFA_ScriptContext;
 
 enum XFA_VERSION {
diff --git a/xfa/src/fxfa/src/common/xfa_parser.h b/xfa/src/fxfa/src/common/xfa_parser.h
index a9f9d05931..43fdb639cb 100644
--- a/xfa/src/fxfa/src/common/xfa_parser.h
+++ b/xfa/src/fxfa/src/common/xfa_parser.h
@@ -9,7 +9,6 @@
 
 #include "xfa/src/fxfa/src/common/xfa_document.h"
 
-class IFX_Stream;
 
 class IXFA_Parser {
  public:
diff --git a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
index 78b364053e..28854937c4 100644
--- a/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
+++ b/xfa/src/fxfa/src/parser/xfa_document_layout_imp.h
@@ -9,7 +9,6 @@
 
 class CXFA_ItemLayoutProcessor;
 class CXFA_LayoutPageMgr;
-class CXFA_LayoutAppAdapter;
 class CXFA_ContainerLayoutItem;
 class CXFA_LayoutProcessor : public IXFA_DocLayout {
  public: