diff --git a/BUILD.gn b/BUILD.gn
index 06f33a7..84101f4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -874,21 +874,21 @@
       "xfa/src/fdp/src/tto/fde_textout.h",
       "xfa/src/fdp/src/xml/fde_xml_imp.cpp",
       "xfa/src/fdp/src/xml/fde_xml_imp.h",
-      "xfa/src/fee/include/fx_wordbreak.h",
-      "xfa/src/fee/include/ifde_txtedtbuf.h",
-      "xfa/src/fee/include/ifde_txtedtengine.h",
-      "xfa/src/fee/include/ifde_txtedtpage.h",
-      "xfa/src/fee/src/fee/fde_txtedtbuf.cpp",
-      "xfa/src/fee/src/fee/fde_txtedtbuf.h",
-      "xfa/src/fee/src/fee/fde_txtedtengine.cpp",
-      "xfa/src/fee/src/fee/fde_txtedtengine.h",
-      "xfa/src/fee/src/fee/fde_txtedtpage.cpp",
-      "xfa/src/fee/src/fee/fde_txtedtpage.h",
-      "xfa/src/fee/src/fee/fde_txtedtparag.cpp",
-      "xfa/src/fee/src/fee/fde_txtedtparag.h",
-      "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp",
-      "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h",
-      "xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp",
+      "xfa/src/fee/fde_txtedtbuf.cpp",
+      "xfa/src/fee/fde_txtedtbuf.h",
+      "xfa/src/fee/fde_txtedtengine.cpp",
+      "xfa/src/fee/fde_txtedtengine.h",
+      "xfa/src/fee/fde_txtedtpage.cpp",
+      "xfa/src/fee/fde_txtedtpage.h",
+      "xfa/src/fee/fde_txtedtparag.cpp",
+      "xfa/src/fee/fde_txtedtparag.h",
+      "xfa/src/fee/fx_wordbreak/fx_wordbreak.h",
+      "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.cpp",
+      "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h",
+      "xfa/src/fee/fx_wordbreak/fx_wordbreakdata.cpp",
+      "xfa/src/fee/ifde_txtedtbuf.h",
+      "xfa/src/fee/ifde_txtedtengine.h",
+      "xfa/src/fee/ifde_txtedtpage.h",
       "xfa/src/fgas/include/fx_alg.h",
       "xfa/src/fgas/include/fx_cpg.h",
       "xfa/src/fgas/include/fx_datetime.h",
diff --git a/xfa.gyp b/xfa.gyp
index 292742e..755a207 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -144,21 +144,21 @@
         "xfa/src/fdp/src/tto/fde_textout.h",
         "xfa/src/fdp/src/xml/fde_xml_imp.cpp",
         "xfa/src/fdp/src/xml/fde_xml_imp.h",
-        "xfa/src/fee/include/fx_wordbreak.h",
-        "xfa/src/fee/include/ifde_txtedtbuf.h",
-        "xfa/src/fee/include/ifde_txtedtengine.h",
-        "xfa/src/fee/include/ifde_txtedtpage.h",
-        "xfa/src/fee/src/fee/fde_txtedtbuf.cpp",
-        "xfa/src/fee/src/fee/fde_txtedtbuf.h",
-        "xfa/src/fee/src/fee/fde_txtedtengine.cpp",
-        "xfa/src/fee/src/fee/fde_txtedtengine.h",
-        "xfa/src/fee/src/fee/fde_txtedtpage.cpp",
-        "xfa/src/fee/src/fee/fde_txtedtpage.h",
-        "xfa/src/fee/src/fee/fde_txtedtparag.cpp",
-        "xfa/src/fee/src/fee/fde_txtedtparag.h",
-        "xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp",
-        "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp",
-        "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h",
+        "xfa/src/fee/fde_txtedtbuf.cpp",
+        "xfa/src/fee/fde_txtedtbuf.h",
+        "xfa/src/fee/fde_txtedtengine.cpp",
+        "xfa/src/fee/fde_txtedtengine.h",
+        "xfa/src/fee/fde_txtedtpage.cpp",
+        "xfa/src/fee/fde_txtedtpage.h",
+        "xfa/src/fee/fde_txtedtparag.cpp",
+        "xfa/src/fee/fde_txtedtparag.h",
+        "xfa/src/fee/fx_wordbreak/fx_wordbreak.h",
+        "xfa/src/fee/fx_wordbreak/fx_wordbreakdata.cpp",
+        "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.cpp",
+        "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h",
+        "xfa/src/fee/ifde_txtedtbuf.h",
+        "xfa/src/fee/ifde_txtedtengine.h",
+        "xfa/src/fee/ifde_txtedtpage.h",
         "xfa/src/fgas/include/fx_alg.h",
         "xfa/src/fgas/include/fx_cpg.h",
         "xfa/src/fgas/include/fx_datetime.h",
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp b/xfa/src/fee/fde_txtedtbuf.cpp
similarity index 98%
rename from xfa/src/fee/src/fee/fde_txtedtbuf.cpp
rename to xfa/src/fee/fde_txtedtbuf.cpp
index c57fff3..93a12dd 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.cpp
+++ b/xfa/src/fee/fde_txtedtbuf.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
+#include "xfa/src/fee/fde_txtedtbuf.h"
 
 #include <algorithm>
 
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 
 #define FDE_DEFCHUNKCOUNT 2
 #define FDE_TXTEDT_FORMATBLOCK_BGN 0xFFF9
