diff --git a/internal/zinc-compile-core/src/main/java/xsbti/ReporterUtil.java b/internal/zinc-compile-core/src/main/java/xsbti/ReporterUtil.java
index 83d1cbbe01..e32e0d5ab5 100644
--- a/internal/zinc-compile-core/src/main/java/xsbti/ReporterUtil.java
+++ b/internal/zinc-compile-core/src/main/java/xsbti/ReporterUtil.java
@@ -1,3 +1,10 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * This software is released under the terms written in LICENSE.
+ */
+
 package xsbti;
 
 import sbt.internal.inc.ReporterManager;
diff --git a/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/FilteredReporter.scala b/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/FilteredReporter.scala
index aeb2f1dacc..6c73cfa6ae 100644
--- a/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/FilteredReporter.scala
+++ b/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/FilteredReporter.scala
@@ -1,3 +1,10 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * This software is released under the terms written in LICENSE.
+ */
+
 package sbt.internal.inc
 
 import java.nio.file.Path
diff --git a/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/ReporterManager.scala b/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/ReporterManager.scala
index b901369f1c..507fdc3552 100644
--- a/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/ReporterManager.scala
+++ b/internal/zinc-compile-core/src/main/scala/sbt/internal/inc/ReporterManager.scala
@@ -1,3 +1,10 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * This software is released under the terms written in LICENSE.
+ */
+
 package sbt.internal.inc
 
 import java.io.{ OutputStreamWriter, PrintStream, PrintWriter }
diff --git a/internal/zinc-core/src/main/java/xsbti/compile/AnalysisContents.java b/internal/zinc-core/src/main/java/xsbti/compile/AnalysisContents.java
index 376e552a2d..283117da91 100644
--- a/internal/zinc-core/src/main/java/xsbti/compile/AnalysisContents.java
+++ b/internal/zinc-core/src/main/java/xsbti/compile/AnalysisContents.java
@@ -1,3 +1,10 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * This software is released under the terms written in LICENSE.
+ */
+
 package xsbti.compile;
 
 import sbt.internal.inc.ConcreteAnalysisContents;
diff --git a/internal/zinc-core/src/main/java/xsbti/compile/AnalysisStore.java b/internal/zinc-core/src/main/java/xsbti/compile/AnalysisStore.java
index 09846f5b47..5a3e2c61fa 100644
--- a/internal/zinc-core/src/main/java/xsbti/compile/AnalysisStore.java
+++ b/internal/zinc-core/src/main/java/xsbti/compile/AnalysisStore.java
@@ -1,3 +1,10 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * This software is released under the terms written in LICENSE.
+ */
+
 package xsbti.compile;
 
 import java.util.Optional;
diff --git a/internal/zinc-core/src/main/scala/sbt/internal/inc/ConcreteAnalysisContents.scala b/internal/zinc-core/src/main/scala/sbt/internal/inc/ConcreteAnalysisContents.scala
index dfb6bbb93c..d11b0462c1 100644
--- a/internal/zinc-core/src/main/scala/sbt/internal/inc/ConcreteAnalysisContents.scala
+++ b/internal/zinc-core/src/main/scala/sbt/internal/inc/ConcreteAnalysisContents.scala
@@ -1,3 +1,10 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * This software is released under the terms written in LICENSE.
+ */
+
 package sbt.internal.inc
 
 import xsbti.compile.{ AnalysisContents, CompileAnalysis, MiniSetup }
diff --git a/internal/zinc-persist/src/main/java/xsbti/compile/FileAnalysisStore.java b/internal/zinc-persist/src/main/java/xsbti/compile/FileAnalysisStore.java
index 4164d1dd90..d54f473b4b 100644
--- a/internal/zinc-persist/src/main/java/xsbti/compile/FileAnalysisStore.java
+++ b/internal/zinc-persist/src/main/java/xsbti/compile/FileAnalysisStore.java
@@ -1,3 +1,10 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * This software is released under the terms written in LICENSE.
+ */
+
 package xsbti.compile;
 
 import xsbti.compile.analysis.ReadWriteMappers;
