diff -r 2c1a58222105 -r 96c700e62710 jdk/make/launcher/Launcher-java.base.gmk
--- a/jdk/make/launcher/Launcher-java.base.gmk	Thu Jul 07 21:29:04 2016 -0700
+++ b/jdk/make/launcher/Launcher-java.base.gmk	Fri Jul 08 08:56:39 2016 +0200
@@ -25,12 +25,10 @@
 
 include LauncherCommon.gmk
 
+$(eval $(call IncludeCustomExtension, jdk, launcher/Launcher-java.base.gmk))
+
 JAVA_RC_FLAGS += -I $(JDK_TOPDIR)/src/java.base/windows/native/common
-ifdef OPENJDK
-  JAVA_RC_FLAGS += -I $(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons
-else
-  JAVA_RC_FLAGS += -I $(JDK_TOPDIR)/src/closed/java.base/windows/native/launcher/icons
-endif
+JAVA_RC_FLAGS += -I $(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons
 
 ################################################################################