diff --git a/packages/flutter/lib/src/material/date_picker.dart b/packages/flutter/lib/src/material/date_picker.dart
index 8df5a45e5e..6e09578e48 100644
--- a/packages/flutter/lib/src/material/date_picker.dart
+++ b/packages/flutter/lib/src/material/date_picker.dart
@@ -6,13 +6,14 @@ import 'dart:async';
 
 import 'package:intl/date_symbols.dart';
 import 'package:intl/intl.dart';
-import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/services.dart';
 import 'package:sky/widgets.dart';
 
+import 'colors.dart';
 import 'ink_well.dart';
 import 'theme.dart';
+import 'typography.dart';
 
 typedef void DatePickerValueChanged(DateTime dateTime);
 
diff --git a/packages/flutter/lib/src/material/dialog.dart b/packages/flutter/lib/src/material/dialog.dart
index 534ec6e5be..a3064fe5b2 100644
--- a/packages/flutter/lib/src/material/dialog.dart
+++ b/packages/flutter/lib/src/material/dialog.dart
@@ -6,11 +6,11 @@ import 'dart:async';
 
 import 'package:sky/animation.dart';
 import 'package:sky/gestures.dart';
-import 'package:sky/material.dart';
 import 'package:sky/widgets.dart';
 
-import 'material.dart';
+import 'colors.dart';
 import 'material_button.dart';
+import 'material.dart';
 import 'theme.dart';
 
 typedef Widget DialogBuilder(NavigatorState navigator);
diff --git a/packages/flutter/lib/src/material/drawer.dart b/packages/flutter/lib/src/material/drawer.dart
index fed362e566..12ebda6b09 100644
--- a/packages/flutter/lib/src/material/drawer.dart
+++ b/packages/flutter/lib/src/material/drawer.dart
@@ -3,9 +3,10 @@
 // found in the LICENSE file.
 
 import 'package:sky/animation.dart';
-import 'package:sky/material.dart';
 import 'package:sky/widgets.dart';
 
+import 'colors.dart';
+import 'shadows.dart';
 import 'theme.dart';
 
 // TODO(eseidel): Draw width should vary based on device size:
diff --git a/packages/flutter/lib/src/material/drawer_header.dart b/packages/flutter/lib/src/material/drawer_header.dart
index 45ae13728e..e95f1b039d 100644
--- a/packages/flutter/lib/src/material/drawer_header.dart
+++ b/packages/flutter/lib/src/material/drawer_header.dart
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/material.dart';
 import 'package:sky/widgets.dart';
 
+import 'constants.dart';
 import 'theme.dart';
 
 // TODO(jackson): This class should usually render the user's
diff --git a/packages/flutter/lib/src/material/drawer_item.dart b/packages/flutter/lib/src/material/drawer_item.dart
index bf5fd3035e..ac11f1900b 100644
--- a/packages/flutter/lib/src/material/drawer_item.dart
+++ b/packages/flutter/lib/src/material/drawer_item.dart
@@ -5,10 +5,10 @@
 import 'dart:sky' as sky;
 
 import 'package:sky/gestures.dart';
-import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/widgets.dart';
 
+import 'colors.dart';
 import 'icon.dart';
 import 'ink_well.dart';
 import 'theme.dart';
diff --git a/packages/flutter/lib/src/material/flat_button.dart b/packages/flutter/lib/src/material/flat_button.dart
index b87e7d1b3c..0737afa760 100644
--- a/packages/flutter/lib/src/material/flat_button.dart
+++ b/packages/flutter/lib/src/material/flat_button.dart
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:sky/gestures.dart';
-import 'package:sky/material.dart';
 import 'package:sky/widgets.dart';
 
+import 'colors.dart';
 import 'material_button.dart';
 import 'theme.dart';
 
diff --git a/packages/flutter/lib/src/material/material.dart b/packages/flutter/lib/src/material/material.dart
index 375a436d51..614dd0d2a3 100644
--- a/packages/flutter/lib/src/material/material.dart
+++ b/packages/flutter/lib/src/material/material.dart
@@ -4,9 +4,10 @@
 
 import 'package:sky/animation.dart';
 import 'package:sky/painting.dart';
-import 'package:sky/material.dart';
 import 'package:sky/widgets.dart';
 
