3 files changed, 6 insertions, 6 deletions
diff --git a/xfa/fde/tto/fde_textout.cpp b/xfa/fde/cfde_textout.cpp
index c036c77931..b85bfef3f6 100644
--- a/xfa/fde/tto/fde_textout.cpp
+++ b/xfa/fde/cfde_textout.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fde/tto/fde_textout.h"
+#include "xfa/fde/cfde_textout.h"
 
 #include <algorithm>
 
diff --git a/xfa/fde/tto/fde_textout.h b/xfa/fde/cfde_textout.h
index 2ca77217a6..c505c0737f 100644
--- a/xfa/fde/tto/fde_textout.h
+++ b/xfa/fde/cfde_textout.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FDE_TTO_FDE_TEXTOUT_H_
-#define XFA_FDE_TTO_FDE_TEXTOUT_H_
+#ifndef XFA_FDE_CFDE_TEXTOUT_H_
+#define XFA_FDE_CFDE_TEXTOUT_H_
 
 #include <deque>
 #include <memory>
@@ -108,7 +108,7 @@ class CFDE_TextOut {
                      const CFX_RectF& rect);
   int32_t GetTotalLines();
 
- protected:
+ private:
   void CalcTextSize(const wchar_t* pwsStr, int32_t iLength, CFX_RectF& rect);
   bool RetrieveLineWidth(CFX_BreakType dwBreakStatus,
                          float& fStartPos,
@@ -172,4 +172,4 @@ class CFDE_TextOut {
   std::vector<CFX_RectF> m_rectArray;
 };
 
-#endif  // XFA_FDE_TTO_FDE_TEXTOUT_H_
+#endif  // XFA_FDE_CFDE_TEXTOUT_H_
diff --git a/xfa/fde/cfde_txtedtengine.cpp b/xfa/fde/cfde_txtedtengine.cpp
index bdd36aa218..15edfc1c1c 100644
--- a/xfa/fde/cfde_txtedtengine.cpp
+++ b/xfa/fde/cfde_txtedtengine.cpp
@@ -11,12 +11,12 @@
 
 #include "core/fxcrt/ifx_chariter.h"
 #include "third_party/base/ptr_util.h"
+#include "xfa/fde/cfde_textout.h"
 #include "xfa/fde/cfde_txtedtbuf.h"
 #include "xfa/fde/cfde_txtedtdorecord_deleterange.h"
 #include "xfa/fde/cfde_txtedtdorecord_insert.h"
 #include "xfa/fde/cfde_txtedtpage.h"
 #include "xfa/fde/cfde_txtedtparag.h"
-#include "xfa/fde/tto/fde_textout.h"
 #include "xfa/fgas/layout/fgas_textbreak.h"
 #include "xfa/fwl/cfwl_edit.h"