XFA: Remove many relative includes in xfa/

Also remove useless files. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1570743002 .
author: Lei Zhang <thestig@chromium.org> 2016-01-08 15:44:36 -0800
committer: Lei Zhang <thestig@chromium.org> 2016-01-08 15:44:36 -0800
commit: c909ce872d999a17ffd44afdc88caf2de43e6cba (patch)
tree: 6427a1392c01f78c7c859910f93fbaf55d7fb1c2 /xfa/src/fxbarcode
parent: b8e1ab27372cdb5d8c83e57e004032f0d72715db (diff)
download: pdfium-c909ce872d999a17ffd44afdc88caf2de43e6cba.tar.xz
114 files changed, 429 insertions, 427 deletions
diff --git a/xfa/src/fxbarcode/BC_BarCode.cpp b/xfa/src/fxbarcode/BC_BarCode.cpp
index 2bc0559b12..82af104bf3 100644
--- a/xfa/src/fxbarcode/BC_BarCode.cpp
+++ b/xfa/src/fxbarcode/BC_BarCode.cpp
@@ -20,66 +20,66 @@
  * limitations under the License.
  */
 
-#include "barcode.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"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/BC_DecoderResult.h"
+#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
+#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h"
+#include "xfa/src/fxbarcode/BC_Binarizer.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
+#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h"
+#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
+#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
+#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h"
 CBC_CodeBase::CBC_CodeBase() {}
 CBC_CodeBase::~CBC_CodeBase() {}
 FX_BOOL CBC_CodeBase::SetCharEncoding(int32_t encoding) {
diff --git a/xfa/src/fxbarcode/BC_Binarizer.cpp b/xfa/src/fxbarcode/BC_Binarizer.cpp
index 8b45e19cf9..314bf5760b 100644
--- a/xfa/src/fxbarcode/BC_Binarizer.cpp
+++ b/xfa/src/fxbarcode/BC_Binarizer.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "BC_LuminanceSource.h"
-#include "BC_Binarizer.h"
-#include "common/BC_CommonBitMatrix.h"
-#include "common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
+#include "xfa/src/fxbarcode/BC_Binarizer.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 CBC_Binarizer::CBC_Binarizer(CBC_LuminanceSource* source) {
   m_source = source;
 }