diff --git a/xfa/src/fee/src/fee/fde_txtedtbuf.h b/xfa/src/fee/fde_txtedtbuf.h
similarity index 91%
rename from xfa/src/fee/src/fee/fde_txtedtbuf.h
rename to xfa/src/fee/fde_txtedtbuf.h
index 1be60f8..1b2d19f 100644
--- a/xfa/src/fee/src/fee/fde_txtedtbuf.h
+++ b/xfa/src/fee/fde_txtedtbuf.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
-#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
+#ifndef XFA_SRC_FEE_FDE_TXTEDTBUF_H_
+#define XFA_SRC_FEE_FDE_TXTEDTBUF_H_
 
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 #include "xfa/src/fgas/include/fx_mem.h"
 
 class IFX_CharIter;
@@ -89,4 +89,4 @@
   IFX_MEMAllocator* m_pAllocator;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTBUF_H_
+#endif  // XFA_SRC_FEE_FDE_TXTEDTBUF_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.cpp b/xfa/src/fee/fde_txtedtengine.cpp
similarity index 99%
rename from xfa/src/fee/src/fee/fde_txtedtengine.cpp
rename to xfa/src/fee/fde_txtedtengine.cpp
index cc55489..2430bc0 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.cpp
+++ b/xfa/src/fee/fde_txtedtengine.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
+#include "xfa/src/fee/fde_txtedtengine.h"
 
 #include <algorithm>
 
-#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/src/fee/fde_txtedtbuf.h"
-#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/fde_txtedtbuf.h"
+#include "xfa/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtpage.h"
 #include "xfa/src/fdp/include/fde_tto.h"
 
 #define FDE_PAGEWIDTH_MAX 0xFFFF
diff --git a/xfa/src/fee/src/fee/fde_txtedtengine.h b/xfa/src/fee/fde_txtedtengine.h
similarity index 96%
rename from xfa/src/fee/src/fee/fde_txtedtengine.h
rename to xfa/src/fee/fde_txtedtengine.h
index 6c80903..ef1270f 100644
--- a/xfa/src/fee/src/fee/fde_txtedtengine.h
+++ b/xfa/src/fee/fde_txtedtengine.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
-#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
+#ifndef XFA_SRC_FEE_FDE_TXTEDTENGINE_H_
+#define XFA_SRC_FEE_FDE_TXTEDTENGINE_H_
 
 #include "core/include/fxcrt/fx_string.h"
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 
 class IFX_TxtBreak;
 class IFX_CharIter;
@@ -244,4 +244,4 @@
   CFX_WideString m_wsRange;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTENGINE_H_
+#endif  // XFA_SRC_FEE_FDE_TXTEDTENGINE_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.cpp b/xfa/src/fee/fde_txtedtpage.cpp
similarity index 98%
rename from xfa/src/fee/src/fee/fde_txtedtpage.cpp
rename to xfa/src/fee/fde_txtedtpage.cpp
index 14e7a94..932832f 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.cpp
+++ b/xfa/src/fee/fde_txtedtpage.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fee/fde_txtedtpage.h"
+#include "xfa/src/fee/fde_txtedtpage.h"
 
 #include <algorithm>
 
