diff --git a/BUILD.gn b/BUILD.gn
index 83f68fb..8e552f3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -239,33 +239,55 @@
     "core/fpdfdoc/clines.cpp",
     "core/fpdfdoc/clines.h",
     "core/fpdfdoc/cpdf_aaction.cpp",
+    "core/fpdfdoc/cpdf_aaction.h",
     "core/fpdfdoc/cpdf_action.cpp",
+    "core/fpdfdoc/cpdf_action.h",
     "core/fpdfdoc/cpdf_actionfields.cpp",
+    "core/fpdfdoc/cpdf_actionfields.h",
     "core/fpdfdoc/cpdf_annot.cpp",
+    "core/fpdfdoc/cpdf_annot.h",
     "core/fpdfdoc/cpdf_annotlist.cpp",
+    "core/fpdfdoc/cpdf_annotlist.h",
     "core/fpdfdoc/cpdf_apsettings.cpp",
     "core/fpdfdoc/cpdf_apsettings.h",
     "core/fpdfdoc/cpdf_bookmark.cpp",
+    "core/fpdfdoc/cpdf_bookmark.h",
     "core/fpdfdoc/cpdf_bookmarktree.cpp",
+    "core/fpdfdoc/cpdf_bookmarktree.h",
     "core/fpdfdoc/cpdf_defaultappearance.cpp",
+    "core/fpdfdoc/cpdf_defaultappearance.h",
     "core/fpdfdoc/cpdf_dest.cpp",
+    "core/fpdfdoc/cpdf_dest.h",
     "core/fpdfdoc/cpdf_docjsactions.cpp",
+    "core/fpdfdoc/cpdf_docjsactions.h",
     "core/fpdfdoc/cpdf_filespec.cpp",
+    "core/fpdfdoc/cpdf_filespec.h",
     "core/fpdfdoc/cpdf_formcontrol.cpp",
+    "core/fpdfdoc/cpdf_formcontrol.h",
     "core/fpdfdoc/cpdf_formfield.cpp",
+    "core/fpdfdoc/cpdf_formfield.h",
     "core/fpdfdoc/cpdf_iconfit.cpp",
+    "core/fpdfdoc/cpdf_iconfit.h",
     "core/fpdfdoc/cpdf_interform.cpp",
+    "core/fpdfdoc/cpdf_interform.h",
     "core/fpdfdoc/cpdf_link.cpp",
+    "core/fpdfdoc/cpdf_link.h",
     "core/fpdfdoc/cpdf_linklist.cpp",
+    "core/fpdfdoc/cpdf_linklist.h",
     "core/fpdfdoc/cpdf_metadata.cpp",
+    "core/fpdfdoc/cpdf_metadata.h",
     "core/fpdfdoc/cpdf_nametree.cpp",
+    "core/fpdfdoc/cpdf_nametree.h",
     "core/fpdfdoc/cpdf_numbertree.cpp",
     "core/fpdfdoc/cpdf_numbertree.h",
     "core/fpdfdoc/cpdf_occontext.cpp",
+    "core/fpdfdoc/cpdf_occontext.h",
     "core/fpdfdoc/cpdf_pagelabel.cpp",
     "core/fpdfdoc/cpdf_pagelabel.h",
     "core/fpdfdoc/cpdf_variabletext.cpp",
+    "core/fpdfdoc/cpdf_variabletext.h",
     "core/fpdfdoc/cpdf_viewerpreferences.cpp",
+    "core/fpdfdoc/cpdf_viewerpreferences.h",
     "core/fpdfdoc/cpvt_arraytemplate.h",
     "core/fpdfdoc/cpvt_color.cpp",
     "core/fpdfdoc/cpvt_color.h",
@@ -275,48 +297,26 @@
     "core/fpdfdoc/cpvt_fontmap.h",
     "core/fpdfdoc/cpvt_generateap.cpp",
     "core/fpdfdoc/cpvt_generateap.h",
+    "core/fpdfdoc/cpvt_line.h",
     "core/fpdfdoc/cpvt_lineinfo.h",
+    "core/fpdfdoc/cpvt_secprops.h",
+    "core/fpdfdoc/cpvt_section.h",
     "core/fpdfdoc/cpvt_sectioninfo.cpp",
     "core/fpdfdoc/cpvt_sectioninfo.h",
+    "core/fpdfdoc/cpvt_word.h",
     "core/fpdfdoc/cpvt_wordinfo.cpp",
     "core/fpdfdoc/cpvt_wordinfo.h",
+    "core/fpdfdoc/cpvt_wordplace.h",
+    "core/fpdfdoc/cpvt_wordprops.h",
+    "core/fpdfdoc/cpvt_wordrange.h",
     "core/fpdfdoc/csection.cpp",
     "core/fpdfdoc/csection.h",
     "core/fpdfdoc/ctypeset.cpp",
     "core/fpdfdoc/ctypeset.h",
     "core/fpdfdoc/doc_tagged.cpp",
-    "core/fpdfdoc/include/cpdf_aaction.h",
-    "core/fpdfdoc/include/cpdf_action.h",
-    "core/fpdfdoc/include/cpdf_actionfields.h",
-    "core/fpdfdoc/include/cpdf_annot.h",
-    "core/fpdfdoc/include/cpdf_annotlist.h",
-    "core/fpdfdoc/include/cpdf_bookmark.h",
-    "core/fpdfdoc/include/cpdf_bookmarktree.h",
-    "core/fpdfdoc/include/cpdf_defaultappearance.h",
-    "core/fpdfdoc/include/cpdf_dest.h",
-    "core/fpdfdoc/include/cpdf_docjsactions.h",
-    "core/fpdfdoc/include/cpdf_filespec.h",
-    "core/fpdfdoc/include/cpdf_formcontrol.h",
-    "core/fpdfdoc/include/cpdf_formfield.h",
-    "core/fpdfdoc/include/cpdf_iconfit.h",
-    "core/fpdfdoc/include/cpdf_interform.h",
-    "core/fpdfdoc/include/cpdf_link.h",
-    "core/fpdfdoc/include/cpdf_linklist.h",
-    "core/fpdfdoc/include/cpdf_metadata.h",
-    "core/fpdfdoc/include/cpdf_nametree.h",
-    "core/fpdfdoc/include/cpdf_occontext.h",
-    "core/fpdfdoc/include/cpdf_variabletext.h",
-    "core/fpdfdoc/include/cpdf_viewerpreferences.h",
-    "core/fpdfdoc/include/cpvt_line.h",
-    "core/fpdfdoc/include/cpvt_secprops.h",
-    "core/fpdfdoc/include/cpvt_section.h",
-    "core/fpdfdoc/include/cpvt_word.h",
-    "core/fpdfdoc/include/cpvt_wordplace.h",
-    "core/fpdfdoc/include/cpvt_wordprops.h",
-    "core/fpdfdoc/include/cpvt_wordrange.h",
-    "core/fpdfdoc/include/fpdf_tagged.h",
-    "core/fpdfdoc/include/ipdf_formnotify.h",
-    "core/fpdfdoc/include/ipvt_fontmap.h",
+    "core/fpdfdoc/fpdf_tagged.h",
+    "core/fpdfdoc/ipdf_formnotify.h",
+    "core/fpdfdoc/ipvt_fontmap.h",
     "core/fpdfdoc/tagged_int.h",
   ]
   configs += [ ":pdfium_core_config" ]
diff --git a/core/fpdfapi/cpdf_pagerendercontext.cpp b/core/fpdfapi/cpdf_pagerendercontext.cpp
index 6a19181..e9a6f54 100644
--- a/core/fpdfapi/cpdf_pagerendercontext.cpp
+++ b/core/fpdfapi/cpdf_pagerendercontext.cpp
@@ -9,8 +9,8 @@
 #include "core/fpdfapi/fpdf_render/cpdf_progressiverenderer.h"
 #include "core/fpdfapi/fpdf_render/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
-#include "core/fpdfdoc/include/cpdf_annotlist.h"
-#include "core/fpdfdoc/include/cpdf_occontext.h"
+#include "core/fpdfdoc/cpdf_annotlist.h"
+#include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxge/include/cfx_renderdevice.h"
 
 CPDF_PageRenderContext::CPDF_PageRenderContext() {}
diff --git a/core/fpdfapi/fpdf_parser/cpdf_document.h b/core/fpdfapi/fpdf_parser/cpdf_document.h
index cac9dfb..46b4d78 100644
--- a/core/fpdfapi/fpdf_parser/cpdf_document.h
+++ b/core/fpdfapi/fpdf_parser/cpdf_document.h
@@ -12,7 +12,7 @@
 
 #include "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_object.h"
-#include "core/fpdfdoc/include/cpdf_linklist.h"
+#include "core/fpdfdoc/cpdf_linklist.h"
 #include "core/fxcrt/include/cfx_string_pool_template.h"
 #include "core/fxcrt/include/cfx_weak_ptr.h"
 #include "core/fxcrt/include/fx_basic.h"
diff --git a/core/fpdfapi/fpdf_render/fpdf_render.cpp b/core/fpdfapi/fpdf_render/fpdf_render.cpp
index 19bfc1c..d610670 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render.cpp
@@ -29,7 +29,7 @@
 #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/fpdfdoc/include/cpdf_occontext.h"
+#include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxge/include/cfx_fxgedevice.h"
 #include "core/fxge/include/cfx_graphstatedata.h"
 #include "core/fxge/include/cfx_pathdata.h"
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
index cfb392d..62b92c6 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -23,7 +23,7 @@
 #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/fpdfdoc/include/cpdf_occontext.h"
+#include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_safe_types.h"
 #include "core/fxge/include/cfx_fxgedevice.h"
diff --git a/core/fpdfdoc/cline.h b/core/fpdfdoc/cline.h
index a0cdbfd..6f95beb 100644
--- a/core/fpdfdoc/cline.h
+++ b/core/fpdfdoc/cline.h
@@ -8,7 +8,7 @@
 #define CORE_FPDFDOC_CLINE_H_
 
 #include "core/fpdfdoc/cpvt_lineinfo.h"
