diff --git a/BUILD.gn b/BUILD.gn
index 23e9f9a..9f40bc3 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -317,6 +317,8 @@
     "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 @@
     "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 f824414..658ddf2 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 b93ddac..1f289bb 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 4ef53d0..0000000
--- 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 7b65826..0000000
--- 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 7581b99..0000000
--- 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 cc8dc4e..0000000
--- 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 9892408..0000000
--- 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 8d53be2..0000000
--- 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 c612bd5..0000000
--- 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 d324a8e..0000000
--- 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 bec380d..0000000
--- 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 a3da355..0000000
--- 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 76a72223..0000000
--- 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 eac49bf..0000000
--- 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 3fb21e5..0000000
--- 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 4434fd0..0000000
--- 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 8a095d3..0000000
--- 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 b07fb40..0000000
--- 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 8c78903..0000000
--- 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 55d4f65..0000000
--- 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 3645bd2..0000000
--- 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 183622f..0000000
--- 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 ce0f6fb..0000000
--- 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 cdbf26c..0000000
--- 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 2dc94bb..0000000
--- 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 5481733..0000000
--- 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 ef57dfd..0000000
--- 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 daee77b..0000000
--- 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 1ece3b8..0000000
--- 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 8693e9d..0000000
--- 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 3b92492..0000000
--- 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 68d26de..0000000
--- 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 aa633e7..0000000
--- 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 40884c8..0000000
--- 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 15c8ee4..0000000
--- 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 03ee51f..0000000
--- 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 08768e7..0000000
--- 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 8323113..0000000
--- 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 a13df45..0000000
--- 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 fed1911..0000000
--- 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 682ffe6..0000000
--- 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 349930f..0000000
--- 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 2812901..0000000
--- 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 eab405a..0000000
--- 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 9a16a92..0000000
--- 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 64289bb..0000000
--- 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 e642a4e..0000000
--- 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 e9c6b10..0000000
--- 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 80f523c..0000000
--- 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 49cd404..0000000
--- 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 6d62e3c..0000000
--- 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 cb1921d..0000000
--- 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 9ab43fa..0000000
--- 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 8460a3f..0000000
--- 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 b0ce2e4..72d1785 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 7d53dec..a8ca925 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 a6c9520..5814a7d 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -234,6 +234,78 @@
   ]
 }
 
+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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_png.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/png.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/pngconf.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/pngdebug.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngerror.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngget.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/pnginfo.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/pnglibconf.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngmem.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngpread.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/pngpriv.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngread.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrio.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrtran.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngrutil.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngset.c
rename to 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
similarity index 99%
rename from core/src/fxcodec/fx_lpng/lpng_v163/pngstruct.h
rename to third_party/lpng_v163/pngstruct.h
index 25355c4..9fe77fd 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngtrans.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwio.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwrite.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwtran.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_lpng/lpng_v163/fx_pngwutil.c
rename to third_party/lpng_v163/pngwutil.c
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index df5341d..e77a92a 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/t4.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_aux.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_close.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_codec.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_color.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_compress.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_dir.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_dirinfo.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_dirread.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_dirwrite.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_dumpmode.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_error.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_extension.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_fax3sm.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_flush.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_getimage.c
rename to 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
similarity index 99%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_jpeg.c
rename to third_party/tiff_v403/tif_jpeg.c
index d02f1f3..3c2998b 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_jpeg.c
+++ b/third_party/tiff_v403/tif_jpeg.c
@@ -85,11 +85,11 @@
 #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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_luv.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_lzw.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_next.c
rename to 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
similarity index 99%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_ojpeg.c
rename to third_party/tiff_v403/tif_ojpeg.c
index dfd1403..281c8e1 100644
--- a/core/src/fxcodec/fx_tiff/tiff_v403/tif_ojpeg.c
+++ b/third_party/tiff_v403/tif_ojpeg.c
@@ -216,11 +216,11 @@
 #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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_open.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_packbits.c
rename to 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
similarity index 99%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_pixarlog.c
rename to third_party/tiff_v403/tif_pixarlog.c
index eba913e..b30e6d4 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_predict.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_print.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_read.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_strip.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_swab.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_thunder.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_tile.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_version.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_warning.c
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_write.c
rename to 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
similarity index 99%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tif_zip.c
rename to third_party/tiff_v403/tif_zip.c
index 131db72..1a0d821 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tiff.h
rename to 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
similarity index 98%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tiffconf.h
rename to third_party/tiff_v403/tiffconf.h
index d0f823d..e36bde6 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tiffio.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tiffiop.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/tiffvers.h
rename to 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
similarity index 100%
rename from core/src/fxcodec/fx_tiff/tiff_v403/uvcode.h
rename to third_party/tiff_v403/uvcode.h