diff --git a/compile/interface/src/main/scala/xsbt/Compat.scala b/compile/interface/src/main/scala/xsbt/Compat.scala
index 8849430e8..aae105e44 100644
--- a/compile/interface/src/main/scala/xsbt/Compat.scala
+++ b/compile/interface/src/main/scala/xsbt/Compat.scala
@@ -39,10 +39,17 @@ abstract class Compat
 		def unapply(t: Type): Option[Type] = None
 	}
 
-	// before 2.10, sym.moduleSuffix doesn't exist, but genJVM.moduleSuffix does
-	private[this] implicit def symbolCompat(sym: Symbol): SymbolCompat = new SymbolCompat(sym)
-	private[this] final class SymbolCompat(sym: Symbol) {
+	protected implicit def symbolCompat(sym: Symbol): SymbolCompat = new SymbolCompat(sym)
+	protected final class SymbolCompat(sym: Symbol) {
+		// before 2.10, sym.moduleSuffix doesn't exist, but genJVM.moduleSuffix does
 		def moduleSuffix = global.genJVM.moduleSuffix(sym)
+		def enclosingTopLevelClass: Symbol = sym.toplevelClass
+		// this for compatibility with Scala 2.11 where Symbol.enclosingTopLevelClass method exist
+		// so we won't be ever calling SymbolCompat.enclosingTopLevelClass but we need to compile
+		// it hence we need dummy forwarder target, the `toplevelClass` method defined
+		// in Scala 2.9 and 2.10 the `Symbol.toplevelClass` exists so the dummy forwarder target
+		// won't be used
+		def toplevelClass: Symbol = throw new UnsupportedOperationException("We should never have gotten here")
 	}
 
 
diff --git a/compile/interface/src/main/scala/xsbt/Dependency.scala b/compile/interface/src/main/scala/xsbt/Dependency.scala
index 535a6b822..edb33197f 100644
--- a/compile/interface/src/main/scala/xsbt/Dependency.scala
+++ b/compile/interface/src/main/scala/xsbt/Dependency.scala
@@ -156,9 +156,7 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile
 		val traverser = new ExtractDependenciesByMemberRefTraverser
 		traverser.traverse(unit.body)
 		val dependencies = traverser.dependencies
-		// we capture enclosing classes only because that's what CompilationUnit.depends does and we don't want
-		// to deviate from old behaviour too much for now
-		dependencies.map(_.toplevelClass)
+		dependencies.map(enclosingTopLevelClass)
 	}
 
 	/** Copied straight from Scala 2.10 as it does not exist in Scala 2.9 compiler */
@@ -184,7 +182,15 @@ final class Dependency(val global: CallbackGlobal) extends LocateClassFile
 		val traverser = new ExtractDependenciesByInheritanceTraverser
 		traverser.traverse(unit.body)
 		val dependencies = traverser.dependencies
-		dependencies.map(_.toplevelClass)
+		dependencies.map(enclosingTopLevelClass)
 	}
 
+	/**
+	 * We capture enclosing classes only because that's what CompilationUnit.depends does and we don't want
+	 * to deviate from old behaviour too much for now.
+	 */
+	private def enclosingTopLevelClass(sym: Symbol): Symbol =
+		// for Scala 2.8 and 2.9 this method is provided through SymbolCompat
+		sym.enclosingTopLevelClass
+
 }