5 files changed, 13 insertions, 3 deletions
diff --git a/xfa/src/fgas/include/fgas.h b/xfa/src/fgas/include/fgas.h
index 8f085e4791..dc155a0818 100644
--- a/xfa/src/fgas/include/fgas.h
+++ b/xfa/src/fgas/include/fgas.h
@@ -4,6 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+// TODO(thestig): Remove this file and do IWYU.
+
 #ifndef _FGAS_
 #define _FGAS_
 #include "fx_sys.h"
diff --git a/xfa/src/fgas/include/fx_lbk.h b/xfa/src/fgas/include/fx_lbk.h
index 0ddf57ecdc..a7421eb66b 100644
--- a/xfa/src/fgas/include/fx_lbk.h
+++ b/xfa/src/fgas/include/fx_lbk.h
@@ -6,6 +6,10 @@
 
 #ifndef _FX_LINEBREAK
 #define _FX_LINEBREAK
+
+#include "core/include/fxcrt/fx_system.h"
+#include "xfa/src/fgas/include/fx_utl.h"
+
 enum FX_LINEBREAKTYPE {
   FX_LBT_UNKNOWN = 0x00,
   FX_LBT_DIRECT_BRK = 0x1A,
@@ -15,6 +19,7 @@ enum FX_LINEBREAKTYPE {
   FX_LBT_PROHIBITED_BRK = 0x5E,
   FX_LBT_HANGUL_SPACE_BRK = 0x6F,
 };
+
 #define FX_LBUN FX_LBT_UNKNOWN
 #define FX_LBDB FX_LBT_DIRECT_BRK
 #define FX_LBIB FX_LBT_INDIRECT_BRK
@@ -22,6 +27,9 @@ enum FX_LINEBREAKTYPE {
 #define FX_LBCP FX_LBT_COM_PROHIBITED_BRK
 #define FX_LBPB FX_LBT_PROHIBITED_BRK
 #define FX_LBHS FX_LBT_HANGUL_SPACE_BRK
+
+extern const FX_LINEBREAKTYPE gs_FX_LineBreak_PairTable[64][32];
+
 void FX_GetLineBreakPositions(const FX_WCHAR* pwsText,
                               FX_LINEBREAKTYPE* pBrkType,
                               int32_t iLength);
diff --git a/xfa/src/fgas/include/fx_mem.h b/xfa/src/fgas/include/fx_mem.h
index 313fc935cc..5e65ea7c88 100644
--- a/xfa/src/fgas/include/fx_mem.h
+++ b/xfa/src/fgas/include/fx_mem.h
@@ -7,7 +7,7 @@
 #ifndef _FX_MEMORY
 #define _FX_MEMORY
 
-#include "../../../../core/include/fxcrt/fx_memory.h"  // For FX_Alloc().
+#include "core/include/fxcrt/fx_memory.h"  // For FX_Alloc().
 
 class IFX_MEMAllocator;
 class CFX_Target;
diff --git a/xfa/src/fgas/include/fx_tbk.h b/xfa/src/fgas/include/fx_tbk.h
index 7cc1db2252..349fc166a0 100644
--- a/xfa/src/fgas/include/fx_tbk.h
+++ b/xfa/src/fgas/include/fx_tbk.h
@@ -7,7 +7,7 @@
 #ifndef _FX_TEXTBREAK
 #define _FX_TEXTBREAK
 
-#include "../../../../core/include/fxcrt/fx_ucd.h"
+#include "core/include/fxcrt/fx_ucd.h"
 
 class IFX_Font;
 class CFX_Char;
diff --git a/xfa/src/fgas/include/fx_utl.h b/xfa/src/fgas/include/fx_utl.h
index 3c4024f772..c58d5a1be6 100644
--- a/xfa/src/fgas/include/fx_utl.h
+++ b/xfa/src/fgas/include/fx_utl.h
@@ -8,7 +8,7 @@
 #define _FX_UTILS
 
 #include "fx_mem.h"
-#include "../../../../core/include/fxcrt/fx_coordinates.h"  // For CFX_Rect.
+#include "core/include/fxcrt/fx_coordinates.h"  // For CFX_Rect.
 
 class CFX_ThreadLock;
 class CFX_BaseArray;