--- a/make/common/Modules.gmk	Tue Feb 06 19:37:56 2018 +0000
+++ b/make/common/Modules.gmk	Wed Feb 07 14:17:24 2018 +0000
@@ -100,6 +100,7 @@
     #
 
 PLATFORM_MODULES += \
+    java.net.http \
     java.scripting \
     java.security.jgss \
     java.smartcardio \
@@ -112,7 +113,6 @@
     jdk.crypto.ec \
     jdk.dynalink \
     jdk.httpserver \
-    jdk.incubator.httpclient \
     jdk.internal.vm.compiler.management \
     jdk.jsobject \
     jdk.localedata \
@@ -143,6 +143,7 @@
 # DOCS_MODULES defines the root modules for javadoc generation.
 # All of their `require transitive` modules directly and indirectly will be included.
 DOCS_MODULES += \
+    java.net.http\
     java.se.ee \
     java.smartcardio \
     jdk.accessibility \
@@ -155,7 +156,6 @@
     jdk.editpad \
     jdk.hotspot.agent \
     jdk.httpserver \
-    jdk.incubator.httpclient \
     jdk.jartool \
     jdk.javadoc \
     jdk.jcmd \