diff --git a/make/Main.gmk b/make/Main.gmk
index e4d6d696b99..20a1fff3247 100644
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -152,7 +152,7 @@ $(eval $(call DeclareRecipesForPhase, GENDATA, \
     FILE_PREFIX := Gendata, \
     MAKE_SUBDIR := gendata, \
     CHECK_MODULES := $(ALL_MODULES), \
-    USE_WRAPPER := true))
+))
 
 ALL_TARGETS += $(GENDATA_TARGETS)
 
@@ -163,7 +163,6 @@ $(eval $(call DeclareRecipesForPhase, COPY, \
     FILE_PREFIX := Copy, \
     MAKE_SUBDIR := copy, \
     CHECK_MODULES := $(ALL_MODULES), \
-    USE_WRAPPER := true, \
 ))
 
 ALL_COPY_MODULES += $(COPY_MODULES)
@@ -206,7 +205,7 @@ $(eval $(call DeclareRecipesForPhase, LIBS, \
     FILE_PREFIX := Lib, \
     MAKE_SUBDIR := lib, \
     CHECK_MODULES := $(ALL_MODULES), \
-    USE_WRAPPER := true))
+))
 
 ALL_TARGETS += $(LIBS_TARGETS)
 
@@ -219,7 +218,6 @@ $(eval $(call DeclareRecipesForPhase, STATIC_LIBS, \
     FILE_PREFIX := Lib, \
     MAKE_SUBDIR := lib, \
     CHECK_MODULES := $(STATIC_LIBS_MODULES), \
-    USE_WRAPPER := true, \
     EXTRA_ARGS := STATIC_LIBS=true, \
 ))
 
@@ -232,7 +230,7 @@ $(eval $(call DeclareRecipesForPhase, LAUNCHER, \
     FILE_PREFIX := Launcher, \
     MAKE_SUBDIR := launcher, \
     CHECK_MODULES := $(ALL_MODULES), \
-    USE_WRAPPER := true))
+))
 
 ALL_TARGETS += $(LAUNCHER_TARGETS)
 
diff --git a/make/MainSupport.gmk b/make/MainSupport.gmk
index 0e5068ea709..7b3f40abe92 100644
--- a/make/MainSupport.gmk
+++ b/make/MainSupport.gmk
@@ -148,23 +148,12 @@ PHASE_MAKEDIRS := $(TOPDIR)/make
 # Param 2: Module name
 define DeclareRecipeForModuleMakefile
   $2-$$($1_TARGET_SUFFIX):
-        ifeq ($$($1_USE_WRAPPER), true)
-	  +($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
-	      -f ModuleWrapper.gmk -I $$(TOPDIR)/make/common/modules  \
-	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
-	          $$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
-	      ) \
-	      MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX) $$($1_EXTRA_ARGS))
-        else
-	  +($(CD) $$(TOPDIR)/make \
-	  && $(MAKE) $(MAKE_ARGS) \
-	      -f modules/$2/$$($1_FILE_PREFIX).gmk -I $$(TOPDIR)/make/common/modules \
-	      $$(addprefix -I, $$(PHASE_MAKEDIRS) \
-	          $$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
-	      ) \
-	      MODULE=$2 $$($1_EXTRA_ARGS) \
-	  )
-        endif
+	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) \
+	    -f ModuleWrapper.gmk -I $$(TOPDIR)/make/common/modules  \
+	    $$(addprefix -I, $$(PHASE_MAKEDIRS) \
+	        $$(addsuffix /modules/$2, $$(PHASE_MAKEDIRS)) \
+	    ) \
+	    MODULE=$2 MAKEFILE_PREFIX=$$($1_FILE_PREFIX) $$($1_EXTRA_ARGS))
 
 endef
 
@@ -198,7 +187,6 @@ endef
 # TARGET_SUFFIX : Suffix of target to create for recipe
 # MAKE_SUBDIR : Subdir for this build phase
 # FILE_PREFIX : File prefix for this build phase
-# USE_WRAPPER : Set to true to use ModuleWrapper.gmk
 # CHECK_MODULES : List of modules to try
 # MULTIPLE_MAKEFILES : Set to true to handle makefiles for the same module and
 #                      phase in multiple repos
