4 files changed, 8 insertions, 33 deletions
diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h
deleted file mode 100644
index 903d7d47c5..0000000000
--- a/xfa/src/fgas/include/fgas.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
-
-// TODO(thestig): Remove this file and do IWYU.
-
-#ifndef XFA_SRC_FGAS_INCLUDE_FGAS_H_
-#define XFA_SRC_FGAS_INCLUDE_FGAS_H_
-
-#include "xfa/src/fgas/include/fx_alg.h"
-#include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fgas/include/fx_datetime.h"
-#include "xfa/src/fgas/include/fx_fnt.h"
-#include "xfa/src/fgas/include/fx_lbk.h"
-#include "xfa/src/fgas/include/fx_lgg.h"
-#include "xfa/src/fgas/include/fx_locale.h"
-#include "xfa/src/fgas/include/fx_mem.h"
-#include "xfa/src/fgas/include/fx_rbk.h"
-#include "xfa/src/fgas/include/fx_sax.h"
-#include "xfa/src/fgas/include/fx_stm.h"
-#include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/fgas/include/fx_tbk.h"
-#include "xfa/src/fgas/include/fx_ucd.h"
-#include "xfa/src/fgas/include/fx_utl.h"
-
-#endif  // XFA_SRC_FGAS_INCLUDE_FGAS_H_
diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h
index 5637913a97..cf35491f9b 100644
--- a/xfa/src/fgas/include/fx_locale.h
+++ b/xfa/src/fgas/include/fx_locale.h
@@ -8,11 +8,9 @@
 #define XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
 
 #include "core/include/fxcrt/fx_xml.h"
+#include "xfa/src/fgas/include/fx_datetime.h"
 
 class CFX_Unitime;
-class IFX_Locale;
-class IFX_FormatString;
-class IFX_LocaleMgr;
 
 enum FX_LOCALENUMSYMBOL {
   FX_LOCALENUMSYMBOL_Decimal,
diff --git a/xfa/src/fgas/include/fx_sax.h b/xfa/src/fgas/include/fx_sax.h
index 02468d31d2..e4b72f6328 100644
--- a/xfa/src/fgas/include/fx_sax.h
+++ b/xfa/src/fgas/include/fx_sax.h
@@ -7,8 +7,8 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_SAX_H_
 
-class IFX_SAXReaderHandler;
-class IFX_SAXReader;
+#include "core/include/fxcrt/fx_basic.h"
+
 #define FX_SAXPARSEMODE_NotConvert_amp 0x0001
 #define FX_SAXPARSEMODE_NotConvert_lt 0x0002
 #define FX_SAXPARSEMODE_NotConvert_gt 0x0004
@@ -16,6 +16,7 @@ class IFX_SAXReader;
 #define FX_SAXPARSEMODE_NotConvert_quot 0x0010
 #define FX_SAXPARSEMODE_NotConvert_sharp 0x0020
 #define FX_SAXPARSEMODE_NotSkipSpace 0x0100
+
 enum FX_SAXNODE {
   FX_SAXNODE_Unknown = 0,
   FX_SAXNODE_Instruction,
@@ -25,6 +26,7 @@ enum FX_SAXNODE {
   FX_SAXNODE_Text,
   FX_SAXNODE_CharData,
 };
+
 class IFX_SAXReaderHandler {
  public:
   virtual ~IFX_SAXReaderHandler() {}
@@ -48,6 +50,7 @@ class IFX_SAXReaderHandler {
                             const CFX_ByteStringC& bsData,
                             FX_DWORD dwStartPos) = 0;
 };
+
 class IFX_SAXReader {
  public:
   virtual ~IFX_SAXReader() {}
diff --git a/xfa/src/fgas/include/fx_sys.h b/xfa/src/fgas/include/fx_sys.h
index 5b5382ec14..d4fec2a74d 100644
--- a/xfa/src/fgas/include/fx_sys.h
+++ b/xfa/src/fgas/include/fx_sys.h
@@ -7,6 +7,8 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_SYS_H_
 
+#include "core/include/fxcrt/fx_system.h"
+
 #define FX_RAD2DEG(r) ((r)*180.0f / FX_PI)
 #define FX_DEG2RAD(a) ((a)*FX_PI / 180.0f)