--- old/make/CompileDemos.gmk	2014-08-20 13:27:38.011797659 +0200
+++ new/make/CompileDemos.gmk	2014-08-20 13:27:37.767787485 +0200
@@ -29,9 +29,7 @@
 include MakeBase.gmk
 include JavaCompilation.gmk
 include NativeCompilation.gmk
-
-# Setup the java compilers for the JDK build.
-include SetupJava.gmk
+include SetupJavaCompilers.gmk
 
 # Prepare the find cache.
 $(eval $(call FillCacheFind, $(JDK_TOPDIR)/src))