Move core/fpdfdoc/include to core/fpdfdoc

BUG=pdfium:611

Review-Url: https://codereview.chromium.org/2374383003

67 files changed, 185 insertions, 185 deletions

diff --git a/core/fpdfdoc/cline.h b/core/fpdfdoc/cline.h
index a0cdbfd4af..6f95beb546 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 588c4c38df..da654b107d 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
index b3a55da23e..cef39f0407 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 @@ class CPDF_AAction {
   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 b6466217ca..d23925745e 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
index 209f1f9f09..7bef84d2e4 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 @@ class CPDF_Action {
   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 f9ac76e575..d87da28016 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
index 0f38e1d469..9e0664cadb 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 @@ class CPDF_ActionFields {
   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 7a85ad1f27..17b2d56bef 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
index e88375a903..f3166256d6 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 @@ class CPDF_Annot {
 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 a76c341935..d19f9b4b70 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
index f76ec64cd9..afe85f33af 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 @@ class CPDF_AnnotList {
   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 33d9b0648d..1c20792cf6 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 860807efd2..4354ac071f 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 b82cee8753..fb74567938 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
index ba0b059572..b19ebbbd8c 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 @@ class CPDF_Bookmark {
   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 7ff4b09ad6..7ede3fefff 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
index f496053383..7207357b1e 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 @@ class CPDF_BookmarkTree {
   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 40491786d7..39f2d23745 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
index c0fd3de709..c09a5aacf4 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 @@ class CPDF_DefaultAppearance {
   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 6a843c684f..da4b9a6f69 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
index 82d8a2b5cf..7a966e26fe 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 @@ class CPDF_Dest {
   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 897cdac610..a7fcdfd071 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
index 137b6afd53..34b8b7ed9e 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 @@ class CPDF_DocJSActions {
   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 6c30cdba81..51b8b356a5 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
index 66f35fc202..c960a839f4 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 @@ class CPDF_FileSpec {
   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 b1b20e172b..c0f08dc480 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 24cb04478d..82a416f942 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
index c73318f49e..3f6cb537ce 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 @@ class CPDF_FormControl {
   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 d709a53a61..4b4ba7fb47 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
index d39c6da4d4..1d83eb060c 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 @@ class CPDF_FormField {
   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 6042fa9d9a..1fe5ee3838 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 fe4fc9a02b..1b800b6be9 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
index a13730d8ce..746161475e 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 @@ class CPDF_IconFit {
   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 7e54db2dae..00fff1acb4 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
index c5512d4699..4c62a401b7 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 @@ class CPDF_InterForm {
   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 6cb53182a2..3c2df15f5a 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
index a3be3ccc90..ce99573e91 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 @@ class CPDF_Link {
   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 326bdda339..d08032d40e 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
index dd9f5517d4..d5c0432671 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 @@ class CPDF_LinkList {
   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 5fd8e920c8..8186c70c54 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
index 31497dd33c..dd68dda713 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 @@ class CPDF_Metadata {
   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 c8f6ebfa7c..37aab075c0 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
index 39a520ddfa..45308b7de5 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 @@ class CPDF_NameTree {
   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 6cb007514e..d2994ac010 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
index 38e81705e5..5c850b9400 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 @@ class CPDF_OCContext {
   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 d8f8f5a9aa..4ac6c6b1f9 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
index 31cf75ff0b..cc13b33f30 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 @@ class CPDF_VariableText {
   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 5ebe2bb11e..98e22b3d44 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
index d93c261183..9375e85b25 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 @@ class CPDF_ViewerPreferences {
   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 cb600fb3a4..908f69f761 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 5c9b4ab5d0..d5ec87948d 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 96e11d38ad..c09503614f 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 3fbc4cc591..603d4458f4 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
index d6c74edb4e..70e3b7f40b 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 @@ struct CPVT_Line {
   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
index 67878f8625..e5c633f2c4 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 @@ struct CPVT_SecProps {
   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
index a9820bd5f9..ae122902d8 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 @@ struct CPVT_Section {
   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 9d9b99fc27..6422efe868 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
index b2af4ec6fa..1e3b5aa0bd 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 @@ inline CPVT_Word::CPVT_Word()
       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 c690e2aa7b..3bb452a005 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
index ef7907797e..33ba7c9ce1 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 @@ struct CPVT_WordPlace {
   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
index 690a5e1950..25d8d76f00 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 @@ struct CPVT_WordProps {
   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
index 3c6f05b159..3cd0ecfb99 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 @@ struct CPVT_WordRange {
   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 a0ce472270..551732d836 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
index 43d69e8db9..da05b79674 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 @@ class IPDF_StructElement {
                          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
index 49bb84d81e..4937bb1f0e 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 @@ class IPDF_FormNotify {
   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
index 9835d5ec12..072783b70c 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 @@ class IPVT_FontMap {
   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 354a93cb76..871a01eeb7 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"