Remove xfa_common.h and IWYU.

R=thestig@chromium.org

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

35 files changed, 39 insertions, 55 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 6ab6cade41..8cd8292a17 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1327,7 +1327,6 @@ if (pdf_enable_xfa) {
       "xfa/src/fxfa/src/app/xfa_textlayout.cpp",
       "xfa/src/fxfa/src/app/xfa_textlayout.h",
       "xfa/src/fxfa/src/common/fxfa_localevalue.h",
-      "xfa/src/fxfa/src/common/xfa_common.h",
       "xfa/src/fxfa/src/common/xfa_docdata.h",
       "xfa/src/fxfa/src/common/xfa_doclayout.h",
       "xfa/src/fxfa/src/common/xfa_document.h",
diff --git a/testing/libfuzzer/pdf_xml_fuzzer.cc b/testing/libfuzzer/pdf_xml_fuzzer.cc
index 3eb1c8b5e5..3e8e18a4dc 100644
--- a/testing/libfuzzer/pdf_xml_fuzzer.cc
+++ b/testing/libfuzzer/pdf_xml_fuzzer.cc
@@ -10,7 +10,7 @@
 #include "core/include/fxcrt/fx_basic.h"
 #include "core/include/fxcrt/fx_system.h"
 #include "xfa/src/foxitlib.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
 #include "xfa/src/fxfa/src/parser/xfa_parser_imp.h"
 
 namespace {
diff --git a/xfa.gyp b/xfa.gyp
index 6f7c918fae..992ddee80e 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -576,7 +576,6 @@
         "xfa/src/fxfa/src/app/xfa_textlayout.cpp",
         "xfa/src/fxfa/src/app/xfa_textlayout.h",
         "xfa/src/fxfa/src/common/fxfa_localevalue.h",
-        "xfa/src/fxfa/src/common/xfa_common.h",
         "xfa/src/fxfa/src/common/xfa_docdata.h",
         "xfa/src/fxfa/src/common/xfa_doclayout.h",
         "xfa/src/fxfa/src/common/xfa_document.h",
diff --git a/xfa/src/fxfa/src/app/xfa_checksum.cpp b/xfa/src/fxfa/src/app/xfa_checksum.cpp
index 4a4168f40b..48ab1ca21c 100644
--- a/xfa/src/fxfa/src/app/xfa_checksum.cpp
+++ b/xfa/src/fxfa/src/app/xfa_checksum.cpp
@@ -6,7 +6,7 @@
 
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fxfa/src/app/xfa_checksum.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_SAXReaderHandler::CXFA_SAXReaderHandler(CXFA_ChecksumContext* pContext)
     : m_pContext(pContext) {
   FXSYS_assert(m_pContext);
diff --git a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp
index 7bbcb02abb..2a31533771 100644
--- a/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffConfigAcc.cpp
@@ -6,7 +6,8 @@
 
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fxfa/src/app/xfa_ffConfigAcc.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+#include "xfa/src/fxfa/src/common/xfa_object.h"
+
 CXFA_FFConfigAcc::CXFA_FFConfigAcc(CXFA_Node* pNode)
     : m_pNode(pNode), m_pPsMapNode(NULL) {}
 CXFA_FFConfigAcc::~CXFA_FFConfigAcc() {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffapp.cpp b/xfa/src/fxfa/src/app/xfa_ffapp.cpp
index be3a38be52..cb8c0b9f1c 100644
--- a/xfa/src/fxfa/src/app/xfa_ffapp.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffapp.cpp
@@ -14,7 +14,6 @@
 #include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
 #include "xfa/src/fxfa/src/app/xfa_fwltheme.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
 
 CXFA_FileRead::CXFA_FileRead(const CFX_ArrayTemplate<CPDF_Stream*>& streams) {
   int32_t iCount = streams.GetSize();
diff --git a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
index 72a9e6dfa5..908b0664b0 100644
--- a/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffbarcode.cpp
@@ -11,7 +11,7 @@
 #include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 static XFA_LPCBARCODETYPEENUMINFO XFA_GetBarcodeTypeByName(
     const CFX_WideStringC& wsName);
 CXFA_FFBarcode::CXFA_FFBarcode(CXFA_FFPageView* pPageView,
diff --git a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
index b3d18efa33..0091aaac90 100644
--- a/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffcheckbutton.cpp
@@ -13,7 +13,7 @@
 #include "xfa/src/fxfa/src/app/xfa_fffield.h"
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFCheckButton::CXFA_FFCheckButton(CXFA_FFPageView* pPageView,
                                        CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {
diff --git a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
index 9954adde9e..79d30198bf 100644
--- a/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffchoicelist.cpp
@@ -12,7 +12,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFListBox::CXFA_FFListBox(CXFA_FFPageView* pPageView,
                                CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
index 3e3549d8f9..e8eb1482e1 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdoc.cpp
@@ -11,7 +11,9 @@
 #include "xfa/src/fxfa/src/app/xfa_ffnotify.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+#include "xfa/src/fxfa/src/common/xfa_docdata.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+
 CXFA_FFDoc::CXFA_FFDoc(CXFA_FFApp* pApp, IXFA_DocProvider* pDocProvider)
     : m_pDocProvider(pDocProvider),
       m_pDocument(nullptr),
diff --git a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp
index 35fc20bc02..20eb44677b 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdochandler.cpp
@@ -7,7 +7,8 @@
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
 #include "xfa/src/fxfa/src/app/xfa_ffdochandler.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+#include "xfa/src/fxfa/src/common/xfa_script.h"
+
 CXFA_FFDocHandler::CXFA_FFDocHandler() {}
 CXFA_FFDocHandler::~CXFA_FFDocHandler() {}
 void CXFA_FFDocHandler::ReleaseDoc(IXFA_Doc* hDoc) {
diff --git a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
index 1687da43dc..59d38007a9 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdocview.cpp
@@ -28,7 +28,8 @@
 #include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+#include "xfa/src/fxfa/src/common/xfa_script.h"
+
 extern const XFA_ATTRIBUTEENUM gs_EventActivity[] = {
     XFA_ATTRIBUTEENUM_Click,      XFA_ATTRIBUTEENUM_Change,
     XFA_ATTRIBUTEENUM_DocClose,   XFA_ATTRIBUTEENUM_DocReady,
diff --git a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp
index 1989ff9761..8a5379258d 100644
--- a/xfa/src/fxfa/src/app/xfa_ffdraw.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffdraw.cpp
@@ -10,7 +10,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffdraw.h"
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFDraw::CXFA_FFDraw(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFWidget(pPageView, pDataAcc) {}
 CXFA_FFDraw::~CXFA_FFDraw() {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp
index 8176ddd38e..171cf573bb 100644
--- a/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffexclgroup.cpp
@@ -10,7 +10,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffexclgroup.h"
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFExclGroup::CXFA_FFExclGroup(CXFA_FFPageView* pPageView,
                                    CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFWidget(pPageView, pDataAcc) {}
diff --git a/xfa/src/fxfa/src/app/xfa_fffield.cpp b/xfa/src/fxfa/src/app/xfa_fffield.cpp
index 47140a0c6d..83e99a08e3 100644
--- a/xfa/src/fxfa/src/app/xfa_fffield.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fffield.cpp
@@ -13,7 +13,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_fwltheme.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFField::CXFA_FFField(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFWidget(pPageView, pDataAcc), m_pNormalWidget(NULL) {
   m_rtUI.Set(0, 0, 0, 0);
diff --git a/xfa/src/fxfa/src/app/xfa_ffimage.cpp b/xfa/src/fxfa/src/app/xfa_ffimage.cpp
index 947bad6881..9fd17a7622 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimage.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffimage.cpp
@@ -11,7 +11,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffimage.h"
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFImage::CXFA_FFImage(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFDraw(pPageView, pDataAcc) {}
 CXFA_FFImage::~CXFA_FFImage() {
diff --git a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
index 59a84820c2..1b3967ace0 100644
--- a/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffimageedit.cpp
@@ -11,7 +11,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffimageedit.h"
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFImageEdit::CXFA_FFImageEdit(CXFA_FFPageView* pPageView,
                                    CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
index fa85760651..5a887095cb 100644
--- a/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffnotify.cpp
@@ -29,7 +29,6 @@
 #include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
 
 static void XFA_FFDeleteWidgetAcc(void* pData) {
   delete static_cast<CXFA_WidgetAcc*>(pData);
diff --git a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
index 2601ffa004..ee25b180dd 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffpageview.cpp
@@ -16,7 +16,7 @@
 #include "xfa/src/fxfa/src/app/xfa_fftextedit.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFPageView::CXFA_FFPageView(CXFA_FFDocView* pDocView, CXFA_Node* pPageArea)
     : CXFA_ContainerLayoutItem(pPageArea),
       m_pDocView(pDocView),
diff --git a/xfa/src/fxfa/src/app/xfa_ffpath.cpp b/xfa/src/fxfa/src/app/xfa_ffpath.cpp
index c1fb273431..7c3239fb50 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpath.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffpath.cpp
@@ -11,7 +11,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffpath.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFLine::CXFA_FFLine(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFDraw(pPageView, pDataAcc) {}
 CXFA_FFLine::~CXFA_FFLine() {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
index bd5656f5f3..027f897f7a 100644
--- a/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffpushbutton.cpp
@@ -12,7 +12,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidgetacc.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFPushButton::CXFA_FFPushButton(CXFA_FFPageView* pPageView,
                                      CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFField(pPageView, pDataAcc),
diff --git a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp
index 905906296b..907e3024c2 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsignature.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffsignature.cpp
@@ -10,7 +10,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffsignature.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFSignature::CXFA_FFSignature(CXFA_FFPageView* pPageView,
                                    CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFField(pPageView, pDataAcc) {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp
index 9e826f241b..6da604d6cf 100644
--- a/xfa/src/fxfa/src/app/xfa_ffsubform.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffsubform.cpp
@@ -10,7 +10,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffsubform.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFSubForm::CXFA_FFSubForm(CXFA_FFPageView* pPageView,
                                CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFWidget(pPageView, pDataAcc) {}
diff --git a/xfa/src/fxfa/src/app/xfa_fftext.cpp b/xfa/src/fxfa/src/app/xfa_fftext.cpp
index a187e2acda..4b78cf9d37 100644
--- a/xfa/src/fxfa/src/app/xfa_fftext.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftext.cpp
@@ -12,7 +12,7 @@
 #include "xfa/src/fxfa/src/app/xfa_fftext.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFText::CXFA_FFText(CXFA_FFPageView* pPageView, CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFDraw(pPageView, pDataAcc) {}
 CXFA_FFText::~CXFA_FFText() {}
diff --git a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
index f315b46911..350d4b0d90 100644
--- a/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fftextedit.cpp
@@ -14,7 +14,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFTextEdit::CXFA_FFTextEdit(CXFA_FFPageView* pPageView,
                                  CXFA_WidgetAcc* pDataAcc)
     : CXFA_FFField(pPageView, pDataAcc), m_pOldDelegate(NULL) {}
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
index a26bc0ba46..f402c715ce 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidget.cpp
@@ -13,7 +13,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffpageview.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFWidget::CXFA_FFWidget(CXFA_FFPageView* pPageView,
                              CXFA_WidgetAcc* pDataAcc)
     : CXFA_ContentLayoutItem(pDataAcc->GetNode()),
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
index 887535a2a8..c2873dc52d 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgetacc.cpp
@@ -19,7 +19,8 @@
 #include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+#include "xfa/src/fxfa/src/common/xfa_script.h"
+
 static void XFA_FFDeleteCalcData(void* pData) {
   if (pData) {
     delete ((CXFA_CalcData*)pData);
diff --git a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp
index 21d3476392..5593541bd0 100644
--- a/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp
+++ b/xfa/src/fxfa/src/app/xfa_ffwidgethandler.cpp
@@ -12,7 +12,8 @@
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidgethandler.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+#include "xfa/src/fxfa/src/common/xfa_parser.h"
+
 CXFA_FFWidgetHandler::CXFA_FFWidgetHandler(CXFA_FFDocView* pDocView)
     : m_pDocView(pDocView) {}
 CXFA_FFWidgetHandler::~CXFA_FFWidgetHandler() {}
diff --git a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
index f42eca6d94..e4585ce67c 100644
--- a/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fontmgr.cpp
@@ -11,7 +11,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffapp.h"
 #include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
 #include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
 static const XFA_FONTINFO g_XFAFontsMap[] = {
     {0x01d5d33e, L"SimSun", L"Arial", 0, 936},
diff --git a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
index f176434554..c97b4fe871 100644
--- a/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fwladapter.cpp
@@ -9,7 +9,6 @@
 #include "xfa/src/fxfa/src/app/xfa_fffield.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_fwladapter.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
 
 void FWL_PostMessageToMainRoop(CFWL_Message* pMessage) {}
 FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget,
diff --git a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
index fa9b92e808..29225c7800 100644
--- a/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
+++ b/xfa/src/fxfa/src/app/xfa_fwltheme.cpp
@@ -8,7 +8,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffapp.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_fwltheme.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_FFWidget* XFA_ThemeGetOuterWidget(IFWL_Widget* pWidget) {
   IFWL_Widget* pOuter = pWidget;
   while (pOuter->GetOuter()) {
diff --git a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp
index 88713f9b4b..27fb91a1e4 100644
--- a/xfa/src/fxfa/src/app/xfa_rendercontext.cpp
+++ b/xfa/src/fxfa/src/app/xfa_rendercontext.cpp
@@ -7,8 +7,9 @@
 #include "xfa/src/foxitlib.h"
 #include "xfa/src/fxfa/src/app/xfa_ffwidget.h"
 #include "xfa/src/fxfa/src/app/xfa_rendercontext.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 #define XFA_RENDERCONTEXT_MaxCount 30
+
 IXFA_RenderContext* XFA_RenderContext_Create() {
   return new CXFA_RenderContext;
 }
diff --git a/xfa/src/fxfa/src/app/xfa_textlayout.cpp b/xfa/src/fxfa/src/app/xfa_textlayout.cpp
index 8c53248a65..3c2e3ca492 100644
--- a/xfa/src/fxfa/src/app/xfa_textlayout.cpp
+++ b/xfa/src/fxfa/src/app/xfa_textlayout.cpp
@@ -11,7 +11,7 @@
 #include "xfa/src/fxfa/src/app/xfa_ffdoc.h"
 #include "xfa/src/fxfa/src/app/xfa_fontmgr.h"
 #include "xfa/src/fxfa/src/app/xfa_textlayout.h"
-#include "xfa/src/fxfa/src/common/xfa_common.h"
+
 CXFA_CSSTagProvider::~CXFA_CSSTagProvider() {
   FX_POSITION pos = m_Attributes.GetStartPosition();
   while (pos) {
diff --git a/xfa/src/fxfa/src/common/xfa_common.h b/xfa/src/fxfa/src/common/xfa_common.h
deleted file mode 100644
index 17948d193b..0000000000
--- a/xfa/src/fxfa/src/common/xfa_common.h
+++ /dev/null
@@ -1,22 +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
-
-// TODO(thestig): Remove this file and do IWYU.
-
-#ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_
-#define XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_
-
-#include "xfa/src/fxfa/src/common/xfa_docdata.h"
-#include "xfa/src/fxfa/src/common/xfa_doclayout.h"
-#include "xfa/src/fxfa/src/common/xfa_document.h"
-#include "xfa/src/fxfa/src/common/xfa_fm2jsapi.h"
-#include "xfa/src/fxfa/src/common/xfa_localemgr.h"
-#include "xfa/src/fxfa/src/common/xfa_object.h"
-#include "xfa/src/fxfa/src/common/xfa_parser.h"
-#include "xfa/src/fxfa/src/common/xfa_script.h"
-#include "xfa/src/fxfa/src/common/xfa_utils.h"
-
-#endif  // XFA_SRC_FXFA_SRC_COMMON_XFA_COMMON_H_
diff --git a/xfa/src/fxfa/src/common/xfa_parser.h b/xfa/src/fxfa/src/common/xfa_parser.h
index 3fbd62e44e..a9f9d05931 100644
--- a/xfa/src/fxfa/src/common/xfa_parser.h
+++ b/xfa/src/fxfa/src/common/xfa_parser.h
@@ -7,7 +7,10 @@
 #ifndef XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H_
 #define XFA_SRC_FXFA_SRC_COMMON_XFA_PARSER_H_
 
+#include "xfa/src/fxfa/src/common/xfa_document.h"
+
 class IFX_Stream;
+
 class IXFA_Parser {
  public:
   static IXFA_Parser* Create(IXFA_ObjFactory* pFactory,