| Index: pkg/compiler/lib/src/elements/elements.dart | 
| diff --git a/pkg/compiler/lib/src/elements/elements.dart b/pkg/compiler/lib/src/elements/elements.dart | 
| index 92bb2a109d43340a5d3b28b1b87ea739024a1df9..dda1436ff3e5a8530a877491745c8a299196b54d 100644 | 
| --- a/pkg/compiler/lib/src/elements/elements.dart | 
| +++ b/pkg/compiler/lib/src/elements/elements.dart | 
| @@ -10,12 +10,12 @@ import '../compiler.dart' show | 
| import '../constants/constructors.dart'; | 
| import '../constants/expressions.dart'; | 
| import '../dart_types.dart'; | 
| -import '../diagnostic_listener.dart'; | 
| +import '../diagnostics/diagnostic_listener.dart'; | 
| +import '../diagnostics/messages.dart' show MessageKind; | 
| import '../diagnostics/source_span.dart' show | 
| SourceSpan; | 
| import '../diagnostics/spannable.dart' show | 
| Spannable; | 
| -import '../messages.dart' show MessageKind; | 
| import '../resolution/resolution.dart'; | 
| import '../ordered_typeset.dart' show OrderedTypeSet; | 
| import '../scanner/scannerlib.dart' show | 
|  |