diff --git a/.hgignore b/.hgignore
index 81a7f7025ff..95446e54dcf 100644
--- a/.hgignore
+++ b/.hgignore
@@ -8,3 +8,6 @@ nbproject/private/
 \.DS_Store
 \.metadata/
 \.recommenders/
+test/nashorn/script/external
+test/nashorn/lib
+NashornProfile.txt
diff --git a/README b/README
index 537dea30aec..c93292bfbe4 100644
--- a/README
+++ b/README
@@ -4,7 +4,7 @@ Welcome to OpenJDK!
 For information about building OpenJDK, including how to fully retrieve all
 source code, please see either of these:
 
-  * common/doc/building.html   (html version)
-  * common/doc/building.md     (markdown version)
+  * doc/building.html   (html version)
+  * doc/building.md     (markdown version)
 
 See http://openjdk.java.net/ for more information about OpenJDK.
diff --git a/bin/idea.sh b/bin/idea.sh
index 2cd6f92bbb9..13c47490292 100644
--- a/bin/idea.sh
+++ b/bin/idea.sh
@@ -25,14 +25,14 @@
 # Shell script for generating an IDEA project from a given list of modules
 
 usage() {
-      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [modules]+" 
+      echo "usage: $0 [-h|--help] [-v|--verbose] [-o|--output <path>] [modules]+"
       exit 1
 }
 
 SCRIPT_DIR=`dirname $0`
 PWD=`pwd`
 cd $SCRIPT_DIR; SCRIPT_DIR=`pwd`
-cd ../../; TOP=`pwd`; cd $PWD
+cd ../; TOP=`pwd`; cd $PWD
 
 IDEA_OUTPUT=$TOP/.idea
 VERBOSE="false"
@@ -70,8 +70,10 @@ IDEA_MAKE="$TOP/make/idea"
 IDEA_TEMPLATE="$IDEA_MAKE/template"
 IML_TEMPLATE="$IDEA_TEMPLATE/jdk.iml"
 ANT_TEMPLATE="$IDEA_TEMPLATE/ant.xml"
+MISC_TEMPLATE="$IDEA_TEMPLATE/misc.xml"
 IDEA_IML="$IDEA_OUTPUT/jdk.iml"
 IDEA_ANT="$IDEA_OUTPUT/ant.xml"
+IDEA_MISC="$IDEA_OUTPUT/misc.xml"
 
 if [ "$VERBOSE" = "true" ] ; then
   echo "output dir: $IDEA_OUTPUT"
@@ -120,20 +122,16 @@ addSourceFolder() {
 }
 
 ### Generate project iml
-RELATIVE_BUILD_DIR="`dirname $SPEC | sed -e s@"$TOP/\(.*$\)"@"\1"@`"
 rm -f $IDEA_IML
 while IFS= read -r line
 do
   if echo "$line" | egrep "^ .* <sourceFolder.*####" > /dev/null ; then
-    if [ "$SOURCE_FOLDERS_DONE" = "false" ] ; then 
+    if [ "$SOURCE_FOLDERS_DONE" = "false" ] ; then
       SOURCE_FOLDERS_DONE="true"
       for root in $MODULE_ROOTS; do
          addSourceFolder $root
       done
     fi
-  elif echo "$line" | egrep "^ .* <excludeFolder.*####" > /dev/null ; then
-    ul="`echo "$line" | sed -e s@"\(.*/\)####\(.*\)"@"\1$RELATIVE_BUILD_DIR\2"@`"
-    printf "%s\n" "$ul" >> $IDEA_IML 
   else
     printf "%s\n" "$line" >> $IDEA_IML
   fi
@@ -155,14 +153,6 @@ addBuildDir() {
   printf "%s\n" "$mn" >> $IDEA_ANT
 }
 
-JTREG_HOME="        <property name=\"jtreg.home\" value=\"####\" />"
-
-addJtregHome() {
-  DIR=`dirname $SPEC`
-  mn="`echo "$JTREG_HOME" | sed -e s@"\(.*\)####\(.*\)"@"\1$JT_HOME\2"@`"
-  printf "%s\n" "$mn" >> $IDEA_ANT
-}
-
 ### Generate ant.xml
 
 rm -f $IDEA_ANT
@@ -170,8 +160,6 @@ while IFS= read -r line
 do
   if echo "$line" | egrep "^ .* <property name=\"module.name\"" > /dev/null ; then
     addModuleName
-  elif echo "$line" | egrep "^ .* <property name=\"jtreg.home\"" > /dev/null ; then
-    addJtregHome
   elif echo "$line" | egrep "^ .* <property name=\"build.target.dir\"" > /dev/null ; then
     addBuildDir
   else
@@ -179,6 +167,38 @@ do
   fi
 done < "$ANT_TEMPLATE"
 
+### Generate misc.xml
+
+rm -f $IDEA_MISC
+
+JTREG_HOME="    <path>####</path>"
+
+IMAGES_DIR="    <jre alt=\"true\" value=\"####\" />"
+
+addImagesDir() {
+  DIR=`dirname $SPEC`/images/jdk
+  mn="`echo "$IMAGES_DIR" | sed -e s@"\(.*\)####\(.*\)"@"\1$DIR\2"@`"
+  printf "%s\n" "$mn" >> $IDEA_MISC
+}
+
+addJtregHome() {
+  DIR=`dirname $SPEC`
+  mn="`echo "$JTREG_HOME" | sed -e s@"\(.*\)####\(.*\)"@"\1$JT_HOME\2"@`"
+  printf "%s\n" "$mn" >> $IDEA_MISC
+}
+
+rm -f $MISC_ANT
+while IFS= read -r line
+do
+  if echo "$line" | egrep "^ .*<path>jtreg_home</path>" > /dev/null ; then
+	addJtregHome
+  elif echo "$line" | egrep "^ .*<jre alt=\"true\" value=\"images_jdk\"" > /dev/null ; then
+    addImagesDir
+  else
+    printf "%s\n" "$line" >> $IDEA_MISC
+  fi
+done < "$MISC_TEMPLATE"
+
 ### Compile the custom Logger
 
 CLASSES=$IDEA_OUTPUT/classes
diff --git a/bin/jib.sh b/bin/jib.sh
index ceac118bb77..040e33c79c0 100644
--- a/bin/jib.sh
+++ b/bin/jib.sh
@@ -42,7 +42,7 @@ setup_url() {
     jib_revision="2.0-SNAPSHOT"
     jib_ext="jib.sh.gz"
 
-    closed_script="${mydir}/../../closed/conf/jib-install.conf"
+    closed_script="${mydir}/../../../closed/conf/jib-install.conf"
     if [ -f "${closed_script}" ]; then
         source "${closed_script}"
     fi
diff --git a/bin/unshuffle_list.txt b/bin/unshuffle_list.txt
index 73ccb0a0136..0f6ce4437ef 100644
--- a/bin/unshuffle_list.txt
+++ b/bin/unshuffle_list.txt
@@ -21,1479 +21,183 @@
 # questions.
 #
 
-corba/src/java.corba/share/classes/com/sun/corba/se : corba/src/share/classes/com/sun/corba/se
-corba/src/java.corba/share/classes/com/sun/org/omg : corba/src/share/classes/com/sun/org/omg
-corba/src/java.corba/share/classes/com/sun/tools/corba/se/idl : corba/src/share/classes/com/sun/tools/corba/se/idl
-corba/src/java.corba/share/classes/javax/activity : corba/src/share/classes/javax/activity
-corba/src/java.corba/share/classes/javax/rmi : corba/src/share/classes/javax/rmi
-corba/src/java.corba/share/classes/org/omg : corba/src/share/classes/org/omg
-corba/src/java.corba/share/classes/sun/corba : corba/src/share/classes/sun/corba
-corba/src/java.corba/share/classes/com/sun/jndi/cosnaming : jdk/src/share/classes/com/sun/jndi/cosnaming
-corba/src/java.corba/share/classes/com/sun/jndi/toolkit/corba : jdk/src/share/classes/com/sun/jndi/toolkit/corba
-corba/src/java.corba/share/classes/com/sun/jndi/url/corbaname : jdk/src/share/classes/com/sun/jndi/url/corbaname
-corba/src/java.corba/share/classes/com/sun/jndi/url/iiop : jdk/src/share/classes/com/sun/jndi/url/iiop
-corba/src/java.corba/share/classes/com/sun/jndi/url/iiopname : jdk/src/share/classes/com/sun/jndi/url/iiopname
-corba/src/jdk.rmic/share/classes/sun/rmi/rmic/iiop : corba/src/share/classes/sun/rmi/rmic/iiop
-jaxp/src/java.xml/share/classes/com/sun/java_cup/internal/runtime : jaxp/src/com/sun/java_cup/internal/runtime
-jaxp/src/java.xml/share/classes/com/sun/org/apache/bcel/internal : jaxp/src/com/sun/org/apache/bcel/internal
-jaxp/src/java.xml/share/classes/com/sun/org/apache/regexp/internal : jaxp/src/com/sun/org/apache/regexp/internal
-jaxp/src/java.xml/share/classes/com/sun/org/apache/xalan : jaxp/src/com/sun/org/apache/xalan
-jaxp/src/java.xml/share/classes/com/sun/org/apache/xerces : jaxp/src/com/sun/org/apache/xerces
-jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm : jaxp/src/com/sun/org/apache/xml/internal/dtm
-jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/res : jaxp/src/com/sun/org/apache/xml/internal/res
-jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/resolver : jaxp/src/com/sun/org/apache/xml/internal/resolver
-jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serialize : jaxp/src/com/sun/org/apache/xml/internal/serialize
-jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/serializer : jaxp/src/com/sun/org/apache/xml/internal/serializer
-jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/utils : jaxp/src/com/sun/org/apache/xml/internal/utils
-jaxp/src/java.xml/share/classes/com/sun/org/apache/xpath : jaxp/src/com/sun/org/apache/xpath
-jaxp/src/java.xml/share/classes/com/sun/xml/internal/stream : jaxp/src/com/sun/xml/internal/stream
-jaxp/src/java.xml/share/classes/javax/xml/datatype : jaxp/src/javax/xml/datatype
-jaxp/src/java.xml/share/classes/javax/xml/namespace : jaxp/src/javax/xml/namespace
-jaxp/src/java.xml/share/classes/javax/xml/parsers : jaxp/src/javax/xml/parsers
-jaxp/src/java.xml/share/classes/javax/xml/stream : jaxp/src/javax/xml/stream
-jaxp/src/java.xml/share/classes/javax/xml/transform : jaxp/src/javax/xml/transform
-jaxp/src/java.xml/share/classes/javax/xml/validation : jaxp/src/javax/xml/validation
-jaxp/src/java.xml/share/classes/javax/xml/XMLConstants.java : jaxp/src/javax/xml/XMLConstants.java
-jaxp/src/java.xml/share/classes/javax/xml/xpath : jaxp/src/javax/xml/xpath
-jaxp/src/java.xml/share/classes/org/w3c/dom : jaxp/src/org/w3c/dom
-jaxp/src/java.xml/share/classes/org/xml/sax : jaxp/src/org/xml/sax
-jaxws/src/java.activation/share/classes/com/sun/activation/registries : jaxws/src/share/jaf_classes/com/sun/activation/registries
-jaxws/src/java.activation/share/classes/javax/activation : jaxws/src/share/jaf_classes/javax/activation
-jaxws/src/java.activation/share/classes/META-INF : jaxws/src/share/jaf_classes/META-INF
-jaxws/src/java.xml.ws.annotation/share/classes/javax/annotation : jaxws/src/share/jaxws_classes/javax/annotation
-jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal : jaxws/src/share/jaxws_classes/com/sun/istack/internal
-jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/localization : jaxws/src/share/jaxws_classes/com/sun/istack/internal/localization
-jaxws/src/java.xml.bind/share/classes/com/sun/istack/internal/logging/Logger.java : jaxws/src/share/jaxws_classes/com/sun/istack/internal/logging/Logger.java
-jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/bind : jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind
-jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/fastinfoset : jaxws/src/share/jaxws_classes/com/sun/xml/internal/fastinfoset
-jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/org : jaxws/src/share/jaxws_classes/com/sun/xml/internal/org
-jaxws/src/java.xml.bind/share/classes/com/sun/xml/internal/txw2 : jaxws/src/share/jaxws_classes/com/sun/xml/internal/txw2
-jaxws/src/java.xml.bind/share/classes/javax/xml/bind : jaxws/src/share/jaxws_classes/javax/xml/bind
-jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/messaging : jaxws/src/share/jaxws_classes/com/sun/xml/internal/messaging
-jaxws/src/java.xml.ws/share/classes/javax/xml/soap : jaxws/src/share/jaxws_classes/javax/xml/soap
-jaxws/src/java.xml.ws/share/classes/com/oracle/webservices/internal : jaxws/src/share/jaxws_classes/com/oracle/webservices/internal
-jaxws/src/java.xml.ws/share/classes/com/oracle/xmlns/internal : jaxws/src/share/jaxws_classes/com/oracle/xmlns/internal
-jaxws/src/java.xml.ws/share/classes/com/sun/org/glassfish : jaxws/src/share/jaxws_classes/com/sun/org/glassfish
-jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/stream : jaxws/src/share/jaxws_classes/com/sun/xml/internal/stream
-jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws : jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws
-jaxws/src/java.xml.ws/share/classes/javax/jws : jaxws/src/share/jaxws_classes/javax/jws
-jaxws/src/java.xml.ws/share/classes/javax/xml/ws : jaxws/src/share/jaxws_classes/javax/xml/ws
-jaxws/src/jdk.xml.bind/share/classes/com/sun/codemodel : jaxws/src/share/jaxws_classes/com/sun/codemodel
-jaxws/src/jdk.xml.bind/share/classes/com/sun/istack/internal/tools : jaxws/src/share/jaxws_classes/com/sun/istack/internal/tools
-jaxws/src/jdk.xml.bind/share/classes/com/sun/tools/internal : jaxws/src/share/jaxws_classes/com/sun/tools/internal
-jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/dtdparser : jaxws/src/share/jaxws_classes/com/sun/xml/internal/dtdparser
-jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/rngom : jaxws/src/share/jaxws_classes/com/sun/xml/internal/rngom
-jaxws/src/jdk.xml.bind/share/classes/com/sun/xml/internal/xsom : jaxws/src/share/jaxws_classes/com/sun/xml/internal/xsom
-jaxws/src/jdk.xml.bind/share/classes/META-INF/services/com.sun.tools.internal.xjc.Plugin : jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.xjc.Plugin
-jaxws/src/jdk.xml.bind/share/classes/org/relaxng/datatype : jaxws/src/share/jaxws_classes/org/relaxng/datatype
-jaxws/src/jdk.xml.ws/share/classes/com/sun/tools/internal/ws : jaxws/src/share/jaxws_classes/com/sun/tools/internal/ws
-jaxws/src/jdk.xml.ws/share/classes/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin : jaxws/src/share/jaxws_classes/com/sun/tools/etc/META-INF/services/com.sun.tools.internal.ws.wscompile.Plugin
-jdk/src/demo/share : jdk/src/share/demo
-jdk/src/demo/share/jpda/com/sun/tools/example : jdk/src/share/classes/com/sun/tools/example
-jdk/src/demo/solaris/jni/Poller : jdk/src/solaris/demo/jni/Poller
-jdk/src/demo/unix/jvmti/hprof/hprof_md.c : jdk/src/solaris/demo/jvmti/hprof/hprof_md.c
-jdk/src/demo/windows/jvmti/hprof : jdk/src/windows/demo/jvmti/hprof
-jdk/src/java.base/aix/conf/tzmappings : jdk/src/aix/lib/tzmappings
-jdk/src/java.base/aix/native/libnet/java/net : jdk/src/aix/native/java/net
-jdk/src/java.base/aix/native/libnio/ch : jdk/src/aix/native/sun/nio/ch
-jdk/src/java.base/aix/native/libnio/fs/AixNativeDispatcher.c : jdk/src/aix/native/sun/nio/fs/AixNativeDispatcher.c
-jdk/src/java.base/macosx/classes/java/lang/ClassLoaderHelper.java : jdk/src/macosx/classes/java/lang/ClassLoaderHelper.java
-jdk/src/java.base/macosx/classes/java/net/DefaultInterface.java : jdk/src/macosx/classes/java/net/DefaultInterface.java
-jdk/src/java.base/macosx/classes/sun/nio/ch : jdk/src/macosx/classes/sun/nio/ch
-jdk/src/java.base/macosx/classes/sun/util/locale/provider : jdk/src/macosx/classes/sun/util/locale/provider
-jdk/src/java.base/macosx/conf/x86_64/jvm.cfg : jdk/src/macosx/bin/x86_64/jvm.cfg
-jdk/src/java.base/macosx/native/include/jni_md.h : jdk/src/macosx/javavm/export/jni_md.h
-jdk/src/java.base/macosx/native/include/jvm_md.h : jdk/src/macosx/javavm/export/jvm_md.h
-jdk/src/java.base/macosx/native/launcher/Info-cmdline.plist : jdk/src/macosx/lib/Info-cmdline.plist
-jdk/src/java.base/macosx/native/launcher/Info-privileged.plist : jdk/src/macosx/lib/Info-privileged.plist
-jdk/src/java.base/macosx/native/launcher/jexec.c : jdk/src/macosx/bin/jexec.c
-jdk/src/java.base/macosx/native/libjava/HostLocaleProviderAdapter_md.c : jdk/src/macosx/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c
-jdk/src/java.base/macosx/native/libjli/java_md_macosx.c : jdk/src/macosx/bin/java_md_macosx.c
-jdk/src/java.base/macosx/native/libjli/java_md_macosx.h : jdk/src/macosx/bin/java_md_macosx.h
-jdk/src/java.base/share/classes/com/sun/crypto/provider : jdk/src/share/classes/com/sun/crypto/provider
-jdk/src/java.base/share/classes/com/sun/java/util/jar/pack : jdk/src/share/classes/com/sun/java/util/jar/pack
-jdk/src/java.base/share/classes/com/sun/net/ssl/internal/ssl : jdk/src/share/classes/com/sun/net/ssl/internal/ssl
-jdk/src/java.base/share/classes/com/sun/net/ssl/internal/www/protocol/https : jdk/src/share/classes/com/sun/net/ssl/internal/www/protocol/https
-jdk/src/java.base/share/classes/com/sun/net/ssl : jdk/src/share/classes/com/sun/net/ssl
-jdk/src/java.base/share/classes/com/sun/nio/file : jdk/src/share/classes/com/sun/nio/file
-jdk/src/java.base/share/classes/com/sun/security/cert/internal/x509 : jdk/src/share/classes/com/sun/security/cert/internal/x509
-jdk/src/java.base/share/classes/com/sun/security/ntlm : jdk/src/share/classes/com/sun/security/ntlm
-jdk/src/java.base/share/classes/java/io : jdk/src/share/classes/java/io
-jdk/src/java.base/share/classes/java/lang/annotation : jdk/src/share/classes/java/lang/annotation
-jdk/src/java.base/share/classes/java/lang/doc-files : jdk/src/share/classes/java/lang/doc-files
-jdk/src/java.base/share/classes/java/lang/invoke : jdk/src/share/classes/java/lang/invoke
-jdk/src/java.base/share/classes/java/lang : jdk/src/share/classes/java/lang
-jdk/src/java.base/share/classes/java/lang/ref : jdk/src/share/classes/java/lang/ref
-jdk/src/java.base/share/classes/java/lang/reflect : jdk/src/share/classes/java/lang/reflect
-jdk/src/java.base/share/classes/java/math : jdk/src/share/classes/java/math
-jdk/src/java.base/share/classes/java/net : jdk/src/share/classes/java/net
-jdk/src/java.base/share/classes/java/nio : jdk/src/share/classes/java/nio
-jdk/src/java.base/share/classes/java/security/acl : jdk/src/share/classes/java/security/acl
-jdk/src/java.base/share/classes/java/security/cert : jdk/src/share/classes/java/security/cert
-jdk/src/java.base/share/classes/java/security/interfaces : jdk/src/share/classes/java/security/interfaces
-jdk/src/java.base/share/classes/java/security : jdk/src/share/classes/java/security
-jdk/src/java.base/share/classes/java/security/spec : jdk/src/share/classes/java/security/spec
-jdk/src/java.base/share/classes/java/text : jdk/src/share/classes/java/text
-jdk/src/java.base/share/classes/java/time : jdk/src/share/classes/java/time
-jdk/src/java.base/share/classes/java/util/concurrent : jdk/src/share/classes/java/util/concurrent
-jdk/src/java.base/share/classes/java/util/function : jdk/src/share/classes/java/util/function
-jdk/src/java.base/share/classes/java/util/jar : jdk/src/share/classes/java/util/jar
-jdk/src/java.base/share/classes/java/util : jdk/src/share/classes/java/util
-jdk/src/java.base/share/classes/java/util/regex : jdk/src/share/classes/java/util/regex
-jdk/src/java.base/share/classes/java/util/spi : jdk/src/share/classes/java/util/spi
-jdk/src/java.base/share/classes/java/util/stream : jdk/src/share/classes/java/util/stream
-jdk/src/java.base/share/classes/java/util/zip : jdk/src/share/classes/java/util/zip
-jdk/src/java.base/share/classes/javax/crypto : jdk/src/share/classes/javax/crypto
-jdk/src/java.base/share/classes/javax/net : jdk/src/share/classes/javax/net
-jdk/src/java.base/share/classes/javax/security/auth/callback : jdk/src/share/classes/javax/security/auth/callback
-jdk/src/java.base/share/classes/javax/security/auth : jdk/src/share/classes/javax/security/auth
-jdk/src/java.base/share/classes/javax/security/auth/login : jdk/src/share/classes/javax/security/auth/login
-jdk/src/java.base/share/classes/javax/security/auth/spi : jdk/src/share/classes/javax/security/auth/spi
-jdk/src/java.base/share/classes/javax/security/auth/x500 : jdk/src/share/classes/javax/security/auth/x500
-jdk/src/java.base/share/classes/javax/security/cert : jdk/src/share/classes/javax/security/cert
-jdk/src/java.base/share/classes/jdk/internal/org/objectweb : jdk/src/share/classes/jdk/internal/org/objectweb
-jdk/src/java.base/share/classes/jdk/internal/org/xml/sax : jdk/src/share/classes/jdk/internal/org/xml/sax
-jdk/src/java.base/share/classes/jdk/internal/util/xml : jdk/src/share/classes/jdk/internal/util/xml
-jdk/src/java.base/share/classes/jdk/net : jdk/src/share/classes/jdk/net
-jdk/src/java.base/share/classes/overview-core.html : jdk/src/share/classes/overview-core.html
-jdk/src/java.base/share/classes/sun/invoke : jdk/src/share/classes/sun/invoke
-jdk/src/java.base/share/classes/sun/launcher : jdk/src/share/classes/sun/launcher
-jdk/src/java.base/share/classes/sun/misc : jdk/src/share/classes/sun/misc
-jdk/src/java.base/share/classes/sun/net/dns : jdk/src/share/classes/sun/net/dns
-jdk/src/java.base/share/classes/sun/net/ftp/impl : jdk/src/share/classes/sun/net/ftp/impl
-jdk/src/java.base/share/classes/sun/net/ftp : jdk/src/share/classes/sun/net/ftp
-jdk/src/java.base/share/classes/sun/net/idn : jdk/src/share/classes/sun/net/idn
-jdk/src/java.base/share/classes/sun/net : jdk/src/share/classes/sun/net
-jdk/src/java.base/share/classes/sun/net/sdp : jdk/src/share/classes/sun/net/sdp
-jdk/src/java.base/share/classes/sun/net/smtp : jdk/src/share/classes/sun/net/smtp
-jdk/src/java.base/share/classes/sun/net/spi/DefaultProxySelector.java : jdk/src/share/classes/sun/net/spi/DefaultProxySelector.java
-jdk/src/java.base/share/classes/sun/net/spi/nameservice : jdk/src/share/classes/sun/net/spi/nameservice
-jdk/src/java.base/share/classes/sun/net/util : jdk/src/share/classes/sun/net/util
-jdk/src/java.base/share/classes/sun/net/www/content/text : jdk/src/share/classes/sun/net/www/content/text
-jdk/src/java.base/share/classes/sun/net/www/http : jdk/src/share/classes/sun/net/www/http
-jdk/src/java.base/share/classes/sun/net/www : jdk/src/share/classes/sun/net/www
-jdk/src/java.base/share/classes/sun/net/www/protocol/file : jdk/src/share/classes/sun/net/www/protocol/file
-jdk/src/java.base/share/classes/sun/net/www/protocol/ftp : jdk/src/share/classes/sun/net/www/protocol/ftp
-jdk/src/java.base/share/classes/sun/net/www/protocol/http : jdk/src/share/classes/sun/net/www/protocol/http
-jdk/src/java.base/share/classes/sun/net/www/protocol/http/ntlm : jdk/src/share/classes/sun/net/www/protocol/http/ntlm
-jdk/src/java.base/share/classes/sun/net/www/protocol/https : jdk/src/share/classes/sun/net/www/protocol/https
-jdk/src/java.base/share/classes/sun/net/www/protocol/jar : jdk/src/share/classes/sun/net/www/protocol/jar
-jdk/src/java.base/share/classes/sun/net/www/protocol/mailto : jdk/src/share/classes/sun/net/www/protocol/mailto
-jdk/src/java.base/share/classes/sun/net/www/protocol/netdoc/Handler.java : jdk/src/share/classes/sun/net/www/protocol/netdoc/Handler.java
-jdk/src/java.base/share/classes/sun/nio/ByteBuffered.java : jdk/src/share/classes/sun/nio/ByteBuffered.java
-jdk/src/java.base/share/classes/sun/nio/ch : jdk/src/share/classes/sun/nio/ch
-jdk/src/java.base/share/classes/sun/nio/cs : jdk/src/share/classes/sun/nio/cs
-jdk/src/java.base/share/classes/sun/nio/fs : jdk/src/share/classes/sun/nio/fs
-jdk/src/java.base/share/classes/sun/reflect : jdk/src/share/classes/sun/reflect
-jdk/src/java.base/share/classes/sun/security/action : jdk/src/share/classes/sun/security/action
-jdk/src/java.base/share/classes/sun/security/internal : jdk/src/share/classes/sun/security/internal
-jdk/src/java.base/share/classes/sun/security/jca : jdk/src/share/classes/sun/security/jca
-jdk/src/java.base/share/classes/sun/security/pkcs10 : jdk/src/share/classes/sun/security/pkcs10
-jdk/src/java.base/share/classes/sun/security/pkcs12 : jdk/src/share/classes/sun/security/pkcs12
-jdk/src/java.base/share/classes/sun/security/pkcs : jdk/src/share/classes/sun/security/pkcs
-jdk/src/java.base/share/classes/sun/security/provider/certpath : jdk/src/share/classes/sun/security/provider/certpath
-jdk/src/java.base/share/classes/sun/security/provider/certpath/ssl : jdk/src/share/classes/sun/security/provider/certpath/ssl
-jdk/src/java.base/share/classes/sun/security/provider : jdk/src/share/classes/sun/security/provider
-jdk/src/java.base/share/classes/sun/security/rsa : jdk/src/share/classes/sun/security/rsa
-jdk/src/java.base/share/classes/sun/security/ssl : jdk/src/share/classes/sun/security/ssl
-jdk/src/java.base/share/classes/sun/security/timestamp : jdk/src/share/classes/sun/security/timestamp
-jdk/src/java.base/share/classes/sun/security/tools : jdk/src/share/classes/sun/security/tools
-jdk/src/java.base/share/classes/sun/security/tools/keytool : jdk/src/share/classes/sun/security/tools/keytool
-jdk/src/java.base/share/classes/sun/security/util : jdk/src/share/classes/sun/security/util
-jdk/src/java.base/share/classes/sun/security/validator : jdk/src/share/classes/sun/security/validator
-jdk/src/java.base/share/classes/sun/security/x509 : jdk/src/share/classes/sun/security/x509
-jdk/src/java.base/share/classes/sun/text/bidi : jdk/src/share/classes/sun/text/bidi
-jdk/src/java.base/share/classes/sun/text : jdk/src/share/classes/sun/text
-jdk/src/java.base/share/classes/sun/text/normalizer : jdk/src/share/classes/sun/text/normalizer
-jdk/src/java.base/share/classes/sun/text/resources/en : jdk/src/share/classes/sun/text/resources/en
-jdk/src/java.base/share/classes/sun/text/resources : jdk/src/share/classes/sun/text/resources
-jdk/src/java.base/share/classes/sun/util/calendar : jdk/src/share/classes/sun/util/calendar
-jdk/src/java.base/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java : jdk/src/share/classes/sun/util/cldr/CLDRLocaleProviderAdapter.java
-jdk/src/java.base/share/classes/sun/util : jdk/src/share/classes/sun/util
-jdk/src/java.base/share/classes/sun/util/locale : jdk/src/share/classes/sun/util/locale
-jdk/src/java.base/share/classes/sun/util/locale/provider : jdk/src/share/classes/sun/util/locale/provider
-jdk/src/java.base/share/classes/sun/util/logging : jdk/src/share/classes/sun/util/logging
-jdk/src/java.base/share/classes/sun/util/resources/en : jdk/src/share/classes/sun/util/resources/en
-jdk/src/java.base/share/classes/sun/util/resources : jdk/src/share/classes/sun/util/resources
-jdk/src/java.base/share/classes/sun/util/spi : jdk/src/share/classes/sun/util/spi
-jdk/src/java.base/share/conf/calendars.properties : jdk/src/share/lib/calendars.properties
-jdk/src/java.base/share/conf/hijrah-config-umalqura.properties : jdk/src/share/lib/hijrah-config-umalqura.properties
-jdk/src/java.base/share/conf/net.properties : jdk/src/share/lib/net.properties
-jdk/src/java.base/share/conf/security : jdk/src/share/lib/security
-jdk/src/java.base/share/native/include/classfile_constants.h : jdk/src/share/javavm/export/classfile_constants.h
-jdk/src/java.base/share/native/include/jni.h : jdk/src/share/javavm/export/jni.h
-jdk/src/java.base/share/native/include/jvm.h : jdk/src/share/javavm/export/jvm.h
-jdk/src/java.base/share/native/include/jvmticmlr.h : jdk/src/share/javavm/export/jvmticmlr.h
-jdk/src/java.base/share/native/include/jvmti.h : jdk/src/share/javavm/export/jvmti.h
-jdk/src/java.base/share/native/launcher/defines.h : jdk/src/share/bin/defines.h
-jdk/src/java.base/share/native/launcher/main.c : jdk/src/share/bin/main.c
-jdk/src/java.base/share/native/libfdlibm/e_acos.c : jdk/src/share/native/java/lang/fdlibm/src/e_acos.c
-jdk/src/java.base/share/native/libfdlibm/e_asin.c : jdk/src/share/native/java/lang/fdlibm/src/e_asin.c
-jdk/src/java.base/share/native/libfdlibm/e_atan2.c : jdk/src/share/native/java/lang/fdlibm/src/e_atan2.c
-jdk/src/java.base/share/native/libfdlibm/e_atanh.c : jdk/src/share/native/java/lang/fdlibm/src/e_atanh.c
-jdk/src/java.base/share/native/libfdlibm/e_cosh.c : jdk/src/share/native/java/lang/fdlibm/src/e_cosh.c
-jdk/src/java.base/share/native/libfdlibm/e_exp.c : jdk/src/share/native/java/lang/fdlibm/src/e_exp.c
-jdk/src/java.base/share/native/libfdlibm/e_fmod.c : jdk/src/share/native/java/lang/fdlibm/src/e_fmod.c
-jdk/src/java.base/share/native/libfdlibm/e_hypot.c : jdk/src/share/native/java/lang/fdlibm/src/e_hypot.c
-jdk/src/java.base/share/native/libfdlibm/e_log10.c : jdk/src/share/native/java/lang/fdlibm/src/e_log10.c
-jdk/src/java.base/share/native/libfdlibm/e_log.c : jdk/src/share/native/java/lang/fdlibm/src/e_log.c
-jdk/src/java.base/share/native/libfdlibm/e_pow.c : jdk/src/share/native/java/lang/fdlibm/src/e_pow.c
-jdk/src/java.base/share/native/libfdlibm/e_remainder.c : jdk/src/share/native/java/lang/fdlibm/src/e_remainder.c
-jdk/src/java.base/share/native/libfdlibm/e_rem_pio2.c : jdk/src/share/native/java/lang/fdlibm/src/e_rem_pio2.c
-jdk/src/java.base/share/native/libfdlibm/e_scalb.c : jdk/src/share/native/java/lang/fdlibm/src/e_scalb.c
-jdk/src/java.base/share/native/libfdlibm/e_sinh.c : jdk/src/share/native/java/lang/fdlibm/src/e_sinh.c
-jdk/src/java.base/share/native/libfdlibm/e_sqrt.c : jdk/src/share/native/java/lang/fdlibm/src/e_sqrt.c
-jdk/src/java.base/share/native/libfdlibm/fdlibm.h : jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h
-jdk/src/java.base/share/native/libfdlibm/jfdlibm.h : jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h
-jdk/src/java.base/share/native/libfdlibm/k_cos.c : jdk/src/share/native/java/lang/fdlibm/src/k_cos.c
-jdk/src/java.base/share/native/libfdlibm/k_rem_pio2.c : jdk/src/share/native/java/lang/fdlibm/src/k_rem_pio2.c
-jdk/src/java.base/share/native/libfdlibm/k_sin.c : jdk/src/share/native/java/lang/fdlibm/src/k_sin.c
-jdk/src/java.base/share/native/libfdlibm/k_standard.c : jdk/src/share/native/java/lang/fdlibm/src/k_standard.c
-jdk/src/java.base/share/native/libfdlibm/k_tan.c : jdk/src/share/native/java/lang/fdlibm/src/k_tan.c
-jdk/src/java.base/share/native/libfdlibm/s_atan.c : jdk/src/share/native/java/lang/fdlibm/src/s_atan.c
-jdk/src/java.base/share/native/libfdlibm/s_cbrt.c : jdk/src/share/native/java/lang/fdlibm/src/s_cbrt.c
-jdk/src/java.base/share/native/libfdlibm/s_ceil.c : jdk/src/share/native/java/lang/fdlibm/src/s_ceil.c
-jdk/src/java.base/share/native/libfdlibm/s_copysign.c : jdk/src/share/native/java/lang/fdlibm/src/s_copysign.c
-jdk/src/java.base/share/native/libfdlibm/s_cos.c : jdk/src/share/native/java/lang/fdlibm/src/s_cos.c
-jdk/src/java.base/share/native/libfdlibm/s_expm1.c : jdk/src/share/native/java/lang/fdlibm/src/s_expm1.c
-jdk/src/java.base/share/native/libfdlibm/s_fabs.c : jdk/src/share/native/java/lang/fdlibm/src/s_fabs.c
-jdk/src/java.base/share/native/libfdlibm/s_finite.c : jdk/src/share/native/java/lang/fdlibm/src/s_finite.c
-jdk/src/java.base/share/native/libfdlibm/s_floor.c : jdk/src/share/native/java/lang/fdlibm/src/s_floor.c
-jdk/src/java.base/share/native/libfdlibm/s_frexp.c : jdk/src/share/native/java/lang/fdlibm/src/s_frexp.c
-jdk/src/java.base/share/native/libfdlibm/s_ilogb.c : jdk/src/share/native/java/lang/fdlibm/src/s_ilogb.c
-jdk/src/java.base/share/native/libfdlibm/s_isnan.c : jdk/src/share/native/java/lang/fdlibm/src/s_isnan.c
-jdk/src/java.base/share/native/libfdlibm/s_ldexp.c : jdk/src/share/native/java/lang/fdlibm/src/s_ldexp.c
-jdk/src/java.base/share/native/libfdlibm/s_lib_version.c : jdk/src/share/native/java/lang/fdlibm/src/s_lib_version.c
-jdk/src/java.base/share/native/libfdlibm/s_log1p.c : jdk/src/share/native/java/lang/fdlibm/src/s_log1p.c
-jdk/src/java.base/share/native/libfdlibm/s_logb.c : jdk/src/share/native/java/lang/fdlibm/src/s_logb.c
-jdk/src/java.base/share/native/libfdlibm/s_matherr.c : jdk/src/share/native/java/lang/fdlibm/src/s_matherr.c
-jdk/src/java.base/share/native/libfdlibm/s_modf.c : jdk/src/share/native/java/lang/fdlibm/src/s_modf.c
-jdk/src/java.base/share/native/libfdlibm/s_nextafter.c : jdk/src/share/native/java/lang/fdlibm/src/s_nextafter.c
-jdk/src/java.base/share/native/libfdlibm/s_rint.c : jdk/src/share/native/java/lang/fdlibm/src/s_rint.c
-jdk/src/java.base/share/native/libfdlibm/s_scalbn.c : jdk/src/share/native/java/lang/fdlibm/src/s_scalbn.c
-jdk/src/java.base/share/native/libfdlibm/s_signgam.c : jdk/src/share/native/java/lang/fdlibm/src/s_signgam.c
-jdk/src/java.base/share/native/libfdlibm/s_significand.c : jdk/src/share/native/java/lang/fdlibm/src/s_significand.c
-jdk/src/java.base/share/native/libfdlibm/s_sin.c : jdk/src/share/native/java/lang/fdlibm/src/s_sin.c
-jdk/src/java.base/share/native/libfdlibm/s_tan.c : jdk/src/share/native/java/lang/fdlibm/src/s_tan.c
-jdk/src/java.base/share/native/libfdlibm/s_tanh.c : jdk/src/share/native/java/lang/fdlibm/src/s_tanh.c
-jdk/src/java.base/share/native/libfdlibm/w_acos.c : jdk/src/share/native/java/lang/fdlibm/src/w_acos.c
-jdk/src/java.base/share/native/libfdlibm/w_asin.c : jdk/src/share/native/java/lang/fdlibm/src/w_asin.c
-jdk/src/java.base/share/native/libfdlibm/w_atan2.c : jdk/src/share/native/java/lang/fdlibm/src/w_atan2.c
-jdk/src/java.base/share/native/libfdlibm/w_atanh.c : jdk/src/share/native/java/lang/fdlibm/src/w_atanh.c
-jdk/src/java.base/share/native/libfdlibm/w_cosh.c : jdk/src/share/native/java/lang/fdlibm/src/w_cosh.c
-jdk/src/java.base/share/native/libfdlibm/w_exp.c : jdk/src/share/native/java/lang/fdlibm/src/w_exp.c
-jdk/src/java.base/share/native/libfdlibm/w_fmod.c : jdk/src/share/native/java/lang/fdlibm/src/w_fmod.c
-jdk/src/java.base/share/native/libfdlibm/w_hypot.c : jdk/src/share/native/java/lang/fdlibm/src/w_hypot.c
-jdk/src/java.base/share/native/libfdlibm/w_log10.c : jdk/src/share/native/java/lang/fdlibm/src/w_log10.c
-jdk/src/java.base/share/native/libfdlibm/w_log.c : jdk/src/share/native/java/lang/fdlibm/src/w_log.c
-jdk/src/java.base/share/native/libfdlibm/w_pow.c : jdk/src/share/native/java/lang/fdlibm/src/w_pow.c
-jdk/src/java.base/share/native/libfdlibm/w_remainder.c : jdk/src/share/native/java/lang/fdlibm/src/w_remainder.c
-jdk/src/java.base/share/native/libfdlibm/w_scalb.c : jdk/src/share/native/java/lang/fdlibm/src/w_scalb.c
-jdk/src/java.base/share/native/libfdlibm/w_sinh.c : jdk/src/share/native/java/lang/fdlibm/src/w_sinh.c
-jdk/src/java.base/share/native/libfdlibm/w_sqrt.c : jdk/src/share/native/java/lang/fdlibm/src/w_sqrt.c
-jdk/src/java.base/share/native/libjava/AccessController.c : jdk/src/share/native/java/security/AccessController.c
-jdk/src/java.base/share/native/libjava/Array.c : jdk/src/share/native/java/lang/reflect/Array.c
-jdk/src/java.base/share/native/libjava/AtomicLong.c : jdk/src/share/native/java/util/concurrent/atomic/AtomicLong.c
-jdk/src/java.base/share/native/libjava/Bits.c : jdk/src/share/native/java/nio/Bits.c
-jdk/src/java.base/share/native/libjava/check_version.c : jdk/src/share/native/common/check_version.c
-jdk/src/java.base/share/native/libjava/Class.c : jdk/src/share/native/java/lang/Class.c
-jdk/src/java.base/share/native/libjava/ClassLoader.c : jdk/src/share/native/java/lang/ClassLoader.c
-jdk/src/java.base/share/native/libjava/Compiler.c : jdk/src/share/native/java/lang/Compiler.c
-jdk/src/java.base/share/native/libjava/ConstantPool.c : jdk/src/share/native/sun/reflect/ConstantPool.c
-jdk/src/java.base/share/native/libjava/Double.c : jdk/src/share/native/java/lang/Double.c
-jdk/src/java.base/share/native/libjava/Executable.c : jdk/src/share/native/java/lang/reflect/Executable.c
-jdk/src/java.base/share/native/libjava/Field.c : jdk/src/share/native/java/lang/reflect/Field.c
-jdk/src/java.base/share/native/libjava/FileInputStream.c : jdk/src/share/native/java/io/FileInputStream.c
-jdk/src/java.base/share/native/libjava/Float.c : jdk/src/share/native/java/lang/Float.c
-jdk/src/java.base/share/native/libjava/GC.c : jdk/src/share/native/sun/misc/GC.c
-jdk/src/java.base/share/native/libjava/gdefs.h : jdk/src/share/native/common/gdefs.h
-jdk/src/java.base/share/native/libjava/io_util.c : jdk/src/share/native/java/io/io_util.c
-jdk/src/java.base/share/native/libjava/io_util.h : jdk/src/share/native/java/io/io_util.h
-jdk/src/java.base/share/native/libjava/java_props.h : jdk/src/share/native/java/lang/java_props.h
-jdk/src/java.base/share/native/libjava/jdk_util.c : jdk/src/share/native/common/jdk_util.c
-jdk/src/java.base/share/native/libjava/jdk_util.h : jdk/src/share/native/common/jdk_util.h
-jdk/src/java.base/share/native/libjava/jio.c : jdk/src/share/native/common/jio.c
-jdk/src/java.base/share/native/libjava/jlong.h : jdk/src/share/native/common/jlong.h
-jdk/src/java.base/share/native/libjava/jni_util.c : jdk/src/share/native/common/jni_util.c
-jdk/src/java.base/share/native/libjava/jni_util.h : jdk/src/share/native/common/jni_util.h
-jdk/src/java.base/share/native/libjava/MessageUtils.c : jdk/src/share/native/sun/misc/MessageUtils.c
-jdk/src/java.base/share/native/libjava/NativeAccessors.c : jdk/src/share/native/sun/reflect/NativeAccessors.c
-jdk/src/java.base/share/native/libjava/NativeSignalHandler.c : jdk/src/share/native/sun/misc/NativeSignalHandler.c
-jdk/src/java.base/share/native/libjava/Object.c : jdk/src/share/native/java/lang/Object.c
-jdk/src/java.base/share/native/libjava/ObjectInputStream.c : jdk/src/share/native/java/io/ObjectInputStream.c
-jdk/src/java.base/share/native/libjava/ObjectOutputStream.c : jdk/src/share/native/java/io/ObjectOutputStream.c
-jdk/src/java.base/share/native/libjava/ObjectStreamClass.c : jdk/src/share/native/java/io/ObjectStreamClass.c
-jdk/src/java.base/share/native/libjava/Package.c : jdk/src/share/native/java/lang/Package.c
-jdk/src/java.base/share/native/libjava/Proxy.c : jdk/src/share/native/java/lang/reflect/Proxy.c
-jdk/src/java.base/share/native/libjava/RandomAccessFile.c : jdk/src/share/native/java/io/RandomAccessFile.c
-jdk/src/java.base/share/native/libjava/Reflection.c : jdk/src/share/native/sun/reflect/Reflection.c
-jdk/src/java.base/share/native/libjava/Runtime.c : jdk/src/share/native/java/lang/Runtime.c
-jdk/src/java.base/share/native/libjava/SecurityManager.c : jdk/src/share/native/java/lang/SecurityManager.c
-jdk/src/java.base/share/native/libjava/Shutdown.c : jdk/src/share/native/java/lang/Shutdown.c
-jdk/src/java.base/share/native/libjava/Signal.c : jdk/src/share/native/sun/misc/Signal.c
-jdk/src/java.base/share/native/libjava/sizecalc.h : jdk/src/share/native/common/sizecalc.h
-jdk/src/java.base/share/native/libjava/StrictMath.c : jdk/src/share/native/java/lang/StrictMath.c
-jdk/src/java.base/share/native/libjava/String.c : jdk/src/share/native/java/lang/String.c
-jdk/src/java.base/share/native/libjava/System.c : jdk/src/share/native/java/lang/System.c
-jdk/src/java.base/share/native/libjava/Thread.c : jdk/src/share/native/java/lang/Thread.c
-jdk/src/java.base/share/native/libjava/Throwable.c : jdk/src/share/native/java/lang/Throwable.c
-jdk/src/java.base/share/native/libjava/TimeZone.c : jdk/src/share/native/java/util/TimeZone.c
-jdk/src/java.base/share/native/libjava/verify_stub.c : jdk/src/share/native/common/verify_stub.c
-jdk/src/java.base/share/native/libjava/Version.c : jdk/src/share/native/sun/misc/Version.c
-jdk/src/java.base/share/native/libjava/VM.c : jdk/src/share/native/sun/misc/VM.c
-jdk/src/java.base/share/native/libjava/VMSupport.c : jdk/src/share/native/sun/misc/VMSupport.c
-jdk/src/java.base/share/native/libjli/emessages.h : jdk/src/share/bin/emessages.h
-jdk/src/java.base/share/native/libjli/java.c : jdk/src/share/bin/java.c
-jdk/src/java.base/share/native/libjli/java.h : jdk/src/share/bin/java.h
-jdk/src/java.base/share/native/libjli/jli_util.c : jdk/src/share/bin/jli_util.c
-jdk/src/java.base/share/native/libjli/jli_util.h : jdk/src/share/bin/jli_util.h
-jdk/src/java.base/share/native/libjli/manifest_info.h : jdk/src/share/bin/manifest_info.h
-jdk/src/java.base/share/native/libjli/parse_manifest.c : jdk/src/share/bin/parse_manifest.c
-jdk/src/java.base/share/native/libjli/splashscreen.h : jdk/src/share/bin/splashscreen.h
-jdk/src/java.base/share/native/libjli/splashscreen_stubs.c : jdk/src/share/bin/splashscreen_stubs.c
-jdk/src/java.base/share/native/libjli/version_comp.c : jdk/src/share/bin/version_comp.c
-jdk/src/java.base/share/native/libjli/version_comp.h : jdk/src/share/bin/version_comp.h
-jdk/src/java.base/share/native/libjli/wildcard.c : jdk/src/share/bin/wildcard.c
-jdk/src/java.base/share/native/libjli/wildcard.h : jdk/src/share/bin/wildcard.h
-jdk/src/java.base/share/native/libnet : jdk/src/share/native/java/net
-jdk/src/java.base/share/native/libnio/ch/nio.h : jdk/src/share/native/sun/nio/ch/nio.h
-jdk/src/java.base/share/native/libverify/check_code.c : jdk/src/share/native/common/check_code.c
-jdk/src/java.base/share/native/libverify/check_format.c : jdk/src/share/native/common/check_format.c
-jdk/src/java.base/share/native/libverify/opcodes.in_out : jdk/src/share/native/common/opcodes.in_out
-jdk/src/java.base/share/native/libzip : jdk/src/share/native/java/util/zip
-jdk/src/java.base/share/native/libzip/zlib : jdk/src/share/native/java/util/zip/zlib
-jdk/src/java.base/share/native/libzip/zlib/patches/ChangeLog_java : jdk/src/share/native/java/util/zip/zlib/patches/ChangeLog_java
-jdk/src/java.base/unix/classes/java/io : jdk/src/solaris/classes/java/io
-jdk/src/java.base/unix/classes/java/lang : jdk/src/solaris/classes/java/lang
-jdk/src/java.base/unix/classes/java/net : jdk/src/solaris/classes/java/net
-jdk/src/java.base/unix/classes/sun/misc : jdk/src/solaris/classes/sun/misc
-jdk/src/java.base/unix/classes/sun/net/dns/ResolverConfigurationImpl.java : jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
-jdk/src/java.base/unix/classes/sun/net : jdk/src/solaris/classes/sun/net
-jdk/src/java.base/unix/classes/sun/net/sdp/SdpProvider.java : jdk/src/solaris/classes/sun/net/sdp/SdpProvider.java
-jdk/src/java.base/unix/classes/sun/net/www/content-types.properties : jdk/src/solaris/classes/sun/net/www/content-types.properties
-jdk/src/java.base/unix/classes/sun/net/www/protocol/file/Handler.java : jdk/src/solaris/classes/sun/net/www/protocol/file/Handler.java
-jdk/src/java.base/unix/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java : jdk/src/solaris/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
-jdk/src/java.base/unix/classes/sun/net/www/protocol/jar/JarFileFactory.java : jdk/src/solaris/classes/sun/net/www/protocol/jar/JarFileFactory.java
-jdk/src/java.base/unix/classes/sun/nio/ch : jdk/src/solaris/classes/sun/nio/ch
-jdk/src/java.base/unix/classes/sun/nio/fs : jdk/src/solaris/classes/sun/nio/fs
-jdk/src/java.base/unix/classes/sun/security/provider : jdk/src/solaris/classes/sun/security/provider
-jdk/src/java.base/unix/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java : jdk/src/solaris/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
-jdk/src/java.base/unix/conf/amd64/jvm.cfg : jdk/src/solaris/bin/amd64/jvm.cfg
-jdk/src/java.base/unix/conf/arm/jvm.cfg : jdk/src/solaris/bin/arm/jvm.cfg
-jdk/src/java.base/unix/conf/i586/jvm.cfg : jdk/src/solaris/bin/i586/jvm.cfg
-jdk/src/java.base/unix/conf/ia64/jvm.cfg : jdk/src/solaris/bin/ia64/jvm.cfg
-jdk/src/java.base/unix/conf/ppc64/jvm.cfg : jdk/src/solaris/bin/ppc64/jvm.cfg
-jdk/src/java.base/unix/conf/ppc64le/jvm.cfg : jdk/src/solaris/bin/ppc64le/jvm.cfg
-jdk/src/java.base/unix/conf/ppc/jvm.cfg : jdk/src/solaris/bin/ppc/jvm.cfg
-jdk/src/java.base/unix/conf/sdp/sdp.conf.template : jdk/src/solaris/lib/sdp/sdp.conf.template
-jdk/src/java.base/unix/conf/sparc/jvm.cfg : jdk/src/solaris/bin/sparc/jvm.cfg
-jdk/src/java.base/unix/conf/sparcv9/jvm.cfg : jdk/src/solaris/bin/sparcv9/jvm.cfg
-jdk/src/java.base/unix/conf/zero/jvm.cfg : jdk/src/solaris/bin/zero/jvm.cfg
-jdk/src/java.base/unix/native/include/jni_md.h : jdk/src/solaris/javavm/export/jni_md.h
-jdk/src/java.base/unix/native/include/jvm_md.h : jdk/src/solaris/javavm/export/jvm_md.h
-jdk/src/java.base/unix/native/jspawnhelper/jspawnhelper.c : jdk/src/solaris/native/java/lang/jspawnhelper.c
-jdk/src/java.base/unix/native/launcher/jexec.c : jdk/src/solaris/bin/jexec.c
-jdk/src/java.base/unix/native/libjava/canonicalize_md.c : jdk/src/solaris/native/java/io/canonicalize_md.c
-jdk/src/java.base/unix/native/libjava/childproc.c : jdk/src/solaris/native/java/lang/childproc.c
-jdk/src/java.base/unix/native/libjava/childproc.h : jdk/src/solaris/native/java/lang/childproc.h
-jdk/src/java.base/unix/native/libjava/Console_md.c : jdk/src/solaris/native/java/io/Console_md.c
-jdk/src/java.base/unix/native/libjava/FileDescriptor_md.c : jdk/src/solaris/native/java/io/FileDescriptor_md.c
-jdk/src/java.base/unix/native/libjava/FileInputStream_md.c : jdk/src/solaris/native/java/io/FileInputStream_md.c
-jdk/src/java.base/unix/native/libjava/FileOutputStream_md.c : jdk/src/solaris/native/java/io/FileOutputStream_md.c
-jdk/src/java.base/unix/native/libjava/gdefs_md.h : jdk/src/solaris/native/common/gdefs_md.h
-jdk/src/java.base/unix/native/libjava/io_util_md.c : jdk/src/solaris/native/java/io/io_util_md.c
-jdk/src/java.base/unix/native/libjava/io_util_md.h : jdk/src/solaris/native/java/io/io_util_md.h
-jdk/src/java.base/unix/native/libjava/java_props_macosx.c : jdk/src/solaris/native/java/lang/java_props_macosx.c
-jdk/src/java.base/unix/native/libjava/java_props_macosx.h : jdk/src/solaris/native/java/lang/java_props_macosx.h
-jdk/src/java.base/unix/native/libjava/java_props_md.c : jdk/src/solaris/native/java/lang/java_props_md.c
-jdk/src/java.base/unix/native/libjava/jdk_util_md.c : jdk/src/solaris/native/common/jdk_util_md.c
-jdk/src/java.base/unix/native/libjava/jdk_util_md.h : jdk/src/solaris/native/common/jdk_util_md.h
-jdk/src/java.base/unix/native/libjava/jlong_md.h : jdk/src/solaris/native/common/jlong_md.h
-jdk/src/java.base/unix/native/libjava/jni_util_md.c : jdk/src/solaris/native/common/jni_util_md.c
-jdk/src/java.base/unix/native/libjava/locale_str.h : jdk/src/solaris/native/java/lang/locale_str.h
-jdk/src/java.base/unix/native/libjava/ProcessEnvironment_md.c : jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c
-jdk/src/java.base/unix/native/libjava/RandomAccessFile_md.c : jdk/src/solaris/native/java/io/RandomAccessFile_md.c
-jdk/src/java.base/unix/native/libjava/TimeZone_md.c : jdk/src/solaris/native/java/util/TimeZone_md.c
-jdk/src/java.base/unix/native/libjava/TimeZone_md.h : jdk/src/solaris/native/java/util/TimeZone_md.h
-jdk/src/java.base/unix/native/libjava/UnixFileSystem_md.c : jdk/src/solaris/native/java/io/UnixFileSystem_md.c
-jdk/src/java.base/unix/native/libjava/UNIXProcess_md.c : jdk/src/solaris/native/java/lang/UNIXProcess_md.c
-jdk/src/java.base/unix/native/libjava/VM_md.c : jdk/src/solaris/native/sun/misc/VM_md.c
-jdk/src/java.base/unix/native/libjli/ergo.c : jdk/src/solaris/bin/ergo.c
-jdk/src/java.base/unix/native/libjli/ergo.h : jdk/src/solaris/bin/ergo.h
-jdk/src/java.base/unix/native/libjli/ergo_i586.c : jdk/src/solaris/bin/ergo_i586.c
-jdk/src/java.base/unix/native/libjli/java_md_common.c : jdk/src/solaris/bin/java_md_common.c
-jdk/src/java.base/unix/native/libjli/java_md.h : jdk/src/solaris/bin/java_md.h
-jdk/src/java.base/unix/native/libjli/java_md_solinux.c : jdk/src/solaris/bin/java_md_solinux.c
-jdk/src/java.base/unix/native/libjli/java_md_solinux.h : jdk/src/solaris/bin/java_md_solinux.h
-jdk/src/java.base/unix/native/libnet/bsd_close.c : jdk/src/solaris/native/java/net/bsd_close.c
-jdk/src/java.base/unix/native/libnet/DefaultProxySelector.c : jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c
-jdk/src/java.base/unix/native/libnet/ExtendedOptionsImpl.c : jdk/src/solaris/native/java/net/ExtendedOptionsImpl.c
-jdk/src/java.base/unix/native/libnet/Inet4AddressImpl.c : jdk/src/solaris/native/java/net/Inet4AddressImpl.c
-jdk/src/java.base/unix/native/libnet/Inet6AddressImpl.c : jdk/src/solaris/native/java/net/Inet6AddressImpl.c
-jdk/src/java.base/unix/native/libnet/InetAddressImplFactory.c : jdk/src/solaris/native/java/net/InetAddressImplFactory.c
-jdk/src/java.base/unix/native/libnet/linux_close.c : jdk/src/solaris/native/java/net/linux_close.c
-jdk/src/java.base/unix/native/libnet/net_util_md.c : jdk/src/solaris/native/java/net/net_util_md.c
-jdk/src/java.base/unix/native/libnet/net_util_md.h : jdk/src/solaris/native/java/net/net_util_md.h
-jdk/src/java.base/unix/native/libnet/NetworkInterface.c : jdk/src/solaris/native/java/net/NetworkInterface.c
-jdk/src/java.base/unix/native/libnet/PlainDatagramSocketImpl.c : jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
-jdk/src/java.base/unix/native/libnet/PlainSocketImpl.c : jdk/src/solaris/native/java/net/PlainSocketImpl.c
-jdk/src/java.base/unix/native/libnet/portconfig.c : jdk/src/solaris/native/sun/net/portconfig.c
-jdk/src/java.base/unix/native/libnet/ResolverConfigurationImpl.c : jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c
-jdk/src/java.base/unix/native/libnet/SdpSupport.c : jdk/src/solaris/native/sun/net/sdp/SdpSupport.c
-jdk/src/java.base/unix/native/libnet/SocketInputStream.c : jdk/src/solaris/native/java/net/SocketInputStream.c
-jdk/src/java.base/unix/native/libnet/SocketOutputStream.c : jdk/src/solaris/native/java/net/SocketOutputStream.c
-jdk/src/java.base/unix/native/libnet/solaris_close.c : jdk/src/solaris/native/java/net/solaris_close.c
-jdk/src/java.base/unix/native/libnio/ch : jdk/src/solaris/native/sun/nio/ch
-jdk/src/java.base/unix/native/libnio/fs : jdk/src/solaris/native/sun/nio/fs
-jdk/src/java.base/unix/native/libnio/MappedByteBuffer.c : jdk/src/solaris/native/java/nio/MappedByteBuffer.c
-jdk/src/java.base/windows/classes/java/io : jdk/src/windows/classes/java/io
-jdk/src/java.base/windows/classes/java/lang : jdk/src/windows/classes/java/lang
-jdk/src/java.base/windows/classes/java/net : jdk/src/windows/classes/java/net
-jdk/src/java.base/windows/classes/sun/misc : jdk/src/windows/classes/sun/misc
-jdk/src/java.base/windows/classes/sun/net/dns/ResolverConfigurationImpl.java : jdk/src/windows/classes/sun/net/dns/ResolverConfigurationImpl.java
-jdk/src/java.base/windows/classes/sun/net : jdk/src/windows/classes/sun/net
-jdk/src/java.base/windows/classes/sun/net/www/content-types.properties : jdk/src/windows/classes/sun/net/www/content-types.properties
-jdk/src/java.base/windows/classes/sun/net/www/protocol/file/Handler.java : jdk/src/windows/classes/sun/net/www/protocol/file/Handler.java
-jdk/src/java.base/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java : jdk/src/windows/classes/sun/net/www/protocol/http/ntlm/NTLMAuthentication.java
-jdk/src/java.base/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java : jdk/src/windows/classes/sun/net/www/protocol/jar/JarFileFactory.java
-jdk/src/java.base/windows/classes/sun/nio/ch : jdk/src/windows/classes/sun/nio/ch
-jdk/src/java.base/windows/classes/sun/nio/fs : jdk/src/windows/classes/sun/nio/fs
-jdk/src/java.base/windows/classes/sun/security/provider : jdk/src/windows/classes/sun/security/provider
-jdk/src/java.base/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java : jdk/src/windows/classes/sun/util/locale/provider/HostLocaleProviderAdapterImpl.java
-jdk/src/java.base/windows/conf/amd64/jvm.cfg : jdk/src/windows/bin/amd64/jvm.cfg
-jdk/src/java.base/windows/conf/i586/jvm.cfg : jdk/src/windows/bin/i586/jvm.cfg
-jdk/src/java.base/windows/conf/ia64/jvm.cfg : jdk/src/windows/bin/ia64/jvm.cfg
-jdk/src/java.base/windows/conf/tzmappings : jdk/src/windows/lib/tzmappings
-jdk/src/java.base/windows/native/common/version.rc : jdk/src/windows/resource/version.rc
-jdk/src/java.base/windows/native/include/jni_md.h : jdk/src/windows/javavm/export/jni_md.h
-jdk/src/java.base/windows/native/include/jvm_md.h : jdk/src/windows/javavm/export/jvm_md.h
-jdk/src/java.base/windows/native/launcher/icons/awt.ico : jdk/src/windows/resource/icons/awt.ico
-jdk/src/java.base/windows/native/launcher/java.manifest : jdk/src/windows/resource/java.manifest
-jdk/src/java.base/windows/native/launcher/java.rc : jdk/src/windows/resource/java.rc
-jdk/src/java.base/windows/native/libjava/canonicalize_md.c : jdk/src/windows/native/java/io/canonicalize_md.c
-jdk/src/java.base/windows/native/libjava/Console_md.c : jdk/src/windows/native/java/io/Console_md.c
-jdk/src/java.base/windows/native/libjava/dirent_md.c : jdk/src/windows/native/java/io/dirent_md.c
-jdk/src/java.base/windows/native/libjava/dirent_md.h : jdk/src/windows/native/java/io/dirent_md.h
-jdk/src/java.base/windows/native/libjava/FileDescriptor_md.c : jdk/src/windows/native/java/io/FileDescriptor_md.c
-jdk/src/java.base/windows/native/libjava/FileInputStream_md.c : jdk/src/windows/native/java/io/FileInputStream_md.c
-jdk/src/java.base/windows/native/libjava/FileOutputStream_md.c : jdk/src/windows/native/java/io/FileOutputStream_md.c
-jdk/src/java.base/windows/native/libjava/gdefs_md.h : jdk/src/windows/native/common/gdefs_md.h
-jdk/src/java.base/windows/native/libjava/HostLocaleProviderAdapter_md.c : jdk/src/windows/native/sun/util/locale/provider/HostLocaleProviderAdapter_md.c
-jdk/src/java.base/windows/native/libjava/io_util_md.c : jdk/src/windows/native/java/io/io_util_md.c
-jdk/src/java.base/windows/native/libjava/io_util_md.h : jdk/src/windows/native/java/io/io_util_md.h
-jdk/src/java.base/windows/native/libjava/java_main_md.h : jdk/src/windows/native/common/java_main_md.h
-jdk/src/java.base/windows/native/libjava/java_props_md.c : jdk/src/windows/native/java/lang/java_props_md.c
-jdk/src/java.base/windows/native/libjava/jdk_util_md.c : jdk/src/windows/native/common/jdk_util_md.c
-jdk/src/java.base/windows/native/libjava/jdk_util_md.h : jdk/src/windows/native/common/jdk_util_md.h
-jdk/src/java.base/windows/native/libjava/jlong_md.h : jdk/src/windows/native/common/jlong_md.h
-jdk/src/java.base/windows/native/libjava/jni_util_md.c : jdk/src/windows/native/common/jni_util_md.c
-jdk/src/java.base/windows/native/libjava/locale_str.h : jdk/src/windows/native/common/locale_str.h
-jdk/src/java.base/windows/native/libjava/ProcessEnvironment_md.c : jdk/src/windows/native/java/lang/ProcessEnvironment_md.c
-jdk/src/java.base/windows/native/libjava/ProcessImpl_md.c : jdk/src/windows/native/java/lang/ProcessImpl_md.c
-jdk/src/java.base/windows/native/libjava/RandomAccessFile_md.c : jdk/src/windows/native/java/io/RandomAccessFile_md.c
-jdk/src/java.base/windows/native/libjava/TimeZone_md.c : jdk/src/windows/native/java/util/TimeZone_md.c
-jdk/src/java.base/windows/native/libjava/TimeZone_md.h : jdk/src/windows/native/java/util/TimeZone_md.h
-jdk/src/java.base/windows/native/libjava/VM_md.c : jdk/src/windows/native/sun/misc/VM_md.c
-jdk/src/java.base/windows/native/libjava/Win32ErrorMode.c : jdk/src/windows/native/sun/io/Win32ErrorMode.c
-jdk/src/java.base/windows/native/libjava/WinCAPISeedGenerator.c : jdk/src/windows/native/sun/security/provider/WinCAPISeedGenerator.c
-jdk/src/java.base/windows/native/libjava/WinNTFileSystem_md.c : jdk/src/windows/native/java/io/WinNTFileSystem_md.c
-jdk/src/java.base/windows/native/libjli : jdk/src/windows/bin
-jdk/src/java.base/windows/native/libnet/DefaultProxySelector.c : jdk/src/windows/native/sun/net/spi/DefaultProxySelector.c
-jdk/src/java.base/windows/native/libnet/DualStackPlainDatagramSocketImpl.c : jdk/src/windows/native/java/net/DualStackPlainDatagramSocketImpl.c
-jdk/src/java.base/windows/native/libnet/DualStackPlainSocketImpl.c : jdk/src/windows/native/java/net/DualStackPlainSocketImpl.c
-jdk/src/java.base/windows/native/libnet/ExtendedOptionsImpl.c : jdk/src/windows/native/java/net/ExtendedOptionsImpl.c
-jdk/src/java.base/windows/native/libnet/icmp.h : jdk/src/windows/native/java/net/icmp.h
-jdk/src/java.base/windows/native/libnet/Inet4AddressImpl.c : jdk/src/windows/native/java/net/Inet4AddressImpl.c
-jdk/src/java.base/windows/native/libnet/Inet6AddressImpl.c : jdk/src/windows/native/java/net/Inet6AddressImpl.c
-jdk/src/java.base/windows/native/libnet/InetAddressImplFactory.c : jdk/src/windows/native/java/net/InetAddressImplFactory.c
-jdk/src/java.base/windows/native/libnet/net_util_md.c : jdk/src/windows/native/java/net/net_util_md.c
-jdk/src/java.base/windows/native/libnet/net_util_md.h : jdk/src/windows/native/java/net/net_util_md.h
-jdk/src/java.base/windows/native/libnet/NetworkInterface.c : jdk/src/windows/native/java/net/NetworkInterface.c
-jdk/src/java.base/windows/native/libnet/NetworkInterface.h : jdk/src/windows/native/java/net/NetworkInterface.h
-jdk/src/java.base/windows/native/libnet/NetworkInterface_winXP.c : jdk/src/windows/native/java/net/NetworkInterface_winXP.c
-jdk/src/java.base/windows/native/libnet/NTLMAuthSequence.c : jdk/src/windows/native/sun/net/www/protocol/http/ntlm/NTLMAuthSequence.c
-jdk/src/java.base/windows/native/libnet/portconfig.c : jdk/src/windows/native/sun/net/portconfig.c
-jdk/src/java.base/windows/native/libnet/ResolverConfigurationImpl.c : jdk/src/windows/native/sun/net/dns/ResolverConfigurationImpl.c
-jdk/src/java.base/windows/native/libnet/SocketInputStream.c : jdk/src/windows/native/java/net/SocketInputStream.c
-jdk/src/java.base/windows/native/libnet/SocketOutputStream.c : jdk/src/windows/native/java/net/SocketOutputStream.c
-jdk/src/java.base/windows/native/libnet/TwoStacksPlainDatagramSocketImpl.c : jdk/src/windows/native/java/net/TwoStacksPlainDatagramSocketImpl.c
-jdk/src/java.base/windows/native/libnet/TwoStacksPlainSocketImpl.c : jdk/src/windows/native/java/net/TwoStacksPlainSocketImpl.c
-jdk/src/java.base/windows/native/libnio/ch : jdk/src/windows/native/sun/nio/ch
-jdk/src/java.base/windows/native/libnio/fs : jdk/src/windows/native/sun/nio/fs
-jdk/src/java.base/windows/native/libnio/MappedByteBuffer.c : jdk/src/windows/native/java/nio/MappedByteBuffer.c
-jdk/src/java.desktop/aix/native/libawt : jdk/src/aix/porting
-jdk/src/java.desktop/linux/conf/oblique-fonts/fonts.dir : jdk/src/solaris/classes/sun/awt/motif/java.oblique-fonts.dir
-jdk/src/java.desktop/macosx/classes/com/apple/eawt/event/package.html : jdk/src/macosx/classes/com/apple/eawt/event/package.html
-jdk/src/java.desktop/macosx/classes/com/apple/eawt/package.html : jdk/src/macosx/classes/com/apple/eawt/package.html
-jdk/src/java.desktop/macosx/classes/com/apple/eio/package.html : jdk/src/macosx/classes/com/apple/eio/package.html
-jdk/src/java.desktop/macosx/classes/com/apple/laf/resources : jdk/src/macosx/classes/com/apple/laf/resources
-jdk/src/java.desktop/macosx/classes/sun/awt/resources/awtosx.properties : jdk/src/macosx/classes/sun/awt/resources/awtosx.properties
-jdk/src/java.desktop/macosx/classes/sun/java2d/BackBufferCapsProvider.java : jdk/src/macosx/classes/sun/java2d/BackBufferCapsProvider.java
-jdk/src/java.desktop/macosx/conf/flavormap.properties : jdk/src/macosx/lib/flavormap.properties
-jdk/src/java.desktop/macosx/native/include/jawt_md.h : jdk/src/macosx/javavm/export/jawt_md.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.h : jdk/src/macosx/native/sun/awt/ApplicationDelegate.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ApplicationDelegate.m : jdk/src/macosx/native/sun/awt/ApplicationDelegate.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt_DrawingSurface.m : jdk/src/macosx/native/sun/awt/awt_DrawingSurface.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.h : jdk/src/macosx/native/sun/awt/AWTEvent.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTEvent.m : jdk/src/macosx/native/sun/awt/AWTEvent.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/awt.m : jdk/src/macosx/native/sun/awt/awt.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.h : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTSurfaceLayers.m : jdk/src/macosx/native/sun/awt/AWTSurfaceLayers.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.h : jdk/src/macosx/native/sun/awt/AWTView.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTView.m : jdk/src/macosx/native/sun/awt/AWTView.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.h : jdk/src/macosx/native/sun/awt/AWTWindow.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/AWTWindow.m : jdk/src/macosx/native/sun/awt/AWTWindow.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CClipboard.m : jdk/src/macosx/native/sun/awt/CClipboard.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CCursorManager.m : jdk/src/macosx/native/sun/awt/CCursorManager.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.h : jdk/src/macosx/native/sun/awt/CDataTransferer.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDataTransferer.m : jdk/src/macosx/native/sun/awt/CDataTransferer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDesktopPeer.m : jdk/src/macosx/native/sun/awt/CDesktopPeer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSourceContextPeer.m : jdk/src/macosx/native/sun/awt/CDragSourceContextPeer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.h : jdk/src/macosx/native/sun/awt/CDragSource.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDragSource.m : jdk/src/macosx/native/sun/awt/CDragSource.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTargetContextPeer.m : jdk/src/macosx/native/sun/awt/CDropTargetContextPeer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.h : jdk/src/macosx/native/sun/awt/CDropTarget.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CDropTarget.m : jdk/src/macosx/native/sun/awt/CDropTarget.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.h : jdk/src/macosx/native/sun/awt/CFileDialog.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFileDialog.m : jdk/src/macosx/native/sun/awt/CFileDialog.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CFRetainedResource.m : jdk/src/macosx/native/sun/awt/CFRetainedResource.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsConfig.m : jdk/src/macosx/native/sun/awt/CGraphicsConfig.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsDevice.m : jdk/src/macosx/native/sun/awt/CGraphicsDevice.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CGraphicsEnv.m : jdk/src/macosx/native/sun/awt/CGraphicsEnv.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CImage.m : jdk/src/macosx/native/sun/awt/CImage.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CInputMethod.m : jdk/src/macosx/native/sun/awt/CInputMethod.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.h : jdk/src/macosx/native/sun/awt/CMenuBar.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuBar.m : jdk/src/macosx/native/sun/awt/CMenuBar.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.h : jdk/src/macosx/native/sun/awt/CMenuComponent.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuComponent.m : jdk/src/macosx/native/sun/awt/CMenuComponent.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.h : jdk/src/macosx/native/sun/awt/CMenu.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.h : jdk/src/macosx/native/sun/awt/CMenuItem.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenuItem.m : jdk/src/macosx/native/sun/awt/CMenuItem.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CMenu.m : jdk/src/macosx/native/sun/awt/CMenu.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.h : jdk/src/macosx/native/sun/awt/CPopupMenu.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPopupMenu.m : jdk/src/macosx/native/sun/awt/CPopupMenu.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CPrinterJob.m : jdk/src/macosx/native/sun/awt/CPrinterJob.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CRobot.m : jdk/src/macosx/native/sun/awt/CRobot.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.h : jdk/src/macosx/native/sun/awt/CSystemColors.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CSystemColors.m : jdk/src/macosx/native/sun/awt/CSystemColors.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTextPipe.m : jdk/src/macosx/native/sun/awt/CTextPipe.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.h : jdk/src/macosx/native/sun/awt/CTrayIcon.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CTrayIcon.m : jdk/src/macosx/native/sun/awt/CTrayIcon.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/CWrapper.m : jdk/src/macosx/native/sun/awt/CWrapper.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.h : jdk/src/macosx/native/sun/awt/DnDUtilities.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/DnDUtilities.m : jdk/src/macosx/native/sun/awt/DnDUtilities.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.h : jdk/src/macosx/native/sun/awt/GeomUtilities.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/GeomUtilities.m : jdk/src/macosx/native/sun/awt/GeomUtilities.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.h : jdk/src/macosx/native/sun/awt/ImageSurfaceData.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/ImageSurfaceData.m : jdk/src/macosx/native/sun/awt/ImageSurfaceData.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.h : jdk/src/macosx/native/sun/awt/InitIDs.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/InitIDs.m : jdk/src/macosx/native/sun/awt/InitIDs.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityAction.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityAction.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.h : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaAccessibilityUtilities.m : jdk/src/macosx/native/sun/awt/JavaAccessibilityUtilities.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.h : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaComponentAccessibility.m : jdk/src/macosx/native/sun/awt/JavaComponentAccessibility.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.h : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/JavaTextAccessibility.m : jdk/src/macosx/native/sun/awt/JavaTextAccessibility.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.h : jdk/src/macosx/native/sun/awt/LWCToolkit.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/LWCToolkit.m : jdk/src/macosx/native/sun/awt/LWCToolkit.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.h : jdk/src/macosx/native/sun/awt/OSVersion.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/OSVersion.m : jdk/src/macosx/native/sun/awt/OSVersion.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.h : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterSurfaceData.m : jdk/src/macosx/native/sun/awt/PrinterSurfaceData.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.h : jdk/src/macosx/native/sun/awt/PrinterView.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrinterView.m : jdk/src/macosx/native/sun/awt/PrinterView.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.h : jdk/src/macosx/native/sun/awt/PrintModel.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/PrintModel.m : jdk/src/macosx/native/sun/awt/PrintModel.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzRenderer.m : jdk/src/macosx/native/sun/awt/QuartzRenderer.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.h : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/awt/QuartzSurfaceData.m : jdk/src/macosx/native/sun/awt/QuartzSurfaceData.m
-jdk/src/java.desktop/macosx/native/libawt_lwawt/font : jdk/src/macosx/native/sun/font
-jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl/J2D_GL/cglext.h : jdk/src/macosx/native/sun/java2d/opengl/J2D_GL/cglext.h
-jdk/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl : jdk/src/macosx/native/sun/java2d/opengl
-jdk/src/java.desktop/macosx/native/libjawt/jawt.m : jdk/src/macosx/native/sun/awt/jawt.m
-jdk/src/java.desktop/macosx/native/libjsound : jdk/src/macosx/native/com/sun/media/sound
-jdk/src/java.desktop/macosx/native/libosxapp : jdk/src/macosx/native/sun/osxapp
-jdk/src/java.desktop/macosx/native/libosxui : jdk/src/macosx/native/com/apple/laf
-jdk/src/java.desktop/macosx/native/libsplashscreen : jdk/src/macosx/native/sun/awt/splashscreen
-jdk/src/java.desktop/share/classes/com/sun/accessibility/internal/resources : jdk/src/share/classes/com/sun/accessibility/internal/resources
-jdk/src/java.desktop/share/classes/com/sun/awt : jdk/src/share/classes/com/sun/awt
-jdk/src/java.desktop/share/classes/com/sun/beans/decoder : jdk/src/share/classes/com/sun/beans/decoder
-jdk/src/java.desktop/share/classes/com/sun/beans/editors : jdk/src/share/classes/com/sun/beans/editors
-jdk/src/java.desktop/share/classes/com/sun/beans/finder : jdk/src/share/classes/com/sun/beans/finder
-jdk/src/java.desktop/share/classes/com/sun/beans/infos : jdk/src/share/classes/com/sun/beans/infos
-jdk/src/java.desktop/share/classes/com/sun/beans : jdk/src/share/classes/com/sun/beans
-jdk/src/java.desktop/share/classes/com/sun/beans/util : jdk/src/share/classes/com/sun/beans/util
-jdk/src/java.desktop/share/classes/com/sun/imageio : jdk/src/share/classes/com/sun/imageio
-jdk/src/java.desktop/share/classes/com/sun/java/swing : jdk/src/share/classes/com/sun/java/swing
-jdk/src/java.desktop/share/classes/com/sun/media/sound : jdk/src/share/classes/com/sun/media/sound
-jdk/src/java.desktop/share/classes/com/sun/swing : jdk/src/share/classes/com/sun/swing
-jdk/src/java.desktop/share/classes/java/applet : jdk/src/share/classes/java/applet
-jdk/src/java.desktop/share/classes/java/awt : jdk/src/share/classes/java/awt
-jdk/src/java.desktop/share/classes/java/beans : jdk/src/share/classes/java/beans
-jdk/src/java.desktop/share/classes/javax/accessibility : jdk/src/share/classes/javax/accessibility
-jdk/src/java.desktop/share/classes/javax/imageio : jdk/src/share/classes/javax/imageio
-jdk/src/java.desktop/share/classes/javax/print : jdk/src/share/classes/javax/print
-jdk/src/java.desktop/share/classes/javax/sound : jdk/src/share/classes/javax/sound
-jdk/src/java.desktop/share/classes/javax/swing : jdk/src/share/classes/javax/swing
-jdk/src/java.desktop/share/classes/META-INF/services : jdk/src/share/classes/com/sun/media/sound/services
-jdk/src/java.desktop/share/classes/sun/applet : jdk/src/share/classes/sun/applet
-jdk/src/java.desktop/share/classes/sun/audio : jdk/src/share/classes/sun/audio
-jdk/src/java.desktop/share/classes/sun/awt : jdk/src/share/classes/sun/awt
-jdk/src/java.desktop/share/classes/sun/font : jdk/src/share/classes/sun/font
-jdk/src/java.desktop/share/classes/sun/java2d : jdk/src/share/classes/sun/java2d
-jdk/src/java.desktop/share/classes/sun/net/www/content/audio : jdk/src/share/classes/sun/net/www/content/audio
-jdk/src/java.desktop/share/classes/sun/net/www/content/image : jdk/src/share/classes/sun/net/www/content/image
-jdk/src/java.desktop/share/classes/sun/print/AttributeUpdater.java : jdk/src/share/classes/sun/print/AttributeUpdater.java
-jdk/src/java.desktop/share/classes/sun/print/BackgroundLookupListener.java : jdk/src/share/classes/sun/print/BackgroundLookupListener.java
-jdk/src/java.desktop/share/classes/sun/print/BackgroundServiceLookup.java : jdk/src/share/classes/sun/print/BackgroundServiceLookup.java
-jdk/src/java.desktop/share/classes/sun/print/CustomMediaSizeName.java : jdk/src/share/classes/sun/print/CustomMediaSizeName.java
-jdk/src/java.desktop/share/classes/sun/print/CustomMediaTray.java : jdk/src/share/classes/sun/print/CustomMediaTray.java
-jdk/src/java.desktop/share/classes/sun/print/DialogOwner.java : jdk/src/share/classes/sun/print/DialogOwner.java
-jdk/src/java.desktop/share/classes/sun/print/DocumentPropertiesUI.java : jdk/src/share/classes/sun/print/DocumentPropertiesUI.java
-jdk/src/java.desktop/share/classes/sun/print/ImagePrinter.java : jdk/src/share/classes/sun/print/ImagePrinter.java
-jdk/src/java.desktop/share/classes/sun/print/OpenBook.java : jdk/src/share/classes/sun/print/OpenBook.java
-jdk/src/java.desktop/share/classes/sun/print/PageableDoc.java : jdk/src/share/classes/sun/print/PageableDoc.java
-jdk/src/java.desktop/share/classes/sun/print/PathGraphics.java : jdk/src/share/classes/sun/print/PathGraphics.java
-jdk/src/java.desktop/share/classes/sun/print/PeekGraphics.java : jdk/src/share/classes/sun/print/PeekGraphics.java
-jdk/src/java.desktop/share/classes/sun/print/PeekMetrics.java : jdk/src/share/classes/sun/print/PeekMetrics.java
-jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsConfig.java : jdk/src/share/classes/sun/print/PrinterGraphicsConfig.java
-jdk/src/java.desktop/share/classes/sun/print/PrinterGraphicsDevice.java : jdk/src/share/classes/sun/print/PrinterGraphicsDevice.java
-jdk/src/java.desktop/share/classes/sun/print/PrinterJobWrapper.java : jdk/src/share/classes/sun/print/PrinterJobWrapper.java
-jdk/src/java.desktop/share/classes/sun/print/PrintJob2D.java : jdk/src/share/classes/sun/print/PrintJob2D.java
-jdk/src/java.desktop/share/classes/sun/print/PrintJobAttributeException.java : jdk/src/share/classes/sun/print/PrintJobAttributeException.java
-jdk/src/java.desktop/share/classes/sun/print/PrintJobFlavorException.java : jdk/src/share/classes/sun/print/PrintJobFlavorException.java
-jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics2D.java : jdk/src/share/classes/sun/print/ProxyGraphics2D.java
-jdk/src/java.desktop/share/classes/sun/print/ProxyGraphics.java : jdk/src/share/classes/sun/print/ProxyGraphics.java
-jdk/src/java.desktop/share/classes/sun/print/ProxyPrintGraphics.java : jdk/src/share/classes/sun/print/ProxyPrintGraphics.java
-jdk/src/java.desktop/share/classes/sun/print/PSPathGraphics.java : jdk/src/share/classes/sun/print/PSPathGraphics.java
-jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java : jdk/src/share/classes/sun/print/PSPrinterJob.java
-jdk/src/java.desktop/share/classes/sun/print/PSStreamPrinterFactory.java : jdk/src/share/classes/sun/print/PSStreamPrinterFactory.java
-jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintJob.java : jdk/src/share/classes/sun/print/PSStreamPrintJob.java
-jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java : jdk/src/share/classes/sun/print/PSStreamPrintService.java
-jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java : jdk/src/share/classes/sun/print/RasterPrinterJob.java
-jdk/src/java.desktop/share/classes/sun/print/resources : jdk/src/share/classes/sun/print/resources
-jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java : jdk/src/share/classes/sun/print/ServiceDialog.java
-jdk/src/java.desktop/share/classes/sun/print/ServiceNotifier.java : jdk/src/share/classes/sun/print/ServiceNotifier.java
-jdk/src/java.desktop/share/classes/sun/print/SunAlternateMedia.java : jdk/src/share/classes/sun/print/SunAlternateMedia.java
-jdk/src/java.desktop/share/classes/sun/print/SunMinMaxPage.java : jdk/src/share/classes/sun/print/SunMinMaxPage.java
-jdk/src/java.desktop/share/classes/sun/print/SunPageSelection.java : jdk/src/share/classes/sun/print/SunPageSelection.java
-jdk/src/java.desktop/share/classes/sun/print/SunPrinterJobService.java : jdk/src/share/classes/sun/print/SunPrinterJobService.java
-jdk/src/java.desktop/share/classes/sun/swing : jdk/src/share/classes/sun/swing
-jdk/src/java.desktop/share/conf/cmm/lcms : jdk/src/share/lib/cmm/lcms
-jdk/src/java.desktop/share/conf/images/cursors : jdk/src/share/lib/images/cursors
-jdk/src/java.desktop/share/conf/psfontj2d.properties : jdk/src/share/classes/sun/print/psfontj2d.properties
-jdk/src/java.desktop/share/conf/psfont.properties.ja : jdk/src/share/classes/sun/print/psfont.properties.ja
-jdk/src/java.desktop/share/conf/sound.properties : jdk/src/share/lib/sound.properties
-jdk/src/java.desktop/share/native/common/awt/debug : jdk/src/share/native/sun/awt/debug
-jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCopy_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c
-jdk/src/java.desktop/share/native/common/awt/medialib/mlib_ImageCreate.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.c
-jdk/src/java.desktop/share/native/common/awt/medialib/mlib_sys.c : jdk/src/share/native/sun/awt/medialib/mlib_sys.c
-jdk/src/java.desktop/share/native/common/awt/utility/rect.c : jdk/src/share/native/sun/awt/utility/rect.c
-jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.c : jdk/src/share/native/sun/font/AccelGlyphCache.c
-jdk/src/java.desktop/share/native/common/font/AccelGlyphCache.h : jdk/src/share/native/sun/font/AccelGlyphCache.h
-jdk/src/java.desktop/share/native/common/font/fontscalerdefs.h : jdk/src/share/native/sun/font/fontscalerdefs.h
-jdk/src/java.desktop/share/native/common/font/sunfontids.h : jdk/src/share/native/sun/font/sunfontids.h
-jdk/src/java.desktop/share/native/common/java2d/opengl/J2D_GL : jdk/src/share/native/sun/java2d/opengl/J2D_GL
-jdk/src/java.desktop/share/native/common/java2d/opengl : jdk/src/share/native/sun/java2d/opengl
-jdk/src/java.desktop/share/native/include/jawt.h : jdk/src/share/javavm/export/jawt.h
-jdk/src/java.desktop/share/native/libawt/awt/image/cvutils : jdk/src/share/native/sun/awt/image/cvutils
-jdk/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c : jdk/src/share/native/sun/awt/image/gif/gifdecoder.c
-jdk/src/java.desktop/share/native/libawt/awt/image : jdk/src/share/native/sun/awt/image
-jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.c : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.c
-jdk/src/java.desktop/share/native/libawt/awt/medialib/awt_ImagingLib.h : jdk/src/share/native/sun/awt/medialib/awt_ImagingLib.h
-jdk/src/java.desktop/share/native/libawt/java2d : jdk/src/share/native/sun/java2d
-jdk/src/java.desktop/share/native/libawt/java2d/loops : jdk/src/share/native/sun/java2d/loops
-jdk/src/java.desktop/share/native/libawt/java2d/pipe : jdk/src/share/native/sun/java2d/pipe
-jdk/src/java.desktop/share/native/libfontmanager/DrawGlyphList.c : jdk/src/share/native/sun/font/DrawGlyphList.c
-jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.cpp : jdk/src/share/native/sun/font/FontInstanceAdapter.cpp
-jdk/src/java.desktop/share/native/libfontmanager/FontInstanceAdapter.h : jdk/src/share/native/sun/font/FontInstanceAdapter.h
-jdk/src/java.desktop/share/native/libfontmanager/fontscaler.h : jdk/src/share/native/sun/font/fontscaler.h
-jdk/src/java.desktop/share/native/libfontmanager/freetypeScaler.c : jdk/src/share/native/sun/font/freetypeScaler.c
-jdk/src/java.desktop/share/native/libfontmanager/glyphblitting.h : jdk/src/share/native/sun/font/glyphblitting.h
-jdk/src/java.desktop/share/native/libfontmanager/layout : jdk/src/share/native/sun/font/layout
-jdk/src/java.desktop/share/native/libfontmanager/sunFont.c : jdk/src/share/native/sun/font/sunFont.c
-jdk/src/java.desktop/share/native/libjavajpeg : jdk/src/share/native/sun/awt/image/jpeg
-jdk/src/java.desktop/share/native/libjsound : jdk/src/share/native/com/sun/media/sound
-jdk/src/java.desktop/share/native/liblcms : jdk/src/share/native/sun/java2d/cmm/lcms
-jdk/src/java.desktop/share/native/libmlib_image/j2d_names.h : jdk/src/share/native/sun/awt/medialib/j2d_names.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_S16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_S16.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BC_U16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BC_U16.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_S16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_S16.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_BL_U16.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_BL_U16.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BC.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BC.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffineIndex_BL.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffineIndex_BL.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageAffine_NN.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageAffine_NN.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageBlendTable.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageBlendTable.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvClearEdge.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvClearEdge.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvCopyEdge.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvCopyEdge.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv_f.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv_f.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConv.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConvVersion.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageConvVersion.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp_f.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageLookUp.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1.h : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageThresh1_U8.c : jdk/src/share/native/sun/awt/medialib/mlib_c_ImageThresh1_U8.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib.h : jdk/src/share/native/sun/awt/medialib/mlib.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_D64.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_D64.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_F32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_F32.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BC_S32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BC_S32.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_D64.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_D64.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_F32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_F32.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_BL_S32.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_BL_S32.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffineEdge.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffineEdge.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN_Bit.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageAffine_NN.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_image_blend_proto.h : jdk/src/share/native/sun/awt/medialib/mlib_image_blend_proto.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCheck.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageCheck.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageClipping.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageClipping.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColormap.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageColormap.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageColorTrue2Index.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageColorTrue2Index.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_16nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv2x2_f.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_32nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_32nw.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_8nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Bit.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvClearEdge_Fp.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvClearEdge_Fp.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvCopyEdge_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Bit.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_D64nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_D64nw.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvEdge.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvEdge.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_F32nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_F32nw.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvKernelConvert.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvKernelConvert.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_ext.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConvMxN_Fp.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConvMxN_Fp.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16ext.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv_u16nw.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCopy.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageCreate.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageCreate.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageDivTables.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageDivTables.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageFilters.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageFilters.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_image_get.h : jdk/src/share/native/sun/awt/medialib/mlib_image_get.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_image.h : jdk/src/share/native/sun/awt/medialib/mlib_image.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_64.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp_Bit.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageLookUp.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_image_proto.h : jdk/src/share/native/sun/awt/medialib/mlib_image_proto.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageRowTable.h : jdk/src/share/native/sun/awt/medialib/mlib_ImageRowTable.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageScanPoly.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageScanPoly.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_image_types.h : jdk/src/share/native/sun/awt/medialib/mlib_image_types.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageUtils.c : jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c
-jdk/src/java.desktop/share/native/libmlib_image/mlib_status.h : jdk/src/share/native/sun/awt/medialib/mlib_status.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_sys.h : jdk/src/share/native/sun/awt/medialib/mlib_sys.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_SysMath.h : jdk/src/share/native/sun/awt/medialib/mlib_SysMath.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_sys_proto.h : jdk/src/share/native/sun/awt/medialib/mlib_sys_proto.h
-jdk/src/java.desktop/share/native/libmlib_image/mlib_types.h : jdk/src/share/native/sun/awt/medialib/mlib_types.h
-jdk/src/java.desktop/share/native/libmlib_image/safe_alloc.h : jdk/src/share/native/sun/awt/medialib/safe_alloc.h
-jdk/src/java.desktop/share/native/libmlib_image/safe_math.h : jdk/src/share/native/sun/awt/medialib/safe_math.h
-jdk/src/java.desktop/share/native/libsplashscreen/giflib : jdk/src/share/native/sun/awt/giflib
-jdk/src/java.desktop/share/native/libsplashscreen : jdk/src/share/native/sun/awt/splashscreen
-jdk/src/java.desktop/share/native/libsplashscreen/libpng : jdk/src/share/native/sun/awt/libpng
-jdk/src/java.desktop/unix/classes/META-INF/services : jdk/src/solaris/classes/sun/print/services
-jdk/src/java.desktop/unix/classes/sun/awt : jdk/src/solaris/classes/sun/awt
-jdk/src/java.desktop/unix/classes/sun/awt/motif/MFontConfiguration.java : jdk/src/solaris/classes/sun/awt/motif/MFontConfiguration.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P1.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P1.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P2.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P2.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11CNS11643P3.java : jdk/src/solaris/classes/sun/awt/motif/X11CNS11643P3.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Dingbats.java : jdk/src/solaris/classes/sun/awt/motif/X11Dingbats.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_0.java : jdk/src/solaris/classes/sun/awt/motif/X11GB18030_0.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB18030_1.java : jdk/src/solaris/classes/sun/awt/motif/X11GB18030_1.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GB2312.java : jdk/src/solaris/classes/sun/awt/motif/X11GB2312.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11GBK.java : jdk/src/solaris/classes/sun/awt/motif/X11GBK.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0201.java : jdk/src/solaris/classes/sun/awt/motif/X11JIS0201.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0208.java : jdk/src/solaris/classes/sun/awt/motif/X11JIS0208.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11JIS0212.java : jdk/src/solaris/classes/sun/awt/motif/X11JIS0212.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11Johab.java : jdk/src/solaris/classes/sun/awt/motif/X11Johab.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11KSC5601.java : jdk/src/solaris/classes/sun/awt/motif/X11KSC5601.java
-jdk/src/java.desktop/unix/classes/sun/awt/motif/X11SunUnicode_0.java : jdk/src/solaris/classes/sun/awt/motif/X11SunUnicode_0.java
-jdk/src/java.desktop/unix/classes/sun/awt/windows/ThemeReader.java : jdk/src/solaris/classes/sun/awt/windows/ThemeReader.java
-jdk/src/java.desktop/unix/classes/sun/awt/X11/doc-files/Modality.txt : jdk/src/solaris/classes/sun/awt/X11/doc-files/Modality.txt
-jdk/src/java.desktop/unix/classes/sun/awt/X11 : jdk/src/solaris/classes/sun/awt/X11
-jdk/src/java.desktop/unix/classes/sun/font : jdk/src/solaris/classes/sun/font
-jdk/src/java.desktop/unix/classes/sun/java2d : jdk/src/solaris/classes/sun/java2d
-jdk/src/java.desktop/unix/classes/sun/java2d/jules : jdk/src/solaris/classes/sun/java2d/jules
-jdk/src/java.desktop/unix/classes/sun/java2d/opengl : jdk/src/solaris/classes/sun/java2d/opengl
-jdk/src/java.desktop/unix/classes/sun/java2d/x11 : jdk/src/solaris/classes/sun/java2d/x11
-jdk/src/java.desktop/unix/classes/sun/java2d/xr : jdk/src/solaris/classes/sun/java2d/xr
-jdk/src/java.desktop/unix/classes/sun/print : jdk/src/solaris/classes/sun/print
-jdk/src/java.desktop/unix/conf/flavormap.properties : jdk/src/solaris/lib/flavormap.properties
-jdk/src/java.desktop/unix/conf/fonts/fonts.dir : jdk/src/solaris/classes/sun/awt/motif/java.fonts.dir
-jdk/src/java.desktop/unix/conf/images/cursors/cursors.properties : jdk/src/solaris/lib/images/cursors/cursors.properties
-jdk/src/java.desktop/unix/native/common/awt/awt_Component.h : jdk/src/solaris/native/sun/awt/awt_Component.h
-jdk/src/java.desktop/unix/native/common/awt/awt_DrawingSurface.h : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.h
-jdk/src/java.desktop/unix/native/common/awt/awt_Font.c : jdk/src/solaris/native/sun/awt/awt_Font.c
-jdk/src/java.desktop/unix/native/common/awt/awt_Font.h : jdk/src/solaris/native/sun/awt/awt_Font.h
-jdk/src/java.desktop/unix/native/common/awt/awt_GraphicsEnv.h : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.h
-jdk/src/java.desktop/unix/native/common/awt/awt.h : jdk/src/solaris/native/sun/awt/awt.h
-jdk/src/java.desktop/unix/native/common/awt/awt_Mlib.h : jdk/src/solaris/native/sun/awt/awt_Mlib.h
-jdk/src/java.desktop/unix/native/common/awt/awt_p.h : jdk/src/solaris/native/sun/awt/awt_p.h
-jdk/src/java.desktop/unix/native/common/awt/awt_util.h : jdk/src/solaris/native/sun/awt/awt_util.h
-jdk/src/java.desktop/unix/native/common/awt/colordata.h : jdk/src/solaris/native/sun/awt/colordata.h
-jdk/src/java.desktop/unix/native/common/awt/color.h : jdk/src/solaris/native/sun/awt/color.h
-jdk/src/java.desktop/unix/native/common/awt/CUPSfuncs.c : jdk/src/solaris/native/sun/awt/CUPSfuncs.c
-jdk/src/java.desktop/unix/native/common/awt/fontconfig.h : jdk/src/solaris/native/sun/awt/fontconfig.h
-jdk/src/java.desktop/unix/native/common/awt/fontpath.c : jdk/src/solaris/native/sun/awt/fontpath.c
-jdk/src/java.desktop/unix/native/common/awt/img_util_md.h : jdk/src/solaris/native/sun/awt/img_util_md.h
-jdk/src/java.desktop/unix/native/common/awt/initIDs.c : jdk/src/solaris/native/sun/awt/initIDs.c
-jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.c
-jdk/src/java.desktop/unix/native/common/awt/medialib/mlib_v_ImageCopy_f.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_f.h
-jdk/src/java.desktop/unix/native/common/awt/medialib/vis_proto.h : jdk/src/solaris/native/sun/awt/medialib/vis_proto.h
-jdk/src/java.desktop/unix/native/common/awt/utility/rect.h : jdk/src/solaris/native/sun/awt/utility/rect.h
-jdk/src/java.desktop/unix/native/common/awt/X11Color.c : jdk/src/solaris/native/sun/awt/X11Color.c
-jdk/src/java.desktop/unix/native/common/font/X11FontScaler.h : jdk/src/solaris/native/sun/font/X11FontScaler.h
-jdk/src/java.desktop/unix/native/common/java2d/opengl/J2D_GL : jdk/src/solaris/native/sun/java2d/opengl/J2D_GL
-jdk/src/java.desktop/unix/native/common/java2d/opengl : jdk/src/solaris/native/sun/java2d/opengl
-jdk/src/java.desktop/unix/native/common/java2d/x11/X11FontScaler_md.c : jdk/src/solaris/native/sun/java2d/x11/X11FontScaler_md.c
-jdk/src/java.desktop/unix/native/common/java2d/x11/X11PMBlitLoops.c : jdk/src/solaris/native/sun/java2d/x11/X11PMBlitLoops.c
-jdk/src/java.desktop/unix/native/common/java2d/x11/X11Renderer.c : jdk/src/solaris/native/sun/java2d/x11/X11Renderer.c
-jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c
-jdk/src/java.desktop/unix/native/common/java2d/x11/X11SurfaceData.h : jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.h
-jdk/src/java.desktop/unix/native/common/java2d/x11/X11TextRenderer_md.c : jdk/src/solaris/native/sun/java2d/x11/X11TextRenderer_md.c
-jdk/src/java.desktop/unix/native/include/jawt_md.h : jdk/src/solaris/javavm/export/jawt_md.h
-jdk/src/java.desktop/unix/native/libawt_headless/awt/HeadlessToolkit.c : jdk/src/solaris/native/sun/awt/HeadlessToolkit.c
-jdk/src/java.desktop/unix/native/libawt_headless/awt/VDrawingArea.c : jdk/src/solaris/native/sun/awt/VDrawingArea.c
-jdk/src/java.desktop/unix/native/libawt/awt/awt_LoadLibrary.c : jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
-jdk/src/java.desktop/unix/native/libawt/awt/awt_Mlib.c : jdk/src/solaris/native/sun/awt/awt_Mlib.c
-jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy_blk.s : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy_blk.s
-jdk/src/java.desktop/unix/native/libawt/awt/medialib/mlib_v_ImageCopy.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageCopy.c
-jdk/src/java.desktop/unix/native/libawt/awt/medialib/vis_asi.h : jdk/src/solaris/native/sun/awt/medialib/vis_asi.h
-jdk/src/java.desktop/unix/native/libawt/java2d/j2d_md.h : jdk/src/solaris/native/sun/java2d/j2d_md.h
-jdk/src/java.desktop/unix/native/libawt/java2d/loops : jdk/src/solaris/native/sun/java2d/loops
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.c : jdk/src/solaris/native/sun/awt/awt_AWTEvent.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h : jdk/src/solaris/native/sun/awt/awt_AWTEvent.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_DrawingSurface.c : jdk/src/solaris/native/sun/awt/awt_DrawingSurface.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.c : jdk/src/solaris/native/sun/awt/awt_Event.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h : jdk/src/solaris/native/sun/awt/awt_Event.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_GraphicsEnv.c : jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_InputMethod.c : jdk/src/solaris/native/sun/awt/awt_InputMethod.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.c : jdk/src/solaris/native/sun/awt/awt_Insets.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h : jdk/src/solaris/native/sun/awt/awt_Insets.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_MenuComponent.h : jdk/src/solaris/native/sun/awt/awt_MenuComponent.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_Robot.c : jdk/src/solaris/native/sun/awt/awt_Robot.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_UNIXToolkit.c : jdk/src/solaris/native/sun/awt/awt_UNIXToolkit.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/awt_util.c : jdk/src/solaris/native/sun/awt/awt_util.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/canvas.h : jdk/src/solaris/native/sun/awt/canvas.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.c : jdk/src/solaris/native/sun/awt/gtk2_interface.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/gtk2_interface.h : jdk/src/solaris/native/sun/awt/gtk2_interface.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/HPkeysym.h : jdk/src/solaris/native/sun/awt/HPkeysym.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.c : jdk/src/solaris/native/sun/awt/list.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/list.h : jdk/src/solaris/native/sun/awt/list.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.c : jdk/src/solaris/native/sun/awt/multi_font.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/multi_font.h : jdk/src/solaris/native/sun/awt/multi_font.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.c : jdk/src/solaris/native/sun/awt/multiVis.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/multiVis.h : jdk/src/solaris/native/sun/awt/multiVis.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/randr.h : jdk/src/solaris/native/sun/awt/randr.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.c : jdk/src/solaris/native/sun/awt/robot_common.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/robot_common.h : jdk/src/solaris/native/sun/awt/robot_common.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/sun_awt_X11_GtkFileDialogPeer.c : jdk/src/solaris/native/sun/awt/sun_awt_X11_GtkFileDialogPeer.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKEngine.c : jdk/src/solaris/native/sun/awt/swing_GTKEngine.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/swing_GTKStyle.c : jdk/src/solaris/native/sun/awt/swing_GTKStyle.c
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/wsutils.h : jdk/src/solaris/native/sun/awt/wsutils.h
-jdk/src/java.desktop/unix/native/libawt_xawt/awt/Xrandr.h : jdk/src/solaris/native/sun/awt/Xrandr.h
-jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRBackendNative.c : jdk/src/solaris/native/sun/java2d/x11/XRBackendNative.c
-jdk/src/java.desktop/unix/native/libawt_xawt/java2d/x11/XRSurfaceData.c : jdk/src/solaris/native/sun/java2d/x11/XRSurfaceData.c
-jdk/src/java.desktop/unix/native/libawt_xawt/xawt : jdk/src/solaris/native/sun/xawt
-jdk/src/java.desktop/unix/native/libfontmanager/X11FontScaler.c : jdk/src/solaris/native/sun/font/X11FontScaler.c
-jdk/src/java.desktop/unix/native/libfontmanager/X11TextRenderer.c : jdk/src/solaris/native/sun/font/X11TextRenderer.c
-jdk/src/java.desktop/unix/native/libjawt/jawt.c : jdk/src/solaris/native/sun/awt/jawt.c
-jdk/src/java.desktop/unix/native/libjsound : jdk/src/solaris/native/com/sun/media/sound
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_ImageConvCopyEdge_Fp.c : jdk/src/solaris/native/sun/awt/medialib/mlib_ImageConvCopyEdge_Fp.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_S16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_S16.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BC_U16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BC_U16.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_S16.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_S16.h
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_BL_U16.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_BL_U16.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffineIndex_BC.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffineIndex_BC.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageAffine_NN.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageAffine_NN.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_1.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_1.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract_43.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract_43.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelExtract.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelExtract.h
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert_1.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert_1.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageChannelInsert.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageChannelInsert.h
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv_8nw.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv_8nw.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvClearEdge.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvClearEdge.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvCopyEdge.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvCopyEdge.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConv.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConv.h
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvMxN_8ext.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvMxN_8ext.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageConvVersion.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageConvVersion.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageFilters.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageFilters.h
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUp.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUp.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpFunc.h : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpFunc.h
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16S32Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS16U8Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32S32Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpS32U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpS32U8Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16S32Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS16U8Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32S32Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIS32U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIS32U8Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16S32Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU16U8Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8S32Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpSIU8U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpSIU8U8Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16S32Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU16U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU16U8Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8S32Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8S32Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U16Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U16Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/mlib_v_ImageLookUpU8U8Func.c : jdk/src/solaris/native/sun/awt/medialib/mlib_v_ImageLookUpU8U8Func.c
-jdk/src/java.desktop/unix/native/libmlib_image/vis_32.il : jdk/src/solaris/native/sun/awt/medialib/vis_32.il
-jdk/src/java.desktop/unix/native/libmlib_image/vis_64.il : jdk/src/solaris/native/sun/awt/medialib/vis_64.il
-jdk/src/java.desktop/unix/native/libsplashscreen : jdk/src/solaris/native/sun/awt/splashscreen
-jdk/src/java.desktop/unix/native/libsunwjdga : jdk/src/solaris/native/sun/jdga
-jdk/src/java.desktop/windows/classes/META-INF/services : jdk/src/windows/classes/sun/print/services
-jdk/src/java.desktop/windows/classes/sun/awt/windows/ThemeReader.java : jdk/src/windows/classes/sun/awt/windows/ThemeReader.java
-jdk/src/java.desktop/windows/classes/sun/font : jdk/src/windows/classes/sun/font
-jdk/src/java.desktop/windows/conf/flavormap.properties : jdk/src/windows/lib/flavormap.properties
-jdk/src/java.desktop/windows/conf/images/cursors/cursors.properties : jdk/src/windows/lib/images/cursors/cursors.properties
-jdk/src/java.desktop/windows/native/common/awt/utility/rect.h : jdk/src/windows/native/sun/awt/utility/rect.h
-jdk/src/java.desktop/windows/native/include/jawt_md.h : jdk/src/windows/javavm/export/jawt_md.h
-jdk/src/java.desktop/windows/native/libawt/java2d/d3d : jdk/src/windows/native/sun/java2d/d3d
-jdk/src/java.desktop/windows/native/libawt/java2d : jdk/src/windows/native/sun/java2d
-jdk/src/java.desktop/windows/native/libawt/windows/alloc.h : jdk/src/windows/native/sun/windows/alloc.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.cpp : jdk/src/windows/native/sun/windows/awt_AWTEvent.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_AWTEvent.h : jdk/src/windows/native/sun/windows/awt_AWTEvent.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.cpp : jdk/src/windows/native/sun/windows/awt_BitmapUtil.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_BitmapUtil.h : jdk/src/windows/native/sun/windows/awt_BitmapUtil.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.cpp : jdk/src/windows/native/sun/windows/awt_Brush.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Brush.h : jdk/src/windows/native/sun/windows/awt_Brush.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.cpp : jdk/src/windows/native/sun/windows/awt_Button.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Button.h : jdk/src/windows/native/sun/windows/awt_Button.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.cpp : jdk/src/windows/native/sun/windows/awt_Canvas.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Canvas.h : jdk/src/windows/native/sun/windows/awt_Canvas.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.cpp : jdk/src/windows/native/sun/windows/awt_Checkbox.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Checkbox.h : jdk/src/windows/native/sun/windows/awt_Checkbox.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp : jdk/src/windows/native/sun/windows/awt_Choice.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.h : jdk/src/windows/native/sun/windows/awt_Choice.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.cpp : jdk/src/windows/native/sun/windows/awt_Clipboard.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Clipboard.h : jdk/src/windows/native/sun/windows/awt_Clipboard.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.cpp : jdk/src/windows/native/sun/windows/awt_Color.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Color.h : jdk/src/windows/native/sun/windows/awt_Color.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp : jdk/src/windows/native/sun/windows/awt_Component.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.h : jdk/src/windows/native/sun/windows/awt_Component.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.cpp : jdk/src/windows/native/sun/windows/awt_Container.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Container.h : jdk/src/windows/native/sun/windows/awt_Container.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.cpp : jdk/src/windows/native/sun/windows/awt_Cursor.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Cursor.h : jdk/src/windows/native/sun/windows/awt_Cursor.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_CustomPaletteDef.h : jdk/src/windows/native/sun/windows/awt_CustomPaletteDef.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.cpp : jdk/src/windows/native/sun/windows/awt_DataTransferer.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DataTransferer.h : jdk/src/windows/native/sun/windows/awt_DataTransferer.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.cpp : jdk/src/windows/native/sun/windows/awt_DCHolder.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DCHolder.h : jdk/src/windows/native/sun/windows/awt_DCHolder.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.cpp : jdk/src/windows/native/sun/windows/awt_Debug.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Debug.h : jdk/src/windows/native/sun/windows/awt_Debug.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Desktop.cpp : jdk/src/windows/native/sun/windows/awt_Desktop.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.cpp : jdk/src/windows/native/sun/windows/awt_DesktopProperties.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DesktopProperties.h : jdk/src/windows/native/sun/windows/awt_DesktopProperties.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.cpp : jdk/src/windows/native/sun/windows/awt_Dialog.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Dialog.h : jdk/src/windows/native/sun/windows/awt_Dialog.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.cpp : jdk/src/windows/native/sun/windows/awt_Dimension.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Dimension.h : jdk/src/windows/native/sun/windows/awt_Dimension.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.cpp : jdk/src/windows/native/sun/windows/awt_DnDDS.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDS.h : jdk/src/windows/native/sun/windows/awt_DnDDS.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.cpp : jdk/src/windows/native/sun/windows/awt_DnDDT.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DnDDT.h : jdk/src/windows/native/sun/windows/awt_DnDDT.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.cpp : jdk/src/windows/native/sun/windows/awt_DrawingSurface.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_DrawingSurface.h : jdk/src/windows/native/sun/windows/awt_DrawingSurface.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.cpp : jdk/src/windows/native/sun/windows/awt_Event.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Event.h : jdk/src/windows/native/sun/windows/awt_Event.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp : jdk/src/windows/native/sun/windows/awt_FileDialog.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_FileDialog.h : jdk/src/windows/native/sun/windows/awt_FileDialog.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp : jdk/src/windows/native/sun/windows/awt_Font.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.h : jdk/src/windows/native/sun/windows/awt_Font.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp : jdk/src/windows/native/sun/windows/awt_Frame.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.h : jdk/src/windows/native/sun/windows/awt_Frame.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.cpp : jdk/src/windows/native/sun/windows/awt_GDIObject.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_GDIObject.h : jdk/src/windows/native/sun/windows/awt_GDIObject.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt.h : jdk/src/windows/native/sun/windows/awt.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.cpp : jdk/src/windows/native/sun/windows/awt_IconCursor.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_IconCursor.h : jdk/src/windows/native/sun/windows/awt_IconCursor.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.cpp : jdk/src/windows/native/sun/windows/awt_InputEvent.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_InputEvent.h : jdk/src/windows/native/sun/windows/awt_InputEvent.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_InputMethod.cpp : jdk/src/windows/native/sun/windows/awt_InputMethod.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.cpp : jdk/src/windows/native/sun/windows/awt_InputTextInfor.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_InputTextInfor.h : jdk/src/windows/native/sun/windows/awt_InputTextInfor.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.cpp : jdk/src/windows/native/sun/windows/awt_Insets.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Insets.h : jdk/src/windows/native/sun/windows/awt_Insets.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyboardFocusManager.cpp : jdk/src/windows/native/sun/windows/awt_KeyboardFocusManager.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.cpp : jdk/src/windows/native/sun/windows/awt_KeyEvent.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_KeyEvent.h : jdk/src/windows/native/sun/windows/awt_KeyEvent.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.cpp : jdk/src/windows/native/sun/windows/awt_Label.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Label.h : jdk/src/windows/native/sun/windows/awt_Label.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_List.cpp : jdk/src/windows/native/sun/windows/awt_List.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_List.h : jdk/src/windows/native/sun/windows/awt_List.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.cpp : jdk/src/windows/native/sun/windows/awt_MenuBar.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuBar.h : jdk/src/windows/native/sun/windows/awt_MenuBar.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.cpp : jdk/src/windows/native/sun/windows/awt_Menu.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Menu.h : jdk/src/windows/native/sun/windows/awt_Menu.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.cpp : jdk/src/windows/native/sun/windows/awt_MenuItem.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_MenuItem.h : jdk/src/windows/native/sun/windows/awt_MenuItem.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.cpp : jdk/src/windows/native/sun/windows/awt_Mlib.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Mlib.h : jdk/src/windows/native/sun/windows/awt_Mlib.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.cpp : jdk/src/windows/native/sun/windows/awt_MouseEvent.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_MouseEvent.h : jdk/src/windows/native/sun/windows/awt_MouseEvent.h
-jdk/src/java.desktop/windows/native/libawt/windows/awtmsg.h : jdk/src/windows/native/sun/windows/awtmsg.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_new.cpp : jdk/src/windows/native/sun/windows/awt_new.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_new.h : jdk/src/windows/native/sun/windows/awt_new.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.cpp : jdk/src/windows/native/sun/windows/awt_Object.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Object.h : jdk/src/windows/native/sun/windows/awt_Object.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.cpp : jdk/src/windows/native/sun/windows/awt_ole.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_ole.h : jdk/src/windows/native/sun/windows/awt_ole.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.cpp : jdk/src/windows/native/sun/windows/awt_Palette.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Palette.h : jdk/src/windows/native/sun/windows/awt_Palette.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.cpp : jdk/src/windows/native/sun/windows/awt_Panel.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Panel.h : jdk/src/windows/native/sun/windows/awt_Panel.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.cpp : jdk/src/windows/native/sun/windows/awt_Pen.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Pen.h : jdk/src/windows/native/sun/windows/awt_Pen.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.cpp : jdk/src/windows/native/sun/windows/awt_PopupMenu.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_PopupMenu.h : jdk/src/windows/native/sun/windows/awt_PopupMenu.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.cpp : jdk/src/windows/native/sun/windows/awt_PrintControl.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintControl.h : jdk/src/windows/native/sun/windows/awt_PrintControl.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.cpp : jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintDialog.h : jdk/src/windows/native/sun/windows/awt_PrintDialog.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_PrintJob.cpp : jdk/src/windows/native/sun/windows/awt_PrintJob.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt.rc : jdk/src/windows/native/sun/windows/awt.rc
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.cpp : jdk/src/windows/native/sun/windows/awt_Rectangle.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h : jdk/src/windows/native/sun/windows/awt_Rectangle.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp : jdk/src/windows/native/sun/windows/awt_Robot.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.h : jdk/src/windows/native/sun/windows/awt_Robot.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.cpp : jdk/src/windows/native/sun/windows/awt_Scrollbar.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Scrollbar.h : jdk/src/windows/native/sun/windows/awt_Scrollbar.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.cpp : jdk/src/windows/native/sun/windows/awt_ScrollPane.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_ScrollPane.h : jdk/src/windows/native/sun/windows/awt_ScrollPane.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.cpp : jdk/src/windows/native/sun/windows/awt_TextArea.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_TextArea.h : jdk/src/windows/native/sun/windows/awt_TextArea.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.cpp : jdk/src/windows/native/sun/windows/awt_TextComponent.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_TextComponent.h : jdk/src/windows/native/sun/windows/awt_TextComponent.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.cpp : jdk/src/windows/native/sun/windows/awt_TextField.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_TextField.h : jdk/src/windows/native/sun/windows/awt_TextField.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp : jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.h : jdk/src/windows/native/sun/windows/awt_Toolkit.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.cpp : jdk/src/windows/native/sun/windows/awt_TrayIcon.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_TrayIcon.h : jdk/src/windows/native/sun/windows/awt_TrayIcon.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsConfig.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsConfig.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsDevice.h : jdk/src/windows/native/sun/windows/awt_Win32GraphicsDevice.h
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Win32GraphicsEnv.cpp : jdk/src/windows/native/sun/windows/awt_Win32GraphicsEnv.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.cpp : jdk/src/windows/native/sun/windows/awt_Window.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/awt_Window.h : jdk/src/windows/native/sun/windows/awt_Window.h
-jdk/src/java.desktop/windows/native/libawt/windows/check.bmp : jdk/src/windows/native/sun/windows/check.bmp
-jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.cpp : jdk/src/windows/native/sun/windows/CmdIDList.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/CmdIDList.h : jdk/src/windows/native/sun/windows/CmdIDList.h
-jdk/src/java.desktop/windows/native/libawt/windows/colordata.h : jdk/src/windows/native/sun/windows/colordata.h
-jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.cpp : jdk/src/windows/native/sun/windows/ComCtl32Util.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/ComCtl32Util.h : jdk/src/windows/native/sun/windows/ComCtl32Util.h
-jdk/src/java.desktop/windows/native/libawt/windows/Devices.cpp : jdk/src/windows/native/sun/windows/Devices.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/Devices.h : jdk/src/windows/native/sun/windows/Devices.h
-jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.cpp : jdk/src/windows/native/sun/windows/DllUtil.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/DllUtil.h : jdk/src/windows/native/sun/windows/DllUtil.h
-jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.cpp : jdk/src/windows/native/sun/windows/GDIHashtable.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/GDIHashtable.h : jdk/src/windows/native/sun/windows/GDIHashtable.h
-jdk/src/java.desktop/windows/native/libawt/windows/hand.cur : jdk/src/windows/native/sun/windows/hand.cur
-jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.cpp : jdk/src/windows/native/sun/windows/Hashtable.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/Hashtable.h : jdk/src/windows/native/sun/windows/Hashtable.h
-jdk/src/java.desktop/windows/native/libawt/windows/img_util_md.h : jdk/src/windows/native/sun/windows/img_util_md.h
-jdk/src/java.desktop/windows/native/libawt/windows/initIDs.cpp : jdk/src/windows/native/sun/windows/initIDs.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/mlib_types_md.h : jdk/src/windows/native/sun/windows/mlib_types_md.h
-jdk/src/java.desktop/windows/native/libawt/windows/MouseInfo.cpp : jdk/src/windows/native/sun/windows/MouseInfo.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.cpp : jdk/src/windows/native/sun/windows/ObjectList.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/ObjectList.h : jdk/src/windows/native/sun/windows/ObjectList.h
-jdk/src/java.desktop/windows/native/libawt/windows/README.JNI : jdk/src/windows/native/sun/windows/README.JNI
-jdk/src/java.desktop/windows/native/libawt/windows/security_warning_bw.ico : jdk/src/windows/native/sun/windows/security_warning_bw.ico
-jdk/src/java.desktop/windows/native/libawt/windows/security_warning.ico : jdk/src/windows/native/sun/windows/security_warning.ico
-jdk/src/java.desktop/windows/native/libawt/windows/security_warning_int.ico : jdk/src/windows/native/sun/windows/security_warning_int.ico
-jdk/src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp : jdk/src/windows/native/sun/windows/ShellFolder2.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/stdhdrs.h : jdk/src/windows/native/sun/windows/stdhdrs.h
-jdk/src/java.desktop/windows/native/libawt/windows/ThemeReader.cpp : jdk/src/windows/native/sun/windows/ThemeReader.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/WBufferStrategy.cpp : jdk/src/windows/native/sun/windows/WBufferStrategy.cpp
-jdk/src/java.desktop/windows/native/libawt/windows/WPrinterJob.cpp : jdk/src/windows/native/sun/windows/WPrinterJob.cpp
-jdk/src/java.desktop/windows/native/libfontmanager : jdk/src/windows/native/sun/font
-jdk/src/java.desktop/windows/native/libjawt/jawt.cpp : jdk/src/windows/native/sun/windows/jawt.cpp
-jdk/src/java.desktop/windows/native/libjsound : jdk/src/windows/native/com/sun/media/sound
-jdk/src/java.desktop/windows/native/libsplashscreen : jdk/src/windows/native/sun/awt/splashscreen
-jdk/src/java.instrument/share/classes/java/lang/instrument : jdk/src/share/classes/java/lang/instrument
-jdk/src/java.instrument/share/classes/sun/instrument : jdk/src/share/classes/sun/instrument
-jdk/src/java.instrument/share/native/libinstrument : jdk/src/share/instrument
-jdk/src/java.instrument/unix/native/libinstrument : jdk/src/solaris/instrument
-jdk/src/java.instrument/windows/native/libinstrument : jdk/src/windows/instrument
-jdk/src/java.logging/share/classes/java/util/logging : jdk/src/share/classes/java/util/logging
-jdk/src/java.logging/share/classes/sun/net/www/protocol/http/logging : jdk/src/share/classes/sun/net/www/protocol/http/logging
-jdk/src/java.logging/share/classes/sun/util/logging/resources : jdk/src/share/classes/sun/util/logging/resources
-jdk/src/java.logging/share/conf/logging.properties : jdk/src/share/lib/logging.properties
-jdk/src/java.management/share/classes/com/sun/jmx/defaults : jdk/src/share/classes/com/sun/jmx/defaults
-jdk/src/java.management/share/classes/com/sun/jmx/interceptor : jdk/src/share/classes/com/sun/jmx/interceptor
-jdk/src/java.management/share/classes/com/sun/jmx/mbeanserver : jdk/src/share/classes/com/sun/jmx/mbeanserver
-jdk/src/java.management/share/classes/com/sun/jmx/remote : jdk/src/share/classes/com/sun/jmx/remote
-jdk/src/java.management/share/classes/java/lang/management : jdk/src/share/classes/java/lang/management
-jdk/src/java.management/share/classes/javax/management : jdk/src/share/classes/javax/management
-jdk/src/java.management/share/classes/mgmt-overview.html : jdk/src/share/classes/com/sun/management/mgmt-overview.html
-jdk/src/java.management/share/classes/sun/management/counter : jdk/src/share/classes/sun/management/counter
-jdk/src/java.management/share/classes/sun/management/counter/perf : jdk/src/share/classes/sun/management/counter/perf
-jdk/src/java.management/share/classes/sun/management : jdk/src/share/classes/sun/management
-jdk/src/java.management/share/conf : jdk/src/share/lib/management
-jdk/src/java.management/share/native/include/jmm.h : jdk/src/share/javavm/export/jmm.h
-jdk/src/java.management/share/native/libmanagement : jdk/src/share/native/sun/management
-jdk/src/java.management/unix/classes/sun/management : jdk/src/solaris/classes/sun/management
-jdk/src/java.management/unix/native/libmanagement : jdk/src/solaris/native/sun/management
-jdk/src/java.management/windows/classes/sun/management : jdk/src/windows/classes/sun/management
-jdk/src/java.management/windows/native/libmanagement : jdk/src/windows/native/sun/management
-jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/ProxyRef.java : jdk/src/share/classes/com/sun/jmx/remote/internal/ProxyRef.java
-jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/RMIExporter.java : jdk/src/share/classes/com/sun/jmx/remote/internal/RMIExporter.java
-jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/internal/rmi/Unmarshal.java : jdk/src/share/classes/com/sun/jmx/remote/internal/Unmarshal.java
-jdk/src/java.management.rmi/share/classes/com/sun/jmx/remote/protocol/rmi : jdk/src/share/classes/com/sun/jmx/remote/protocol/rmi
-jdk/src/java.management.rmi/share/classes/javax/management/remote/rmi : jdk/src/share/classes/javax/management/remote/rmi
-jdk/src/java.naming/share/classes/com/sun/jndi/ldap/ext : jdk/src/share/classes/com/sun/jndi/ldap/ext
-jdk/src/java.naming/share/classes/com/sun/jndi/ldap : jdk/src/share/classes/com/sun/jndi/ldap
-jdk/src/java.naming/share/classes/com/sun/jndi/ldap/pool : jdk/src/share/classes/com/sun/jndi/ldap/pool
-jdk/src/java.naming/share/classes/com/sun/jndi/ldap/sasl : jdk/src/share/classes/com/sun/jndi/ldap/sasl
-jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/ctx : jdk/src/share/classes/com/sun/jndi/toolkit/ctx
-jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/dir : jdk/src/share/classes/com/sun/jndi/toolkit/dir
-jdk/src/java.naming/share/classes/com/sun/jndi/toolkit/url : jdk/src/share/classes/com/sun/jndi/toolkit/url
-jdk/src/java.naming/share/classes/com/sun/jndi/url/ldap : jdk/src/share/classes/com/sun/jndi/url/ldap
-jdk/src/java.naming/share/classes/com/sun/jndi/url/ldaps : jdk/src/share/classes/com/sun/jndi/url/ldaps
-jdk/src/java.naming/share/classes/com/sun/naming/internal : jdk/src/share/classes/com/sun/naming/internal
-jdk/src/java.naming/share/classes/javax/naming/directory : jdk/src/share/classes/javax/naming/directory
-jdk/src/java.naming/share/classes/javax/naming/event : jdk/src/share/classes/javax/naming/event
-jdk/src/java.naming/share/classes/javax/naming : jdk/src/share/classes/javax/naming
-jdk/src/java.naming/share/classes/javax/naming/ldap : jdk/src/share/classes/javax/naming/ldap
-jdk/src/java.naming/share/classes/javax/naming/spi : jdk/src/share/classes/javax/naming/spi
-jdk/src/java.naming/share/classes/sun/security/provider/certpath/ldap : jdk/src/share/classes/sun/security/provider/certpath/ldap
-jdk/src/java.prefs/macosx/native/libprefs : jdk/src/macosx/native/java/util/prefs
-jdk/src/java.prefs/unix/classes/java/util/prefs : jdk/src/solaris/classes/java/util/prefs
-jdk/src/java.prefs/unix/native/libprefs : jdk/src/solaris/native/java/util/prefs
-jdk/src/java.prefs/windows/native/libprefs : jdk/src/windows/native/java/util/prefs
-jdk/src/java.rmi/share/classes/com/sun/rmi/rmid : jdk/src/share/classes/com/sun/rmi/rmid
-jdk/src/java.rmi/share/classes/java/rmi/activation : jdk/src/share/classes/java/rmi/activation
-jdk/src/java.rmi/share/classes/java/rmi/dgc : jdk/src/share/classes/java/rmi/dgc
-jdk/src/java.rmi/share/classes/java/rmi : jdk/src/share/classes/java/rmi
-jdk/src/java.rmi/share/classes/java/rmi/registry : jdk/src/share/classes/java/rmi/registry
-jdk/src/java.rmi/share/classes/java/rmi/server : jdk/src/share/classes/java/rmi/server
-jdk/src/java.rmi/share/classes/javax/rmi/ssl : jdk/src/share/classes/javax/rmi/ssl
-jdk/src/java.rmi/share/classes/sun/rmi/log : jdk/src/share/classes/sun/rmi/log
-jdk/src/java.rmi/share/classes/sun/rmi/registry : jdk/src/share/classes/sun/rmi/registry
-jdk/src/java.rmi/share/classes/sun/rmi/runtime : jdk/src/share/classes/sun/rmi/runtime
-jdk/src/java.rmi/share/classes/sun/rmi/server : jdk/src/share/classes/sun/rmi/server
-jdk/src/java.rmi/share/classes/sun/rmi/server/resources : jdk/src/share/classes/sun/rmi/server/resources
-jdk/src/java.rmi/share/classes/sun/rmi/transport : jdk/src/share/classes/sun/rmi/transport
-jdk/src/java.rmi/share/classes/sun/rmi/transport/proxy : jdk/src/share/classes/sun/rmi/transport/proxy
-jdk/src/java.rmi/share/classes/sun/rmi/transport/tcp : jdk/src/share/classes/sun/rmi/transport/tcp
-jdk/src/java.rmi/share/doc/stub/java/rmi/activation : jdk/src/share/doc/stub/java/rmi/activation
-jdk/src/java.rmi/unix/bin/java-rmi.cgi.sh : jdk/src/solaris/bin/java-rmi.cgi.sh
-jdk/src/java.scripting/share/classes/javax/script : jdk/src/share/classes/javax/script
-jdk/src/java.scripting/share/classes/com/sun/tools/script/shell : jdk/src/share/classes/com/sun/tools/script/shell
-jdk/src/java.security.jgss/macosx/native/libosxkrb5/nativeccache.c : jdk/src/share/native/sun/security/krb5/nativeccache.c
-jdk/src/java.security.jgss/macosx/native/libosxkrb5/SCDynamicStoreConfig.m : jdk/src/macosx/native/sun/security/krb5/SCDynamicStoreConfig.m
-jdk/src/java.security.jgss/share/classes/javax/security/auth/kerberos : jdk/src/share/classes/javax/security/auth/kerberos
-jdk/src/java.security.jgss/share/classes/jgss-overview.html : jdk/src/share/classes/com/sun/security/jgss/jgss-overview.html
-jdk/src/java.security.jgss/share/classes/org/ietf/jgss : jdk/src/share/classes/org/ietf/jgss
-jdk/src/java.security.jgss/share/classes/sun/net/www/protocol/http/spnego : jdk/src/share/classes/sun/net/www/protocol/http/spnego
-jdk/src/java.security.jgss/share/classes/sun/security/jgss : jdk/src/share/classes/sun/security/jgss
-jdk/src/java.security.jgss/share/classes/sun/security/krb5 : jdk/src/share/classes/sun/security/krb5
-jdk/src/java.security.jgss/windows/classes/sun/security/krb5 : jdk/src/windows/classes/sun/security/krb5
-jdk/src/java.security.jgss/share/classes/sun/security/ssl/krb5 : jdk/src/share/classes/sun/security/ssl/krb5
-jdk/src/java.security.jgss/share/native/libj2gss : jdk/src/share/native/sun/security/jgss/wrapper
-jdk/src/java.security.jgss/unix/native/libj2gss : jdk/src/solaris/native/sun/security/jgss/wrapper
-jdk/src/java.security.jgss/windows/native/libw2k_lsa_auth : jdk/src/windows/native/sun/security/krb5
-jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/digest : jdk/src/share/classes/com/sun/security/sasl/digest
-jdk/src/java.security.sasl/share/classes/com/sun/security/sasl : jdk/src/share/classes/com/sun/security/sasl
-jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/ntlm : jdk/src/share/classes/com/sun/security/sasl/ntlm
-jdk/src/java.security.sasl/share/classes/com/sun/security/sasl/util : jdk/src/share/classes/com/sun/security/sasl/util
-jdk/src/java.security.sasl/share/classes/javax/security/sasl : jdk/src/share/classes/javax/security/sasl
-jdk/src/java.smartcardio/share/classes/javax/smartcardio : jdk/src/share/classes/javax/smartcardio
-jdk/src/java.smartcardio/share/classes/sun/security/smartcardio : jdk/src/share/classes/sun/security/smartcardio
-jdk/src/java.smartcardio/share/native/libj2pcsc : jdk/src/share/native/sun/security/smartcardio
-jdk/src/java.smartcardio/unix/classes/sun/security/smartcardio : jdk/src/solaris/classes/sun/security/smartcardio
-jdk/src/java.smartcardio/unix/native/libj2pcsc : jdk/src/solaris/native/sun/security/smartcardio
-jdk/src/java.smartcardio/unix/native/libj2pcsc/MUSCLE : jdk/src/solaris/native/sun/security/smartcardio/MUSCLE
-jdk/src/java.smartcardio/windows/classes/sun/security/smartcardio : jdk/src/windows/classes/sun/security/smartcardio
-jdk/src/java.smartcardio/windows/native/libj2pcsc : jdk/src/windows/native/sun/security/smartcardio
-jdk/src/java.sql.rowset/share/classes/com/sun/rowset : jdk/src/share/classes/com/sun/rowset
-jdk/src/java.sql.rowset/share/classes/javax/sql/rowset : jdk/src/share/classes/javax/sql/rowset
-jdk/src/java.sql/share/classes/java/sql : jdk/src/share/classes/java/sql
-jdk/src/java.sql/share/classes/javax/sql : jdk/src/share/classes/javax/sql
-jdk/src/java.sql/share/classes/javax/transaction/xa : corba/src/share/classes/javax/transaction/xa
-jdk/src/java.transaction/share/classes/javax/transaction : corba/src/share/classes/javax/transaction
-jdk/src/java.xml.crypto/share/classes/com/sun/org/apache/xml/internal/security : jdk/src/share/classes/com/sun/org/apache/xml/internal/security
-jdk/src/java.xml.crypto/share/classes/javax/xml/crypto : jdk/src/share/classes/javax/xml/crypto
-jdk/src/java.xml.crypto/share/classes/org/jcp/xml/dsig/internal : jdk/src/share/classes/org/jcp/xml/dsig/internal
-jdk/src/jdk.attach/aix/native/libattach/AixVirtualMachine.c : jdk/src/aix/native/sun/tools/attach/AixVirtualMachine.c
-jdk/src/jdk.attach/share/classes/com/sun/tools/attach : jdk/src/share/classes/com/sun/tools/attach
-jdk/src/jdk.attach/share/classes/com/sun/tools/attach/spi : jdk/src/share/classes/com/sun/tools/attach/spi
-jdk/src/jdk.attach/share/classes/META-INF/services : jdk/src/share/classes/sun/tools/attach/META-INF/services
-jdk/src/jdk.attach/share/classes/sun/tools/attach : jdk/src/share/classes/sun/tools/attach
-jdk/src/jdk.attach/unix/classes/sun/tools/attach : jdk/src/solaris/classes/sun/tools/attach
-jdk/src/jdk.attach/unix/native/libattach : jdk/src/solaris/native/sun/tools/attach
-jdk/src/jdk.attach/windows/native/libattach : jdk/src/windows/native/sun/tools/attach
-jdk/src/jdk.base/share/native/libnpt : jdk/src/share/npt
-jdk/src/jdk.base/unix/native/libnpt : jdk/src/solaris/npt
-jdk/src/jdk.base/windows/native/libnpt : jdk/src/windows/npt
-jdk/src/jdk.charsets/share/classes/sun/nio/cs/ext : jdk/src/share/classes/sun/nio/cs/ext
-jdk/src/jdk.charsets/unix/classes/sun/nio/cs/ext : jdk/src/solaris/classes/sun/nio/cs/ext
-jdk/src/jdk.compiler/share/classes/sun/tools/serialver : jdk/src/share/classes/sun/tools/serialver
-jdk/src/jdk.crypto.ec/share/classes/sun/security/ec : jdk/src/share/classes/sun/security/ec
-jdk/src/jdk.crypto.ec/share/native/libsunec/ECC_JNI.cpp : jdk/src/share/native/sun/security/ec/ECC_JNI.cpp
-jdk/src/jdk.crypto.ec/share/native/libsunec/impl : jdk/src/share/native/sun/security/ec/impl
-jdk/src/jdk.crypto.mscapi/windows/classes/sun/security/mscapi : jdk/src/windows/classes/sun/security/mscapi
-jdk/src/jdk.crypto.mscapi/windows/native/libsunmscapi : jdk/src/windows/native/sun/security/mscapi
-jdk/src/jdk.crypto.cryptoki/share/classes/sun/security/pkcs11 : jdk/src/share/classes/sun/security/pkcs11
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.c : jdk/src/share/native/sun/security/pkcs11/j2secmod.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/j2secmod.h : jdk/src/share/native/sun/security/pkcs11/j2secmod.h
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_convert.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_convert.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_crypt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_crypt.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_digest.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_digest.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_dual.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_dual.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_general.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_general.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_keymgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_keymgmt.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_mutex.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_mutex.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_objmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_objmgmt.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sessmgmt.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sessmgmt.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_sign.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_sign.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/p11_util.c : jdk/src/share/native/sun/security/pkcs11/wrapper/p11_util.c
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11f.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11f.h
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11.h
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11t.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11t.h
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs-11v2-20a3.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs-11v2-20a3.h
-jdk/src/jdk.crypto.cryptoki/share/native/libj2pkcs11/pkcs11wrapper.h : jdk/src/share/native/sun/security/pkcs11/wrapper/pkcs11wrapper.h
-jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.c : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c
-jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/j2secmod_md.h : jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.h
-jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.c : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c
-jdk/src/jdk.crypto.cryptoki/unix/native/libj2pkcs11/p11_md.h : jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.h
-jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.c : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.c
-jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/j2secmod_md.h : jdk/src/windows/native/sun/security/pkcs11/j2secmod_md.h
-jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.c : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.c
-jdk/src/jdk.crypto.cryptoki/windows/native/libj2pkcs11/p11_md.h : jdk/src/windows/native/sun/security/pkcs11/wrapper/p11_md.h
-jdk/src/java.desktop/macosx/native/libosx/CFileManager.m : jdk/src/macosx/native/com/apple/eio/CFileManager.m
-jdk/src/java.base/macosx/native/libosxsecurity/KeystoreImpl.m : jdk/src/macosx/native/apple/security/KeystoreImpl.m
-jdk/src/jdk.hprof.agent/share/classes/com/sun/demo/jvmti/hprof : jdk/src/share/classes/com/sun/demo/jvmti/hprof
-jdk/src/jdk.httpserver/share/classes/com/sun/net/httpserver : jdk/src/share/classes/com/sun/net/httpserver
-jdk/src/jdk.httpserver/share/classes/sun/net/httpserver : jdk/src/share/classes/sun/net/httpserver
-jdk/src/jdk.jartool/share/classes/com/sun/jarsigner : jdk/src/share/classes/com/sun/jarsigner
-jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner : jdk/src/share/classes/sun/security/tools/jarsigner
-jdk/src/jdk.jartool/share/classes/sun/tools/jar : jdk/src/share/classes/sun/tools/jar
-jdk/src/jdk.jcmd/share/classes/sun/tools/jcmd : jdk/src/share/classes/sun/tools/jcmd
-jdk/src/jdk.jcmd/share/classes/sun/tools/jinfo : jdk/src/share/classes/sun/tools/jinfo
-jdk/src/jdk.jcmd/share/classes/sun/tools/jmap : jdk/src/share/classes/sun/tools/jmap
-jdk/src/jdk.jcmd/share/classes/sun/tools/jps : jdk/src/share/classes/sun/tools/jps
-jdk/src/jdk.jcmd/share/classes/sun/tools/jstack : jdk/src/share/classes/sun/tools/jstack
-jdk/src/jdk.jcmd/share/classes/sun/tools/jstat : jdk/src/share/classes/sun/tools/jstat
-jdk/src/jdk.jconsole/share/classes/com/sun/tools/jconsole : jdk/src/share/classes/com/sun/tools/jconsole
-jdk/src/jdk.jconsole/share/classes/sun/tools/jconsole : jdk/src/share/classes/sun/tools/jconsole
-jdk/src/jdk.jdi/share/classes/com/sun/jdi : jdk/src/share/classes/com/sun/jdi
-jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/expr : jdk/src/share/classes/com/sun/tools/example/debug/expr
-jdk/src/jdk.jdi/share/classes/com/sun/tools/example/debug/tty : jdk/src/share/classes/com/sun/tools/example/debug/tty
-jdk/src/jdk.jdi/share/classes/com/sun/tools/jdi : jdk/src/share/classes/com/sun/tools/jdi
-jdk/src/jdk.jdi/share/classes/jdi-overview.html : jdk/src/share/classes/jdi-overview.html
-jdk/src/jdk.jdi/share/classes/META-INF/services : jdk/src/share/classes/com/sun/tools/jdi/META-INF/services
-jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryConnection.c : jdk/src/share/native/com/sun/tools/jdi/SharedMemoryConnection.c
-jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemory.h : jdk/src/share/native/com/sun/tools/jdi/SharedMemory.h
-jdk/src/jdk.jdi/share/native/libdt_shmem/SharedMemoryTransport.c : jdk/src/share/native/com/sun/tools/jdi/SharedMemoryTransport.c
-jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBack.c : jdk/src/share/transport/shmem/shmemBack.c
-jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.c : jdk/src/share/transport/shmem/shmemBase.c
-jdk/src/jdk.jdi/share/native/libdt_shmem/shmemBase.h : jdk/src/share/transport/shmem/shmemBase.h
-jdk/src/jdk.jdi/share/native/libdt_shmem/sysShmem.h : jdk/src/share/transport/shmem/sysShmem.h
-jdk/src/jdk.jdi/windows/native/libdt_shmem : jdk/src/windows/transport/shmem
-jdk/src/jdk.jdwp.agent/share/native/include/jdwpTransport.h : jdk/src/share/javavm/export/jdwpTransport.h
-jdk/src/jdk.jdwp.agent/share/native/libdt_socket : jdk/src/share/transport/socket
-jdk/src/jdk.jdwp.agent/share/native/libjdwp : jdk/src/share/back
-jdk/src/jdk.jdwp.agent/unix/native/libdt_socket : jdk/src/solaris/transport/socket
-jdk/src/jdk.jdwp.agent/unix/native/libjdwp : jdk/src/solaris/back
-jdk/src/jdk.jdwp.agent/windows/native/libdt_socket : jdk/src/windows/transport/socket
-jdk/src/jdk.jdwp.agent/windows/native/libjdwp : jdk/src/windows/back
-jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/monitor : jdk/src/share/classes/sun/jvmstat/monitor
-jdk/src/jdk.internal.jvmstat/share/classes/sun/jvmstat/perfdata : jdk/src/share/classes/sun/jvmstat/perfdata
-jdk/src/jdk.internal.jvmstat/share/classes/sun/tools/jstatd : jdk/src/share/classes/sun/tools/jstatd
-jdk/src/jdk.localedata/share/classes/sun/text/resources/ar : jdk/src/share/classes/sun/text/resources/ar
-jdk/src/jdk.localedata/share/classes/sun/text/resources/be : jdk/src/share/classes/sun/text/resources/be
-jdk/src/jdk.localedata/share/classes/sun/text/resources/bg : jdk/src/share/classes/sun/text/resources/bg
-jdk/src/jdk.localedata/share/classes/sun/text/resources/ca : jdk/src/share/classes/sun/text/resources/ca
-jdk/src/jdk.localedata/share/classes/sun/text/resources/cs : jdk/src/share/classes/sun/text/resources/cs
-jdk/src/jdk.localedata/share/classes/sun/text/resources/da : jdk/src/share/classes/sun/text/resources/da
-jdk/src/jdk.localedata/share/classes/sun/text/resources/de : jdk/src/share/classes/sun/text/resources/de
-jdk/src/jdk.localedata/share/classes/sun/text/resources/el : jdk/src/share/classes/sun/text/resources/el
-jdk/src/jdk.localedata/share/classes/sun/text/resources/es : jdk/src/share/classes/sun/text/resources/es
-jdk/src/jdk.localedata/share/classes/sun/text/resources/et : jdk/src/share/classes/sun/text/resources/et
-jdk/src/jdk.localedata/share/classes/sun/text/resources/fi : jdk/src/share/classes/sun/text/resources/fi
-jdk/src/jdk.localedata/share/classes/sun/text/resources/fr : jdk/src/share/classes/sun/text/resources/fr
-jdk/src/jdk.localedata/share/classes/sun/text/resources/ga : jdk/src/share/classes/sun/text/resources/ga
-jdk/src/jdk.localedata/share/classes/sun/text/resources/hi : jdk/src/share/classes/sun/text/resources/hi
-jdk/src/jdk.localedata/share/classes/sun/text/resources/hr : jdk/src/share/classes/sun/text/resources/hr
-jdk/src/jdk.localedata/share/classes/sun/text/resources/hu : jdk/src/share/classes/sun/text/resources/hu
-jdk/src/jdk.localedata/share/classes/sun/text/resources/in : jdk/src/share/classes/sun/text/resources/in
-jdk/src/jdk.localedata/share/classes/sun/text/resources/is : jdk/src/share/classes/sun/text/resources/is
-jdk/src/jdk.localedata/share/classes/sun/text/resources/it : jdk/src/share/classes/sun/text/resources/it
-jdk/src/jdk.localedata/share/classes/sun/text/resources/iw : jdk/src/share/classes/sun/text/resources/iw
-jdk/src/jdk.localedata/share/classes/sun/text/resources/ja : jdk/src/share/classes/sun/text/resources/ja
-jdk/src/jdk.localedata/share/classes/sun/text/resources/ko : jdk/src/share/classes/sun/text/resources/ko
-jdk/src/jdk.localedata/share/classes/sun/text/resources/lt : jdk/src/share/classes/sun/text/resources/lt
-jdk/src/jdk.localedata/share/classes/sun/text/resources/lv : jdk/src/share/classes/sun/text/resources/lv
-jdk/src/jdk.localedata/share/classes/sun/text/resources/mk : jdk/src/share/classes/sun/text/resources/mk
-jdk/src/jdk.localedata/share/classes/sun/text/resources/ms : jdk/src/share/classes/sun/text/resources/ms
-jdk/src/jdk.localedata/share/classes/sun/text/resources/mt : jdk/src/share/classes/sun/text/resources/mt
-jdk/src/jdk.localedata/share/classes/sun/text/resources/nl : jdk/src/share/classes/sun/text/resources/nl
-jdk/src/jdk.localedata/share/classes/sun/text/resources/no : jdk/src/share/classes/sun/text/resources/no
-jdk/src/jdk.localedata/share/classes/sun/text/resources/pl : jdk/src/share/classes/sun/text/resources/pl
-jdk/src/jdk.localedata/share/classes/sun/text/resources/pt : jdk/src/share/classes/sun/text/resources/pt
-jdk/src/jdk.localedata/share/classes/sun/text/resources/ro : jdk/src/share/classes/sun/text/resources/ro
-jdk/src/jdk.localedata/share/classes/sun/text/resources/ru : jdk/src/share/classes/sun/text/resources/ru
-jdk/src/jdk.localedata/share/classes/sun/text/resources/sk : jdk/src/share/classes/sun/text/resources/sk
-jdk/src/jdk.localedata/share/classes/sun/text/resources/sl : jdk/src/share/classes/sun/text/resources/sl
-jdk/src/jdk.localedata/share/classes/sun/text/resources/sq : jdk/src/share/classes/sun/text/resources/sq
-jdk/src/jdk.localedata/share/classes/sun/text/resources/sr : jdk/src/share/classes/sun/text/resources/sr
-jdk/src/jdk.localedata/share/classes/sun/text/resources/sv : jdk/src/share/classes/sun/text/resources/sv
-jdk/src/jdk.localedata/share/classes/sun/text/resources/th : jdk/src/share/classes/sun/text/resources/th
-jdk/src/jdk.localedata/share/classes/sun/text/resources/tr : jdk/src/share/classes/sun/text/resources/tr
-jdk/src/jdk.localedata/share/classes/sun/text/resources/uk : jdk/src/share/classes/sun/text/resources/uk
-jdk/src/jdk.localedata/share/classes/sun/text/resources/vi : jdk/src/share/classes/sun/text/resources/vi
-jdk/src/jdk.localedata/share/classes/sun/text/resources/zh : jdk/src/share/classes/sun/text/resources/zh
-jdk/src/jdk.localedata/share/classes/sun/util/cldr/resources : jdk/src/share/classes/sun/util/cldr/resources
-jdk/src/jdk.localedata/share/classes/sun/util/resources/ar : jdk/src/share/classes/sun/util/resources/ar
-jdk/src/jdk.localedata/share/classes/sun/util/resources/be : jdk/src/share/classes/sun/util/resources/be
-jdk/src/jdk.localedata/share/classes/sun/util/resources/bg : jdk/src/share/classes/sun/util/resources/bg
-jdk/src/jdk.localedata/share/classes/sun/util/resources/ca : jdk/src/share/classes/sun/util/resources/ca
-jdk/src/jdk.localedata/share/classes/sun/util/resources/cs : jdk/src/share/classes/sun/util/resources/cs
-jdk/src/jdk.localedata/share/classes/sun/util/resources/da : jdk/src/share/classes/sun/util/resources/da
-jdk/src/jdk.localedata/share/classes/sun/util/resources/de : jdk/src/share/classes/sun/util/resources/de
-jdk/src/jdk.localedata/share/classes/sun/util/resources/el : jdk/src/share/classes/sun/util/resources/el
-jdk/src/jdk.localedata/share/classes/sun/util/resources/es : jdk/src/share/classes/sun/util/resources/es
-jdk/src/jdk.localedata/share/classes/sun/util/resources/et : jdk/src/share/classes/sun/util/resources/et
-jdk/src/jdk.localedata/share/classes/sun/util/resources/fi : jdk/src/share/classes/sun/util/resources/fi
-jdk/src/jdk.localedata/share/classes/sun/util/resources/fr : jdk/src/share/classes/sun/util/resources/fr
-jdk/src/jdk.localedata/share/classes/sun/util/resources/ga : jdk/src/share/classes/sun/util/resources/ga
-jdk/src/jdk.localedata/share/classes/sun/util/resources/hi : jdk/src/share/classes/sun/util/resources/hi
-jdk/src/jdk.localedata/share/classes/sun/util/resources/hr : jdk/src/share/classes/sun/util/resources/hr
-jdk/src/jdk.localedata/share/classes/sun/util/resources/hu : jdk/src/share/classes/sun/util/resources/hu
-jdk/src/jdk.localedata/share/classes/sun/util/resources/in : jdk/src/share/classes/sun/util/resources/in
-jdk/src/jdk.localedata/share/classes/sun/util/resources/is : jdk/src/share/classes/sun/util/resources/is
-jdk/src/jdk.localedata/share/classes/sun/util/resources/it : jdk/src/share/classes/sun/util/resources/it
-jdk/src/jdk.localedata/share/classes/sun/util/resources/iw : jdk/src/share/classes/sun/util/resources/iw
-jdk/src/jdk.localedata/share/classes/sun/util/resources/ja : jdk/src/share/classes/sun/util/resources/ja
-jdk/src/jdk.localedata/share/classes/sun/util/resources/ko : jdk/src/share/classes/sun/util/resources/ko
-jdk/src/jdk.localedata/share/classes/sun/util/resources/lt : jdk/src/share/classes/sun/util/resources/lt
-jdk/src/jdk.localedata/share/classes/sun/util/resources/lv : jdk/src/share/classes/sun/util/resources/lv
-jdk/src/jdk.localedata/share/classes/sun/util/resources/mk : jdk/src/share/classes/sun/util/resources/mk
-jdk/src/jdk.localedata/share/classes/sun/util/resources/ms : jdk/src/share/classes/sun/util/resources/ms
-jdk/src/jdk.localedata/share/classes/sun/util/resources/mt : jdk/src/share/classes/sun/util/resources/mt
-jdk/src/jdk.localedata/share/classes/sun/util/resources/nl : jdk/src/share/classes/sun/util/resources/nl
-jdk/src/jdk.localedata/share/classes/sun/util/resources/no : jdk/src/share/classes/sun/util/resources/no
-jdk/src/jdk.localedata/share/classes/sun/util/resources/pl : jdk/src/share/classes/sun/util/resources/pl
-jdk/src/jdk.localedata/share/classes/sun/util/resources/pt : jdk/src/share/classes/sun/util/resources/pt
-jdk/src/jdk.localedata/share/classes/sun/util/resources/ro : jdk/src/share/classes/sun/util/resources/ro
-jdk/src/jdk.localedata/share/classes/sun/util/resources/ru : jdk/src/share/classes/sun/util/resources/ru
-jdk/src/jdk.localedata/share/classes/sun/util/resources/sk : jdk/src/share/classes/sun/util/resources/sk
-jdk/src/jdk.localedata/share/classes/sun/util/resources/sl : jdk/src/share/classes/sun/util/resources/sl
-jdk/src/jdk.localedata/share/classes/sun/util/resources/sq : jdk/src/share/classes/sun/util/resources/sq
-jdk/src/jdk.localedata/share/classes/sun/util/resources/sr : jdk/src/share/classes/sun/util/resources/sr
-jdk/src/jdk.localedata/share/classes/sun/util/resources/sv : jdk/src/share/classes/sun/util/resources/sv
-jdk/src/jdk.localedata/share/classes/sun/util/resources/th : jdk/src/share/classes/sun/util/resources/th
-jdk/src/jdk.localedata/share/classes/sun/util/resources/tr : jdk/src/share/classes/sun/util/resources/tr
-jdk/src/jdk.localedata/share/classes/sun/util/resources/uk : jdk/src/share/classes/sun/util/resources/uk
-jdk/src/jdk.localedata/share/classes/sun/util/resources/vi : jdk/src/share/classes/sun/util/resources/vi
-jdk/src/jdk.localedata/share/classes/sun/util/resources/zh : jdk/src/share/classes/sun/util/resources/zh
-jdk/src/jdk.management/share/classes/com/sun/management : jdk/src/share/classes/com/sun/management
-jdk/src/jdk.management.agent/share/classes/jdk/internal/agent/resources : jdk/src/share/classes/sun/management/resources
-jdk/src/jdk.management.agent/share/classes/sun/management/jmxremote : jdk/src/share/classes/sun/management/jmxremote
-jdk/src/jdk.management.agent/share/classes/sun/management/jdp : jdk/src/share/classes/sun/management/jdp
-jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/dns : jdk/src/share/classes/com/sun/jndi/dns
-jdk/src/jdk.naming.dns/share/classes/com/sun/jndi/url/dns : jdk/src/share/classes/com/sun/jndi/url/dns
-jdk/src/jdk.naming.dns/share/classes/META-INF/services : jdk/src/share/classes/sun/net/spi/nameservice/dns/META-INF/services
-jdk/src/jdk.naming.dns/share/classes/sun/net/spi/nameservice/dns : jdk/src/share/classes/sun/net/spi/nameservice/dns
-jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/rmi/registry : jdk/src/share/classes/com/sun/jndi/rmi/registry
-jdk/src/jdk.naming.rmi/share/classes/com/sun/jndi/url/rmi : jdk/src/share/classes/com/sun/jndi/url/rmi
-jdk/src/jdk.pack/share/native/common-unpack/bands.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bands.cpp
-jdk/src/jdk.pack/share/native/common-unpack/bands.h : jdk/src/share/native/com/sun/java/util/jar/pack/bands.h
-jdk/src/jdk.pack/share/native/common-unpack/bytes.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.cpp
-jdk/src/jdk.pack/share/native/common-unpack/bytes.h : jdk/src/share/native/com/sun/java/util/jar/pack/bytes.h
-jdk/src/jdk.pack/share/native/common-unpack/coding.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/coding.cpp
-jdk/src/jdk.pack/share/native/common-unpack/coding.h : jdk/src/share/native/com/sun/java/util/jar/pack/coding.h
-jdk/src/jdk.pack/share/native/common-unpack/constants.h : jdk/src/share/native/com/sun/java/util/jar/pack/constants.h
-jdk/src/jdk.pack/share/native/common-unpack/defines.h : jdk/src/share/native/com/sun/java/util/jar/pack/defines.h
-jdk/src/jdk.pack/share/native/common-unpack/unpack.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.cpp
-jdk/src/jdk.pack/share/native/common-unpack/unpack.h : jdk/src/share/native/com/sun/java/util/jar/pack/unpack.h
-jdk/src/jdk.pack/share/native/common-unpack/utils.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/utils.cpp
-jdk/src/jdk.pack/share/native/common-unpack/utils.h : jdk/src/share/native/com/sun/java/util/jar/pack/utils.h
-jdk/src/jdk.pack/share/native/common-unpack/zip.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/zip.cpp
-jdk/src/jdk.pack/share/native/common-unpack/zip.h : jdk/src/share/native/com/sun/java/util/jar/pack/zip.h
-jdk/src/jdk.pack/share/native/libjsdt : jdk/src/share/native/sun/tracing/dtrace
-jdk/src/jdk.pack/share/native/libunpack/jni.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/jni.cpp
-jdk/src/jdk.pack/share/native/unpack200/main.cpp : jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp
-jdk/src/jdk.pack/unix/native/libjsdt/jvm_symbols_md.c : jdk/src/solaris/native/sun/tracing/dtrace/jvm_symbols_md.c
-jdk/src/jdk.pack/windows/native/libjsdt/jvm_symbols_md.c : jdk/src/windows/native/sun/tracing/dtrace/jvm_symbols_md.c
-jdk/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest : jdk/src/windows/resource/unpack200_proto.exe.manifest
-jdk/src/jdk.policytool/share/classes/sun/security/tools/policytool : jdk/src/share/classes/sun/security/tools/policytool
-jdk/src/jdk.rmic/share/classes/sun/rmi/rmic : jdk/src/share/classes/sun/rmi/rmic
-jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic : jdk/src/share/classes/sun/rmi/rmic/newrmic
-jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/newrmic/jrmp : jdk/src/share/classes/sun/rmi/rmic/newrmic/jrmp
-jdk/src/jdk.rmic/share/classes/sun/rmi/rmic/resources : jdk/src/share/classes/sun/rmi/rmic/resources
-jdk/src/jdk.rmic/share/classes/sun/tools/asm : jdk/src/share/classes/sun/tools/asm
-jdk/src/jdk.rmic/share/classes/sun/tools/javac : jdk/src/share/classes/sun/tools/javac
-jdk/src/jdk.rmic/share/classes/sun/tools/java : jdk/src/share/classes/sun/tools/java
-jdk/src/jdk.rmic/share/classes/sun/tools/tree : jdk/src/share/classes/sun/tools/tree
-jdk/src/jdk.rmic/share/classes/sun/tools/util : jdk/src/share/classes/sun/tools/util
-jdk/src/jdk.sctp/macosx/classes/sun/nio/ch/sctp : jdk/src/macosx/classes/sun/nio/ch/sctp
-jdk/src/jdk.sctp/share/classes/com/sun/nio/sctp : jdk/src/share/classes/com/sun/nio/sctp
-jdk/src/jdk.sctp/share/classes/sun/nio/ch/sctp : jdk/src/share/classes/sun/nio/ch/sctp
-jdk/src/jdk.sctp/unix/classes/sun/nio/ch/sctp : jdk/src/solaris/classes/sun/nio/ch/sctp
-jdk/src/jdk.sctp/unix/native/libsctp : jdk/src/solaris/native/sun/nio/ch/sctp
-jdk/src/jdk.sctp/windows/classes/sun/nio/ch/sctp : jdk/src/windows/classes/sun/nio/ch/sctp
-jdk/src/jdk.security.auth/share/classes/com/sun/security/auth : jdk/src/share/classes/com/sun/security/auth
-jdk/src/jdk.security.auth/share/classes/jaas-overview.html : jdk/src/share/classes/com/sun/security/auth/jaas-overview.html
-jdk/src/jdk.security.auth/unix/native/libjaas : jdk/src/solaris/native/com/sun/security/auth/module
-jdk/src/jdk.security.auth/windows/native/libjaas : jdk/src/windows/native/com/sun/security/auth/module
-jdk/src/jdk.security.jgss/share/classes/com/sun/security/jgss : jdk/src/share/classes/com/sun/security/jgss
-jdk/src/jdk.security.jgss/share/classes/com/sun/security/sasl/gsskerb : jdk/src/share/classes/com/sun/security/sasl/gsskerb
-jdk/src/jdk.snmp/share/classes/com/sun/jmx/snmp : jdk/src/share/classes/com/sun/jmx/snmp
-jdk/src/jdk.snmp/share/classes/sun/management/snmp : jdk/src/share/classes/sun/management/snmp
-jdk/src/jdk.zipfs/share/classes/jdk/nio/zipfs : jdk/src/share/classes/jdk/nio/zipfs
-jdk/src/jdk.zipfs/share/classes/META-INF : jdk/src/share/classes/jdk/nio/zipfs/META-INF
-jdk/src/sample/share : jdk/src/share/sample
-langtools/src/java.base/share/classes/jdk/Exported.java : langtools/src/share/classes/jdk/Exported.java
-langtools/src/java.compiler/share/classes/javax/annotation/processing : langtools/src/share/classes/javax/annotation/processing
-langtools/src/java.compiler/share/classes/javax/lang/model : langtools/src/share/classes/javax/lang/model
-langtools/src/java.compiler/share/classes/javax/tools : langtools/src/share/classes/javax/tools
-langtools/src/jdk.compiler/share/classes/com/sun/source : langtools/src/share/classes/com/sun/source
-langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint : langtools/src/share/classes/com/sun/tools/doclint
-langtools/src/jdk.compiler/share/classes/com/sun/tools/doclint/resources : langtools/src/share/classes/com/sun/tools/doclint/resources
-langtools/src/jdk.compiler/share/classes/com/sun/tools/javac : langtools/src/share/classes/com/sun/tools/javac
-langtools/src/jdk.compiler/share/classes/com/sun/tools/javah : langtools/src/share/classes/com/sun/tools/javah
-langtools/src/jdk.compiler/share/classes/com/sun/tools/sjavac : langtools/src/share/classes/com/sun/tools/sjavac
-langtools/src/jdk.javadoc/share/classes/com/sun/javadoc : langtools/src/share/classes/com/sun/javadoc
-langtools/src/jdk.javadoc/share/classes/com/sun/tools/doclets : langtools/src/share/classes/com/sun/tools/doclets
-langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc : langtools/src/share/classes/com/sun/tools/javadoc
-langtools/src/jdk.jdeps/share/classes/com/sun/tools/classfile : langtools/src/share/classes/com/sun/tools/classfile
-langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap : langtools/src/share/classes/com/sun/tools/javap
-langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps : langtools/src/share/classes/com/sun/tools/jdeps
-langtools/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources : langtools/src/share/classes/com/sun/tools/jdeps/resources
-nashorn/src/jdk.scripting.nashorn/share/classes : nashorn/src
+src/bsd : jdk/src/bsd
+src/demo : jdk/src/demo
+src/java.activation : jaxws/src/java.activation
+src/java.base : jdk/src/java.base
+src/java.compiler : langtools/src/java.compiler
+src/java.corba : corba/src/java.corba
+src/java.datatransfer : jdk/src/java.datatransfer
+src/java.desktop : jdk/src/java.desktop
+src/java.instrument : jdk/src/java.instrument
+src/java.logging : jdk/src/java.logging
+src/java.management : jdk/src/java.management
+src/java.management.rmi : jdk/src/java.management.rmi
+src/java.naming : jdk/src/java.naming
+src/java.prefs : jdk/src/java.prefs
+src/java.rmi : jdk/src/java.rmi
+src/java.scripting : jdk/src/java.scripting
+src/java.se : jdk/src/java.se
+src/java.security.jgss : jdk/src/java.security.jgss
+src/java.security.sasl : jdk/src/java.security.sasl
+src/java.se.ee : jdk/src/java.se.ee
+src/java.smartcardio : jdk/src/java.smartcardio
+src/java.sql : jdk/src/java.sql
+src/java.sql.rowset : jdk/src/java.sql.rowset
+src/java.transaction : jdk/src/java.transaction
+src/java.xml : jaxp/src/java.xml
+src/java.xml.bind : jaxws/src/java.xml.bind
+src/java.xml.crypto : jdk/src/java.xml.crypto
+src/java.xml.ws : jaxws/src/java.xml.ws
+src/java.xml.ws.annotation : jaxws/src/java.xml.ws.annotation
+src/jdk.accessibility : jdk/src/jdk.accessibility
+src/jdk.aot : hotspot/src/jdk.aot
+src/jdk.attach : jdk/src/jdk.attach
+src/jdk.charsets : jdk/src/jdk.charsets
+src/jdk.compiler : jdk/src/jdk.compiler  langtools/src/jdk.compiler
+src/jdk.crypto.cryptoki : jdk/src/jdk.crypto.cryptoki
+src/jdk.crypto.ec : jdk/src/jdk.crypto.ec
+src/jdk.crypto.mscapi : jdk/src/jdk.crypto.mscapi
+src/jdk.crypto.ucrypto : jdk/src/jdk.crypto.ucrypto
+src/jdk.dynalink : nashorn/src/jdk.dynalink
+src/jdk.editpad : jdk/src/jdk.editpad
+src/jdk.hotspot.agent : hotspot/src/jdk.hotspot.agent
+src/jdk.httpserver : jdk/src/jdk.httpserver
+src/jdk.incubator.httpclient : jdk/src/jdk.incubator.httpclient
+src/jdk.internal.ed : jdk/src/jdk.internal.ed
+src/jdk.internal.jvmstat : jdk/src/jdk.internal.jvmstat
+src/jdk.internal.le : jdk/src/jdk.internal.le
+src/jdk.internal.opt : jdk/src/jdk.internal.opt
+src/jdk.internal.vm.ci : hotspot/src/jdk.internal.vm.ci
+src/jdk.internal.vm.compiler : hotspot/src/jdk.internal.vm.compiler
+src/jdk.jartool : jdk/src/jdk.jartool
+src/jdk.javadoc : langtools/src/jdk.javadoc
+src/jdk.jcmd : jdk/src/jdk.jcmd
+src/jdk.jconsole : jdk/src/jdk.jconsole
+src/jdk.jdeps : langtools/src/jdk.jdeps
+src/jdk.jdi : jdk/src/jdk.jdi
+src/jdk.jdwp.agent : jdk/src/jdk.jdwp.agent
+src/jdk.jlink : jdk/src/jdk.jlink
+src/jdk.jshell : langtools/src/jdk.jshell
+src/jdk.jsobject : jdk/src/jdk.jsobject
+src/jdk.jstatd : jdk/src/jdk.jstatd
+src/jdk.localedata : jdk/src/jdk.localedata
+src/jdk.management : jdk/src/jdk.management
+src/jdk.management.agent : jdk/src/jdk.management.agent
+src/jdk.naming.dns : jdk/src/jdk.naming.dns
+src/jdk.naming.rmi : jdk/src/jdk.naming.rmi
+src/jdk.net : jdk/src/jdk.net
+src/jdk.pack : jdk/src/jdk.pack
+src/jdk.policytool : jdk/src/jdk.policytool
+src/jdk.rmic : corba/src/jdk.rmic  jdk/src/jdk.rmic
+src/jdk.scripting.nashorn : nashorn/src/jdk.scripting.nashorn
+src/jdk.scripting.nashorn.shell : nashorn/src/jdk.scripting.nashorn.shell
+src/jdk.sctp : jdk/src/jdk.sctp
+src/jdk.security.auth : jdk/src/jdk.security.auth
+src/jdk.security.jgss : jdk/src/jdk.security.jgss
+src/jdk.unsupported : jdk/src/jdk.unsupported
+src/jdk.xml.bind : jaxws/src/jdk.xml.bind
+src/jdk.xml.dom : jaxp/src/jdk.xml.dom
+src/jdk.xml.ws : jaxws/src/jdk.xml.ws
+src/jdk.zipfs : jdk/src/jdk.zipfs
+src/langtools/sample : langtools/src/sample
+src/linux : jdk/src/linux
+src/sample : jdk/src/sample
+src/solaris : jdk/src/solaris
+src/hotspot/share : hotspot/src/share/vm
+src/hotspot/cpu/aarch64 : hotspot/src/cpu/aarch64/vm
+src/hotspot/cpu/arm : hotspot/src/cpu/arm/vm
+src/hotspot/cpu/ppc : hotspot/src/cpu/ppc/vm
+src/hotspot/cpu/s390 : hotspot/src/cpu/s390/vm
+src/hotspot/cpu/sparc : hotspot/src/cpu/sparc/vm
+src/hotspot/cpu/x86 : hotspot/src/cpu/x86/vm
+src/hotspot/cpu/zero : hotspot/src/cpu/zero/vm
+src/hotspot/os/aix : hotspot/src/os/aix/vm
+src/hotspot/os/bsd : hotspot/src/os/bsd/vm
+src/hotspot/os/linux : hotspot/src/os/linux/vm
+src/hotspot/os/posix/dtrace : hotspot/src/os/posix/dtrace
+src/hotspot/os/posix : hotspot/src/os/posix/vm
+src/hotspot/os/solaris : hotspot/src/os/solaris/vm
+src/hotspot/os/windows : hotspot/src/os/windows/vm
+src/hotspot/os_cpu/aix_ppc : hotspot/src/os_cpu/aix_ppc/vm
+src/hotspot/os_cpu/bsd_x86 : hotspot/src/os_cpu/bsd_x86/vm
+src/hotspot/os_cpu/bsd_zero : hotspot/src/os_cpu/bsd_zero/vm
+src/hotspot/os_cpu/linux_aarch64 : hotspot/src/os_cpu/linux_aarch64/vm
+src/hotspot/os_cpu/linux_arm : hotspot/src/os_cpu/linux_arm/vm
+src/hotspot/os_cpu/linux_ppc : hotspot/src/os_cpu/linux_ppc/vm
+src/hotspot/os_cpu/linux_s390 : hotspot/src/os_cpu/linux_s390/vm
+src/hotspot/os_cpu/linux_sparc : hotspot/src/os_cpu/linux_sparc/vm
+src/hotspot/os_cpu/linux_x86 : hotspot/src/os_cpu/linux_x86/vm
+src/hotspot/os_cpu/linux_zero : hotspot/src/os_cpu/linux_zero/vm
+src/hotspot/os_cpu/solaris_sparc : hotspot/src/os_cpu/solaris_sparc/vm
+src/hotspot/os_cpu/solaris_x86 : hotspot/src/os_cpu/solaris_x86/vm
+src/hotspot/os_cpu/windows_x86 : hotspot/src/os_cpu/windows_x86/vm
+src/hotspot : hotspot/src
+src/utils/IdealGraphVisualizer : hotspot/src/share/tools/IdealGraphVisualizer
+src/utils/LogCompilation : hotspot/src/share/tools/LogCompilation
+src/utils/hsdis : hotspot/src/share/tools/hsdis
+src/utils/reorder : jdk/make/non-build-utils/reorder
+src/utils/src/build : jdk/make/non-build-utils/src/build
+make/BuildNashorn.gmk : nashorn/make/BuildNashorn.gmk
+make/CompileDemos.gmk : jdk/make/CompileDemos.gmk
+make/CompileInterimLangtools.gmk : langtools/make/CompileInterim.gmk
+make/CompileInterimRmic.gmk : jdk/make/CompileInterimRmic.gmk
+make/CompileModuleTools.gmk : jdk/make/CompileModuleTools.gmk
+make/CompileToolsHotspot.gmk : hotspot/make/CompileTools.gmk
+make/CompileToolsJdk.gmk : jdk/make/CompileTools.gmk
+make/CopyInterimCLDRConverter.gmk : jdk/make/CopyInterimCLDRConverter.gmk
+make/GenerateModuleSummary.gmk : jdk/make/GenerateModuleSummary.gmk
+make/ModuleTools.gmk : jdk/make/ModuleTools.gmk
+make/ToolsJdk.gmk : jdk/make/Tools.gmk
+make/ToolsLangtools.gmk : langtools/make/Tools.gmk
+make/UnpackSecurity.gmk : jdk/make/UnpackSecurity.gmk
+make/autoconf : common/autoconf
+make/conf : common/conf
+make/copy : jdk/make/copy
+make/copy/Copy-java.corba.gmk : corba/make/copy/Copy-java.corba.gmk
+make/corba : corba/make
+make/data : jdk/make/data
+make/gendata : jdk/make/gendata
+make/gendata/Gendata-jdk.compiler.gmk : langtools/make/gendata/Gendata-jdk.compiler.gmk
+make/gensrc : jdk/make/gensrc
+make/gensrc/Gensrc-java.corba.gmk : corba/make/gensrc/Gensrc-java.corba.gmk
+make/gensrc/Gensrc-jdk.compiler.gmk : langtools/make/gensrc/Gensrc-jdk.compiler.gmk
+make/gensrc/Gensrc-jdk.hotspot.agent.gmk : hotspot/make/gensrc/Gensrc-jdk.hotspot.agent.gmk
+make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk : hotspot/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
+make/gensrc/Gensrc-jdk.javadoc.gmk : langtools/make/gensrc/Gensrc-jdk.javadoc.gmk
+make/gensrc/Gensrc-jdk.jdeps.gmk : langtools/make/gensrc/Gensrc-jdk.jdeps.gmk
+make/gensrc/Gensrc-jdk.jshell.gmk : langtools/make/gensrc/Gensrc-jdk.jshell.gmk
+make/gensrc/GensrcCommonLangtools.gmk : langtools/make/gensrc/GensrcCommon.gmk
+make/hotspot : hotspot/make
+make/jdk : jdk/make
+make/langtools : langtools/make
+make/launcher : jdk/make/launcher
+make/lib : jdk/make/lib
+make/lib/Lib-jdk.hotspot.agent.gmk : hotspot/make/lib/Lib-jdk.hotspot.agent.gmk
+make/mapfiles : jdk/make/mapfiles
+make/mapfiles/libjsig : hotspot/make/mapfiles/libjsig
+make/mapfiles/libjvm_db : hotspot/make/mapfiles/libjvm_db
+make/mapfiles/libjvm_dtrace : hotspot/make/mapfiles/libjvm_dtrace
+make/mapfiles/libsaproc : hotspot/make/mapfiles/libsaproc
+make/nashorn : nashorn/make
+make/nb_native : common/nb_native
+make/rmic : jdk/make/rmic
+make/scripts/addNotices.sh : jdk/make/scripts/addNotices.sh
+make/scripts/compare.sh : common/bin/compare.sh
+make/scripts/compare_exceptions.sh.incl : common/bin/compare_exceptions.sh.incl
+make/scripts/genExceptions.sh : jdk/make/scripts/genExceptions.sh
+make/scripts/hide_important_warnings_from_javac.sh : common/bin/hide_important_warnings_from_javac.sh
+make/scripts/logger.sh : common/bin/logger.sh
+make/src/native/fixpath.c : common/src/fixpath.c
+make/test/JtregNativeHotspot.gmk : hotspot/make/test/JtregNative.gmk
+make/test/JtregNativeJdk.gmk : jdk/make/test/JtregNative.gmk
+test/jdk : jdk/test
+test/langtools : langtools/test
+test/nashorn : nashorn/test
+test/jaxp : jaxp/test
+test/hotspot/gtest : hotspot/test/native
+test/hotspot/jtreg : hotspot/test
+bin : common/bin
+bin/nashorn : nashorn/bin
+doc : common/doc
+doc/nashorn : nashorn/docs
diff --git a/bin/unshuffle_patch.sh b/bin/unshuffle_patch.sh
index a61864cbd3f..c5cdc3851c3 100644
--- a/bin/unshuffle_patch.sh
+++ b/bin/unshuffle_patch.sh
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -25,14 +25,17 @@
 # Script for updating a patch file as per the shuffled/unshuffled source location.
 
 usage() {
-      echo "Usage: $0 [-h|--help] [-v|--verbose] <repo> <input_patch> <output_patch>"
-      echo "where:"
-      echo "  <repo>          is one of: corba, jaxp, jaxws, jdk, langtools, nashorn"
-      echo "                  [Note: patches from other repos do not need updating]"
-      echo "  <input_patch>   is the input patch file, that needs shuffling/unshuffling"
-      echo "  <output_patch>  is the updated patch file "
-      echo " "
-      exit 1
+  echo "Usage: $0 [-h|--help] [-v|--verbose] [-to9|-to10] [-r <repo>] <input_patch> <output_patch>"
+  echo "where:"
+  echo "  -to9            create patches appropriate for a JDK 9 source tree"
+  echo "                  When going to 9, the output patches will be suffixed with the"
+  echo "                  repo name"
+  echo "  -to10           create patches appropriate for a JDK 10 source tree"
+  echo "  -r <repo>       specify repo for source patch, set to 'top' for top repo"
+  echo "  <input_patch>   is the input patch file, that needs shuffling/unshuffling"
+  echo "  <output_patch>  is the updated patch file "
+  echo " "
+  exit 1
 }
 
 SCRIPT_DIR=`dirname $0`
@@ -55,11 +58,24 @@ do
       vflag="true"
       ;;
 
+    -r)
+      repo="$2"
+      shift
+      ;;
+
+    -to9)
+      shuffle_to=9
+      ;;
+
+    -to10)
+      shuffle_to=10
+      ;;
+
     -*)  # bad option
       usage
       ;;
 
-     * )  # non option
+    * )  # non option
       break
       ;;
   esac
@@ -67,28 +83,40 @@ do
 done
 
 # Make sure we have the right number of arguments
-if [ ! $# -eq 3 ] ; then
+if [ ! $# -eq 2 ] ; then
   echo "ERROR: Invalid number of arguments." >&2
   usage
 fi
 
 # Check the given repo
-repos="corba jaxp jaxws jdk langtools nashorn"
-repo="$1"
+repos="top corba jaxp jaxws jdk langtools nashorn hotspot"
 found="false"
-for r in $repos ; do
-  if [ $repo = "$r" ] ; then
-    found="true"
-    break;
+if [ -n "$repo" ]; then
+  for r in $repos ; do
+    if [ $repo = "$r" ] ; then
+      found="true"
+      break;
+    fi
+  done
+  if [ $found = "false" ] ; then
+    echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
+    usage
   fi
-done
-if [ $found = "false" ] ; then
-  echo "ERROR: Unknown repo: $repo. Should be one of [$repos]." >&2
-  usage
+fi
+
+if [ "$shuffle_to" != "9" -a "$shuffle_to" != "10" ]; then
+  echo "ERROR: Must pick either -to9 or -to10"
+  exit 1
+fi
+
+# When going to 10, a repo must be specified for the source patch
+if [ "$shuffle_to" = "10" -a -z "$repo" ]; then
+  echo "ERROR: Must specify src repo for JDK 9 patch"
+  exit 1
 fi
 
 # Check given input/output files
-input="$2"
+input="$1"
 if [ "x$input" = "x-" ] ; then
   input="/dev/stdin"
 fi
@@ -98,18 +126,26 @@ if [ ! -f $input -a "x$input" != "x/dev/stdin" ] ; then
   exit 1
 fi
 
-output="$3"
+output="$2"
 if [ "x$output" = "x-" ] ; then
   output="/dev/stdout"
 fi
+base_output="$output"
 
-if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
-  echo "ERROR: Output patch already exists: $output" >&2
-  exit 1
+if [ "$shuffle_to" = "10" ]; then
+  if [ -f $output -a "x$output" != "x/dev/stdout" ] ; then
+    echo "ERROR: Output patch already exists: $output" >&2
+    exit 1
+  fi
+else
+  for r in $repos; do
+    if [ -f "$output.$r" ]; then
+      echo "ERROR: Output patch already exists: $output.$r" >&2
+      exit 1
+    fi
+  done
 fi
 
-what=""  ## shuffle or unshuffle
-
 verbose() {
   if [ ${vflag} = "true" ] ; then
     echo "$@" >&2
@@ -135,30 +171,17 @@ unshuffle() {
   fi
   verbose "Extracted path: \"$path\""
 
-  # Only source can be shuffled, or unshuffled
-  if ! echo "$path" | egrep '^src/.*' > /dev/null ; then
-    verbose "Not a src path, skipping."
-    echo "$line" >> $output
-    return
-  fi
-
-  # Shuffle or unshuffle?
-  if [ "${what}" = "" ] ; then
-    if echo "$path" | egrep '^src/java\..*|^src/jdk\..*' > /dev/null ; then
-      what="unshuffle"
-    else
-      what="shuffle"
-    fi
-    verbose "Shuffle or unshuffle: $what"
-  fi
-
   # Find the most specific matches in the shuffle list
   matches=
-  matchpath="$repo"/"$path"/x
+  if [ -n "$repo" -a "$repo" != "top" ]; then
+    matchpath="$repo"/"$path"/x
+  else
+    matchpath="$path"/x
+  fi
   while [ "$matchpath" != "" ] ; do
     matchpath="`echo $matchpath | sed s@'\(.*\)/.*$'@'\1'@`"
 
-    if [ "${what}" =  "shuffle" ] ; then
+    if [ "$shuffle_to" =  "10" ] ; then
       pattern=": $matchpath$"
     else
       pattern="^$matchpath :"
@@ -177,12 +200,24 @@ unshuffle() {
 
   # Rewrite the line, if we have a match
   if ! [ "x${matches}" = "x" ] ; then
-    shuffled="`echo "$matches" | sed -e s@' : .*'@@g -e s@'^[a-z]*\/'@@`"
-    unshuffled="`echo "$matches" | sed -e s@'.* : '@@g -e s@'^[a-z]*\/'@@`"
-    if [ "${what}" =  "shuffle" ] ; then
+    shuffled="${matches%% : *}"
+    unshuffled="${matches#* : }"
+    patch_suffix_9=""
+    for r in $repos; do
+      if [ "$unshuffled" != "${unshuffled#$r}" ]; then
+        unshuffled="${unshuffled#$r\/}"
+        patch_suffix_9=".$r"
+      fi
+    done
+    verbose "shuffled: $shuffled"
+    verbose "unshuffled: $unshuffled"
+    verbose "patch_suffix_9: $patch_suffix_9"
+    if [ "$shuffle_to" =  "10" ] ; then
       newline="`echo "$line" | sed -e s@"$unshuffled"@"$shuffled"@g`"
     else
       newline="`echo "$line" | sed -e s@"$shuffled"@"$unshuffled"@g`"
+      output=$base_output$patch_suffix_9
+      verbose "Writing to $output"
     fi
     verbose "Rewriting to \"$newline\""
     echo "$newline" >> $output
diff --git a/configure b/configure
index af0b5b57bd8..f3b1c536875 100644
--- a/configure
+++ b/configure
@@ -32,4 +32,4 @@ this_script_dir=`cd $this_script_dir > /dev/null && pwd`
 # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
 # This trick is needed to get autoconf to co-operate properly.
 # The ${-:+-$-} construction passes on bash options.
-bash ${-:+-$-} -c ". $this_script_dir/common/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
+bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
diff --git a/doc/building.html b/doc/building.html
index 3b34dbd235e..dc3cf815c58 100644
--- a/doc/building.html
+++ b/doc/building.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
   <title>Building OpenJDK</title>
   <style type="text/css">code{white-space: pre;}</style>
-  <link rel="stylesheet" href="../../jdk/make/data/docs-resources/resources/jdk-default.css">
+  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css">
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
@@ -22,9 +22,6 @@
 <li><a href="#introduction">Introduction</a></li>
 <li><a href="#getting-the-source-code">Getting the Source Code</a><ul>
 <li><a href="#special-considerations">Special Considerations</a></li>
-<li><a href="#using-get_source.sh">Using get_source.sh</a></li>
-<li><a href="#using-hgforest.sh">Using hgforest.sh</a></li>
-<li><a href="#using-the-trees-extension">Using the Trees Extension</a></li>
 </ul></li>
 <li><a href="#build-hardware-requirements">Build Hardware Requirements</a><ul>
 <li><a href="#building-on-x86">Building on x86</a></li>
@@ -119,7 +116,7 @@
 <p>If you are eager to try out building OpenJDK, these simple steps works most of the time. They assume that you have installed Mercurial (and Cygwin if running on Windows) and cloned the top-level OpenJDK repository that you want to build.</p>
 <ol type="1">
 <li><p><a href="#getting-the-source-code">Get the complete source code</a>:<br />
-<code>bash get_source.sh</code></p></li>
+<code>hg clone http://hg.openjdk.java.net/jdk10/master</code></p></li>
 <li><p><a href="#running-configure">Run configure</a>:<br />
 <code>bash configure</code></p>
 <p>If <code>configure</code> fails due to missing dependencies (to either the <a href="#native-compiler-toolchain-requirements">toolchain</a>, <a href="#external-library-requirements">external libraries</a> or the <a href="#boot-jdk-requirements">boot JDK</a>), most of the time it prints a suggestion on how to resolve the situation on your platform. Follow the instructions, and try running <code>bash configure</code> again.</p></li>
@@ -135,8 +132,7 @@
 <p>OpenJDK is a complex software project. Building it requires a certain amount of technical expertise, a fair number of dependencies on external software, and reasonably powerful hardware.</p>
 <p>If you just want to use OpenJDK and not build it yourself, this document is not for you. See for instance <a href="http://openjdk.java.net/install">OpenJDK installation</a> for some methods of installing a prebuilt OpenJDK.</p>
 <h2 id="getting-the-source-code">Getting the Source Code</h2>
-<p>OpenJDK uses <a href="http://www.mercurial-scm.org">Mercurial</a> for source control. The source code is contained not in a single Mercurial repository, but in a tree (&quot;forest&quot;) of interrelated repositories. You will need to check out all of the repositories to be able to build OpenJDK. To assist you in dealing with this somewhat unusual arrangement, there are multiple tools available, which are explained below.</p>
-<p>In any case, make sure you are getting the correct version. At the <a href="http://hg.openjdk.java.net/">OpenJDK Mercurial server</a> you can see a list of all available forests. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
+<p>Make sure you are getting the correct version. As of JDK 10, the source is no longer split into separate repositories so you only need to clone one single repository. At the <a href="http://hg.openjdk.java.net/">OpenJDK Mercurial server</a> you can see a list of all available forests. If you want to build an older version, e.g. JDK 8, it is recommended that you get the <code>jdk8u</code> forest, which contains incremental updates, instead of the <code>jdk8</code> forest, which was frozen at JDK 8 GA.</p>
 <p>If you are new to Mercurial, a good place to start is the <a href="http://www.mercurial-scm.org/guide">Mercurial Beginner's Guide</a>. The rest of this document assumes a working knowledge of Mercurial.</p>
 <h3 id="special-considerations">Special Considerations</h3>
 <p>For a smooth building experience, it is recommended that you follow these rules on where and how to check out the source code.</p>
@@ -152,45 +148,6 @@
 </ul>
 <p>Failure to follow this procedure might result in hard-to-debug build problems.</p></li>
 </ul>
-<h3 id="using-get_source.sh">Using get_source.sh</h3>
-<p>The simplest way to get the entire forest is probably to clone the top-level repository and then run the <code>get_source.sh</code> script, like this:</p>
-<pre><code>hg clone http://hg.openjdk.java.net/jdk9/jdk9
-cd jdk9
-bash get_source.sh</code></pre>
-<p>The first time this is run, it will clone all the sub-repositories. Any subsequent execution of the script will update all sub-repositories to the latest revision.</p>
-<h3 id="using-hgforest.sh">Using hgforest.sh</h3>
-<p>The <code>hgforest.sh</code> script is more expressive than <code>get_source.sh</code>. It takes any number of arguments, and runs <code>hg</code> with those arguments on each sub-repository in the forest. The <code>get_source.sh</code> script is basically a simple wrapper that runs either <code>hgforest.sh clone</code> or <code>hgforest.sh pull -u</code>.</p>
-<ul>
-<li><p>Cloning the forest:</p>
-<pre><code>hg clone http://hg.openjdk.java.net/jdk9/jdk9
-cd jdk9
-bash common/bin/hgforest.sh clone</code></pre></li>
-<li><p>Pulling and updating the forest:</p>
-<pre><code>bash common/bin/hgforest.sh pull -u</code></pre></li>
-<li><p>Merging over the entire forest:</p>
-<pre><code>bash common/bin/hgforest.sh merge</code></pre></li>
-</ul>
-<h3 id="using-the-trees-extension">Using the Trees Extension</h3>
-<p>The trees extension is a Mercurial add-on that helps you deal with the forest. More information is available on the <a href="http://openjdk.java.net/projects/code-tools/trees">Code Tools trees page</a>.</p>
-<h4 id="installing-the-extension">Installing the Extension</h4>
-<p>Install the extension by cloning <code>http://hg.openjdk.java.net/code-tools/trees</code> and updating your <code>.hgrc</code> file. Here's one way to do this:</p>
-<pre><code>cd ~
-mkdir hg-ext
-cd hg-ext
-hg clone http://hg.openjdk.java.net/code-tools/trees
-cat &lt;&lt; EOT &gt;&gt; ~/.hgrc
-[extensions]
-trees=~/hg-ext/trees/trees.py
-EOT</code></pre>
-<h4 id="initializing-the-tree">Initializing the Tree</h4>
-<p>The trees extension needs to know the structure of the forest. If you have already cloned the entire forest using another method, you can initialize the forest like this:</p>
-<pre><code>hg tconf --set --walk --depth</code></pre>
-<p>Or you can clone the entire forest at once, if you substitute <code>clone</code> with <code>tclone</code> when cloning the top-level repository, e.g. like this:</p>
-<pre><code>hg tclone http://hg.openjdk.java.net/jdk9/jdk9</code></pre>
-<p>In this case, the forest will be properly initialized from the start.</p>
-<h4 id="other-operations">Other Operations</h4>
-<p>The trees extensions supplement many common operations with a trees version by prefixing a <code>t</code> to the normal Mercurial command, e.g. <code>tcommit</code>, <code>tstatus</code> or <code>tmerge</code>. For instance, to update the entire forest:</p>
-<pre><code>hg tpull -u</code></pre>
 <h2 id="build-hardware-requirements">Build Hardware Requirements</h2>
 <p>OpenJDK is a massive project, and require machines ranging from decent to powerful to be able to build in a reasonable amount of time, or to be able to complete a build at all.</p>
 <p>We <em>strongly</em> recommend usage of an SSD disk for the build, since disk speed is one of the limiting factors for build performance.</p>
@@ -327,8 +284,7 @@ EOT</code></pre>
 </tbody>
 </table>
 <h3 id="gcc">gcc</h3>
-<p>The minimum accepted version of gcc is 4.3. Older versions will not be accepted by <code>configure</code>.</p>
-<p>However, gcc 4.3 is quite old and OpenJDK is not regularly tested on this version, so it is recommended to use a more modern gcc.</p>
+<p>The minimum accepted version of gcc is 4.7. Older versions will generate a warning by <code>configure</code> and are unlikely to work.</p>
 <p>OpenJDK 9 includes patches that should allow gcc 6 to compile, but this should be considered experimental.</p>
 <p>In general, any version between these two should be usable.</p>
 <h3 id="clang">clang</h3>
diff --git a/doc/building.md b/doc/building.md
index 5767ee6f64c..4de63e8cd8b 100644
--- a/doc/building.md
+++ b/doc/building.md
@@ -7,7 +7,7 @@ the time. They assume that you have installed Mercurial (and Cygwin if running
 on Windows) and cloned the top-level OpenJDK repository that you want to build.
 
  1. [Get the complete source code](#getting-the-source-code): \
-    `bash get_source.sh`
+    `hg clone http://hg.openjdk.java.net/jdk10/master`
 
  2. [Run configure](#running-configure): \
     `bash configure`
@@ -44,18 +44,12 @@ OpenJDK.
 
 ## Getting the Source Code
 
-OpenJDK uses [Mercurial](http://www.mercurial-scm.org) for source control. The
-source code is contained not in a single Mercurial repository, but in a tree
-("forest") of interrelated repositories. You will need to check out all of the
-repositories to be able to build OpenJDK. To assist you in dealing with this
-somewhat unusual arrangement, there are multiple tools available, which are
-explained below.
-
-In any case, make sure you are getting the correct version. At the [OpenJDK
-Mercurial server](http://hg.openjdk.java.net/) you can see a list of all
-available forests. If you want to build an older version, e.g. JDK 8, it is
-recommended that you get the `jdk8u` forest, which contains incremental
-updates, instead of the `jdk8` forest, which was frozen at JDK 8 GA.
+Make sure you are getting the correct version. As of JDK 10, the source is no
+longer split into separate repositories so you only need to clone one single
+repository. At the [OpenJDK Mercurial server](http://hg.openjdk.java.net/) you
+can see a list of all available forests. If you want to build an older version,
+e.g. JDK 8, it is recommended that you get the `jdk8u` forest, which contains
+incremental updates, instead of the `jdk8` forest, which was frozen at JDK 8 GA.
 
 If you are new to Mercurial, a good place to start is the [Mercurial Beginner's
 Guide](http://www.mercurial-scm.org/guide). The rest of this document assumes a
@@ -101,96 +95,6 @@ on where and how to check out the source code.
     Failure to follow this procedure might result in hard-to-debug build
     problems.
 
-### Using get\_source.sh
-
-The simplest way to get the entire forest is probably to clone the top-level
-repository and then run the `get_source.sh` script, like this:
-
-```
-hg clone http://hg.openjdk.java.net/jdk9/jdk9
-cd jdk9
-bash get_source.sh
-```
-
-The first time this is run, it will clone all the sub-repositories. Any
-subsequent execution of the script will update all sub-repositories to the
-latest revision.
-
-### Using hgforest.sh
-
-The `hgforest.sh` script is more expressive than `get_source.sh`. It takes any
-number of arguments, and runs `hg` with those arguments on each sub-repository
-in the forest. The `get_source.sh` script is basically a simple wrapper that
-runs either `hgforest.sh clone` or `hgforest.sh pull -u`.
-
-  * Cloning the forest:
-    ```
-    hg clone http://hg.openjdk.java.net/jdk9/jdk9
-    cd jdk9
-    bash common/bin/hgforest.sh clone
-    ```
-
-  * Pulling and updating the forest:
-    ```
-    bash common/bin/hgforest.sh pull -u
-    ```
-
-  * Merging over the entire forest:
-    ```
-    bash common/bin/hgforest.sh merge
-    ```
-
-### Using the Trees Extension
-
-The trees extension is a Mercurial add-on that helps you deal with the forest.
-More information is available on the [Code Tools trees page](
-http://openjdk.java.net/projects/code-tools/trees).
-
-#### Installing the Extension
-
-Install the extension by cloning `http://hg.openjdk.java.net/code-tools/trees`
-and updating your `.hgrc` file. Here's one way to do this:
-
-```
-cd ~
-mkdir hg-ext
-cd hg-ext
-hg clone http://hg.openjdk.java.net/code-tools/trees
-cat << EOT >> ~/.hgrc
-[extensions]
-trees=~/hg-ext/trees/trees.py
-EOT
-```
-
-#### Initializing the Tree
-
-The trees extension needs to know the structure of the forest. If you have
-already cloned the entire forest using another method, you can initialize the
-forest like this:
-
-```
-hg tconf --set --walk --depth
-```
-
-Or you can clone the entire forest at once, if you substitute `clone` with
-`tclone` when cloning the top-level repository, e.g. like this:
-
-```
-hg tclone http://hg.openjdk.java.net/jdk9/jdk9
-```
-
-In this case, the forest will be properly initialized from the start.
-
-#### Other Operations
-
-The trees extensions supplement many common operations with a trees version by
-prefixing a `t` to the normal Mercurial command, e.g. `tcommit`, `tstatus` or
-`tmerge`. For instance, to update the entire forest:
-
-```
-hg tpull -u
-```
-
 ## Build Hardware Requirements
 
 OpenJDK is a massive project, and require machines ranging from decent to
diff --git a/doc/testing.html b/doc/testing.html
index 7ac23de060e..d71f7e569e8 100644
--- a/doc/testing.html
+++ b/doc/testing.html
@@ -6,7 +6,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
   <title>Testing OpenJDK</title>
   <style type="text/css">code{white-space: pre;}</style>
-  <link rel="stylesheet" href="../../jdk/make/data/docs-resources/resources/jdk-default.css">
+  <link rel="stylesheet" href="../make/data/docs-resources/resources/jdk-default.css">
   <!--[if lt IE 9]>
     <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
   <![endif]-->
@@ -43,7 +43,6 @@ $ make run-test-only TEST=&quot;gtest:LogTagSet gtest:LogTagSetDescriptions&quot
 $ make run-test TEST=&quot;hotspot/test:hotspot_gc&quot; JTREG=&quot;JOBS=1;TIMEOUT=8;VM_OTIONS=-XshowSettings -Xlog:gc+ref=debug&quot;
 $ make run-test TEST=&quot;jtreg:hotspot/test:hotspot_gc hotspot/test/native_sanity/JniVersion.java&quot;
 $ make exploded-run-test TEST=hotspot_tier1</code></pre>
-
 <h3 id="configuration">Configuration</h3>
 <p>To be able to run JTReg tests, <code>configure</code> needs to know where to find the JTReg test framework. If it is not picked up automatically by configure, use the <code>--with-jtreg=&lt;path to jtreg home&gt;</code> option to point to the JTReg framework. Note that this option should point to the JTReg home, i.e. the top directory, containing <code>lib/jtreg.jar</code> etc. (An alternative is to set the <code>JT_HOME</code> environment variable to point to the JTReg home before running <code>configure</code>.)</p>
 <h2 id="test-selection">Test selection</h2>
diff --git a/make/BuildNashorn.gmk b/make/BuildNashorn.gmk
index a0929c415d0..f176f5b94d2 100644
--- a/make/BuildNashorn.gmk
+++ b/make/BuildNashorn.gmk
@@ -32,18 +32,17 @@ include JarArchive.gmk
 include JavaCompilation.gmk
 include SetupJavaCompilers.gmk
 include TextFileProcessing.gmk
+include Modules.gmk
 
 JDK_CLASSES := $(call PathList, $(strip $(addprefix $(JDK_OUTPUTDIR)/modules/, \
       java.base java.logging java.scripting jdk.dynalink)))
 
-MODULESOURCEPATH := $(NASHORN_TOPDIR)/src/*/share/classes
-
 # Need to use source and target 8 for nasgen to work.
 $(eval $(call SetupJavaCompiler, GENERATE_NEWBYTECODE_DEBUG, \
     JVM := $(JAVA_JAVAC), \
     JAVAC := $(NEW_JAVAC), \
     FLAGS := -g -source 9 -target 9 --upgrade-module-path "$(JDK_OUTPUTDIR)/modules/" \
-         --system none --module-source-path "$(MODULESOURCEPATH)", \
+         --system none --module-source-path $(call GetModuleSrcPath), \
     SERVER_DIR := $(SJAVAC_SERVER_DIR), \
     SERVER_JVM := $(SJAVAC_SERVER_JAVA)))
 
@@ -54,12 +53,12 @@ $(eval $(call SetupJavaCompiler, GENERATE_NEWBYTECODE_DEBUG, \
 $(eval $(call SetupJavaCompilation, jdk.scripting.nashorn, \
     SETUP := GENERATE_NEWBYTECODE_DEBUG, \
     MODULE := jdk.scripting.nashorn, \
-    SRC := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
+    SRC := $(TOPDIR)/src/jdk.scripting.nashorn/share/classes, \
     COPY := .properties .js, \
     BIN := $(SUPPORT_OUTPUTDIR)/special_classes))
 
-NASGEN_SRC := $(NASHORN_TOPDIR)/buildtools/nasgen/src
-ASM_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
+NASGEN_SRC := $(TOPDIR)/make/nashorn/buildtools/nasgen/src
+ASM_SRC := $(TOPDIR)/src/java.base/share/classes/jdk/internal/org/objectweb/asm
 
 # Build nasgen
 $(eval $(call SetupJavaCompilation, BUILD_NASGEN, \
@@ -94,7 +93,7 @@ $(NASGEN_RUN_FILE): $(BUILD_NASGEN) $(jdk.scripting.nashorn)
 
 # Version file needs to be processed with version numbers
 $(eval $(call SetupTextFileProcessing, BUILD_VERSION_FILE, \
-  SOURCE_FILES := $(NASHORN_TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template, \
+  SOURCE_FILES := $(TOPDIR)/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/resources/version.properties.template, \
   OUTPUT_FILE := $(JDK_OUTPUTDIR)/modules/jdk.scripting.nashorn/jdk/nashorn/internal/runtime/resources/version.properties, \
   REPLACEMENTS := \
       @@VERSION_STRING@@ => $(VERSION_STRING) ; \
diff --git a/make/Bundles.gmk b/make/Bundles.gmk
index 81321550e23..1f9d229ee4f 100644
--- a/make/Bundles.gmk
+++ b/make/Bundles.gmk
@@ -56,7 +56,7 @@ define SetupBundleFileBody
     $$(eval $1_$$d_RELATIVE_FILES := $$$$(patsubst $$d/%, %, \
         $$$$(filter $$d/%, $$$$($1_FILES)))) \
     $$(eval $1_$$d_LIST_FILE := \
-        $(SUPPORT_OUTPUTDIR)/bundles/_$1_$$$$(subst /,_,$$$$(patsubst $(TOPDIR)/%,%,$$d)_files)) \
+        $(SUPPORT_OUTPUTDIR)/bundles/_$1_$$$$(subst /,_,$$$$(patsubst $(OUTPUT_ROOT)/%,%,$$d)_files)) \
   )
 
   ifneq ($$(filter %.tar.gz, $$($1_BUNDLE_NAME)), )
diff --git a/make/CompileDemos.gmk b/make/CompileDemos.gmk
index 5b093935cd7..0892f05df86 100644
--- a/make/CompileDemos.gmk
+++ b/make/CompileDemos.gmk
@@ -38,8 +38,8 @@ include TextFileProcessing.gmk
 include ZipArchive.gmk
 
 # Prepare the find cache.
-$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/demo \
-    $(JDK_TOPDIR)/src/*/demo)))
+$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/demo \
+    $(TOPDIR)/src/*/demo)))
 
 # Append demo goals to this variable.
 TARGETS =
@@ -48,15 +48,15 @@ TARGETS =
 # Now every other demo has its own quirks where to put the
 # READMEs and other files.
 
-DEMO_SHARE_SRC := $(JDK_TOPDIR)/src/demo/share
-GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc
+DEMO_SHARE_SRC := $(TOPDIR)/src/demo/share
+GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 
 DEMO_MANIFEST := $(SUPPORT_OUTPUTDIR)/demos/java-main-manifest.mf
 
 # This rule will be depended on due to the MANIFEST line in SetupBuildDemo
 # and SetupBuildJvmtiDemo.
 $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \
-  SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
+  SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf, \
   OUTPUT_FILE := $(DEMO_MANIFEST), \
   REPLACEMENTS := \
       @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
@@ -303,7 +303,7 @@ endif
 
 ################################################################################
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, CompileDemos.gmk))
+$(eval $(call IncludeCustomExtension, , CompileDemos.gmk))
 
 all: $(TARGETS)
 images: $(IMAGES_TARGETS)
diff --git a/make/CompileInterimLangtools.gmk b/make/CompileInterimLangtools.gmk
index 20b967a4074..5d2f7f2e535 100644
--- a/make/CompileInterimLangtools.gmk
+++ b/make/CompileInterimLangtools.gmk
@@ -43,7 +43,7 @@ define SetupInterimModule
   $$(eval $$(call SetupJavaCompilation,BUILD_INTERIM_$(strip $1), \
       SETUP := BOOT_JAVAC, \
       DISABLE_SJAVAC := true, \
-      SRC := $(LANGTOOLS_TOPDIR)/src/$(strip $1)/share/classes \
+      SRC := $(TOPDIR)/src/$(strip $1)/share/classes \
           $$(wildcard $(SUPPORT_OUTPUTDIR)/gensrc/$(strip $1)), \
       EXCLUDES := sun com/sun/tools/jdeps com/sun/tools/javap \
           com/sun/tools/jdeprscan, \
diff --git a/make/CompileInterimRmic.gmk b/make/CompileInterimRmic.gmk
index 9a30893f142..2f56fbcfaa4 100644
--- a/make/CompileInterimRmic.gmk
+++ b/make/CompileInterimRmic.gmk
@@ -43,7 +43,7 @@ RMIC_PKGS := \
 
 $(eval $(call SetupJavaCompilation,BUILD_INTERIM_RMIC, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/jdk.rmic/share/classes, \
+    SRC := $(TOPDIR)/src/jdk.rmic/share/classes, \
     EXCLUDE_FILES := module-info.java, \
     INCLUDES := $(RMIC_PKGS), \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/override_modules/jdk.rmic, \
diff --git a/make/CompileJavaModules.gmk b/make/CompileJavaModules.gmk
index ed9fb56b042..327d139849f 100644
--- a/make/CompileJavaModules.gmk
+++ b/make/CompileJavaModules.gmk
@@ -47,7 +47,7 @@ java.base_COPY += .icu .dat .spp content-types.properties hijrah-config-islamic-
 java.base_CLEAN += intrinsic.properties
 
 java.base_EXCLUDE_FILES += \
-  $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
+  $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java
 
 java.base_EXCLUDES += java/lang/doc-files
 
@@ -146,10 +146,10 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
       com/sun/java/swing/plaf/gtk \
       #
   java.desktop_EXCLUDE_FILES += \
-      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
-      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
-      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
-      $(wildcard $(JDK_TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/java2d/opengl/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/awt/*.java) \
+      $(wildcard $(TOPDIR)/src/java.desktop/unix/classes/sun/font/*.java) \
       #
 else
   # TBD: figure out how to eliminate this long list
@@ -267,15 +267,15 @@ java.sql_SETUP := GENERATE_JDKBYTECODE_NOWARNINGS
 
 java.sql.rowset_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
 java.sql.rowset_CLEAN_FILES += $(wildcard \
-    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
-    $(JDK_TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
+    $(TOPDIR)/src/java.sql.rowset/share/classes/com/sun/rowset/*.properties \
+    $(TOPDIR)/src/java.sql.rowset/share/classes/javax/sql/rowset/*.properties)
 
 ################################################################################
 
 java.rmi_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:java.*,javax.*'
 java.rmi_CLEAN_FILES += $(wildcard \
-    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
-    $(JDK_TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
+    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/registry/resources/*.properties \
+    $(TOPDIR)/src/java.rmi/share/classes/sun/rmi/server/resources/*.properties)
 
 ################################################################################
 
@@ -351,10 +351,11 @@ jdk.charsets_COPY += .dat
 
 ################################################################################
 
-jdk.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*' \
+jdk.compiler_ADD_JAVAC_FLAGS += -Xdoclint:all/protected \
+    '-Xdoclint/package:-com.sun.tools.*,-jdk.internal.*,sun.tools.serialver.resources.*' \
     -XDstringConcat=inline
 jdk.compiler_CLEAN_FILES += $(wildcard \
-    $(patsubst %, $(JDK_TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
+    $(patsubst %, $(TOPDIR)/src/jdk.compiler/share/classes/%/*.properties, \
         sun/tools/serialver/resources))
 
 ################################################################################
@@ -399,17 +400,17 @@ jdk.rmic_CLEAN += .properties
 
 # No SCTP implementation on Mac OS X or AIX. These classes should be excluded.
 SCTP_IMPL_CLASSES = \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
-    $(JDK_TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationChange.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/AssociationImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/PeerAddrChange.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/ResultContainer.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpMultiChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNet.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpNotification.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SctpServerChannelImpl.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/SendFailed.java \
+    $(TOPDIR)/src/jdk.sctp/unix/classes/sun/nio/ch/sctp/Shutdown.java
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   jdk.sctp_EXCLUDE_FILES += $(SCTP_IMPL_CLASSES)
@@ -424,15 +425,15 @@ endif
 jdk.jconsole_COPY += .gif .png
 
 jdk.jconsole_CLEAN_FILES += $(wildcard \
-    $(JDK_TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
+    $(TOPDIR)/src/jdk.jconsole/share/classes/sun/tools/jconsole/resources/*.properties)
 
 ################################################################################
 
 jdk.jdeps_COPY += .txt
 
 jdk.jdeps_CLEAN_FILES += $(wildcard \
-    $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
-    $(JDK_TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
+    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/jdeps/resources/*.properties \
+    $(TOPDIR)/src/jdk.jdeps/share/classes/com/sun/tools/javap/resources/*.properties)
 
 ################################################################################
 
@@ -448,7 +449,7 @@ jdk.jdi_EXCLUDE_FILES += jdi-overview.html
 ################################################################################
 
 jdk.dev_CLEAN_FILES += $(wildcard \
-    $(patsubst %, $(JDK_TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
+    $(patsubst %, $(TOPDIR)/src/jdk.dev/share/classes/%/*.properties, \
         com/sun/tools/script/shell))
 
 jdk.dev_COPY += .js oqlhelp.html .txt
@@ -601,7 +602,7 @@ ifeq ($(MODULE), jdk.internal.vm.ci)
   ## WORKAROUND jdk.internal.vm.ci source structure issue
   JVMCI_MODULESOURCEPATH := $(MODULESOURCEPATH) \
       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
-          $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
   MODULESOURCEPATH := $(call PathList, $(JVMCI_MODULESOURCEPATH))
 endif
 
@@ -609,7 +610,7 @@ ifeq ($(MODULE), jdk.internal.vm.compiler)
   ## WORKAROUND jdk.internal.vm.compiler source structure issue
   VM_COMPILER_MODULESOURCEPATH := $(MODULESOURCEPATH) \
       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src %test/src %jtt/src %bench/src %microbenchmarks/src, \
-          $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
   MODULESOURCEPATH := $(call PathList, $(VM_COMPILER_MODULESOURCEPATH))
 endif
 
@@ -617,7 +618,7 @@ ifeq ($(MODULE), jdk.aot)
   ## WORKAROUND jdk.aot source structure issue
   AOT_MODULESOURCEPATH := $(MODULESOURCEPATH) \
       $(subst /$(MODULE)/,/*/, $(filter-out %processor/src, \
-          $(wildcard $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes/*/src)))
+          $(wildcard $(TOPDIR)/src/$(MODULE)/share/classes/*/src)))
   MODULESOURCEPATH := $(call PathList, $(AOT_MODULESOURCEPATH))
 endif
 
@@ -654,7 +655,7 @@ $(JDK_OUTPUTDIR)/modules/%_zh_HK.properties: $(JDK_OUTPUTDIR)/modules/%_zh_TW.pr
 	$(install-file)
 
 CreateHkTargets = \
-    $(patsubst $(JDK_TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
+    $(patsubst $(TOPDIR)/src/%, $(JDK_OUTPUTDIR)/modules/%, \
       $(subst /share/classes,, \
         $(subst _zh_TW,_zh_HK, $(filter %_zh_TW.properties, $1))))
 
diff --git a/make/CompileModuleTools.gmk b/make/CompileModuleTools.gmk
index c53953335e8..841f1166292 100644
--- a/make/CompileModuleTools.gmk
+++ b/make/CompileModuleTools.gmk
@@ -36,7 +36,7 @@ TOOLS_CLASSES_DIR := $(BUILDTOOLS_OUTPUTDIR)/tools_jigsaw_classes
 
 $(eval $(call SetupJavaCompilation,BUILD_JIGSAW_TOOLS, \
     SETUP := GENERATE_USINGJDKBYTECODE, \
-    SRC := $(JDK_TOPDIR)/make/src/classes, \
+    SRC := $(TOPDIR)/make/jdk/src/classes, \
     INCLUDES := build/tools/deps \
                 build/tools/docs \
                 build/tools/jigsaw, \
diff --git a/make/CompileToolsHotspot.gmk b/make/CompileToolsHotspot.gmk
index 309d9c9aaf6..48ac77afde5 100644
--- a/make/CompileToolsHotspot.gmk
+++ b/make/CompileToolsHotspot.gmk
@@ -35,12 +35,12 @@ include SetupJavaCompilers.gmk
 TARGETS :=
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, hotspot, CompileTools.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/CompileTools.gmk))
 
 ifeq ($(INCLUDE_GRAAL), true)
-  VM_CI_SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.ci/share/classes
+  VM_CI_SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.ci/share/classes
 
-  SRC_DIR := $(HOTSPOT_TOPDIR)/src/jdk.internal.vm.compiler/share/classes
+  SRC_DIR := $(TOPDIR)/src/jdk.internal.vm.compiler/share/classes
 
   ##############################################################################
   # Compile the annotation processors
diff --git a/make/CompileToolsJdk.gmk b/make/CompileToolsJdk.gmk
index 23c3bdb5e39..e52a5eba600 100644
--- a/make/CompileToolsJdk.gmk
+++ b/make/CompileToolsJdk.gmk
@@ -32,13 +32,13 @@ include SetupJavaCompilers.gmk
 
 ################################################################################
 
-$(eval $(call IncludeCustomExtension, jdk, CompileTools.gmk))
+$(eval $(call IncludeCustomExtension, , CompileTools.gmk))
 
 ################################################################################
 
 # Use += to be able to add to this from a custom extension
 BUILD_TOOLS_SRC_DIRS += \
-    $(JDK_TOPDIR)/make/src/classes \
+    $(TOPDIR)/make/jdk/src/classes \
     $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes \
     #
 
@@ -53,9 +53,9 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
 TARGETS += $(BUILD_TOOLS_JDK)
 
 $(eval $(call SetupCopyFiles,COPY_NIMBUS_TEMPLATES, \
-    SRC := $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
+    SRC := $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus, \
     DEST := $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes/build/tools/generatenimbus/resources, \
-    FILES := $(wildcard $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))
+    FILES := $(wildcard $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/*.template)))
 
 TARGETS += $(COPY_NIMBUS_TEMPLATES)
 
diff --git a/make/CopyInterimCLDRConverter.gmk b/make/CopyInterimCLDRConverter.gmk
index 44eb63a25ea..eabd8326fa0 100644
--- a/make/CopyInterimCLDRConverter.gmk
+++ b/make/CopyInterimCLDRConverter.gmk
@@ -42,7 +42,7 @@ define cldrconverter_copytznames
 endef
 
 $(eval $(call SetupCopyFiles,COPY_INTERIM_CLDRCONVERTER, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/resources, \
+    SRC := $(TOPDIR)/src/java.base/share/classes/sun/util/resources, \
     DEST := $(BUILDTOOLS_OUTPUTDIR)/interim_cldrconverter_classes/build/tools/cldrconverter, \
     FILES := TimeZoneNames.java, \
     MACRO := cldrconverter_copytznames))
diff --git a/make/Docs.gmk b/make/Docs.gmk
index 7b5194adbf4..645852dc7b6 100644
--- a/make/Docs.gmk
+++ b/make/Docs.gmk
@@ -29,8 +29,8 @@ include MakeBase.gmk
 include Modules.gmk
 include ProcessMarkdown.gmk
 include ZipArchive.gmk
-include $(JDK_TOPDIR)/make/Tools.gmk
-include $(JDK_TOPDIR)/make/ModuleTools.gmk
+include $(TOPDIR)/make/ToolsJdk.gmk
+include $(TOPDIR)/make/ModuleTools.gmk
 
 # This is needed to properly setup DOCS_MODULES.
 $(eval $(call ReadImportMetaData))
@@ -58,7 +58,7 @@ $(eval $(call IncludeCustomExtension, , Docs.gmk))
 # On top of the sources that was used to compile the JDK, we need some
 # extra java.rmi sources that are used just for javadoc.
 MODULES_SOURCE_PATH := $(call PathList, $(call GetModuleSrcPath) \
-    $(SUPPORT_OUTPUTDIR)/rmic/* $(JDK_TOPDIR)/src/*/share/doc/stub)
+    $(SUPPORT_OUTPUTDIR)/rmic/* $(TOPDIR)/src/*/share/doc/stub)
 
 # URLs
 JAVADOC_BASE_URL := http://www.oracle.com/pls/topic/lookup?ctx=javase9&amp;id=homepage
@@ -340,7 +340,7 @@ define SetupApiDocsGenerationBody
     # First we run the GenGraph tool. It will query the module structure of the
     # running JVM and output .dot files for all existing modules.
     GENGRAPHS_PROPS := \
-        $$(JDK_TOPDIR)/make/src/classes/build/tools/jigsaw/javadoc-graphs.properties
+        $$(TOPDIR)/make/jdk/src/classes/build/tools/jigsaw/javadoc-graphs.properties
 
     $1_GENGRAPHS_DIR := $$(SUPPORT_OUTPUTDIR)/docs/$1-gengraphs
     $1_GENGRAPHS_MARKER := $$($1_GENGRAPHS_DIR)/_gengraphs_run.marker
@@ -448,7 +448,7 @@ $(JDK_INDEX_HTML):
 JDK_INDEX_TARGETS += $(JDK_INDEX_HTML)
 
 # Copy the global resources
-GLOBAL_SPECS_RESOURCES_DIR := $(JDK_TOPDIR)/make/data/docs-resources/
+GLOBAL_SPECS_RESOURCES_DIR := $(TOPDIR)/make/data/docs-resources/
 $(eval $(call SetupCopyFiles, COPY_GLOBAL_RESOURCES, \
     SRC := $(GLOBAL_SPECS_RESOURCES_DIR), \
     FILES := $(call CacheFind, $(GLOBAL_SPECS_RESOURCES_DIR)), \
@@ -459,7 +459,7 @@ JDK_INDEX_TARGETS += $(COPY_GLOBAL_RESOURCES)
 # Copy the legal notices distributed with the docs bundle
 DOCS_LEGAL_NOTICES := jquery.md jszip.md pako.md
 $(eval $(call SetupCopyFiles, COPY_DOCS_LEGAL_NOTICES, \
-    SRC := $(LANGTOOLS_TOPDIR)/src/jdk.javadoc/share/legal, \
+    SRC := $(TOPDIR)/src/jdk.javadoc/share/legal, \
     FILES := $(DOCS_LEGAL_NOTICES), \
     DEST := $(DOCS_OUTPUTDIR)/legal, \
 ))
@@ -498,14 +498,15 @@ ifeq ($(ENABLE_FULL_DOCS), true)
     $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
     $(foreach d, $(SPECS_$m), \
       $(if $(filter %.md, $(call CacheFind, $d)), \
-        $(eval $(call SetupProcessMarkdown, CONVERT_MARKDOWN_$m_$(patsubst $(TOPDIR)/%,%,$d), \
+        $(eval $m_$d_NAME := CONVERT_MARKDOWN_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
+        $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
             SRC := $d, \
             FILES := $(filter %.md, $(call CacheFind, $d)), \
             DEST := $(DOCS_OUTPUTDIR)/specs/, \
             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
         )) \
+        $(eval JDK_SPECS_TARGETS += $($($m_$d_NAME))) \
       ) \
-      $(eval JDK_SPECS_TARGETS += $(CONVERT_MARKDOWN_$m_$(patsubst $(TOPDIR)/%,%,$d))) \
     ) \
   )
 endif
diff --git a/make/ExplodedImageOptimize.gmk b/make/ExplodedImageOptimize.gmk
index 36c27d8ab37..dedac6db738 100644
--- a/make/ExplodedImageOptimize.gmk
+++ b/make/ExplodedImageOptimize.gmk
@@ -29,7 +29,7 @@ default: all
 
 include $(SPEC)
 include MakeBase.gmk
-include $(JDK_TOPDIR)/make/ModuleTools.gmk
+include $(TOPDIR)/make/ModuleTools.gmk
 
 ################################################################################
 
diff --git a/make/GenerateModuleSummary.gmk b/make/GenerateModuleSummary.gmk
index b96e9ded8ca..1b48e1d8626 100644
--- a/make/GenerateModuleSummary.gmk
+++ b/make/GenerateModuleSummary.gmk
@@ -32,7 +32,7 @@ include ModuleTools.gmk
 
 GENGRAPHS_DIR := $(IMAGES_OUTPUTDIR)/gengraphs
 SPEC_DOTFILES_DIR := $(GENGRAPHS_DIR)/spec-dotfiles
-TOOLS_MODULE_SRCDIR := $(JDK_TOPDIR)/make/src/classes/build/tools/jigsaw
+TOOLS_MODULE_SRCDIR := $(TOPDIR)/make/jdk/src/classes/build/tools/jigsaw
 
 $(GENGRAPHS_DIR)/jdk.dot: $(BUILD_JIGSAW_TOOLS)
 	$(MKDIR) -p $(@D)
diff --git a/make/Images.gmk b/make/Images.gmk
index c8567bd0ee2..5a210cac9cf 100644
--- a/make/Images.gmk
+++ b/make/Images.gmk
@@ -232,7 +232,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
       xjc.1
 
   # This variable is potentially overridden in the closed makefile.
-  MAN_SRC_BASEDIR ?= $(JDK_TOPDIR)/src
+  MAN_SRC_BASEDIR ?= $(TOPDIR)/src
 
   ifeq ($(OPENJDK_TARGET_OS), linux)
     MAN_SRC_DIR = $(MAN_SRC_BASEDIR)/linux/doc
diff --git a/make/Init.gmk b/make/Init.gmk
index aeda160f14f..7ead7fc6853 100644
--- a/make/Init.gmk
+++ b/make/Init.gmk
@@ -266,7 +266,7 @@ else # HAS_SPEC=true
 	  $(ECHO) "Re-running configure using default settings"
         endif
 	( cd $(OUTPUT_ROOT) && PATH="$(ORIGINAL_PATH)" \
-	    $(BASH) $(TOPDIR)/configure $(CONFIGURE_COMMAND_LINE) )
+	    $(BASH) $(CONFIGURE_CMD) $(CONFIGURE_COMMAND_LINE) )
 
   ##############################################################################
   # The main target, for delegating into Main.gmk
diff --git a/make/InitSupport.gmk b/make/InitSupport.gmk
index ecb8f8b073b..fa296f3ad23 100644
--- a/make/InitSupport.gmk
+++ b/make/InitSupport.gmk
@@ -69,7 +69,11 @@ ifeq ($(HAS_SPEC),)
       $(subst \ ,\#,$(MAKEOVERRIDES))))
 
   # Setup information about available configurations, if any.
-  build_dir=$(topdir)/build
+  ifeq ($(CUSTOM_BUILD_DIR), )
+    build_dir=$(topdir)/build
+  else
+    build_dir=$(CUSTOM_BUILD_DIR)
+  endif
   all_spec_files=$(wildcard $(build_dir)/*/spec.gmk)
   # Extract the configuration names from the path
   all_confs=$(patsubst %/spec.gmk, %, $(patsubst $(build_dir)/%, %, $(all_spec_files)))
@@ -342,7 +346,7 @@ else # $(HAS_SPEC)=true
   # proper and existing SPEC is included.
   ##############################################################################
 
-  include $(SRC_ROOT)/make/common/MakeBase.gmk
+  include $(TOPDIR)/make/common/MakeBase.gmk
 
   # Define basic logging setup
   BUILD_LOG := $(OUTPUT_ROOT)/build.log
diff --git a/make/JrtfsJar.gmk b/make/JrtfsJar.gmk
index a95049030ea..83a69083c4e 100644
--- a/make/JrtfsJar.gmk
+++ b/make/JrtfsJar.gmk
@@ -33,7 +33,7 @@ include TextFileProcessing.gmk
 
 # This rule will be depended on due to the MANIFEST line
 $(eval $(call SetupTextFileProcessing, BUILD_JAVA_MANIFEST, \
-  SOURCE_FILES := $(JDK_TOPDIR)/make/data/mainmanifest/manifest.mf, \
+  SOURCE_FILES := $(TOPDIR)/make/data/mainmanifest/manifest.mf, \
   OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/java-main-manifest.mf, \
   REPLACEMENTS := \
       @@VERSION_SPECIFICATION@@ => $(VERSION_SPECIFICATION) ; \
@@ -48,7 +48,7 @@ JIMAGE_PKGS := \
 
 $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
+    SRC := $(TOPDIR)/src/java.base/share/classes, \
     EXCLUDE_FILES := module-info.java, \
     INCLUDES := $(JIMAGE_PKGS), \
     BIN := $(SUPPORT_OUTPUTDIR)/jrtfs_classes))
@@ -58,7 +58,7 @@ $(eval $(call SetupJavaCompilation, BUILD_JRTFS, \
 # Adding META-INF/services would include all files in that directory when only the one
 # is needed, which is why this explicit copy is defined instead.
 $(eval $(call SetupCopyFiles, COPY_JIMAGE_SERVICE_PROVIDER, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
+    SRC := $(TOPDIR)/src/java.base/share/classes, \
     DEST := $(SUPPORT_OUTPUTDIR)/jrtfs_classes, \
     FILES := META-INF/services/java.nio.file.spi.FileSystemProvider))
 
diff --git a/make/MacBundles.gmk b/make/MacBundles.gmk
index a4e7db333db..23b9c88158c 100644
--- a/make/MacBundles.gmk
+++ b/make/MacBundles.gmk
@@ -36,7 +36,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   # JDK_MACOSX_CONTENTS_DIR and JRE_MACOSX_CONTENTS_DIR are defined in SPEC.
 
-  MACOSX_PLIST_SRC := $(JDK_TOPDIR)/make/data/bundle
+  MACOSX_PLIST_SRC := $(TOPDIR)/make/data/bundle
 
   BUNDLE_ID := $(MACOSX_BUNDLE_ID_BASE).$(VERSION_SHORT)
   BUNDLE_NAME := $(MACOSX_BUNDLE_NAME_BASE) $(VERSION_SHORT)
diff --git a/make/Main.gmk b/make/Main.gmk
index f367d48ec2a..6ed69099bdd 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -38,12 +38,12 @@ endif
 # Now load the spec
 include $(SPEC)
 
-include $(SRC_ROOT)/make/MainSupport.gmk
+include $(TOPDIR)/make/MainSupport.gmk
 
 # Load the vital tools for all the makefiles.
-include $(SRC_ROOT)/make/common/MakeBase.gmk
-include $(SRC_ROOT)/make/common/Modules.gmk
-include $(SRC_ROOT)/make/common/FindTests.gmk
+include $(TOPDIR)/make/common/MakeBase.gmk
+include $(TOPDIR)/make/common/Modules.gmk
+include $(TOPDIR)/make/common/FindTests.gmk
 
 # Declare ALL_TARGETS as an immediate variable. This variable is a list of all
 # valid top level targets. It's used to declare them all as PHONY and to
@@ -70,25 +70,25 @@ ALL_MODULES := $(call FindAllModules)
 # been built and should not be built again.
 ifneq ($(CREATING_BUILDJDK), true)
   buildtools-langtools:
-	+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Tools.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ToolsLangtools.gmk)
 
   interim-langtools:
-	+($(CD) $(LANGTOOLS_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterim.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimLangtools.gmk)
 
   interim-rmic:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
 
   interim-cldrconverter:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimCLDRConverter.gmk)
 
   buildtools-jdk:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsJdk.gmk)
 
   buildtools-modules:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileModuleTools.gmk)
 
   buildtools-hotspot:
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileTools.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsHotspot.gmk)
 endif
 
 ALL_TARGETS += buildtools-langtools interim-langtools \
@@ -99,7 +99,7 @@ ALL_TARGETS += buildtools-langtools interim-langtools \
 # Special targets for certain modules
 
 unpack-sec:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UnpackSecurity.gmk)
 
 generate-exported-symbols:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f BuildStatic.gmk)
@@ -113,16 +113,19 @@ ALL_TARGETS += unpack-sec generate-exported-symbols
 # into the buildjdk so no need to generate sources.
 ifneq ($(CREATING_BUILDJDK), true)
   $(eval $(call DeclareRecipesForPhase, GENSRC, \
-      TARGET_SUFFIX := gensrc, \
+      TARGET_SUFFIX := gensrc-src, \
       FILE_PREFIX := Gensrc, \
       MAKE_SUBDIR := gensrc, \
       CHECK_MODULES := $(ALL_MODULES), \
-      MULTIPLE_MAKEFILES := true))
+  ))
 
-  JDK_GENSRC_TARGETS := $(filter %-gensrc-jdk, $(GENSRC_TARGETS))
-  LANGTOOLS_GENSRC_TARGETS := $(filter %-gensrc-langtools, $(GENSRC_TARGETS))
-  CORBA_GENSRC_TARGETS := $(filter %-gensrc-corba, $(GENSRC_TARGETS))
-  HOTSPOT_GENSRC_TARGETS := $(filter %-gensrc-hotspot, $(GENSRC_TARGETS))
+  $(foreach m, $(GENSRC_MODULES), $(eval $m-gensrc: $m-gensrc-src))
+
+  LANGTOOLS_GENSRC_TARGETS := $(filter $(addsuffix -%, $(LANGTOOLS_MODULES)), $(GENSRC_TARGETS))
+  CORBA_GENSRC_TARGETS := $(filter $(addsuffix -%, $(CORBA_MODULES)), $(GENSRC_TARGETS))
+  HOTSPOT_GENSRC_TARGETS := $(filter $(addsuffix -%, $(HOTSPOT_MODULES)), $(GENSRC_TARGETS))
+  JDK_GENSRC_TARGETS := $(filter-out $(LANGTOOLS_GENSRC_TARGETS) \
+      $(CORBA_GENSRC_TARGETS) $(HOTSPOT_GENSRC_TARGETS), $(GENSRC_TARGETS))
 
   GENSRC_MODULEINFO_MODULES := $(ALL_MODULES)
   GENSRC_MODULEINFO_TARGETS := $(addsuffix -gensrc-moduleinfo, \
@@ -134,7 +137,7 @@ ifneq ($(CREATING_BUILDJDK), true)
 
   define DeclareModuleInfoRecipe
     $1-gensrc-moduleinfo:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f GensrcModuleInfo.gmk MODULE=$1)
 
     $1-gensrc: $1-gensrc-moduleinfo
@@ -164,7 +167,7 @@ $(eval $(call DeclareRecipesForPhase, COPY, \
     MAKE_SUBDIR := copy, \
     CHECK_MODULES := $(ALL_MODULES), \
     USE_WRAPPER := true, \
-    MULTIPLE_MAKEFILES := true))
+))
 
 ALL_COPY_MODULES += $(COPY_MODULES)
 ALL_COPY_TARGETS += $(COPY_TARGETS)
@@ -176,7 +179,7 @@ ALL_COPY_TARGETS += $(IMPORT_COPY_TARGETS)
 
 define DeclareImportCopyRecipe
   $1-copy:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f CopyImportModules.gmk MODULE=$1)
 endef
 
@@ -191,7 +194,7 @@ JAVA_TARGETS := $(addsuffix -java, $(JAVA_MODULES))
 
 define DeclareCompileJavaRecipe
   $1-java:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f CompileJavaModules.gmk MODULE=$1)
 endef
 
@@ -201,7 +204,7 @@ $(foreach m, $(filter-out jdk.scripting.nashorn, $(JAVA_MODULES)), \
 # Build nashorn. Needs to be compiled separately from the rest of the modules
 # due to nasgen.
 jdk.scripting.nashorn-java:
-	+($(CD) $(NASHORN_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	    -f BuildNashorn.gmk compile)
 
 ALL_TARGETS += $(JAVA_TARGETS)
@@ -248,7 +251,7 @@ HOTSPOT_VARIANT_LIBS_TARGETS := $(addsuffix -libs, $(HOTSPOT_VARIANT_TARGETS))
 define DeclareHotspotGensrcRecipe
   hotspot-$1-gensrc:
 	$$(call LogInfo, Building JVM variant '$1' with features '$(JVM_FEATURES_$1)')
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \
+	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f gensrc/GenerateSources.gmk \
 	    JVM_VARIANT=$1)
 endef
 
@@ -256,17 +259,17 @@ $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotGensrcRecipe,$v)))
 
 define DeclareHotspotLibsRecipe
   hotspot-$1-libs:
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
+	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibraries.gmk \
 	    JVM_VARIANT=$1)
 endef
 
 $(foreach v, $(JVM_VARIANTS), $(eval $(call DeclareHotspotLibsRecipe,$v)))
 
 hotspot-jsig:
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk)
+	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f lib/CompileLibjsig.gmk)
 
 hotspot-ide-project:
-	+($(CD) $(HOTSPOT_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
+	+($(CD) $(TOPDIR)/make/hotspot && $(MAKE) $(MAKE_ARGS) -f ide/CreateVSProject.gmk)
 
 ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
     $(HOTSPOT_VARIANT_LIBS_TARGETS) hotspot-jsig hotspot-ide-project
@@ -275,10 +278,10 @@ ALL_TARGETS += $(HOTSPOT_VARIANT_TARGETS) $(HOTSPOT_VARIANT_GENSRC_TARGETS) \
 # Build demos targets
 
 demos-jdk:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk)
 
 test-image-demos-jdk:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk images)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileDemos.gmk images)
 
 ALL_TARGETS += demos-jdk test-image-demos-jdk
 
@@ -286,7 +289,7 @@ ALL_TARGETS += demos-jdk test-image-demos-jdk
 # Jigsaw specific data and analysis targets.
 
 generate-summary:
-	+($(CD) $(JDK_TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateModuleSummary.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateModuleSummary.gmk)
 
 ALL_TARGETS += generate-summary
 
@@ -298,7 +301,7 @@ JMOD_TARGETS := $(addsuffix -jmod, $(JMOD_MODULES))
 
 define DeclareJmodRecipe
   $1-jmod:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
 	    MODULE=$1)
 endef
 
@@ -310,50 +313,50 @@ ALL_TARGETS += $(JMOD_TARGETS)
 # Images targets
 
 store-source-revision:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk store-source-revision)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk store-source-revision)
 
 create-source-revision-tracker:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk create-source-revision-tracker)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f SourceRevision.gmk create-source-revision-tracker)
 
 BOOTCYCLE_TARGET := product-images
 bootcycle-images:
         ifneq ($(COMPILE_TYPE), cross)
 	  $(call LogWarn, Boot cycle build step 2: Building a new JDK image using previously built image)
-	  +$(MAKE) $(MAKE_ARGS) -f $(SRC_ROOT)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
+	  +$(MAKE) $(MAKE_ARGS) -f $(TOPDIR)/make/Init.gmk PARALLEL_TARGETS=$(BOOTCYCLE_TARGET) \
 	      JOBS= SPEC=$(dir $(SPEC))bootcycle-spec.gmk main
         else
 	  $(call LogWarn, Boot cycle build disabled when cross compiling)
         endif
 
 zip-security:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ZipSecurity.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ZipSecurity.gmk)
 
 zip-source:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ZipSource.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ZipSource.gmk)
 
 jrtfs-jar:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f JrtfsJar.gmk)
 
 jdk-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jdk)
 
 jre-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk jre)
 
 symbols-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk symbols)
 
 profiles-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Images.gmk profiles)
 
 mac-bundles-jdk:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f MacBundles.gmk)
 
 release-file:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ReleaseFile.gmk)
 
 exploded-image-optimize:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ExplodedImageOptimize.gmk)
 
 ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-images zip-security \
     zip-source jrtfs-jar jdk-image jre-image \
@@ -366,28 +369,28 @@ ALL_TARGETS += store-source-revision create-source-revision-tracker bootcycle-im
 # If building full docs, to complete docs-*-api we need both the javadoc and
 # modulegraph targets.
 docs-jdk-api-javadoc:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-javadoc)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-javadoc)
 
 docs-jdk-api-modulegraph:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-modulegraph)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-api-modulegraph)
 
 docs-javase-api-javadoc:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-javadoc)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-javadoc)
 
 docs-javase-api-modulegraph:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-modulegraph)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-javase-api-modulegraph)
 
 docs-jdk-specs:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-specs)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-specs)
 
 docs-jdk-index:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-index)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-jdk-index)
 
 docs-zip:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-zip)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Docs.gmk docs-zip)
 
 update-build-docs:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f UpdateBuildDocs.gmk)
 
 ALL_TARGETS += docs-jdk-api-javadoc docs-jdk-api-modulegraph \
     docs-javase-api-javadoc docs-javase-api-modulegraph docs-jdk-specs \
@@ -403,10 +406,10 @@ ifeq ($(CREATING_BUILDJDK), true)
 endif
 
 create-buildjdk-copy:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CreateBuildJdkCopy.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateBuildJdkCopy.gmk)
 
 create-buildjdk-interim-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Main.gmk \
 	    $@-helper \
 	    SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
 	    HOTSPOT_SPEC=$(dir $(SPEC))buildjdk-spec.gmk \
@@ -422,7 +425,7 @@ INTERIM_JMOD_TARGETS := $(addsuffix -interim-jmod, $(INTERIM_IMAGE_MODULES))
 
 define DeclareInterimJmodRecipe
   $1-interim-jmod:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CreateJmods.gmk \
 	    MODULE=$1 \
 	    JMODS_DIR=$(INTERIM_JMODS_DIR) \
 	    JMODS_TEMPDIR=$(INTERIM_JMODS_DIR)/temp \
@@ -433,11 +436,11 @@ endef
 $(foreach m, $(INTERIM_IMAGE_MODULES), $(eval $(call DeclareInterimJmodRecipe,$m)))
 
 interim-image:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f InterimImage.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f InterimImage.gmk)
 
 ifeq ($(ENABLE_GENERATE_CLASSLIST), true)
   generate-link-opt-data:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f GenerateLinkOptData.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f GenerateLinkOptData.gmk)
 endif
 
 ALL_TARGETS += $(INTERIM_JMOD_TARGETS) interim-image generate-link-opt-data
@@ -448,10 +451,10 @@ ALL_TARGETS += $(INTERIM_JMOD_TARGETS) interim-image generate-link-opt-data
 
 define DeclareRunTestRecipe
   run-test-$1:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1")
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test TEST="$1")
 
   exploded-run-test-$1:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f RunTests.gmk run-test \
 	    TEST="$1" JDK_IMAGE_DIR=$(JDK_OUTPUTDIR))
 
 endef
@@ -472,19 +475,19 @@ prepare-test-image:
 	$(ECHO) > $(TEST_IMAGE_DIR)/Readme.txt 'JDK test image'
 
 build-test-hotspot-jtreg-native:
-	+($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
+	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeHotspot.gmk \
 	    build-test-hotspot-jtreg-native)
 
 test-image-hotspot-jtreg-native:
-	+($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
+	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeHotspot.gmk \
 	    test-image-hotspot-jtreg-native)
 
 build-test-jdk-jtreg-native:
-	+($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
+	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeJdk.gmk \
 	    build-test-jdk-jtreg-native)
 
 test-image-jdk-jtreg-native:
-	+($(CD) $(JDK_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNative.gmk \
+	+($(CD) $(TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f JtregNativeJdk.gmk \
 	    test-image-jdk-jtreg-native)
 
 run-test:
@@ -496,7 +499,7 @@ exploded-run-test:
 
 ifeq ($(BUILD_GTEST), true)
   test-image-hotspot-gtest:
-	+($(CD) $(HOTSPOT_TOPDIR)/make/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk)
+	+($(CD) $(TOPDIR)/make/hotspot/test && $(MAKE) $(MAKE_ARGS) -f GtestImage.gmk)
 endif
 
 build-test-lib:
@@ -548,7 +551,7 @@ test-jdk-jtreg-native:
 	$(call RunTests, "jdk_native_sanity", $(JDK_IMAGE_DIR))
 
 test-make:
-	($(CD) $(SRC_ROOT)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
+	($(CD) $(TOPDIR)/test/make && $(MAKE) $(MAKE_ARGS) -f TestMake.gmk $(TEST_TARGET))
 
 ALL_TARGETS += test test-hotspot-jtreg test-hotspot-jtreg-native \
     test-hotspot-internal test-hotspot-gtest test-jdk-jtreg-native test-make
@@ -574,7 +577,7 @@ ALL_TARGETS += product-bundles profiles-bundles test-bundles docs-bundles
 # Install targets
 
 install:
-	+($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) -f Install.gmk)
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f Install.gmk)
 
 ALL_TARGETS += install
 
@@ -681,18 +684,18 @@ else
 
   # The swing beans need to have java base properly generated to avoid errors
   # in javadoc.
-  java.desktop-gensrc-jdk: java.base-gensrc
+  java.desktop-gensrc-src: java.base-gensrc
 
   # The annotation processing for jdk.internal.vm.ci and jdk.internal.vm.compiler
   # needs classes from the current JDK.
-  jdk.internal.vm.ci-gensrc-hotspot: $(addsuffix -java, \
+  jdk.internal.vm.ci-gensrc-src: $(addsuffix -java, \
       $(call FindTransitiveDepsForModule, jdk.internal.vm.ci))
-  jdk.internal.vm.compiler-gensrc-hotspot: $(addsuffix -java, \
+  jdk.internal.vm.compiler-gensrc-src: $(addsuffix -java, \
       $(call FindTransitiveDepsForModule, jdk.internal.vm.compiler))
 
   # For jdk.internal.vm.compiler, the gensrc step is generating a module-info.java.extra
   # file to be processed by the gensrc-moduleinfo target.
-  jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-hotspot
+  jdk.internal.vm.compiler-gensrc-moduleinfo: jdk.internal.vm.compiler-gensrc-src
 
   # Explicitly add dependencies for special targets
   java.base-java: unpack-sec
@@ -1084,7 +1087,7 @@ dist-clean: clean
 	  if test "x`$(LS) $(OUTPUT_ROOT)`" != x; then \
 	    $(ECHO) "Warning: Not removing non-empty configuration directory for '$(CONF_NAME)'" ; \
 	  else \
-	    ($(CD) $(SRC_ROOT) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" \
+	    ($(CD) $(TOPDIR) && $(ECHO) "Removing configuration directory for '$(CONF_NAME)'" \
 	        && $(RM) -r $(OUTPUT_ROOT)) \
 	  fi \
 	)
@@ -1103,7 +1106,7 @@ ALL_TARGETS += $(addsuffix -only, $(filter-out dist-clean clean%, $(ALL_TARGETS)
 ################################################################################
 
 # Include JPRT targets
-include $(SRC_ROOT)/make/Jprt.gmk
+include $(TOPDIR)/make/Jprt.gmk
 
 ################################################################################
 
diff --git a/make/MainSupport.gmk b/make/MainSupport.gmk
index 73bb88e7efc..8637fba788c 100644
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@@ -33,7 +33,7 @@ _MAINSUPPORT_GMK := 1
 # Run the tests specified by $1, with PRODUCT_HOME specified by $2
 # JT_JAVA is picked up by the jtreg launcher and used to run Jtreg itself.
 define RunTests
-	($(CD) $(SRC_ROOT)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
+	($(CD) $(TOPDIR)/test && $(MAKE) $(MAKE_ARGS) -j1 -k MAKEFLAGS= \
 	    JT_HOME=$(JT_HOME) PRODUCT_HOME=$(strip $2) \
 	    TEST_IMAGE_DIR=$(TEST_IMAGE_DIR) \
 	    ALT_OUTPUTDIR=$(OUTPUT_ROOT) TEST_JOBS=$(TEST_JOBS) \
@@ -118,42 +118,36 @@ endef
 
 ################################################################################
 
-MAKE_TOPDIR_LIST := $(JDK_TOPDIR) $(CORBA_TOPDIR) $(LANGTOOLS_TOPDIR) \
-    $(HOTSPOT_TOPDIR)
-MAKE_MAKEDIR_LIST := make
+PHASE_MAKEDIRS := $(TOPDIR)/make
 
 # Helper macro for DeclareRecipesForPhase
 # Declare a recipe for calling the module and phase specific makefile.
 # If there are multiple makefiles to call, create a rule for each topdir
 # that contains a makefile with the target $module-$suffix-$repodir,
-# (i.e: java.base-gensrc-jdk)
+# (i.e: java.base-gensrc-src)
 # Normally there is only one makefile, and the target will just be
 # $module-$suffix
 # Param 1: Name of list to add targets to
 # Param 2: Module name
-# Param 3: Topdir
 define DeclareRecipeForModuleMakefile
-  ifeq ($$($1_MULTIPLE_MAKEFILES), true)
-    $2-$$($1_TARGET_SUFFIX): $2-$$($1_TARGET_SUFFIX)-$$(notdir $3)
-
-    $2-$$($1_TARGET_SUFFIX)-$$(notdir $3):
-  else
-    $2-$$($1_TARGET_SUFFIX):
-  endif
+  $2-$$($1_TARGET_SUFFIX):
         ifeq ($$($1_USE_WRAPPER), true)
-	  +($(CD) $(SRC_ROOT)/make && $(MAKE) $(MAKE_ARGS) \
+	  +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
 	      -f ModuleWrapper.gmk \
-	          $$(addprefix -I, $$(wildcard $$(addprefix $3/, $(MAKE_MAKEDIR_LIST)) \
-	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(addprefix $3/, $(MAKE_MAKEDIR_LIST))))) \
-	          MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX))
+	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
+	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
+	      ) \
+	      MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX))
         else
-	  +($(CD) $$(dir $$(firstword $$(wildcard $$(patsubst %, \
-	          $3/%/$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $(MAKE_MAKEDIR_LIST))))) \
-	    && $(MAKE) $(MAKE_ARGS) \
-	          -f $$($1_FILE_PREFIX)-$2.gmk \
-	          $$(addprefix -I, $$(wildcard $$(addprefix $3/, $(MAKE_MAKEDIR_LIST)) \
-	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(addprefix $3/, $(MAKE_MAKEDIR_LIST))))) \
-	          MODULE=$2)
+	  +($(CD) $$(dir $$(firstword $$(wildcard $$(addsuffix \
+	      /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))) \
+	  && $(MAKE) $(MAKE_ARGS) \
+	      -f $$($1_FILE_PREFIX)-$2.gmk \
+	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
+	          $$(addsuffix /$$($1_MAKE_SUBDIR), $$(PHASE_MAKEDIRS)) \
+	      ) \
+	      MODULE=$2 \
+	  )
         endif
 
 endef
@@ -162,14 +156,11 @@ endef
 # Param 1: Name of list to add targets to
 # Param 2: Module name
 define DeclareRecipesForPhaseAndModule
-  $1_$2_TOPDIRS := $$(strip $$(sort $$(foreach d, $(MAKE_TOPDIR_LIST), \
-      $$(patsubst $$d/%, $$d, $$(filter $$d/%, \
-          $$(wildcard $$(patsubst %, %/$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, \
-          $$(foreach s, $(MAKE_MAKEDIR_LIST), \
-              $$(addsuffix /$$s, $(MAKE_TOPDIR_LIST))))))))))
+  $1_$2_MAKEFILES := $$(strip $$(wildcard \
+      $$(addsuffix /$$($1_MAKE_SUBDIR)/$$($1_FILE_PREFIX)-$2.gmk, $$(PHASE_MAKEDIRS))))
 
   # Only declare recipes if there are makefiles to call
-  ifneq ($$($1_$2_TOPDIRS), )
+  ifneq ($$($1_$2_MAKEFILES), )
     # Add the top dir specific target to target list regardless of if recipe
     # generation is disabled.
     ifeq ($$($1_MULTIPLE_MAKEFILES), true)
@@ -177,8 +168,7 @@ define DeclareRecipesForPhaseAndModule
         $$(eval $1 += $2-$$($1_TARGET_SUFFIX)-$$(notdir $$d)))
     endif
     ifeq ($(NO_RECIPES),)
-      $$(foreach d, $$($1_$2_TOPDIRS), \
-          $$(eval $$(call DeclareRecipeForModuleMakefile,$1,$2,$$d)))
+      $$(eval $$(call DeclareRecipeForModuleMakefile,$1,$2))
     endif
     $1 += $2-$$($1_TARGET_SUFFIX)
     $1_MODULES += $2
@@ -200,7 +190,7 @@ endef
 # $1_MODULES : All modules that had rules generated
 # $1_TARGETS : All targets generated
 define DeclareRecipesForPhase
-  $(foreach i,2 3 4 5 6 7, $(if $($i),$(strip $1)_$(strip $($i)))$(NEWLINE))
+  $(foreach i,2 3 4 5 6 7, $(if $(strip $($i)),$(strip $1)_$(strip $($i)))$(NEWLINE))
   $(if $(8),$(error Internal makefile error: Too many arguments to \
       DeclareRecipesForPhase, please update MakeHelper.gmk))
 
diff --git a/make/SourceRevision.gmk b/make/SourceRevision.gmk
index a14b3ef0e29..f4987cf4679 100644
--- a/make/SourceRevision.gmk
+++ b/make/SourceRevision.gmk
@@ -28,6 +28,8 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
+$(eval $(call IncludeCustomExtension, , SourceRevision.gmk))
+
 ################################################################################
 # Keep track of what source revision is used to create the build, by creating
 # a tracker file in the output directory. This tracker file is included in the
diff --git a/make/ToolsJdk.gmk b/make/ToolsJdk.gmk
index 55c3934536b..34be124a0b6 100644
--- a/make/ToolsJdk.gmk
+++ b/make/ToolsJdk.gmk
@@ -29,7 +29,7 @@ _TOOLS_GMK := 1
 include JavaCompilation.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, Tools.gmk))
+$(eval $(call IncludeCustomExtension, , Tools.gmk))
 
 ################################################################################
 # To avoid reevaluating the compilation setup for the tools each time this file
@@ -60,7 +60,7 @@ TOOL_GENERATECHARACTER = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_cla
 TOOL_CHARACTERNAME = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.generatecharacter.CharacterName
 
-TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(JDK_TOPDIR)/make/data/dtdbuilder \
+TOOL_DTDBUILDER = $(JAVA_SMALL) -Ddtd_home=$(TOPDIR)/make/data/dtdbuilder \
     -Djava.awt.headless=true \
     -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes build.tools.dtdbuilder.DTDBuilder
 
diff --git a/make/ToolsLangtools.gmk b/make/ToolsLangtools.gmk
index d6fae56280d..2f2df2556e3 100644
--- a/make/ToolsLangtools.gmk
+++ b/make/ToolsLangtools.gmk
@@ -38,7 +38,7 @@ $(eval $(call SetupJavaCompilation,BUILD_TOOLS_LANGTOOLS, \
     SETUP := BOOT_JAVAC, \
     DISABLE_SJAVAC := true, \
     ADD_JAVAC_FLAGS := -Xprefer:source, \
-    SRC := $(LANGTOOLS_TOPDIR)/make/tools, \
+    SRC := $(TOPDIR)/make/langtools/tools, \
     INCLUDES := compileproperties propertiesparser, \
     COPY := .properties, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/langtools_tools_classes))
diff --git a/make/UnpackSecurity.gmk b/make/UnpackSecurity.gmk
index 9e5e615167a..0a3b2d0e443 100644
--- a/make/UnpackSecurity.gmk
+++ b/make/UnpackSecurity.gmk
@@ -30,10 +30,10 @@ include MakeBase.gmk
 
 ################################################################################
 # Unpack the binary distributions of the crypto classes if they exist.
-SEC_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-bin.zip
-SEC_FILES_WIN_ZIP := $(JDK_TOPDIR)/make/tools/crypto/sec-windows-bin.zip
-JGSS_WIN32_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip
-JGSS_WIN64_FILES_ZIP := $(JDK_TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip
+SEC_FILES_ZIP := $(TOPDIR)/make/tools/crypto/sec-bin.zip
+SEC_FILES_WIN_ZIP := $(TOPDIR)/make/tools/crypto/sec-windows-bin.zip
+JGSS_WIN32_FILES_ZIP := $(TOPDIR)/make/tools/crypto/jgss-windows-i586-bin.zip
+JGSS_WIN64_FILES_ZIP := $(TOPDIR)/make/tools/crypto/jgss-windows-x64-bin.zip
 
 define unzip-sec-file
 	$(ECHO) Unzipping $(<F)
diff --git a/make/UpdateBuildDocs.gmk b/make/UpdateBuildDocs.gmk
index edcd6485a09..fe048999b0b 100644
--- a/make/UpdateBuildDocs.gmk
+++ b/make/UpdateBuildDocs.gmk
@@ -39,11 +39,11 @@ ifeq ($(PANDOC), )
   $(error Cannot continue)
 endif
 
-GLOBAL_SPECS_DEFAULT_CSS_FILE := $(JDK_TOPDIR)/make/data/docs-resources/resources/jdk-default.css
+GLOBAL_SPECS_DEFAULT_CSS_FILE := $(TOPDIR)/make/data/docs-resources/resources/jdk-default.css
 
 ################################################################################
 
-DOCS_DIR := $(TOPDIR)/common/doc
+DOCS_DIR := $(TOPDIR)/doc
 
 $(eval $(call SetupProcessMarkdown, building, \
   FILES := $(DOCS_DIR)/building.md, \
diff --git a/make/autoconf/basics.m4 b/make/autoconf/basics.m4
index 0bce558c1c7..890121acd9c 100644
--- a/make/autoconf/basics.m4
+++ b/make/autoconf/basics.m4
@@ -577,7 +577,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_PATHS],
   AC_SUBST(CANONICAL_TOPDIR)
 
   # Locate the directory of this script.
-  AUTOCONF_DIR=$TOPDIR/common/autoconf
+  AUTOCONF_DIR=$TOPDIR/make/autoconf
 
   # Setup username (for use in adhoc version strings etc)
   # Outer [ ] to quote m4.
@@ -768,11 +768,14 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
   AC_ARG_WITH(conf-name, [AS_HELP_STRING([--with-conf-name],
       [use this as the name of the configuration @<:@generated from important configuration options@:>@])],
       [ CONF_NAME=${with_conf_name} ])
+  AC_ARG_WITH(output-base-dir, [AS_HELP_STRING([--with-output-base-dir],
+      [override the default output base directory @<:@./build@:>@])],
+      [ OUTPUT_BASE=${with_output_base_dir} ], [ OUTPUT_BASE="$SRC_ROOT/build" ] )
 
   # Test from where we are running configure, in or outside of src root.
   AC_MSG_CHECKING([where to store configuration])
   if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
+      || test "x$CURDIR" = "x$SRC_ROOT/make/autoconf" \
       || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
@@ -782,7 +785,7 @@ AC_DEFUN_ONCE([BASIC_SETUP_OUTPUT_DIR],
     else
       AC_MSG_RESULT([in build directory with custom name])
     fi
-    OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
+    OUTPUT_ROOT="${OUTPUT_BASE}/${CONF_NAME}"
     $MKDIR -p "$OUTPUT_ROOT"
     if test ! -d "$OUTPUT_ROOT"; then
       AC_MSG_ERROR([Could not create build directory $OUTPUT_ROOT])
diff --git a/make/autoconf/basics_windows.m4 b/make/autoconf/basics_windows.m4
index 2ae6e34a556..01c28d31de4 100644
--- a/make/autoconf/basics_windows.m4
+++ b/make/autoconf/basics_windows.m4
@@ -382,7 +382,7 @@ AC_DEFUN_ONCE([BASIC_COMPILE_FIXPATH],
   FIXPATH=
   if test "x$OPENJDK_BUILD_OS" = xwindows; then
     AC_MSG_CHECKING([if fixpath can be created])
-    FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
+    FIXPATH_SRC="$SRC_ROOT/make/src/native/fixpath.c"
     FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
     FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
     if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
diff --git a/make/autoconf/compare.sh.in b/make/autoconf/compare.sh.in
index 76d921f4b32..2d9a2187957 100644
--- a/make/autoconf/compare.sh.in
+++ b/make/autoconf/compare.sh.in
@@ -88,7 +88,7 @@ if [ "$OPENJDK_TARGET_OS" = "windows" ]; then
 fi
 
 # Now locate the main script and run it.
-REAL_COMPARE_SCRIPT="$SRC_ROOT/common/bin/compare.sh"
+REAL_COMPARE_SCRIPT="$SRC_ROOT/make/scripts/compare.sh"
 if [ ! -e "$REAL_COMPARE_SCRIPT" ]; then
   echo "Error: Cannot locate compare script, it should have been in $REAL_COMPARE_SCRIPT"
   exit 1
@@ -100,4 +100,4 @@ $MV $OUTPUT_ROOT/compare.log $OUTPUT_ROOT/compare.log.old 2> /dev/null
 
 export SCRIPT_DIR="$( cd "$( dirname "$0" )" > /dev/null && pwd )"
 
-$BASH $SRC_ROOT/common/bin/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"
+$BASH $SRC_ROOT/make/scripts/logger.sh $OUTPUT_ROOT/compare.log $BASH "$REAL_COMPARE_SCRIPT" "$@"
diff --git a/make/autoconf/configure b/make/autoconf/configure
index 547cb33fbc8..1c5b4062ad9 100644
--- a/make/autoconf/configure
+++ b/make/autoconf/configure
@@ -44,7 +44,7 @@ fi
 export CONFIG_SHELL=$BASH
 export _as_can_reexec=no
 
-conf_script_dir="$TOPDIR/common/autoconf"
+conf_script_dir="$TOPDIR/make/autoconf"
 
 if [ "$CUSTOM_CONFIG_DIR" = "" ]; then
   conf_custom_script_dir="$TOPDIR/closed/autoconf"
diff --git a/make/autoconf/configure.ac b/make/autoconf/configure.ac
index 0bf6cf97c5e..333b818d7b8 100644
--- a/make/autoconf/configure.ac
+++ b/make/autoconf/configure.ac
@@ -33,7 +33,7 @@
 AC_PREREQ([2.69])
 AC_INIT(OpenJDK, jdk9, build-dev@openjdk.java.net,,http://openjdk.java.net)
 
-AC_CONFIG_AUX_DIR([$TOPDIR/common/autoconf/build-aux])
+AC_CONFIG_AUX_DIR([$TOPDIR/make/autoconf/build-aux])
 m4_include([build-aux/pkg.m4])
 
 # Include these first...
diff --git a/make/autoconf/flags.m4 b/make/autoconf/flags.m4
index 6f0aa50e024..03b4a7d9c80 100644
--- a/make/autoconf/flags.m4
+++ b/make/autoconf/flags.m4
@@ -1162,11 +1162,11 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER],
   # Setup some hard coded includes
   $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
       -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
-      -I${JDK_TOPDIR}/src/java.base/share/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
-      -I${JDK_TOPDIR}/src/java.base/share/native/libjava \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/libjava"
+      -I${TOPDIR}/src/java.base/share/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/include \
+      -I${TOPDIR}/src/java.base/share/native/libjava \
+      -I${TOPDIR}/src/java.base/$OPENJDK_$1_OS_TYPE/native/libjava"
 
   # The shared libraries are compiled using the picflag.
   $2CFLAGS_JDKLIB="[$]$2COMMON_CCXXFLAGS_JDK \
diff --git a/make/autoconf/generated-configure.sh b/make/autoconf/generated-configure.sh
index 08d6ccb6717..28eaa47f880 100644
--- a/make/autoconf/generated-configure.sh
+++ b/make/autoconf/generated-configure.sh
@@ -871,7 +871,6 @@ IMPORT_MODULES_LIBS
 IMPORT_MODULES_CMDS
 IMPORT_MODULES_CLASSES
 BUILD_OUTPUT
-JDK_TOPDIR
 NASHORN_TOPDIR
 HOTSPOT_TOPDIR
 JAXWS_TOPDIR
@@ -1140,6 +1139,7 @@ with_toolchain_path
 with_extra_path
 with_sdk_name
 with_conf_name
+with_output_base_dir
 with_output_sync
 with_default_make_target
 enable_headless_only
@@ -2059,6 +2059,7 @@ Optional Packages:
   --with-sdk-name         use the platform SDK of the given name. [macosx]
   --with-conf-name        use this as the name of the configuration [generated
                           from important configuration options]
+  --with-output-base-dir  override the default output base directory [./build]
   --with-output-sync      set make output sync type if supported by make.
                           [recurse]
   --with-default-make-target
@@ -3451,7 +3452,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 ac_aux_dir=
-for ac_dir in $TOPDIR/common/autoconf/build-aux "$srcdir"/$TOPDIR/common/autoconf/build-aux; do
+for ac_dir in $TOPDIR/make/autoconf/build-aux "$srcdir"/$TOPDIR/make/autoconf/build-aux; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -3467,7 +3468,7 @@ for ac_dir in $TOPDIR/common/autoconf/build-aux "$srcdir"/$TOPDIR/common/autocon
   fi
 done
 if test -z "$ac_aux_dir"; then
-  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $TOPDIR/common/autoconf/build-aux \"$srcdir\"/$TOPDIR/common/autoconf/build-aux" "$LINENO" 5
+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in $TOPDIR/make/autoconf/build-aux \"$srcdir\"/$TOPDIR/make/autoconf/build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -5161,7 +5162,7 @@ VS_SDK_PLATFORM_NAME_2013=
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1504441177
+DATE_WHEN_GENERATED=1505235832
 
 ###############################################################################
 #
@@ -16905,7 +16906,7 @@ $as_echo "$as_me: The path of TOPDIR, which resolves as \"$path\", is invalid."
 
 
   # Locate the directory of this script.
-  AUTOCONF_DIR=$TOPDIR/common/autoconf
+  AUTOCONF_DIR=$TOPDIR/make/autoconf
 
   # Setup username (for use in adhoc version strings etc)
   # Outer [ ] to quote m4.
@@ -17600,11 +17601,19 @@ if test "${with_conf_name+set}" = set; then :
 fi
 
 
+# Check whether --with-output-base-dir was given.
+if test "${with_output_base_dir+set}" = set; then :
+  withval=$with_output_base_dir;  OUTPUT_BASE=${with_output_base_dir}
+else
+   OUTPUT_BASE="$SRC_ROOT/build"
+fi
+
+
   # Test from where we are running configure, in or outside of src root.
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking where to store configuration" >&5
 $as_echo_n "checking where to store configuration... " >&6; }
   if test "x$CURDIR" = "x$SRC_ROOT" || test "x$CURDIR" = "x$SRC_ROOT/common" \
-      || test "x$CURDIR" = "x$SRC_ROOT/common/autoconf" \
+      || test "x$CURDIR" = "x$SRC_ROOT/make/autoconf" \
       || test "x$CURDIR" = "x$SRC_ROOT/make" ; then
     # We are running configure from the src root.
     # Create a default ./build/target-variant-debuglevel output root.
@@ -17616,7 +17625,7 @@ $as_echo "in default location" >&6; }
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: in build directory with custom name" >&5
 $as_echo "in build directory with custom name" >&6; }
     fi
-    OUTPUT_ROOT="$SRC_ROOT/build/${CONF_NAME}"
+    OUTPUT_ROOT="${OUTPUT_BASE}/${CONF_NAME}"
     $MKDIR -p "$OUTPUT_ROOT"
     if test ! -d "$OUTPUT_ROOT"; then
       as_fn_error $? "Could not create build directory $OUTPUT_ROOT" "$LINENO" 5
@@ -51890,11 +51899,11 @@ fi
   # Setup some hard coded includes
   COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK \
       -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
-      -I${JDK_TOPDIR}/src/java.base/share/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/include \
-      -I${JDK_TOPDIR}/src/java.base/share/native/libjava \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/libjava"
+      -I${TOPDIR}/src/java.base/share/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/include \
+      -I${TOPDIR}/src/java.base/share/native/libjava \
+      -I${TOPDIR}/src/java.base/$OPENJDK_TARGET_OS_TYPE/native/libjava"
 
   # The shared libraries are compiled using the picflag.
   CFLAGS_JDKLIB="$COMMON_CCXXFLAGS_JDK \
@@ -52769,11 +52778,11 @@ fi
   # Setup some hard coded includes
   OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
       -I\$(SUPPORT_OUTPUTDIR)/modules_include/java.base \
-      -I${JDK_TOPDIR}/src/java.base/share/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_BUILD_OS/native/include \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/include \
-      -I${JDK_TOPDIR}/src/java.base/share/native/libjava \
-      -I${JDK_TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/libjava"
+      -I${TOPDIR}/src/java.base/share/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_BUILD_OS/native/include \
+      -I${TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/include \
+      -I${TOPDIR}/src/java.base/share/native/libjava \
+      -I${TOPDIR}/src/java.base/$OPENJDK_BUILD_OS_TYPE/native/libjava"
 
   # The shared libraries are compiled using the picflag.
   OPENJDK_BUILD_CFLAGS_JDKLIB="$OPENJDK_BUILD_COMMON_CCXXFLAGS_JDK \
@@ -54200,19 +54209,19 @@ $as_echo "no, forced" >&6; }
   if test "x$ENABLE_AOT" = "xtrue"; then
     # Only enable AOT on X64 platforms.
     if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-      if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
-        if test -e "$HOTSPOT_TOPDIR/src/jdk.internal.vm.compiler"; then
+      if test -e "${TOPDIR}/src/jdk.aot"; then
+        if test -e "${TOPDIR}/src/jdk.internal.vm.compiler"; then
           ENABLE_AOT="true"
         else
           ENABLE_AOT="false"
           if test "x$enable_aot" = "xyes"; then
-            as_fn_error $? "Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot." "$LINENO" 5
+            as_fn_error $? "Cannot build AOT without src/jdk.internal.vm.compiler sources. Remove --enable-aot." "$LINENO" 5
           fi
         fi
       else
         ENABLE_AOT="false"
         if test "x$enable_aot" = "xyes"; then
-          as_fn_error $? "Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot." "$LINENO" 5
+          as_fn_error $? "Cannot build AOT without src/jdk.aot sources. Remove --enable-aot." "$LINENO" 5
         fi
       fi
     else
@@ -54249,7 +54258,7 @@ if test "${enable_hotspot_gtest+set}" = set; then :
 fi
 
 
-  if test -e "$HOTSPOT_TOPDIR/test/native"; then
+  if test -e "${TOPDIR}/test/hotspot/gtest"; then
     GTEST_DIR_EXISTS="true"
   else
     GTEST_DIR_EXISTS="false"
@@ -54302,7 +54311,7 @@ $as_echo "no" >&6; }
   if test "x$OPENJDK_BUILD_OS" = xwindows; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if fixpath can be created" >&5
 $as_echo_n "checking if fixpath can be created... " >&6; }
-    FIXPATH_SRC="$SRC_ROOT/common/src/fixpath.c"
+    FIXPATH_SRC="$SRC_ROOT/make/src/native/fixpath.c"
     FIXPATH_BIN="$CONFIGURESUPPORT_OUTPUTDIR/bin/fixpath.exe"
     FIXPATH_DIR="$CONFIGURESUPPORT_OUTPUTDIR/fixpath"
     if test "x$OPENJDK_BUILD_OS_ENV" = xwindows.cygwin; then
@@ -65934,7 +65943,7 @@ fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
 $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
 
-  if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
+  if test -d "${TOPDIR}/src/jdk.crypto.ec/share/native/libsunec/impl"; then
     ENABLE_INTREE_EC=true
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
diff --git a/make/autoconf/hotspot.m4 b/make/autoconf/hotspot.m4
index 636a7f43d01..487dbde68ac 100644
--- a/make/autoconf/hotspot.m4
+++ b/make/autoconf/hotspot.m4
@@ -214,19 +214,19 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_AOT],
   if test "x$ENABLE_AOT" = "xtrue"; then
     # Only enable AOT on X64 platforms.
     if test "x$OPENJDK_TARGET_CPU" = "xx86_64"; then
-      if test -e "$HOTSPOT_TOPDIR/src/jdk.aot"; then
-        if test -e "$HOTSPOT_TOPDIR/src/jdk.internal.vm.compiler"; then
+      if test -e "${TOPDIR}/src/jdk.aot"; then
+        if test -e "${TOPDIR}/src/jdk.internal.vm.compiler"; then
           ENABLE_AOT="true"
         else
           ENABLE_AOT="false"
           if test "x$enable_aot" = "xyes"; then
-            AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.internal.vm.compiler sources. Remove --enable-aot.])
+            AC_MSG_ERROR([Cannot build AOT without src/jdk.internal.vm.compiler sources. Remove --enable-aot.])
           fi
         fi
       else
         ENABLE_AOT="false"
         if test "x$enable_aot" = "xyes"; then
-          AC_MSG_ERROR([Cannot build AOT without hotspot/src/jdk.aot sources. Remove --enable-aot.])
+          AC_MSG_ERROR([Cannot build AOT without src/jdk.aot sources. Remove --enable-aot.])
         fi
       fi
     else
@@ -488,7 +488,7 @@ AC_DEFUN_ONCE([HOTSPOT_ENABLE_DISABLE_GTEST],
   AC_ARG_ENABLE([hotspot-gtest], [AS_HELP_STRING([--disable-hotspot-gtest],
       [Disables building of the Hotspot unit tests])])
 
-  if test -e "$HOTSPOT_TOPDIR/test/native"; then
+  if test -e "${TOPDIR}/test/hotspot/gtest"; then
     GTEST_DIR_EXISTS="true"
   else
     GTEST_DIR_EXISTS="false"
diff --git a/make/autoconf/jdk-options.m4 b/make/autoconf/jdk-options.m4
index 2ce5830c2e5..df5d8a51508 100644
--- a/make/autoconf/jdk-options.m4
+++ b/make/autoconf/jdk-options.m4
@@ -258,7 +258,7 @@ AC_DEFUN_ONCE([JDKOPT_DETECT_INTREE_EC],
 [
   AC_MSG_CHECKING([if elliptic curve crypto implementation is present])
 
-  if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then
+  if test -d "${TOPDIR}/src/jdk.crypto.ec/share/native/libsunec/impl"; then
     ENABLE_INTREE_EC=true
     AC_MSG_RESULT([yes])
   else
diff --git a/make/autoconf/source-dirs.m4 b/make/autoconf/source-dirs.m4
index 95053e760dd..e5d82a25ed1 100644
--- a/make/autoconf/source-dirs.m4
+++ b/make/autoconf/source-dirs.m4
@@ -39,7 +39,7 @@ AC_DEFUN_ONCE([SRCDIRS_SETUP_TOPDIRS],
   AC_SUBST(JAXWS_TOPDIR)
   AC_SUBST(HOTSPOT_TOPDIR)
   AC_SUBST(NASHORN_TOPDIR)
-  AC_SUBST(JDK_TOPDIR)
+  AC_SUBST(TOPDIR)
 ])
 
 AC_DEFUN_ONCE([SRCDIRS_SETUP_ALTERNATIVE_TOPDIRS],
diff --git a/make/autoconf/spec.gmk.in b/make/autoconf/spec.gmk.in
index 72e28cf5905..2dbce9a5f49 100644
--- a/make/autoconf/spec.gmk.in
+++ b/make/autoconf/spec.gmk.in
@@ -857,6 +857,8 @@ JRE_SYMBOLS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(JRE_SYMBOLS_BUNDLE_NAME)
 TEST_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(TEST_BUNDLE_NAME)
 DOCS_BUNDLE :=  $(BUNDLES_OUTPUTDIR)/$(DOCS_BUNDLE_NAME)
 
+CONFIGURE_CMD := $(TOPDIR)/configure
+
 # This macro is called to allow inclusion of closed source counterparts.
 # Unless overridden in closed sources, it expands to nothing.
 # Usage: This function is called in an open makefile, with the following
diff --git a/make/common/JavaCompilation.gmk b/make/common/JavaCompilation.gmk
index 21e8517685d..f063e036b5c 100644
--- a/make/common/JavaCompilation.gmk
+++ b/make/common/JavaCompilation.gmk
@@ -124,7 +124,7 @@ define add_file_to_clean
 	export LC_ALL=C ; ( $(CAT) $$< && $(ECHO) "" ) \
 	    | $(SED) -e 's/\([^\\]\):/\1\\:/g' -e 's/\([^\\]\)=/\1\\=/g' \
 	        -e 's/\([^\\]\)!/\1\\!/g' -e 's/^[ 	]*#.*/#/g' \
-	    | $(SED) -f "$(SRC_ROOT)/make/common/support/unicode2x.sed" \
+	    | $(SED) -f "$(TOPDIR)/make/common/support/unicode2x.sed" \
 	    | $(SED) -e '/^#/d' -e '/^$$$$/d' \
 	        -e :a -e '/\\$$$$/N; s/\\\n//; ta' \
 	        -e 's/^[ 	]*//;s/[ 	]*$$$$//' \
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
index 3a8a900321d..e2372d0cea3 100644
--- a/make/common/MakeBase.gmk
+++ b/make/common/MakeBase.gmk
@@ -152,18 +152,18 @@ ifeq ($(HAS_FILE_FUNCTION), true)
 else # HAS_FILE_FUNCTION = false
 
   $(eval compress_paths = \
-      $(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-pre-compress.incl)))
+      $(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-pre-compress.incl)))
   compress_paths += \
-      $(subst $(SRC_ROOT),X97, \
+      $(subst $(TOPDIR),X97, \
       $(subst $(OUTPUT_ROOT),X98, \
       $(subst X,X00, \
       $(subst $(SPACE),\n,$(strip $1)))))
   $(eval compress_paths += \
-      $(strip $(shell $(CAT) $(SRC_ROOT)/make/common/support/ListPathsSafely-post-compress.incl)))
+      $(strip $(shell $(CAT) $(TOPDIR)/make/common/support/ListPathsSafely-post-compress.incl)))
 
-  decompress_paths=$(SED) -f $(SRC_ROOT)/make/common/support/ListPathsSafely-uncompress.sed \
+  decompress_paths=$(SED) -f $(TOPDIR)/make/common/support/ListPathsSafely-uncompress.sed \
       -e 's|X99|\\n|g' \
-      -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(SRC_ROOT)|g' \
+      -e 's|X98|$(OUTPUT_ROOT)|g' -e 's|X97|$(TOPDIR)|g' \
       -e 's|X00|X|g'
 
   ListPathsSafely_IfPrintf = \
@@ -344,24 +344,24 @@ SOURCE_REVISION_TRACKER := $(SUPPORT_OUTPUTDIR)/src-rev/source-revision-tracker
 
 # Locate all hg repositories included in the forest, as absolute paths
 FindAllReposAbs = \
-    $(strip $(sort $(dir $(filter-out $(SRC_ROOT)/build/%, $(wildcard \
-        $(addprefix $(SRC_ROOT)/, .hg */.hg */*/.hg */*/*/.hg) \
+    $(strip $(sort $(dir $(filter-out $(TOPDIR)/build/%, $(wildcard \
+        $(addprefix $(TOPDIR)/, .hg */.hg */*/.hg */*/*/.hg */*/*/*/.hg) \
     )))))
 
 # Locate all hg repositories included in the forest, as relative paths
 FindAllReposRel = \
-    $(strip $(subst $(SRC_ROOT)/,.,$(patsubst $(SRC_ROOT)/%/, %, $(FindAllReposAbs))))
+    $(strip $(subst $(TOPDIR)/,.,$(patsubst $(TOPDIR)/%/, %, $(FindAllReposAbs))))
 
 ################################################################################
 
 define SetupLogging
   ifeq ($$(LOG_PROFILE_TIMES_FILE), true)
     ifeq ($$(IS_GNU_TIME), yes)
-      SHELL :=  $$(BASH) $$(SRC_ROOT)/common/bin/shell-profiler.sh \
+      SHELL :=  $$(BASH) $$(TOPDIR)/make/scripts/shell-profiler.sh \
                 gnutime $$(TIME) \
                 $$(OUTPUT_ROOT)/build-profile.log $$(SHELL)
     else ifneq ($$(FLOCK), )
-      SHELL :=  $$(BASH) $$(SRC_ROOT)/common/bin/shell-profiler.sh \
+      SHELL :=  $$(BASH) $$(TOPDIR)/make/scripts/shell-profiler.sh \
                 flock $$(FLOCK) \
                 $$(OUTPUT_ROOT)/build-profile.log $$(SHELL)
     endif
@@ -874,7 +874,7 @@ endif
 # Defines the sub directory structure to store variable value file in
 DependOnVariableDirName = \
     $(strip $(addsuffix $(if $(MODULE),/$(MODULE)), \
-        $(subst $(SRC_ROOT)/,, $(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \
+        $(subst $(TOPDIR)/,, $(if $(filter /%, $(firstword $(MAKEFILE_LIST))), \
           $(firstword $(MAKEFILE_LIST)), \
           $(CURDIR)/$(firstword $(MAKEFILE_LIST))))))
 
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 9bbcf6c8f51..86486b494d9 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -187,6 +187,23 @@ DOCS_MODULES += \
 # 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 @@ GENERATED_SRC_DIRS += \
     #
 
 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
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index f772e2e7232..d56ce9311f4 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -510,8 +510,8 @@ define SetupNativeCompilationBody
   $$(foreach d,$$($1_SRC), $$(if $$(wildcard $$d),, \
       $$(error SRC specified to SetupNativeCompilation $1 contains missing directory $$d)))
 
-  # Find all files in the source trees. Sort to remove duplicates.
-  $1_SRCS := $$(sort $$(call CacheFind,$$($1_SRC)))
+  # Find all files in the source trees. Preserve order.
+  $1_SRCS := $$(foreach s, $$($1_SRC), $$(call CacheFind,$$(s)))
   $1_SRCS := $$(filter $$(NATIVE_SOURCE_EXTENSIONS), $$($1_SRCS))
   # Extract the C/C++ files.
   ifneq ($$($1_EXCLUDE_PATTERNS), )
diff --git a/make/conf/jib-profiles.js b/make/conf/jib-profiles.js
index dcac9dcaa1d..b2dfdf391ed 100644
--- a/make/conf/jib-profiles.js
+++ b/make/conf/jib-profiles.js
@@ -1287,7 +1287,7 @@ var getVersionNumbers = function () {
     // Read version information from common/autoconf/version-numbers
     if (version_numbers == null) {
         version_numbers = new java.util.Properties();
-        var stream = new java.io.FileInputStream(__DIR__ + "/../../common/autoconf/version-numbers");
+        var stream = new java.io.FileInputStream(__DIR__ + "/../autoconf/version-numbers");
         version_numbers.load(stream);
         stream.close();
     }
diff --git a/make/copy/Copy-java.base.gmk b/make/copy/Copy-java.base.gmk
index 01764904187..ddcc895f833 100644
--- a/make/copy/Copy-java.base.gmk
+++ b/make/copy/Copy-java.base.gmk
@@ -25,7 +25,7 @@
 
 include CopyCommon.gmk
 
-$(eval $(call IncludeCustomExtension, jdk, copy/Copy-java.base.gmk))
+$(eval $(call IncludeCustomExtension, , copy/Copy-java.base.gmk))
 
 ################################################################################
 #
@@ -38,18 +38,18 @@ TARGETS += \
     $(INCLUDE_DST_OS_DIR)/jni_md.h \
     #
 
-$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.base/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(TOPDIR)/src/java.base/share/native/include/%.h
 	$(call install-file)
 
 $(INCLUDE_DST_OS_DIR)/%.h: \
-    $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
+    $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
 	$(call install-file)
 
 ################################################################################
 
 ifneq ($(findstring $(OPENJDK_TARGET_OS), windows aix),)
 
-  TZMAPPINGS_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
+  TZMAPPINGS_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/conf
 
   $(LIB_DST_DIR)/tzmappings: $(TZMAPPINGS_SRC)/tzmappings
 	$(call install-file)
@@ -94,9 +94,9 @@ else
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
+  JVMCFG_SRC := $(TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
 else
-  JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
+  JVMCFG_SRC := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
   # Allow override by ALT_JVMCFG_SRC if it exists
   JVMCFG_SRC := $(if $(wildcard $(ALT_JVMCFG_SRC)),$(ALT_JVMCFG_SRC),$(JVMCFG_SRC))
 endif
@@ -161,7 +161,7 @@ TARGETS += $(JVMCFG)
 
 ################################################################################
 
-POLICY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.policy
+POLICY_SRC := $(TOPDIR)/src/java.base/share/conf/security/java.policy
 POLICY_DST := $(CONF_DST_DIR)/security/java.policy
 
 POLICY_SRC_LIST := $(POLICY_SRC)
@@ -176,14 +176,14 @@ TARGETS += $(POLICY_DST)
 
 ################################################################################
 
-DEF_POLICY_SRC := $(JDK_TOPDIR)/src/java.base/share/lib/security/default.policy
+DEF_POLICY_SRC := $(TOPDIR)/src/java.base/share/lib/security/default.policy
 DEF_POLICY_DST := $(LIB_DST_DIR)/security/default.policy
 
 DEF_POLICY_SRC_LIST := $(DEF_POLICY_SRC)
 DEF_POLICY_SRC_LIST += $(CUSTOM_POLICY_SRC_LIST)
 
 ifneq ($(filter $(OPENJDK_TARGET_OS), windows solaris), )
-  DEF_POLICY_SRC_LIST += $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
+  DEF_POLICY_SRC_LIST += $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/lib/security/default.policy
 endif
 
 # Allow imported modules to modify the java.policy
@@ -202,7 +202,7 @@ TARGETS += $(DEF_POLICY_DST)
 ################################################################################
 
 ifeq ($(CACERTS_FILE), )
-  CACERTS_FILE := $(JDK_TOPDIR)/src/java.base/share/lib/security/cacerts
+  CACERTS_FILE := $(TOPDIR)/src/java.base/share/lib/security/cacerts
 endif
 
 CACERTS_DST := $(LIB_DST_DIR)/security/cacerts
@@ -216,7 +216,7 @@ TARGETS += $(CACERTS_DST)
 ################################################################################
 
 $(eval $(call SetupCopyFiles, COPY_NET_PROPERTIES, \
-    FILES := $(JDK_TOPDIR)/src/java.base/share/conf/net.properties, \
+    FILES := $(TOPDIR)/src/java.base/share/conf/net.properties, \
     DEST := $(CONF_DST_DIR), \
 ))
 
@@ -224,7 +224,7 @@ TARGETS += $(COPY_NET_PROPERTIES)
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   $(eval $(call SetupCopyFiles, COPY_SDP_CONF, \
-      FILES := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
+      FILES := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template, \
       DEST := $(CONF_DST_DIR)/sdp, \
   ))
 
diff --git a/make/copy/Copy-java.corba.gmk b/make/copy/Copy-java.corba.gmk
index fbc26a5833b..61628c465af 100644
--- a/make/copy/Copy-java.corba.gmk
+++ b/make/copy/Copy-java.corba.gmk
@@ -26,9 +26,9 @@
 ################################################################################
 # Copy idl files to jdk/lib.
 $(eval $(call SetupCopyFiles,COPY_IDL, \
-    SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl, \
+    SRC := $(TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl, \
     DEST := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE), \
-    FILES := $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl \
-        $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl))
+    FILES := $(TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/orb.idl \
+        $(TOPDIR)/src/java.corba/share/classes/com/sun/tools/corba/se/idl/ir.idl))
 
 TARGETS := $(COPY_IDL)
diff --git a/make/copy/Copy-java.desktop.gmk b/make/copy/Copy-java.desktop.gmk
index 710375594e4..a40d65f1e58 100644
--- a/make/copy/Copy-java.desktop.gmk
+++ b/make/copy/Copy-java.desktop.gmk
@@ -25,7 +25,7 @@
 
 include CopyCommon.gmk
 
-$(eval $(call IncludeCustomExtension, jdk, copy/Copy-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, , copy/Copy-java.desktop.gmk))
 
 ################################################################################
 
@@ -34,11 +34,11 @@ TARGETS += \
     $(INCLUDE_DST_OS_DIR)/jawt_md.h \
     #
 
-$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/java.desktop/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(TOPDIR)/src/java.desktop/share/native/include/%.h
 	$(call install-file)
 
 $(INCLUDE_DST_OS_DIR)/%.h: \
-    $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
+    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include/%.h
 	$(call install-file)
 
 ################################################################################
@@ -88,7 +88,7 @@ endif
 
 ################################################################################
 
-$(CONF_DST_DIR)/sound.properties: $(JDK_TOPDIR)/src/java.desktop/share/conf/sound.properties
+$(CONF_DST_DIR)/sound.properties: $(TOPDIR)/src/java.desktop/share/conf/sound.properties
 	$(call install-file)
 
 TARGETS += $(CONF_DST_DIR)/sound.properties
@@ -97,7 +97,7 @@ TARGETS += $(CONF_DST_DIR)/sound.properties
 #
 # Copy property files from sun/print to LIB_DST_DIR
 #
-PSFONTPROPFILE_SRC_DIR := $(JDK_TOPDIR)/src/java.desktop/share/conf
+PSFONTPROPFILE_SRC_DIR := $(TOPDIR)/src/java.desktop/share/conf
 PSFONTPROPFILE_SRCS := $(wildcard $(PSFONTPROPFILE_SRC_DIR)/psfont*.properties*)
 PSFONTPROPFILE_TARGET_FILES := $(subst $(PSFONTPROPFILE_SRC_DIR),$(LIB_DST_DIR),$(PSFONTPROPFILE_SRCS))
 
diff --git a/make/copy/Copy-java.logging.gmk b/make/copy/Copy-java.logging.gmk
index 8791e574e8d..8c9e677b861 100644
--- a/make/copy/Copy-java.logging.gmk
+++ b/make/copy/Copy-java.logging.gmk
@@ -27,7 +27,7 @@ include CopyCommon.gmk
 
 ################################################################################
 
-LOGGING_LIB_SRC := $(JDK_TOPDIR)/src/java.logging/share/conf
+LOGGING_LIB_SRC := $(TOPDIR)/src/java.logging/share/conf
 
 $(CONF_DST_DIR)/logging.properties: $(LOGGING_LIB_SRC)/logging.properties
 	$(call install-file)
diff --git a/make/copy/Copy-jdk.accessibility.gmk b/make/copy/Copy-jdk.accessibility.gmk
index f3c136b8466..bde3206d670 100644
--- a/make/copy/Copy-jdk.accessibility.gmk
+++ b/make/copy/Copy-jdk.accessibility.gmk
@@ -33,7 +33,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
       $(INCLUDE_DST_OS_DIR)/bridge/AccessBridgePackages.h
 
   $(INCLUDE_DST_OS_DIR)/bridge/%: \
-      $(JDK_TOPDIR)/src/jdk.accessibility/windows/native/include/bridge/%
+      $(TOPDIR)/src/jdk.accessibility/windows/native/include/bridge/%
 		$(install-file)
 
 endif
diff --git a/make/copy/Copy-jdk.crypto.cryptoki.gmk b/make/copy/Copy-jdk.crypto.cryptoki.gmk
index fafbeef0a14..7965c568545 100644
--- a/make/copy/Copy-jdk.crypto.cryptoki.gmk
+++ b/make/copy/Copy-jdk.crypto.cryptoki.gmk
@@ -30,7 +30,7 @@ include CopyCommon.gmk
 ifeq ($(OPENJDK_TARGET_OS), solaris)
 
   SUNPKCS11_CFG_SRC := \
-      $(JDK_TOPDIR)/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg
+      $(TOPDIR)/src/jdk.crypto.cryptoki/solaris/conf/security/sunpkcs11-solaris.cfg
   SUNPKCS11_CFG_DST := $(CONF_DST_DIR)/security/sunpkcs11-solaris.cfg
 
   $(SUNPKCS11_CFG_DST): $(SUNPKCS11_CFG_SRC)
diff --git a/make/copy/Copy-jdk.crypto.ucrypto.gmk b/make/copy/Copy-jdk.crypto.ucrypto.gmk
index 521c81b7a89..0007e4471ba 100644
--- a/make/copy/Copy-jdk.crypto.ucrypto.gmk
+++ b/make/copy/Copy-jdk.crypto.ucrypto.gmk
@@ -29,7 +29,7 @@ include CopyCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
 
-  UCRYPTO_CFG_SRC := $(JDK_TOPDIR)/src/jdk.crypto.ucrypto/solaris/conf/security/ucrypto-solaris.cfg
+  UCRYPTO_CFG_SRC := $(TOPDIR)/src/jdk.crypto.ucrypto/solaris/conf/security/ucrypto-solaris.cfg
   UCRYPTO_CFG_DST := $(CONF_DST_DIR)/security/ucrypto-solaris.cfg
 
   $(UCRYPTO_CFG_DST): $(UCRYPTO_CFG_SRC)
diff --git a/make/copy/Copy-jdk.jdwp.agent.gmk b/make/copy/Copy-jdk.jdwp.agent.gmk
index 279f2749efb..a765567fdd9 100644
--- a/make/copy/Copy-jdk.jdwp.agent.gmk
+++ b/make/copy/Copy-jdk.jdwp.agent.gmk
@@ -29,7 +29,7 @@ include CopyCommon.gmk
 
 TARGETS := $(INCLUDE_DST_DIR)/jdwpTransport.h
 
-$(INCLUDE_DST_DIR)/%.h: $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h
+$(INCLUDE_DST_DIR)/%.h: $(TOPDIR)/src/jdk.jdwp.agent/share/native/include/%.h
 	$(call install-file)
 
 ################################################################################
diff --git a/make/copy/Copy-jdk.management.agent.gmk b/make/copy/Copy-jdk.management.agent.gmk
index 6910ca2caa1..5600989b4d3 100644
--- a/make/copy/Copy-jdk.management.agent.gmk
+++ b/make/copy/Copy-jdk.management.agent.gmk
@@ -28,7 +28,7 @@ include CopyCommon.gmk
 ################################################################################
 
 MGMT_CONF_DIR := $(CONF_DST_DIR)/management
-MGMT_CONF_SRC := $(JDK_TOPDIR)/src/jdk.management.agent/share/conf
+MGMT_CONF_SRC := $(TOPDIR)/src/jdk.management.agent/share/conf
 MGMT_SRC_FILES := $(wildcard $(MGMT_CONF_SRC)/*)
 MGMT_TARGET_FILES := $(subst $(MGMT_CONF_SRC),$(MGMT_CONF_DIR),$(MGMT_SRC_FILES))
 
diff --git a/make/gendata/Gendata-java.base.gmk b/make/gendata/Gendata-java.base.gmk
index 88acb5b983b..a55a3d79af9 100644
--- a/make/gendata/Gendata-java.base.gmk
+++ b/make/gendata/Gendata-java.base.gmk
@@ -26,7 +26,7 @@
 include GendataCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, gendata/Gendata-java.base.gmk))
+$(eval $(call IncludeCustomExtension, , gendata/Gendata-java.base.gmk))
 
 include GendataBreakIterator.gmk
 
@@ -40,7 +40,7 @@ include GendataCryptoPolicy.gmk
 
 GENDATA_UNINAME := $(JDK_OUTPUTDIR)/modules/java.base/java/lang/uniName.dat
 
-$(GENDATA_UNINAME): $(JDK_TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK)
+$(GENDATA_UNINAME): $(TOPDIR)/make/data/unicodedata/UnicodeData.txt $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))
 	$(TOOL_CHARACTERNAME) $< $@
 
@@ -50,7 +50,7 @@ TARGETS += $(GENDATA_UNINAME)
 
 GENDATA_CURDATA := $(JDK_OUTPUTDIR)/modules/java.base/java/util/currency.data
 
-$(GENDATA_CURDATA): $(JDK_TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
+$(GENDATA_CURDATA): $(TOPDIR)/make/data/currency/CurrencyData.properties $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))
 	$(RM) $@
 	$(TOOL_GENERATECURRENCYDATA) -o $@.tmp < $<
@@ -61,7 +61,7 @@ TARGETS += $(GENDATA_CURDATA)
 
 ################################################################################
 
-GENDATA_JAVA_SECURITY_SRC := $(JDK_TOPDIR)/src/java.base/share/conf/security/java.security
+GENDATA_JAVA_SECURITY_SRC := $(TOPDIR)/src/java.base/share/conf/security/java.security
 GENDATA_JAVA_SECURITY := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/java.security
 
 ifeq ($(UNLIMITED_CRYPTO), true)
diff --git a/make/gendata/Gendata-jdk.compiler.gmk b/make/gendata/Gendata-jdk.compiler.gmk
index 93574ce6851..25f9e377188 100644
--- a/make/gendata/Gendata-jdk.compiler.gmk
+++ b/make/gendata/Gendata-jdk.compiler.gmk
@@ -39,11 +39,11 @@ CT_MODULES := $(DOCS_MODULES)
 # Get the complete module source path:
 CT_MODULESOURCEPATH := $(call GetModuleSrcPath)
 
-CT_DATA_DESCRIPTION ?= $(LANGTOOLS_TOPDIR)/make/data/symbols/symbols
+CT_DATA_DESCRIPTION ?= $(TOPDIR)/make/data/symbols/symbols
 
 $(eval $(call SetupJavaCompilation, COMPILE_CREATE_SYMBOLS, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(LANGTOOLS_TOPDIR)/make/src/classes, \
+    SRC := $(TOPDIR)/make/langtools/src/classes, \
     INCLUDES := build/tools/symbolgenerator, \
     ADD_JAVAC_FLAGS := -Xbootclasspath/p:"$(INTERIM_LANGTOOLS_JAR)", \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/create_symbols, \
@@ -60,7 +60,7 @@ endif
 
 $(SUPPORT_OUTPUTDIR)/symbols/ct.sym-files/_the.symbols: \
     $(COMPILE_CREATE_SYMBOLS) \
-    $(wildcard $(LANGTOOLS_TOPDIR)/make/data/symbols/*) \
+    $(wildcard $(TOPDIR)/make/data/symbols/*) \
     $(MODULE_INFOS)
 	$(RM) -r $(@D)
 	$(MKDIR) -p $(@D)
diff --git a/make/gendata/GendataBlacklistedCerts.gmk b/make/gendata/GendataBlacklistedCerts.gmk
index c25fb525ced..0772a797ce4 100644
--- a/make/gendata/GendataBlacklistedCerts.gmk
+++ b/make/gendata/GendataBlacklistedCerts.gmk
@@ -23,9 +23,9 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, jdk, gendata/GendataBlacklistedCerts.gmk))
+$(eval $(call IncludeCustomExtension, , gendata/GendataBlacklistedCerts.gmk))
 
-GENDATA_BLACKLISTED_CERTS_SRC += $(JDK_TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem
+GENDATA_BLACKLISTED_CERTS_SRC += $(TOPDIR)/make/data/blacklistedcertsconverter/blacklisted.certs.pem
 GENDATA_BLACKLISTED_CERTS := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)/security/blacklisted.certs
 
 $(GENDATA_BLACKLISTED_CERTS): $(BUILD_TOOLS) $(GENDATA_BLACKLISTED_CERTS_SRC)
diff --git a/make/gendata/GendataBreakIterator.gmk b/make/gendata/GendataBreakIterator.gmk
index 39a5dfb5efc..4b97b636a2a 100644
--- a/make/gendata/GendataBreakIterator.gmk
+++ b/make/gendata/GendataBreakIterator.gmk
@@ -46,7 +46,7 @@ BREAK_ITERATOR_CLASSES := $(BUILDTOOLS_OUTPUTDIR)/break_iterator_classes
 # These two files should be moved out to a build tool!
 $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR_BASE, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/classes, \
+    SRC := $(TOPDIR)/src/java.base/share/classes, \
     INCLUDE_FILES := \
         $(TEXT_PKG)/BreakIteratorRules.java \
         $(TEXT_PKG)/BreakIteratorInfo.java, \
@@ -54,7 +54,7 @@ $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR_BASE, \
 
 $(eval $(call SetupJavaCompilation,BUILD_BREAKITERATOR_LD, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(JDK_TOPDIR)/src/jdk.localedata/share/classes, \
+    SRC := $(TOPDIR)/src/jdk.localedata/share/classes, \
     INCLUDE_FILES := \
         $(TEXT_PKG_LD)/BreakIteratorRules_th.java \
         $(TEXT_PKG_LD)/BreakIteratorInfo_th.java, \
@@ -76,7 +76,7 @@ endif
 
 # Generate data resource files.
 # input
-UNICODEDATA := $(JDK_TOPDIR)/make/data/unicodedata/UnicodeData.txt
+UNICODEDATA := $(TOPDIR)/make/data/unicodedata/UnicodeData.txt
 
 # output
 BASE_DATA_PKG_DIR := $(JDK_OUTPUTDIR)/modules/java.base/sun/text/resources
diff --git a/make/gendata/GendataCommon.gmk b/make/gendata/GendataCommon.gmk
index 0eb8ed38923..42c82eb48d7 100644
--- a/make/gendata/GendataCommon.gmk
+++ b/make/gendata/GendataCommon.gmk
@@ -26,5 +26,5 @@
 include JavaCompilation.gmk
 include SetupJavaCompilers.gmk
 # We need the tools.
-include Tools.gmk
+include ToolsJdk.gmk
 
diff --git a/make/gendata/GendataCryptoPolicy.gmk b/make/gendata/GendataCryptoPolicy.gmk
index dff51230b44..e36a1b9fcb7 100644
--- a/make/gendata/GendataCryptoPolicy.gmk
+++ b/make/gendata/GendataCryptoPolicy.gmk
@@ -48,7 +48,7 @@ POLICY_DIR := $(SUPPORT_OUTPUTDIR)/modules_conf/java.base/security/policy
 LIMITED_POLICY_DIR := $(POLICY_DIR)/limited
 UNLIMITED_POLICY_DIR := $(POLICY_DIR)/unlimited
 
-POLICY_SRC_DIR := $(JDK_TOPDIR)/src/java.base/share/conf/security/policy
+POLICY_SRC_DIR := $(TOPDIR)/src/java.base/share/conf/security/policy
 LIMITED_POLICY_SRC_DIR := $(POLICY_SRC_DIR)/limited
 UNLIMITED_POLICY_SRC_DIR := $(POLICY_SRC_DIR)/unlimited
 
diff --git a/make/gendata/GendataFontConfig.gmk b/make/gendata/GendataFontConfig.gmk
index 048c445d5f2..1031bfba837 100644
--- a/make/gendata/GendataFontConfig.gmk
+++ b/make/gendata/GendataFontConfig.gmk
@@ -23,11 +23,11 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, jdk, gendata/GendataFontConfig.gmk))
+$(eval $(call IncludeCustomExtension, , gendata/GendataFontConfig.gmk))
 
 GENDATA_FONT_CONFIG_DST := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
 
-GENDATA_FONT_CONFIG_DATA_DIR ?= $(JDK_TOPDIR)/make/data/fontconfig
+GENDATA_FONT_CONFIG_DATA_DIR ?= $(TOPDIR)/make/data/fontconfig
 
 GENDATA_FONT_CONFIG_SRC_FILES := \
     $(wildcard $(GENDATA_FONT_CONFIG_DATA_DIR)/$(OPENJDK_TARGET_OS).*)
diff --git a/make/gendata/GendataTZDB.gmk b/make/gendata/GendataTZDB.gmk
index 5d17b4fedf0..e9be176d873 100644
--- a/make/gendata/GendataTZDB.gmk
+++ b/make/gendata/GendataTZDB.gmk
@@ -28,7 +28,7 @@ GENDATA_TZDB :=
 #
 # Time zone data file creation
 #
-TZDATA_DIR := $(JDK_TOPDIR)/make/data/tzdata
+TZDATA_DIR := $(TOPDIR)/make/data/tzdata
 TZDATA_TZFILE := africa antarctica asia australasia europe northamerica pacificnew southamerica backward etcetera gmt jdk11_backward
 TZDATA_TZFILES := $(addprefix $(TZDATA_DIR)/,$(TZDATA_TZFILE))
 
diff --git a/make/gensrc/Gensrc-java.base.gmk b/make/gensrc/Gensrc-java.base.gmk
index c750489d065..3aaae2cedb3 100644
--- a/make/gensrc/Gensrc-java.base.gmk
+++ b/make/gensrc/Gensrc-java.base.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 include GensrcLocaleData.gmk
 include GensrcCLDR.gmk
@@ -41,12 +41,12 @@ include GensrcModuleLoaderMap.gmk
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, LIST_RESOURCE_BUNDLE, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/java.base/share/classes/sun/launcher/resources, \
+    SRC_DIRS := $(TOPDIR)/src/java.base/share/classes/sun/launcher/resources, \
     CLASS := ListResourceBundle, \
 ))
 
 $(eval $(call SetupCompileProperties, SUN_UTIL, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/resources, \
+    SRC_DIRS := $(TOPDIR)/src/java.base/share/classes/sun/util/resources, \
     CLASS := sun.util.resources.LocaleNamesBundle, \
 ))
 
@@ -55,7 +55,7 @@ GENSRC_JAVA_BASE += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL)
 # Some resources bundles are already present as java files but still need to be
 # copied to zh_HK locale.
 $(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
-    $(addprefix $(JDK_TOPDIR)/src/java.base/share/classes/, \
+    $(addprefix $(TOPDIR)/src/java.base/share/classes/, \
         sun/security/util/AuthResources_zh_TW.java \
         sun/security/util/Resources_zh_TW.java)))
 
@@ -65,7 +65,7 @@ GENSRC_JAVA_BASE += $(COPY_ZH_HK)
 
 GENSRC_LSREQUIVMAPS := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/LocaleEquivalentMaps.java
 
-$(GENSRC_LSREQUIVMAPS): $(JDK_TOPDIR)/make/data/lsrdata/language-subtag-registry.txt $(BUILD_TOOLS_JDK)
+$(GENSRC_LSREQUIVMAPS): $(TOPDIR)/make/data/lsrdata/language-subtag-registry.txt $(BUILD_TOOLS_JDK)
 	$(call MakeDir, $(@D))
 	$(TOOL_GENERATELSREQUIVMAPS) $< $@
 
diff --git a/make/gensrc/Gensrc-java.corba.gmk b/make/gensrc/Gensrc-java.corba.gmk
index 4899790c67f..45c2301aae3 100644
--- a/make/gensrc/Gensrc-java.corba.gmk
+++ b/make/gensrc/Gensrc-java.corba.gmk
@@ -35,7 +35,7 @@ include SetupJavaCompilers.gmk
 
 $(eval $(call SetupJavaCompilation,BUILD_TOOLS_CORBA, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(CORBA_TOPDIR)/make/src/classes, \
+    SRC := $(TOPDIR)/make/corba/src/classes, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/corba_tools_classes))
 
 TOOL_LOGUTIL_CMD := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/corba_tools_classes \
@@ -43,7 +43,7 @@ TOOL_LOGUTIL_CMD := $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/corba_tools_classe
 
 $(eval $(call SetupJavaCompilation,BUILD_IDLJ, \
     SETUP := GENERATE_OLDBYTECODE, \
-    SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \
+    SRC := $(TOPDIR)/src/java.corba/share/classes, \
     BIN := $(BUILDTOOLS_OUTPUTDIR)/idlj_classes, \
     COPY := .prp, \
     INCLUDES := com/sun/tools/corba/se/idl, \
@@ -60,7 +60,7 @@ LOGWRAPPER_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.corba/_logwrappers
 
 # Generate LogWrapper classes
 $(EXCEPTION_DIR)/%SystemException.java: \
-    $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
+    $(TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
     $(BUILD_TOOLS_CORBA)
 	$(call LogInfo, Generating class file from $*.mc)
 	$(call MakeDir, $(@D))
@@ -83,7 +83,7 @@ $(EXCEPTION_DIR)/LogStrings.properties: \
 
 # The resources files are generated from lisp-like .mc files.
 $(LOGWRAPPER_DIR)/%SystemException.resource: \
-    $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
+    $(TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/spi/logging/data/%.mc \
     $(BUILD_TOOLS_CORBA)
 	$(call LogInfo, Generating resource file from $*.mc)
 	$(call MakeDir, $(@D))
@@ -216,7 +216,7 @@ IDL_DELETES := \
 
 $(eval $(call SetupIdlCompilation,BUILD_IDLS, \
     IDLJ := $(TOOL_IDLJ_CMD), \
-    SRC := $(CORBA_TOPDIR)/src/java.corba/share/classes, \
+    SRC := $(TOPDIR)/src/java.corba/share/classes, \
     BIN := $(SUPPORT_OUTPUTDIR)/gensrc/java.corba, \
     EXCLUDES := com/sun/tools/corba/se/idl/% \
         org/omg/CORBA/% \
@@ -233,7 +233,7 @@ $(BUILD_IDLS): $(BUILD_IDLJ)
 # zh_HK is just a copy of zh_TW
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.corba/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_HK.properties: \
-    $(CORBA_TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
+    $(TOPDIR)/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/resources/sunorb_zh_TW.properties
 	$(install-file)
 
 ################################################################################
diff --git a/make/gensrc/Gensrc-java.desktop.gmk b/make/gensrc/Gensrc-java.desktop.gmk
index 42eb1a2fda0..d28027d991d 100644
--- a/make/gensrc/Gensrc-java.desktop.gmk
+++ b/make/gensrc/Gensrc-java.desktop.gmk
@@ -23,10 +23,10 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, gensrc/Gensrc-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-java.desktop.gmk))
 
 ifneq ($(OPENJDK_TARGET_OS), windows)
   include GensrcIcons.gmk
@@ -43,29 +43,29 @@ include GensrcSwing.gmk
 include GensrcProperties.gmk
 
 PROP_SRC_DIRS := \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/awt/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/accessibility/internal/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/sun/awt/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/accessibility/internal/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/motif/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/windows/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/basic/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/metal/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/com/sun/swing/internal/plaf/synth/resources \
+    $(TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
     #
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   PROP_SRC_DIRS += \
-      $(JDK_TOPDIR)/src/java.desktop/macosx/classes/com/apple/laf/resources \
-      $(JDK_TOPDIR)/src/java.desktop/macosx/classes/sun/awt/resources \
+      $(TOPDIR)/src/java.desktop/macosx/classes/com/apple/laf/resources \
+      $(TOPDIR)/src/java.desktop/macosx/classes/sun/awt/resources \
       #
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  PROP_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/windows/classes/sun/awt/windows
+  PROP_SRC_DIRS += $(TOPDIR)/src/java.desktop/windows/classes/sun/awt/windows
 endif
 
 ifeq ($(filter $(OPENJDK_TARGET_OS), windows macosx), )
-  PROP_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources
+  PROP_SRC_DIRS += $(TOPDIR)/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/resources
 endif
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
@@ -79,7 +79,7 @@ GENSRC_JAVA_DESKTOP += $(COMPILE_PROPERTIES)
 # Some resources bundles are already present as java files but still need to be
 # copied to zh_HK locale.
 $(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
-    $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java))
+    $(TOPDIR)/src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java))
 
 GENSRC_JAVA_DESKTOP += $(COPY_ZH_HK)
 
diff --git a/make/gensrc/Gensrc-java.logging.gmk b/make/gensrc/Gensrc-java.logging.gmk
index ea44f5701a6..cd57b2080ea 100644
--- a/make/gensrc/Gensrc-java.logging.gmk
+++ b/make/gensrc/Gensrc-java.logging.gmk
@@ -23,14 +23,14 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/java.logging/share/classes/sun/util/logging/resources, \
+    SRC_DIRS := $(TOPDIR)/src/java.logging/share/classes/sun/util/logging/resources, \
     CLASS := ListResourceBundle, \
 ))
 
diff --git a/make/gensrc/Gensrc-jdk.charsets.gmk b/make/gensrc/Gensrc-jdk.charsets.gmk
index c5f79ce54c9..6db72890f40 100644
--- a/make/gensrc/Gensrc-jdk.charsets.gmk
+++ b/make/gensrc/Gensrc-jdk.charsets.gmk
@@ -23,23 +23,23 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 #
 # Generate files using the charsetmapping tool
 #
-CHARSET_DATA_DIR := $(JDK_TOPDIR)/make/data/charsetmapping
+CHARSET_DATA_DIR := $(TOPDIR)/make/data/charsetmapping
 
 CHARSET_GENSRC_JAVA_DIR_CS := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.charsets/sun/nio/cs/ext
 CHARSET_DONE_CS := $(CHARSET_GENSRC_JAVA_DIR_CS)/_the.charsetmapping
-CHARSET_COPYRIGHT_HEADER := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping
+CHARSET_COPYRIGHT_HEADER := $(TOPDIR)/make/jdk/src/classes/build/tools/charsetmapping
 CHARSET_TEMPLATES := \
     $(CHARSET_DATA_DIR)/SingleByte-X.java.template \
     $(CHARSET_DATA_DIR)/DoubleByte-X.java.template
 CHARSET_EXTENDED_JAVA_TEMPLATES := \
-    $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
-CHARSET_EXTENDED_JAVA_DIR := $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
+    $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext/ExtendedCharsets.java.template
+CHARSET_EXTENDED_JAVA_DIR := $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
 $(CHARSET_DONE_CS)-extcs: $(CHARSET_DATA_DIR)/charsets \
diff --git a/make/gensrc/Gensrc-jdk.compiler.gmk b/make/gensrc/Gensrc-jdk.compiler.gmk
index 2f8f8633ffd..7f2bf508252 100644
--- a/make/gensrc/Gensrc-jdk.compiler.gmk
+++ b/make/gensrc/Gensrc-jdk.compiler.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonLangtools.gmk
 
 $(eval $(call SetupVersionProperties,JAVAC_VERSION, \
     com/sun/tools/javac/resources/version.properties))
diff --git a/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk b/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
index 623430abab6..059437db368 100644
--- a/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
+++ b/make/gensrc/Gensrc-jdk.internal.vm.compiler.gmk
@@ -28,10 +28,10 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot, gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
+$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-jdk.internal.vm.compiler.gmk))
 
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
-SRC_DIR := $(HOTSPOT_TOPDIR)/src/$(MODULE)/share/classes
+SRC_DIR := $(TOPDIR)/src/$(MODULE)/share/classes
 
 ################################################################################
 
diff --git a/make/gensrc/Gensrc-jdk.jartool.gmk b/make/gensrc/Gensrc-jdk.jartool.gmk
index 8cb04f33f7f..5376ae30422 100644
--- a/make/gensrc/Gensrc-jdk.jartool.gmk
+++ b/make/gensrc/Gensrc-jdk.jartool.gmk
@@ -23,14 +23,14 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jartool/share/classes/sun/tools/jar/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jartool/share/classes/sun/tools/jar/resources, \
     CLASS := ListResourceBundle, \
 ))
 
diff --git a/make/gensrc/Gensrc-jdk.javadoc.gmk b/make/gensrc/Gensrc-jdk.javadoc.gmk
index 3720b1be5ae..c0561bbc666 100644
--- a/make/gensrc/Gensrc-jdk.javadoc.gmk
+++ b/make/gensrc/Gensrc-jdk.javadoc.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonLangtools.gmk
 
 $(eval $(call SetupVersionProperties,OLD_JAVADOC_VERSION,\
     com/sun/tools/javadoc/resources/version.properties))
diff --git a/make/gensrc/Gensrc-jdk.jdeps.gmk b/make/gensrc/Gensrc-jdk.jdeps.gmk
index 91095437aff..36d7ca15f0a 100644
--- a/make/gensrc/Gensrc-jdk.jdeps.gmk
+++ b/make/gensrc/Gensrc-jdk.jdeps.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonLangtools.gmk
 
 $(eval $(call SetupVersionProperties,JAVAP_VERSION, \
     com/sun/tools/javap/resources/version.properties))
diff --git a/make/gensrc/Gensrc-jdk.jdi.gmk b/make/gensrc/Gensrc-jdk.jdi.gmk
index 720b685ef4b..ef539905a5d 100644
--- a/make/gensrc/Gensrc-jdk.jdi.gmk
+++ b/make/gensrc/Gensrc-jdk.jdi.gmk
@@ -23,13 +23,13 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 # Translate the Java debugger wire protocol (jdwp.spec) file into a JDWP.java file
 # and a JDWPCommands.h C-header file.
 
-JDWP_SPEC_FILE := $(JDK_TOPDIR)/make/data/jdwp/jdwp.spec
+JDWP_SPEC_FILE := $(TOPDIR)/make/data/jdwp/jdwp.spec
 HEADER_FILE := $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent/JDWPCommands.h
 JAVA_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/com/sun/tools/jdi/JDWP.java
 
@@ -64,7 +64,7 @@ GENSRC_JDK_JDI += $(GENSRC_JDWP)
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jdi/share/classes/com/sun/tools/jdi/resources, \
     CLASS := ListResourceBundle, \
 ))
 
diff --git a/make/gensrc/Gensrc-jdk.jlink.gmk b/make/gensrc/Gensrc-jdk.jlink.gmk
index 9ac5b1918a2..5904a031d03 100644
--- a/make/gensrc/Gensrc-jdk.jlink.gmk
+++ b/make/gensrc/Gensrc-jdk.jlink.gmk
@@ -23,24 +23,24 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, JLINK_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jlink/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jlink/resources, \
     CLASS := ListResourceBundle, \
 ))
 
 $(eval $(call SetupCompileProperties, JMOD_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jmod/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jmod/resources, \
     CLASS := ListResourceBundle, \
 ))
 
 $(eval $(call SetupCompileProperties, JIMAGE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jimage/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.jlink/share/classes/jdk/tools/jimage/resources, \
     CLASS := ListResourceBundle, \
 ))
 
diff --git a/make/gensrc/Gensrc-jdk.jshell.gmk b/make/gensrc/Gensrc-jdk.jshell.gmk
index d6773099611..a0ec734307c 100644
--- a/make/gensrc/Gensrc-jdk.jshell.gmk
+++ b/make/gensrc/Gensrc-jdk.jshell.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonLangtools.gmk
 
 $(eval $(call SetupVersionProperties,JSHELL_VERSION, \
     jdk/internal/jshell/tool/resources/version.properties))
diff --git a/make/gensrc/Gensrc-jdk.localedata.gmk b/make/gensrc/Gensrc-jdk.localedata.gmk
index 5bbe512dc18..64e1fa9a07b 100644
--- a/make/gensrc/Gensrc-jdk.localedata.gmk
+++ b/make/gensrc/Gensrc-jdk.localedata.gmk
@@ -23,10 +23,10 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, gensrc/Gensrc-jdk.localedata.gmk))
+$(eval $(call IncludeCustomExtension, , gensrc/Gensrc-jdk.localedata.gmk))
 
 include GensrcLocaleData.gmk
 include GensrcCLDR.gmk
@@ -36,7 +36,7 @@ include GensrcCLDR.gmk
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.localedata/share/classes/sun/util/resources, \
     CLASS := sun.util.resources.LocaleNamesBundle, \
 ))
 
diff --git a/make/gensrc/Gensrc-jdk.management.agent.gmk b/make/gensrc/Gensrc-jdk.management.agent.gmk
index 726a6f3cb57..1d5d919d76b 100644
--- a/make/gensrc/Gensrc-jdk.management.agent.gmk
+++ b/make/gensrc/Gensrc-jdk.management.agent.gmk
@@ -23,14 +23,14 @@
 # questions.
 #
 
-include GensrcCommon.gmk
+include GensrcCommonJdk.gmk
 
 ################################################################################
 
 include GensrcProperties.gmk
 
 $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
-    SRC_DIRS := $(JDK_TOPDIR)/src/jdk.management.agent/share/classes/jdk/internal/agent/resources, \
+    SRC_DIRS := $(TOPDIR)/src/jdk.management.agent/share/classes/jdk/internal/agent/resources, \
     CLASS := ListResourceBundle, \
 ))
 
diff --git a/make/gensrc/GensrcBuffer.gmk b/make/gensrc/GensrcBuffer.gmk
index 34c67125aea..7258a053dac 100644
--- a/make/gensrc/GensrcBuffer.gmk
+++ b/make/gensrc/GensrcBuffer.gmk
@@ -27,7 +27,7 @@ GENSRC_BUFFER :=
 
 GENSRC_BUFFER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio
 
-GENSRC_BUFFER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
+GENSRC_BUFFER_SRC := $(TOPDIR)/src/java.base/share/classes/java/nio
 
 ###
 
diff --git a/make/gensrc/GensrcCLDR.gmk b/make/gensrc/GensrcCLDR.gmk
index 63487b00c0d..8ceb371d994 100644
--- a/make/gensrc/GensrcCLDR.gmk
+++ b/make/gensrc/GensrcCLDR.gmk
@@ -24,7 +24,7 @@
 #
 
 CLDRVERSION := 29.0.0
-CLDRSRCDIR := $(JDK_TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/common
+CLDRSRCDIR := $(TOPDIR)/src/jdk.localedata/share/classes/sun/util/cldr/resources/common
 
 GENSRC_BASEDIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata
diff --git a/make/gensrc/GensrcCharacterData.gmk b/make/gensrc/GensrcCharacterData.gmk
index 7e0abff1d7c..7e882115d92 100644
--- a/make/gensrc/GensrcCharacterData.gmk
+++ b/make/gensrc/GensrcCharacterData.gmk
@@ -29,8 +29,8 @@
 
 GENSRC_CHARACTERDATA :=
 
-CHARACTERDATA = $(JDK_TOPDIR)/make/data/characterdata
-UNICODEDATA = $(JDK_TOPDIR)/make/data/unicodedata
+CHARACTERDATA = $(TOPDIR)/make/data/characterdata
+UNICODEDATA = $(TOPDIR)/make/data/unicodedata
 
 define SetupCharacterData
   $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/$1.java: \
diff --git a/make/gensrc/GensrcCharsetCoder.gmk b/make/gensrc/GensrcCharsetCoder.gmk
index 47dab1cfbc0..1a8836691d0 100644
--- a/make/gensrc/GensrcCharsetCoder.gmk
+++ b/make/gensrc/GensrcCharsetCoder.gmk
@@ -27,7 +27,7 @@ GENSRC_CHARSETCODER :=
 
 GENSRC_CHARSETCODER_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio/charset
 
-GENSRC_CHARSETCODER_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
+GENSRC_CHARSETCODER_SRC := $(TOPDIR)/src/java.base/share/classes/java/nio
 
 GENSRC_CHARSETCODER_TEMPLATE := $(GENSRC_CHARSETCODER_SRC)/charset/Charset-X-Coder.java.template
 
diff --git a/make/gensrc/GensrcCharsetMapping.gmk b/make/gensrc/GensrcCharsetMapping.gmk
index c904c54de23..842e742d7ce 100644
--- a/make/gensrc/GensrcCharsetMapping.gmk
+++ b/make/gensrc/GensrcCharsetMapping.gmk
@@ -28,16 +28,16 @@
 # Generate StandardCharsets.java and individul sun.nio.cs charset class using
 # the charsetmapping tool
 #
-CHARSET_DATA_DIR := $(JDK_TOPDIR)/make/data/charsetmapping
-CHARSET_EXTSRC_DIR := $(JDK_TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
+CHARSET_DATA_DIR := $(TOPDIR)/make/data/charsetmapping
+CHARSET_EXTSRC_DIR := $(TOPDIR)/src/jdk.charsets/share/classes/sun/nio/cs/ext
 CHARSET_GENSRC_JAVA_DIR_BASE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/cs
 CHARSET_DONE_BASE := $(CHARSET_GENSRC_JAVA_DIR_BASE)/_the.charsetmapping
-CHARSET_COPYRIGHT_HEADER := $(JDK_TOPDIR)/make/src/classes/build/tools/charsetmapping
+CHARSET_COPYRIGHT_HEADER := $(TOPDIR)/make/jdk/src/classes/build/tools/charsetmapping
 CHARSET_TEMPLATES := \
     $(CHARSET_DATA_DIR)/SingleByte-X.java.template \
     $(CHARSET_DATA_DIR)/DoubleByte-X.java.template
 CHARSET_STANDARD_JAVA_TEMPLATES := \
-    $(JDK_TOPDIR)/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
+    $(TOPDIR)/src/java.base/share/classes/sun/nio/cs/StandardCharsets.java.template
 CHARSET_STANDARD_OS := stdcs-$(OPENJDK_TARGET_OS)
 
 $(CHARSET_DONE_BASE)-stdcs: $(CHARSET_DATA_DIR)/charsets \
diff --git a/make/gensrc/GensrcCommonJdk.gmk b/make/gensrc/GensrcCommonJdk.gmk
index a3370639176..60ad33bfff4 100644
--- a/make/gensrc/GensrcCommonJdk.gmk
+++ b/make/gensrc/GensrcCommonJdk.gmk
@@ -32,4 +32,4 @@ include NativeCompilation.gmk
 include TextFileProcessing.gmk
 include SetupJavaCompilers.gmk
 # We need the tools.
-include Tools.gmk
+include ToolsJdk.gmk
diff --git a/make/gensrc/GensrcCommonLangtools.gmk b/make/gensrc/GensrcCommonLangtools.gmk
index 96aed34ae78..97b5a5dd24f 100644
--- a/make/gensrc/GensrcCommonLangtools.gmk
+++ b/make/gensrc/GensrcCommonLangtools.gmk
@@ -64,13 +64,13 @@ endef
 define SetupCompileProperties
   # Lookup the properties that need to be compiled into resource bundles.
   PROPSOURCES := $2 \
-      $$(shell $(FIND) $(LANGTOOLS_TOPDIR)/src/$(MODULE)/share/classes -name "*.properties")
+      $$(shell $(FIND) $(TOPDIR)/src/$(MODULE)/share/classes -name "*.properties")
 
   # Convert .../src/<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties
   # to .../langtools/gensrc/<module>/com/sun/tools/javac/resources/javac_zh_CN.java
   # Strip away prefix and suffix, leaving for example only:
   # "<module>/share/classes/com/sun/tools/javac/resources/javac_zh_CN"
-  PROPJAVAS := $$(patsubst $(LANGTOOLS_TOPDIR)/src/%, \
+  PROPJAVAS := $$(patsubst $(TOPDIR)/src/%, \
       $(SUPPORT_OUTPUTDIR)/gensrc/%, \
       $$(patsubst %.properties, %.java, \
       $$(subst /share/classes,, $$(PROPSOURCES))))
@@ -104,9 +104,9 @@ endef
 # Param 2 - Extra properties files to process
 define SetupParseProperties
   # property files to process
-  PARSEPROPSOURCES := $$(addprefix $(LANGTOOLS_TOPDIR)/src/$(MODULE)/share/classes/, $2)
+  PARSEPROPSOURCES := $$(addprefix $(TOPDIR)/src/$(MODULE)/share/classes/, $2)
 
-  PARSEPROPALLDIRS := $$(patsubst $(LANGTOOLS_TOPDIR)/src/$(MODULE)/share/classes/%, \
+  PARSEPROPALLDIRS := $$(patsubst $(TOPDIR)/src/$(MODULE)/share/classes/%, \
       $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/%, \
       $$(dir $$(PARSEPROPSOURCES)))
 
diff --git a/make/gensrc/GensrcExceptions.gmk b/make/gensrc/GensrcExceptions.gmk
index 947cd019eec..4e7b5b5fe17 100644
--- a/make/gensrc/GensrcExceptions.gmk
+++ b/make/gensrc/GensrcExceptions.gmk
@@ -27,8 +27,8 @@ GENSRC_EXCEPTIONS :=
 
 GENSRC_EXCEPTIONS_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/nio
 
-GENSRC_EXCEPTIONS_SRC := $(JDK_TOPDIR)/src/java.base/share/classes/java/nio
-GENSRC_EXCEPTIONS_CMD := $(JDK_TOPDIR)/make/scripts/genExceptions.sh
+GENSRC_EXCEPTIONS_SRC := $(TOPDIR)/src/java.base/share/classes/java/nio
+GENSRC_EXCEPTIONS_CMD := $(TOPDIR)/make/scripts/genExceptions.sh
 
 GENSRC_EXCEPTIONS_SRC_DIRS := . charset channels
 
@@ -36,7 +36,7 @@ $(GENSRC_EXCEPTIONS_DST)/_the.%.marker: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
     $(GENSRC_EXCEPTIONS_CMD)
 	$(call LogInfo, Generating exceptions java.nio $*)
 	$(call MakeDir, $(@D)/$*)
-	SCRIPTS="$(JDK_TOPDIR)/make/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) \
+	SCRIPTS="$(TOPDIR)/make/scripts" NAWK="$(NAWK)" SH="$(SH)" $(SH) \
 	    $(GENSRC_EXCEPTIONS_CMD) $< $(@D)/$* $(LOG_DEBUG)
 	$(TOUCH) $@
 
diff --git a/make/gensrc/GensrcIcons.gmk b/make/gensrc/GensrcIcons.gmk
index 62e31fb39f0..b2fcad6804e 100644
--- a/make/gensrc/GensrcIcons.gmk
+++ b/make/gensrc/GensrcIcons.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, jdk, gensrc/GensrcIcons.gmk))
+$(eval $(call IncludeCustomExtension, , gensrc/GensrcIcons.gmk))
 
 GENSRC_AWT_ICONS :=
 GENSRC_AWT_ICONS_SRC :=
@@ -31,7 +31,7 @@ GENSRC_AWT_ICONS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop
 GENSRC_AWT_ICONS_DST := $(GENSRC_AWT_ICONS_TMP)/sun/awt/
 
 # Allow this to be overridden from a custom makefile
-X11_ICONS_PATH_PREFIX ?= $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
+X11_ICONS_PATH_PREFIX ?= $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)
 
 GENSRC_AWT_ICONS_SRC += \
     $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon16.png \
@@ -40,7 +40,7 @@ GENSRC_AWT_ICONS_SRC += \
     $(X11_ICONS_PATH_PREFIX)/classes/sun/awt/X11/java-icon48.png
 
 
-AWT_ICONPATH := $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/awt/resources
+AWT_ICONPATH := $(TOPDIR)/src/java.desktop/share/classes/sun/awt/resources
 
 GENSRC_AWT_ICONS_SRC += \
     $(AWT_ICONPATH)/security-icon-bw16.png \
@@ -113,7 +113,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
   GENSRC_OSX_ICONS_DST := $(SUPPORT_OUTPUTDIR)/headers/java.desktop
   GENSRC_OSX_ICONS := $(GENSRC_OSX_ICONS_DST)/AWTIconData.h
 
-  GENSRC_OSX_ICONS_SRC ?= $(JDK_TOPDIR)/make/data/macosxicons/JavaApp.icns
+  GENSRC_OSX_ICONS_SRC ?= $(TOPDIR)/make/data/macosxicons/JavaApp.icns
 
 
   $(GENSRC_OSX_ICONS): $(GENSRC_OSX_ICONS_SRC) $(BUILD_TOOLS_JDK)
diff --git a/make/gensrc/GensrcLocaleData.gmk b/make/gensrc/GensrcLocaleData.gmk
index c02db194195..3235136b1eb 100644
--- a/make/gensrc/GensrcLocaleData.gmk
+++ b/make/gensrc/GensrcLocaleData.gmk
@@ -29,8 +29,8 @@
 
 # First go look for all locale files
 LOCALE_FILES := $(shell $(FIND) \
-    $(JDK_TOPDIR)/src/$(MODULE)/share/classes/sun/text/resources \
-    $(JDK_TOPDIR)/src/$(MODULE)/share/classes/sun/util/resources \
+    $(TOPDIR)/src/$(MODULE)/share/classes/sun/text/resources \
+    $(TOPDIR)/src/$(MODULE)/share/classes/sun/util/resources \
     -name "FormatData_*.java" -o -name "FormatData_*.properties" -o \
     -name "CollationData_*.java" -o -name "CollationData_*.properties" -o \
     -name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
@@ -129,7 +129,7 @@ SED_BASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_BASE_L
 SED_NONBASEARGS += -e 's/$(HASH)AvailableLocales_Locales$(HASH)/$(sort $(ALL_NON_BASE_LOCALES))/g'
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java: \
-    $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
+    $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
 	$(call LogInfo, Creating sun/util/locale/provider/BaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources)
 	$(MKDIR) -p $(@D)
 	$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
@@ -137,7 +137,7 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMet
 	$(SED) $(SED_BASEARGS) $< > $@
 
 $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java: \
-    $(JDK_TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
+    $(TOPDIR)/src/java.base/share/classes/sun/util/locale/provider/LocaleDataMetaInfo-XLocales.java.template
 	$(call LogInfo, Creating sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java from $(words $(LOCALE_RESOURCES)) found resources)
 	$(MKDIR) -p $(@D)
 	$(PRINTF) "PREV_LOCALE_RESOURCES:=$(LOCALE_RESOURCES)" \
diff --git a/make/gensrc/GensrcMisc.gmk b/make/gensrc/GensrcMisc.gmk
index 9a03f118b82..804cbcdce0b 100644
--- a/make/gensrc/GensrcMisc.gmk
+++ b/make/gensrc/GensrcMisc.gmk
@@ -28,7 +28,7 @@
 # string and the runtime name into the VersionProps.java file.
 
 $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
-    SOURCE_FILES := $(JDK_TOPDIR)/src/java.base/share/classes/java/lang/VersionProps.java.template, \
+    SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/java/lang/VersionProps.java.template, \
     OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/VersionProps.java, \
     REPLACEMENTS := \
         @@LAUNCHER_NAME@@ => $(LAUNCHER_NAME) ; \
@@ -74,7 +74,7 @@ endef
 GENSRC_SOR_FILE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/ch/SocketOptionRegistry.java
 
 $(GENSRC_SOR_FILE): \
-    $(JDK_TOPDIR)/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
+    $(TOPDIR)/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
 	$(generate-preproc-src)
 
 GENSRC_JAVA_BASE += $(GENSRC_SOR_FILE)
@@ -86,7 +86,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
   GENSRC_UC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/UnixConstants.java
 
   $(GENSRC_UC_FILE): \
-      $(JDK_TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
+      $(TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
 	$(generate-preproc-src)
 
   GENSRC_JAVA_BASE += $(GENSRC_UC_FILE)
@@ -100,7 +100,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
   GENSRC_SC_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/nio/fs/SolarisConstants.java
 
   $(GENSRC_SC_FILE): \
-      $(JDK_TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
+      $(TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
 	$(generate-preproc-src)
 
   GENSRC_JAVA_BASE += $(GENSRC_SC_FILE)
@@ -116,9 +116,9 @@ else
     JCE_DEFAULT_POLICY = limited
 endif
 
-ifneq ($(wildcard $(JDK_TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template), )
+ifneq ($(wildcard $(TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template), )
   $(eval $(call SetupTextFileProcessing, BUILD_JCESECURITY_JAVA, \
-      SOURCE_FILES := $(JDK_TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template, \
+      SOURCE_FILES := $(TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity.java.template, \
       OUTPUT_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/javax/crypto/JceSecurity.java, \
       REPLACEMENTS := \
         @@JCE_DEFAULT_POLICY@@ => $(JCE_DEFAULT_POLICY), \
diff --git a/make/gensrc/GensrcModuleLoaderMap.gmk b/make/gensrc/GensrcModuleLoaderMap.gmk
index 365c83ddf90..5d4adeeccba 100644
--- a/make/gensrc/GensrcModuleLoaderMap.gmk
+++ b/make/gensrc/GensrcModuleLoaderMap.gmk
@@ -44,7 +44,7 @@ VARDEPS_FILE := $(call DependOnVariable, VARDEPS_VALUE)
 ############################################################################
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java: \
-    $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java \
+    $(TOPDIR)/src/java.base/share/classes/jdk/internal/module/ModuleLoaderMap.java \
     $(VARDEPS_FILE) $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(@D)
 	$(RM) $@ $@.tmp
@@ -55,7 +55,7 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java:
 GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat: \
-    $(JDK_TOPDIR)/src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat \
+    $(TOPDIR)/src/java.base/share/classes/jdk/internal/vm/cds/resources/ModuleLoaderMap.dat \
     $(VARDEPS_FILE) $(BUILD_TOOLS_JDK)
 	$(MKDIR) -p $(@D)
 	$(RM) $@ $@.tmp
diff --git a/make/gensrc/GensrcProperties.gmk b/make/gensrc/GensrcProperties.gmk
index 7293a19bbeb..b0381e9159c 100644
--- a/make/gensrc/GensrcProperties.gmk
+++ b/make/gensrc/GensrcProperties.gmk
@@ -29,7 +29,7 @@
 ################################################################################
 # Helper macro for SetupCopy-zh_HK.
 define SetupOneCopy-zh_HK
-  $1_$2_TARGET := $$(patsubst $(JDK_TOPDIR)/src/$(MODULE)/share/classes/%, \
+  $1_$2_TARGET := $$(patsubst $(TOPDIR)/src/$(MODULE)/share/classes/%, \
       $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/%, \
       $$(subst _zh_TW,_zh_HK, $2))
 
@@ -58,12 +58,12 @@ endef
 # SRC_DIRS   Directories containing properties files to process.
 # EXCLUDE   Exclude files matching this pattern.
 # CLASS   The super class for the generated classes.
-# MODULE_PATH_ROOT   Module path root, defaults to $(JDK_TOPDIR)/src.
+# MODULE_PATH_ROOT   Module path root, defaults to $(TOPDIR)/src.
 SetupCompileProperties = $(NamedParamsMacroTemplate)
 define SetupCompilePropertiesBody
   # Set default value unless overridden
   ifeq ($$($1_MODULE_PATH_ROOT), )
-    $1_MODULE_PATH_ROOT := $(JDK_TOPDIR)/src
+    $1_MODULE_PATH_ROOT := $(TOPDIR)/src
   endif
 
   # Locate all properties files in the given source dirs.
diff --git a/make/gensrc/GensrcSwing.gmk b/make/gensrc/GensrcSwing.gmk
index eee0c044f2f..713f1d3425d 100644
--- a/make/gensrc/GensrcSwing.gmk
+++ b/make/gensrc/GensrcSwing.gmk
@@ -28,7 +28,7 @@
 #
 NIMBUS_PACKAGE = javax.swing.plaf
 NIMBUS_GENSRC_DIR = $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/javax/swing/plaf/nimbus
-NIMBUS_SKIN_FILE = $(JDK_TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
+NIMBUS_SKIN_FILE = $(TOPDIR)/src/java.desktop/share/classes/javax/swing/plaf/nimbus/skin.laf
 
 $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_nimbus: $(NIMBUS_SKIN_FILE) $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Generating Nimbus source files)
diff --git a/make/gensrc/GensrcVarHandles.gmk b/make/gensrc/GensrcVarHandles.gmk
index 773c0f4c109..acdce6c03a7 100644
--- a/make/gensrc/GensrcVarHandles.gmk
+++ b/make/gensrc/GensrcVarHandles.gmk
@@ -26,7 +26,7 @@
 GENSRC_VARHANDLES :=
 
 VARHANDLES_GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/invoke
-VARHANDLES_SRC_DIR := $(JDK_TOPDIR)/src/java.base/share/classes/java/lang/invoke
+VARHANDLES_SRC_DIR := $(TOPDIR)/src/java.base/share/classes/java/lang/invoke
 
 ################################################################################
 # Setup a rule for generating a VarHandle java class
diff --git a/make/gensrc/GensrcX11Wrappers.gmk b/make/gensrc/GensrcX11Wrappers.gmk
index e4e3bba5745..b3081b2637a 100644
--- a/make/gensrc/GensrcX11Wrappers.gmk
+++ b/make/gensrc/GensrcX11Wrappers.gmk
@@ -42,7 +42,7 @@ GENSRC_X11WRAPPERS_TMP := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_x11wrappers
 GENSRC_X11WRAPPERS_DST := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/sun/awt/X11
 
 # The pre-calculated offset file are stored here:
-GENSRC_SIZER_DIR := $(JDK_TOPDIR)/make/data/x11wrappergen
+GENSRC_SIZER_DIR := $(TOPDIR)/make/data/x11wrappergen
 
 # Normal case is to generate only according to target bits
 GENSRC_X11_VERSION := $(OPENJDK_TARGET_CPU_BITS)
@@ -92,13 +92,13 @@ ifneq ($(COMPILE_TYPE), cross)
   endif
 
   SIZER_CFLAGS := \
-      -I$(JDK_TOPDIR)/src/java.base/share/native/include \
-      -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include \
-      -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-      -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
+      -I$(TOPDIR)/src/java.base/share/native/include \
+      -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_EXPORT_DIR)/native/include \
+      -I$(TOPDIR)/src/java.base/share/native/libjava \
+      -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
       #
 
   # Compile the C code into an executable.
diff --git a/make/hotspot/copy/Copy-java.base.gmk b/make/hotspot/copy/Copy-java.base.gmk
index 2185b60396e..1d7ed7adf8d 100644
--- a/make/hotspot/copy/Copy-java.base.gmk
+++ b/make/hotspot/copy/Copy-java.base.gmk
@@ -33,7 +33,7 @@ INCLUDE_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE)
 ################################################################################
 # Copy platform-independent .h files
 $(eval $(call SetupCopyFiles, COPY_INCLUDE_FILES, \
-    SRC := $(HOTSPOT_TOPDIR)/src/share/vm, \
+    SRC := $(TOPDIR)/src/hotspot/share, \
     DEST := $(INCLUDE_DST_DIR), \
     FLATTEN := true, \
     FILES := prims/jni.h code/jvmticmlr.h \
@@ -45,7 +45,7 @@ $(eval $(call SetupCopyFiles, COPY_INCLUDE_FILES, \
 # Copy jni_md.h
 
 # This might have been defined in a custom extension
-JNI_MD_H_SRC ?= $(HOTSPOT_TOPDIR)/src/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/vm/jni_$(HOTSPOT_TARGET_CPU_ARCH).h
+JNI_MD_H_SRC ?= $(TOPDIR)/src/hotspot/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/jni_$(HOTSPOT_TARGET_CPU_ARCH).h
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   # NOTE: This should most likely be darwin, but the old hotspot build uses bsd
diff --git a/make/hotspot/gensrc/GenerateSources.gmk b/make/hotspot/gensrc/GenerateSources.gmk
index 31c342ae83e..4c96e463e63 100644
--- a/make/hotspot/gensrc/GenerateSources.gmk
+++ b/make/hotspot/gensrc/GenerateSources.gmk
@@ -39,14 +39,14 @@ include gensrc/GensrcAdlc.gmk
 include gensrc/GensrcDtrace.gmk
 include gensrc/GensrcJvmti.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot, gensrc/GenerateSources.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/gensrc/GenerateSources.gmk))
 
 # While technically the rules below are "gendata" which can be done in parallel
 # with native compilation, let's keep it here for simplicity.
 
 # The Xusage.txt file needs to have platform specific path separator
 $(eval $(call SetupTextFileProcessing, CREATE_XUSAGE, \
-    SOURCE_FILES := $(HOTSPOT_TOPDIR)/src/share/vm/Xusage.txt, \
+    SOURCE_FILES := $(TOPDIR)/src/hotspot/share/Xusage.txt, \
     OUTPUT_FILE := $(JVM_LIB_OUTPUTDIR)/Xusage.txt, \
     REPLACEMENTS := separated by ;> => separated by $(PATH_SEP)> ; , \
 ))
@@ -55,7 +55,7 @@ TARGETS += $(CREATE_XUSAGE)
 
 # Setup the hotspot launcher script for developer use
 $(eval $(call SetupTextFileProcessing, CREATE_HOTSPOT_LAUNCHER, \
-    SOURCE_FILES := $(HOTSPOT_TOPDIR)/make/hotspot.script, \
+    SOURCE_FILES := $(TOPDIR)/make/hotspot/hotspot.script, \
     OUTPUT_FILE := $(JVM_OUTPUTDIR)/hotspot, \
     REPLACEMENTS := \
         @@LIBARCH@@ => $(OPENJDK_TARGET_CPU_LEGACY_LIB) ; \
diff --git a/make/hotspot/gensrc/GensrcAdlc.gmk b/make/hotspot/gensrc/GensrcAdlc.gmk
index ef3b1cf9a12..f6622e88418 100644
--- a/make/hotspot/gensrc/GensrcAdlc.gmk
+++ b/make/hotspot/gensrc/GensrcAdlc.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, hotspot, gensrc/GensrcAdlc.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/gensrc/GensrcAdlc.gmk))
 
 ifeq ($(call check-jvm-feature, compiler2), true)
 
@@ -60,12 +60,12 @@ ifeq ($(call check-jvm-feature, compiler2), true)
 
   ADLC_CFLAGS += -D$(HOTSPOT_TARGET_CPU_DEFINE)
 
-  ADLC_CFLAGS += -I$(HOTSPOT_TOPDIR)/src/share/vm
+  ADLC_CFLAGS += -I$(TOPDIR)/src/hotspot/share
 
   $(eval $(call SetupNativeCompilation, BUILD_ADLC, \
       TOOLCHAIN := TOOLCHAIN_BUILD_LINK_CXX, \
-      SRC := $(HOTSPOT_TOPDIR)/src/share/vm/adlc, \
-      EXTRA_FILES := $(HOTSPOT_TOPDIR)/src/share/vm/opto/opcodes.cpp, \
+      SRC := $(TOPDIR)/src/hotspot/share/adlc, \
+      EXTRA_FILES := $(TOPDIR)/src/hotspot/share/opto/opcodes.cpp, \
       CFLAGS := $(ADLC_CFLAGS) $(ADLC_CFLAGS_WARNINGS), \
       LDFLAGS := $(ADLC_LDFLAGS), \
       LIBS := $(ADLC_LIBS), \
@@ -127,12 +127,12 @@ ifeq ($(call check-jvm-feature, compiler2), true)
   # #line directives in those files will be pointing back to <arch>.ad.
 
   # AD_SRC_ROOTS might have been added to by a custom extension
-  AD_SRC_ROOTS += $(HOTSPOT_TOPDIR)/src
+  AD_SRC_ROOTS += $(TOPDIR)/src/hotspot
 
   AD_SRC_FILES := $(call uniq, $(wildcard $(foreach d, $(AD_SRC_ROOTS), \
-      $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/vm/$(HOTSPOT_TARGET_CPU).ad \
-      $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/vm/$(HOTSPOT_TARGET_CPU_ARCH).ad \
-      $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH)/vm/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH).ad \
+      $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_CPU).ad \
+      $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_CPU_ARCH).ad \
+      $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH)/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH).ad \
     )))
 
   SINGLE_AD_SRCFILE := $(ADLC_SUPPORT_DIR)/all-ad-src.ad
diff --git a/make/hotspot/gensrc/GensrcDtrace.gmk b/make/hotspot/gensrc/GensrcDtrace.gmk
index 126be0b3599..9df23a8cbe5 100644
--- a/make/hotspot/gensrc/GensrcDtrace.gmk
+++ b/make/hotspot/gensrc/GensrcDtrace.gmk
@@ -37,7 +37,7 @@ ifeq ($(call check-jvm-feature, dtrace), true)
     DTRACE_CPP_FLAGS := -x c
   endif
 
-  DTRACE_SOURCE_DIR := $(HOTSPOT_TOPDIR)/src/os/posix/dtrace
+  DTRACE_SOURCE_DIR := $(TOPDIR)/src/hotspot/os/posix/dtrace
   DTRACE_GENSRC_DIR := $(JVM_VARIANT_OUTPUTDIR)/gensrc/dtracefiles
 
   # Make sure we run our selected compiler for preprocessing instead of letting
diff --git a/make/hotspot/gensrc/GensrcJvmti.gmk b/make/hotspot/gensrc/GensrcJvmti.gmk
index d91c2b6346f..c7340dabc1e 100644
--- a/make/hotspot/gensrc/GensrcJvmti.gmk
+++ b/make/hotspot/gensrc/GensrcJvmti.gmk
@@ -23,12 +23,12 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, hotspot, gensrc/GensrcJvmti.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/gensrc/GensrcJvmti.gmk))
 
 ################################################################################
 # Build tools needed for the JVMTI source code generation
 
-JVMTI_TOOLS_SRCDIR := $(HOTSPOT_TOPDIR)/src/share/vm/prims
+JVMTI_TOOLS_SRCDIR := $(TOPDIR)/src/hotspot/share/prims
 JVMTI_TOOLS_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/tools/jvmti
 
 $(eval $(call SetupJavaCompiler, GENERATE_OLDBYTECODE, \
@@ -79,7 +79,7 @@ endef
 ################################################################################
 # Create JVMTI files in gensrc/jvmtifiles
 
-JVMTI_SRCDIR := $(HOTSPOT_TOPDIR)/src/share/vm/prims
+JVMTI_SRCDIR := $(TOPDIR)/src/hotspot/share/prims
 JVMTI_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles
 
 # Setup rule for generating a jvmti file
@@ -106,7 +106,7 @@ $(eval $(call SetupJvmtiGeneration, jvmti.h, jvmtiH.xsl))
 $(eval $(call SetupJvmtiGeneration, jvmti.html, jvmti.xsl))
 $(eval $(call SetupJvmtiGeneration, jvmtiEnvStub.cpp, jvmtiEnv.xsl))
 
-JVMTI_BC_SRCDIR := $(HOTSPOT_TOPDIR)/src/share/vm/interpreter
+JVMTI_BC_SRCDIR := $(TOPDIR)/src/hotspot/share/interpreter
 
 $(eval $(call SetupXslTransform, bytecodeInterpreterWithChecks.cpp, \
     XML_FILE := $(JVMTI_BC_SRCDIR)/bytecodeInterpreterWithChecks.xml, \
@@ -146,7 +146,7 @@ endif
 # Create trace files in gensrc/tracefiles
 
 TRACE_OUTPUTDIR := $(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles
-TRACE_SRCDIR := $(HOTSPOT_TOPDIR)/src/share/vm/trace
+TRACE_SRCDIR := $(TOPDIR)/src/hotspot/share/trace
 
 # Append list of XSL files to search (might have been set by custom extensions)
 TRACE_XSL_FILES += $(wildcard $(TRACE_SRCDIR)/*.xsl)
diff --git a/make/hotspot/ide/CreateVSProject.gmk b/make/hotspot/ide/CreateVSProject.gmk
index 2a9da913ab7..94c75a466e9 100644
--- a/make/hotspot/ide/CreateVSProject.gmk
+++ b/make/hotspot/ide/CreateVSProject.gmk
@@ -90,7 +90,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
   $(eval $(call SetupJavaCompilation, BUILD_PROJECT_CREATOR, \
       SETUP := GENERATE_OLDBYTECODE, \
       ADD_JAVAC_FLAGS := -Xlint:-auxiliaryclass, \
-      SRC := $(HOTSPOT_TOPDIR)/make/src/classes, \
+      SRC := $(TOPDIR)/make/hotspot/src/classes, \
       BIN := $(TOOLS_OUTPUTDIR), \
   ))
 
diff --git a/make/hotspot/lib/CompileDtracePostJvm.gmk b/make/hotspot/lib/CompileDtracePostJvm.gmk
index 1051cafe8dd..49a21b29465 100644
--- a/make/hotspot/lib/CompileDtracePostJvm.gmk
+++ b/make/hotspot/lib/CompileDtracePostJvm.gmk
@@ -46,8 +46,7 @@ ifeq ($(call check-jvm-feature, dtrace), true)
     # in the libjvm.so, using JVM_CFLAGS as setup in CompileJvm.gmk. Otherwise
     # this would preferrably have been done as a part of GensrcDtrace.gmk.
     $(eval $(call SetupNativeCompilation, BUILD_DTRACE_GEN_OFFSETS, \
-        SRC := $(HOTSPOT_TOPDIR)/src/os/$(OPENJDK_TARGET_OS)/dtrace, \
-        INCLUDE_FILES := generateJvmOffsets.cpp generateJvmOffsetsMain.c, \
+        SRC := $(TOPDIR)/make/hotspot/src/native/dtrace, \
         CC := $(BUILD_CXX), \
         CXX := $(BUILD_CXX), \
         LDEXE := $(BUILD_CXX), \
@@ -100,7 +99,7 @@ ifeq ($(call check-jvm-feature, dtrace), true)
     # Generate DTRACE_OBJ which is linked with libjvm.so.
 
     # Concatenate all *.d files into a single file
-    DTRACE_SOURCE_FILES := $(addprefix $(HOTSPOT_TOPDIR)/src/os/posix/dtrace/, \
+    DTRACE_SOURCE_FILES := $(addprefix $(TOPDIR)/src/hotspot/os/posix/dtrace/, \
         hotspot_jni.d \
         hotspot.d \
         hs_private.d \
@@ -158,7 +157,7 @@ ifeq ($(call check-jvm-feature, dtrace), true)
     # Unfortunately dtrace generates incorrect types for some symbols in
     # dtrace_jhelper.o, resulting in "warning: symbol X has differing types"
     # This is tracked in JDK-6890703.
-    $(DTRACE_JHELPER_OBJ): $(HOTSPOT_TOPDIR)/src/os/solaris/dtrace/jhelper.d \
+    $(DTRACE_JHELPER_OBJ): $(TOPDIR)/src/hotspot/os/solaris/dtrace/jhelper.d \
         $(JVM_OFFSETS_INDEX_H)
 	$(call LogInfo, Running dtrace for $(<F))
 	$(call ExecuteWithLog, $@, $(DTRACE) $(DTRACE_FLAGS) $(DTRACE_CPP_FLAGS) -C \
@@ -181,12 +180,11 @@ ifeq ($(call check-jvm-feature, dtrace), true)
     $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DTRACE, \
         LIBRARY := jvm_dtrace, \
         OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
-        SRC := $(HOTSPOT_TOPDIR)/src/os/solaris/dtrace, \
-        INCLUDE_FILES := jvm_dtrace.c, \
+        SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_dtrace, \
         CFLAGS := -m64 -G -mt -KPIC, \
         LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
         LIBS := $(LIBDL) -lc -lthread -ldoor, \
-        MAPFILE := $(HOTSPOT_TOPDIR)/make/mapfiles/libjvm_dtrace/mapfile-vers, \
+        MAPFILE := $(TOPDIR)/make/mapfiles/libjvm_dtrace/mapfile-vers, \
         OBJECT_DIR := $(LIBJVM_DTRACE_OUTPUTDIR)/objs, \
     ))
 
@@ -197,13 +195,12 @@ ifeq ($(call check-jvm-feature, dtrace), true)
     $(eval $(call SetupNativeCompilation, BUILD_LIBJVM_DB, \
         LIBRARY := jvm_db, \
         OUTPUT_DIR := $(JVM_LIB_OUTPUTDIR), \
-        SRC := $(HOTSPOT_TOPDIR)/src/os/solaris/dtrace, \
-        INCLUDE_FILES := libjvm_db.c, \
+        SRC := $(TOPDIR)/src/java.base/solaris/native/libjvm_db, \
         CFLAGS := -I$(JVM_VARIANT_OUTPUTDIR)/gensrc -I$(DTRACE_SUPPORT_DIR) \
             -m64 -G -mt -KPIC, \
         LDFLAGS := -m64 -mt -xnolib $(SHARED_LIBRARY_FLAGS), \
         LIBS := -lc, \
-        MAPFILE := $(HOTSPOT_TOPDIR)/make/mapfiles/libjvm_db/mapfile-vers, \
+        MAPFILE := $(TOPDIR)/make/mapfiles/libjvm_db/mapfile-vers, \
         OBJECT_DIR := $(LIBJVM_DB_OUTPUTDIR)/objs, \
     ))
 
diff --git a/make/hotspot/lib/CompileGtest.gmk b/make/hotspot/lib/CompileGtest.gmk
index 10e3f14de0d..c944c3481c9 100644
--- a/make/hotspot/lib/CompileGtest.gmk
+++ b/make/hotspot/lib/CompileGtest.gmk
@@ -23,11 +23,11 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/CompileGtest.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/lib/CompileGtest.gmk))
 
-GTEST_TEST_SRC += $(HOTSPOT_TOPDIR)/test/native
-GTEST_LAUNCHER_SRC := $(HOTSPOT_TOPDIR)/test/native/gtestLauncher.cpp
-GTEST_FRAMEWORK_SRC := $(SRC_ROOT)/test/fmw/gtest
+GTEST_TEST_SRC += $(TOPDIR)/test/hotspot/gtest
+GTEST_LAUNCHER_SRC := $(TOPDIR)/test/hotspot/gtest/gtestLauncher.cpp
+GTEST_FRAMEWORK_SRC := $(TOPDIR)/test/fmw/gtest
 
 # On Windows, there are no internal debug symbols so must set copying to true
 # to get any at all.
diff --git a/make/hotspot/lib/CompileJvm.gmk b/make/hotspot/lib/CompileJvm.gmk
index d5ecb2555f3..da7d4eafc87 100644
--- a/make/hotspot/lib/CompileJvm.gmk
+++ b/make/hotspot/lib/CompileJvm.gmk
@@ -28,7 +28,7 @@
 include lib/JvmFeatures.gmk
 include lib/JvmOverrideFiles.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/CompileJvm.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/lib/CompileJvm.gmk))
 
 ################################################################################
 # Setup compilation of the main Hotspot native library (libjvm).
@@ -40,14 +40,14 @@ JVM_MAPFILE := $(JVM_OUTPUTDIR)/mapfile
 # Platform independent setup
 
 # This variable may be added to by a custom extension
-JVM_SRC_ROOTS += $(HOTSPOT_TOPDIR)/src
+JVM_SRC_ROOTS += $(TOPDIR)/src/hotspot
 
 JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \
-        $d/share/vm \
-        $d/os/$(HOTSPOT_TARGET_OS)/vm \
-        $d/os/$(HOTSPOT_TARGET_OS_TYPE)/vm \
-        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH)/vm \
-        $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH)/vm \
+        $d/share \
+        $d/os/$(HOTSPOT_TARGET_OS) \
+        $d/os/$(HOTSPOT_TARGET_OS_TYPE) \
+        $d/cpu/$(HOTSPOT_TARGET_CPU_ARCH) \
+        $d/os_cpu/$(HOTSPOT_TARGET_OS)_$(HOTSPOT_TARGET_CPU_ARCH) \
     ))) \
     $(JVM_VARIANT_OUTPUTDIR)/gensrc/jvmtifiles \
     $(JVM_VARIANT_OUTPUTDIR)/gensrc/tracefiles \
@@ -56,8 +56,8 @@ JVM_SRC_DIRS += $(call uniq, $(wildcard $(foreach d, $(JVM_SRC_ROOTS), \
 JVM_CFLAGS_INCLUDES += \
     $(patsubst %,-I%,$(filter-out $(JVM_VARIANT_OUTPUTDIR)/gensrc/%, $(JVM_SRC_DIRS))) \
     -I$(JVM_VARIANT_OUTPUTDIR)/gensrc \
-    -I$(HOTSPOT_TOPDIR)/src/share/vm/precompiled \
-    -I$(HOTSPOT_TOPDIR)/src/share/vm/prims \
+    -I$(TOPDIR)/src/hotspot/share/precompiled \
+    -I$(TOPDIR)/src/hotspot/share/prims \
     #
 
 # INCLUDE_SUFFIX_* is only meant for including the proper
@@ -161,7 +161,7 @@ else ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), linux-aarch64)
 endif
 
 ifneq ($(filter $(OPENJDK_TARGET_OS), linux macosx windows), )
-  JVM_PRECOMPILED_HEADER := $(HOTSPOT_TOPDIR)/src/share/vm/precompiled/precompiled.hpp
+  JVM_PRECOMPILED_HEADER := $(TOPDIR)/src/hotspot/share/precompiled/precompiled.hpp
 endif
 
 ifeq ($(OPENJDK_TARGET_CPU), x86)
@@ -173,9 +173,9 @@ endif
 # Inline assembly for solaris
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   ifeq ($(OPENJDK_TARGET_CPU), x86_64)
-    JVM_CFLAGS += $(HOTSPOT_TOPDIR)/src/os_cpu/solaris_x86/vm/solaris_x86_64.il
+    JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_x86/solaris_x86_64.il
   else ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
-    JVM_CFLAGS += $(HOTSPOT_TOPDIR)/src/os_cpu/solaris_sparc/vm/solaris_sparc.il
+    JVM_CFLAGS += $(TOPDIR)/src/hotspot/os_cpu/solaris_sparc/solaris_sparc.il
   endif
 endif
 
@@ -231,7 +231,7 @@ $(eval $(call SetupNativeCompilation, BUILD_LIBJVM, \
     STRIPFLAGS := $(JVM_STRIPFLAGS), \
     EMBED_MANIFEST := true, \
     RC_FLAGS := $(JVM_RCFLAGS), \
-    VERSIONINFO_RESOURCE := $(HOTSPOT_TOPDIR)/src/os/windows/vm/version.rc, \
+    VERSIONINFO_RESOURCE := $(TOPDIR)/src/hotspot/os/windows/version.rc, \
     PRECOMPILED_HEADER := $(JVM_PRECOMPILED_HEADER), \
     PRECOMPILED_HEADER_EXCLUDE := $(JVM_PRECOMPILED_HEADER_EXCLUDE), \
 ))
diff --git a/make/hotspot/lib/CompileLibjsig.gmk b/make/hotspot/lib/CompileLibjsig.gmk
index fbc8abb1ca3..fbe557cd420 100644
--- a/make/hotspot/lib/CompileLibjsig.gmk
+++ b/make/hotspot/lib/CompileLibjsig.gmk
@@ -57,7 +57,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
       endif
 
     else ifeq ($(OPENJDK_TARGET_OS), solaris)
-      LIBJSIG_CFLAGS := -m64 -KPIC -mt
+      LIBJSIG_CFLAGS := -m64 -KPIC -mt -I $(TOPDIR)/src/hotspot/os/solaris
       LIBJSIG_LDFLAGS := -m64 -mt -xnolib
       LIBJSIG_LIBS := $(LIBDL)
 
@@ -81,8 +81,8 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
       $(error Unknown target OS $(OPENJDK_TARGET_OS) in CompileLibjsig.gmk)
     endif
 
-    LIBJSIG_SRC_FILE := $(HOTSPOT_TOPDIR)/src/os/$(HOTSPOT_TARGET_OS)/vm/jsig.c
-    LIBJSIG_MAPFILE := $(wildcard $(HOTSPOT_TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS))
+    LIBJSIG_SRC_FILE := $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjsig/jsig.c
+    LIBJSIG_MAPFILE := $(wildcard $(TOPDIR)/make/mapfiles/libjsig/mapfile-vers-$(OPENJDK_TARGET_OS))
     LIBJSIG_OUTPUTDIR := $(HOTSPOT_OUTPUTDIR)/libjsig
 
     LIBJSIG_LDFLAGS += $(SHARED_LIBRARY_FLAGS)
diff --git a/make/hotspot/lib/JvmFeatures.gmk b/make/hotspot/lib/JvmFeatures.gmk
index db07898ce41..3880e685fe3 100644
--- a/make/hotspot/lib/JvmFeatures.gmk
+++ b/make/hotspot/lib/JvmFeatures.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/JvmFeatures.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmFeatures.gmk))
 
 ################################################################################
 # Setup CFLAGS and EXCLUDES for the libjvm compilation, depending on which
diff --git a/make/hotspot/lib/JvmMapfile.gmk b/make/hotspot/lib/JvmMapfile.gmk
index 9f9c928d8f5..aae8d0cf866 100644
--- a/make/hotspot/lib/JvmMapfile.gmk
+++ b/make/hotspot/lib/JvmMapfile.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/JvmMapfile.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmMapfile.gmk))
 
 ################################################################################
 # Combine a list of static symbols
@@ -31,20 +31,20 @@ $(eval $(call IncludeCustomExtension, hotspot, lib/JvmMapfile.gmk))
 ifneq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU), windows-x86_64)
   # On Windows x86_64, we should not have any symbols at all, since that
   # results in duplicate warnings from the linker (JDK-8043491).
-  SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-shared
+  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-shared
 endif
 
 ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
-  SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-unix
+  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-unix
 endif
 
-ifneq ($(wildcard $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)), )
-  SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)
+ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)), )
+  SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)
 endif
 
 ifneq ($(findstring debug, $(DEBUG_LEVEL)), )
-  ifneq ($(wildcard $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
-    SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-$(OPENJDK_TARGET_OS)-debug
+  ifneq ($(wildcard $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug), )
+    SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-$(OPENJDK_TARGET_OS)-debug
   endif
 endif
 
@@ -53,9 +53,9 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
     # Additional mapfiles that are only used when dtrace is enabled
     ifeq ($(call check-jvm-feature, compiler2), true)
       # This also covers the case of compiler1+compiler2.
-      SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-solaris-dtrace-compiler2
+      SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-solaris-dtrace-compiler2
     else ifeq ($(call check-jvm-feature, compiler1), true)
-      SYMBOLS_SRC += $(HOTSPOT_TOPDIR)/make/symbols/symbols-solaris-dtrace-compiler1
+      SYMBOLS_SRC += $(TOPDIR)/make/hotspot/symbols/symbols-solaris-dtrace-compiler1
     endif
   endif
 endif
diff --git a/make/hotspot/lib/JvmOverrideFiles.gmk b/make/hotspot/lib/JvmOverrideFiles.gmk
index dabdf3b4eab..b8eddbd9df3 100644
--- a/make/hotspot/lib/JvmOverrideFiles.gmk
+++ b/make/hotspot/lib/JvmOverrideFiles.gmk
@@ -23,7 +23,7 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/JvmOverrideFiles.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/lib/JvmOverrideFiles.gmk))
 
 ################################################################################
 # This file contains explicit overrides of CFLAGS and/or precompiled header
@@ -55,8 +55,8 @@ ifeq ($(OPENJDK_TARGET_OS), linux)
     # significantly reduce the GC pause time on 32 bit Linux/Unix platforms by
     # compiling without the PIC flag (-fPIC on linux).
     # See 6454213 for more details.
-    ALL_SRC := $(filter %.cpp, $(call CacheFind, $(HOTSPOT_TOPDIR)/src/share/vm))
-    NONPIC_FILTER := $(addsuffix %, $(addprefix $(HOTSPOT_TOPDIR)/src/share/vm/, \
+    ALL_SRC := $(filter %.cpp, $(call CacheFind, $(TOPDIR)/src/hotspot/share))
+    NONPIC_FILTER := $(addsuffix %, $(addprefix $(TOPDIR)/src/hotspot/share/, \
         memory oops gc))
     # Due to what looks like a bug in the old build implementation of this, add a
     # couple of more files that were accidentally matched as substrings of GC related
diff --git a/make/idea/template/ant.xml b/make/idea/template/ant.xml
index f5274deb5bb..9e7c19b8c89 100644
--- a/make/idea/template/ant.xml
+++ b/make/idea/template/ant.xml
@@ -4,9 +4,8 @@
     <buildFile url="file://$PROJECT_DIR$/.idea/build.xml">
       <properties>
         <property name="boot.java.home" value="$JDKPath$" />
-        <property name="jtreg.tests" value="$FilePath$" />
-        <property name="jtreg.home" value="jtreg.home" />
-        <property name="build.target.dir" value="specDir" /> <!-- this will be replaced --> 
+        <property name="intellij.ismake" value="$IsMake$" />
+        <property name="build.target.dir" value="specDir" /> <!-- this will be replaced -->
         <property name="module.name" value="java.base" /> <!-- this will be replaced -->
       </properties>
       <executeOn event="afterCompilation" target="post-make" />
diff --git a/make/idea/template/build.xml b/make/idea/template/build.xml
index b10490f77f1..7f0eff40e3b 100644
--- a/make/idea/template/build.xml
+++ b/make/idea/template/build.xml
@@ -33,7 +33,11 @@
             </sequential>
         </macrodef>
 
-    <target name="post-make" depends="build-module"/>
+    <target name="cond-clean" unless="${intellij.ismake}">
+        <antcall target="clean"/>
+    </target>
+
+    <target name="post-make" depends="cond-clean, build-module"/>
 
     <!--
         **** Global JDK Build Targets
@@ -106,68 +110,4 @@
             </sequential>
         </macrodef>
     </target>
-
-    <macrodef name="exec-target">
-        <attribute name="antfile" default="${ant.file}" />
-        <attribute name="target" />
-        <sequential>
-            <java classname="org.apache.tools.ant.Main" fork="true" spawn="true">
-                <arg value="-f"/>
-                <arg value="@{antfile}"/>
-                <arg value="-Dbuild.target.dir=${build.target.dir}"/>
-                <arg value="-Djtreg.home=${jtreg.home}"/>
-                <arg value="-Djtreg.tests=${jtreg.tests}"/>
-                <arg value="-Djtreg.jpda.jvmargs=${jtreg.jpda.jvmargs}"/>
-                <arg value="@{target}"/>
-                <classpath>
-                    <pathelement path="${java.class.path}"/>
-                </classpath>
-            </java>
-        </sequential>
-    </macrodef>
-
-    <target name="jtreg" depends="images,-def-jtreg">
-        <jtreg-tool name="all" tests="${jtreg.tests}"/>
-    </target>
-
-    <target name="-def-jtreg" unless="jtreg.defined" depends="-check-jtreg.home">
-        <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant">
-            <classpath>
-                <pathelement location="${jtreg.home}/lib/jtreg.jar"/>
-                <pathelement location="${jtreg.home}/lib/javatest.jar"/>
-            </classpath>
-        </taskdef>
-        <macrodef name="jtreg-tool">
-            <attribute name="name"/>
-            <attribute name="tests"/>
-            <attribute name="jdk" default="${build.target.dir}/images/jdk"/>
-            <attribute name="agentvm" default="true"/>
-            <attribute name="verbose" default="${default.jtreg.verbose}"/>
-            <attribute name="options" default="${other.jtreg.options}"/>
-            <attribute name="keywords" default="-keywords:!ignore"/>
-            <attribute name="jpda.jvmargs" default=""/>
-            <attribute name="extra.jvmargs" default=""/>
-            <attribute name="build.modules" default="${build.modules}"/>
-            <sequential>
-                <property name="coverage.options" value=""/>              <!-- default -->
-                <property name="coverage.classpath" value=""/>            <!-- default -->
-                <property name="default.jtreg.verbose" value="summary"/>  <!-- default -->
-                <property name="other.jtreg.options" value=""/>           <!-- default -->
-                <property name="jtreg.classfiles.to.modules" value="@{agentvm}"/>
-                <jtreg
-                    dir="${test.dir}"
-                    workDir="${build.target.dir}/idea/@{name}/work"
-                    reportDir="${build.target.dir}/idea/@{name}/report"
-                    jdk="@{jdk}"
-                    agentvm="@{agentvm}" verbose="@{verbose}"
-                    failonerror="false" resultproperty="jtreg.@{name}.result">
-                    <arg value="-debug:@{jpda.jvmargs}"/>
-                    <arg line="@{keywords}"/>
-                    <arg line="@{options}"/>
-                    <arg line="@{tests}"/>
-                </jtreg>
-            </sequential>
-        </macrodef>
-        <property name="jtreg.defined" value="true"/>
-    </target>
 </project>
diff --git a/make/idea/template/compiler.xml b/make/idea/template/compiler.xml
index f801895e7f7..51d78fb9733 100644
--- a/make/idea/template/compiler.xml
+++ b/make/idea/template/compiler.xml
@@ -3,17 +3,10 @@
   <component name="CompilerConfiguration">
     <option name="DEFAULT_COMPILER" value="Javac" />
     <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/jdk/src" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/langtools/src" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/jaxp/src" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/jaxws/src" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/corba/src" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/nashorn/src" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/src" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/build" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/jdk/test" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/jaxp/test" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/langtools/test" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/langtools" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/make" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/test" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions />
     <wildcardResourcePatterns>
diff --git a/make/idea/template/jdk.iml b/make/idea/template/jdk.iml
index 5e1436c949a..384f7806d3b 100644
--- a/make/idea/template/jdk.iml
+++ b/make/idea/template/jdk.iml
@@ -4,17 +4,10 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/####" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/jdk/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/langtools/test" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/jaxp/test" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/####/buildtools" />
-      <excludeFolder url="file://$MODULE_DIR$/####/configure-support" />
-      <excludeFolder url="file://$MODULE_DIR$/####/hotspot" />
-      <excludeFolder url="file://$MODULE_DIR$/####/images" />
-      <excludeFolder url="file://$MODULE_DIR$/####/ide" />
-      <excludeFolder url="file://$MODULE_DIR$/####/jdk" />
-      <excludeFolder url="file://$MODULE_DIR$/####/make-support" />
-      <excludeFolder url="file://$MODULE_DIR$/####/testoutput" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/src" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/make" />
     </content>    
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
diff --git a/make/idea/template/misc.xml b/make/idea/template/misc.xml
index e5caa22e0d6..c597899705a 100644
--- a/make/idea/template/misc.xml
+++ b/make/idea/template/misc.xml
@@ -3,6 +3,15 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="JTRegService">
+    <path>jtreg_home</path> <!-- this will be replaced -->
+    <workDir>build</workDir>
+    <jre alt="true" value="images_jdk" /> <!-- this will be replaced -->
+    <options></options>
+    <ant>
+      <target file="file://$PROJECT_DIR$/.idea/build.xml" name="images" />
+    </ant>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_9" assert-keyword="true" jdk-15="true">
     <output url="file://$PROJECT_DIR$/build/idea/out" />
   </component>
diff --git a/make/idea/template/vcs.xml b/make/idea/template/vcs.xml
index 876d3cd2ef8..94ad9258305 100644
--- a/make/idea/template/vcs.xml
+++ b/make/idea/template/vcs.xml
@@ -2,13 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="hg4idea" />
-    <mapping directory="$PROJECT_DIR$/jdk" vcs="hg4idea" />
-    <mapping directory="$PROJECT_DIR$/langtools" vcs="hg4idea" />
-    <mapping directory="$PROJECT_DIR$/hotspot" vcs="hg4idea" />
-    <mapping directory="$PROJECT_DIR$/nashorn" vcs="hg4idea" />
-    <mapping directory="$PROJECT_DIR$/jaxp" vcs="hg4idea" />
-    <mapping directory="$PROJECT_DIR$/jaxws" vcs="hg4idea" />
-    <mapping directory="$PROJECT_DIR$/corba" vcs="hg4idea" />
   </component>
 </project>
 
diff --git a/make/idea/template/workspace.xml b/make/idea/template/workspace.xml
index e6377dd53a2..7113a00aa75 100644
--- a/make/idea/template/workspace.xml
+++ b/make/idea/template/workspace.xml
@@ -8,14 +8,6 @@
   <component name="StructureViewFactory">
     <option name="ACTIVE_ACTIONS" value=",ALPHA_COMPARATOR" />
   </component>
-  <component name="RunManager" selected="Ant Target.jtreg">
-    <configuration default="false" name="jtreg" type="AntRunConfiguration" factoryName="Ant Target">
-      <antsettings antfile="file://$PROJECT_DIR$/.idea/build.xml" target="jtreg" />
-      <method>
-        <option name="Make" enabled="false" />
-      </method>
-    </configuration>
-  </component>
   <component name="antWorkspaceConfiguration">
     <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
     <option name="FILTER_TARGETS" value="false" />
@@ -43,7 +35,7 @@
     </buildFile>
   </component>
   <component name="ProjectView">
-    <navigator currentView="PackagesPane" proportions="" version="1">
+    <navigator currentView="ProjectPane" proportions="" version="1">
       <flattenPackages />
       <showMembers />
       <showModules />
diff --git a/make/jprt.properties b/make/jprt.properties
index 491462cdb97..b3239b1ea5b 100644
--- a/make/jprt.properties
+++ b/make/jprt.properties
@@ -38,13 +38,13 @@ jprt.tools.default.release=jdk9
 jprt.sync.push=true
 
 # Directories to be excluded from the source bundles
-jprt.bundle.exclude.src.dirs=build dist webrev
+jprt.bundle.exclude.src.dirs=build dist webrev ${jprt.bundle.exclude.src.dirs.extra}
 
 # Use configure when building
 jprt.build.use.configure=true
 jprt.build.use.jib=true
 jprt.test.use.jib=true
-jprt.jib.launcher=common/bin/jib.sh
+jprt.jib.launcher=bin/jib.sh
 jprt.build.use.jib.publish=true
 
 # Clear out all the build needs as JIB handles this
diff --git a/make/langtools/build.properties b/make/langtools/build.properties
index 9ee717093c3..2b934790e05 100644
--- a/make/langtools/build.properties
+++ b/make/langtools/build.properties
@@ -33,6 +33,12 @@ javac.build.opts = -XDignore.symbol.file=true -Xlint:all,-deprecation,-options -
 javac.build.source = 8
 javac.build.target = 8
 
+module.names = java.compiler \
+               jdk.compiler \
+               jdk.javadoc \
+               jdk.jdeps \
+               jdk.jshell
+
 langtools.resource.includes = \
         com/sun/tools/javac/resources/compiler.properties
 
diff --git a/make/langtools/build.xml b/make/langtools/build.xml
index c39ff0e2761..b1a9d032744 100644
--- a/make/langtools/build.xml
+++ b/make/langtools/build.xml
@@ -53,7 +53,7 @@
  - utility definitions
  -->
 
-<project name="langtools" default="build" basedir="..">
+<project name="langtools" default="build" basedir="../..">
     <!--
     **** Global property definitions.
     -->
@@ -61,7 +61,7 @@
     <!-- The following locations can be used to override default property values. -->
 
     <!-- Use this location for customizations specific to this instance of this workspace -->
-    <property file="build.properties"/>
+    <property file="make/langtools/build.properties"/>
 
     <!-- Use this location for customizations common to all OpenJDK langtools workspaces -->
     <property file="${user.home}/.openjdk/${ant.project.name}-build.properties"/>
@@ -72,10 +72,10 @@
     <!-- Convenient shorthands for standard locations within the workspace. -->
     <property name="src.dir" location="src"/>
     <property name="test.dir" location="test"/>
-    <property name="make.dir" location="make"/>
+    <property name="make.dir" location="make/langtools"/>
     <property name="make.conf.dir" location="${make.dir}/conf"/>
     <property name="make.tools.dir" location="${make.dir}/tools"/>
-    <property name="build.dir" location="build"/>
+    <property name="build.dir" location="build/langtools"/>
     <property name="build.modules" location="${build.dir}/modules"/>
     <property name="build.gensrc" location="${build.dir}/gensrc"/>
     <property name="build.tools" location="${build.dir}/toolclasses"/>
@@ -83,29 +83,26 @@
     <property name="build.jtreg" location="${build.dir}/jtreg"/>
     <property name="build.prevsrc" location="${build.dir}/prevsrc"/>
 
-    <pathconvert property="modules.names" pathsep=",">
-        <globmapper from="${src.dir}/*" to="*" handledirsep="yes"/>
-        <dirset dir="${src.dir}" includes="*.*"/>
-    </pathconvert>
+    <dirset id="src.module.dirset" dir="${src.dir}" includes="${module.names}"/>
 
-    <pathconvert property="xpatch.rest" pathsep=" --patch-module=">
+    <pathconvert pathsep="," property="src.module.dirs" refid="src.module.dirset"/>
+
+    <pathconvert property="xpatch.rest" pathsep=" --patch-module=" refid="src.module.dirset">
         <scriptmapper language="javascript">
             fs = project.getProperty("file.separator");
             path = project.getProperty("build.modules");
             mod = source.substr(source.lastIndexOf(fs)+1);
             self.addMappedName(mod + "=\"" + path + fs + mod + "\"");
         </scriptmapper>
-        <dirset dir="${src.dir}" includes="*.*"/>
     </pathconvert>
 
-    <pathconvert property="xpatch.noquotes.rest" pathsep=" --patch-module=">
+    <pathconvert property="xpatch.noquotes.rest" pathsep=" --patch-module=" refid="src.module.dirset">
         <scriptmapper language="javascript">
             fs = project.getProperty("file.separator");
             path = project.getProperty("build.modules");
             mod = source.substr(source.lastIndexOf(fs)+1);
             self.addMappedName(mod + "=" + path + fs + mod);
         </scriptmapper>
-        <dirset dir="${src.dir}" includes="*.*"/>
     </pathconvert>
 
     <property name="xpatch.cmd" value="--patch-module=${xpatch.rest}"/>
@@ -198,6 +195,7 @@
 
     <target name="generate-sources-internal">
         <basename property="module.name" file="${basedir}"/>
+        <mkdir dir="${build.gensrc}/${module.name}"/>
         <pparse destdir="${build.gensrc}/${module.name}" includes="${langtools.resource.includes}">
             <src path="./share/classes"/>
         </pparse>
@@ -208,22 +206,48 @@
 
     <target name="generate-sources"  depends="-prepare-build,-def-pparse,-def-pcompile">
         <subant inheritall="true" target="generate-sources-internal" genericantfile="${make.dir}/build.xml">
-              <dirset dir="${src.dir}" includes="*.*"/>
+              <dirset refid="src.module.dirset"/>
         </subant>
     </target>
 
     <target name="build-all-classes" depends="generate-sources">
+        <pathconvert property="xpatch.src.rest" pathsep=" --patch-module=" refid="src.module.dirset">
+            <scriptmapper language="javascript">
+                fs = project.getProperty("file.separator");
+                path_src = project.getProperty("src.dir");
+                path_sep = project.getProperty("path.separator");
+                path_gensrc = project.getProperty("build.gensrc");
+                mod = source.substr(source.lastIndexOf(fs)+1);
+                self.addMappedName(mod + "=" + path_src + fs + mod + path_sep + path_gensrc + fs + mod);
+            </scriptmapper>
+        </pathconvert>
+        <property name="xpatch.src.cmd" value="--patch-module=${xpatch.src.rest}"/>
+        <pathconvert pathsep="," property="gensrc.module.dirs">
+            <dirset dir="${build.gensrc}" includes="${module.names}"/>
+        </pathconvert>
+        <multirootfileset id="source.fileset" basedirs="${src.module.dirs},${gensrc.module.dirs}">
+            <include name="**/*.java"/>
+            <different targetdir="${build.prevsrc}" ignoreFileTimes="true"/>
+        </multirootfileset>
+        <pathconvert pathsep=" " property="source.files" refid="source.fileset"/>
+        <echo file="${build.dir}/sources.txt">${source.files}</echo>
         <exec executable="${langtools.jdk.home}/bin/javac" failonerror="true">
             <arg line="-source ${javac.source} -target ${javac.target}" />
             <arg value="-d" />
             <arg value="${build.modules}" />
             <arg line="${javac.opts}" />
-            <arg line="--module-source-path ${src.dir}${file.separator}*${file.separator}share${file.separator}classes${path.separator}${build.gensrc}" />
-            <arg line="-m ${modules.names}" />
+            <arg line="${xpatch.src.cmd}" />
+            <arg line="--module-source-path ." />
+            <arg line="@${build.dir}/sources.txt" />
         </exec>
+        <delete file="${build.dir}/sources.txt"/>
         <delete>
             <fileset dir="${build.modules}" includes="**/module-info.class"/>
         </delete>
+        <!-- workaround for incremental compilation -->
+        <copy todir="${build.prevsrc}" >
+            <multirootfileset refid="source.fileset"/>
+        </copy>
     </target>
 
     <target name="build-all-tools" depends="build-all-classes, -def-build-tool">
@@ -247,7 +271,7 @@
     <target name="idea" depends="-check-langtools.jdk.home">
         <mkdir dir=".idea"/>
         <copy todir=".idea" >
-            <fileset dir="make/intellij">
+            <fileset dir="${make.dir}/intellij">
                <exclude name="**/src/**"/>
                <exclude name="**/utils/**"/>
             </fileset>
@@ -267,7 +291,7 @@
         <mkdir dir=".idea/classes"/>
         <javac source="${javac.build.source}"
                target="${javac.build.target}"
-               srcdir="make/intellij/src"
+               srcdir="${make.dir}/intellij/src"
                destdir=".idea/classes"/>
     </target>
 
diff --git a/make/langtools/intellij/ant.xml b/make/langtools/intellij/ant.xml
index ea4b820a965..bdfadea35f5 100644
--- a/make/langtools/intellij/ant.xml
+++ b/make/langtools/intellij/ant.xml
@@ -3,7 +3,8 @@
   <component name="AntConfiguration">
     <buildFile url="file://$PROJECT_DIR$/.idea/build.xml">
       <properties>
-	<property name="langtools.jdk.home" value="@IDEA_TARGET_JDK@" />
+	    <property name="langtools.jdk.home" value="@IDEA_TARGET_JDK@" />
+        <property name="intellij.ismake" value="$IsMake$" />
       </properties>
       <executeOn event="afterCompilation" target="post-make" />
     </buildFile>
diff --git a/make/langtools/intellij/build.xml b/make/langtools/intellij/build.xml
index 238f54b5609..b6b92f5584b 100644
--- a/make/langtools/intellij/build.xml
+++ b/make/langtools/intellij/build.xml
@@ -6,7 +6,11 @@
         new LangtoolsLogger(project)
     </script>
 
-    <import file="../make/build.xml"/>
+    <import file="../make/langtools/build.xml"/>
 
-    <target name="post-make" depends="clean, build-all-tools"/>
+    <target name="cond-clean" unless="${intellij.ismake}">
+        <antcall target="clean"/>
+    </target>
+
+    <target name="post-make" depends="cond-clean, build-all-tools"/>
 </project>
diff --git a/make/langtools/intellij/langtools.iml b/make/langtools/intellij/langtools.iml
index c982a85e461..28f2643ab21 100644
--- a/make/langtools/intellij/langtools.iml
+++ b/make/langtools/intellij/langtools.iml
@@ -7,12 +7,26 @@
       <sourceFolder url="file://$MODULE_DIR$/src/jdk.javadoc/share/classes" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/jdk.jdeps/share/classes" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/jdk.jshell/share/classes" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/gensrc/jdk.compiler" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/gensrc/jdk.javadoc" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/gensrc/jdk.jdeps" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/make/tools" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/make/src/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/langtools/gensrc/jdk.compiler" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/langtools/gensrc/jdk.javadoc" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/langtools/gensrc/jdk.jdeps" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/make/langtools/tools" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/make/langtools/src/classes" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/langtools/gensrc/jdk.compiler" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/langtools/gensrc/jdk.javadoc" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/langtools/gensrc/jdk.jdeps" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/langtools/gensrc/jdk.jshell" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jdk.compiler" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/java.compiler" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jdk.jdeps" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jdk.jshell" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jdk.javadoc" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/make" />
+      <excludeFolder url="file://$MODULE_DIR$/src" />
+      <excludeFolder url="file://$MODULE_DIR$/test" />
     </content>
+    <content url="file://$MODULE_DIR$/test/langtools"/>
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="inheritedJdk" />
   </component>
diff --git a/make/langtools/netbeans/langtools/nbproject/project.xml b/make/langtools/netbeans/langtools/nbproject/project.xml
index aa5b4dd6a0c..f2d9ecfd225 100644
--- a/make/langtools/netbeans/langtools/nbproject/project.xml
+++ b/make/langtools/netbeans/langtools/nbproject/project.xml
@@ -39,7 +39,7 @@
             <!-- Do not use Project Properties customizer when editing this file manually. -->
             <name>langtools</name>
             <properties>
-                <property name="root">../../..</property>
+                <property name="root">../../../..</property>
             </properties>
             <folders>
                 <source-folder>
@@ -49,12 +49,12 @@
                 <source-folder>
                     <label>Test files</label>
                     <type>tests</type>
-                    <location>${root}/test</location>
+                    <location>${root}/test/langtools</location>
                 </source-folder>
                 <source-folder>
                     <label>Build files</label>
                     <type>build</type>
-                    <location>${root}/make</location>
+                    <location>${root}/make/langtools</location>
                 </source-folder>
                 <source-folder>
                     <label>Source files - java.compiler</label>
@@ -253,7 +253,7 @@
                     <target>jtreg</target>
                     <context>
                         <property>jtreg.tests</property>
-                        <folder>${root}/test</folder>
+                        <folder>${root}/test/langtools</folder>
                         <pattern>\.(java|sh)$</pattern>
                         <format>relative-path</format>
                         <arity>
@@ -335,7 +335,7 @@
                     <target>debug-jtreg</target>
                     <context>
                         <property>jtreg.tests</property>
-                        <folder>${root}/test</folder>
+                        <folder>${root}/test/langtools</folder>
                         <pattern>\.(java|sh)$</pattern>
                         <format>relative-path</format>
                         <arity>
@@ -447,7 +447,7 @@
                     </source-folder>
                     <source-folder style="tree">
                         <label>Test files</label>
-                        <location>${root}/test</location>
+                        <location>${root}/test/langtools</location>
                     </source-folder>
                     <source-folder style="tree">
                         <label>Build files</label>
diff --git a/make/launcher/Launcher-java.base.gmk b/make/launcher/Launcher-java.base.gmk
index 06ccec771ea..340072ca486 100644
--- a/make/launcher/Launcher-java.base.gmk
+++ b/make/launcher/Launcher-java.base.gmk
@@ -25,10 +25,10 @@
 
 include LauncherCommon.gmk
 
-$(eval $(call IncludeCustomExtension, jdk, launcher/Launcher-java.base.gmk))
+$(eval $(call IncludeCustomExtension, , launcher/Launcher-java.base.gmk))
 
-JAVA_RC_FLAGS += -I $(JDK_TOPDIR)/src/java.base/windows/native/common
-JAVA_RC_FLAGS += -I $(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons
+JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/common
+JAVA_RC_FLAGS += -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
 
 ################################################################################
 
@@ -73,11 +73,11 @@ $(eval $(call SetupBuildLauncher, keytool, \
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
   $(eval $(call SetupNativeCompilation, BUILD_JEXEC, \
-      SRC := $(JDK_TOPDIR)/src/$(MODULE)/unix/native/launcher, \
+      SRC := $(TOPDIR)/src/$(MODULE)/unix/native/launcher, \
       INCLUDE_FILES := jexec.c, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKEXE) \
-          -I$(JDK_TOPDIR)/src/$(MODULE)/share/native/libjli, \
+          -I$(TOPDIR)/src/$(MODULE)/share/native/libjli, \
       CFLAGS_linux := -fPIC, \
       CFLAGS_solaris := -KPIC, \
       LDFLAGS := $(LDFLAGS_JDKEXE), \
@@ -93,9 +93,9 @@ endif
 
 ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx solaris aix), )
   $(eval $(call SetupNativeCompilation, BUILD_JSPAWNHELPER, \
-      SRC := $(JDK_TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
+      SRC := $(TOPDIR)/src/$(MODULE)/unix/native/jspawnhelper, \
       OPTIMIZATION := LOW, \
-      CFLAGS := $(CFLAGS_JDKEXE) -I$(JDK_TOPDIR)/src/$(MODULE)/unix/native/libjava, \
+      CFLAGS := $(CFLAGS_JDKEXE) -I$(TOPDIR)/src/$(MODULE)/unix/native/libjava, \
       EXTRA_OBJECT_FILES := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libjava/childproc.o, \
       LDFLAGS := $(LDFLAGS_JDKEXE), \
       OBJECT_DIR := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/jspawnhelper, \
diff --git a/make/launcher/Launcher-java.desktop.gmk b/make/launcher/Launcher-java.desktop.gmk
index 8cf4d79363e..ab60dea9b0a 100644
--- a/make/launcher/Launcher-java.desktop.gmk
+++ b/make/launcher/Launcher-java.desktop.gmk
@@ -26,7 +26,7 @@
 include LauncherCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, launcher/Launcher-java.desktop.gmk))
+$(eval $(call IncludeCustomExtension, , launcher/Launcher-java.desktop.gmk))
 
 ifeq ($(ENABLE_HEADLESS_ONLY), false)
   $(eval $(call SetupBuildLauncher, appletviewer, \
diff --git a/make/launcher/Launcher-jdk.accessibility.gmk b/make/launcher/Launcher-jdk.accessibility.gmk
index 914b9464909..1163e7691fd 100644
--- a/make/launcher/Launcher-jdk.accessibility.gmk
+++ b/make/launcher/Launcher-jdk.accessibility.gmk
@@ -30,8 +30,8 @@ include LauncherCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  JABSWITCH_SRC := $(JDK_TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
-  ACCESSBRIDGE_SRC := $(JDK_TOPDIR)/src/jdk.accessibility/windows/native/common
+  JABSWITCH_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/jabswitch
+  ACCESSBRIDGE_SRC := $(TOPDIR)/src/jdk.accessibility/windows/native/common
 
   $(eval $(call SetupNativeCompilation,BUILD_JABSWITCH, \
       SRC := $(JABSWITCH_SRC), \
@@ -59,7 +59,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 ################################################################################
 # jaccessinspector
 
-  TOPDIR := $(JDK_TOPDIR)/src/jdk.accessibility/windows/native
+  TOPDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
   TOOLS_CFLAGS := $(addprefix -I, \
       $(TOPDIR)/include/bridge \
       $(TOPDIR)/common \
diff --git a/make/launcher/Launcher-jdk.pack.gmk b/make/launcher/Launcher-jdk.pack.gmk
index 4fe0fdf411f..fed0ac81968 100644
--- a/make/launcher/Launcher-jdk.pack.gmk
+++ b/make/launcher/Launcher-jdk.pack.gmk
@@ -34,17 +34,17 @@ $(eval $(call SetupBuildLauncher, pack200, \
 # The order of the object files on the link command line affects the size of the resulting
 # binary (at least on linux) which causes the size to differ between old and new build.
 
-UNPACKEXE_SRC := $(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack \
-    $(JDK_TOPDIR)/src/jdk.pack/share/native/unpack200
-UNPACKEXE_CFLAGS := -I$(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack \
-    -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-    -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava
+UNPACKEXE_SRC := $(TOPDIR)/src/jdk.pack/share/native/common-unpack \
+    $(TOPDIR)/src/jdk.pack/share/native/unpack200
+UNPACKEXE_CFLAGS := -I$(TOPDIR)/src/jdk.pack/share/native/common-unpack \
+    -I$(TOPDIR)/src/java.base/share/native/libjava \
+    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava
 
 ifeq ($(USE_EXTERNAL_LIBZ), true)
   UNPACKEXE_CFLAGS += -DSYSTEM_ZLIB
   UNPACKEXE_LIBS := -lz
 else
-  UNPACKEXE_CFLAGS += -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib
+  UNPACKEXE_CFLAGS += -I$(TOPDIR)/src/java.base/share/native/libzip/zlib
   UNPACKEXE_ZIPOBJS := $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/zcrc32$(OBJ_SUFFIX) \
       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/deflate$(OBJ_SUFFIX) \
       $(SUPPORT_OUTPUTDIR)/native/java.base/libzip/trees$(OBJ_SUFFIX) \
@@ -58,7 +58,7 @@ else
 
 endif
 
-UNPACK_MAPFILE_DIR := $(JDK_TOPDIR)/make/mapfiles/libunpack
+UNPACK_MAPFILE_DIR := $(TOPDIR)/make/mapfiles/libunpack
 UNPACK_MAPFILE_PLATFORM_FILE := \
     $(UNPACK_MAPFILE_DIR)/mapfile-vers-unpack200-$(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH)
 
@@ -97,7 +97,7 @@ $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE, \
         -D "JDK_FNAME=unpack200.exe" \
         -D "JDK_INTERNAL_NAME=unpack200" \
         -D "JDK_FTYPE=0x1L", \
-    MANIFEST := $(JDK_TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \
+    MANIFEST := $(TOPDIR)/src/jdk.pack/windows/native/unpack200/unpack200_proto.exe.manifest, \
     MANIFEST_VERSION := $(VERSION_NUMBER_FOUR_POSITIONS), \
 ))
 
diff --git a/make/launcher/LauncherCommon.gmk b/make/launcher/LauncherCommon.gmk
index 08938e05fb2..aa07cac2467 100644
--- a/make/launcher/LauncherCommon.gmk
+++ b/make/launcher/LauncherCommon.gmk
@@ -42,16 +42,16 @@ else
   endif
 endif
 
-LAUNCHER_SRC := $(JDK_TOPDIR)/src/java.base/share/native/launcher
-LAUNCHER_CFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/launcher \
-    -I$(JDK_TOPDIR)/src/java.base/share/native/libjli \
-    -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
-    -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
+LAUNCHER_SRC := $(TOPDIR)/src/java.base/share/native/launcher
+LAUNCHER_CFLAGS := -I$(TOPDIR)/src/java.base/share/native/launcher \
+    -I$(TOPDIR)/src/java.base/share/native/libjli \
+    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjli \
+    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libjli \
     #
-GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc
-JAVA_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/launcher/java.rc
-MACOSX_PLIST_DIR := $(JDK_TOPDIR)/src/java.base/macosx/native/launcher
-JAVA_MANIFEST := $(JDK_TOPDIR)/src/java.base/windows/native/launcher/java.manifest
+GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
+JAVA_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/launcher/java.rc
+MACOSX_PLIST_DIR := $(TOPDIR)/src/java.base/macosx/native/launcher
+JAVA_MANIFEST := $(TOPDIR)/src/java.base/windows/native/launcher/java.manifest
 
 ################################################################################
 # Build standard launcher.
@@ -169,14 +169,14 @@ define SetupBuildLauncherBody
   # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
   # if feeded with a version script which contains named tags.
   ifeq ($(USING_BROKEN_SUSE_LD),yes)
-    ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous), )
-      $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous
+    ifneq ($(wildcard $(TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous), )
+      $1_MAPFILE := $(TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous
     else
       $1_MAPFILE :=
     endif
   else
-    ifneq ($(wildcard $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), )
-      $1_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
+    ifneq ($(wildcard $(TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)), )
+      $1_MAPFILE := $(TOPDIR)/make/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
     else
       $1_MAPFILE :=
     endif
diff --git a/make/lib/Awt2dLibraries.gmk b/make/lib/Awt2dLibraries.gmk
index 3f714e12b7b..fcb6ead748a 100644
--- a/make/lib/Awt2dLibraries.gmk
+++ b/make/lib/Awt2dLibraries.gmk
@@ -23,20 +23,20 @@
 # questions.
 #
 
-$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries-pre.gmk))
+$(eval $(call IncludeCustomExtension, , lib/Awt2dLibraries-pre.gmk))
 
 WIN_AWT_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libawt/awt.lib
 
 ################################################################################
 
-BUILD_LIBMLIB_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
-    $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib
+BUILD_LIBMLIB_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \
+    $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib
 BUILD_LIBMLIB_CFLAGS := -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES \
     $(addprefix -I, $(BUILD_LIBMLIB_SRC)) \
-    -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image
+    -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libmlib_image
 
 BUILD_LIBMLIB_LDLIBS :=
-BUILD_LIBMLIB_IMAGE_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
+BUILD_LIBMLIB_IMAGE_MAPFILE := $(TOPDIR)/make/mapfiles/libmlib_image/mapfile-vers
 
 BUILD_LIBMLIB_CFLAGS += -DMLIB_NO_LIBSUNMATH
 
@@ -78,12 +78,12 @@ TARGETS += $(BUILD_LIBMLIB_IMAGE)
 
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
 
-  LIBMLIB_IMAGE_V_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image \
-      $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib \
-      $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
+  LIBMLIB_IMAGE_V_SRC := $(TOPDIR)/src/java.desktop/share/native/libmlib_image \
+      $(TOPDIR)/src/java.desktop/unix/native/libmlib_image \
+      $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib \
+      $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
       #
-  LIBMLIB_IMAGE_V_CFLAGS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \
+  LIBMLIB_IMAGE_V_CFLAGS := $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il \
       $(addprefix -I, $(LIBMLIB_IMAGE_V_SRC)) \
       #
 
@@ -131,18 +131,18 @@ endif
 
 ################################################################################
 
-LIBAWT_DIRS := $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
-    $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
-    $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-    $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+LIBAWT_DIRS := $(TOPDIR)/src/java.desktop/share/native/libawt \
+    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
+    $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
     #
 
 ifeq ($(OPENJDK_TARGET_OS), aix)
-  LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
+  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/libawt
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility
+  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/utility
 endif
 
 ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), )
@@ -165,8 +165,8 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
   LIBAWT_CFLAGS += -DMLIB_ADD_SUFF
   LIBAWT_CFLAGS += -xarch=sparcvis
 
-  LIBAWT_CFLAGS += $(JDK_TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
-  LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/medialib
+  LIBAWT_CFLAGS += $(TOPDIR)/src/java.desktop/unix/native/libmlib_image/vis_$(OPENJDK_TARGET_CPU_BITS).il
+  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/awt/medialib
   LIBAWT_EXFILES += java2d/loops/MapAccelFunc.c
 
   ifeq ($(OPENJDK_TARGET_CPU), sparcv9)
@@ -176,9 +176,9 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
   endif
 else
   LIBAWT_EXCLUDES += \
-      $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/awt/medialib \
-      $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d/loops \
-      $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
+      $(TOPDIR)/src/java.desktop/unix/native/libawt/awt/medialib \
+      $(TOPDIR)/src/java.desktop/unix/native/libawt/java2d/loops \
+      $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib \
       #
 endif
 
@@ -187,15 +187,15 @@ ifneq ($(OPENJDK_TARGET_OS), solaris)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
-      $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
+  LIBAWT_DIRS += $(TOPDIR)/src/java.desktop/share/native/common/font \
+      $(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
+      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt/systemscale \
   # Why does libawt need java.base headers?
-  LIBAWT_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
-      -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
+  LIBAWT_CFLAGS += -I$(TOPDIR)/src/java.desktop/share/native/common/font \
+      -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
+      -I$(TOPDIR)/src/java.desktop/windows/native/include \
+      -I$(TOPDIR)/src/java.desktop/share/native/include \
       -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
       #
   LIBAWT_EXFILES += \
@@ -208,11 +208,11 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
     LIBAWT_CFLAGS += -DMLIB_OS64BIT
   endif
 
-  LIBAWT_RC_FLAGS ?= -I $(JDK_TOPDIR)/src/java.base/windows/native/launcher/icons
-  LIBAWT_VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
+  LIBAWT_RC_FLAGS ?= -I $(TOPDIR)/src/java.base/windows/native/launcher/icons
+  LIBAWT_VERSIONINFO_RESOURCE := $(TOPDIR)/src/java.desktop/windows/native/libawt/windows/awt.rc
 endif
 
-LIBAWT_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt/mapfile-vers
+LIBAWT_MAPFILE := $(TOPDIR)/make/mapfiles/libawt/mapfile-vers
 ifeq ($(OPENJDK_TARGET_OS), linux)
   LIBAWT_MAPFILE :=
 endif
@@ -285,33 +285,33 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
   ifeq ($(ENABLE_HEADLESS_ONLY), false)
 
     LIBAWT_XAWT_DIRS := \
-        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
-        $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-        $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility \
-        $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
-        $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d \
-        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
-        $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+        $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt_xawt \
+        $(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+        $(TOPDIR)/src/java.desktop/share/native/common/awt/utility \
+        $(TOPDIR)/src/java.desktop/share/native/common/font \
+        $(TOPDIR)/src/java.desktop/share/native/common/java2d \
+        $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
+        $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
         #
 
     ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
-      LIBAWT_XAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
+      LIBAWT_XAWT_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
     endif
 
     LIBAWT_XAWT_EXCLUDES := medialib
 
     LIBAWT_XAWT_CFLAGS := $(addprefix -I, $(shell $(FIND) $(LIBAWT_XAWT_DIRS) -type d)) \
         -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-        -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
-        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
-        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
-        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
-        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
-        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
-        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-        -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
-        -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
+        -I$(TOPDIR)/src/java.desktop/share/native/include \
+        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
+        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
+        -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
+        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
+        -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
+        -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
+        -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
+        -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
+        -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
         $(LIBJAVA_HEADER_FLAGS)
         #
 
@@ -360,7 +360,7 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),)
             format-security int-to-pointer-cast parentheses, \
         DISABLED_WARNINGS_solstudio := E_DECLARATION_IN_CODE \
             E_ASSIGNMENT_TYPE_MISMATCH E_NON_CONST_INIT, \
-        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
+        MAPFILE := $(TOPDIR)/make/mapfiles/libawt_xawt/mapfile-vers, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN) \
             -L$(INSTALL_LIBRARIES_HERE), \
@@ -384,10 +384,10 @@ endif
 
 ################################################################################
 
-LIBLCMS_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/liblcms
+LIBLCMS_SRC := $(TOPDIR)/src/java.desktop/share/native/liblcms
 LIBLCMS_CPPFLAGS += -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-    -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-    -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+    -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
+    -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
     $(LIBJAVA_HEADER_FLAGS) \
     #
 # The fast floor code loses precision.
@@ -419,7 +419,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBLCMS, \
     DISABLED_WARNINGS_clang := tautological-compare, \
     DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \
     DISABLED_WARNINGS_microsoft := 4819, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/liblcms/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
@@ -444,12 +444,12 @@ $(BUILD_LIBLCMS): $(BUILD_LIBAWT)
 
 ################################################################################
 
-LIBJAVAJPEG_SRC += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
+LIBJAVAJPEG_SRC += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
 
 BUILD_LIBJAVAJPEG_REORDER :=
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-    BUILD_LIBJAVAJPEG_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
+    BUILD_LIBJAVAJPEG_REORDER := $(TOPDIR)/make/mapfiles/libjpeg/reorder-$(OPENJDK_TARGET_CPU)
   endif
 endif
 
@@ -491,7 +491,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \
         $(LIBJAVA_HEADER_FLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \
     DISABLED_WARNINGS_gcc := clobbered, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(LIBJPEG_LIBS) $(JDKLIB_LIBS), \
@@ -514,34 +514,34 @@ TARGETS += $(BUILD_LIBJAVAJPEG)
 # Mac and Windows only use the native AWT lib, do not build libawt_headless
 ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
 
-  LIBAWT_HEADLESS_DIRS := $(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
-      $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-      $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
+  LIBAWT_HEADLESS_DIRS := $(TOPDIR)/src/java.desktop/unix/native/libawt_headless/awt \
+      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d \
+      $(TOPDIR)/src/java.desktop/share/native/common/java2d \
+      $(TOPDIR)/src/java.desktop/share/native/common/font \
       #
 
   LIBAWT_HEADLESS_EXCLUDES := medialib
   LIBAWT_HEADLESS_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
       $(addprefix -I, $(LIBAWT_HEADLESS_DIRS)) \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
+      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+      -I$(TOPDIR)/src/java.desktop/share/native/common/font \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/font \
+      -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/java2d/opengl \
       $(LIBJAVA_HEADER_FLAGS) \
       #
 
   LIBAWT_HEADLESS_REORDER :=
   ifeq ($(OPENJDK_TARGET_OS), solaris)
     ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-      LIBAWT_HEADLESS_REORDER := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
+      LIBAWT_HEADLESS_REORDER := $(TOPDIR)/make/mapfiles/libawt_headless/reorder-$(OPENJDK_TARGET_CPU)
     endif
   endif
 
@@ -559,7 +559,7 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS), windows macosx),)
           $(LIBAWT_HEADLESS_CFLAGS), \
       DISABLED_WARNINGS_xlc := 1506-356, \
       DISABLED_WARNINGS_solstudio := E_EMPTY_TRANSLATION_UNIT, \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
+      MAPFILE := $(TOPDIR)/make/mapfiles/libawt_headless/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
@@ -582,15 +582,15 @@ endif
 
 ################################################################################
 
-LIBFONTMANAGER_SRC := $(JDK_TOPDIR)/src/java.desktop/share/native/libfontmanager \
-    $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
+LIBFONTMANAGER_SRC := $(TOPDIR)/src/java.desktop/share/native/libfontmanager \
+    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libfontmanager
 LIBFONTMANAGER_CFLAGS := \
     $(addprefix -I, $(shell $(FIND) \
       $(LIBFONTMANAGER_SRC) \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/libawt \
-      $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/common \
-      $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \
+      $(TOPDIR)/src/java.desktop/share/native/libawt \
+      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt \
+      $(TOPDIR)/src/java.desktop/share/native/common \
+      $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common -type d)) \
     -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
     $(LIBJAVA_HEADER_FLAGS) \
     #
@@ -624,7 +624,7 @@ LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
 
 LIBFONTMANAGER_CFLAGS += $(FREETYPE_CFLAGS)
 # This may be overridden in a custom makefile
-BUILD_LIBFONTMANAGER_MAPFILE ?= $(JDK_TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
+BUILD_LIBFONTMANAGER_MAPFILE ?= $(TOPDIR)/make/mapfiles/libfontmanager/mapfile-vers
 BUILD_LIBFONTMANAGER_FONTLIB += $(FREETYPE_LIBS)
 
 LIBFONTMANAGER_OPTIMIZATION := HIGH
@@ -633,7 +633,7 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
       X11TextRenderer.c
   LIBFONTMANAGER_OPTIMIZATION := HIGHEST
-  LIBFONTMANAGER_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows
+  LIBFONTMANAGER_CFLAGS += -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
   LIBFONTMANAGER_EXCLUDE_FILES += X11FontScaler.c \
       X11TextRenderer.c \
@@ -711,15 +711,15 @@ TARGETS += $(BUILD_LIBFONTMANAGER)
 ################################################################################
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
-  LIBJAWT_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \
+  LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
+  LIBJAWT_CFLAGS := -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/windows \
+      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libawt/java2d/windows \
       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-      -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
+      -I$(TOPDIR)/src/java.desktop/windows/native/include \
+      -I$(TOPDIR)/src/java.desktop/share/native/include \
       $(LIBJAVA_HEADER_FLAGS) \
       #
 
@@ -759,15 +759,15 @@ ifeq ($(OPENJDK_TARGET_OS), windows)
 else # OPENJDK_TARGET_OS not windows
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
-    LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjawt
+    LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libjawt
   else
-    LIBJAWT_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
+    LIBJAWT_SRC := $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjawt
   endif
   LIBJAWT_CFLAGS := \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
-      -I$(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/common/awt \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS)/native/include \
+      -I$(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/include \
+      -I$(TOPDIR)/src/java.desktop/share/native/include \
       $(LIBJAVA_HEADER_FLAGS) \
       #
 
@@ -796,7 +796,7 @@ else # OPENJDK_TARGET_OS not windows
           $(LIBJAWT_CFLAGS), \
       CFLAGS_linux := $(HEADLESS_CFLAG), \
       CFLAGS_macosx := $(LIBJAWT_CFLAGS_macosx), \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
+      MAPFILE := $(TOPDIR)/make/mapfiles/libjawt/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
@@ -826,42 +826,42 @@ TARGETS += $(BUILD_LIBJAWT)
 ifeq ($(ENABLE_HEADLESS_ONLY), false)
 
   LIBSPLASHSCREEN_DIRS := \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen \
+      $(TOPDIR)/src/java.desktop/share/native/libjavajpeg \
+      $(TOPDIR)/src/java.desktop/share/native/libsplashscreen \
       #
 
   ifeq ($(USE_EXTERNAL_LIBGIF), true)
     GIFLIB_LIBS := -lgif
     LIBSPLASHSCREEN_EXCLUDES := giflib
   else
-    LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib
+    LIBSPLASHSCREEN_CFLAGS += -I$(TOPDIR)/src/java.desktop/share/native/libsplashscreen/giflib
   endif
 
   ifeq ($(USE_EXTERNAL_LIBJPEG), true)
     LIBJPEG_LIBS := -ljpeg
   else
-    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
-    LIBJPEG_CFLAGS := -I$(JDK_TOPDIR)/src/java.desktop/share/native/libjavajpeg
+    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/share/native/libjavajpeg
+    LIBJPEG_CFLAGS := -I$(TOPDIR)/src/java.desktop/share/native/libjavajpeg
   endif
 
   ifeq ($(USE_EXTERNAL_LIBPNG), false)
-    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng
+    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/share/native/libsplashscreen/libpng
   else
     LIBSPLASHSCREEN_EXCLUDES += libpng
   endif
 
   ifneq ($(OPENJDK_TARGET_OS), macosx)
-    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
+    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libsplashscreen
   else
-    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
+    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/macosx/native/libsplashscreen
   endif
 
   ifneq ($(filter $(OPENJDK_TARGET_OS),linux solaris aix), )
-    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
+    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/unix/native/common/awt/systemscale
   endif
 
   ifeq ($(OPENJDK_TARGET_OS), windows)
-    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.desktop/windows/native/common/awt/systemscale
+    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.desktop/windows/native/common/awt/systemscale
   endif
   LIBSPLASHSCREEN_CFLAGS += -DSPLASHSCREEN -DPNG_NO_MMX_CODE -DPNG_ARM_NEON_OPT=0 \
       $(addprefix -I, $(LIBSPLASHSCREEN_DIRS)) \
@@ -870,7 +870,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
 
   ifeq ($(OPENJDK_TARGET_OS), macosx)
     LIBSPLASHSCREEN_CFLAGS += -DWITH_MACOSX
-    LIBSPLASHSCREEN_CFLAGS += -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp
+    LIBSPLASHSCREEN_CFLAGS += -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp
 
     BUILD_LIBSPLASHSCREEN_java_awt_SplashScreen.c_CFLAGS := -x objective-c -O0
     BUILD_LIBSPLASHSCREEN_splashscreen_gfx_impl.c_CFLAGS := -x objective-c -O0
@@ -889,7 +889,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
   LIBSPLASHSCREEN_LIBS :=
 
   ifneq ($(USE_EXTERNAL_LIBZ), true)
-    LIBSPLASHSCREEN_DIRS += $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib
+    LIBSPLASHSCREEN_DIRS += $(TOPDIR)/src/java.base/share/native/libzip/zlib
     LIBSPLASHSCREEN_CFLAGS += $(ZLIB_CPPFLAGS)
   endif
 
@@ -922,7 +922,7 @@ ifeq ($(ENABLE_HEADLESS_ONLY), false)
       DISABLED_WARNINGS_solstudio := E_NEWLINE_NOT_LAST E_DECLARATION_IN_CODE \
           E_STATEMENT_NOT_REACHED, \
       DISABLED_WARNINGS_microsoft := 4018 4244 4267, \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
+      MAPFILE := $(TOPDIR)/make/mapfiles/libsplashscreen/mapfile-vers, \
       LDFLAGS := $(LIBSPLASHSCREEN_LDFLAGS) $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := $(JDKLIB_LIBS) $(LIBSPLASHSCREEN_LIBS) $(LIBZ) \
@@ -949,36 +949,36 @@ endif
 ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   LIBAWT_LWAWT_DIRS := \
-      $(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
-      $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/common/font \
-      $(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d \
+      $(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt \
+      $(TOPDIR)/src/java.desktop/unix/native/common/awt \
+      $(TOPDIR)/src/java.desktop/share/native/common/font \
+      $(TOPDIR)/src/java.desktop/share/native/common/java2d \
       #
 
   LIBAWT_LWAWT_CFLAGS := \
       $(addprefix -I, $(LIBAWT_LWAWT_DIRS)) \
       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
-      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
-      -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
-      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
-      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/debug \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
-      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/include \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/include \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d \
-      -I$(JDK_TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
-      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
+      -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
+      -I$(TOPDIR)/src/java.desktop/unix/native/libawt_xawt/awt \
+      -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/font \
+      -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/java2d/opengl \
+      -I$(TOPDIR)/src/java.desktop/share/native/common/awt/debug \
+      -I$(TOPDIR)/src/java.desktop/share/native/common/java2d/opengl \
+      -I$(TOPDIR)/src/java.desktop/macosx/native/include \
+      -I$(TOPDIR)/src/java.desktop/share/native/include \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/awt/image/cvutils \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d \
+      -I$(TOPDIR)/src/java.desktop/unix/native/libawt/java2d \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/loops \
+      -I$(TOPDIR)/src/java.desktop/share/native/libawt/java2d/pipe \
+      -I$(TOPDIR)/src/java.desktop/share/native/libmlib_image/ \
+      -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
       $(LIBJAVA_HEADER_FLAGS) \
       #
 
   LIBAWT_LWAWT_EXFILES := fontpath.c awt_Font.c X11Color.c
-  LIBAWT_LWAWT_EXCLUDES := $(JDK_TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
+  LIBAWT_LWAWT_EXCLUDES := $(TOPDIR)/src/java.desktop/unix/native/common/awt/medialib
 
   $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_LWAWT, \
       LIBRARY := awt_lwawt, \
@@ -1032,14 +1032,14 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
   $(eval $(call SetupNativeCompilation,BUILD_LIBOSXUI, \
       LIBRARY := osxui, \
       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-      SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui, \
+      SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxui, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) \
-          -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxui \
-          -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
-          -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
-          -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-          -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
+          -I$(TOPDIR)/src/java.desktop/macosx/native/libosxui \
+          -I$(TOPDIR)/src/java.desktop/macosx/native/libawt_lwawt/awt \
+          -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
+          -I$(TOPDIR)/src/java.base/share/native/libjava \
+          -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
           -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop,  \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN) \
@@ -1070,4 +1070,4 @@ endif
 ################################################################################
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, lib/Awt2dLibraries.gmk))
+$(eval $(call IncludeCustomExtension, , lib/Awt2dLibraries.gmk))
diff --git a/make/lib/CoreLibraries.gmk b/make/lib/CoreLibraries.gmk
index 224b3392a03..6b6f1edacfd 100644
--- a/make/lib/CoreLibraries.gmk
+++ b/make/lib/CoreLibraries.gmk
@@ -26,7 +26,7 @@
 WIN_VERIFY_LIB := $(SUPPORT_OUTPUTDIR)/native/$(MODULE)/libverify/verify.lib
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, lib/CoreLibraries.gmk))
+$(eval $(call IncludeCustomExtension, , lib/CoreLibraries.gmk))
 
 
 ##########################################################################################
@@ -51,7 +51,7 @@ ifeq ($(OPENJDK_TARGET_OS), linux)
   endif
 endif
 
-LIBFDLIBM_SRC := $(JDK_TOPDIR)/src/java.base/share/native/libfdlibm
+LIBFDLIBM_SRC := $(TOPDIR)/src/java.base/share/native/libfdlibm
 LIBFDLIBM_CFLAGS := -I$(LIBFDLIBM_SRC)
 
 ifneq ($(OPENJDK_TARGET_OS), macosx)
@@ -96,7 +96,7 @@ endif
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-    BUILD_LIBVERIFY_REORDER := $(JDK_TOPDIR)/make/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
+    BUILD_LIBVERIFY_REORDER := $(TOPDIR)/make/mapfiles/libverify/reorder-$(OPENJDK_TARGET_CPU)
   endif
 endif
 
@@ -110,11 +110,11 @@ endif
 $(eval $(call SetupNativeCompilation,BUILD_LIBVERIFY, \
     LIBRARY := verify, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/native/libverify, \
+    SRC := $(TOPDIR)/src/java.base/share/native/libverify, \
     OPTIMIZATION := $(LIBVERIFY_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB), \
     DISABLED_WARNINGS_microsoft := 4244 4267, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libverify/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libverify/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm -lc, \
@@ -136,12 +136,12 @@ TARGETS += $(BUILD_LIBVERIFY)
 LIBJAVA_SRC_DIRS += $(call FindSrcDirsForLib, java.base, java)
 
 LIBJAVA_CFLAGS := $(addprefix -I, $(LIBJAVA_SRC_DIRS)) \
-    -I$(JDK_TOPDIR)/src/java.base/share/native/libfdlibm \
+    -I$(TOPDIR)/src/java.base/share/native/libfdlibm \
     -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
     -DARCHPROPNAME='"$(OPENJDK_TARGET_CPU_OSARCH)"'
 
 # Make it possible to override this variable
-LIBJAVA_MAPFILE ?= $(JDK_TOPDIR)/make/mapfiles/libjava/mapfile-vers
+LIBJAVA_MAPFILE ?= $(TOPDIR)/make/mapfiles/libjava/mapfile-vers
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   BUILD_LIBJAVA_java_props_md.c_CFLAGS := -x objective-c
@@ -150,7 +150,7 @@ endif
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-    LIBJAVA_REORDER := $(JDK_TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
+    LIBJAVA_REORDER := $(TOPDIR)/make/mapfiles/libjava/reorder-$(OPENJDK_TARGET_CPU)
   endif
 endif
 
@@ -209,7 +209,7 @@ endif
 BUILD_LIBZIP_REORDER :=
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   ifneq ($(OPENJDK_TARGET_CPU), x86_64)
-    BUILD_LIBZIP_REORDER := $(JDK_TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
+    BUILD_LIBZIP_REORDER := $(TOPDIR)/make/mapfiles/libzip/reorder-$(OPENJDK_TARGET_CPU)
   endif
 endif
 
@@ -221,15 +221,15 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBZIP, \
     LIBRARY := zip, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
     OPTIMIZATION := LOW, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/native/libzip, \
+    SRC := $(TOPDIR)/src/java.base/share/native/libzip, \
     EXCLUDES := $(LIBZIP_EXCLUDES), \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(ZLIB_CPPFLAGS) \
-        -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-        -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
+        -I$(TOPDIR)/src/java.base/share/native/libjava \
+        -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
         -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
     CFLAGS_unix := $(BUILD_LIBZIP_MMAP) -UDEBUG, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libzip/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libzip/mapfile-vers, \
     REORDER := $(BUILD_LIBZIP_REORDER), \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
@@ -254,9 +254,9 @@ TARGETS += $(BUILD_LIBZIP)
 ##########################################################################################
 
 JIMAGELIB_CPPFLAGS := \
-    -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
-    -I$(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
-    -I$(JDK_TOPDIR)/src/java.base/share/native/libjimage \
+    -I$(TOPDIR)/src/java.base/share/native/libjava \
+    -I$(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjava \
+    -I$(TOPDIR)/src/java.base/share/native/libjimage \
     -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
     #
 
@@ -265,13 +265,13 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJIMAGE, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
     OPTIMIZATION := LOW, \
-    SRC := $(JDK_TOPDIR)/src/java.base/share/native/libjimage \
-        $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \
+    SRC := $(TOPDIR)/src/java.base/share/native/libjimage \
+        $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libjimage, \
     EXCLUDES := $(LIBJIMAGE_EXCLUDES), \
     CFLAGS := $(CFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(JIMAGELIB_CPPFLAGS), \
     CFLAGS_unix := -UDEBUG, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libjimage/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_windows := -export:JIMAGE_Open -export:JIMAGE_Close \
@@ -344,7 +344,7 @@ LIBJLI_CFLAGS += $(addprefix -I, $(LIBJLI_SRC_DIRS))
 ifneq ($(USE_EXTERNAL_LIBZ), true)
   LIBJLI_CFLAGS += $(ZLIB_CPPFLAGS)
   LIBJLI_EXTRA_FILES += \
-      $(addprefix $(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib/, \
+      $(addprefix $(TOPDIR)/src/java.base/share/native/libzip/zlib/, \
           inflate.c \
           inftrees.c \
           inffast.c \
@@ -365,7 +365,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJLI, \
     DISABLED_WARNINGS_solstudio := \
         E_ASM_DISABLES_OPTIMIZATION \
         E_STATEMENT_NOT_REACHED, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjli/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libjli/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_linux := $(call SET_SHARED_LIBRARY_ORIGIN,/..), \
diff --git a/make/lib/Lib-java.base.gmk b/make/lib/Lib-java.base.gmk
index 345fda65908..d2c5f853c71 100644
--- a/make/lib/Lib-java.base.gmk
+++ b/make/lib/Lib-java.base.gmk
@@ -26,8 +26,8 @@
 include LibCommon.gmk
 
 # Prepare the find cache.
-$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/java.base/*/native \
-    $(JDK_TOPDIR)/src/*/java.base/*/native)))
+$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.base/*/native \
+    $(TOPDIR)/src/*/java.base/*/native)))
 
 include CoreLibraries.gmk
 include NetworkingLibraries.gmk
diff --git a/make/lib/Lib-java.desktop.gmk b/make/lib/Lib-java.desktop.gmk
index 1043ce777f2..156ac901a03 100644
--- a/make/lib/Lib-java.desktop.gmk
+++ b/make/lib/Lib-java.desktop.gmk
@@ -26,8 +26,8 @@
 include LibCommon.gmk
 
 # Prepare the find cache.
-$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/java.desktop/*/native \
-    $(JDK_TOPDIR)/src/*/java.desktop/*/native)))
+$(eval $(call FillCacheFind, $(wildcard $(TOPDIR)/src/java.desktop/*/native \
+    $(TOPDIR)/src/*/java.desktop/*/native)))
 
 include LibosxLibraries.gmk
 include PlatformLibraries.gmk
diff --git a/make/lib/Lib-java.instrument.gmk b/make/lib/Lib-java.instrument.gmk
index 64f25d0eb82..caee912c307 100644
--- a/make/lib/Lib-java.instrument.gmk
+++ b/make/lib/Lib-java.instrument.gmk
@@ -26,18 +26,18 @@
 include LibCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, lib/Lib-java.instrument.gmk))
+$(eval $(call IncludeCustomExtension, , lib/Lib-java.instrument.gmk))
 
 ################################################################################
 
-LIBINSTRUMENT_SRC := $(JDK_TOPDIR)/src/java.instrument/share/native/libinstrument \
-    $(JDK_TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_TYPE)/native/libinstrument \
+LIBINSTRUMENT_SRC := $(TOPDIR)/src/java.instrument/share/native/libinstrument \
+    $(TOPDIR)/src/java.instrument/$(OPENJDK_TARGET_OS_TYPE)/native/libinstrument \
     #
 LIBINSTRUMENT_CFLAGS := $(CFLAGS_JDKLIB) \
     $(addprefix -I, $(LIBINSTRUMENT_SRC)) \
     -I$(SUPPORT_OUTPUTDIR)/headers/java.instrument \
-    -I$(JDK_TOPDIR)/src/java.base/share/native/libjli \
-    -I$(JDK_TOPDIR)/src/java.base/share/native/libjava \
+    -I$(TOPDIR)/src/java.base/share/native/libjli \
+    -I$(TOPDIR)/src/java.base/share/native/libjava \
     #
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
@@ -57,7 +57,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBINSTRUMENT, \
     CFLAGS := $(LIBINSTRUMENT_CFLAGS), \
     CFLAGS_debug := -DJPLIS_LOGGING, \
     CFLAGS_release := -DNO_JPLIS_LOGGING, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libinstrument/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN) \
         $(LIBINSTRUMENT_LDFLAGS), \
diff --git a/make/lib/Lib-java.management.gmk b/make/lib/Lib-java.management.gmk
index 1847e2eb681..e583ca338cc 100644
--- a/make/lib/Lib-java.management.gmk
+++ b/make/lib/Lib-java.management.gmk
@@ -26,12 +26,12 @@
 include LibCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, lib/Lib-java.management.gmk))
+$(eval $(call IncludeCustomExtension, , lib/Lib-java.management.gmk))
 
 ################################################################################
 
-LIBMANAGEMENT_SRC += $(JDK_TOPDIR)/src/java.management/share/native/libmanagement 
-LIBMANAGEMENT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \
+LIBMANAGEMENT_SRC += $(TOPDIR)/src/java.management/share/native/libmanagement 
+LIBMANAGEMENT_CFLAGS := -I$(TOPDIR)/src/java.management/share/native/include \
     $(addprefix -I,$(LIBMANAGEMENT_SRC)) \
     -I$(SUPPORT_OUTPUTDIR)/headers/java.management \
     $(LIBJAVA_HEADER_FLAGS) \
@@ -50,7 +50,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT, \
     SRC := $(LIBMANAGEMENT_SRC), \
     OPTIMIZATION := $(LIBMANAGEMENT_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_CFLAGS), \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libmanagement/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
diff --git a/make/lib/Lib-java.prefs.gmk b/make/lib/Lib-java.prefs.gmk
index 4652415c0c5..358ccecd6ea 100644
--- a/make/lib/Lib-java.prefs.gmk
+++ b/make/lib/Lib-java.prefs.gmk
@@ -28,9 +28,9 @@ include LibCommon.gmk
 ################################################################################
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  LIBPREF_SRC_DIRS := $(JDK_TOPDIR)/src/java.prefs/macosx/native/libprefs
+  LIBPREF_SRC_DIRS := $(TOPDIR)/src/java.prefs/macosx/native/libprefs
 else
-  LIBPREF_SRC_DIRS := $(JDK_TOPDIR)/src/java.prefs/$(OPENJDK_TARGET_OS_TYPE)/native/libprefs
+  LIBPREF_SRC_DIRS := $(TOPDIR)/src/java.prefs/$(OPENJDK_TARGET_OS_TYPE)/native/libprefs
 endif
 
 $(eval $(call SetupNativeCompilation,BUILD_LIBPREFS, \
@@ -40,7 +40,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBPREFS, \
     OPTIMIZATION := HIGH, \
     CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBPREF_SRC_DIRS)) \
         $(LIBJAVA_HEADER_FLAGS), \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libprefs/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libprefs/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
diff --git a/make/lib/Lib-java.rmi.gmk b/make/lib/Lib-java.rmi.gmk
index c01e2f888fe..0e32650240c 100644
--- a/make/lib/Lib-java.rmi.gmk
+++ b/make/lib/Lib-java.rmi.gmk
@@ -30,10 +30,10 @@ include LibCommon.gmk
 $(eval $(call SetupNativeCompilation,BUILD_LIBRMI, \
     LIBRARY := rmi, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-    SRC := $(JDK_TOPDIR)/src/java.rmi/share/native/librmi, \
+    SRC := $(TOPDIR)/src/java.rmi/share/native/librmi, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/java.rmi, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/librmi/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/librmi/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljvm, \
diff --git a/make/lib/Lib-java.security.jgss.gmk b/make/lib/Lib-java.security.jgss.gmk
index 56b290bbe3b..d56006df849 100644
--- a/make/lib/Lib-java.security.jgss.gmk
+++ b/make/lib/Lib-java.security.jgss.gmk
@@ -28,8 +28,8 @@ include LibCommon.gmk
 ################################################################################
 
 ifneq ($(OPENJDK_TARGET_OS), windows)
-  LIBJ2GSS_SRC := $(JDK_TOPDIR)/src/java.security.jgss/share/native/libj2gss \
-      $(JDK_TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_TYPE)/native/libj2gss \
+  LIBJ2GSS_SRC := $(TOPDIR)/src/java.security.jgss/share/native/libj2gss \
+      $(TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_TYPE)/native/libj2gss \
       #
 
   $(eval $(call SetupNativeCompilation,BUILD_LIBJ2GSS, \
@@ -40,7 +40,7 @@ ifneq ($(OPENJDK_TARGET_OS), windows)
       CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2GSS_SRC)) \
           $(LIBJAVA_HEADER_FLAGS) \
           -I$(SUPPORT_OUTPUTDIR)/headers/java.security.jgss, \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
+      MAPFILE := $(TOPDIR)/make/mapfiles/libj2gss/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := $(LIBDL), \
@@ -57,13 +57,13 @@ ifneq ($(BUILD_CRYPTO), false)
   BUILD_LIBKRB5_NAME :=
   ifeq ($(OPENJDK_TARGET_OS), windows)
     BUILD_LIBKRB5_NAME := w2k_lsa_auth
-    BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_TYPE)/native/libw2k_lsa_auth
+    BUILD_LIBKRB5_SRC := $(TOPDIR)/src/java.security.jgss/$(OPENJDK_TARGET_OS_TYPE)/native/libw2k_lsa_auth
     BUILD_LIBKRB5_LIBS := advapi32.lib Secur32.lib netapi32.lib kernel32.lib user32.lib \
         gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib \
         ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib
   else ifeq ($(OPENJDK_TARGET_OS), macosx)
     BUILD_LIBKRB5_NAME := osxkrb5
-    BUILD_LIBKRB5_SRC := $(JDK_TOPDIR)/src/java.security.jgss/macosx/native/libosxkrb5
+    BUILD_LIBKRB5_SRC := $(TOPDIR)/src/java.security.jgss/macosx/native/libosxkrb5
     BUILD_LIBKRB5_LIBS := \
         -framework JavaNativeFoundation \
         -framework Cocoa \
diff --git a/make/lib/Lib-java.smartcardio.gmk b/make/lib/Lib-java.smartcardio.gmk
index e013203d4e9..a89046d2900 100644
--- a/make/lib/Lib-java.smartcardio.gmk
+++ b/make/lib/Lib-java.smartcardio.gmk
@@ -27,10 +27,10 @@ include LibCommon.gmk
 
 ################################################################################
 
-LIBJ2PCSC_SRC := $(JDK_TOPDIR)/src/java.smartcardio/share/native/libj2pcsc \
-    $(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc
+LIBJ2PCSC_SRC := $(TOPDIR)/src/java.smartcardio/share/native/libj2pcsc \
+    $(TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc
 LIBJ2PCSC_CPPFLAGS := $(addprefix -I,$(LIBJ2PCSC_SRC)) \
-    -I$(JDK_TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc/MUSCLE \
+    -I$(TOPDIR)/src/java.smartcardio/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pcsc/MUSCLE \
     -I$(SUPPORT_OUTPUTDIR)/headers/java.smartcardio
 
 $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \
@@ -40,7 +40,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PCSC, \
     CFLAGS_unix := -D__sun_jdk, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBJ2PCSC_CPPFLAGS), \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libj2pcsc/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := $(LIBDL), \
diff --git a/make/lib/Lib-jdk.accessibility.gmk b/make/lib/Lib-jdk.accessibility.gmk
index 542b20f925b..1ddcfdfa0a1 100644
--- a/make/lib/Lib-jdk.accessibility.gmk
+++ b/make/lib/Lib-jdk.accessibility.gmk
@@ -29,13 +29,13 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  ROOT_SRCDIR := $(JDK_TOPDIR)/src/jdk.accessibility/windows/native
+  ROOT_SRCDIR := $(TOPDIR)/src/jdk.accessibility/windows/native
   JAVA_AB_SRCDIR := $(ROOT_SRCDIR)/libjavaaccessbridge $(ROOT_SRCDIR)/common
   WIN_AB_SRCDIR := $(ROOT_SRCDIR)/libwindowsaccessbridge $(ROOT_SRCDIR)/common
   SYSINFO_SRCDIR := $(ROOT_SRCDIR)/libjabsysinfo
   ACCESSBRIDGE_CFLAGS := -I$(SUPPORT_OUTPUTDIR)/headers/jdk.accessibility \
-      -I$(JDK_TOPDIR)/src/java.desktop/windows/native/include \
-      -I$(JDK_TOPDIR)/src/java.desktop/share/native/include
+      -I$(TOPDIR)/src/java.desktop/windows/native/include \
+      -I$(TOPDIR)/src/java.desktop/share/native/include
 
   define SetupJavaDLL
     # Parameter 1 Suffix
diff --git a/make/lib/Lib-jdk.attach.gmk b/make/lib/Lib-jdk.attach.gmk
index 552b855594a..b3fdb3b94c8 100644
--- a/make/lib/Lib-jdk.attach.gmk
+++ b/make/lib/Lib-jdk.attach.gmk
@@ -43,7 +43,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \
         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.attach \
         $(LIBJAVA_HEADER_FLAGS) $(LIBATTACH_CFLAGS), \
     CFLAGS_windows := /Gy, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libattach/mapfile-$(OPENJDK_TARGET_OS), \
     VERSIONINFO_RESOURCE := $(GLOBAL_VERSION_INFO_RESOURCE), \
     RC_FLAGS := $(RC_FLAGS) \
         -D "JDK_FNAME=attach.dll" \
@@ -51,7 +51,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBATTACH, \
         -D "JDK_FTYPE=0x2L", \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
-    LDFLAGS_windows := -order:@$(JDK_TOPDIR)/make/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \
+    LDFLAGS_windows := -order:@$(TOPDIR)/make/mapfiles/libattach/reorder-windows-$(OPENJDK_TARGET_CPU), \
     LIBS := $(JDKLIB_LIBS), \
     LIBS_solaris := -ldoor, \
     LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib psapi.lib, \
diff --git a/make/lib/Lib-jdk.crypto.cryptoki.gmk b/make/lib/Lib-jdk.crypto.cryptoki.gmk
index 5abb592fd27..ff1467c18ee 100644
--- a/make/lib/Lib-jdk.crypto.cryptoki.gmk
+++ b/make/lib/Lib-jdk.crypto.cryptoki.gmk
@@ -27,8 +27,8 @@ include LibCommon.gmk
 
 ################################################################################
 
-LIBJ2PKCS11_SRC := $(JDK_TOPDIR)/src/jdk.crypto.cryptoki/share/native/libj2pkcs11 \
-    $(JDK_TOPDIR)/src/jdk.crypto.cryptoki/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pkcs11
+LIBJ2PKCS11_SRC := $(TOPDIR)/src/jdk.crypto.cryptoki/share/native/libj2pkcs11 \
+    $(TOPDIR)/src/jdk.crypto.cryptoki/$(OPENJDK_TARGET_OS_TYPE)/native/libj2pkcs11
 
 $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
     LIBRARY := j2pkcs11, \
@@ -38,7 +38,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJ2PKCS11, \
     CFLAGS := $(CFLAGS_JDKLIB) $(addprefix -I, $(LIBJ2PKCS11_SRC)) \
         $(LIBJAVA_HEADER_FLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.crypto.cryptoki, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libj2pkcs11/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := $(LIBDL), \
diff --git a/make/lib/Lib-jdk.crypto.ec.gmk b/make/lib/Lib-jdk.crypto.ec.gmk
index 8f592374f91..c71bc4fa801 100644
--- a/make/lib/Lib-jdk.crypto.ec.gmk
+++ b/make/lib/Lib-jdk.crypto.ec.gmk
@@ -29,7 +29,7 @@ include LibCommon.gmk
 
 ifeq ($(ENABLE_INTREE_EC), true)
 
-  LIBSUNEC_SRC := $(JDK_TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
+  LIBSUNEC_SRC := $(TOPDIR)/src/jdk.crypto.ec/share/native/libsunec
   BUILD_LIBSUNEC_FLAGS := $(addprefix -I, $(SUNEC_SRC))
 
   #
@@ -56,7 +56,7 @@ ifeq ($(ENABLE_INTREE_EC), true)
           $(BUILD_LIBSUNEC_FLAGS), \
       DISABLED_WARNINGS_gcc := sign-compare, \
       DISABLED_WARNINGS_microsoft := 4101 4244 4146 4018, \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
+      MAPFILE := $(TOPDIR)/make/mapfiles/libsunec/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK), \
       LDFLAGS_macosx := $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := $(LIBCXX), \
diff --git a/make/lib/Lib-jdk.crypto.mscapi.gmk b/make/lib/Lib-jdk.crypto.mscapi.gmk
index ea73c1c55e4..76d105a1e3f 100644
--- a/make/lib/Lib-jdk.crypto.mscapi.gmk
+++ b/make/lib/Lib-jdk.crypto.mscapi.gmk
@@ -29,7 +29,7 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  LIBSUNMSCAPI_SRC := $(JDK_TOPDIR)/src/jdk.crypto.mscapi/$(OPENJDK_TARGET_OS_TYPE)/native/libsunmscapi
+  LIBSUNMSCAPI_SRC := $(TOPDIR)/src/jdk.crypto.mscapi/$(OPENJDK_TARGET_OS_TYPE)/native/libsunmscapi
 
   $(eval $(call SetupNativeCompilation,BUILD_LIBSUNMSCAPI, \
       LIBRARY := sunmscapi, \
diff --git a/make/lib/Lib-jdk.crypto.ucrypto.gmk b/make/lib/Lib-jdk.crypto.ucrypto.gmk
index 81f51e1b73c..92c30759228 100644
--- a/make/lib/Lib-jdk.crypto.ucrypto.gmk
+++ b/make/lib/Lib-jdk.crypto.ucrypto.gmk
@@ -29,7 +29,7 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
 
-  LIBJ2UCRYPTO_SRC := $(JDK_TOPDIR)/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto
+  LIBJ2UCRYPTO_SRC := $(TOPDIR)/src/jdk.crypto.ucrypto/solaris/native/libj2ucrypto
 
   $(eval $(call SetupNativeCompilation,BUILD_LIBJ2UCRYPTO, \
       LIBRARY := j2ucrypto, \
@@ -38,7 +38,7 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) \
           $(addprefix -I, $(LIBJ2UCRYPTO_SRC)), \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libj2ucrypto/mapfile-vers, \
+      MAPFILE := $(TOPDIR)/make/mapfiles/libj2ucrypto/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB), \
       LIBS := $(LIBDL), \
       LIBS_solaris := -lc, \
diff --git a/make/lib/Lib-jdk.hotspot.agent.gmk b/make/lib/Lib-jdk.hotspot.agent.gmk
index f6b4a22d44a..bd8cdaa4c29 100644
--- a/make/lib/Lib-jdk.hotspot.agent.gmk
+++ b/make/lib/Lib-jdk.hotspot.agent.gmk
@@ -25,7 +25,7 @@
 
 include NativeCompilation.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot, lib/Lib-jdk.hotspot.agent.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/lib/Lib-jdk.hotspot.agent.gmk))
 
 ################################################################################
 
@@ -33,17 +33,17 @@ ifneq ($(findstring $(OPENJDK_TARGET_OS), macosx windows), )
   DISABLE_MAPFILES := true
 endif
 
-SA_TOPDIR := $(HOTSPOT_TOPDIR)/src/jdk.hotspot.agent
+SA_TOPDIR := $(TOPDIR)/src/jdk.hotspot.agent
 
 # Defaults for most platforms
 SA_TOOLCHAIN := TOOLCHAIN_DEFAULT
 SA_NAME := saproc
 SA_SRC += $(SA_TOPDIR)/share/native/libsaproc $(SA_TOPDIR)/$(OPENJDK_TARGET_OS)/native/libsaproc
-SA_MAPFILE := $(HOTSPOT_TOPDIR)/make/mapfiles/libsaproc/mapfile-$(OPENJDK_TARGET_OS)
+SA_MAPFILE := $(TOPDIR)/make/mapfiles/libsaproc/mapfile-$(OPENJDK_TARGET_OS)
 SA_INCLUDES := \
     $(addprefix -I, $(SA_SRC)) \
     -I$(SUPPORT_OUTPUTDIR)/headers/jdk.hotspot.agent \
-    -I$(HOTSPOT_TOPDIR)/src/os/$(OPENJDK_TARGET_OS) \
+    -I$(TOPDIR)/src/hotspot/os/$(OPENJDK_TARGET_OS) \
     #
 
 ifeq ($(OPENJDK_TARGET_CPU), x86_64)
diff --git a/make/lib/Lib-jdk.internal.le.gmk b/make/lib/Lib-jdk.internal.le.gmk
index cd9eaba1923..8b2d37127b5 100644
--- a/make/lib/Lib-jdk.internal.le.gmk
+++ b/make/lib/Lib-jdk.internal.le.gmk
@@ -29,7 +29,7 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  LIBLE_SRC := $(JDK_TOPDIR)/src/jdk.internal.le/$(OPENJDK_TARGET_OS_TYPE)/native/lible \
+  LIBLE_SRC := $(TOPDIR)/src/jdk.internal.le/$(OPENJDK_TARGET_OS_TYPE)/native/lible \
       #
   LIBLE_CPPFLAGS := \
       $(addprefix -I, $(LIBLE_SRC)) \
diff --git a/make/lib/Lib-jdk.jdi.gmk b/make/lib/Lib-jdk.jdi.gmk
index f74b1c209a6..1b7b83fa7fc 100644
--- a/make/lib/Lib-jdk.jdi.gmk
+++ b/make/lib/Lib-jdk.jdi.gmk
@@ -29,13 +29,13 @@ include LibCommon.gmk
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
 
-  LIBDT_SHMEM_SRC := $(JDK_TOPDIR)/src/jdk.jdi/share/native/libdt_shmem \
-      $(JDK_TOPDIR)/src/jdk.jdi/$(OPENJDK_TARGET_OS_TYPE)/native/libdt_shmem \
+  LIBDT_SHMEM_SRC := $(TOPDIR)/src/jdk.jdi/share/native/libdt_shmem \
+      $(TOPDIR)/src/jdk.jdi/$(OPENJDK_TARGET_OS_TYPE)/native/libdt_shmem \
       #
   LIBDT_SHMEM_CPPFLAGS := -I$(INCLUDEDIR) -I$(JDK_OUTPUTDIR)/include/$(OPENJDK_TARGET_OS) \
       $(addprefix -I, $(LIBDT_SHMEM_SRC)) \
-      -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
-      -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include \
+      -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
+      -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
       -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdi \
       #
 
diff --git a/make/lib/Lib-jdk.jdwp.agent.gmk b/make/lib/Lib-jdk.jdwp.agent.gmk
index fb5de3e1f24..59cc4f6b2fb 100644
--- a/make/lib/Lib-jdk.jdwp.agent.gmk
+++ b/make/lib/Lib-jdk.jdwp.agent.gmk
@@ -27,13 +27,13 @@ include LibCommon.gmk
 
 ################################################################################
 
-LIBDT_SOCKET_SRC := $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libdt_socket \
-    $(JDK_TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libdt_socket
+LIBDT_SOCKET_SRC := $(TOPDIR)/src/jdk.jdwp.agent/share/native/libdt_socket \
+    $(TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libdt_socket
 LIBDT_SOCKET_CPPFLAGS := \
     $(addprefix -I, $(LIBDT_SOCKET_SRC)) \
-    -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
-    -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \
-    -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include \
+    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
+    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \
+    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
     #
 
 $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \
@@ -43,7 +43,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBDT_SOCKET, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) -DUSE_MMAP \
         $(LIBDT_SOCKET_CPPFLAGS), \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libdt_socket/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_windows := -export:jdwpTransport_OnLoad, \
@@ -65,11 +65,11 @@ TARGETS += $(BUILD_LIBDT_SOCKET)
 
 ################################################################################
 
-LIBJDWP_SRC := $(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \
-    $(JDK_TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libjdwp
+LIBJDWP_SRC := $(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp \
+    $(TOPDIR)/src/jdk.jdwp.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libjdwp
 LIBJDWP_CPPFLAGS := \
-    -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
-    -I$(JDK_TOPDIR)/src/jdk.jdwp.agent/share/native/include \
+    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/libjdwp/export \
+    -I$(TOPDIR)/src/jdk.jdwp.agent/share/native/include \
     $(addprefix -I, $(LIBJDWP_SRC))
 
 # JDWP_LOGGING causes log messages to be compiled into the library.
@@ -81,7 +81,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJDWP, \
     CFLAGS := $(CFLAGS_JDKLIB) -DJDWP_LOGGING \
         $(LIBJDWP_CPPFLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libjdwp/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
diff --git a/make/lib/Lib-jdk.management.agent.gmk b/make/lib/Lib-jdk.management.agent.gmk
index 46e77281acc..630163c3471 100644
--- a/make/lib/Lib-jdk.management.agent.gmk
+++ b/make/lib/Lib-jdk.management.agent.gmk
@@ -27,7 +27,7 @@ include LibCommon.gmk
 
 ################################################################################
 
-LIBMANAGEMENT_AGENT_SRC += $(JDK_TOPDIR)/src/jdk.management.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement_agent
+LIBMANAGEMENT_AGENT_SRC += $(TOPDIR)/src/jdk.management.agent/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement_agent
 LIBMANAGEMENT_AGENT_CFLAGS := $(addprefix -I,$(LIBMANAGEMENT_AGENT_SRC)) \
     -I$(SUPPORT_OUTPUTDIR)/headers/jdk.management.agent \
     $(LIBJAVA_HEADER_FLAGS) \
@@ -39,7 +39,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT_AGENT, \
     SRC := $(LIBMANAGEMENT_AGENT_SRC), \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_AGENT_CFLAGS), \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement_agent/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libmanagement_agent/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
diff --git a/make/lib/Lib-jdk.management.gmk b/make/lib/Lib-jdk.management.gmk
index 7f38553c61e..f6f68049ada 100644
--- a/make/lib/Lib-jdk.management.gmk
+++ b/make/lib/Lib-jdk.management.gmk
@@ -26,14 +26,14 @@
 include LibCommon.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, lib/Lib-jdk.management.gmk))
+$(eval $(call IncludeCustomExtension, , lib/Lib-jdk.management.gmk))
 
 ################################################################################
 
-LIBMANAGEMENT_EXT_SRC += $(JDK_TOPDIR)/src/jdk.management/share/native/libmanagement_ext \
-    $(JDK_TOPDIR)/src/jdk.management/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement_ext       \
-    $(JDK_TOPDIR)/src/jdk.management/$(OPENJDK_TARGET_OS)/native/libmanagement_ext
-LIBMANAGEMENT_EXT_CFLAGS := -I$(JDK_TOPDIR)/src/java.management/share/native/include \
+LIBMANAGEMENT_EXT_SRC += $(TOPDIR)/src/jdk.management/share/native/libmanagement_ext \
+    $(TOPDIR)/src/jdk.management/$(OPENJDK_TARGET_OS_TYPE)/native/libmanagement_ext       \
+    $(TOPDIR)/src/jdk.management/$(OPENJDK_TARGET_OS)/native/libmanagement_ext
+LIBMANAGEMENT_EXT_CFLAGS := -I$(TOPDIR)/src/java.management/share/native/include \
     $(addprefix -I,$(LIBMANAGEMENT_EXT_SRC)) \
     -I$(SUPPORT_OUTPUTDIR)/headers/jdk.management \
     $(LIBJAVA_HEADER_FLAGS) \
@@ -60,7 +60,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMANAGEMENT_EXT, \
     LANG := C, \
     OPTIMIZATION := $(LIBMANAGEMENT_EXT_OPTIMIZATION), \
     CFLAGS := $(CFLAGS_JDKLIB) $(LIBMANAGEMENT_EXT_CFLAGS), \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libmanagement_ext/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libmanagement_ext/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS := $(JDKLIB_LIBS), \
diff --git a/make/lib/Lib-jdk.net.gmk b/make/lib/Lib-jdk.net.gmk
index 69c789b2f08..b0859339f95 100644
--- a/make/lib/Lib-jdk.net.gmk
+++ b/make/lib/Lib-jdk.net.gmk
@@ -32,10 +32,10 @@ ifeq ($(OPENJDK_TARGET_OS), solaris)
   $(eval $(call SetupNativeCompilation, BUILD_LIBEXTNET, \
       LIBRARY := extnet, \
       OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-      SRC := $(JDK_TOPDIR)/src/jdk.net/solaris/native/libextnet, \
+      SRC := $(TOPDIR)/src/jdk.net/solaris/native/libextnet, \
       OPTIMIZATION := LOW, \
       CFLAGS := $(CFLAGS_JDKLIB) -I$(SUPPORT_OUTPUTDIR)/headers/jdk.net, \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libextnet/mapfile-vers, \
+      MAPFILE := $(TOPDIR)/make/mapfiles/libextnet/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := -lsocket -lc -ljava, \
diff --git a/make/lib/Lib-jdk.pack.gmk b/make/lib/Lib-jdk.pack.gmk
index cc482c9ecd4..7b8f9708643 100644
--- a/make/lib/Lib-jdk.pack.gmk
+++ b/make/lib/Lib-jdk.pack.gmk
@@ -30,17 +30,17 @@ include LibCommon.gmk
 $(eval $(call SetupNativeCompilation,BUILD_LIBUNPACK, \
     LIBRARY := unpack, \
     OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-    SRC := $(JDK_TOPDIR)/src/jdk.pack/share/native/libunpack \
-        $(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack, \
+    SRC := $(TOPDIR)/src/jdk.pack/share/native/libunpack \
+        $(TOPDIR)/src/jdk.pack/share/native/common-unpack, \
     TOOLCHAIN := TOOLCHAIN_LINK_CXX, \
     OPTIMIZATION := LOW, \
     CFLAGS := $(CXXFLAGS_JDKLIB) \
         -DNO_ZLIB -DUNPACK_JNI -DFULL \
         -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
-        -I$(JDK_TOPDIR)/src/jdk.pack/share/native/common-unpack \
+        -I$(TOPDIR)/src/jdk.pack/share/native/common-unpack \
         $(LIBJAVA_HEADER_FLAGS), \
     CFLAGS_release := -DPRODUCT, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libunpack/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) $(LDFLAGS_CXX_JDK) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_windows := -map:$(SUPPORT_OUTPUTDIR)/native/$(MODULE)/unpack.map -debug, \
diff --git a/make/lib/Lib-jdk.sctp.gmk b/make/lib/Lib-jdk.sctp.gmk
index a31c0e7fb5c..d40d70e2ccc 100644
--- a/make/lib/Lib-jdk.sctp.gmk
+++ b/make/lib/Lib-jdk.sctp.gmk
@@ -33,16 +33,16 @@ ifeq ($(OPENJDK_TARGET_OS_TYPE), unix)
     $(eval $(call SetupNativeCompilation,BUILD_LIBSCTP, \
         LIBRARY := sctp, \
         OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
-        SRC := $(JDK_TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_TYPE)/native/libsctp, \
+        SRC := $(TOPDIR)/src/jdk.sctp/$(OPENJDK_TARGET_OS_TYPE)/native/libsctp, \
         OPTIMIZATION := LOW, \
         CFLAGS := $(CFLAGS_JDKLIB) \
-            -I $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
-            -I $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \
+            -I $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
+            -I $(TOPDIR)/src/java.base/share/native/libnio/ch \
             $(addprefix -I, $(call FindSrcDirsForLib, java.base, net)) \
             $(LIBJAVA_HEADER_FLAGS) \
             -I$(SUPPORT_OUTPUTDIR)/headers/jdk.sctp \
             -I$(SUPPORT_OUTPUTDIR)/headers/java.base, \
-        MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \
+        MAPFILE := $(TOPDIR)/make/mapfiles/libsctp/mapfile-vers, \
         LDFLAGS := $(LDFLAGS_JDKLIB) \
             $(call SET_SHARED_LIBRARY_ORIGIN), \
         LIBS_unix := -lnio -lnet -ljava -ljvm, \
diff --git a/make/lib/Lib-jdk.security.auth.gmk b/make/lib/Lib-jdk.security.auth.gmk
index e37e327266c..996cf9a6f6d 100644
--- a/make/lib/Lib-jdk.security.auth.gmk
+++ b/make/lib/Lib-jdk.security.auth.gmk
@@ -30,7 +30,7 @@ include LibCommon.gmk
 LIBJAAS_MAPFILE :=
 ifeq ($(OPENJDK_TARGET_OS), solaris)
   # only on solaris...wonder why
-  LIBJAAS_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjaas/mapfile-vers
+  LIBJAAS_MAPFILE := $(TOPDIR)/make/mapfiles/libjaas/mapfile-vers
 endif
 
 LIBJAAS_NAME := jaas_unix
diff --git a/make/lib/LibCommon.gmk b/make/lib/LibCommon.gmk
index 4e1cab991aa..112a234eb86 100644
--- a/make/lib/LibCommon.gmk
+++ b/make/lib/LibCommon.gmk
@@ -26,11 +26,11 @@
 include NativeCompilation.gmk
 
 # Hook to include the corresponding custom file, if present.
-$(eval $(call IncludeCustomExtension, jdk, lib/LibCommon.gmk))
+$(eval $(call IncludeCustomExtension, , lib/LibCommon.gmk))
 
 ################################################################################
 
-GLOBAL_VERSION_INFO_RESOURCE := $(JDK_TOPDIR)/src/java.base/windows/native/common/version.rc
+GLOBAL_VERSION_INFO_RESOURCE := $(TOPDIR)/src/java.base/windows/native/common/version.rc
 
 # Absolute paths to lib files on windows for use in LDFLAGS. Should figure out a more
 # elegant solution to this.
@@ -46,9 +46,9 @@ endif
 # Param 2 - library name
 FindSrcDirsForLib += \
   $(call uniq, $(wildcard \
-      $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
-      $(JDK_TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
-      $(JDK_TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
+      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS)/native/lib$(strip $2) \
+      $(TOPDIR)/src/$(strip $1)/$(OPENJDK_TARGET_OS_TYPE)/native/lib$(strip $2) \
+      $(TOPDIR)/src/$(strip $1)/share/native/lib$(strip $2)))
 
 ################################################################################
 # Find a library
@@ -73,7 +73,7 @@ INSTALL_LIBRARIES_HERE := $(call FindLibDirForModule, $(MODULE))
 ifeq ($(USE_EXTERNAL_LIBZ), true)
   LIBZ := -lz
 else
-  ZLIB_CPPFLAGS := -I$(JDK_TOPDIR)/src/java.base/share/native/libzip/zlib
+  ZLIB_CPPFLAGS := -I$(TOPDIR)/src/java.base/share/native/libzip/zlib
 endif
 
 ###############################################################################
diff --git a/make/lib/LibosxLibraries.gmk b/make/lib/LibosxLibraries.gmk
index 91ab6457cb4..d7a99ab9059 100644
--- a/make/lib/LibosxLibraries.gmk
+++ b/make/lib/LibosxLibraries.gmk
@@ -27,9 +27,9 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   ################################################################################
 
-  LIBOSX_DIRS := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosx
+  LIBOSX_DIRS := $(TOPDIR)/src/java.desktop/macosx/native/libosx
   LIBOSX_CFLAGS := -I$(LIBOSX_DIRS) \
-      -I$(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp \
+      -I$(TOPDIR)/src/java.desktop/macosx/native/libosxapp \
       $(LIBJAVA_HEADER_FLAGS) \
       -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
       #
diff --git a/make/lib/NetworkingLibraries.gmk b/make/lib/NetworkingLibraries.gmk
index 90257b25ff0..fbfecde36ea 100644
--- a/make/lib/NetworkingLibraries.gmk
+++ b/make/lib/NetworkingLibraries.gmk
@@ -36,7 +36,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBNET, \
     DISABLED_WARNINGS_clang := parentheses-equality constant-logical-operand, \
     DISABLED_WARNINGS_microsoft := 4244 4047 4133 4996, \
     DISABLED_WARNINGS_solstudio := E_ARG_INCOMPATIBLE_WITH_ARG_L, \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnet/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libnet/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LDFLAGS_windows := -delayload:secur32.dll -delayload:iphlpapi.dll, \
diff --git a/make/lib/NioLibraries.gmk b/make/lib/NioLibraries.gmk
index 4a48ab105ad..2d298dd13c6 100644
--- a/make/lib/NioLibraries.gmk
+++ b/make/lib/NioLibraries.gmk
@@ -24,14 +24,14 @@
 #
 
 BUILD_LIBNIO_SRC := \
-    $(JDK_TOPDIR)/src/java.base/share/native/libnio \
-    $(JDK_TOPDIR)/src/java.base/share/native/libnio/ch \
-    $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio \
+    $(TOPDIR)/src/java.base/share/native/libnio \
+    $(TOPDIR)/src/java.base/share/native/libnio/ch \
+    $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio \
     $(sort $(wildcard \
-      $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
-      $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/fs \
-      $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/ch \
-      $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/fs)) \
+      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/ch \
+      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/native/libnio/fs \
+      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/ch \
+      $(TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS)/native/libnio/fs)) \
     #
 
 BUILD_LIBNIO_CFLAGS := \
@@ -41,19 +41,19 @@ BUILD_LIBNIO_CFLAGS := \
     $(addprefix -I, $(BUILD_LIBNET_SRC))
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
-  BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+  BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
-  BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+  BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), solaris)
-  BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+  BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), aix)
-  BUILD_LIBNIO_MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
+  BUILD_LIBNIO_MAPFILE := $(TOPDIR)/make/mapfiles/libnio/mapfile-$(OPENJDK_TARGET_OS)
 endif
 
 $(eval $(call SetupNativeCompilation,BUILD_LIBNIO, \
diff --git a/make/lib/PlatformLibraries.gmk b/make/lib/PlatformLibraries.gmk
index 85038b91714..0cba6a3a643 100644
--- a/make/lib/PlatformLibraries.gmk
+++ b/make/lib/PlatformLibraries.gmk
@@ -27,7 +27,7 @@
 
 ifeq ($(OPENJDK_TARGET_OS), macosx)
 
-  LIBOSXAPP_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/native/libosxapp
+  LIBOSXAPP_SRC := $(TOPDIR)/src/java.desktop/macosx/native/libosxapp
 
   $(eval $(call SetupNativeCompilation,BUILD_LIBOSXAPP, \
       LIBRARY := osxapp, \
diff --git a/make/lib/SecurityLibraries.gmk b/make/lib/SecurityLibraries.gmk
index be73c528c6b..4d96461d8b3 100644
--- a/make/lib/SecurityLibraries.gmk
+++ b/make/lib/SecurityLibraries.gmk
@@ -31,7 +31,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
 
   ################################################################################
 
-    LIBOSXSECURITY_DIRS := $(JDK_TOPDIR)/src/java.base/macosx/native/libosxsecurity
+    LIBOSXSECURITY_DIRS := $(TOPDIR)/src/java.base/macosx/native/libosxsecurity
     LIBOSXSECURITY_CFLAGS := -I$(LIBOSXSECURITY_DIRS) \
         $(LIBJAVA_HEADER_FLAGS) \
         -I$(SUPPORT_OUTPUTDIR)/headers/java.base \
diff --git a/make/lib/SoundLibraries.gmk b/make/lib/SoundLibraries.gmk
index 77ed362571e..2174476e92b 100644
--- a/make/lib/SoundLibraries.gmk
+++ b/make/lib/SoundLibraries.gmk
@@ -24,8 +24,8 @@
 #
 
 LIBJSOUND_SRC_DIRS := \
-    $(JDK_TOPDIR)/src/java.desktop/share/native/libjsound \
-    $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjsound \
+    $(TOPDIR)/src/java.desktop/share/native/libjsound \
+    $(TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/native/libjsound \
     #
 LIBJSOUND_CFLAGS := \
     -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop \
@@ -86,7 +86,7 @@ ifeq ($(OPENJDK_TARGET_OS), macosx)
       -DUSE_DAUDIO=TRUE \
       -DUSE_PLATFORM_MIDI_OUT=TRUE \
       -DUSE_PLATFORM_MIDI_IN=TRUE
-  LIBJSOUND_SRC_DIRS += $(JDK_TOPDIR)/src/java.desktop/macosx/native/libjsound
+  LIBJSOUND_SRC_DIRS += $(TOPDIR)/src/java.desktop/macosx/native/libjsound
   LIBJSOUND_SRC_FILES += \
       PLATFORM_API_MacOSX_Utils.cpp \
       PLATFORM_API_MacOSX_PCM.cpp \
@@ -124,7 +124,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJSOUND, \
     CFLAGS := $(CFLAGS_JDKLIB) \
         $(LIBJSOUND_CFLAGS), \
     CXXFLAGS := $(CXXFLAGS_JDKLIB) $(LIBJSOUND_CFLAGS), \
-    MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \
+    MAPFILE := $(TOPDIR)/make/mapfiles/libjsound/mapfile-vers, \
     LDFLAGS := $(LDFLAGS_JDKLIB) \
         $(call SET_SHARED_LIBRARY_ORIGIN), \
     LIBS_unix := -ljava -ljvm, \
@@ -169,7 +169,7 @@ ifneq ($(filter jsoundalsa, $(EXTRA_SOUND_JNI_LIBS)), )
           -DUSE_PORTS=TRUE \
           -DUSE_PLATFORM_MIDI_OUT=TRUE \
           -DUSE_PLATFORM_MIDI_IN=TRUE, \
-      MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \
+      MAPFILE := $(TOPDIR)/make/mapfiles/libjsoundalsa/mapfile-vers, \
       LDFLAGS := $(LDFLAGS_JDKLIB) \
           $(call SET_SHARED_LIBRARY_ORIGIN), \
       LIBS := $(ALSA_LIBS) -ljava -ljvm, \
diff --git a/make/nashorn/build-nasgen.xml b/make/nashorn/build-nasgen.xml
index d233f55c0a2..4bd18d42203 100644
--- a/make/nashorn/build-nasgen.xml
+++ b/make/nashorn/build-nasgen.xml
@@ -21,12 +21,12 @@
  or visit www.oracle.com if you need additional information or have any
  questions.
 -->
-<project name="build-nasgen" default="run-nasgen" basedir="..">
+<project name="build-nasgen" default="run-nasgen" basedir=".">
     <description>Builds and runs nasgen.</description>
     <import file="build.xml"/>
 
     <target name="build-nasgen" depends="prepare">
-        <ant inheritAll="false" dir="${basedir}/buildtools/nasgen"
+        <ant inheritAll="false" dir="${nashorn.make.dir}/buildtools/nasgen"
             antfile="build.xml" target="jar"/>
     </target>
 
@@ -34,7 +34,7 @@
         <java classname="${nasgen.tool}" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="${basedir}/jcov2/lib/jcov_j2se_rt.jar"/>
-                <pathelement location="${basedir}/buildtools/nasgen/dist/nasgen.jar"/>
+                <pathelement location="${build.dir}/nasgen/dist/nasgen.jar"/>
             </classpath>
             <jvmarg line="${nasgen.module.imports}"/>
             <arg value="${nashorn.module.classes.dir}"/>
@@ -72,7 +72,7 @@
     </target>
 
     <target name="clean-nasgen">
-        <ant inheritAll="false" dir="${basedir}/buildtools/nasgen"
+        <ant inheritAll="false" dir="${nashorn.make.dir}/buildtools/nasgen"
             antfile="build.xml" target="clean"/>
     </target>
 
diff --git a/make/nashorn/build.xml b/make/nashorn/build.xml
index ef1c6b80c5f..d128870764c 100644
--- a/make/nashorn/build.xml
+++ b/make/nashorn/build.xml
@@ -23,7 +23,7 @@
  questions.
 -->
 
-<project name="nashorn" default="test" basedir="..">
+<project name="nashorn" default="test" basedir="../..">
   <import file="build-nasgen.xml"/>
   <import file="code_coverage.xml"/>
 
@@ -35,7 +35,7 @@
     <!-- loading locally defined resources and properties. NB they owerwrite default ones defined later -->
     <property file="${user.home}/.nashorn.project.local.properties"/>
 
-    <loadproperties srcFile="make/project.properties"/>
+    <loadproperties srcFile="make/nashorn/project.properties"/>
   </target>
 
   <target name="init-conditions" depends="load-properties">
@@ -86,7 +86,7 @@
     </condition>
 
     <!-- exclude tests in exclude lists -->
-    <condition property="exclude.list" value="./exclude/exclude_list_cc.txt" else="./exclude/exclude_list.txt">
+    <condition property="exclude.list" value="${nashorn.make.dir}/exclude/exclude_list_cc.txt" else="${nashorn.make.dir}/exclude/exclude_list.txt">
       <istrue value="${make.code.coverage}" />
     </condition>
 
@@ -167,6 +167,8 @@
       <fileset dir="${build.dir}" erroronmissingdir="false"/>
     </delete>
     <delete dir="${dist.dir}"/>
+    <delete dir="${jdk.build.dir}/nashorn_code_cache"/>
+    <delete file="${basedir}/NashornProfile.txt"/>
   </target>
 
   <target name="compile" depends="prepare" description="Compiles nashorn">
@@ -271,7 +273,9 @@
         windowtitle="${nashorn.product.name} ${nashorn.version}"
         additionalparam="-quiet" failonerror="true" useexternalfile="true">
       <arg value="--module-source-path"/>
-      <arg value="${basedir}/src/*/share/classes"/>
+      <arg value="${nashorn.module.src.dir}"/>
+      <arg value="--module-source-path"/>
+      <arg value="${dynalink.module.src.dir}"/>
       <arg value="${javadoc.option}"/>
       <classpath>
         <pathelement location="${build.classes.dir}"/>
@@ -289,7 +293,7 @@
         extdirs="${nashorn.ext.path}" windowtitle="${nashorn.product.name} ${nashorn.version}"
         additionalparam="-quiet" failonerror="true" useexternalfile="true">
       <arg value="--module-source-path"/>
-      <arg value="${basedir}/src/*/share/classes"/>
+      <arg value="${nashorn.module.src.dir}"/>
       <arg value="${javadoc.option}"/>
       <classpath>
         <pathelement location="${build.classes.dir}"/>
@@ -306,7 +310,7 @@
         windowtitle="Dynalink"
         additionalparam="-quiet" failonerror="true" useexternalfile="true">
       <arg value="--module-source-path"/>
-      <arg value="${basedir}/src/*/share/classes"/>
+      <arg value="${dynalink.module.src.dir}"/>
       <arg value="${javadoc.option}"/>
       <classpath>
         <pathelement location="${build.classes.dir}"/>
@@ -425,7 +429,7 @@ grant codeBase "file:/${basedir}/${nashorn.api.tests.jar}" {
     permission java.util.PropertyPermission "parserapitest.*", "read";
     permission java.util.PropertyPermission "test.*", "read";
     permission java.util.PropertyPermission "test262.*", "read";
-    permission java.io.FilePermission "${basedir}/test/-","read";
+    permission java.io.FilePermission "${basedir}/test/nashorn/-","read";
     permission java.io.FilePermission "$${user.dir}", "read";
     permission java.util.PropertyPermission "user.dir", "read";
 };
@@ -461,56 +465,56 @@ grant codeBase "file:/${file.reference.snakeyaml.jar}" {
 };
 
 
-grant codeBase "file:/${basedir}/test/script/trusted/*" {
+grant codeBase "file:/${basedir}/${test.script.dir}/trusted/*" {
     permission java.security.AllPermission;
 };
 
-grant codeBase "file:/${basedir}/test/script/maptests/*" {
-    permission java.io.FilePermission "${basedir}/test/script/maptests/*","read";
+grant codeBase "file:/${basedir}/${test.script.dir}/maptests/*" {
+    permission java.io.FilePermission "${basedir}/${test.script.dir}/maptests/*","read";
     permission java.lang.RuntimePermission "nashorn.debugMode";
 };
 
-grant codeBase "file:/${basedir}/test/script/basic/*" {
-    permission java.io.FilePermission "${basedir}/test/script/-", "read";
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/*" {
+    permission java.io.FilePermission "${basedir}/${test.script.dir}/-", "read";
     permission java.io.FilePermission "$${user.dir}", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "nashorn.test.*", "read";
 };
 
-grant codeBase "file:/${basedir}/test/script/basic/apply_to_call/*" {
-    permission java.io.FilePermission "${basedir}/test/script/-", "read";
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/apply_to_call/*" {
+    permission java.io.FilePermission "${basedir}/${test.script.dir}/-", "read";
     permission java.io.FilePermission "$${user.dir}", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "nashorn.test.*", "read";
 };
 
-grant codeBase "file:/${basedir}/test/script/basic/parser/*" {
-    permission java.io.FilePermission "${basedir}/test/script/-", "read";
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/parser/*" {
+    permission java.io.FilePermission "${basedir}/${test.script.dir}/-", "read";
     permission java.io.FilePermission "$${user.dir}", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "nashorn.test.*", "read";
 };
 
-grant codeBase "file:/${basedir}/test/script/basic/es6/*" {
-    permission java.io.FilePermission "${basedir}/test/script/-", "read";
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/es6/*" {
+    permission java.io.FilePermission "${basedir}/${test.script.dir}/-", "read";
     permission java.io.FilePermission "$${user.dir}", "read";
     permission java.util.PropertyPermission "user.dir", "read";
     permission java.util.PropertyPermission "nashorn.test.*", "read";
 };
 
-grant codeBase "file:/${basedir}/test/script/basic/JDK-8010946-privileged.js" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/JDK-8010946-privileged.js" {
     permission java.util.PropertyPermission "java.security.policy", "read";
 };
 
-grant codeBase "file:/${basedir}/test/script/basic/classloader.js" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/classloader.js" {
     permission java.lang.RuntimePermission "nashorn.JavaReflection";
 };
 
-grant codeBase "file:/${basedir}/test/script/markdown.js" {
-    permission java.io.FilePermission "${basedir}/test/script/external/showdown/-", "read";
+grant codeBase "file:/${basedir}/${test.script.dir}/markdown.js" {
+    permission java.io.FilePermission "${basedir}/${test.script.dir}/external/showdown/-", "read";
 };
 
-grant codeBase "file:/${basedir}/test/script/basic/JDK-8158467.js" {
+grant codeBase "file:/${basedir}/${test.script.dir}/basic/JDK-8158467.js" {
     permission java.lang.RuntimePermission "nashorn.setConfig";
 };
 
@@ -610,7 +614,7 @@ grant codeBase "file:/${basedir}/test/script/basic/JDK-8158467.js" {
     </testng>
   </target>
 
-  <target name="test" depends="prepare, javadoc, test-pessimistic, test-optimistic"/>
+  <target name="test" depends="prepare, test-pessimistic, test-optimistic"/>
 
   <target name="test-optimistic" depends="jar, -test-classes-all,-test-classes-single, check-testng, check-external-tests, compile-test, generate-security-config" if="testng.available">
     <echo message="Running test suite in OPTIMISTIC mode..."/>
diff --git a/make/nashorn/buildtools/nasgen/build.xml b/make/nashorn/buildtools/nasgen/build.xml
index 2116db176c6..db1dea1eabe 100644
--- a/make/nashorn/buildtools/nasgen/build.xml
+++ b/make/nashorn/buildtools/nasgen/build.xml
@@ -27,19 +27,19 @@
   </target>
 
   <target name="prepare" depends="init">
-    <mkdir dir="${build.classes.dir}"/>
-    <mkdir dir="${dist.dir}"/>
-    <mkdir dir="${dist.dir}/lib"/>
+    <mkdir dir="${nasgen.build.classes.dir}"/>
+    <mkdir dir="${nasgen.dist.dir}"/>
+    <mkdir dir="${nasgen.dist.dir}/lib"/>
   </target>
 
   <target name="clean" depends="init">
-    <delete dir="${build.dir}"/>
-    <delete dir="${dist.dir}"/>
+    <delete dir="${nasgen.build.dir}"/>
+    <delete dir="${nasgen.dist.dir}"/>
   </target>
 
   <target name="compile" depends="prepare" description="Compiles the nasgen sources">
     <javac srcdir="${src.dir}"
-           destdir="${build.classes.dir}"
+           destdir="${nasgen.build.classes.dir}"
            debug="${javac.debug}"
            includeantruntime="false" fork="true">
       <compilerarg line="${nasgen.module.imports}"/>
@@ -50,7 +50,7 @@
   </target>
 
   <target name="jar" depends="compile" description="Creates nasgen.jar">
-    <jar jarfile="${dist.jar}" basedir="${build.classes.dir}" manifest="${meta.inf.dir}/MANIFEST.MF"/>
+    <jar jarfile="${nasgen.dist.jar}" basedir="${nasgen.build.classes.dir}" manifest="${meta.inf.dir}/MANIFEST.MF"/>
   </target>
 
   <target name="dist" depends="jar"/>
diff --git a/make/nashorn/buildtools/nasgen/project.properties b/make/nashorn/buildtools/nasgen/project.properties
index 2ad8b5956c6..ec31db01d12 100644
--- a/make/nashorn/buildtools/nasgen/project.properties
+++ b/make/nashorn/buildtools/nasgen/project.properties
@@ -27,15 +27,14 @@ build.compiler=modern
 javac.source=1.7
 javac.target=1.7
 
-build.classes.dir=${build.dir}/classes
+# This directory is removed when the project is cleaned:
+nasgen.build.dir=../../../../build/nashorn/nasgen
+nasgen.build.classes.dir=${nasgen.build.dir}/classes
 
 # This directory is removed when the project is cleaned:
-build.dir=build
-
-# This directory is removed when the project is cleaned:
-dist.dir=dist
-dist.jar=${dist.dir}/nasgen.jar
-dist.javadoc.dir=${dist.dir}/javadoc
+nasgen.dist.dir=${nasgen.build.dir}/dist
+nasgen.dist.jar=${nasgen.dist.dir}/nasgen.jar
+nasgen.dist.javadoc.dir=${nasgen.dist.dir}/javadoc
 
 javac.debug=true
 
diff --git a/make/nashorn/project.properties b/make/nashorn/project.properties
index 5626838f560..de829ab0752 100644
--- a/make/nashorn/project.properties
+++ b/make/nashorn/project.properties
@@ -24,11 +24,11 @@
 application.title=nashorn
 
 # location of JDK embedded ASM sources
-jdk.java.base.dir=../jdk/src/java.base/share/classes
+jdk.java.base.dir=src/java.base/share/classes
 jdk.asm.src.dir=${jdk.java.base.dir}/jdk/internal/org/objectweb/asm
 
 # location of JDK embedded jline sources
-jdk.jline.src.dir=../jdk/src/jdk.internal.le/share/classes
+jdk.jline.src.dir=src/jdk.internal.le/share/classes
 
 # source and target levels
 build.compiler=modern
@@ -45,8 +45,11 @@ nashorn.version=0.1
 nashorn.fullversion=0.1
 nashorn.product.name=Oracle Nashorn
 
+jdk.build.dir=build
+nashorn.make.dir=make/nashorn
+
 # This directory is removed when the project is cleaned:
-build.dir=build
+build.dir=${jdk.build.dir}/nashorn
 build.classes.dir=${build.dir}/classes
 build.zip=${build.dir}/nashorn.zip
 build.gzip=${build.dir}/nashorn.tar.gz
@@ -85,7 +88,7 @@ build.nosecurity.test.results.dir=${build.dir}/test/nosecurity/reports
 build.nooptimistic.test.results.dir=${build.dir}/test/nooptimistic/reports
 
 # This directory is removed when the project is cleaned:
-dist.dir=dist
+dist.dir=build/nashorn/dist
 dynalink.jar=${dist.dir}/dynalink.jar
 nashorn.jar=${dist.dir}/nashorn.jar
 jjs.jar=${dist.dir}/jjs.jar
@@ -97,7 +100,7 @@ dist.dynalinkapi.javadoc.dir=${dist.javadoc.dir}/dynalinkapi
 run.test.jvmargs.jfr=-XX:+UnlockCommercialFeatures -XX:+FlightRecorder -XX:FlightRecorderOptions=defaultrecording=true,disk=true,dumponexit=true,dumponexitpath=${build.dir},stackdepth=128
 
 # test library location
-test.lib=${basedir}${file.separator}test${file.separator}lib
+test.lib=test/nashorn/lib
 
 # jars refererred
 file.reference.testng.jar=${test.lib}${file.separator}testng-6.8.jar
@@ -165,15 +168,15 @@ run.classpath=\
     ${build.classes.dir}
 
 # test scripts to run
-test.dir=test
-test.nosecurity.dir=test/script/nosecurity
-test.script.dir=test/script
-test.basic.dir=test/script/basic
-test.maptests.dir=test/script/maptests
-test.error.dir=test/script/error
-test.sandbox.dir=test/script/sandbox
-test.trusted.dir=test/script/trusted
-test.external.dir=test/script/external
+test.dir=test/nashorn
+test.nosecurity.dir=${test.dir}/script/nosecurity
+test.script.dir=${test.dir}/script
+test.basic.dir=${test.script.dir}/basic
+test.maptests.dir=${test.script.dir}/maptests
+test.error.dir=${test.script.dir}/error
+test.sandbox.dir=${test.script.dir}/sandbox
+test.trusted.dir=${test.script.dir}/trusted
+test.external.dir=${test.script.dir}/external
 test262.dir=${test.external.dir}/test262
 test262.suite.dir=${test262.dir}/test/suite
 testjfx.dir=${test.script.dir}/jfx
@@ -337,7 +340,7 @@ src.dir=${dynalink.module.src.dir}${path.separator}\
         ${nashorn.shell.module.src.dir}${path.separator}\
         ${jdk.jline.src.dir}
 
-test.src.dir=test/src
+test.src.dir=test/nashorn/src
 
 # -Xmx is used for all tests, -Xms only for octane benchmark
 run.test.xmx=2G
@@ -470,11 +473,11 @@ jcov=dynamic
 
 #naming of CC results
 #NB directory specified in the cc.dir will be cleaned up!!!
-cc.dir=${basedir}/../Codecoverage_Nashorn
+cc.dir=${build.dir}/Codecoverage_Nashorn
 cc.result.file.name=CC_${jcov}_nashorn.xml
 
 #dynamic CC parameters; please redefine in the ${user.home}/.nashorn.project.local.properties
-jcov2.lib.dir=${basedir}/../jcov2/lib
+jcov2.lib.dir=${build.dir}/jcov2/lib
 jcov.jar=${jcov2.lib.dir}/jcov.jar
 cc.include=jdk\.nashorn\.*
 cc.exclude=jdk\.nashorn\.internal\.scripts\.*
diff --git a/make/scripts/compare.sh b/make/scripts/compare.sh
index 3385423fb4a..4b17c7dc198 100644
--- a/make/scripts/compare.sh
+++ b/make/scripts/compare.sh
@@ -56,7 +56,7 @@ else
     STAT_PRINT_SIZE="-c %s"
 fi
 
-COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/common/bin/compare_exceptions.sh.incl"
+COMPARE_EXCEPTIONS_INCLUDE="$SRC_ROOT/make/scripts/compare_exceptions.sh.incl"
 if [ ! -e "$COMPARE_EXCEPTIONS_INCLUDE" ]; then
     echo "Error: Cannot locate the exceptions file, it should have been here: $COMPARE_EXCEPTIONS_INCLUDE"
     exit 1
@@ -363,7 +363,7 @@ compare_general_files() {
                 $RM $OTHER_FILE $THIS_FILE
                 #Note that | doesn't work on mac sed.
                 HTML_FILTER="$SED \
-                    -e 's/20[0-9]\{2\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6\}/<DATE>/g' \
+                    -e 's/20[0-9]\{2\}-[0-9]\{2\}-[0-9]\{2\}-[0-9]\{6,7\}/<DATE>/g' \
                     -e 's/20[0-9]\{2\}-[0-9]\{2\}-[0-9]\{2\}/<DATE>/g' \
                     -e 's/\(-- Generated by javadoc \).*\( --\)/\1(removed)\2/' \
                     -e 's/[A-Z][a-z]*, [A-Z][a-z]* [0-9][0-9]*, [0-9]\{4\} [0-9][0-9:]* [AMP]\{2,2\} [A-Z][A-Z]*/<DATE>/' \
@@ -452,13 +452,15 @@ compare_zip_file() {
 
     # Find all archives inside and unzip them as well to compare the contents rather than
     # the archives. pie.jar.pack.gz i app3.war is corrupt, skip it.
-    EXCEPTIONS="pie.jar.pack.gz"
-    for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
+    EXCEPTIONS="pie.jar.pack.gz jdk.pack"
+    for pack in $($FIND $THIS_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a \
+                        ! -name pie.jar.pack.gz -a ! -name jdk.pack); do
         ($UNPACK200 $pack $pack.jar)
         # Filter out the unzipped archives from the diff below.
         EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
     done
-    for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a ! -name pie.jar.pack.gz); do
+    for pack in $($FIND $OTHER_UNZIPDIR \( -name "*.pack" -o -name "*.pack.gz" \) -a \
+                        ! -name pie.jar.pack.gz -a ! -name jdk.pack); do
         ($UNPACK200 $pack $pack.jar)
         EXCEPTIONS="$EXCEPTIONS $pack $pack.jar"
     done
@@ -1089,7 +1091,7 @@ if [ -z "$1" ] || [ "$1" = "-h" ] || [ "$1" = "-?" ] || [ "$1" = "/h" ] || [ "$1
     echo ""
     echo "[FILTER]            List filenames in the image to compare, works for jars, zips, libs and execs"
     echo "Example:"
-    echo "bash ./common/bin/compareimages.sh CodePointIM.jar"
+    echo "bash ./make/scripts/compareimages.sh CodePointIM.jar"
     echo ""
     echo "-2zips <file1> <file2> Compare two zip files only"
     echo "-2bins <file1> <file2> Compare two binary files only"
diff --git a/make/test/BuildFailureHandler.gmk b/make/test/BuildFailureHandler.gmk
index e64541fb6e2..52b828b69a2 100644
--- a/make/test/BuildFailureHandler.gmk
+++ b/make/test/BuildFailureHandler.gmk
@@ -35,7 +35,7 @@ TARGETS :=
 
 ################################################################################
 
-FH_BASEDIR := $(SRC_ROOT)/test/failure_handler
+FH_BASEDIR := $(TOPDIR)/test/failure_handler
 FH_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/failure_handler
 FH_JAR := $(FH_SUPPORT)/jtregFailureHandler.jar
 
diff --git a/make/test/JtregNativeHotspot.gmk b/make/test/JtregNativeHotspot.gmk
index 3f1d3fd46be..277f9dec0dc 100644
--- a/make/test/JtregNativeHotspot.gmk
+++ b/make/test/JtregNativeHotspot.gmk
@@ -35,7 +35,7 @@ include $(SPEC)
 include MakeBase.gmk
 include TestFilesCompilation.gmk
 
-$(eval $(call IncludeCustomExtension, hotspot, test/JtregNative.gmk))
+$(eval $(call IncludeCustomExtension, , hotspot/test/JtregNative.gmk))
 
 ################################################################################
 # Targets for building the native tests themselves.
@@ -43,51 +43,51 @@ $(eval $(call IncludeCustomExtension, hotspot, test/JtregNative.gmk))
 
 # Add more directories here when needed.
 BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
-    $(HOTSPOT_TOPDIR)/test/gc/g1/TestJNIWeakG1 \
-    $(HOTSPOT_TOPDIR)/test/gc/stress/gclocker \
-    $(HOTSPOT_TOPDIR)/test/gc/cslocker \
-    $(HOTSPOT_TOPDIR)/test/native_sanity \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/8025979 \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/8033445 \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/checked \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/PrivateInterfaceMethods \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/ToStringInInterfaceTest \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/CalleeSavedRegisters \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/CallWithJNIWeak \
-    $(HOTSPOT_TOPDIR)/test/runtime/jni/ReturnJNIWeak \
-    $(HOTSPOT_TOPDIR)/test/runtime/modules/getModuleJNI \
-    $(HOTSPOT_TOPDIR)/test/runtime/SameObject \
-    $(HOTSPOT_TOPDIR)/test/runtime/BoolReturn \
-    $(HOTSPOT_TOPDIR)/test/runtime/noClassDefFoundMsg \
-    $(HOTSPOT_TOPDIR)/test/compiler/floatingpoint/ \
-    $(HOTSPOT_TOPDIR)/test/compiler/calls \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/GetOwnedMonitorInfo \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/GetNamedModule \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/IsModifiableModule \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleReads \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleExportsAndOpens \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/AddModuleUsesAndProvides \
-    $(HOTSPOT_TOPDIR)/test/testlibrary/jvmti \
-    $(HOTSPOT_TOPDIR)/test/compiler/jvmci/jdk.vm.ci.code.test \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/GetModulesInfo \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/ModuleAwareAgents/ThreadStart \
-    $(HOTSPOT_TOPDIR)/test/serviceability/jvmti/StartPhase/AllowedFunctions \
+    $(TOPDIR)/test/hotspot/jtreg/gc/g1/TestJNIWeakG1 \
+    $(TOPDIR)/test/hotspot/jtreg/gc/stress/gclocker \
+    $(TOPDIR)/test/hotspot/jtreg/gc/cslocker \
+    $(TOPDIR)/test/hotspot/jtreg/native_sanity \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/8025979 \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/8033445 \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/checked \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/PrivateInterfaceMethods \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/ToStringInInterfaceTest \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/CalleeSavedRegisters \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/CallWithJNIWeak \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jni/ReturnJNIWeak \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/modules/getModuleJNI \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/SameObject \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/BoolReturn \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/noClassDefFoundMsg \
+    $(TOPDIR)/test/hotspot/jtreg/compiler/floatingpoint/ \
+    $(TOPDIR)/test/hotspot/jtreg/compiler/calls \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetOwnedMonitorInfo \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetNamedModule \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/IsModifiableModule \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/AddModuleReads \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/AddModuleExportsAndOpens \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/AddModuleUsesAndProvides \
+    $(TOPDIR)/test/hotspot/jtreg/testlibrary/jvmti \
+    $(TOPDIR)/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.code.test \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/GetModulesInfo \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassFileLoadHook \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ClassLoadPrepare \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/ModuleAwareAgents/ThreadStart \
+    $(TOPDIR)/test/hotspot/jtreg/serviceability/jvmti/StartPhase/AllowedFunctions \
     #
 
 # Add conditional directories here when needed.
 ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc)
 BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
-    $(HOTSPOT_TOPDIR)/test/runtime/libadimalloc.solaris.sparc \
-    $(HOTSPOT_TOPDIR)/test/runtime/ThreadSignalMask
+    $(TOPDIR)/test/hotspot/jtreg/runtime/libadimalloc.solaris.sparc \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/ThreadSignalMask
 endif
 
 ifeq ($(OPENJDK_TARGET_OS), linux)
 BUILD_HOTSPOT_JTREG_NATIVE_SRC += \
-    $(HOTSPOT_TOPDIR)/test/runtime/execstack \
-    $(HOTSPOT_TOPDIR)/test/runtime/jsig \
-    $(HOTSPOT_TOPDIR)/test/runtime/StackGuardPages
+    $(TOPDIR)/test/hotspot/jtreg/runtime/execstack \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/jsig \
+    $(TOPDIR)/test/hotspot/jtreg/runtime/StackGuardPages
 endif
 
 ifeq ($(TOOLCHAIN_TYPE), solstudio)
diff --git a/make/test/JtregNativeJdk.gmk b/make/test/JtregNativeJdk.gmk
index baa572d6899..f4ba683e844 100644
--- a/make/test/JtregNativeJdk.gmk
+++ b/make/test/JtregNativeJdk.gmk
@@ -35,7 +35,7 @@ include $(SPEC)
 include MakeBase.gmk
 include TestFilesCompilation.gmk
 
-$(eval $(call IncludeCustomExtension, jdk, test/JtregNative.gmk))
+$(eval $(call IncludeCustomExtension, , test/JtregNative.gmk))
 
 ################################################################################
 # Targets for building the native tests themselves.
@@ -43,8 +43,8 @@ $(eval $(call IncludeCustomExtension, jdk, test/JtregNative.gmk))
 
 # Add more directories here when needed.
 BUILD_JDK_JTREG_NATIVE_SRC += \
-    $(JDK_TOPDIR)/test/native_sanity \
-    $(JDK_TOPDIR)/test/java/lang/String/nativeEncoding \
+    $(TOPDIR)/test/jdk/native_sanity \
+    $(TOPDIR)/test/jdk/java/lang/String/nativeEncoding \
     #
 
 BUILD_JDK_JTREG_OUTPUT_DIR := $(BUILD_OUTPUT)/support/test/jdk/jtreg/native
diff --git a/test/make/TestJavaCompilation.gmk b/test/make/TestJavaCompilation.gmk
index 9cd05b985ab..4c120fef231 100644
--- a/test/make/TestJavaCompilation.gmk
+++ b/test/make/TestJavaCompilation.gmk
@@ -30,10 +30,10 @@ include MakeBase.gmk
 include JarArchive.gmk
 include JavaCompilation.gmk
 
-THIS_FILE := $(SRC_ROOT)/test/make/TestJavaCompilation.gmk
+THIS_FILE := $(TOPDIR)/test/make/TestJavaCompilation.gmk
 DEPS := $(THIS_FILE) \
-    $(SRC_ROOT)/make/common/MakeBase.gmk \
-    $(SRC_ROOT)/make/common/JavaCompilation.gmk \
+    $(TOPDIR)/make/common/MakeBase.gmk \
+    $(TOPDIR)/make/common/JavaCompilation.gmk \
     #
 
 OUTPUT_DIR := $(TESTMAKE_OUTPUTDIR)/java-compilation
diff --git a/test/make/TestMakeBase.gmk b/test/make/TestMakeBase.gmk
index 60a7a6a3b67..8c7f111b9f1 100644
--- a/test/make/TestMakeBase.gmk
+++ b/test/make/TestMakeBase.gmk
@@ -28,9 +28,9 @@ default: all
 include $(SPEC)
 include MakeBase.gmk
 
-THIS_FILE := $(SRC_ROOT)/test/make/TestMakeBase.gmk
+THIS_FILE := $(TOPDIR)/test/make/TestMakeBase.gmk
 DEPS := $(THIS_FILE) \
-    $(SRC_ROOT)/make/common/MakeBase.gmk \
+    $(TOPDIR)/make/common/MakeBase.gmk \
     #
 
 # Assert two strings are equal
diff --git a/test/nashorn/script/basic/JDK-8007990.js b/test/nashorn/script/basic/JDK-8007990.js
index d5a41aa62e3..b9b4e70c7d5 100644
--- a/test/nashorn/script/basic/JDK-8007990.js
+++ b/test/nashorn/script/basic/JDK-8007990.js
@@ -29,7 +29,7 @@
  * @run
  */
 
-var p = new Packages.java.io.File("test/script/basic/JDK-8007990.js");
+var p = new Packages.java.io.File("test/nashorn/script/basic/JDK-8007990.js");
 var path = p.toPath();
 var basicView = Packages.java.nio.file.Files.getFileAttributeView(path, Packages.java.nio.file.attribute.BasicFileAttributeView.class);
 // We just want to confirm we can access the readAttributes() function
diff --git a/test/nashorn/script/basic/JDK-8012164.js.EXPECTED b/test/nashorn/script/basic/JDK-8012164.js.EXPECTED
index 9912edcd509..5caf9929a5f 100644
--- a/test/nashorn/script/basic/JDK-8012164.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8012164.js.EXPECTED
@@ -1,3 +1,3 @@
-<test/script/basic/JDK-8012164.js>.error(test/script/basic/JDK-8012164.js:38)
-<test/script/basic/JDK-8012164.js>.func(test/script/basic/JDK-8012164.js:33)
-<test/script/basic/JDK-8012164.js>.<program>(test/script/basic/JDK-8012164.js:47)
+<test/nashorn/script/basic/JDK-8012164.js>.error(test/nashorn/script/basic/JDK-8012164.js:38)
+<test/nashorn/script/basic/JDK-8012164.js>.func(test/nashorn/script/basic/JDK-8012164.js:33)
+<test/nashorn/script/basic/JDK-8012164.js>.<program>(test/nashorn/script/basic/JDK-8012164.js:47)
diff --git a/test/nashorn/script/basic/JDK-8014781.js.EXPECTED b/test/nashorn/script/basic/JDK-8014781.js.EXPECTED
index d3586c0ee67..2be79f1d05e 100644
--- a/test/nashorn/script/basic/JDK-8014781.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8014781.js.EXPECTED
@@ -1,4 +1,4 @@
 [object Object]
-	at MyError (test/script/basic/JDK-8014781.js:32)
-	at func (test/script/basic/JDK-8014781.js:36)
-	at <program> (test/script/basic/JDK-8014781.js:39)
+	at MyError (test/nashorn/script/basic/JDK-8014781.js:32)
+	at func (test/nashorn/script/basic/JDK-8014781.js:36)
+	at <program> (test/nashorn/script/basic/JDK-8014781.js:39)
diff --git a/test/nashorn/script/basic/JDK-8017950.js.EXPECTED b/test/nashorn/script/basic/JDK-8017950.js.EXPECTED
index 8c34d21343f..4749e5db00d 100644
--- a/test/nashorn/script/basic/JDK-8017950.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8017950.js.EXPECTED
@@ -1,5 +1,5 @@
 Error
-	at func (test/script/basic/JDK-8017950.js:33)
-	at f (test/script/basic/JDK-8017950.js:40)
-	at g (test/script/basic/JDK-8017950.js:44)
-	at <program> (test/script/basic/JDK-8017950.js:47)
+	at func (test/nashorn/script/basic/JDK-8017950.js:33)
+	at f (test/nashorn/script/basic/JDK-8017950.js:40)
+	at g (test/nashorn/script/basic/JDK-8017950.js:44)
+	at <program> (test/nashorn/script/basic/JDK-8017950.js:47)
diff --git a/test/nashorn/script/basic/JDK-8019226.js.EXPECTED b/test/nashorn/script/basic/JDK-8019226.js.EXPECTED
index 002a3ddbf0e..14ce001e097 100644
--- a/test/nashorn/script/basic/JDK-8019226.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8019226.js.EXPECTED
@@ -1,4 +1,4 @@
 Error: failed!
-	at func2 (test/script/basic/JDK-8019226.js:33)
-	at func1 (test/script/basic/JDK-8019226.js:31)
-	at <program> (test/script/basic/JDK-8019226.js:36)
+	at func2 (test/nashorn/script/basic/JDK-8019226.js:33)
+	at func1 (test/nashorn/script/basic/JDK-8019226.js:31)
+	at <program> (test/nashorn/script/basic/JDK-8019226.js:36)
diff --git a/test/nashorn/script/basic/JDK-8020437.js.EXPECTED b/test/nashorn/script/basic/JDK-8020437.js.EXPECTED
index 93657361e95..d89e97c99b7 100644
--- a/test/nashorn/script/basic/JDK-8020437.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8020437.js.EXPECTED
@@ -1,5 +1,5 @@
 [object Object]
 Error
-	at func (test/script/basic/JDK-8020437.js:48)
-	at f (test/script/basic/JDK-8020437.js:41)
-	at <program> (test/script/basic/JDK-8020437.js:37)
+	at func (test/nashorn/script/basic/JDK-8020437.js:48)
+	at f (test/nashorn/script/basic/JDK-8020437.js:41)
+	at <program> (test/nashorn/script/basic/JDK-8020437.js:37)
diff --git a/test/nashorn/script/basic/JDK-8025488.js.EXPECTED b/test/nashorn/script/basic/JDK-8025488.js.EXPECTED
index 40b244a96d8..6cf138cb0cc 100644
--- a/test/nashorn/script/basic/JDK-8025488.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8025488.js.EXPECTED
@@ -1,3 +1,3 @@
 [object Object]
-	at MyError (test/script/basic/JDK-8025488.js:34)
-	at <program> (test/script/basic/JDK-8025488.js:42)
+	at MyError (test/nashorn/script/basic/JDK-8025488.js:34)
+	at <program> (test/nashorn/script/basic/JDK-8025488.js:42)
diff --git a/test/nashorn/script/basic/JDK-8030182.js.EXPECTED b/test/nashorn/script/basic/JDK-8030182.js.EXPECTED
index d12b6d7fd72..f9dc9e056f0 100644
--- a/test/nashorn/script/basic/JDK-8030182.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8030182.js.EXPECTED
@@ -1,3 +1,3 @@
 Error: Strange...
-	at func (test/script/basic/JDK-8030182.js:32)
-	at <program> (test/script/basic/JDK-8030182.js:43)
+	at func (test/nashorn/script/basic/JDK-8030182.js:32)
+	at <program> (test/nashorn/script/basic/JDK-8030182.js:43)
diff --git a/test/nashorn/script/basic/JDK-8030182_2.js.EXPECTED b/test/nashorn/script/basic/JDK-8030182_2.js.EXPECTED
index afc582e964c..667567ecf14 100644
--- a/test/nashorn/script/basic/JDK-8030182_2.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8030182_2.js.EXPECTED
@@ -1,3 +1,3 @@
 ReferenceError: "g" is not defined
-	at <program> (test/script/basic/JDK-8030182_2.js#42:4<eval>:-1)
-	at <program> (test/script/basic/JDK-8030182_2.js:42)
+	at <program> (test/nashorn/script/basic/JDK-8030182_2.js#42:4<eval>:-1)
+	at <program> (test/nashorn/script/basic/JDK-8030182_2.js:42)
diff --git a/test/nashorn/script/basic/JDK-8030809.js.EXPECTED b/test/nashorn/script/basic/JDK-8030809.js.EXPECTED
index 6d2ee69b12a..a17cec460c8 100644
--- a/test/nashorn/script/basic/JDK-8030809.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8030809.js.EXPECTED
@@ -1,4 +1,4 @@
 Error
-	at <anonymous> (test/script/basic/JDK-8030809.js:33)
-	at func (test/script/basic/JDK-8030809.js:32)
-	at <program> (test/script/basic/JDK-8030809.js:38)
+	at <anonymous> (test/nashorn/script/basic/JDK-8030809.js:33)
+	at func (test/nashorn/script/basic/JDK-8030809.js:32)
+	at <program> (test/nashorn/script/basic/JDK-8030809.js:38)
diff --git a/test/nashorn/script/basic/JDK-8031983.js.EXPECTED b/test/nashorn/script/basic/JDK-8031983.js.EXPECTED
index 9d62db31954..458375892e9 100644
--- a/test/nashorn/script/basic/JDK-8031983.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8031983.js.EXPECTED
@@ -1,9 +1,9 @@
 hello
 35
 Error
-	at <program> (test/script/basic/JDK-8031983.js:31)
+	at <program> (test/nashorn/script/basic/JDK-8031983.js:31)
 43
 Error
-	at <program> (test/script/basic/JDK-8031983.js:41)
+	at <program> (test/nashorn/script/basic/JDK-8031983.js:41)
 [object Object]
-	at <program> (test/script/basic/JDK-8031983.js:50)
+	at <program> (test/nashorn/script/basic/JDK-8031983.js:50)
diff --git a/test/nashorn/script/basic/JDK-8032068.js.EXPECTED b/test/nashorn/script/basic/JDK-8032068.js.EXPECTED
index b8891eee077..53db157a8ab 100644
--- a/test/nashorn/script/basic/JDK-8032068.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8032068.js.EXPECTED
@@ -1,14 +1,14 @@
 Error
 	at <anonymous> (foo.js:2)
-	at <program> (test/script/basic/JDK-8032068.js:33)
+	at <program> (test/nashorn/script/basic/JDK-8032068.js:33)
 Error: x
 	at g (bar.js:1)
 	at <program> (bar.js:2)
-	at <program> (test/script/basic/JDK-8032068.js:39)
+	at <program> (test/nashorn/script/basic/JDK-8032068.js:39)
 Error
 	at <anonymous> (foo2.js:2)
-	at <program> (test/script/basic/JDK-8032068.js:46)
+	at <program> (test/nashorn/script/basic/JDK-8032068.js:46)
 Error: x
 	at g (bar2.js:1)
 	at <program> (bar2.js:2)
-	at <program> (test/script/basic/JDK-8032068.js:52)
+	at <program> (test/nashorn/script/basic/JDK-8032068.js:52)
diff --git a/test/nashorn/script/basic/JDK-8062583.js.EXPECTED b/test/nashorn/script/basic/JDK-8062583.js.EXPECTED
index 75201739e41..5a6f3a04ba0 100644
--- a/test/nashorn/script/basic/JDK-8062583.js.EXPECTED
+++ b/test/nashorn/script/basic/JDK-8062583.js.EXPECTED
@@ -1,8 +1,8 @@
 true
 false
 CustomError
-	at <program> (test/script/basic/JDK-8062583.js:40)
-test/script/basic/JDK-8062583.js:40:4 CustomError
+	at <program> (test/nashorn/script/basic/JDK-8062583.js:40)
+test/nashorn/script/basic/JDK-8062583.js:40:4 CustomError
 CustomError
-	at <program> (test/script/basic/JDK-8062583.js:49)
-test/script/basic/JDK-8062583.js:49 CustomError
+	at <program> (test/nashorn/script/basic/JDK-8062583.js:49)
+test/nashorn/script/basic/JDK-8062583.js:49 CustomError
diff --git a/test/nashorn/script/basic/es6/class.js.EXPECTED b/test/nashorn/script/basic/es6/class.js.EXPECTED
index 0d457c9bcbc..fa4a7bbe6d4 100644
--- a/test/nashorn/script/basic/es6/class.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/class.js.EXPECTED
@@ -1,3 +1,3 @@
-java.lang.RuntimeException: test/script/basic/es6/class.js#33:3<eval>:1:0 ES6 class declarations and expressions are not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/class.js#33:3<eval>:1:0 ES6 class declarations and expressions are not yet implemented
 class Foo {}
 ^
diff --git a/test/nashorn/script/basic/es6/const-empty.js.EXPECTED b/test/nashorn/script/basic/es6/const-empty.js.EXPECTED
index d3684a893aa..34d83e99f07 100644
--- a/test/nashorn/script/basic/es6/const-empty.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/const-empty.js.EXPECTED
@@ -1,3 +1,3 @@
-SyntaxError: test/script/basic/es6/const-empty.js#33:4<eval>:2:7 Missing assignment to constant "x"
+SyntaxError: test/nashorn/script/basic/es6/const-empty.js#33:4<eval>:2:7 Missing assignment to constant "x"
 const x;
        ^
diff --git a/test/nashorn/script/basic/es6/const-redeclare-extra.js.EXPECTED b/test/nashorn/script/basic/es6/const-redeclare-extra.js.EXPECTED
index 06af782e606..0723eacdc27 100644
--- a/test/nashorn/script/basic/es6/const-redeclare-extra.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/const-redeclare-extra.js.EXPECTED
@@ -1,9 +1,9 @@
-SyntaxError: test/script/basic/es6/const-redeclare-extra.js#36:8<eval>:3:8 Variable "x" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/const-redeclare-extra.js#36:8<eval>:3:8 Variable "x" has already been declared
     var x = {};
         ^
-SyntaxError: test/script/basic/es6/const-redeclare-extra.js#36:8<eval>:3:10 Variable "x" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/const-redeclare-extra.js#36:8<eval>:3:10 Variable "x" has already been declared
     const x = {};
           ^
-SyntaxError: test/script/basic/es6/const-redeclare-extra.js#36:8<eval>:3:10 Variable "x" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/const-redeclare-extra.js#36:8<eval>:3:10 Variable "x" has already been declared
     const x = 5;
           ^
diff --git a/test/nashorn/script/basic/es6/const-redeclare.js.EXPECTED b/test/nashorn/script/basic/es6/const-redeclare.js.EXPECTED
index 44b6a70fd9a..2a21a2f363e 100644
--- a/test/nashorn/script/basic/es6/const-redeclare.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/const-redeclare.js.EXPECTED
@@ -1,3 +1,3 @@
-SyntaxError: test/script/basic/es6/const-redeclare.js#33:4<eval>:2:6 Variable "x" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/const-redeclare.js#33:4<eval>:2:6 Variable "x" has already been declared
 const x = 2;
       ^
diff --git a/test/nashorn/script/basic/es6/destructuring.js.EXPECTED b/test/nashorn/script/basic/es6/destructuring.js.EXPECTED
index 54ecd96a3fa..e6d4fe3e05b 100644
--- a/test/nashorn/script/basic/es6/destructuring.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/destructuring.js.EXPECTED
@@ -1,93 +1,93 @@
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
 var { x: y } = obj;
     ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
 let { x: y } = obj;
     ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:6 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:6 ES6 destructuring is not yet implemented
 const { x: y } = obj;
       ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:1 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:1 ES6 destructuring is not yet implemented
 ({ x: y }) = obj;
  ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
 for (var { x: y } of obj) ;
 ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
 for (let { x: y } of obj) ;
 ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
 var { x, y } = obj;
     ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
 let { x, y } = obj;
     ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:6 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:6 ES6 destructuring is not yet implemented
 const { x, y } = obj;
       ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:1 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:1 ES6 destructuring is not yet implemented
 ({ x, y }) = obj;
  ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
 for (var { x, y } of obj) ;
 ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
 for (let { x, y } of obj) ;
 ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
 var [a, b] = obj;
     ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:4 ES6 destructuring is not yet implemented
 let [a, b] = obj;
     ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:6 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:6 ES6 destructuring is not yet implemented
 const [a, b] = obj;
       ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
 [a, b] = obj;
 ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
 for ([a, b] of obj) ;
 ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
 for (var [a, b] of obj) ;
 ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
 for (let [a, b] of obj) ;
 ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:9 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:9 ES6 destructuring is not yet implemented
 (function({ x: y }) { return x; })()
          ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:9 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:9 ES6 destructuring is not yet implemented
 (function({ x }) { return x; })()
          ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:9 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:9 ES6 destructuring is not yet implemented
 (function([x]) { return x; })()
          ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:9 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:9 ES6 destructuring is not yet implemented
 for (var [[x, y, z] = [4, 5, 6]] = [7, 8, 9]; iterCount < 1; ) ;
          ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:0 ES6 destructuring is not yet implemented
 for ([ arrow = () => {} ] of [[]]) ;
 ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:25 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:25 ES6 destructuring is not yet implemented
 try { throw null;} catch({}) { }
                          ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:24 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:24 ES6 destructuring is not yet implemented
 try { throw {} } catch ({}) { }
                         ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:24 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:24 ES6 destructuring is not yet implemented
 try { throw [] } catch ([,]) { }
                         ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:44 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:44 ES6 destructuring is not yet implemented
 try { throw { w: [7, undefined, ] }} catch ({ w: [x, y, z] = [4, 5, 6] }) { }
                                             ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:35 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:35 ES6 destructuring is not yet implemented
 try { throw { a: 2, b: 3} } catch ({a, b}) { }
                                    ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:28 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:28 ES6 destructuring is not yet implemented
 try { throw [null] } catch ([[x]]) { }
                             ^
-java.lang.RuntimeException: test/script/basic/es6/destructuring.js#35:6<eval>:1:38 ES6 destructuring is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/destructuring.js#35:6<eval>:1:38 ES6 destructuring is not yet implemented
 try { throw { w: undefined } } catch ({ w: { x, y, z } = { x: 4, y: 5, z: 6 } }) { }
                                       ^
diff --git a/test/nashorn/script/basic/es6/generator.js.EXPECTED b/test/nashorn/script/basic/es6/generator.js.EXPECTED
index fe4b850a1d5..cd13f7a5de8 100644
--- a/test/nashorn/script/basic/es6/generator.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/generator.js.EXPECTED
@@ -1,9 +1,9 @@
-java.lang.RuntimeException: test/script/basic/es6/generator.js#34:6<eval>:1:17 ES6 generator is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/generator.js#34:6<eval>:1:17 ES6 generator is not yet implemented
 function* func() { yield 1; }
                  ^
-java.lang.RuntimeException: test/script/basic/es6/generator.js#34:6<eval>:1:23 ES6 generator is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/generator.js#34:6<eval>:1:23 ES6 generator is not yet implemented
 ({ * generatorMethod() { yield 1; } })
                        ^
-java.lang.RuntimeException: test/script/basic/es6/generator.js#34:6<eval>:1:23 ES6 generator is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/generator.js#34:6<eval>:1:23 ES6 generator is not yet implemented
 var func = function*() { yield 1; }
                        ^
diff --git a/test/nashorn/script/basic/es6/let-const-statement-context.js.EXPECTED b/test/nashorn/script/basic/es6/let-const-statement-context.js.EXPECTED
index 1b73e4c7114..e9d822e387f 100644
--- a/test/nashorn/script/basic/es6/let-const-statement-context.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/let-const-statement-context.js.EXPECTED
@@ -1,30 +1,30 @@
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:10 Expected statement but found let declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:10 Expected statement but found let declaration
 if (true) let x = 1;
           ^
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:10 Expected statement but found const declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:10 Expected statement but found const declaration
 if (true) const x = 1;
           ^
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:13 Expected statement but found let declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:13 Expected statement but found let declaration
 while (true) let x = 1;
              ^
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:13 Expected statement but found const declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:13 Expected statement but found const declaration
 while (true) const x = 1;
              ^
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:9 Expected statement but found let declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:9 Expected statement but found let declaration
 for (;;) let x = 1;
          ^
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:9 Expected statement but found const declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:9 Expected statement but found const declaration
 for (;;) const x = 1;
          ^
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:3 Expected statement but found let declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:3 Expected statement but found let declaration
 do let x = 1; while (true);
    ^
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:3 Expected statement but found const declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:3 Expected statement but found const declaration
 do const x = 1; while (true);
    ^
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:9 Expected statement but found const declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:9 Expected statement but found const declaration
 with (y) const x = 1;
          ^
-SyntaxError: test/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:9 Expected statement but found let declaration
+SyntaxError: test/nashorn/script/basic/es6/let-const-statement-context.js#34:8<eval>:1:9 Expected statement but found let declaration
 with (y) let x = 1;
          ^
diff --git a/test/nashorn/script/basic/es6/let-const-switch.js.EXPECTED b/test/nashorn/script/basic/es6/let-const-switch.js.EXPECTED
index c534d448fbd..3eea21a6d04 100644
--- a/test/nashorn/script/basic/es6/let-const-switch.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/let-const-switch.js.EXPECTED
@@ -4,9 +4,9 @@
 1
 2
 0
-SyntaxError: test/script/basic/es6/let-const-switch.js#34:8<eval>:1:21 Unsupported let declaration in unprotected switch statement
+SyntaxError: test/nashorn/script/basic/es6/let-const-switch.js#34:8<eval>:1:21 Unsupported let declaration in unprotected switch statement
 switch (x) { case 0: let x = 1; }
                      ^
-SyntaxError: test/script/basic/es6/let-const-switch.js#34:8<eval>:1:21 Unsupported const declaration in unprotected switch statement
+SyntaxError: test/nashorn/script/basic/es6/let-const-switch.js#34:8<eval>:1:21 Unsupported const declaration in unprotected switch statement
 switch (x) { case 0: const x = 1; }
                      ^
diff --git a/test/nashorn/script/basic/es6/let-redeclare-extra.js.EXPECTED b/test/nashorn/script/basic/es6/let-redeclare-extra.js.EXPECTED
index e0e1afec156..9922cb0dbbc 100644
--- a/test/nashorn/script/basic/es6/let-redeclare-extra.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/let-redeclare-extra.js.EXPECTED
@@ -1,15 +1,15 @@
-SyntaxError: test/script/basic/es6/let-redeclare-extra.js#35:8<eval>:2:8 Variable "x" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/let-redeclare-extra.js#35:8<eval>:2:8 Variable "x" has already been declared
     let x = 2;
         ^
-SyntaxError: test/script/basic/es6/let-redeclare-extra.js#35:8<eval>:3:8 Variable "x" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/let-redeclare-extra.js#35:8<eval>:3:8 Variable "x" has already been declared
     var x = 2;
         ^
-SyntaxError: test/script/basic/es6/let-redeclare-extra.js#35:8<eval>:3:8 Variable "x" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/let-redeclare-extra.js#35:8<eval>:3:8 Variable "x" has already been declared
     let x = undefined;
         ^
-SyntaxError: test/script/basic/es6/let-redeclare-extra.js#35:8<eval>:2:10 Variable "x" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/let-redeclare-extra.js#35:8<eval>:2:10 Variable "x" has already been declared
     const x = function (){};
           ^
-SyntaxError: test/script/basic/es6/let-redeclare-extra.js#35:8<eval>:2:8 Variable "a" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/let-redeclare-extra.js#35:8<eval>:2:8 Variable "a" has already been declared
     let a = 2;
         ^
diff --git a/test/nashorn/script/basic/es6/let-redeclare.js.EXPECTED b/test/nashorn/script/basic/es6/let-redeclare.js.EXPECTED
index 299e35ef3fc..74d98a8a8ca 100644
--- a/test/nashorn/script/basic/es6/let-redeclare.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/let-redeclare.js.EXPECTED
@@ -1,3 +1,3 @@
-SyntaxError: test/script/basic/es6/let-redeclare.js#33:4<eval>:2:4 Variable "x" has already been declared
+SyntaxError: test/nashorn/script/basic/es6/let-redeclare.js#33:4<eval>:2:4 Variable "x" has already been declared
 let x = 2;
     ^
diff --git a/test/nashorn/script/basic/es6/restparam.js.EXPECTED b/test/nashorn/script/basic/es6/restparam.js.EXPECTED
index 9ccc374acac..b4c59145fa0 100644
--- a/test/nashorn/script/basic/es6/restparam.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/restparam.js.EXPECTED
@@ -1,15 +1,15 @@
-java.lang.RuntimeException: test/script/basic/es6/restparam.js#35:6<eval>:1:17 ES6 function rest parameter declaration is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/restparam.js#35:6<eval>:1:17 ES6 function rest parameter declaration is not yet implemented
 function func(...args) {}
                  ^
-java.lang.RuntimeException: test/script/basic/es6/restparam.js#35:6<eval>:1:23 ES6 function rest parameter declaration is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/restparam.js#35:6<eval>:1:23 ES6 function rest parameter declaration is not yet implemented
 function func(x, y, ...args) {}
                        ^
-java.lang.RuntimeException: test/script/basic/es6/restparam.js#35:6<eval>:1:11 ES6 function rest parameter declaration is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/restparam.js#35:6<eval>:1:11 ES6 function rest parameter declaration is not yet implemented
 ({ meth(...args) {} })
            ^
-java.lang.RuntimeException: test/script/basic/es6/restparam.js#35:6<eval>:1:17 ES6 function rest parameter declaration is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/restparam.js#35:6<eval>:1:17 ES6 function rest parameter declaration is not yet implemented
 ({ meth(x, y, ...args) {} })
                  ^
-SyntaxError: test/script/basic/es6/restparam.js#35:6<eval>:1:15 Duplicate parameter name "x"
+SyntaxError: test/nashorn/script/basic/es6/restparam.js#35:6<eval>:1:15 Duplicate parameter name "x"
 ({ meth(x = 0, x) {} })
                ^
diff --git a/test/nashorn/script/basic/es6/spread.js.EXPECTED b/test/nashorn/script/basic/es6/spread.js.EXPECTED
index 635f705599a..9484931b45b 100644
--- a/test/nashorn/script/basic/es6/spread.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/spread.js.EXPECTED
@@ -1,12 +1,12 @@
-java.lang.RuntimeException: test/script/basic/es6/spread.js#34:8<eval>:1:9 ES6 spread operator is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/spread.js#34:8<eval>:1:9 ES6 spread operator is not yet implemented
 var x = [...args]
          ^
-java.lang.RuntimeException: test/script/basic/es6/spread.js#34:8<eval>:1:15 ES6 spread operator is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/spread.js#34:8<eval>:1:15 ES6 spread operator is not yet implemented
 var x = [1, 2, ...args]
                ^
-java.lang.RuntimeException: test/script/basic/es6/spread.js#34:8<eval>:1:9 ES6 spread operator is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/spread.js#34:8<eval>:1:9 ES6 spread operator is not yet implemented
 var x = [...args, 3, 5]
          ^
-java.lang.RuntimeException: test/script/basic/es6/spread.js#34:8<eval>:1:13 ES6 spread operator is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/spread.js#34:8<eval>:1:13 ES6 spread operator is not yet implemented
 var r = func(...arr)
              ^
diff --git a/test/nashorn/script/basic/es6/super.js.EXPECTED b/test/nashorn/script/basic/es6/super.js.EXPECTED
index 25698576979..deaf43f12ae 100644
--- a/test/nashorn/script/basic/es6/super.js.EXPECTED
+++ b/test/nashorn/script/basic/es6/super.js.EXPECTED
@@ -1,9 +1,9 @@
-java.lang.RuntimeException: test/script/basic/es6/super.js#34:8<eval>:1:10 ES6 super keyword is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/super.js#34:8<eval>:1:10 ES6 super keyword is not yet implemented
 ({ meth() { x = super.x } })
           ^
-java.lang.RuntimeException: test/script/basic/es6/super.js#34:8<eval>:1:10 ES6 super keyword is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/super.js#34:8<eval>:1:10 ES6 super keyword is not yet implemented
 ({ meth() { x = super.x() } })
           ^
-java.lang.RuntimeException: test/script/basic/es6/super.js#34:8<eval>:1:10 ES6 super keyword is not yet implemented
+java.lang.RuntimeException: test/nashorn/script/basic/es6/super.js#34:8<eval>:1:10 ES6 super keyword is not yet implemented
 ({ meth() { x = super['x'] } })
           ^
diff --git a/test/nashorn/script/basic/hideLocationProperties.js.EXPECTED b/test/nashorn/script/basic/hideLocationProperties.js.EXPECTED
index 3af2a389d5c..041ba4e56e5 100644
--- a/test/nashorn/script/basic/hideLocationProperties.js.EXPECTED
+++ b/test/nashorn/script/basic/hideLocationProperties.js.EXPECTED
@@ -1,4 +1,4 @@
-test/script/basic/hideLocationProperties.js
+test/nashorn/script/basic/hideLocationProperties.js
 woot
 foo
 bar
diff --git a/test/nashorn/script/error/JDK-8008814-1.js.EXPECTED b/test/nashorn/script/error/JDK-8008814-1.js.EXPECTED
index 914372554e9..870e3103f86 100644
--- a/test/nashorn/script/error/JDK-8008814-1.js.EXPECTED
+++ b/test/nashorn/script/error/JDK-8008814-1.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/JDK-8008814-1.js:32:2 Function declarations can only occur at program or function body level. You should use a function expression here instead.
+test/nashorn/script/error/JDK-8008814-1.js:32:2 Function declarations can only occur at program or function body level. You should use a function expression here instead.
   function g() {
   ^
diff --git a/test/nashorn/script/error/JDK-8008814-2.js.EXPECTED b/test/nashorn/script/error/JDK-8008814-2.js.EXPECTED
index f79c679cf46..7307bc5ec7f 100644
--- a/test/nashorn/script/error/JDK-8008814-2.js.EXPECTED
+++ b/test/nashorn/script/error/JDK-8008814-2.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/JDK-8008814-2.js:32:2 In strict mode, function declarations can only occur at program or function body level. You should use a function expression here instead.
+test/nashorn/script/error/JDK-8008814-2.js:32:2 In strict mode, function declarations can only occur at program or function body level. You should use a function expression here instead.
   function g() {
   ^
diff --git a/test/nashorn/script/error/JDK-8016522.js.EXPECTED b/test/nashorn/script/error/JDK-8016522.js.EXPECTED
index 3bfe59ef217..9412c3c34cc 100644
--- a/test/nashorn/script/error/JDK-8016522.js.EXPECTED
+++ b/test/nashorn/script/error/JDK-8016522.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/JDK-8016522.js:30:1 Missing space after numeric literal
+test/nashorn/script/error/JDK-8016522.js:30:1 Missing space after numeric literal
 3in {};
  ^
diff --git a/test/nashorn/script/error/JDK-8020437-2.js.EXPECTED b/test/nashorn/script/error/JDK-8020437-2.js.EXPECTED
index b81f4885d1f..2b3c5308509 100644
--- a/test/nashorn/script/error/JDK-8020437-2.js.EXPECTED
+++ b/test/nashorn/script/error/JDK-8020437-2.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/JDK-8020437-2.js:36:12 Expected ; but found ++
+test/nashorn/script/error/JDK-8020437-2.js:36:12 Expected ; but found ++
 EOF}); var x++; // syntax error in same line
             ^
diff --git a/test/nashorn/script/error/JDK-8020437.js.EXPECTED b/test/nashorn/script/error/JDK-8020437.js.EXPECTED
index 9d169985ef6..dc38a07fdcc 100644
--- a/test/nashorn/script/error/JDK-8020437.js.EXPECTED
+++ b/test/nashorn/script/error/JDK-8020437.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/JDK-8020437.js:36:3 Expected comma but found )
+test/nashorn/script/error/JDK-8020437.js:36:3 Expected comma but found )
 EOF);  // missing "}" to end object literal
    ^
diff --git a/test/nashorn/script/error/JDK-8026039.js.EXPECTED b/test/nashorn/script/error/JDK-8026039.js.EXPECTED
index 4166339c017..37ac532f9ad 100644
--- a/test/nashorn/script/error/JDK-8026039.js.EXPECTED
+++ b/test/nashorn/script/error/JDK-8026039.js.EXPECTED
@@ -1,9 +1,9 @@
-test/script/error/JDK-8026039.js:30:9 "public" cannot be used as function name in strict mode
+test/nashorn/script/error/JDK-8026039.js:30:9 "public" cannot be used as function name in strict mode
 function public() {"use strict"}
          ^
-test/script/error/JDK-8026039.js:32:11 Expected ident but found public
+test/nashorn/script/error/JDK-8026039.js:32:11 Expected ident but found public
 function f(public) {"use strict"}
            ^
-test/script/error/JDK-8026039.js:33:0 Expected } but found eof
+test/nashorn/script/error/JDK-8026039.js:33:0 Expected } but found eof
 
 ^
diff --git a/test/nashorn/script/error/JDK-8027933.js.EXPECTED b/test/nashorn/script/error/JDK-8027933.js.EXPECTED
index 9389a5fc9d1..f44ee163527 100644
--- a/test/nashorn/script/error/JDK-8027933.js.EXPECTED
+++ b/test/nashorn/script/error/JDK-8027933.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/JDK-8027933.js:31:0 Expected an operand but found const
+test/nashorn/script/error/JDK-8027933.js:31:0 Expected an operand but found const
 const THE_ANSWER = 42;
 ^
diff --git a/test/nashorn/script/error/JDK-8039047.js.EXPECTED b/test/nashorn/script/error/JDK-8039047.js.EXPECTED
index b1d2f1705b0..83245d22989 100644
--- a/test/nashorn/script/error/JDK-8039047.js.EXPECTED
+++ b/test/nashorn/script/error/JDK-8039047.js.EXPECTED
@@ -1,6 +1,6 @@
-test/script/error/JDK-8039047.js:33:11 Expected ) but found if
+test/nashorn/script/error/JDK-8039047.js:33:11 Expected ) but found if
 } catch (e if e instanceof ReferenceError) {
            ^
-test/script/error/JDK-8039047.js:35:0 Expected eof but found }
+test/nashorn/script/error/JDK-8039047.js:35:0 Expected eof but found }
 }
 ^
diff --git a/test/nashorn/script/error/JDK-8098847.js.EXPECTED b/test/nashorn/script/error/JDK-8098847.js.EXPECTED
index 97611acb367..b96e7c56fb4 100644
--- a/test/nashorn/script/error/JDK-8098847.js.EXPECTED
+++ b/test/nashorn/script/error/JDK-8098847.js.EXPECTED
@@ -1,6 +1,6 @@
-test/script/error/JDK-8098847.js:32:5 Expected ident but found prop
+test/nashorn/script/error/JDK-8098847.js:32:5 Expected ident but found prop
 obj."prop" = "hello";
      ^
-test/script/error/JDK-8098847.js:33:5 Expected ident but found prop
+test/nashorn/script/error/JDK-8098847.js:33:5 Expected ident but found prop
 obj.'prop' = "hello";
      ^
diff --git a/test/nashorn/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED
index f7112ce951a..4ebc4c88c5c 100644
--- a/test/nashorn/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-154/function_mult_params_in_strict.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/NASHORN-154/function_mult_params_in_strict.js:38:17 strict mode function cannot have duplicate parameter name "x"
+test/nashorn/script/error/NASHORN-154/function_mult_params_in_strict.js:38:17 strict mode function cannot have duplicate parameter name "x"
 function func(x, x) {}
                  ^
diff --git a/test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED
index ffccb5d20cc..b4a604a677d 100644
--- a/test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js.EXPECTED
@@ -1,15 +1,15 @@
-test/script/error/NASHORN-154/improper_return_break_continue.js:34:0 Invalid return statement
+test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js:34:0 Invalid return statement
 return 33;
 ^
-test/script/error/NASHORN-154/improper_return_break_continue.js:36:0 Illegal continue statement
+test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js:36:0 Illegal continue statement
 continue;
 ^
-test/script/error/NASHORN-154/improper_return_break_continue.js:37:0 Illegal break statement
+test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js:37:0 Illegal break statement
 break;
 ^
-test/script/error/NASHORN-154/improper_return_break_continue.js:39:9 Undefined Label "nonExist"
+test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js:39:9 Undefined Label "nonExist"
 continue nonExist;
          ^
-test/script/error/NASHORN-154/improper_return_break_continue.js:40:6 Undefined Label "nonExist"
+test/nashorn/script/error/NASHORN-154/improper_return_break_continue.js:40:6 Undefined Label "nonExist"
 break nonExist;
       ^
diff --git a/test/nashorn/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED
index 7532fe00af0..e6d0ba1a6fa 100644
--- a/test/nashorn/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-154/invalid_lvalue.js.EXPECTED
@@ -1,15 +1,15 @@
-test/script/error/NASHORN-154/invalid_lvalue.js:36:0 Invalid left hand side for assignment
+test/nashorn/script/error/NASHORN-154/invalid_lvalue.js:36:0 Invalid left hand side for assignment
 3 = 4;
 ^
-test/script/error/NASHORN-154/invalid_lvalue.js:37:2 Invalid left hand side for assignment
+test/nashorn/script/error/NASHORN-154/invalid_lvalue.js:37:2 Invalid left hand side for assignment
 2 + 44 = 3;
   ^
-test/script/error/NASHORN-154/invalid_lvalue.js:38:2 Invalid left hand side for assignment
+test/nashorn/script/error/NASHORN-154/invalid_lvalue.js:38:2 Invalid left hand side for assignment
 x * y = 33;
   ^
-test/script/error/NASHORN-154/invalid_lvalue.js:39:2 Invalid left hand side for assignment
+test/nashorn/script/error/NASHORN-154/invalid_lvalue.js:39:2 Invalid left hand side for assignment
 x / y = 23;
   ^
-test/script/error/NASHORN-154/invalid_lvalue.js:40:1 Invalid left hand side for assignment
+test/nashorn/script/error/NASHORN-154/invalid_lvalue.js:40:1 Invalid left hand side for assignment
 x++ /= 33
  ^
diff --git a/test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED
index 05585fb9ce0..bf6163913c8 100644
--- a/test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js.EXPECTED
@@ -1,6 +1,6 @@
-test/script/error/NASHORN-154/literal_data_and_accessor.js:35:21 Property "foo" already defined
+test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js:35:21 Property "foo" already defined
 var obj = { foo: 42, get foo() { return 'hello' } };
                      ^
-test/script/error/NASHORN-154/literal_data_and_accessor.js:38:22 Property "foo" already defined
+test/nashorn/script/error/NASHORN-154/literal_data_and_accessor.js:38:22 Property "foo" already defined
 var obj2 = { foo: 42, set foo(x) { } };
                       ^
diff --git a/test/nashorn/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED
index 7031c69679b..416551d2510 100644
--- a/test/nashorn/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-154/literal_mult_getters.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/NASHORN-154/literal_mult_getters.js:36:37 Property "foo" already defined
+test/nashorn/script/error/NASHORN-154/literal_mult_getters.js:36:37 Property "foo" already defined
 var obj = { get foo() { return 2; }, get foo() { return 'hello'; } };
                                      ^
diff --git a/test/nashorn/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED
index dfb2e7bb991..14ba7b138d4 100644
--- a/test/nashorn/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-154/literal_mult_prop_in_strict.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/NASHORN-154/literal_mult_prop_in_strict.js:37:21 Property "foo" already defined
+test/nashorn/script/error/NASHORN-154/literal_mult_prop_in_strict.js:37:21 Property "foo" already defined
 var obj = { foo: 42, foo: 'hello' };
                      ^
diff --git a/test/nashorn/script/error/NASHORN-154/with_in_strict.js.EXPECTED b/test/nashorn/script/error/NASHORN-154/with_in_strict.js.EXPECTED
index 7e5103dc533..c85252bd046 100644
--- a/test/nashorn/script/error/NASHORN-154/with_in_strict.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-154/with_in_strict.js.EXPECTED
@@ -1,9 +1,9 @@
-test/script/error/NASHORN-154/with_in_strict.js:36:0 "with" statement cannot be used in strict mode
+test/nashorn/script/error/NASHORN-154/with_in_strict.js:36:0 "with" statement cannot be used in strict mode
 with({}) {
 ^
-test/script/error/NASHORN-154/with_in_strict.js:36:7 Expected ; but found )
+test/nashorn/script/error/NASHORN-154/with_in_strict.js:36:7 Expected ; but found )
 with({}) {
        ^
-test/script/error/NASHORN-154/with_in_strict.js:38:0 Expected eof but found }
+test/nashorn/script/error/NASHORN-154/with_in_strict.js:38:0 Expected eof but found }
 }
 ^
diff --git a/test/nashorn/script/error/NASHORN-35.js.EXPECTED b/test/nashorn/script/error/NASHORN-35.js.EXPECTED
index dca745ef110..a506f28fca9 100644
--- a/test/nashorn/script/error/NASHORN-35.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-35.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/NASHORN-35.js:30:4 Expected an operand but found =
+test/nashorn/script/error/NASHORN-35.js:30:4 Expected an operand but found =
 new = 1;
     ^
diff --git a/test/nashorn/script/error/NASHORN-39.js.EXPECTED b/test/nashorn/script/error/NASHORN-39.js.EXPECTED
index 7d68bddc4da..0e3e1033ca9 100644
--- a/test/nashorn/script/error/NASHORN-39.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-39.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/NASHORN-39.js:33:0 Expected an operand but found eol
+test/nashorn/script/error/NASHORN-39.js:33:0 Expected an operand but found eol
   1;
 ^
diff --git a/test/nashorn/script/error/NASHORN-568.js.EXPECTED b/test/nashorn/script/error/NASHORN-568.js.EXPECTED
index 12b0adfaac2..c301e4a3fef 100644
--- a/test/nashorn/script/error/NASHORN-568.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-568.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/NASHORN-568.js:30:0 Missing catch or finally after try
+test/nashorn/script/error/NASHORN-568.js:30:0 Missing catch or finally after try
 try { }
 ^
diff --git a/test/nashorn/script/error/NASHORN-57.js.EXPECTED b/test/nashorn/script/error/NASHORN-57.js.EXPECTED
index c9c51de1292..2c42dafbbfb 100644
--- a/test/nashorn/script/error/NASHORN-57.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-57.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/NASHORN-57.js:35:2 Expected l-value but found ;
+test/nashorn/script/error/NASHORN-57.js:35:2 Expected l-value but found ;
 ++;
   ^
diff --git a/test/nashorn/script/error/NASHORN-668.js.EXPECTED b/test/nashorn/script/error/NASHORN-668.js.EXPECTED
index 5a95579b3d7..6d550375c8b 100644
--- a/test/nashorn/script/error/NASHORN-668.js.EXPECTED
+++ b/test/nashorn/script/error/NASHORN-668.js.EXPECTED
@@ -1,10 +1,10 @@
-test/script/error/NASHORN-668.js:34:15 Repeated RegExp flag: g
+test/nashorn/script/error/NASHORN-668.js:34:15 Repeated RegExp flag: g
 var x = /xxx/gg;
                ^
-test/script/error/NASHORN-668.js:36:14 Unsupported RegExp flag: X
+test/nashorn/script/error/NASHORN-668.js:36:14 Unsupported RegExp flag: X
 var y = /xxx/X;
               ^
-test/script/error/NASHORN-668.js:38:13 Dangling meta character '*' near index 2
+test/nashorn/script/error/NASHORN-668.js:38:13 Dangling meta character '*' near index 2
 2**
   ^
 var z = /2**/;
diff --git a/test/nashorn/script/error/anon_func_stat_nse.js.EXPECTED b/test/nashorn/script/error/anon_func_stat_nse.js.EXPECTED
index 350f71c923d..36fde2513c7 100644
--- a/test/nashorn/script/error/anon_func_stat_nse.js.EXPECTED
+++ b/test/nashorn/script/error/anon_func_stat_nse.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/anon_func_stat_nse.js:31:8 Expected ident but found (
+test/nashorn/script/error/anon_func_stat_nse.js:31:8 Expected ident but found (
 function() {}
         ^
diff --git a/test/nashorn/script/error/backquote_string_nse.js.EXPECTED b/test/nashorn/script/error/backquote_string_nse.js.EXPECTED
index dd1eac2255c..0521839cf04 100644
--- a/test/nashorn/script/error/backquote_string_nse.js.EXPECTED
+++ b/test/nashorn/script/error/backquote_string_nse.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/backquote_string_nse.js:32:0 Expected an operand but found error
+test/nashorn/script/error/backquote_string_nse.js:32:0 Expected an operand but found error
 `ls -l`;
 ^
diff --git a/test/nashorn/script/error/conditional_catch_nse.js.EXPECTED b/test/nashorn/script/error/conditional_catch_nse.js.EXPECTED
index 2f8ed287340..cb34bdbaf75 100644
--- a/test/nashorn/script/error/conditional_catch_nse.js.EXPECTED
+++ b/test/nashorn/script/error/conditional_catch_nse.js.EXPECTED
@@ -1,6 +1,6 @@
-test/script/error/conditional_catch_nse.js:33:11 Expected ) but found if
+test/nashorn/script/error/conditional_catch_nse.js:33:11 Expected ) but found if
 } catch (e if e instanceof ReferenceError) {
            ^
-test/script/error/conditional_catch_nse.js:34:0 Expected eof but found }
+test/nashorn/script/error/conditional_catch_nse.js:34:0 Expected eof but found }
 }
 ^
diff --git a/test/nashorn/script/error/expr_closure_nse.js.EXPECTED b/test/nashorn/script/error/expr_closure_nse.js.EXPECTED
index da99c707787..22b02ff897d 100644
--- a/test/nashorn/script/error/expr_closure_nse.js.EXPECTED
+++ b/test/nashorn/script/error/expr_closure_nse.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/expr_closure_nse.js:31:19 Expected { but found x
+test/nashorn/script/error/expr_closure_nse.js:31:19 Expected { but found x
 function square(x) x*x;
                    ^
diff --git a/test/nashorn/script/error/for_each_nse.js.EXPECTED b/test/nashorn/script/error/for_each_nse.js.EXPECTED
index 51dd2fff7ea..d534f139e89 100644
--- a/test/nashorn/script/error/for_each_nse.js.EXPECTED
+++ b/test/nashorn/script/error/for_each_nse.js.EXPECTED
@@ -1,6 +1,6 @@
-test/script/error/for_each_nse.js:31:4 Expected ( but found each
+test/nashorn/script/error/for_each_nse.js:31:4 Expected ( but found each
 for each (var x in [3, 454, 4]) {
     ^
-test/script/error/for_each_nse.js:33:0 Expected eof but found }
+test/nashorn/script/error/for_each_nse.js:33:0 Expected eof but found }
 }
 ^
diff --git a/test/nashorn/script/error/hash_comment_nse.js.EXPECTED b/test/nashorn/script/error/hash_comment_nse.js.EXPECTED
index 1d1cafe6af1..5507bde3624 100644
--- a/test/nashorn/script/error/hash_comment_nse.js.EXPECTED
+++ b/test/nashorn/script/error/hash_comment_nse.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/hash_comment_nse.js:32:0 Expected an operand but found error
+test/nashorn/script/error/hash_comment_nse.js:32:0 Expected an operand but found error
 # this is a comment
 ^
diff --git a/test/nashorn/script/error/heredoc_nse.js.EXPECTED b/test/nashorn/script/error/heredoc_nse.js.EXPECTED
index e0b3cc250e2..b3c25bf9dc1 100644
--- a/test/nashorn/script/error/heredoc_nse.js.EXPECTED
+++ b/test/nashorn/script/error/heredoc_nse.js.EXPECTED
@@ -1,9 +1,9 @@
-test/script/error/heredoc_nse.js:32:10 Expected an operand but found <<
+test/nashorn/script/error/heredoc_nse.js:32:10 Expected an operand but found <<
 var str = <<EOF
           ^
-test/script/error/heredoc_nse.js:33:5 Expected ; but found is
+test/nashorn/script/error/heredoc_nse.js:33:5 Expected ; but found is
 This is a multiple line string
      ^
-test/script/error/heredoc_nse.js:34:7 Expected ; but found a
+test/nashorn/script/error/heredoc_nse.js:34:7 Expected ; but found a
 inside a heredoc
        ^
diff --git a/test/nashorn/script/error/object_literal_in_new_nse.js.EXPECTED b/test/nashorn/script/error/object_literal_in_new_nse.js.EXPECTED
index f925d741198..28467791dbb 100644
--- a/test/nashorn/script/error/object_literal_in_new_nse.js.EXPECTED
+++ b/test/nashorn/script/error/object_literal_in_new_nse.js.EXPECTED
@@ -1,9 +1,9 @@
-test/script/error/object_literal_in_new_nse.js:31:33 Expected ; but found {
+test/nashorn/script/error/object_literal_in_new_nse.js:31:33 Expected ; but found {
 var r = new java.lang.Runnable() {
                                  ^
-test/script/error/object_literal_in_new_nse.js:32:15 Expected ident but found (
+test/nashorn/script/error/object_literal_in_new_nse.js:32:15 Expected ident but found (
   run: function() { print("hello"); }
                ^
-test/script/error/object_literal_in_new_nse.js:32:36 Expected eof but found }
+test/nashorn/script/error/object_literal_in_new_nse.js:32:36 Expected eof but found }
   run: function() { print("hello"); }
                                     ^
diff --git a/test/nashorn/script/error/quotemissing.js.EXPECTED b/test/nashorn/script/error/quotemissing.js.EXPECTED
index a9d171a453a..3b5990107ae 100644
--- a/test/nashorn/script/error/quotemissing.js.EXPECTED
+++ b/test/nashorn/script/error/quotemissing.js.EXPECTED
@@ -1,3 +1,3 @@
-test/script/error/quotemissing.js:28:14 Missing close quote
+test/nashorn/script/error/quotemissing.js:28:14 Missing close quote
 print("hello);
               ^
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java
index a01e223d5ae..3a3349f8196 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java
+++ b/test/nashorn/src/jdk/nashorn/internal/runtime/test/ClassFilterTest.java
@@ -39,7 +39,7 @@ import org.testng.annotations.Test;
 @SuppressWarnings("javadoc")
 public class ClassFilterTest {
     private static final String NASHORN_CODE_CACHE = "nashorn.persistent.code.cache";
-    private static final String CLASSFILTER_CODE_CACHE = "build/classfilter_nashorn_code_cache";
+    private static final String CLASSFILTER_CODE_CACHE = System.getProperty("build.dir", "build") + "/classfilter_nashorn_code_cache";
 
     // @Test
     // This test takes too much time for basic "ant clean test" run.
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java
index 4167967c7c8..ae855c1f380 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java
+++ b/test/nashorn/src/jdk/nashorn/internal/runtime/test/CodeStoreAndPathTest.java
@@ -390,7 +390,7 @@ public class CodeStoreAndPathTest {
             "        return object; \n" +
             "    })(); \n" +
             "}()); ";
-    final static String codeCache = "build/nashorn_code_cache";
+    final static String codeCache = System.getProperty("build.dir", "build") + "/nashorn_code_cache";
     final static String oldUserDir = System.getProperty("user.dir");
 
     private static final String[] ENGINE_OPTIONS_OPT   = new String[]{"--persistent-code-cache", "--optimistic-types=true"};
diff --git a/test/nashorn/src/jdk/nashorn/internal/runtime/test/SourceTest.java b/test/nashorn/src/jdk/nashorn/internal/runtime/test/SourceTest.java
index fdf406c54f4..642874cd29a 100644
--- a/test/nashorn/src/jdk/nashorn/internal/runtime/test/SourceTest.java
+++ b/test/nashorn/src/jdk/nashorn/internal/runtime/test/SourceTest.java
@@ -49,7 +49,8 @@ public class SourceTest {
     final private static String SOURCE_STRING = "var x = 1;";
     final private static char[] SOURCE_CHARS = SOURCE_STRING.toCharArray();
     final private static String RESOURCE_PATH = "resources/load_test.js";
-    final private static File SOURCE_FILE = new File("build/test/classes/jdk/nashorn/internal/runtime/test/" + RESOURCE_PATH);
+    final private static File SOURCE_FILE = new File(System.getProperty("build.dir", "build") +
+            "/test/classes/jdk/nashorn/internal/runtime/test/" + RESOURCE_PATH);
     final private static URL  SOURCE_URL = SourceTest.class.getResource(RESOURCE_PATH);
 
 
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
index f1ae70a6863..3363696816e 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
+++ b/test/nashorn/src/jdk/nashorn/internal/test/framework/ParallelTestRunner.java
@@ -466,9 +466,9 @@ public class ParallelTestRunner {
     }
 
     private static void setTest262Properties() throws IOException {
-        System.setProperty(TEST_JS_ROOTS, "test/test262/test/suite/");
-        System.setProperty(TEST_JS_FRAMEWORK, "test/script/test262.js test/test262/test/harness/framework.js test/test262/test/harness/sta.js");
-        System.setProperty(TEST_JS_EXCLUDES_FILE, "test/test262/test/config/excludelist.xml");
+        System.setProperty(TEST_JS_ROOTS, "test/nashorn/script/external/test262/test/suite/");
+        System.setProperty(TEST_JS_FRAMEWORK, "test/nashorn/script/test262.js test/nashorn/script/external/test262/test/harness/framework.js test/nashorn/script/external/test262/test/harness/sta.js");
+        System.setProperty(TEST_JS_EXCLUDES_FILE, "test/nashorn/script/external/test262/test/config/excludelist.xml");
         System.setProperty(TEST_JS_ENABLE_STRICT_MODE, "true");
 
         final Properties projectProperties = new Properties();
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestFinder.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/TestFinder.java
index 8c757737944..7332e3271db 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestFinder.java
+++ b/test/nashorn/src/jdk/nashorn/internal/test/framework/TestFinder.java
@@ -116,7 +116,7 @@ public final class TestFinder {
         if (testList == null || testList.length() == 0) {
             // Run the tests under the test roots dir, selected by the
             // TEST_JS_INCLUDES patterns
-            final String testRootsString = System.getProperty(TEST_JS_ROOTS, "test/script");
+            final String testRootsString = System.getProperty(TEST_JS_ROOTS, "test/nashorn/script");
             if (testRootsString == null || testRootsString.length() == 0) {
                 throw new Exception("Error: " + TEST_JS_ROOTS + " must be set");
             }
@@ -160,6 +160,7 @@ public final class TestFinder {
             factory.log("WARNING: " + dir + " not found or not a directory");
         }
 
+
         Files.walkFileTree(dir, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new SimpleFileVisitor<Path>() {
             @Override
             public FileVisitResult visitFile(final Path file, final BasicFileAttributes attrs) throws IOException {
@@ -191,7 +192,7 @@ public final class TestFinder {
         }
     }
 
-    private static final String uncheckedDirs[] = System.getProperty(TEST_JS_UNCHECKED_DIR, "test/script/external/test262/").split(" ");
+    private static final String uncheckedDirs[] = System.getProperty(TEST_JS_UNCHECKED_DIR, "test/nashorn/script/external/test262/").split(" ");
 
     private static boolean isUnchecked(final Path testFile) {
         for (final String uncheckedDir : uncheckedDirs) {
@@ -447,7 +448,7 @@ public final class TestFinder {
     }
 
     private static Path[] getExcludeDirs() {
-        final String excludeDirs[] = System.getProperty(TEST_JS_EXCLUDE_DIR, "test/script/currently-failing").split(" ");
+        final String excludeDirs[] = System.getProperty(TEST_JS_EXCLUDE_DIR, "test/nashorn/script/currently-failing").split(" ");
         final Path[] excludePaths = new Path[excludeDirs.length];
         final FileSystem fileSystem = FileSystems.getDefault();
         int i = 0;
diff --git a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestHelper.java b/test/nashorn/src/jdk/nashorn/internal/test/framework/TestHelper.java
index 99e32802532..733b3e3d9d6 100644
--- a/test/nashorn/src/jdk/nashorn/internal/test/framework/TestHelper.java
+++ b/test/nashorn/src/jdk/nashorn/internal/test/framework/TestHelper.java
@@ -39,7 +39,7 @@ import java.io.Reader;
 @SuppressWarnings("javadoc")
 public abstract class TestHelper {
 
-    public static final String TEST_ROOT   = "test";
+    public static final String TEST_ROOT   = "test" + File.separator + "nashorn";
     public static final String BUILD_ROOT =
         System.getProperty("build.dir", "build") + File.separator + "test";
     public static final String TEST_PREFIX = TEST_ROOT + File.separator;