10 files changed, 44 insertions, 12 deletions
diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h
index 8031269f1e..903d7d47c5 100644
--- a/xfa/src/fgas/include/fgas.h
+++ b/xfa/src/fgas/include/fgas.h
@@ -9,20 +9,20 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FGAS_H_
 #define XFA_SRC_FGAS_INCLUDE_FGAS_H_
 
-#include "xfa/src/fgas/include/fx_sys.h"
-#include "xfa/src/fgas/include/fx_mem.h"
-#include "xfa/src/fgas/include/fx_lgg.h"
-#include "xfa/src/fgas/include/fx_utl.h"
 #include "xfa/src/fgas/include/fx_alg.h"
 #include "xfa/src/fgas/include/fx_cpg.h"
-#include "xfa/src/fgas/include/fx_stm.h"
 #include "xfa/src/fgas/include/fx_datetime.h"
-#include "xfa/src/fgas/include/fx_locale.h"
-#include "xfa/src/fgas/include/fx_sax.h"
 #include "xfa/src/fgas/include/fx_fnt.h"
-#include "xfa/src/fgas/include/fx_ucd.h"
 #include "xfa/src/fgas/include/fx_lbk.h"
-#include "xfa/src/fgas/include/fx_tbk.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_alg.h b/xfa/src/fgas/include/fx_alg.h
index dd593202da..e2682729a3 100644
--- a/xfa/src/fgas/include/fx_alg.h
+++ b/xfa/src/fgas/include/fx_alg.h
@@ -7,10 +7,16 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_ALG_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_ALG_H_
 
+#include <cstdint>
+
+#include "core/include/fxcrt/fx_basic.h"
+
 #define FX_IsOdd(a) ((a)&1)
