--- a/make/common/Modules.gmk	Tue Apr 17 15:39:20 2018 +0200
+++ b/make/common/Modules.gmk	Tue Apr 17 08:54:17 2018 -0700
@@ -89,6 +89,7 @@
     #
 
 PLATFORM_MODULES += \
+    java.net.http \
     java.scripting \
     java.security.jgss \
     java.smartcardio \
@@ -102,7 +103,6 @@
     jdk.crypto.ec \
     jdk.dynalink \
     jdk.httpserver \
-    jdk.incubator.httpclient \
     jdk.internal.vm.compiler.management \
     jdk.jsobject \
     jdk.localedata \
@@ -145,7 +145,6 @@
     jdk.editpad \
     jdk.hotspot.agent \
     jdk.httpserver \
-    jdk.incubator.httpclient \
     jdk.jartool \
     jdk.javadoc \
     jdk.jcmd \