143 files changed, 670 insertions, 657 deletions

diff --git a/BUILD.gn b/BUILD.gn
index b54f67d9f7..175106a6e4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1156,6 +1156,145 @@ if (pdf_enable_xfa) {
     configs += [ ":pdfium_core_config" ]
   }
 
+  static_library("fxbarcode") {
+    sources = [
+      "fxbarcode/BC_Dimension.cpp",
+      "fxbarcode/BC_Dimension.h",
+      "fxbarcode/BC_Library.cpp",
+      "fxbarcode/BC_Library.h",
+      "fxbarcode/BC_TwoDimWriter.cpp",
+      "fxbarcode/BC_TwoDimWriter.h",
+      "fxbarcode/BC_UtilCodingConvert.cpp",
+      "fxbarcode/BC_UtilCodingConvert.h",
+      "fxbarcode/BC_Utils.cpp",
+      "fxbarcode/BC_Writer.cpp",
+      "fxbarcode/BC_Writer.h",
+      "fxbarcode/cbc_codabar.cpp",
+      "fxbarcode/cbc_codabar.h",
+      "fxbarcode/cbc_code128.cpp",
+      "fxbarcode/cbc_code128.h",
+      "fxbarcode/cbc_code39.cpp",
+      "fxbarcode/cbc_code39.h",
+      "fxbarcode/cbc_codebase.cpp",
+      "fxbarcode/cbc_codebase.h",
+      "fxbarcode/cbc_datamatrix.cpp",
+      "fxbarcode/cbc_datamatrix.h",
+      "fxbarcode/cbc_ean13.cpp",
+      "fxbarcode/cbc_ean13.h",
+      "fxbarcode/cbc_ean8.cpp",
+      "fxbarcode/cbc_ean8.h",
+      "fxbarcode/cbc_onecode.cpp",
+      "fxbarcode/cbc_onecode.h",
+      "fxbarcode/cbc_pdf417i.cpp",
+      "fxbarcode/cbc_pdf417i.h",
+      "fxbarcode/cbc_qrcode.cpp",
+      "fxbarcode/cbc_qrcode.h",
+      "fxbarcode/cbc_upca.cpp",
+      "fxbarcode/cbc_upca.h",
+      "fxbarcode/common/BC_CommonBitArray.cpp",
+      "fxbarcode/common/BC_CommonBitArray.h",
+      "fxbarcode/common/BC_CommonBitMatrix.cpp",
+      "fxbarcode/common/BC_CommonBitMatrix.h",
+      "fxbarcode/common/BC_CommonByteArray.cpp",
+      "fxbarcode/common/BC_CommonByteArray.h",
+      "fxbarcode/common/BC_CommonByteMatrix.cpp",
+      "fxbarcode/common/BC_CommonByteMatrix.h",
+      "fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp",
+      "fxbarcode/common/reedsolomon/BC_ReedSolomon.h",
+      "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp",
+      "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h",
+      "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp",
+      "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h",
+      "fxbarcode/datamatrix/BC_ASCIIEncoder.cpp",
+      "fxbarcode/datamatrix/BC_ASCIIEncoder.h",
+      "fxbarcode/datamatrix/BC_Base256Encoder.cpp",
+      "fxbarcode/datamatrix/BC_Base256Encoder.h",
+      "fxbarcode/datamatrix/BC_C40Encoder.cpp",
+      "fxbarcode/datamatrix/BC_C40Encoder.h",
+      "fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp",
+      "fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h",
+      "fxbarcode/datamatrix/BC_DataMatrixWriter.cpp",
+      "fxbarcode/datamatrix/BC_DataMatrixWriter.h",
+      "fxbarcode/datamatrix/BC_DefaultPlacement.cpp",
+      "fxbarcode/datamatrix/BC_DefaultPlacement.h",
+      "fxbarcode/datamatrix/BC_EdifactEncoder.cpp",
+      "fxbarcode/datamatrix/BC_EdifactEncoder.h",
+      "fxbarcode/datamatrix/BC_Encoder.cpp",
+      "fxbarcode/datamatrix/BC_Encoder.h",
+      "fxbarcode/datamatrix/BC_EncoderContext.cpp",
+      "fxbarcode/datamatrix/BC_EncoderContext.h",
+      "fxbarcode/datamatrix/BC_ErrorCorrection.cpp",
+      "fxbarcode/datamatrix/BC_ErrorCorrection.h",
+      "fxbarcode/datamatrix/BC_HighLevelEncoder.cpp",
+      "fxbarcode/datamatrix/BC_HighLevelEncoder.h",
+      "fxbarcode/datamatrix/BC_SymbolInfo.cpp",
+      "fxbarcode/datamatrix/BC_SymbolInfo.h",
+      "fxbarcode/datamatrix/BC_SymbolShapeHint.cpp",
+      "fxbarcode/datamatrix/BC_SymbolShapeHint.h",
+      "fxbarcode/datamatrix/BC_TextEncoder.cpp",
+      "fxbarcode/datamatrix/BC_TextEncoder.h",
+      "fxbarcode/datamatrix/BC_X12Encoder.cpp",
+      "fxbarcode/datamatrix/BC_X12Encoder.h",
+      "fxbarcode/oned/BC_OneDimWriter.cpp",
+      "fxbarcode/oned/BC_OneDimWriter.h",
+      "fxbarcode/oned/BC_OnedCodaBarWriter.cpp",
+      "fxbarcode/oned/BC_OnedCodaBarWriter.h",
+      "fxbarcode/oned/BC_OnedCode128Writer.cpp",
+      "fxbarcode/oned/BC_OnedCode128Writer.h",
+      "fxbarcode/oned/BC_OnedCode39Writer.cpp",
+      "fxbarcode/oned/BC_OnedCode39Writer.h",
+      "fxbarcode/oned/BC_OnedEAN13Writer.cpp",
+      "fxbarcode/oned/BC_OnedEAN13Writer.h",
+      "fxbarcode/oned/BC_OnedEAN8Writer.cpp",
+      "fxbarcode/oned/BC_OnedEAN8Writer.h",
+      "fxbarcode/oned/BC_OnedUPCAWriter.cpp",
+      "fxbarcode/oned/BC_OnedUPCAWriter.h",
+      "fxbarcode/pdf417/BC_PDF417.cpp",
+      "fxbarcode/pdf417/BC_PDF417.h",
+      "fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp",
+      "fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h",
+      "fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp",
+      "fxbarcode/pdf417/BC_PDF417BarcodeRow.h",
+      "fxbarcode/pdf417/BC_PDF417Compaction.cpp",
+      "fxbarcode/pdf417/BC_PDF417Compaction.h",
+      "fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp",
+      "fxbarcode/pdf417/BC_PDF417ErrorCorrection.h",
+      "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp",
+      "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h",
+      "fxbarcode/pdf417/BC_PDF417Writer.cpp",
+      "fxbarcode/pdf417/BC_PDF417Writer.h",
+      "fxbarcode/qrcode/BC_QRCodeWriter.cpp",
+      "fxbarcode/qrcode/BC_QRCodeWriter.h",
+      "fxbarcode/qrcode/BC_QRCoder.cpp",
+      "fxbarcode/qrcode/BC_QRCoder.h",
+      "fxbarcode/qrcode/BC_QRCoderBitVector.cpp",
+      "fxbarcode/qrcode/BC_QRCoderBitVector.h",
+      "fxbarcode/qrcode/BC_QRCoderBlockPair.cpp",
+      "fxbarcode/qrcode/BC_QRCoderBlockPair.h",
+      "fxbarcode/qrcode/BC_QRCoderECB.cpp",
+      "fxbarcode/qrcode/BC_QRCoderECB.h",
+      "fxbarcode/qrcode/BC_QRCoderECBlocks.cpp",
+      "fxbarcode/qrcode/BC_QRCoderECBlocks.h",
+      "fxbarcode/qrcode/BC_QRCoderEncoder.cpp",
+      "fxbarcode/qrcode/BC_QRCoderEncoder.h",
+      "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp",
+      "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h",
+      "fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp",
+      "fxbarcode/qrcode/BC_QRCoderMaskUtil.h",
+      "fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp",
+      "fxbarcode/qrcode/BC_QRCoderMatrixUtil.h",
+      "fxbarcode/qrcode/BC_QRCoderMode.cpp",
+      "fxbarcode/qrcode/BC_QRCoderMode.h",
+      "fxbarcode/qrcode/BC_QRCoderVersion.cpp",
+      "fxbarcode/qrcode/BC_QRCoderVersion.h",
+      "fxbarcode/utils.h",
+    ]
+    deps = [
+      ":fxcrt",
+    ]
+    configs += [ ":pdfium_core_config" ]
+  }
+
   static_library("xfa") {
     sources = [
       "xfa/fde/cfde_path.cpp",
@@ -1378,136 +1517,6 @@ if (pdf_enable_xfa) {
       "xfa/fwl/theme/cfwl_utils.h",
       "xfa/fwl/theme/cfwl_widgettp.cpp",
       "xfa/fwl/theme/cfwl_widgettp.h",
-      "xfa/fxbarcode/BC_Dimension.cpp",
-      "xfa/fxbarcode/BC_Dimension.h",
-      "xfa/fxbarcode/BC_Library.cpp",
-      "xfa/fxbarcode/BC_Library.h",
-      "xfa/fxbarcode/BC_TwoDimWriter.cpp",
-      "xfa/fxbarcode/BC_TwoDimWriter.h",
-      "xfa/fxbarcode/BC_UtilCodingConvert.cpp",
-      "xfa/fxbarcode/BC_UtilCodingConvert.h",
-      "xfa/fxbarcode/BC_Utils.cpp",
-      "xfa/fxbarcode/BC_Writer.cpp",
-      "xfa/fxbarcode/BC_Writer.h",
-      "xfa/fxbarcode/cbc_codabar.cpp",
-      "xfa/fxbarcode/cbc_codabar.h",
-      "xfa/fxbarcode/cbc_code128.cpp",
-      "xfa/fxbarcode/cbc_code128.h",
-      "xfa/fxbarcode/cbc_code39.cpp",
-      "xfa/fxbarcode/cbc_code39.h",
-      "xfa/fxbarcode/cbc_codebase.cpp",
-      "xfa/fxbarcode/cbc_codebase.h",
-      "xfa/fxbarcode/cbc_datamatrix.cpp",
-      "xfa/fxbarcode/cbc_datamatrix.h",
-      "xfa/fxbarcode/cbc_ean13.cpp",
-      "xfa/fxbarcode/cbc_ean13.h",
-      "xfa/fxbarcode/cbc_ean8.cpp",
-      "xfa/fxbarcode/cbc_ean8.h",
-      "xfa/fxbarcode/cbc_onecode.cpp",
-      "xfa/fxbarcode/cbc_onecode.h",
-      "xfa/fxbarcode/cbc_pdf417i.cpp",
-      "xfa/fxbarcode/cbc_pdf417i.h",
-      "xfa/fxbarcode/cbc_qrcode.cpp",
-      "xfa/fxbarcode/cbc_qrcode.h",
-      "xfa/fxbarcode/cbc_upca.cpp",
-      "xfa/fxbarcode/cbc_upca.h",
-      "xfa/fxbarcode/common/BC_CommonBitArray.cpp",
-      "xfa/fxbarcode/common/BC_CommonBitArray.h",
-      "xfa/fxbarcode/common/BC_CommonBitMatrix.cpp",
-      "xfa/fxbarcode/common/BC_CommonBitMatrix.h",
-      "xfa/fxbarcode/common/BC_CommonByteArray.cpp",
-      "xfa/fxbarcode/common/BC_CommonByteArray.h",
-      "xfa/fxbarcode/common/BC_CommonByteMatrix.cpp",
-      "xfa/fxbarcode/common/BC_CommonByteMatrix.h",
-      "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp",
-      "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h",
-      "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp",
-      "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h",
-      "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp",
-      "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h",
-      "xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp",
-      "xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.h",
-      "xfa/fxbarcode/datamatrix/BC_Base256Encoder.cpp",
-      "xfa/fxbarcode/datamatrix/BC_Base256Encoder.h",
-      "xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp",
-      "xfa/fxbarcode/datamatrix/BC_C40Encoder.h",
-      "xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp",
-      "xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h",
-      "xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp",
-      "xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h",
-      "xfa/fxbarcode/datamatrix/BC_DefaultPlacement.cpp",
-      "xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h",
-      "xfa/fxbarcode/datamatrix/BC_EdifactEncoder.cpp",
-      "xfa/fxbarcode/datamatrix/BC_EdifactEncoder.h",
-      "xfa/fxbarcode/datamatrix/BC_Encoder.cpp",
-      "xfa/fxbarcode/datamatrix/BC_Encoder.h",
-      "xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp",
-      "xfa/fxbarcode/datamatrix/BC_EncoderContext.h",
-      "xfa/fxbarcode/datamatrix/BC_ErrorCorrection.cpp",
-      "xfa/fxbarcode/datamatrix/BC_ErrorCorrection.h",
-      "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp",
-      "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h",
-      "xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp",
-      "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h",
-      "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp",
-      "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h",
-      "xfa/fxbarcode/datamatrix/BC_TextEncoder.cpp",
-      "xfa/fxbarcode/datamatrix/BC_TextEncoder.h",
-      "xfa/fxbarcode/datamatrix/BC_X12Encoder.cpp",
-      "xfa/fxbarcode/datamatrix/BC_X12Encoder.h",
-      "xfa/fxbarcode/oned/BC_OneDimWriter.cpp",
-      "xfa/fxbarcode/oned/BC_OneDimWriter.h",
-      "xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp",
-      "xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h",
-      "xfa/fxbarcode/oned/BC_OnedCode128Writer.cpp",
-      "xfa/fxbarcode/oned/BC_OnedCode128Writer.h",
-      "xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp",
-      "xfa/fxbarcode/oned/BC_OnedCode39Writer.h",
-      "xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp",
-      "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h",
-      "xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp",
-      "xfa/fxbarcode/oned/BC_OnedEAN8Writer.h",
-      "xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp",
-      "xfa/fxbarcode/oned/BC_OnedUPCAWriter.h",
-      "xfa/fxbarcode/pdf417/BC_PDF417.cpp",
-      "xfa/fxbarcode/pdf417/BC_PDF417.h",
-      "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp",
-      "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h",
-      "xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp",
-      "xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h",
-      "xfa/fxbarcode/pdf417/BC_PDF417Compaction.cpp",
-      "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h",
-      "xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp",
-      "xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h",
-      "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp",
-      "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h",
-      "xfa/fxbarcode/pdf417/BC_PDF417Writer.cpp",
-      "xfa/fxbarcode/pdf417/BC_PDF417Writer.h",
-      "xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCodeWriter.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoder.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoder.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderECB.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderECB.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderMode.h",
-      "xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp",
-      "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h",
-      "xfa/fxbarcode/utils.h",
       "xfa/fxfa/app/cxfa_csstagprovider.cpp",
       "xfa/fxfa/app/cxfa_csstagprovider.h",
       "xfa/fxfa/app/cxfa_linkuserdata.cpp",
@@ -1768,6 +1777,7 @@ if (pdf_enable_xfa) {
     ]
     include_dirs = [ "." ]
     deps = [
+      ":fxbarcode",
       ":fxcrt",
       ":fxjs",
     ]
@@ -1831,13 +1841,13 @@ test("pdfium_unittests") {
   include_dirs = []
   if (pdf_enable_xfa) {
     sources += [
+      "fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp",
       "xfa/fde/cfde_txtedtbuf_unittest.cpp",
       "xfa/fde/css/cfde_cssdeclaration_unittest.cpp",
       "xfa/fde/css/cfde_cssstylesheet_unittest.cpp",
       "xfa/fde/css/cfde_cssvaluelistparser_unittest.cpp",
       "xfa/fde/xml/fde_xml_imp_unittest.cpp",
       "xfa/fgas/layout/fgas_rtfbreak_unittest.cpp",
-      "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp",
       "xfa/fxfa/app/cxfa_textparser_unittest.cpp",
       "xfa/fxfa/cxfa_ffapp_unitest.cpp",
       "xfa/fxfa/fm2js/xfa_simpleexpression_unittest.cpp",
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index e077225b17..807b397298 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -3,7 +3,7 @@ include_rules = [
   '+public',
   '+v8',
   '+xfa/fwl',
-  '+xfa/fxbarcode',
+  '+fxbarcode',
   '+xfa/fxfa',
   '+xfa/fxgraphics',
   ]
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index dcfa1c1925..e9ae68cf5e 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -41,8 +41,8 @@
 #include "fpdfsdk/fpdfxfa/cpdfxfa_context.h"
 #include "fpdfsdk/fpdfxfa/cpdfxfa_page.h"
 #include "fpdfsdk/fpdfxfa/cxfa_fwladaptertimermgr.h"
+#include "fxbarcode/BC_Library.h"
 #include "public/fpdf_formfill.h"
-#include "xfa/fxbarcode/BC_Library.h"
 #endif  // PDF_ENABLE_XFA
 
 #ifdef PDF_ENABLE_XFA_BMP
diff --git a/fpdfsdk/fpdfxfa/DEPS b/fpdfsdk/fpdfxfa/DEPS
index 1687e308b5..b437883ba9 100644
--- a/fpdfsdk/fpdfxfa/DEPS
+++ b/fpdfsdk/fpdfxfa/DEPS
@@ -1,4 +1,4 @@
 include_rules = [
   '+fxjs',
-  '+xfa/fxbarcode',
+  '+fxbarcode',
 ]
diff --git a/xfa/fxbarcode/BC_Dimension.cpp b/fxbarcode/BC_Dimension.cpp
index 7a4b256f31..03cfa7eced 100644
--- a/xfa/fxbarcode/BC_Dimension.cpp
+++ b/fxbarcode/BC_Dimension.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
 
 CBC_Dimension::CBC_Dimension() {}
 CBC_Dimension::CBC_Dimension(int32_t width, int32_t height, int32_t& e) {
diff --git a/xfa/fxbarcode/BC_Dimension.h b/fxbarcode/BC_Dimension.h
index 2050b0faaf..fc24bf9e6a 100644
--- a/xfa/fxbarcode/BC_Dimension.h
+++ b/fxbarcode/BC_Dimension.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_BC_DIMENSION_H_
-#define XFA_FXBARCODE_BC_DIMENSION_H_
+#ifndef FXBARCODE_BC_DIMENSION_H_
+#define FXBARCODE_BC_DIMENSION_H_
 
 #include <cstdint>
 
@@ -26,4 +26,4 @@ class CBC_Dimension {
   int32_t m_height;
 };
 
-#endif  // XFA_FXBARCODE_BC_DIMENSION_H_
+#endif  // FXBARCODE_BC_DIMENSION_H_
diff --git a/xfa/fxbarcode/BC_Library.cpp b/fxbarcode/BC_Library.cpp
index 075bc2247d..c52e92a191 100644
--- a/xfa/fxbarcode/BC_Library.cpp
+++ b/fxbarcode/BC_Library.cpp
@@ -4,17 +4,17 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxbarcode/BC_Library.h"
+#include "fxbarcode/BC_Library.h"
 
 #include <stdint.h>
 
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
-#include "xfa/fxbarcode/datamatrix/BC_ErrorCorrection.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "fxbarcode/datamatrix/BC_ErrorCorrection.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
+#include "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "fxbarcode/qrcode/BC_QRCoderVersion.h"
 
 void BC_Library_Init() {
   CBC_QRCoderErrorCorrectionLevel::Initialize();
diff --git a/xfa/fxbarcode/BC_Library.h b/fxbarcode/BC_Library.h
index 47ef9d1532..7be4646c68 100644
--- a/xfa/fxbarcode/BC_Library.h
+++ b/fxbarcode/BC_Library.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_BC_LIBRARY_H_
-#define XFA_FXBARCODE_BC_LIBRARY_H_
+#ifndef FXBARCODE_BC_LIBRARY_H_
+#define FXBARCODE_BC_LIBRARY_H_
 
 enum BC_TEXT_LOC {
   BC_TEXT_LOC_NONE = 0,
@@ -35,4 +35,4 @@ enum BC_TYPE {
 void BC_Library_Init();
 void BC_Library_Destory();
 
-#endif  // XFA_FXBARCODE_BC_LIBRARY_H_
+#endif  // FXBARCODE_BC_LIBRARY_H_
diff --git a/xfa/fxbarcode/BC_TwoDimWriter.cpp b/fxbarcode/BC_TwoDimWriter.cpp
index 9c9427aaa5..65d28a2090 100644
--- a/xfa/fxbarcode/BC_TwoDimWriter.cpp
+++ b/fxbarcode/BC_TwoDimWriter.cpp
@@ -9,11 +9,11 @@
 #include "core/fxge/cfx_graphstatedata.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
+#include "fxbarcode/BC_TwoDimWriter.h"
+#include "fxbarcode/BC_Writer.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
 #include "third_party/base/numerics/safe_math.h"
 #include "third_party/base/ptr_util.h"
-#include "xfa/fxbarcode/BC_TwoDimWriter.h"
-#include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
 
 CBC_TwoDimWriter::CBC_TwoDimWriter() : m_iCorrectLevel(1), m_bFixedSize(true) {}
 
diff --git a/xfa/fxbarcode/BC_TwoDimWriter.h b/fxbarcode/BC_TwoDimWriter.h
index c6e0495aec..b0fed0b79f 100644
--- a/xfa/fxbarcode/BC_TwoDimWriter.h
+++ b/fxbarcode/BC_TwoDimWriter.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_BC_TWODIMWRITER_H_
-#define XFA_FXBARCODE_BC_TWODIMWRITER_H_
+#ifndef FXBARCODE_BC_TWODIMWRITER_H_
+#define FXBARCODE_BC_TWODIMWRITER_H_
 
 #include <memory>
 
-#include "xfa/fxbarcode/BC_Writer.h"
+#include "fxbarcode/BC_Writer.h"
 
 class CBC_CommonBitMatrix;
 class CFX_RenderDevice;
@@ -36,4 +36,4 @@ class CBC_TwoDimWriter : public CBC_Writer {
   std::unique_ptr<CBC_CommonBitMatrix> m_output;
 };
 
-#endif  // XFA_FXBARCODE_BC_TWODIMWRITER_H_
+#endif  // FXBARCODE_BC_TWODIMWRITER_H_
diff --git a/xfa/fxbarcode/BC_UtilCodingConvert.cpp b/fxbarcode/BC_UtilCodingConvert.cpp
index 159bced47a..f1dea885c3 100644
--- a/xfa/fxbarcode/BC_UtilCodingConvert.cpp
+++ b/fxbarcode/BC_UtilCodingConvert.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxbarcode/BC_UtilCodingConvert.h"
+#include "fxbarcode/BC_UtilCodingConvert.h"
 
 CBC_UtilCodingConvert::CBC_UtilCodingConvert() {}
 
diff --git a/xfa/fxbarcode/BC_UtilCodingConvert.h b/fxbarcode/BC_UtilCodingConvert.h
index 51cc93df19..5aaa53c726 100644
--- a/xfa/fxbarcode/BC_UtilCodingConvert.h
+++ b/fxbarcode/BC_UtilCodingConvert.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_BC_UTILCODINGCONVERT_H_
-#define XFA_FXBARCODE_BC_UTILCODINGCONVERT_H_
+#ifndef FXBARCODE_BC_UTILCODINGCONVERT_H_
+#define FXBARCODE_BC_UTILCODINGCONVERT_H_
 
 #include <vector>
 
@@ -30,4 +30,4 @@ class CBC_UtilCodingConvert {
                             CFX_ByteString& result);
 };
 
-#endif  // XFA_FXBARCODE_BC_UTILCODINGCONVERT_H_
+#endif  // FXBARCODE_BC_UTILCODINGCONVERT_H_
diff --git a/xfa/fxbarcode/BC_Utils.cpp b/fxbarcode/BC_Utils.cpp
index d0e89dce10..3c75406425 100644
--- a/xfa/fxbarcode/BC_Utils.cpp
+++ b/fxbarcode/BC_Utils.cpp
@@ -7,7 +7,7 @@
 #include <vector>
 
 #include "core/fxcrt/fx_basic.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/utils.h"
 
 bool BC_FX_ByteString_Replace(CFX_ByteString& dst,
                               uint32_t first,
diff --git a/xfa/fxbarcode/BC_Writer.cpp b/fxbarcode/BC_Writer.cpp
index 69f34148f4..9a109bfbdd 100644
--- a/xfa/fxbarcode/BC_Writer.cpp
+++ b/fxbarcode/BC_Writer.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxbarcode/BC_Writer.h"
+#include "fxbarcode/BC_Writer.h"
 
 CBC_Writer::CBC_Writer() {
   m_CharEncoding = 0;
diff --git a/xfa/fxbarcode/BC_Writer.h b/fxbarcode/BC_Writer.h
index 8dd03ead58..44cdbae4b4 100644
--- a/xfa/fxbarcode/BC_Writer.h
+++ b/fxbarcode/BC_Writer.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_BC_WRITER_H_
-#define XFA_FXBARCODE_BC_WRITER_H_
+#ifndef FXBARCODE_BC_WRITER_H_
+#define FXBARCODE_BC_WRITER_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/utils.h"
 
 class CBC_Writer {
  public:
@@ -35,4 +35,4 @@ class CBC_Writer {
   FX_ARGB m_backgroundColor;
 };
 
-#endif  // XFA_FXBARCODE_BC_WRITER_H_
+#endif  // FXBARCODE_BC_WRITER_H_
diff --git a/fxbarcode/DEPS b/fxbarcode/DEPS
new file mode 100644
index 0000000000..35a265a6c3
--- /dev/null
+++ b/fxbarcode/DEPS
@@ -0,0 +1,6 @@
+include_rules = [
+  '+core/fxcodec',
+  '+core/fxcrt',
+  '+core/fxge',
+  '+third_party/bigint',
+]
diff --git a/xfa/fxbarcode/cbc_codabar.cpp b/fxbarcode/cbc_codabar.cpp
index c49fe95948..4072f32712 100644
--- a/xfa/fxbarcode/cbc_codabar.cpp
+++ b/fxbarcode/cbc_codabar.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_codabar.h"
+#include "fxbarcode/cbc_codabar.h"
 
-#include "xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h"
+#include "fxbarcode/oned/BC_OnedCodaBarWriter.h"
 
 CBC_Codabar::CBC_Codabar() : CBC_OneCode(new CBC_OnedCodaBarWriter) {}
 
diff --git a/xfa/fxbarcode/cbc_codabar.h b/fxbarcode/cbc_codabar.h
index f00c295f44..64b7ae8f45 100644
--- a/xfa/fxbarcode/cbc_codabar.h
+++ b/fxbarcode/cbc_codabar.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_CODABAR_H_
-#define XFA_FXBARCODE_CBC_CODABAR_H_
+#ifndef FXBARCODE_CBC_CODABAR_H_
+#define FXBARCODE_CBC_CODABAR_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/cbc_onecode.h"
+#include "fxbarcode/cbc_onecode.h"
 
 class CBC_Codabar : public CBC_OneCode {
  public:
@@ -37,4 +37,4 @@ class CBC_Codabar : public CBC_OneCode {
   CFX_WideString m_renderContents;
 };
 
-#endif  // XFA_FXBARCODE_CBC_CODABAR_H_
+#endif  // FXBARCODE_CBC_CODABAR_H_
diff --git a/xfa/fxbarcode/cbc_code128.cpp b/fxbarcode/cbc_code128.cpp
index ea0bc56fce..91d53d462b 100644
--- a/xfa/fxbarcode/cbc_code128.cpp
+++ b/fxbarcode/cbc_code128.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_code128.h"
+#include "fxbarcode/cbc_code128.h"
 
-#include "xfa/fxbarcode/oned/BC_OnedCode128Writer.h"
+#include "fxbarcode/oned/BC_OnedCode128Writer.h"
 
 CBC_Code128::CBC_Code128(BC_TYPE type)
     : CBC_OneCode(new CBC_OnedCode128Writer(type)) {}
@@ -88,4 +88,3 @@ bool CBC_Code128::RenderBitmap(CFX_RetainPtr<CFX_DIBitmap>& pOutBitmap,
 BC_TYPE CBC_Code128::GetType() {
   return BC_CODE128;
 }
-
diff --git a/xfa/fxbarcode/cbc_code128.h b/fxbarcode/cbc_code128.h
index d8505760a6..6cd6ac56aa 100644
--- a/xfa/fxbarcode/cbc_code128.h
+++ b/fxbarcode/cbc_code128.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_CODE128_H_
-#define XFA_FXBARCODE_CBC_CODE128_H_
+#ifndef FXBARCODE_CBC_CODE128_H_
+#define FXBARCODE_CBC_CODE128_H_
 
 #include "core/fxcrt/fx_coordinates.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/cbc_onecode.h"
+#include "fxbarcode/cbc_onecode.h"
 
 class CBC_Code128 : public CBC_OneCode {
  public:
@@ -34,4 +34,4 @@ class CBC_Code128 : public CBC_OneCode {
   CFX_WideString m_renderContents;
 };
 
-#endif  // XFA_FXBARCODE_CBC_CODE128_H_
+#endif  // FXBARCODE_CBC_CODE128_H_
diff --git a/xfa/fxbarcode/cbc_code39.cpp b/fxbarcode/cbc_code39.cpp
index e3cfccbd90..58e78daadd 100644
--- a/xfa/fxbarcode/cbc_code39.cpp
+++ b/fxbarcode/cbc_code39.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_code39.h"
+#include "fxbarcode/cbc_code39.h"
 
-#include "xfa/fxbarcode/oned/BC_OnedCode39Writer.h"
+#include "fxbarcode/oned/BC_OnedCode39Writer.h"
 
 CBC_Code39::CBC_Code39() : CBC_OneCode(new CBC_OnedCode39Writer) {}
 
diff --git a/xfa/fxbarcode/cbc_code39.h b/fxbarcode/cbc_code39.h
index 0320211631..2de902fbdc 100644
--- a/xfa/fxbarcode/cbc_code39.h
+++ b/fxbarcode/cbc_code39.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_CODE39_H_
-#define XFA_FXBARCODE_CBC_CODE39_H_
+#ifndef FXBARCODE_CBC_CODE39_H_
+#define FXBARCODE_CBC_CODE39_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/cbc_onecode.h"
+#include "fxbarcode/cbc_onecode.h"
 
 class CBC_Code39 : public CBC_OneCode {
  public:
@@ -35,4 +35,4 @@ class CBC_Code39 : public CBC_OneCode {
   CFX_WideString m_renderContents;
 };
 
-#endif  // XFA_FXBARCODE_CBC_CODE39_H_
+#endif  // FXBARCODE_CBC_CODE39_H_
diff --git a/xfa/fxbarcode/cbc_codebase.cpp b/fxbarcode/cbc_codebase.cpp
index 5b4cb713bb..df237c9136 100644
--- a/xfa/fxbarcode/cbc_codebase.cpp
+++ b/fxbarcode/cbc_codebase.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_codebase.h"
+#include "fxbarcode/cbc_codebase.h"
 
-#include "xfa/fxbarcode/BC_Writer.h"
+#include "fxbarcode/BC_Writer.h"
 
 CBC_CodeBase::CBC_CodeBase(CBC_Writer* pWriter) : m_pBCWriter(pWriter) {}
 
diff --git a/xfa/fxbarcode/cbc_codebase.h b/fxbarcode/cbc_codebase.h
index 37a65d2cf6..e01e9be14e 100644
--- a/xfa/fxbarcode/cbc_codebase.h
+++ b/fxbarcode/cbc_codebase.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_CODEBASE_H_
-#define XFA_FXBARCODE_CBC_CODEBASE_H_
+#ifndef FXBARCODE_CBC_CODEBASE_H_
+#define FXBARCODE_CBC_CODEBASE_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/BC_Library.h"
+#include "fxbarcode/BC_Library.h"
 
 class CBC_Writer;
 class CBC_Reader;
@@ -45,4 +45,4 @@ class CBC_CodeBase {
   std::unique_ptr<CBC_Writer> m_pBCWriter;
 };
 
-#endif  // XFA_FXBARCODE_CBC_CODEBASE_H_
+#endif  // FXBARCODE_CBC_CODEBASE_H_
diff --git a/xfa/fxbarcode/cbc_datamatrix.cpp b/fxbarcode/cbc_datamatrix.cpp
index ebfa8b9901..ea12315102 100644
--- a/xfa/fxbarcode/cbc_datamatrix.cpp
+++ b/fxbarcode/cbc_datamatrix.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_datamatrix.h"
+#include "fxbarcode/cbc_datamatrix.h"
 
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h"
+#include "fxbarcode/datamatrix/BC_DataMatrixWriter.h"
 
 CBC_DataMatrix::CBC_DataMatrix() : CBC_CodeBase(new CBC_DataMatrixWriter) {}
 
diff --git a/xfa/fxbarcode/cbc_datamatrix.h b/fxbarcode/cbc_datamatrix.h
index ebca372f3f..f172428e7c 100644
--- a/xfa/fxbarcode/cbc_datamatrix.h
+++ b/fxbarcode/cbc_datamatrix.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_DATAMATRIX_H_
-#define XFA_FXBARCODE_CBC_DATAMATRIX_H_
+#ifndef FXBARCODE_CBC_DATAMATRIX_H_
+#define FXBARCODE_CBC_DATAMATRIX_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/cbc_codebase.h"
+#include "fxbarcode/cbc_codebase.h"
 
 class CBC_DataMatrix : public CBC_CodeBase {
  public:
@@ -29,4 +29,4 @@ class CBC_DataMatrix : public CBC_CodeBase {
   BC_TYPE GetType() override;
 };
 
-#endif  // XFA_FXBARCODE_CBC_DATAMATRIX_H_
+#endif  // FXBARCODE_CBC_DATAMATRIX_H_
diff --git a/xfa/fxbarcode/cbc_ean13.cpp b/fxbarcode/cbc_ean13.cpp
index afe52db9dd..0366e03523 100644
--- a/xfa/fxbarcode/cbc_ean13.cpp
+++ b/fxbarcode/cbc_ean13.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_ean13.h"
+#include "fxbarcode/cbc_ean13.h"
 
-#include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h"
+#include "fxbarcode/oned/BC_OnedEAN13Writer.h"
 
 CBC_EAN13::CBC_EAN13() : CBC_OneCode(new CBC_OnedEAN13Writer) {}
 
diff --git a/xfa/fxbarcode/cbc_ean13.h b/fxbarcode/cbc_ean13.h
index 5f23855ead..8b7b662092 100644
--- a/xfa/fxbarcode/cbc_ean13.h
+++ b/fxbarcode/cbc_ean13.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_EAN13_H_
-#define XFA_FXBARCODE_CBC_EAN13_H_
+#ifndef FXBARCODE_CBC_EAN13_H_
+#define FXBARCODE_CBC_EAN13_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/cbc_onecode.h"
+#include "fxbarcode/cbc_onecode.h"
 
 class CBC_EAN13 : public CBC_OneCode {
  public:
@@ -33,4 +33,4 @@ class CBC_EAN13 : public CBC_OneCode {
   CFX_WideString m_renderContents;
 };
 
-#endif  // XFA_FXBARCODE_CBC_EAN13_H_
+#endif  // FXBARCODE_CBC_EAN13_H_
diff --git a/xfa/fxbarcode/cbc_ean8.cpp b/fxbarcode/cbc_ean8.cpp
index 408b43a608..0ba9b20904 100644
--- a/xfa/fxbarcode/cbc_ean8.cpp
+++ b/fxbarcode/cbc_ean8.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_ean8.h"
+#include "fxbarcode/cbc_ean8.h"
 
-#include "xfa/fxbarcode/oned/BC_OnedEAN8Writer.h"
+#include "fxbarcode/oned/BC_OnedEAN8Writer.h"
 
 CBC_EAN8::CBC_EAN8() : CBC_OneCode(new CBC_OnedEAN8Writer) {}
 
diff --git a/xfa/fxbarcode/cbc_ean8.h b/fxbarcode/cbc_ean8.h
index 478a67405c..16480ef298 100644
--- a/xfa/fxbarcode/cbc_ean8.h
+++ b/fxbarcode/cbc_ean8.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_EAN8_H_
-#define XFA_FXBARCODE_CBC_EAN8_H_
+#ifndef FXBARCODE_CBC_EAN8_H_
+#define FXBARCODE_CBC_EAN8_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/cbc_onecode.h"
+#include "fxbarcode/cbc_onecode.h"
 
 class CBC_EAN8 : public CBC_OneCode {
  public:
@@ -33,4 +33,4 @@ class CBC_EAN8 : public CBC_OneCode {
   CFX_WideString m_renderContents;
 };
 
-#endif  // XFA_FXBARCODE_CBC_EAN8_H_
+#endif  // FXBARCODE_CBC_EAN8_H_
diff --git a/xfa/fxbarcode/cbc_onecode.cpp b/fxbarcode/cbc_onecode.cpp
index cf916402fb..1b4db0a170 100644
--- a/xfa/fxbarcode/cbc_onecode.cpp
+++ b/fxbarcode/cbc_onecode.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_onecode.h"
+#include "fxbarcode/cbc_onecode.h"
 
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
 
 CBC_OneCode::CBC_OneCode(CBC_Writer* pWriter) : CBC_CodeBase(pWriter) {}
 
diff --git a/xfa/fxbarcode/cbc_onecode.h b/fxbarcode/cbc_onecode.h
index ac7eacebfb..8da46113db 100644
--- a/xfa/fxbarcode/cbc_onecode.h
+++ b/fxbarcode/cbc_onecode.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_ONECODE_H_
-#define XFA_FXBARCODE_CBC_ONECODE_H_
+#ifndef FXBARCODE_CBC_ONECODE_H_
+#define FXBARCODE_CBC_ONECODE_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fxbarcode/cbc_codebase.h"
+#include "fxbarcode/cbc_codebase.h"
 
 class CFX_DIBitmap;
 class CFX_Font;
@@ -32,4 +32,4 @@ class CBC_OneCode : public CBC_CodeBase {
   virtual void SetFontColor(FX_ARGB color);
 };
 
-#endif  // XFA_FXBARCODE_CBC_ONECODE_H_
+#endif  // FXBARCODE_CBC_ONECODE_H_
diff --git a/xfa/fxbarcode/cbc_pdf417i.cpp b/fxbarcode/cbc_pdf417i.cpp
index a5e210757a..6a79aa3f57 100644
--- a/xfa/fxbarcode/cbc_pdf417i.cpp
+++ b/fxbarcode/cbc_pdf417i.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_pdf417i.h"
+#include "fxbarcode/cbc_pdf417i.h"
 
-#include "xfa/fxbarcode/pdf417/BC_PDF417Writer.h"
+#include "fxbarcode/pdf417/BC_PDF417Writer.h"
 
 CBC_PDF417I::CBC_PDF417I() : CBC_CodeBase(new CBC_PDF417Writer) {}
 
diff --git a/xfa/fxbarcode/cbc_pdf417i.h b/fxbarcode/cbc_pdf417i.h
index c26dceeebd..da1c88d3f2 100644
--- a/xfa/fxbarcode/cbc_pdf417i.h
+++ b/fxbarcode/cbc_pdf417i.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_PDF417I_H_
-#define XFA_FXBARCODE_CBC_PDF417I_H_
+#ifndef FXBARCODE_CBC_PDF417I_H_
+#define FXBARCODE_CBC_PDF417I_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/cbc_codebase.h"
+#include "fxbarcode/cbc_codebase.h"
 
 class CBC_PDF417I : public CBC_CodeBase {
  public:
@@ -32,4 +32,4 @@ class CBC_PDF417I : public CBC_CodeBase {
   void SetTruncated(bool truncated);
 };
 
-#endif  // XFA_FXBARCODE_CBC_PDF417I_H_
+#endif  // FXBARCODE_CBC_PDF417I_H_
diff --git a/xfa/fxbarcode/cbc_qrcode.cpp b/fxbarcode/cbc_qrcode.cpp
index e046857b6b..15c4057826 100644
--- a/xfa/fxbarcode/cbc_qrcode.cpp
+++ b/fxbarcode/cbc_qrcode.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_qrcode.h"
+#include "fxbarcode/cbc_qrcode.h"
 
-#include "xfa/fxbarcode/qrcode/BC_QRCodeWriter.h"
+#include "fxbarcode/qrcode/BC_QRCodeWriter.h"
 
 CBC_QRCode::CBC_QRCode() : CBC_CodeBase(new CBC_QRCodeWriter) {}
 
diff --git a/xfa/fxbarcode/cbc_qrcode.h b/fxbarcode/cbc_qrcode.h
index 05f3f6c415..f41c3507ee 100644
--- a/xfa/fxbarcode/cbc_qrcode.h
+++ b/fxbarcode/cbc_qrcode.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_QRCODE_H_
-#define XFA_FXBARCODE_CBC_QRCODE_H_
+#ifndef FXBARCODE_CBC_QRCODE_H_
+#define FXBARCODE_CBC_QRCODE_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/cbc_codebase.h"
+#include "fxbarcode/cbc_codebase.h"
 
 class CBC_QRCode : public CBC_CodeBase {
  public:
@@ -32,4 +32,4 @@ class CBC_QRCode : public CBC_CodeBase {
   bool SetErrorCorrectionLevel(int32_t level);
 };
 
-#endif  // XFA_FXBARCODE_CBC_QRCODE_H_
+#endif  // FXBARCODE_CBC_QRCODE_H_
diff --git a/xfa/fxbarcode/cbc_upca.cpp b/fxbarcode/cbc_upca.cpp
index 915a6aead5..6c8e821a10 100644
--- a/xfa/fxbarcode/cbc_upca.cpp
+++ b/fxbarcode/cbc_upca.cpp
@@ -19,9 +19,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/cbc_upca.h"
+#include "fxbarcode/cbc_upca.h"
 
-#include "xfa/fxbarcode/oned/BC_OnedUPCAWriter.h"
+#include "fxbarcode/oned/BC_OnedUPCAWriter.h"
 
 CBC_UPCA::CBC_UPCA() : CBC_OneCode(new CBC_OnedUPCAWriter) {}
 
diff --git a/xfa/fxbarcode/cbc_upca.h b/fxbarcode/cbc_upca.h
index 4015a3143d..e27596ca9a 100644
--- a/xfa/fxbarcode/cbc_upca.h
+++ b/fxbarcode/cbc_upca.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_CBC_UPCA_H_
-#define XFA_FXBARCODE_CBC_UPCA_H_
+#ifndef FXBARCODE_CBC_UPCA_H_
+#define FXBARCODE_CBC_UPCA_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/cbc_onecode.h"
+#include "fxbarcode/cbc_onecode.h"
 
 class CBC_UPCA : public CBC_OneCode {
  public:
@@ -33,4 +33,4 @@ class CBC_UPCA : public CBC_OneCode {
   CFX_WideString m_renderContents;
 };
 
-#endif  // XFA_FXBARCODE_CBC_UPCA_H_
+#endif  // FXBARCODE_CBC_UPCA_H_
diff --git a/xfa/fxbarcode/common/BC_CommonBitArray.cpp b/fxbarcode/common/BC_CommonBitArray.cpp
index f53e677389..34cdb65174 100644
--- a/xfa/fxbarcode/common/BC_CommonBitArray.cpp
+++ b/fxbarcode/common/BC_CommonBitArray.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
+#include "fxbarcode/common/BC_CommonBitArray.h"
 
 #include <utility>
 
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/utils.h"
 
 CBC_CommonBitArray::CBC_CommonBitArray(CBC_CommonBitArray* array) {
   m_size = array->GetSize();
diff --git a/xfa/fxbarcode/common/BC_CommonBitArray.h b/fxbarcode/common/BC_CommonBitArray.h
index 841ca99149..504e3038f6 100644
--- a/xfa/fxbarcode/common/BC_CommonBitArray.h
+++ b/fxbarcode/common/BC_CommonBitArray.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
-#define XFA_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
+#ifndef FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
+#define FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
 
 #include <vector>
 
@@ -35,4 +35,4 @@ class CBC_CommonBitArray {
   std::vector<int32_t> m_bits;
 };
 
-#endif  // XFA_FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
+#endif  // FXBARCODE_COMMON_BC_COMMONBITARRAY_H_
diff --git a/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp b/fxbarcode/common/BC_CommonBitMatrix.cpp
index 5e65bd74cf..95f5e4640e 100644
--- a/xfa/fxbarcode/common/BC_CommonBitMatrix.cpp
+++ b/fxbarcode/common/BC_CommonBitMatrix.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/common/BC_CommonBitArray.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/utils.h"
 
 CBC_CommonBitMatrix::CBC_CommonBitMatrix() {
   m_width = 0;
diff --git a/xfa/fxbarcode/common/BC_CommonBitMatrix.h b/fxbarcode/common/BC_CommonBitMatrix.h
index ed1f684a37..2bb3f64843 100644
--- a/xfa/fxbarcode/common/BC_CommonBitMatrix.h
+++ b/fxbarcode/common/BC_CommonBitMatrix.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
-#define XFA_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
+#ifndef FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
+#define FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
 
 #include "core/fxcrt/fx_system.h"
 
@@ -45,4 +45,4 @@ class CBC_CommonBitMatrix {
   int32_t* m_bits;
 };
 
-#endif  // XFA_FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
+#endif  // FXBARCODE_COMMON_BC_COMMONBITMATRIX_H_
diff --git a/xfa/fxbarcode/common/BC_CommonByteArray.cpp b/fxbarcode/common/BC_CommonByteArray.cpp
index e950f0f941..a271de6015 100644
--- a/xfa/fxbarcode/common/BC_CommonByteArray.cpp
+++ b/fxbarcode/common/BC_CommonByteArray.cpp
@@ -22,7 +22,7 @@
 
 #include <algorithm>
 
-#include "xfa/fxbarcode/common/BC_CommonByteArray.h"
+#include "fxbarcode/common/BC_CommonByteArray.h"
 
 CBC_CommonByteArray::CBC_CommonByteArray() {
   m_bytes = nullptr;
diff --git a/xfa/fxbarcode/common/BC_CommonByteArray.h b/fxbarcode/common/BC_CommonByteArray.h
index e1fe4c7f2e..84222ba25a 100644
--- a/xfa/fxbarcode/common/BC_CommonByteArray.h
+++ b/fxbarcode/common/BC_CommonByteArray.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
-#define XFA_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
+#ifndef FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
+#define FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
 
 #include <vector>
 
@@ -35,4 +35,4 @@ class CBC_CommonByteArray {
   uint8_t* m_bytes;
 };
 
-#endif  // XFA_FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
+#endif  // FXBARCODE_COMMON_BC_COMMONBYTEARRAY_H_
diff --git a/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp b/fxbarcode/common/BC_CommonByteMatrix.cpp
index 0e7ce80e29..44c783248f 100644
--- a/xfa/fxbarcode/common/BC_CommonByteMatrix.cpp
+++ b/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "core/fxcrt/fx_memory.h"
-#include "xfa/fxbarcode/common/BC_CommonByteMatrix.h"
+#include "fxbarcode/common/BC_CommonByteMatrix.h"
 
 CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) {
   m_height = height;
diff --git a/xfa/fxbarcode/common/BC_CommonByteMatrix.h b/fxbarcode/common/BC_CommonByteMatrix.h
index 13cf5c330e..9f13a376d1 100644
--- a/xfa/fxbarcode/common/BC_CommonByteMatrix.h
+++ b/fxbarcode/common/BC_CommonByteMatrix.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
-#define XFA_FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
+#ifndef FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
+#define FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
 
 #include <stdint.h>
 
@@ -32,4 +32,4 @@ class CBC_CommonByteMatrix {
   int32_t m_height;
 };
 
-#endif  // XFA_FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
+#endif  // FXBARCODE_COMMON_BC_COMMONBYTEMATRIX_H_
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
index 82a729b067..bb33bbd0e9 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
+++ b/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
 
 #include <memory>
 
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
 
 CBC_ReedSolomonEncoder::CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field) {
   m_field = field;
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h b/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index 5e5c7c52d3..42a1e002ca 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
+++ b/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
-#define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
+#ifndef FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
+#define FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
 
 #include <vector>
 
@@ -29,4 +29,4 @@ class CBC_ReedSolomonEncoder {
   std::vector<CBC_ReedSolomonGF256Poly*> m_cachedGenerators;
 };
 
-#endif  // XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
+#endif  // FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMON_H_
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
index 349ed0789a..b2af2a54b4 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
+++ b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 
 #include <vector>
 
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
 #include "third_party/base/ptr_util.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
 
 CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeField = nullptr;
 CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::DataMatrixField = nullptr;
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
index 16f1ad17f7..d4b303c5ff 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
+++ b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
-#define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
+#ifndef FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
+#define FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_basic.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/utils.h"
 
 class CBC_ReedSolomonGF256Poly;
 
@@ -44,4 +44,4 @@ class CBC_ReedSolomonGF256 {
   std::unique_ptr<CBC_ReedSolomonGF256Poly> m_one;
 };
 
-#endif  // XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
+#endif  // FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256_H_
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
index e4ee30b586..a062589218 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
+++ b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h"
 
 #include <memory>
 #include <utility>
 
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 
 CBC_ReedSolomonGF256Poly::CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field,
                                                    int32_t coefficients) {
diff --git a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
index 6fc7509399..284b531e81 100644
--- a/xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
+++ b/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
-#define XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
+#ifndef FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
+#define FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
 
 #include <vector>
 
@@ -46,4 +46,4 @@ class CBC_ReedSolomonGF256Poly final {
   std::vector<int32_t> m_coefficients;
 };
 
-#endif  // XFA_FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
+#endif  // FXBARCODE_COMMON_REEDSOLOMON_BC_REEDSOLOMONGF256POLY_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp b/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
index 88a12b23a2..2d7b9d7995 100644
--- a/xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
+++ b/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EncoderContext.h"
-#include "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/datamatrix/BC_ASCIIEncoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 CBC_ASCIIEncoder::CBC_ASCIIEncoder() {}
 CBC_ASCIIEncoder::~CBC_ASCIIEncoder() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.h b/fxbarcode/datamatrix/BC_ASCIIEncoder.h
index a0cfaa76ed..6eb3a50669 100644
--- a/xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.h
+++ b/fxbarcode/datamatrix/BC_ASCIIEncoder.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
+#define FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
 
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
 
 class CBC_EncoderContext;
 
@@ -24,4 +24,4 @@ class CBC_ASCIIEncoder : public CBC_Encoder {
   static wchar_t encodeASCIIDigits(wchar_t digit1, wchar_t digit2, int32_t& e);
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_ASCIIENCODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/fxbarcode/datamatrix/BC_Base256Encoder.cpp
index 333377e392..1b8db85bdd 100644
--- a/xfa/fxbarcode/datamatrix/BC_Base256Encoder.cpp
+++ b/fxbarcode/datamatrix/BC_Base256Encoder.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/datamatrix/BC_Base256Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EncoderContext.h"
-#include "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/datamatrix/BC_Base256Encoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 CBC_Base256Encoder::CBC_Base256Encoder() {}
 CBC_Base256Encoder::~CBC_Base256Encoder() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_Base256Encoder.h b/fxbarcode/datamatrix/BC_Base256Encoder.h
index 41229afb80..65abf59662 100644
--- a/xfa/fxbarcode/datamatrix/BC_Base256Encoder.h
+++ b/fxbarcode/datamatrix/BC_Base256Encoder.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
+#define FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
 
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
 
 class CBC_Base256Encoder : public CBC_Encoder {
  public:
@@ -22,4 +22,4 @@ class CBC_Base256Encoder : public CBC_Encoder {
   static wchar_t randomize255State(wchar_t ch, int32_t codewordPosition);
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_BASE256ENCODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp b/fxbarcode/datamatrix/BC_C40Encoder.cpp
index 04fcb6b541..7c3f4e7d7a 100644
--- a/xfa/fxbarcode/datamatrix/BC_C40Encoder.cpp
+++ b/fxbarcode/datamatrix/BC_C40Encoder.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/datamatrix/BC_C40Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EncoderContext.h"
-#include "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/datamatrix/BC_C40Encoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 CBC_C40Encoder::CBC_C40Encoder() {}
 CBC_C40Encoder::~CBC_C40Encoder() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_C40Encoder.h b/fxbarcode/datamatrix/BC_C40Encoder.h
index 03dee140df..217404913e 100644
--- a/xfa/fxbarcode/datamatrix/BC_C40Encoder.h
+++ b/fxbarcode/datamatrix/BC_C40Encoder.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
+#define FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
 
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
 
 class CBC_C40Encoder : public CBC_Encoder {
  public:
@@ -35,4 +35,4 @@ class CBC_C40Encoder : public CBC_Encoder {
   static CFX_WideString encodeToCodewords(CFX_WideString sb, int32_t startPos);
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_C40ENCODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp b/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
index e580bb583f..d0ccfc2f1e 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
+++ b/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 CBC_DataMatrixSymbolInfo144::CBC_DataMatrixSymbolInfo144()
     : CBC_SymbolInfo(false, 1558, 620, 22, 22, 36) {
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h b/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
index 2cd0cd0e6f..18ef979141 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
+++ b/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
+#define FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
 
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
 
 class CBC_DataMatrixSymbolInfo144 : public CBC_SymbolInfo {
  public:
@@ -17,4 +17,4 @@ class CBC_DataMatrixSymbolInfo144 : public CBC_SymbolInfo {
   int32_t getInterleavedBlockCount();
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_DATAMATRIXSYMBOLINFO144_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
index f1ce798af0..3b1b9641d1 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
+++ b/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
@@ -20,27 +20,27 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/BC_TwoDimWriter.h"
-#include "xfa/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/common/BC_CommonByteMatrix.h"
-#include "xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Base256Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_C40Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h"
-#include "xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h"
-#include "xfa/fxbarcode/datamatrix/BC_EdifactEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EncoderContext.h"
-#include "xfa/fxbarcode/datamatrix/BC_ErrorCorrection.h"
-#include "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
-#include "xfa/fxbarcode/datamatrix/BC_TextEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_X12Encoder.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/BC_TwoDimWriter.h"
+#include "fxbarcode/BC_UtilCodingConvert.h"
+#include "fxbarcode/BC_Writer.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/common/BC_CommonByteMatrix.h"
+#include "fxbarcode/datamatrix/BC_ASCIIEncoder.h"
+#include "fxbarcode/datamatrix/BC_Base256Encoder.h"
+#include "fxbarcode/datamatrix/BC_C40Encoder.h"
+#include "fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h"
+#include "fxbarcode/datamatrix/BC_DataMatrixWriter.h"
+#include "fxbarcode/datamatrix/BC_DefaultPlacement.h"
+#include "fxbarcode/datamatrix/BC_EdifactEncoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "fxbarcode/datamatrix/BC_ErrorCorrection.h"
+#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_TextEncoder.h"
+#include "fxbarcode/datamatrix/BC_X12Encoder.h"
 
 CBC_DataMatrixWriter::CBC_DataMatrixWriter() {}
 CBC_DataMatrixWriter::~CBC_DataMatrixWriter() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h b/fxbarcode/datamatrix/BC_DataMatrixWriter.h
index af1417b588..cf5f6e4c4d 100644
--- a/xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h
+++ b/fxbarcode/datamatrix/BC_DataMatrixWriter.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXWRITER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXWRITER_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_DATAMATRIXWRITER_H_
+#define FXBARCODE_DATAMATRIX_BC_DATAMATRIXWRITER_H_
 
-#include "xfa/fxbarcode/BC_TwoDimWriter.h"
+#include "fxbarcode/BC_TwoDimWriter.h"
 
 class CBC_CommonByteMatrix;
 class CBC_DefaultPlacement;
@@ -33,4 +33,4 @@ class CBC_DataMatrixWriter : public CBC_TwoDimWriter {
   int32_t m_iCorrectLevel;
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DATAMATRIXWRITER_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_DATAMATRIXWRITER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.cpp b/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
index f027486ee3..405b4f72a1 100644
--- a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
+++ b/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_DefaultPlacement.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
 
 CBC_DefaultPlacement::CBC_DefaultPlacement(CFX_WideString codewords,
                                            int32_t numcols,
diff --git a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h b/fxbarcode/datamatrix/BC_DefaultPlacement.h
index d3c38ca13d..5036b121e5 100644
--- a/xfa/fxbarcode/datamatrix/BC_DefaultPlacement.h
+++ b/fxbarcode/datamatrix/BC_DefaultPlacement.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
+#define FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
 
 #include <vector>
 
@@ -39,4 +39,4 @@ class CBC_DefaultPlacement {
   void corner4(int32_t pos);
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_DEFAULTPLACEMENT_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
index 2ffc8413a3..61eea93d33 100644
--- a/xfa/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
+++ b/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/datamatrix/BC_EdifactEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EncoderContext.h"
-#include "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/datamatrix/BC_EdifactEncoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 CBC_EdifactEncoder::CBC_EdifactEncoder() {}
 CBC_EdifactEncoder::~CBC_EdifactEncoder() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_EdifactEncoder.h b/fxbarcode/datamatrix/BC_EdifactEncoder.h
index afe013e02e..6fe0934de1 100644
--- a/xfa/fxbarcode/datamatrix/BC_EdifactEncoder.h
+++ b/fxbarcode/datamatrix/BC_EdifactEncoder.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
+#define FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
 
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
 
 class CBC_EdifactEncoder : public CBC_Encoder {
  public:
@@ -28,4 +28,4 @@ class CBC_EdifactEncoder : public CBC_Encoder {
                                           int32_t& e);
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_EDIFACTENCODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_Encoder.cpp b/fxbarcode/datamatrix/BC_Encoder.cpp
index bf815bdfa7..9403904f32 100644
--- a/xfa/fxbarcode/datamatrix/BC_Encoder.cpp
+++ b/fxbarcode/datamatrix/BC_Encoder.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
 
 CBC_Encoder::CBC_Encoder() {}
 CBC_Encoder::~CBC_Encoder() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_Encoder.h b/fxbarcode/datamatrix/BC_Encoder.h
index 68a223fee1..40d491c2cd 100644
--- a/xfa/fxbarcode/datamatrix/BC_Encoder.h
+++ b/fxbarcode/datamatrix/BC_Encoder.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_ENCODER_H_
+#define FXBARCODE_DATAMATRIX_BC_ENCODER_H_
 
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/utils.h"
 
 class CBC_EncoderContext;
 
@@ -20,4 +20,4 @@ class CBC_Encoder {
   virtual void Encode(CBC_EncoderContext& context, int32_t& e) = 0;
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_ENCODER_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_ENCODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp b/fxbarcode/datamatrix/BC_EncoderContext.cpp
index 6af2bc4e83..8fe5bf5b26 100644
--- a/xfa/fxbarcode/datamatrix/BC_EncoderContext.cpp
+++ b/fxbarcode/datamatrix/BC_EncoderContext.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EncoderContext.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/BC_UtilCodingConvert.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 CBC_EncoderContext::CBC_EncoderContext(const CFX_WideString msg,
                                        CFX_WideString ecLevel,
diff --git a/xfa/fxbarcode/datamatrix/BC_EncoderContext.h b/fxbarcode/datamatrix/BC_EncoderContext.h
index 03018b2ffe..6be824116f 100644
--- a/xfa/fxbarcode/datamatrix/BC_EncoderContext.h
+++ b/fxbarcode/datamatrix/BC_EncoderContext.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
+#define FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
 
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 class CBC_SymbolInfo;
 class CBC_Dimension;
@@ -53,4 +53,4 @@ class CBC_EncoderContext : public CBC_SymbolShapeHint {
   int32_t m_skipAtEnd;
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_ENCODERCONTEXT_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
index 0af52faedd..72ce8fcdf3 100644
--- a/xfa/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
+++ b/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
@@ -22,10 +22,10 @@
 
 #include <vector>
 
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_ErrorCorrection.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_ErrorCorrection.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/datamatrix/BC_ErrorCorrection.h b/fxbarcode/datamatrix/BC_ErrorCorrection.h
index d3b9da8056..f09763da2b 100644
--- a/xfa/fxbarcode/datamatrix/BC_ErrorCorrection.h
+++ b/fxbarcode/datamatrix/BC_ErrorCorrection.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
+#define FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
 
 class CBC_SymbolInfo;
 
@@ -36,4 +36,4 @@ class CBC_ErrorCorrection {
                                        int32_t& e);
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_ERRORCORRECTION_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
index 3ece55f2e9..e2d483cbdf 100644
--- a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
+++ b/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
@@ -24,21 +24,21 @@
 #include <memory>
 #include <vector>
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/datamatrix/BC_ASCIIEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Base256Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_C40Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EdifactEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EncoderContext.h"
-#include "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
-#include "xfa/fxbarcode/datamatrix/BC_TextEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_X12Encoder.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/BC_UtilCodingConvert.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/datamatrix/BC_ASCIIEncoder.h"
+#include "fxbarcode/datamatrix/BC_Base256Encoder.h"
+#include "fxbarcode/datamatrix/BC_C40Encoder.h"
+#include "fxbarcode/datamatrix/BC_EdifactEncoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_TextEncoder.h"
+#include "fxbarcode/datamatrix/BC_X12Encoder.h"
+#include "fxbarcode/utils.h"
 
 wchar_t CBC_HighLevelEncoder::LATCH_TO_C40 = 230;
 wchar_t CBC_HighLevelEncoder::LATCH_TO_BASE256 = 231;
diff --git a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h b/fxbarcode/datamatrix/BC_HighLevelEncoder.h
index 6819e29163..83136be2f4 100644
--- a/xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h
+++ b/fxbarcode/datamatrix/BC_HighLevelEncoder.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
+#define FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
 
 #include <vector>
 
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 #define ASCII_ENCODATION 0
 #define C40_ENCODATION 1
@@ -76,4 +76,4 @@ class CBC_HighLevelEncoder : public CBC_SymbolShapeHint {
   static bool isSpecialB256(wchar_t ch);
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_HIGHLEVELENCODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/fxbarcode/datamatrix/BC_SymbolInfo.cpp
index ae74b8b2d4..f98370b90f 100644
--- a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.cpp
+++ b/fxbarcode/datamatrix/BC_SymbolInfo.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h b/fxbarcode/datamatrix/BC_SymbolInfo.h
index d2730025db..36ed01d7e4 100644
--- a/xfa/fxbarcode/datamatrix/BC_SymbolInfo.h
+++ b/fxbarcode/datamatrix/BC_SymbolInfo.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
+#define FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 class CBC_Dimension;
 
@@ -76,4 +76,4 @@ class CBC_SymbolInfo : public CBC_SymbolShapeHint {
   int32_t m_dataRegions;
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_SYMBOLINFO_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp b/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
index 8f91dd837a..294580bb5a 100644
--- a/xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
+++ b/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
 
 CBC_SymbolShapeHint::CBC_SymbolShapeHint() {}
 CBC_SymbolShapeHint::~CBC_SymbolShapeHint() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h b/fxbarcode/datamatrix/BC_SymbolShapeHint.h
index 7cd4c86931..409ee05d75 100644
--- a/xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h
+++ b/fxbarcode/datamatrix/BC_SymbolShapeHint.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
+#define FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
 
 class CBC_SymbolShapeHint {
  public:
@@ -19,4 +19,4 @@ class CBC_SymbolShapeHint {
   };
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_SYMBOLSHAPEHINT_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_TextEncoder.cpp b/fxbarcode/datamatrix/BC_TextEncoder.cpp
index cc02661c26..a521acb6c3 100644
--- a/xfa/fxbarcode/datamatrix/BC_TextEncoder.cpp
+++ b/fxbarcode/datamatrix/BC_TextEncoder.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/datamatrix/BC_C40Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EncoderContext.h"
-#include "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
-#include "xfa/fxbarcode/datamatrix/BC_TextEncoder.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/datamatrix/BC_C40Encoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_TextEncoder.h"
 
 CBC_TextEncoder::CBC_TextEncoder() {}
 CBC_TextEncoder::~CBC_TextEncoder() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_TextEncoder.h b/fxbarcode/datamatrix/BC_TextEncoder.h
index 71092023da..dde1a7f46e 100644
--- a/xfa/fxbarcode/datamatrix/BC_TextEncoder.h
+++ b/fxbarcode/datamatrix/BC_TextEncoder.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
+#define FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
 
 class CBC_TextEncoder;
 
@@ -19,4 +19,4 @@ class CBC_TextEncoder : public CBC_C40Encoder {
   int32_t encodeChar(wchar_t c, CFX_WideString& sb, int32_t& e) override;
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_TEXTENCODER_H_
diff --git a/xfa/fxbarcode/datamatrix/BC_X12Encoder.cpp b/fxbarcode/datamatrix/BC_X12Encoder.cpp
index 570076b348..dd8254bff7 100644
--- a/xfa/fxbarcode/datamatrix/BC_X12Encoder.cpp
+++ b/fxbarcode/datamatrix/BC_X12Encoder.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Dimension.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/datamatrix/BC_C40Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_Encoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_EncoderContext.h"
-#include "xfa/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolInfo.h"
-#include "xfa/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
-#include "xfa/fxbarcode/datamatrix/BC_X12Encoder.h"
+#include "fxbarcode/BC_Dimension.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/datamatrix/BC_C40Encoder.h"
+#include "fxbarcode/datamatrix/BC_Encoder.h"
+#include "fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "fxbarcode/datamatrix/BC_HighLevelEncoder.h"
+#include "fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "fxbarcode/datamatrix/BC_X12Encoder.h"
 
 CBC_X12Encoder::CBC_X12Encoder() {}
 CBC_X12Encoder::~CBC_X12Encoder() {}
diff --git a/xfa/fxbarcode/datamatrix/BC_X12Encoder.h b/fxbarcode/datamatrix/BC_X12Encoder.h
index 693b9bba6c..a90dd8c7ba 100644
--- a/xfa/fxbarcode/datamatrix/BC_X12Encoder.h
+++ b/fxbarcode/datamatrix/BC_X12Encoder.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
-#define XFA_FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
+#ifndef FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
+#define FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
 
 class CBC_C40Encoder;
 class CBC_X12Encoder;
@@ -23,4 +23,4 @@ class CBC_X12Encoder : public CBC_C40Encoder {
   int32_t encodeChar(wchar_t c, CFX_WideString& sb, int32_t& e) override;
 };
 
-#endif  // XFA_FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
+#endif  // FXBARCODE_DATAMATRIX_BC_X12ENCODER_H_
diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp b/fxbarcode/oned/BC_OneDimWriter.cpp
index 16eba2df10..7e6483bb95 100644
--- a/xfa/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
 
 #include <algorithm>
 #include <memory>
@@ -31,9 +31,9 @@
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/cfx_renderdevice.h"
 #include "core/fxge/cfx_unicodeencodingex.h"
+#include "fxbarcode/BC_Writer.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
 #include "third_party/base/ptr_util.h"
-#include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
 
 CBC_OneDimWriter::CBC_OneDimWriter() {
   m_locTextLoc = BC_TEXT_LOC_BELOWEMBED;
diff --git a/xfa/fxbarcode/oned/BC_OneDimWriter.h b/fxbarcode/oned/BC_OneDimWriter.h
index 4892889ddb..11a1ed4fdf 100644
--- a/xfa/fxbarcode/oned/BC_OneDimWriter.h
+++ b/fxbarcode/oned/BC_OneDimWriter.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDIMWRITER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDIMWRITER_H_
+#ifndef FXBARCODE_ONED_BC_ONEDIMWRITER_H_
+#define FXBARCODE_ONED_BC_ONEDIMWRITER_H_
 
 #include <memory>
 
 #include "core/fxge/cfx_renderdevice.h"
-#include "xfa/fxbarcode/BC_Library.h"
-#include "xfa/fxbarcode/BC_Writer.h"
+#include "fxbarcode/BC_Library.h"
+#include "fxbarcode/BC_Writer.h"
 
 class CBC_CommonBitMatrix;
 class CFX_Font;
@@ -115,4 +115,4 @@ class CBC_OneDimWriter : public CBC_Writer {
   float m_outputHScale;
 };
 
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDIMWRITER_H_
+#endif  // FXBARCODE_ONED_BC_ONEDIMWRITER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
index 7d51fa8f94..6c04cafe7b 100644
--- a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
+++ b/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h"
+#include "fxbarcode/BC_Writer.h"
+#include "fxbarcode/common/BC_CommonBitArray.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OnedCodaBarWriter.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h b/fxbarcode/oned/BC_OnedCodaBarWriter.h
index 0d01ad9242..f9ecc1b11a 100644
--- a/xfa/fxbarcode/oned/BC_OnedCodaBarWriter.h
+++ b/fxbarcode/oned/BC_OnedCodaBarWriter.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
+#ifndef FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
+#define FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fxbarcode/BC_Library.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/BC_Library.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
 
 class CBC_OnedCodaBarWriter : public CBC_OneDimWriter {
  public:
@@ -55,4 +55,4 @@ class CBC_OnedCodaBarWriter : public CBC_OneDimWriter {
   int32_t m_iWideNarrRatio;
 };
 
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
+#endif  // FXBARCODE_ONED_BC_ONEDCODABARWRITER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedCode128Writer.cpp b/fxbarcode/oned/BC_OnedCode128Writer.cpp
index 7adbb1f55c..d4f05a3bc6 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode128Writer.cpp
+++ b/fxbarcode/oned/BC_OnedCode128Writer.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedCode128Writer.h"
+#include "fxbarcode/BC_Writer.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OnedCode128Writer.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/oned/BC_OnedCode128Writer.h b/fxbarcode/oned/BC_OnedCode128Writer.h
index ff6e4d0fa5..34b22876b6 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode128Writer.h
+++ b/fxbarcode/oned/BC_OnedCode128Writer.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
+#ifndef FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
+#define FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
 
 #include <vector>
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
 
 class CBC_OnedCode128Writer : public CBC_OneDimWriter {
  public:
@@ -52,4 +52,4 @@ class CBC_OnedCode128Writer : public CBC_OneDimWriter {
   BC_TYPE m_codeFormat;
 };
 
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
+#endif  // FXBARCODE_ONED_BC_ONEDCODE128WRITER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp b/fxbarcode/oned/BC_OnedCode39Writer.cpp
index bd0607d3cd..d454985478 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode39Writer.cpp
+++ b/fxbarcode/oned/BC_OnedCode39Writer.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedCode39Writer.h"
+#include "fxbarcode/BC_Writer.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OnedCode39Writer.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/oned/BC_OnedCode39Writer.h b/fxbarcode/oned/BC_OnedCode39Writer.h
index 5f7c294c2b..6926d93f20 100644
--- a/xfa/fxbarcode/oned/BC_OnedCode39Writer.h
+++ b/fxbarcode/oned/BC_OnedCode39Writer.h
@@ -4,11 +4,11 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
+#ifndef FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
+#define FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
 
-#include "xfa/fxbarcode/BC_Library.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/BC_Library.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
 
 class CBC_OnedCode39Writer : public CBC_OneDimWriter {
  public:
@@ -51,4 +51,4 @@ class CBC_OnedCode39Writer : public CBC_OneDimWriter {
   int32_t m_iWideNarrRatio;
 };
 
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
+#endif  // FXBARCODE_ONED_BC_ONEDCODE39WRITER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index dcea777089..697d8df270 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -22,9 +22,9 @@
 
 #include "core/fxge/cfx_fxgedevice.h"
 #include "core/fxge/cfx_gemodule.h"
-#include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h"
+#include "fxbarcode/BC_Writer.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OnedEAN13Writer.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h b/fxbarcode/oned/BC_OnedEAN13Writer.h
index 8336259568..1e99159132 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN13Writer.h
+++ b/fxbarcode/oned/BC_OnedEAN13Writer.h
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
+#ifndef FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
+#define FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
 
 class CFX_DIBitmap;
 class CFX_RenderDevice;
@@ -57,4 +57,4 @@ class CBC_OnedEAN13Writer : public CBC_OneDimWriter {
   int32_t m_codeWidth;
 };
 
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
+#endif  // FXBARCODE_ONED_BC_ONEDEAN13WRITER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index a7fa30c811..5d1666da98 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.cpp
+++ b/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -22,10 +22,10 @@
 
 #include "core/fxge/cfx_fxgedevice.h"
 #include "core/fxge/cfx_gemodule.h"
-#include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedEAN8Writer.h"
+#include "fxbarcode/BC_Writer.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OnedEAN8Writer.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h b/fxbarcode/oned/BC_OnedEAN8Writer.h
index b9921babc3..1d26d16620 100644
--- a/xfa/fxbarcode/oned/BC_OnedEAN8Writer.h
+++ b/fxbarcode/oned/BC_OnedEAN8Writer.h
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
+#ifndef FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
+#define FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fxbarcode/BC_Library.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/BC_Library.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
 
 class CFX_DIBitmap;
 class CFX_RenderDevice;
@@ -61,4 +61,4 @@ class CBC_OnedEAN8Writer : public CBC_OneDimWriter {
   int32_t m_codeWidth;
 };
 
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
+#endif  // FXBARCODE_ONED_BC_ONEDEAN8WRITER_H_
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index 540e852d5d..588c306b12 100644
--- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.cpp
+++ b/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -22,11 +22,11 @@
 
 #include "core/fxge/cfx_fxgedevice.h"
 #include "core/fxge/cfx_gemodule.h"
+#include "fxbarcode/BC_Writer.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OnedEAN13Writer.h"
+#include "fxbarcode/oned/BC_OnedUPCAWriter.h"
 #include "third_party/base/ptr_util.h"
-#include "xfa/fxbarcode/BC_Writer.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
-#include "xfa/fxbarcode/oned/BC_OnedEAN13Writer.h"
-#include "xfa/fxbarcode/oned/BC_OnedUPCAWriter.h"
 
 CBC_OnedUPCAWriter::CBC_OnedUPCAWriter() {
   m_bLeftPadding = true;
diff --git a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h b/fxbarcode/oned/BC_OnedUPCAWriter.h
index 6c0929a051..83e70302f8 100644
--- a/xfa/fxbarcode/oned/BC_OnedUPCAWriter.h
+++ b/fxbarcode/oned/BC_OnedUPCAWriter.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
-#define XFA_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
+#ifndef FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
+#define FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
 
 #include <memory>
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fxbarcode/oned/BC_OneDimWriter.h"
+#include "fxbarcode/oned/BC_OneDimWriter.h"
 
 class CBC_OnedEAN13Writer;
 class CFX_DIBitmap;
@@ -63,4 +63,4 @@ class CBC_OnedUPCAWriter : public CBC_OneDimWriter {
   std::unique_ptr<CBC_OnedEAN13Writer> m_subWriter;
 };
 
-#endif  // XFA_FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
+#endif  // FXBARCODE_ONED_BC_ONEDUPCAWRITER_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417.cpp b/fxbarcode/pdf417/BC_PDF417.cpp
index 0bc6680108..7907150831 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417.cpp
+++ b/fxbarcode/pdf417/BC_PDF417.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/pdf417/BC_PDF417.h"
+#include "fxbarcode/pdf417/BC_PDF417.h"
 
+#include "fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
+#include "fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
+#include "fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "fxbarcode/pdf417/BC_PDF417ErrorCorrection.h"
+#include "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
+#include "fxbarcode/utils.h"
 #include "third_party/base/ptr_util.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
-#include "xfa/fxbarcode/utils.h"
 
 const int32_t CBC_PDF417::CODEWORD_TABLE[][929] = {
     {0x1d5c0, 0x1eaf0, 0x1f57c, 0x1d4e0, 0x1ea78, 0x1f53e, 0x1a8c0, 0x1d470,
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417.h b/fxbarcode/pdf417/BC_PDF417.h
index 0d8fbfaf5f..bc36ea5037 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417.h
+++ b/fxbarcode/pdf417/BC_PDF417.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417_H_
+#ifndef FXBARCODE_PDF417_BC_PDF417_H_
+#define FXBARCODE_PDF417_BC_PDF417_H_
 
 #include <memory>
 #include <vector>
 
 #include "core/fxcrt/fx_basic.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "fxbarcode/pdf417/BC_PDF417Compaction.h"
 
 class CBC_BarcodeRow;
 class CBC_BarcodeMatrix;
@@ -65,4 +65,4 @@ class CBC_PDF417 {
   int32_t m_minRows;
 };
 
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417_H_
+#endif  // FXBARCODE_PDF417_BC_PDF417_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index 68bc799ec0..564d7ef0b1 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
+++ b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
+#include "fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
+#include "fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
 
 CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) {
   m_matrix.resize(height + 2);
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
index bf86b7b55a..964048db9f 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
+++ b/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
+#ifndef FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
+#define FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
 
 #include <vector>
 
@@ -39,4 +39,4 @@ class CBC_BarcodeMatrix {
   int32_t m_outHeight;
 };
 
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
+#endif  // FXBARCODE_PDF417_BC_PDF417BARCODEMATRIX_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp b/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
index 427da9d588..c0c251f708 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
+++ b/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
+#include "fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
 
 CBC_BarcodeRow::CBC_BarcodeRow(size_t width)
     : m_row(width), m_currentLocation(0) {}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h b/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
index 9130a0c38f..d9d8f69089 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
+++ b/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
+#ifndef FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
+#define FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
 
 #include <vector>
 
@@ -28,4 +28,4 @@ class CBC_BarcodeRow {
   int32_t m_currentLocation;
 };
 
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
+#endif  // FXBARCODE_PDF417_BC_PDF417BARCODEROW_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Compaction.cpp b/fxbarcode/pdf417/BC_PDF417Compaction.cpp
index d3a1663eb6..d0ed8780fa 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Compaction.cpp
+++ b/fxbarcode/pdf417/BC_PDF417Compaction.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "fxbarcode/pdf417/BC_PDF417Compaction.h"
 
 CBC_Compaction::CBC_Compaction() {}
 CBC_Compaction::~CBC_Compaction() {}
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Compaction.h b/fxbarcode/pdf417/BC_PDF417Compaction.h
index 2df0fce303..7f4795a7e5 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Compaction.h
+++ b/fxbarcode/pdf417/BC_PDF417Compaction.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417COMPACTION_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417COMPACTION_H_
+#ifndef FXBARCODE_PDF417_BC_PDF417COMPACTION_H_
+#define FXBARCODE_PDF417_BC_PDF417COMPACTION_H_
 
 class CBC_Compaction;
 enum Compaction { AUTO, TEXT, BYTES, NUMERIC };
@@ -15,4 +15,4 @@ class CBC_Compaction {
   virtual ~CBC_Compaction();
 };
 
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417COMPACTION_H_
+#endif  // FXBARCODE_PDF417_BC_PDF417COMPACTION_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp b/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
index 71cdc351db..b1fd3d3243 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
+++ b/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/pdf417/BC_PDF417ErrorCorrection.h"
+#include "fxbarcode/utils.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h b/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
index 6822ae4e11..d1c6eed1b3 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
+++ b/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
+#ifndef FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
+#define FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
 
 #include <stdint.h>
 
@@ -25,4 +25,4 @@ class CBC_PDF417ErrorCorrection {
                                                 int32_t& e);
 };
 
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
+#endif  // FXBARCODE_PDF417_BC_PDF417ERRORCORRECTION_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
index 5402f3d7f7..ac8b0186f6 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
+++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
+#include "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
 
+#include "fxbarcode/BC_UtilCodingConvert.h"
+#include "fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "fxbarcode/utils.h"
 #include "third_party/bigint/BigIntegerLibrary.hh"
-#include "xfa/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h"
-#include "xfa/fxbarcode/utils.h"
 
 #define SUBMODE_ALPHA 0
 #define SUBMODE_LOWER 1
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
index 48b8d009fc..023f3dbb25 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
+++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
+#ifndef FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
+#define FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
 
 #include <vector>
 
 #include "core/fxcrt/fx_basic.h"
 #include "core/fxcrt/fx_string.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "fxbarcode/pdf417/BC_PDF417Compaction.h"
 
 class CBC_PDF417HighLevelEncoder {
  public:
@@ -73,4 +73,4 @@ class CBC_PDF417HighLevelEncoder {
   friend class PDF417HighLevelEncoder_ConsecutiveBinaryCount_Test;
 };
 
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
+#endif  // FXBARCODE_PDF417_BC_PDF417HIGHLEVELENCODER_H_
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
index a1f3283dd8..b4b9396d84 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
+++ b/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "core/fxcrt/fx_basic.h"
+#include "fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
 
 TEST(PDF417HighLevelEncoder, EncodeHighLevel) {
   // TODO(tsepez): implement test cases.
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Writer.cpp b/fxbarcode/pdf417/BC_PDF417Writer.cpp
index ddd740d12e..aa5a92361e 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Writer.cpp
+++ b/fxbarcode/pdf417/BC_PDF417Writer.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_TwoDimWriter.h"
-#include "xfa/fxbarcode/common/BC_CommonBitArray.h"
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Compaction.h"
-#include "xfa/fxbarcode/pdf417/BC_PDF417Writer.h"
+#include "fxbarcode/BC_TwoDimWriter.h"
+#include "fxbarcode/common/BC_CommonBitArray.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/pdf417/BC_PDF417.h"
+#include "fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
+#include "fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "fxbarcode/pdf417/BC_PDF417Writer.h"
 
 CBC_PDF417Writer::CBC_PDF417Writer() {
   m_bFixedSize = false;
diff --git a/xfa/fxbarcode/pdf417/BC_PDF417Writer.h b/fxbarcode/pdf417/BC_PDF417Writer.h
index 564f80849c..ddfdc9be24 100644
--- a/xfa/fxbarcode/pdf417/BC_PDF417Writer.h
+++ b/fxbarcode/pdf417/BC_PDF417Writer.h
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_PDF417_BC_PDF417WRITER_H_
-#define XFA_FXBARCODE_PDF417_BC_PDF417WRITER_H_
+#ifndef FXBARCODE_PDF417_BC_PDF417WRITER_H_
+#define FXBARCODE_PDF417_BC_PDF417WRITER_H_
 
 #include <vector>
 
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
-#include "xfa/fxbarcode/BC_TwoDimWriter.h"
+#include "fxbarcode/BC_TwoDimWriter.h"
 
 class CBC_PDF417Writer : public CBC_TwoDimWriter {
  public:
@@ -35,4 +35,4 @@ class CBC_PDF417Writer : public CBC_TwoDimWriter {
   bool m_bTruncated;
 };
 
-#endif  // XFA_FXBARCODE_PDF417_BC_PDF417WRITER_H_
+#endif  // FXBARCODE_PDF417_BC_PDF417WRITER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/fxbarcode/qrcode/BC_QRCodeWriter.cpp
index 8a6499cbb7..ac23462ed8 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCodeWriter.cpp
+++ b/fxbarcode/qrcode/BC_QRCodeWriter.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/BC_TwoDimWriter.h"
-#include "xfa/fxbarcode/common/BC_CommonByteMatrix.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCodeWriter.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "fxbarcode/BC_TwoDimWriter.h"
+#include "fxbarcode/common/BC_CommonByteMatrix.h"
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "fxbarcode/qrcode/BC_QRCodeWriter.h"
+#include "fxbarcode/qrcode/BC_QRCoder.h"
+#include "fxbarcode/qrcode/BC_QRCoderEncoder.h"
+#include "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "fxbarcode/qrcode/BC_QRCoderVersion.h"
 
 CBC_QRCodeWriter::CBC_QRCodeWriter() {
   m_bFixedSize = true;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCodeWriter.h b/fxbarcode/qrcode/BC_QRCodeWriter.h
index 5585fa55c1..185e10aa37 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCodeWriter.h
+++ b/fxbarcode/qrcode/BC_QRCodeWriter.h
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODEWRITER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODEWRITER_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODEWRITER_H_
+#define FXBARCODE_QRCODE_BC_QRCODEWRITER_H_
 
-#include "xfa/fxbarcode/BC_TwoDimWriter.h"
+#include "fxbarcode/BC_TwoDimWriter.h"
 
 class CBC_TwoDimWriter;
 class CBC_QRCodeWriter : public CBC_TwoDimWriter {
@@ -42,4 +42,4 @@ class CBC_QRCodeWriter : public CBC_TwoDimWriter {
   int32_t m_iVersion;
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODEWRITER_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODEWRITER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoder.cpp b/fxbarcode/qrcode/BC_QRCoder.cpp
index a5c849780d..93f0d00455 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoder.cpp
+++ b/fxbarcode/qrcode/BC_QRCoder.cpp
@@ -22,11 +22,11 @@
 
 #include <utility>
 
-#include "xfa/fxbarcode/common/BC_CommonByteMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/common/BC_CommonByteMatrix.h"
+#include "fxbarcode/qrcode/BC_QRCoder.h"
+#include "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "fxbarcode/utils.h"
 
 CBC_QRCoder::CBC_QRCoder()
     : m_mode(nullptr),
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoder.h b/fxbarcode/qrcode/BC_QRCoder.h
index 5e949920a7..0925a8e5cd 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoder.h
+++ b/fxbarcode/qrcode/BC_QRCoder.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODER_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODER_H_
+#define FXBARCODE_QRCODE_BC_QRCODER_H_
 
 #include <memory>
 
@@ -60,4 +60,4 @@ class CBC_QRCoder {
   std::unique_ptr<CBC_CommonByteMatrix> m_matrix;
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODER_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
index e4140a87a0..08222093a5 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "core/fxcrt/fx_memory.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/qrcode/BC_QRCoderBitVector.h"
+#include "fxbarcode/utils.h"
 
 CBC_QRCoderBitVector::CBC_QRCoderBitVector() {
   m_sizeInBits = 0;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h b/fxbarcode/qrcode/BC_QRCoderBitVector.h
index 7742541a06..59c4360c1e 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h
+++ b/fxbarcode/qrcode/BC_QRCoderBitVector.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
+#define FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
 
 #include <stdint.h>
 
@@ -32,4 +32,4 @@ class CBC_QRCoderBitVector {
   virtual void Init();
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERBITVECTOR_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp b/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
index 8dc73c4be4..9d2a1f8375 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.h"
+#include "fxbarcode/qrcode/BC_QRCoderBlockPair.h"
 
 #include <utility>
 
-#include "xfa/fxbarcode/common/BC_CommonByteArray.h"
+#include "fxbarcode/common/BC_CommonByteArray.h"
 
 CBC_QRCoderBlockPair::CBC_QRCoderBlockPair(
     std::unique_ptr<CBC_CommonByteArray> data,
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.h b/fxbarcode/qrcode/BC_QRCoderBlockPair.h
index 4259d6badd..7c24d9f5ec 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.h
+++ b/fxbarcode/qrcode/BC_QRCoderBlockPair.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERBLOCKPAIR_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERBLOCKPAIR_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERBLOCKPAIR_H_
+#define FXBARCODE_QRCODE_BC_QRCODERBLOCKPAIR_H_
 
 #include <memory>
 
@@ -25,4 +25,4 @@ class CBC_QRCoderBlockPair {
   std::unique_ptr<CBC_CommonByteArray> m_errorCorrectionBytes;
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERBLOCKPAIR_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERBLOCKPAIR_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderECB.cpp b/fxbarcode/qrcode/BC_QRCoderECB.cpp
index 2b5a2a6fef..65fbe33447 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderECB.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderECB.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/qrcode/BC_QRCoderECB.h"
+#include "fxbarcode/qrcode/BC_QRCoderECB.h"
 
 CBC_QRCoderECB::CBC_QRCoderECB(int32_t count, int32_t dataCodeWords) {
   m_dataCodeWords = dataCodeWords;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderECB.h b/fxbarcode/qrcode/BC_QRCoderECB.h
index 25b0b20fe3..b774a3c19c 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderECB.h
+++ b/fxbarcode/qrcode/BC_QRCoderECB.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERECB_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERECB_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERECB_H_
+#define FXBARCODE_QRCODE_BC_QRCODERECB_H_
 
 #include <stdint.h>
 
@@ -21,4 +21,4 @@ class CBC_QRCoderECB {
   int32_t GetDataCodeWords();
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERECB_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERECB_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp b/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
index 8894695e95..e07197df93 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/qrcode/BC_QRCoderECB.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
+#include "fxbarcode/qrcode/BC_QRCoderECB.h"
+#include "fxbarcode/qrcode/BC_QRCoderECBlocks.h"
 
 CBC_QRCoderECBlocks::CBC_QRCoderECBlocks(int32_t ecCodeWordsPerBlock,
                                          CBC_QRCoderECB* ecBlocks)
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h b/fxbarcode/qrcode/BC_QRCoderECBlocks.h
index 816a983ce5..bf4f76dc84 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h
+++ b/fxbarcode/qrcode/BC_QRCoderECBlocks.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
+#define FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
 
 #include <vector>
 
@@ -31,4 +31,4 @@ class CBC_QRCoderECBlocks {
   std::vector<CBC_QRCoderECB*> m_ecBlocksArray;
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index 2534675877..b07b700c51 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -20,25 +20,25 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h"
+#include "fxbarcode/qrcode/BC_QRCoderEncoder.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
-#include "xfa/fxbarcode/BC_UtilCodingConvert.h"
-#include "xfa/fxbarcode/common/BC_CommonByteArray.h"
-#include "xfa/fxbarcode/common/BC_CommonByteMatrix.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
-#include "xfa/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderBlockPair.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "fxbarcode/BC_UtilCodingConvert.h"
+#include "fxbarcode/common/BC_CommonByteArray.h"
+#include "fxbarcode/common/BC_CommonByteMatrix.h"
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
+#include "fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "fxbarcode/qrcode/BC_QRCoder.h"
+#include "fxbarcode/qrcode/BC_QRCoderBitVector.h"
+#include "fxbarcode/qrcode/BC_QRCoderBlockPair.h"
+#include "fxbarcode/qrcode/BC_QRCoderECBlocks.h"
+#include "fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
+#include "fxbarcode/qrcode/BC_QRCoderMatrixUtil.h"
+#include "fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "fxbarcode/qrcode/BC_QRCoderVersion.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h b/fxbarcode/qrcode/BC_QRCoderEncoder.h
index 77de6e5e40..f46a64e9a9 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderEncoder.h
+++ b/fxbarcode/qrcode/BC_QRCoderEncoder.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
+#define FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
 
 #include <utility>
 #include <vector>
@@ -137,4 +137,4 @@ class CBC_QRCoderEncoder {
       int32_t& e);
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERENCODER_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
index 2990d980fc..6fb3233705 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
 
 CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::L = nullptr;
 CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::M = nullptr;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h b/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
index 2f0d22eb29..e153c64395 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
+++ b/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
+#define FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
 
 #include "core/fxcrt/fx_string.h"
 
@@ -38,4 +38,4 @@ class CBC_QRCoderErrorCorrectionLevel {
   CFX_ByteString m_name;
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERERRORCORRECTIONLEVEL_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
index 7953701bb2..cdf1e4caf9 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/common/BC_CommonByteMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/common/BC_CommonByteMatrix.h"
+#include "fxbarcode/qrcode/BC_QRCoder.h"
+#include "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
+#include "fxbarcode/utils.h"
 
 CBC_QRCoderMaskUtil::CBC_QRCoderMaskUtil() {}
 CBC_QRCoderMaskUtil::~CBC_QRCoderMaskUtil() {}
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.h b/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
index 9fbe073e7e..63fccbb8e4 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
+++ b/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERMASKUTIL_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERMASKUTIL_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERMASKUTIL_H_
+#define FXBARCODE_QRCODE_BC_QRCODERMASKUTIL_H_
 class CBC_CommonByteMatrix;
 class CBC_QRCoderMaskUtil {
  public:
@@ -24,4 +24,4 @@ class CBC_QRCoderMaskUtil {
                                                bool isHorizontal);
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERMASKUTIL_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERMASKUTIL_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp b/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
index d48d81c091..b6ffaa00fc 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/common/BC_CommonByteMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoder.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/common/BC_CommonByteMatrix.h"
+#include "fxbarcode/qrcode/BC_QRCoder.h"
+#include "fxbarcode/qrcode/BC_QRCoderBitVector.h"
+#include "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
+#include "fxbarcode/qrcode/BC_QRCoderMatrixUtil.h"
+#include "fxbarcode/utils.h"
 
 const int32_t CBC_QRCoderMatrixUtil::POSITION_DETECTION_PATTERN[7][7] = {
     {1, 1, 1, 1, 1, 1, 1}, {1, 0, 0, 0, 0, 0, 1}, {1, 0, 1, 1, 1, 0, 1},
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h b/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
index 3ce4b7510b..3535c43c74 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
+++ b/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERMATRIXUTIL_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERMATRIXUTIL_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERMATRIXUTIL_H_
+#define FXBARCODE_QRCODE_BC_QRCODERMATRIXUTIL_H_
 
 class CBC_CommonByteMatrix;
 class CBC_QRCoderErrorCorrectionLevel;
@@ -84,4 +84,4 @@ class CBC_QRCoderMatrixUtil {
                                                    int32_t& e);
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERMATRIXUTIL_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERMATRIXUTIL_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp b/fxbarcode/qrcode/BC_QRCoderMode.cpp
index a1283dda93..3127145465 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderMode.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderMode.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "fxbarcode/qrcode/BC_QRCoderMode.h"
 
 #include <utility>
 
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "fxbarcode/utils.h"
 
 CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = nullptr;
 CBC_QRCoderMode* CBC_QRCoderMode::sNUMERIC = nullptr;
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderMode.h b/fxbarcode/qrcode/BC_QRCoderMode.h
index f876d81f03..4402e3fe26 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderMode.h
+++ b/fxbarcode/qrcode/BC_QRCoderMode.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERMODE_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERMODE_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERMODE_H_
+#define FXBARCODE_QRCODE_BC_QRCODERMODE_H_
 
 #include <stdint.h>
 
@@ -50,4 +50,4 @@ class CBC_QRCoderMode {
   const CFX_ByteString m_name;
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERMODE_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERMODE_H_
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/fxbarcode/qrcode/BC_QRCoderVersion.cpp
index da13700ae2..ff7cbc4007 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.cpp
+++ b/fxbarcode/qrcode/BC_QRCoderVersion.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "xfa/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderBitVector.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderECB.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "xfa/fxbarcode/qrcode/BC_QRCoderVersion.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/common/BC_CommonBitMatrix.h"
+#include "fxbarcode/qrcode/BC_QRCoderBitVector.h"
+#include "fxbarcode/qrcode/BC_QRCoderECB.h"
+#include "fxbarcode/qrcode/BC_QRCoderECBlocks.h"
+#include "fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "fxbarcode/utils.h"
 
 namespace {
 
diff --git a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h b/fxbarcode/qrcode/BC_QRCoderVersion.h
index 853a93ed0c..78ded0d30c 100644
--- a/xfa/fxbarcode/qrcode/BC_QRCoderVersion.h
+++ b/fxbarcode/qrcode/BC_QRCoderVersion.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
-#define XFA_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
+#ifndef FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
+#define FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
 
 #include <vector>
 
@@ -54,4 +54,4 @@ class CBC_QRCoderVersion {
   std::vector<CBC_QRCoderECBlocks*> m_ecBlocksArray;
 };
 
-#endif  // XFA_FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
+#endif  // FXBARCODE_QRCODE_BC_QRCODERVERSION_H_
diff --git a/xfa/fxbarcode/utils.h b/fxbarcode/utils.h
index 93a3c576cb..f87c10ac7e 100644
--- a/xfa/fxbarcode/utils.h
+++ b/fxbarcode/utils.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef XFA_FXBARCODE_UTILS_H_
-#define XFA_FXBARCODE_UTILS_H_
+#ifndef FXBARCODE_UTILS_H_
+#define FXBARCODE_UTILS_H_
 
 #include <vector>
 
@@ -168,4 +168,4 @@ enum BCFORMAT {
 #define BCExceptionNotFoundInstance 105
 #define BCExceptionCannotMetadata 106
 
-#endif  // XFA_FXBARCODE_UTILS_H_
+#endif  // FXBARCODE_UTILS_H_
diff --git a/xfa/DEPS b/xfa/DEPS
index 4aad7ef958..cc3061d2bc 100644
--- a/xfa/DEPS
+++ b/xfa/DEPS
@@ -2,5 +2,6 @@ include_rules = [
   '+core/fpdfapi/parser',
   '+core/fxcrt',
   '+core/fxge',
+  '+fxbarcode',
   '+third_party/bigint'
 ]
diff --git a/xfa/fwl/cfwl_barcode.h b/xfa/fwl/cfwl_barcode.h
index 101cc602fb..463c0a2e18 100644
--- a/xfa/fwl/cfwl_barcode.h
+++ b/xfa/fwl/cfwl_barcode.h
@@ -9,10 +9,10 @@
 
 #include <memory>
 
+#include "fxbarcode/BC_Library.h"
 #include "xfa/fwl/cfwl_edit.h"
 #include "xfa/fwl/cfwl_scrollbar.h"
 #include "xfa/fwl/cfwl_widget.h"
-#include "xfa/fxbarcode/BC_Library.h"
 
 class CFWL_WidgetProperties;
 class CFX_Barcode;
diff --git a/xfa/fwl/cfx_barcode.cpp b/xfa/fwl/cfx_barcode.cpp
index cbd6b09975..1c16143de5 100644
--- a/xfa/fwl/cfx_barcode.cpp
+++ b/xfa/fwl/cfx_barcode.cpp
@@ -6,17 +6,17 @@
 
 #include "xfa/fwl/cfx_barcode.h"
 
-#include "xfa/fxbarcode/cbc_codabar.h"
-#include "xfa/fxbarcode/cbc_code128.h"
-#include "xfa/fxbarcode/cbc_code39.h"
-#include "xfa/fxbarcode/cbc_codebase.h"
-#include "xfa/fxbarcode/cbc_datamatrix.h"
-#include "xfa/fxbarcode/cbc_ean13.h"
-#include "xfa/fxbarcode/cbc_ean8.h"
-#include "xfa/fxbarcode/cbc_pdf417i.h"
-#include "xfa/fxbarcode/cbc_qrcode.h"
-#include "xfa/fxbarcode/cbc_upca.h"
-#include "xfa/fxbarcode/utils.h"
+#include "fxbarcode/cbc_codabar.h"
+#include "fxbarcode/cbc_code128.h"
+#include "fxbarcode/cbc_code39.h"
+#include "fxbarcode/cbc_codebase.h"
+#include "fxbarcode/cbc_datamatrix.h"
+#include "fxbarcode/cbc_ean13.h"
+#include "fxbarcode/cbc_ean8.h"
+#include "fxbarcode/cbc_pdf417i.h"
+#include "fxbarcode/cbc_qrcode.h"
+#include "fxbarcode/cbc_upca.h"
+#include "fxbarcode/utils.h"
 
 namespace {
 
diff --git a/xfa/fwl/cfx_barcode.h b/xfa/fwl/cfx_barcode.h
index d3df216977..f2445c2f08 100644
--- a/xfa/fwl/cfx_barcode.h
+++ b/xfa/fwl/cfx_barcode.h
@@ -13,7 +13,7 @@
 #include "core/fxcrt/fx_string.h"
 #include "core/fxcrt/fx_system.h"
 #include "core/fxge/fx_dib.h"
-#include "xfa/fxbarcode/BC_Library.h"
+#include "fxbarcode/BC_Library.h"
 
 class CBC_CodeBase;
 class CFX_Font;
diff --git a/xfa/fxbarcode/DEPS b/xfa/fxbarcode/DEPS
deleted file mode 100644
index 1519ceaa93..0000000000
--- a/xfa/fxbarcode/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  '+core/fxcodec',
-]
diff --git a/xfa/fxfa/app/xfa_ffbarcode.h b/xfa/fxfa/app/xfa_ffbarcode.h
index 6d93e1b682..ad12218f3d 100644
--- a/xfa/fxfa/app/xfa_ffbarcode.h
+++ b/xfa/fxfa/app/xfa_ffbarcode.h
@@ -7,7 +7,7 @@
 #ifndef XFA_FXFA_APP_XFA_FFBARCODE_H_
 #define XFA_FXFA_APP_XFA_FFBARCODE_H_
 
-#include "xfa/fxbarcode/BC_Library.h"
+#include "fxbarcode/BC_Library.h"
 #include "xfa/fxfa/app/xfa_fftextedit.h"
 #include "xfa/fxfa/cxfa_ffpageview.h"
 
diff --git a/xfa/fxfa/parser/cxfa_widgetdata.cpp b/xfa/fxfa/parser/cxfa_widgetdata.cpp
index 0065296776..8784b6e9d1 100644
--- a/xfa/fxfa/parser/cxfa_widgetdata.cpp
+++ b/xfa/fxfa/parser/cxfa_widgetdata.cpp
@@ -8,8 +8,8 @@
 
 #include "core/fxcrt/cfx_decimal.h"
 #include "core/fxcrt/fx_ext.h"
+#include "fxbarcode/BC_Library.h"
 #include "third_party/base/stl_util.h"
-#include "xfa/fxbarcode/BC_Library.h"
 #include "xfa/fxfa/app/xfa_ffnotify.h"
 #include "xfa/fxfa/parser/cxfa_document.h"
 #include "xfa/fxfa/parser/cxfa_event.h"