--- old/common/makefiles/JavaCompilation.gmk	2013-04-30 16:38:36.759717296 +0200
+++ new/common/makefiles/JavaCompilation.gmk	2013-04-30 16:38:36.659700028 +0200
@@ -497,30 +497,30 @@
 
         $$($1_BIN)/javac_state: $$($1_SRCS) $$($1_DEPENDS)
 		$(MKDIR) -p $$(@D)
-		$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp)
+		$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
 		$(ECHO) Compiling $1
 		($$($1_JVM) $$($1_SJAVAC) \
 			$$($1_REMOTE) \
 			-j $(JOBS) \
 			--permit-unidentified-artifacts \
 			--permit-sources-without-package \
-			--compare-found-sources $$($1_BIN)/_the.batch.tmp \
+			--compare-found-sources $$($1_BIN)/_the.$1_batch.tmp \
 			--log=$(LOG_LEVEL) \
 			$$($1_SJAVAC_ARGS) \
 			$$($1_FLAGS) \
 			$$($1_HEADERS_ARG) \
 			-d $$($1_BIN) && \
-			$(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch)
+			$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
     else
         # Using plain javac to batch compile everything.
-        $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.batch
+        $1 := $$($1_ALL_COPY_TARGETS) $$($1_ALL_COPY_CLEAN_TARGETS) $$($1_BIN)/_the.$1_batch
 
         # When buliding in batch, put headers in a temp dir to filter out those that actually
         # changed before copying them to the real header dir.
         ifneq (,$$($1_HEADERS))
             $1_HEADERS_ARG := -h $$($1_HEADERS).tmp
 
-            $$($1_HEADERS)/_the.headers: $$($1_BIN)/_the.batch
+            $$($1_HEADERS)/_the.$1_headers: $$($1_BIN)/_the.$1_batch
 		$(MKDIR) -p $$(@D)
 		for f in `ls $$($1_HEADERS).tmp`; do \
 		  if [ ! -f "$$($1_HEADERS)/$$$$f" ] || [ "`$(DIFF) $$($1_HEADERS)/$$$$f $$($1_HEADERS).tmp/$$$$f`" != "" ]; then \
@@ -530,19 +530,19 @@
 		$(RM) -r $$($1_HEADERS).tmp
 		$(TOUCH) $$@
 
-            $1 += $$($1_HEADERS)/_the.headers
+            $1 += $$($1_HEADERS)/_the.$1_headers
         endif
 
         # When not using sjavac, pass along all sources to javac using an @file.
-        $$($1_BIN)/_the.batch: $$($1_SRCS) $$($1_DEPENDS)
+        $$($1_BIN)/_the.$1_batch: $$($1_SRCS) $$($1_DEPENDS)
 		$(MKDIR) -p $$(@D)
-		$(RM) $$($1_BIN)/_the.batch $$($1_BIN)/_the.batch.tmp
-		$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.batch.tmp)
-		$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
+		$(RM) $$($1_BIN)/_the.$1_batch $$($1_BIN)/_the.$1_batch.tmp
+		$$(call ListPathsSafely,$1_SRCS,\n, >> $$($1_BIN)/_the.$1_batch.tmp)
+		$(ECHO) Compiling `$(WC) $$($1_BIN)/_the.$1_batch.tmp | $(TR) -s ' ' | $(CUT) -f 2 -d ' '` files for $1
 		($$($1_JVM) $$($1_JAVAC) $$($1_FLAGS) \
 			-implicit:none -sourcepath "$$($1_SRCROOTSC)" \
-			-d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.batch.tmp && \
-			$(MV) $$($1_BIN)/_the.batch.tmp $$($1_BIN)/_the.batch)
+			-d $$($1_BIN) $$($1_HEADERS_ARG) @$$($1_BIN)/_the.$1_batch.tmp && \
+			$(MV) $$($1_BIN)/_the.$1_batch.tmp $$($1_BIN)/_the.$1_batch)
 
     endif