diff --git a/make/common/modules/GensrcCommonJdk.gmk b/make/common/modules/GensrcCommonJdk.gmk
index b44b0fe65a7..652ba8f860e 100644
--- a/make/common/modules/GensrcCommonJdk.gmk
+++ b/make/common/modules/GensrcCommonJdk.gmk
@@ -23,10 +23,6 @@
 # questions.
 #
 
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
 include Execute.gmk
 include JavaCompilation.gmk
 include NativeCompilation.gmk
diff --git a/make/common/modules/GensrcCommonLangtools.gmk b/make/common/modules/GensrcCommonLangtools.gmk
index df8dcd9cd15..44e46aa5253 100644
--- a/make/common/modules/GensrcCommonLangtools.gmk
+++ b/make/common/modules/GensrcCommonLangtools.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -22,12 +22,6 @@
 # or visit www.oracle.com if you need additional information or have any
 # questions.
 #
-
-# This must be the first rule
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
 include JavaCompilation.gmk
 
 ################################################################################
@@ -131,4 +125,3 @@ define SetupParseProperties
   $$(strip $1) += $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props
 endef
 
-################################################################################
diff --git a/make/modules/java.base/Gensrc.gmk b/make/modules/java.base/Gensrc.gmk
index 7b54a6980ae..3d473df7a1c 100644
--- a/make/modules/java.base/Gensrc.gmk
+++ b/make/modules/java.base/Gensrc.gmk
@@ -36,6 +36,10 @@ include gensrc/GensrcVarHandles.gmk
 include gensrc/GensrcModuleLoaderMap.gmk
 include gensrc/GensrcEmojiData.gmk
 
+# GensrcLocaleData.gmk does not set TARGETS, so we must choose which targets
+# to include.
+TARGETS += $(GENSRC_BASELOCALEDATA)
+
 ################################################################################
 
 CLDR_DATA_DIR := $(TOPDIR)/make/data/cldr/common
