diff --git a/core/fpdfapi/page/cpdf_streamparser.cpp b/core/fpdfapi/page/cpdf_streamparser.cpp
index 0838a53..ce3879c 100644
--- a/core/fpdfapi/page/cpdf_streamparser.cpp
+++ b/core/fpdfapi/page/cpdf_streamparser.cpp
@@ -26,9 +26,9 @@
 #include "core/fpdfapi/parser/cpdf_string.h"
 #include "core/fpdfapi/parser/fpdf_parser_decode.h"
 #include "core/fpdfapi/parser/fpdf_parser_utility.h"
-#include "core/fxcodec/codec/scanlinedecoder.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcodec/jpeg/jpegmodule.h"
+#include "core/fxcodec/scanlinedecoder.h"
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "third_party/base/ptr_util.h"
diff --git a/core/fpdfapi/parser/fpdf_parser_decode.cpp b/core/fpdfapi/parser/fpdf_parser_decode.cpp
index 138c44e..0dccfbd 100644
--- a/core/fpdfapi/parser/fpdf_parser_decode.cpp
+++ b/core/fpdfapi/parser/fpdf_parser_decode.cpp
@@ -17,10 +17,10 @@
 #include "core/fpdfapi/parser/cpdf_array.h"
 #include "core/fpdfapi/parser/cpdf_dictionary.h"
 #include "core/fpdfapi/parser/fpdf_parser_utility.h"
-#include "core/fxcodec/codec/scanlinedecoder.h"
 #include "core/fxcodec/fax/faxmodule.h"
 #include "core/fxcodec/flate/flatemodule.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/scanlinedecoder.h"
 #include "core/fxcrt/fx_extension.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "third_party/base/numerics/safe_math.h"
diff --git a/core/fpdfapi/render/cpdf_dibbase.cpp b/core/fpdfapi/render/cpdf_dibbase.cpp
index 9ca46f8..6482a10 100644
--- a/core/fpdfapi/render/cpdf_dibbase.cpp
+++ b/core/fpdfapi/render/cpdf_dibbase.cpp
@@ -24,12 +24,12 @@
 #include "core/fpdfapi/render/cpdf_pagerendercache.h"
 #include "core/fpdfapi/render/cpdf_renderstatus.h"
 #include "core/fxcodec/basic/basicmodule.h"
-#include "core/fxcodec/codec/scanlinedecoder.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcodec/jbig2/jbig2module.h"
 #include "core/fxcodec/jpeg/jpegmodule.h"
 #include "core/fxcodec/jpx/cjpx_decoder.h"
 #include "core/fxcodec/jpx/jpxmodule.h"
+#include "core/fxcodec/scanlinedecoder.h"
 #include "core/fxcrt/cfx_fixedbufgrow.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
diff --git a/core/fxcodec/BUILD.gn b/core/fxcodec/BUILD.gn
index c964be9..c101bf2 100644
--- a/core/fxcodec/BUILD.gn
+++ b/core/fxcodec/BUILD.gn
@@ -10,11 +10,9 @@
   sources = [
     "basic/basicmodule.cpp",
     "basic/basicmodule.h",
-    "codec/cfx_codec_memory.cpp",
-    "codec/cfx_codec_memory.h",
-    "codec/codec_module_iface.h",
-    "codec/scanlinedecoder.cpp",
-    "codec/scanlinedecoder.h",
+    "cfx_codec_memory.cpp",
+    "cfx_codec_memory.h",
+    "codec_module_iface.h",
     "fax/faxmodule.cpp",
     "fax/faxmodule.h",
     "flate/flatemodule.cpp",
@@ -70,6 +68,8 @@
     "jpx/jpx_decode_utils.h",
     "jpx/jpxmodule.cpp",
     "jpx/jpxmodule.h",
+    "scanlinedecoder.cpp",
+    "scanlinedecoder.h",
   ]
   configs += [ "../../:pdfium_core_config" ]
   include_dirs = []