-#include "xfa/src/fee/include/fx_wordbreak.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/src/fee/fde_txtedtbuf.h"
-#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
-#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak.h"
+#include "xfa/src/fee/fde_txtedtbuf.h"
+#include "xfa/src/fee/fde_txtedtengine.h"
+#include "xfa/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtpage.h"
 
 #define FDE_TXTEDT_TOLERANCE 0.1f
 
diff --git a/xfa/src/fee/src/fee/fde_txtedtpage.h b/xfa/src/fee/fde_txtedtpage.h
similarity index 96%
rename from xfa/src/fee/src/fee/fde_txtedtpage.h
rename to xfa/src/fee/fde_txtedtpage.h
index 9b67b6f..e51f80e 100644
--- a/xfa/src/fee/src/fee/fde_txtedtpage.h
+++ b/xfa/src/fee/fde_txtedtpage.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
-#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
+#ifndef XFA_SRC_FEE_FDE_TXTEDTPAGE_H_
+#define XFA_SRC_FEE_FDE_TXTEDTPAGE_H_
 
 #include "core/include/fxcrt/fx_coordinates.h"
 #include "core/include/fxcrt/fx_string.h"
 #include "xfa/src/fdp/include/fde_psr.h"
-#include "xfa/src/fee/include/ifde_txtedtpage.h"
+#include "xfa/src/fee/ifde_txtedtpage.h"
 #include "xfa/src/fgas/include/fx_utl.h"
 
 class IFX_CharIter;
@@ -165,4 +165,4 @@
   int32_t* m_pCharWidth;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPAGE_H_
+#endif  // XFA_SRC_FEE_FDE_TXTEDTPAGE_H_
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.cpp b/xfa/src/fee/fde_txtedtparag.cpp
similarity index 93%
rename from xfa/src/fee/src/fee/fde_txtedtparag.cpp
rename to xfa/src/fee/fde_txtedtparag.cpp
index 83b2fdd..e5d1d9d 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.cpp
+++ b/xfa/src/fee/fde_txtedtparag.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fee/fde_txtedtparag.h"
+#include "xfa/src/fee/fde_txtedtparag.h"
 
-#include "xfa/src/fee/include/fx_wordbreak.h"
-#include "xfa/src/fee/include/ifde_txtedtbuf.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
-#include "xfa/src/fee/src/fee/fde_txtedtbuf.h"
-#include "xfa/src/fee/src/fee/fde_txtedtengine.h"
+#include "xfa/src/fee/fde_txtedtbuf.h"
+#include "xfa/src/fee/fde_txtedtengine.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak.h"
+#include "xfa/src/fee/ifde_txtedtbuf.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 #include "xfa/src/fgas/include/fx_tbk.h"
 
 CFDE_TxtEdtParag::CFDE_TxtEdtParag(CFDE_TxtEdtEngine* pEngine)
diff --git a/xfa/src/fee/src/fee/fde_txtedtparag.h b/xfa/src/fee/fde_txtedtparag.h
similarity index 82%
rename from xfa/src/fee/src/fee/fde_txtedtparag.h
rename to xfa/src/fee/fde_txtedtparag.h
index d850f6f..5af0497 100644
--- a/xfa/src/fee/src/fee/fde_txtedtparag.h
+++ b/xfa/src/fee/fde_txtedtparag.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
-#define XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
+#ifndef XFA_SRC_FEE_FDE_TXTEDTPARAG_H_
+#define XFA_SRC_FEE_FDE_TXTEDTPARAG_H_
 
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 
 class CFDE_TxtEdtEngine;
 
@@ -34,4 +34,4 @@
   CFDE_TxtEdtEngine* m_pEngine;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FEE_FDE_TXTEDTPARAG_H_
