--- a/graal/com.oracle.graal.graph/.checkstyle_checks.xml	Thu Jun 06 08:51:43 2013 +0200
+++ b/graal/com.oracle.graal.graph/.checkstyle_checks.xml	Thu Jun 06 10:09:49 2013 +0200
@@ -203,6 +203,12 @@
     <property name="checkFormat" value="RegexpSingleline"/>
     <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable System.(out|err).print checks"/>
   </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CheckStyle: stop header check"/>
+    <property name="onCommentFormat" value="CheckStyle: resume header check"/>
+    <property name="checkFormat" value=".*Header"/>
+    <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Disable header checks"/>
+  </module>
   <module name="RegexpSingleline">
     <property name="format" value="System\.(out|err)\.print"/>
     <property name="fileExtensions" value="java"/>

--- a/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Thu Jun 06 08:51:43 2013 +0200
+++ b/graal/com.oracle.graal.options/src/com/oracle/graal/options/OptionProcessor.java	Thu Jun 06 10:09:49 2013 +0200
@@ -131,29 +131,7 @@
         Filer filer = processingEnv.getFiler();
         try (PrintWriter out = createSourceFile(pkg, providerClassName, filer, originatingElements)) {
 
-            out.println("/*");
-            out.println(" * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.");
-            out.println(" * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.");
-            out.println(" *");
-            out.println(" * This code is free software; you can redistribute it and/or modify it");
-            out.println(" * under the terms of the GNU General Public License version 2 only, as");
-            out.println(" * published by the Free Software Foundation.");
-            out.println(" *");
-            out.println(" * This code is distributed in the hope that it will be useful, but WITHOUT");
-            out.println(" * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or");
-            out.println(" * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License");
-            out.println(" * version 2 for more details (a copy is included in the LICENSE file that");
-            out.println(" * accompanied this code).");
-            out.println(" *");
-            out.println(" * You should have received a copy of the GNU General Public License version");
-            out.println(" * 2 along with this work; if not, write to the Free Software Foundation,");
-            out.println(" * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.");
-            out.println(" *");
-            out.println(" * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA");
-            out.println(" * or visit www.oracle.com if you need additional information or have any");
-            out.println(" * questions.");
-            out.println(" */");
-
+            out.println("// CheckStyle: stop header check");
             out.println("package " + pkg + ";");
             out.println("");
             if (element.getModifiers().contains(Modifier.PRIVATE)) {