61 files changed, 155 insertions, 293 deletions
diff --git a/BUILD.gn b/BUILD.gn
index ede37b493b..adabb169ae 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -314,6 +314,9 @@ static_library("fpdftext") {
 }
 
 static_library("fxcodec") {
+  deps = [
+    "third_party:fx_lcms2",
+  ]
   sources = [
     "core/include/fxcodec/fx_codec.h",
     "core/include/fxcodec/fx_codec_def.h",
@@ -452,31 +455,8 @@ static_library("fxcodec") {
     "core/src/fxcodec/jbig2/JBig2_SymbolDict.h",
     "core/src/fxcodec/lbmp/fx_bmp.cpp",
     "core/src/fxcodec/lbmp/fx_bmp.h",
-    "core/src/fxcodec/lcms2/src/fx_cmscam02.c",
-    "core/src/fxcodec/lcms2/src/fx_cmscgats.c",
-    "core/src/fxcodec/lcms2/src/fx_cmscnvrt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmserr.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsgamma.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsgmt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmshalf.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsintrp.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsio0.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsio1.c",
-    "core/src/fxcodec/lcms2/src/fx_cmslut.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsmd5.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsmtrx.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsnamed.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsopt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmspack.c",
-    "core/src/fxcodec/lcms2/src/fx_cmspcs.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsplugin.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsps2.c",
-    "core/src/fxcodec/lcms2/src/fx_cmssamp.c",
-    "core/src/fxcodec/lcms2/src/fx_cmssm.c",
-    "core/src/fxcodec/lcms2/src/fx_cmstypes.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsvirt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmswtpnt.c",
-    "core/src/fxcodec/lcms2/src/fx_cmsxform.c",
+    "core/src/fxcodec/lcms2/fx_lcms2.h",
+    "core/src/fxcodec/lcms2/fx_lcms2_plugin.h",
     "core/src/fxcodec/lgif/fx_gif.cpp",
     "core/src/fxcodec/lgif/fx_gif.h",
     "core/src/fxcodec/libjpeg/cderror.h",
diff --git a/core/src/fxcodec/codec/fx_codec_icc.cpp b/core/src/fxcodec/codec/fx_codec_icc.cpp
index 3b3b54b438..f33d085f56 100644
--- a/core/src/fxcodec/codec/fx_codec_icc.cpp
+++ b/core/src/fxcodec/codec/fx_codec_icc.cpp
@@ -5,8 +5,9 @@
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../../include/fxcodec/fx_codec.h"
+#include "../lcms2/fx_lcms2.h"
 #include "codec_int.h"
-#include "../lcms2/include/fx_lcms2.h"
+
 const FX_DWORD N_COMPONENT_LAB = 3;
 const FX_DWORD N_COMPONENT_GRAY = 1;
 const FX_DWORD N_COMPONENT_RGB = 3;
diff --git a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
index ce82960340..4457f1835a 100644
--- a/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
+++ b/core/src/fxcodec/codec/fx_codec_jpx_opj.cpp
@@ -8,9 +8,9 @@
 #include <limits>
 
 #include "../../../include/fxcodec/fx_codec.h"
-#include "codec_int.h"
 #include "../fx_libopenjpeg/libopenjpeg20/openjpeg.h"
-#include "../lcms2/include/fx_lcms2.h"
+#include "../lcms2/fx_lcms2.h"
+#include "codec_int.h"
 
 static void fx_error_callback(const char *msg, void *client_data)
 {
diff --git a/core/src/fxcodec/lcms2/include/fx_lcms2.h b/core/src/fxcodec/lcms2/fx_lcms2.h
index ca1ed2a2b2..86b4fad472 100644
--- a/core/src/fxcodec/lcms2/include/fx_lcms2.h
+++ b/core/src/fxcodec/lcms2/fx_lcms2.h
@@ -7,6 +7,6 @@
 #ifndef CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_
 #define CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_
 
-#include "../lcms2-2.6/include/lcms2.h"
+#include "../../../../third_party/lcms2-2.6/include/lcms2.h"
 
 #endif  // CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_H_
diff --git a/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h b/core/src/fxcodec/lcms2/fx_lcms2_plugin.h
index 92fd8a6362..86b722d261 100644
--- a/core/src/fxcodec/lcms2/include/fx_lcms2_plugin.h
+++ b/core/src/fxcodec/lcms2/fx_lcms2_plugin.h
@@ -7,6 +7,6 @@
 #ifndef CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_
 #define CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_
 
-#include "../lcms2-2.6/include/lcms2_plugin.h"
+#include "../../../../third_party/lcms2-2.6/include/lcms2_plugin.h"
 
 #endif  // CORE_SRC_FXCODEC_LCMS2_INCLUDE_FX_LCMS2_PLUGIN_H_
diff --git a/core/src/fxcodec/lcms2/src/fx_cmscam02.c b/core/src/fxcodec/lcms2/src/fx_cmscam02.c
deleted file mode 100644
index 3268424870..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmscam02.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 "../lcms2-2.6/src/cmscam02.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmscgats.c b/core/src/fxcodec/lcms2/src/fx_cmscgats.c
deleted file mode 100644
index 9e00fe6c3e..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmscgats.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 "../lcms2-2.6/src/cmscgats.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmscnvrt.c b/core/src/fxcodec/lcms2/src/fx_cmscnvrt.c
deleted file mode 100644
index 9b9eb99c70..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmscnvrt.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 "../lcms2-2.6/src/cmscnvrt.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmserr.c b/core/src/fxcodec/lcms2/src/fx_cmserr.c
deleted file mode 100644
index 27d0696c85..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmserr.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 "../lcms2-2.6/src/cmserr.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsgamma.c b/core/src/fxcodec/lcms2/src/fx_cmsgamma.c
deleted file mode 100644
index 9936c62b0f..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsgamma.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 "../lcms2-2.6/src/cmsgamma.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsgmt.c b/core/src/fxcodec/lcms2/src/fx_cmsgmt.c
deleted file mode 100644
index dfe4cc86f0..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsgmt.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 "../lcms2-2.6/src/cmsgmt.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmshalf.c b/core/src/fxcodec/lcms2/src/fx_cmshalf.c
deleted file mode 100644
index 9c7e07c580..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmshalf.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 "../lcms2-2.6/src/cmshalf.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsintrp.c b/core/src/fxcodec/lcms2/src/fx_cmsintrp.c
deleted file mode 100644
index 8eacd55bc0..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsintrp.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 "../lcms2-2.6/src/cmsintrp.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsio0.c b/core/src/fxcodec/lcms2/src/fx_cmsio0.c
deleted file mode 100644
index a4aed23c94..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsio0.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 "../lcms2-2.6/src/cmsio0.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsio1.c b/core/src/fxcodec/lcms2/src/fx_cmsio1.c
deleted file mode 100644
index 34ce927c4f..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsio1.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 "../lcms2-2.6/src/cmsio1.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmslut.c b/core/src/fxcodec/lcms2/src/fx_cmslut.c
deleted file mode 100644
index d032e3b0cb..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmslut.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 "../lcms2-2.6/src/cmslut.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsmd5.c b/core/src/fxcodec/lcms2/src/fx_cmsmd5.c
deleted file mode 100644
index 028db4a8eb..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsmd5.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 "../lcms2-2.6/src/cmsmd5.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsmtrx.c b/core/src/fxcodec/lcms2/src/fx_cmsmtrx.c
deleted file mode 100644
index ad04dcc307..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsmtrx.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 "../lcms2-2.6/src/cmsmtrx.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsnamed.c b/core/src/fxcodec/lcms2/src/fx_cmsnamed.c
deleted file mode 100644
index 93a0132aa7..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsnamed.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 "../lcms2-2.6/src/cmsnamed.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsopt.c b/core/src/fxcodec/lcms2/src/fx_cmsopt.c
deleted file mode 100644
index e16c735cbb..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsopt.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 "../lcms2-2.6/src/cmsopt.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmspack.c b/core/src/fxcodec/lcms2/src/fx_cmspack.c
deleted file mode 100644
index d125d33a32..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmspack.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 "../lcms2-2.6/src/cmspack.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmspcs.c b/core/src/fxcodec/lcms2/src/fx_cmspcs.c
deleted file mode 100644
index 2a9d6dde99..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmspcs.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 "../lcms2-2.6/src/cmspcs.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsplugin.c b/core/src/fxcodec/lcms2/src/fx_cmsplugin.c
deleted file mode 100644
index ab7e6c31ee..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsplugin.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 "../lcms2-2.6/src/cmsplugin.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsps2.c b/core/src/fxcodec/lcms2/src/fx_cmsps2.c
deleted file mode 100644
index b6a1ea9f97..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsps2.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 "../lcms2-2.6/src/cmsps2.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmssamp.c b/core/src/fxcodec/lcms2/src/fx_cmssamp.c
deleted file mode 100644
index 5e5c0316b2..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmssamp.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 "../lcms2-2.6/src/cmssamp.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmssm.c b/core/src/fxcodec/lcms2/src/fx_cmssm.c
deleted file mode 100644
index b8c716041e..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmssm.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 "../lcms2-2.6/src/cmssm.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmstypes.c b/core/src/fxcodec/lcms2/src/fx_cmstypes.c
deleted file mode 100644
index cf64a61dd9..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmstypes.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 "../lcms2-2.6/src/cmstypes.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsvirt.c b/core/src/fxcodec/lcms2/src/fx_cmsvirt.c
deleted file mode 100644
index cc60d1f9f1..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsvirt.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 "../lcms2-2.6/src/cmsvirt.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmswtpnt.c b/core/src/fxcodec/lcms2/src/fx_cmswtpnt.c
deleted file mode 100644
index d46c60a985..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmswtpnt.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 "../lcms2-2.6/src/cmswtpnt.c"
diff --git a/core/src/fxcodec/lcms2/src/fx_cmsxform.c b/core/src/fxcodec/lcms2/src/fx_cmsxform.c
deleted file mode 100644
index e8cd83af42..0000000000
--- a/core/src/fxcodec/lcms2/src/fx_cmsxform.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 "../lcms2-2.6/src/cmsxform.c"
diff --git a/pdfium.gyp b/pdfium.gyp
index 6585adfad2..8a4fb0bb41 100644
--- a/pdfium.gyp
+++ b/pdfium.gyp
@@ -328,16 +328,10 @@
     {
       'target_name': 'fxcodec',
       'type': 'static_library',
-      'include_dirs': [
+      'dependencies': [
+        'third_party/third_party.gyp:fx_lcms2',
       ],
       'ldflags': [ '-L<(PRODUCT_DIR)',],
-      'msvs_settings': {
-        'VCCLCompilerTool': {
-          # Unresolved warnings in fx_codec_jpx_opj.cpp
-          # https://code.google.com/p/pdfium/issues/detail?id=100
-          'WarnAsError': 'false',
-        },
-      },
       'sources': [
         'core/include/fxcodec/fx_codec.h',
         'core/include/fxcodec/fx_codec_def.h',
@@ -477,31 +471,8 @@
         'core/src/fxcodec/jbig2/JBig2_SymbolDict.h',
         'core/src/fxcodec/lbmp/fx_bmp.cpp',
         'core/src/fxcodec/lbmp/fx_bmp.h',
-        'core/src/fxcodec/lcms2/src/fx_cmscam02.c',
-        'core/src/fxcodec/lcms2/src/fx_cmscgats.c',
-        'core/src/fxcodec/lcms2/src/fx_cmscnvrt.c',
-        'core/src/fxcodec/lcms2/src/fx_cmserr.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsgamma.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsgmt.c',
-        'core/src/fxcodec/lcms2/src/fx_cmshalf.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsintrp.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsio0.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsio1.c',
-        'core/src/fxcodec/lcms2/src/fx_cmslut.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsmd5.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsmtrx.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsnamed.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsopt.c',
-        'core/src/fxcodec/lcms2/src/fx_cmspack.c',
-        'core/src/fxcodec/lcms2/src/fx_cmspcs.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsplugin.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsps2.c',
-        'core/src/fxcodec/lcms2/src/fx_cmssamp.c',
-        'core/src/fxcodec/lcms2/src/fx_cmssm.c',
-        'core/src/fxcodec/lcms2/src/fx_cmstypes.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsvirt.c',
-        'core/src/fxcodec/lcms2/src/fx_cmswtpnt.c',
-        'core/src/fxcodec/lcms2/src/fx_cmsxform.c',
+        'core/src/fxcodec/lcms2/fx_lcms2.h',
+        'core/src/fxcodec/lcms2/fx_lcms2_plugin.h',
         'core/src/fxcodec/lgif/fx_gif.cpp',
         'core/src/fxcodec/lgif/fx_gif.h',
         'core/src/fxcodec/libjpeg/cderror.h',
@@ -560,6 +531,13 @@
         'core/src/fxcodec/libjpeg/makefile',
         'core/src/fxcodec/libjpeg/transupp.h',
       ],
+      'msvs_settings': {
+        'VCCLCompilerTool': {
+          # Unresolved warnings in fx_codec_jpx_opj.cpp
+          # https://code.google.com/p/pdfium/issues/detail?id=100
+          'WarnAsError': 'false',
+        },
+      },
       'conditions': [
         ['os_posix==1', {
           # core/src/fxcodec/fx_libopenjpeg/src/fx_mct.c does an pointer-to-int
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index 9353b112a6..f5f0626ea7 100644
--- a/third_party/BUILD.gn
+++ b/third_party/BUILD.gn
@@ -30,31 +30,6 @@ static_library("bigint") {
   ]
 }
 
-source_set("fx_agg") {
-  configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    "//build/config/compiler:no_chromium_code",
-    "//third_party/pdfium:pdfium_config",
-  ]
-  sources = [
-    "agg23/agg_basics.h",
-    "agg23/agg_clip_liang_barsky.h",
-    "agg23/agg_conv_dash.h",
-    "agg23/agg_conv_stroke.h",
-    "agg23/agg_curves.cpp",
-    "agg23/agg_curves.h",
-    "agg23/agg_path_storage.cpp",
-    "agg23/agg_path_storage.h",
-    "agg23/agg_rasterizer_scanline_aa.cpp",
-    "agg23/agg_rasterizer_scanline_aa.h",
-    "agg23/agg_renderer_scanline.h",
-    "agg23/agg_rendering_buffer.h",
-    "agg23/agg_scanline_u.h",
-    "agg23/agg_vcgen_dash.cpp",
-    "agg23/agg_vcgen_stroke.cpp",
-  ]
-}
-
 source_set("freetype") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
@@ -94,6 +69,68 @@ source_set("freetype") {
   ]
 }
 
+source_set("fx_agg") {
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [
+    "//build/config/compiler:no_chromium_code",
+    "//third_party/pdfium:pdfium_config",
+  ]
+  sources = [
+    "agg23/agg_basics.h",
+    "agg23/agg_clip_liang_barsky.h",
+    "agg23/agg_conv_dash.h",
+    "agg23/agg_conv_stroke.h",
+    "agg23/agg_curves.cpp",
+    "agg23/agg_curves.h",
+    "agg23/agg_path_storage.cpp",
+    "agg23/agg_path_storage.h",
+    "agg23/agg_rasterizer_scanline_aa.cpp",
+    "agg23/agg_rasterizer_scanline_aa.h",
+    "agg23/agg_renderer_scanline.h",
+    "agg23/agg_rendering_buffer.h",
+    "agg23/agg_scanline_u.h",
+    "agg23/agg_vcgen_dash.cpp",
+    "agg23/agg_vcgen_stroke.cpp",
+  ]
+}
+
+source_set("fx_lcms2") {
+  configs -= [ "//build/config/compiler:chromium_code" ]
+  configs += [
+    "//build/config/compiler:no_chromium_code",
+    "//third_party/pdfium:pdfium_config",
+  ]
+  sources = [
+    "lcms2-2.6/include/lcms2.h",
+    "lcms2-2.6/include/lcms2_plugin.h",
+    "lcms2-2.6/src/cmscam02.c",
+    "lcms2-2.6/src/cmscgats.c",
+    "lcms2-2.6/src/cmscnvrt.c",
+    "lcms2-2.6/src/cmserr.c",
+    "lcms2-2.6/src/cmsgamma.c",
+    "lcms2-2.6/src/cmsgmt.c",
+    "lcms2-2.6/src/cmshalf.c",
+    "lcms2-2.6/src/cmsintrp.c",
+    "lcms2-2.6/src/cmsio0.c",
+    "lcms2-2.6/src/cmsio1.c",
+    "lcms2-2.6/src/cmslut.c",
+    "lcms2-2.6/src/cmsmd5.c",
+    "lcms2-2.6/src/cmsmtrx.c",
+    "lcms2-2.6/src/cmsnamed.c",
+    "lcms2-2.6/src/cmsopt.c",
+    "lcms2-2.6/src/cmspack.c",
+    "lcms2-2.6/src/cmspcs.c",
+    "lcms2-2.6/src/cmsplugin.c",
+    "lcms2-2.6/src/cmsps2.c",
+    "lcms2-2.6/src/cmssamp.c",
+    "lcms2-2.6/src/cmssm.c",
+    "lcms2-2.6/src/cmstypes.c",
+    "lcms2-2.6/src/cmsvirt.c",
+    "lcms2-2.6/src/cmswtpnt.c",
+    "lcms2-2.6/src/cmsxform.c",
+  ]
+}
+
 component("pdfium_base") {
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
@@ -111,4 +148,3 @@ component("pdfium_base") {
     "base/template_util.h",
   ]
 }
-
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/include/lcms2.h b/third_party/lcms2-2.6/include/lcms2.h
index 8595f70203..8595f70203 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/include/lcms2.h
+++ b/third_party/lcms2-2.6/include/lcms2.h
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/include/lcms2_plugin.h b/third_party/lcms2-2.6/include/lcms2_plugin.h
index 0c95d1f73c..0c95d1f73c 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/include/lcms2_plugin.h
+++ b/third_party/lcms2-2.6/include/lcms2_plugin.h
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmscam02.c b/third_party/lcms2-2.6/src/cmscam02.c
index 9d874aa205..9d874aa205 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmscam02.c
+++ b/third_party/lcms2-2.6/src/cmscam02.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmscgats.c b/third_party/lcms2-2.6/src/cmscgats.c
index 90174351e3..90174351e3 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmscgats.c
+++ b/third_party/lcms2-2.6/src/cmscgats.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmscnvrt.c b/third_party/lcms2-2.6/src/cmscnvrt.c
index 1a93e83f90..1a93e83f90 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmscnvrt.c
+++ b/third_party/lcms2-2.6/src/cmscnvrt.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmserr.c b/third_party/lcms2-2.6/src/cmserr.c
index a32b6e2303..743b4f5034 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmserr.c
+++ b/third_party/lcms2-2.6/src/cmserr.c
@@ -251,8 +251,8 @@ cmsBool  _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase *Data)
     return TRUE;
 }
 #else
-#include "../../../../../include/fxcrt/fx_system.h"
-#include "../../../../../include/fxcrt/fx_memory.h"
+#include "../../../core/include/fxcrt/fx_memory.h"
+#include "../../../core/include/fxcrt/fx_system.h"
 
 cmsBool  _cmsRegisterMemHandlerPlugin(cmsContext ContextID, cmsPluginBase* Plugin)
 {
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgamma.c b/third_party/lcms2-2.6/src/cmsgamma.c
index 97aeb7cc16..97aeb7cc16 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgamma.c
+++ b/third_party/lcms2-2.6/src/cmsgamma.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgmt.c b/third_party/lcms2-2.6/src/cmsgmt.c
index 1103363a78..1103363a78 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsgmt.c
+++ b/third_party/lcms2-2.6/src/cmsgmt.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmshalf.c b/third_party/lcms2-2.6/src/cmshalf.c
index f038b57b4c..f038b57b4c 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmshalf.c
+++ b/third_party/lcms2-2.6/src/cmshalf.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsintrp.c b/third_party/lcms2-2.6/src/cmsintrp.c
index 5d5f35d3fc..5d5f35d3fc 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsintrp.c
+++ b/third_party/lcms2-2.6/src/cmsintrp.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsio0.c b/third_party/lcms2-2.6/src/cmsio0.c
index 6549d15d9e..6549d15d9e 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsio0.c
+++ b/third_party/lcms2-2.6/src/cmsio0.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsio1.c b/third_party/lcms2-2.6/src/cmsio1.c
index 778aa2b4fc..778aa2b4fc 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsio1.c
+++ b/third_party/lcms2-2.6/src/cmsio1.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmslut.c b/third_party/lcms2-2.6/src/cmslut.c
index 73e6726bf4..73e6726bf4 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmslut.c
+++ b/third_party/lcms2-2.6/src/cmslut.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsmd5.c b/third_party/lcms2-2.6/src/cmsmd5.c
index a4758ff662..a4758ff662 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsmd5.c
+++ b/third_party/lcms2-2.6/src/cmsmd5.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsmtrx.c b/third_party/lcms2-2.6/src/cmsmtrx.c
index fb7b91caf1..fb7b91caf1 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsmtrx.c
+++ b/third_party/lcms2-2.6/src/cmsmtrx.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsnamed.c b/third_party/lcms2-2.6/src/cmsnamed.c
index acfd1c8cf9..acfd1c8cf9 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsnamed.c
+++ b/third_party/lcms2-2.6/src/cmsnamed.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsopt.c b/third_party/lcms2-2.6/src/cmsopt.c
index f885ef3f60..f885ef3f60 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsopt.c
+++ b/third_party/lcms2-2.6/src/cmsopt.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmspack.c b/third_party/lcms2-2.6/src/cmspack.c
index 9323b53ec5..9323b53ec5 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmspack.c
+++ b/third_party/lcms2-2.6/src/cmspack.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmspcs.c b/third_party/lcms2-2.6/src/cmspcs.c
index 102cd7d21e..102cd7d21e 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmspcs.c
+++ b/third_party/lcms2-2.6/src/cmspcs.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsplugin.c b/third_party/lcms2-2.6/src/cmsplugin.c
index 8903d2bd61..8903d2bd61 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsplugin.c
+++ b/third_party/lcms2-2.6/src/cmsplugin.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsps2.c b/third_party/lcms2-2.6/src/cmsps2.c
index 224b44b542..224b44b542 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsps2.c
+++ b/third_party/lcms2-2.6/src/cmsps2.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmssamp.c b/third_party/lcms2-2.6/src/cmssamp.c
index 70e469161f..70e469161f 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmssamp.c
+++ b/third_party/lcms2-2.6/src/cmssamp.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmssm.c b/third_party/lcms2-2.6/src/cmssm.c
index 5836e15506..5836e15506 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmssm.c
+++ b/third_party/lcms2-2.6/src/cmssm.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmstypes.c b/third_party/lcms2-2.6/src/cmstypes.c
index 06742b5ad6..06742b5ad6 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmstypes.c
+++ b/third_party/lcms2-2.6/src/cmstypes.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsvirt.c b/third_party/lcms2-2.6/src/cmsvirt.c
index b324c9902a..b324c9902a 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsvirt.c
+++ b/third_party/lcms2-2.6/src/cmsvirt.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmswtpnt.c b/third_party/lcms2-2.6/src/cmswtpnt.c
index 903fdd7497..903fdd7497 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmswtpnt.c
+++ b/third_party/lcms2-2.6/src/cmswtpnt.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsxform.c b/third_party/lcms2-2.6/src/cmsxform.c
index eddb9bd02c..eddb9bd02c 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/cmsxform.c
+++ b/third_party/lcms2-2.6/src/cmsxform.c
diff --git a/core/src/fxcodec/lcms2/lcms2-2.6/src/lcms2_internal.h b/third_party/lcms2-2.6/src/lcms2_internal.h
index 5119218ceb..5119218ceb 100644
--- a/core/src/fxcodec/lcms2/lcms2-2.6/src/lcms2_internal.h
+++ b/third_party/lcms2-2.6/src/lcms2_internal.h
diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp
index 8538001e7f..524416289e 100644
--- a/third_party/third_party.gyp
+++ b/third_party/third_party.gyp
@@ -21,33 +21,6 @@
       ],
     },
     {
-      'target_name': 'fx_agg',
-      'type': 'static_library',
-      'sources': [
-        'agg23/agg_basics.h',
-        'agg23/agg_clip_liang_barsky.h',
-        'agg23/agg_conv_dash.h',
-        'agg23/agg_conv_stroke.h',
-        'agg23/agg_curves.cpp',
-        'agg23/agg_curves.h',
-        'agg23/agg_path_storage.cpp',
-        'agg23/agg_path_storage.h',
-        'agg23/agg_rasterizer_scanline_aa.cpp',
-        'agg23/agg_rasterizer_scanline_aa.h',
-        'agg23/agg_renderer_scanline.h',
-        'agg23/agg_rendering_buffer.h',
-        'agg23/agg_scanline_u.h',
-        'agg23/agg_vcgen_dash.cpp',
-        'agg23/agg_vcgen_stroke.cpp',
-      ],
-      'conditions': [
-        ['os_posix==1', {
-          # library contains several enum vs non-enum conditionals.
-          'cflags': [ '-Wno-extra', ],
-        }],
-      ],
-    },
-    {
       'target_name': 'freetype',
       'type': 'static_library',
       'defines': [
@@ -88,6 +61,75 @@
       ],
     },
     {
+      'target_name': 'fx_agg',
+      'type': 'static_library',
+      'sources': [
+        'agg23/agg_basics.h',
+        'agg23/agg_clip_liang_barsky.h',
+        'agg23/agg_conv_dash.h',
+        'agg23/agg_conv_stroke.h',
+        'agg23/agg_curves.cpp',
+        'agg23/agg_curves.h',
+        'agg23/agg_path_storage.cpp',
+        'agg23/agg_path_storage.h',
+        'agg23/agg_rasterizer_scanline_aa.cpp',
+        'agg23/agg_rasterizer_scanline_aa.h',
+        'agg23/agg_renderer_scanline.h',
+        'agg23/agg_rendering_buffer.h',
+        'agg23/agg_scanline_u.h',
+        'agg23/agg_vcgen_dash.cpp',
+        'agg23/agg_vcgen_stroke.cpp',
+      ],
+      'conditions': [
+        ['os_posix==1', {
+          # library contains several enum vs non-enum conditionals.
+          'cflags': [ '-Wno-extra', ],
+        }],
+      ],
+    },
+    {
+      'target_name': 'fx_lcms2',
+      'type': 'static_library',
+      'sources': [
+        'lcms2-2.6/include/lcms2.h',
+        'lcms2-2.6/include/lcms2_plugin.h',
+        'lcms2-2.6/src/cmscam02.c',
+        'lcms2-2.6/src/cmscgats.c',
+        'lcms2-2.6/src/cmscnvrt.c',
+        'lcms2-2.6/src/cmserr.c',
+        'lcms2-2.6/src/cmsgamma.c',
+        'lcms2-2.6/src/cmsgmt.c',
+        'lcms2-2.6/src/cmshalf.c',
+        'lcms2-2.6/src/cmsintrp.c',
+        'lcms2-2.6/src/cmsio0.c',
+        'lcms2-2.6/src/cmsio1.c',
+        'lcms2-2.6/src/cmslut.c',
+        'lcms2-2.6/src/cmsmd5.c',
+        'lcms2-2.6/src/cmsmtrx.c',
+        'lcms2-2.6/src/cmsnamed.c',
+        'lcms2-2.6/src/cmsopt.c',
+        'lcms2-2.6/src/cmspack.c',
+        'lcms2-2.6/src/cmspcs.c',
+        'lcms2-2.6/src/cmsplugin.c',
+        'lcms2-2.6/src/cmsps2.c',
+        'lcms2-2.6/src/cmssamp.c',
+        'lcms2-2.6/src/cmssm.c',
+        'lcms2-2.6/src/cmstypes.c',
+        'lcms2-2.6/src/cmsvirt.c',
+        'lcms2-2.6/src/cmswtpnt.c',
+        'lcms2-2.6/src/cmsxform.c',
+      ],
+      'conditions': [
+        ['os_posix==1', {
+          'cflags': [
+            '-Wno-main',
+            '-Wno-missing-braces',
+            '-Wno-unused',
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'pdfium_base',
       'type': 'none',
       'sources': [