+#endif  // XFA_SRC_FEE_FDE_TXTEDTPARAG_H_
diff --git a/xfa/src/fee/include/fx_wordbreak.h b/xfa/src/fee/fx_wordbreak/fx_wordbreak.h
similarity index 85%
rename from xfa/src/fee/include/fx_wordbreak.h
rename to xfa/src/fee/fx_wordbreak/fx_wordbreak.h
index f545f48..f67afb6 100644
--- a/xfa/src/fee/include/fx_wordbreak.h
+++ b/xfa/src/fee/fx_wordbreak/fx_wordbreak.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_
-#define XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_
+#ifndef XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
+#define XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
 
 #include "core/include/fxcrt/fx_string.h"
 #include "core/include/fxcrt/fx_system.h"
@@ -27,4 +27,4 @@
 };
 IFX_WordBreak* FX_WordBreak_Create();
 
-#endif  // XFA_SRC_FEE_INCLUDE_FX_WORDBREAK_H_
+#endif  // XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_H_
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp b/xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.cpp
similarity index 97%
rename from xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp
rename to xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.cpp
index 155d165..036b4f8 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.cpp
+++ b/xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.cpp
@@ -4,14 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h"
-
-#define FX_IsOdd(a) ((a)&1)
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h"
 
 FX_WordBreakProp FX_GetWordBreakProperty(FX_WCHAR wcCodePoint) {
   FX_DWORD dwProperty =
       (FX_DWORD)gs_FX_WordBreak_CodePointProperties[wcCodePoint >> 1];
-  return (FX_WordBreakProp)(FX_IsOdd(wcCodePoint) ? (dwProperty & 0x0F)
+  return (FX_WordBreakProp)(((wcCodePoint) & 1) ? (dwProperty & 0x0F)
                                                   : (dwProperty >> 4));
 }
 CFX_CharIter::CFX_CharIter(const CFX_WideString& wsText)
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h b/xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h
similarity index 86%
rename from xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
rename to xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h
index 616690b..253d83b 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h
+++ b/xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h
@@ -4,16 +4,16 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
-#define XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
+#ifndef XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
+#define XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
 
 #include <cstdint>
 
 #include "core/include/fxcrt/fx_string.h"
 #include "core/include/fxcrt/fx_system.h"
-#include "xfa/src/fee/include/fx_wordbreak.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
-#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 
 extern const FX_WORD gs_FX_WordBreak_Table[16];
 extern const uint8_t gs_FX_WordBreak_CodePointProperties[(0xFFFF - 1) / 2 + 1];
@@ -75,4 +75,4 @@
   IFX_CharIter* m_pCurIter;
 };
 
-#endif  // XFA_SRC_FEE_SRC_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
+#endif  // XFA_SRC_FEE_FX_WORDBREAK_FX_WORDBREAK_IMPL_H_
diff --git a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp b/xfa/src/fee/fx_wordbreak/fx_wordbreakdata.cpp
similarity index 99%
rename from xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp
rename to xfa/src/fee/fx_wordbreak/fx_wordbreakdata.cpp
index 9d4cc5c..ea1a31f 100644
--- a/xfa/src/fee/src/fx_wordbreak/fx_wordbreakdata.cpp
+++ b/xfa/src/fee/fx_wordbreak/fx_wordbreakdata.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/src/fee/src/fx_wordbreak/fx_wordbreak_impl.h"
+#include "xfa/src/fee/fx_wordbreak/fx_wordbreak_impl.h"
 
 const FX_WORD gs_FX_WordBreak_Table[16] = {
     0xFFFF, 0xFFF9, 0xFFFB, 0xFFFB, 0xFFFB, 0xFFFB, 0xEFBB, 0xE77B,
diff --git a/xfa/src/fee/include/ifde_txtedtbuf.h b/xfa/src/fee/ifde_txtedtbuf.h
similarity index 89%
rename from xfa/src/fee/include/ifde_txtedtbuf.h
rename to xfa/src/fee/ifde_txtedtbuf.h
index f7c9550..8cc7dfe 100644
--- a/xfa/src/fee/include/ifde_txtedtbuf.h
+++ b/xfa/src/fee/ifde_txtedtbuf.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_
-#define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_
+#ifndef XFA_SRC_FEE_IFDE_TXTEDTBUF_H_
+#define XFA_SRC_FEE_IFDE_TXTEDTBUF_H_
 
 #include "core/include/fxcrt/fx_basic.h"
 
@@ -36,4 +36,4 @@
   virtual FX_BOOL Optimize(IFX_Pause* pPause = NULL) = 0;
 };
 