-#include "core/fpdfdoc/include/cpvt_wordplace.h"
+#include "core/fpdfdoc/cpvt_wordplace.h"
 
 class CLine final {
  public:
diff --git a/core/fpdfdoc/cpdf_aaction.cpp b/core/fpdfdoc/cpdf_aaction.cpp
index 588c4c3..da654b1 100644
--- a/core/fpdfdoc/cpdf_aaction.cpp
+++ b/core/fpdfdoc/cpdf_aaction.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_aaction.h"
+#include "core/fpdfdoc/cpdf_aaction.h"
 
 namespace {
 
diff --git a/core/fpdfdoc/include/cpdf_aaction.h b/core/fpdfdoc/cpdf_aaction.h
similarity index 83%
rename from core/fpdfdoc/include/cpdf_aaction.h
rename to core/fpdfdoc/cpdf_aaction.h
index b3a55da..cef39f0 100644
--- a/core/fpdfdoc/include/cpdf_aaction.h
+++ b/core/fpdfdoc/cpdf_aaction.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_AACTION_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_AACTION_H_
+#ifndef CORE_FPDFDOC_CPDF_AACTION_H_
+#define CORE_FPDFDOC_CPDF_AACTION_H_
 
-#include "core/fpdfdoc/include/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_action.h"
 
 class CPDF_Dictionary;
 
@@ -48,4 +48,4 @@
   CPDF_Dictionary* const m_pDict;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_AACTION_H_
+#endif  // CORE_FPDFDOC_CPDF_AACTION_H_
diff --git a/core/fpdfdoc/cpdf_action.cpp b/core/fpdfdoc/cpdf_action.cpp
index b646621..d239257 100644
--- a/core/fpdfdoc/cpdf_action.cpp
+++ b/core/fpdfdoc/cpdf_action.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_action.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fpdfdoc/include/cpdf_filespec.h"
-#include "core/fpdfdoc/include/cpdf_nametree.h"
+#include "core/fpdfdoc/cpdf_filespec.h"
+#include "core/fpdfdoc/cpdf_nametree.h"
 
 namespace {
 
diff --git a/core/fpdfdoc/include/cpdf_action.h b/core/fpdfdoc/cpdf_action.h
similarity index 88%
rename from core/fpdfdoc/include/cpdf_action.h
rename to core/fpdfdoc/cpdf_action.h
index 209f1f9..7bef84d 100644
--- a/core/fpdfdoc/include/cpdf_action.h
+++ b/core/fpdfdoc/cpdf_action.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ACTION_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_ACTION_H_
+#ifndef CORE_FPDFDOC_CPDF_ACTION_H_
+#define CORE_FPDFDOC_CPDF_ACTION_H_
 
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
-#include "core/fpdfdoc/include/cpdf_dest.h"
+#include "core/fpdfdoc/cpdf_dest.h"
 #include "core/fxcrt/include/fx_string.h"
 
 class CPDF_Document;
@@ -56,4 +56,4 @@
   CPDF_Dictionary* const m_pDict;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_ACTION_H_
+#endif  // CORE_FPDFDOC_CPDF_ACTION_H_
diff --git a/core/fpdfdoc/cpdf_actionfields.cpp b/core/fpdfdoc/cpdf_actionfields.cpp
index f9ac76e..d87da28 100644
--- a/core/fpdfdoc/cpdf_actionfields.cpp
+++ b/core/fpdfdoc/cpdf_actionfields.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_actionfields.h"
+#include "core/fpdfdoc/cpdf_actionfields.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
-#include "core/fpdfdoc/include/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_action.h"
 
 size_t CPDF_ActionFields::GetFieldsCount() const {
   if (!m_pAction)
diff --git a/core/fpdfdoc/include/cpdf_actionfields.h b/core/fpdfdoc/cpdf_actionfields.h
similarity index 80%
rename from core/fpdfdoc/include/cpdf_actionfields.h
rename to core/fpdfdoc/cpdf_actionfields.h
index 0f38e1d..9e0664c 100644
--- a/core/fpdfdoc/include/cpdf_actionfields.h
+++ b/core/fpdfdoc/cpdf_actionfields.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ACTIONFIELDS_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_ACTIONFIELDS_H_
+#ifndef CORE_FPDFDOC_CPDF_ACTIONFIELDS_H_
+#define CORE_FPDFDOC_CPDF_ACTIONFIELDS_H_
 
 #include <stddef.h>
 
@@ -26,4 +26,4 @@
   const CPDF_Action* const m_pAction;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_ACTIONFIELDS_H_
+#endif  // CORE_FPDFDOC_CPDF_ACTIONFIELDS_H_
diff --git a/core/fpdfdoc/cpdf_annot.cpp b/core/fpdfdoc/cpdf_annot.cpp
index 7a85ad1..17b2d56 100644
--- a/core/fpdfdoc/cpdf_annot.cpp
+++ b/core/fpdfdoc/cpdf_annot.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_annot.h"
 
 #include "core/fpdfapi/fpdf_page/cpdf_form.h"
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
diff --git a/core/fpdfdoc/include/cpdf_annot.h b/core/fpdfdoc/cpdf_annot.h
similarity index 96%
rename from core/fpdfdoc/include/cpdf_annot.h
rename to core/fpdfdoc/cpdf_annot.h
index e88375a..f316625 100644
--- a/core/fpdfdoc/include/cpdf_annot.h
+++ b/core/fpdfdoc/cpdf_annot.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_
+#ifndef CORE_FPDFDOC_CPDF_ANNOT_H_
+#define CORE_FPDFDOC_CPDF_ANNOT_H_
 
 #include <map>
 #include <memory>
@@ -128,4 +128,4 @@
 CPDF_Stream* FPDFDOC_GetAnnotAP(CPDF_Dictionary* pAnnotDict,
                                 CPDF_Annot::AppearanceMode mode);
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_ANNOT_H_
+#endif  // CORE_FPDFDOC_CPDF_ANNOT_H_
diff --git a/core/fpdfdoc/cpdf_annotlist.cpp b/core/fpdfdoc/cpdf_annotlist.cpp
index a76c341..d19f9b4 100644
--- a/core/fpdfdoc/cpdf_annotlist.cpp
+++ b/core/fpdfdoc/cpdf_annotlist.cpp
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_annotlist.h"
+#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/fpdfdoc/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fpdfdoc/cpvt_generateap.h"
-#include "core/fpdfdoc/include/cpdf_annot.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
-#include "core/fpdfdoc/include/cpdf_occontext.h"
 #include "core/fxge/include/cfx_renderdevice.h"
 
 namespace {
diff --git a/core/fpdfdoc/include/cpdf_annotlist.h b/core/fpdfdoc/cpdf_annotlist.h
similarity index 92%
rename from core/fpdfdoc/include/cpdf_annotlist.h
rename to core/fpdfdoc/cpdf_annotlist.h
index f76ec64..afe85f3 100644
--- a/core/fpdfdoc/include/cpdf_annotlist.h
+++ b/core/fpdfdoc/cpdf_annotlist.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ANNOTLIST_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_ANNOTLIST_H_
+#ifndef CORE_FPDFDOC_CPDF_ANNOTLIST_H_
+#define CORE_FPDFDOC_CPDF_ANNOTLIST_H_
 
 #include <memory>
 #include <vector>
@@ -61,4 +61,4 @@
   std::vector<std::unique_ptr<CPDF_Annot>> m_AnnotList;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_ANNOTLIST_H_
+#endif  // CORE_FPDFDOC_CPDF_ANNOTLIST_H_
diff --git a/core/fpdfdoc/cpdf_apsettings.cpp b/core/fpdfdoc/cpdf_apsettings.cpp
index 33d9b06..1c20792 100644
--- a/core/fpdfdoc/cpdf_apsettings.cpp
+++ b/core/fpdfdoc/cpdf_apsettings.cpp
@@ -8,7 +8,7 @@
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
-#include "core/fpdfdoc/include/cpdf_formcontrol.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
 
 CPDF_ApSettings::CPDF_ApSettings(CPDF_Dictionary* pDict) : m_pDict(pDict) {}
 
diff --git a/core/fpdfdoc/cpdf_apsettings.h b/core/fpdfdoc/cpdf_apsettings.h
index 860807ef..4354ac0 100644
--- a/core/fpdfdoc/cpdf_apsettings.h
+++ b/core/fpdfdoc/cpdf_apsettings.h
@@ -7,7 +7,7 @@
 #ifndef CORE_FPDFDOC_CPDF_APSETTINGS_H_
 #define CORE_FPDFDOC_CPDF_APSETTINGS_H_
 
-#include "core/fpdfdoc/include/cpdf_iconfit.h"
+#include "core/fpdfdoc/cpdf_iconfit.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
 #include "core/fxge/include/fx_dib.h"
diff --git a/core/fpdfdoc/cpdf_bookmark.cpp b/core/fpdfdoc/cpdf_bookmark.cpp
index b82cee8..fb74567 100644
--- a/core/fpdfdoc/cpdf_bookmark.cpp
+++ b/core/fpdfdoc/cpdf_bookmark.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_bookmark.h"
+#include "core/fpdfdoc/cpdf_bookmark.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_string.h"
-#include "core/fpdfdoc/include/cpdf_nametree.h"
+#include "core/fpdfdoc/cpdf_nametree.h"
 #include "core/fxge/include/fx_dib.h"
 
 uint32_t CPDF_Bookmark::GetColorRef() const {
diff --git a/core/fpdfdoc/include/cpdf_bookmark.h b/core/fpdfdoc/cpdf_bookmark.h
similarity index 76%
rename from core/fpdfdoc/include/cpdf_bookmark.h
rename to core/fpdfdoc/cpdf_bookmark.h
index ba0b059..b19ebbb 100644
--- a/core/fpdfdoc/include/cpdf_bookmark.h
+++ b/core/fpdfdoc/cpdf_bookmark.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARK_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARK_H_
+#ifndef CORE_FPDFDOC_CPDF_BOOKMARK_H_
+#define CORE_FPDFDOC_CPDF_BOOKMARK_H_
 
-#include "core/fpdfdoc/include/cpdf_action.h"
-#include "core/fpdfdoc/include/cpdf_dest.h"
+#include "core/fpdfdoc/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_dest.h"
 #include "core/fxcrt/include/fx_string.h"
 
 class CPDF_Dictionary;
@@ -30,4 +30,4 @@
   CPDF_Dictionary* m_pDict;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARK_H_
+#endif  // CORE_FPDFDOC_CPDF_BOOKMARK_H_
diff --git a/core/fpdfdoc/cpdf_bookmarktree.cpp b/core/fpdfdoc/cpdf_bookmarktree.cpp
index 7ff4b09..7ede3fe 100644
--- a/core/fpdfdoc/cpdf_bookmarktree.cpp
+++ b/core/fpdfdoc/cpdf_bookmarktree.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_bookmarktree.h"
+#include "core/fpdfdoc/cpdf_bookmarktree.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 
diff --git a/core/fpdfdoc/include/cpdf_bookmarktree.h b/core/fpdfdoc/cpdf_bookmarktree.h
similarity index 75%
rename from core/fpdfdoc/include/cpdf_bookmarktree.h
rename to core/fpdfdoc/cpdf_bookmarktree.h
index f496053..7207357 100644
--- a/core/fpdfdoc/include/cpdf_bookmarktree.h
+++ b/core/fpdfdoc/cpdf_bookmarktree.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARKTREE_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARKTREE_H_
+#ifndef CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_
+#define CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_
 
-#include "core/fpdfdoc/include/cpdf_bookmark.h"
+#include "core/fpdfdoc/cpdf_bookmark.h"
 
 class CPDF_Document;
 
@@ -23,4 +23,4 @@
   CPDF_Document* const m_pDocument;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_BOOKMARKTREE_H_
+#endif  // CORE_FPDFDOC_CPDF_BOOKMARKTREE_H_
diff --git a/core/fpdfdoc/cpdf_defaultappearance.cpp b/core/fpdfdoc/cpdf_defaultappearance.cpp
index 4049178..39f2d23 100644
--- a/core/fpdfdoc/cpdf_defaultappearance.cpp
+++ b/core/fpdfdoc/cpdf_defaultappearance.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_defaultappearance.h"
+#include "core/fpdfdoc/cpdf_defaultappearance.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
-#include "core/fpdfdoc/include/cpdf_formcontrol.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
 
 FX_BOOL CPDF_DefaultAppearance::HasFont() {
   if (m_csDA.IsEmpty())
diff --git a/core/fpdfdoc/include/cpdf_defaultappearance.h b/core/fpdfdoc/cpdf_defaultappearance.h
similarity index 86%
rename from core/fpdfdoc/include/cpdf_defaultappearance.h
rename to core/fpdfdoc/cpdf_defaultappearance.h
index c0fd3de..c09a5aa 100644
--- a/core/fpdfdoc/include/cpdf_defaultappearance.h
+++ b/core/fpdfdoc/cpdf_defaultappearance.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_DEFAULTAPPEARANCE_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_DEFAULTAPPEARANCE_H_
+#ifndef CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_
+#define CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_
 
-#include "core/fpdfdoc/include/cpdf_defaultappearance.h"
+#include "core/fpdfdoc/cpdf_defaultappearance.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
@@ -49,4 +49,4 @@
   CFX_ByteString m_csDA;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_DEFAULTAPPEARANCE_H_
+#endif  // CORE_FPDFDOC_CPDF_DEFAULTAPPEARANCE_H_
diff --git a/core/fpdfdoc/cpdf_dest.cpp b/core/fpdfdoc/cpdf_dest.cpp
index 6a843c6..da4b9a6 100644
--- a/core/fpdfdoc/cpdf_dest.cpp
+++ b/core/fpdfdoc/cpdf_dest.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_dest.h"
+#include "core/fpdfdoc/cpdf_dest.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
diff --git a/core/fpdfdoc/include/cpdf_dest.h b/core/fpdfdoc/cpdf_dest.h
similarity index 84%
rename from core/fpdfdoc/include/cpdf_dest.h
rename to core/fpdfdoc/cpdf_dest.h
index 82d8a2b..7a966e2 100644
--- a/core/fpdfdoc/include/cpdf_dest.h
+++ b/core/fpdfdoc/cpdf_dest.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_DEST_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_DEST_H_
+#ifndef CORE_FPDFDOC_CPDF_DEST_H_
+#define CORE_FPDFDOC_CPDF_DEST_H_
 
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
@@ -29,4 +29,4 @@
   CPDF_Object* m_pObj;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_DEST_H_
+#endif  // CORE_FPDFDOC_CPDF_DEST_H_
diff --git a/core/fpdfdoc/cpdf_docjsactions.cpp b/core/fpdfdoc/cpdf_docjsactions.cpp
index 897cdac..a7fcdfd 100644
--- a/core/fpdfdoc/cpdf_docjsactions.cpp
+++ b/core/fpdfdoc/cpdf_docjsactions.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_docjsactions.h"
+#include "core/fpdfdoc/cpdf_docjsactions.h"
 
-#include "core/fpdfdoc/include/cpdf_nametree.h"
+#include "core/fpdfdoc/cpdf_nametree.h"
 
 CPDF_DocJSActions::CPDF_DocJSActions(CPDF_Document* pDoc) : m_pDocument(pDoc) {}
 
diff --git a/core/fpdfdoc/include/cpdf_docjsactions.h b/core/fpdfdoc/cpdf_docjsactions.h
similarity index 78%
rename from core/fpdfdoc/include/cpdf_docjsactions.h
rename to core/fpdfdoc/cpdf_docjsactions.h
index 137b6af..34b8b7e 100644
--- a/core/fpdfdoc/include/cpdf_docjsactions.h
+++ b/core/fpdfdoc/cpdf_docjsactions.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_DOCJSACTIONS_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_DOCJSACTIONS_H_
+#ifndef CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_
+#define CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_
 
-#include "core/fpdfdoc/include/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_action.h"
 #include "core/fxcrt/include/fx_string.h"
 
 class CPDF_Document;
@@ -26,4 +26,4 @@
   CPDF_Document* const m_pDocument;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_DOCJSACTIONS_H_
+#endif  // CORE_FPDFDOC_CPDF_DOCJSACTIONS_H_
diff --git a/core/fpdfdoc/cpdf_filespec.cpp b/core/fpdfdoc/cpdf_filespec.cpp
index 6c30cdb..51b8b35 100644
--- a/core/fpdfdoc/cpdf_filespec.cpp
+++ b/core/fpdfdoc/cpdf_filespec.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_filespec.h"
+#include "core/fpdfdoc/cpdf_filespec.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_object.h"
diff --git a/core/fpdfdoc/include/cpdf_filespec.h b/core/fpdfdoc/cpdf_filespec.h
similarity index 88%
rename from core/fpdfdoc/include/cpdf_filespec.h
rename to core/fpdfdoc/cpdf_filespec.h
index 66f35fc..c960a83 100644
--- a/core/fpdfdoc/include/cpdf_filespec.h
+++ b/core/fpdfdoc/cpdf_filespec.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_FILESPEC_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_FILESPEC_H_
+#ifndef CORE_FPDFDOC_CPDF_FILESPEC_H_
+#define CORE_FPDFDOC_CPDF_FILESPEC_H_
 
 #include "core/fxcrt/include/cfx_string_pool_template.h"
 #include "core/fxcrt/include/cfx_weak_ptr.h"
@@ -34,4 +34,4 @@
   CPDF_Object* m_pObj;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_FILESPEC_H_
+#endif  // CORE_FPDFDOC_CPDF_FILESPEC_H_
diff --git a/core/fpdfdoc/cpdf_filespec_unittest.cpp b/core/fpdfdoc/cpdf_filespec_unittest.cpp
index b1b20e1..c0f08dc 100644
--- a/core/fpdfdoc/cpdf_filespec_unittest.cpp
+++ b/core/fpdfdoc/cpdf_filespec_unittest.cpp
@@ -8,7 +8,7 @@
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_name.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_string.h"
-#include "core/fpdfdoc/include/cpdf_filespec.h"
+#include "core/fpdfdoc/cpdf_filespec.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/test_support.h"
 
diff --git a/core/fpdfdoc/cpdf_formcontrol.cpp b/core/fpdfdoc/cpdf_formcontrol.cpp
index 24cb044..82a416f 100644
--- a/core/fpdfdoc/cpdf_formcontrol.cpp
+++ b/core/fpdfdoc/cpdf_formcontrol.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_formcontrol.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
 
 #include <algorithm>
 
@@ -14,7 +14,7 @@
 #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/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fxge/include/cfx_renderdevice.h"
 
 namespace {
diff --git a/core/fpdfdoc/include/cpdf_formcontrol.h b/core/fpdfdoc/cpdf_formcontrol.h
similarity index 87%
rename from core/fpdfdoc/include/cpdf_formcontrol.h
rename to core/fpdfdoc/cpdf_formcontrol.h
index c73318f..3f6cb53 100644
--- a/core/fpdfdoc/include/cpdf_formcontrol.h
+++ b/core/fpdfdoc/cpdf_formcontrol.h
@@ -4,18 +4,18 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_FORMCONTROL_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_FORMCONTROL_H_
+#ifndef CORE_FPDFDOC_CPDF_FORMCONTROL_H_
+#define CORE_FPDFDOC_CPDF_FORMCONTROL_H_
 
+#include "core/fpdfdoc/cpdf_aaction.h"
+#include "core/fpdfdoc/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_annotlist.h"
 #include "core/fpdfdoc/cpdf_apsettings.h"
-#include "core/fpdfdoc/include/cpdf_aaction.h"
-#include "core/fpdfdoc/include/cpdf_action.h"
-#include "core/fpdfdoc/include/cpdf_annot.h"
-#include "core/fpdfdoc/include/cpdf_annotlist.h"
-#include "core/fpdfdoc/include/cpdf_defaultappearance.h"
-#include "core/fpdfdoc/include/cpdf_formfield.h"
-#include "core/fpdfdoc/include/cpdf_iconfit.h"
-#include "core/fpdfdoc/include/ipdf_formnotify.h"
+#include "core/fpdfdoc/cpdf_defaultappearance.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
+#include "core/fpdfdoc/cpdf_iconfit.h"
+#include "core/fpdfdoc/ipdf_formnotify.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxge/include/fx_dib.h"
@@ -131,4 +131,4 @@
   CPDF_InterForm* const m_pForm;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_FORMCONTROL_H_
+#endif  // CORE_FPDFDOC_CPDF_FORMCONTROL_H_
diff --git a/core/fpdfdoc/cpdf_formfield.cpp b/core/fpdfdoc/cpdf_formfield.cpp
index d709a53..4b4ba7f 100644
--- a/core/fpdfdoc/cpdf_formfield.cpp
+++ b/core/fpdfdoc/cpdf_formfield.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_formfield.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
 
 #include <set>
 
@@ -15,9 +15,9 @@
 #include "core/fpdfapi/fpdf_parser/cpdf_simple_parser.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_string.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fpdfdoc/cpvt_generateap.h"
-#include "core/fpdfdoc/include/cpdf_formcontrol.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
 #include "third_party/base/stl_util.h"
 
 namespace {
diff --git a/core/fpdfdoc/include/cpdf_formfield.h b/core/fpdfdoc/cpdf_formfield.h
similarity index 94%
rename from core/fpdfdoc/include/cpdf_formfield.h
rename to core/fpdfdoc/cpdf_formfield.h
index d39c6da..1d83eb0 100644
--- a/core/fpdfdoc/include/cpdf_formfield.h
+++ b/core/fpdfdoc/cpdf_formfield.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_FORMFIELD_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_FORMFIELD_H_
+#ifndef CORE_FPDFDOC_CPDF_FORMFIELD_H_
+#define CORE_FPDFDOC_CPDF_FORMFIELD_H_
 
-#include "core/fpdfdoc/include/cpdf_aaction.h"
-#include "core/fpdfdoc/include/cpdf_formfield.h"
+#include "core/fpdfdoc/cpdf_aaction.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
@@ -165,4 +165,4 @@
   CPDF_Font* m_pFont;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_FORMFIELD_H_
+#endif  // CORE_FPDFDOC_CPDF_FORMFIELD_H_
diff --git a/core/fpdfdoc/cpdf_formfield_unittest.cpp b/core/fpdfdoc/cpdf_formfield_unittest.cpp
index 6042fa9..1fe5ee3 100644
--- a/core/fpdfdoc/cpdf_formfield_unittest.cpp
+++ b/core/fpdfdoc/cpdf_formfield_unittest.cpp
@@ -4,7 +4,7 @@
 
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_indirect_object_holder.h"
-#include "core/fpdfdoc/include/cpdf_formfield.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(cpdf_formfield, FPDF_GetFullName) {
diff --git a/core/fpdfdoc/cpdf_iconfit.cpp b/core/fpdfdoc/cpdf_iconfit.cpp
index fe4fc9a..1b800b6 100644
--- a/core/fpdfdoc/cpdf_iconfit.cpp
+++ b/core/fpdfdoc/cpdf_iconfit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_iconfit.h"
+#include "core/fpdfdoc/cpdf_iconfit.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
diff --git a/core/fpdfdoc/include/cpdf_iconfit.h b/core/fpdfdoc/cpdf_iconfit.h
similarity index 84%
rename from core/fpdfdoc/include/cpdf_iconfit.h
rename to core/fpdfdoc/cpdf_iconfit.h
index a13730d..7461614 100644
--- a/core/fpdfdoc/include/cpdf_iconfit.h
+++ b/core/fpdfdoc/cpdf_iconfit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_ICONFIT_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_ICONFIT_H_
+#ifndef CORE_FPDFDOC_CPDF_ICONFIT_H_
+#define CORE_FPDFDOC_CPDF_ICONFIT_H_
 
 #include "core/fxcrt/include/fx_system.h"
 
@@ -27,4 +27,4 @@
   const CPDF_Dictionary* const m_pDict;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_ICONFIT_H_
+#endif  // CORE_FPDFDOC_CPDF_ICONFIT_H_
diff --git a/core/fpdfdoc/cpdf_interform.cpp b/core/fpdfdoc/cpdf_interform.cpp
index 7e54db2..00fff1a 100644
--- a/core/fpdfdoc/cpdf_interform.cpp
+++ b/core/fpdfdoc/cpdf_interform.cpp
@@ -13,9 +13,9 @@
 #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/fpdfdoc/include/cpdf_filespec.h"
-#include "core/fpdfdoc/include/cpdf_formcontrol.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_filespec.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fxge/include/cfx_substfont.h"
 #include "core/fxge/include/fx_font.h"
 #include "third_party/base/stl_util.h"
diff --git a/core/fpdfdoc/include/cpdf_interform.h b/core/fpdfdoc/cpdf_interform.h
similarity index 95%
rename from core/fpdfdoc/include/cpdf_interform.h
rename to core/fpdfdoc/cpdf_interform.h
index c5512d4..4c62a40 100644
--- a/core/fpdfdoc/include/cpdf_interform.h
+++ b/core/fpdfdoc/cpdf_interform.h
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_INTERFORM_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_INTERFORM_H_
+#ifndef CORE_FPDFDOC_CPDF_INTERFORM_H_
+#define CORE_FPDFDOC_CPDF_INTERFORM_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
-#include "core/fpdfdoc/include/cpdf_defaultappearance.h"
+#include "core/fpdfdoc/cpdf_defaultappearance.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
 
@@ -116,4 +116,4 @@
   IPDF_FormNotify* m_pFormNotify;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_INTERFORM_H_
+#endif  // CORE_FPDFDOC_CPDF_INTERFORM_H_
diff --git a/core/fpdfdoc/cpdf_link.cpp b/core/fpdfdoc/cpdf_link.cpp
index 6cb5318..3c2df15 100644
--- a/core/fpdfdoc/cpdf_link.cpp
+++ b/core/fpdfdoc/cpdf_link.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_link.h"
+#include "core/fpdfdoc/cpdf_link.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
-#include "core/fpdfdoc/include/cpdf_nametree.h"
+#include "core/fpdfdoc/cpdf_nametree.h"
 
 CFX_FloatRect CPDF_Link::GetRect() {
   return m_pDict->GetRectFor("Rect");
diff --git a/core/fpdfdoc/include/cpdf_link.h b/core/fpdfdoc/cpdf_link.h
similarity index 74%
rename from core/fpdfdoc/include/cpdf_link.h
rename to core/fpdfdoc/cpdf_link.h
index a3be3cc..ce99573 100644
--- a/core/fpdfdoc/include/cpdf_link.h
+++ b/core/fpdfdoc/cpdf_link.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_LINK_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_LINK_H_
+#ifndef CORE_FPDFDOC_CPDF_LINK_H_
+#define CORE_FPDFDOC_CPDF_LINK_H_
 
-#include "core/fpdfdoc/include/cpdf_action.h"
-#include "core/fpdfdoc/include/cpdf_dest.h"
+#include "core/fpdfdoc/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_dest.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 
 class CPDF_Dictionary;
@@ -28,4 +28,4 @@
   CPDF_Dictionary* m_pDict;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_LINK_H_
+#endif  // CORE_FPDFDOC_CPDF_LINK_H_
diff --git a/core/fpdfdoc/cpdf_linklist.cpp b/core/fpdfdoc/cpdf_linklist.cpp
index 326bdda..d08032d 100644
--- a/core/fpdfdoc/cpdf_linklist.cpp
+++ b/core/fpdfdoc/cpdf_linklist.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_linklist.h"
+#include "core/fpdfdoc/cpdf_linklist.h"
 
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
diff --git a/core/fpdfdoc/include/cpdf_linklist.h b/core/fpdfdoc/cpdf_linklist.h
similarity index 81%
rename from core/fpdfdoc/include/cpdf_linklist.h
rename to core/fpdfdoc/cpdf_linklist.h
index dd9f551..d5c0432 100644
--- a/core/fpdfdoc/include/cpdf_linklist.h
+++ b/core/fpdfdoc/cpdf_linklist.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_LINKLIST_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_LINKLIST_H_
+#ifndef CORE_FPDFDOC_CPDF_LINKLIST_H_
+#define CORE_FPDFDOC_CPDF_LINKLIST_H_
 
 #include <map>
 #include <vector>
 
-#include "core/fpdfdoc/include/cpdf_link.h"
+#include "core/fpdfdoc/cpdf_link.h"
 #include "core/fxcrt/include/fx_system.h"
 
 class CPDF_Page;
@@ -33,4 +33,4 @@
   std::map<uint32_t, std::vector<CPDF_Dictionary*>> m_PageMap;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_LINKLIST_H_
+#endif  // CORE_FPDFDOC_CPDF_LINKLIST_H_
diff --git a/core/fpdfdoc/cpdf_metadata.cpp b/core/fpdfdoc/cpdf_metadata.cpp
index 5fd8e92..8186c70 100644
--- a/core/fpdfdoc/cpdf_metadata.cpp
+++ b/core/fpdfdoc/cpdf_metadata.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_metadata.h"
+#include "core/fpdfdoc/cpdf_metadata.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
diff --git a/core/fpdfdoc/include/cpdf_metadata.h b/core/fpdfdoc/cpdf_metadata.h
similarity index 78%
rename from core/fpdfdoc/include/cpdf_metadata.h
rename to core/fpdfdoc/cpdf_metadata.h
index 31497dd..dd68dda 100644
--- a/core/fpdfdoc/include/cpdf_metadata.h
+++ b/core/fpdfdoc/cpdf_metadata.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_METADATA_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_METADATA_H_
+#ifndef CORE_FPDFDOC_CPDF_METADATA_H_
+#define CORE_FPDFDOC_CPDF_METADATA_H_
 
 #include <memory>
 
@@ -23,4 +23,4 @@
   std::unique_ptr<CXML_Element> m_pXmlElement;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_METADATA_H_
+#endif  // CORE_FPDFDOC_CPDF_METADATA_H_
diff --git a/core/fpdfdoc/cpdf_nametree.cpp b/core/fpdfdoc/cpdf_nametree.cpp
index c8f6ebf..37aab07 100644
--- a/core/fpdfdoc/cpdf_nametree.cpp
+++ b/core/fpdfdoc/cpdf_nametree.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_nametree.h"
+#include "core/fpdfdoc/cpdf_nametree.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
diff --git a/core/fpdfdoc/include/cpdf_nametree.h b/core/fpdfdoc/cpdf_nametree.h
similarity index 86%
rename from core/fpdfdoc/include/cpdf_nametree.h
rename to core/fpdfdoc/cpdf_nametree.h
index 39a520d..45308b7 100644
--- a/core/fpdfdoc/include/cpdf_nametree.h
+++ b/core/fpdfdoc/cpdf_nametree.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_NAMETREE_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_NAMETREE_H_
+#ifndef CORE_FPDFDOC_CPDF_NAMETREE_H_
+#define CORE_FPDFDOC_CPDF_NAMETREE_H_
 
 #include "core/fxcrt/include/fx_string.h"
 
@@ -31,4 +31,4 @@
   CPDF_Dictionary* m_pRoot;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_NAMETREE_H_
+#endif  // CORE_FPDFDOC_CPDF_NAMETREE_H_
diff --git a/core/fpdfdoc/cpdf_occontext.cpp b/core/fpdfdoc/cpdf_occontext.cpp
index 6cb0075..d2994ac 100644
--- a/core/fpdfdoc/cpdf_occontext.cpp
+++ b/core/fpdfdoc/cpdf_occontext.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_occontext.h"
+#include "core/fpdfdoc/cpdf_occontext.h"
 
 #include "core/fpdfapi/fpdf_page/cpdf_pageobject.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
diff --git a/core/fpdfdoc/include/cpdf_occontext.h b/core/fpdfdoc/cpdf_occontext.h
similarity index 88%
rename from core/fpdfdoc/include/cpdf_occontext.h
rename to core/fpdfdoc/cpdf_occontext.h
index 38e81705..5c850b9 100644
--- a/core/fpdfdoc/include/cpdf_occontext.h
+++ b/core/fpdfdoc/cpdf_occontext.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_OCCONTEXT_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_OCCONTEXT_H_
+#ifndef CORE_FPDFDOC_CPDF_OCCONTEXT_H_
+#define CORE_FPDFDOC_CPDF_OCCONTEXT_H_
 
 #include <unordered_map>
 
@@ -39,4 +39,4 @@
   std::unordered_map<const CPDF_Dictionary*, bool> m_OCGStates;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_OCCONTEXT_H_
+#endif  // CORE_FPDFDOC_CPDF_OCCONTEXT_H_
diff --git a/core/fpdfdoc/cpdf_variabletext.cpp b/core/fpdfdoc/cpdf_variabletext.cpp
index d8f8f5a..4ac6c6b 100644
--- a/core/fpdfdoc/cpdf_variabletext.cpp
+++ b/core/fpdfdoc/cpdf_variabletext.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_variabletext.h"
+#include "core/fpdfdoc/cpdf_variabletext.h"
 
 #include "core/fpdfapi/fpdf_font/cpdf_font.h"
 #include "core/fpdfdoc/cline.h"
+#include "core/fpdfdoc/cpvt_section.h"
+#include "core/fpdfdoc/cpvt_word.h"
 #include "core/fpdfdoc/cpvt_wordinfo.h"
 #include "core/fpdfdoc/csection.h"
-#include "core/fpdfdoc/include/cpvt_section.h"
-#include "core/fpdfdoc/include/cpvt_word.h"
-#include "core/fpdfdoc/include/ipvt_fontmap.h"
+#include "core/fpdfdoc/ipvt_fontmap.h"
 
 namespace {
 
diff --git a/core/fpdfdoc/include/cpdf_variabletext.h b/core/fpdfdoc/cpdf_variabletext.h
similarity index 96%
rename from core/fpdfdoc/include/cpdf_variabletext.h
rename to core/fpdfdoc/cpdf_variabletext.h
index 31cf75f..cc13b33 100644
--- a/core/fpdfdoc/include/cpdf_variabletext.h
+++ b/core/fpdfdoc/cpdf_variabletext.h
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_VARIABLETEXT_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_VARIABLETEXT_H_
+#ifndef CORE_FPDFDOC_CPDF_VARIABLETEXT_H_
+#define CORE_FPDFDOC_CPDF_VARIABLETEXT_H_
 
 #include <memory>
 
 #include "core/fpdfdoc/cpvt_arraytemplate.h"
 #include "core/fpdfdoc/cpvt_floatrect.h"
+#include "core/fpdfdoc/cpvt_line.h"
 #include "core/fpdfdoc/cpvt_lineinfo.h"
-#include "core/fpdfdoc/include/cpvt_line.h"
-#include "core/fpdfdoc/include/cpvt_wordplace.h"
-#include "core/fpdfdoc/include/cpvt_wordrange.h"
+#include "core/fpdfdoc/cpvt_wordplace.h"
+#include "core/fpdfdoc/cpvt_wordrange.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
@@ -242,4 +242,4 @@
   CPVT_FloatRect m_rcContent;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_VARIABLETEXT_H_
+#endif  // CORE_FPDFDOC_CPDF_VARIABLETEXT_H_
diff --git a/core/fpdfdoc/cpdf_viewerpreferences.cpp b/core/fpdfdoc/cpdf_viewerpreferences.cpp
index 5ebe2bb..98e22b3 100644
--- a/core/fpdfdoc/cpdf_viewerpreferences.cpp
+++ b/core/fpdfdoc/cpdf_viewerpreferences.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fpdfdoc/include/cpdf_viewerpreferences.h"
+#include "core/fpdfdoc/cpdf_viewerpreferences.h"
 
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 
diff --git a/core/fpdfdoc/include/cpdf_viewerpreferences.h b/core/fpdfdoc/cpdf_viewerpreferences.h
similarity index 82%
rename from core/fpdfdoc/include/cpdf_viewerpreferences.h
rename to core/fpdfdoc/cpdf_viewerpreferences.h
index d93c261..9375e85 100644
--- a/core/fpdfdoc/include/cpdf_viewerpreferences.h
+++ b/core/fpdfdoc/cpdf_viewerpreferences.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPDF_VIEWERPREFERENCES_H_
-#define CORE_FPDFDOC_INCLUDE_CPDF_VIEWERPREFERENCES_H_
+#ifndef CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_
+#define CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_
 
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
@@ -31,4 +31,4 @@
   CPDF_Document* const m_pDoc;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPDF_VIEWERPREFERENCES_H_
+#endif  // CORE_FPDFDOC_CPDF_VIEWERPREFERENCES_H_
diff --git a/core/fpdfdoc/cpvt_fontmap.cpp b/core/fpdfdoc/cpvt_fontmap.cpp
index cb600fb..908f69f 100644
--- a/core/fpdfdoc/cpvt_fontmap.cpp
+++ b/core/fpdfdoc/cpvt_fontmap.cpp
@@ -9,7 +9,7 @@
 #include "core/fpdfapi/fpdf_font/cpdf_font.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_dictionary.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 
 CPVT_FontMap::CPVT_FontMap(CPDF_Document* pDoc,
                            CPDF_Dictionary* pResDict,
diff --git a/core/fpdfdoc/cpvt_fontmap.h b/core/fpdfdoc/cpvt_fontmap.h
index 5c9b4ab..d5ec879 100644
--- a/core/fpdfdoc/cpvt_fontmap.h
+++ b/core/fpdfdoc/cpvt_fontmap.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include "core/fpdfdoc/include/ipvt_fontmap.h"
+#include "core/fpdfdoc/ipvt_fontmap.h"
 #include "core/fxcrt/include/fx_string.h"
 
 class CPDF_Document;
diff --git a/core/fpdfdoc/cpvt_generateap.cpp b/core/fpdfdoc/cpvt_generateap.cpp
index 96e11d3..c095036 100644
--- a/core/fpdfdoc/cpvt_generateap.cpp
+++ b/core/fpdfdoc/cpvt_generateap.cpp
@@ -14,11 +14,11 @@
 #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/fpdfdoc/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
 #include "core/fpdfdoc/cpvt_color.h"
 #include "core/fpdfdoc/cpvt_fontmap.h"
-#include "core/fpdfdoc/include/cpdf_annot.h"
-#include "core/fpdfdoc/include/cpdf_formfield.h"
-#include "core/fpdfdoc/include/cpvt_word.h"
+#include "core/fpdfdoc/cpvt_word.h"
 
 namespace {
 
diff --git a/core/fpdfdoc/cpvt_generateap.h b/core/fpdfdoc/cpvt_generateap.h
index 3fbc4cc..603d445 100644
--- a/core/fpdfdoc/cpvt_generateap.h
+++ b/core/fpdfdoc/cpvt_generateap.h
@@ -7,10 +7,10 @@
 #ifndef CORE_FPDFDOC_CPVT_GENERATEAP_H_
 #define CORE_FPDFDOC_CPVT_GENERATEAP_H_
 
+#include "core/fpdfdoc/cpdf_defaultappearance.h"
+#include "core/fpdfdoc/cpdf_variabletext.h"
 #include "core/fpdfdoc/cpvt_color.h"
 #include "core/fpdfdoc/cpvt_dash.h"
-#include "core/fpdfdoc/include/cpdf_defaultappearance.h"
-#include "core/fpdfdoc/include/cpdf_variabletext.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "core/fxcrt/include/fx_system.h"
diff --git a/core/fpdfdoc/include/cpvt_line.h b/core/fpdfdoc/cpvt_line.h
similarity index 76%
rename from core/fpdfdoc/include/cpvt_line.h
rename to core/fpdfdoc/cpvt_line.h
index d6c74ed..70e3b7f 100644
--- a/core/fpdfdoc/include/cpvt_line.h
+++ b/core/fpdfdoc/cpvt_line.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPVT_LINE_H_
-#define CORE_FPDFDOC_INCLUDE_CPVT_LINE_H_
+#ifndef CORE_FPDFDOC_CPVT_LINE_H_
+#define CORE_FPDFDOC_CPVT_LINE_H_
 
-#include "core/fpdfdoc/include/cpvt_wordplace.h"
+#include "core/fpdfdoc/cpvt_wordplace.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_system.h"
 
@@ -22,4 +22,4 @@
   FX_FLOAT fLineDescent;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPVT_LINE_H_
+#endif  // CORE_FPDFDOC_CPVT_LINE_H_
diff --git a/core/fpdfdoc/include/cpvt_secprops.h b/core/fpdfdoc/cpvt_secprops.h
similarity index 84%
rename from core/fpdfdoc/include/cpvt_secprops.h
rename to core/fpdfdoc/cpvt_secprops.h
index 67878f8..e5c633f 100644
--- a/core/fpdfdoc/include/cpvt_secprops.h
+++ b/core/fpdfdoc/cpvt_secprops.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPVT_SECPROPS_H_
-#define CORE_FPDFDOC_INCLUDE_CPVT_SECPROPS_H_
+#ifndef CORE_FPDFDOC_CPVT_SECPROPS_H_
+#define CORE_FPDFDOC_CPVT_SECPROPS_H_
 
 #include "core/fxcrt/include/fx_system.h"
 
@@ -27,4 +27,4 @@
   int32_t nAlignment;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPVT_SECPROPS_H_
+#endif  // CORE_FPDFDOC_CPVT_SECPROPS_H_
diff --git a/core/fpdfdoc/include/cpvt_section.h b/core/fpdfdoc/cpvt_section.h
similarity index 60%
rename from core/fpdfdoc/include/cpvt_section.h
rename to core/fpdfdoc/cpvt_section.h
index a9820bd..ae12290 100644
--- a/core/fpdfdoc/include/cpvt_section.h
+++ b/core/fpdfdoc/cpvt_section.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPVT_SECTION_H_
-#define CORE_FPDFDOC_INCLUDE_CPVT_SECTION_H_
+#ifndef CORE_FPDFDOC_CPVT_SECTION_H_
+#define CORE_FPDFDOC_CPVT_SECTION_H_
 
-#include "core/fpdfdoc/include/cpvt_secprops.h"
-#include "core/fpdfdoc/include/cpvt_wordplace.h"
-#include "core/fpdfdoc/include/cpvt_wordprops.h"
+#include "core/fpdfdoc/cpvt_secprops.h"
+#include "core/fpdfdoc/cpvt_wordplace.h"
+#include "core/fpdfdoc/cpvt_wordprops.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 
 struct CPVT_Section {
@@ -19,4 +19,4 @@
   CPVT_WordProps WordProps;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPVT_SECTION_H_
+#endif  // CORE_FPDFDOC_CPVT_SECTION_H_
diff --git a/core/fpdfdoc/cpvt_sectioninfo.h b/core/fpdfdoc/cpvt_sectioninfo.h
index 9d9b99f..6422efe 100644
--- a/core/fpdfdoc/cpvt_sectioninfo.h
+++ b/core/fpdfdoc/cpvt_sectioninfo.h
@@ -10,8 +10,8 @@
 #include <memory>
 
 #include "core/fpdfdoc/cpvt_floatrect.h"
-#include "core/fpdfdoc/include/cpvt_secprops.h"
-#include "core/fpdfdoc/include/cpvt_wordprops.h"
+#include "core/fpdfdoc/cpvt_secprops.h"
+#include "core/fpdfdoc/cpvt_wordprops.h"
 
 struct CPVT_SectionInfo {
   CPVT_SectionInfo();
diff --git a/core/fpdfdoc/include/cpvt_word.h b/core/fpdfdoc/cpvt_word.h
similarity index 75%
rename from core/fpdfdoc/include/cpvt_word.h
rename to core/fpdfdoc/cpvt_word.h
index b2af4ec..1e3b5aa 100644
--- a/core/fpdfdoc/include/cpvt_word.h
+++ b/core/fpdfdoc/cpvt_word.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPVT_WORD_H_
-#define CORE_FPDFDOC_INCLUDE_CPVT_WORD_H_
+#ifndef CORE_FPDFDOC_CPVT_WORD_H_
+#define CORE_FPDFDOC_CPVT_WORD_H_
 
-#include "core/fpdfdoc/include/cpvt_wordplace.h"
-#include "core/fpdfdoc/include/cpvt_wordprops.h"
+#include "core/fpdfdoc/cpvt_wordplace.h"
+#include "core/fpdfdoc/cpvt_wordprops.h"
 #include "core/fxcrt/include/fx_system.h"
 
 struct CPVT_Word {
@@ -35,4 +35,4 @@
       nFontIndex(-1),
       fFontSize(0.0f) {}
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPVT_WORD_H_
+#endif  // CORE_FPDFDOC_CPVT_WORD_H_
diff --git a/core/fpdfdoc/cpvt_wordinfo.h b/core/fpdfdoc/cpvt_wordinfo.h
index c690e2a..3bb452a 100644
--- a/core/fpdfdoc/cpvt_wordinfo.h
+++ b/core/fpdfdoc/cpvt_wordinfo.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "core/fpdfdoc/include/cpvt_wordprops.h"
+#include "core/fpdfdoc/cpvt_wordprops.h"
 #include "core/fxcrt/include/fx_system.h"
 
 struct CPVT_WordInfo {
diff --git a/core/fpdfdoc/include/cpvt_wordplace.h b/core/fpdfdoc/cpvt_wordplace.h
similarity index 92%
rename from core/fpdfdoc/include/cpvt_wordplace.h
rename to core/fpdfdoc/cpvt_wordplace.h
index ef79077..33ba7c9 100644
--- a/core/fpdfdoc/include/cpvt_wordplace.h
+++ b/core/fpdfdoc/cpvt_wordplace.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPVT_WORDPLACE_H_
-#define CORE_FPDFDOC_INCLUDE_CPVT_WORDPLACE_H_
+#ifndef CORE_FPDFDOC_CPVT_WORDPLACE_H_
+#define CORE_FPDFDOC_CPVT_WORDPLACE_H_
 
 #include "core/fxcrt/include/fx_system.h"
 
@@ -70,4 +70,4 @@
   int32_t nWordIndex;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPVT_WORDPLACE_H_
+#endif  // CORE_FPDFDOC_CPVT_WORDPLACE_H_
diff --git a/core/fpdfdoc/include/cpvt_wordprops.h b/core/fpdfdoc/cpvt_wordprops.h
similarity index 89%
rename from core/fpdfdoc/include/cpvt_wordprops.h
rename to core/fpdfdoc/cpvt_wordprops.h
index 690a5e1..25d8d76 100644
--- a/core/fpdfdoc/include/cpvt_wordprops.h
+++ b/core/fpdfdoc/cpvt_wordprops.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPVT_WORDPROPS_H_
-#define CORE_FPDFDOC_INCLUDE_CPVT_WORDPROPS_H_
+#ifndef CORE_FPDFDOC_CPVT_WORDPROPS_H_
+#define CORE_FPDFDOC_CPVT_WORDPROPS_H_
 
-#include "core/fpdfdoc/include/cpdf_variabletext.h"
+#include "core/fpdfdoc/cpdf_variabletext.h"
 #include "core/fxcrt/include/fx_system.h"
 #include "core/fxge/include/fx_dib.h"
 
@@ -55,4 +55,4 @@
   int32_t nHorzScale;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPVT_WORDPROPS_H_
+#endif  // CORE_FPDFDOC_CPVT_WORDPROPS_H_
diff --git a/core/fpdfdoc/include/cpvt_wordrange.h b/core/fpdfdoc/cpvt_wordrange.h
similarity index 86%
rename from core/fpdfdoc/include/cpvt_wordrange.h
rename to core/fpdfdoc/cpvt_wordrange.h
index 3c6f05b..3cd0ecf 100644
--- a/core/fpdfdoc/include/cpvt_wordrange.h
+++ b/core/fpdfdoc/cpvt_wordrange.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_CPVT_WORDRANGE_H_
-#define CORE_FPDFDOC_INCLUDE_CPVT_WORDRANGE_H_
+#ifndef CORE_FPDFDOC_CPVT_WORDRANGE_H_
+#define CORE_FPDFDOC_CPVT_WORDRANGE_H_
 
-#include "core/fpdfdoc/include/cpvt_wordplace.h"
+#include "core/fpdfdoc/cpvt_wordplace.h"
 #include "core/fxcrt/include/fx_system.h"
 
 struct CPVT_WordRange {
@@ -56,4 +56,4 @@
   CPVT_WordPlace EndPos;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_CPVT_WORDRANGE_H_
+#endif  // CORE_FPDFDOC_CPVT_WORDRANGE_H_
diff --git a/core/fpdfdoc/doc_tagged.cpp b/core/fpdfdoc/doc_tagged.cpp
index a0ce472..551732d 100644
--- a/core/fpdfdoc/doc_tagged.cpp
+++ b/core/fpdfdoc/doc_tagged.cpp
@@ -12,7 +12,7 @@
 #include "core/fpdfapi/fpdf_parser/cpdf_reference.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_stream.h"
 #include "core/fpdfdoc/cpdf_numbertree.h"
-#include "core/fpdfdoc/include/fpdf_tagged.h"
+#include "core/fpdfdoc/fpdf_tagged.h"
 #include "core/fpdfdoc/tagged_int.h"
 
 namespace {
diff --git a/core/fpdfdoc/include/fpdf_tagged.h b/core/fpdfdoc/fpdf_tagged.h
similarity index 95%
rename from core/fpdfdoc/include/fpdf_tagged.h
rename to core/fpdfdoc/fpdf_tagged.h
index 43d69e8..da05b79 100644
--- a/core/fpdfdoc/include/fpdf_tagged.h
+++ b/core/fpdfdoc/fpdf_tagged.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_FPDF_TAGGED_H_
-#define CORE_FPDFDOC_INCLUDE_FPDF_TAGGED_H_
+#ifndef CORE_FPDFDOC_FPDF_TAGGED_H_
+#define CORE_FPDFDOC_FPDF_TAGGED_H_
 
 #include "core/fxge/include/fx_dib.h"
 
@@ -90,4 +90,4 @@
                          int subindex = -1) = 0;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_FPDF_TAGGED_H_
+#endif  // CORE_FPDFDOC_FPDF_TAGGED_H_
diff --git a/core/fpdfdoc/include/ipdf_formnotify.h b/core/fpdfdoc/ipdf_formnotify.h
similarity index 87%
rename from core/fpdfdoc/include/ipdf_formnotify.h
rename to core/fpdfdoc/ipdf_formnotify.h
index 49bb84d..4937bb1 100644
--- a/core/fpdfdoc/include/ipdf_formnotify.h
+++ b/core/fpdfdoc/ipdf_formnotify.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_IPDF_FORMNOTIFY_H_
-#define CORE_FPDFDOC_INCLUDE_IPDF_FORMNOTIFY_H_
+#ifndef CORE_FPDFDOC_IPDF_FORMNOTIFY_H_
+#define CORE_FPDFDOC_IPDF_FORMNOTIFY_H_
 
 #include "core/fxcrt/include/fx_string.h"
 
@@ -29,4 +29,4 @@
   virtual void AfterFormImportData(CPDF_InterForm* pForm) = 0;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_IPDF_FORMNOTIFY_H_
+#endif  // CORE_FPDFDOC_IPDF_FORMNOTIFY_H_
diff --git a/core/fpdfdoc/include/ipvt_fontmap.h b/core/fpdfdoc/ipvt_fontmap.h
similarity index 85%
rename from core/fpdfdoc/include/ipvt_fontmap.h
rename to core/fpdfdoc/ipvt_fontmap.h
index 9835d5e..072783b 100644
--- a/core/fpdfdoc/include/ipvt_fontmap.h
+++ b/core/fpdfdoc/ipvt_fontmap.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FPDFDOC_INCLUDE_IPVT_FONTMAP_H_
-#define CORE_FPDFDOC_INCLUDE_IPVT_FONTMAP_H_
+#ifndef CORE_FPDFDOC_IPVT_FONTMAP_H_
+#define CORE_FPDFDOC_IPVT_FONTMAP_H_
 
 #include <stdint.h>
 
@@ -26,4 +26,4 @@
   virtual int32_t CharSetFromUnicode(uint16_t word, int32_t nOldCharset) = 0;
 };
 
-#endif  // CORE_FPDFDOC_INCLUDE_IPVT_FONTMAP_H_
+#endif  // CORE_FPDFDOC_IPVT_FONTMAP_H_
diff --git a/core/fpdfdoc/tagged_int.h b/core/fpdfdoc/tagged_int.h
index 354a93c..871a01e 100644
--- a/core/fpdfdoc/tagged_int.h
+++ b/core/fpdfdoc/tagged_int.h
@@ -11,7 +11,7 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfdoc/include/fpdf_tagged.h"
+#include "core/fpdfdoc/fpdf_tagged.h"
 #include "core/fxcrt/include/cfx_retain_ptr.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index f5e8476..30e2079 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -5,7 +5,7 @@
   '+core/fpdfapi/fpdf_page',
   '+core/fpdfapi/fpdf_parser',
   '+core/fpdfapi/fpdf_render',
-  '+core/fpdfdoc/include',
+  '+core/fpdfdoc',
   '+core/fxcodec/include',
   '+core/fxcrt/include',
   '+core/fxge/include',
diff --git a/fpdfsdk/cpdfsdk_annothandlermgr.cpp b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
index 75542d3..9dd5a4e 100644
--- a/fpdfsdk/cpdfsdk_annothandlermgr.cpp
+++ b/fpdfsdk/cpdfsdk_annothandlermgr.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/include/cpdfsdk_annothandlermgr.h"
 
-#include "core/fpdfdoc/include/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_annot.h"
 #include "fpdfsdk/include/cba_annotiterator.h"
 #include "fpdfsdk/include/cpdfsdk_annot.h"
 #include "fpdfsdk/include/cpdfsdk_baannot.h"
diff --git a/fpdfsdk/cpdfsdk_baannothandler.cpp b/fpdfsdk/cpdfsdk_baannothandler.cpp
index ebbf2c1..4f5213e 100644
--- a/fpdfsdk/cpdfsdk_baannothandler.cpp
+++ b/fpdfsdk/cpdfsdk_baannothandler.cpp
@@ -11,7 +11,7 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/cpdfsdk_annot.h"
 #include "fpdfsdk/include/cpdfsdk_baannot.h"
diff --git a/fpdfsdk/cpdfsdk_document.cpp b/fpdfsdk/cpdfsdk_document.cpp
index 09093fe..7c4686f 100644
--- a/fpdfsdk/cpdfsdk_document.cpp
+++ b/fpdfsdk/cpdfsdk_document.cpp
@@ -10,9 +10,9 @@
 #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/fpdfdoc/include/cpdf_action.h"
-#include "core/fpdfdoc/include/cpdf_docjsactions.h"
-#include "core/fpdfdoc/include/cpdf_occontext.h"
+#include "core/fpdfdoc/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_docjsactions.h"
+#include "core/fpdfdoc/cpdf_occontext.h"
 #include "fpdfsdk/include/cpdfsdk_annot.h"
 #include "fpdfsdk/include/cpdfsdk_annothandlermgr.h"
 #include "fpdfsdk/include/cpdfsdk_environment.h"
diff --git a/fpdfsdk/cpdfsdk_interform.cpp b/fpdfsdk/cpdfsdk_interform.cpp
index e41df1d..9afd30b 100644
--- a/fpdfsdk/cpdfsdk_interform.cpp
+++ b/fpdfsdk/cpdfsdk_interform.cpp
@@ -15,8 +15,8 @@
 #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/fpdfdoc/include/cpdf_actionfields.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_actionfields.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fxge/include/cfx_graphstatedata.h"
 #include "core/fxge/include/cfx_pathdata.h"
 #include "core/fxge/include/cfx_renderdevice.h"
diff --git a/fpdfsdk/cpdfsdk_pageview.cpp b/fpdfsdk/cpdfsdk_pageview.cpp
index 0ffc3fc..cb76a8a 100644
--- a/fpdfsdk/cpdfsdk_pageview.cpp
+++ b/fpdfsdk/cpdfsdk_pageview.cpp
@@ -11,8 +11,8 @@
 
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/cpdf_renderoptions.h"
-#include "core/fpdfdoc/include/cpdf_annotlist.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_annotlist.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/include/cpdfsdk_annot.h"
 #include "fpdfsdk/include/cpdfsdk_annothandlermgr.h"
 #include "fpdfsdk/include/cpdfsdk_annotiterator.h"
diff --git a/fpdfsdk/cpdfsdk_widget.cpp b/fpdfsdk/cpdfsdk_widget.cpp
index f0583dd..284fe8a 100644
--- a/fpdfsdk/cpdfsdk_widget.cpp
+++ b/fpdfsdk/cpdfsdk_widget.cpp
@@ -11,11 +11,11 @@
 #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/fpdfdoc/include/cpdf_defaultappearance.h"
-#include "core/fpdfdoc/include/cpdf_formcontrol.h"
-#include "core/fpdfdoc/include/cpdf_formfield.h"
-#include "core/fpdfdoc/include/cpdf_iconfit.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_defaultappearance.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
+#include "core/fpdfdoc/cpdf_iconfit.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fxge/include/cfx_graphstatedata.h"
 #include "core/fxge/include/cfx_pathdata.h"
 #include "core/fxge/include/cfx_renderdevice.h"
diff --git a/fpdfsdk/cpdfsdk_widgethandler.cpp b/fpdfsdk/cpdfsdk_widgethandler.cpp
index c84372e..208877e 100644
--- a/fpdfsdk/cpdfsdk_widgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_widgethandler.cpp
@@ -11,7 +11,7 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/formfiller/cffl_formfiller.h"
 #include "fpdfsdk/include/cpdfsdk_annot.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
diff --git a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
index 3816991..2abe994 100644
--- a/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
+++ b/fpdfsdk/cpdfsdk_xfawidgethandler.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/include/cpdfsdk_xfawidgethandler.h"
 
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/fpdfxfa/include/fpdfxfa_doc.h"
 #include "fpdfsdk/include/cpdfsdk_annot.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
diff --git a/fpdfsdk/formfiller/cba_fontmap.cpp b/fpdfsdk/formfiller/cba_fontmap.cpp
index 9e2a53f..60e17a3 100644
--- a/fpdfsdk/formfiller/cba_fontmap.cpp
+++ b/fpdfsdk/formfiller/cba_fontmap.cpp
@@ -12,7 +12,7 @@
 #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/fpdfdoc/include/cpdf_formfield.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
 #include "core/fxge/include/cfx_substfont.h"
 #include "fpdfsdk/include/cpdfsdk_annot.h"
 
diff --git a/fpdfsdk/fpdf_ext.cpp b/fpdfsdk/fpdf_ext.cpp
index d261b71..f9ae0c0 100644
--- a/fpdfsdk/fpdf_ext.cpp
+++ b/fpdfsdk/fpdf_ext.cpp
@@ -11,9 +11,9 @@
 #include "core/fpdfapi/cpdf_modulemgr.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fpdfdoc/include/cpdf_annot.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
-#include "core/fpdfdoc/include/cpdf_metadata.h"
+#include "core/fpdfdoc/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_metadata.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_memory.h"
 #include "core/fxcrt/include/fx_xml.h"
diff --git a/fpdfsdk/fpdf_flatten.cpp b/fpdfsdk/fpdf_flatten.cpp
index 1f3305b..69c7a32 100644
--- a/fpdfsdk/fpdf_flatten.cpp
+++ b/fpdfsdk/fpdf_flatten.cpp
@@ -15,7 +15,7 @@
 #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/fpdfdoc/include/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_annot.h"
 #include "fpdfsdk/include/fsdk_define.h"
 
 typedef CFX_ArrayTemplate<CPDF_Dictionary*> CPDF_ObjectArray;
diff --git a/fpdfsdk/fpdfdoc.cpp b/fpdfsdk/fpdfdoc.cpp
index 55297bb..4e0d05c 100644
--- a/fpdfsdk/fpdfdoc.cpp
+++ b/fpdfsdk/fpdfdoc.cpp
@@ -11,8 +11,8 @@
 #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/fpdfdoc/include/cpdf_bookmark.h"
-#include "core/fpdfdoc/include/cpdf_bookmarktree.h"
+#include "core/fpdfdoc/cpdf_bookmark.h"
+#include "core/fpdfdoc/cpdf_bookmarktree.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "third_party/base/stl_util.h"
 
diff --git a/fpdfsdk/fpdfeditpage.cpp b/fpdfsdk/fpdfeditpage.cpp
index 5a0c6a4..acbb295 100644
--- a/fpdfsdk/fpdfeditpage.cpp
+++ b/fpdfsdk/fpdfeditpage.cpp
@@ -22,8 +22,8 @@
 #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/fpdfdoc/include/cpdf_annot.h"
-#include "core/fpdfdoc/include/cpdf_annotlist.h"
+#include "core/fpdfdoc/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_annotlist.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "public/fpdf_formfill.h"
 #include "third_party/base/stl_util.h"
diff --git a/fpdfsdk/fpdfformfill.cpp b/fpdfsdk/fpdfformfill.cpp
index 4abeb81..11d4467 100644
--- a/fpdfsdk/fpdfformfill.cpp
+++ b/fpdfsdk/fpdfformfill.cpp
@@ -12,10 +12,10 @@
 #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/fpdfdoc/include/cpdf_formcontrol.h"
-#include "core/fpdfdoc/include/cpdf_formfield.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
-#include "core/fpdfdoc/include/cpdf_occontext.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
+#include "core/fpdfdoc/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxge/include/cfx_fxgedevice.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
 #include "fpdfsdk/include/cpdfsdk_environment.h"
diff --git a/fpdfsdk/fpdftext.cpp b/fpdfsdk/fpdftext.cpp
index 7662b7d..4a637b7 100644
--- a/fpdfsdk/fpdftext.cpp
+++ b/fpdfsdk/fpdftext.cpp
@@ -7,7 +7,7 @@
 #include "public/fpdf_text.h"
 
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
-#include "core/fpdfdoc/include/cpdf_viewerpreferences.h"
+#include "core/fpdfdoc/cpdf_viewerpreferences.h"
 #include "core/fpdftext/include/cpdf_linkextract.h"
 #include "core/fpdftext/include/cpdf_textpage.h"
 #include "core/fpdftext/include/cpdf_textpagefind.h"
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index 05f73e8..d6d7f3b 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -17,10 +17,10 @@
 #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/fpdfdoc/include/cpdf_annotlist.h"
-#include "core/fpdfdoc/include/cpdf_nametree.h"
-#include "core/fpdfdoc/include/cpdf_occontext.h"
-#include "core/fpdfdoc/include/cpdf_viewerpreferences.h"
+#include "core/fpdfdoc/cpdf_annotlist.h"
+#include "core/fpdfdoc/cpdf_nametree.h"
+#include "core/fpdfdoc/cpdf_occontext.h"
+#include "core/fpdfdoc/cpdf_viewerpreferences.h"
 #include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_memory.h"
 #include "core/fxcrt/include/fx_safe_types.h"
diff --git a/fpdfsdk/fsdk_actionhandler.cpp b/fpdfsdk/fsdk_actionhandler.cpp
index 021d5a0..d904352 100644
--- a/fpdfsdk/fsdk_actionhandler.cpp
+++ b/fpdfsdk/fsdk_actionhandler.cpp
@@ -9,8 +9,8 @@
 #include <set>
 
 #include "core/fpdfapi/fpdf_parser/cpdf_array.h"
-#include "core/fpdfdoc/include/cpdf_formfield.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_formfield.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
 #include "fpdfsdk/include/cpdfsdk_environment.h"
 #include "fpdfsdk/include/cpdfsdk_interform.h"
diff --git a/fpdfsdk/fxedit/DEPS b/fpdfsdk/fxedit/DEPS
index 973ea05..a8612e1 100644
--- a/fpdfsdk/fxedit/DEPS
+++ b/fpdfsdk/fxedit/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   '+core/fpdfapi/fpdf_font',
-  '+core/fpdfdoc/include',
+  '+core/fpdfdoc',
 ]
diff --git a/fpdfsdk/fxedit/fxet_ap.cpp b/fpdfsdk/fxedit/fxet_ap.cpp
index 7bd7e61..e3fb034 100644
--- a/fpdfsdk/fxedit/fxet_ap.cpp
+++ b/fpdfsdk/fxedit/fxet_ap.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fpdfapi/fpdf_font/cpdf_font.h"
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.h"
-#include "core/fpdfdoc/include/cpvt_word.h"
-#include "core/fpdfdoc/include/ipvt_fontmap.h"
+#include "core/fpdfdoc/cpvt_word.h"
+#include "core/fpdfdoc/ipvt_fontmap.h"
 #include "fpdfsdk/fxedit/include/fx_edit.h"
 #include "fpdfsdk/fxedit/include/fxet_edit.h"
 
diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp
index f7597d2..db299e5 100644
--- a/fpdfsdk/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/fxedit/fxet_edit.cpp
@@ -18,9 +18,9 @@
 #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/fpdfdoc/include/cpvt_section.h"
-#include "core/fpdfdoc/include/cpvt_word.h"
-#include "core/fpdfdoc/include/ipvt_fontmap.h"
+#include "core/fpdfdoc/cpvt_section.h"
+#include "core/fpdfdoc/cpvt_word.h"
+#include "core/fpdfdoc/ipvt_fontmap.h"
 #include "core/fxge/include/cfx_graphstatedata.h"
 #include "core/fxge/include/cfx_pathdata.h"
 #include "core/fxge/include/cfx_renderdevice.h"
diff --git a/fpdfsdk/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp
index 5fb26b1..5c51446 100644
--- a/fpdfsdk/fxedit/fxet_list.cpp
+++ b/fpdfsdk/fxedit/fxet_list.cpp
@@ -6,7 +6,7 @@
 
 #include "fpdfsdk/fxedit/include/fxet_list.h"
 
-#include "core/fpdfdoc/include/cpvt_word.h"
+#include "core/fpdfdoc/cpvt_word.h"
 #include "fpdfsdk/fxedit/include/fxet_edit.h"
 #include "fpdfsdk/pdfwindow/PWL_ListBox.h"
 
diff --git a/fpdfsdk/fxedit/include/DEPS b/fpdfsdk/fxedit/include/DEPS
index db9a09c..0b00511 100644
--- a/fpdfsdk/fxedit/include/DEPS
+++ b/fpdfsdk/fxedit/include/DEPS
@@ -1,3 +1,3 @@
 include_rules = [
-  '+core/fpdfdoc/include',
+  '+core/fpdfdoc',
 ]
diff --git a/fpdfsdk/fxedit/include/fxet_edit.h b/fpdfsdk/fxedit/include/fxet_edit.h
index 22db613..652dbbf 100644
--- a/fpdfsdk/fxedit/include/fxet_edit.h
+++ b/fpdfsdk/fxedit/include/fxet_edit.h
@@ -9,8 +9,8 @@
 
 #include <memory>
 
-#include "core/fpdfdoc/include/cpvt_secprops.h"
-#include "core/fpdfdoc/include/cpvt_wordprops.h"
+#include "core/fpdfdoc/cpvt_secprops.h"
+#include "core/fpdfdoc/cpvt_wordprops.h"
 #include "fpdfsdk/fxedit/include/fx_edit.h"
 
 class CFFL_FormFiller;
diff --git a/fpdfsdk/include/cba_annotiterator.h b/fpdfsdk/include/cba_annotiterator.h
index aa0ad2d..7d9078e 100644
--- a/fpdfsdk/include/cba_annotiterator.h
+++ b/fpdfsdk/include/cba_annotiterator.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "core/fpdfdoc/include/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_annot.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_string.h"
 
diff --git a/fpdfsdk/include/cpdfsdk_annot.h b/fpdfsdk/include/cpdfsdk_annot.h
index e7ae2e1..7356ce8 100644
--- a/fpdfsdk/include/cpdfsdk_annot.h
+++ b/fpdfsdk/include/cpdfsdk_annot.h
@@ -7,9 +7,9 @@
 #ifndef FPDFSDK_INCLUDE_CPDFSDK_ANNOT_H_
 #define FPDFSDK_INCLUDE_CPDFSDK_ANNOT_H_
 
-#include "core/fpdfdoc/include/cpdf_aaction.h"
-#include "core/fpdfdoc/include/cpdf_annot.h"
-#include "core/fpdfdoc/include/cpdf_defaultappearance.h"
+#include "core/fpdfdoc/cpdf_aaction.h"
+#include "core/fpdfdoc/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_defaultappearance.h"
 #include "core/fxcrt/include/cfx_observable.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "fpdfsdk/cfx_systemhandler.h"
diff --git a/fpdfsdk/include/cpdfsdk_annothandlermgr.h b/fpdfsdk/include/cpdfsdk_annothandlermgr.h
index d66914a..da54c7e 100644
--- a/fpdfsdk/include/cpdfsdk_annothandlermgr.h
+++ b/fpdfsdk/include/cpdfsdk_annothandlermgr.h
@@ -10,7 +10,7 @@
 #include <map>
 #include <memory>
 
-#include "core/fpdfdoc/include/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_annot.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "fpdfsdk/include/cpdfsdk_annot.h"
diff --git a/fpdfsdk/include/cpdfsdk_baannot.h b/fpdfsdk/include/cpdfsdk_baannot.h
index 4575bfe..9cc1680 100644
--- a/fpdfsdk/include/cpdfsdk_baannot.h
+++ b/fpdfsdk/include/cpdfsdk_baannot.h
@@ -7,10 +7,10 @@
 #ifndef FPDFSDK_INCLUDE_CPDFSDK_BAANNOT_H_
 #define FPDFSDK_INCLUDE_CPDFSDK_BAANNOT_H_
 
-#include "core/fpdfdoc/include/cpdf_aaction.h"
-#include "core/fpdfdoc/include/cpdf_action.h"
-#include "core/fpdfdoc/include/cpdf_annot.h"
-#include "core/fpdfdoc/include/cpdf_defaultappearance.h"
+#include "core/fpdfdoc/cpdf_aaction.h"
+#include "core/fpdfdoc/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_defaultappearance.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "fpdfsdk/cfx_systemhandler.h"
diff --git a/fpdfsdk/include/cpdfsdk_environment.h b/fpdfsdk/include/cpdfsdk_environment.h
index 4cf39f2..35b4850 100644
--- a/fpdfsdk/include/cpdfsdk_environment.h
+++ b/fpdfsdk/include/cpdfsdk_environment.h
@@ -11,7 +11,7 @@
 
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fpdfdoc/include/cpdf_occontext.h"
+#include "core/fpdfdoc/cpdf_occontext.h"
 #include "core/fxcrt/include/cfx_observable.h"
 #include "fpdfsdk/cfx_systemhandler.h"
 #include "fpdfsdk/include/fsdk_define.h"
diff --git a/fpdfsdk/include/cpdfsdk_interform.h b/fpdfsdk/include/cpdfsdk_interform.h
index b4b5db3..b186ceb 100644
--- a/fpdfsdk/include/cpdfsdk_interform.h
+++ b/fpdfsdk/include/cpdfsdk_interform.h
@@ -10,8 +10,8 @@
 #include <map>
 #include <vector>
 
-#include "core/fpdfdoc/include/cpdf_action.h"
-#include "core/fpdfdoc/include/ipdf_formnotify.h"
+#include "core/fpdfdoc/cpdf_action.h"
+#include "core/fpdfdoc/ipdf_formnotify.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxge/include/fx_dib.h"
 
diff --git a/fpdfsdk/include/cpdfsdk_widget.h b/fpdfsdk/include/cpdfsdk_widget.h
index 09f9d94..0171091 100644
--- a/fpdfsdk/include/cpdfsdk_widget.h
+++ b/fpdfsdk/include/cpdfsdk_widget.h
@@ -9,9 +9,9 @@
 
 #include <set>
 
-#include "core/fpdfdoc/include/cpdf_aaction.h"
-#include "core/fpdfdoc/include/cpdf_action.h"
-#include "core/fpdfdoc/include/cpdf_annot.h"
+#include "core/fpdfdoc/cpdf_aaction.h"
+#include "core/fpdfdoc/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_annot.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "fpdfsdk/include/cpdfsdk_baannot.h"
diff --git a/fpdfsdk/include/fsdk_actionhandler.h b/fpdfsdk/include/fsdk_actionhandler.h
index 5262439..fc67588 100644
--- a/fpdfsdk/include/fsdk_actionhandler.h
+++ b/fpdfsdk/include/fsdk_actionhandler.h
@@ -10,8 +10,8 @@
 #include <memory>
 #include <set>
 
-#include "core/fpdfdoc/include/cpdf_aaction.h"
-#include "core/fpdfdoc/include/cpdf_action.h"
+#include "core/fpdfdoc/cpdf_aaction.h"
+#include "core/fpdfdoc/cpdf_action.h"
 #include "core/fxcrt/include/fx_string.h"
 #include "fpdfsdk/include/pdfsdk_fieldaction.h"
 
diff --git a/fpdfsdk/javascript/Document.cpp b/fpdfsdk/javascript/Document.cpp
index 1f6fb7d..594a92e 100644
--- a/fpdfsdk/javascript/Document.cpp
+++ b/fpdfsdk/javascript/Document.cpp
@@ -14,8 +14,8 @@
 #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/fpdfdoc/include/cpdf_interform.h"
-#include "core/fpdfdoc/include/cpdf_nametree.h"
+#include "core/fpdfdoc/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_nametree.h"
 #include "fpdfsdk/include/cpdfsdk_annotiterator.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
 #include "fpdfsdk/include/cpdfsdk_environment.h"
diff --git a/fpdfsdk/javascript/Field.cpp b/fpdfsdk/javascript/Field.cpp
index 7a0494f..0e65b16 100644
--- a/fpdfsdk/javascript/Field.cpp
+++ b/fpdfsdk/javascript/Field.cpp
@@ -14,7 +14,7 @@
 #include "core/fpdfapi/fpdf_font/cpdf_font.h"
 #include "core/fpdfapi/fpdf_page/cpdf_page.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
 #include "fpdfsdk/include/cpdfsdk_environment.h"
 #include "fpdfsdk/include/cpdfsdk_interform.h"
diff --git a/fpdfsdk/javascript/PublicMethods.cpp b/fpdfsdk/javascript/PublicMethods.cpp
index 65af6a1..c7f7b85 100644
--- a/fpdfsdk/javascript/PublicMethods.cpp
+++ b/fpdfsdk/javascript/PublicMethods.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <vector>
 
-#include "core/fpdfdoc/include/cpdf_interform.h"
+#include "core/fpdfdoc/cpdf_interform.h"
 #include "core/fxcrt/include/fx_ext.h"
 #include "fpdfsdk/include/cpdfsdk_document.h"
 #include "fpdfsdk/include/cpdfsdk_environment.h"
diff --git a/fpdfsdk/pdfwindow/DEPS b/fpdfsdk/pdfwindow/DEPS
index 973ea05..a8612e1 100644
--- a/fpdfsdk/pdfwindow/DEPS
+++ b/fpdfsdk/pdfwindow/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   '+core/fpdfapi/fpdf_font',
-  '+core/fpdfdoc/include',
+  '+core/fpdfdoc',
 ]
diff --git a/fpdfsdk/pdfwindow/PWL_Edit.cpp b/fpdfsdk/pdfwindow/PWL_Edit.cpp
index fc7d04c..b87d339 100644
--- a/fpdfsdk/pdfwindow/PWL_Edit.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Edit.cpp
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "core/fpdfapi/fpdf_font/cpdf_font.h"
-#include "core/fpdfdoc/include/cpvt_word.h"
+#include "core/fpdfdoc/cpvt_word.h"
 #include "core/fxcrt/include/fx_safe_types.h"
 #include "core/fxcrt/include/fx_xml.h"
 #include "core/fxge/include/cfx_graphstatedata.h"
diff --git a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
index 2ec88cb..c99af4d 100644
--- a/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
+++ b/fpdfsdk/pdfwindow/PWL_EditCtrl.cpp
@@ -6,8 +6,8 @@
 
 #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
 
-#include "core/fpdfdoc/include/cpvt_section.h"
-#include "core/fpdfdoc/include/cpvt_word.h"
+#include "core/fpdfdoc/cpvt_section.h"
+#include "core/fpdfdoc/cpvt_word.h"
 #include "core/fxge/include/fx_font.h"
 #include "fpdfsdk/fxedit/include/fxet_edit.h"
 #include "fpdfsdk/pdfwindow/PWL_Caret.h"
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.cpp b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
index 6b71960..57feb27 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.cpp
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.cpp
@@ -11,7 +11,7 @@
 #include "core/fpdfapi/fpdf_font/cpdf_fontencoding.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_document.h"
 #include "core/fpdfapi/fpdf_parser/cpdf_parser.h"
-#include "core/fpdfdoc/include/ipvt_fontmap.h"
+#include "core/fpdfdoc/ipvt_fontmap.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 namespace {
diff --git a/fpdfsdk/pdfwindow/PWL_FontMap.h b/fpdfsdk/pdfwindow/PWL_FontMap.h
index bb3925d..3dcd339 100644
--- a/fpdfsdk/pdfwindow/PWL_FontMap.h
+++ b/fpdfsdk/pdfwindow/PWL_FontMap.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "core/fpdfdoc/include/ipvt_fontmap.h"
+#include "core/fpdfdoc/ipvt_fontmap.h"
 #include "core/fxge/include/fx_font.h"
 #include "fpdfsdk/fxedit/include/fx_edit.h"
 #include "public/fpdf_sysfontinfo.h"
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.cpp b/fpdfsdk/pdfwindow/PWL_Utils.cpp
index 7c7e05a..4b19fd5 100644
--- a/fpdfsdk/pdfwindow/PWL_Utils.cpp
+++ b/fpdfsdk/pdfwindow/PWL_Utils.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "core/fpdfdoc/include/cpvt_word.h"
+#include "core/fpdfdoc/cpvt_word.h"
 #include "core/fxge/include/cfx_graphstatedata.h"
 #include "core/fxge/include/cfx_pathdata.h"
 #include "core/fxge/include/cfx_renderdevice.h"
diff --git a/fpdfsdk/pdfwindow/PWL_Utils.h b/fpdfsdk/pdfwindow/PWL_Utils.h
index d7c65d2..bdcba96 100644
--- a/fpdfsdk/pdfwindow/PWL_Utils.h
+++ b/fpdfsdk/pdfwindow/PWL_Utils.h
@@ -7,7 +7,7 @@
 #ifndef FPDFSDK_PDFWINDOW_PWL_UTILS_H_
 #define FPDFSDK_PDFWINDOW_PWL_UTILS_H_
 
-#include "core/fpdfdoc/include/cpvt_wordrange.h"
+#include "core/fpdfdoc/cpvt_wordrange.h"
 #include "fpdfsdk/pdfwindow/PWL_Wnd.h"
 
 class CFX_Edit;
diff --git a/fpdfsdk/pdfwindow/PWL_Wnd.h b/fpdfsdk/pdfwindow/PWL_Wnd.h
index ca2b4c7..37209ed 100644
--- a/fpdfsdk/pdfwindow/PWL_Wnd.h
+++ b/fpdfsdk/pdfwindow/PWL_Wnd.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "core/fpdfdoc/include/cpdf_formcontrol.h"
+#include "core/fpdfdoc/cpdf_formcontrol.h"
 #include "core/fxcrt/include/fx_basic.h"
 #include "fpdfsdk/cfx_systemhandler.h"
 
diff --git a/xfa/fxfa/app/DEPS b/xfa/fxfa/app/DEPS
index 5943f04..abdf53d 100644
--- a/xfa/fxfa/app/DEPS
+++ b/xfa/fxfa/app/DEPS
@@ -3,7 +3,7 @@
   '+core/fpdfapi/fpdf_font',
   '+core/fpdfapi/fpdf_page',
   '+core/fpdfapi/fpdf_parser',
-  '+core/fpdfdoc/include',
+  '+core/fpdfdoc',
   '+core/fxcodec/include',
   '+core/fxcodec/codec/include',
 ]
diff --git a/xfa/fxfa/app/xfa_ffdoc.cpp b/xfa/fxfa/app/xfa_ffdoc.cpp
index a36e5e0..f9b92c6 100644
--- a/xfa/fxfa/app/xfa_ffdoc.cpp
+++ b/xfa/fxfa/app/xfa_ffdoc.cpp
@@ -11,7 +11,7 @@
 #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/fpdfdoc/include/cpdf_nametree.h"
+#include "core/fpdfdoc/cpdf_nametree.h"
 #include "core/fxcrt/include/fx_ext.h"
 #include "core/fxcrt/include/fx_memory.h"
 #include "xfa/fde/xml/fde_xml_imp.h"