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, 96 insertions, 96 deletions

diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
index f1d11785a1..c4e9463420 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417.cpp
@@ -21,12 +21,12 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Compaction.h"
-#include "BC_PDF417BarcodeRow.h"
-#include "BC_PDF417BarcodeMatrix.h"
-#include "BC_PDF417ErrorCorrection.h"
-#include "BC_PDF417HighLevelEncoder.h"
-#include "BC_PDF417.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h"
 int32_t CBC_PDF417::START_PATTERN = 0x1fea8;
 int32_t CBC_PDF417::STOP_PATTERN = 0x3fa29;
 int32_t CBC_PDF417::CODEWORD_TABLE[][1000] = {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
index 137e335f38..76e8e18504 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417BarcodeRow.h"
-#include "BC_PDF417BarcodeMatrix.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
 CBC_BarcodeMatrix::CBC_BarcodeMatrix(int32_t height, int32_t width) {
   m_matrix.SetSize(height + 2);
   for (int32_t i = 0, matrixLength = m_matrix.GetSize(); i < matrixLength;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
index 10fcf27f52..4b53e8c458 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417BarcodeMetadata.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
 CBC_BarcodeMetadata::CBC_BarcodeMetadata(int32_t columnCount,
                                          int32_t rowCountUpperPart,
                                          int32_t rowCountLowerPart,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
index c5e95e6695..0fcbb9c836 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417BarcodeRow.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeRow.h"
 CBC_BarcodeRow::CBC_BarcodeRow(int32_t width) {
   m_row.SetSize(width);
   m_currentLocation = 0;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
index 8bb5b25750..4d9ea60a18 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Common.h"
-#include "BC_PDF417BarcodeValue.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
 CBC_BarcodeValue::CBC_BarcodeValue() {}
 CBC_BarcodeValue::~CBC_BarcodeValue() {}
 void CBC_BarcodeValue::setValue(int32_t value) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
index 73fa1327ef..1a999bbae4 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.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_PDF417BoundingBox.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
 CBC_BoundingBox::CBC_BoundingBox(CBC_CommonBitMatrix* image,
                                  CBC_ResultPoint* topLeft,
                                  CBC_ResultPoint* bottomLeft,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
index 92b413f6d6..cd6787554e 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Codeword.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
 int32_t CBC_Codeword::BARCODE_ROW_UNKNOWN = -1;
 CBC_Codeword::CBC_Codeword(int32_t startX,
                            int32_t endX,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
index 821cf07825..d8adabbf58 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.cpp
@@ -21,8 +21,8 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Common.h"
-#include "BC_PDF417CodewordDecoder.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417CodewordDecoder.h"
 #define SYMBOL_TABLE_Length 2787
 #define Float_MAX_VALUE 2147483647
 FX_FLOAT CBC_PDF417CodewordDecoder::RATIOS_TABLE[2787][8] = {{0}};
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
index 62eaa7c25b..074325ec51 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Common.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Common.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
 int32_t CBC_PDF417Common::NUMBER_OF_CODEWORDS = 929;
 int32_t CBC_PDF417Common::MAX_CODEWORDS_IN_BARCODE = NUMBER_OF_CODEWORDS - 1;
 int32_t CBC_PDF417Common::MIN_ROWS_IN_BARCODE = 3;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
index 2b61b0de32..22481c4d05 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.cpp
@@ -21,6 +21,6 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Compaction.h"
+#include "xfa/src/fxbarcode/pdf417/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 4a3e2447f4..27d483be85 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.cpp
@@ -20,14 +20,14 @@
  * limitations under the License.
  */
 
-#include "BC_PDF417DecodedBitStreamParser.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DecodedBitStreamParser.h"
 
 #include <stdlib.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 "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
 #include "third_party/bigint/BigIntegerLibrary.hh"
 
 #define TEXT_COMPACTION_MODE_LATCH 900
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
index ecb5f75134..bd92a06007 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.cpp
@@ -21,13 +21,13 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Codeword.h"
-#include "BC_PDF417BarcodeMetadata.h"
-#include "BC_PDF417BoundingBox.h"
-#include "BC_PDF417DetectionResultColumn.h"
-#include "BC_PDF417Common.h"
-#include "BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "BC_PDF417DetectionResult.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.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_PDF417Common.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResult.h"
 int32_t CBC_DetectionResult::ADJUST_ROW_NUMBER_SKIP = 2;
 CBC_DetectionResult::CBC_DetectionResult(CBC_BarcodeMetadata* barcodeMetadata,
                                          CBC_BoundingBox* boundingBox) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
index 53bdfbed9b..b03ef7d39e 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Codeword.h"
-#include "BC_PDF417BoundingBox.h"
-#include "BC_PDF417DetectionResultColumn.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
 int32_t CBC_DetectionResultColumn::MAX_NEARBY_DISTANCE = 5;
 CBC_DetectionResultColumn::CBC_DetectionResultColumn(
     CBC_BoundingBox* boundingBox) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
index 4f681d1e7d..ad3bd8e216 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.cpp
@@ -22,13 +22,13 @@
 
 #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"
-#include "BC_PDF417BarcodeValue.h"
-#include "BC_PDF417Common.h"
-#include "BC_PDF417DetectionResultColumn.h"
-#include "BC_PDF417DetectionResultRowIndicatorColumn.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMetadata.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BoundingBox.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Codeword.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeValue.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultColumn.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectionResultRowIndicatorColumn.h"
 CBC_DetectionResultRowIndicatorColumn::CBC_DetectionResultRowIndicatorColumn(
     CBC_BoundingBox* boundingBox,
     FX_BOOL isLeft)
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
index 4ad85ca479..40f00b42ee 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Detector.cpp
@@ -25,8 +25,8 @@
 #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"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Detector.h"
 #define INTERGER_MAX 2147483647
 int32_t CBC_Detector::INDEXES_START_PATTERN[] = {0, 4, 1, 5};
 int32_t CBC_Detector::INDEXES_STOP_PATTERN[] = {6, 2, 7, 3};
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
index 7fe76e70be..7b1329e5ac 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.cpp
@@ -23,7 +23,7 @@
 #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"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.h"
 CBC_PDF417DetectorResult::CBC_PDF417DetectorResult(CBC_CommonBitMatrix* bits,
                                                    CFX_PtrArray* points) {
   m_bits = bits;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
index 7bd5c2d2f2..d0d7fab8da 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Dimensions.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Dimensions.h"
 CBC_Dimensions::CBC_Dimensions(int32_t minCols,
                                int32_t maxCols,
                                int32_t minRows,
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
index cf02449701..b814f32dca 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECErrorCorrection.cpp
@@ -21,10 +21,10 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Common.h"
-#include "BC_PDF417ECModulusPoly.h"
-#include "BC_PDF417ECModulusGF.h"
-#include "BC_PDF417ECErrorCorrection.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.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"
 CBC_PDF417ECModulusGF* CBC_PDF417ECErrorCorrection::m_field = NULL;
 void CBC_PDF417ECErrorCorrection::Initialize(int32_t& e) {
   m_field =
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
index 8f6a8cacc4..b0b3cb69e8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Common.h"
-#include "BC_PDF417ECModulusPoly.h"
-#include "BC_PDF417ECModulusGF.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
 CBC_PDF417ECModulusGF* CBC_PDF417ECModulusGF::PDF417_GF = NULL;
 void CBC_PDF417ECModulusGF::Initialize(int32_t& e) {
   PDF417_GF =
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
index 710b0c703d..aad247a615 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.cpp
@@ -21,9 +21,9 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Common.h"
-#include "BC_PDF417ECModulusGF.h"
-#include "BC_PDF417ECModulusPoly.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Common.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusGF.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ECModulusPoly.h"
 CBC_PDF417ECModulusPoly::CBC_PDF417ECModulusPoly(CBC_PDF417ECModulusGF* field,
                                                  CFX_Int32Array& coefficients,
                                                  int32_t& e) {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
index 47fa4976d6..920860bb42 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417ErrorCorrection.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ErrorCorrection.h"
 int32_t CBC_PDF417ErrorCorrection::EC_COEFFICIENTS[][2500] = {
     {27, 917},
     {522, 568, 723, 809},
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
index 4025c26bb5..52b1f8a84c 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.cpp
@@ -20,11 +20,11 @@
  * limitations under the License.
  */
 
-#include "BC_PDF417HighLevelEncoder.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
 
 #include "xfa/src/fxbarcode/BC_UtilCodingConvert.h"
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417Compaction.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
 #include "third_party/bigint/BigIntegerLibrary.hh"
 
 #define SUBMODE_ALPHA 0
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
index 4e0f3c962b..57a12e222d 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder_unittest.cpp
@@ -5,7 +5,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "core/include/fxcrt/fx_basic.h"
 #include "testing/fx_string_testhelpers.h"
-#include "BC_PDF417HighLevelEncoder.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417HighLevelEncoder.h"
 
 TEST(PDF417HighLevelEncoder, EncodeHighLevel) {
   // TODO(tsepez): implement test cases.
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
index 23595fbe03..556e6e1db8 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Reader.cpp
@@ -30,26 +30,26 @@
 #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"
-#include "BC_PDF417Codeword.h"
-#include "BC_PDF417Common.h"
-#include "BC_PDF417BarcodeValue.h"
-#include "BC_PDF417BarcodeMetadata.h"
-#include "BC_PDF417BoundingBox.h"
-#include "BC_PDF417DetectionResultColumn.h"
-#include "BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "BC_PDF417DetectionResult.h"
-#include "BC_PDF417DecodedBitStreamParser.h"
-#include "BC_PDF417CodewordDecoder.h"
-#include "BC_PDF417DecodedBitStreamParser.h"
-#include "BC_PDF417ECModulusPoly.h"
-#include "BC_PDF417ECModulusGF.h"
-#include "BC_PDF417ECErrorCorrection.h"
-#include "BC_PDF417DecodedBitStreamParser.h"
-#include "BC_PDF417ScanningDecoder.h"
-#include "BC_PDF417Reader.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417DetectorResult.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"
 #define Integer_MAX_VALUE 2147483647
 CBC_PDF417Reader::CBC_PDF417Reader() {}
 CBC_PDF417Reader::~CBC_PDF417Reader() {}
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
index 5230f0b505..09fbcef2e3 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.cpp
@@ -21,7 +21,7 @@
  */
 
 #include "xfa/src/fxbarcode/barcode.h"
-#include "BC_PDF417ResultMetadata.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417ResultMetadata.h"
 CBC_PDF417ResultMetadata::CBC_PDF417ResultMetadata() {}
 CBC_PDF417ResultMetadata::~CBC_PDF417ResultMetadata() {}
 int32_t CBC_PDF417ResultMetadata::getSegmentIndex() {
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
index 89b2d2865a..9ef37e6a14 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417ScanningDecoder.cpp
@@ -24,22 +24,22 @@
 #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"
-#include "BC_PDF417BarcodeMetadata.h"
-#include "BC_PDF417BoundingBox.h"
-#include "BC_PDF417DetectionResultColumn.h"
-#include "BC_PDF417DetectionResultRowIndicatorColumn.h"
-#include "BC_PDF417DetectionResult.h"
-#include "BC_PDF417DecodedBitStreamParser.h"
-#include "BC_PDF417CodewordDecoder.h"
-#include "BC_PDF417DecodedBitStreamParser.h"
-#include "BC_PDF417ECModulusPoly.h"
-#include "BC_PDF417ECModulusGF.h"
-#include "BC_PDF417ECErrorCorrection.h"
-#include "BC_PDF417DecodedBitStreamParser.h"
-#include "BC_PDF417ScanningDecoder.h"
+#include "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"
 int32_t CBC_PDF417ScanningDecoder::CODEWORD_SKEW_SIZE = 2;
 int32_t CBC_PDF417ScanningDecoder::MAX_ERRORS = 3;
 int32_t CBC_PDF417ScanningDecoder::MAX_EC_CODEWORDS = 512;
diff --git a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
index 3a921dae83..b832c8a7c2 100644
--- a/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
+++ b/xfa/src/fxbarcode/pdf417/BC_PDF417Writer.cpp
@@ -24,10 +24,10 @@
 #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"
-#include "BC_PDF417Writer.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Compaction.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417BarcodeMatrix.h"
+#include "xfa/src/fxbarcode/pdf417/BC_PDF417Writer.h"
 CBC_PDF417Writer::CBC_PDF417Writer() {
   m_bFixedSize = FALSE;
 }