9 files changed, 2 insertions, 8 deletions
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: