4 files changed, 41 insertions, 2 deletions
diff --git a/fpdfsdk/BUILD.gn b/fpdfsdk/BUILD.gn
index f4df1d54cd..cf1fdbf85b 100644
--- a/fpdfsdk/BUILD.gn
+++ b/fpdfsdk/BUILD.gn
@@ -51,7 +51,20 @@ jumbo_source_set("fpdfsdk") {
 
   configs += [ "../:pdfium_core_config" ]
   deps = [
+    "../core/fpdfapi",
+    "../core/fpdfapi/page",
+    "../core/fpdfapi/parser",
+    "../core/fpdfapi/render",
+    "../core/fpdfdoc",
     "../core/fxcrt",
+    "../core/fxge",
+    "../fxjs",
+    "formfiller",
+    "pwl",
+  ]
+  allow_circular_includes_from = [
+    "formfiller",
+    "pwl",
   ]
   visibility = [ "../*" ]
 
@@ -63,6 +76,13 @@ jumbo_source_set("fpdfsdk") {
       "cpdfsdk_xfawidgethandler.h",
     ]
 
-    deps += [ "fpdfxfa" ]
+    deps += [
+      "../xfa/fwl",
+      "../xfa/fxfa",
+      "../xfa/fxfa/parser",
+      "../xfa/fxgraphics",
+      "fpdfxfa",
+    ]
+    allow_circular_includes_from += [ "fpdfxfa" ]
   }
 }
diff --git a/fpdfsdk/formfiller/BUILD.gn b/fpdfsdk/formfiller/BUILD.gn
index a9994ee1c1..434e58085e 100644
--- a/fpdfsdk/formfiller/BUILD.gn
+++ b/fpdfsdk/formfiller/BUILD.gn
@@ -32,7 +32,14 @@ jumbo_source_set("formfiller") {
   ]
   configs += [ "../../:pdfium_core_config" ]
   deps = [
+    "../../core/fpdfapi/font",
+    "../../core/fpdfapi/page",
+    "../../core/fpdfapi/parser",
+    "../../core/fpdfdoc",
     "../../core/fxcrt",
+    "../../core/fxge",
+    "../pwl",
   ]
+  allow_circular_includes_from = [ "../pwl" ]
   visibility = [ "../../*" ]
 }
diff --git a/fpdfsdk/fpdfxfa/BUILD.gn b/fpdfsdk/fpdfxfa/BUILD.gn
index bca6f67884..baa615db46 100644
--- a/fpdfsdk/fpdfxfa/BUILD.gn
+++ b/fpdfsdk/fpdfxfa/BUILD.gn
@@ -19,9 +19,14 @@ jumbo_source_set("fpdfxfa") {
     "cxfa_fwladaptertimermgr.h",
   ]
   deps = [
+    "../../core/fpdfapi/page",
+    "../../core/fpdfapi/parser",
     "../../core/fxcrt",
     "../../fxjs",
-    "../../xfa",
+    "../../xfa/fgas",
+    "../../xfa/fwl",
+    "../../xfa/fxfa",
+    "../../xfa/fxfa/parser",
   ]
   configs += [ "../../:pdfium_core_config" ]
   visibility = [ "../../*" ]
diff --git a/fpdfsdk/pwl/BUILD.gn b/fpdfsdk/pwl/BUILD.gn
index 7c33196788..c5e02685e8 100644
--- a/fpdfsdk/pwl/BUILD.gn
+++ b/fpdfsdk/pwl/BUILD.gn
@@ -42,7 +42,14 @@ jumbo_source_set("pwl") {
   ]
   configs += [ "../../:pdfium_core_config" ]
   deps = [
+    "../../core/fpdfapi",
+    "../../core/fpdfapi/font",
+    "../../core/fpdfapi/page",
+    "../../core/fpdfapi/parser",
+    "../../core/fpdfapi/render",
+    "../../core/fpdfdoc",
     "../../core/fxcrt",
+    "../../core/fxge",
   ]
   visibility = [ "../../*" ]
 }