9 files changed, 19 insertions, 37 deletions
diff --git a/xfa/src/fee/src/fee/fde_txtedtblock.cpp b/xfa/src/fee/src/fee/fde_txtedtblock.cpp
index d98b6eefa4..15ef6620cc 100644
--- a/xfa/src/fee/src/fee/fde_txtedtblock.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtblock.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../foxitlib.h"
+#include "xfa/src/foxitlib.h"
 #include "fde_txtedtblock.h"
 #ifdef FDE_USEFORMATBLOCK
 #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp
index 53aef2ba03..0019207212 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtbuf.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../foxitlib.h"
-#include "../../include/ifde_txtedtbuf.h"
-#include "../../include/ifde_txtedtengine.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fee/include/ifde_txtedtbuf.h"
+#include "xfa/src/fee/include/ifde_txtedtengine.h"
 #include "fde_txtedtbuf.h"
 #define FDE_DEFCHUNKCOUNT 2
 #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/src/fee/fde_txtedtengine.cpp
index 6cf8f0e872..51f41d1273 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtengine.cpp
@@ -4,13 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../foxitlib.h"
-#include "../../include/ifde_txtedtengine.h"
-#include "../../include/ifde_txtedtbuf.h"
-#include "../../include/ifde_txtedtpage.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/include/ifde_txtedtbuf.h"
+#include "xfa/src/fee/include/ifde_txtedtpage.h"
 #include "fde_txtedtengine.h"
 #include "fde_txtedtparag.h"
-#include "fde_txtedtkmpmatch.h"
 #include "fde_txtedtbuf.h"
 #ifdef FDE_USEFORMATBLOCK
 #include "fde_txtedtblock.h"
diff --git a/xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp b/xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp
deleted file mode 100644
index 7d0790bf8c..0000000000
--- a/xfa/src/fee/src/fee/fde_txtedtkmpmatch.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../../../foxitlib.h"
-#include "fde_txtedtkmpmatch.h"
diff --git a/xfa/src/fee/src/fee/fde_txtedtkmpmatch.h b/xfa/src/fee/src/fee/fde_txtedtkmpmatch.h
deleted file mode 100644
index 0b5b477172..0000000000
--- a/xfa/src/fee/src/fee/fde_txtedtkmpmatch.h
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifndef _FDE_KMPMATCH_H
-#define _FDE_KMPMATCH_H
-#endif
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/src/fee/fde_txtedtpage.cpp
index ec715b9070..2c592232f6 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtpage.cpp
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../foxitlib.h"
-#include "../../include/ifde_txtedtbuf.h"
-#include "../../include/ifde_txtedtengine.h"
-#include "../../include/ifde_txtedtpage.h"
-#include "../../include/fx_wordbreak.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fee/include/ifde_txtedtbuf.h"
+#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/include/ifde_txtedtpage.h"
+#include "xfa/src/fee/include/fx_wordbreak.h"
 #include "fde_txtedtpage.h"
 #include "fde_txtedtengine.h"
 #include "fde_txtedtparag.h"
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/src/fee/fde_txtedtparag.cpp
index cf6fa77acc..7be3a27e24 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp
+++ b/xfa/src/fee/src/fee/fde_txtedtparag.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../foxitlib.h"
-#include "../../include/ifde_txtedtbuf.h"
-#include "../../include/ifde_txtedtengine.h"
-#include "../../include/fx_wordbreak.h"
+#include "xfa/src/foxitlib.h"
+#include "xfa/src/fee/include/ifde_txtedtbuf.h"
+#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/include/fx_wordbreak.h"
 #include "fde_txtedtparag.h"
 #include "fde_txtedtengine.h"
 #include "fde_txtedtbuf.h"
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp
index e3d1fc2cf0..1841523d9b 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp
+++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../foxitlib.h"
+#include "xfa/src/foxitlib.h"
 #include "fx_wordbreak_impl.h"
 #define FX_IsOdd(a) ((a)&1)
 FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint) {
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp
index 8cf2c2a290..2527a79ba8 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp
+++ b/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../../foxitlib.h"
+#include "xfa/src/foxitlib.h"
 #include "fx_wordbreak_impl.h"
 extern const FX_WORD gs_FX_WordBreak_Table[16] = {
     0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B,