240 files changed, 820 insertions, 818 deletions
diff --git a/xfa/src/fxbarcode/src/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp
index 099644bb13..063f8b5d8d 100644
--- a/xfa/src/fxbarcode/src/BC_BarCode.cpp
+++ b/xfa/src/fxbarcode/BC_BarCode.cpp
@@ -21,64 +21,65 @@
  */
 
 #include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_OneDimReader.h"
-#include "include/BC_Writer.h"
-#include "include/BC_OneDimWriter.h"
-#include "include/BC_OnedCode39Reader.h"
-#include "include/BC_OnedCode39Writer.h"
-#include "include/BC_OnedCodaBarReader.h"
-#include "include/BC_OnedCodaBarWriter.h"
-#include "include/BC_OnedCode128Reader.h"
-#include "include/BC_OnedCode128Writer.h"
-#include "include/BC_OnedEAN8Reader.h"
-#include "include/BC_OnedEAN8Writer.h"
-#include "include/BC_OnedEAN13Reader.h"
-#include "include/BC_OnedEAN13Writer.h"
-#include "include/BC_OnedUPCAReader.h"
-#include "include/BC_OnedUPCAWriter.h"
-#include "include/BC_QRCodeReader.h"
-#include "include/BC_QRCodeWriter.h"
-#include "include/BC_PDF417Compaction.h"
-#include "include/BC_PDF417.h"
-#include "include/BC_PDF417Writer.h"
-#include "include/BC_DataMatrixReader.h"
-#include "include/BC_DataMatrixWriter.h"
-#include "include/BC_LuminanceSource.h"
-#include "include/BC_BufferedImageLuminanceSource.h"
-#include "include/BC_Binarizer.h"
-#include "include/BC_GlobalHistogramBinarizer.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_UtilCodingConvert.h"
-#include "include/BC_PDF417HighLevelEncoder.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_PDF417DetectorResult.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_PDF417Detector.h"
-#include "include/BC_PDF417DetectorResult.h"
-#include "include/BC_DecoderResult.h"
-#include "include/BC_PDF417Codeword.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417BarcodeValue.h"
-#include "include/BC_PDF417BarcodeMetadata.h"
-#include "include/BC_PDF417BoundingBox.h"
-#include "include/BC_PDF417DetectionResultColumn.h"
-#include "include/BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "include/BC_PDF417DetectionResult.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_PDF417CodewordDecoder.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_PDF417ECModulusPoly.h"
-#include "include/BC_PDF417ECModulusGF.h"
-#include "include/BC_PDF417ECErrorCorrection.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_CommonDecoderResult.h"
-#include "include/BC_PDF417ScanningDecoder.h"
-#include "include/BC_PDF417Reader.h"
+#include "BC_Reader.h"
+#include "BC_Writer.h"
+#include "BC_DecoderResult.h"
+#include "BC_LuminanceSource.h"
+#include "BC_BufferedImageLuminanceSource.h"
+#include "BC_Binarizer.h"
+#include "BC_BinaryBitmap.h"
+#include "BC_UtilCodingConvert.h"
+#include "BC_ResultPoint.h"
+#include "BC_BinaryBitmap.h"
+#include "BC_TwoDimWriter.h"
+#include "common/BC_GlobalHistogramBinarizer.h"
+#include "common/BC_CommonBitMatrix.h"
+#include "common/BC_CommonBitArray.h"
+#include "common/BC_CommonBitMatrix.h"
+#include "common/BC_CommonDecoderResult.h"
+#include "datamatrix/BC_DataMatrixReader.h"
+#include "datamatrix/BC_DataMatrixWriter.h"
+#include "oned/BC_OneDReader.h"
+#include "oned/BC_OneDimReader.h"
+#include "oned/BC_OneDimWriter.h"
+#include "oned/BC_OnedCode39Reader.h"
+#include "oned/BC_OnedCode39Writer.h"
+#include "oned/BC_OnedCodaBarReader.h"
+#include "oned/BC_OnedCodaBarWriter.h"
+#include "oned/BC_OnedCode128Reader.h"
+#include "oned/BC_OnedCode128Writer.h"
+#include "oned/BC_OnedEAN8Reader.h"
+#include "oned/BC_OnedEAN8Writer.h"
+#include "oned/BC_OnedEAN13Reader.h"
+#include "oned/BC_OnedEAN13Writer.h"
+#include "oned/BC_OnedUPCAReader.h"
+#include "oned/BC_OnedUPCAWriter.h"
+#include "pdf417/BC_PDF417DetectorResult.h"
+#include "pdf417/BC_PDF417Compaction.h"
+#include "pdf417/BC_PDF417.h"
+#include "pdf417/BC_PDF417Writer.h"
+#include "pdf417/BC_PDF417Detector.h"
+#include "pdf417/BC_PDF417DetectorResult.h"
+#include "pdf417/BC_PDF417Codeword.h"
+#include "pdf417/BC_PDF417Common.h"
+#include "pdf417/BC_PDF417BarcodeValue.h"
+#include "pdf417/BC_PDF417BarcodeMetadata.h"
+#include "pdf417/BC_PDF417BoundingBox.h"
+#include "pdf417/BC_PDF417DetectionResultColumn.h"
+#include "pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "pdf417/BC_PDF417DetectionResult.h"
+#include "pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "pdf417/BC_PDF417CodewordDecoder.h"
+#include "pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "pdf417/BC_PDF417ECModulusPoly.h"
+#include "pdf417/BC_PDF417ECModulusGF.h"
+#include "pdf417/BC_PDF417ECErrorCorrection.h"
+#include "pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "pdf417/BC_PDF417ScanningDecoder.h"
+#include "pdf417/BC_PDF417Reader.h"
+#include "pdf417/BC_PDF417HighLevelEncoder.h"
+#include "qrcode/BC_QRCodeReader.h"
+#include "qrcode/BC_QRCodeWriter.h"
 CBC_CodeBase :: CBC_CodeBase()
 {
 }
diff --git a/xfa/src/fxbarcode/src/BC_Binarizer.cpp b/xfa/src/fxbarcode/BC_Binarizer.cpp
index daf450c483..da433d7375 100644
--- a/xfa/src/fxbarcode/src/BC_Binarizer.cpp
+++ b/xfa/src/fxbarcode/BC_Binarizer.cpp
@@ -21,10 +21,10 @@
  */
 
 #include "barcode.h"
