Renamed scala.reflect.common to scala.reflect.i...

Renamed scala.reflect.common to scala.reflect.internal to better
emphasize that it is not API. (The brush was overly broad, and some
files now need to be rescued from being internal.) No review.

62 files changed, 73 insertions, 73 deletions

diff --git a/src/compiler/scala/reflect/common/AnnotationCheckers.scala b/src/compiler/scala/reflect/internal/AnnotationCheckers.scala
index cd3b343238..666c1d74cb 100644
--- a/src/compiler/scala/reflect/common/AnnotationCheckers.scala
+++ b/src/compiler/scala/reflect/internal/AnnotationCheckers.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 /** Additions to the type checker that can be added at
  *  run time.  Typically these are added by
diff --git a/src/compiler/scala/reflect/common/AnnotationInfos.scala b/src/compiler/scala/reflect/internal/AnnotationInfos.scala
index 642e2f0b22..7ca7d5c902 100644
--- a/src/compiler/scala/reflect/common/AnnotationInfos.scala
+++ b/src/compiler/scala/reflect/internal/AnnotationInfos.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import util._
 
diff --git a/src/compiler/scala/reflect/common/BaseTypeSeqs.scala b/src/compiler/scala/reflect/internal/BaseTypeSeqs.scala
index 7a77ca8e62..a27aea035a 100644
--- a/src/compiler/scala/reflect/common/BaseTypeSeqs.scala
+++ b/src/compiler/scala/reflect/internal/BaseTypeSeqs.scala
@@ -3,7 +3,7 @@
  * @author  Martin Odersky
  */
 package scala.reflect
-package common
+package internal
 
 // todo implement in terms of BitSet
 import scala.collection.mutable.{ListBuffer, BitSet}
diff --git a/src/compiler/scala/reflect/common/Caches.scala b/src/compiler/scala/reflect/internal/Caches.scala
index 2666761f92..46e290c796 100644
--- a/src/compiler/scala/reflect/common/Caches.scala
+++ b/src/compiler/scala/reflect/internal/Caches.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import scala.collection.{ mutable, immutable }
 
