diff --git a/BUILD.gn b/BUILD.gn
index c2d415d..b69dda6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -271,7 +271,7 @@
         "core/fxcrt/css:unittests",
         "fxbarcode:unittests",
         "xfa/fde:unittests",
-        "xfa/fgas:unittests",
+        "xfa/fgas/crt:unittests",
         "xfa/fgas/layout:unittests",
         "xfa/fxfa:unittests",
         "xfa/fxfa/fm2js:unittests",
diff --git a/fpdfsdk/fpdfxfa/BUILD.gn b/fpdfsdk/fpdfxfa/BUILD.gn
index 41b9765..92ac9f7 100644
--- a/fpdfsdk/fpdfxfa/BUILD.gn
+++ b/fpdfsdk/fpdfxfa/BUILD.gn
@@ -29,7 +29,7 @@
     "../../fxbarcode",
     "../../fxjs",
     "../../fxjs:gc",
-    "../../xfa/fgas",
+    "../../xfa/fgas/font",
     "../../xfa/fgas/graphics",
     "../../xfa/fwl",
     "../../xfa/fxfa",
diff --git a/fxjs/BUILD.gn b/fxjs/BUILD.gn
index 1c7c3e3..585d7da 100644
--- a/fxjs/BUILD.gn
+++ b/fxjs/BUILD.gn
@@ -208,7 +208,7 @@
       ]
       deps += [
         ":gc",
-        "../xfa/fgas",
+        "../xfa/fgas/crt",
         "../xfa/fxfa/fm2js",
       ]
     }
diff --git a/testing/BUILD.gn b/testing/BUILD.gn
index e060275..4942a4c 100644
--- a/testing/BUILD.gn
+++ b/testing/BUILD.gn
@@ -91,7 +91,7 @@
     ]
     deps += [
       "../fxjs:gc",
-      "../xfa/fgas",
+      "../xfa/fgas/font",
     ]
   }
 }
diff --git a/testing/fuzzers/BUILD.gn b/testing/fuzzers/BUILD.gn
index 421fa52..b6f7c77 100644
--- a/testing/fuzzers/BUILD.gn
+++ b/testing/fuzzers/BUILD.gn
@@ -247,7 +247,7 @@
         "../../:freetype_common",
         "../../core/fxcrt",
         "../../core/fxge",
-        "../../xfa/fgas",
+        "../../xfa/fgas/font",
         "../../xfa/fgas/layout",
         "//third_party/icu:icuuc",
       ]
@@ -259,7 +259,7 @@
         ":fuzzer_utils",
         "../../core/fxcrt",
         "../../fxjs:gc",
-        "../../xfa/fgas",
+        "../../xfa/fgas/crt",
         "../../xfa/fxfa/parser",
       ]
       public_fuzzer = true
diff --git a/xfa/fde/BUILD.gn b/xfa/fde/BUILD.gn
index 6c46b9a..75802cf 100644
--- a/xfa/fde/BUILD.gn
+++ b/xfa/fde/BUILD.gn
@@ -20,7 +20,7 @@
   deps = [
     "../../core/fxcrt",
     "../../core/fxge",
-    "../fgas",
+    "../fgas/font",
     "../fgas/layout",
   ]
   configs += [
@@ -35,7 +35,7 @@
   deps = [
     ":fde",
     "../../core/fxge",
-    "../fgas",
+    "../fgas/font",
   ]
   pdfium_root_dir = "../../"
 }
