diff a/make/Main.gmk b/make/Main.gmk
--- a/make/Main.gmk
+++ b/make/Main.gmk
@@ -70,13 +70,10 @@
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f ToolsLangtools.gmk)
 
 interim-langtools:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimLangtools.gmk)
 
-interim-rmic:
-	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileInterimRmic.gmk)
-
 interim-tzdb:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CopyInterimTZDB.gmk)
 
 
 buildtools-jdk:
@@ -87,11 +84,11 @@
 
 buildtools-hotspot:
 	+($(CD) $(TOPDIR)/make && $(MAKE) $(MAKE_ARGS) -f CompileToolsHotspot.gmk)
 
 ALL_TARGETS += buildtools-langtools interim-langtools \
-    interim-rmic interim-tzdb buildtools-jdk buildtools-modules \
+    interim-tzdb buildtools-jdk buildtools-modules \
     buildtools-hotspot
 
 ################################################################################
 # Special targets for certain modules
 
@@ -686,13 +683,11 @@
 
   $(GENSRC_MODULEINFO_TARGETS): buildtools-jdk
 
   $(GENDATA_TARGETS): interim-langtools buildtools-jdk
 
-  interim-rmic: interim-langtools
-
-  $(RMIC_TARGETS): interim-langtools interim-rmic
+  $(RMIC_TARGETS): interim-langtools
 
   $(JAVA_TARGETS): interim-langtools
 
   # Declare dependencies between hotspot-<variant>* targets
   $(foreach v, $(JVM_VARIANTS), \
@@ -854,11 +849,11 @@
   $(JMOD_TARGETS): java.base-copy
 
   zip-security: java.base-java java.security.jgss-java java.security.jgss-libs \
       $(filter jdk.crypto%, $(JAVA_TARGETS))
 
-  zip-source: gensrc rmic
+  zip-source: gensrc
 
   jrtfs-jar: interim-langtools
 
   build-microbenchmark: interim-langtools exploded-image
 
@@ -901,15 +896,15 @@
   exploded-image-optimize: java copy gendata java.base-libs java.base-launchers \
       buildtools-modules
 
   bootcycle-images: jdk-image
 
-  docs-jdk-api-javadoc: $(GENSRC_TARGETS) rmic
+  docs-jdk-api-javadoc: $(GENSRC_TARGETS)
 
-  docs-javase-api-javadoc: $(GENSRC_TARGETS) rmic
+  docs-javase-api-javadoc: $(GENSRC_TARGETS)
 
-  docs-reference-api-javadoc: $(GENSRC_TARGETS) rmic
+  docs-reference-api-javadoc: $(GENSRC_TARGETS)
 
   docs-jdk-api-modulegraph: exploded-image buildtools-modules
 
   docs-javase-api-modulegraph: exploded-image buildtools-modules
 
@@ -987,11 +982,11 @@
 ################################################################################
 # Virtual targets without recipes
 
 # If not already set, set the JVM specific tools targets
 JVM_TOOLS_TARGETS ?= buildtools-hotspot
-buildtools: buildtools-langtools interim-langtools interim-rmic \
+buildtools: buildtools-langtools interim-langtools \
     buildtools-jdk $(JVM_TOOLS_TARGETS)
 
 # Declare dependencies from hotspot-<variant> targets
 $(foreach v, $(JVM_VARIANTS), \
   $(eval hotspot-$v: hotspot-$v-gensrc hotspot-$v-libs) \