diff --git a/src/compiler/scala/reflect/common/ClassfileConstants.scala b/src/compiler/scala/reflect/internal/ClassfileConstants.scala
index a48b16be96..0e1671bc1c 100644
--- a/src/compiler/scala/reflect/common/ClassfileConstants.scala
+++ b/src/compiler/scala/reflect/internal/ClassfileConstants.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 object ClassfileConstants {
 
diff --git a/src/compiler/scala/reflect/common/Constants.scala b/src/compiler/scala/reflect/internal/Constants.scala
index 6e96dae3e6..c4e2aceb7d 100644
--- a/src/compiler/scala/reflect/common/Constants.scala
+++ b/src/compiler/scala/reflect/internal/Constants.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import java.lang.Integer.toOctalString
 import annotation.switch
diff --git a/src/compiler/scala/reflect/common/Definitions.scala b/src/compiler/scala/reflect/internal/Definitions.scala
index f2c4fc844e..8af509e8ec 100644
--- a/src/compiler/scala/reflect/common/Definitions.scala
+++ b/src/compiler/scala/reflect/internal/Definitions.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import scala.collection.{ mutable, immutable }
 import scala.collection.mutable.{ HashMap }
diff --git a/src/compiler/scala/reflect/common/FatalError.scala b/src/compiler/scala/reflect/internal/FatalError.scala
index 0d4cd6e338..edbae19278 100644
--- a/src/compiler/scala/reflect/common/FatalError.scala
+++ b/src/compiler/scala/reflect/internal/FatalError.scala
@@ -2,5 +2,5 @@
  * Copyright 2005-2011 LAMP/EPFL
  * @author  Martin Odersky
  */
-package scala.reflect.common
+package scala.reflect.internal
 case class FatalError(msg: String) extends Throwable(msg)
diff --git a/src/compiler/scala/reflect/common/Flags.scala b/src/compiler/scala/reflect/internal/Flags.scala
index 8cdecd0da1..dc716fa7f5 100644
--- a/src/compiler/scala/reflect/common/Flags.scala
+++ b/src/compiler/scala/reflect/internal/Flags.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 // Flags at each index of a flags Long.  Those marked with /M are used in
 // Parsers/JavaParsers and therefore definitely appear on Modifiers; but the
diff --git a/src/compiler/scala/reflect/common/HasFlags.scala b/src/compiler/scala/reflect/internal/HasFlags.scala
index cbdd20b122..4c03c43c2c 100644
--- a/src/compiler/scala/reflect/common/HasFlags.scala
+++ b/src/compiler/scala/reflect/internal/HasFlags.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package common
+package internal
 
 /** ISSUE #1: Flag names vs. Test method names
  *
diff --git a/src/compiler/scala/reflect/common/InfoTransformers.scala b/src/compiler/scala/reflect/internal/InfoTransformers.scala
index 12fd57caee..9c54b1b4cd 100644
--- a/src/compiler/scala/reflect/common/InfoTransformers.scala
+++ b/src/compiler/scala/reflect/internal/InfoTransformers.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 trait InfoTransformers {
   self: SymbolTable =>
diff --git a/src/compiler/scala/reflect/common/MissingRequirementError.scala b/src/compiler/scala/reflect/internal/MissingRequirementError.scala
index a580cfc2dc..37e46bcac0 100644
--- a/src/compiler/scala/reflect/common/MissingRequirementError.scala
+++ b/src/compiler/scala/reflect/internal/MissingRequirementError.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 class MissingRequirementError(val req: String) extends FatalError(req + " not found.")
 
diff --git a/src/compiler/scala/reflect/common/NameManglers.scala b/src/compiler/scala/reflect/internal/NameManglers.scala
index 2f603d36ed..dea811dad1 100644
--- a/src/compiler/scala/reflect/common/NameManglers.scala
+++ b/src/compiler/scala/reflect/internal/NameManglers.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import java.security.MessageDigest
 import scala.io.Codec
diff --git a/src/compiler/scala/reflect/common/Names.scala b/src/compiler/scala/reflect/internal/Names.scala
index 4122d7ba2d..4c1f449430 100644
--- a/src/compiler/scala/reflect/common/Names.scala
+++ b/src/compiler/scala/reflect/internal/Names.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import scala.reflect.NameTransformer
 import scala.io.Codec
diff --git a/src/compiler/scala/reflect/common/Phase.scala b/src/compiler/scala/reflect/internal/Phase.scala
index e351b3f676..f65af1eaae 100644
--- a/src/compiler/scala/reflect/common/Phase.scala
+++ b/src/compiler/scala/reflect/internal/Phase.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 abstract class Phase(val prev: Phase) {
 
diff --git a/src/compiler/scala/reflect/common/Positions.scala b/src/compiler/scala/reflect/internal/Positions.scala
index e8048a65c9..75cbb80ab0 100644
--- a/src/compiler/scala/reflect/common/Positions.scala
+++ b/src/compiler/scala/reflect/internal/Positions.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package common
+package internal
 
 trait Positions { self: SymbolTable =>
 
diff --git a/src/compiler/scala/reflect/common/Required.scala b/src/compiler/scala/reflect/internal/Required.scala
index a7d33fa8db..6f038d4ea0 100644
--- a/src/compiler/scala/reflect/common/Required.scala
+++ b/src/compiler/scala/reflect/internal/Required.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package common
+package internal
 
 import settings.MutableSettings
 
diff --git a/src/compiler/scala/reflect/common/Scopes.scala b/src/compiler/scala/reflect/internal/Scopes.scala
index 4fbfa1760e..9f8eb025e5 100644
--- a/src/compiler/scala/reflect/common/Scopes.scala
+++ b/src/compiler/scala/reflect/internal/Scopes.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 trait Scopes { self: SymbolTable =>
 
diff --git a/src/compiler/scala/reflect/common/StdNames.scala b/src/compiler/scala/reflect/internal/StdNames.scala
index 5c1efa35ba..f8f3c681be 100644
--- a/src/compiler/scala/reflect/common/StdNames.scala
+++ b/src/compiler/scala/reflect/internal/StdNames.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import scala.collection.immutable
 
diff --git a/src/compiler/scala/reflect/common/SymbolTable.scala b/src/compiler/scala/reflect/internal/SymbolTable.scala
index 4bbe0b5201..18fdcfbc51 100644
--- a/src/compiler/scala/reflect/common/SymbolTable.scala
+++ b/src/compiler/scala/reflect/internal/SymbolTable.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import util._
 
diff --git a/src/compiler/scala/reflect/common/Symbols.scala b/src/compiler/scala/reflect/internal/Symbols.scala
index 573871fa8b..751586e810 100644
--- a/src/compiler/scala/reflect/common/Symbols.scala
+++ b/src/compiler/scala/reflect/internal/Symbols.scala
@@ -5,7 +5,7 @@
 
 
 package scala.reflect
-package common
+package internal
 
 import scala.collection.{ mutable, immutable }
 import scala.collection.mutable.ListBuffer
diff --git a/src/compiler/scala/reflect/common/TreeGen.scala b/src/compiler/scala/reflect/internal/TreeGen.scala
index 5d43e0f26e..d2e09aeaca 100644
--- a/src/compiler/scala/reflect/common/TreeGen.scala
+++ b/src/compiler/scala/reflect/internal/TreeGen.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package common
+package internal
 
 abstract class TreeGen {
   val global: SymbolTable
diff --git a/src/compiler/scala/reflect/common/TreeInfo.scala b/src/compiler/scala/reflect/internal/TreeInfo.scala
index 95189d1813..d61ac792cc 100644
--- a/src/compiler/scala/reflect/common/TreeInfo.scala
+++ b/src/compiler/scala/reflect/internal/TreeInfo.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import Flags._
 import util.HashSet
diff --git a/src/compiler/scala/reflect/common/TreePrinters.scala b/src/compiler/scala/reflect/internal/TreePrinters.scala
index 711232d774..87096120f2 100644
--- a/src/compiler/scala/reflect/common/TreePrinters.scala
+++ b/src/compiler/scala/reflect/internal/TreePrinters.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import java.io.{ OutputStream, PrintWriter, StringWriter, Writer }
 import Flags._
diff --git a/src/compiler/scala/reflect/common/Trees.scala b/src/compiler/scala/reflect/internal/Trees.scala
index f7008d7a65..6d3cc8b8cb 100644
--- a/src/compiler/scala/reflect/common/Trees.scala
+++ b/src/compiler/scala/reflect/internal/Trees.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import scala.collection.mutable.ListBuffer
 import Flags._
diff --git a/src/compiler/scala/reflect/common/TypeDebugging.scala b/src/compiler/scala/reflect/internal/TypeDebugging.scala
index 6028473b39..88fab9054b 100644
--- a/src/compiler/scala/reflect/common/TypeDebugging.scala
+++ b/src/compiler/scala/reflect/internal/TypeDebugging.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 trait TypeDebugging {
   self: SymbolTable =>
diff --git a/src/compiler/scala/reflect/common/Types.scala b/src/compiler/scala/reflect/internal/Types.scala
index 78407cd868..d391ef0a26 100644
--- a/src/compiler/scala/reflect/common/Types.scala
+++ b/src/compiler/scala/reflect/internal/Types.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 
 import scala.collection.{ mutable, immutable }
 import scala.ref.WeakReference
diff --git a/src/compiler/scala/reflect/common/pickling/ByteCodecs.scala b/src/compiler/scala/reflect/internal/pickling/ByteCodecs.scala
index 57d5eb63e8..0a02d09a71 100644
--- a/src/compiler/scala/reflect/common/pickling/ByteCodecs.scala
+++ b/src/compiler/scala/reflect/internal/pickling/ByteCodecs.scala
@@ -5,7 +5,7 @@
 ** /____/\___/_/ |_/____/_/ | |                                         **
 **                          |/                                          **
 \*                                                                      */
-package scala.reflect.common.pickling
+package scala.reflect.internal.pickling
 
 object ByteCodecs {
 
diff --git a/src/compiler/scala/reflect/common/pickling/PickleBuffer.scala b/src/compiler/scala/reflect/internal/pickling/PickleBuffer.scala
index 4ce83bea10..7f0895ce64 100644
--- a/src/compiler/scala/reflect/common/pickling/PickleBuffer.scala
+++ b/src/compiler/scala/reflect/internal/pickling/PickleBuffer.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 package pickling
 
 /** Variable length byte arrays, with methods for basic pickling and unpickling.
diff --git a/src/compiler/scala/reflect/common/pickling/PickleFormat.scala b/src/compiler/scala/reflect/internal/pickling/PickleFormat.scala
index 3f7d9fbb52..f188361f37 100644
--- a/src/compiler/scala/reflect/common/pickling/PickleFormat.scala
+++ b/src/compiler/scala/reflect/internal/pickling/PickleFormat.scala
@@ -1,5 +1,5 @@
 package scala.reflect
-package common
+package internal
 package pickling
 
 /** This object provides constants for pickling attributes.
diff --git a/src/compiler/scala/reflect/common/pickling/UnPickler.scala b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
index 6b0f933f9b..67a5639b76 100644
--- a/src/compiler/scala/reflect/common/pickling/UnPickler.scala
+++ b/src/compiler/scala/reflect/internal/pickling/UnPickler.scala
@@ -4,7 +4,7 @@
  */
 
 package scala.reflect
-package common
+package internal
 package pickling
 
 import java.io.IOException
diff --git a/src/compiler/scala/reflect/common/settings/AbsSettings.scala b/src/compiler/scala/reflect/internal/settings/AbsSettings.scala
index 2c73b2103e..9bbba3f079 100644
--- a/src/compiler/scala/reflect/common/settings/AbsSettings.scala
+++ b/src/compiler/scala/reflect/internal/settings/AbsSettings.scala
@@ -3,7 +3,7 @@
  * @author  Paul Phillips
  */
 
-package scala.reflect.common
+package scala.reflect.internal
 package settings
 
 /** A Settings abstraction boiled out of the original highly mutable Settings
diff --git a/src/compiler/scala/reflect/common/settings/MutableSettings.scala b/src/compiler/scala/reflect/internal/settings/MutableSettings.scala
index dfde14bb37..6ea9e94725 100644
--- a/src/compiler/scala/reflect/common/settings/MutableSettings.scala
+++ b/src/compiler/scala/reflect/internal/settings/MutableSettings.scala
@@ -4,7 +4,7 @@
  */
 // $Id$
 
-package scala.reflect.common
+package scala.reflect.internal
 package settings
 
 /** A mutable Settings object.
diff --git a/src/compiler/scala/reflect/common/util/HashSet.scala b/src/compiler/scala/reflect/internal/util/HashSet.scala
index 53e7835418..7dc725773e 100644
--- a/src/compiler/scala/reflect/common/util/HashSet.scala
+++ b/src/compiler/scala/reflect/internal/util/HashSet.scala
@@ -3,7 +3,7 @@
  * @author  Martin Odersky
  */
 
-package scala.reflect.common.util
+package scala.reflect.internal.util
 
 object HashSet {
   def apply[T >: Null <: AnyRef](): HashSet[T] = this(16)
diff --git a/src/compiler/scala/reflect/common/util/Set.scala b/src/compiler/scala/reflect/internal/util/Set.scala
index f4618e4432..59091a27f1 100644
--- a/src/compiler/scala/reflect/common/util/Set.scala
+++ b/src/compiler/scala/reflect/internal/util/Set.scala
@@ -2,7 +2,7 @@
  * Copyright 2005-2011 LAMP/EPFL
  * @author  Martin Odersky
  */
-package scala.reflect.common.util
+package scala.reflect.internal.util
 
 /** A common class for lightweight sets.
  */
diff --git a/src/compiler/scala/reflect/common/util/StatBase.scala b/src/compiler/scala/reflect/internal/util/StatBase.scala
index 12083938b7..b033ff98bc 100644
--- a/src/compiler/scala/reflect/common/util/StatBase.scala
+++ b/src/compiler/scala/reflect/internal/util/StatBase.scala
@@ -1,4 +1,4 @@
-package scala.reflect.common.util
+package scala.reflect.internal.util
 
 class StatBase {
 
diff --git a/src/compiler/scala/reflect/common/util/Statistics.scala b/src/compiler/scala/reflect/internal/util/Statistics.scala
index 85a02c9f37..ef17327fda 100644
--- a/src/compiler/scala/reflect/common/util/Statistics.scala
+++ b/src/compiler/scala/reflect/internal/util/Statistics.scala
@@ -2,7 +2,7 @@
  * Copyright 2005-2011 LAMP/EPFL
  * @author  Martin Odersky
  */
-package scala.reflect.common.util
+package scala.reflect.internal.util
 
 class Statistics extends StatBase {
   val singletonBaseTypeSeqCount = new Counter
diff --git a/src/compiler/scala/reflect/std/JavaMappings.scala b/src/compiler/scala/reflect/std/JavaMappings.scala
index 606972420d..6f1cc6b4f4 100644
--- a/src/compiler/scala/reflect/std/JavaMappings.scala
+++ b/src/compiler/scala/reflect/std/JavaMappings.scala
@@ -1,7 +1,7 @@
 package scala.reflect
 package std
 
-import common._
+import internal._
 import collection.mutable.ListBuffer
 
 trait JavaMappings { self: Mirror =>
diff --git a/src/compiler/scala/reflect/std/Mirror.scala b/src/compiler/scala/reflect/std/Mirror.scala
index 69ddfa1e71..2814bda8ea 100644
--- a/src/compiler/scala/reflect/std/Mirror.scala
+++ b/src/compiler/scala/reflect/std/Mirror.scala
@@ -1,14 +1,14 @@
 package scala.reflect
 package std
 
-import common._
+import internal._
 
 abstract class Mirror extends SymbolTable
                          with JavaMappings
                          with SymbolCompleters
                          with Positions { self =>
 
-  val unpickler = new common.pickling.UnPickler { val global: self.type = self }
+  val unpickler = new internal.pickling.UnPickler { val global: self.type = self }
   override val settings = new ReflectSettings
 
 }
diff --git a/src/compiler/scala/reflect/std/ReflectSettings.scala b/src/compiler/scala/reflect/std/ReflectSettings.scala
index a520e1fb89..09e5d2dedb 100644
--- a/src/compiler/scala/reflect/std/ReflectSettings.scala
+++ b/src/compiler/scala/reflect/std/ReflectSettings.scala
@@ -1,7 +1,7 @@
 package scala.reflect
 package std
 
-class ReflectSettings extends common.settings.MutableSettings {
+class ReflectSettings extends internal.settings.MutableSettings {
 
   def newSetting[TT](init: TT) = new SettingValue {
     type T = TT
diff --git a/src/compiler/scala/reflect/std/SymbolCompleters.scala b/src/compiler/scala/reflect/std/SymbolCompleters.scala
index 678caf500a..fce38be08d 100644
--- a/src/compiler/scala/reflect/std/SymbolCompleters.scala
+++ b/src/compiler/scala/reflect/std/SymbolCompleters.scala
@@ -2,7 +2,7 @@ package scala.reflect
 package std
 
 import java.io.File
-import common._
+import internal._
 
 trait SymbolCompleters { self: Mirror =>
 
diff --git a/src/compiler/scala/tools/nsc/Global.scala b/src/compiler/scala/tools/nsc/Global.scala
index 98937b8d83..c98562f1f0 100644
--- a/src/compiler/scala/tools/nsc/Global.scala
+++ b/src/compiler/scala/tools/nsc/Global.scala
@@ -14,7 +14,7 @@ import scala.collection.{ mutable, immutable }
 import io.{ SourceReader, AbstractFile, Path }
 import reporters.{ Reporter, ConsoleReporter }
 import util.{ Exceptional, ClassPath, SourceFile, Statistics, StatisticsInfo, BatchSourceFile, ScriptSourceFile, ShowPickled, returning }
-import scala.reflect.common.pickling.{ PickleBuffer, PickleFormat }
+import scala.reflect.internal.pickling.{ PickleBuffer, PickleFormat }
 import settings.{ AestheticSettings }
 
 import symtab.{ Flags, SymbolTable, SymbolLoaders, SymbolTrackers }
diff --git a/src/compiler/scala/tools/nsc/ast/TreeGen.scala b/src/compiler/scala/tools/nsc/ast/TreeGen.scala
index 29dc2c62d5..92b55e7702 100644
--- a/src/compiler/scala/tools/nsc/ast/TreeGen.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreeGen.scala
@@ -13,7 +13,7 @@ import symtab.SymbolTable
 /** XXX to resolve: TreeGen only assumes global is a SymbolTable, but
  *  TreeDSL at the moment expects a Global.  Can we get by with SymbolTable?
  */
-abstract class TreeGen extends reflect.common.TreeGen {
+abstract class TreeGen extends reflect.internal.TreeGen {
   val global: Global
 
   import global._
diff --git a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
index 8c22f750b6..1a0ddd4e1e 100644
--- a/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
+++ b/src/compiler/scala/tools/nsc/ast/TreePrinters.scala
@@ -10,7 +10,7 @@ import java.io.{ OutputStream, PrintWriter, StringWriter, Writer }
 import symtab.Flags._
 import symtab.SymbolTable
 
-trait TreePrinters extends reflect.common.TreePrinters { this: Global =>
+trait TreePrinters extends reflect.internal.TreePrinters { this: Global =>
 
   import treeInfo.{ IsTrue, IsFalse }
 
diff --git a/src/compiler/scala/tools/nsc/ast/Trees.scala b/src/compiler/scala/tools/nsc/ast/Trees.scala
index bb61534f16..008eb8372a 100644
--- a/src/compiler/scala/tools/nsc/ast/Trees.scala
+++ b/src/compiler/scala/tools/nsc/ast/Trees.scala
@@ -6,7 +6,7 @@
 package scala.tools.nsc
 package ast
 
-trait Trees extends reflect.common.Trees { self: Global =>
+trait Trees extends reflect.internal.Trees { self: Global =>
 
   lazy val treePrinter = newTreePrinter()
 
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index e1d45ac8ca..bb4c1d33f0 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -11,7 +11,7 @@ package ast.parser
 
 import scala.collection.mutable.ListBuffer
 import util.{ SourceFile, OffsetPosition, FreshNameCreator }
-import scala.reflect.common.{ ModifierFlags => Flags }
+import scala.reflect.internal.{ ModifierFlags => Flags }
 import Tokens._
 import scala.reflect.Chars.{ isScalaLetter }
 
diff --git a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
index 4c584cd4b5..6cbd37720b 100644
--- a/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
+++ b/src/compiler/scala/tools/nsc/backend/jvm/GenJVM.scala
@@ -10,7 +10,7 @@ package backend.jvm
 import java.io.{ DataOutputStream, OutputStream }
 import java.nio.ByteBuffer
 import scala.collection.{ mutable, immutable }
-import scala.reflect.common.pickling.{ PickleFormat, PickleBuffer }
+import scala.reflect.internal.pickling.{ PickleFormat, PickleBuffer }
 import scala.tools.reflect.SigParser
 import scala.tools.nsc.util.ScalaClassLoader
 import scala.tools.nsc.symtab._
diff --git a/src/compiler/scala/tools/nsc/interpreter/IMain.scala b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
index fdf8f6bfab..61c2eed278 100644
--- a/src/compiler/scala/tools/nsc/interpreter/IMain.scala
+++ b/src/compiler/scala/tools/nsc/interpreter/IMain.scala
@@ -14,7 +14,7 @@ import util._
 import io.VirtualDirectory
 import reporters.{ ConsoleReporter, Reporter }
 import symtab.Flags
-import scala.reflect.common.Names
+import scala.reflect.internal.Names
 import scala.tools.nsc.interpreter.{ Results => IR }
 import scala.tools.util.PathResolver
 import scala.tools.nsc.util.{ ScalaClassLoader, Exceptional }
diff --git a/src/compiler/scala/tools/nsc/package.scala b/src/compiler/scala/tools/nsc/package.scala
index 11d9f6723f..a908062b2f 100644
--- a/src/compiler/scala/tools/nsc/package.scala
+++ b/src/compiler/scala/tools/nsc/package.scala
@@ -11,12 +11,12 @@ package object nsc {
   @deprecated("Use a class in the scala.tools.nsc.interpreter package.", "2.9.0")
   val InterpreterResults   = interpreter.Results
 
-  type Phase = scala.reflect.common.Phase
-  val NoPhase = scala.reflect.common.NoPhase
+  type Phase = scala.reflect.internal.Phase
+  val NoPhase = scala.reflect.internal.NoPhase
 
-  type FatalError = scala.reflect.common.FatalError
-  val FatalError = scala.reflect.common.FatalError
+  type FatalError = scala.reflect.internal.FatalError
+  val FatalError = scala.reflect.internal.FatalError
 
-  type MissingRequirementError = scala.reflect.common.MissingRequirementError
-  val MissingRequirementError = scala.reflect.common.MissingRequirementError
+  type MissingRequirementError = scala.reflect.internal.MissingRequirementError
+  val MissingRequirementError = scala.reflect.internal.MissingRequirementError
 }
diff --git a/src/compiler/scala/tools/nsc/settings/AbsSettings.scala b/src/compiler/scala/tools/nsc/settings/AbsSettings.scala
index b87e556d7c..5efe41770e 100644
--- a/src/compiler/scala/tools/nsc/settings/AbsSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/AbsSettings.scala
@@ -13,7 +13,7 @@ import io.AbstractFile
  *  interchangeably.   Except of course without the mutants.
  */
 
-trait AbsSettings extends scala.reflect.common.settings.AbsSettings {
+trait AbsSettings extends scala.reflect.internal.settings.AbsSettings {
   type Setting <: AbsSetting      // Fix to the concrete Setting type
   type ResultOfTryToSet           // List[String] in mutable, (Settings, List[String]) in immutable
   def errorFn: String => Unit
diff --git a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
index e38ccd2b80..ac97c1a00f 100644
--- a/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
+++ b/src/compiler/scala/tools/nsc/settings/MutableSettings.scala
@@ -15,7 +15,7 @@ import scala.io.Source
 
 /** A mutable Settings object.
  */
-class MutableSettings(val errorFn: String => Unit) extends scala.reflect.common.settings.MutableSettings
+class MutableSettings(val errorFn: String => Unit) extends scala.reflect.internal.settings.MutableSettings
                                                       with AbsSettings with ScalaSettings with Mutable {
   type ResultOfTryToSet = List[String]
 
diff --git a/src/compiler/scala/tools/nsc/symtab/Positions.scala b/src/compiler/scala/tools/nsc/symtab/Positions.scala
index ff20e70541..c96c709fb0 100644
--- a/src/compiler/scala/tools/nsc/symtab/Positions.scala
+++ b/src/compiler/scala/tools/nsc/symtab/Positions.scala
@@ -3,7 +3,7 @@ package symtab
 
 import scala.tools.nsc.util.{ SourceFile, Position, OffsetPosition, NoPosition }
 
-trait Positions extends scala.reflect.common.Positions {
+trait Positions extends scala.reflect.internal.Positions {
 self: scala.tools.nsc.symtab.SymbolTable =>
 
   def rangePos(source: SourceFile, start: Int, point: Int, end: Int) =
diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
index 9f91d89158..55b7c6004b 100644
--- a/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolLoaders.scala
@@ -12,7 +12,7 @@ import ch.epfl.lamp.compiler.msil.{ Type => MSILType, Attribute => MSILAttribute
 import scala.compat.Platform.currentTime
 import scala.tools.nsc.util.{ ClassPath }
 import classfile.ClassfileParser
-import reflect.common.Flags._
+import reflect.internal.Flags._
 import util.Statistics._
 
 /** This class ...
diff --git a/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala b/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala
index d27374cc29..9fbf649525 100644
--- a/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala
+++ b/src/compiler/scala/tools/nsc/symtab/SymbolTable.scala
@@ -10,4 +10,4 @@ import ast.{Trees, TreePrinters, DocComments}
 
 import util._
 
-abstract class SymbolTable extends reflect.common.SymbolTable
+abstract class SymbolTable extends reflect.internal.SymbolTable
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
index cc63a43ca4..126dd2c2da 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/ClassfileParser.scala
@@ -13,7 +13,7 @@ import java.lang.Integer.toHexString
 import scala.collection.{ mutable, immutable }
 import scala.collection.mutable.{ ListBuffer, ArrayBuffer }
 import scala.annotation.switch
-import scala.reflect.common.pickling.{PickleBuffer, ByteCodecs}
+import scala.reflect.internal.pickling.{PickleBuffer, ByteCodecs}
 
 /** This abstract class implements a class file parser.
  *
@@ -48,7 +48,7 @@ abstract class ClassfileParser {
     val global: ClassfileParser.this.global.type = ClassfileParser.this.global
   }
 
-  private object unpickler extends scala.reflect.common.pickling.UnPickler {
+  private object unpickler extends scala.reflect.internal.pickling.UnPickler {
     val global: ClassfileParser.this.global.type = ClassfileParser.this.global
   }
 
diff --git a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
index ea1283cfaa..e082e6c616 100644
--- a/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
+++ b/src/compiler/scala/tools/nsc/symtab/classfile/Pickler.scala
@@ -10,7 +10,7 @@ package classfile
 import java.lang.Float.floatToIntBits
 import java.lang.Double.doubleToLongBits
 import scala.io.Codec
-import scala.reflect.common.pickling.{ PickleBuffer, PickleFormat }
+import scala.reflect.internal.pickling.{ PickleBuffer, PickleFormat }
 import scala.collection.mutable.LinkedHashMap
 import PickleFormat._
 import Flags._
diff --git a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
index 6242a22bfa..673abb8639 100644
--- a/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
+++ b/src/compiler/scala/tools/nsc/symtab/clr/TypeParser.scala
@@ -12,7 +12,7 @@ import java.io.IOException
 import ch.epfl.lamp.compiler.msil.{Type => MSILType, Attribute => MSILAttribute, _}
 
 import scala.collection.mutable.{HashMap, HashSet}
-import scala.reflect.common.pickling.UnPickler
+import scala.reflect.internal.pickling.UnPickler
 import ch.epfl.lamp.compiler.msil.Type.TMVarUsage
 
 /**
diff --git a/src/compiler/scala/tools/nsc/symtab/package.scala b/src/compiler/scala/tools/nsc/symtab/package.scala
index 30de9c75bf..1cf0d2c2ae 100644
--- a/src/compiler/scala/tools/nsc/symtab/package.scala
+++ b/src/compiler/scala/tools/nsc/symtab/package.scala
@@ -2,6 +2,6 @@ package scala.tools.nsc
 
 package object symtab {
 
-  val Flags = reflect.common.Flags
+  val Flags = reflect.internal.Flags
 
 }
diff --git a/src/compiler/scala/tools/nsc/util/FlagsUtil.scala b/src/compiler/scala/tools/nsc/util/FlagsUtil.scala
index c12a919054..7574859e03 100644
--- a/src/compiler/scala/tools/nsc/util/FlagsUtil.scala
+++ b/src/compiler/scala/tools/nsc/util/FlagsUtil.scala
@@ -213,7 +213,7 @@ class FlagsUtil(flagsObject: AnyRef) {
 }
 
 object FlagsUtil {
-  import reflect.common.ModifierFlags
+  import reflect.internal.ModifierFlags
 
   trait MarkModifiers extends FlagsUtil {
     lazy val isModifiersFlag = classOf[ModifierFlags].getMethods map (_.getName) filter isFlagName toSet
@@ -230,7 +230,7 @@ object FlagsUtilCompiler extends FlagsUtil(symtab.Flags) with FlagsUtil.MarkModi
   def main(args: Array[String]): Unit = reflectiveAnalyzeFlags()
 }
 
-object FlagsUtilLibrary extends FlagsUtil(reflect.common.Flags) with FlagsUtil.MarkModifiers {
+object FlagsUtilLibrary extends FlagsUtil(reflect.internal.Flags) with FlagsUtil.MarkModifiers {
   def main(args: Array[String]): Unit = reflectiveAnalyzeFlags()
 }
 
diff --git a/src/compiler/scala/tools/nsc/util/ShowPickled.scala b/src/compiler/scala/tools/nsc/util/ShowPickled.scala
index 4acd8629bb..4f9813279f 100644
--- a/src/compiler/scala/tools/nsc/util/ShowPickled.scala
+++ b/src/compiler/scala/tools/nsc/util/ShowPickled.scala
@@ -13,8 +13,8 @@ import java.lang.Float.intBitsToFloat
 import java.lang.Double.longBitsToDouble
 
 import cmd.program.Simple
-import scala.reflect.common.{Flags, Names}
-import scala.reflect.common.pickling.{ PickleBuffer, PickleFormat }
+import scala.reflect.internal.{Flags, Names}
+import scala.reflect.internal.pickling.{ PickleBuffer, PickleFormat }
 import interpreter.ByteCode.scalaSigBytesForPath
 
 object ShowPickled extends Names {
diff --git a/src/compiler/scala/tools/nsc/util/Statistics.scala b/src/compiler/scala/tools/nsc/util/Statistics.scala
index 8ef7d443ad..95cdc77a09 100644
--- a/src/compiler/scala/tools/nsc/util/Statistics.scala
+++ b/src/compiler/scala/tools/nsc/util/Statistics.scala
@@ -6,7 +6,7 @@
 package scala.tools.nsc
 package util
 
-class Statistics extends scala.reflect.common.util.Statistics {
+class Statistics extends scala.reflect.internal.util.Statistics {
 
  var nodeByType = new ClassCounts
 
diff --git a/src/compiler/scala/tools/nsc/util/package.scala b/src/compiler/scala/tools/nsc/util/package.scala
index fb18adb630..e598031676 100644
--- a/src/compiler/scala/tools/nsc/util/package.scala
+++ b/src/compiler/scala/tools/nsc/util/package.scala
@@ -9,9 +9,9 @@ import java.io.{ OutputStream, PrintStream, ByteArrayOutputStream, PrintWriter,
 
 package object util {
 
-  type Set[T <: AnyRef] = scala.reflect.common.util.Set[T]
-  type HashSet[T >: Null <: AnyRef] = scala.reflect.common.util.HashSet[T]
-  val HashSet = scala.reflect.common.util.HashSet
+  type Set[T <: AnyRef] = scala.reflect.internal.util.Set[T]
+  type HashSet[T >: Null <: AnyRef] = scala.reflect.internal.util.HashSet[T]
+  val HashSet = scala.reflect.internal.util.HashSet
 
   def onull[T](value: T, orElse: => T): T = if (value == null) orElse else value