-#endif  // XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTBUF_H_
+#endif  // XFA_SRC_FEE_IFDE_TXTEDTBUF_H_
diff --git a/xfa/src/fee/include/ifde_txtedtengine.h b/xfa/src/fee/ifde_txtedtengine.h
similarity index 98%
rename from xfa/src/fee/include/ifde_txtedtengine.h
rename to xfa/src/fee/ifde_txtedtengine.h
index d4319d2..053fd1c 100644
--- a/xfa/src/fee/include/ifde_txtedtengine.h
+++ b/xfa/src/fee/ifde_txtedtengine.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_
-#define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_
+#ifndef XFA_SRC_FEE_IFDE_TXTEDTENGINE_H_
+#define XFA_SRC_FEE_IFDE_TXTEDTENGINE_H_
 
 #include "core/include/fxge/fx_dib.h"
 #include "xfa/src/fgas/include/fx_fnt.h"
@@ -255,4 +255,4 @@
                             int32_t& nCount) const = 0;
 };
 
-#endif  // XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTENGINE_H_
+#endif  // XFA_SRC_FEE_IFDE_TXTEDTENGINE_H_
diff --git a/xfa/src/fee/include/ifde_txtedtpage.h b/xfa/src/fee/ifde_txtedtpage.h
similarity index 91%
rename from xfa/src/fee/include/ifde_txtedtpage.h
rename to xfa/src/fee/ifde_txtedtpage.h
index 884b752..c0236ff 100644
--- a/xfa/src/fee/include/ifde_txtedtpage.h
+++ b/xfa/src/fee/ifde_txtedtpage.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_
-#define XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_
+#ifndef XFA_SRC_FEE_IFDE_TXTEDTPAGE_H_
+#define XFA_SRC_FEE_IFDE_TXTEDTPAGE_H_
 
 #include "core/include/fxge/fx_ge.h"
 #include "xfa/src/fdp/include/fde_psr.h"
@@ -39,4 +39,4 @@
   virtual const CFX_RectF& GetContentsBox() = 0;
 };
 
-#endif  // XFA_SRC_FEE_INCLUDE_IFDE_TXTEDTPAGE_H_
+#endif  // XFA_SRC_FEE_IFDE_TXTEDTPAGE_H_
diff --git a/xfa/src/fwl/basewidget/fwl_editimp.cpp b/xfa/src/fwl/basewidget/fwl_editimp.cpp
index d60bc11..6c802ff 100644
--- a/xfa/src/fwl/basewidget/fwl_editimp.cpp
+++ b/xfa/src/fwl/basewidget/fwl_editimp.cpp
@@ -14,7 +14,7 @@
 #include "xfa/include/fwl/core/fwl_theme.h"
 #include "xfa/src/fdp/include/fde_rdr.h"
 #include "xfa/src/fdp/include/fde_rdv.h"
-#include "xfa/src/fee/include/ifde_txtedtpage.h"
+#include "xfa/src/fee/ifde_txtedtpage.h"
 #include "xfa/src/fwl/basewidget/fwl_caretimp.h"
 #include "xfa/src/fwl/basewidget/fwl_comboboximp.h"
 #include "xfa/src/fwl/basewidget/fwl_scrollbarimp.h"
diff --git a/xfa/src/fwl/basewidget/fwl_editimp.h b/xfa/src/fwl/basewidget/fwl_editimp.h
index 0dbdca2..6e6b35c 100644
--- a/xfa/src/fwl/basewidget/fwl_editimp.h
+++ b/xfa/src/fwl/basewidget/fwl_editimp.h
@@ -11,7 +11,7 @@
 #include <vector>
 
 #include "xfa/include/fwl/basewidget/fwl_scrollbar.h"
-#include "xfa/src/fee/include/ifde_txtedtengine.h"
+#include "xfa/src/fee/ifde_txtedtengine.h"
 #include "xfa/src/fwl/core/fwl_widgetimp.h"
 
 class CFWL_WidgetImpProperties;