diff --git a/jdk/make/Tools.gmk b/jdk/make/Tools.gmk
index 4541519db0a..4cfa33fc9f8 100644
--- a/jdk/make/Tools.gmk
+++ b/jdk/make/Tools.gmk
@@ -34,9 +34,6 @@ include JavaCompilation.gmk
 include NativeCompilation.gmk
 include SetupJavaCompilers.gmk
 
-# Cache all finds needed for this file.
-$(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes))
-
 # The exception handling of swing beaninfo which have the own tool directory
 ifeq (, $(BUILD_TOOLS_JDK))
   $(eval $(call SetupJavaCompilation,BUILD_TOOLS_JDK, \
diff --git a/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk b/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk
index 12b80d7fcbe..f4a3575218e 100644
--- a/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk
+++ b/jdk/make/gensrc/GensrcLocaleDataMetaInfo.gmk
@@ -28,7 +28,8 @@
 # into LocaleDataMetaInfo.java
 
 # First go look for all locale files
-LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/*/share/classes \
+LOCALE_FILES := $(shell $(FIND) $(JDK_TOPDIR)/src/java.base/share/classes \
+    $(JDK_TOPDIR)/src/jdk.localedata/share/classes \
     -name "FormatData_*.java" -o -name "FormatData_*.properties" -o \
     -name "CollationData_*.java" -o -name "CollationData_*.properties" -o \
     -name "TimeZoneNames_*.java" -o -name "TimeZoneNames_*.properties" -o \
diff --git a/jdk/make/gensrc/GensrcProperties.gmk b/jdk/make/gensrc/GensrcProperties.gmk
index c387d52ffe2..a33015b150c 100644
--- a/jdk/make/gensrc/GensrcProperties.gmk
+++ b/jdk/make/gensrc/GensrcProperties.gmk
@@ -23,9 +23,6 @@
 # questions.
 #
 
-# Prepare the find cache.
-$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/*/*/classes)))
-
 # All .properties files to be compiled are appended to this variable.
 ALL_COMPILED_PROPSOURCES :=
 # All generated .java files from compilation are appended to this variable.
@@ -76,7 +73,6 @@ COMPILE_PROP_SRC_FILES := \
         $(JDK_TOPDIR)/src/java.management/share/classes/sun/management/resources \
         $(JDK_TOPDIR)/src/java.desktop/share/classes/sun/print/resources \
         $(JDK_TOPDIR)/src/jdk.dev/share/classes/sun/tools/jar/resources \
-        $(JDK_TOPDIR)/src/jdk.dev/share/classes/jdk/jigsaw/tools/jlink/resources \
         $(JDK_TOPDIR)/src/java.logging/share/classes/sun/util/logging/resources)) \
     #
 
diff --git a/jdk/make/lib/Lib-java.base.gmk b/jdk/make/lib/Lib-java.base.gmk
index cf7f663d6fa..301e31c2df8 100644
--- a/jdk/make/lib/Lib-java.base.gmk
+++ b/jdk/make/lib/Lib-java.base.gmk
@@ -25,6 +25,10 @@
 
 include LibCommon.gmk
 
+# Prepare the find cache.
+$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/java.base/*/native \
+    $(JDK_TOPDIR)/src/*/java.base/*/native)))
+
 include CoreLibraries.gmk
 include NetworkingLibraries.gmk
 include NioLibraries.gmk
diff --git a/jdk/make/lib/Lib-java.desktop.gmk b/jdk/make/lib/Lib-java.desktop.gmk
index bdd919cfeb7..e8661508e93 100644
--- a/jdk/make/lib/Lib-java.desktop.gmk
+++ b/jdk/make/lib/Lib-java.desktop.gmk
@@ -25,6 +25,10 @@
 
 include LibCommon.gmk
 
+# Prepare the find cache.
+$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/java.desktop/*/native \
+    $(JDK_TOPDIR)/src/*/java.desktop/*/native)))
+
 include PlatformLibraries.gmk
 include Awt2dLibraries.gmk
 include SoundLibraries.gmk
diff --git a/jdk/make/lib/LibCommon.gmk b/jdk/make/lib/LibCommon.gmk
index 7fadd1c781f..885ba11c780 100644
--- a/jdk/make/lib/LibCommon.gmk
+++ b/jdk/make/lib/LibCommon.gmk
@@ -29,9 +29,6 @@ include $(SPEC)
 include MakeBase.gmk
 include NativeCompilation.gmk
 
-# Prepare the find cache.
-$(eval $(call FillCacheFind, $(wildcard $(JDK_TOPDIR)/src/*/*/native)))
-
 # Build tools
 include Tools.gmk