diff --git a/xfa/src/fxbarcode/BC_BinaryBitmap.cpp b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp
index 50a87126a7..2fdcb9904d 100644
--- a/xfa/src/fxbarcode/BC_BinaryBitmap.cpp
+++ b/xfa/src/fxbarcode/BC_BinaryBitmap.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "BC_Binarizer.h"
-#include "BC_LuminanceSource.h"
-#include "BC_BinaryBitmap.h"
-#include "common/BC_CommonBitMatrix.h"
-#include "common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Binarizer.h"
+#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 CBC_BinaryBitmap::CBC_BinaryBitmap(CBC_Binarizer* binarizer)
     : m_binarizer(binarizer), m_matrix(NULL) {}
 CBC_BinaryBitmap::~CBC_BinaryBitmap() {
diff --git a/xfa/src/fxbarcode/BC_Dimension.cpp b/xfa/src/fxbarcode/BC_Dimension.cpp
index 13cc8d5ede..e22810022c 100644
--- a/xfa/src/fxbarcode/BC_Dimension.cpp
+++ b/xfa/src/fxbarcode/BC_Dimension.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "barcode.h"
-#include "BC_Dimension.h"
-#include "datamatrix/BC_Encoder.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
 CBC_Dimension::CBC_Dimension() {}
 CBC_Dimension::CBC_Dimension(int32_t width, int32_t height, int32_t& e) {
   if (width < 0 || height < 0) {
diff --git a/xfa/src/fxbarcode/BC_Library.cpp b/xfa/src/fxbarcode/BC_Library.cpp
index 5f875b9770..7f142989ae 100644
--- a/xfa/src/fxbarcode/BC_Library.cpp
+++ b/xfa/src/fxbarcode/BC_Library.cpp
@@ -4,88 +4,88 @@
 
 // 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"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
+#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h"
+#include "xfa/src/fxbarcode/BC_Binarizer.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
+#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/BC_DecoderResult.h"
+#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
+#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_Encoder.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_EncoderContext.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_C40Encoder.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_TextEncoder.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_X12Encoder.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.h"
+#include "xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.h"
+#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCode128Reader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
+#include "xfa/src/fxbarcode/oned/BC_OneDimReader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedUPCAReader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
+#include "xfa/src/fxbarcode/oned/BC_OneDimWriter.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCode128Writer.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCode39Writer.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Reader.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h"
 void BC_Library_Init() {
   CBC_QRCoderErrorCorrectionLevel::Initialize();
   CBC_QRCoderMode::Initialize();
diff --git a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp
index 9cb97f4a54..d6d6614449 100644
--- a/xfa/src/fxbarcode/BC_TwoDimWriter.cpp
+++ b/xfa/src/fxbarcode/BC_TwoDimWriter.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "barcode.h"
-#include "common/BC_CommonBitMatrix.h"
-#include "BC_Writer.h"
-#include "BC_TwoDimWriter.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
 CBC_TwoDimWriter::CBC_TwoDimWriter() {
   m_iCorrectLevel = 1;
   m_bFixedSize = TRUE;
diff --git a/xfa/src/fxbarcode/barcode.h b/xfa/src/fxbarcode/barcode.h
index 333d3f7a11..d878f2d8a7 100644
--- a/xfa/src/fxbarcode/barcode.h
+++ b/xfa/src/fxbarcode/barcode.h
@@ -4,5 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../foxitlib.h"
+// TODO(thestig): Remove this file and do IWYU.
+
+#include "xfa/src/foxitlib.h"
 #include "utils.h"
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
index d0d0d8ea54..61b4ce3b4f 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitArray.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_CommonBitArray.h"
 CBC_CommonBitArray::CBC_CommonBitArray(CBC_CommonBitArray* array) {
   m_size = array->GetSize();
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
index ec2706b122..c45e28c0c8 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitMatrix.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_CommonBitArray.h"
 #include "BC_CommonBitMatrix.h"
 CBC_CommonBitMatrix::CBC_CommonBitMatrix() {
diff --git a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp
index 20b0d2accc..c308638fad 100644
--- a/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonBitSource.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_CommonBitSource.h"
 CBC_CommonBitSource::CBC_CommonBitSource(CFX_ByteArray* bytes) {
   m_bytes.Copy((*bytes));
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
index 0ad07fd981..967a1849d5 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteArray.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_CommonByteArray.h"
 CBC_CommonByteArray::CBC_CommonByteArray() {
   m_bytes = NULL;
diff --git a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
index d6208d41b5..875b8026c9 100644
--- a/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonByteMatrix.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_CommonByteMatrix.h"
 CBC_CommonByteMatrix::CBC_CommonByteMatrix(int32_t width, int32_t height) {
   m_height = height;
diff --git a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
index fbc6607ae7..2beb850963 100644
--- a/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_CommonECI.h"
 #include "BC_CommonCharacterSetECI.h"
 void CBC_CommonCharacterSetECI::initialize() {}
diff --git a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
index d5f97029f4..1bf9f57981 100644
--- a/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonDecoderResult.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../qrcode/BC_QRCoderErrorCorrectionLevel.h"
-#include "../pdf417/BC_PDF417ResultMetadata.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
 #include "BC_CommonDecoderResult.h"
 CBC_CommonDecoderResult::CBC_CommonDecoderResult() {}
 void CBC_CommonDecoderResult::Init(const CFX_ByteArray& rawBytes,
diff --git a/xfa/src/fxbarcode/common/BC_CommonECI.cpp b/xfa/src/fxbarcode/common/BC_CommonECI.cpp
index 08cddc90a6..d9f918b025 100644
--- a/xfa/src/fxbarcode/common/BC_CommonECI.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonECI.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_CommonECI.h"
 #include "BC_CommonCharacterSetECI.h"
 CBC_CommonECI::CBC_CommonECI(int32_t value) {
diff --git a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
index 8a4687036e..3fd2e4a893 100644
--- a/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
+++ b/xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_CommonPerspectiveTransform.h"
 CBC_CommonPerspectiveTransform::CBC_CommonPerspectiveTransform(FX_FLOAT a11,
                                                                FX_FLOAT a21,
diff --git a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
index 5a15c36f01..24c17712cc 100644
--- a/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
+++ b/xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Binarizer.h"
-#include "../BC_LuminanceSource.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Binarizer.h"
+#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
 #include "BC_CommonBitMatrix.h"
 #include "BC_CommonBitArray.h"
 #include "BC_GlobalHistogramBinarizer.h"
diff --git a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
index 368a12efd7..a01eaee3ac 100644
--- a/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
+++ b/xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "BC_WhiteRectangleDetector.h"
-#include "BC_CommonBitMatrix.h"
-#include "../BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 const int32_t CBC_WhiteRectangleDetector::INIT_SIZE = 30;
 const int32_t CBC_WhiteRectangleDetector::CORR = 1;
 CBC_WhiteRectangleDetector::CBC_WhiteRectangleDetector(
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
index c2ddd0f69f..a14a2d9cb5 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_ReedSolomonGF256.h"
 #include "BC_ReedSolomonGF256Poly.h"
 #include "BC_ReedSolomon.h"
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
index b072309a86..4ee87a4fa7 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_ReedSolomonGF256.h"
 #include "BC_ReedSolomonGF256Poly.h"
 #include "BC_ReedSolomonDecoder.h"
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
index d862e9a931..0957ca51b7 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_ReedSolomonGF256Poly.h"
 #include "BC_ReedSolomonGF256.h"
 CBC_ReedSolomonGF256* CBC_ReedSolomonGF256::QRCodeFild = NULL;
diff --git a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
index b94508f900..f87cd5ba86 100644
--- a/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
+++ b/xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256Poly.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_ReedSolomonGF256.h"
 #include "BC_ReedSolomonGF256Poly.h"
 CBC_ReedSolomonGF256Poly::CBC_ReedSolomonGF256Poly(CBC_ReedSolomonGF256* field,
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
index 3663b9f84e..2c25c7a8b7 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_ASCIIEncoder.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Dimension.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp
index 9df28e1b5b..14f35ab70c 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_Base256Encoder.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Dimension.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
index 7e58d8ef06..b2b003848c 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_C40Encoder.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Dimension.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
index 52738a1527..1989c8d2f4 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixBitMatrixParser.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_DataMatrixVersion.h"
 #include "BC_DataMatrixBitMatrixParser.h"
 CBC_DataMatrixBitMatrixParser::CBC_DataMatrixBitMatrixParser() {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
index ef9f5582b6..0f3239d552 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDataBlock.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_DataMatrixVersion.h"
 #include "BC_DataMatrixDataBlock.h"
 CBC_DataMatrixDataBlock::~CBC_DataMatrixDataBlock() {}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
index 8ac6468b3a..1938fb4bb4 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecodedBitStreamParser.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonDecoderResult.h"
-#include "../common/BC_CommonBitSource.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
+#include "xfa/src/fxbarcode/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',
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
index 5767c95555..8d886201cd 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDecoder.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
-#include "../common/reedsolomon/BC_ReedSolomonDecoder.h"
-#include "../common/reedsolomon/BC_ReedSolomonGF256.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 #include "BC_DataMatrixDecoder.h"
 #include "BC_DataMatrixBitMatrixParser.h"
 #include "BC_DataMatrixVersion.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
index 641d2761bb..c930f0e45d 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixDetector.cpp
@@ -20,13 +20,13 @@
  * limitations under the License.
  */
 
-#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 "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/common/BC_WhiteRectangleDetector.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h"
 #include "BC_DataMatrixDetector.h"
 const int32_t CBC_DataMatrixDetector::INTEGERS[5] = {0, 1, 2, 3, 4};
 CBC_DataMatrixDetector::CBC_DataMatrixDetector(CBC_CommonBitMatrix* image)
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
index 4c4be46176..9c0c367b75 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixReader.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_BinaryBitmap.h"
-#include "../BC_Reader.h"
-#include "../qrcode/BC_QRDetectorResult.h"
-#include "../common/BC_CommonDecoderResult.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
+#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
 #include "BC_DataMatrixDecoder.h"
 #include "BC_DataMatrixDetector.h"
 #include "BC_DataMatrixReader.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
index d6176be909..93cb541dbf 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixSymbolInfo144.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
index 69257b1b06..d4af9c6d3e 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixVersion.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_DataMatrixVersion.h"
 CFX_PtrArray* CBC_DataMatrixVersion::VERSIONS = NULL;
 void CBC_DataMatrixVersion::Initialize() {
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
index d2f2507729..22a04b1ab0 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DataMatrixWriter.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#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 "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
 #include "BC_Encoder.h"
 #include "BC_DefaultPlacement.h"
 #include "BC_SymbolShapeHint.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
index 86c2a80210..076657b6ff 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_DefaultPlacement.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_Encoder.h"
 #include "BC_DefaultPlacement.h"
 CBC_DefaultPlacement::CBC_DefaultPlacement(CFX_WideString codewords,
diff --git a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
index 60b796a196..a0a999fb99 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_EdifactEncoder.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
-#include "../BC_Dimension.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp
index 4858e19fb8..38beb6c87f 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_Encoder.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_Encoder.h"
 CBC_Encoder::CBC_Encoder() {}
 CBC_Encoder::~CBC_Encoder() {}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp
index 8b3093c836..9823642818 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_EncoderContext.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Dimension.h"
-#include "../BC_UtilCodingConvert.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
+#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
index ffb52350c9..dff07db8e3 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_ErrorCorrection.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
index 4a0e09528b..0b14ef3595 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_HighLevelEncoder.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Dimension.h"
-#include "../BC_UtilCodingConvert.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
+#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
index b6a19328a8..985eb7be38 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolInfo.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Dimension.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
index d0f0e45846..f3c3d1d6f6 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_SymbolShapeHint.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_SymbolShapeHint.h"
 CBC_SymbolShapeHint::CBC_SymbolShapeHint() {}
 CBC_SymbolShapeHint::~CBC_SymbolShapeHint() {}
diff --git a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
index ecd20cd5e5..0a6b381c79 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_TextEncoder.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
-#include "../BC_Dimension.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp
index a15362f542..690a3245b0 100644
--- a/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp
+++ b/xfa/src/fxbarcode/datamatrix/BC_X12Encoder.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
-#include "../BC_Dimension.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/BC_Dimension.h"
 #include "BC_Encoder.h"
 #include "BC_SymbolShapeHint.h"
 #include "BC_SymbolInfo.h"
diff --git a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
index 6e4798b666..61448d21e7 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDReader.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Reader.h"
-#include "../BC_BinaryBitmap.h"
-#include "../common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "BC_OneDReader.h"
 const int32_t CBC_OneDReader::INTEGER_MATH_SHIFT = 8;
 const int32_t CBC_OneDReader::PATTERN_MATCH_RESULT_SCALE_FACTOR = 1 << 8;
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
index 67bfd80995..b6ef6749b8 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimReader.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Reader.h"
-#include "../common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "BC_OneDReader.h"
 #include "BC_OneDimReader.h"
 const int32_t CBC_OneDimReader::MAX_AVG_VARIANCE = (int32_t)(256 * 0.48f);
diff --git a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
index 662e773af3..8f4b226e8c 100644
--- a/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OneDimWriter.cpp
@@ -24,9 +24,9 @@
 
 #include <memory>
 
-#include "../BC_Writer.h"
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 
 CBC_OneDimWriter::CBC_OneDimWriter() {
   m_locTextLoc = BC_TEXT_LOC_BELOWEMBED;
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
index 010406be8d..a2177fd699 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#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"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/oned/BC_OneDReader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCode39Reader.h"
+#include "xfa/src/fxbarcode/oned/BC_OnedCodaBarReader.h"
 const FX_CHAR* CBC_OnedCodaBarReader::ALPHABET_STRING =
     "0123456789-$:/.+ABCDTN";
 const int32_t CBC_OnedCodaBarReader::CHARACTER_ENCODINGS[22] = {
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
index a2e27faff8..9c76ca78ba 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCodaBarWriter.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Writer.h"
-#include "../BC_Reader.h"
-#include "../common/BC_CommonBitMatrix.h"
-#include "../common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "BC_OneDReader.h"
 #include "BC_OneDimWriter.h"
 #include "BC_OnedCodaBarReader.h"
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
index c1f74c8a61..601baa2a4c 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Reader.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Reader.h"
-#include "../common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "BC_OneDReader.h"
 #include "BC_OnedCode128Reader.h"
 const int32_t CBC_OnedCode128Reader::CODE_PATTERNS[107][7] = {
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp
index bdea697841..118d426cf4 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode128Writer.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Writer.h"
-#include "../BC_Reader.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
 #include "BC_OneDReader.h"
 #include "BC_OneDimWriter.h"
 #include "BC_OnedCode128Reader.h"
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
index 99484493f3..a5b77ed13f 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Reader.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Reader.h"
-#include "../common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "BC_OneDReader.h"
 #include "BC_OnedCode39Reader.h"
 const FX_CHAR* CBC_OnedCode39Reader::ALPHABET_STRING =
diff --git a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp
index cd01d93b8a..d90cde1973 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedCode39Writer.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Writer.h"
-#include "../BC_Reader.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_OneDReader.h"
 #include "BC_OneDimWriter.h"
 #include "BC_OnedCode39Reader.h"
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp
index 74c4cd9826..f822c3c4b0 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Reader.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Reader.h"
-#include "../common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "BC_OneDReader.h"
 #include "BC_OneDimReader.h"
 #include "BC_OnedEAN13Reader.h"
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
index 0e38ab283b..3e5e9dd104 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN13Writer.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Writer.h"
-#include "../BC_Reader.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
 #include "BC_OneDReader.h"
 #include "BC_OneDimReader.h"
 #include "BC_OneDimWriter.h"
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp
index d860bbe9e7..6dbe046098 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Reader.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Reader.h"
-#include "../common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "BC_OneDReader.h"
 #include "BC_OneDimReader.h"
 #include "BC_OnedEAN8Reader.h"
diff --git a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
index fcf781fd60..f26486d461 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedEAN8Writer.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Writer.h"
-#include "../BC_Reader.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_OneDReader.h"
 #include "BC_OneDimWriter.h"
 #include "BC_OneDimReader.h"
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
index d02e2a2966..7acb0ad698 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAReader.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Reader.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
 #include "BC_OneDReader.h"
 #include "BC_OneDimReader.h"
 #include "BC_OnedEAN13Reader.h"
diff --git a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
index b3f9dc3f86..2934ed97e0 100644
--- a/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
+++ b/xfa/src/fxbarcode/oned/BC_OnedUPCAWriter.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_Writer.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Writer.h"
 #include "BC_OneDimWriter.h"
 #include "BC_OnedEAN13Writer.h"
 #include "BC_OnedUPCAWriter.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
index a3db95ddf5..b506862b63 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Compaction.h"
 #include "BC_PDF417BarcodeRow.h"
 #include "BC_PDF417BarcodeMatrix.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index 2386ba4e2e..dadfbb2413 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417BarcodeRow.h"
 #include "BC_PDF417BarcodeMatrix.h"
 CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
index 44d71aaec1..ed0136efb8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417BarcodeMetadata.h"
 CBC_BarcodeMetadata::CBC_BarcodeMetadata(int32_t columnCount,
                                          int32_t rowCountUpperPart,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
index 82e5834c55..e472f0ef3a 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417BarcodeRow.h"
 CBC_BarcodeRow::CBC_BarcodeRow(int32_t width) {
   m_row.SetSize(width);
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
index 2bb3c45a18..e33193199f 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Common.h"
 #include "BC_PDF417BarcodeValue.h"
 CBC_BarcodeValue::CBC_BarcodeValue() {}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
index c1a7394103..02d9316f64 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_ResultPoint.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_PDF417BoundingBox.h"
 CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image,
                                  CBC_ResultPoint* topLeft,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
index b4e61a3f8a..c53591b211 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Codeword.h"
 int32_t CBC_Codeword::BARCODE_ROW_UNKNOWN = -1;
 CBC_Codeword::CBC_Codeword(int32_t startX,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
index f61c523f8a..97840bf2d8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Common.h"
 #include "BC_PDF417CodewordDecoder.h"
 #define SYMBOL_TABLE_Length 2787
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
index 1a3c3eb300..059229a4bf 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Common.h"
 int32_t CBC_PDF417Common::NUMBER_OF_CODEWORDS = 929;
 int32_t CBC_PDF417Common::MAX_CODEWORDS_IN_BARCODE = NUMBER_OF_CODEWORDS - 1;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
index 261d07a0cd..f9c0afd234 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Compaction.h"
 CBC_Compaction::CBC_Compaction() {}
 CBC_Compaction::~CBC_Compaction() {}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
index ba822ce1d2..1628f68db7 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
@@ -24,9 +24,9 @@
 
 #include <stdlib.h>
 
-#include "../BC_DecoderResult.h"
-#include "../barcode.h"
-#include "../common/BC_CommonDecoderResult.h"
+#include "xfa/src/fxbarcode/BC_DecoderResult.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
 #include "BC_PDF417ResultMetadata.h"
 #include "third_party/bigint/BigIntegerLibrary.hh"
 
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
index 47b6794fb0..23c2aacc39 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Codeword.h"
 #include "BC_PDF417BarcodeMetadata.h"
 #include "BC_PDF417BoundingBox.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
index 9252c33011..6c1abd23da 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Codeword.h"
 #include "BC_PDF417BoundingBox.h"
 #include "BC_PDF417DetectionResultColumn.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
index 0a0067c758..5091d4e55e 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 #include "BC_PDF417BarcodeMetadata.h"
 #include "BC_PDF417BoundingBox.h"
 #include "BC_PDF417Codeword.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
index 3f0532ac4b..3732a7506d 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_ResultPoint.h"
-#include "../BC_BinaryBitmap.h"
-#include "../common/BC_CommonBitMatrix.h"
-#include "../common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
 #include "BC_PDF417DetectorResult.h"
 #include "BC_PDF417Detector.h"
 #define INTERGER_MAX 2147483647
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
index 6f6b3a8cf1..00feaf0dc0 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
-#include "../BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 #include "BC_PDF417DetectorResult.h"
 CBC_PDF417DetectorResult::CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits,
                                                    CFX_PtrArray* points) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
index 2746ebe703..b60f5fd28f 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Dimensions.h"
 CBC_Dimensions::CBC_Dimensions(int32_t minCols,
                                int32_t maxCols,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
index 9e0351fd35..86b9044ea9 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Common.h"
 #include "BC_PDF417ECModulusPoly.h"
 #include "BC_PDF417ECModulusGF.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
index d9952c64d1..9d31944ef8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Common.h"
 #include "BC_PDF417ECModulusPoly.h"
 #include "BC_PDF417ECModulusGF.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
index 2e06fdb7d7..cc4976d210 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Common.h"
 #include "BC_PDF417ECModulusGF.h"
 #include "BC_PDF417ECModulusPoly.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
index b0518c6f2c..97a073fbbd 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417ErrorCorrection.h"
 int32_t CBC_PDF417ErrorCorrection::EC_COEFFICIENTS[][2500] = {
     {27, 917},
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
index 6a8beaab20..d2cee6f93f 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
@@ -22,8 +22,8 @@
 
 #include "BC_PDF417HighLevelEncoder.h"
 
-#include "../BC_UtilCodingConvert.h"
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417Compaction.h"
 #include "third_party/bigint/BigIntegerLibrary.hh"
 
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
index 36e9a7d793..4e0f3c962b 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "../../../../core/include/fxcrt/fx_basic.h"
-#include "../../../../testing/fx_string_testhelpers.h"
+#include "core/include/fxcrt/fx_basic.h"
+#include "testing/fx_string_testhelpers.h"
 #include "BC_PDF417HighLevelEncoder.h"
 
 TEST(PDF417HighLevelEncoder, EncodeHighLevel) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
index f970d700dc..f9664e47be 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
@@ -20,16 +20,16 @@
  * limitations under the License.
  */
 
-#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 "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/BC_DecoderResult.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_PDF417DetectorResult.h"
 #include "BC_PDF417Detector.h"
 #include "BC_PDF417DetectorResult.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
index 2cd5b251ac..538ae5120b 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_PDF417ResultMetadata.h"
 CBC_PDF417ResultMetadata::CBC_PDF417ResultMetadata() {}
 CBC_PDF417ResultMetadata::~CBC_PDF417ResultMetadata() {}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
index a34213c153..2d2ea8fa8d 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_DecoderResult.h"
-#include "../BC_ResultPoint.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_DecoderResult.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_PDF417Codeword.h"
 #include "BC_PDF417Common.h"
 #include "BC_PDF417BarcodeValue.h"
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
index d922889b3d..b61ba1094b 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_TwoDimWriter.h"
-#include "../common/BC_CommonBitArray.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitArray.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_PDF417Compaction.h"
 #include "BC_PDF417.h"
 #include "BC_PDF417BarcodeMatrix.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
index 16e8a9accd..dfc6148910 100644
--- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 #include "BC_QRFinderPattern.h"
 #include "BC_FinderPatternInfo.h"
 CBC_QRFinderPatternInfo::CBC_QRFinderPatternInfo(CFX_PtrArray* patternCenters) {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
index 79066fe83e..e5bbb7d9c8 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 #include "BC_QRAlignmentPattern.h"
 CBC_QRAlignmentPattern::CBC_QRAlignmentPattern(FX_FLOAT posX,
                                                FX_FLOAT posY,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
index f504517d44..a2c01c2fce 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_ResultPoint.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_QRAlignmentPattern.h"
 #include "BC_QRAlignmentPatternFinder.h"
 CBC_QRAlignmentPatternFinder::CBC_QRAlignmentPatternFinder(
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
index ad8bd566bf..5428902883 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_QRCoderVersion.h"
 #include "BC_QRCoderFormatInformation.h"
 #include "BC_QRDataMask.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
index 05635917bd..8de9ef7e80 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
@@ -20,16 +20,16 @@
  * limitations under the License.
  */
 
-#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 "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/BC_LuminanceSource.h"
+#include "xfa/src/fxbarcode/BC_BufferedImageLuminanceSource.h"
+#include "xfa/src/fxbarcode/BC_Binarizer.h"
+#include "xfa/src/fxbarcode/BC_BinaryBitmap.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/common/BC_GlobalHistogramBinarizer.h"
+#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 #include "BC_QRCodeReader.h"
 #include "BC_QRCodeReader.h"
 #include "BC_QRCoderMode.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
index 2621abeb63..0d3096c4ae 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
@@ -20,10 +20,10 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_TwoDimWriter.h"
-#include "../BC_Reader.h"
-#include "../common/BC_CommonByteMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_TwoDimWriter.h"
+#include "xfa/src/fxbarcode/BC_Reader.h"
+#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
 #include "BC_QRCodeWriter.h"
 #include "BC_QRCoderEncoder.h"
 #include "BC_QRCoder.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h
index 51272f65f6..6cdd1e9c15 100644
--- a/xfa/src/fxbarcode/qrcode/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 "xfa/src/fxbarcode/BC_TwoDimWriter.h"
 class CBC_TwoDimWriter;
 class CBC_MultiBarCodes;
 class CBC_QRCoderWriter;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
index 3569c1c2ec..9d2553d4e0 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonByteMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
 #include "BC_QRCoderErrorCorrectionLevel.h"
 #include "BC_QRCoderMode.h"
 #include "BC_QRCoder.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
index 21c2f09637..825d527388 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_QRCoderBitVector.h"
 CBC_QRCoderBitVector::CBC_QRCoderBitVector() {
   m_sizeInBits = 0;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
index 7c23ce68ff..4990a157b0 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonByteArray.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h"
 #include "BC_QRCoderBlockPair.h"
 CBC_QRCoderBlockPair::CBC_QRCoderBlockPair(
     CBC_CommonByteArray* data,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
index 78e7a89f18..7815c99aee 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#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 "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonDecoder.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 #include "BC_QRBitMatrixParser.h"
 #include "BC_QRDataBlock.h"
 #include "BC_QRDecodedBitStreamParser.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
index c3633afaa8..bfb1c6455b 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_QRCoderECB.h"
 CBC_QRCoderECB::CBC_QRCoderECB(int32_t count, int32_t dataCodeWords) {
   m_dataCodeWords = dataCodeWords;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
index 8489106d82..c5c32222f6 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_QRCoderECB.h"
 #include "BC_QRCoderECBlocks.h"
 CBC_QRCoderECBlocks::CBC_QRCoderECBlocks(int32_t ecCodeWordsPerBlock,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index bbdaa0b93b..2610db95dc 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#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 "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
+#include "xfa/src/fxbarcode/common/BC_CommonByteArray.h"
+#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomon.h"
+#include "xfa/src/fxbarcode/common/reedsolomon/BC_ReedSolomonGF256.h"
 #include "BC_QRCoder.h"
 #include "BC_QRCoderEncoder.h"
 #include "BC_QRCoderMode.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
index 52265000c1..330a992361 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_QRCoderErrorCorrectionLevel.h"
 CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::L = NULL;
 CBC_QRCoderErrorCorrectionLevel* CBC_QRCoderErrorCorrectionLevel::M = NULL;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
index 7f605c3ea5..f2fe512d43 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_QRCoderErrorCorrectionLevel.h"
 #include "BC_QRCoderFormatInformation.h"
 const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_MASK_QR = 0X5412;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
index e63f0237ef..ac1b74b5a0 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonByteMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
 #include "BC_QRCoderErrorCorrectionLevel.h"
 #include "BC_QRCoder.h"
 #include "BC_QRCoderMaskUtil.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
index 3c663c7b69..8c66717d84 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonByteMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonByteMatrix.h"
 #include "BC_QRCoderErrorCorrectionLevel.h"
 #include "BC_QRCoder.h"
 #include "BC_QRCoderMaskUtil.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
index 7481a8ec67..f122627986 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_QRCoderVersion.h"
 #include "BC_QRCoderMode.h"
 CBC_QRCoderMode* CBC_QRCoderMode::sBYTE = NULL;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
index dde09ee564..15b99fbb6a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../utils.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/utils.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_QRCoderECB.h"
 #include "BC_QRCoderFormatInformation.h"
 #include "BC_QRCoderErrorCorrectionLevel.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
index 0a265c9d04..b4a7b53258 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
+#include "xfa/src/fxbarcode/barcode.h"
 #include "BC_QRCoderECBlocks.h"
 #include "BC_QRCoderECB.h"
 #include "BC_QRDataBlock.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
index 79b6db39a9..f825ce4766 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_QRDataMask.h"
 static int32_t N_DATA_MASKS = 0;
 CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
index 26180ceff4..c9a9222506 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
@@ -20,12 +20,12 @@
  * limitations under the License.
  */
 
-#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 "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitSource.h"
+#include "xfa/src/fxbarcode/common/BC_CommonECI.h"
+#include "xfa/src/fxbarcode/common/BC_CommonCharacterSetECI.h"
+#include "xfa/src/fxbarcode/common/BC_CommonDecoderResult.h"
 #include "BC_QRCoderMode.h"
 #include "BC_QRDecodedBitStreamParser.h"
 const FX_CHAR* CBC_QRDecodedBitStreamParser::UTF_8 = "utf8";
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
index 70edfeff40..1b799114b4 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonBitMatrix.h"
-#include "../BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 #include "BC_QRFinderPattern.h"
 #include "BC_QRCoderVersion.h"
 #include "BC_FinderPatternInfo.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
index 561c10a3ab..55656c48fd 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_ResultPoint.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_QRDetectorResult.h"
 CBC_QRDetectorResult::CBC_QRDetectorResult(CBC_CommonBitMatrix* bits,
                                            CFX_PtrArray* points)
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
index f9fdfbd2cf..0ff97e21b7 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
@@ -20,8 +20,8 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
 #include "BC_QRFinderPattern.h"
 CBC_QRFinderPattern::CBC_QRFinderPattern(FX_FLOAT x,
                                          FX_FLOAT posY,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
index fc82584370..69614f0710 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../BC_ResultPoint.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/BC_ResultPoint.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_QRFinderPatternFinder.h"
 #include "BC_FinderPatternInfo.h"
 #include "BC_QRFinderPattern.h"
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
index 1bc85f1a12..b06be55f7e 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
@@ -20,9 +20,9 @@
  * limitations under the License.
  */
 
-#include "../barcode.h"
-#include "../common/BC_CommonPerspectiveTransform.h"
-#include "../common/BC_CommonBitMatrix.h"
+#include "xfa/src/fxbarcode/barcode.h"
+#include "xfa/src/fxbarcode/common/BC_CommonPerspectiveTransform.h"
+#include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
 #include "BC_QRGridSampler.h"
 CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler;
 CBC_QRGridSampler::CBC_QRGridSampler() {}
author	Lei Zhang <thestig@chromium.org>	2016-01-08 15:44:36 -0800
committer	Lei Zhang <thestig@chromium.org>	2016-01-08 15:44:36 -0800
commit	c909ce872d999a17ffd44afdc88caf2de43e6cba (patch)
tree	6427a1392c01f78c7c859910f93fbaf55d7fb1c2 /xfa/src/fxbarcode
parent	b8e1ab27372cdb5d8c83e57e004032f0d72715db (diff)
download	pdfium-c909ce872d999a17ffd44afdc88caf2de43e6cba.tar.xz