--- old/jdk/make/launcher/Launcher-java.base.gmk	2016-07-01 17:48:49.088111917 +0200
+++ new/jdk/make/launcher/Launcher-java.base.gmk	2016-07-01 17:48:48.932105319 +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
 
 ################################################################################