--- old/make/lib/Awt2dLibraries.gmk	2014-03-19 19:08:41.203932132 -0400
+++ new/make/lib/Awt2dLibraries.gmk	2014-03-19 19:08:41.094931928 -0400
@@ -668,35 +668,76 @@
 
 ##########################################################################################
 
-# TODO: Update awt lib path when awt is converted
-$(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
-    LIBRARY := lcms, \
-    OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-    SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
-    LANG := C, \
-    OPTIMIZATION := HIGHEST, \
-    CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
-        $(SHARED_LIBRARY_FLAGS) \
-        -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
-        -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug, \
-    CFLAGS_solaris := -xc99=no_lib, \
-    CFLAGS_windows := -DCMS_IS_WINDOWS_, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
-    LDFLAGS := $(LDFLAGS_JDKLIB) \
-        $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
-    LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
-    LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
-    LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
-    LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
-    LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
-    VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
-    RC_FLAGS := $(RC_FLAGS) \
-        -D "JDK_FNAME=lcms.dll" \
-        -D "JDK_INTERNAL_NAME=lcms" \
-        -D "JDK_FTYPE=0x2L", \
-    OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
-    DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+LIBLCMS_DIR := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms
+
+ifeq ($(USE_EXTERNAL_LCMS), true)
+
+    # TODO: Update awt lib path when awt is converted
+    $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
+        LIBRARY := lcms, \
+        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+        SRC := $(LIBLCMS_DIR), \
+        INCLUDE_FILES := LCMS.c, \
+        LANG := C, \
+        OPTIMIZATION := HIGHEST, \
+        CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
+            $(SHARED_LIBRARY_FLAGS) \
+            -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+            -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+            $(LCMS_CFLAGS), \
+        CFLAGS_solaris := -xc99=no_lib, \
+        CFLAGS_windows := -DCMS_IS_WINDOWS_, \
+        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
+        LDFLAGS := $(LDFLAGS_JDKLIB) \
+            $(call SET_SHARED_LIBRARY_ORIGIN), \
+        LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
+        LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
+        LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc $(LCMS_LIBS), \
+        LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm $(LCMS_LIBS), \
+        LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm $(LCMS_LIBS), \
+        LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm $(LCMS_LIBS),\
+        VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+        RC_FLAGS := $(RC_FLAGS) \
+            -D "JDK_FNAME=lcms.dll" \
+            -D "JDK_INTERNAL_NAME=lcms" \
+            -D "JDK_FTYPE=0x2L", \
+        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
+        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+else
+
+    # TODO: Update awt lib path when awt is converted
+    $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
+        LIBRARY := lcms, \
+        OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
+        SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
+        LANG := C, \
+        OPTIMIZATION := HIGHEST, \
+        CFLAGS := $(filter-out -xc99=%none, $(CFLAGS_JDKLIB)) \
+            $(SHARED_LIBRARY_FLAGS) \
+            -I$(JDK_TOPDIR)/src/share/native/sun/java2d \
+            -I$(JDK_TOPDIR)/src/share/native/sun/awt/debug \
+            -I$(LIBLCMS_DIR), \
+        CFLAGS_solaris := -xc99=no_lib, \
+        CFLAGS_windows := -DCMS_IS_WINDOWS_, \
+        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
+        LDFLAGS := $(LDFLAGS_JDKLIB) \
+            $(call SET_SHARED_LIBRARY_ORIGIN), \
+        LDFLAGS_solaris := /usr/lib$(OPENJDK_TARGET_CPU_ISADIR)/libm.so.2, \
+        LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
+        LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
+        LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
+        LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
+        LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
+        VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
+        RC_FLAGS := $(RC_FLAGS) \
+            -D "JDK_FNAME=lcms.dll" \
+            -D "JDK_INTERNAL_NAME=lcms" \
+            -D "JDK_FTYPE=0x2L", \
+        OBJECT_DIR := $(JDK_OUTPUTDIR)/objs/liblcms, \
+        DEBUG_SYMBOLS := $(DEBUG_ALL_BINARIES)))
+
+endif
 
 BUILD_LIBRARIES += $(BUILD_LIBLCMS)
 
--- old/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2014-03-19 19:11:49.371277229 -0400
+++ new/src/share/native/sun/java2d/cmm/lcms/LCMS.c	2014-03-19 19:11:49.253277016 -0400
@@ -30,7 +30,7 @@
 #include "jni_util.h"
 #include "Trace.h"
 #include "Disposer.h"
-#include "lcms2.h"
+#include <lcms2.h>
 #include "jlong.h"