--- a/make/common/Modules.gmk	Tue Sep 12 19:03:39 2017 +0200
+++ b/make/common/Modules.gmk	Tue Sep 12 19:03:56 2017 +0200
@@ -187,6 +187,23 @@
 # before building the real images.
 INTERIM_IMAGE_MODULES := java.base java.logging
 
+LANGTOOLS_MODULES := \
+    java.compiler \
+    jdk.compiler \
+    jdk.javadoc \
+    jdk.jdeps \
+    jdk.jshell \
+    #
+
+CORBA_MODULES := java.corba
+
+HOTSPOT_MODULES := \
+    jdk.aot \
+    jdk.hotspot.agent \
+    jdk.internal.vm.ci \
+    jdk.internal.vm.compiler \
+    #
+
 ################################################################################
 # Some platforms don't have the serviceability agent
 
@@ -218,13 +235,7 @@
     #
 
 TOP_SRC_DIRS += \
-    $(CORBA_TOPDIR)/src \
-    $(HOTSPOT_TOPDIR)/src \
-    $(JDK_TOPDIR)/src \
-    $(LANGTOOLS_TOPDIR)/src \
-    $(JAXP_TOPDIR)/src \
-    $(JAXWS_TOPDIR)/src \
-    $(NASHORN_TOPDIR)/src \
+    $(TOPDIR)/src \
     #
 
 SRC_SUBDIRS += $(OPENJDK_TARGET_OS)/classes