diff --git a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt
index 2a464e88268..0da61368eee 100644
--- a/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt
+++ b/tests/baselines/reference/ModuleAndClassWithSameNameAndCommonRoot.errors.txt
@@ -1,5 +1,6 @@
 tests/cases/conformance/internalModules/DeclarationMerging/module.ts(2,19): error TS2433: A namespace declaration cannot be in a different file from a class or function with which it is merged.
 tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(1,8): error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged.
+tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(2,31): error TS2449: Class 'A' used before its declaration.
 
 
 ==== tests/cases/conformance/internalModules/DeclarationMerging/module.ts (1 errors) ====
@@ -24,11 +25,13 @@ tests/cases/conformance/internalModules/DeclarationMerging/simple.ts(1,8): error
         }
     }
     
-==== tests/cases/conformance/internalModules/DeclarationMerging/simple.ts (1 errors) ====
+==== tests/cases/conformance/internalModules/DeclarationMerging/simple.ts (2 errors) ====
     module A {
            ~
 !!! error TS2434: A namespace declaration cannot be located prior to a class or function with which it is merged.
         export var Instance = new A();
+                                  ~
+!!! error TS2449: Class 'A' used before its declaration.
     }
     
     // duplicate identifier
diff --git a/tests/baselines/reference/circularImportAlias.errors.txt b/tests/baselines/reference/circularImportAlias.errors.txt
index 82c9205ae54..13ff1d8c7c9 100644
--- a/tests/baselines/reference/circularImportAlias.errors.txt
+++ b/tests/baselines/reference/circularImportAlias.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/conformance/internalModules/importDeclarations/circularImportAlias.ts(5,28): error TS2690: A class must be declared after its base class.
+tests/cases/conformance/internalModules/importDeclarations/circularImportAlias.ts(5,30): error TS2449: Class 'C' used before its declaration.
 
 
 ==== tests/cases/conformance/internalModules/importDeclarations/circularImportAlias.ts (1 errors) ====
@@ -7,8 +7,8 @@ tests/cases/conformance/internalModules/importDeclarations/circularImportAlias.t
     module B {
         export import a = A;
         export class D extends a.C {
-                               ~~~
-!!! error TS2690: A class must be declared after its base class.
+                                 ~
+!!! error TS2449: Class 'C' used before its declaration.
             id: number;
         }
     }
diff --git a/tests/baselines/reference/classAbstractInstantiations2.errors.txt b/tests/baselines/reference/classAbstractInstantiations2.errors.txt
index bf4cd851fb3..15b63a6d3e8 100644
--- a/tests/baselines/reference/classAbstractInstantiations2.errors.txt
+++ b/tests/baselines/reference/classAbstractInstantiations2.errors.txt
@@ -3,13 +3,14 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst
   Cannot assign an abstract constructor type to a non-abstract constructor type.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(17,5): error TS2511: Cannot create an instance of the abstract class 'B'.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(21,1): error TS2511: Cannot create an instance of the abstract class 'B'.
+tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(23,15): error TS2449: Class 'C' used before its declaration.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(26,7): error TS2515: Non-abstract class 'C' does not implement inherited abstract member 'bar' from class 'B'.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(46,5): error TS2391: Function implementation is missing or not immediately following the declaration.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(46,5): error TS2512: Overload signatures must all be abstract or non-abstract.
 tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts(50,5): error TS1244: Abstract methods can only appear within an abstract class.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts (8 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbstractInstantiations2.ts (9 errors) ====
     class A {
         // ...
     }
@@ -42,6 +43,8 @@ tests/cases/conformance/classes/classDeclarations/classAbstractKeyword/classAbst
 !!! error TS2511: Cannot create an instance of the abstract class 'B'.
     
     var x : any = C;
+                  ~
+!!! error TS2449: Class 'C' used before its declaration.
     new x; // okay -- undefined behavior at runtime
     
     class C extends B { } // error -- not declared abstract
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly.errors.txt b/tests/baselines/reference/classExtendsItselfIndirectly.errors.txt
index c0f35f0388f..8f54ef18051 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly.errors.txt
+++ b/tests/baselines/reference/classExtendsItselfIndirectly.errors.txt
@@ -1,15 +1,19 @@
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts(1,7): error TS2506: 'C' is referenced directly or indirectly in its own base expression.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts(1,17): error TS2449: Class 'E' used before its declaration.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts(3,7): error TS2506: 'D' is referenced directly or indirectly in its own base expression.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts(5,7): error TS2506: 'E' is referenced directly or indirectly in its own base expression.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts(7,7): error TS2506: 'C2' is referenced directly or indirectly in its own base expression.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts(7,21): error TS2449: Class 'E2' used before its declaration.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts(9,7): error TS2506: 'D2' is referenced directly or indirectly in its own base expression.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts(11,7): error TS2506: 'E2' is referenced directly or indirectly in its own base expression.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts (6 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly.ts (8 errors) ====
     class C extends E { foo: string; } // error
           ~
 !!! error TS2506: 'C' is referenced directly or indirectly in its own base expression.
+                    ~
+!!! error TS2449: Class 'E' used before its declaration.
     
     class D extends C { bar: string; }
           ~
@@ -22,6 +26,8 @@ tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/cla
     class C2<T> extends E2<T> { foo: T; } // error
           ~~
 !!! error TS2506: 'C2' is referenced directly or indirectly in its own base expression.
+                        ~~
+!!! error TS2449: Class 'E2' used before its declaration.
     
     class D2<T> extends C2<T> { bar: T; }
           ~~
diff --git a/tests/baselines/reference/classExtendsItselfIndirectly2.errors.txt b/tests/baselines/reference/classExtendsItselfIndirectly2.errors.txt
index 061770f9b79..48c787b54d9 100644
--- a/tests/baselines/reference/classExtendsItselfIndirectly2.errors.txt
+++ b/tests/baselines/reference/classExtendsItselfIndirectly2.errors.txt
@@ -1,15 +1,19 @@
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts(1,7): error TS2506: 'C' is referenced directly or indirectly in its own base expression.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts(1,19): error TS2449: Class 'E' used before its declaration.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts(4,18): error TS2506: 'D' is referenced directly or indirectly in its own base expression.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts(9,18): error TS2506: 'E' is referenced directly or indirectly in its own base expression.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts(13,11): error TS2506: 'C2' is referenced directly or indirectly in its own base expression.
+tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts(13,27): error TS2449: Class 'E2' used before its declaration.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts(16,22): error TS2506: 'D2' is referenced directly or indirectly in its own base expression.
 tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts(20,22): error TS2506: 'E2' is referenced directly or indirectly in its own base expression.
 
 
-==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts (6 errors) ====
+==== tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/classExtendsItselfIndirectly2.ts (8 errors) ====
     class C extends N.E { foo: string; } // error
           ~
 !!! error TS2506: 'C' is referenced directly or indirectly in its own base expression.
+                      ~
+!!! error TS2449: Class 'E' used before its declaration.
     
     module M {
         export class D extends C { bar: string; }
@@ -28,6 +32,8 @@ tests/cases/conformance/classes/classDeclarations/classHeritageSpecification/cla
         class C2<T> extends Q.E2<T> { foo: T; } // error
               ~~
 !!! error TS2506: 'C2' is referenced directly or indirectly in its own base expression.
+                              ~~
+!!! error TS2449: Class 'E2' used before its declaration.
     
         module P {
             export class D2<T> extends C2<T> { bar: T; }
diff --git a/tests/baselines/reference/classInheritence.errors.txt b/tests/baselines/reference/classInheritence.errors.txt
index cd95dedbfcf..3bad3caf3d2 100644
--- a/tests/baselines/reference/classInheritence.errors.txt
+++ b/tests/baselines/reference/classInheritence.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/classInheritence.ts(1,17): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/classInheritence.ts(1,17): error TS2449: Class 'A' used before its declaration.
 tests/cases/compiler/classInheritence.ts(2,7): error TS2506: 'A' is referenced directly or indirectly in its own base expression.
 
 
 ==== tests/cases/compiler/classInheritence.ts (2 errors) ====
     class B extends A { }
                     ~
-!!! error TS2690: A class must be declared after its base class.
+!!! error TS2449: Class 'A' used before its declaration.
     class A extends A { }
           ~
 !!! error TS2506: 'A' is referenced directly or indirectly in its own base expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/classOrder2.errors.txt b/tests/baselines/reference/classOrder2.errors.txt
index a1b8dc6346e..59184e6a5e6 100644
--- a/tests/baselines/reference/classOrder2.errors.txt
+++ b/tests/baselines/reference/classOrder2.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/classOrder2.ts(2,17): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/classOrder2.ts(2,17): error TS2449: Class 'B' used before its declaration.
 
 
 ==== tests/cases/compiler/classOrder2.ts (1 errors) ====
     
     class A extends B {
                     ~
-!!! error TS2690: A class must be declared after its base class.
+!!! error TS2449: Class 'B' used before its declaration.
     
       foo() { this.bar(); }
     
diff --git a/tests/baselines/reference/classSideInheritance2.errors.txt b/tests/baselines/reference/classSideInheritance2.errors.txt
index e286594ec2d..7b27ee7c0f9 100644
--- a/tests/baselines/reference/classSideInheritance2.errors.txt
+++ b/tests/baselines/reference/classSideInheritance2.errors.txt
@@ -1,4 +1,4 @@
-tests/cases/compiler/classSideInheritance2.ts(7,23): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/classSideInheritance2.ts(7,23): error TS2449: Class 'TextBase' used before its declaration.
 
 
 ==== tests/cases/compiler/classSideInheritance2.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/compiler/classSideInheritance2.ts(7,23): error TS2690: A class must
     
     class SubText extends TextBase {
                           ~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+!!! error TS2449: Class 'TextBase' used before its declaration.
     
             constructor(text: IText, span: TextSpan) {
                 super();
diff --git a/tests/baselines/reference/complexClassRelationships.errors.txt b/tests/baselines/reference/complexClassRelationships.errors.txt
index 33413e496d4..c978a36c036 100644
--- a/tests/baselines/reference/complexClassRelationships.errors.txt
+++ b/tests/baselines/reference/complexClassRelationships.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/compiler/complexClassRelationships.ts(2,23): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/complexClassRelationships.ts(2,23): error TS2449: Class 'Base' used before its declaration.
 
 
 ==== tests/cases/compiler/complexClassRelationships.ts (1 errors) ====
     // There should be no errors in this file
     class Derived extends Base {
                           ~~~~
-!!! error TS2690: A class must be declared after its base class.
+!!! error TS2449: Class 'Base' used before its declaration.
         public static createEmpty(): Derived {
             var item = new Derived();
             return item;
diff --git a/tests/baselines/reference/derivedClasses.errors.txt b/tests/baselines/reference/derivedClasses.errors.txt
index fdd38d8c060..ff6946df2ca 100644
--- a/tests/baselines/reference/derivedClasses.errors.txt
+++ b/tests/baselines/reference/derivedClasses.errors.txt
@@ -1,10 +1,10 @@
-tests/cases/compiler/derivedClasses.ts(1,19): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/derivedClasses.ts(1,19): error TS2449: Class 'Color' used before its declaration.
 
 
 ==== tests/cases/compiler/derivedClasses.ts (1 errors) ====
     class Red extends Color {
                       ~~~~~
-!!! error TS2690: A class must be declared after its base class.
+!!! error TS2449: Class 'Color' used before its declaration.
         public shade() { 
         	var getHue = () => { return this.hue(); };
         	return getHue() + " red"; 
diff --git a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.errors.txt b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.errors.txt
index 2678fdf8667..64e5c7d3ef3 100644
--- a/tests/baselines/reference/extendBaseClassBeforeItsDeclared.errors.txt
+++ b/tests/baselines/reference/extendBaseClassBeforeItsDeclared.errors.txt
@@ -1,9 +1,9 @@
-tests/cases/compiler/extendBaseClassBeforeItsDeclared.ts(1,23): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/extendBaseClassBeforeItsDeclared.ts(1,23): error TS2449: Class 'base' used before its declaration.
 
 
 ==== tests/cases/compiler/extendBaseClassBeforeItsDeclared.ts (1 errors) ====
     class derived extends base { }
                           ~~~~
-!!! error TS2690: A class must be declared after its base class.
+!!! error TS2449: Class 'base' used before its declaration.
      
     class base { constructor (public n: number) { } }
\ No newline at end of file
diff --git a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.errors.txt b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.errors.txt
index 1962576abcd..d259a2d2e27 100644
--- a/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.errors.txt
+++ b/tests/baselines/reference/genericClassInheritsConstructorFromNonGenericClass.errors.txt
@@ -1,14 +1,14 @@
-tests/cases/compiler/genericClassInheritsConstructorFromNonGenericClass.ts(1,17): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/genericClassInheritsConstructorFromNonGenericClass.ts(2,20): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/genericClassInheritsConstructorFromNonGenericClass.ts(1,17): error TS2449: Class 'B' used before its declaration.
+tests/cases/compiler/genericClassInheritsConstructorFromNonGenericClass.ts(2,20): error TS2449: Class 'C' used before its declaration.
 
 
 ==== tests/cases/compiler/genericClassInheritsConstructorFromNonGenericClass.ts (2 errors) ====
     class A extends B<string> { }
-                    ~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                    ~
+!!! error TS2449: Class 'B' used before its declaration.
     class B<U> extends C { }
                        ~
-!!! error TS2690: A class must be declared after its base class.
+!!! error TS2449: Class 'C' used before its declaration.
     class C {
         constructor(p: string) { }
     }
\ No newline at end of file
diff --git a/tests/baselines/reference/indirectSelfReference.errors.txt b/tests/baselines/reference/indirectSelfReference.errors.txt
index 3f7d3d47f12..0339dd8ed08 100644
--- a/tests/baselines/reference/indirectSelfReference.errors.txt
+++ b/tests/baselines/reference/indirectSelfReference.errors.txt
@@ -1,11 +1,14 @@
 tests/cases/compiler/indirectSelfReference.ts(1,7): error TS2506: 'a' is referenced directly or indirectly in its own base expression.
+tests/cases/compiler/indirectSelfReference.ts(1,17): error TS2449: Class 'b' used before its declaration.
 tests/cases/compiler/indirectSelfReference.ts(2,7): error TS2506: 'b' is referenced directly or indirectly in its own base expression.
 
 
-==== tests/cases/compiler/indirectSelfReference.ts (2 errors) ====
+==== tests/cases/compiler/indirectSelfReference.ts (3 errors) ====
     class a extends b{ }
           ~
 !!! error TS2506: 'a' is referenced directly or indirectly in its own base expression.
+                    ~
+!!! error TS2449: Class 'b' used before its declaration.
     class b extends a{ }
           ~
 !!! error TS2506: 'b' is referenced directly or indirectly in its own base expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/indirectSelfReferenceGeneric.errors.txt b/tests/baselines/reference/indirectSelfReferenceGeneric.errors.txt
index 5a6aeed5de1..d1cdbf1da58 100644
--- a/tests/baselines/reference/indirectSelfReferenceGeneric.errors.txt
+++ b/tests/baselines/reference/indirectSelfReferenceGeneric.errors.txt
@@ -1,11 +1,14 @@
 tests/cases/compiler/indirectSelfReferenceGeneric.ts(1,7): error TS2506: 'a' is referenced directly or indirectly in its own base expression.
+tests/cases/compiler/indirectSelfReferenceGeneric.ts(1,20): error TS2449: Class 'b' used before its declaration.
 tests/cases/compiler/indirectSelfReferenceGeneric.ts(2,7): error TS2506: 'b' is referenced directly or indirectly in its own base expression.
 
 
-==== tests/cases/compiler/indirectSelfReferenceGeneric.ts (2 errors) ====
+==== tests/cases/compiler/indirectSelfReferenceGeneric.ts (3 errors) ====
     class a<T> extends b<T> { }
           ~
 !!! error TS2506: 'a' is referenced directly or indirectly in its own base expression.
+                       ~
+!!! error TS2449: Class 'b' used before its declaration.
     class b<T> extends a<T> { }
           ~
 !!! error TS2506: 'b' is referenced directly or indirectly in its own base expression.
\ No newline at end of file
diff --git a/tests/baselines/reference/parserRealSource10.errors.txt b/tests/baselines/reference/parserRealSource10.errors.txt
index d6199636e69..ae48cd79b51 100644
--- a/tests/baselines/reference/parserRealSource10.errors.txt
+++ b/tests/baselines/reference/parserRealSource10.errors.txt
@@ -1,4 +1,5 @@
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(4,1): error TS6053: File 'tests/cases/conformance/parser/ecmascript5/typescript.ts' not found.
+tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(127,33): error TS2449: Class 'TokenInfo' used before its declaration.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(127,42): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(128,36): error TS2304: Cannot find name 'string'.
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(128,42): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
@@ -342,7 +343,7 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(356,53): error
 tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(449,40): error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
 
 
-==== tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts (342 errors) ====
+==== tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts (343 errors) ====
     // Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0. 
     // See LICENSE.txt in the project root for complete license information.
     
@@ -472,6 +473,8 @@ tests/cases/conformance/parser/ecmascript5/parserRealSource10.ts(449,40): error
         }
     
         export var tokenTable = new TokenInfo[];
+                                    ~~~~~~~~~
+!!! error TS2449: Class 'TokenInfo' used before its declaration.
                                              ~~
 !!! error TS1150: 'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead.
         export var nodeTypeTable = new string[];
diff --git a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
index dd44005047e..95378c4c694 100644
--- a/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
+++ b/tests/baselines/reference/privacyClassExtendsClauseDeclFile.errors.txt
@@ -1,8 +1,8 @@
 tests/cases/compiler/privacyClassExtendsClauseDeclFile_GlobalFile.ts(16,67): error TS4020: 'extends' clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
 tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(17,67): error TS4020: 'extends' clause of exported class 'publicClassExtendingPrivateClassInModule' has or is using private name 'privateClassInPublicModule'.
-tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(20,63): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(20,77): error TS2449: Class 'publicClassInPrivateModule' used before its declaration.
 tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(22,69): error TS4020: 'extends' clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'.
-tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(22,69): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(22,83): error TS2449: Class 'publicClassInPrivateModule' used before its declaration.
 tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(64,55): error TS4020: 'extends' clause of exported class 'publicClassExtendingPrivateClass' has or is using private name 'privateClass'.
 tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(69,65): error TS4020: 'extends' clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'.
 
@@ -30,14 +30,14 @@ tests/cases/compiler/privacyClassExtendsClauseDeclFile_externalModule.ts(69,65):
         }
     
         class privateClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule {
-                                                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2449: Class 'publicClassInPrivateModule' used before its declaration.
         }
         export class publicClassExtendingFromPrivateModuleClass extends privateModule.publicClassInPrivateModule { // Should error
                                                                         ~~~~~~~~~~~~~
 !!! error TS4020: 'extends' clause of exported class 'publicClassExtendingFromPrivateModuleClass' has or is using private name 'privateModule'.
-                                                                        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~
+!!! error TS2449: Class 'publicClassInPrivateModule' used before its declaration.
         }
     }
     
diff --git a/tests/baselines/reference/recursiveBaseCheck3.errors.txt b/tests/baselines/reference/recursiveBaseCheck3.errors.txt
index 97f7cadc3d6..ba0ea669c55 100644
--- a/tests/baselines/reference/recursiveBaseCheck3.errors.txt
+++ b/tests/baselines/reference/recursiveBaseCheck3.errors.txt
@@ -1,12 +1,15 @@
 tests/cases/compiler/recursiveBaseCheck3.ts(1,7): error TS2506: 'A' is referenced directly or indirectly in its own base expression.
+tests/cases/compiler/recursiveBaseCheck3.ts(1,20): error TS2449: Class 'C' used before its declaration.
 tests/cases/compiler/recursiveBaseCheck3.ts(2,7): error TS2506: 'C' is referenced directly or indirectly in its own base expression.
 tests/cases/compiler/recursiveBaseCheck3.ts(4,9): error TS2339: Property 'blah' does not exist on type 'C<{}>'.
 
 
-==== tests/cases/compiler/recursiveBaseCheck3.ts (3 errors) ====
+==== tests/cases/compiler/recursiveBaseCheck3.ts (4 errors) ====
     class A<T> extends C<T> { }
           ~
 !!! error TS2506: 'A' is referenced directly or indirectly in its own base expression.
+                       ~
+!!! error TS2449: Class 'C' used before its declaration.
     class C<T> extends A<T> { }
           ~
 !!! error TS2506: 'C' is referenced directly or indirectly in its own base expression.
diff --git a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt
index b9e650b644b..bfb9a5127f8 100644
--- a/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt
+++ b/tests/baselines/reference/resolvingClassDeclarationWhenInBaseTypeResolution.errors.txt
@@ -1,34 +1,34 @@
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(2,35): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(9,44): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(45,39): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(60,34): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(96,33): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(114,40): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(126,34): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(182,42): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(199,39): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(247,35): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(272,30): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(301,33): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(403,44): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(436,45): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(469,44): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(490,34): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(495,39): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(500,38): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(534,42): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(549,41): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(580,45): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(589,44): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(605,46): error TS2690: A class must be declared after its base class.
-tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42): error TS2690: A class must be declared after its base class.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(2,45): error TS2449: Class 'nitidus' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(9,56): error TS2449: Class 'mixtus' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(45,48): error TS2449: Class 'psilurus' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(60,44): error TS2449: Class 'jugularis' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(96,44): error TS2449: Class 'aurata' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(114,48): error TS2449: Class 'gilbertii' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(126,43): error TS2449: Class 'johorensis' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(182,54): error TS2449: Class 'falconeri' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(199,47): error TS2449: Class 'pygmaea' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(247,46): error TS2449: Class 'ciliolabrum' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(272,35): error TS2449: Class 'coludo' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(301,41): error TS2449: Class 'oreas' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(403,53): error TS2449: Class 'johorensis' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(436,55): error TS2449: Class 'punicus' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(469,52): error TS2449: Class 'stolzmanni' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(490,42): error TS2449: Class 'portoricensis' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(495,50): error TS2449: Class 'pelurus' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(500,49): error TS2449: Class 'lasiurus' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(534,50): error TS2449: Class 'stolzmanni' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(549,53): error TS2449: Class 'daphaenodon' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(580,54): error TS2449: Class 'johorensis' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(589,52): error TS2449: Class 'stolzmanni' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(605,55): error TS2449: Class 'psilurus' used before its declaration.
+tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,53): error TS2449: Class 'lasiurus' used before its declaration.
 
 
 ==== tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts (24 errors) ====
     module rionegrensis {
       export class caniventer extends Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana> {
-                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                ~~~~~~~
+!!! error TS2449: Class 'nitidus' used before its declaration.
         salomonseni() : caniventer { var x : caniventer; () => { var y = this; }; return x; }
         uchidai() : lavali.xanthognathus { var x : lavali.xanthognathus; () => { var y = this; }; return x; }
         raffrayana() : lavali.otion { var x : lavali.otion; () => { var y = this; }; return x; }
@@ -36,8 +36,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
         nayaur() : gabriellae.amicus { var x : gabriellae.amicus; () => { var y = this; }; return x; }
       }
       export class veraecrucis<T0, T1> extends trivirgatus.mixtus<gabriellae.amicus, lutreolus.punicus> {
-                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                           ~~~~~~
+!!! error TS2449: Class 'mixtus' used before its declaration.
         naso() : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>> { var x : panamensis.setulosus<lutreolus.punicus, howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>>; () => { var y = this; }; return x; }
         vancouverensis() : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae> { var x : imperfecta.ciliolabrum<argurus.oreas, argurus.peninsulae>; () => { var y = this; }; return x; }
         africana() : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>> { var x : argurus.gilbertii<panamensis.linulus<lavali.lepturus, argurus.oreas>, sagitta.cinereus<lavali.xanthognathus, argurus.oreas>>; () => { var y = this; }; return x; }
@@ -74,8 +74,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
         porcellus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
       }
       export class oralis<T0, T1> extends caurinus.psilurus {
-                                          ~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                   ~~~~~~~~
+!!! error TS2449: Class 'psilurus' used before its declaration.
         cepapi() : caurinus.psilurus { var x : caurinus.psilurus; () => { var y = this; }; return x; }
         porteri() : lavali.thaeleri { var x : lavali.thaeleri; () => { var y = this; }; return x; }
         bindi() : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>> { var x : caurinus.mahaganus<gabriellae.amicus, panglima.amphibius<macrorhinos.daphaenodon, patas.uralensis>>; () => { var y = this; }; return x; }
@@ -91,8 +91,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
         eisentrauti() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
       }
       export class sumatrana extends Lanthanum.jugularis {
-                                     ~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                               ~~~~~~~~~
+!!! error TS2449: Class 'jugularis' used before its declaration.
         wolffsohni() : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis> { var x : Lanthanum.suillus<dammermani.melanops, quasiater.carolinensis>; () => { var y = this; }; return x; }
         geata() : ruatanica.hector<sumatrana, quasiater.bobrinskoi> { var x : ruatanica.hector<sumatrana, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
         awashensis() : petrophilus.minutilla { var x : petrophilus.minutilla; () => { var y = this; }; return x; }
@@ -129,8 +129,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
         olchonensis() : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca> { var x : rendalli.crenulata<trivirgatus.falconeri, provocax.melanoleuca>; () => { var y = this; }; return x; }
       }
       export class durangae extends dogramacii.aurata {
-                                    ~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                               ~~~~~~
+!!! error TS2449: Class 'aurata' used before its declaration.
         Californium() : panamensis.setulosus<lutreolus.punicus, dammermani.melanops> { var x : panamensis.setulosus<lutreolus.punicus, dammermani.melanops>; () => { var y = this; }; return x; }
         Flerovium() : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus> { var x : howi.angulatus<petrophilus.minutilla, lavali.xanthognathus>; () => { var y = this; }; return x; }
         phrudus() : sagitta.stolzmanni { var x : sagitta.stolzmanni; () => { var y = this; }; return x; }
@@ -149,8 +149,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
         anatolicus() : julianae.steerii { var x : julianae.steerii; () => { var y = this; }; return x; }
       }
       export class nitidus<T0, T1> extends argurus.gilbertii<lavali.thaeleri, lutreolus.punicus> {
-                                           ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                   ~~~~~~~~~
+!!! error TS2449: Class 'gilbertii' used before its declaration.
         granatensis() : quasiater.bobrinskoi { var x : quasiater.bobrinskoi; () => { var y = this; }; return x; }
         negligens() : minutus.inez<lavali.wilsoni, lavali.wilsoni> { var x : minutus.inez<lavali.wilsoni, lavali.wilsoni>; () => { var y = this; }; return x; }
         lewisi() : julianae.oralis<lavali.xanthognathus, argurus.oreas> { var x : julianae.oralis<lavali.xanthognathus, argurus.oreas>; () => { var y = this; }; return x; }
@@ -163,8 +163,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
         bicornis() : dogramacii.kaiseri { var x : dogramacii.kaiseri; () => { var y = this; }; return x; }
       }
       export class megalonyx extends caurinus.johorensis<caurinus.megaphyllus, julianae.steerii> {
-                                     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                              ~~~~~~~~~~
+!!! error TS2449: Class 'johorensis' used before its declaration.
         phillipsii() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
         melanogaster() : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis> { var x : rionegrensis.veraecrucis<trivirgatus.falconeri, quasiater.carolinensis>; () => { var y = this; }; return x; }
         elaphus() : nitidus<petrophilus.minutilla, julianae.sumatrana> { var x : nitidus<petrophilus.minutilla, julianae.sumatrana>; () => { var y = this; }; return x; }
@@ -221,8 +221,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
         biacensis() : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca> { var x : howi.coludo<quasiater.bobrinskoi, provocax.melanoleuca>; () => { var y = this; }; return x; }
       }
       export class crenulata<T0, T1> extends trivirgatus.falconeri {
-                                             ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                         ~~~~~~~~~
+!!! error TS2449: Class 'falconeri' used before its declaration.
         salvanius() : howi.coludo<howi.marcanoi, rionegrensis.caniventer> { var x : howi.coludo<howi.marcanoi, rionegrensis.caniventer>; () => { var y = this; }; return x; }
         maritimus() : ruatanica.americanus { var x : ruatanica.americanus; () => { var y = this; }; return x; }
         edax() : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer> { var x : lutreolus.cor<imperfecta.lasiurus<howi.marcanoi, imperfecta.ciliolabrum<Lanthanum.megalonyx, petrophilus.minutilla>>, rionegrensis.caniventer>; () => { var y = this; }; return x; }
@@ -240,8 +240,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
         vallinus() : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus> { var x : sagitta.sicarius<lavali.wilsoni, lutreolus.punicus>; () => { var y = this; }; return x; }
       }
       export class mixtus<T0, T1> extends argurus.pygmaea<argurus.oreas, panglima.fundatus<quasiater.carolinensis, macrorhinos.daphaenodon>> {
-                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                  ~~~~~~~
+!!! error TS2449: Class 'pygmaea' used before its declaration.
         ochrogaster() : dogramacii.aurata { var x : dogramacii.aurata; () => { var y = this; }; return x; }
         bryophilus() : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>> { var x : macrorhinos.marmosurus<dogramacii.koepckeae, panglima.abidi<dogramacii.aurata, chrysaeolus.sarasinorum<caurinus.megaphyllus, lavali.xanthognathus>>>; () => { var y = this; }; return x; }
         liechtensteini() : rendalli.zuluensis { var x : rendalli.zuluensis; () => { var y = this; }; return x; }
@@ -290,8 +290,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module ruatanica {
       export class americanus extends imperfecta.ciliolabrum<argurus.germaini, lutreolus.foina> {
-                                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                 ~~~~~~~~~~~
+!!! error TS2449: Class 'ciliolabrum' used before its declaration.
         nasoloi() : macrorhinos.konganensis { var x : macrorhinos.konganensis; () => { var y = this; }; return x; }
         mystacalis() : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni> { var x : howi.angulatus<quasiater.carolinensis, sagitta.stolzmanni>; () => { var y = this; }; return x; }
         fardoulisi() : trivirgatus.oconnelli { var x : trivirgatus.oconnelli; () => { var y = this; }; return x; }
@@ -317,8 +317,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
       export class beisa {
       }
       export class otion extends howi.coludo<argurus.oreas, howi.marcanoi> {
-                                 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                      ~~~~~~
+!!! error TS2449: Class 'coludo' used before its declaration.
         bonaerensis() : provocax.melanoleuca { var x : provocax.melanoleuca; () => { var y = this; }; return x; }
         dussumieri() : nigra.gracilis<julianae.steerii, dogramacii.kaiseri> { var x : nigra.gracilis<julianae.steerii, dogramacii.kaiseri>; () => { var y = this; }; return x; }
         osvaldoreigi() : julianae.albidens<julianae.steerii, quasiater.carolinensis> { var x : julianae.albidens<julianae.steerii, quasiater.carolinensis>; () => { var y = this; }; return x; }
@@ -348,8 +348,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
         coyhaiquensis() : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus> { var x : caurinus.mahaganus<dammermani.siberu<nigra.thalia<lutreolus.schlegeli, julianae.sumatrana>, panglima.abidi<lutreolus.foina, argurus.peninsulae>>, lutreolus.punicus>; () => { var y = this; }; return x; }
       }
       export class thaeleri extends argurus.oreas {
-                                    ~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                            ~~~~~
+!!! error TS2449: Class 'oreas' used before its declaration.
         coromandra() : julianae.galapagoensis { var x : julianae.galapagoensis; () => { var y = this; }; return x; }
         parvipes() : nigra.dolichurus<argurus.germaini, samarensis.pallidus> { var x : nigra.dolichurus<argurus.germaini, samarensis.pallidus>; () => { var y = this; }; return x; }
         sponsorius() : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii> { var x : rionegrensis.veraecrucis<chrysaeolus.sarasinorum<caurinus.psilurus, quasiater.bobrinskoi>, julianae.steerii>; () => { var y = this; }; return x; }
@@ -452,8 +452,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module panglima {
         export class amphibius<T0, T1> extends caurinus.johorensis<Lanthanum.nitidus<petrophilus.minutilla, julianae.sumatrana>, Lanthanum.jugularis> {
-                                               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                        ~~~~~~~~~~
+!!! error TS2449: Class 'johorensis' used before its declaration.
             bottegi(): macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni> { var x: macrorhinos.marmosurus<rendalli.moojeni<amphibius<trivirgatus.falconeri, caurinus.psilurus>, gabriellae.echinatus>, sagitta.stolzmanni>; () => { var y = this; }; return x; }
             jerdoni(): macrorhinos.daphaenodon { var x: macrorhinos.daphaenodon; () => { var y = this; }; return x; }
             camtschatica(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
@@ -487,8 +487,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module minutus {
         export class himalayana<T0, T1> extends lutreolus.punicus {
-                                                ~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                          ~~~~~~~
+!!! error TS2449: Class 'punicus' used before its declaration.
             simoni(): argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>> { var x: argurus.netscheri<lavali.lepturus, argurus.dauricus<argurus.oreas, quasiater.carolinensis>>; () => { var y = this; }; return x; }
             lobata(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
             rusticus(): dogramacii.aurata { var x: dogramacii.aurata; () => { var y = this; }; return x; }
@@ -522,8 +522,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module howi {
         export class angulatus<T0, T1> extends sagitta.stolzmanni {
-                                               ~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                       ~~~~~~~~~~
+!!! error TS2449: Class 'stolzmanni' used before its declaration.
             pennatus(): howi.marcanoi { var x: howi.marcanoi; () => { var y = this; }; return x; }
         }
     }
@@ -545,22 +545,22 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module sagitta {
         export class walkeri extends minutus.portoricensis {
-                                     ~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                             ~~~~~~~~~~~~~
+!!! error TS2449: Class 'portoricensis' used before its declaration.
             maracajuensis(): samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus> { var x: samarensis.cahirinus<Lanthanum.jugularis, ruatanica.americanus>; () => { var y = this; }; return x; }
         }
     }
     module minutus {
         export class inez<T0, T1> extends samarensis.pelurus<argurus.germaini, julianae.durangae> {
-                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                     ~~~~~~~
+!!! error TS2449: Class 'pelurus' used before its declaration.
             vexillaris(): samarensis.cahirinus<lavali.lepturus, lavali.wilsoni> { var x: samarensis.cahirinus<lavali.lepturus, lavali.wilsoni>; () => { var y = this; }; return x; }
         }
     }
     module macrorhinos {
         export class konganensis extends imperfecta.lasiurus<caurinus.psilurus, caurinus.psilurus> {
-                                         ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                    ~~~~~~~~
+!!! error TS2449: Class 'lasiurus' used before its declaration.
         }
     }
     module panamensis {
@@ -595,8 +595,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module samarensis {
         export class pelurus<T0, T1> extends sagitta.stolzmanni {
-                                             ~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                     ~~~~~~~~~~
+!!! error TS2449: Class 'stolzmanni' used before its declaration.
             Palladium(): panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer> { var x: panamensis.linulus<macrorhinos.konganensis, rionegrensis.caniventer>; () => { var y = this; }; return x; }
             castanea(): argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>> { var x: argurus.netscheri<minutus.inez<argurus.peninsulae, julianae.nudicaudus>, julianae.oralis<lavali.xanthognathus, argurus.oreas>>; () => { var y = this; }; return x; }
             chamek(): argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca> { var x: argurus.pygmaea<julianae.galapagoensis, provocax.melanoleuca>; () => { var y = this; }; return x; }
@@ -612,8 +612,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
             olitor(): rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi> { var x: rionegrensis.veraecrucis<lavali.xanthognathus, quasiater.bobrinskoi>; () => { var y = this; }; return x; }
         }
         export class fuscus<T0, T1> extends macrorhinos.daphaenodon {
-                                            ~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                        ~~~~~~~~~~~
+!!! error TS2449: Class 'daphaenodon' used before its declaration.
             planifrons(): nigra.gracilis<julianae.nudicaudus, dogramacii.aurata> { var x: nigra.gracilis<julianae.nudicaudus, dogramacii.aurata>; () => { var y = this; }; return x; }
             badia(): julianae.sumatrana { var x: julianae.sumatrana; () => { var y = this; }; return x; }
             prymnolopha(): sagitta.walkeri { var x: sagitta.walkeri; () => { var y = this; }; return x; }
@@ -645,8 +645,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module sagitta {
         export class leptoceros<T0, T1> extends caurinus.johorensis<argurus.peninsulae, daubentonii.arboreus<argurus.germaini, sagitta.stolzmanni>> {
-                                                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                         ~~~~~~~~~~
+!!! error TS2449: Class 'johorensis' used before its declaration.
             victus(): rionegrensis.caniventer { var x: rionegrensis.caniventer; () => { var y = this; }; return x; }
             hoplomyoides(): panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>> { var x: panglima.fundatus<julianae.gerbillus<imperfecta.subspinosus, julianae.durangae>, nigra.gracilis<argurus.luctuosa, imperfecta.subspinosus>>; () => { var y = this; }; return x; }
             gratiosus(): lavali.lepturus { var x: lavali.lepturus; () => { var y = this; }; return x; }
@@ -656,8 +656,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module daubentonii {
         export class nigricans<T0, T1> extends sagitta.stolzmanni {
-                                               ~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                       ~~~~~~~~~~
+!!! error TS2449: Class 'stolzmanni' used before its declaration.
             woosnami(): dogramacii.robustulus { var x: dogramacii.robustulus; () => { var y = this; }; return x; }
         }
     }
@@ -674,8 +674,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module chrysaeolus {
         export class sarasinorum<T0, T1> extends caurinus.psilurus {
-                                                 ~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                          ~~~~~~~~
+!!! error TS2449: Class 'psilurus' used before its declaration.
             belzebul(): samarensis.pallidus { var x: samarensis.pallidus; () => { var y = this; }; return x; }
             hinpoon(): nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli> { var x: nigra.caucasica<julianae.sumatrana, trivirgatus.oconnelli>; () => { var y = this; }; return x; }
             kandti(): quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana> { var x: quasiater.wattsi<Lanthanum.jugularis, julianae.sumatrana>; () => { var y = this; }; return x; }
@@ -840,8 +840,8 @@ tests/cases/compiler/resolvingClassDeclarationWhenInBaseTypeResolution.ts(769,42
     }
     module gabriellae {
         export class klossii<T0, T1> extends imperfecta.lasiurus<dogramacii.robustulus, caurinus.psilurus> {
-                                             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-!!! error TS2690: A class must be declared after its base class.
+                                                        ~~~~~~~~
+!!! error TS2449: Class 'lasiurus' used before its declaration.
         }
         export class amicus {
             pirrensis(): argurus.luctuosa { var x: argurus.luctuosa; () => { var y = this; }; return x; }
diff --git a/tests/baselines/reference/symbolProperty33.errors.txt b/tests/baselines/reference/symbolProperty33.errors.txt
index b1dab90db33..a8e95fc5bd8 100644
--- a/tests/baselines/reference/symbolProperty33.errors.txt
+++ b/tests/baselines/reference/symbolProperty33.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/es6/Symbols/symbolProperty33.ts(1,18): error TS2690: A class must be declared after its base class.
+tests/cases/conformance/es6/Symbols/symbolProperty33.ts(1,18): error TS2449: Class 'C2' used before its declaration.
 tests/cases/conformance/es6/Symbols/symbolProperty33.ts(7,6): error TS1023: An index signature parameter type must be 'string' or 'number'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty33.ts (2 errors) ====
     class C1 extends C2 {
                      ~~
-!!! error TS2690: A class must be declared after its base class.
+!!! error TS2449: Class 'C2' used before its declaration.
         [Symbol.toStringTag]() {
             return { x: "" };
         }
diff --git a/tests/baselines/reference/symbolProperty34.errors.txt b/tests/baselines/reference/symbolProperty34.errors.txt
index 98a9875bd50..3ff62c12ad1 100644
--- a/tests/baselines/reference/symbolProperty34.errors.txt
+++ b/tests/baselines/reference/symbolProperty34.errors.txt
@@ -1,11 +1,11 @@
-tests/cases/conformance/es6/Symbols/symbolProperty34.ts(1,18): error TS2690: A class must be declared after its base class.
+tests/cases/conformance/es6/Symbols/symbolProperty34.ts(1,18): error TS2449: Class 'C2' used before its declaration.
 tests/cases/conformance/es6/Symbols/symbolProperty34.ts(7,6): error TS1023: An index signature parameter type must be 'string' or 'number'.
 
 
 ==== tests/cases/conformance/es6/Symbols/symbolProperty34.ts (2 errors) ====
     class C1 extends C2 {
                      ~~
-!!! error TS2690: A class must be declared after its base class.
+!!! error TS2449: Class 'C2' used before its declaration.
         [Symbol.toStringTag]() {
             return { x: "" };
         }