--- old/make/Tools.gmk	2014-08-20 13:27:40.459899731 +0200
+++ new/make/Tools.gmk	2014-08-20 13:27:40.231890224 +0200
@@ -32,7 +32,7 @@
 include MakeBase.gmk
 include JavaCompilation.gmk
 include NativeCompilation.gmk
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
 
 # Cache all finds needed for this file.
 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/make/src/classes))