diff --git a/main-command/src/main/scala/sbt/StampedFile.scala b/main-command/src/main/scala/sbt/StampedFile.scala
new file mode 100644
index 000000000..743658bbc
--- /dev/null
+++ b/main-command/src/main/scala/sbt/StampedFile.scala
@@ -0,0 +1,73 @@
+/*
+ * sbt
+ * Copyright 2011 - 2018, Lightbend, Inc.
+ * Copyright 2008 - 2010, Mark Harrah
+ * Licensed under Apache License 2.0 (see LICENSE)
+ */
+
+package sbt
+
+import java.io.File
+import java.nio.file.Path
+
+import sbt.internal.inc.Stamper
+import sbt.io.TypedPath
+import xsbti.compile.analysis.Stamp
+
+/**
+ * A File that has a [[Stamp]] value associated with it. In general, the stamp method should be
+ * a cached value that can be read without doing any io. This can be used to improve performance
+ * anywhere where we need to check if files have changed before doing potentially expensive work.
+ */
+trait StampedFile extends File with TypedPath {
+  def stamp: Stamp
+}
+
+/**
+ * Provides converter functions from TypedPath to [[StampedFile]].
+ */
+object StampedFile {
+
+  /**
+   * Converts a TypedPath instance to a [[StampedFile]] by calculating the file hash.
+   */
+  val sourceConverter: TypedPath => StampedFile =
+    new StampedFileImpl(_: TypedPath, forceLastModified = false)
+
+  /**
+   * Converts a TypedPath instance to a [[StampedFile]] using the last modified time.
+   */
+  val binaryConverter: TypedPath => StampedFile =
+    new StampedFileImpl(_: TypedPath, forceLastModified = true)
+
+  /**
+   * A combined convert that converts TypedPath instances representing *.jar and *.class files
+   * using the last modified time and all other files using the file hash.
+   */
+  val converter: TypedPath => StampedFile = (tp: TypedPath) =>
+    tp.toPath.toString match {
+      case s if s.endsWith(".jar")   => binaryConverter(tp)
+      case s if s.endsWith(".class") => binaryConverter(tp)
+      case _                         => sourceConverter(tp)
+  }
+
+  /**
+   * Adds a default ordering that just delegates to the java.io.File.compareTo method.
+   */
+  implicit case object ordering extends Ordering[StampedFile] {
+    override def compare(left: StampedFile, right: StampedFile): Int = left.compareTo(right)
+  }
+
+  private class StampedFileImpl(typedPath: TypedPath, forceLastModified: Boolean)
+      extends java.io.File(typedPath.toPath.toString)
+      with StampedFile {
+    override val stamp: Stamp =
+      if (forceLastModified || typedPath.isDirectory) Stamper.forLastModified(this)
+      else Stamper.forHash(this)
+    override def exists: Boolean = typedPath.exists
+    override def isDirectory: Boolean = typedPath.isDirectory
+    override def isFile: Boolean = typedPath.isFile
+    override def isSymbolicLink: Boolean = typedPath.isSymbolicLink
+    override def toPath: Path = typedPath.toPath
+  }
+}
diff --git a/main-command/src/main/scala/sbt/Watched.scala b/main-command/src/main/scala/sbt/Watched.scala
index 95f415a7c..16fb1aae1 100644
--- a/main-command/src/main/scala/sbt/Watched.scala
+++ b/main-command/src/main/scala/sbt/Watched.scala
@@ -19,7 +19,6 @@ import sbt.BasicCommandStrings.{
 import sbt.BasicCommands.otherCommandParser
 import sbt.internal.LabeledFunctions._
 import sbt.internal.LegacyWatched
-import sbt.internal.inc.Stamper
 import sbt.internal.io.{ EventMonitor, Source, WatchState }
 import sbt.internal.util.Types.const
 import sbt.internal.util.complete.{ DefaultParsers, Parser }
@@ -27,7 +26,6 @@ import sbt.internal.util.{ AttributeKey, JLine }
 import sbt.io.FileEventMonitor.{ Creation, Deletion, Event, Update }
 import sbt.io._
 import sbt.util.{ Level, Logger }
-import xsbti.compile.analysis.Stamp
 
 import scala.annotation.tailrec
 import scala.concurrent.duration._
@@ -570,57 +568,3 @@ object WatchConfig {
     }
   }
 }
-
-/**
- * A File that has a [[Stamp]] value associated with it. In general, the stamp method should be
- * a cached value that can be read without doing any io. This can be used to improve performance
- * anywhere where we need to check if files have changed before doing potentially expensive work.
- */
-trait StampedFile extends File {
-  def stamp: Stamp
-}
-
-/**
- * Provides converter functions from TypedPath to [[StampedFile]].
- */
-object StampedFile {
-
-  /**
-   * Converts a TypedPath instance to a [[StampedFile]] by calculating the file hash.
-   */
-  val sourceConverter: TypedPath => StampedFile =
-    new StampedFileImpl(_: TypedPath, forceLastModified = false)
-
-  /**
-   * Converts a TypedPath instance to a [[StampedFile]] using the last modified time.
-   */
-  val binaryConverter: TypedPath => StampedFile =
-    new StampedFileImpl(_: TypedPath, forceLastModified = true)
-
-  /**
-   * A combined convert that converts TypedPath instances representing *.jar and *.class files
-   * using the last modified time and all other files using the file hash.
-   */
-  val converter: TypedPath => StampedFile = (tp: TypedPath) =>
-    tp.toPath.toString match {
-      case s if s.endsWith(".jar")   => binaryConverter(tp)
-      case s if s.endsWith(".class") => binaryConverter(tp)
-      case _                         => sourceConverter(tp)
-  }
-
-  /**
-   * Adds a default ordering that just delegates to the java.io.File.compareTo method.
-   */
-  implicit case object ordering extends Ordering[StampedFile] {
-    override def compare(left: StampedFile, right: StampedFile): Int = left.compareTo(right)
-  }
-
-  private class StampedFileImpl(typedPath: TypedPath, forceLastModified: Boolean)
-      extends java.io.File(typedPath.toPath.toString)
-      with StampedFile {
-    override val stamp: Stamp =
-      if (forceLastModified || typedPath.isDirectory)
-        Stamper.forLastModified(typedPath.toPath.toFile)
-      else Stamper.forHash(typedPath.toPath.toFile)
-  }
-}