-#include "include/BC_LuminanceSource.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_Binarizer.h"
+#include "BC_LuminanceSource.h"
+#include "BC_Binarizer.h"
+#include "common/BC_CommonBitMatrix.h"
+#include "common/BC_CommonBitArray.h"
 CBC_Binarizer::CBC_Binarizer(CBC_LuminanceSource *source)
 {
     m_source = source;
diff --git a/xfa/src/fxbarcode/src/include/BC_Binarizer.h b/xfa/src/fxbarcode/BC_Binarizer.h
index 357aef67c2..357aef67c2 100644
--- a/xfa/src/fxbarcode/src/include/BC_Binarizer.h
+++ b/xfa/src/fxbarcode/BC_Binarizer.h
diff --git a/xfa/src/fxbarcode/src/BC_BinaryBitmap.cpp b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp
index 707b5c859c..90e1755cf4 100644
--- a/xfa/src/fxbarcode/src/BC_BinaryBitmap.cpp
+++ b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp
@@ -21,11 +21,11 @@
  */
 
 #include "barcode.h"
-#include "include/BC_Binarizer.h"
-#include "include/BC_LuminanceSource.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_BinaryBitmap.h"
+#include "BC_Binarizer.h"
+#include "BC_LuminanceSource.h"
+#include "BC_BinaryBitmap.h"
+#include "common/BC_CommonBitMatrix.h"
+#include "common/BC_CommonBitArray.h"
 CBC_BinaryBitmap::CBC_BinaryBitmap(CBC_Binarizer *binarizer): m_binarizer(binarizer), m_matrix(NULL)
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_BinaryBitmap.h b/xfa/src/fxbarcode/BC_BinaryBitmap.h
index 638d16f5a9..638d16f5a9 100644
--- a/xfa/src/fxbarcode/src/include/BC_BinaryBitmap.h
+++ b/xfa/src/fxbarcode/BC_BinaryBitmap.h
diff --git a/xfa/src/fxbarcode/src/BC_BufferedImageLuminanceSource.cpp b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp
index 475eed06a6..d385c456de 100644
--- a/xfa/src/fxbarcode/src/BC_BufferedImageLuminanceSource.cpp
+++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "barcode.h"
-#include "include/BC_LuminanceSource.h"
-#include "include/BC_BufferedImageLuminanceSource.h"
+#include "BC_LuminanceSource.h"
+#include "BC_BufferedImageLuminanceSource.h"
 class CBC_Pause : public IFX_Pause
 {
 public:
diff --git a/xfa/src/fxbarcode/src/include/BC_BufferedImageLuminanceSource.h b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h
index 4bff1756d5..4bff1756d5 100644
--- a/xfa/src/fxbarcode/src/include/BC_BufferedImageLuminanceSource.h
+++ b/xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h
diff --git a/xfa/src/fxbarcode/src/include/BC_DecoderResult.h b/xfa/src/fxbarcode/BC_DecoderResult.h
index ff98b2c407..ff98b2c407 100644
--- a/xfa/src/fxbarcode/src/include/BC_DecoderResult.h
+++ b/xfa/src/fxbarcode/BC_DecoderResult.h
diff --git a/xfa/src/fxbarcode/src/BC_Dimension.cpp b/xfa/src/fxbarcode/BC_Dimension.cpp
index 1788355ec0..5662c6eba7 100644
--- a/xfa/src/fxbarcode/src/BC_Dimension.cpp
+++ b/xfa/src/fxbarcode/BC_Dimension.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_Dimension.h"
+#include "BC_Dimension.h"
+#include "datamatrix/BC_Encoder.h"
 CBC_Dimension::CBC_Dimension()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_Dimension.h b/xfa/src/fxbarcode/BC_Dimension.h
index ff4aecace4..ff4aecace4 100644
--- a/xfa/src/fxbarcode/src/include/BC_Dimension.h
+++ b/xfa/src/fxbarcode/BC_Dimension.h
diff --git a/xfa/src/fxbarcode/BC_Library.cpp b/xfa/src/fxbarcode/BC_Library.cpp
new file mode 100644
index 0000000000..e84eda6099
--- /dev/null
+++ b/xfa/src/fxbarcode/BC_Library.cpp
@@ -0,0 +1,123 @@
+// Copyright 2014 PDFium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
+
+#include "barcode.h"
+#include "BC_Reader.h"
+#include "BC_UtilCodingConvert.h"
+#include "BC_BinaryBitmap.h"
+#include "BC_LuminanceSource.h"
+#include "BC_BufferedImageLuminanceSource.h"
+#include "BC_Binarizer.h"
+#include "BC_Writer.h"
+#include "BC_Dimension.h"
+#include "BC_UtilCodingConvert.h"
+#include "BC_ResultPoint.h"
+#include "BC_BinaryBitmap.h"
+#include "BC_DecoderResult.h"
+#include "BC_TwoDimWriter.h"
+#include "common/BC_GlobalHistogramBinarizer.h"
+#include "common/BC_CommonBitMatrix.h"
+#include "common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "common/BC_CommonByteMatrix.h"
+#include "common/BC_CommonBitMatrix.h"
+#include "common/BC_CommonBitArray.h"
+#include "common/BC_CommonBitMatrix.h"
+#include "common/BC_CommonDecoderResult.h"
+#include "datamatrix/BC_DataMatrixVersion.h"
+#include "datamatrix/BC_DataMatrixReader.h"
+#include "datamatrix/BC_Encoder.h"
+#include "datamatrix/BC_DefaultPlacement.h"
+#include "datamatrix/BC_SymbolShapeHint.h"
+#include "datamatrix/BC_SymbolInfo.h"
+#include "datamatrix/BC_DataMatrixSymbolInfo144.h"
+#include "datamatrix/BC_ErrorCorrection.h"
+#include "datamatrix/BC_EncoderContext.h"
+#include "datamatrix/BC_C40Encoder.h"
+#include "datamatrix/BC_TextEncoder.h"
+#include "datamatrix/BC_X12Encoder.h"
+#include "datamatrix/BC_EdifactEncoder.h"
+#include "datamatrix/BC_Base256Encoder.h"
+#include "datamatrix/BC_ASCIIEncoder.h"
+#include "datamatrix/BC_HighLevelEncoder.h"
+#include "datamatrix/BC_DataMatrixWriter.h"
+#include "oned/BC_OneDReader.h"
+#include "oned/BC_OnedCode128Reader.h"
+#include "oned/BC_OnedCode39Reader.h"
+#include "oned/BC_OneDimReader.h"
+#include "oned/BC_OnedEAN13Reader.h"
+#include "oned/BC_OnedEAN8Reader.h"
+#include "oned/BC_OnedUPCAReader.h"
+#include "oned/BC_OnedCodaBarReader.h"
+#include "oned/BC_OneDimWriter.h"
+#include "oned/BC_OnedCode128Writer.h"
+#include "oned/BC_OnedCode39Writer.h"
+#include "oned/BC_OnedEAN13Writer.h"
+#include "oned/BC_OnedEAN8Writer.h"
+#include "oned/BC_OnedUPCAWriter.h"
+#include "pdf417/BC_PDF417DetectorResult.h"
+#include "pdf417/BC_PDF417Compaction.h"
+#include "pdf417/BC_PDF417HighLevelEncoder.h"
+#include "pdf417/BC_PDF417Detector.h"
+#include "pdf417/BC_PDF417DetectorResult.h"
+#include "pdf417/BC_PDF417Codeword.h"
+#include "pdf417/BC_PDF417Common.h"
+#include "pdf417/BC_PDF417BarcodeValue.h"
+#include "pdf417/BC_PDF417BarcodeMetadata.h"
+#include "pdf417/BC_PDF417BoundingBox.h"
+#include "pdf417/BC_PDF417DetectionResultColumn.h"
+#include "pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "pdf417/BC_PDF417DetectionResult.h"
+#include "pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "pdf417/BC_PDF417CodewordDecoder.h"
+#include "pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "pdf417/BC_PDF417ECModulusPoly.h"
+#include "pdf417/BC_PDF417ECModulusGF.h"
+#include "pdf417/BC_PDF417ECErrorCorrection.h"
+#include "pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "pdf417/BC_PDF417ScanningDecoder.h"
+#include "pdf417/BC_PDF417Reader.h"
+#include "qrcode/BC_QRCodeReader.h"
+#include "qrcode/BC_QRCodeWriter.h"
+#include "qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "qrcode/BC_QRCoderMode.h"
+#include "qrcode/BC_QRCoderVersion.h"
+#include "qrcode/BC_QRDataMask.h"
+#include "qrcode/BC_QRDecodedBitStreamParser.h"
+void BC_Library_Init()
+{
+    CBC_QRCoderErrorCorrectionLevel::Initialize();
+    CBC_QRCoderMode::Initialize();
+    CBC_QRCoderVersion::Initialize();
+    CBC_QRDataMask::Initialize();
+    CBC_ReedSolomonGF256::Initialize();
+    CBC_DataMatrixVersion::Initialize();
+    CBC_SymbolInfo::Initialize();
+    CBC_ErrorCorrection::Initialize();
+    CBC_PDF417HighLevelEncoder::Initialize();
+    FX_INT32 e = 0;
+    CBC_PDF417ECModulusGF::Initialize(e);
+    CBC_DecodedBitStreamPaser::Initialize();
+    CBC_PDF417CodewordDecoder::Initialize();
+    CBC_PDF417ECErrorCorrection::Initialize(e);
+    CBC_PDF417ScanningDecoder::Initialize();
+}
+void BC_Library_Destory()
+{
+    CBC_QRCoderErrorCorrectionLevel::Finalize();
+    CBC_QRCoderMode::Finalize();
+    CBC_QRCoderVersion::Finalize();
+    CBC_QRDataMask::Finalize();
+    CBC_ReedSolomonGF256::Finalize();
+    CBC_DataMatrixVersion::Finalize();
+    CBC_SymbolInfo::Finalize();
+    CBC_ErrorCorrection::Finalize();
+    CBC_PDF417HighLevelEncoder::Finalize();
+    CBC_DecodedBitStreamPaser::Finalize();
+    CBC_PDF417CodewordDecoder::Finalize();
+    CBC_PDF417ECErrorCorrection::Finalize();
+    CBC_PDF417ECModulusGF::Finalize();
+    CBC_PDF417ScanningDecoder::Finalize();
+}
diff --git a/xfa/src/fxbarcode/src/BC_LuminanceSource.cpp b/xfa/src/fxbarcode/BC_LuminanceSource.cpp
index 675d51b364..e237454a83 100644
--- a/xfa/src/fxbarcode/src/BC_LuminanceSource.cpp
+++ b/xfa/src/fxbarcode/BC_LuminanceSource.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "barcode.h"
-#include "include/BC_LuminanceSource.h"
+#include "BC_LuminanceSource.h"
 CBC_LuminanceSource::CBC_LuminanceSource(FX_INT32 width, FX_INT32 height): m_width(width), m_height(height)
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_LuminanceSource.h b/xfa/src/fxbarcode/BC_LuminanceSource.h
index 6aa85101c9..6aa85101c9 100644
--- a/xfa/src/fxbarcode/src/include/BC_LuminanceSource.h
+++ b/xfa/src/fxbarcode/BC_LuminanceSource.h
diff --git a/xfa/src/fxbarcode/src/BC_Reader.cpp b/xfa/src/fxbarcode/BC_Reader.cpp
index 51f7188b50..3b0929bfbf 100644
--- a/xfa/src/fxbarcode/src/BC_Reader.cpp
+++ b/xfa/src/fxbarcode/BC_Reader.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "barcode.h"
-#include "include/BC_Reader.h"
+#include "BC_Reader.h"
 CBC_Reader::CBC_Reader()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_Reader.h b/xfa/src/fxbarcode/BC_Reader.h
index 42b2aa11f5..42b2aa11f5 100644
--- a/xfa/src/fxbarcode/src/include/BC_Reader.h
+++ b/xfa/src/fxbarcode/BC_Reader.h
diff --git a/xfa/src/fxbarcode/src/BC_ResultPoint.cpp b/xfa/src/fxbarcode/BC_ResultPoint.cpp
index 5618d8f38d..6f1aac4e31 100644
--- a/xfa/src/fxbarcode/src/BC_ResultPoint.cpp
+++ b/xfa/src/fxbarcode/BC_ResultPoint.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "barcode.h"
-#include "include/BC_ResultPoint.h"
+#include "BC_ResultPoint.h"
 CBC_ResultPoint::CBC_ResultPoint(FX_FLOAT x, FX_FLOAT y): m_x(x), m_y(y)
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_ResultPoint.h b/xfa/src/fxbarcode/BC_ResultPoint.h
index 7001cfa2a5..7001cfa2a5 100644
--- a/xfa/src/fxbarcode/src/include/BC_ResultPoint.h
+++ b/xfa/src/fxbarcode/BC_ResultPoint.h
diff --git a/xfa/src/fxbarcode/src/BC_TwoDimWriter.cpp b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp
index b23802b784..c0456cd104 100644
--- a/xfa/src/fxbarcode/src/BC_TwoDimWriter.cpp
+++ b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp
@@ -5,9 +5,9 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "barcode.h"
-#include "include/BC_Writer.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_TwoDimWriter.h"
+#include "common/BC_CommonBitMatrix.h"
+#include "BC_Writer.h"
+#include "BC_TwoDimWriter.h"
 CBC_TwoDimWriter::CBC_TwoDimWriter()
 {
     m_iCorrectLevel		= 1;
diff --git a/xfa/src/fxbarcode/src/include/BC_TwoDimWriter.h b/xfa/src/fxbarcode/BC_TwoDimWriter.h
index 369d494c08..369d494c08 100644
--- a/xfa/src/fxbarcode/src/include/BC_TwoDimWriter.h
+++ b/xfa/src/fxbarcode/BC_TwoDimWriter.h
diff --git a/xfa/src/fxbarcode/src/BC_UtilCodingConvert.cpp b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
index 993fc79689..c6aa1f3eb7 100644
--- a/xfa/src/fxbarcode/src/BC_UtilCodingConvert.cpp
+++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "barcode.h"
-#include "include/BC_UtilCodingConvert.h"
+#include "BC_UtilCodingConvert.h"
 CBC_UtilCodingConvert::CBC_UtilCodingConvert()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_UtilCodingConvert.h b/xfa/src/fxbarcode/BC_UtilCodingConvert.h
index 1ee3a8c64c..1ee3a8c64c 100644
--- a/xfa/src/fxbarcode/src/include/BC_UtilCodingConvert.h
+++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.h
diff --git a/xfa/src/fxbarcode/src/BC_UtilRSS.cpp b/xfa/src/fxbarcode/BC_UtilRSS.cpp
index be9c2a5268..c65df34e13 100644
--- a/xfa/src/fxbarcode/src/BC_UtilRSS.cpp
+++ b/xfa/src/fxbarcode/BC_UtilRSS.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "barcode.h"
-#include "include/BC_UtilRSS.h"
+#include "BC_UtilRSS.h"
 CBC_UtilRSS::CBC_UtilRSS()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_UtilRSS.h b/xfa/src/fxbarcode/BC_UtilRSS.h
index 37834eaa76..37834eaa76 100644
--- a/xfa/src/fxbarcode/src/include/BC_UtilRSS.h
+++ b/xfa/src/fxbarcode/BC_UtilRSS.h
diff --git a/xfa/src/fxbarcode/src/BC_Utils.cpp b/xfa/src/fxbarcode/BC_Utils.cpp
index 3a04ebda2b..3a04ebda2b 100644
--- a/xfa/src/fxbarcode/src/BC_Utils.cpp
+++ b/xfa/src/fxbarcode/BC_Utils.cpp
diff --git a/xfa/src/fxbarcode/src/BC_Writer.cpp b/xfa/src/fxbarcode/BC_Writer.cpp
index c372c97097..69276dd1f4 100644
--- a/xfa/src/fxbarcode/src/BC_Writer.cpp
+++ b/xfa/src/fxbarcode/BC_Writer.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "barcode.h"
-#include "include/BC_Writer.h"
+#include "BC_Writer.h"
 CBC_Writer::CBC_Writer()
 {
     m_CharEncoding		= 0;
diff --git a/xfa/src/fxbarcode/src/include/BC_Writer.h b/xfa/src/fxbarcode/BC_Writer.h
index deb68c07be..deb68c07be 100644
--- a/xfa/src/fxbarcode/src/include/BC_Writer.h
+++ b/xfa/src/fxbarcode/BC_Writer.h
diff --git a/xfa/src/fxbarcode/src/barcode.h b/xfa/src/fxbarcode/barcode.h
index e2ad2126a0..333d3f7a11 100644
--- a/xfa/src/fxbarcode/src/barcode.h
+++ b/xfa/src/fxbarcode/barcode.h
@@ -4,5 +4,5 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../../foxitlib.h"
-#include "include/utils.h"
+#include "../foxitlib.h"
+#include "utils.h"
diff --git a/xfa/src/fxbarcode/src/BC_CommonBitArray.cpp b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
index 617c7c91d5..6263affbe8 100644
--- a/xfa/src/fxbarcode/src/BC_CommonBitArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonBitArray.h"
+#include "../barcode.h"
+#include "BC_CommonBitArray.h"
 CBC_CommonBitArray::CBC_CommonBitArray(CBC_CommonBitArray* array)
 {
     m_size = array->GetSize();
diff --git a/xfa/src/fxbarcode/src/include/BC_CommonBitArray.h b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
index 484d87d5a7..484d87d5a7 100644
--- a/xfa/src/fxbarcode/src/include/BC_CommonBitArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.h
diff --git a/xfa/src/fxbarcode/src/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
index 222de565c0..df24d1dabb 100644
--- a/xfa/src/fxbarcode/src/BC_CommonBitMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_CommonBitMatrix.h"
+#include "../barcode.h"
+#include "BC_CommonBitArray.h"
+#include "BC_CommonBitMatrix.h"
 CBC_CommonBitMatrix::CBC_CommonBitMatrix()
 {
     m_width = 0;
diff --git a/xfa/src/fxbarcode/src/include/BC_CommonBitMatrix.h b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
index f69d7a0e33..f69d7a0e33 100644
--- a/xfa/src/fxbarcode/src/include/BC_CommonBitMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.h
diff --git a/xfa/src/fxbarcode/src/BC_CommonBitSource.cpp b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp
index 43df2958fd..b71848a60c 100644
--- a/xfa/src/fxbarcode/src/BC_CommonBitSource.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonBitSource.h"
+#include "../barcode.h"
+#include "BC_CommonBitSource.h"
 CBC_CommonBitSource::CBC_CommonBitSource(CFX_ByteArray* bytes)
 {
     m_bytes.Copy((*bytes));
diff --git a/xfa/src/fxbarcode/src/include/BC_CommonBitSource.h b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
index 53891cf671..53891cf671 100644
--- a/xfa/src/fxbarcode/src/include/BC_CommonBitSource.h
+++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.h
diff --git a/xfa/src/fxbarcode/src/BC_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
index 9d5c52a454..99e97d38d8 100644
--- a/xfa/src/fxbarcode/src/BC_CommonByteArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonByteArray.h"
+#include "../barcode.h"
+#include "BC_CommonByteArray.h"
 CBC_CommonByteArray::CBC_CommonByteArray()
 {
     m_bytes = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_CommonByteArray.h b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
index fe0a67ffd1..fe0a67ffd1 100644
--- a/xfa/src/fxbarcode/src/include/BC_CommonByteArray.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.h
diff --git a/xfa/src/fxbarcode/src/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
index de10f9e401..27c8615bf9 100644
--- a/xfa/src/fxbarcode/src/BC_CommonByteMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonByteMatrix.h"
+#include "../barcode.h"
+#include "BC_CommonByteMatrix.h"
 CBC_CommonByteMatrix::CBC_CommonByteMatrix(FX_INT32 width, FX_INT32 height)
 {
     m_height = height;
diff --git a/xfa/src/fxbarcode/src/include/BC_CommonByteMatrix.h b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
index 3d831d1911..3d831d1911 100644
--- a/xfa/src/fxbarcode/src/include/BC_CommonByteMatrix.h
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.h
diff --git a/xfa/src/fxbarcode/src/BC_CommonCharacterSetECI.cpp b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
index 07a2a77683..2909704796 100644
--- a/xfa/src/fxbarcode/src/BC_CommonCharacterSetECI.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonECI.h"
-#include "include/BC_CommonCharacterSetECI.h"
+#include "../barcode.h"
+#include "BC_CommonECI.h"
+#include "BC_CommonCharacterSetECI.h"
 void CBC_CommonCharacterSetECI::initialize()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_CommonCharacterSetECI.h b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
index 1e9f9a433f..1e9f9a433f 100644
--- a/xfa/src/fxbarcode/src/include/BC_CommonCharacterSetECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h
diff --git a/xfa/src/fxbarcode/src/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
index 28d99b1382..d0c55734db 100644
--- a/xfa/src/fxbarcode/src/BC_CommonDecoderResult.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
-#include "include/BC_PDF417ResultMetadata.h"
-#include "include/BC_CommonDecoderResult.h"
+#include "../barcode.h"
+#include "../qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "../pdf417/BC_PDF417ResultMetadata.h"
+#include "BC_CommonDecoderResult.h"
 CBC_CommonDecoderResult::CBC_CommonDecoderResult()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_CommonDecoderResult.h b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
index 808203bd01..808203bd01 100644
--- a/xfa/src/fxbarcode/src/include/BC_CommonDecoderResult.h
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.h
diff --git a/xfa/src/fxbarcode/src/BC_CommonECI.cpp b/xfa/src/fxbarcode/common/BC_CommonECI.cpp
index e6ade95024..5aa64095f7 100644
--- a/xfa/src/fxbarcode/src/BC_CommonECI.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonECI.h"
-#include "include/BC_CommonCharacterSetECI.h"
+#include "../barcode.h"
+#include "BC_CommonECI.h"
+#include "BC_CommonCharacterSetECI.h"
 CBC_CommonECI::CBC_CommonECI(FX_INT32 value)
 {
     m_value = value;
diff --git a/xfa/src/fxbarcode/src/include/BC_CommonECI.h b/xfa/src/fxbarcode/common/BC_CommonECI.h
index 3907066066..3907066066 100644
--- a/xfa/src/fxbarcode/src/include/BC_CommonECI.h
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.h
diff --git a/xfa/src/fxbarcode/src/BC_CommonPerspectiveTransform.cpp b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
index 76aead4c1c..cb59d99cdf 100644
--- a/xfa/src/fxbarcode/src/BC_CommonPerspectiveTransform.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonPerspectiveTransform.h"
+#include "../barcode.h"
+#include "BC_CommonPerspectiveTransform.h"
 CBC_CommonPerspectiveTransform::CBC_CommonPerspectiveTransform(FX_FLOAT a11, FX_FLOAT a21, FX_FLOAT a31,
         FX_FLOAT a12, FX_FLOAT a22, FX_FLOAT a32,
         FX_FLOAT a13, FX_FLOAT a23, FX_FLOAT a33) :
diff --git a/xfa/src/fxbarcode/src/include/BC_CommonPerspectiveTransform.h b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
index 5c42a1a6a7..5c42a1a6a7 100644
--- a/xfa/src/fxbarcode/src/include/BC_CommonPerspectiveTransform.h
+++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h
diff --git a/xfa/src/fxbarcode/src/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
index 78615734d6..7ef1671d98 100644
--- a/xfa/src/fxbarcode/src/BC_GlobalHistogramBinarizer.cpp
+++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Binarizer.h"
-#include "include/BC_LuminanceSource.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_GlobalHistogramBinarizer.h"
+#include "../barcode.h"
+#include "../BC_Binarizer.h"
+#include "../BC_LuminanceSource.h"
+#include "BC_CommonBitMatrix.h"
+#include "BC_CommonBitArray.h"
+#include "BC_GlobalHistogramBinarizer.h"
 const FX_INT32 LUMINANCE_BITS = 5;
 const FX_INT32 LUMINANCE_SHIFT = 8 - LUMINANCE_BITS;
 const FX_INT32 LUMINANCE_BUCKETS = 1 << LUMINANCE_BITS;
diff --git a/xfa/src/fxbarcode/src/include/BC_GlobalHistogramBinarizer.h b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
index ef084c075e..ef084c075e 100644
--- a/xfa/src/fxbarcode/src/include/BC_GlobalHistogramBinarizer.h
+++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h
diff --git a/xfa/src/fxbarcode/src/BC_WhiteRectangleDetector.cpp b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
index 38fa5e9477..8bc93136ca 100644
--- a/xfa/src/fxbarcode/src/BC_WhiteRectangleDetector.cpp
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_WhiteRectangleDetector.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_ResultPoint.h"
+#include "../barcode.h"
+#include "BC_WhiteRectangleDetector.h"
+#include "BC_CommonBitMatrix.h"
+#include "../BC_ResultPoint.h"
 const FX_INT32 CBC_WhiteRectangleDetector::INIT_SIZE = 30;
 const FX_INT32 CBC_WhiteRectangleDetector::CORR = 1;
 CBC_WhiteRectangleDetector::CBC_WhiteRectangleDetector(CBC_CommonBitMatrix *image)
diff --git a/xfa/src/fxbarcode/src/include/BC_WhiteRectangleDetector.h b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
index 83d91ced92..83d91ced92 100644
--- a/xfa/src/fxbarcode/src/include/BC_WhiteRectangleDetector.h
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h
diff --git a/xfa/src/fxbarcode/src/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
index 588f978de5..1fc8b6685a 100644
--- a/xfa/src/fxbarcode/src/BC_ReedSolomon.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ReedSolomonGF256.h"
-#include "include/BC_ReedSolomonGF256Poly.h"
-#include "include/BC_ReedSolomon.h"
+#include "../../barcode.h"
+#include "BC_ReedSolomonGF256.h"
+#include "BC_ReedSolomonGF256Poly.h"
+#include "BC_ReedSolomon.h"
 CBC_ReedSolomonEncoder::CBC_ReedSolomonEncoder(CBC_ReedSolomonGF256* field)
 {
     m_field = field;
diff --git a/xfa/src/fxbarcode/src/include/BC_ReedSolomon.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
index 2950b8f315..2950b8f315 100644
--- a/xfa/src/fxbarcode/src/include/BC_ReedSolomon.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h
diff --git a/xfa/src/fxbarcode/src/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
index da61616087..3cb5e7762f 100644
--- a/xfa/src/fxbarcode/src/BC_ReedSolomonDecoder.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ReedSolomonGF256.h"
-#include "include/BC_ReedSolomonGF256Poly.h"
-#include "include/BC_ReedSolomonDecoder.h"
+#include "../../barcode.h"
+#include "BC_ReedSolomonGF256.h"
+#include "BC_ReedSolomonGF256Poly.h"
+#include "BC_ReedSolomonDecoder.h"
 CBC_ReedSolomonDecoder::CBC_ReedSolomonDecoder(CBC_ReedSolomonGF256* field)
 {
     m_field = field;
diff --git a/xfa/src/fxbarcode/src/include/BC_ReedSolomonDecoder.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
index c1dd0f03f5..c1dd0f03f5 100644
--- a/xfa/src/fxbarcode/src/include/BC_ReedSolomonDecoder.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h
diff --git a/xfa/src/fxbarcode/src/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
index 7fb8a9e7df..bb045ac24c 100644
--- a/xfa/src/fxbarcode/src/BC_ReedSolomonGF256.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ReedSolomonGF256Poly.h"
-#include "include/BC_ReedSolomonGF256.h"
+#include "../../barcode.h"
+#include "BC_ReedSolomonGF256Poly.h"
+#include "BC_ReedSolomonGF256.h"
 CBC_ReedSolomonGF256 *CBC_ReedSolomonGF256::QRCodeFild = NULL;
 CBC_ReedSolomonGF256 *CBC_ReedSolomonGF256::DataMatrixField = NULL;
 void CBC_ReedSolomonGF256::Initialize()
diff --git a/xfa/src/fxbarcode/src/include/BC_ReedSolomonGF256.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
index 1687b95e09..1687b95e09 100644
--- a/xfa/src/fxbarcode/src/include/BC_ReedSolomonGF256.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h
diff --git a/xfa/src/fxbarcode/src/BC_ReedSolomonGF256Poly.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
index 6c8edb7897..6476e4cf80 100644
--- a/xfa/src/fxbarcode/src/BC_ReedSolomonGF256Poly.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ReedSolomonGF256.h"
-#include "include/BC_ReedSolomonGF256Poly.h"
+#include "../../barcode.h"
+#include "BC_ReedSolomonGF256.h"
+#include "BC_ReedSolomonGF256Poly.h"
 CBC_ReedSolomonGF256Poly::CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field, FX_INT32 coefficients)
 {
     if(field == NULL) {
diff --git a/xfa/src/fxbarcode/src/include/BC_ReedSolomonGF256Poly.h b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
index a6db24e231..a6db24e231 100644
--- a/xfa/src/fxbarcode/src/include/BC_ReedSolomonGF256Poly.h
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.h
diff --git a/xfa/src/fxbarcode/src/BC_ASCIIEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
index dabed3699e..bc29b7d6ce 100644
--- a/xfa/src/fxbarcode/src/BC_ASCIIEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_HighLevelEncoder.h"
-#include "include/BC_ASCIIEncoder.h"
+#include "../barcode.h"
+#include "../BC_Dimension.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_EncoderContext.h"
+#include "BC_HighLevelEncoder.h"
+#include "BC_ASCIIEncoder.h"
 CBC_ASCIIEncoder::CBC_ASCIIEncoder()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_ASCIIEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h
index 9a48b8762f..9a48b8762f 100644
--- a/xfa/src/fxbarcode/src/include/BC_ASCIIEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h
diff --git a/xfa/src/fxbarcode/src/BC_Base256Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp
index bb954f2543..d896cf6445 100644
--- a/xfa/src/fxbarcode/src/BC_Base256Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_HighLevelEncoder.h"
-#include "include/BC_Base256Encoder.h"
+#include "../barcode.h"
+#include "../BC_Dimension.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_EncoderContext.h"
+#include "BC_HighLevelEncoder.h"
+#include "BC_Base256Encoder.h"
 CBC_Base256Encoder::CBC_Base256Encoder()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_Base256Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h
index 96110b1d08..96110b1d08 100644
--- a/xfa/src/fxbarcode/src/include/BC_Base256Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h
diff --git a/xfa/src/fxbarcode/src/BC_C40Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
index 685f1d80fd..4c3b458afa 100644
--- a/xfa/src/fxbarcode/src/BC_C40Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_HighLevelEncoder.h"
-#include "include/BC_C40Encoder.h"
+#include "../barcode.h"
+#include "../BC_Dimension.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_EncoderContext.h"
+#include "BC_HighLevelEncoder.h"
+#include "BC_C40Encoder.h"
 CBC_C40Encoder::CBC_C40Encoder()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_C40Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h
index 7f2d2f7e79..7f2d2f7e79 100644
--- a/xfa/src/fxbarcode/src/include/BC_C40Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h
diff --git a/xfa/src/fxbarcode/src/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
index aff6329f19..cfb676b0a7 100644
--- a/xfa/src/fxbarcode/src/BC_DataMatrixBitMatrixParser.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_DataMatrixVersion.h"
-#include "include/BC_DataMatrixBitMatrixParser.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_DataMatrixVersion.h"
+#include "BC_DataMatrixBitMatrixParser.h"
 CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser()
 {
     m_mappingBitMatrix = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_DataMatrixBitMatrixParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
index c5f1f3f7a0..c5f1f3f7a0 100644
--- a/xfa/src/fxbarcode/src/include/BC_DataMatrixBitMatrixParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.h
diff --git a/xfa/src/fxbarcode/src/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
index a30489f4dd..c884834fa9 100644
--- a/xfa/src/fxbarcode/src/BC_DataMatrixDataBlock.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_DataMatrixVersion.h"
-#include "include/BC_DataMatrixDataBlock.h"
+#include "../barcode.h"
+#include "BC_DataMatrixVersion.h"
+#include "BC_DataMatrixDataBlock.h"
 CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_DataMatrixDataBlock.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
index 1dd62fe1fe..1dd62fe1fe 100644
--- a/xfa/src/fxbarcode/src/include/BC_DataMatrixDataBlock.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.h
diff --git a/xfa/src/fxbarcode/src/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
index 89a72bd72e..e934d9313d 100644
--- a/xfa/src/fxbarcode/src/BC_DataMatrixDecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_DataMatrixDecodedBitStreamParser.h"
-#include "include/BC_CommonDecoderResult.h"
-#include "include/BC_CommonBitSource.h"
+#include "../barcode.h"
+#include "../common/BC_CommonDecoderResult.h"
+#include "../common/BC_CommonBitSource.h"
+#include "BC_DataMatrixDecodedBitStreamParser.h"
 const FX_CHAR CBC_DataMatrixDecodedBitStreamParser::C40_BASIC_SET_CHARS[] = {
     '*', '*', '*', ' ', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
     'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N',
diff --git a/xfa/src/fxbarcode/src/include/BC_DataMatrixDecodedBitStreamParser.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
index 060972d53a..060972d53a 100644
--- a/xfa/src/fxbarcode/src/include/BC_DataMatrixDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.h
diff --git a/xfa/src/fxbarcode/src/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
index 80f99332c1..e9eb32cf84 100644
--- a/xfa/src/fxbarcode/src/BC_DataMatrixDecoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_DataMatrixDecoder.h"
-#include "include/BC_ReedSolomonDecoder.h"
-#include "include/BC_ReedSolomonGF256.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_DataMatrixBitMatrixParser.h"
-#include "include/BC_DataMatrixVersion.h"
-#include "include/BC_DataMatrixDataBlock.h"
-#include "include/BC_DataMatrixDecodedBitStreamParser.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../common/reedsolomon/BC_ReedSolomonDecoder.h"
+#include "../common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "BC_DataMatrixDecoder.h"
+#include "BC_DataMatrixBitMatrixParser.h"
+#include "BC_DataMatrixVersion.h"
+#include "BC_DataMatrixDataBlock.h"
+#include "BC_DataMatrixDecodedBitStreamParser.h"
 CBC_DataMatrixDecoder::CBC_DataMatrixDecoder()
 {
     m_rsDecoder = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_DataMatrixDecoder.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
index 44f7efc7b7..44f7efc7b7 100644
--- a/xfa/src/fxbarcode/src/include/BC_DataMatrixDecoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.h
diff --git a/xfa/src/fxbarcode/src/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
index ff956f8e95..12877c5c3a 100644
--- a/xfa/src/fxbarcode/src/BC_DataMatrixDetector.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_DataMatrixDetector.h"
-#include "include/BC_WhiteRectangleDetector.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_QRFinderPatternFinder.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_QRDetectorResult.h"
-#include "include/BC_QRGridSampler.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "../common/BC_WhiteRectangleDetector.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../qrcode/BC_QRFinderPatternFinder.h"
+#include "../qrcode/BC_QRDetectorResult.h"
+#include "../qrcode/BC_QRGridSampler.h"
+#include "BC_DataMatrixDetector.h"
 const FX_INT32 CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4};
 CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix *image):
     m_image(image), m_rectangleDetector(NULL)
diff --git a/xfa/src/fxbarcode/src/include/BC_DataMatrixDetector.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
index 2d3ca744fe..2d3ca744fe 100644
--- a/xfa/src/fxbarcode/src/include/BC_DataMatrixDetector.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.h
diff --git a/xfa/src/fxbarcode/src/BC_DataMatrixReader.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
index cbea2c42a3..cf076cd313 100644
--- a/xfa/src/fxbarcode/src/BC_DataMatrixReader.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_DataMatrixDecoder.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_DataMatrixDetector.h"
-#include "include/BC_QRDetectorResult.h"
-#include "include/BC_CommonDecoderResult.h"
-#include "include/BC_Reader.h"
-#include "include/BC_DataMatrixReader.h"
+#include "../barcode.h"
+#include "../BC_BinaryBitmap.h"
+#include "../BC_Reader.h"
+#include "../qrcode/BC_QRDetectorResult.h"
+#include "../common/BC_CommonDecoderResult.h"
+#include "BC_DataMatrixDecoder.h"
+#include "BC_DataMatrixDetector.h"
+#include "BC_DataMatrixReader.h"
 CBC_DataMatrixReader::CBC_DataMatrixReader()
 {
     m_decoder = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_DataMatrixReader.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h
index 4301512d70..4301512d70 100644
--- a/xfa/src/fxbarcode/src/include/BC_DataMatrixReader.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h
diff --git a/xfa/src/fxbarcode/src/BC_DataMatrixSymbolInfo144.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
index 41a6839b5b..256117883d 100644
--- a/xfa/src/fxbarcode/src/BC_DataMatrixSymbolInfo144.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_DataMatrixSymbolInfo144.h"
+#include "../barcode.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_DataMatrixSymbolInfo144.h"
 CBC_DataMatrixSymbolInfo144::CBC_DataMatrixSymbolInfo144() : CBC_SymbolInfo(FALSE, 1558, 620, 22, 22, 36)
 {
     m_rsBlockData = -1;
diff --git a/xfa/src/fxbarcode/src/include/BC_DataMatrixSymbolInfo144.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
index e749b27d86..e749b27d86 100644
--- a/xfa/src/fxbarcode/src/include/BC_DataMatrixSymbolInfo144.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h
diff --git a/xfa/src/fxbarcode/src/BC_DataMatrixVersion.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
index 4d0bce331e..1a4e59864e 100644
--- a/xfa/src/fxbarcode/src/BC_DataMatrixVersion.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_DataMatrixVersion.h"
+#include "../barcode.h"
+#include "BC_DataMatrixVersion.h"
 CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL;
 void CBC_DataMatrixVersion::Initialize()
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_DataMatrixVersion.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
index 41d2f23db6..41d2f23db6 100644
--- a/xfa/src/fxbarcode/src/include/BC_DataMatrixVersion.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h
diff --git a/xfa/src/fxbarcode/src/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
index a6cf63e3cc..652758a635 100644
--- a/xfa/src/fxbarcode/src/BC_DataMatrixWriter.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
@@ -20,29 +20,29 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Writer.h"
-#include "include/BC_TwoDimWriter.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_DefaultPlacement.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_DataMatrixSymbolInfo144.h"
-#include "include/BC_ErrorCorrection.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_C40Encoder.h"
-#include "include/BC_TextEncoder.h"
-#include "include/BC_X12Encoder.h"
-#include "include/BC_EdifactEncoder.h"
-#include "include/BC_Base256Encoder.h"
-#include "include/BC_ASCIIEncoder.h"
-#include "include/BC_HighLevelEncoder.h"
-#include "include/BC_CommonByteMatrix.h"
-#include "include/BC_DataMatrixWriter.h"
-#include "include/BC_UtilCodingConvert.h"
+#include "../barcode.h"
+#include "../BC_Writer.h"
+#include "../BC_TwoDimWriter.h"
+#include "../BC_Dimension.h"
+#include "../BC_BinaryBitmap.h"
+#include "../BC_UtilCodingConvert.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../common/BC_CommonByteMatrix.h"
+#include "BC_Encoder.h"
+#include "BC_DefaultPlacement.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_DataMatrixSymbolInfo144.h"
+#include "BC_ErrorCorrection.h"
+#include "BC_EncoderContext.h"
+#include "BC_C40Encoder.h"
+#include "BC_TextEncoder.h"
+#include "BC_X12Encoder.h"
+#include "BC_EdifactEncoder.h"
+#include "BC_Base256Encoder.h"
+#include "BC_ASCIIEncoder.h"
+#include "BC_HighLevelEncoder.h"
+#include "BC_DataMatrixWriter.h"
 CBC_DataMatrixWriter::CBC_DataMatrixWriter()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_DataMatrixWriter.h b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h
index c8a6bdd823..c8a6bdd823 100644
--- a/xfa/src/fxbarcode/src/include/BC_DataMatrixWriter.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h
diff --git a/xfa/src/fxbarcode/src/BC_DefaultPlacement.cpp b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
index e62192b5f0..e6bab5a65e 100644
--- a/xfa/src/fxbarcode/src/BC_DefaultPlacement.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_DefaultPlacement.h"
+#include "../barcode.h"
+#include "BC_Encoder.h"
+#include "BC_DefaultPlacement.h"
 CBC_DefaultPlacement::CBC_DefaultPlacement(CFX_WideString codewords, FX_INT32 numcols, FX_INT32 numrows)
 {
     m_codewords = codewords;
diff --git a/xfa/src/fxbarcode/src/include/BC_DefaultPlacement.h b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
index ba2da03408..ba2da03408 100644
--- a/xfa/src/fxbarcode/src/include/BC_DefaultPlacement.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h
diff --git a/xfa/src/fxbarcode/src/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
index 2a6d56adb9..d1e84af73e 100644
--- a/xfa/src/fxbarcode/src/BC_EdifactEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_HighLevelEncoder.h"
-#include "include/BC_EdifactEncoder.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../BC_Dimension.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_EncoderContext.h"
+#include "BC_HighLevelEncoder.h"
+#include "BC_EdifactEncoder.h"
 CBC_EdifactEncoder::CBC_EdifactEncoder()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_EdifactEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h
index 7e2453a71d..7e2453a71d 100644
--- a/xfa/src/fxbarcode/src/include/BC_EdifactEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h
diff --git a/xfa/src/fxbarcode/src/BC_Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp
index f9b224e68e..acae555afe 100644
--- a/xfa/src/fxbarcode/src/BC_Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
+#include "../barcode.h"
+#include "BC_Encoder.h"
 CBC_Encoder::CBC_Encoder()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
index 10ac8763e5..10ac8763e5 100644
--- a/xfa/src/fxbarcode/src/include/BC_Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.h
diff --git a/xfa/src/fxbarcode/src/BC_EncoderContext.cpp b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp
index 4b1bf0ea62..f65c9f29bc 100644
--- a/xfa/src/fxbarcode/src/BC_EncoderContext.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_UtilCodingConvert.h"
+#include "../barcode.h"
+#include "../BC_Dimension.h"
+#include "../BC_UtilCodingConvert.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_EncoderContext.h"
 CBC_EncoderContext::CBC_EncoderContext(const CFX_WideString msg, CFX_WideString ecLevel, FX_INT32 &e)
 {
     CFX_ByteString dststr;
diff --git a/xfa/src/fxbarcode/src/include/BC_EncoderContext.h b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h
index 0099dbc9f0..0099dbc9f0 100644
--- a/xfa/src/fxbarcode/src/include/BC_EncoderContext.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h
diff --git a/xfa/src/fxbarcode/src/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
index 16f5c1184e..f346072499 100644
--- a/xfa/src/fxbarcode/src/BC_ErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_ErrorCorrection.h"
+#include "../barcode.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_ErrorCorrection.h"
 FX_INT32 CBC_ErrorCorrection::FACTOR_SETS[] = {5, 7, 10, 11, 12, 14, 18, 20, 24, 28, 36, 42, 48, 56, 62, 68};
 FX_INT32 CBC_ErrorCorrection::FACTORS[][100] = {
     {228, 48, 15, 111, 62},
diff --git a/xfa/src/fxbarcode/src/include/BC_ErrorCorrection.h b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
index 973ff33b8e..973ff33b8e 100644
--- a/xfa/src/fxbarcode/src/include/BC_ErrorCorrection.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h
diff --git a/xfa/src/fxbarcode/src/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
index cfa953df98..5b46612d62 100644
--- a/xfa/src/fxbarcode/src/BC_HighLevelEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
@@ -20,21 +20,21 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_C40Encoder.h"
-#include "include/BC_TextEncoder.h"
-#include "include/BC_X12Encoder.h"
-#include "include/BC_EdifactEncoder.h"
-#include "include/BC_Base256Encoder.h"
-#include "include/BC_ASCIIEncoder.h"
-#include "include/BC_HighLevelEncoder.h"
-#include "include/BC_UtilCodingConvert.h"
+#include "../barcode.h"
+#include "../BC_Dimension.h"
+#include "../BC_UtilCodingConvert.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_EncoderContext.h"
+#include "BC_C40Encoder.h"
+#include "BC_TextEncoder.h"
+#include "BC_X12Encoder.h"
+#include "BC_EdifactEncoder.h"
+#include "BC_Base256Encoder.h"
+#include "BC_ASCIIEncoder.h"
+#include "BC_HighLevelEncoder.h"
 #define  Integer_MAX_VALUE   2147483647
 FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_C40 = 230;
 FX_WCHAR CBC_HighLevelEncoder::LATCH_TO_BASE256 = 231;
diff --git a/xfa/src/fxbarcode/src/include/BC_HighLevelEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
index 170ca9f8fa..170ca9f8fa 100644
--- a/xfa/src/fxbarcode/src/include/BC_HighLevelEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h
diff --git a/xfa/src/fxbarcode/src/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
index f079528c76..415cbd6b3c 100644
--- a/xfa/src/fxbarcode/src/BC_SymbolInfo.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_DataMatrixSymbolInfo144.h"
+#include "../barcode.h"
+#include "../BC_Dimension.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_DataMatrixSymbolInfo144.h"
 #define  SYMBOLS_COUNT  30
 CBC_SymbolInfo* CBC_SymbolInfo::m_PROD_SYMBOLS[30] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
 CBC_SymbolInfo* CBC_SymbolInfo::m_symbols[30] = {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL};
diff --git a/xfa/src/fxbarcode/src/include/BC_SymbolInfo.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
index 0450a28725..0450a28725 100644
--- a/xfa/src/fxbarcode/src/include/BC_SymbolInfo.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h
diff --git a/xfa/src/fxbarcode/src/BC_SymbolShapeHint.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
index aa3694d9e2..b7b477539c 100644
--- a/xfa/src/fxbarcode/src/BC_SymbolShapeHint.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_SymbolShapeHint.h"
+#include "../barcode.h"
+#include "BC_SymbolShapeHint.h"
 CBC_SymbolShapeHint::CBC_SymbolShapeHint()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_SymbolShapeHint.h b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
index 2b030012a3..2b030012a3 100644
--- a/xfa/src/fxbarcode/src/include/BC_SymbolShapeHint.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h
diff --git a/xfa/src/fxbarcode/src/BC_TextEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
index c8da30482b..45abec4d4a 100644
--- a/xfa/src/fxbarcode/src/BC_TextEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
@@ -20,16 +20,16 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_HighLevelEncoder.h"
-#include "include/BC_C40Encoder.h"
-#include "include/BC_TextEncoder.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../BC_Dimension.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_EncoderContext.h"
+#include "BC_HighLevelEncoder.h"
+#include "BC_C40Encoder.h"
+#include "BC_TextEncoder.h"
 CBC_TextEncoder::CBC_TextEncoder()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_TextEncoder.h b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h
index f1168679a6..f1168679a6 100644
--- a/xfa/src/fxbarcode/src/include/BC_TextEncoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h
diff --git a/xfa/src/fxbarcode/src/BC_X12Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp
index 1b600387c1..f6263f6777 100644
--- a/xfa/src/fxbarcode/src/BC_X12Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp
@@ -20,16 +20,16 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_HighLevelEncoder.h"
-#include "include/BC_C40Encoder.h"
-#include "include/BC_X12Encoder.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../BC_Dimension.h"
+#include "BC_Encoder.h"
+#include "BC_SymbolShapeHint.h"
+#include "BC_SymbolInfo.h"
+#include "BC_EncoderContext.h"
+#include "BC_HighLevelEncoder.h"
+#include "BC_C40Encoder.h"
+#include "BC_X12Encoder.h"
 CBC_X12Encoder::CBC_X12Encoder()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_X12Encoder.h b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h
index 21111bc5cc..21111bc5cc 100644
--- a/xfa/src/fxbarcode/src/include/BC_X12Encoder.h
+++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h
diff --git a/xfa/src/fxbarcode/src/BC_OneDReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
index c26e4fd253..1079c348d0 100644
--- a/xfa/src/fxbarcode/src/BC_OneDReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_CommonBitArray.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "../BC_BinaryBitmap.h"
+#include "../common/BC_CommonBitArray.h"
+#include "BC_OneDReader.h"
 const FX_INT32 CBC_OneDReader::INTEGER_MATH_SHIFT = 8;
 const FX_INT32 CBC_OneDReader::PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << 8;
 CBC_OneDReader::CBC_OneDReader()
diff --git a/xfa/src/fxbarcode/src/include/BC_OneDReader.h b/xfa/src/fxbarcode/oned/BC_OneDReader.h
index 8645c9edf9..8645c9edf9 100644
--- a/xfa/src/fxbarcode/src/include/BC_OneDReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDReader.h
diff --git a/xfa/src/fxbarcode/src/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
index 9855244f42..f1db94a6a1 100644
--- a/xfa/src/fxbarcode/src/BC_OneDimReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_OneDimReader.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonBitArray.h"
+#include "BC_OneDReader.h"
+#include "BC_OneDimReader.h"
 const FX_INT32 CBC_OneDimReader::MAX_AVG_VARIANCE = (FX_INT32)(256 * 0.48f);
 const FX_INT32 CBC_OneDimReader::MAX_INDIVIDUAL_VARIANCE = (FX_INT32)(256 * 0.7f);
 const FX_INT32 CBC_OneDimReader::START_END_PATTERN[3] = {1, 1, 1};
diff --git a/xfa/src/fxbarcode/src/include/BC_OneDimReader.h b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
index bb10060ba3..bb10060ba3 100644
--- a/xfa/src/fxbarcode/src/include/BC_OneDimReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.h
diff --git a/xfa/src/fxbarcode/src/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
index b71ec79bcc..25f3fa5f6c 100644
--- a/xfa/src/fxbarcode/src/BC_OneDimWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Writer.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_OneDimWriter.h"
+#include "../barcode.h"
+#include "../BC_Writer.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_OneDimWriter.h"
 CBC_OneDimWriter::CBC_OneDimWriter()
 {
     m_locTextLoc			= BC_TEXT_LOC_BELOWEMBED;
diff --git a/xfa/src/fxbarcode/src/include/BC_OneDimWriter.h b/xfa/src/fxbarcode/oned/BC_OneDimWriter.h
index cd5d937aca..cd5d937aca 100644
--- a/xfa/src/fxbarcode/src/include/BC_OneDimWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
index abe0dfb94e..5d94d7ac06 100644
--- a/xfa/src/fxbarcode/src/BC_OnedCodaBarReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_OnedCode39Reader.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_OnedCodaBarReader.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonBitArray.h"
+#include "../oned/BC_OneDReader.h"
+#include "../oned/BC_OnedCode39Reader.h"
+#include "../oned/BC_OnedCodaBarReader.h"
 FX_LPCSTR CBC_OnedCodaBarReader::ALPHABET_STRING = "0123456789-$:/.+ABCDTN";
 const FX_INT32 CBC_OnedCodaBarReader::CHARACTER_ENCODINGS[22] = {
     0x003, 0x006, 0x009, 0x060, 0x012, 0x042, 0x021, 0x024, 0x030, 0x048,
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedCodaBarReader.h b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
index 1d03491841..1d03491841 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedCodaBarReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedCodaBarWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
index 08eac25b79..059d2d7df5 100644
--- a/xfa/src/fxbarcode/src/BC_OnedCodaBarWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Writer.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_OneDimWriter.h"
-#include "include/BC_OnedCodaBarReader.h"
-#include "include/BC_OnedCodaBarWriter.h"
-#include "include/BC_CommonBitMatrix.h"
+#include "../barcode.h"
+#include "../BC_Writer.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../common/BC_CommonBitArray.h"
+#include "BC_OneDReader.h"
+#include "BC_OneDimWriter.h"
+#include "BC_OnedCodaBarReader.h"
+#include "BC_OnedCodaBarWriter.h"
 const FX_CHAR CBC_OnedCodaBarWriter::START_END_CHARS[] = {'A', 'B', 'C', 'D', 'T', 'N', '*', 'E', 'a', 'b', 'c', 'd', 't', 'n', 'e'};
 const FX_CHAR CBC_OnedCodaBarWriter::CONTENT_CHARS[] = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '$', '/', ':', '+', '.'};
 CBC_OnedCodaBarWriter::CBC_OnedCodaBarWriter()
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedCodaBarWriter.h b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h
index b81839ca4a..b81839ca4a 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedCodaBarWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
index 805bd985c0..9dd9f629cf 100644
--- a/xfa/src/fxbarcode/src/BC_OnedCode128Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_OnedCode128Reader.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonBitArray.h"
+#include "BC_OneDReader.h"
+#include "BC_OnedCode128Reader.h"
 const FX_INT32 CBC_OnedCode128Reader::CODE_PATTERNS[107][7] =  {
     {2, 1, 2, 2, 2, 2, 0},
     {2, 2, 2, 1, 2, 2, 0},
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedCode128Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
index 94e1a6388b..94e1a6388b 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedCode128Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedCode128Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp
index 146f61186e..6dd3cbe8a5 100644
--- a/xfa/src/fxbarcode/src/BC_OnedCode128Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Writer.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_OneDimWriter.h"
-#include "include/BC_OnedCode128Reader.h"
-#include "include/BC_OnedCode128Writer.h"
+#include "../barcode.h"
+#include "../BC_Writer.h"
+#include "../BC_Reader.h"
+#include "BC_OneDReader.h"
+#include "BC_OneDimWriter.h"
+#include "BC_OnedCode128Reader.h"
+#include "BC_OnedCode128Writer.h"
 const FX_INT32 CBC_OnedCode128Writer::CODE_CODE_B = 100;
 const FX_INT32 CBC_OnedCode128Writer::CODE_CODE_C = 99;
 const FX_INT32 CBC_OnedCode128Writer::CODE_START_B = 104;
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedCode128Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
index daa48eca51..daa48eca51 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedCode128Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
index 95b1785fef..b19343943b 100644
--- a/xfa/src/fxbarcode/src/BC_OnedCode39Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_OnedCode39Reader.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonBitArray.h"
+#include "BC_OneDReader.h"
+#include "BC_OnedCode39Reader.h"
 FX_LPCSTR CBC_OnedCode39Reader::ALPHABET_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. *$/+%";
 FX_LPCSTR CBC_OnedCode39Reader::CHECKSUM_STRING = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ-. $/+%";
 const FX_INT32 CBC_OnedCode39Reader::CHARACTER_ENCODINGS[44] = {
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedCode39Reader.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
index 81fd6b79e9..81fd6b79e9 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedCode39Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedCode39Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp
index 5ebbd7380f..d9c77460ac 100644
--- a/xfa/src/fxbarcode/src/BC_OnedCode39Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Writer.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_OneDimWriter.h"
-#include "include/BC_OnedCode39Reader.h"
-#include "include/BC_OnedCode39Writer.h"
-#include "include/BC_CommonBitMatrix.h"
+#include "../barcode.h"
+#include "../BC_Writer.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_OneDReader.h"
+#include "BC_OneDimWriter.h"
+#include "BC_OnedCode39Reader.h"
+#include "BC_OnedCode39Writer.h"
 CBC_OnedCode39Writer::CBC_OnedCode39Writer()
 {
     m_extendedMode = FALSE;
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedCode39Writer.h b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
index b37d9d8e19..b37d9d8e19 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedCode39Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedEAN13Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp
index 36c62e3c76..ddce736bb8 100644
--- a/xfa/src/fxbarcode/src/BC_OnedEAN13Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_OneDimReader.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_OnedEAN13Reader.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonBitArray.h"
+#include "BC_OneDReader.h"
+#include "BC_OneDimReader.h"
+#include "BC_OnedEAN13Reader.h"
 const FX_INT32 CBC_OnedEAN13Reader::FIRST_DIGIT_ENCODINGS[10] = {
     0x00, 0x0B, 0x0D, 0xE, 0x13, 0x19, 0x1C, 0x15, 0x16, 0x1A
 };
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedEAN13Reader.h b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h
index 9afb9b6418..9afb9b6418 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedEAN13Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index 5f349ea31b..788cd8f7da 100644
--- a/xfa/src/fxbarcode/src/BC_OnedEAN13Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Writer.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_OneDimReader.h"
-#include "include/BC_OneDimWriter.h"
-#include "include/BC_OnedEAN13Reader.h"
-#include "include/BC_OnedEAN13Writer.h"
+#include "../barcode.h"
+#include "../BC_Writer.h"
+#include "../BC_Reader.h"
+#include "BC_OneDReader.h"
+#include "BC_OneDimReader.h"
+#include "BC_OneDimWriter.h"
+#include "BC_OnedEAN13Reader.h"
+#include "BC_OnedEAN13Writer.h"
 CBC_OnedEAN13Writer::CBC_OnedEAN13Writer()
 {
     m_bLeftPadding = TRUE;
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedEAN13Writer.h b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h
index 2353cfda95..2353cfda95 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedEAN13Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedEAN8Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp
index 19c10bab50..48e24681df 100644
--- a/xfa/src/fxbarcode/src/BC_OnedEAN8Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_OneDimReader.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_OnedEAN8Reader.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonBitArray.h"
+#include "BC_OneDReader.h"
+#include "BC_OneDimReader.h"
+#include "BC_OnedEAN8Reader.h"
 CBC_OnedEAN8Reader::CBC_OnedEAN8Reader()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedEAN8Reader.h b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h
index a32bb63083..a32bb63083 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedEAN8Reader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedEAN8Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index 2bb50ba588..19f7f7cede 100644
--- a/xfa/src/fxbarcode/src/BC_OnedEAN8Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Writer.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_OneDimWriter.h"
-#include "include/BC_OneDimReader.h"
-#include "include/BC_OnedEAN8Writer.h"
-#include "include/BC_CommonBitMatrix.h"
+#include "../barcode.h"
+#include "../BC_Writer.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_OneDReader.h"
+#include "BC_OneDimWriter.h"
+#include "BC_OneDimReader.h"
+#include "BC_OnedEAN8Writer.h"
 CBC_OnedEAN8Writer::CBC_OnedEAN8Writer()
 {
     m_iDataLenth = 8;
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedEAN8Writer.h b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h
index 2b55734538..2b55734538 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedEAN8Writer.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedUPCAReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
index b5362496aa..44c26acf7e 100644
--- a/xfa/src/fxbarcode/src/BC_OnedUPCAReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
@@ -21,12 +21,12 @@
  */
 
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_OneDimReader.h"
-#include "include/BC_OnedEAN13Reader.h"
-#include "include/BC_OnedUPCAReader.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "BC_OneDReader.h"
+#include "BC_OneDimReader.h"
+#include "BC_OnedEAN13Reader.h"
+#include "BC_OnedUPCAReader.h"
 CBC_OnedUPCAReader::CBC_OnedUPCAReader()
 {
     m_ean13Reader = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedUPCAReader.h b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h
index 5df6c739ff..5df6c739ff 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedUPCAReader.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h
diff --git a/xfa/src/fxbarcode/src/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index bd7b4668a7..612c031c02 100644
--- a/xfa/src/fxbarcode/src/BC_OnedUPCAWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Writer.h"
-#include "include/BC_OneDimWriter.h"
-#include "include/BC_OnedEAN13Writer.h"
-#include "include/BC_OnedUPCAWriter.h"
+#include "../barcode.h"
+#include "../BC_Writer.h"
+#include "BC_OneDimWriter.h"
+#include "BC_OnedEAN13Writer.h"
+#include "BC_OnedUPCAWriter.h"
 CBC_OnedUPCAWriter::CBC_OnedUPCAWriter()
 {
     m_subWriter = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_OnedUPCAWriter.h b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
index 4174ceb36e..4174ceb36e 100644
--- a/xfa/src/fxbarcode/src/include/BC_OnedUPCAWriter.h
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
index 668835a694..96d3a3b655 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Compaction.h"
-#include "include/BC_PDF417BarcodeRow.h"
-#include "include/BC_PDF417BarcodeMatrix.h"
-#include "include/BC_PDF417ErrorCorrection.h"
-#include "include/BC_PDF417HighLevelEncoder.h"
-#include "include/BC_PDF417.h"
+#include "../barcode.h"
+#include "BC_PDF417Compaction.h"
+#include "BC_PDF417BarcodeRow.h"
+#include "BC_PDF417BarcodeMatrix.h"
+#include "BC_PDF417ErrorCorrection.h"
+#include "BC_PDF417HighLevelEncoder.h"
+#include "BC_PDF417.h"
 FX_INT32 CBC_PDF417::START_PATTERN = 0x1fea8;
 FX_INT32 CBC_PDF417::STOP_PATTERN = 0x3fa29;
 FX_INT32 CBC_PDF417::CODEWORD_TABLE[][1000] = {
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417.h b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
index ab31244add..ab31244add 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index 342d1ec2b2..e45562ba79 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417BarcodeMatrix.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417BarcodeRow.h"
-#include "include/BC_PDF417BarcodeMatrix.h"
+#include "../barcode.h"
+#include "BC_PDF417BarcodeRow.h"
+#include "BC_PDF417BarcodeMatrix.h"
 CBC_BarcodeMatrix::CBC_BarcodeMatrix(FX_INT32 height, FX_INT32 width)
 {
     m_matrix.SetSize(height + 2);
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417BarcodeMatrix.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
index d8a0c5d0ae..d8a0c5d0ae 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417BarcodeMatrix.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417BarcodeMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
index 50f3a1e2c2..456c0e6f2e 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417BarcodeMetadata.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417BarcodeMetadata.h"
+#include "../barcode.h"
+#include "BC_PDF417BarcodeMetadata.h"
 CBC_BarcodeMetadata::CBC_BarcodeMetadata(FX_INT32 columnCount, FX_INT32 rowCountUpperPart, FX_INT32 rowCountLowerPart, FX_INT32 errorCorrectionLevel)
 {
     m_columnCount = columnCount;
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417BarcodeMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
index 62b1282827..62b1282827 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417BarcodeMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417BarcodeRow.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
index eec89010ab..02bc0f5574 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417BarcodeRow.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417BarcodeRow.h"
+#include "../barcode.h"
+#include "BC_PDF417BarcodeRow.h"
 CBC_BarcodeRow::CBC_BarcodeRow(FX_INT32 width)
 {
     m_row.SetSize(width);
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417BarcodeRow.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
index 75fd15b653..75fd15b653 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417BarcodeRow.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
index d861365b17..446ef58a48 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417BarcodeValue.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417BarcodeValue.h"
+#include "../barcode.h"
+#include "BC_PDF417Common.h"
+#include "BC_PDF417BarcodeValue.h"
 CBC_BarcodeValue::CBC_BarcodeValue()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417BarcodeValue.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
index 1695c8ac5a..1695c8ac5a 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417BarcodeValue.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
index be3f3277e3..55f4cb4510 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417BoundingBox.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_PDF417BoundingBox.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_PDF417BoundingBox.h"
 CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image, CBC_ResultPoint* topLeft, CBC_ResultPoint* bottomLeft, CBC_ResultPoint* topRight, CBC_ResultPoint* bottomRight, FX_INT32 &e)
 {
     if ((topLeft == NULL && topRight == NULL) ||
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417BoundingBox.h b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
index efae2b706f..efae2b706f 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417BoundingBox.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417Codeword.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
index 529e41f432..9ac65ab7bc 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417Codeword.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Codeword.h"
+#include "../barcode.h"
+#include "BC_PDF417Codeword.h"
 FX_INT32 CBC_Codeword::BARCODE_ROW_UNKNOWN = -1;
 CBC_Codeword::CBC_Codeword(FX_INT32 startX, FX_INT32 endX, FX_INT32 bucket, FX_INT32 cvalue)
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417Codeword.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
index 93b3cf6bb3..93b3cf6bb3 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417Codeword.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
index ca458210f4..bf16bc25e0 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417CodewordDecoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417CodewordDecoder.h"
+#include "../barcode.h"
+#include "BC_PDF417Common.h"
+#include "BC_PDF417CodewordDecoder.h"
 #define     SYMBOL_TABLE_Length       2787
 #define     Float_MAX_VALUE           2147483647
 FX_FLOAT CBC_PDF417CodewordDecoder::RATIOS_TABLE[2787][8] = {0};
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417CodewordDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
index da22683bfa..da22683bfa 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417CodewordDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417Common.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
index f195e4b4ef..1f192e63a7 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417Common.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Common.h"
+#include "../barcode.h"
+#include "BC_PDF417Common.h"
 FX_INT32 CBC_PDF417Common::NUMBER_OF_CODEWORDS = 929;
 FX_INT32 CBC_PDF417Common::MAX_CODEWORDS_IN_BARCODE = NUMBER_OF_CODEWORDS - 1;
 FX_INT32 CBC_PDF417Common::MIN_ROWS_IN_BARCODE = 3;
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417Common.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
index 19e3fe57da..19e3fe57da 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417Common.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417Compaction.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
index 1ff93dd55c..6ad8c1321f 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417Compaction.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Compaction.h"
+#include "../barcode.h"
+#include "BC_PDF417Compaction.h"
 CBC_Compaction::CBC_Compaction()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417Compaction.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
index 774a23fbdf..774a23fbdf 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417Compaction.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
index e3583bcddc..ae26057c3e 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417DecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
@@ -21,12 +21,12 @@
  */
 
 #include <stdlib.h>
-#include "barcode.h"
-#include "include/BC_DecoderResult.h"
-#include "include/BC_PDF417ResultMetadata.h"
-#include "include/BC_CommonDecoderResult.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
+#include "../barcode.h"
+#include "../BC_DecoderResult.h"
+#include "../common/BC_CommonDecoderResult.h"
 #include "../../../../third_party/bigint/BigIntegerLibrary.hh"
+#include "BC_PDF417ResultMetadata.h"
+#include "BC_PDF417DecodedBitStreamParser.h"
 #define    TEXT_COMPACTION_MODE_LATCH            900
 #define    BYTE_COMPACTION_MODE_LATCH            901
 #define    NUMERIC_COMPACTION_MODE_LATCH         902
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417DecodedBitStreamParser.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
index 64ae2aee53..64ae2aee53 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417DecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
index e343b4a038..af316f7660 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417DetectionResult.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Codeword.h"
-#include "include/BC_PDF417BarcodeMetadata.h"
-#include "include/BC_PDF417BoundingBox.h"
-#include "include/BC_PDF417DetectionResultColumn.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "include/BC_PDF417DetectionResult.h"
+#include "../barcode.h"
+#include "BC_PDF417Codeword.h"
+#include "BC_PDF417BarcodeMetadata.h"
+#include "BC_PDF417BoundingBox.h"
+#include "BC_PDF417DetectionResultColumn.h"
+#include "BC_PDF417Common.h"
+#include "BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "BC_PDF417DetectionResult.h"
 FX_INT32 CBC_DetectionResult::ADJUST_ROW_NUMBER_SKIP = 2;
 CBC_DetectionResult::CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata, CBC_BoundingBox* boundingBox)
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417DetectionResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
index 9c3401459b..9c3401459b 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417DetectionResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
index 1556194f46..6d949b7640 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417DetectionResultColumn.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Codeword.h"
-#include "include/BC_PDF417BoundingBox.h"
-#include "include/BC_PDF417DetectionResultColumn.h"
+#include "../barcode.h"
+#include "BC_PDF417Codeword.h"
+#include "BC_PDF417BoundingBox.h"
+#include "BC_PDF417DetectionResultColumn.h"
 FX_INT32 CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5;
 CBC_DetectionResultColumn::CBC_DetectionResultColumn(CBC_BoundingBox* boundingBox)
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417DetectionResultColumn.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
index eddc3bce6d..eddc3bce6d 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417DetectionResultColumn.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
index 0ad8b8e527..89e46a74cd 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417DetectionResultRowIndicatorColumn.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_PDF417BarcodeMetadata.h"
-#include "include/BC_PDF417BoundingBox.h"
-#include "include/BC_PDF417Codeword.h"
-#include "include/BC_PDF417BarcodeValue.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417DetectionResultColumn.h"
-#include "include/BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "BC_PDF417BarcodeMetadata.h"
+#include "BC_PDF417BoundingBox.h"
+#include "BC_PDF417Codeword.h"
+#include "BC_PDF417BarcodeValue.h"
+#include "BC_PDF417Common.h"
+#include "BC_PDF417DetectionResultColumn.h"
+#include "BC_PDF417DetectionResultRowIndicatorColumn.h"
 CBC_DetectionResultRowIndicatorColumn::CBC_DetectionResultRowIndicatorColumn(CBC_BoundingBox* boundingBox, FX_BOOL isLeft)
     : CBC_DetectionResultColumn(boundingBox)
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417DetectionResultRowIndicatorColumn.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h
index fbdd0f0ec4..fbdd0f0ec4 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417DetectionResultRowIndicatorColumn.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417Detector.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
index 2c5728e2e7..8d1a86ec92 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417Detector.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_PDF417DetectorResult.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_PDF417Detector.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "../BC_BinaryBitmap.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../common/BC_CommonBitArray.h"
+#include "BC_PDF417DetectorResult.h"
+#include "BC_PDF417Detector.h"
 #define  INTERGER_MAX     2147483647
 FX_INT32 CBC_Detector::INDEXES_START_PATTERN[] = {0, 4, 1, 5};
 FX_INT32 CBC_Detector::INDEXES_STOP_PATTERN[] = {6, 2, 7, 3};
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417Detector.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
index 557559e1f7..557559e1f7 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417Detector.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417DetectorResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
index 8c9aa29b47..e082290011 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417DetectorResult.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_PDF417DetectorResult.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../BC_ResultPoint.h"
+#include "BC_PDF417DetectorResult.h"
 CBC_PDF417DetectorResult::CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits, CFX_PtrArray* points)
 {
     m_bits = bits;
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417DetectorResult.h b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
index ba557f1541..ba557f1541 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417DetectorResult.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417Dimensions.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
index 77ca0c42a1..76d2e7bf88 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417Dimensions.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
@@ -21,8 +21,8 @@
  */
 
 
-#include "barcode.h"
-#include "include/BC_PDF417Dimensions.h"
+#include "../barcode.h"
+#include "BC_PDF417Dimensions.h"
 CBC_Dimensions::CBC_Dimensions(FX_INT32 minCols, FX_INT32 maxCols, FX_INT32 minRows, FX_INT32 maxRows)
 {
     m_minCols = minCols;
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417Dimensions.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
index 6f8eaffed7..6f8eaffed7 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417Dimensions.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
index bdfe27d97c..23207ef959 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417ECErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417ECModulusPoly.h"
-#include "include/BC_PDF417ECModulusGF.h"
-#include "include/BC_PDF417ECErrorCorrection.h"
+#include "../barcode.h"
+#include "BC_PDF417Common.h"
+#include "BC_PDF417ECModulusPoly.h"
+#include "BC_PDF417ECModulusGF.h"
+#include "BC_PDF417ECErrorCorrection.h"
 CBC_PDF417ECModulusGF* CBC_PDF417ECErrorCorrection::m_field = NULL;
 void CBC_PDF417ECErrorCorrection::Initialize(FX_INT32 &e)
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417ECErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
index 4ce8eda7d6..4ce8eda7d6 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417ECErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
index 7d445cb3b4..7619854bcb 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417ECModulusGF.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417ECModulusPoly.h"
-#include "include/BC_PDF417ECModulusGF.h"
+#include "../barcode.h"
+#include "BC_PDF417Common.h"
+#include "BC_PDF417ECModulusPoly.h"
+#include "BC_PDF417ECModulusGF.h"
 CBC_PDF417ECModulusGF* CBC_PDF417ECModulusGF::PDF417_GF = NULL;
 void CBC_PDF417ECModulusGF::Initialize(FX_INT32 &e)
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417ECModulusGF.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
index 7ebe33ecfd..7ebe33ecfd 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417ECModulusGF.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417ECModulusPoly.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
index f484619587..39d3fd8056 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417ECModulusPoly.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417ECModulusGF.h"
-#include "include/BC_PDF417ECModulusPoly.h"
+#include "../barcode.h"
+#include "BC_PDF417Common.h"
+#include "BC_PDF417ECModulusGF.h"
+#include "BC_PDF417ECModulusPoly.h"
 CBC_PDF417ECModulusPoly::CBC_PDF417ECModulusPoly(CBC_PDF417ECModulusGF* field, CFX_Int32Array &coefficients, FX_INT32 &e)
 {
     if (coefficients.GetSize() == 0) {
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417ECModulusPoly.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
index 9a9d6c16f2..9a9d6c16f2 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417ECModulusPoly.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417ErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
index 3f83175e87..cd1ea88046 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417ErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417ErrorCorrection.h"
+#include "../barcode.h"
+#include "BC_PDF417ErrorCorrection.h"
 FX_INT32 CBC_PDF417ErrorCorrection::EC_COEFFICIENTS[][2500] = {
     {27, 917},
     {522, 568, 723, 809},
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417ErrorCorrection.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
index 4e3aee8d26..4e3aee8d26 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417ErrorCorrection.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
index 61051060f6..8ee21ea97e 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417HighLevelEncoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417Compaction.h"
-#include "include/BC_UtilCodingConvert.h"
-#include "include/BC_PDF417HighLevelEncoder.h"
+#include "../barcode.h"
+#include "../BC_UtilCodingConvert.h"
 #include "../../../../third_party/bigint/BigIntegerLibrary.hh"
+#include "BC_PDF417Compaction.h"
+#include "BC_PDF417HighLevelEncoder.h"
 #define  SUBMODE_ALPHA  0
 #define  SUBMODE_LOWER  1
 #define  SUBMODE_MIXED  2
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417HighLevelEncoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
index ed962030ac..ed962030ac 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417HighLevelEncoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417HighLevelEncoder_unittest.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
index df45b16a78..33c875366c 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417HighLevelEncoder_unittest.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "core/include/fxcrt/fx_basic.h"
-#include "include/BC_PDF417HighLevelEncoder.h"
+#include "BC_PDF417HighLevelEncoder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/fx_string_testhelpers.h"
 
diff --git a/xfa/src/fxbarcode/src/BC_PDF417Reader.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
index 7b75c0009b..ed751cc4ba 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417Reader.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
@@ -20,36 +20,36 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_PDF417DetectorResult.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_PDF417Detector.h"
-#include "include/BC_PDF417DetectorResult.h"
-#include "include/BC_DecoderResult.h"
-#include "include/BC_PDF417Codeword.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417BarcodeValue.h"
-#include "include/BC_PDF417BarcodeMetadata.h"
-#include "include/BC_PDF417BoundingBox.h"
-#include "include/BC_PDF417DetectionResultColumn.h"
-#include "include/BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "include/BC_PDF417DetectionResult.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_PDF417CodewordDecoder.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_PDF417ECModulusPoly.h"
-#include "include/BC_PDF417ECModulusGF.h"
-#include "include/BC_PDF417ECErrorCorrection.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_CommonDecoderResult.h"
-#include "include/BC_PDF417ScanningDecoder.h"
-#include "include/BC_PDF417Reader.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "../BC_BinaryBitmap.h"
+#include "../BC_ResultPoint.h"
+#include "../BC_BinaryBitmap.h"
+#include "../BC_DecoderResult.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../common/BC_CommonBitArray.h"
+#include "../common/BC_CommonDecoderResult.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_PDF417DetectorResult.h"
+#include "BC_PDF417Detector.h"
+#include "BC_PDF417DetectorResult.h"
+#include "BC_PDF417Codeword.h"
+#include "BC_PDF417Common.h"
+#include "BC_PDF417BarcodeValue.h"
+#include "BC_PDF417BarcodeMetadata.h"
+#include "BC_PDF417BoundingBox.h"
+#include "BC_PDF417DetectionResultColumn.h"
+#include "BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "BC_PDF417DetectionResult.h"
+#include "BC_PDF417DecodedBitStreamParser.h"
+#include "BC_PDF417CodewordDecoder.h"
+#include "BC_PDF417DecodedBitStreamParser.h"
+#include "BC_PDF417ECModulusPoly.h"
+#include "BC_PDF417ECModulusGF.h"
+#include "BC_PDF417ECErrorCorrection.h"
+#include "BC_PDF417DecodedBitStreamParser.h"
+#include "BC_PDF417ScanningDecoder.h"
+#include "BC_PDF417Reader.h"
 #define    Integer_MAX_VALUE   2147483647
 CBC_PDF417Reader::CBC_PDF417Reader()
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417Reader.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h
index e6c0236cf7..e6c0236cf7 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417Reader.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417ResultMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
index 9f4b98d7bd..393ee2e75d 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417ResultMetadata.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_PDF417ResultMetadata.h"
+#include "../barcode.h"
+#include "BC_PDF417ResultMetadata.h"
 CBC_PDF417ResultMetadata::CBC_PDF417ResultMetadata()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417ResultMetadata.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
index e6c7780304..e6c7780304 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417ResultMetadata.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
index 4812883800..2b127ceb07 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417ScanningDecoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
@@ -20,26 +20,26 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_DecoderResult.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_PDF417Codeword.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417BarcodeValue.h"
-#include "include/BC_PDF417BarcodeMetadata.h"
-#include "include/BC_PDF417BoundingBox.h"
-#include "include/BC_PDF417DetectionResultColumn.h"
-#include "include/BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "include/BC_PDF417DetectionResult.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_PDF417CodewordDecoder.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_PDF417ECModulusPoly.h"
-#include "include/BC_PDF417ECModulusGF.h"
-#include "include/BC_PDF417ECErrorCorrection.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_PDF417ScanningDecoder.h"
+#include "../barcode.h"
+#include "../BC_DecoderResult.h"
+#include "../BC_ResultPoint.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_PDF417Codeword.h"
+#include "BC_PDF417Common.h"
+#include "BC_PDF417BarcodeValue.h"
+#include "BC_PDF417BarcodeMetadata.h"
+#include "BC_PDF417BoundingBox.h"
+#include "BC_PDF417DetectionResultColumn.h"
+#include "BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "BC_PDF417DetectionResult.h"
+#include "BC_PDF417DecodedBitStreamParser.h"
+#include "BC_PDF417CodewordDecoder.h"
+#include "BC_PDF417DecodedBitStreamParser.h"
+#include "BC_PDF417ECModulusPoly.h"
+#include "BC_PDF417ECModulusGF.h"
+#include "BC_PDF417ECErrorCorrection.h"
+#include "BC_PDF417DecodedBitStreamParser.h"
+#include "BC_PDF417ScanningDecoder.h"
 FX_INT32 CBC_PDF417ScanningDecoder::CODEWORD_SKEW_SIZE = 2;
 FX_INT32 CBC_PDF417ScanningDecoder::MAX_ERRORS = 3;
 FX_INT32 CBC_PDF417ScanningDecoder::MAX_EC_CODEWORDS = 512;
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417ScanningDecoder.h b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
index 924e5f798a..924e5f798a 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417ScanningDecoder.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h
diff --git a/xfa/src/fxbarcode/src/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
index d9d41d5200..86951c91e9 100644
--- a/xfa/src/fxbarcode/src/BC_PDF417Writer.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_TwoDimWriter.h"
-#include "include/BC_PDF417Compaction.h"
-#include "include/BC_PDF417.h"
-#include "include/BC_PDF417BarcodeMatrix.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_PDF417Writer.h"
+#include "../barcode.h"
+#include "../BC_TwoDimWriter.h"
+#include "../common/BC_CommonBitArray.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_PDF417Compaction.h"
+#include "BC_PDF417.h"
+#include "BC_PDF417BarcodeMatrix.h"
+#include "BC_PDF417Writer.h"
 CBC_PDF417Writer::CBC_PDF417Writer()
 {
     m_bFixedSize = FALSE;
diff --git a/xfa/src/fxbarcode/src/include/BC_PDF417Writer.h b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h
index 5d974f9377..5d974f9377 100644
--- a/xfa/src/fxbarcode/src/include/BC_PDF417Writer.h
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h
diff --git a/xfa/src/fxbarcode/src/BC_FinderPatternInfo.cpp b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
index 30ef843bde..b3c6f3f8a3 100644
--- a/xfa/src/fxbarcode/src/BC_FinderPatternInfo.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
@@ -21,10 +21,10 @@
  */
 
 
-#include "barcode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_QRFinderPattern.h"
-#include "include/BC_FinderPatternInfo.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "BC_QRFinderPattern.h"
+#include "BC_FinderPatternInfo.h"
 CBC_QRFinderPatternInfo::CBC_QRFinderPatternInfo(CFX_PtrArray *patternCenters)
 {
     m_bottomLeft = (CBC_QRFinderPattern*)(*patternCenters)[0];
diff --git a/xfa/src/fxbarcode/src/include/BC_FinderPatternInfo.h b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
index bac9291947..bac9291947 100644
--- a/xfa/src/fxbarcode/src/include/BC_FinderPatternInfo.h
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h
diff --git a/xfa/src/fxbarcode/src/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
index ace8ac2c41..e1ee168e72 100644
--- a/xfa/src/fxbarcode/src/BC_QRAlignmentPattern.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_QRAlignmentPattern.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "BC_QRAlignmentPattern.h"
 CBC_QRAlignmentPattern::CBC_QRAlignmentPattern(FX_FLOAT posX, FX_FLOAT posY, FX_FLOAT estimateModuleSize):
     CBC_ResultPoint(posX, posY), m_moduleSize(estimateModuleSize)
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_QRAlignmentPattern.h b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h
index a52687b6b7..a52687b6b7 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRAlignmentPattern.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h
diff --git a/xfa/src/fxbarcode/src/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
index 59ae4aad04..669a0fbf7e 100644
--- a/xfa/src/fxbarcode/src/BC_QRAlignmentPatternFinder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_QRAlignmentPattern.h"
-#include "include/BC_QRAlignmentPatternFinder.h"
-#include "include/BC_CommonBitMatrix.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_QRAlignmentPattern.h"
+#include "BC_QRAlignmentPatternFinder.h"
 CBC_QRAlignmentPatternFinder::CBC_QRAlignmentPatternFinder(CBC_CommonBitMatrix *image,
         FX_INT32 startX,
         FX_INT32 startY,
diff --git a/xfa/src/fxbarcode/src/include/BC_QRAlignmentPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
index 5471c4e62a..5471c4e62a 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRAlignmentPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h
diff --git a/xfa/src/fxbarcode/src/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
index 5e5d245b49..7c85c58367 100644
--- a/xfa/src/fxbarcode/src/BC_QRBitMatrixParser.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_QRCoderVersion.h"
-#include "include/BC_QRCoderFormatInformation.h"
-#include "include/BC_QRDataMask.h"
-#include "include/BC_QRBitMatrixParser.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_QRCoderVersion.h"
+#include "BC_QRCoderFormatInformation.h"
+#include "BC_QRDataMask.h"
+#include "BC_QRBitMatrixParser.h"
 CBC_QRBitMatrixParser::CBC_QRBitMatrixParser()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_QRBitMatrixParser.h b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
index 2e176f63d3..2e176f63d3 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRBitMatrixParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
index 898dc2ddb2..f12c4e0ad3 100644
--- a/xfa/src/fxbarcode/src/BC_QRCodeReader.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
@@ -20,26 +20,26 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_QRCodeReader.h"
-#include "include/BC_LuminanceSource.h"
-#include "include/BC_BufferedImageLuminanceSource.h"
-#include "include/BC_Binarizer.h"
-#include "include/BC_GlobalHistogramBinarizer.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_QRCodeReader.h"
-#include "include/BC_QRCoderMode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_QRCoderDecoder.h"
-#include "include/BC_QRDetector.h"
-#include "include/BC_QRDetectorResult.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
-#include "include/BC_QRDataMask.h"
-#include "include/BC_ReedSolomonGF256.h"
-#include "include/BC_QRCoderVersion.h"
-#include "include/BC_CommonDecoderResult.h"
-#include "include/BC_QRCodeReader.h"
+#include "../barcode.h"
+#include "../BC_Reader.h"
+#include "../BC_LuminanceSource.h"
+#include "../BC_BufferedImageLuminanceSource.h"
+#include "../BC_Binarizer.h"
+#include "../BC_BinaryBitmap.h"
+#include "../BC_ResultPoint.h"
+#include "../common/BC_GlobalHistogramBinarizer.h"
+#include "../common/BC_CommonDecoderResult.h"
+#include "../common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "BC_QRCodeReader.h"
+#include "BC_QRCodeReader.h"
+#include "BC_QRCoderMode.h"
+#include "BC_QRCoderDecoder.h"
+#include "BC_QRDetector.h"
+#include "BC_QRDetectorResult.h"
+#include "BC_QRCoderErrorCorrectionLevel.h"
+#include "BC_QRDataMask.h"
+#include "BC_QRCodeReader.h"
+#include "BC_QRCoderVersion.h"
 CBC_QRCodeReader::CBC_QRCodeReader(): m_decoder(NULL)
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCodeReader.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h
index 71a1ad3dd6..71a1ad3dd6 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCodeReader.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCodeWriter.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
index ade03dd494..ccc0220d6c 100644
--- a/xfa/src/fxbarcode/src/BC_QRCodeWriter.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_TwoDimWriter.h"
-#include "include/BC_Reader.h"
-#include "include/BC_QRCodeWriter.h"
-#include "include/BC_QRCoderEncoder.h"
-#include "include/BC_QRCoder.h"
-#include "include/BC_CommonByteMatrix.h"
-#include "include/BC_QRCodeReader.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
+#include "../barcode.h"
+#include "../BC_TwoDimWriter.h"
+#include "../BC_Reader.h"
+#include "../common/BC_CommonByteMatrix.h"
+#include "BC_QRCodeWriter.h"
+#include "BC_QRCoderEncoder.h"
+#include "BC_QRCoder.h"
+#include "BC_QRCodeReader.h"
+#include "BC_QRCoderErrorCorrectionLevel.h"
 CBC_QRCodeWriter::CBC_QRCodeWriter()
 {
     m_bFixedSize = TRUE;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCodeWriter.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
index a4a4cbe048..bf0ca71996 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCodeWriter.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
@@ -6,7 +6,7 @@
 
 #ifndef _BC_QRCODERWRITER_H_
 #define _BC_QRCODERWRITER_H_
-#include "BC_TwoDimWriter.h"
+#include "../BC_TwoDimWriter.h"
 class CBC_TwoDimWriter;
 class CBC_MultiBarCodes;
 class CBC_QRCoderWriter;
diff --git a/xfa/src/fxbarcode/src/BC_QRCoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
index 564a280421..f650f83b48 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
-#include "include/BC_QRCoderMode.h"
-#include "include/BC_CommonByteMatrix.h"
-#include "include/BC_QRCoder.h"
+#include "../barcode.h"
+#include "../common/BC_CommonByteMatrix.h"
+#include "BC_QRCoderErrorCorrectionLevel.h"
+#include "BC_QRCoderMode.h"
+#include "BC_QRCoder.h"
 CBC_QRCoder::CBC_QRCoder()
 {
     m_mode = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
index 89ce140fbd..89ce140fbd 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderBitVector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
index 728252e9e2..b7a0a1c3a7 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderBitVector.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderBitVector.h"
+#include "../barcode.h"
+#include "BC_QRCoderBitVector.h"
 CBC_QRCoderBitVector::CBC_QRCoderBitVector()
 {
     m_sizeInBits = 0;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderBitVector.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
index 6e9abba6c9..6e9abba6c9 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderBitVector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderBlockPair.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
index 4b0b7c92b1..da7e8a509e 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderBlockPair.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonByteArray.h"
-#include "include/BC_QRCoderBlockPair.h"
+#include "../barcode.h"
+#include "../common/BC_CommonByteArray.h"
+#include "BC_QRCoderBlockPair.h"
 CBC_QRCoderBlockPair::CBC_QRCoderBlockPair(CBC_CommonByteArray* data, CBC_CommonByteArray* errorCorrection)
 {
     m_dataBytes = data;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderBlockPair.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
index 234ac1a776..234ac1a776 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderBlockPair.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
index 3033074eb8..6f16db6ad8 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderDecoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
@@ -20,17 +20,17 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ReedSolomonDecoder.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_CommonDecoderResult.h"
-#include "include/BC_QRBitMatrixParser.h"
-#include "include/BC_QRDataBlock.h"
-#include "include/BC_QRDecodedBitStreamParser.h"
-#include "include/BC_QRCoderVersion.h"
-#include "include/BC_QRCoderFormatInformation.h"
-#include "include/BC_ReedSolomonGF256.h"
-#include "include/BC_QRCoderDecoder.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../common/BC_CommonDecoderResult.h"
+#include "../common/reedsolomon/BC_ReedSolomonDecoder.h"
+#include "../common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "BC_QRBitMatrixParser.h"
+#include "BC_QRDataBlock.h"
+#include "BC_QRDecodedBitStreamParser.h"
+#include "BC_QRCoderVersion.h"
+#include "BC_QRCoderFormatInformation.h"
+#include "BC_QRCoderDecoder.h"
 CBC_QRCoderDecoder::CBC_QRCoderDecoder()
 {
     m_rsDecoder = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderDecoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
index 355af78180..355af78180 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderDecoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderECB.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
index a6eb48ed99..a475cecb37 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderECB.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderECB.h"
+#include "../barcode.h"
+#include "BC_QRCoderECB.h"
 CBC_QRCoderECB::CBC_QRCoderECB(FX_INT32 count, FX_INT32 dataCodeWords)
 {
     m_dataCodeWords = dataCodeWords;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderECB.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
index c6494b75cd..c6494b75cd 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderECB.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderECBlocks.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
index 8c98530371..22485fe733 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderECBlocks.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderECB.h"
-#include "include/BC_QRCoderECBlocks.h"
+#include "../barcode.h"
+#include "BC_QRCoderECB.h"
+#include "BC_QRCoderECBlocks.h"
 CBC_QRCoderECBlocks::CBC_QRCoderECBlocks(FX_INT32 ecCodeWordsPerBlock, CBC_QRCoderECB* ecBlocks)
 {
     m_ecCodeWordsPerBlock = ecCodeWordsPerBlock;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderECBlocks.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
index 385837510a..385837510a 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderECBlocks.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index 2529f4f59d..e072dc337e 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderEncoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -20,22 +20,22 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoder.h"
-#include "include/BC_QRCoderEncoder.h"
-#include "include/BC_CommonByteArray.h"
-#include "include/BC_QRCoderMode.h"
-#include "include/BC_QRCoderEncoder.h"
-#include "include/BC_QRCoderECBlocks.h"
-#include "include/BC_QRCoderVersion.h"
-#include "include/BC_QRCoderBlockPair.h"
-#include "include/BC_QRCoderMaskUtil.h"
-#include "include/BC_QRCoderMatrixUtil.h"
-#include "include/BC_ReedSolomon.h"
-#include "include/BC_CommonByteMatrix.h"
-#include "include/BC_ReedSolomonGF256.h"
-#include "include/BC_UtilCodingConvert.h"
-#include "include/BC_QRCoderBitVector.h"
+#include "../barcode.h"
+#include "../BC_UtilCodingConvert.h"
+#include "../common/BC_CommonByteArray.h"
+#include "../common/BC_CommonByteMatrix.h"
+#include "../common/reedsolomon/BC_ReedSolomon.h"
+#include "../common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "BC_QRCoder.h"
+#include "BC_QRCoderEncoder.h"
+#include "BC_QRCoderMode.h"
+#include "BC_QRCoderEncoder.h"
+#include "BC_QRCoderECBlocks.h"
+#include "BC_QRCoderVersion.h"
+#include "BC_QRCoderBlockPair.h"
+#include "BC_QRCoderMaskUtil.h"
+#include "BC_QRCoderMatrixUtil.h"
+#include "BC_QRCoderBitVector.h"
 const FX_INT32 CBC_QRCoderEncoder::m_alphaNumbericTable[] = {
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
     -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderEncoder.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
index 8dea2a6477..8dea2a6477 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderEncoder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
index 238b4e3149..f8aae491da 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderErrorCorrectionLevel.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
+#include "../barcode.h"
+#include "BC_QRCoderErrorCorrectionLevel.h"
 CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::L = NULL;
 CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::M = NULL;
 CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::Q = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderErrorCorrectionLevel.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
index 2c0ad7b0b7..2c0ad7b0b7 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderErrorCorrectionLevel.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
index 2dbbcc5432..5a205480ae 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderFormatInformation.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
-#include "include/BC_QRCoderFormatInformation.h"
+#include "../barcode.h"
+#include "BC_QRCoderErrorCorrectionLevel.h"
+#include "BC_QRCoderFormatInformation.h"
 const FX_INT32 CBC_QRCoderFormatInformation::FORMAT_INFO_MASK_QR = 0X5412;
 const FX_INT32 CBC_QRCoderFormatInformation::FORMAT_INFO_DECODE_LOOKUP[32][2] = {
     {0x5412, 0x00},
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderFormatInformation.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
index 9d828c8380..9d828c8380 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderFormatInformation.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderMaskUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
index 6f2f9b2dbb..bc01eff442 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderMaskUtil.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonByteMatrix.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
-#include "include/BC_QRCoder.h"
-#include "include/BC_QRCoderMaskUtil.h"
+#include "../barcode.h"
+#include "../common/BC_CommonByteMatrix.h"
+#include "BC_QRCoderErrorCorrectionLevel.h"
+#include "BC_QRCoder.h"
+#include "BC_QRCoderMaskUtil.h"
 CBC_QRCoderMaskUtil::CBC_QRCoderMaskUtil()
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderMaskUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
index 134d344e72..134d344e72 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderMaskUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderMatrixUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
index b76af65847..4c2db5e34e 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderMatrixUtil.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonByteMatrix.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
-#include "include/BC_QRCoder.h"
-#include "include/BC_QRCoderMaskUtil.h"
-#include "include/BC_QRCoderMatrixUtil.h"
-#include "include/BC_QRCoderBitVector.h"
+#include "../barcode.h"
+#include "../common/BC_CommonByteMatrix.h"
+#include "BC_QRCoderErrorCorrectionLevel.h"
+#include "BC_QRCoder.h"
+#include "BC_QRCoderMaskUtil.h"
+#include "BC_QRCoderMatrixUtil.h"
+#include "BC_QRCoderBitVector.h"
 const FX_INT32 CBC_QRCoderMatrixUtil::POSITION_DETECTION_PATTERN[7][7] = {
     1, 1, 1, 1, 1, 1, 1,
     1, 0, 0, 0, 0, 0, 1,
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderMatrixUtil.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
index 23a9d88128..23a9d88128 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderMatrixUtil.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
index f0f1621e28..00c7e47cb7 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderMode.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderVersion.h"
-#include "include/BC_QRCoderMode.h"
+#include "../barcode.h"
+#include "BC_QRCoderVersion.h"
+#include "BC_QRCoderMode.h"
 CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = NULL;
 CBC_QRCoderMode* CBC_QRCoderMode::sNUMERIC = NULL;
 CBC_QRCoderMode* CBC_QRCoderMode::sALPHANUMERIC = NULL;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderMode.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
index 71cea9fc78..71cea9fc78 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderMode.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h
diff --git a/xfa/src/fxbarcode/src/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
index a566e8dcfc..9ff54f2a13 100644
--- a/xfa/src/fxbarcode/src/BC_QRCoderVersion.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
@@ -20,15 +20,15 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/utils.h"
-#include "include/BC_QRCoderECB.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_QRCoderFormatInformation.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
-#include "include/BC_QRCoderBitVector.h"
-#include "include/BC_QRCoderECBlocks.h"
-#include "include/BC_QRCoderVersion.h"
+#include "../barcode.h"
+#include "../utils.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_QRCoderECB.h"
+#include "BC_QRCoderFormatInformation.h"
+#include "BC_QRCoderErrorCorrectionLevel.h"
+#include "BC_QRCoderBitVector.h"
+#include "BC_QRCoderECBlocks.h"
+#include "BC_QRCoderVersion.h"
 const FX_INT32 CBC_QRCoderVersion::VERSION_DECODE_INFO[] = {
     0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6,
     0x0C762, 0x0D847, 0x0E60D, 0x0F928, 0x10B78,
diff --git a/xfa/src/fxbarcode/src/include/BC_QRCoderVersion.h b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
index b693dd6dd7..b693dd6dd7 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRCoderVersion.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h
diff --git a/xfa/src/fxbarcode/src/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
index 2e82c1881f..87c14deac9 100644
--- a/xfa/src/fxbarcode/src/BC_QRDataBlock.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderECBlocks.h"
-#include "include/BC_QRCoderECB.h"
-#include "include/BC_QRDataBlock.h"
-#include "include/BC_QRCoderVersion.h"
+#include "../barcode.h"
+#include "BC_QRCoderECBlocks.h"
+#include "BC_QRCoderECB.h"
+#include "BC_QRDataBlock.h"
+#include "BC_QRCoderVersion.h"
 CBC_QRDataBlock::CBC_QRDataBlock(FX_INT32 numDataCodewords, CFX_ByteArray *codewords)
     : m_numDataCodewords(numDataCodewords)
     , m_codewords(codewords)
diff --git a/xfa/src/fxbarcode/src/include/BC_QRDataBlock.h b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
index 4f68c7a9f3..4f68c7a9f3 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRDataBlock.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h
diff --git a/xfa/src/fxbarcode/src/BC_QRDataMask.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
index 1946ca9e09..fd81b20f1b 100644
--- a/xfa/src/fxbarcode/src/BC_QRDataMask.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_QRDataMask.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_QRDataMask.h"
 static FX_INT32 N_DATA_MASKS = 0;
 CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL;
 void CBC_QRDataMask::Initialize()
diff --git a/xfa/src/fxbarcode/src/include/BC_QRDataMask.h b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
index 6fcc09d556..6fcc09d556 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRDataMask.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.h
diff --git a/xfa/src/fxbarcode/src/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
index d51536d09e..0fe4d1b2b6 100644
--- a/xfa/src/fxbarcode/src/BC_QRDecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_QRCoderMode.h"
-#include "include/BC_CommonBitSource.h"
-#include "include/BC_CommonECI.h"
-#include "include/BC_QRDecodedBitStreamParser.h"
-#include "include/BC_CommonCharacterSetECI.h"
-#include "include/BC_CommonDecoderResult.h"
-#include "include/BC_UtilCodingConvert.h"
+#include "../barcode.h"
+#include "../BC_UtilCodingConvert.h"
+#include "../common/BC_CommonBitSource.h"
+#include "../common/BC_CommonECI.h"
+#include "../common/BC_CommonCharacterSetECI.h"
+#include "../common/BC_CommonDecoderResult.h"
+#include "BC_QRCoderMode.h"
+#include "BC_QRDecodedBitStreamParser.h"
 FX_LPCSTR CBC_QRDecodedBitStreamParser::UTF_8 = "utf8";
 const FX_CHAR CBC_QRDecodedBitStreamParser::ALPHANUMERIC_CHARS[45] = {
     '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B',
diff --git a/xfa/src/fxbarcode/src/include/BC_QRDecodedBitStreamParser.h b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
index b64485f788..b64485f788 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRDecodedBitStreamParser.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h
diff --git a/xfa/src/fxbarcode/src/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
index 5b3910b413..01d90832b9 100644
--- a/xfa/src/fxbarcode/src/BC_QRDetector.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
@@ -20,17 +20,17 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_QRFinderPattern.h"
-#include "include/BC_QRCoderVersion.h"
-#include "include/BC_FinderPatternInfo.h"
-#include "include/BC_QRGridSampler.h"
-#include "include/BC_QRAlignmentPatternFinder.h"
-#include "include/BC_QRFinderPatternFinder.h"
-#include "include/BC_QRDetectorResult.h"
-#include "include/BC_QRDetector.h"
+#include "../barcode.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "../BC_ResultPoint.h"
+#include "BC_QRFinderPattern.h"
+#include "BC_QRCoderVersion.h"
+#include "BC_FinderPatternInfo.h"
+#include "BC_QRGridSampler.h"
+#include "BC_QRAlignmentPatternFinder.h"
+#include "BC_QRFinderPatternFinder.h"
+#include "BC_QRDetectorResult.h"
+#include "BC_QRDetector.h"
 CBC_QRDetector::CBC_QRDetector(CBC_CommonBitMatrix *image): m_image(image)
 {
 }
diff --git a/xfa/src/fxbarcode/src/include/BC_QRDetector.h b/xfa/src/fxbarcode/qrcode/BC_QRDetector.h
index 60c301cb7b..60c301cb7b 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRDetector.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.h
diff --git a/xfa/src/fxbarcode/src/BC_QRDetectorResult.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
index 44f4714a92..369dc3a527 100644
--- a/xfa/src/fxbarcode/src/BC_QRDetectorResult.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_QRDetectorResult.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_QRDetectorResult.h"
 CBC_QRDetectorResult::CBC_QRDetectorResult(CBC_CommonBitMatrix *bits, CFX_PtrArray *points):
     m_bits(bits), m_points(points)
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_QRDetectorResult.h b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
index 13f6d3dc46..13f6d3dc46 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRDetectorResult.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h
diff --git a/xfa/src/fxbarcode/src/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
index 8dd30f217a..8d1385e99a 100644
--- a/xfa/src/fxbarcode/src/BC_QRFinderPattern.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_QRFinderPattern.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "BC_QRFinderPattern.h"
 CBC_QRFinderPattern::CBC_QRFinderPattern(FX_FLOAT x, FX_FLOAT posY, FX_FLOAT estimatedModuleSize):
     CBC_ResultPoint(x, posY),
     m_estimatedModuleSize(estimatedModuleSize), m_count(1)
diff --git a/xfa/src/fxbarcode/src/include/BC_QRFinderPattern.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h
index af88a727d9..af88a727d9 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRFinderPattern.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h
diff --git a/xfa/src/fxbarcode/src/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
index 67d1a7b069..da2d1231f8 100644
--- a/xfa/src/fxbarcode/src/BC_QRFinderPatternFinder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_QRFinderPatternFinder.h"
-#include "include/BC_FinderPatternInfo.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_QRFinderPattern.h"
+#include "../barcode.h"
+#include "../BC_ResultPoint.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_QRFinderPatternFinder.h"
+#include "BC_FinderPatternInfo.h"
+#include "BC_QRFinderPattern.h"
 const FX_INT32 CBC_QRFinderPatternFinder::CENTER_QUORUM = 2;
 const FX_INT32 CBC_QRFinderPatternFinder::MIN_SKIP = 3;
 const FX_INT32 CBC_QRFinderPatternFinder::MAX_MODULES = 57;
diff --git a/xfa/src/fxbarcode/src/include/BC_QRFinderPatternFinder.h b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
index 7470b553ee..7470b553ee 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRFinderPatternFinder.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h
diff --git a/xfa/src/fxbarcode/src/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
index a5c492f4bc..8783078690 100644
--- a/xfa/src/fxbarcode/src/BC_QRGridSampler.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "include/BC_CommonPerspectiveTransform.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_QRGridSampler.h"
+#include "../barcode.h"
+#include "../common/BC_CommonPerspectiveTransform.h"
+#include "../common/BC_CommonBitMatrix.h"
+#include "BC_QRGridSampler.h"
 CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler;
 CBC_QRGridSampler::CBC_QRGridSampler()
 {
diff --git a/xfa/src/fxbarcode/src/include/BC_QRGridSampler.h b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
index 0b8c7d3ab7..0b8c7d3ab7 100644
--- a/xfa/src/fxbarcode/src/include/BC_QRGridSampler.h
+++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h
diff --git a/xfa/src/fxbarcode/src/BC_Library.cpp b/xfa/src/fxbarcode/src/BC_Library.cpp
deleted file mode 100644
index 5b12609517..0000000000
--- a/xfa/src/fxbarcode/src/BC_Library.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "barcode.h"
-#include "include/BC_Reader.h"
-#include "include/BC_OneDReader.h"
-#include "include/BC_UtilCodingConvert.h"
-#include "include/BC_DataMatrixVersion.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_LuminanceSource.h"
-#include "include/BC_BufferedImageLuminanceSource.h"
-#include "include/BC_Binarizer.h"
-#include "include/BC_GlobalHistogramBinarizer.h"
-#include "include/BC_OnedCode128Reader.h"
-#include "include/BC_OnedCode39Reader.h"
-#include "include/BC_OneDimReader.h"
-#include "include/BC_OnedEAN13Reader.h"
-#include "include/BC_OnedEAN8Reader.h"
-#include "include/BC_OnedUPCAReader.h"
-#include "include/BC_OnedCodaBarReader.h"
-#include "include/BC_DataMatrixReader.h"
-#include "include/BC_QRCodeReader.h"
-#include "include/BC_Writer.h"
-#include "include/BC_OneDimWriter.h"
-#include "include/BC_OnedCode128Writer.h"
-#include "include/BC_OnedCode39Writer.h"
-#include "include/BC_OnedEAN13Writer.h"
-#include "include/BC_OnedEAN8Writer.h"
-#include "include/BC_OnedUPCAWriter.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_QRCodeWriter.h"
-#include "include/BC_QRCoderErrorCorrectionLevel.h"
-#include "include/BC_QRCoderMode.h"
-#include "include/BC_QRCoderVersion.h"
-#include "include/BC_QRDataMask.h"
-#include "include/BC_QRDecodedBitStreamParser.h"
-#include "include/BC_ReedSolomonGF256.h"
-#include "include/BC_Encoder.h"
-#include "include/BC_DefaultPlacement.h"
-#include "include/BC_SymbolShapeHint.h"
-#include "include/BC_SymbolInfo.h"
-#include "include/BC_DataMatrixSymbolInfo144.h"
-#include "include/BC_ErrorCorrection.h"
-#include "include/BC_Dimension.h"
-#include "include/BC_EncoderContext.h"
-#include "include/BC_C40Encoder.h"
-#include "include/BC_TextEncoder.h"
-#include "include/BC_X12Encoder.h"
-#include "include/BC_EdifactEncoder.h"
-#include "include/BC_Base256Encoder.h"
-#include "include/BC_ASCIIEncoder.h"
-#include "include/BC_HighLevelEncoder.h"
-#include "include/BC_CommonByteMatrix.h"
-#include "include/BC_DataMatrixWriter.h"
-#include "include/BC_PDF417Compaction.h"
-#include "include/BC_UtilCodingConvert.h"
-#include "include/BC_PDF417HighLevelEncoder.h"
-#include "include/BC_ResultPoint.h"
-#include "include/BC_PDF417DetectorResult.h"
-#include "include/BC_BinaryBitmap.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_CommonBitArray.h"
-#include "include/BC_PDF417Detector.h"
-#include "include/BC_PDF417DetectorResult.h"
-#include "include/BC_DecoderResult.h"
-#include "include/BC_PDF417Codeword.h"
-#include "include/BC_CommonBitMatrix.h"
-#include "include/BC_PDF417Common.h"
-#include "include/BC_PDF417BarcodeValue.h"
-#include "include/BC_PDF417BarcodeMetadata.h"
-#include "include/BC_PDF417BoundingBox.h"
-#include "include/BC_PDF417DetectionResultColumn.h"
-#include "include/BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "include/BC_PDF417DetectionResult.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_PDF417CodewordDecoder.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_PDF417ECModulusPoly.h"
-#include "include/BC_PDF417ECModulusGF.h"
-#include "include/BC_PDF417ECErrorCorrection.h"
-#include "include/BC_PDF417DecodedBitStreamParser.h"
-#include "include/BC_CommonDecoderResult.h"
-#include "include/BC_PDF417ScanningDecoder.h"
-#include "include/BC_PDF417Reader.h"
-void BC_Library_Init()
-{
-    CBC_QRCoderErrorCorrectionLevel::Initialize();
-    CBC_QRCoderMode::Initialize();
-    CBC_QRCoderVersion::Initialize();
-    CBC_QRDataMask::Initialize();
-    CBC_ReedSolomonGF256::Initialize();
-    CBC_DataMatrixVersion::Initialize();
-    CBC_SymbolInfo::Initialize();
-    CBC_ErrorCorrection::Initialize();
-    CBC_PDF417HighLevelEncoder::Initialize();
-    FX_INT32 e = 0;
-    CBC_PDF417ECModulusGF::Initialize(e);
-    CBC_DecodedBitStreamPaser::Initialize();
-    CBC_PDF417CodewordDecoder::Initialize();
-    CBC_PDF417ECErrorCorrection::Initialize(e);
-    CBC_PDF417ScanningDecoder::Initialize();
-}
-void BC_Library_Destory()
-{
-    CBC_QRCoderErrorCorrectionLevel::Finalize();
-    CBC_QRCoderMode::Finalize();
-    CBC_QRCoderVersion::Finalize();
-    CBC_QRDataMask::Finalize();
-    CBC_ReedSolomonGF256::Finalize();
-    CBC_DataMatrixVersion::Finalize();
-    CBC_SymbolInfo::Finalize();
-    CBC_ErrorCorrection::Finalize();
-    CBC_PDF417HighLevelEncoder::Finalize();
-    CBC_DecodedBitStreamPaser::Finalize();
-    CBC_PDF417CodewordDecoder::Finalize();
-    CBC_PDF417ECErrorCorrection::Finalize();
-    CBC_PDF417ECModulusGF::Finalize();
-    CBC_PDF417ScanningDecoder::Finalize();
-}
diff --git a/xfa/src/fxbarcode/src/include/utils.h b/xfa/src/fxbarcode/utils.h
index ecaadccef0..ecaadccef0 100644
--- a/xfa/src/fxbarcode/src/include/utils.h
+++ b/xfa/src/fxbarcode/utils.h