Expand XFA includes to be relative to pdfium/.

This Cl updates the includes in the XFA directory to be relative to the
pdfium/ directory instead of the current directory.

This does not sort the includes as that is a larger IWYU task that will be
handled separately.

BUG=pdfium:65
R=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1723533002 .

27 files changed, 88 insertions, 88 deletions

diff --git a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
index 0142458b99..680806eafb 100644
--- a/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.cpp
@@ -22,8 +22,8 @@
 
 #include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "BC_QRFinderPattern.h"
-#include "BC_FinderPatternInfo.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h"
+#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h"
 CBC_QRFinderPatternInfo::CBC_QRFinderPatternInfo(CFX_PtrArray* patternCenters) {
   m_bottomLeft = (CBC_QRFinderPattern*)(*patternCenters)[0];
   m_topLeft = (CBC_QRFinderPattern*)(*patternCenters)[1];
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
index 960bdad64a..47e3197f76 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.cpp
@@ -22,7 +22,7 @@
 
 #include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "BC_QRAlignmentPattern.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h"
 CBC_QRAlignmentPattern::CBC_QRAlignmentPattern(FX_FLOAT posX,
                                                FX_FLOAT posY,
                                                FX_FLOAT estimateModuleSize)
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
index 396f272f3f..4e88215a58 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.cpp
@@ -23,8 +23,8 @@
 #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"
+#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPattern.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h"
 CBC_QRAlignmentPatternFinder::CBC_QRAlignmentPatternFinder(
     CBC_CommonBitMatrix* image,
     int32_t startX,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
index 339c5ab77c..db4f243fee 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.cpp
@@ -22,10 +22,10 @@
 
 #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"
-#include "BC_QRBitMatrixParser.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h"
 CBC_QRBitMatrixParser::CBC_QRBitMatrixParser() {}
 void CBC_QRBitMatrixParser::Init(CBC_CommonBitMatrix* bitMatrix, int32_t& e) {
   m_dimension = bitMatrix->GetDimension(e);
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
index a09ac1e892..d5effa0b66 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeReader.cpp
@@ -30,16 +30,16 @@
 #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"
-#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"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
 CBC_QRCodeReader::CBC_QRCodeReader() : m_decoder(NULL) {}
 void CBC_QRCodeReader::Init() {
   m_decoder = new CBC_QRCoderDecoder;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
index 39f9884d45..0506b4fb97 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.cpp
@@ -24,11 +24,11 @@
 #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"
-#include "BC_QRCodeReader.h"
-#include "BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCodeWriter.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCodeReader.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
 CBC_QRCodeWriter::CBC_QRCodeWriter() {
   m_bFixedSize = TRUE;
   m_iCorrectLevel = 1;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
index 9db8267280..fdc7a4e064 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoder.cpp
@@ -22,9 +22,9 @@
 
 #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"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h"
 CBC_QRCoder::CBC_QRCoder() {
   m_mode = NULL;
   m_ecLevel = NULL;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
index 605aacc79a..cfd50d135e 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_QRCoderBitVector.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h"
 CBC_QRCoderBitVector::CBC_QRCoderBitVector() {
   m_sizeInBits = 0;
   m_size = 32;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
index 59c1a637f3..ac20c03a6c 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.cpp
@@ -22,7 +22,7 @@
 
 #include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/common/BC_CommonByteArray.h"
-#include "BC_QRCoderBlockPair.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h"
 CBC_QRCoderBlockPair::CBC_QRCoderBlockPair(
     CBC_CommonByteArray* data,
     CBC_CommonByteArray* errorCorrection) {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
index 81bd220389..676f7e4971 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.cpp
@@ -25,12 +25,12 @@
 #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"
-#include "BC_QRCoderVersion.h"
-#include "BC_QRCoderFormatInformation.h"
-#include "BC_QRCoderDecoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRBitMatrixParser.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderDecoder.h"
 CBC_QRCoderDecoder::CBC_QRCoderDecoder() {
   m_rsDecoder = NULL;
 }
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
index b3fc1f78ff..91e2ba7fa4 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECB.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_QRCoderECB.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h"
 CBC_QRCoderECB::CBC_QRCoderECB(int32_t count, int32_t dataCodeWords) {
   m_dataCodeWords = dataCodeWords;
   m_count = count;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
index 0b2a2a6c28..c63ee63c5a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_QRCoderECB.h"
-#include "BC_QRCoderECBlocks.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
 CBC_QRCoderECBlocks::CBC_QRCoderECBlocks(int32_t ecCodeWordsPerBlock,
                                          CBC_QRCoderECB* ecBlocks) {
   m_ecCodeWordsPerBlock = ecCodeWordsPerBlock;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
index bb496cb0e5..74ce5316a1 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.cpp
@@ -28,16 +28,16 @@
 #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"
-#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"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderEncoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBlockPair.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h"
 const int32_t 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/qrcode/BC_QRCoderErrorCorrectionLevel.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
index 879351c40a..8d3f567cec 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/qrcode/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/qrcode/BC_QRCoderFormatInformation.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
index 729f351f3d..b4d21e3a2d 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_QRCoderErrorCorrectionLevel.h"
-#include "BC_QRCoderFormatInformation.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
 const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_MASK_QR = 0X5412;
 const int32_t CBC_QRCoderFormatInformation::FORMAT_INFO_DECODE_LOOKUP[32][2] = {
     {0x5412, 0x00}, {0x5125, 0x01}, {0x5E7C, 0x02}, {0x5B4B, 0x03},
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
index 8c4538a300..de2d428596 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.cpp
@@ -22,9 +22,9 @@
 
 #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"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
 CBC_QRCoderMaskUtil::CBC_QRCoderMaskUtil() {}
 CBC_QRCoderMaskUtil::~CBC_QRCoderMaskUtil() {}
 int32_t CBC_QRCoderMaskUtil::ApplyMaskPenaltyRule1(
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
index fd4d4b84ff..5bf02b9573 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.cpp
@@ -22,11 +22,11 @@
 
 #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"
-#include "BC_QRCoderMatrixUtil.h"
-#include "BC_QRCoderBitVector.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMaskUtil.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMatrixUtil.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h"
 const int32_t CBC_QRCoderMatrixUtil::POSITION_DETECTION_PATTERN[7][7] = {
     {1, 1, 1, 1, 1, 1, 1},
     {1, 0, 0, 0, 0, 0, 1},
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
index 738193a2b5..3e24c72cd1 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderMode.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_QRCoderVersion.h"
-#include "BC_QRCoderMode.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "xfa/src/fxbarcode/qrcode/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/qrcode/BC_QRCoderVersion.cpp b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
index 1798db760a..06686a918b 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.cpp
@@ -23,12 +23,12 @@
 #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"
-#include "BC_QRCoderBitVector.h"
-#include "BC_QRCoderECBlocks.h"
-#include "BC_QRCoderVersion.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderFormatInformation.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderErrorCorrectionLevel.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderBitVector.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
 const int32_t CBC_QRCoderVersion::VERSION_DECODE_INFO[] = {
     0x07C94, 0x085BC, 0x09A99, 0x0A4D3, 0x0BBF6, 0x0C762, 0x0D847,
     0x0E60D, 0x0F928, 0x10B78, 0x1145D, 0x12A17, 0x13532, 0x149A6,
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
index cf85c33d5d..4fca780590 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataBlock.cpp
@@ -21,10 +21,10 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_QRCoderECBlocks.h"
-#include "BC_QRCoderECB.h"
-#include "BC_QRDataBlock.h"
-#include "BC_QRCoderVersion.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECBlocks.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderECB.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDataBlock.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
 CBC_QRDataBlock::CBC_QRDataBlock(int32_t numDataCodewords,
                                  CFX_ByteArray* codewords)
     : m_numDataCodewords(numDataCodewords), m_codewords(codewords) {}
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
index 846374e3b3..dc4fddbbea 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDataMask.cpp
@@ -22,7 +22,7 @@
 
 #include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/common/BC_CommonBitMatrix.h"
-#include "BC_QRDataMask.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDataMask.h"
 static int32_t N_DATA_MASKS = 0;
 CFX_PtrArray* CBC_QRDataMask::DATA_MASKS = NULL;
 void CBC_QRDataMask::Initialize() {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
index 3aba699bce..4297253ccd 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.cpp
@@ -26,8 +26,8 @@
 #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"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderMode.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDecodedBitStreamParser.h"
 const FX_CHAR* 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', 'C', 'D', 'E',
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
index 44bbce3aab..96c156a892 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetector.cpp
@@ -25,14 +25,14 @@
 #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"
-#include "BC_QRGridSampler.h"
-#include "BC_QRAlignmentPatternFinder.h"
-#include "BC_QRFinderPatternFinder.h"
-#include "BC_QRDetectorResult.h"
-#include "BC_QRDetector.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRCoderVersion.h"
+#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRAlignmentPatternFinder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRDetector.h"
 CBC_QRDetector::CBC_QRDetector(CBC_CommonBitMatrix* image) : m_image(image) {}
 CBC_QRDetector::~CBC_QRDetector() {}
 CBC_QRDetectorResult* CBC_QRDetector::Detect(int32_t hints, int32_t& e) {
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
index 894204ef97..0d0ae9f034 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRDetectorResult.cpp
@@ -23,7 +23,7 @@
 #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"
+#include "xfa/src/fxbarcode/qrcode/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/qrcode/BC_QRFinderPattern.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
index 7d3e98feaa..205abe348a 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.cpp
@@ -22,7 +22,7 @@
 
 #include "xfa/src/fxbarcode/barcode.h"
 #include "xfa/src/fxbarcode/BC_ResultPoint.h"
-#include "BC_QRFinderPattern.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h"
 CBC_QRFinderPattern::CBC_QRFinderPattern(FX_FLOAT x,
                                          FX_FLOAT posY,
                                          FX_FLOAT estimatedModuleSize)
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
index 72edb53db7..5242f2c1e0 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.cpp
@@ -23,9 +23,9 @@
 #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"
+#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPatternFinder.h"
+#include "xfa/src/fxbarcode/qrcode/BC_FinderPatternInfo.h"
+#include "xfa/src/fxbarcode/qrcode/BC_QRFinderPattern.h"
 const int32_t CBC_QRFinderPatternFinder::CENTER_QUORUM = 2;
 const int32_t CBC_QRFinderPatternFinder::MIN_SKIP = 3;
 const int32_t CBC_QRFinderPatternFinder::MAX_MODULES = 57;
diff --git a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
index e762171a3f..088b3cbd7c 100644
--- a/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
+++ b/xfa/src/fxbarcode/qrcode/BC_QRGridSampler.cpp
@@ -23,7 +23,7 @@
 #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"
+#include "xfa/src/fxbarcode/qrcode/BC_QRGridSampler.h"
 CBC_QRGridSampler CBC_QRGridSampler::m_gridSampler;
 CBC_QRGridSampler::CBC_QRGridSampler() {}
 CBC_QRGridSampler::~CBC_QRGridSampler() {}