@@ -84,8 +84,8 @@
 
   if (pdf_enable_xfa) {
     sources += [
-      "codec/progressivedecoder.cpp",
-      "codec/progressivedecoder.h",
+      "progressivedecoder.cpp",
+      "progressivedecoder.h",
     ]
     if (pdf_enable_xfa_bmp) {
       sources += [
@@ -144,7 +144,7 @@
   pdfium_root_dir = "../../"
 
   if (pdf_enable_xfa) {
-    sources += [ "codec/progressivedecoder_unittest.cpp" ]
+    sources += [ "progressivedecoder_unittest.cpp" ]
     deps += [ "../fxge" ]
     if (pdf_enable_xfa_gif) {
       sources += [
diff --git a/core/fxcodec/basic/basicmodule.cpp b/core/fxcodec/basic/basicmodule.cpp
index 7bae674..1aadc6d 100644
--- a/core/fxcodec/basic/basicmodule.cpp
+++ b/core/fxcodec/basic/basicmodule.cpp
@@ -7,7 +7,7 @@
 #include <algorithm>
 #include <utility>
 
-#include "core/fxcodec/codec/scanlinedecoder.h"
+#include "core/fxcodec/scanlinedecoder.h"
 #include "third_party/base/ptr_util.h"
 
 namespace fxcodec {
diff --git a/core/fxcodec/bmp/bmpmodule.cpp b/core/fxcodec/bmp/bmpmodule.cpp
index 5cdb681..1987f08 100644
--- a/core/fxcodec/bmp/bmpmodule.cpp
+++ b/core/fxcodec/bmp/bmpmodule.cpp
@@ -9,7 +9,7 @@
 #include <utility>
 
 #include "core/fxcodec/bmp/cfx_bmpcontext.h"
-#include "core/fxcodec/codec/cfx_codec_memory.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxge/fx_dib.h"
 #include "third_party/base/ptr_util.h"
diff --git a/core/fxcodec/bmp/bmpmodule.h b/core/fxcodec/bmp/bmpmodule.h
index 70e265e..a8d1943 100644
--- a/core/fxcodec/bmp/bmpmodule.h
+++ b/core/fxcodec/bmp/bmpmodule.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <vector>
 
-#include "core/fxcodec/codec/codec_module_iface.h"
+#include "core/fxcodec/codec_module_iface.h"
 
 namespace fxcodec {
 
diff --git a/core/fxcodec/bmp/cfx_bmpdecompressor.cpp b/core/fxcodec/bmp/cfx_bmpdecompressor.cpp
index 082c3d0..34c03da 100644
--- a/core/fxcodec/bmp/cfx_bmpdecompressor.cpp
+++ b/core/fxcodec/bmp/cfx_bmpdecompressor.cpp
@@ -11,7 +11,7 @@
 #include <utility>
 
 #include "core/fxcodec/bmp/cfx_bmpcontext.h"
-#include "core/fxcodec/codec/cfx_codec_memory.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/fx_system.h"
diff --git a/core/fxcodec/codec/cfx_codec_memory.cpp b/core/fxcodec/cfx_codec_memory.cpp
similarity index 95%
rename from core/fxcodec/codec/cfx_codec_memory.cpp
rename to core/fxcodec/cfx_codec_memory.cpp
index 36b7867..256e15c 100644
--- a/core/fxcodec/codec/cfx_codec_memory.cpp
+++ b/core/fxcodec/cfx_codec_memory.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcodec/codec/cfx_codec_memory.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 
 #include <algorithm>
 
diff --git a/core/fxcodec/codec/cfx_codec_memory.h b/core/fxcodec/cfx_codec_memory.h
similarity index 89%
rename from core/fxcodec/codec/cfx_codec_memory.h
rename to core/fxcodec/cfx_codec_memory.h
index fa26e24..76efcf7 100644
--- a/core/fxcodec/codec/cfx_codec_memory.h
+++ b/core/fxcodec/cfx_codec_memory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CORE_FXCODEC_CODEC_CFX_CODEC_MEMORY_H_
-#define CORE_FXCODEC_CODEC_CFX_CODEC_MEMORY_H_
+#ifndef CORE_FXCODEC_CFX_CODEC_MEMORY_H_
+#define CORE_FXCODEC_CFX_CODEC_MEMORY_H_
 
 #include <memory>
 
@@ -41,4 +41,4 @@
   size_t pos_ = 0;
 };
 
-#endif  // CORE_FXCODEC_CODEC_CFX_CODEC_MEMORY_H_
+#endif  // CORE_FXCODEC_CFX_CODEC_MEMORY_H_
diff --git a/core/fxcodec/codec/codec_module_iface.h b/core/fxcodec/codec_module_iface.h
similarity index 87%
rename from core/fxcodec/codec/codec_module_iface.h
rename to core/fxcodec/codec_module_iface.h
index 4c6f961..992d2ad 100644
--- a/core/fxcodec/codec/codec_module_iface.h
+++ b/core/fxcodec/codec_module_iface.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_CODEC_MODULE_IFACE_H_
-#define CORE_FXCODEC_CODEC_CODEC_MODULE_IFACE_H_
+#ifndef CORE_FXCODEC_CODEC_MODULE_IFACE_H_
+#define CORE_FXCODEC_CODEC_MODULE_IFACE_H_
 
 #include "core/fxcrt/fx_system.h"
 #include "core/fxcrt/retain_ptr.h"
@@ -40,4 +40,4 @@
 
 using fxcodec::ModuleIface;
 
-#endif  // CORE_FXCODEC_CODEC_CODEC_MODULE_IFACE_H_
+#endif  // CORE_FXCODEC_CODEC_MODULE_IFACE_H_
diff --git a/core/fxcodec/fax/faxmodule.cpp b/core/fxcodec/fax/faxmodule.cpp
index 60bec6a..6d61857 100644
--- a/core/fxcodec/fax/faxmodule.cpp
+++ b/core/fxcodec/fax/faxmodule.cpp
@@ -12,8 +12,8 @@
 #include <vector>
 
 #include "build/build_config.h"
-#include "core/fxcodec/codec/scanlinedecoder.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/scanlinedecoder.h"
 #include "core/fxcrt/cfx_binarybuf.h"
 #include "core/fxcrt/fx_memory.h"
 #include "third_party/base/logging.h"
diff --git a/core/fxcodec/flate/flatemodule.cpp b/core/fxcodec/flate/flatemodule.cpp
index 45613b9..3604efb 100644
--- a/core/fxcodec/flate/flatemodule.cpp
+++ b/core/fxcodec/flate/flatemodule.cpp
@@ -12,8 +12,8 @@
 #include <utility>
 #include <vector>
 
-#include "core/fxcodec/codec/scanlinedecoder.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/scanlinedecoder.h"
 #include "core/fxcrt/fx_extension.h"
 #include "third_party/base/numerics/safe_conversions.h"
 #include "third_party/base/ptr_util.h"
diff --git a/core/fxcodec/gif/cfx_gifcontext.cpp b/core/fxcodec/gif/cfx_gifcontext.cpp
index 07f3781..65c0682 100644
--- a/core/fxcodec/gif/cfx_gifcontext.cpp
+++ b/core/fxcodec/gif/cfx_gifcontext.cpp
@@ -9,7 +9,7 @@
 #include <algorithm>
 #include <utility>
 
-#include "core/fxcodec/codec/cfx_codec_memory.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 #include "core/fxcodec/gif/cfx_gif.h"
 #include "core/fxcodec/gif/gifmodule.h"
 #include "third_party/base/ptr_util.h"
diff --git a/core/fxcodec/gif/cfx_gifcontext_unittest.cpp b/core/fxcodec/gif/cfx_gifcontext_unittest.cpp
index 925beed..10ac6dc 100644
--- a/core/fxcodec/gif/cfx_gifcontext_unittest.cpp
+++ b/core/fxcodec/gif/cfx_gifcontext_unittest.cpp
@@ -6,7 +6,7 @@
 
 #include <utility>
 
-#include "core/fxcodec/codec/cfx_codec_memory.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace fxcodec {
diff --git a/core/fxcodec/gif/gifmodule.cpp b/core/fxcodec/gif/gifmodule.cpp
index cc82e38..041aa36 100644
--- a/core/fxcodec/gif/gifmodule.cpp
+++ b/core/fxcodec/gif/gifmodule.cpp
@@ -6,7 +6,7 @@
 
 #include "core/fxcodec/gif/gifmodule.h"
 
-#include "core/fxcodec/codec/cfx_codec_memory.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcodec/gif/cfx_gif.h"
 #include "core/fxcodec/gif/cfx_gifcontext.h"
diff --git a/core/fxcodec/gif/gifmodule.h b/core/fxcodec/gif/gifmodule.h
index c8d801d..2944e34 100644
--- a/core/fxcodec/gif/gifmodule.h
+++ b/core/fxcodec/gif/gifmodule.h
@@ -10,7 +10,7 @@
 #include <memory>
 #include <utility>
 
-#include "core/fxcodec/codec/codec_module_iface.h"
+#include "core/fxcodec/codec_module_iface.h"
 #include "core/fxcodec/gif/cfx_gif.h"
 #include "core/fxcrt/fx_coordinates.h"
 
diff --git a/core/fxcodec/jpeg/jpegmodule.cpp b/core/fxcodec/jpeg/jpegmodule.cpp
index b7401af..b7a4c31 100644
--- a/core/fxcodec/jpeg/jpegmodule.cpp
+++ b/core/fxcodec/jpeg/jpegmodule.cpp
@@ -12,9 +12,9 @@
 #include <utility>
 
 #include "build/build_config.h"
-#include "core/fxcodec/codec/cfx_codec_memory.h"
-#include "core/fxcodec/codec/scanlinedecoder.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/scanlinedecoder.h"
 #include "core/fxcrt/fx_memory.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxge/dib/cfx_dibbase.h"
diff --git a/core/fxcodec/jpeg/jpegmodule.h b/core/fxcodec/jpeg/jpegmodule.h
index ee5658a..607e48d 100644
--- a/core/fxcodec/jpeg/jpegmodule.h
+++ b/core/fxcodec/jpeg/jpegmodule.h
@@ -11,7 +11,7 @@
 #include <memory>
 
 #include "build/build_config.h"
-#include "core/fxcodec/codec/codec_module_iface.h"
+#include "core/fxcodec/codec_module_iface.h"
 #include "third_party/base/span.h"
 
 class CFX_DIBBase;
diff --git a/core/fxcodec/png/pngmodule.cpp b/core/fxcodec/png/pngmodule.cpp
index 9742bc6..d3a3c0b 100644
--- a/core/fxcodec/png/pngmodule.cpp
+++ b/core/fxcodec/png/pngmodule.cpp
@@ -8,7 +8,7 @@
 
 #include <algorithm>
 
-#include "core/fxcodec/codec/cfx_codec_memory.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/unowned_ptr.h"
 #include "core/fxge/fx_dib.h"
diff --git a/core/fxcodec/png/pngmodule.h b/core/fxcodec/png/pngmodule.h
index 0056ed5..ad3fd39 100644
--- a/core/fxcodec/png/pngmodule.h
+++ b/core/fxcodec/png/pngmodule.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "core/fxcodec/codec/codec_module_iface.h"
+#include "core/fxcodec/codec_module_iface.h"
 
 namespace fxcodec {
 
diff --git a/core/fxcodec/codec/progressivedecoder.cpp b/core/fxcodec/progressivedecoder.cpp
similarity index 99%
rename from core/fxcodec/codec/progressivedecoder.cpp
rename to core/fxcodec/progressivedecoder.cpp
index 85052f0..34ffcd3 100644
--- a/core/fxcodec/codec/progressivedecoder.cpp
+++ b/core/fxcodec/progressivedecoder.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/codec/progressivedecoder.h"
+#include "core/fxcodec/progressivedecoder.h"
 
 #include <algorithm>
 #include <memory>
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "build/build_config.h"
-#include "core/fxcodec/codec/cfx_codec_memory.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/fx_stream.h"
diff --git a/core/fxcodec/codec/progressivedecoder.h b/core/fxcodec/progressivedecoder.h
similarity index 98%
rename from core/fxcodec/codec/progressivedecoder.h
rename to core/fxcodec/progressivedecoder.h
index 2a836d0..b74d0a6 100644
--- a/core/fxcodec/codec/progressivedecoder.h
+++ b/core/fxcodec/progressivedecoder.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_PROGRESSIVEDECODER_H_
-#define CORE_FXCODEC_CODEC_PROGRESSIVEDECODER_H_
+#ifndef CORE_FXCODEC_PROGRESSIVEDECODER_H_
+#define CORE_FXCODEC_PROGRESSIVEDECODER_H_
 
 #include <memory>
 #include <utility>
@@ -306,4 +306,4 @@
 
 using ProgressiveDecoder = fxcodec::ProgressiveDecoder;
 
-#endif  // CORE_FXCODEC_CODEC_PROGRESSIVEDECODER_H_
+#endif  // CORE_FXCODEC_PROGRESSIVEDECODER_H_
diff --git a/core/fxcodec/codec/progressivedecoder_unittest.cpp b/core/fxcodec/progressivedecoder_unittest.cpp
similarity index 99%
rename from core/fxcodec/codec/progressivedecoder_unittest.cpp
rename to core/fxcodec/progressivedecoder_unittest.cpp
index 07eb701..5c4e26f 100644
--- a/core/fxcodec/codec/progressivedecoder_unittest.cpp
+++ b/core/fxcodec/progressivedecoder_unittest.cpp
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "core/fxcodec/codec/progressivedecoder.h"
+#include "core/fxcodec/progressivedecoder.h"
 
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/cfx_readonlymemorystream.h"
diff --git a/core/fxcodec/codec/scanlinedecoder.cpp b/core/fxcodec/scanlinedecoder.cpp
similarity index 97%
rename from core/fxcodec/codec/scanlinedecoder.cpp
rename to core/fxcodec/scanlinedecoder.cpp
index 7fefebb..2aa4178 100644
--- a/core/fxcodec/codec/scanlinedecoder.cpp
+++ b/core/fxcodec/scanlinedecoder.cpp
@@ -4,7 +4,7 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#include "core/fxcodec/codec/scanlinedecoder.h"
+#include "core/fxcodec/scanlinedecoder.h"
 
 #include "core/fxcrt/pauseindicator_iface.h"
 
diff --git a/core/fxcodec/codec/scanlinedecoder.h b/core/fxcodec/scanlinedecoder.h
similarity index 90%
rename from core/fxcodec/codec/scanlinedecoder.h
rename to core/fxcodec/scanlinedecoder.h
index 14d4b9c..e0014cf 100644
--- a/core/fxcodec/codec/scanlinedecoder.h
+++ b/core/fxcodec/scanlinedecoder.h
@@ -4,8 +4,8 @@
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-#ifndef CORE_FXCODEC_CODEC_SCANLINEDECODER_H_
-#define CORE_FXCODEC_CODEC_SCANLINEDECODER_H_
+#ifndef CORE_FXCODEC_SCANLINEDECODER_H_
+#define CORE_FXCODEC_SCANLINEDECODER_H_
 
 #include "core/fxcrt/fx_system.h"
 
@@ -56,4 +56,4 @@
 
 using ScanlineDecoder = fxcodec::ScanlineDecoder;
 
-#endif  // CORE_FXCODEC_CODEC_SCANLINEDECODER_H_
+#endif  // CORE_FXCODEC_SCANLINEDECODER_H_
diff --git a/core/fxcodec/tiff/tiffmodule.cpp b/core/fxcodec/tiff/tiffmodule.cpp
index c02b55b..a253f72 100644
--- a/core/fxcodec/tiff/tiffmodule.cpp
+++ b/core/fxcodec/tiff/tiffmodule.cpp
@@ -9,7 +9,7 @@
 #include <limits>
 #include <memory>
 
-#include "core/fxcodec/codec/cfx_codec_memory.h"
+#include "core/fxcodec/cfx_codec_memory.h"
 #include "core/fxcodec/fx_codec.h"
 #include "core/fxcrt/fx_safe_types.h"
 #include "core/fxcrt/fx_stream.h"
diff --git a/core/fxcodec/tiff/tiffmodule.h b/core/fxcodec/tiff/tiffmodule.h
index 8d5a89e..770973b 100644
--- a/core/fxcodec/tiff/tiffmodule.h
+++ b/core/fxcodec/tiff/tiffmodule.h
@@ -9,7 +9,7 @@
 
 #include <memory>
 
-#include "core/fxcodec/codec/codec_module_iface.h"
+#include "core/fxcodec/codec_module_iface.h"
 
 class CFX_DIBitmap;
 class IFX_SeekableReadStream;
diff --git a/testing/fuzzers/pdf_codec_fax_fuzzer.cc b/testing/fuzzers/pdf_codec_fax_fuzzer.cc
index 7e9817e..d0c2984 100644
--- a/testing/fuzzers/pdf_codec_fax_fuzzer.cc
+++ b/testing/fuzzers/pdf_codec_fax_fuzzer.cc
@@ -5,8 +5,8 @@
 #include <cstdint>
 #include <memory>
 
-#include "core/fxcodec/codec/scanlinedecoder.h"
 #include "core/fxcodec/fax/faxmodule.h"
+#include "core/fxcodec/scanlinedecoder.h"
 #include "testing/fuzzers/pdfium_fuzzer_util.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
diff --git a/testing/fuzzers/xfa_codec_fuzzer.h b/testing/fuzzers/xfa_codec_fuzzer.h
index c1cae50..4f5668d 100644
--- a/testing/fuzzers/xfa_codec_fuzzer.h
+++ b/testing/fuzzers/xfa_codec_fuzzer.h
@@ -7,8 +7,8 @@
 
 #include <memory>
 
-#include "core/fxcodec/codec/progressivedecoder.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/progressivedecoder.h"
 #include "core/fxcrt/cfx_readonlymemorystream.h"
 #include "core/fxge/dib/cfx_dibitmap.h"
 #include "third_party/base/ptr_util.h"
diff --git a/xfa/fxfa/cxfa_ffwidget.cpp b/xfa/fxfa/cxfa_ffwidget.cpp
index 91f0690..d658141 100644
--- a/xfa/fxfa/cxfa_ffwidget.cpp
+++ b/xfa/fxfa/cxfa_ffwidget.cpp
@@ -12,8 +12,8 @@
 #include <utility>
 #include <vector>
 
-#include "core/fxcodec/codec/progressivedecoder.h"
 #include "core/fxcodec/fx_codec.h"
+#include "core/fxcodec/progressivedecoder.h"
 #include "core/fxcrt/maybe_owned.h"
 #include "core/fxge/cfx_pathdata.h"
 #include "core/fxge/dib/cfx_dibitmap.h"