+
 #ifdef __cplusplus
 extern "C" {
 #endif
+
 int32_t FX_Base64EncodeA(const uint8_t* pSrc, int32_t iSrcLen, FX_CHAR* pDst);
 int32_t FX_Base64DecodeA(const FX_CHAR* pSrc, int32_t iSrcLen, uint8_t* pDst);
 int32_t FX_Base64DecodeW(const FX_WCHAR* pSrc, int32_t iSrcLen, uint8_t* pDst);
@@ -22,6 +28,7 @@ int32_t FX_SeparateStringW(const FX_WCHAR* pStr,
 #ifdef __cplusplus
 };
 #endif
+
 template <class baseType>
 class CFX_DSPATemplate {
  public:
diff --git a/xfa/src/fgas/include/fx_cpg.h b/xfa/src/fgas/include/fx_cpg.h
index 84914766e6..970066156a 100644
--- a/xfa/src/fgas/include/fx_cpg.h
+++ b/xfa/src/fgas/include/fx_cpg.h
@@ -7,7 +7,8 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_CPG_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_CPG_H_
 
-class IFX_CodePage;
+#include "core/include/fxcrt/fx_basic.h"
+
 #define FX_CODEPAGE_DefANSI 0
 #define FX_CODEPAGE_DefOEM 1
 #define FX_CODEPAGE_DefMAC 2
diff --git a/xfa/src/fgas/include/fx_fnt.h b/xfa/src/fgas/include/fx_fnt.h
index 34abab8846..78c9b5ee13 100644
--- a/xfa/src/fgas/include/fx_fnt.h
+++ b/xfa/src/fgas/include/fx_fnt.h
@@ -7,8 +7,17 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_FNT_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_FNT_H_
 
+#include "core/include/fxge/fx_font.h"
+#include "xfa/src/fgas/include/fx_stm.h"
+
+#if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+#include "xfa/src/fgas/include/fx_mem.h"
+#include "xfa/src/fgas/include/fx_utl.h"
+#endif  // _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
+
 class IFX_Font;
 class IFX_FontMgr;
+
 #define FX_FONTSTYLE_Normal 0x00
 #define FX_FONTSTYLE_FixedPitch 0x01
 #define FX_FONTSTYLE_Serif 0x02
diff --git a/xfa/src/fgas/include/fx_locale.h b/xfa/src/fgas/include/fx_locale.h
index 36d19b5e14..5637913a97 100644
--- a/xfa/src/fgas/include/fx_locale.h
+++ b/xfa/src/fgas/include/fx_locale.h
@@ -7,10 +7,13 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_LOCALE_H_
 
+#include "core/include/fxcrt/fx_xml.h"
+
 class CFX_Unitime;
 class IFX_Locale;
 class IFX_FormatString;
 class IFX_LocaleMgr;
+
 enum FX_LOCALENUMSYMBOL {
   FX_LOCALENUMSYMBOL_Decimal,
   FX_LOCALENUMSYMBOL_Grouping,
diff --git a/xfa/src/fgas/include/fx_mem.h b/xfa/src/fgas/include/fx_mem.h
index d59d391d44..e768c454ac 100644
--- a/xfa/src/fgas/include/fx_mem.h
+++ b/xfa/src/fgas/include/fx_mem.h
@@ -47,6 +47,7 @@ class CFX_Target {
   void* operator new(size_t size, void* place) { return place; }
   void operator delete(void* p, void* place) {}
 };
+
 #define FXTARGET_NewWith(__allocator__) new (__allocator__)
 #define FXTARGET_DeleteWith(__class__, __allocator__, pointer) \
   {                                                            \
diff --git a/xfa/src/fgas/include/fx_rbk.h b/xfa/src/fgas/include/fx_rbk.h
index e3e0595f59..a56040de67 100644
--- a/xfa/src/fgas/include/fx_rbk.h
+++ b/xfa/src/fgas/include/fx_rbk.h
@@ -7,12 +7,16 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_RBK_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_RBK_H_
 
+#include "core/include/fxcrt/fx_ucd.h"
+#include "core/include/fxge/fx_ge.h"
+#include "xfa/src/fgas/include/fx_ucd.h"
+
 class IFX_Unknown;
 class IFX_Font;
 class CFX_Char;
-class CFX_RTFChar;
 class CFX_RTFBreakPiece;
 class IFX_RTFBreak;
+
 #define FX_RTFBREAKPOLICY_None 0x00
 #define FX_RTFBREAKPOLICY_SpaceBreak 0x01
 #define FX_RTFBREAKPOLICY_NumberBreak 0x02
diff --git a/xfa/src/fgas/include/fx_stm.h b/xfa/src/fgas/include/fx_stm.h
index cfd863d08c..199a03f677 100644
--- a/xfa/src/fgas/include/fx_stm.h
+++ b/xfa/src/fgas/include/fx_stm.h
@@ -7,7 +7,10 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_STM_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_STM_H_
 
+#include "core/include/fxcrt/fx_stream.h"
+
 class IFX_Stream;
+
 IFX_FileRead* FX_CreateFileRead(IFX_Stream* pBaseStream,
                                 FX_BOOL bReleaseStream = FALSE);
 IFX_FileRead* FX_CreateFileRead(IFX_BufferRead* pBufferRead,
diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h
index 6ebfd4ce04..5063aec142 100644
--- a/xfa/src/fgas/include/fx_tbk.h
+++ b/xfa/src/fgas/include/fx_tbk.h
@@ -8,6 +8,9 @@
 #define XFA_SRC_FGAS_INCLUDE_FX_TBK_H_
 
 #include "core/include/fxcrt/fx_ucd.h"
+#include "core/include/fxge/fx_ge.h"
+#include "xfa/src/fgas/include/fx_ucd.h"
+#include "xfa/src/fgas/include/fx_utl.h"
 
 class IFX_Font;
 class CFX_Char;
@@ -15,6 +18,7 @@ class IFX_TxtAccess;
 class CFX_TxtChar;
 class CFX_TxtPiece;
 class IFX_TxtBreak;
+
 #define FX_TXTBREAKPOLICY_None 0x00
 #define FX_TXTBREAKPOLICY_Pagination 0x01
 #define FX_TXTBREAKPOLICY_SpaceBreak 0x02
diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h
index f6c7c09f13..e95d82005a 100644
--- a/xfa/src/fgas/include/fx_utl.h
+++ b/xfa/src/fgas/include/fx_utl.h
@@ -7,8 +7,8 @@
 #ifndef XFA_SRC_FGAS_INCLUDE_FX_UTL_H_
 #define XFA_SRC_FGAS_INCLUDE_FX_UTL_H_
 
-#include "xfa/src/fgas/include/fx_mem.h"
 #include "core/include/fxcrt/fx_coordinates.h"  // For CFX_Rect.
+#include "xfa/src/fgas/include/fx_mem.h"
 
 class CFX_BaseArray;
 template <class baseType>