7 files changed, 17 insertions, 20 deletions
diff --git a/fpdfsdk/fxedit/include/fx_edit.h b/fpdfsdk/fxedit/fx_edit.h
index da93071f23..6c9166709c 100644
--- a/fpdfsdk/fxedit/include/fx_edit.h
+++ b/fpdfsdk/fxedit/fx_edit.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_
-#define FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_
+#ifndef FPDFSDK_FXEDIT_FX_EDIT_H_
+#define FPDFSDK_FXEDIT_FX_EDIT_H_
 
 #include "core/fxcrt/fx_basic.h"
 
@@ -20,4 +20,4 @@ CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap,
                                 uint16_t Word,
                                 uint16_t SubWord);
 
-#endif  // FPDFSDK_FXEDIT_INCLUDE_FX_EDIT_H_
+#endif  // FPDFSDK_FXEDIT_FX_EDIT_H_
diff --git a/fpdfsdk/fxedit/fxet_ap.cpp b/fpdfsdk/fxedit/fxet_ap.cpp
index e3fb03432a..a259d83079 100644
--- a/fpdfsdk/fxedit/fxet_ap.cpp
+++ b/fpdfsdk/fxedit/fxet_ap.cpp
@@ -8,8 +8,8 @@
 #include "core/fpdfapi/fpdf_parser/fpdf_parser_decode.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"
+#include "fpdfsdk/fxedit/fx_edit.h"
+#include "fpdfsdk/fxedit/fxet_edit.h"
 
 CFX_ByteString GetPDFWordString(IPVT_FontMap* pFontMap,
                                 int32_t nFontIndex,
diff --git a/fpdfsdk/fxedit/fxet_edit.cpp b/fpdfsdk/fxedit/fxet_edit.cpp
index bed91dc98c..ef3f7415bd 100644
--- a/fpdfsdk/fxedit/fxet_edit.cpp
+++ b/fpdfsdk/fxedit/fxet_edit.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/fxedit/include/fxet_edit.h"
+#include "fpdfsdk/fxedit/fxet_edit.h"
 
 #include <algorithm>
 #include <memory>
@@ -25,7 +25,7 @@
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "fpdfsdk/cfx_systemhandler.h"
-#include "fpdfsdk/fxedit/include/fx_edit.h"
+#include "fpdfsdk/fxedit/fx_edit.h"
 #include "fpdfsdk/pdfwindow/PWL_Edit.h"
 #include "fpdfsdk/pdfwindow/PWL_EditCtrl.h"
 
diff --git a/fpdfsdk/fxedit/include/fxet_edit.h b/fpdfsdk/fxedit/fxet_edit.h
index 652dbbf2ce..394a2fd3f3 100644
--- a/fpdfsdk/fxedit/include/fxet_edit.h
+++ b/fpdfsdk/fxedit/fxet_edit.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FXEDIT_INCLUDE_FXET_EDIT_H_
-#define FPDFSDK_FXEDIT_INCLUDE_FXET_EDIT_H_
+#ifndef FPDFSDK_FXEDIT_FXET_EDIT_H_
+#define FPDFSDK_FXEDIT_FXET_EDIT_H_
 
 #include <memory>
 
 #include "core/fpdfdoc/cpvt_secprops.h"
 #include "core/fpdfdoc/cpvt_wordprops.h"
-#include "fpdfsdk/fxedit/include/fx_edit.h"
+#include "fpdfsdk/fxedit/fx_edit.h"
 
 class CFFL_FormFiller;
 class CFX_Edit;
@@ -557,4 +557,4 @@ class CFX_Edit_Provider : public CPDF_VariableText::Provider {
   IPVT_FontMap* m_pFontMap;
 };
 
-#endif  // FPDFSDK_FXEDIT_INCLUDE_FXET_EDIT_H_
+#endif  // FPDFSDK_FXEDIT_FXET_EDIT_H_
diff --git a/fpdfsdk/fxedit/fxet_list.cpp b/fpdfsdk/fxedit/fxet_list.cpp
index 5c51446db4..fa4a154e8c 100644
--- a/fpdfsdk/fxedit/fxet_list.cpp
+++ b/fpdfsdk/fxedit/fxet_list.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fpdfsdk/fxedit/include/fxet_list.h"
+#include "fpdfsdk/fxedit/fxet_list.h"
 
 #include "core/fpdfdoc/cpvt_word.h"
-#include "fpdfsdk/fxedit/include/fxet_edit.h"
+#include "fpdfsdk/fxedit/fxet_edit.h"
 #include "fpdfsdk/pdfwindow/PWL_ListBox.h"
 
 CFX_ListItem::CFX_ListItem()
diff --git a/fpdfsdk/fxedit/include/fxet_list.h b/fpdfsdk/fxedit/fxet_list.h
index 1d738c0dcc..ce7acc4220 100644
--- a/fpdfsdk/fxedit/include/fxet_list.h
+++ b/fpdfsdk/fxedit/fxet_list.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_
-#define FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_
+#ifndef FPDFSDK_FXEDIT_FXET_LIST_H_
+#define FPDFSDK_FXEDIT_FXET_LIST_H_
 
 #include "core/fxcrt/fx_coordinates.h"
-#include "fpdfsdk/fxedit/include/fx_edit.h"
+#include "fpdfsdk/fxedit/fx_edit.h"
 
 class CFX_Edit;
 class CFX_Edit_Iterator;
@@ -301,4 +301,4 @@ class CFX_ListCtrl : protected CFX_ListContainer {
   FX_BOOL m_bMultiple;
 };
 
-#endif  // FPDFSDK_FXEDIT_INCLUDE_FXET_LIST_H_
+#endif  // FPDFSDK_FXEDIT_FXET_LIST_H_
diff --git a/fpdfsdk/fxedit/include/DEPS b/fpdfsdk/fxedit/include/DEPS
deleted file mode 100644
index 0b00511fb2..0000000000
--- a/fpdfsdk/fxedit/include/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  '+core/fpdfdoc',
-]