6 files changed, 54 insertions, 0 deletions
diff --git a/core/fpdfapi/BUILD.gn b/core/fpdfapi/BUILD.gn
index 347e66eec7..465b1afd0f 100644
--- a/core/fpdfapi/BUILD.gn
+++ b/core/fpdfapi/BUILD.gn
@@ -14,7 +14,10 @@ jumbo_source_set("fpdfapi") {
   ]
   configs += [ "../../:pdfium_core_config" ]
   deps = [
+    "../fpdfdoc",
+    "../fxcodec",
     "../fxcrt",
+    "../fxge",
     "cmaps",
     "edit",
     "font",
@@ -22,5 +25,12 @@ jumbo_source_set("fpdfapi") {
     "parser",
     "render",
   ]
+  allow_circular_includes_from = [
+    "parser",
+    "cmaps",
+    "font",
+    "page",
+    "render",
+  ]
   visibility = [ "../../*" ]
 }
diff --git a/core/fpdfapi/edit/BUILD.gn b/core/fpdfapi/edit/BUILD.gn
index 1bcce79142..de1a404c87 100644
--- a/core/fpdfapi/edit/BUILD.gn
+++ b/core/fpdfapi/edit/BUILD.gn
@@ -22,7 +22,12 @@ jumbo_source_set("edit") {
   ]
   configs += [ "../../../:pdfium_core_config" ]
   deps = [
+    "../../../third_party:skia_shared",
     "../../fxcrt",
+    "../font",
+    "../page",
+    "../parser",
   ]
+  allow_circular_includes_from = [ "../parser" ]
   visibility = [ "../../../*" ]
 }
diff --git a/core/fpdfapi/font/BUILD.gn b/core/fpdfapi/font/BUILD.gn
index e00bea75a5..a8f8619124 100644
--- a/core/fpdfapi/font/BUILD.gn
+++ b/core/fpdfapi/font/BUILD.gn
@@ -43,6 +43,14 @@ jumbo_source_set("font") {
   configs += [ "../../../:pdfium_core_config" ]
   deps = [
     "../../fxcrt",
+    "../../fxge",
+    "../cmaps",
+    "../parser",
+  ]
+  allow_circular_includes_from = [
+    "../../fxge",
+    "../cmaps",
+    "../parser",
   ]
   visibility = [ "../../../*" ]
 }
diff --git a/core/fpdfapi/page/BUILD.gn b/core/fpdfapi/page/BUILD.gn
index 573ee60fbf..5df39f2068 100644
--- a/core/fpdfapi/page/BUILD.gn
+++ b/core/fpdfapi/page/BUILD.gn
@@ -92,7 +92,22 @@ jumbo_source_set("page") {
   ]
   configs += [ "../../../:pdfium_core_config" ]
   deps = [
+    "../../fdrm",
+    "../../fxcodec",
     "../../fxcrt",
+    "../../fxge",
+    "../cmaps",
+    "../font",
+    "../parser",
   ]
+  allow_circular_includes_from = [
+    "../cmaps",
+    "../font",
+    "../parser",
+    "../../fxcodec",
+  ]
+  if (pdf_use_skia || pdf_use_skia_paths) {
+    allow_circular_includes_from += [ "../../fxge" ]
+  }
   visibility = [ "../../../*" ]
 }
diff --git a/core/fpdfapi/parser/BUILD.gn b/core/fpdfapi/parser/BUILD.gn
index 0a8958fa1b..64306dff1d 100644
--- a/core/fpdfapi/parser/BUILD.gn
+++ b/core/fpdfapi/parser/BUILD.gn
@@ -72,7 +72,14 @@ jumbo_source_set("parser") {
   ]
   configs += [ "../../../:pdfium_core_config" ]
   deps = [
+    "../../fdrm",
+    "../../fxcodec",
     "../../fxcrt",
+    "../../fxge",
+  ]
+  allow_circular_includes_from = [
+    "../../fxge",
+    "../../fxcodec",
   ]
   visibility = [ "../../../*" ]
 }
diff --git a/core/fpdfapi/render/BUILD.gn b/core/fpdfapi/render/BUILD.gn
index 02b3b4f5a6..042f04d179 100644
--- a/core/fpdfapi/render/BUILD.gn
+++ b/core/fpdfapi/render/BUILD.gn
@@ -48,7 +48,16 @@ jumbo_source_set("render") {
   ]
   configs += [ "../../../:pdfium_core_config" ]
   deps = [
+    "../../fxcodec",
     "../../fxcrt",
+    "../../fxge",
+    "../font",
+    "../page",
+    "../parser",
+  ]
+  allow_circular_includes_from = [
+    "../parser",
+    "../page",
   ]
   visibility = [ "../../../*" ]
 }