7 files changed, 13 insertions, 9 deletions

diff --git a/src/compiler/scala/tools/nsc/typechecker/Codification.scala b/src/compiler/scala/tools/nsc/typechecker/Codification.scala
index 1deda7bdfb..59ddca225a 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Codification.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Codification.scala
@@ -7,7 +7,8 @@ package scala.tools.nsc.typechecker;
 
 import symtab.Flags._;
 import scala.collection.immutable.ListMap;
-import scala.tools.nsc.util.{ListBuffer, FreshNameCreator};
+import scala.collection.mutable.ListBuffer;
+import scala.tools.nsc.util.FreshNameCreator;
 
 [_trait_] abstract class Codification: Analyzer {
 
diff --git a/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala
index f6d481d58b..36dd960342 100644
--- a/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/EtaExpansion.scala
@@ -5,7 +5,7 @@
 // $Id$
 package scala.tools.nsc.typechecker;
 
-import util.ListBuffer;
+import scala.collection.mutable.ListBuffer;
 import symtab.Flags._;
 
 [_trait_] abstract class EtaExpansion: Analyzer {
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
index fb03509627..e982ac1ba1 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
@@ -5,12 +5,13 @@
 // $Id$
 package scala.tools.nsc.typechecker;
 
+import scala.collection.mutable.ListBuffer;
+import symtab.Flags._;
+
 [_trait_] abstract class Infer: Analyzer {
-  import symtab.Flags._;
   import global._;
   import definitions._;
   import posAssigner.atPos;
-  import util.ListBuffer;
 
   var normM = 0;
   var normP = 0;
diff --git a/src/compiler/scala/tools/nsc/typechecker/Namers.scala b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
index bb0aeed305..0fd959e271 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Namers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Namers.scala
@@ -111,7 +111,10 @@ trait Namers: Analyzer {
       } else {
 	c = enterInScope(context.owner.newClass(pos, name)).setFlag(flags | inConstructorFlag);
       }
-      if (c.owner.isPackageClass) currentRun.symSource(c) = context.unit.source.getFile();
+      if (c.owner.isPackageClass) {
+        currentRun.symSource(c) = context.unit.source.getFile();
+        c.sourceFile = context.unit.source.getFile();
+      }
       c
     }
 
diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
index 50749deb5e..4eb38f349b 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala
@@ -5,7 +5,7 @@
 // $Id$
 package scala.tools.nsc.typechecker;
 
-import nsc.util.ListBuffer;
+import scala.collection.mutable.ListBuffer;
 import nsc.symtab.Flags._;
 
 /** A sample transform.
diff --git a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
index da6ac07d6c..005a81d031 100644
--- a/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/SyntheticMethods.scala
@@ -6,7 +6,7 @@
 package scala.tools.nsc.typechecker;
 
 import symtab.Flags._;
-import util.ListBuffer;
+import scala.collection.mutable.ListBuffer;
 
 /**
  *   - caseArity, caseElement implementations added to case classes
diff --git a/src/compiler/scala/tools/nsc/typechecker/Typers.scala b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
index f4098b615a..e6d2e0e8a3 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Typers.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Typers.scala
@@ -6,10 +6,9 @@
 //todo: rewrite or disallow new T where T is a trait (currently: <init> not a member of T)
 package scala.tools.nsc.typechecker;
 
-import nsc.util.ListBuffer;
 import symtab.Flags._;
 import scala.tools.nsc.util.Position;
-import collection.mutable.HashMap;
+import scala.collection.mutable.{HashMap, ListBuffer}
 
 /** Methods to create symbols and to enter them into scopes. */
 [_trait_] abstract class Typers: Analyzer {