3 files changed, 22 insertions, 1 deletions
diff --git a/xfa/fxfa/BUILD.gn b/xfa/fxfa/BUILD.gn
index 4c82ed3633..e87d772006 100644
--- a/xfa/fxfa/BUILD.gn
+++ b/xfa/fxfa/BUILD.gn
@@ -99,12 +99,27 @@ jumbo_source_set("fxfa") {
     "fxfa_basic.h",
   ]
   deps = [
+    "../../core/fpdfapi",
+    "../../core/fpdfapi/font",
+    "../../core/fpdfapi/parser",
+    "../../core/fpdfdoc",
+    "../../core/fxcodec",
     "../../core/fxcrt",
     "../../core/fxcrt:seekablemultistream",
     "../../core/fxcrt/css",
+    "../../core/fxge",
+    "../../fxbarcode",
     "../../fxjs",
     "../fde",
     "../fgas",
+    "../fwl",
+    "../fxgraphics",
+    "parser",
+  ]
+  allow_circular_includes_from = [
+    "../fgas",
+    "../fwl",
+    "parser",
   ]
   configs += [
     "../../:pdfium_core_config",
diff --git a/xfa/fxfa/fm2js/BUILD.gn b/xfa/fxfa/fm2js/BUILD.gn
index d34265f3a3..8da1ec5433 100644
--- a/xfa/fxfa/fm2js/BUILD.gn
+++ b/xfa/fxfa/fm2js/BUILD.gn
@@ -21,6 +21,7 @@ jumbo_source_set("fm2js") {
     "cxfa_fmtojavascriptdepth.h",
   ]
   deps = [
+    "../../../core/fxcrt",
     "//third_party/icu:icuuc",
   ]
   configs += [
diff --git a/xfa/fxfa/parser/BUILD.gn b/xfa/fxfa/parser/BUILD.gn
index 97b834a780..e65428e9e6 100644
--- a/xfa/fxfa/parser/BUILD.gn
+++ b/xfa/fxfa/parser/BUILD.gn
@@ -699,12 +699,17 @@ jumbo_source_set("parser") {
     "xfa_utils.h",
   ]
   deps = [
+    "../../../core/fpdfapi",
+    "../../../core/fxcodec",
     "../../../core/fxcrt",
+    "../../../core/fxge",
+    "../../../fxbarcode",
     "../../../fxjs",
     "../../fde",
     "../../fgas",
-    "../../fxfa",
+    "../../fxgraphics",
   ]
+  allow_circular_includes_from = [ "../../fgas" ]
   configs += [
     "../../../:pdfium_core_config",
     "../../:xfa_warnings",