126 files changed, 158 insertions, 485 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 23e9f9a8ff..9f40bc3a03 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -317,6 +317,8 @@ static_library("fxcodec") {
     "third_party:fx_lcms2",
     "third_party:fx_libjpeg",
     "third_party:fx_libopenjpeg",
+    "third_party:fx_lpng",
+    "third_party:fx_tiff",
     "third_party:fx_zlib",
   ]
   sources = [
@@ -339,57 +341,6 @@ static_library("fxcodec") {
     "core/src/fxcodec/codec/fx_codec_progress.cpp",
     "core/src/fxcodec/codec/fx_codec_progress.h",
     "core/src/fxcodec/codec/fx_codec_tiff.cpp",
-    "core/src/fxcodec/fx_lpng/src/fx_png.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngerror.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngget.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngmem.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngpread.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngread.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngrio.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngrtran.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngrutil.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngset.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngtrans.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngwio.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngwrite.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngwtran.c",
-    "core/src/fxcodec/fx_lpng/src/fx_pngwutil.c",
-    "core/src/fxcodec/fx_tiff/include/fx_tiffiop.h",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_aux.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_close.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_codec.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_color.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_compress.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_dir.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_dirinfo.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_dirread.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_dirwrite.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_dumpmode.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_error.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_extension.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_fax3.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_fax3sm.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_flush.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_getimage.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_jpeg.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_luv.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_lzw.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_next.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_ojpeg.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_open.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_packbits.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_pixarlog.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_predict.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_print.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_read.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_strip.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_swab.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_thunder.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_tile.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_version.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_warning.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_write.c",
-    "core/src/fxcodec/fx_tiff/src/fx_tif_zip.c",
     "core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp",
     "core/src/fxcodec/jbig2/JBig2_ArithDecoder.h",
     "core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp",
diff --git a/core/src/fxcodec/codec/fx_codec_png.cpp b/core/src/fxcodec/codec/fx_codec_png.cpp
index f824414c8e..658ddf2ca0 100644
--- a/core/src/fxcodec/codec/fx_codec_png.cpp
+++ b/core/src/fxcodec/codec/fx_codec_png.cpp
@@ -9,7 +9,7 @@
 #include "codec_int.h"
 extern "C" {
 #undef FAR
-#include "../fx_lpng/include/fx_png.h"
+#include "../../../../third_party/lpng_v163/png.h"
 }
 static void _png_error_data(png_structp png_ptr, png_const_charp error_msg) {
   if (png_get_error_ptr(png_ptr)) {
diff --git a/core/src/fxcodec/codec/fx_codec_tiff.cpp b/core/src/fxcodec/codec/fx_codec_tiff.cpp
index b93ddacc3c..1f289bbb40 100644
--- a/core/src/fxcodec/codec/fx_codec_tiff.cpp
+++ b/core/src/fxcodec/codec/fx_codec_tiff.cpp
@@ -8,7 +8,7 @@
 #include "../../../include/fxge/fx_dib.h"
 #include "codec_int.h"
 extern "C" {
-#include "../fx_tiff/include/fx_tiffiop.h"
+#include "../../../../third_party/tiff_v403/tiffiop.h"
 }
 void* IccLib_CreateTransform_sRGB(const unsigned char* pProfileData,
                                   unsigned int dwProfileSize,
diff --git a/core/src/fxcodec/fx_lpng/include/fx_png.h b/core/src/fxcodec/fx_lpng/include/fx_png.h
deleted file mode 100644
index 4ef53d0298..0000000000
--- a/core/src/fxcodec/fx_lpng/include/fx_png.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/png.h"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_png.c b/core/src/fxcodec/fx_lpng/src/fx_png.c
deleted file mode 100644
index 7b6582666f..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_png.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_png.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngerror.c b/core/src/fxcodec/fx_lpng/src/fx_pngerror.c
deleted file mode 100644
index 7581b99130..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngerror.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngerror.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngget.c b/core/src/fxcodec/fx_lpng/src/fx_pngget.c
deleted file mode 100644
index cc8dc4e6b7..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngget.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngget.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngmem.c b/core/src/fxcodec/fx_lpng/src/fx_pngmem.c
deleted file mode 100644
index 9892408d70..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngmem.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngmem.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngpread.c b/core/src/fxcodec/fx_lpng/src/fx_pngpread.c
deleted file mode 100644
index 8d53be20a6..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngpread.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngpread.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngread.c b/core/src/fxcodec/fx_lpng/src/fx_pngread.c
deleted file mode 100644
index c612bd533e..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngread.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngread.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngrio.c b/core/src/fxcodec/fx_lpng/src/fx_pngrio.c
deleted file mode 100644
index d324a8e6e5..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngrio.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngrio.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngrtran.c b/core/src/fxcodec/fx_lpng/src/fx_pngrtran.c
deleted file mode 100644
index bec380dc3c..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngrtran.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngrtran.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngrutil.c b/core/src/fxcodec/fx_lpng/src/fx_pngrutil.c
deleted file mode 100644
index a3da3555e3..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngrutil.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngrutil.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngset.c b/core/src/fxcodec/fx_lpng/src/fx_pngset.c
deleted file mode 100644
index 76a72223f2..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngset.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngset.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngtrans.c b/core/src/fxcodec/fx_lpng/src/fx_pngtrans.c
deleted file mode 100644
index eac49bf227..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngtrans.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngtrans.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngwio.c b/core/src/fxcodec/fx_lpng/src/fx_pngwio.c
deleted file mode 100644
index 3fb21e5b0b..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngwio.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngwio.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngwrite.c b/core/src/fxcodec/fx_lpng/src/fx_pngwrite.c
deleted file mode 100644
index 4434fd0cb4..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngwrite.c
+++ /dev/null
@@ -1,10 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#ifdef _MSC_VER
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-#include "../lpng_v163/fx_pngwrite.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngwtran.c b/core/src/fxcodec/fx_lpng/src/fx_pngwtran.c
deleted file mode 100644
index 8a095d3565..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngwtran.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngwtran.c"
diff --git a/core/src/fxcodec/fx_lpng/src/fx_pngwutil.c b/core/src/fxcodec/fx_lpng/src/fx_pngwutil.c
deleted file mode 100644
index b07fb40500..0000000000
--- a/core/src/fxcodec/fx_lpng/src/fx_pngwutil.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../lpng_v163/fx_pngwutil.c"
diff --git a/core/src/fxcodec/fx_tiff/include/fx_tiffiop.h b/core/src/fxcodec/fx_tiff/include/fx_tiffiop.h
deleted file mode 100644
index 8c78903025..0000000000
--- a/core/src/fxcodec/fx_tiff/include/fx_tiffiop.h
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tiffiop.h"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_aux.c b/core/src/fxcodec/fx_tiff/src/fx_tif_aux.c
deleted file mode 100644
index 55d4f650cf..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_aux.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_aux.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_close.c b/core/src/fxcodec/fx_tiff/src/fx_tif_close.c
deleted file mode 100644
index 3645bd29bd..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_close.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_close.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_codec.c b/core/src/fxcodec/fx_tiff/src/fx_tif_codec.c
deleted file mode 100644
index 183622f659..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_codec.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_codec.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_color.c b/core/src/fxcodec/fx_tiff/src/fx_tif_color.c
deleted file mode 100644
index ce0f6fb252..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_color.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_color.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_compress.c b/core/src/fxcodec/fx_tiff/src/fx_tif_compress.c
deleted file mode 100644
index cdbf26c71e..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_compress.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_compress.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_dir.c b/core/src/fxcodec/fx_tiff/src/fx_tif_dir.c
deleted file mode 100644
index 2dc94bb60f..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_dir.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_dir.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_dirinfo.c b/core/src/fxcodec/fx_tiff/src/fx_tif_dirinfo.c
deleted file mode 100644
index 5481733e46..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_dirinfo.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_dirinfo.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_dirread.c b/core/src/fxcodec/fx_tiff/src/fx_tif_dirread.c
deleted file mode 100644
index ef57dfde21..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_dirread.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_dirread.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_dirwrite.c b/core/src/fxcodec/fx_tiff/src/fx_tif_dirwrite.c
deleted file mode 100644
index daee77ba0e..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_dirwrite.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_dirwrite.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_dumpmode.c b/core/src/fxcodec/fx_tiff/src/fx_tif_dumpmode.c
deleted file mode 100644
index 1ece3b8322..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_dumpmode.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_dumpmode.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_error.c b/core/src/fxcodec/fx_tiff/src/fx_tif_error.c
deleted file mode 100644
index 8693e9d359..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_error.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_error.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_extension.c b/core/src/fxcodec/fx_tiff/src/fx_tif_extension.c
deleted file mode 100644
index 3b92492098..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_extension.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_extension.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_fax3.c b/core/src/fxcodec/fx_tiff/src/fx_tif_fax3.c
deleted file mode 100644
index 68d26de22d..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_fax3.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_fax3.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_fax3sm.c b/core/src/fxcodec/fx_tiff/src/fx_tif_fax3sm.c
deleted file mode 100644
index aa633e7b7e..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_fax3sm.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_fax3sm.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_flush.c b/core/src/fxcodec/fx_tiff/src/fx_tif_flush.c
deleted file mode 100644
index 40884c8c37..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_flush.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_flush.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_getimage.c b/core/src/fxcodec/fx_tiff/src/fx_tif_getimage.c
deleted file mode 100644
index 15c8ee46fb..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_getimage.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_getimage.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_jpeg.c b/core/src/fxcodec/fx_tiff/src/fx_tif_jpeg.c
deleted file mode 100644
index 03ee51fc78..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_jpeg.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_jpeg.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_luv.c b/core/src/fxcodec/fx_tiff/src/fx_tif_luv.c
deleted file mode 100644
index 08768e795a..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_luv.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_luv.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_lzw.c b/core/src/fxcodec/fx_tiff/src/fx_tif_lzw.c
deleted file mode 100644
index 832311330b..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_lzw.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_lzw.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_next.c b/core/src/fxcodec/fx_tiff/src/fx_tif_next.c
deleted file mode 100644
index a13df45480..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_next.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_next.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_ojpeg.c b/core/src/fxcodec/fx_tiff/src/fx_tif_ojpeg.c
deleted file mode 100644
index fed1911053..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_ojpeg.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_ojpeg.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_open.c b/core/src/fxcodec/fx_tiff/src/fx_tif_open.c
deleted file mode 100644
index 682ffe614b..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_open.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_open.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_packbits.c b/core/src/fxcodec/fx_tiff/src/fx_tif_packbits.c
deleted file mode 100644
index 349930f7c5..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_packbits.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_packbits.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_pixarlog.c b/core/src/fxcodec/fx_tiff/src/fx_tif_pixarlog.c
deleted file mode 100644
index 2812901c84..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_pixarlog.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_pixarlog.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_predict.c b/core/src/fxcodec/fx_tiff/src/fx_tif_predict.c
deleted file mode 100644
index eab405a93b..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_predict.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_predict.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_print.c b/core/src/fxcodec/fx_tiff/src/fx_tif_print.c
deleted file mode 100644
index 9a16a921fd..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_print.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_print.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_read.c b/core/src/fxcodec/fx_tiff/src/fx_tif_read.c
deleted file mode 100644
index 64289bbddf..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_read.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_read.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_strip.c b/core/src/fxcodec/fx_tiff/src/fx_tif_strip.c
deleted file mode 100644
index e642a4e56f..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_strip.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_strip.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_swab.c b/core/src/fxcodec/fx_tiff/src/fx_tif_swab.c
deleted file mode 100644
index e9c6b10793..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_swab.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_swab.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_thunder.c b/core/src/fxcodec/fx_tiff/src/fx_tif_thunder.c
deleted file mode 100644
index 80f523cd2b..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_thunder.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_thunder.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_tile.c b/core/src/fxcodec/fx_tiff/src/fx_tif_tile.c
deleted file mode 100644
index 49cd4048a4..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_tile.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_tile.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_version.c b/core/src/fxcodec/fx_tiff/src/fx_tif_version.c
deleted file mode 100644
index 6d62e3cd79..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_version.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_version.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_warning.c b/core/src/fxcodec/fx_tiff/src/fx_tif_warning.c
deleted file mode 100644
index cb1921db8d..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_warning.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_warning.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_write.c b/core/src/fxcodec/fx_tiff/src/fx_tif_write.c
deleted file mode 100644
index 9ab43fa882..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_write.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_write.c"
diff --git a/core/src/fxcodec/fx_tiff/src/fx_tif_zip.c b/core/src/fxcodec/fx_tiff/src/fx_tif_zip.c
deleted file mode 100644
index 8460a3fd5b..0000000000
--- a/core/src/fxcodec/fx_tiff/src/fx_tif_zip.c
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 PDFium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
-
-#include "../tiff_v403/tif_zip.c"
diff --git a/pdfium.gyp b/pdfium.gyp
index b0ce2e4764..72d1785d66 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -331,6 +331,8 @@
         'third_party/third_party.gyp:fx_lcms2',
         'third_party/third_party.gyp:fx_libjpeg',
         'third_party/third_party.gyp:fx_libopenjpeg',
+        'third_party/third_party.gyp:fx_lpng',
+        'third_party/third_party.gyp:fx_tiff',
         'third_party/third_party.gyp:fx_zlib',
       ],
       'ldflags': [ '-L<(PRODUCT_DIR)',],
@@ -354,58 +356,6 @@
         'core/src/fxcodec/codec/fx_codec_progress.cpp',
         'core/src/fxcodec/codec/fx_codec_progress.h',
         'core/src/fxcodec/codec/fx_codec_tiff.cpp',
-        'core/src/fxcodec/fx_lpng/include/fx_png.h',
-        'core/src/fxcodec/fx_lpng/src/fx_png.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngerror.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngget.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngmem.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngpread.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngread.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngrio.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngrtran.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngrutil.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngset.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngtrans.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngwio.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngwrite.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngwtran.c',
-        'core/src/fxcodec/fx_lpng/src/fx_pngwutil.c',
-        'core/src/fxcodec/fx_tiff/include/fx_tiffiop.h',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_aux.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_close.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_codec.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_color.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_compress.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_dir.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_dirinfo.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_dirread.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_dirwrite.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_dumpmode.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_error.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_extension.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_fax3.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_fax3sm.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_flush.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_getimage.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_jpeg.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_luv.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_lzw.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_next.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_ojpeg.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_open.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_packbits.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_pixarlog.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_predict.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_print.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_read.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_strip.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_swab.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_thunder.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_tile.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_version.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_warning.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_write.c',
-        'core/src/fxcodec/fx_tiff/src/fx_tif_zip.c',
         'core/src/fxcodec/jbig2/JBig2_ArithDecoder.cpp',
         'core/src/fxcodec/jbig2/JBig2_ArithDecoder.h',
         'core/src/fxcodec/jbig2/JBig2_ArithIntDecoder.cpp',
diff --git a/samples/image_diff_png.cc b/samples/image_diff_png.cc
index 7d53decef1..a8ca925a3a 100644
--- a/samples/image_diff_png.cc
+++ b/samples/image_diff_png.cc
@@ -17,8 +17,8 @@
 #include <string>
 
 #include "../third_party/base/logging.h"
+#include "../third_party/lpng_v163/png.h"
 #include "../third_party/zlib_v128/zlib.h"
-#include "../core/src/fxcodec/fx_lpng/include/fx_png.h"
 
 namespace image_diff_png {
 
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index a6c9520aba..5814a7db97 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -234,6 +234,78 @@ source_set("fx_libopenjpeg") {
   ]
 }
 
+source_set("fx_lpng") {
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [
+    "//build/config/compiler:no_chromium_code",
+    "//third_party/pdfium:pdfium_config",
+  ]
+  sources = [
+    "lpng_v163/png.h",
+    "lpng_v163/png.c",
+    "lpng_v163/pngerror.c",
+    "lpng_v163/pngget.c",
+    "lpng_v163/pngmem.c",
+    "lpng_v163/pngpread.c",
+    "lpng_v163/pngread.c",
+    "lpng_v163/pngrio.c",
+    "lpng_v163/pngrtran.c",
+    "lpng_v163/pngrutil.c",
+    "lpng_v163/pngset.c",
+    "lpng_v163/pngtrans.c",
+    "lpng_v163/pngwio.c",
+    "lpng_v163/pngwrite.c",
+    "lpng_v163/pngwtran.c",
+    "lpng_v163/pngwutil.c",
+  ]
+}
+
+source_set("fx_tiff") {
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [
+    "//build/config/compiler:no_chromium_code",
+    "//third_party/pdfium:pdfium_config",
+  ]
+  sources = [
+    "tiff_v403/tiffiop.h",
+    "tiff_v403/tif_aux.c",
+    "tiff_v403/tif_close.c",
+    "tiff_v403/tif_codec.c",
+    "tiff_v403/tif_color.c",
+    "tiff_v403/tif_compress.c",
+    "tiff_v403/tif_dir.c",
+    "tiff_v403/tif_dirinfo.c",
+    "tiff_v403/tif_dirread.c",
+    "tiff_v403/tif_dirwrite.c",
+    "tiff_v403/tif_dumpmode.c",
+    "tiff_v403/tif_error.c",
+    "tiff_v403/tif_extension.c",
+    "tiff_v403/tif_fax3.c",
+    "tiff_v403/tif_fax3sm.c",
+    "tiff_v403/tif_flush.c",
+    "tiff_v403/tif_getimage.c",
+    "tiff_v403/tif_jpeg.c",
+    "tiff_v403/tif_luv.c",
+    "tiff_v403/tif_lzw.c",
+    "tiff_v403/tif_next.c",
+    "tiff_v403/tif_ojpeg.c",
+    "tiff_v403/tif_open.c",
+    "tiff_v403/tif_packbits.c",
+    "tiff_v403/tif_pixarlog.c",
+    "tiff_v403/tif_predict.c",
+    "tiff_v403/tif_print.c",
+    "tiff_v403/tif_read.c",
+    "tiff_v403/tif_strip.c",
+    "tiff_v403/tif_swab.c",
+    "tiff_v403/tif_thunder.c",
+    "tiff_v403/tif_tile.c",
+    "tiff_v403/tif_version.c",
+    "tiff_v403/tif_warning.c",
+    "tiff_v403/tif_write.c",
+    "tiff_v403/tif_zip.c",
+  ]
+}
+
 source_set("fx_zlib") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_png.c b/third_party/lpng_v163/png.c
index 93c675b085..93c675b085 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_png.c
+++ b/third_party/lpng_v163/png.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/png.h b/third_party/lpng_v163/png.h
index 538b5613a9..538b5613a9 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/png.h
+++ b/third_party/lpng_v163/png.h
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/pngconf.h b/third_party/lpng_v163/pngconf.h
index 02f74e2639..02f74e2639 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/pngconf.h
+++ b/third_party/lpng_v163/pngconf.h
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/pngdebug.h b/third_party/lpng_v163/pngdebug.h
index 96c1ea42b3..96c1ea42b3 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/pngdebug.h
+++ b/third_party/lpng_v163/pngdebug.h
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngerror.c b/third_party/lpng_v163/pngerror.c
index 2125e4ca11..2125e4ca11 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngerror.c
+++ b/third_party/lpng_v163/pngerror.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngget.c b/third_party/lpng_v163/pngget.c
index 6839f6beef..6839f6beef 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngget.c
+++ b/third_party/lpng_v163/pngget.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/pnginfo.h b/third_party/lpng_v163/pnginfo.h
index 683b7ea177..683b7ea177 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/pnginfo.h
+++ b/third_party/lpng_v163/pnginfo.h
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/pnglibconf.h b/third_party/lpng_v163/pnglibconf.h
index ececc38fc2..ececc38fc2 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/pnglibconf.h
+++ b/third_party/lpng_v163/pnglibconf.h
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngmem.c b/third_party/lpng_v163/pngmem.c
index 9be580322a..9be580322a 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngmem.c
+++ b/third_party/lpng_v163/pngmem.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngpread.c b/third_party/lpng_v163/pngpread.c
index afb2abf357..afb2abf357 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngpread.c
+++ b/third_party/lpng_v163/pngpread.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/pngpriv.h b/third_party/lpng_v163/pngpriv.h
index 7fa3d6059c..7fa3d6059c 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/pngpriv.h
+++ b/third_party/lpng_v163/pngpriv.h
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngread.c b/third_party/lpng_v163/pngread.c
index b30c5a1009..b30c5a1009 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngread.c
+++ b/third_party/lpng_v163/pngread.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrio.c b/third_party/lpng_v163/pngrio.c
index d27a26d5bc..d27a26d5bc 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrio.c
+++ b/third_party/lpng_v163/pngrio.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrtran.c b/third_party/lpng_v163/pngrtran.c
index a81034cdf1..a81034cdf1 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrtran.c
+++ b/third_party/lpng_v163/pngrtran.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrutil.c b/third_party/lpng_v163/pngrutil.c
index 970ec4d4d9..970ec4d4d9 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrutil.c
+++ b/third_party/lpng_v163/pngrutil.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngset.c b/third_party/lpng_v163/pngset.c
index b4790521bb..b4790521bb 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngset.c
+++ b/third_party/lpng_v163/pngset.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/pngstruct.h b/third_party/lpng_v163/pngstruct.h
index 25355c4012..9fe77fdd34 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/pngstruct.h
+++ b/third_party/lpng_v163/pngstruct.h
@@ -28,7 +28,7 @@
    /* We must ensure that zlib uses 'const' in declarations. */
 #  define ZLIB_CONST
 #endif
-#include "../../../third_party/zlib_v128/zlib.h"
+#include "../zlib_v128/zlib.h"
 #ifdef const
    /* zlib.h sometimes #defines const to nothing, undo this. */
 #  undef const
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngtrans.c b/third_party/lpng_v163/pngtrans.c
index 0de6a46f30..0de6a46f30 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngtrans.c
+++ b/third_party/lpng_v163/pngtrans.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwio.c b/third_party/lpng_v163/pngwio.c
index 9268c163b0..9268c163b0 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwio.c
+++ b/third_party/lpng_v163/pngwio.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwrite.c b/third_party/lpng_v163/pngwrite.c
index f48ed970ff..f48ed970ff 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwrite.c
+++ b/third_party/lpng_v163/pngwrite.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwtran.c b/third_party/lpng_v163/pngwtran.c
index 1fc3340e2c..1fc3340e2c 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwtran.c
+++ b/third_party/lpng_v163/pngwtran.c
diff --git a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwutil.c b/third_party/lpng_v163/pngwutil.c
index dd5d659f3c..dd5d659f3c 100644
--- a/core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwutil.c
+++ b/third_party/lpng_v163/pngwutil.c
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index df5341d44a..e77a92a008 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -6,6 +6,9 @@
   'target_defaults': {
     'defines': [
       'OPJ_STATIC',
+      'PNG_PREFIX',
+      'PNGPREFIX_H',
+      'PNG_USE_READ_MACROS',
       '_CRT_SECURE_NO_WARNINGS',
     ],
     'msvs_disabled_warnings': [
@@ -238,6 +241,70 @@
       ],
     },
     {
+      'target_name': 'fx_lpng',
+      'type': 'static_library',
+      'sources': [
+        'lpng_v163/png.h',
+        'lpng_v163/png.c',
+        'lpng_v163/pngerror.c',
+        'lpng_v163/pngget.c',
+        'lpng_v163/pngmem.c',
+        'lpng_v163/pngpread.c',
+        'lpng_v163/pngread.c',
+        'lpng_v163/pngrio.c',
+        'lpng_v163/pngrtran.c',
+        'lpng_v163/pngrutil.c',
+        'lpng_v163/pngset.c',
+        'lpng_v163/pngtrans.c',
+        'lpng_v163/pngwio.c',
+        'lpng_v163/pngwrite.c',
+        'lpng_v163/pngwtran.c',
+        'lpng_v163/pngwutil.c',
+      ],
+    },
+    {
+      'target_name': 'fx_tiff',
+      'type': 'static_library',
+      'sources': [
+        'tiff_v403/tiffiop.h',
+        'tiff_v403/tif_aux.c',
+        'tiff_v403/tif_close.c',
+        'tiff_v403/tif_codec.c',
+        'tiff_v403/tif_color.c',
+        'tiff_v403/tif_compress.c',
+        'tiff_v403/tif_dir.c',
+        'tiff_v403/tif_dirinfo.c',
+        'tiff_v403/tif_dirread.c',
+        'tiff_v403/tif_dirwrite.c',
+        'tiff_v403/tif_dumpmode.c',
+        'tiff_v403/tif_error.c',
+        'tiff_v403/tif_extension.c',
+        'tiff_v403/tif_fax3.c',
+        'tiff_v403/tif_fax3sm.c',
+        'tiff_v403/tif_flush.c',
+        'tiff_v403/tif_getimage.c',
+        'tiff_v403/tif_jpeg.c',
+        'tiff_v403/tif_luv.c',
+        'tiff_v403/tif_lzw.c',
+        'tiff_v403/tif_next.c',
+        'tiff_v403/tif_ojpeg.c',
+        'tiff_v403/tif_open.c',
+        'tiff_v403/tif_packbits.c',
+        'tiff_v403/tif_pixarlog.c',
+        'tiff_v403/tif_predict.c',
+        'tiff_v403/tif_print.c',
+        'tiff_v403/tif_read.c',
+        'tiff_v403/tif_strip.c',
+        'tiff_v403/tif_swab.c',
+        'tiff_v403/tif_thunder.c',
+        'tiff_v403/tif_tile.c',
+        'tiff_v403/tif_version.c',
+        'tiff_v403/tif_warning.c',
+        'tiff_v403/tif_write.c',
+        'tiff_v403/tif_zip.c',
+      ],
+    },
+    {
       'target_name': 'fx_zlib',
       'type': 'static_library',
       'sources': [
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/t4.h b/third_party/tiff_v403/t4.h
index b908f54f09..b908f54f09 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/t4.h
+++ b/third_party/tiff_v403/t4.h
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_aux.c b/third_party/tiff_v403/tif_aux.c
index 7d712146dd..7d712146dd 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_aux.c
+++ b/third_party/tiff_v403/tif_aux.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_close.c b/third_party/tiff_v403/tif_close.c
index 6181b97e2e..6181b97e2e 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_close.c
+++ b/third_party/tiff_v403/tif_close.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_codec.c b/third_party/tiff_v403/tif_codec.c
index 012a90b5e6..012a90b5e6 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_codec.c
+++ b/third_party/tiff_v403/tif_codec.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_color.c b/third_party/tiff_v403/tif_color.c
index c55a4afeb2..c55a4afeb2 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_color.c
+++ b/third_party/tiff_v403/tif_color.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_compress.c b/third_party/tiff_v403/tif_compress.c
index 3a1e15f3ba..3a1e15f3ba 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_compress.c
+++ b/third_party/tiff_v403/tif_compress.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.c b/third_party/tiff_v403/tif_dir.c
index 06951b4d17..06951b4d17 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.c
+++ b/third_party/tiff_v403/tif_dir.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.h b/third_party/tiff_v403/tif_dir.h
index 6af5f3dc37..6af5f3dc37 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.h
+++ b/third_party/tiff_v403/tif_dir.h
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirinfo.c b/third_party/tiff_v403/tif_dirinfo.c
index 2914d4079b..2914d4079b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirinfo.c
+++ b/third_party/tiff_v403/tif_dirinfo.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirread.c b/third_party/tiff_v403/tif_dirread.c
index b9e4ffae09..b9e4ffae09 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirread.c
+++ b/third_party/tiff_v403/tif_dirread.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirwrite.c b/third_party/tiff_v403/tif_dirwrite.c
index fa20609e2b..fa20609e2b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dirwrite.c
+++ b/third_party/tiff_v403/tif_dirwrite.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dumpmode.c b/third_party/tiff_v403/tif_dumpmode.c
index 8f582e7be5..8f582e7be5 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_dumpmode.c
+++ b/third_party/tiff_v403/tif_dumpmode.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_error.c b/third_party/tiff_v403/tif_error.c
index 8c0ef6cf9b..8c0ef6cf9b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_error.c
+++ b/third_party/tiff_v403/tif_error.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_extension.c b/third_party/tiff_v403/tif_extension.c
index 32d10cb7ad..32d10cb7ad 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_extension.c
+++ b/third_party/tiff_v403/tif_extension.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.c b/third_party/tiff_v403/tif_fax3.c
index 7ec8faa8b0..7ec8faa8b0 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.c
+++ b/third_party/tiff_v403/tif_fax3.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.h b/third_party/tiff_v403/tif_fax3.h
index b0f46c9a43..b0f46c9a43 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.h
+++ b/third_party/tiff_v403/tif_fax3.h
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3sm.c b/third_party/tiff_v403/tif_fax3sm.c
index c943f3e42f..c943f3e42f 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3sm.c
+++ b/third_party/tiff_v403/tif_fax3sm.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_flush.c b/third_party/tiff_v403/tif_flush.c
index 976cbc4cde..976cbc4cde 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_flush.c
+++ b/third_party/tiff_v403/tif_flush.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_getimage.c b/third_party/tiff_v403/tif_getimage.c
index 35c4786018..35c4786018 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_getimage.c
+++ b/third_party/tiff_v403/tif_getimage.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_jpeg.c b/third_party/tiff_v403/tif_jpeg.c
index d02f1f35e2..3c2998b915 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_jpeg.c
+++ b/third_party/tiff_v403/tif_jpeg.c
@@ -85,11 +85,11 @@ int TIFFReInitJPEG_12( TIFF *tif, int scheme, int is_encode );
 #endif
 
 #ifndef _FX_JPEG_TURBO_
-	#include "../../libjpeg/jpeglib.h"
-	#include "../../libjpeg/jerror.h"
+	#include "../libjpeg/jpeglib.h"
+	#include "../libjpeg/jerror.h"
 #else
-	#include "../../libjpeg-turbo/jpeglib.h"
-	#include "../../libjpeg-turbo/jerror.h"
+	#include "../libjpeg-turbo/jpeglib.h"
+	#include "../libjpeg-turbo/jerror.h"
 #endif//_FX_JPEG_TURBO_
 
 /* 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_luv.c b/third_party/tiff_v403/tif_luv.c
index 88f4ee85a0..88f4ee85a0 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_luv.c
+++ b/third_party/tiff_v403/tif_luv.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_lzw.c b/third_party/tiff_v403/tif_lzw.c
index 3a6f4c82c7..3a6f4c82c7 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_lzw.c
+++ b/third_party/tiff_v403/tif_lzw.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_next.c b/third_party/tiff_v403/tif_next.c
index 9f2f6d5307..9f2f6d5307 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_next.c
+++ b/third_party/tiff_v403/tif_next.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_ojpeg.c b/third_party/tiff_v403/tif_ojpeg.c
index dfd1403aa5..281c8e13cd 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_ojpeg.c
+++ b/third_party/tiff_v403/tif_ojpeg.c
@@ -216,11 +216,11 @@ static const TIFFField ojpegFields[] = {
 #endif
 
 #ifndef _FX_JPEG_TURBO_
-	#include "../../libjpeg/jpeglib.h"
-	#include "../../libjpeg/jerror.h"
+	#include "../libjpeg/jpeglib.h"
+	#include "../libjpeg/jerror.h"
 #else
-	#include "../../libjpeg-turbo/jpeglib.h"
-	#include "../../libjpeg-turbo/jerror.h"
+	#include "../libjpeg-turbo/jpeglib.h"
+	#include "../libjpeg-turbo/jerror.h"
 #endif//_FX_JPEG_TURBO_
 
 typedef struct jpeg_error_mgr jpeg_error_mgr;
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_open.c b/third_party/tiff_v403/tif_open.c
index f1c3e0a4a6..f1c3e0a4a6 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_open.c
+++ b/third_party/tiff_v403/tif_open.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_packbits.c b/third_party/tiff_v403/tif_packbits.c
index b599934f1f..b599934f1f 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_packbits.c
+++ b/third_party/tiff_v403/tif_packbits.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c b/third_party/tiff_v403/tif_pixarlog.c
index eba913e286..b30e6d4e9b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c
+++ b/third_party/tiff_v403/tif_pixarlog.c
@@ -89,7 +89,7 @@
  */
 
 #include "tif_predict.h"
-#include "../../../../../third_party/zlib_v128/zlib.h"
+#include "../zlib_v128/zlib.h"
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.c b/third_party/tiff_v403/tif_predict.c
index a34faf0a70..a34faf0a70 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.c
+++ b/third_party/tiff_v403/tif_predict.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.h b/third_party/tiff_v403/tif_predict.h
index dc7144c69e..dc7144c69e 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.h
+++ b/third_party/tiff_v403/tif_predict.h
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_print.c b/third_party/tiff_v403/tif_print.c
index f93e557f5c..f93e557f5c 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_print.c
+++ b/third_party/tiff_v403/tif_print.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_read.c b/third_party/tiff_v403/tif_read.c
index eb9350846e..eb9350846e 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_read.c
+++ b/third_party/tiff_v403/tif_read.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_strip.c b/third_party/tiff_v403/tif_strip.c
index 2c15a70bdc..2c15a70bdc 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_strip.c
+++ b/third_party/tiff_v403/tif_strip.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_swab.c b/third_party/tiff_v403/tif_swab.c
index 205e529c2c..205e529c2c 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_swab.c
+++ b/third_party/tiff_v403/tif_swab.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_thunder.c b/third_party/tiff_v403/tif_thunder.c
index e2d4ac0439..e2d4ac0439 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_thunder.c
+++ b/third_party/tiff_v403/tif_thunder.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_tile.c b/third_party/tiff_v403/tif_tile.c
index cb59a598e8..cb59a598e8 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_tile.c
+++ b/third_party/tiff_v403/tif_tile.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_version.c b/third_party/tiff_v403/tif_version.c
index 30119d205c..30119d205c 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_version.c
+++ b/third_party/tiff_v403/tif_version.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_warning.c b/third_party/tiff_v403/tif_warning.c
index 997f353688..997f353688 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_warning.c
+++ b/third_party/tiff_v403/tif_warning.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_write.c b/third_party/tiff_v403/tif_write.c
index f32ee9078b..f32ee9078b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_write.c
+++ b/third_party/tiff_v403/tif_write.c
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c b/third_party/tiff_v403/tif_zip.c
index 131db72b47..1a0d821ba8 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c
+++ b/third_party/tiff_v403/tif_zip.c
@@ -46,7 +46,7 @@
  * last found at ftp://ftp.uu.net/pub/archiving/zip/zlib/zlib-0.99.tar.gz.
  */
 #include "tif_predict.h"
-#include "../../../../../third_party/zlib_v128/zlib.h"
+#include "../zlib_v128/zlib.h"
 
 #include <stdio.h>
 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tiff.h b/third_party/tiff_v403/tiff.h
index 19b4e7976d..19b4e7976d 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tiff.h
+++ b/third_party/tiff_v403/tiff.h
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tiffconf.h b/third_party/tiff_v403/tiffconf.h
index d0f823d8c3..e36bde6571 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tiffconf.h
+++ b/third_party/tiff_v403/tiffconf.h
@@ -8,7 +8,7 @@
 #define _TIFFCONF_
 
 #ifndef _FX_SYSTEM_H_
-# include "../../../../include/fxcrt/fx_system.h"
+# include "../../core/include/fxcrt/fx_system.h"
 #endif
 
 //NOTE: The tiff codec requires an ANSI C compiler environment for building and 
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tiffio.h b/third_party/tiff_v403/tiffio.h
index 4c749edc9e..4c749edc9e 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tiffio.h
+++ b/third_party/tiff_v403/tiffio.h
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tiffiop.h b/third_party/tiff_v403/tiffiop.h
index c5ddc3c173..c5ddc3c173 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tiffiop.h
+++ b/third_party/tiff_v403/tiffiop.h
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/tiffvers.h b/third_party/tiff_v403/tiffvers.h
index 40edc813d5..40edc813d5 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tiffvers.h
+++ b/third_party/tiff_v403/tiffvers.h
diff --git a/core/src/fxcodec/fx_tiff/tiff_v403/uvcode.h b/third_party/tiff_v403/uvcode.h
index 50f11d7e0a..50f11d7e0a 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/uvcode.h
+++ b/third_party/tiff_v403/uvcode.h