Move include/fxcodec to fxcodec/include

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

49 files changed, 66 insertions, 55 deletions

diff --git a/BUILD.gn b/BUILD.gn
index 8007012a48..a2be53705e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -510,6 +510,9 @@ static_library("fxcodec") {
     "core/fxcodec/codec/fx_codec_jbig.cpp",
     "core/fxcodec/codec/fx_codec_jpeg.cpp",
     "core/fxcodec/codec/fx_codec_jpx_opj.cpp",
+    "core/fxcodec/include/fx_codec.h",
+    "core/fxcodec/include/fx_codec_def.h",
+    "core/fxcodec/include/fx_codec_flate.h",
     "core/fxcodec/jbig2/JBig2_ArithDecoder.cpp",
     "core/fxcodec/jbig2/JBig2_ArithDecoder.h",
     "core/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp",
@@ -549,9 +552,6 @@ static_library("fxcodec") {
     "core/fxcodec/jbig2/JBig2_SymbolDict.h",
     "core/fxcodec/jbig2/JBig2_TrdProc.cpp",
     "core/fxcodec/jbig2/JBig2_TrdProc.h",
-    "core/include/fxcodec/fx_codec.h",
-    "core/include/fxcodec/fx_codec_def.h",
-    "core/include/fxcodec/fx_codec_flate.h",
   ]
   include_dirs = []
   if (pdf_enable_xfa) {
diff --git a/core/fpdfapi/fpdf_basic_module.cpp b/core/fpdfapi/fpdf_basic_module.cpp
index b77d998ed8..2dfc9fb1f6 100644
--- a/core/fpdfapi/fpdf_basic_module.cpp
+++ b/core/fpdfapi/fpdf_basic_module.cpp
@@ -7,7 +7,7 @@
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
 
 #include "core/fpdfapi/ipdf_rendermodule.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp b/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp
index c5aa5e3905..b5dcd46235 100644
--- a/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_colorspace.cpp
@@ -15,7 +15,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_page/cpdf_image.cpp b/core/fpdfapi/fpdf_page/cpdf_image.cpp
index 2b662e1074..84f6853b58 100644
--- a/core/fpdfapi/fpdf_page/cpdf_image.cpp
+++ b/core/fpdfapi/fpdf_page/cpdf_image.cpp
@@ -15,8 +15,8 @@
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/fpdf_render/render_int.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 CPDF_Image::CPDF_Image(CPDF_Document* pDoc)
     : m_pDIBSource(nullptr),
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp
index 224602ebc7..2256fda585 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_colors.cpp
@@ -17,7 +17,7 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_stream_acc.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 namespace {
 
diff --git a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
index 183573aaa3..058ac338b2 100644
--- a/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
+++ b/core/fpdfapi/fpdf_page/fpdf_page_parser_old.cpp
@@ -27,9 +27,9 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_string.h"
 #include "core/fpdfapi/fpdf_parser/include/fpdf_parser_decode.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_ext.h"
 #include "core/fxcrt/include/fx_safe_types.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 CPDF_StreamParser::CPDF_StreamParser(const uint8_t* pData, uint32_t dwSize) {
   m_pBuf = pData;
diff --git a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
index 5d9254901a..0a7729fe4b 100644
--- a/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/fpdf_parser/fpdf_parser_decode.cpp
@@ -13,8 +13,8 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_array.h"
 #include "core/fpdfapi/fpdf_parser/include/cpdf_dictionary.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_ext.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "third_party/base/stl_util.h"
 
 #define _STREAM_MAX_SIZE_ 20 * 1024 * 1024
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
index 16c55c57af..efb55d928f 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_image.cpp
@@ -24,9 +24,9 @@
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_rendercontext.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_safe_types.h"
 #include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 FX_BOOL CPDF_RenderStatus::ProcessImage(const CPDF_ImageObject* pImageObj,
                                         const CFX_Matrix* pObj2Device) {
diff --git a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
index db1b8ccd71..7b88e84399 100644
--- a/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
+++ b/core/fpdfapi/fpdf_render/fpdf_render_loadimage.cpp
@@ -19,9 +19,9 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_safe_types.h"
 #include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 namespace {
 
diff --git a/core/fxcodec/codec/codec_int.h b/core/fxcodec/codec/codec_int.h
index 7f0aaef379..ed9bcac349 100644
--- a/core/fxcodec/codec/codec_int.h
+++ b/core/fxcodec/codec/codec_int.h
@@ -14,8 +14,8 @@
 #include <memory>
 #include <vector>
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcodec/jbig2/JBig2_Context.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "third_party/libopenjpeg20/openjpeg.h"  // For OPJ_SIZE_T.
 
 class CFX_IccProfileCache;
diff --git a/core/fxcodec/codec/fx_codec.cpp b/core/fxcodec/codec/fx_codec.cpp
index ef9414dbe5..77dd363c9d 100644
--- a/core/fxcodec/codec/fx_codec.cpp
+++ b/core/fxcodec/codec/fx_codec.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 #include <cmath>
 #include <utility>
diff --git a/core/fxcodec/codec/fx_codec_bmp.cpp b/core/fxcodec/codec/fx_codec_bmp.cpp
index 2dc537161b..0fed151217 100644
--- a/core/fxcodec/codec/fx_codec_bmp.cpp
+++ b/core/fxcodec/codec/fx_codec_bmp.cpp
@@ -5,9 +5,9 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcodec/lbmp/fx_bmp.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 struct FXBMP_Context {
   bmp_decompress_struct_p bmp_ptr;
   void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_fax.cpp b/core/fxcodec/codec/fx_codec_fax.cpp
index 6b90b15e51..898b0d0251 100644
--- a/core/fxcodec/codec/fx_codec_fax.cpp
+++ b/core/fxcodec/codec/fx_codec_fax.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 namespace {
 
diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp
index 2350eb1a88..16cde3e5ea 100644
--- a/core/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/fxcodec/codec/fx_codec_flate.cpp
@@ -9,9 +9,9 @@
 #include <algorithm>
 #include <memory>
 
+#include "core/fxcodec/include/fx_codec.h"
+#include "core/fxcodec/include/fx_codec_flate.h"
 #include "core/fxcrt/include/fx_ext.h"
-#include "core/include/fxcodec/fx_codec.h"
-#include "core/include/fxcodec/fx_codec_flate.h"
 #include "third_party/zlib_v128/zlib.h"
 
 extern "C" {
diff --git a/core/fxcodec/codec/fx_codec_gif.cpp b/core/fxcodec/codec/fx_codec_gif.cpp
index e1806a4001..5fc0d094d8 100644
--- a/core/fxcodec/codec/fx_codec_gif.cpp
+++ b/core/fxcodec/codec/fx_codec_gif.cpp
@@ -5,9 +5,9 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcodec/lgif/fx_gif.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 struct FXGIF_Context {
   gif_decompress_struct_p gif_ptr;
   void* parent_ptr;
diff --git a/core/fxcodec/codec/fx_codec_icc.cpp b/core/fxcodec/codec/fx_codec_icc.cpp
index 13280d7f49..74801e57a0 100644
--- a/core/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/fxcodec/codec/fx_codec_icc.cpp
@@ -5,7 +5,7 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 
 const uint32_t N_COMPONENT_LAB = 3;
diff --git a/core/fxcodec/codec/fx_codec_jbig.cpp b/core/fxcodec/codec/fx_codec_jbig.cpp
index ddcec6c6bb..96f6836190 100644
--- a/core/fxcodec/codec/fx_codec_jbig.cpp
+++ b/core/fxcodec/codec/fx_codec_jbig.cpp
@@ -7,7 +7,7 @@
 #include <list>
 
 #include "core/fxcodec/codec/codec_int.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 // Holds per-document JBig2 related data.
 class JBig2DocumentContext : public CFX_DestructObject {
diff --git a/core/fxcodec/codec/fx_codec_jpeg.cpp b/core/fxcodec/codec/fx_codec_jpeg.cpp
index 33ebf1ba20..9a2a0ee4a3 100644
--- a/core/fxcodec/codec/fx_codec_jpeg.cpp
+++ b/core/fxcodec/codec/fx_codec_jpeg.cpp
@@ -7,9 +7,9 @@
 #include <setjmp.h>
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_safe_types.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
index 18d2c8d827..85b0b767ac 100644
--- a/core/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -10,8 +10,8 @@
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_colorspace.h"
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_safe_types.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "third_party/lcms2-2.6/include/lcms2.h"
 #include "third_party/libopenjpeg20/openjpeg.h"
 
diff --git a/core/fxcodec/codec/fx_codec_png.cpp b/core/fxcodec/codec/fx_codec_png.cpp
index e625737e34..fd56c93393 100644
--- a/core/fxcodec/codec/fx_codec_png.cpp
+++ b/core/fxcodec/codec/fx_codec_png.cpp
@@ -7,8 +7,8 @@
 #include <algorithm>
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 extern "C" {
 #undef FAR
diff --git a/core/fxcodec/codec/fx_codec_progress.cpp b/core/fxcodec/codec/fx_codec_progress.cpp
index ebd69ae1e3..89e4b25dbb 100644
--- a/core/fxcodec/codec/fx_codec_progress.cpp
+++ b/core/fxcodec/codec/fx_codec_progress.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fxcodec/codec/fx_codec_progress.h"
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 void CFXCODEC_WeightTable::Calc(int dest_len,
                                 int dest_min,
diff --git a/core/fxcodec/codec/fx_codec_progress.h b/core/fxcodec/codec/fx_codec_progress.h
index 2b2ba28e16..e8e885b3b5 100644
--- a/core/fxcodec/codec/fx_codec_progress.h
+++ b/core/fxcodec/codec/fx_codec_progress.h
@@ -7,10 +7,10 @@
 #ifndef CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
 #define CORE_FXCODEC_CODEC_FX_CODEC_PROGRESS_H_
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_memory.h"
 #include "core/fxcrt/include/fx_system.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 #define FXCODEC_BLOCK_SIZE 4096
 #define FXCODEC_PNG_GAMMA 2.2
diff --git a/core/fxcodec/codec/fx_codec_tiff.cpp b/core/fxcodec/codec/fx_codec_tiff.cpp
index d445769714..f0f2ab2e96 100644
--- a/core/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/fxcodec/codec/fx_codec_tiff.cpp
@@ -5,8 +5,8 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "core/fxcodec/codec/codec_int.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 extern "C" {
 #include "third_party/libtiff/tiffiop.h"
diff --git a/core/include/fxcodec/DEPS b/core/fxcodec/include/DEPS
index 548eb61a3b..548eb61a3b 100644
--- a/core/include/fxcodec/DEPS
+++ b/core/fxcodec/include/DEPS
diff --git a/core/include/fxcodec/fx_codec.h b/core/fxcodec/include/fx_codec.h
index 9db5e8c34b..1c3922ee4f 100644
--- a/core/include/fxcodec/fx_codec.h
+++ b/core/fxcodec/include/fx_codec.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_H_
-#define CORE_INCLUDE_FXCODEC_FX_CODEC_H_
+#ifndef CORE_FXCODEC_INCLUDE_FX_CODEC_H_
+#define CORE_FXCODEC_INCLUDE_FX_CODEC_H_
 
 #include <map>
 #include <memory>
@@ -13,7 +13,7 @@
 
 #include "core/fxcrt/include/fx_basic.h"
 #include "core/fxcrt/include/fx_coordinates.h"  // For FX_RECT.
-#include "core/include/fxcodec/fx_codec_def.h"
+#include "core/fxcodec/include/fx_codec_def.h"
 
 class CFX_DIBSource;
 class CJPX_Decoder;
@@ -557,4 +557,4 @@ void FaxG4Decode(const uint8_t* src_buf,
                  int height,
                  int pitch);
 
-#endif  // CORE_INCLUDE_FXCODEC_FX_CODEC_H_
+#endif  // CORE_FXCODEC_INCLUDE_FX_CODEC_H_
diff --git a/core/include/fxcodec/fx_codec_def.h b/core/fxcodec/include/fx_codec_def.h
index 99ccf15f0f..fb1b5bcdac 100644
--- a/core/include/fxcodec/fx_codec_def.h
+++ b/core/fxcodec/include/fx_codec_def.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_
-#define CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_
+#ifndef CORE_FXCODEC_INCLUDE_FX_CODEC_DEF_H_
+#define CORE_FXCODEC_INCLUDE_FX_CODEC_DEF_H_
 
 enum FXCODEC_STATUS {
   FXCODEC_STATUS_ERROR = -1,
@@ -89,4 +89,4 @@ enum FXCODEC_RESUNIT {
 #define EXIFTAG_STRING_DATETIME 306
 #define EXIFTAG_STRING_COPYRIGHT 33432
 
-#endif  // CORE_INCLUDE_FXCODEC_FX_CODEC_DEF_H_
+#endif  // CORE_FXCODEC_INCLUDE_FX_CODEC_DEF_H_
diff --git a/core/include/fxcodec/fx_codec_flate.h b/core/fxcodec/include/fx_codec_flate.h
index a0d151d258..83e9281b48 100644
--- a/core/include/fxcodec/fx_codec_flate.h
+++ b/core/fxcodec/include/fx_codec_flate.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_INCLUDE_FXCODEC_FX_CODEC_FLATE_H_
-#define CORE_INCLUDE_FXCODEC_FX_CODEC_FLATE_H_
+#ifndef CORE_FXCODEC_INCLUDE_FX_CODEC_FLATE_H_
+#define CORE_FXCODEC_INCLUDE_FX_CODEC_FLATE_H_
 
 #include "third_party/zlib_v128/zlib.h"
 
@@ -30,4 +30,4 @@ void FPDFAPI_FlateEnd(void* context);
 }  // extern "C"
 #endif
 
-#endif  // CORE_INCLUDE_FXCODEC_FX_CODEC_FLATE_H_
+#endif  // CORE_FXCODEC_INCLUDE_FX_CODEC_FLATE_H_
diff --git a/core/fxcodec/jbig2/JBig2_Context.h b/core/fxcodec/jbig2/JBig2_Context.h
index 4a32e61489..fa68588a4a 100644
--- a/core/fxcodec/jbig2/JBig2_Context.h
+++ b/core/fxcodec/jbig2/JBig2_Context.h
@@ -12,10 +12,10 @@
 #include <utility>
 
 #include "core/fpdfapi/fpdf_parser/include/cpdf_object.h"
+#include "core/fxcodec/include/fx_codec_def.h"
 #include "core/fxcodec/jbig2/JBig2_List.h"
 #include "core/fxcodec/jbig2/JBig2_Page.h"
 #include "core/fxcodec/jbig2/JBig2_Segment.h"
-#include "core/include/fxcodec/fx_codec_def.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_GRDProc;
diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.cpp b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
index 5f3b47f659..2391fb2b07 100644
--- a/core/fxcodec/jbig2/JBig2_GrdProc.cpp
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.cpp
@@ -8,10 +8,10 @@
 
 #include <memory>
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcodec/jbig2/JBig2_ArithDecoder.h"
 #include "core/fxcodec/jbig2/JBig2_BitStream.h"
 #include "core/fxcodec/jbig2/JBig2_Image.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 CJBig2_GRDProc::CJBig2_GRDProc()
     : m_loopIndex(0),
diff --git a/core/fxcodec/jbig2/JBig2_GrdProc.h b/core/fxcodec/jbig2/JBig2_GrdProc.h
index f6a5448769..b24e2f36fa 100644
--- a/core/fxcodec/jbig2/JBig2_GrdProc.h
+++ b/core/fxcodec/jbig2/JBig2_GrdProc.h
@@ -7,9 +7,9 @@
 #ifndef CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
 #define CORE_FXCODEC_JBIG2_JBIG2_GRDPROC_H_
 
+#include "core/fxcodec/include/fx_codec_def.h"
 #include "core/fxcrt/include/fx_coordinates.h"
 #include "core/fxcrt/include/fx_system.h"
-#include "core/include/fxcodec/fx_codec_def.h"
 
 class CJBig2_ArithDecoder;
 class CJBig2_BitStream;
diff --git a/core/fxge/agg/fx_agg_driver.cpp b/core/fxge/agg/fx_agg_driver.cpp
index 62fb539239..811e65c4e9 100644
--- a/core/fxge/agg/fx_agg_driver.cpp
+++ b/core/fxge/agg/fx_agg_driver.cpp
@@ -8,10 +8,10 @@
 
 #include <algorithm>
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/ge/fx_text_int.h"
 #include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "third_party/agg23/agg_conv_dash.h"
 #include "third_party/agg23/agg_conv_stroke.h"
 #include "third_party/agg23/agg_curves.h"
diff --git a/core/fxge/dib/fx_dib_composite.cpp b/core/fxge/dib/fx_dib_composite.cpp
index 8b0b97c049..a9a3039ef7 100644
--- a/core/fxge/dib/fx_dib_composite.cpp
+++ b/core/fxge/dib/fx_dib_composite.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 const uint8_t _color_sqrt[256] = {
     0x00, 0x03, 0x07, 0x0B, 0x0F, 0x12, 0x16, 0x19, 0x1D, 0x20, 0x23, 0x26,
diff --git a/core/fxge/dib/fx_dib_convert.cpp b/core/fxge/dib/fx_dib_convert.cpp
index 5ed655afe2..7484620b8f 100644
--- a/core/fxge/dib/fx_dib_convert.cpp
+++ b/core/fxge/dib/fx_dib_convert.cpp
@@ -4,9 +4,9 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/include/fx_dib.h"
 #include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 class CFX_Palette {
  public:
diff --git a/core/fxge/dib/fx_dib_main.cpp b/core/fxge/dib/fx_dib_main.cpp
index 3c500ecb53..4503fd506f 100644
--- a/core/fxge/dib/fx_dib_main.cpp
+++ b/core/fxge/dib/fx_dib_main.cpp
@@ -8,9 +8,9 @@
 
 #include <limits.h>
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 FX_BOOL ConvertBuffer(FXDIB_Format dest_format,
                       uint8_t* dest_buf,
diff --git a/core/fxge/ge/fx_ge_ps.cpp b/core/fxge/ge/fx_ge_ps.cpp
index 0d8ccbf566..b4e9ed918a 100644
--- a/core/fxge/ge/fx_ge_ps.cpp
+++ b/core/fxge/ge/fx_ge_ps.cpp
@@ -6,8 +6,8 @@
 
 #include "core/fxge/include/fx_ge.h"
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/ge/fx_text_int.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 struct PSGlyph {
   CFX_Font* m_pFont;
diff --git a/core/fxge/ge/fx_ge_text.cpp b/core/fxge/ge/fx_ge_text.cpp
index 78d1c15687..8d6fecf7a1 100644
--- a/core/fxge/ge/fx_ge_text.cpp
+++ b/core/fxge/ge/fx_ge_text.cpp
@@ -4,10 +4,10 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/ge/fx_text_int.h"
 #include "core/fxge/include/fx_freetype.h"
 #include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
 
 #ifdef _SKIA_SUPPORT_
 #include "third_party/skia/include/core/SkStream.h"
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 1f8f086b2b..ba671c2511 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -5,7 +5,7 @@
 #include "core/fxge/include/fx_ge.h"
 
 #if defined(_SKIA_SUPPORT_)
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 
 #include "core/fpdfapi/fpdf_page/cpdf_shadingpattern.h"
 #include "core/fpdfapi/fpdf_page/pageint.h"
diff --git a/core/fxge/win32/fx_win32_device.cpp b/core/fxge/win32/fx_win32_device.cpp
index bfcda1547c..f83ac3277c 100644
--- a/core/fxge/win32/fx_win32_device.cpp
+++ b/core/fxge/win32/fx_win32_device.cpp
@@ -9,6 +9,7 @@
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_DESKTOP_
 #include <crtdbg.h>
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxge/agg/fx_agg_driver.h"
 #include "core/fxge/dib/dib_int.h"
 #include "core/fxge/ge/fx_text_int.h"
@@ -16,7 +17,6 @@
 #include "core/fxge/include/fx_ge_win32.h"
 #include "core/fxge/win32/dwrite_int.h"
 #include "core/fxge/win32/win32_int.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "third_party/base/stl_util.h"
 
 class CFX_Win32FallbackFontInfo final : public CFX_FolderFontInfo {
diff --git a/fpdfsdk/DEPS b/fpdfsdk/DEPS
index 9fa01ac925..514011d0b3 100644
--- a/fpdfsdk/DEPS
+++ b/fpdfsdk/DEPS
@@ -7,6 +7,7 @@ include_rules = [
   '+core/fpdfapi/fpdf_parser/include',
   '+core/fpdfapi/fpdf_render/include',
   '+core/fpdfdoc/include',
+  '+core/fxcodec/include',
   '+core/fxcrt/include',
   '+core/fxge/include',
   '+public',
diff --git a/fpdfsdk/fpdfview.cpp b/fpdfsdk/fpdfview.cpp
index 3f02feeadf..dec1059e1a 100644
--- a/fpdfsdk/fpdfview.cpp
+++ b/fpdfsdk/fpdfview.cpp
@@ -13,8 +13,8 @@
 #include "core/fpdfapi/fpdf_parser/include/cpdf_document.h"
 #include "core/fpdfapi/fpdf_render/include/cpdf_renderoptions.h"
 #include "core/fpdfapi/include/cpdf_modulemgr.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_safe_types.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "fpdfsdk/include/fsdk_define.h"
 #include "fpdfsdk/include/fsdk_mgr.h"
 #include "fpdfsdk/include/fsdk_rendercontext.h"
diff --git a/pdfium.gyp b/pdfium.gyp
index 1815f9d6f3..1d2fa0d6e7 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -522,9 +522,9 @@
         'third_party/third_party.gyp:fx_zlib',
       ],
       'sources': [
-        'core/include/fxcodec/fx_codec.h',
-        'core/include/fxcodec/fx_codec_def.h',
-        'core/include/fxcodec/fx_codec_flate.h',
+        'core/fxcodec/include/fx_codec.h',
+        'core/fxcodec/include/fx_codec_def.h',
+        'core/fxcodec/include/fx_codec_flate.h',
         'core/fxcodec/codec/codec_int.h',
         'core/fxcodec/codec/fx_codec.cpp',
         'core/fxcodec/codec/fx_codec_fax.cpp',
diff --git a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.cpp b/xfa/fxbarcode/BC_BufferedImageLuminanceSource.cpp
index 86b19c15af..91f4557a85 100644
--- a/xfa/fxbarcode/BC_BufferedImageLuminanceSource.cpp
+++ b/xfa/fxbarcode/BC_BufferedImageLuminanceSource.cpp
@@ -20,7 +20,7 @@
  * limitations under the License.
  */
 
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "xfa/fxbarcode/BC_BufferedImageLuminanceSource.h"
 #include "xfa/fxbarcode/BC_LuminanceSource.h"
 #include "xfa/fxbarcode/utils.h"
diff --git a/xfa/fxbarcode/DEPS b/xfa/fxbarcode/DEPS
new file mode 100644
index 0000000000..97ccb1faa6
--- /dev/null
+++ b/xfa/fxbarcode/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  '+core/fxcodec/include',
+]
diff --git a/xfa/fxfa/app/DEPS b/xfa/fxfa/app/DEPS
index 7c067f228f..7177840ec6 100644
--- a/xfa/fxfa/app/DEPS
+++ b/xfa/fxfa/app/DEPS
@@ -4,4 +4,5 @@ include_rules = [
   '+core/fpdfapi/fpdf_page/include',
   '+core/fpdfapi/fpdf_parser/include',
   '+core/fpdfdoc/include',
+  '+core/fxcodec/include',
 ]
diff --git a/xfa/fxfa/app/xfa_ffwidget.cpp b/xfa/fxfa/app/xfa_ffwidget.cpp
index 2b859ab83a..6f67654e96 100644
--- a/xfa/fxfa/app/xfa_ffwidget.cpp
+++ b/xfa/fxfa/app/xfa_ffwidget.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 
 #include "core/fpdfapi/fpdf_page/include/cpdf_pageobjectholder.h"
-#include "core/include/fxcodec/fx_codec.h"
+#include "core/fxcodec/include/fx_codec.h"
 #include "xfa/fxfa/app/xfa_textlayout.h"
 #include "xfa/fxfa/parser/cxfa_corner.h"
 #include "xfa/fxgraphics/cfx_color.h"
diff --git a/xfa/fxfa/parser/DEPS b/xfa/fxfa/parser/DEPS
new file mode 100644
index 0000000000..97ccb1faa6
--- /dev/null
+++ b/xfa/fxfa/parser/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  '+core/fxcodec/include',
+]
diff --git a/xfa/fxfa/parser/xfa_localemgr.cpp b/xfa/fxfa/parser/xfa_localemgr.cpp
index d040e0dd2b..828fcd8caa 100644
--- a/xfa/fxfa/parser/xfa_localemgr.cpp
+++ b/xfa/fxfa/parser/xfa_localemgr.cpp
@@ -6,9 +6,9 @@
 
 #include "xfa/fxfa/parser/xfa_localemgr.h"
 
+#include "core/fxcodec/include/fx_codec.h"
 #include "core/fxcrt/include/fx_xml.h"
 #include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec.h"
 #include "xfa/fxfa/fm2js/xfa_fm2jsapi.h"
 #include "xfa/fxfa/parser/xfa_docdata.h"
 #include "xfa/fxfa/parser/xfa_doclayout.h"
diff --git a/xfa/include/fxfa/DEPS b/xfa/include/fxfa/DEPS
new file mode 100644
index 0000000000..97ccb1faa6
--- /dev/null
+++ b/xfa/include/fxfa/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  '+core/fxcodec/include',
+]
diff --git a/xfa/include/fxfa/xfa_ffwidget.h b/xfa/include/fxfa/xfa_ffwidget.h
index 30ad6d250a..66e24f7043 100644
--- a/xfa/include/fxfa/xfa_ffwidget.h
+++ b/xfa/include/fxfa/xfa_ffwidget.h
@@ -9,8 +9,8 @@
 
 #include <vector>
 
+#include "core/fxcodec/include/fx_codec_def.h"
 #include "core/fxge/include/fx_ge.h"
-#include "core/include/fxcodec/fx_codec_def.h"
 #include "xfa/fxfa/parser/xfa_doclayout.h"
 #include "xfa/include/fxfa/fxfa.h"