Expand all paths to be based off pdfium/ directory

This CL runs a script over the source and updates the include files to be
a full path from the pdfium/ directory.

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

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

39 files changed, 68 insertions, 69 deletions

diff --git a/core/src/fxcodec/codec/fx_codec.cpp b/core/src/fxcodec/codec/fx_codec.cpp
index 82a6ae67da..17e665d608 100644
--- a/core/src/fxcodec/codec/fx_codec.cpp
+++ b/core/src/fxcodec/codec/fx_codec.cpp
@@ -9,9 +9,9 @@
 #include <cmath>
 #include <utility>
 
-#include "codec_int.h"
 #include "core/include/fxcrt/fx_ext.h"
 #include "core/include/fxcrt/fx_safe_types.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 #include "third_party/base/logging.h"
 
 CCodec_ModuleMgr::CCodec_ModuleMgr()
diff --git a/core/src/fxcodec/codec/fx_codec_bmp.cpp b/core/src/fxcodec/codec/fx_codec_bmp.cpp
index 2396f36c1a..4e5fef0d1d 100644
--- a/core/src/fxcodec/codec/fx_codec_bmp.cpp
+++ b/core/src/fxcodec/codec/fx_codec_bmp.cpp
@@ -6,7 +6,7 @@
 
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
-#include "codec_int.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 #include "core/src/fxcodec/lbmp/fx_bmp.h"
 struct FXBMP_Context {
   bmp_decompress_struct_p bmp_ptr;
diff --git a/core/src/fxcodec/codec/fx_codec_fax.cpp b/core/src/fxcodec/codec/fx_codec_fax.cpp
index b198e74784..cacbc71456 100644
--- a/core/src/fxcodec/codec/fx_codec_fax.cpp
+++ b/core/src/fxcodec/codec/fx_codec_fax.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 
 namespace {
 
diff --git a/core/src/fxcodec/codec/fx_codec_flate.cpp b/core/src/fxcodec/codec/fx_codec_flate.cpp
index ce7c9ade03..faffebda28 100644
--- a/core/src/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/src/fxcodec/codec/fx_codec_flate.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "codec_int.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 
 #include <algorithm>
 #include <memory>
diff --git a/core/src/fxcodec/codec/fx_codec_gif.cpp b/core/src/fxcodec/codec/fx_codec_gif.cpp
index d61ccc6f70..4c60a0392c 100644
--- a/core/src/fxcodec/codec/fx_codec_gif.cpp
+++ b/core/src/fxcodec/codec/fx_codec_gif.cpp
@@ -6,7 +6,7 @@
 
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
-#include "codec_int.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 #include "core/src/fxcodec/lgif/fx_gif.h"
 struct FXGIF_Context {
   gif_decompress_struct_p gif_ptr;
diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp
index 7ae59a6510..c2129eaef2 100644
--- a/core/src/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/src/fxcodec/codec/fx_codec_icc.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 
 const FX_DWORD N_COMPONENT_LAB = 3;
diff --git a/core/src/fxcodec/codec/fx_codec_jbig.cpp b/core/src/fxcodec/codec/fx_codec_jbig.cpp
index 8c7f1bcc7a..0e39e19bc9 100644
--- a/core/src/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jbig.cpp
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 
 // Holds per-document JBig2 related data.
 class JBig2DocumentContext : public CFX_DestructObject {
diff --git a/core/src/fxcodec/codec/fx_codec_jpeg.cpp b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
index 4f0494691c..14cc194db4 100644
--- a/core/src/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpeg.cpp
@@ -6,10 +6,10 @@
 
 #include <setjmp.h>
 
-#include "codec_int.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_safe_types.h"
 #include "core/include/fxge/fx_dib.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
index c185d224f0..4ace3ad220 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -8,10 +8,10 @@
 #include <limits>
 #include <vector>
 
-#include "codec_int.h"
 #include "core/include/fpdfapi/fpdf_resource.h"
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxcrt/fx_safe_types.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 #include "third_party/libopenjpeg20/openjpeg.h"
 
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
index 4139fbde3b..c472ef18c6 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_unittest.cpp
@@ -6,7 +6,7 @@
 
 #include <limits>
 
-#include "codec_int.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 #include "testing/fx_string_testhelpers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/core/src/fxcodec/codec/fx_codec_png.cpp b/core/src/fxcodec/codec/fx_codec_png.cpp
index 32b0d3d48f..0df3455522 100644
--- a/core/src/fxcodec/codec/fx_codec_png.cpp
+++ b/core/src/fxcodec/codec/fx_codec_png.cpp
@@ -8,7 +8,7 @@
 
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
-#include "codec_int.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/src/fxcodec/codec/fx_codec_progress.cpp b/core/src/fxcodec/codec/fx_codec_progress.cpp
index 5dbc19b4b6..1165f7f1d6 100644
--- a/core/src/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/src/fxcodec/codec/fx_codec_progress.cpp
@@ -6,7 +6,7 @@
 
 #include "core/include/fxge/fx_dib.h"
 #include "core/include/fxcodec/fx_codec.h"
-#include "fx_codec_progress.h"
+#include "core/src/fxcodec/codec/fx_codec_progress.h"
 void CFXCODEC_WeightTable::Calc(int dest_len,
                                 int dest_min,
                                 int dest_max,
diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp
index cfdc5feb97..38c2af6287 100644
--- a/core/src/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/src/fxcodec/codec/fx_codec_tiff.cpp
@@ -6,7 +6,7 @@
 
 #include "core/include/fxcodec/fx_codec.h"
 #include "core/include/fxge/fx_dib.h"
-#include "codec_int.h"
+#include "core/src/fxcodec/codec/codec_int.h"
 
 extern "C" {
 #include "third_party/libtiff/tiffiop.h"
diff --git a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp
index 3a2f26df77..9e32304f41 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_ArithDecoder.h"
+#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
 
-#include "JBig2_BitStream.h"
 #include "core/include/fxcrt/fx_basic.h"
+#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
 
 namespace {
 
diff --git a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
index 6ee255af1b..b3f9911141 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_ArithIntDecoder.h"
+#include "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h"
 
 #include "core/include/fxcrt/fx_basic.h"
 
diff --git a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h
index dc3cb11904..4909ce48f8 100644
--- a/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h
+++ b/core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h
@@ -9,8 +9,8 @@
 
 #include <vector>
 
-#include "JBig2_ArithDecoder.h"
 #include "core/include/fxcrt/fx_system.h"
+#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
 
 class CJBig2_ArithIntDecoder {
  public:
diff --git a/core/src/fxcodec/jbig2/JBig2_BitStream.cpp b/core/src/fxcodec/jbig2/JBig2_BitStream.cpp
index 42b1e642dc..5e99e80e7c 100644
--- a/core/src/fxcodec/jbig2/JBig2_BitStream.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_BitStream.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_BitStream.h"
+#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
 
 #include <algorithm>
 
diff --git a/core/src/fxcodec/jbig2/JBig2_Context.h b/core/src/fxcodec/jbig2/JBig2_Context.h
index dd63bcd1b0..ff62062c1f 100644
--- a/core/src/fxcodec/jbig2/JBig2_Context.h
+++ b/core/src/fxcodec/jbig2/JBig2_Context.h
@@ -11,11 +11,11 @@
 #include <memory>
 #include <utility>
 
-#include "JBig2_List.h"
-#include "JBig2_Page.h"
-#include "JBig2_Segment.h"
 #include "core/include/fpdfapi/fpdf_objects.h"
 #include "core/include/fxcodec/fx_codec_def.h"
+#include "core/src/fxcodec/jbig2/JBig2_List.h"
+#include "core/src/fxcodec/jbig2/JBig2_Page.h"
+#include "core/src/fxcodec/jbig2/JBig2_Segment.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_GRDProc;
diff --git a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp
index 803e4a70d4..cf0f60405c 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_GrdProc.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_GrdProc.h"
+#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
 
 #include <memory>
 
-#include "JBig2_ArithDecoder.h"
-#include "JBig2_BitStream.h"
-#include "JBig2_Image.h"
 #include "core/include/fxcodec/fx_codec.h"
+#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 CJBig2_GRDProc::CJBig2_GRDProc()
     : m_loopIndex(0),
diff --git a/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp
index e1c5e19fa6..eaa9a76608 100644
--- a/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_GrrdProc.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_GrrdProc.h"
+#include "core/src/fxcodec/jbig2/JBig2_GrrdProc.h"
 
 #include <memory>
 
-#include "JBig2_ArithDecoder.h"
-#include "JBig2_BitStream.h"
-#include "JBig2_Image.h"
+#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 CJBig2_Image* CJBig2_GRRDProc::decode(CJBig2_ArithDecoder* pArithDecoder,
                                       JBig2ArithCtx* grContext) {
diff --git a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp b/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp
index 5871efb16d..42b3b59142 100644
--- a/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_GsidProc.cpp
@@ -4,15 +4,15 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_GsidProc.h"
+#include "core/src/fxcodec/jbig2/JBig2_GsidProc.h"
 
 #include <memory>
 
-#include "JBig2_BitStream.h"
-#include "JBig2_GrdProc.h"
-#include "JBig2_Image.h"
-#include "JBig2_List.h"
 #include "core/include/fxcrt/fx_basic.h"
+#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
+#include "core/src/fxcodec/jbig2/JBig2_Image.h"
+#include "core/src/fxcodec/jbig2/JBig2_List.h"
 
 FX_DWORD* CJBig2_GSIDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
                                         JBig2ArithCtx* gbContext,
diff --git a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp
index 377af58dfa..d49cab92e5 100644
--- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_HtrdProc.cpp
@@ -4,12 +4,12 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_HtrdProc.h"
+#include "core/src/fxcodec/jbig2/JBig2_HtrdProc.h"
 
 #include <memory>
 
-#include "JBig2_GsidProc.h"
 #include "core/include/fxcrt/fx_basic.h"
+#include "core/src/fxcodec/jbig2/JBig2_GsidProc.h"
 
 CJBig2_Image* CJBig2_HTRDProc::decode_Arith(CJBig2_ArithDecoder* pArithDecoder,
                                             JBig2ArithCtx* gbContext,
diff --git a/core/src/fxcodec/jbig2/JBig2_HtrdProc.h b/core/src/fxcodec/jbig2/JBig2_HtrdProc.h
index 30e038058c..f66ad75eca 100644
--- a/core/src/fxcodec/jbig2/JBig2_HtrdProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_HtrdProc.h
@@ -8,8 +8,7 @@
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_HTRDPROC_H_
 
 #include "core/include/fxcrt/fx_system.h"
-
-#include "JBig2_Image.h"
+#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_BitStream;
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
index 4cbecd017a..093d2abadb 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_HuffmanDecoder.h"
+#include "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h"
 
-#include "JBig2_Define.h"
+#include "core/src/fxcodec/jbig2/JBig2_Define.h"
 
 CJBig2_HuffmanDecoder::CJBig2_HuffmanDecoder(CJBig2_BitStream* pStream)
     : m_pStream(pStream) {
diff --git a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
index e15e891060..85b393bd41 100644
--- a/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
+++ b/core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h
@@ -6,8 +6,8 @@
 
 #ifndef _JBIG2_HUFFMAN_DECODER_H_
 #define _JBIG2_HUFFMAN_DECODER_H_
-#include "JBig2_BitStream.h"
-#include "JBig2_HuffmanTable.h"
+#include "core/src/fxcodec/jbig2/JBig2_BitStream.h"
+#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
 class CJBig2_HuffmanDecoder {
  public:
   explicit CJBig2_HuffmanDecoder(CJBig2_BitStream* pStream);
diff --git a/core/src/fxcodec/jbig2/JBig2_Image.cpp b/core/src/fxcodec/jbig2/JBig2_Image.cpp
index 074458744d..16e4243e3b 100644
--- a/core/src/fxcodec/jbig2/JBig2_Image.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_Image.cpp
@@ -6,9 +6,9 @@
 
 #include <limits.h>
 
-#include "JBig2_Image.h"
 #include "core/include/fxcrt/fx_coordinates.h"
 #include "core/include/fxcrt/fx_safe_types.h"
+#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 CJBig2_Image::CJBig2_Image(int32_t w, int32_t h) {
   m_nWidth = w;
diff --git a/core/src/fxcodec/jbig2/JBig2_Image.h b/core/src/fxcodec/jbig2/JBig2_Image.h
index c47d275cf7..e7b0779816 100644
--- a/core/src/fxcodec/jbig2/JBig2_Image.h
+++ b/core/src/fxcodec/jbig2/JBig2_Image.h
@@ -7,7 +7,7 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_IMAGE_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_IMAGE_H_
 
-#include "JBig2_Define.h"
+#include "core/src/fxcodec/jbig2/JBig2_Define.h"
 
 enum JBig2ComposeOp {
   JBIG2_COMPOSE_OR = 0,
diff --git a/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp b/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp
index b32daa0de7..aa78954aaa 100644
--- a/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_PatternDict.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_PatternDict.h"
+#include "core/src/fxcodec/jbig2/JBig2_PatternDict.h"
 
 #include "core/include/fxcrt/fx_memory.h"
 
diff --git a/core/src/fxcodec/jbig2/JBig2_PatternDict.h b/core/src/fxcodec/jbig2/JBig2_PatternDict.h
index 43250f9163..ac8e062535 100644
--- a/core/src/fxcodec/jbig2/JBig2_PatternDict.h
+++ b/core/src/fxcodec/jbig2/JBig2_PatternDict.h
@@ -6,8 +6,8 @@
 
 #ifndef _JBIG2_PATTERN_DICT_H_
 #define _JBIG2_PATTERN_DICT_H_
-#include "JBig2_Define.h"
-#include "JBig2_Image.h"
+#include "core/src/fxcodec/jbig2/JBig2_Define.h"
+#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 class CJBig2_PatternDict {
  public:
   CJBig2_PatternDict();
diff --git a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp b/core/src/fxcodec/jbig2/JBig2_PddProc.cpp
index 179077466c..ba4755ce59 100644
--- a/core/src/fxcodec/jbig2/JBig2_PddProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_PddProc.cpp
@@ -4,13 +4,13 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_PddProc.h"
+#include "core/src/fxcodec/jbig2/JBig2_PddProc.h"
 
 #include <memory>
 
-#include "JBig2_GrdProc.h"
-#include "JBig2_Image.h"
-#include "JBig2_PatternDict.h"
+#include "core/src/fxcodec/jbig2/JBig2_GrdProc.h"
+#include "core/src/fxcodec/jbig2/JBig2_Image.h"
+#include "core/src/fxcodec/jbig2/JBig2_PatternDict.h"
 
 CJBig2_PatternDict* CJBig2_PDDProc::decode_Arith(
     CJBig2_ArithDecoder* pArithDecoder,
diff --git a/core/src/fxcodec/jbig2/JBig2_SddProc.h b/core/src/fxcodec/jbig2/JBig2_SddProc.h
index 77ac049baf..b01ce2fd66 100644
--- a/core/src/fxcodec/jbig2/JBig2_SddProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_SddProc.h
@@ -9,8 +9,8 @@
 
 #include <vector>
 
-#include "JBig2_ArithDecoder.h"
 #include "core/include/fxcrt/fx_system.h"
+#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
 
 class CJBig2_BitStream;
 class CJBig2_HuffmanTable;
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.cpp b/core/src/fxcodec/jbig2/JBig2_Segment.cpp
index 41eeafee9e..21fa4d4572 100644
--- a/core/src/fxcodec/jbig2/JBig2_Segment.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_Segment.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_Segment.h"
+#include "core/src/fxcodec/jbig2/JBig2_Segment.h"
 
 #include "core/include/fxcrt/fx_memory.h"
 
diff --git a/core/src/fxcodec/jbig2/JBig2_Segment.h b/core/src/fxcodec/jbig2/JBig2_Segment.h
index 4aef27289a..f9e454b4a2 100644
--- a/core/src/fxcodec/jbig2/JBig2_Segment.h
+++ b/core/src/fxcodec/jbig2/JBig2_Segment.h
@@ -7,10 +7,10 @@
 #ifndef _JBIG2_SEGMENT_H_
 #define _JBIG2_SEGMENT_H_
 
-#include "JBig2_Define.h"
-#include "JBig2_HuffmanTable.h"
-#include "JBig2_PatternDict.h"
-#include "JBig2_SymbolDict.h"
+#include "core/src/fxcodec/jbig2/JBig2_Define.h"
+#include "core/src/fxcodec/jbig2/JBig2_HuffmanTable.h"
+#include "core/src/fxcodec/jbig2/JBig2_PatternDict.h"
+#include "core/src/fxcodec/jbig2/JBig2_SymbolDict.h"
 
 #define JBIG2_GET_INT32(buf) \
   (((buf)[0] << 24) | ((buf)[1] << 16) | ((buf)[2] << 8) | (buf)[3])
diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
index 1e949c5d26..5db77250f0 100644
--- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_SymbolDict.h"
+#include "core/src/fxcodec/jbig2/JBig2_SymbolDict.h"
 
-#include "JBig2_Image.h"
 #include "core/include/fxcrt/fx_memory.h"
+#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 CJBig2_SymbolDict::CJBig2_SymbolDict() {
 }
diff --git a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h
index 6f6b303640..5880a83bef 100644
--- a/core/src/fxcodec/jbig2/JBig2_SymbolDict.h
+++ b/core/src/fxcodec/jbig2/JBig2_SymbolDict.h
@@ -10,9 +10,9 @@
 #include <memory>
 #include <vector>
 
-#include "JBig2_ArithDecoder.h"
-#include "JBig2_List.h"
 #include "core/include/fxcrt/fx_basic.h"
+#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/src/fxcodec/jbig2/JBig2_List.h"
 
 class CJBig2_Image;
 
diff --git a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp b/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp
index e3fd47894e..963c7b1f76 100644
--- a/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp
+++ b/core/src/fxcodec/jbig2/JBig2_TrdProc.cpp
@@ -4,14 +4,14 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "JBig2_TrdProc.h"
+#include "core/src/fxcodec/jbig2/JBig2_TrdProc.h"
 
 #include <memory>
 
-#include "JBig2_ArithDecoder.h"
-#include "JBig2_ArithIntDecoder.h"
-#include "JBig2_GrrdProc.h"
-#include "JBig2_HuffmanDecoder.h"
+#include "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h"
+#include "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.h"
+#include "core/src/fxcodec/jbig2/JBig2_GrrdProc.h"
+#include "core/src/fxcodec/jbig2/JBig2_HuffmanDecoder.h"
 
 CJBig2_Image* CJBig2_TRDProc::decode_Huffman(CJBig2_BitStream* pStream,
                                              JBig2ArithCtx* grContext) {
diff --git a/core/src/fxcodec/jbig2/JBig2_TrdProc.h b/core/src/fxcodec/jbig2/JBig2_TrdProc.h
index 9e0802cde8..423b42f758 100644
--- a/core/src/fxcodec/jbig2/JBig2_TrdProc.h
+++ b/core/src/fxcodec/jbig2/JBig2_TrdProc.h
@@ -7,8 +7,8 @@
 #ifndef CORE_SRC_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
 #define CORE_SRC_FXCODEC_JBIG2_JBIG2_TRDPROC_H_
 
-#include "JBig2_Image.h"
 #include "core/include/fxcrt/fx_system.h"
+#include "core/src/fxcodec/jbig2/JBig2_Image.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_ArithIaidDecoder;
diff --git a/core/src/fxcodec/lbmp/fx_bmp.cpp b/core/src/fxcodec/lbmp/fx_bmp.cpp
index 388daa434f..bfcf2f4722 100644
--- a/core/src/fxcodec/lbmp/fx_bmp.cpp
+++ b/core/src/fxcodec/lbmp/fx_bmp.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fx_bmp.h"
+#include "core/src/fxcodec/lbmp/fx_bmp.h"
 
 #include <algorithm>
 
diff --git a/core/src/fxcodec/lgif/fx_gif.cpp b/core/src/fxcodec/lgif/fx_gif.cpp
index c00b7a74b2..0be7caad12 100644
--- a/core/src/fxcodec/lgif/fx_gif.cpp
+++ b/core/src/fxcodec/lgif/fx_gif.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "fx_gif.h"
+#include "core/src/fxcodec/lgif/fx_gif.h"
 void CGifLZWDecoder::Input(uint8_t* src_buf, FX_DWORD src_size) {
   next_in = src_buf;
   avail_in = src_size;