124 files changed, 395 insertions, 398 deletions
diff --git a/BUILD.gn b/BUILD.gn
index d440c2648c..16ef8e5ecb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -420,67 +420,6 @@ static_library("fpdfapi") {
     "core/fpdfapi/font/fpdf_font_cid.cpp",
     "core/fpdfapi/font/ttgsubtable.cpp",
     "core/fpdfapi/font/ttgsubtable.h",
-    "core/fpdfapi/fpdf_page/cpdf_allstates.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_allstates.h",
-    "core/fpdfapi/fpdf_page/cpdf_clippath.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_clippath.h",
-    "core/fpdfapi/fpdf_page/cpdf_color.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_color.h",
-    "core/fpdfapi/fpdf_page/cpdf_colorspace.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_colorspace.h",
-    "core/fpdfapi/fpdf_page/cpdf_colorstate.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_colorstate.h",
-    "core/fpdfapi/fpdf_page/cpdf_contentmark.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_contentmark.h",
-    "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h",
-    "core/fpdfapi/fpdf_page/cpdf_countedobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_form.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_form.h",
-    "core/fpdfapi/fpdf_page/cpdf_formobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_formobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_generalstate.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_generalstate.h",
-    "core/fpdfapi/fpdf_page/cpdf_graphicstates.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_graphicstates.h",
-    "core/fpdfapi/fpdf_page/cpdf_image.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_image.h",
-    "core/fpdfapi/fpdf_page/cpdf_imageobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_imageobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_meshstream.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_meshstream.h",
-    "core/fpdfapi/fpdf_page/cpdf_page.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_page.h",
-    "core/fpdfapi/fpdf_page/cpdf_pagemodule.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pagemodule.h",
-    "core/fpdfapi/fpdf_page/cpdf_pageobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pageobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h",
-    "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h",
-    "core/fpdfapi/fpdf_page/cpdf_path.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_path.h",
-    "core/fpdfapi/fpdf_page/cpdf_pathobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pathobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_pattern.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_pattern.h",
-    "core/fpdfapi/fpdf_page/cpdf_shadingobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_shadingobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_shadingpattern.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h",
-    "core/fpdfapi/fpdf_page/cpdf_textobject.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_textobject.h",
-    "core/fpdfapi/fpdf_page/cpdf_textstate.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_textstate.h",
-    "core/fpdfapi/fpdf_page/cpdf_tilingpattern.cpp",
-    "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h",
-    "core/fpdfapi/fpdf_page/fpdf_page_colors.cpp",
-    "core/fpdfapi/fpdf_page/fpdf_page_doc.cpp",
-    "core/fpdfapi/fpdf_page/fpdf_page_func.cpp",
-    "core/fpdfapi/fpdf_page/fpdf_page_parser.cpp",
-    "core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp",
-    "core/fpdfapi/fpdf_page/pageint.h",
     "core/fpdfapi/fpdf_parser/cfdf_document.cpp",
     "core/fpdfapi/fpdf_parser/cfdf_document.h",
     "core/fpdfapi/fpdf_parser/cpdf_array.cpp",
@@ -543,6 +482,67 @@ static_library("fpdfapi") {
     "core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp",
     "core/fpdfapi/fpdf_render/fpdf_render_text.cpp",
     "core/fpdfapi/fpdf_render/render_int.h",
+    "core/fpdfapi/page/cpdf_allstates.cpp",
+    "core/fpdfapi/page/cpdf_allstates.h",
+    "core/fpdfapi/page/cpdf_clippath.cpp",
+    "core/fpdfapi/page/cpdf_clippath.h",
+    "core/fpdfapi/page/cpdf_color.cpp",
+    "core/fpdfapi/page/cpdf_color.h",
+    "core/fpdfapi/page/cpdf_colorspace.cpp",
+    "core/fpdfapi/page/cpdf_colorspace.h",
+    "core/fpdfapi/page/cpdf_colorstate.cpp",
+    "core/fpdfapi/page/cpdf_colorstate.h",
+    "core/fpdfapi/page/cpdf_contentmark.cpp",
+    "core/fpdfapi/page/cpdf_contentmark.h",
+    "core/fpdfapi/page/cpdf_contentmarkitem.cpp",
+    "core/fpdfapi/page/cpdf_contentmarkitem.h",
+    "core/fpdfapi/page/cpdf_countedobject.h",
+    "core/fpdfapi/page/cpdf_form.cpp",
+    "core/fpdfapi/page/cpdf_form.h",
+    "core/fpdfapi/page/cpdf_formobject.cpp",
+    "core/fpdfapi/page/cpdf_formobject.h",
+    "core/fpdfapi/page/cpdf_generalstate.cpp",
+    "core/fpdfapi/page/cpdf_generalstate.h",
+    "core/fpdfapi/page/cpdf_graphicstates.cpp",
+    "core/fpdfapi/page/cpdf_graphicstates.h",
+    "core/fpdfapi/page/cpdf_image.cpp",
+    "core/fpdfapi/page/cpdf_image.h",
+    "core/fpdfapi/page/cpdf_imageobject.cpp",
+    "core/fpdfapi/page/cpdf_imageobject.h",
+    "core/fpdfapi/page/cpdf_meshstream.cpp",
+    "core/fpdfapi/page/cpdf_meshstream.h",
+    "core/fpdfapi/page/cpdf_page.cpp",
+    "core/fpdfapi/page/cpdf_page.h",
+    "core/fpdfapi/page/cpdf_pagemodule.cpp",
+    "core/fpdfapi/page/cpdf_pagemodule.h",
+    "core/fpdfapi/page/cpdf_pageobject.cpp",
+    "core/fpdfapi/page/cpdf_pageobject.h",
+    "core/fpdfapi/page/cpdf_pageobjectholder.cpp",
+    "core/fpdfapi/page/cpdf_pageobjectholder.h",
+    "core/fpdfapi/page/cpdf_pageobjectlist.cpp",
+    "core/fpdfapi/page/cpdf_pageobjectlist.h",
+    "core/fpdfapi/page/cpdf_path.cpp",
+    "core/fpdfapi/page/cpdf_path.h",
+    "core/fpdfapi/page/cpdf_pathobject.cpp",
+    "core/fpdfapi/page/cpdf_pathobject.h",
+    "core/fpdfapi/page/cpdf_pattern.cpp",
+    "core/fpdfapi/page/cpdf_pattern.h",
+    "core/fpdfapi/page/cpdf_shadingobject.cpp",
+    "core/fpdfapi/page/cpdf_shadingobject.h",
+    "core/fpdfapi/page/cpdf_shadingpattern.cpp",
+    "core/fpdfapi/page/cpdf_shadingpattern.h",
+    "core/fpdfapi/page/cpdf_textobject.cpp",
+    "core/fpdfapi/page/cpdf_textobject.h",
+    "core/fpdfapi/page/cpdf_textstate.cpp",
+    "core/fpdfapi/page/cpdf_textstate.h",
+    "core/fpdfapi/page/cpdf_tilingpattern.cpp",
+    "core/fpdfapi/page/cpdf_tilingpattern.h",
+    "core/fpdfapi/page/fpdf_page_colors.cpp",
+    "core/fpdfapi/page/fpdf_page_doc.cpp",
+    "core/fpdfapi/page/fpdf_page_func.cpp",
+    "core/fpdfapi/page/fpdf_page_parser.cpp",
+    "core/fpdfapi/page/fpdf_page_parser_old.cpp",
+    "core/fpdfapi/page/pageint.h",
   ]
   configs += [ ":pdfium_core_config" ]
   deps = [
@@ -1638,14 +1638,14 @@ test("pdfium_unittests") {
   sources = [
     "core/fpdfapi/font/fpdf_font_cid_unittest.cpp",
     "core/fpdfapi/font/fpdf_font_unittest.cpp",
-    "core/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp",
-    "core/fpdfapi/fpdf_page/fpdf_page_parser_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_array_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_object_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_parser_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_simple_parser_unittest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_syntax_parser_unittest.cpp",
     "core/fpdfapi/fpdf_parser/fpdf_parser_decode_unittest.cpp",
+    "core/fpdfapi/page/fpdf_page_parser_old_unittest.cpp",
+    "core/fpdfapi/page/fpdf_page_parser_unittest.cpp",
     "core/fpdfdoc/cpdf_filespec_unittest.cpp",
     "core/fpdfdoc/cpdf_formfield_unittest.cpp",
     "core/fpdftext/fpdf_text_int_unittest.cpp",
@@ -1705,12 +1705,12 @@ test("pdfium_unittests") {
 
 test("pdfium_embeddertests") {
   sources = [
-    "core/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_parser_embeddertest.cpp",
     "core/fpdfapi/fpdf_parser/cpdf_security_handler_embeddertest.cpp",
     "core/fpdfapi/fpdf_parser/fpdf_parser_decode_embeddertest.cpp",
     "core/fpdfapi/fpdf_render/fpdf_render_loadimage_embeddertest.cpp",
     "core/fpdfapi/fpdf_render/fpdf_render_pattern_embeddertest.cpp",
+    "core/fpdfapi/page/fpdf_page_func_embeddertest.cpp",
     "core/fxcodec/codec/fx_codec_embeddertest.cpp",
     "core/fxge/ge/fx_ge_text_embeddertest.cpp",
     "fpdfsdk/fpdf_dataavail_embeddertest.cpp",
diff --git a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
index 8d7fa4b322..a1bbefc1ab 100644
--- a/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
+++ b/core/fpdfapi/cmaps/CNS1/cmaps_cns1.cpp
@@ -9,7 +9,7 @@
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/font_int.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 
 static const FXCMAP_CMap g_FXCMAP_CNS1_cmaps[] = {
diff --git a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
index 8c60b3be9f..9d15271e7e 100644
--- a/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
+++ b/core/fpdfapi/cmaps/GB1/cmaps_gb1.cpp
@@ -9,7 +9,7 @@
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/font_int.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 
 static const FXCMAP_CMap g_FXCMAP_GB1_cmaps[] = {
diff --git a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
index 5336060dc4..bdf65595ad 100644
--- a/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
+++ b/core/fpdfapi/cmaps/Japan1/cmaps_japan1.cpp
@@ -9,7 +9,7 @@
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/font_int.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 
 static const FXCMAP_CMap g_FXCMAP_Japan1_cmaps[] = {
diff --git a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
index cc417bf00c..5e88b3ba17 100644
--- a/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
+++ b/core/fpdfapi/cmaps/Korea1/cmaps_korea1.cpp
@@ -9,7 +9,7 @@
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/font_int.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_basic.h"
 
 static const FXCMAP_CMap g_FXCMAP_Korea1_cmaps[] = {
diff --git a/core/fpdfapi/cmaps/fpdf_cmaps.cpp b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
index 58a1c082bb..ca01d431f4 100644
--- a/core/fpdfapi/cmaps/fpdf_cmaps.cpp
+++ b/core/fpdfapi/cmaps/fpdf_cmaps.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/font_int.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
 
 extern "C" {
 
diff --git a/core/fpdfapi/cpdf_modulemgr.cpp b/core/fpdfapi/cpdf_modulemgr.cpp
index a8ecc6d154..ff7d95a68e 100644
--- a/core/fpdfapi/cpdf_modulemgr.cpp
+++ b/core/fpdfapi/cpdf_modulemgr.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
 #include "core/fxcodec/fx_codec.h"
 
 namespace {
diff --git a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
index e5d9683da6..9cfccb3f7c 100644
--- a/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
+++ b/core/fpdfapi/edit/cpdf_pagecontentgenerator.cpp
@@ -7,17 +7,17 @@
 #include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"
 
 #include "core/fpdfapi/edit/cpdf_creator.h"
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
+#include "core/fpdfapi/page/cpdf_image.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/pageint.h"
 
 CFX_ByteTextBuf& operator<<(CFX_ByteTextBuf& ar, CFX_Matrix& matrix) {
   ar << matrix.a << " " << matrix.b << " " << matrix.c << " " << matrix.d << " "
diff --git a/core/fpdfapi/font/cpdf_cidfont.cpp b/core/fpdfapi/font/cpdf_cidfont.cpp
index e5bbd80a83..9254294d7b 100644
--- a/core/fpdfapi/font/cpdf_cidfont.cpp
+++ b/core/fpdfapi/font/cpdf_cidfont.cpp
@@ -14,10 +14,10 @@
 #include "core/fpdfapi/font/cpdf_fontencoding.h"
 #include "core/fpdfapi/font/font_int.h"
 #include "core/fpdfapi/font/ttgsubtable.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
 #include "third_party/base/numerics/safe_math.h"
 
 namespace {
diff --git a/core/fpdfapi/font/cpdf_font.cpp b/core/fpdfapi/font/cpdf_font.cpp
index 945681fc9d..f4f95afd1f 100644
--- a/core/fpdfapi/font/cpdf_font.cpp
+++ b/core/fpdfapi/font/cpdf_font.cpp
@@ -15,13 +15,13 @@
 #include "core/fpdfapi/font/cpdf_type1font.h"
 #include "core/fpdfapi/font/cpdf_type3font.h"
 #include "core/fpdfapi/font/font_int.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_name.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxcrt/fx_memory.h"
 #include "core/fxge/fx_freetype.h"
 #include "third_party/base/ptr_util.h"
diff --git a/core/fpdfapi/font/cpdf_type3char.cpp b/core/fpdfapi/font/cpdf_type3char.cpp
index 2114486dec..332287f594 100644
--- a/core/fpdfapi/font/cpdf_type3char.cpp
+++ b/core/fpdfapi/font/cpdf_type3char.cpp
@@ -6,10 +6,10 @@
 
 #include "core/fpdfapi/font/cpdf_type3char.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_image.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
 #include "core/fxge/fx_dib.h"
 
 CPDF_Type3Char::CPDF_Type3Char(CPDF_Form* pForm)
diff --git a/core/fpdfapi/font/cpdf_type3font.cpp b/core/fpdfapi/font/cpdf_type3font.cpp
index ae301c2e8c..f23d4057cf 100644
--- a/core/fpdfapi/font/cpdf_type3font.cpp
+++ b/core/fpdfapi/font/cpdf_type3font.cpp
@@ -9,10 +9,10 @@
 #include <utility>
 
 #include "core/fpdfapi/font/cpdf_type3char.h"
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxcrt/fx_system.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/core/fpdfapi/font/fpdf_font.cpp b/core/fpdfapi/font/fpdf_font.cpp
index 4763fe5c44..b679b759da 100644
--- a/core/fpdfapi/font/fpdf_font.cpp
+++ b/core/fpdfapi/font/fpdf_font.cpp
@@ -7,9 +7,6 @@
 #include "core/fpdfapi/font/font_int.h"
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
@@ -17,6 +14,9 @@
 #include "core/fpdfapi/fpdf_parser/cpdf_number.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxcrt/fx_ext.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxge/fx_freetype.h"
diff --git a/core/fpdfapi/font/fpdf_font_cid.cpp b/core/fpdfapi/font/fpdf_font_cid.cpp
index 1d8052bc29..95f4701aa2 100644
--- a/core/fpdfapi/font/fpdf_font_cid.cpp
+++ b/core/fpdfapi/font/fpdf_font_cid.cpp
@@ -9,10 +9,10 @@
 #include "core/fpdfapi/cmaps/cmap_int.h"
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/ttgsubtable.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
 #include "core/fxcrt/fx_ext.h"
 #include "core/fxge/fx_freetype.h"
 
diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.cpp b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
index 811f3a9f95..21469af179 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_document.cpp
+++ b/core/fpdfapi/fpdf_parser/cpdf_document.cpp
@@ -12,14 +12,14 @@
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/cpdf_fontencoding.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_parser.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_reference.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxcodec/JBig2_DocumentContext.h"
 #include "core/fxge/cfx_unicodeencoding.h"
 #include "core/fxge/fx_font.h"
diff --git a/core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h b/core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h
index 5ba3a55453..a488269d8d 100644
--- a/core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h
+++ b/core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
 #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
+#include "core/fpdfapi/page/cpdf_pageobjectlist.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 
diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index cb1b2042fb..c3085f1155 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -11,16 +11,6 @@
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/cpdf_type3char.h"
 #include "core/fpdfapi/font/cpdf_type3font.h"
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_formobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pathobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
@@ -29,6 +19,16 @@
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
 #include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h"
 #include "core/fpdfapi/fpdf_render/cpdf_type3cache.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_formobject.h"
+#include "core/fpdfapi/page/cpdf_graphicstates.h"
+#include "core/fpdfapi/page/cpdf_image.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pathobject.h"
+#include "core/fpdfapi/page/cpdf_textobject.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxge/cfx_fxgedevice.h"
 #include "core/fxge/cfx_graphstatedata.h"
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp b/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp
index 33b0f3bca5..758a2d7738 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_cache.cpp
@@ -6,11 +6,11 @@
 
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/pageint.h"
 
 struct CACHEINFO {
   uint32_t time;
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
index d0bca1a17a..c6b0af8822 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -10,19 +10,19 @@
 #include <utility>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
-#include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_image.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_shadingpattern.h"
+#include "core/fpdfapi/page/cpdf_tilingpattern.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/fx_safe_types.h"
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index d040871ac6..4321a9b75e 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -11,13 +11,13 @@
 #include <vector>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
+#include "core/fpdfapi/page/cpdf_image.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/fx_safe_types.h"
 
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
index 55887204ef..3c96e799b2 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_pattern.cpp
@@ -8,19 +8,19 @@
 
 #include <algorithm>
 
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
-#include "core/fpdfapi/fpdf_page/cpdf_meshstream.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pathobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_shadingobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
-#include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_graphicstates.h"
+#include "core/fpdfapi/page/cpdf_meshstream.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pathobject.h"
+#include "core/fpdfapi/page/cpdf_shadingobject.h"
+#include "core/fpdfapi/page/cpdf_shadingpattern.h"
+#include "core/fpdfapi/page/cpdf_tilingpattern.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxge/cfx_fxgedevice.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
index 2554f645d4..b15e8f793e 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_text.cpp
@@ -12,17 +12,17 @@
 #include "core/fpdfapi/font/cpdf_font.h"
 #include "core/fpdfapi/font/cpdf_type3char.h"
 #include "core/fpdfapi/font/cpdf_type3font.h"
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pathobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
 #include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h"
 #include "core/fpdfapi/fpdf_render/cpdf_type3cache.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pathobject.h"
+#include "core/fpdfapi/page/cpdf_textobject.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxge/cfx_facecache.h"
 #include "core/fxge/cfx_fxgedevice.h"
 #include "core/fxge/cfx_gemodule.h"
diff --git a/core/fpdfapi/fpdf_render/render_int.h b/core/fpdfapi/fpdf_render/render_int.h
index c913d56a7f..aea618465e 100644
--- a/core/fpdfapi/fpdf_render/render_int.h
+++ b/core/fpdfapi/fpdf_render/render_int.h
@@ -11,11 +11,11 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_clippath.h"
-#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
+#include "core/fpdfapi/page/cpdf_clippath.h"
+#include "core/fpdfapi/page/cpdf_countedobject.h"
+#include "core/fpdfapi/page/cpdf_graphicstates.h"
 #include "core/fxge/cfx_fxgedevice.h"
 #include "core/fxge/cfx_renderdevice.h"
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp b/core/fpdfapi/page/cpdf_allstates.cpp
index 16eb0dfbae..f4a99c3206 100644
--- a/core/fpdfapi/fpdf_page/cpdf_allstates.cpp
+++ b/core/fpdfapi/page/cpdf_allstates.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
+#include "core/fpdfapi/page/cpdf_allstates.h"
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxge/cfx_graphstatedata.h"
 
 namespace {
diff --git a/core/fpdfapi/fpdf_page/cpdf_allstates.h b/core/fpdfapi/page/cpdf_allstates.h
index 44c5d3e57f..1aa680a2ce 100644
--- a/core/fpdfapi/fpdf_page/cpdf_allstates.h
+++ b/core/fpdfapi/page/cpdf_allstates.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_ALLSTATES_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_ALLSTATES_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_ALLSTATES_H_
+#define CORE_FPDFAPI_PAGE_CPDF_ALLSTATES_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
+#include "core/fpdfapi/page/cpdf_graphicstates.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -36,4 +36,4 @@ class CPDF_AllStates : public CPDF_GraphicStates {
   FX_FLOAT m_TextHorzScale;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_ALLSTATES_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_ALLSTATES_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_clippath.cpp b/core/fpdfapi/page/cpdf_clippath.cpp
index 62f5a37653..8c268a1b5e 100644
--- a/core/fpdfapi/fpdf_page/cpdf_clippath.cpp
+++ b/core/fpdfapi/page/cpdf_clippath.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_clippath.h"
+#include "core/fpdfapi/page/cpdf_clippath.h"
 
 #include <utility>
 
-#include "core/fpdfapi/fpdf_page/cpdf_path.h"
-#include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
+#include "core/fpdfapi/page/cpdf_path.h"
+#include "core/fpdfapi/page/cpdf_textobject.h"
 #include "third_party/base/stl_util.h"
 
 #define FPDF_CLIPPATH_MAX_TEXTS 1024
diff --git a/core/fpdfapi/fpdf_page/cpdf_clippath.h b/core/fpdfapi/page/cpdf_clippath.h
index 81c8ce6619..25fc3860da 100644
--- a/core/fpdfapi/fpdf_page/cpdf_clippath.h
+++ b/core/fpdfapi/page/cpdf_clippath.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_CLIPPATH_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_CLIPPATH_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_CLIPPATH_H_
+#define CORE_FPDFAPI_PAGE_CPDF_CLIPPATH_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_path.h"
+#include "core/fpdfapi/page/cpdf_path.h"
 #include "core/fxcrt/cfx_count_ref.h"
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_coordinates.h"
@@ -60,4 +60,4 @@ class CPDF_ClipPath {
   CFX_CountRef<PathData> m_Ref;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_CLIPPATH_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_CLIPPATH_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_color.cpp b/core/fpdfapi/page/cpdf_color.cpp
index ba46d99b80..ec49777d47 100644
--- a/core/fpdfapi/fpdf_page/cpdf_color.cpp
+++ b/core/fpdfapi/page/cpdf_color.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_color.h"
+#include "core/fpdfapi/page/cpdf_color.h"
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxcrt/fx_system.h"
 
 CPDF_Color::CPDF_Color() : m_pCS(nullptr), m_pBuffer(nullptr) {}
diff --git a/core/fpdfapi/fpdf_page/cpdf_color.h b/core/fpdfapi/page/cpdf_color.h
index 2056ca4cb8..3eb839a684 100644
--- a/core/fpdfapi/fpdf_page/cpdf_color.h
+++ b/core/fpdfapi/page/cpdf_color.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_COLOR_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLOR_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_COLOR_H_
+#define CORE_FPDFAPI_PAGE_CPDF_COLOR_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
+#include "core/fpdfapi/page/cpdf_colorspace.h"
 #include "core/fxcrt/fx_system.h"
 
 class CPDF_Pattern;
@@ -38,4 +38,4 @@ class CPDF_Color {
   FX_FLOAT* m_pBuffer;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_COLOR_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_COLOR_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp b/core/fpdfapi/page/cpdf_colorspace.cpp
index d7469b6d98..b43792b19c 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/page/cpdf_colorspace.cpp
@@ -4,13 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
+#include "core/fpdfapi/page/cpdf_colorspace.h"
 
 #include <memory>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
@@ -18,6 +16,8 @@
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_string.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxcodec/fx_codec.h"
 
 namespace {
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorspace.h b/core/fpdfapi/page/cpdf_colorspace.h
index 892ec688d0..78311ce195 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorspace.h
+++ b/core/fpdfapi/page/cpdf_colorspace.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSPACE_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSPACE_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_COLORSPACE_H_
+#define CORE_FPDFAPI_PAGE_CPDF_COLORSPACE_H_
 
 #include <memory>
 
@@ -118,4 +118,4 @@ struct default_delete<CPDF_ColorSpace> {
 
 }  // namespace std
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSPACE_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_COLORSPACE_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp b/core/fpdfapi/page/cpdf_colorstate.cpp
index e74b884d68..da583122af 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstate.cpp
+++ b/core/fpdfapi/page/cpdf_colorstate.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_colorstate.h"
+#include "core/fpdfapi/page/cpdf_colorstate.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
-#include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h"
+#include "core/fpdfapi/page/cpdf_pattern.h"
+#include "core/fpdfapi/page/cpdf_tilingpattern.h"
 #include "core/fxge/fx_dib.h"
 
 CPDF_ColorState::CPDF_ColorState() {}
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorstate.h b/core/fpdfapi/page/cpdf_colorstate.h
index 9114ad3528..916abed7ee 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorstate.h
+++ b/core/fpdfapi/page/cpdf_colorstate.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATE_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATE_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_COLORSTATE_H_
+#define CORE_FPDFAPI_PAGE_CPDF_COLORSTATE_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_color.h"
+#include "core/fpdfapi/page/cpdf_color.h"
 #include "core/fxcrt/cfx_count_ref.h"
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_system.h"
@@ -74,4 +74,4 @@ class CPDF_ColorState {
   CFX_CountRef<ColorData> m_Ref;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_COLORSTATE_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_COLORSTATE_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmark.cpp b/core/fpdfapi/page/cpdf_contentmark.cpp
index f71206e640..b455b4f28a 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmark.cpp
+++ b/core/fpdfapi/page/cpdf_contentmark.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
+#include "core/fpdfapi/page/cpdf_contentmark.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "third_party/base/stl_util.h"
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmark.h b/core/fpdfapi/page/cpdf_contentmark.h
index 5f38f04337..9d137faa35 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmark.h
+++ b/core/fpdfapi/page/cpdf_contentmark.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARK_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARK_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_CONTENTMARK_H_
+#define CORE_FPDFAPI_PAGE_CPDF_CONTENTMARK_H_
 
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h"
+#include "core/fpdfapi/page/cpdf_contentmarkitem.h"
 #include "core/fxcrt/cfx_count_ref.h"
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_system.h"
@@ -61,4 +61,4 @@ class CPDF_ContentMark {
   CFX_CountRef<MarkData> m_Ref;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARK_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_CONTENTMARK_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.cpp b/core/fpdfapi/page/cpdf_contentmarkitem.cpp
index 88c5008e0b..90e36d1215 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.cpp
+++ b/core/fpdfapi/page/cpdf_contentmarkitem.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h"
+#include "core/fpdfapi/page/cpdf_contentmarkitem.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h b/core/fpdfapi/page/cpdf_contentmarkitem.h
index 1cd80a25a4..ef691e252c 100644
--- a/core/fpdfapi/fpdf_page/cpdf_contentmarkitem.h
+++ b/core/fpdfapi/page/cpdf_contentmarkitem.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_CONTENTMARKITEM_H_
+#define CORE_FPDFAPI_PAGE_CPDF_CONTENTMARKITEM_H_
 
 #include <memory>
 
@@ -43,4 +43,4 @@ class CPDF_ContentMarkItem {
       m_pDirectDict;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_CONTENTMARKITEM_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_CONTENTMARKITEM_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_countedobject.h b/core/fpdfapi/page/cpdf_countedobject.h
index 6aa6577124..97d710cf76 100644
--- a/core/fpdfapi/fpdf_page/cpdf_countedobject.h
+++ b/core/fpdfapi/page/cpdf_countedobject.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_COUNTEDOBJECT_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_COUNTEDOBJECT_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_COUNTEDOBJECT_H_
+#define CORE_FPDFAPI_PAGE_CPDF_COUNTEDOBJECT_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
+#include "core/fpdfapi/page/cpdf_colorspace.h"
+#include "core/fpdfapi/page/cpdf_pattern.h"
 #include "core/fxcrt/fx_system.h"
 
 template <class T>
@@ -44,4 +44,4 @@ class CPDF_CountedObject {
 using CPDF_CountedColorSpace = CPDF_CountedObject<CPDF_ColorSpace>;
 using CPDF_CountedPattern = CPDF_CountedObject<CPDF_Pattern>;
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_COUNTEDOBJECT_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_COUNTEDOBJECT_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_form.cpp b/core/fpdfapi/page/cpdf_form.cpp
index 2823ee5bab..73e8139369 100644
--- a/core/fpdfapi/fpdf_page/cpdf_form.cpp
+++ b/core/fpdfapi/page/cpdf_form.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_form.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobjectholder.h"
+#include "core/fpdfapi/page/pageint.h"
 
 CPDF_Form::CPDF_Form(CPDF_Document* pDoc,
                      CPDF_Dictionary* pPageResources,
diff --git a/core/fpdfapi/fpdf_page/cpdf_form.h b/core/fpdfapi/page/cpdf_form.h
index 1b88763d2c..1208e327bd 100644
--- a/core/fpdfapi/fpdf_page/cpdf_form.h
+++ b/core/fpdfapi/page/cpdf_form.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_FORM_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_FORM_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_FORM_H_
+#define CORE_FPDFAPI_PAGE_CPDF_FORM_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
+#include "core/fpdfapi/page/cpdf_pageobjectholder.h"
 
 class CPDF_Document;
 class CPDF_Dictionary;
@@ -38,4 +38,4 @@ class CPDF_Form : public CPDF_PageObjectHolder {
                   int level = 0);
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_FORM_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_FORM_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_formobject.cpp b/core/fpdfapi/page/cpdf_formobject.cpp
index d027d1dbf9..dd3c2c2036 100644
--- a/core/fpdfapi/fpdf_page/cpdf_formobject.cpp
+++ b/core/fpdfapi/page/cpdf_formobject.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_formobject.h"
+#include "core/fpdfapi/page/cpdf_formobject.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_form.h"
 
 CPDF_FormObject::CPDF_FormObject() {}
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_formobject.h b/core/fpdfapi/page/cpdf_formobject.h
index d3d92575be..0fdc692019 100644
--- a/core/fpdfapi/fpdf_page/cpdf_formobject.h
+++ b/core/fpdfapi/page/cpdf_formobject.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_FORMOBJECT_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_FORMOBJECT_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_FORMOBJECT_H_
+#define CORE_FPDFAPI_PAGE_CPDF_FORMOBJECT_H_
 
 #include <memory>
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
 #include "core/fxcrt/fx_coordinates.h"
 
 class CPDF_Form;
@@ -34,4 +34,4 @@ class CPDF_FormObject : public CPDF_PageObject {
   CFX_Matrix m_FormMatrix;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_FORMOBJECT_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_FORMOBJECT_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_generalstate.cpp b/core/fpdfapi/page/cpdf_generalstate.cpp
index e5208f5c30..4b082c0946 100644
--- a/core/fpdfapi/fpdf_page/cpdf_generalstate.cpp
+++ b/core/fpdfapi/page/cpdf_generalstate.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_generalstate.h"
+#include "core/fpdfapi/page/cpdf_generalstate.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/render_int.h"
diff --git a/core/fpdfapi/fpdf_page/cpdf_generalstate.h b/core/fpdfapi/page/cpdf_generalstate.h
index 9bcce04894..8c6b0622f4 100644
--- a/core/fpdfapi/fpdf_page/cpdf_generalstate.h
+++ b/core/fpdfapi/page/cpdf_generalstate.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_GENERALSTATE_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_GENERALSTATE_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_
+#define CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_
 
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_coordinates.h"
@@ -106,4 +106,4 @@ class CPDF_GeneralState {
   CFX_CountRef<StateData> m_Ref;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_GENERALSTATE_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_GENERALSTATE_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_graphicstates.cpp b/core/fpdfapi/page/cpdf_graphicstates.cpp
index 42f26c1135..962bc0a89e 100644
--- a/core/fpdfapi/fpdf_page/cpdf_graphicstates.cpp
+++ b/core/fpdfapi/page/cpdf_graphicstates.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
+#include "core/fpdfapi/page/cpdf_graphicstates.h"
 
 CPDF_GraphicStates::CPDF_GraphicStates() {}
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_graphicstates.h b/core/fpdfapi/page/cpdf_graphicstates.h
index 6e612153d0..b7e7fa2056 100644
--- a/core/fpdfapi/fpdf_page/cpdf_graphicstates.h
+++ b/core/fpdfapi/page/cpdf_graphicstates.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_GRAPHICSTATES_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_GRAPHICSTATES_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_GRAPHICSTATES_H_
+#define CORE_FPDFAPI_PAGE_CPDF_GRAPHICSTATES_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_clippath.h"
-#include "core/fpdfapi/fpdf_page/cpdf_colorstate.h"
-#include "core/fpdfapi/fpdf_page/cpdf_generalstate.h"
-#include "core/fpdfapi/fpdf_page/cpdf_textstate.h"
+#include "core/fpdfapi/page/cpdf_clippath.h"
+#include "core/fpdfapi/page/cpdf_colorstate.h"
+#include "core/fpdfapi/page/cpdf_generalstate.h"
+#include "core/fpdfapi/page/cpdf_textstate.h"
 #include "core/fxge/cfx_graphstate.h"
 
 class CPDF_GraphicStates {
@@ -28,4 +28,4 @@ class CPDF_GraphicStates {
   CPDF_GeneralState m_GeneralState;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_GRAPHICSTATES_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_GRAPHICSTATES_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_image.cpp b/core/fpdfapi/page/cpdf_image.cpp
index 21cec2e442..eb59dc750e 100644
--- a/core/fpdfapi/fpdf_page/cpdf_image.cpp
+++ b/core/fpdfapi/page/cpdf_image.cpp
@@ -4,21 +4,21 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
+#include "core/fpdfapi/page/cpdf_image.h"
 
 #include <algorithm>
 #include <memory>
 #include <vector>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_boolean.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_string.h"
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/fpdf_render/render_int.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxge/fx_dib.h"
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_image.h b/core/fpdfapi/page/cpdf_image.h
index 4254202c9d..0bf806c13e 100644
--- a/core/fpdfapi/fpdf_page/cpdf_image.h
+++ b/core/fpdfapi/page/cpdf_image.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_IMAGE_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_IMAGE_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_IMAGE_H_
+#define CORE_FPDFAPI_PAGE_CPDF_IMAGE_H_
 
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fxcrt/fx_system.h"
@@ -87,4 +87,4 @@ class CPDF_Image {
   CPDF_Dictionary* m_pOC;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_IMAGE_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_IMAGE_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_imageobject.cpp b/core/fpdfapi/page/cpdf_imageobject.cpp
index 74351b024d..8be2cf3c76 100644
--- a/core/fpdfapi/fpdf_page/cpdf_imageobject.cpp
+++ b/core/fpdfapi/page/cpdf_imageobject.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
 
 #include <memory>
 
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_image.h"
+#include "core/fpdfapi/page/pageint.h"
 
 CPDF_ImageObject::CPDF_ImageObject()
     : m_pImage(nullptr), m_pImageOwned(false) {}
diff --git a/core/fpdfapi/fpdf_page/cpdf_imageobject.h b/core/fpdfapi/page/cpdf_imageobject.h
index e61dd5ac36..fd99d3d612 100644
--- a/core/fpdfapi/fpdf_page/cpdf_imageobject.h
+++ b/core/fpdfapi/page/cpdf_imageobject.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_IMAGEOBJECT_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_IMAGEOBJECT_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_IMAGEOBJECT_H_
+#define CORE_FPDFAPI_PAGE_CPDF_IMAGEOBJECT_H_
 
 #include <memory>
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
 #include "core/fxcrt/fx_coordinates.h"
 
 class CPDF_Image;
@@ -41,4 +41,4 @@ class CPDF_ImageObject : public CPDF_PageObject {
   bool m_pImageOwned;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_IMAGEOBJECT_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_IMAGEOBJECT_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_meshstream.cpp b/core/fpdfapi/page/cpdf_meshstream.cpp
index 9e707365ec..bd877a0920 100644
--- a/core/fpdfapi/fpdf_page/cpdf_meshstream.cpp
+++ b/core/fpdfapi/page/cpdf_meshstream.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_meshstream.h"
+#include "core/fpdfapi/page/cpdf_meshstream.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
+#include "core/fpdfapi/page/cpdf_colorspace.h"
+#include "core/fpdfapi/page/pageint.h"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_meshstream.h b/core/fpdfapi/page/cpdf_meshstream.h
index 5930cf9833..a2ac9ae868 100644
--- a/core/fpdfapi/fpdf_page/cpdf_meshstream.h
+++ b/core/fpdfapi/page/cpdf_meshstream.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_MESHSTREAM_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_MESHSTREAM_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_MESHSTREAM_H_
+#define CORE_FPDFAPI_PAGE_CPDF_MESHSTREAM_H_
 
 #include <memory>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
+#include "core/fpdfapi/page/cpdf_shadingpattern.h"
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -73,4 +73,4 @@ class CPDF_MeshStream {
   CFX_BitStream m_BitStream;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_MESHSTREAM_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_MESHSTREAM_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_page.cpp b/core/fpdfapi/page/cpdf_page.cpp
index 7c4b2bb203..f471760c91 100644
--- a/core/fpdfapi/fpdf_page/cpdf_page.cpp
+++ b/core/fpdfapi/page/cpdf_page.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 
 #include <set>
 
 #include "core/fpdfapi/cpdf_pagerendercontext.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_object.h"
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "third_party/base/stl_util.h"
 
 CPDF_Page::CPDF_Page(CPDF_Document* pDocument,
diff --git a/core/fpdfapi/fpdf_page/cpdf_page.h b/core/fpdfapi/page/cpdf_page.h
index 13f51986a2..a542e33dbc 100644
--- a/core/fpdfapi/fpdf_page/cpdf_page.h
+++ b/core/fpdfapi/page/cpdf_page.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGE_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGE_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_PAGE_H_
+#define CORE_FPDFAPI_PAGE_CPDF_PAGE_H_
 
 #include <memory>
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
+#include "core/fpdfapi/page/cpdf_pageobjectholder.h"
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
@@ -66,4 +66,4 @@ class CPDF_Page : public CPDF_PageObjectHolder {
   std::unique_ptr<CPDF_PageRenderContext> m_pRenderContext;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGE_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_PAGE_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_pagemodule.cpp b/core/fpdfapi/page/cpdf_pagemodule.cpp
index c22c8fbc46..80edf2cdd0 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pagemodule.cpp
+++ b/core/fpdfapi/page/cpdf_pagemodule.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
 
 CPDF_PageModule::CPDF_PageModule()
     : m_StockGrayCS(nullptr, PDFCS_DEVICEGRAY),
diff --git a/core/fpdfapi/fpdf_page/cpdf_pagemodule.h b/core/fpdfapi/page/cpdf_pagemodule.h
index 35316cd0bf..4aa19da2bb 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pagemodule.h
+++ b/core/fpdfapi/page/cpdf_pagemodule.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEMODULE_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEMODULE_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_PAGEMODULE_H_
+#define CORE_FPDFAPI_PAGE_CPDF_PAGEMODULE_H_
 
 #include "core/fpdfapi/font/font_int.h"
-#include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/page/cpdf_colorspace.h"
+#include "core/fpdfapi/page/pageint.h"
 
 class CPDF_Document;
 
@@ -30,4 +30,4 @@ class CPDF_PageModule {
   CPDF_PatternCS m_StockPatternCS;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEMODULE_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_PAGEMODULE_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_pageobject.cpp b/core/fpdfapi/page/cpdf_pageobject.cpp
index 4015587304..c0e031e7ed 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pageobject.cpp
+++ b/core/fpdfapi/page/cpdf_pageobject.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
 
 CPDF_PageObject::CPDF_PageObject() {}
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_pageobject.h b/core/fpdfapi/page/cpdf_pageobject.h
index 359bc2bdb4..97cac7e9aa 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pageobject.h
+++ b/core/fpdfapi/page/cpdf_pageobject.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECT_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECT_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_PAGEOBJECT_H_
+#define CORE_FPDFAPI_PAGE_CPDF_PAGEOBJECT_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
-#include "core/fpdfapi/fpdf_page/cpdf_graphicstates.h"
+#include "core/fpdfapi/page/cpdf_contentmark.h"
+#include "core/fpdfapi/page/cpdf_graphicstates.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -68,4 +68,4 @@ class CPDF_PageObject : public CPDF_GraphicStates {
   void operator=(const CPDF_PageObject& src) = delete;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECT_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_PAGEOBJECT_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_pageobjectholder.cpp b/core/fpdfapi/page/cpdf_pageobjectholder.cpp
index fd92e598cd..bd7830de4d 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pageobjectholder.cpp
+++ b/core/fpdfapi/page/cpdf_pageobjectholder.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
+#include "core/fpdfapi/page/cpdf_pageobjectholder.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/pageint.h"
 
 CPDF_PageObjectHolder::CPDF_PageObjectHolder()
     : m_pFormDict(nullptr),
diff --git a/core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h b/core/fpdfapi/page/cpdf_pageobjectholder.h
index a8845552f7..96a0a80838 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h
+++ b/core/fpdfapi/page/cpdf_pageobjectholder.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECTHOLDER_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECTHOLDER_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_PAGEOBJECTHOLDER_H_
+#define CORE_FPDFAPI_PAGE_CPDF_PAGEOBJECTHOLDER_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
+#include "core/fpdfapi/page/cpdf_pageobjectlist.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -65,4 +65,4 @@ class CPDF_PageObjectHolder {
   CPDF_PageObjectList m_PageObjectList;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECTHOLDER_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_PAGEOBJECTHOLDER_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_pageobjectlist.cpp b/core/fpdfapi/page/cpdf_pageobjectlist.cpp
index e433431551..02b590e413 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pageobjectlist.cpp
+++ b/core/fpdfapi/page/cpdf_pageobjectlist.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
+#include "core/fpdfapi/page/cpdf_pageobjectlist.h"
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "third_party/base/stl_util.h"
 
 CPDF_PageObject* CPDF_PageObjectList::GetPageObjectByIndex(int index) {
diff --git a/core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h b/core/fpdfapi/page/cpdf_pageobjectlist.h
index 360bb26e8b..b4505371f8 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h
+++ b/core/fpdfapi/page/cpdf_pageobjectlist.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECTLIST_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECTLIST_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_PAGEOBJECTLIST_H_
+#define CORE_FPDFAPI_PAGE_CPDF_PAGEOBJECTLIST_H_
 
 #include <deque>
 #include <memory>
@@ -18,4 +18,4 @@ class CPDF_PageObjectList
   CPDF_PageObject* GetPageObjectByIndex(int index);
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_PAGEOBJECTLIST_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_PAGEOBJECTLIST_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_path.cpp b/core/fpdfapi/page/cpdf_path.cpp
index 2c80cc3d12..e80edf798e 100644
--- a/core/fpdfapi/fpdf_page/cpdf_path.cpp
+++ b/core/fpdfapi/page/cpdf_path.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_path.h"
+#include "core/fpdfapi/page/cpdf_path.h"
 
 CPDF_Path::CPDF_Path() {}
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_path.h b/core/fpdfapi/page/cpdf_path.h
index 3f77b05d5b..6322f08ba2 100644
--- a/core/fpdfapi/fpdf_page/cpdf_path.h
+++ b/core/fpdfapi/page/cpdf_path.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PATH_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PATH_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_PATH_H_
+#define CORE_FPDFAPI_PAGE_CPDF_PATH_H_
 
 #include "core/fxcrt/cfx_count_ref.h"
 #include "core/fxcrt/fx_system.h"
@@ -47,4 +47,4 @@ class CPDF_Path {
   CFX_CountRef<CFX_PathData> m_Ref;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_PATH_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_PATH_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_pathobject.cpp b/core/fpdfapi/page/cpdf_pathobject.cpp
index 94385de6e0..a25f7891a6 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pathobject.cpp
+++ b/core/fpdfapi/page/cpdf_pathobject.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_pathobject.h"
+#include "core/fpdfapi/page/cpdf_pathobject.h"
 
 CPDF_PathObject::CPDF_PathObject() {}
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_pathobject.h b/core/fpdfapi/page/cpdf_pathobject.h
index ee40322076..65578a1bab 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pathobject.h
+++ b/core/fpdfapi/page/cpdf_pathobject.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PATHOBJECT_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PATHOBJECT_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_PATHOBJECT_H_
+#define CORE_FPDFAPI_PAGE_CPDF_PATHOBJECT_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_path.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_path.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -33,4 +33,4 @@ class CPDF_PathObject : public CPDF_PageObject {
   CFX_Matrix m_Matrix;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_PATHOBJECT_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_PATHOBJECT_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_pattern.cpp b/core/fpdfapi/page/cpdf_pattern.cpp
index f8bc9a555f..b0a2d81bca 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pattern.cpp
+++ b/core/fpdfapi/page/cpdf_pattern.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
+#include "core/fpdfapi/page/cpdf_pattern.h"
 
 CPDF_Pattern::CPDF_Pattern(PatternType type,
                            CPDF_Document* pDoc,
diff --git a/core/fpdfapi/fpdf_page/cpdf_pattern.h b/core/fpdfapi/page/cpdf_pattern.h
index 52be26a823..d44965ff16 100644
--- a/core/fpdfapi/fpdf_page/cpdf_pattern.h
+++ b/core/fpdfapi/page/cpdf_pattern.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PATTERN_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PATTERN_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_PATTERN_H_
+#define CORE_FPDFAPI_PAGE_CPDF_PATTERN_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
@@ -42,4 +42,4 @@ class CPDF_Pattern {
   const CFX_Matrix m_ParentMatrix;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_PATTERN_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_PATTERN_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_psengine.h b/core/fpdfapi/page/cpdf_psengine.h
index 81e3204fc3..d3eec6629c 100644
--- a/core/fpdfapi/fpdf_page/cpdf_psengine.h
+++ b/core/fpdfapi/page/cpdf_psengine.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_PSENGINE_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_PSENGINE_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_PSENGINE_H_
+#define CORE_FPDFAPI_PAGE_CPDF_PSENGINE_H_
 
 #include <memory>
 #include <vector>
@@ -98,4 +98,4 @@ class CPDF_PSEngine {
   CPDF_PSProc m_MainProc;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_PSENGINE_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_PSENGINE_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_shadingobject.cpp b/core/fpdfapi/page/cpdf_shadingobject.cpp
index 49d0f60353..28a154374f 100644
--- a/core/fpdfapi/fpdf_page/cpdf_shadingobject.cpp
+++ b/core/fpdfapi/page/cpdf_shadingobject.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_shadingobject.h"
+#include "core/fpdfapi/page/cpdf_shadingobject.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_shadingpattern.h"
+#include "core/fpdfapi/page/pageint.h"
 
 CPDF_ShadingObject::CPDF_ShadingObject() : m_pShading(nullptr) {}
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_shadingobject.h b/core/fpdfapi/page/cpdf_shadingobject.h
index ff5e3f52dd..ed5679a83b 100644
--- a/core/fpdfapi/fpdf_page/cpdf_shadingobject.h
+++ b/core/fpdfapi/page/cpdf_shadingobject.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_SHADINGOBJECT_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_SHADINGOBJECT_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_SHADINGOBJECT_H_
+#define CORE_FPDFAPI_PAGE_CPDF_SHADINGOBJECT_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
 #include "core/fxcrt/fx_coordinates.h"
 
 class CPDF_ShadingPattern;
@@ -31,4 +31,4 @@ class CPDF_ShadingObject : public CPDF_PageObject {
   CFX_Matrix m_Matrix;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_SHADINGOBJECT_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_SHADINGOBJECT_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.cpp b/core/fpdfapi/page/cpdf_shadingpattern.cpp
index 8b74d1275e..5b52e84fb7 100644
--- a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.cpp
+++ b/core/fpdfapi/page/cpdf_shadingpattern.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
+#include "core/fpdfapi/page/cpdf_shadingpattern.h"
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_object.h"
+#include "core/fpdfapi/page/pageint.h"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h b/core/fpdfapi/page/cpdf_shadingpattern.h
index e2bcef268a..6f5978f8a5 100644
--- a/core/fpdfapi/fpdf_page/cpdf_shadingpattern.h
+++ b/core/fpdfapi/page/cpdf_shadingpattern.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_SHADINGPATTERN_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_SHADINGPATTERN_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_SHADINGPATTERN_H_
+#define CORE_FPDFAPI_PAGE_CPDF_SHADINGPATTERN_H_
 
 #include <memory>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
+#include "core/fpdfapi/page/cpdf_countedobject.h"
+#include "core/fpdfapi/page/cpdf_pattern.h"
 #include "core/fxcrt/fx_system.h"
 
 enum ShadingType {
@@ -72,4 +72,4 @@ class CPDF_ShadingPattern : public CPDF_Pattern {
   std::vector<std::unique_ptr<CPDF_Function>> m_pFunctions;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_SHADINGPATTERN_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_SHADINGPATTERN_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp b/core/fpdfapi/page/cpdf_textobject.cpp
index 97f6ad2bcd..0b44522835 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textobject.cpp
+++ b/core/fpdfapi/page/cpdf_textobject.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
+#include "core/fpdfapi/page/cpdf_textobject.h"
 
 #include "core/fpdfapi/font/cpdf_cidfont.h"
 #include "core/fpdfapi/font/cpdf_font.h"
diff --git a/core/fpdfapi/fpdf_page/cpdf_textobject.h b/core/fpdfapi/page/cpdf_textobject.h
index 05a08a9c89..23da997aeb 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textobject.h
+++ b/core/fpdfapi/page/cpdf_textobject.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTOBJECT_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTOBJECT_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_TEXTOBJECT_H_
+#define CORE_FPDFAPI_PAGE_CPDF_TEXTOBJECT_H_
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -65,4 +65,4 @@ class CPDF_TextObject : public CPDF_PageObject {
   FX_FLOAT* m_pCharPos;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTOBJECT_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_TEXTOBJECT_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp b/core/fpdfapi/page/cpdf_textstate.cpp
index 800af23861..ef19b87ae2 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textstate.cpp
+++ b/core/fpdfapi/page/cpdf_textstate.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_textstate.h"
+#include "core/fpdfapi/page/cpdf_textstate.h"
 
 #include "core/fpdfapi/font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/pageint.h"
 
 CPDF_TextState::CPDF_TextState() {}
 CPDF_TextState::~CPDF_TextState() {}
diff --git a/core/fpdfapi/fpdf_page/cpdf_textstate.h b/core/fpdfapi/page/cpdf_textstate.h
index 0c615b270b..e76e376c3b 100644
--- a/core/fpdfapi/fpdf_page/cpdf_textstate.h
+++ b/core/fpdfapi/page/cpdf_textstate.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_TEXTSTATE_H_
+#define CORE_FPDFAPI_PAGE_CPDF_TEXTSTATE_H_
 
 #include "core/fxcrt/cfx_count_ref.h"
 #include "core/fxcrt/fx_basic.h"
@@ -88,4 +88,4 @@ bool SetTextRenderingModeFromInt(int iMode, TextRenderingMode* mode);
 bool TextRenderingModeIsClipMode(const TextRenderingMode& mode);
 bool TextRenderingModeIsStrokeMode(const TextRenderingMode& mode);
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_TEXTSTATE_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_TEXTSTATE_H_
diff --git a/core/fpdfapi/fpdf_page/cpdf_tilingpattern.cpp b/core/fpdfapi/page/cpdf_tilingpattern.cpp
index 42f4aaa955..1ddc3c6ebc 100644
--- a/core/fpdfapi/fpdf_page/cpdf_tilingpattern.cpp
+++ b/core/fpdfapi/page/cpdf_tilingpattern.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h"
+#include "core/fpdfapi/page/cpdf_tilingpattern.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_object.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
+#include "core/fpdfapi/page/cpdf_form.h"
 
 CPDF_TilingPattern::CPDF_TilingPattern(CPDF_Document* pDoc,
                                        CPDF_Object* pPatternObj,
@@ -21,8 +21,7 @@ CPDF_TilingPattern::CPDF_TilingPattern(CPDF_Document* pDoc,
   m_Pattern2Form.Concat(parentMatrix);
 }
 
-CPDF_TilingPattern::~CPDF_TilingPattern() {
-}
+CPDF_TilingPattern::~CPDF_TilingPattern() {}
 
 CPDF_TilingPattern* CPDF_TilingPattern::AsTilingPattern() {
   return this;
diff --git a/core/fpdfapi/fpdf_page/cpdf_tilingpattern.h b/core/fpdfapi/page/cpdf_tilingpattern.h
index 7ff2068f75..3c9ffb206d 100644
--- a/core/fpdfapi/fpdf_page/cpdf_tilingpattern.h
+++ b/core/fpdfapi/page/cpdf_tilingpattern.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_CPDF_TILINGPATTERN_H_
-#define CORE_FPDFAPI_FPDF_PAGE_CPDF_TILINGPATTERN_H_
+#ifndef CORE_FPDFAPI_PAGE_CPDF_TILINGPATTERN_H_
+#define CORE_FPDFAPI_PAGE_CPDF_TILINGPATTERN_H_
 
 #include <memory>
 
-#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
+#include "core/fpdfapi/page/cpdf_pattern.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 
@@ -43,4 +43,4 @@ class CPDF_TilingPattern : public CPDF_Pattern {
   std::unique_ptr<CPDF_Form> m_pForm;
 };
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_CPDF_TILINGPATTERN_H_
+#endif  // CORE_FPDFAPI_PAGE_CPDF_TILINGPATTERN_H_
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/fpdfapi/page/fpdf_page_colors.cpp
index 472e8751d7..d6500b716b 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp
+++ b/core/fpdfapi/page/fpdf_page_colors.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/page/pageint.h"
 
 #include <limits.h>
 
@@ -232,4 +232,3 @@ CPDF_IccProfile::~CPDF_IccProfile() {
     CPDF_ModuleMgr::Get()->GetIccModule()->DestroyTransform(m_pTransform);
   }
 }
-
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp b/core/fpdfapi/page/fpdf_page_doc.cpp
index 4b1eaa3064..f11f1b288f 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_doc.cpp
+++ b/core/fpdfapi/page/fpdf_page_doc.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/page/pageint.h"
 
 #include <algorithm>
 #include <set>
@@ -13,15 +13,15 @@
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/cpdf_type1font.h"
 #include "core/fpdfapi/font/font_int.h"
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pagemodule.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pattern.h"
-#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
-#include "core/fpdfapi/fpdf_page/cpdf_tilingpattern.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
+#include "core/fpdfapi/page/cpdf_image.h"
+#include "core/fpdfapi/page/cpdf_pagemodule.h"
+#include "core/fpdfapi/page/cpdf_pattern.h"
+#include "core/fpdfapi/page/cpdf_shadingpattern.h"
+#include "core/fpdfapi/page/cpdf_tilingpattern.h"
 #include "third_party/base/stl_util.h"
 
 void CPDF_ModuleMgr::InitPageModule() {
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp b/core/fpdfapi/page/fpdf_page_func.cpp
index eb487577c8..e11d8dd754 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_func.cpp
+++ b/core/fpdfapi/page/fpdf_page_func.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/page/pageint.h"
 
 #include <limits.h>
 
@@ -13,12 +13,12 @@
 #include <utility>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_psengine.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
+#include "core/fpdfapi/page/cpdf_psengine.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "third_party/base/numerics/safe_conversions_impl.h"
 
@@ -464,7 +464,6 @@ FX_BOOL CPDF_PSFunc::v_Call(FX_FLOAT* inputs, FX_FLOAT* results) const {
   return TRUE;
 }
 
-
 CPDF_SampledFunc::CPDF_SampledFunc() : CPDF_Function(Type::kType0Sampled) {}
 
 CPDF_SampledFunc::~CPDF_SampledFunc() {}
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp b/core/fpdfapi/page/fpdf_page_func_embeddertest.cpp
index 2892036882..2892036882 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_func_embeddertest.cpp
+++ b/core/fpdfapi/page/fpdf_page_func_embeddertest.cpp
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp b/core/fpdfapi/page/fpdf_page_parser.cpp
index c0059b8a77..e19d99a971 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser.cpp
+++ b/core/fpdfapi/page/fpdf_page_parser.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/page/pageint.h"
 
 #include <memory>
 #include <utility>
@@ -13,17 +13,6 @@
 #include "core/fpdfapi/edit/cpdf_creator.h"
 #include "core/fpdfapi/font/cpdf_font.h"
 #include "core/fpdfapi/font/cpdf_type3font.h"
-#include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_formobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_meshstream.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pathobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_shadingobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
-#include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
@@ -33,6 +22,17 @@
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
+#include "core/fpdfapi/page/cpdf_allstates.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_formobject.h"
+#include "core/fpdfapi/page/cpdf_image.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_meshstream.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pathobject.h"
+#include "core/fpdfapi/page/cpdf_shadingobject.h"
+#include "core/fpdfapi/page/cpdf_shadingpattern.h"
+#include "core/fpdfapi/page/cpdf_textobject.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_pathdata.h"
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/page/fpdf_page_parser_old.cpp
index 3c3104b8ab..fb89b14db9 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/page/fpdf_page_parser_old.cpp
@@ -4,17 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/page/pageint.h"
 
 #include <limits.h>
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/font/cpdf_type3char.h"
-#include "core/fpdfapi/fpdf_page/cpdf_allstates.h"
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_path.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_boolean.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
@@ -27,6 +22,11 @@
 #include "core/fpdfapi/fpdf_parser/cpdf_string.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_utility.h"
+#include "core/fpdfapi/page/cpdf_allstates.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_path.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/fx_ext.h"
 #include "core/fxcrt/fx_safe_types.h"
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp b/core/fpdfapi/page/fpdf_page_parser_old_unittest.cpp
index ff15b21d73..52ebf1ef09 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old_unittest.cpp
+++ b/core/fpdfapi/page/fpdf_page_parser_old_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fpdf_page_parser_old, ReadHexString) {
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_unittest.cpp b/core/fpdfapi/page/fpdf_page_parser_unittest.cpp
index 3da36a8f8c..b6eec7bcf7 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_unittest.cpp
+++ b/core/fpdfapi/page/fpdf_page_parser_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fpdfapi/fpdf_page/pageint.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(fpdf_page_parser, PDF_FindKeyAbbreviation) {
diff --git a/core/fpdfapi/fpdf_page/pageint.h b/core/fpdfapi/page/pageint.h
index 3c10702b9e..2d3927d13d 100644
--- a/core/fpdfapi/fpdf_page/pageint.h
+++ b/core/fpdfapi/page/pageint.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
-#define CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
+#ifndef CORE_FPDFAPI_PAGE_PAGEINT_H_
+#define CORE_FPDFAPI_PAGE_PAGEINT_H_
 
 #include <map>
 #include <memory>
@@ -13,9 +13,9 @@
 #include <unordered_map>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_contentmark.h"
-#include "core/fpdfapi/fpdf_page/cpdf_countedobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
+#include "core/fpdfapi/page/cpdf_contentmark.h"
+#include "core/fpdfapi/page/cpdf_countedobject.h"
+#include "core/fpdfapi/page/cpdf_pageobjectholder.h"
 #include "core/fxcrt/cfx_string_pool_template.h"
 #include "core/fxcrt/cfx_weak_ptr.h"
 #include "core/fxge/cfx_pathdata.h"
@@ -563,4 +563,4 @@ CFX_ByteStringC PDF_FindValueAbbreviationForTesting(
 void PDF_ReplaceAbbr(CPDF_Object* pObj);
 bool IsPathOperator(const uint8_t* buf, size_t len);
 
-#endif  // CORE_FPDFAPI_FPDF_PAGE_PAGEINT_H_
+#endif  // CORE_FPDFAPI_PAGE_PAGEINT_H_
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index c2297ac3df..85c3906620 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -6,12 +6,12 @@
 
 #include "core/fpdfdoc/cpdf_annot.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpvt_generateap.h"
 #include "core/fxcrt/fx_memory.h"
 #include "core/fxge/cfx_graphstatedata.h"
diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp
index 7ddbab38a6..c99f22a615 100644
--- a/core/fpdfdoc/cpdf_annotlist.cpp
+++ b/core/fpdfdoc/cpdf_annotlist.cpp
@@ -6,10 +6,10 @@
 
 #include "core/fpdfdoc/cpdf_annotlist.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_reference.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_annot.h"
 #include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fpdfdoc/cpdf_occontext.h"
diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp
index dab59d773a..b8f57a53c4 100644
--- a/core/fpdfdoc/cpdf_formcontrol.cpp
+++ b/core/fpdfdoc/cpdf_formcontrol.cpp
@@ -8,12 +8,12 @@
 
 #include <algorithm>
 
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
 #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
+#include "core/fpdfapi/page/cpdf_form.h"
 #include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fxge/cfx_renderdevice.h"
 
diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp
index d68bdbc524..7a14d9c227 100644
--- a/core/fpdfdoc/cpdf_interform.cpp
+++ b/core/fpdfdoc/cpdf_interform.cpp
@@ -8,11 +8,11 @@
 
 #include "core/fpdfapi/font/cpdf_font.h"
 #include "core/fpdfapi/font/cpdf_fontencoding.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cfdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_string.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_filespec.h"
 #include "core/fpdfdoc/cpdf_formcontrol.h"
 #include "core/fpdfdoc/cpdf_interform.h"
diff --git a/core/fpdfdoc/cpdf_linklist.cpp b/core/fpdfdoc/cpdf_linklist.cpp
index d08032d40e..1d2cddd05a 100644
--- a/core/fpdfdoc/cpdf_linklist.cpp
+++ b/core/fpdfdoc/cpdf_linklist.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fpdfdoc/cpdf_linklist.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 
 CPDF_LinkList::CPDF_LinkList() {}
 
diff --git a/core/fpdfdoc/cpdf_occontext.cpp b/core/fpdfdoc/cpdf_occontext.cpp
index d2994ac010..d9c742c78f 100644
--- a/core/fpdfdoc/cpdf_occontext.cpp
+++ b/core/fpdfdoc/cpdf_occontext.cpp
@@ -6,9 +6,9 @@
 
 #include "core/fpdfdoc/cpdf_occontext.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
 
 namespace {
 
diff --git a/core/fpdftext/cpdf_textpage.cpp b/core/fpdftext/cpdf_textpage.cpp
index 51556c43e7..e6bd13015e 100644
--- a/core/fpdftext/cpdf_textpage.cpp
+++ b/core/fpdftext/cpdf_textpage.cpp
@@ -11,13 +11,13 @@
 #include <vector>
 
 #include "core/fpdfapi/font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_formobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_string.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_formobject.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_textobject.h"
 #include "core/fpdftext/unicodenormalizationdata.h"
 #include "core/fxcrt/fx_bidi.h"
 #include "core/fxcrt/fx_ext.h"
diff --git a/core/fpdftext/cpdf_textpage.h b/core/fpdftext/cpdf_textpage.h
index bbb92fddf9..99c2b5299b 100644
--- a/core/fpdftext/cpdf_textpage.h
+++ b/core/fpdftext/cpdf_textpage.h
@@ -10,7 +10,7 @@
 #include <deque>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectlist.h"
+#include "core/fpdfapi/page/cpdf_pageobjectlist.h"
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_string.h"
diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
index df836c2deb..85446c1d9b 100644
--- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -8,7 +8,7 @@
 #include <limits>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_colorspace.h"
+#include "core/fpdfapi/page/cpdf_colorspace.h"
 #include "core/fxcodec/codec/codec_int.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/fx_safe_types.h"
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index aef933118c..c37933a50c 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -9,11 +9,11 @@
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/fx_memory.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
-#include "core/fpdfapi/fpdf_page/pageint.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
+#include "core/fpdfapi/page/cpdf_shadingpattern.h"
+#include "core/fpdfapi/page/pageint.h"
 #include "core/fxge/cfx_fxgedevice.h"
 #include "core/fxge/cfx_gemodule.h"
 #include "core/fxge/cfx_graphstatedata.h"
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index 88f31d8711..971b36a865 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -2,7 +2,7 @@ include_rules = [
   '+core/fpdftext',
   '+core/fpdfapi',
   '+core/fpdfapi/edit',
-  '+core/fpdfapi/fpdf_page',
+  '+core/fpdfapi/page',
   '+core/fpdfapi/fpdf_parser',
   '+core/fpdfapi/fpdf_render',
   '+core/fpdfdoc',
diff --git a/fpdfsdk/cba_annotiterator.cpp b/fpdfsdk/cba_annotiterator.cpp
index 762f6346c1..ef9ab2ad31 100644
--- a/fpdfsdk/cba_annotiterator.cpp
+++ b/fpdfsdk/cba_annotiterator.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/cba_annotiterator.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
 #include "fpdfsdk/cpdfsdk_pageview.h"
 
diff --git a/fpdfsdk/cpdfsdk_baannothandler.cpp b/fpdfsdk/cpdfsdk_baannothandler.cpp
index 02ffff4265..4e4d284b61 100644
--- a/fpdfsdk/cpdfsdk_baannothandler.cpp
+++ b/fpdfsdk/cpdfsdk_baannothandler.cpp
@@ -9,8 +9,8 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
 #include "fpdfsdk/cpdfsdk_baannot.h"
diff --git a/fpdfsdk/cpdfsdk_environment.h b/fpdfsdk/cpdfsdk_environment.h
index f8e0218b59..0b46f55ac6 100644
--- a/fpdfsdk/cpdfsdk_environment.h
+++ b/fpdfsdk/cpdfsdk_environment.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxcrt/cfx_observable.h"
 #include "fpdfsdk/cfx_systemhandler.h"
diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp
index 855dc96da9..a5f3f127ba 100644
--- a/fpdfsdk/cpdfsdk_interform.cpp
+++ b/fpdfsdk/cpdfsdk_interform.cpp
@@ -10,11 +10,11 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cfdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_actionfields.h"
 #include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fxge/cfx_graphstatedata.h"
diff --git a/fpdfsdk/cpdfsdk_pageview.h b/fpdfsdk/cpdfsdk_pageview.h
index f837ba5a91..f29af7055a 100644
--- a/fpdfsdk/cpdfsdk_pageview.h
+++ b/fpdfsdk/cpdfsdk_pageview.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fxcrt/fx_system.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
 #include "fpdfsdk/cpdfsdk_document.h"
diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp
index 60ee192685..6647fd996a 100644
--- a/fpdfsdk/cpdfsdk_widgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_widgethandler.cpp
@@ -9,8 +9,8 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
 #include "fpdfsdk/cpdfsdk_document.h"
diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp
index 05107ed369..797cfe57f9 100644
--- a/fpdfsdk/formfiller/cba_fontmap.cpp
+++ b/fpdfsdk/formfiller/cba_fontmap.cpp
@@ -7,11 +7,11 @@
 #include "fpdfsdk/formfiller/cba_fontmap.h"
 
 #include "core/fpdfapi/font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_formfield.h"
 #include "core/fxge/cfx_substfont.h"
 #include "fpdfsdk/cpdfsdk_annot.h"
diff --git a/fpdfsdk/formfiller/cffl_formfiller.cpp b/fpdfsdk/formfiller/cffl_formfiller.cpp
index 35146aa455..858966c302 100644
--- a/fpdfsdk/formfiller/cffl_formfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_formfiller.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "fpdfsdk/cpdfsdk_document.h"
 #include "fpdfsdk/cpdfsdk_environment.h"
diff --git a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
index bb6b77897c..7e6def2cfe 100644
--- a/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
+++ b/fpdfsdk/formfiller/cffl_interactiveformfiller.cpp
@@ -6,8 +6,8 @@
 
 #include "fpdfsdk/formfiller/cffl_interactiveformfiller.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp
index 58a37d2e6d..2eac4e9513 100644
--- a/fpdfsdk/fpdf_flatten.cpp
+++ b/fpdfsdk/fpdf_flatten.cpp
@@ -8,13 +8,13 @@
 
 #include <algorithm>
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_number.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream_acc.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
 #include "core/fpdfdoc/cpdf_annot.h"
 #include "fpdfsdk/fsdk_define.h"
 
diff --git a/fpdfsdk/fpdf_progressive.cpp b/fpdfsdk/fpdf_progressive.cpp
index 8c08b8f310..1895d056ba 100644
--- a/fpdfsdk/fpdf_progressive.cpp
+++ b/fpdfsdk/fpdf_progressive.cpp
@@ -7,8 +7,8 @@
 #include "public/fpdf_progressive.h"
 
 #include "core/fpdfapi/cpdf_pagerendercontext.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fxcrt/fx_memory.h"
 #include "core/fxge/cfx_fxgedevice.h"
 #include "core/fxge/cfx_renderdevice.h"
diff --git a/fpdfsdk/fpdf_transformpage.cpp b/fpdfsdk/fpdf_transformpage.cpp
index c269e1379e..7a904702cc 100644
--- a/fpdfsdk/fpdf_transformpage.cpp
+++ b/fpdfsdk/fpdf_transformpage.cpp
@@ -6,15 +6,15 @@
 
 #include "public/fpdf_transformpage.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_clippath.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_path.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_number.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_reference.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
+#include "core/fpdfapi/page/cpdf_clippath.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_path.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "fpdfsdk/fsdk_define.h"
 
diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp
index 7abeca38c4..639fed9dff 100644
--- a/fpdfsdk/fpdfdoc.cpp
+++ b/fpdfsdk/fpdfdoc.cpp
@@ -8,9 +8,9 @@
 
 #include <set>
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_bookmark.h"
 #include "core/fpdfdoc/cpdf_bookmarktree.h"
 #include "fpdfsdk/fsdk_define.h"
diff --git a/fpdfsdk/fpdfeditimg.cpp b/fpdfsdk/fpdfeditimg.cpp
index cd4d5525f4..042ad2bf37 100644
--- a/fpdfsdk/fpdfeditimg.cpp
+++ b/fpdfsdk/fpdfeditimg.cpp
@@ -7,9 +7,9 @@
 #include "public/fpdf_edit.h"
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
-#include "core/fpdfapi/fpdf_page/cpdf_image.h"
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_image.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
 #include "fpdfsdk/fsdk_define.h"
 #include "third_party/base/ptr_util.h"
 
diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp
index bc4013a263..2b7c350915 100644
--- a/fpdfsdk/fpdfeditpage.cpp
+++ b/fpdfsdk/fpdfeditpage.cpp
@@ -11,17 +11,17 @@
 #include <utility>
 
 #include "core/fpdfapi/edit/cpdf_pagecontentgenerator.h"
-#include "core/fpdfapi/fpdf_page/cpdf_form.h"
-#include "core/fpdfapi/fpdf_page/cpdf_formobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_imageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pathobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_shadingobject.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_number.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_string.h"
+#include "core/fpdfapi/page/cpdf_form.h"
+#include "core/fpdfapi/page/cpdf_formobject.h"
+#include "core/fpdfapi/page/cpdf_imageobject.h"
+#include "core/fpdfapi/page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pathobject.h"
+#include "core/fpdfapi/page/cpdf_shadingobject.h"
 #include "core/fpdfdoc/cpdf_annot.h"
 #include "core/fpdfdoc/cpdf_annotlist.h"
 #include "fpdfsdk/fsdk_define.h"
diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp
index a9a83b3541..624bbb39c7 100644
--- a/fpdfsdk/fpdfformfill.cpp
+++ b/fpdfsdk/fpdfformfill.cpp
@@ -9,9 +9,9 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_formcontrol.h"
 #include "core/fpdfdoc/cpdf_formfield.h"
 #include "core/fpdfdoc/cpdf_interform.h"
diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp
index 73c78bcfd0..4244a2dd96 100644
--- a/fpdfsdk/fpdftext.cpp
+++ b/fpdfsdk/fpdftext.cpp
@@ -6,7 +6,7 @@
 
 #include "public/fpdf_text.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_viewerpreferences.h"
 #include "core/fpdftext/cpdf_linkextract.h"
 #include "core/fpdftext/cpdf_textpage.h"
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index 552ec2a8c7..48a1b06307 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -11,12 +11,12 @@
 
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/cpdf_pagerendercontext.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
 #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_annotlist.h"
 #include "core/fpdfdoc/cpdf_nametree.h"
 #include "core/fpdfdoc/cpdf_occontext.h"
diff --git a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
index b3bc20bad8..4a0ebf0d15 100644
--- a/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
+++ b/fpdfsdk/fpdfxfa/fpdfxfa_page.cpp
@@ -6,8 +6,8 @@
 
 #include "fpdfsdk/fpdfxfa/fpdfxfa_page.h"
 
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "fpdfsdk/fpdfxfa/fpdfxfa_doc.h"
 #include "fpdfsdk/fpdfxfa/fpdfxfa_util.h"
 #include "fpdfsdk/fsdk_define.h"
diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp
index 8ea2885b73..2ebbf2cb05 100644
--- a/fpdfsdk/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/fxedit/fxet_edit.cpp
@@ -11,13 +11,13 @@
 #include <utility>
 
 #include "core/fpdfapi/font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
-#include "core/fpdfapi/fpdf_page/cpdf_pathobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
 #include "core/fpdfapi/fpdf_render/cpdf_textrenderer.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_pageobjectholder.h"
+#include "core/fpdfapi/page/cpdf_pathobject.h"
+#include "core/fpdfapi/page/cpdf_textobject.h"
 #include "core/fpdfdoc/cpvt_section.h"
 #include "core/fpdfdoc/cpvt_word.h"
 #include "core/fpdfdoc/ipvt_fontmap.h"
diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp
index 48cf7824dd..db1b5b0809 100644
--- a/fpdfsdk/javascript/Document.cpp
+++ b/fpdfsdk/javascript/Document.cpp
@@ -10,10 +10,10 @@
 #include <vector>
 
 #include "core/fpdfapi/font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fpdfdoc/cpdf_nametree.h"
 #include "fpdfsdk/cpdfsdk_annotiterator.h"
diff --git a/fpdfsdk/javascript/Document.h b/fpdfsdk/javascript/Document.h
index ad01cb27c3..5f33cf1f69 100644
--- a/fpdfsdk/javascript/Document.h
+++ b/fpdfsdk/javascript/Document.h
@@ -11,8 +11,8 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
-#include "core/fpdfapi/fpdf_page/cpdf_textobject.h"
+#include "core/fpdfapi/page/cpdf_pageobject.h"
+#include "core/fpdfapi/page/cpdf_textobject.h"
 #include "fpdfsdk/cpdfsdk_document.h"
 #include "fpdfsdk/javascript/JS_Define.h"
 
diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp
index 78d00f0a1d..35eeefa83e 100644
--- a/fpdfsdk/javascript/Field.cpp
+++ b/fpdfsdk/javascript/Field.cpp
@@ -12,8 +12,8 @@
 #include <vector>
 
 #include "core/fpdfapi/font/cpdf_font.h"
-#include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
+#include "core/fpdfapi/page/cpdf_page.h"
 #include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/cpdfsdk_document.h"
 #include "fpdfsdk/cpdfsdk_environment.h"
diff --git a/xfa/fxfa/app/DEPS b/xfa/fxfa/app/DEPS
index 78bd1ed55d..662b4b9d14 100644
--- a/xfa/fxfa/app/DEPS
+++ b/xfa/fxfa/app/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   '+core/fdrm/crypto',
   '+core/fpdfapi/font',
-  '+core/fpdfapi/fpdf_page',
+  '+core/fpdfapi/page',
   '+core/fpdfapi/fpdf_parser',
   '+core/fpdfdoc',
   '+core/fxcodec',
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp
index 1a1ff49ab1..cac9ccf26d 100644
--- a/xfa/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <memory>
 
-#include "core/fpdfapi/fpdf_page/cpdf_pageobjectholder.h"
+#include "core/fpdfapi/page/cpdf_pageobjectholder.h"
 #include "core/fxcodec/codec/ccodec_progressivedecoder.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxge/cfx_gemodule.h"