diff --git a/xfa/fgas/BUILD.gn b/xfa/fgas/BUILD.gn
deleted file mode 100644
index f5aee6f..0000000
--- a/xfa/fgas/BUILD.gn
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2018 The PDFium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import("../../pdfium.gni")
-import("../../testing/test.gni")
-
-assert(pdf_enable_xfa)
-
-source_set("fgas") {
-  sources = [
-    "crt/cfgas_decimal.cpp",
-    "crt/cfgas_decimal.h",
-    "crt/cfgas_stringformatter.cpp",
-    "crt/cfgas_stringformatter.h",
-    "crt/locale_iface.h",
-    "crt/locale_mgr_iface.h",
-    "font/cfgas_defaultfontmanager.cpp",
-    "font/cfgas_defaultfontmanager.h",
-    "font/cfgas_fontmgr.cpp",
-    "font/cfgas_fontmgr.h",
-    "font/cfgas_gefont.cpp",
-    "font/cfgas_gefont.h",
-    "font/cfgas_gemodule.cpp",
-    "font/cfgas_gemodule.h",
-    "font/cfgas_pdffontmgr.cpp",
-    "font/cfgas_pdffontmgr.h",
-    "font/fgas_fontutils.cpp",
-    "font/fgas_fontutils.h",
-  ]
-  deps = [
-    "../../core/fpdfapi/font",
-    "../../core/fpdfapi/page",
-    "../../core/fpdfapi/parser",
-    "../../core/fxcrt",
-    "../../core/fxge",
-  ]
-  configs += [
-    "../../:pdfium_core_config",
-    "../:xfa_warnings",
-  ]
-  visibility = [ "../../*" ]
-}
-
-pdfium_unittest_source_set("unittests") {
-  sources = [
-    "crt/cfgas_decimal_unittest.cpp",
-    "crt/cfgas_stringformatter_unittest.cpp",
-  ]
-  deps = [
-    ":fgas",
-    "../../core/fpdfapi/page",
-    "../../fxjs:gc",
-    "../fxfa/parser",
-  ]
-  pdfium_root_dir = "../../"
-}
diff --git a/xfa/fgas/crt/BUILD.gn b/xfa/fgas/crt/BUILD.gn
new file mode 100644
index 0000000..33f2630
--- /dev/null
+++ b/xfa/fgas/crt/BUILD.gn
@@ -0,0 +1,42 @@
+# Copyright 2018 The PDFium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("../../../pdfium.gni")
+import("../../../testing/test.gni")
+
+assert(pdf_enable_xfa)
+
+source_set("crt") {
+  sources = [
+    "cfgas_decimal.cpp",
+    "cfgas_decimal.h",
+    "cfgas_stringformatter.cpp",
+    "cfgas_stringformatter.h",
+    "locale_iface.h",
+    "locale_mgr_iface.h",
+  ]
+  deps = [
+    "../../../core/fpdfapi/page",
+    "../../../core/fxcrt",
+  ]
+  configs += [
+    "../../../:pdfium_core_config",
+    "../../:xfa_warnings",
+  ]
+  visibility = [ "../../../*" ]
+}
+
+pdfium_unittest_source_set("unittests") {
+  sources = [
+    "cfgas_decimal_unittest.cpp",
+    "cfgas_stringformatter_unittest.cpp",
+  ]
+  deps = [
+    ":crt",
+    "../../../core/fpdfapi/page",
+    "../../../fxjs:gc",
+    "../../fxfa/parser:parser",
+  ]
+  pdfium_root_dir = "../../../"
+}
diff --git a/xfa/fgas/font/BUILD.gn b/xfa/fgas/font/BUILD.gn
new file mode 100644
index 0000000..2df95cd
--- /dev/null
+++ b/xfa/fgas/font/BUILD.gn
@@ -0,0 +1,37 @@
+# Copyright 2018 The PDFium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import("../../../pdfium.gni")
+import("../../../testing/test.gni")
+
+assert(pdf_enable_xfa)
+
+source_set("font") {
+  sources = [
+    "cfgas_defaultfontmanager.cpp",
+    "cfgas_defaultfontmanager.h",
+    "cfgas_fontmgr.cpp",
+    "cfgas_fontmgr.h",
+    "cfgas_gefont.cpp",
+    "cfgas_gefont.h",
+    "cfgas_gemodule.cpp",
+    "cfgas_gemodule.h",
+    "cfgas_pdffontmgr.cpp",
+    "cfgas_pdffontmgr.h",
+    "fgas_fontutils.cpp",
+    "fgas_fontutils.h",
+  ]
+  deps = [
+    "../../../core/fpdfapi/font",
+    "../../../core/fpdfapi/page",
+    "../../../core/fpdfapi/parser",
+    "../../../core/fxcrt",
+    "../../../core/fxge",
+  ]
+  configs += [
+    "../../../:pdfium_core_config",
+    "../../:xfa_warnings",
+  ]
+  visibility = [ "../../../*" ]
+}
diff --git a/xfa/fgas/layout/BUILD.gn b/xfa/fgas/layout/BUILD.gn
index e991854..99cae13 100644
--- a/xfa/fgas/layout/BUILD.gn
+++ b/xfa/fgas/layout/BUILD.gn
@@ -33,10 +33,10 @@
     "fx_linebreak.h",
   ]
   deps = [
-    "../:fgas",
     "../../../core/fxcrt",
     "../../../core/fxcrt/css",
     "../../../core/fxge",
+    "../font",
   ]
   configs += [
     "../../../:pdfium_core_config",
@@ -52,8 +52,8 @@
   ]
   deps = [
     ":layout",
-    "../:fgas",
     "../../../core/fxge",
+    "../font",
   ]
   pdfium_root_dir = "../../../"
 }
diff --git a/xfa/fwl/BUILD.gn b/xfa/fwl/BUILD.gn
index ae42174..ac39851 100644
--- a/xfa/fwl/BUILD.gn
+++ b/xfa/fwl/BUILD.gn
@@ -112,7 +112,7 @@
     "../../fxbarcode",
     "../../fxjs:gc",
     "../fde",
-    "../fgas",
+    "../fgas/font",
     "../fgas/graphics",
   ]
   configs += [
diff --git a/xfa/fxfa/BUILD.gn b/xfa/fxfa/BUILD.gn
index ec4093e..be7839c 100644
--- a/xfa/fxfa/BUILD.gn
+++ b/xfa/fxfa/BUILD.gn
@@ -95,7 +95,7 @@
     "../../fxjs",
     "../../fxjs:gc",
     "../fde",
-    "../fgas",
+    "../fgas/font",
     "../fgas/graphics",
     "../fgas/layout",
     "../fwl",
diff --git a/xfa/fxfa/parser/BUILD.gn b/xfa/fxfa/parser/BUILD.gn
index c7f2bdc..024eb3e 100644
--- a/xfa/fxfa/parser/BUILD.gn
+++ b/xfa/fxfa/parser/BUILD.gn
@@ -685,7 +685,8 @@
     "../../../fxjs",
     "../../../fxjs:gc",
     "../../fde",
-    "../../fgas",
+    "../../fgas/crt",
+    "../../fgas/font",
     "../../fgas/graphics",
   ]
   allow_circular_includes_from = [ "../../../fxjs" ]