diff --git a/BUILD.gn b/BUILD.gn
index 487b604..88619bd 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -887,8 +887,8 @@
       "xfa/src/fdp/src/fde/fde_render.h",
       "xfa/src/fdp/src/tto/fde_textout.cpp",
       "xfa/src/fdp/src/tto/fde_textout.h",
-      "xfa/src/fdp/src/xml/fde_xml.cpp",
-      "xfa/src/fdp/src/xml/fde_xml.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",
diff --git a/xfa.gyp b/xfa.gyp
index 810464e..8e1ddec 100644
--- a/xfa.gyp
+++ b/xfa.gyp
@@ -134,8 +134,8 @@
         "xfa/src/fdp/src/fde/fde_render.h",
         "xfa/src/fdp/src/tto/fde_textout.cpp",
         "xfa/src/fdp/src/tto/fde_textout.h",
-        "xfa/src/fdp/src/xml/fde_xml.cpp",
-        "xfa/src/fdp/src/xml/fde_xml.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",
diff --git a/xfa/src/fdp/include/fde_xml.h b/xfa/src/fdp/include/fde_xml.h
index 9fc80b7..85793aa 100644
--- a/xfa/src/fdp/include/fde_xml.h
+++ b/xfa/src/fdp/include/fde_xml.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_XML
-#define _FDE_XML
+#ifndef FDE_XML_H_
+#define FDE_XML_H_
+
 class IFDE_XMLNode;
 class IFDE_XMLInstruction;
 class IFDE_XMLDeclaration;
@@ -228,4 +229,5 @@
   virtual void GetTextData(CFX_WideString& wsText) const = 0;
   virtual void GetTargetData(CFX_WideString& wsData) const = 0;
 };
-#endif
+
+#endif  // FDE_XML_H_
diff --git a/xfa/src/fdp/src/xml/fde_xml.cpp b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
similarity index 99%
rename from xfa/src/fdp/src/xml/fde_xml.cpp
rename to xfa/src/fdp/src/xml/fde_xml_imp.cpp
index 8725cb7..6961aba 100644
--- a/xfa/src/fdp/src/xml/fde_xml.cpp
+++ b/xfa/src/fdp/src/xml/fde_xml_imp.cpp
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "xfa/src/foxitlib.h"
-#include "fde_xml.h"
+#include "fde_xml_imp.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -1320,8 +1320,7 @@
     : m_iDataLength(0),
       m_iBufferSize(0),
       m_iAllocStep(iAllocStep),
-      m_iStartPosition(0) {
-}
+      m_iStartPosition(0) {}
 CFDE_BlockBuffer::~CFDE_BlockBuffer() {
   ClearBuffer();
 }
diff --git a/xfa/src/fdp/src/xml/fde_xml.h b/xfa/src/fdp/src/xml/fde_xml_imp.h
similarity index 99%
rename from xfa/src/fdp/src/xml/fde_xml.h
rename to xfa/src/fdp/src/xml/fde_xml_imp.h
index fb5ea6f..1a80970 100644
--- a/xfa/src/fdp/src/xml/fde_xml.h
+++ b/xfa/src/fdp/src/xml/fde_xml_imp.h
@@ -4,8 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef _FDE_XML_IMP
-#define _FDE_XML_IMP
+#ifndef FDE_XML_IMP_H_
+#define FDE_XML_IMP_H_
+
 #define _FDE_BLOCK_BUFFER
 #ifdef _FDE_BLOCK_BUFFER
 class CFDE_BlockBuffer;
@@ -370,4 +371,5 @@
   void GetData(CFX_WideString& wsData) const;
 #endif
 };
-#endif
+
+#endif  // FDE_XML_IMP_H_