diff --git a/internal/zinc-persist/src/main/java/xsbti/compile/analysis/RootPaths.java b/internal/zinc-persist/src/main/java/xsbti/compile/analysis/RootPaths.java
index a692948c25..21e1a4b608 100644
--- a/internal/zinc-persist/src/main/java/xsbti/compile/analysis/RootPaths.java
+++ b/internal/zinc-persist/src/main/java/xsbti/compile/analysis/RootPaths.java
@@ -1,3 +1,10 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * This software is released under the terms written in LICENSE.
+ */
+
 package xsbti.compile.analysis;
 
 import java.io.File;
diff --git a/internal/zinc-persist/src/main/scala/sbt/internal/inc/ConcreteRootPaths.scala b/internal/zinc-persist/src/main/scala/sbt/internal/inc/ConcreteRootPaths.scala
index 3dae3f1cb5..ae9e486b31 100644
--- a/internal/zinc-persist/src/main/scala/sbt/internal/inc/ConcreteRootPaths.scala
+++ b/internal/zinc-persist/src/main/scala/sbt/internal/inc/ConcreteRootPaths.scala
@@ -1,3 +1,10 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright 2011 - 2017, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * This software is released under the terms written in LICENSE.
+ */
+
 package sbt.internal.inc
 
 import java.io.File
diff --git a/project/Header.scala b/project/Header.scala
index 35e0c7881d..b6daaa577a 100644
--- a/project/Header.scala
+++ b/project/Header.scala
@@ -1,27 +1,25 @@
-// import sbt._
-// import Keys._
+import sbt._
+import Keys._
 
-// import de.heikoseeberger.sbtheader.{ HeaderPlugin, HeaderPattern }
-// import HeaderPlugin.autoImport._
+import de.heikoseeberger.sbtheader.HeaderPlugin
+import de.heikoseeberger.sbtheader.HeaderPlugin.{autoImport => SbtHeaderKeys}
 
-// object CustomHeaderPlugin extends AutoPlugin {
-//   override def requires = plugins.JvmPlugin && HeaderPlugin
-//   override def trigger = allRequirements
+object CustomHeaderPlugin extends AutoPlugin {
+  override def requires = plugins.JvmPlugin && HeaderPlugin
+  override def trigger = allRequirements
+  import SbtHeaderKeys.{HeaderFileType, HeaderCommentStyle, HeaderLicense}
 
-//   override def projectSettings = Seq(
-//     headers := Map(
-//       "scala" -> (HeaderPattern.cStyleBlockComment, copyrightText),
-//       "java" -> (HeaderPattern.cStyleBlockComment, copyrightText)
-//     )
-//   )
-
-//   val copyrightText =
-//     """|/*
-//        | * Zinc - The incremental compiler for Scala.
-//        | * Copyright 2011 - 2017, Lightbend, Inc.
-//        | * Copyright 2008 - 2010, Mark Harrah
-//        | * This software is released under the terms written in LICENSE.
-//        | */
-//        |
-//        |""".stripMargin
-// }
+  override def projectSettings = Seq(
+    SbtHeaderKeys.headerMappings ++= Map(
+      HeaderFileType.scala -> HeaderCommentStyle.CStyleBlockComment,
+      HeaderFileType.java -> HeaderCommentStyle.CStyleBlockComment
+    ),
+    SbtHeaderKeys.headerLicense := Some(HeaderLicense.Custom(
+      """|Zinc - The incremental compiler for Scala.
+         |Copyright 2011 - 2017, Lightbend, Inc.
+         |Copyright 2008 - 2010, Mark Harrah
+         |This software is released under the terms written in LICENSE.
+         |""".stripMargin
+    ))
+  )
+}
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 190713ad70..c6926192a9 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,8 +1,8 @@
 addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.2.27")
 addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1")
-addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.10")
-// addSbtPlugin("de.heikoseeberger" % "sbt-header" % "1.7.0")
+addSbtPlugin("com.lucidchart" % "sbt-scalafmt" % "1.12")
+addSbtPlugin("de.heikoseeberger" % "sbt-header" % "3.0.2")
 addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.3")
 addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0")
 addSbtPlugin("com.thesamet" % "sbt-protoc" % "0.99.12-rc5")