@@ -61,7 +65,7 @@ $(CLDR_GEN_DONE): $(wildcard $(CLDR_DATA_DIR)/dtd/*.dtd) \
 	    -tzdatadir $(TZ_DATA_DIR))
 	$(TOUCH) $@
 
-GENSRC_JAVA_BASE += $(CLDR_GEN_DONE)
+TARGETS += $(CLDR_GEN_DONE)
 
 ################################################################################
 
@@ -77,7 +81,7 @@ $(eval $(call SetupCompileProperties, SUN_UTIL, \
     CLASS := sun.util.resources.LocaleNamesBundle, \
 ))
 
-GENSRC_JAVA_BASE += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL)
+TARGETS += $(LIST_RESOURCE_BUNDLE) $(SUN_UTIL)
 
 # Some resources bundles are already present as java files but still need to be
 # copied to zh_HK locale.
@@ -86,7 +90,7 @@ $(eval $(call SetupCopy-zh_HK,COPY_ZH_HK, \
         sun/security/util/AuthResources_zh_TW.java \
         sun/security/util/Resources_zh_TW.java)))
 
-GENSRC_JAVA_BASE += $(COPY_ZH_HK)
+TARGETS += $(COPY_ZH_HK)
 
 ################################################################################
 
@@ -96,7 +100,7 @@ $(GENSRC_LSREQUIVMAPS): $(TOPDIR)/make/data/lsrdata/language-subtag-registry.txt
 	$(call MakeDir, $(@D))
 	$(TOOL_GENERATELSREQUIVMAPS) $< $@
 
-GENSRC_JAVA_BASE += $(GENSRC_LSREQUIVMAPS)
+TARGETS += $(GENSRC_LSREQUIVMAPS)
 
 ################################################################################
 
@@ -111,12 +115,4 @@ $(INTPOLY_GEN_DONE): $(INTPLOY_HEADER) $(BUILD_TOOLS_JDK)
 	    $(GENSRC_DIR)) $(LOG_DEBUG)
 	$(TOUCH) $@
 
-GENSRC_JAVA_BASE += $(INTPOLY_GEN_DONE)
-
-################################################################################
-
-java.base: $(GENSRC_JAVA_BASE)
-
-all: java.base
-
-.PHONY: all java.base
+TARGETS += $(INTPOLY_GEN_DONE)
diff --git a/make/modules/java.base/gensrc/GensrcBuffer.gmk b/make/modules/java.base/gensrc/GensrcBuffer.gmk
index 8f353ae0018..6ad432fb866 100644
--- a/make/modules/java.base/gensrc/GensrcBuffer.gmk
+++ b/make/modules/java.base/gensrc/GensrcBuffer.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -378,4 +378,5 @@ $(eval $(call SetupGenBuffer,ByteBufferAsDoubleBufferRL,$(BYTE_X_BUF), type:=dou
 ###
 
 $(GENSRC_BUFFER): $(BUILD_TOOLS_JDK)
-GENSRC_JAVA_BASE += $(GENSRC_BUFFER)
+
+TARGETS += $(GENSRC_BUFFER)
diff --git a/make/modules/java.base/gensrc/GensrcCharacterData.gmk b/make/modules/java.base/gensrc/GensrcCharacterData.gmk
index 09966bab4d7..cdfc8a64c96 100644
--- a/make/modules/java.base/gensrc/GensrcCharacterData.gmk
+++ b/make/modules/java.base/gensrc/GensrcCharacterData.gmk
@@ -64,6 +64,7 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/%.java: $(CHARACTERDATA)/%.java.
 
 GENSRC_CHARACTERDATA += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataUndefined.java \
     $(SUPPORT_OUTPUTDIR)/gensrc/java.base/java/lang/CharacterDataPrivateUse.java
-GENSRC_JAVA_BASE += $(GENSRC_CHARACTERDATA)
 
 $(GENSRC_CHARACTERDATA): $(BUILD_TOOLS_JDK)
+
+TARGETS += $(GENSRC_CHARACTERDATA)
diff --git a/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk b/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
index e595f5bb11e..7622c1069a4 100644
--- a/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
+++ b/make/modules/java.base/gensrc/GensrcCharsetCoder.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -100,8 +100,9 @@ $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java: $(GENSRC_CHARSETCODER_TEMPLATE)
 	$(MV) $@.tmp $@
 
 GENSRC_CHARSETCODER += $(GENSRC_CHARSETCODER_DST)/CharsetEncoder.java
-GENSRC_JAVA_BASE += $(GENSRC_CHARSETCODER)
 
 ################################################################################
 
 $(GENSRC_CHARSETCODER): $(BUILD_TOOLS_JDK)
+
+TARGETS += $(GENSRC_CHARSETCODER)
diff --git a/make/modules/java.base/gensrc/GensrcCharsetMapping.gmk b/make/modules/java.base/gensrc/GensrcCharsetMapping.gmk
index 842e742d7ce..b9a8f269a7d 100644
--- a/make/modules/java.base/gensrc/GensrcCharsetMapping.gmk
+++ b/make/modules/java.base/gensrc/GensrcCharsetMapping.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -53,4 +53,4 @@ $(CHARSET_DONE_BASE)-stdcs: $(CHARSET_DATA_DIR)/charsets \
             $(LOG_DEBUG)
 	$(TOUCH) '$@'
 
-GENSRC_JAVA_BASE += $(CHARSET_DONE_BASE)-stdcs
+TARGETS += $(CHARSET_DONE_BASE)-stdcs
diff --git a/make/modules/java.base/gensrc/GensrcEmojiData.gmk b/make/modules/java.base/gensrc/GensrcEmojiData.gmk
index c6ae6fa9c32..d92cb9354a3 100644
--- a/make/modules/java.base/gensrc/GensrcEmojiData.gmk
+++ b/make/modules/java.base/gensrc/GensrcEmojiData.gmk
@@ -40,5 +40,4 @@ $(GENSRC_EMOJIDATA): $(BUILD_TOOLS_JDK) $(EMOJIDATATEMP) $(UNICODEDATA)/emoji/em
 		$(UNICODEDATA) \
 		$(GENSRC_EMOJIDATA)
 
-GENSRC_JAVA_BASE += $(GENSRC_EMOJIDATA)
-
+TARGETS += $(GENSRC_EMOJIDATA)
diff --git a/make/modules/java.base/gensrc/GensrcExceptions.gmk b/make/modules/java.base/gensrc/GensrcExceptions.gmk
index 4e7b5b5fe17..fd7d8c75d8b 100644
--- a/make/modules/java.base/gensrc/GensrcExceptions.gmk
+++ b/make/modules/java.base/gensrc/GensrcExceptions.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -41,6 +41,7 @@ $(GENSRC_EXCEPTIONS_DST)/_the.%.marker: $(GENSRC_EXCEPTIONS_SRC)/%/exceptions \
 	$(TOUCH) $@
 
 GENSRC_EXCEPTIONS += $(foreach D,$(GENSRC_EXCEPTIONS_SRC_DIRS),$(GENSRC_EXCEPTIONS_DST)/_the.$(D).marker)
-GENSRC_JAVA_BASE += $(GENSRC_EXCEPTIONS)
 
 $(GENSRC_EXCEPTIONS): $(BUILD_TOOLS_JDK)
+
+TARGETS += $(GENSRC_EXCEPTIONS)
diff --git a/make/modules/java.base/gensrc/GensrcLocaleData.gmk b/make/modules/java.base/gensrc/GensrcLocaleData.gmk
index 115d2efd5f2..1e28d91ab68 100644
--- a/make/modules/java.base/gensrc/GensrcLocaleData.gmk
+++ b/make/modules/java.base/gensrc/GensrcLocaleData.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -147,7 +147,7 @@ $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLo
 GENSRC_BASELOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/java.base/sun/util/locale/provider/BaseLocaleDataMetaInfo.java
 GENSRC_LOCALEDATA := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.localedata/sun/util/resources/provider/NonBaseLocaleDataMetaInfo.java
 
-GENSRC_JAVA_BASE += $(GENSRC_BASELOCALEDATA)
-GENSRC_JDK_LOCALEDATA += $(GENSRC_LOCALEDATA)
-
 ################################################################################
+
+# This file is included twice, by java.base and jdk.localedata. The includer must
+# add either GENSRC_BASELOCALEDATA or GENSRC_LOCALEDATA to TARGETS.
diff --git a/make/modules/java.base/gensrc/GensrcMisc.gmk b/make/modules/java.base/gensrc/GensrcMisc.gmk
index 55f6005ca51..0863f4fa4ec 100644
--- a/make/modules/java.base/gensrc/GensrcMisc.gmk
+++ b/make/modules/java.base/gensrc/GensrcMisc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -50,7 +50,7 @@ $(eval $(call SetupTextFileProcessing, BUILD_VERSION_JAVA, \
         @@VENDOR_URL_VM_BUG@@ => $(VENDOR_URL_VM_BUG), \
 ))
 
-GENSRC_JAVA_BASE += $(BUILD_VERSION_JAVA)
+TARGETS += $(BUILD_VERSION_JAVA)
 
 ################################################################################
 
@@ -88,7 +88,7 @@ $(GENSRC_SOR_FILE): \
     $(TOPDIR)/src/java.base/share/classes/sun/nio/ch/SocketOptionRegistry.java.template
 	$(generate-preproc-src)
 
-GENSRC_JAVA_BASE += $(GENSRC_SOR_FILE)
+TARGETS += $(GENSRC_SOR_FILE)
 
 ################################################################################
 
@@ -100,7 +100,7 @@ ifeq ($(call isTargetOs, windows), false)
       $(TOPDIR)/src/java.base/unix/classes/sun/nio/fs/UnixConstants.java.template
 	$(generate-preproc-src)
 
-  GENSRC_JAVA_BASE += $(GENSRC_UC_FILE)
+  TARGETS += $(GENSRC_UC_FILE)
 
 endif
 
@@ -114,7 +114,7 @@ ifeq ($(call isTargetOs, solaris), true)
       $(TOPDIR)/src/java.base/solaris/classes/sun/nio/fs/SolarisConstants.java.template
 	$(generate-preproc-src)
 
-  GENSRC_JAVA_BASE += $(GENSRC_SC_FILE)
+  TARGETS += $(GENSRC_SC_FILE)
 
 endif
 
@@ -135,5 +135,5 @@ ifneq ($(wildcard $(TOPDIR)/src/java.base/share/classes/javax/crypto/JceSecurity
         @@JCE_DEFAULT_POLICY@@ => $(JCE_DEFAULT_POLICY), \
   ))
 
-  GENSRC_JAVA_BASE += $(BUILD_JCESECURITY_JAVA)
+  TARGETS += $(BUILD_JCESECURITY_JAVA)
 endif
diff --git a/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk b/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
index 10b5cd86d05..e248e680d46 100644
--- a/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
+++ b/make/modules/java.base/gensrc/GensrcModuleLoaderMap.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, 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
@@ -52,6 +52,6 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java:
 	     -platform $(PLATFORM_MODULES_LIST) -o $@.tmp $<
 	$(MV) $@.tmp $@
 
-GENSRC_JAVA_BASE += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java
+TARGETS += $(SUPPORT_OUTPUTDIR)/gensrc/java.base/jdk/internal/module/ModuleLoaderMap.java
 
 ################################################################################
diff --git a/make/modules/java.base/gensrc/GensrcVarHandles.gmk b/make/modules/java.base/gensrc/GensrcVarHandles.gmk
index 4efbe146e23..af24429ba3c 100644
--- a/make/modules/java.base/gensrc/GensrcVarHandles.gmk
+++ b/make/modules/java.base/gensrc/GensrcVarHandles.gmk
@@ -276,4 +276,4 @@ VARHANDLES_MEMORY_ADDRESS_TYPES := Byte Short Char Int Long Float Double
 $(foreach t, $(VARHANDLES_MEMORY_ADDRESS_TYPES), \
   $(eval $(call GenerateVarHandleMemoryAddress,VAR_HANDLE_MEMORY_ADDRESS_$t,$t)))
 
-GENSRC_JAVA_BASE += $(GENSRC_VARHANDLES)
+TARGETS += $(GENSRC_VARHANDLES)
diff --git a/make/modules/java.desktop/Gensrc.gmk b/make/modules/java.desktop/Gensrc.gmk
index c32107a529f..efa823a044e 100644
--- a/make/modules/java.desktop/Gensrc.gmk
+++ b/make/modules/java.desktop/Gensrc.gmk
@@ -76,12 +76,4 @@ $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
     CLASS := ListResourceBundle, \
 ))
 
-GENSRC_JAVA_DESKTOP += $(COMPILE_PROPERTIES)
-
-################################################################################
-
-java.desktop: $(GENSRC_JAVA_DESKTOP)
-
-all: java.desktop
-
-.PHONY: all java.desktop
+TARGETS += $(COMPILE_PROPERTIES)
diff --git a/make/modules/java.desktop/gensrc/GensrcIcons.gmk b/make/modules/java.desktop/gensrc/GensrcIcons.gmk
index 8757030166e..e0a6c107ecc 100644
--- a/make/modules/java.desktop/gensrc/GensrcIcons.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcIcons.gmk
@@ -102,7 +102,7 @@ endef
 
 $(foreach I, $(GENSRC_AWT_ICONS_SRC), $(eval $(call SetupGensrcAWTIcon,$(notdir $(I)),$(dir $(I)))))
 
-GENSRC_JAVA_DESKTOP += $(GENSRC_AWT_ICONS)
+TARGETS += $(GENSRC_AWT_ICONS)
 
 ################################################################################
 
@@ -123,5 +123,5 @@ ifeq ($(call isTargetOs, macosx), true)
 	$(ECHO) "};" >> $@.tmp
 	$(MV) $@.tmp $@
 
-  GENSRC_JAVA_DESKTOP += $(GENSRC_OSX_ICONS)
+  TARGETS += $(GENSRC_OSX_ICONS)
 endif
diff --git a/make/modules/java.desktop/gensrc/GensrcSwing.gmk b/make/modules/java.desktop/gensrc/GensrcSwing.gmk
index 32de2beb3e0..cfb50831d1b 100644
--- a/make/modules/java.desktop/gensrc/GensrcSwing.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcSwing.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -40,4 +40,4 @@ $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_nimbus: $(NIMBUS_SKIN_FI
 
 GENSRC_SWING_NIMBUS := $(SUPPORT_OUTPUTDIR)/gensrc/java.desktop/_the.generated_nimbus
 
-GENSRC_JAVA_DESKTOP += $(GENSRC_SWING_NIMBUS)
+TARGETS += $(GENSRC_SWING_NIMBUS)
diff --git a/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk b/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
index b3c090b063c..d46328f8607 100644
--- a/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
+++ b/make/modules/java.desktop/gensrc/GensrcX11Wrappers.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2020, 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
@@ -44,4 +44,4 @@ $(eval $(call SetupExecute, gen_x11wrappers, \
         $(OPENJDK_TARGET_CPU_BITS), \
 ))
 
-GENSRC_JAVA_DESKTOP += $(gen_x11wrappers_TARGET)
+TARGETS += $(gen_x11wrappers_TARGET)
diff --git a/make/modules/java.logging/Gensrc.gmk b/make/modules/java.logging/Gensrc.gmk
index cd57b2080ea..0839fcfd9ec 100644
--- a/make/modules/java.logging/Gensrc.gmk
+++ b/make/modules/java.logging/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -35,9 +35,3 @@ $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
 ))
 
 TARGETS += $(COMPILE_PROPERTIES)
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: all
diff --git a/make/modules/jdk.charsets/Gensrc.gmk b/make/modules/jdk.charsets/Gensrc.gmk
index e630d01cdff..ca9c1940941 100644
--- a/make/modules/jdk.charsets/Gensrc.gmk
+++ b/make/modules/jdk.charsets/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -76,17 +76,9 @@ $(CHARSET_GENSRC_JAVA_DIR_CS)/sjis0213.dat: $(CHARSET_DATA_DIR)/sjis0213.map \
 	$(call MakeDir, $(@D))
 	$(TOOL_CHARSETMAPPING) '$<' '$@' sjis0213
 
-GENSRC_JDK_CHARSETS += \
+TARGETS += \
     $(CHARSET_DONE_CS)-extcs \
     $(CHARSET_DONE_CS)-hkscs \
     $(CHARSET_DONE_CS)-euctw \
     $(CHARSET_GENSRC_JAVA_DIR_CS)/sjis0213.dat \
     #
-
-################################################################################
-
-jdk.charsets: $(GENSRC_JDK_CHARSETS)
-
-all: jdk.charsets
-
-.PHONY: all jdk.charsets
diff --git a/make/modules/jdk.compiler/Gensrc.gmk b/make/modules/jdk.compiler/Gensrc.gmk
index e5a299f7970..2312449751e 100644
--- a/make/modules/jdk.compiler/Gensrc.gmk
+++ b/make/modules/jdk.compiler/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -35,4 +35,4 @@ $(eval $(call SetupParseProperties,PARSE_PROPERTIES, \
 	com/sun/tools/javac/resources/compiler.properties \
 	com/sun/tools/javac/resources/launcher.properties))
 
-all: $(COMPILE_PROPERTIES) $(PARSE_PROPERTIES)
+TARGETS += $(COMPILE_PROPERTIES) $(PARSE_PROPERTIES)
diff --git a/make/modules/jdk.hotspot.agent/Gensrc.gmk b/make/modules/jdk.hotspot.agent/Gensrc.gmk
index c8923cc6c77..aee268eb3a9 100644
--- a/make/modules/jdk.hotspot.agent/Gensrc.gmk
+++ b/make/modules/jdk.hotspot.agent/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, 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
@@ -23,11 +23,6 @@
 # questions.
 #
 
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-
 ################################################################################
 
 SA_PROPERTIES := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.hotspot.agent/sa.properties
@@ -56,9 +51,3 @@ ifeq ($(call isTargetOs, macosx), true)
 
   TARGETS += $(MACH_EXC_SERVER)
 endif
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: all default
diff --git a/make/modules/jdk.incubator.jpackage/Gensrc.gmk b/make/modules/jdk.incubator.jpackage/Gensrc.gmk
index a62c8d45d53..5948a80f120 100644
--- a/make/modules/jdk.incubator.jpackage/Gensrc.gmk
+++ b/make/modules/jdk.incubator.jpackage/Gensrc.gmk
@@ -38,9 +38,3 @@ ifeq ($(call isTargetOs, macosx), true)
 
   TARGETS := $(ENTITLEMENTS_TARGET_FILE)
 endif
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: all
diff --git a/make/modules/jdk.internal.vm.compiler.management/Gensrc.gmk b/make/modules/jdk.internal.vm.compiler.management/Gensrc.gmk
index 7e43a300607..103b2bba503 100644
--- a/make/modules/jdk.internal.vm.compiler.management/Gensrc.gmk
+++ b/make/modules/jdk.internal.vm.compiler.management/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, 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
@@ -23,11 +23,6 @@
 # questions.
 #
 
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
 SRC_DIR := $(TOPDIR)/src/$(MODULE)/share/classes
 
@@ -93,9 +88,3 @@ $(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done
 	$(ECHO) "    ;" >> $@;
 
 TARGETS += $(GENSRC_DIR)/module-info.java.extra
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: default all
diff --git a/make/modules/jdk.internal.vm.compiler/Gensrc.gmk b/make/modules/jdk.internal.vm.compiler/Gensrc.gmk
index be0b85f462d..7efd9ccb484 100644
--- a/make/modules/jdk.internal.vm.compiler/Gensrc.gmk
+++ b/make/modules/jdk.internal.vm.compiler/Gensrc.gmk
@@ -23,11 +23,6 @@
 # questions.
 #
 
-default: all
-
-include $(SPEC)
-include MakeBase.gmk
-
 GENSRC_DIR := $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)
 SRC_DIR := $(TOPDIR)/src/$(MODULE)/share/classes
 
@@ -157,9 +152,3 @@ $(GENSRC_DIR)/module-info.java.extra: $(GENSRC_DIR)/_gensrc_proc_done
 	$(ECHO) "    ;" >> $@;
 
 TARGETS += $(GENSRC_DIR)/module-info.java.extra
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: default all
diff --git a/make/modules/jdk.jartool/Gensrc.gmk b/make/modules/jdk.jartool/Gensrc.gmk
index 5376ae30422..f059f4ac43f 100644
--- a/make/modules/jdk.jartool/Gensrc.gmk
+++ b/make/modules/jdk.jartool/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, 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
@@ -35,9 +35,3 @@ $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
 ))
 
 TARGETS += $(COMPILE_PROPERTIES)
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: all
diff --git a/make/modules/jdk.javadoc/Gensrc.gmk b/make/modules/jdk.javadoc/Gensrc.gmk
index c0561bbc666..4fd6bff8f88 100644
--- a/make/modules/jdk.javadoc/Gensrc.gmk
+++ b/make/modules/jdk.javadoc/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -33,4 +33,4 @@ $(eval $(call SetupVersionProperties,JAVADOC_VERSION,\
 
 $(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, $(JAVADOC_VERSION)))
 
-all: $(COMPILE_PROPERTIES)
+TARGETS += $(COMPILE_PROPERTIES)
diff --git a/make/modules/jdk.jdeps/Gensrc.gmk b/make/modules/jdk.jdeps/Gensrc.gmk
index 36d7ca15f0a..a819ad4296e 100644
--- a/make/modules/jdk.jdeps/Gensrc.gmk
+++ b/make/modules/jdk.jdeps/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -34,4 +34,4 @@ $(eval $(call SetupVersionProperties,JDEPS_VERSION,\
 $(eval $(call SetupCompileProperties,COMPILE_PROPERTIES,\
     $(JDEPS_VERSION) $(JAVAP_VERSION)))
 
-all: $(COMPILE_PROPERTIES)
+TARGETS += $(COMPILE_PROPERTIES)
diff --git a/make/modules/jdk.jdi/Gensrc.gmk b/make/modules/jdk.jdi/Gensrc.gmk
index ef539905a5d..5487e950921 100644
--- a/make/modules/jdk.jdi/Gensrc.gmk
+++ b/make/modules/jdk.jdi/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -32,6 +32,7 @@ include GensrcCommonJdk.gmk
 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
+HTML_FILE := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html
 
 # Both the header and java file are created using the same recipe. By declaring
 # this rule and adding header file to dependencies for java file, both are
@@ -47,17 +48,14 @@ $(JAVA_FILE): $(JDWP_SPEC_FILE) $(BUILD_TOOLS_JDK) $(HEADER_FILE)
 	    $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent/JDWPCommands.h
 	$(TOUCH) $@
 
-$(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html: $(JDWP_SPEC_FILE) \
+$(HTML_FILE): $(JDWP_SPEC_FILE) \
     $(BUILD_TOOLS_JDK)
 	$(call LogInfo, Creating $(@F) from jdwp.spec)
 	$(call MakeDir, $(@D))
 	$(RM) $@
 	$(TOOL_JDWPGEN) $< -doc $@
 
-GENSRC_JDWP := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/com/sun/tools/jdi/JDWP.java \
-    $(SUPPORT_OUTPUTDIR)/headers/jdk.jdwp.agent/JDWPCommands.h \
-    $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html
-GENSRC_JDK_JDI += $(GENSRC_JDWP)
+TARGETS += $(JAVA_FILE) $(HEADER_FILE) $(HTML_FILE)
 
 ################################################################################
 
@@ -68,12 +66,4 @@ $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
     CLASS := ListResourceBundle, \
 ))
 
-GENSRC_JDK_JDI += $(COMPILE_PROPERTIES)
-
-################################################################################
-
-jdk.jdi: $(GENSRC_JDK_JDI)
-
-all: jdk.jdi
-
-.PHONY: all jdk.jdi
+TARGETS += $(COMPILE_PROPERTIES)
diff --git a/make/modules/jdk.jlink/Gensrc.gmk b/make/modules/jdk.jlink/Gensrc.gmk
index d944c6b1187..0cca1b9ba29 100644
--- a/make/modules/jdk.jlink/Gensrc.gmk
+++ b/make/modules/jdk.jlink/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2020, 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
@@ -50,9 +50,3 @@ $(eval $(call SetupCompileProperties, JIMAGE_PROPERTIES, \
 
 
 TARGETS += $(JLINK_PROPERTIES) $(JMOD_PROPERTIES) $(JIMAGE_PROPERTIES)
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: all
diff --git a/make/modules/jdk.jshell/Gensrc.gmk b/make/modules/jdk.jshell/Gensrc.gmk
index a0ec734307c..a30fb018e76 100644
--- a/make/modules/jdk.jshell/Gensrc.gmk
+++ b/make/modules/jdk.jshell/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2020, 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
@@ -31,4 +31,4 @@ $(eval $(call SetupVersionProperties,JSHELL_VERSION, \
 $(eval $(call SetupCompileProperties,COMPILE_PROPERTIES, \
     $(JSHELL_VERSION) $(JAVAH_VERSION)))
 
-all: $(COMPILE_PROPERTIES)
+TARGETS += $(COMPILE_PROPERTIES)
diff --git a/make/modules/jdk.localedata/Gensrc.gmk b/make/modules/jdk.localedata/Gensrc.gmk
index 7812d9d2be1..ce746e89732 100644
--- a/make/modules/jdk.localedata/Gensrc.gmk
+++ b/make/modules/jdk.localedata/Gensrc.gmk
@@ -27,6 +27,10 @@ include GensrcCommonJdk.gmk
 
 include modules/java.base/gensrc/GensrcLocaleData.gmk
 
+# GensrcLocaleData.gmk does not set TARGETS, so we must choose which targets
+# to include.
+TARGETS += $(GENSRC_LOCALEDATA)
+
 ################################################################################
 
 CLDR_DATA_DIR := $(TOPDIR)/make/data/cldr/common
@@ -45,7 +49,7 @@ $(CLDR_GEN_DONE): $(wildcard $(CLDR_DATA_DIR)/dtd/*.dtd) \
 	    -o $(GENSRC_DIR))
 	$(TOUCH) $@
 
-GENSRC_JDK_LOCALEDATA += $(CLDR_GEN_DONE)
+TARGETS += $(CLDR_GEN_DONE)
 
 ################################################################################
 
@@ -58,12 +62,4 @@ $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
 ))
 
 # Skip generating zh_HK from zh_TW for this module.
-GENSRC_JDK_LOCALEDATA += $(filter-out %_zh_HK.java, $(COMPILE_PROPERTIES))
-
-################################################################################
-
-jdk.localedata: $(GENSRC_JDK_LOCALEDATA)
-
-all: jdk.localedata
-
-.PHONY: all jdk.localedata
+TARGETS += $(filter-out %_zh_HK.java, $(COMPILE_PROPERTIES))
diff --git a/make/modules/jdk.management.agent/Gensrc.gmk b/make/modules/jdk.management.agent/Gensrc.gmk
index 1d5d919d76b..12fdb4c7137 100644
--- a/make/modules/jdk.management.agent/Gensrc.gmk
+++ b/make/modules/jdk.management.agent/Gensrc.gmk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2020, 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
@@ -35,9 +35,3 @@ $(eval $(call SetupCompileProperties, COMPILE_PROPERTIES, \
 ))
 
 TARGETS += $(COMPILE_PROPERTIES)
-
-################################################################################
-
-all: $(TARGETS)
-
-.PHONY: all