+import 'constants.dart';
+import 'shadows.dart';
 import 'theme.dart';
 
 enum MaterialType { canvas, card, circle, button }
diff --git a/packages/flutter/lib/src/material/material_app.dart b/packages/flutter/lib/src/material/material_app.dart
index 8076d94f1d..704d06c23e 100644
--- a/packages/flutter/lib/src/material/material_app.dart
+++ b/packages/flutter/lib/src/material/material_app.dart
@@ -4,7 +4,6 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/services.dart';
 import 'package:sky/widgets.dart';
diff --git a/packages/flutter/lib/src/material/material_button.dart b/packages/flutter/lib/src/material/material_button.dart
index 4db52a39b3..23f28e9353 100644
--- a/packages/flutter/lib/src/material/material_button.dart
+++ b/packages/flutter/lib/src/material/material_button.dart
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:sky/gestures.dart';
-import 'package:sky/material.dart';
 import 'package:sky/widgets.dart';
 
+import 'colors.dart';
 import 'ink_well.dart';
 import 'material.dart';
 import 'theme.dart';
diff --git a/packages/flutter/lib/src/material/popup_menu.dart b/packages/flutter/lib/src/material/popup_menu.dart
index 6b1922bdac..373ef046ee 100644
--- a/packages/flutter/lib/src/material/popup_menu.dart
+++ b/packages/flutter/lib/src/material/popup_menu.dart
@@ -6,12 +6,12 @@ import 'dart:async';
 import 'dart:sky' as sky;
 
 import 'package:sky/animation.dart';
-import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/widgets.dart';
 
 import 'ink_well.dart';
 import 'popup_menu_item.dart';
+import 'shadows.dart';
 import 'theme.dart';
 
 const Duration _kMenuDuration = const Duration(milliseconds: 300);
diff --git a/packages/flutter/lib/src/material/raised_button.dart b/packages/flutter/lib/src/material/raised_button.dart
index 3484f6c8a7..a41b8624ac 100644
--- a/packages/flutter/lib/src/material/raised_button.dart
+++ b/packages/flutter/lib/src/material/raised_button.dart
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import 'package:sky/gestures.dart';
-import 'package:sky/material.dart';
 import 'package:sky/widgets.dart';
 
+import 'colors.dart';
 import 'material_button.dart';
 import 'theme.dart';
 
diff --git a/packages/flutter/lib/src/material/scaffold.dart b/packages/flutter/lib/src/material/scaffold.dart
index fb65a23884..76fbb5e84d 100644
--- a/packages/flutter/lib/src/material/scaffold.dart
+++ b/packages/flutter/lib/src/material/scaffold.dart
@@ -4,10 +4,11 @@
 
 import 'dart:sky' as sky;
 
-import 'package:sky/material.dart';
 import 'package:sky/rendering.dart';
 import 'package:sky/widgets.dart';
 
+import 'constants.dart';
+
 class Scaffold extends StatelessComponent {
   Scaffold({
     Key key,
diff --git a/packages/flutter/lib/src/material/snack_bar.dart b/packages/flutter/lib/src/material/snack_bar.dart
index bc66cceb01..7c663fecd2 100644
--- a/packages/flutter/lib/src/material/snack_bar.dart
+++ b/packages/flutter/lib/src/material/snack_bar.dart
@@ -4,12 +4,13 @@
 
 import 'package:sky/animation.dart';
 import 'package:sky/gestures.dart';
-import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/widgets.dart';
 
+import 'constants.dart';
 import 'material.dart';
 import 'theme.dart';
+import 'typography.dart';
 
 const double _kSideMargins = 24.0;
 const double _kVerticalPadding = 14.0;
diff --git a/packages/flutter/lib/src/material/tool_bar.dart b/packages/flutter/lib/src/material/tool_bar.dart
index 16fc3398a8..6be4c60d65 100644
--- a/packages/flutter/lib/src/material/tool_bar.dart
+++ b/packages/flutter/lib/src/material/tool_bar.dart
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:sky/material.dart';
 import 'package:sky/painting.dart';
 import 'package:sky/widgets.dart';
 
+import 'constants.dart';
 import 'icon.dart';
+import 'shadows.dart';
 import 'theme.dart';
+import 'typography.dart';
 
 class ToolBar extends StatelessComponent {
   ToolBar({