--- a/langtools/makefiles/Makefile	Fri Jun 08 12:45:43 2012 -0700
+++ b/langtools/makefiles/Makefile	Wed Jun 13 16:58:00 2012 -0700
@@ -23,12 +23,13 @@
 # questions.
 #
 
+# This must be the first rule
+default: all
+
 include $(SPEC)
 include MakeBase.gmk
 include JavaCompilation.gmk
 
-default: all
-
 # The BOOT_JAVAC setup uses the bootdir compiler to compile the tools
 # and the bootstrap javac, to be run by the bootdir jvm.
 $(eval $(call SetupJavaCompiler,BOOT_JAVAC,\
@@ -184,8 +185,7 @@
 			SETUP:=GENERATE_NEWBYTECODE,\
 			SRCS:=$(LANGTOOLS_OUTPUTDIR)/classes,\
 			SUFFIXES:=.class $(RESOURCE_SUFFIXES),\
-			JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar,\
-			HEADERS:=$(LANGTOOLS_OUTPUTDIR)/gensrc_headers))
+			JAR:=$(LANGTOOLS_OUTPUTDIR)/dist/lib/classes.jar))
 
                 $(eval $(call SetupZipArchive,ZIP_FULL_JAVAC_SOURCE,\
 			SRC:=$(LANGTOOLS_TOPDIR)/src/share/classes $(LANGTOOLS_OUTPUTDIR)/gensrc,\