diff --git a/src/material/_theming.scss b/src/material/_theming.scss
index 082f6126db5a..dff455128b0f 100644
--- a/src/material/_theming.scss
+++ b/src/material/_theming.scss
@@ -2,7 +2,42 @@
 // Note that we have to forward the `.import` files for backwards-compatibility with
 // projects that don't use Sass modules and include the `mat-`-prefixed mixins.
 
-@forward './core/color/all-color.import';
-@forward './core/density/private/all-density.import';
-@forward './core/theming/all-theme.import';
-@forward './core/typography/all-typography.import';
+@forward '../cdk/a11y/index.import';
+@forward '../cdk/overlay/index.import';
+@forward '../cdk/text-field/index.import';
+
+@forward './core/core-legacy-index';
+@forward './autocomplete/autocomplete-legacy-index';
+@forward './badge/badge-legacy-index';
+@forward './bottom-sheet/bottom-sheet-legacy-index';
+@forward './button-toggle/button-toggle-legacy-index';
+@forward './button/button-legacy-index';
+@forward './card/card-legacy-index';
+@forward './checkbox/checkbox-legacy-index';
+@forward './chips/chips-legacy-index';
+@forward './datepicker/datepicker-legacy-index';
+@forward './dialog/dialog-legacy-index';
+@forward './divider/divider-legacy-index';
+@forward './expansion/expansion-legacy-index';
+@forward './form-field/form-field-legacy-index';
+@forward './grid-list/grid-list-legacy-index';
+@forward './icon/icon-legacy-index';
+@forward './input/input-legacy-index';
+@forward './list/list-legacy-index';
+@forward './menu/menu-legacy-index';
+@forward './paginator/paginator-legacy-index';
+@forward './progress-bar/progress-bar-legacy-index';
+@forward './progress-spinner/progress-spinner-legacy-index';
+@forward './radio/radio-legacy-index';
+@forward './select/select-legacy-index';
+@forward './sidenav/sidenav-legacy-index';
+@forward './slide-toggle/slide-toggle-legacy-index';
+@forward './slider/slider-legacy-index';
+@forward './snack-bar/snack-bar-legacy-index';
+@forward './sort/sort-legacy-index';
+@forward './stepper/stepper-legacy-index';
+@forward './table/table-legacy-index';
+@forward './tabs/tabs-legacy-index';
+@forward './toolbar/toolbar-legacy-index';
+@forward './tooltip/tooltip-legacy-index';
+@forward './tree/tree-legacy-index';
diff --git a/src/material/autocomplete/_autocomplete-legacy-index.scss b/src/material/autocomplete/_autocomplete-legacy-index.scss
new file mode 100644
index 000000000000..677f21160802
--- /dev/null
+++ b/src/material/autocomplete/_autocomplete-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'autocomplete-theme' hide color, theme, typography;
+@forward 'autocomplete-theme' as mat-autocomplete-* hide mat-autocomplete-density;
diff --git a/src/material/autocomplete/_autocomplete-theme.import.scss b/src/material/autocomplete/_autocomplete-theme.import.scss
index a0833d90ec77..709af0776d8b 100644
--- a/src/material/autocomplete/_autocomplete-theme.import.scss
+++ b/src/material/autocomplete/_autocomplete-theme.import.scss
@@ -1,7 +1,6 @@
 @forward '../core/style/private.import';
 @forward '../core/theming/theming.import';
-@forward 'autocomplete-theme' hide color, theme, typography;
-@forward 'autocomplete-theme' as mat-autocomplete-* hide mat-autocomplete-density;
+@forward './autocomplete-legacy-index';
 
 @import '../core/style/private';
 @import '../core/theming/theming';
diff --git a/src/material/badge/_badge-legacy-index.scss b/src/material/badge/_badge-legacy-index.scss
new file mode 100644
index 000000000000..ff49f165a35f
--- /dev/null
+++ b/src/material/badge/_badge-legacy-index.scss
@@ -0,0 +1,3 @@
+@forward 'badge-theme' hide $default-size, $font-size, $font-weight, $large-size, $small-size,
+color, theme, typography;
+@forward 'badge-theme' as mat-badge-* hide mat-badge-density, mat-badge-size;
diff --git a/src/material/badge/_badge-theme.import.scss b/src/material/badge/_badge-theme.import.scss
index 653f5925701c..093060f842d1 100644
--- a/src/material/badge/_badge-theme.import.scss
+++ b/src/material/badge/_badge-theme.import.scss
@@ -1,9 +1,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
 @forward '../../cdk/a11y/index.import';
-@forward 'badge-theme' hide $default-size, $font-size, $font-weight, $large-size, $small-size,
-color, theme, typography;
-@forward 'badge-theme' as mat-badge-* hide mat-badge-density, mat-badge-size;
+@forward './badge-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/bottom-sheet/_bottom-sheet-legacy-index.scss b/src/material/bottom-sheet/_bottom-sheet-legacy-index.scss
new file mode 100644
index 000000000000..0039f4c980a1
--- /dev/null
+++ b/src/material/bottom-sheet/_bottom-sheet-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'bottom-sheet-theme' hide color, theme, typography;
+@forward 'bottom-sheet-theme' as mat-bottom-sheet-* hide mat-bottom-sheet-density;
diff --git a/src/material/bottom-sheet/_bottom-sheet-theme.import.scss b/src/material/bottom-sheet/_bottom-sheet-theme.import.scss
index 3dec4322c29b..31c9a1c12ace 100644
--- a/src/material/bottom-sheet/_bottom-sheet-theme.import.scss
+++ b/src/material/bottom-sheet/_bottom-sheet-theme.import.scss
@@ -1,8 +1,7 @@
 @forward '../core/style/private.import';
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'bottom-sheet-theme' hide color, theme, typography;
-@forward 'bottom-sheet-theme' as mat-bottom-sheet-* hide mat-bottom-sheet-density;
+@forward './bottom-sheet-legacy-index';
 
 @import '../core/style/private';
 @import '../core/typography/typography-utils';
diff --git a/src/material/button-toggle/_button-toggle-legacy-index.scss b/src/material/button-toggle/_button-toggle-legacy-index.scss
new file mode 100644
index 000000000000..6dc79dfc9423
--- /dev/null
+++ b/src/material/button-toggle/_button-toggle-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'button-toggle-variables' as mat-button-toggle-*;
+@forward 'button-toggle-theme' as mat-button-toggle-*;
diff --git a/src/material/button-toggle/_button-toggle-theme.import.scss b/src/material/button-toggle/_button-toggle-theme.import.scss
index f5c81d68d29c..6530b25af604 100644
--- a/src/material/button-toggle/_button-toggle-theme.import.scss
+++ b/src/material/button-toggle/_button-toggle-theme.import.scss
@@ -1,10 +1,9 @@
 @forward '../core/style/private.import';
 @forward '../core/theming/theming.import';
 @forward '../core/density/private/compatibility.import';
-@forward 'button-toggle-variables' as mat-button-toggle-*;
 @forward '../../cdk/a11y/index.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'button-toggle-theme' as mat-button-toggle-*;
+@forward './button-toggle-legacy-index';
 
 @import '../../cdk/a11y';
 @import '../core/style/private';
diff --git a/src/material/button/_button-base.import.scss b/src/material/button/_button-base.import.scss
index 52ec6868bf1d..e5b0f496d224 100644
--- a/src/material/button/_button-base.import.scss
+++ b/src/material/button/_button-base.import.scss
@@ -1,19 +1,6 @@
 @forward '../core/style/private.import';
 @forward '../core/style/button-common.import';
-@forward 'button-base' as mat-* hide $mat-border-radius, $mat-button-border-radius,
-$mat-button-line-height, $mat-button-size, $mat-focus-transition, $mat-line-height, $mat-margin,
-$mat-min-width, $mat-padding, mat-base;
-@forward 'button-base' as mat-button-* hide $mat-button-button-border-radius,
-$mat-button-button-line-height, $mat-button-button-size, $mat-button-fab-border-radius,
-$mat-button-fab-padding, $mat-button-fab-size, $mat-button-mini-fab-padding,
-$mat-button-mini-fab-size, $mat-button-stroked-button-border-width,
-$mat-button-stroked-button-line-height, $mat-button-stroked-button-padding, mat-button-fab,
-mat-button-raised-button;
-@forward 'button-base' as mat-icon-* hide $mat-icon-border-radius, $mat-icon-fab-border-radius,
-$mat-icon-fab-padding, $mat-icon-fab-size, $mat-icon-focus-transition, $mat-icon-line-height,
-$mat-icon-margin, $mat-icon-min-width, $mat-icon-mini-fab-padding, $mat-icon-mini-fab-size,
-$mat-icon-padding, $mat-icon-stroked-button-border-width, $mat-icon-stroked-button-line-height,
-$mat-icon-stroked-button-padding, mat-icon-base, mat-icon-fab, mat-icon-raised-button;
+@forward './button-legacy-index';
 
 @import '../core/style/variables';
 @import '../core/style/elevation';
diff --git a/src/material/button/_button-legacy-index.scss b/src/material/button/_button-legacy-index.scss
new file mode 100644
index 000000000000..4b9d85420b31
--- /dev/null
+++ b/src/material/button/_button-legacy-index.scss
@@ -0,0 +1,19 @@
+@forward 'button-theme' hide color, theme, typography;
+@forward 'button-theme' as mat-button-* hide $mat-button-ripple-opacity, mat-button-density,
+mat-button-focus-overlay-color, mat-button-ripple-background, mat-button-ripple-color,
+mat-button-theme-property;
+
+@forward 'button-base' as mat-* hide $mat-border-radius, $mat-button-border-radius,
+$mat-button-line-height, $mat-button-size, $mat-focus-transition, $mat-line-height, $mat-margin,
+$mat-min-width, $mat-padding, mat-base;
+@forward 'button-base' as mat-button-* hide $mat-button-button-border-radius,
+$mat-button-button-line-height, $mat-button-button-size, $mat-button-fab-border-radius,
+$mat-button-fab-padding, $mat-button-fab-size, $mat-button-mini-fab-padding,
+$mat-button-mini-fab-size, $mat-button-stroked-button-border-width,
+$mat-button-stroked-button-line-height, $mat-button-stroked-button-padding, mat-button-fab,
+mat-button-raised-button;
+@forward 'button-base' as mat-icon-* hide $mat-icon-border-radius, $mat-icon-fab-border-radius,
+$mat-icon-fab-padding, $mat-icon-fab-size, $mat-icon-focus-transition, $mat-icon-line-height,
+$mat-icon-margin, $mat-icon-min-width, $mat-icon-mini-fab-padding, $mat-icon-mini-fab-size,
+$mat-icon-padding, $mat-icon-stroked-button-border-width, $mat-icon-stroked-button-line-height,
+$mat-icon-stroked-button-padding, mat-icon-base, mat-icon-fab, mat-icon-raised-button;
diff --git a/src/material/button/_button-theme.import.scss b/src/material/button/_button-theme.import.scss
index a77aad6a26a3..5fd81e09cf79 100644
--- a/src/material/button/_button-theme.import.scss
+++ b/src/material/button/_button-theme.import.scss
@@ -1,10 +1,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/style/private.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'button-theme' hide color, theme, typography;
-@forward 'button-theme' as mat-button-* hide $mat-button-ripple-opacity, mat-button-density,
-mat-button-focus-overlay-color, mat-button-ripple-background, mat-button-ripple-color,
-mat-button-theme-property;
+@forward './button-legacy-index';
 
 @import '../core/theming/theming';
 @import '../core/style/private';
diff --git a/src/material/card/_card-legacy-index.scss b/src/material/card/_card-legacy-index.scss
new file mode 100644
index 000000000000..77a45aa32e96
--- /dev/null
+++ b/src/material/card/_card-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'card-theme' hide color, theme, typography;
+@forward 'card-theme' as mat-card-* hide mat-card-density;
diff --git a/src/material/card/_card-theme.import.scss b/src/material/card/_card-theme.import.scss
index 71ff57e208a6..d117465a9e39 100644
--- a/src/material/card/_card-theme.import.scss
+++ b/src/material/card/_card-theme.import.scss
@@ -1,8 +1,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/style/private.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'card-theme' hide color, theme, typography;
-@forward 'card-theme' as mat-card-* hide mat-card-density;
+@forward './card-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/checkbox/_checkbox-legacy-index.scss b/src/material/checkbox/_checkbox-legacy-index.scss
new file mode 100644
index 000000000000..7b345d21f101
--- /dev/null
+++ b/src/material/checkbox/_checkbox-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'checkbox-theme' hide color, theme, typography;
+@forward 'checkbox-theme' as mat-checkbox-* hide mat-checkbox-density;
diff --git a/src/material/checkbox/_checkbox-theme.import.scss b/src/material/checkbox/_checkbox-theme.import.scss
index 13bf2ce0d1d0..ed183e6f1d34 100644
--- a/src/material/checkbox/_checkbox-theme.import.scss
+++ b/src/material/checkbox/_checkbox-theme.import.scss
@@ -1,7 +1,6 @@
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'checkbox-theme' hide color, theme, typography;
-@forward 'checkbox-theme' as mat-checkbox-* hide mat-checkbox-density;
+@forward './checkbox-legacy-index';
 
 @import '../core/theming/theming';
 @import '../core/typography/typography-utils';
diff --git a/src/material/chips/_chips-legacy-index.scss b/src/material/chips/_chips-legacy-index.scss
new file mode 100644
index 000000000000..78d51b9a76f4
--- /dev/null
+++ b/src/material/chips/_chips-legacy-index.scss
@@ -0,0 +1,6 @@
+@forward 'chips-theme' hide $chip-remove-font-size, color, theme, typography;
+@forward 'chips-theme' as mat-* hide mat-chip-element-color, mat-chip-theme-color, mat-color,
+mat-density, mat-ripple-background, mat-theme, mat-typography;
+@forward 'chips-theme' as mat-chips-* hide $mat-chips-chip-remove-font-size,
+mat-chips-chip-element-color, mat-chips-chip-theme-color, mat-chips-density,
+mat-chips-ripple-background;
diff --git a/src/material/chips/_chips-theme.import.scss b/src/material/chips/_chips-theme.import.scss
index a03aa8abd053..bb3342c8df9d 100644
--- a/src/material/chips/_chips-theme.import.scss
+++ b/src/material/chips/_chips-theme.import.scss
@@ -1,12 +1,7 @@
 @forward '../core/style/private.import';
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'chips-theme' hide $chip-remove-font-size, color, theme, typography;
-@forward 'chips-theme' as mat-* hide mat-chip-element-color, mat-chip-theme-color, mat-color,
-mat-density, mat-ripple-background, mat-theme, mat-typography;
-@forward 'chips-theme' as mat-chips-* hide $mat-chips-chip-remove-font-size,
-mat-chips-chip-element-color, mat-chips-chip-theme-color, mat-chips-density,
-mat-chips-ripple-background;
+@forward './chips-legacy-index';
 
 @import '../core/style/private';
 @import '../core/theming/palette';
diff --git a/src/material/core/_core-legacy-index.scss b/src/material/core/_core-legacy-index.scss
new file mode 100644
index 000000000000..89c8140deb7c
--- /dev/null
+++ b/src/material/core/_core-legacy-index.scss
@@ -0,0 +1,18 @@
+@forward 'core' hide core;
+@forward 'core-theme' hide color, theme;
+@forward 'core' as mat-* hide mat-mdc-core, mat-mdc-strong-focus-indicators-positioning;
+@forward 'core-theme' as mat-* hide mat-color, mat-theme;
+@forward 'core' as mat-core-* hide mat-core-mdc-core,
+mat-core-mdc-strong-focus-indicators-positioning;
+@forward 'core-theme' as mat-core-*;
+
+@forward './theming/all-theme';
+@forward './color/color-legacy-index';
+@forward './density/private/density-legacy-index';
+@forward './focus-indicators/focus-indicators-legacy-index';
+@forward './option/option-legacy-index';
+@forward './ripple/ripple-legacy-index';
+@forward './selection/pseudo-checkbox/pseudo-checkbox-legacy-index';
+@forward './style/style-legacy-index';
+@forward './theming/theming-legacy-index';
+@forward './typography/typography-legacy-index';
diff --git a/src/material/core/_core.import.scss b/src/material/core/_core.import.scss
index 47828eb6d0fe..d1d9071f7b27 100644
--- a/src/material/core/_core.import.scss
+++ b/src/material/core/_core.import.scss
@@ -41,13 +41,7 @@
 @forward '../sort/sort-theme.import';
 @forward '../tabs/tabs-theme.import';
 @forward 'typography/all-typography';
-@forward 'core' hide core;
-@forward 'core-theme' hide color, theme;
-@forward 'core' as mat-* hide mat-mdc-core, mat-mdc-strong-focus-indicators-positioning;
-@forward 'core-theme' as mat-* hide mat-color, mat-theme;
-@forward 'core' as mat-core-* hide mat-core-mdc-core,
-mat-core-mdc-strong-focus-indicators-positioning;
-@forward 'core-theme' as mat-core-*;
+@forward './core-legacy-index';
 
 @import '../../cdk/overlay';
 @import '../../cdk/a11y';
diff --git a/src/material/core/color/_all-color.import.scss b/src/material/core/color/_all-color.import.scss
index 3a2579da41f9..03cc7ef0549e 100644
--- a/src/material/core/color/_all-color.import.scss
+++ b/src/material/core/color/_all-color.import.scss
@@ -47,7 +47,7 @@
 @forward '../core' as mat-core-* hide mat-core-core;
 @forward '../core-theme' as mat-core-*;
 @forward '../theming/all-theme';
-@forward 'all-color';
+@forward './color-legacy-index';
 
 @import '../theming/all-theme';
 @import '../theming/theming';
diff --git a/src/material/core/color/_color-legacy-index.scss b/src/material/core/color/_color-legacy-index.scss
new file mode 100644
index 000000000000..4cfab5bc9dbe
--- /dev/null
+++ b/src/material/core/color/_color-legacy-index.scss
@@ -0,0 +1 @@
+@forward 'all-color';
diff --git a/src/material/core/density/private/_all-density.import.scss b/src/material/core/density/private/_all-density.import.scss
index fe9ebd5a3925..a3247e6481a1 100644
--- a/src/material/core/density/private/_all-density.import.scss
+++ b/src/material/core/density/private/_all-density.import.scss
@@ -5,7 +5,7 @@
 @forward '../../../tree/tree-theme.import';
 @forward '../../../paginator/paginator-theme.import';
 @forward '../../../form-field/form-field-theme.import';
-@forward 'all-density' hide all-component-densities;
+@forward './density-legacy-index';
 
 @import '../../theming/theming';
 @import '../../../expansion/expansion-theme';
diff --git a/src/material/core/density/private/_compatibility.import.scss b/src/material/core/density/private/_compatibility.import.scss
index f68d97510308..f6784df90bcb 100644
--- a/src/material/core/density/private/_compatibility.import.scss
+++ b/src/material/core/density/private/_compatibility.import.scss
@@ -1,4 +1 @@
-@forward 'compatibility' hide $private-density-generate-at-root, $private-density-generate-styles,
-private-density-legacy-compatibility, private-density-prop-value;
-@forward 'compatibility' as mat-* hide $mat-default-scale, $mat-interval, $mat-maximum-scale,
-$mat-minimum-scale, $mat-supported-scales;
+@forward './density-legacy-index';
diff --git a/src/material/core/density/private/_density-legacy-index.scss b/src/material/core/density/private/_density-legacy-index.scss
new file mode 100644
index 000000000000..4f314409dcc9
--- /dev/null
+++ b/src/material/core/density/private/_density-legacy-index.scss
@@ -0,0 +1,5 @@
+@forward 'all-density' hide all-component-densities;
+@forward 'compatibility' hide $private-density-generate-at-root, $private-density-generate-styles,
+private-density-legacy-compatibility, private-density-prop-value;
+@forward 'compatibility' as mat-* hide $mat-default-scale, $mat-interval, $mat-maximum-scale,
+$mat-minimum-scale, $mat-supported-scales;
diff --git a/src/material/core/focus-indicators/_focus-indicators-legacy-index.scss b/src/material/core/focus-indicators/_focus-indicators-legacy-index.scss
new file mode 100644
index 000000000000..491992a52872
--- /dev/null
+++ b/src/material/core/focus-indicators/_focus-indicators-legacy-index.scss
@@ -0,0 +1,5 @@
+@forward 'focus-indicators' hide private-strong-focus-indicators-positioning,
+strong-focus-indicators;
+@forward 'focus-indicators-theme' hide color, theme;
+@forward 'focus-indicators' as mat-*;
+@forward 'focus-indicators-theme' as mat-strong-focus-indicators-*;
diff --git a/src/material/core/focus-indicators/_focus-indicators.import.scss b/src/material/core/focus-indicators/_focus-indicators.import.scss
index 6482e0959bf2..04674c9b02c8 100644
--- a/src/material/core/focus-indicators/_focus-indicators.import.scss
+++ b/src/material/core/focus-indicators/_focus-indicators.import.scss
@@ -12,11 +12,7 @@ $mat-white-6-opacity, $mat-white-87-opacity;
 @forward '../density/private/compatibility' as mat-*;
 @forward '../theming/theming' as mat-*;
 @forward '../style/layout-common' as mat-*;
-@forward 'focus-indicators' hide private-strong-focus-indicators-positioning,
-strong-focus-indicators;
-@forward 'focus-indicators-theme' hide color, theme;
-@forward 'focus-indicators' as mat-*;
-@forward 'focus-indicators-theme' as mat-strong-focus-indicators-*;
+@forward './focus-indicators-legacy-index';
 
 @import '../theming/theming';
 @import '../style/layout-common';
diff --git a/src/material/core/option/_optgroup-theme.import.scss b/src/material/core/option/_optgroup-theme.import.scss
index e82cba3a656b..da25d43cb577 100644
--- a/src/material/core/option/_optgroup-theme.import.scss
+++ b/src/material/core/option/_optgroup-theme.import.scss
@@ -19,8 +19,7 @@ mat-line-typography-level;
 @forward '../typography/typography-utils' as mat-typography-* hide mat-typography-font-family,
 mat-typography-font-size, mat-typography-font-weight, mat-typography-height,
 mat-typography-letter-spacing;
-@forward 'optgroup-theme' hide color, theme, typography;
-@forward 'optgroup-theme' as mat-optgroup-* hide mat-optgroup-density;
+@forward './option-legacy-index';
 
 @import '../theming/palette';
 @import '../theming/theming';
diff --git a/src/material/core/option/_option-legacy-index.scss b/src/material/core/option/_option-legacy-index.scss
new file mode 100644
index 000000000000..ec5247d6b68b
--- /dev/null
+++ b/src/material/core/option/_option-legacy-index.scss
@@ -0,0 +1,5 @@
+@forward 'option-theme' hide color, theme, typography;
+@forward 'option-theme' as mat-option-* hide mat-option-density;
+
+@forward 'optgroup-theme' hide color, theme, typography;
+@forward 'optgroup-theme' as mat-optgroup-* hide mat-optgroup-density;
diff --git a/src/material/core/option/_option-theme.import.scss b/src/material/core/option/_option-theme.import.scss
index 0f37a50d9e88..da25d43cb577 100644
--- a/src/material/core/option/_option-theme.import.scss
+++ b/src/material/core/option/_option-theme.import.scss
@@ -19,8 +19,7 @@ mat-line-typography-level;
 @forward '../typography/typography-utils' as mat-typography-* hide mat-typography-font-family,
 mat-typography-font-size, mat-typography-font-weight, mat-typography-height,
 mat-typography-letter-spacing;
-@forward 'option-theme' hide color, theme, typography;
-@forward 'option-theme' as mat-option-* hide mat-option-density;
+@forward './option-legacy-index';
 
 @import '../theming/palette';
 @import '../theming/theming';
diff --git a/src/material/core/ripple/_ripple-legacy-index.scss b/src/material/core/ripple/_ripple-legacy-index.scss
new file mode 100644
index 000000000000..d51b8ae3a522
--- /dev/null
+++ b/src/material/core/ripple/_ripple-legacy-index.scss
@@ -0,0 +1,3 @@
+@forward 'ripple' as mat-* hide $mat-color-opacity;
+@forward 'ripple' as mat-ripple-* hide mat-ripple-ripple;
+@forward 'ripple-theme' as mat-ripple-*;
diff --git a/src/material/core/ripple/_ripple.import.scss b/src/material/core/ripple/_ripple.import.scss
index ee7566d664d2..50628c388925 100644
--- a/src/material/core/ripple/_ripple.import.scss
+++ b/src/material/core/ripple/_ripple.import.scss
@@ -12,9 +12,7 @@ $mat-white-6-opacity, $mat-white-87-opacity;
 @forward '../density/private/compatibility' as mat-*;
 @forward '../theming/theming' as mat-*;
 @forward '../../../cdk/a11y/index.import';
-@forward 'ripple' as mat-* hide $mat-color-opacity;
-@forward 'ripple' as mat-ripple-* hide mat-ripple-ripple;
-@forward 'ripple-theme' as mat-ripple-*;
+@forward './ripple-legacy-index';
 
 @import '../theming/theming';
 @import '../../../cdk/a11y';
diff --git a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-legacy-index.scss b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-legacy-index.scss
new file mode 100644
index 000000000000..0be457b1ee57
--- /dev/null
+++ b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'pseudo-checkbox-theme' hide color, theme, typography;
+@forward 'pseudo-checkbox-theme' as mat-pseudo-checkbox-* hide mat-pseudo-checkbox-density;
diff --git a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss
index 827a272949e8..f7d8e4cd9aaa 100644
--- a/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss
+++ b/src/material/core/selection/pseudo-checkbox/_pseudo-checkbox-theme.import.scss
@@ -11,7 +11,6 @@ $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-whi
 $mat-white-6-opacity, $mat-white-87-opacity;
 @forward '../../density/private/compatibility' as mat-*;
 @forward '../../theming/theming' as mat-*;
-@forward 'pseudo-checkbox-theme' hide color, theme, typography;
-@forward 'pseudo-checkbox-theme' as mat-pseudo-checkbox-* hide mat-pseudo-checkbox-density;
+@forward './pseudo-checkbox-legacy-index';
 
 @import '../../theming/theming';
diff --git a/src/material/core/style/_button-common.import.scss b/src/material/core/style/_button-common.import.scss
index 092eeac484bc..ed55ad5003e8 100644
--- a/src/material/core/style/_button-common.import.scss
+++ b/src/material/core/style/_button-common.import.scss
@@ -1,4 +1,3 @@
-@forward 'vendor-prefixes';
-@forward 'button-common' as mat-button-*;
+@forward './style-legacy-index';
 
 @import './vendor-prefixes';
diff --git a/src/material/core/style/_checkbox-common.import.scss b/src/material/core/style/_checkbox-common.import.scss
index 2f12a6a12cdc..5080a7da98e4 100644
--- a/src/material/core/style/_checkbox-common.import.scss
+++ b/src/material/core/style/_checkbox-common.import.scss
@@ -1,11 +1,3 @@
-@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
-$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
-@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
-$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
-$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
-$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
-$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
-$mat-z-index-fab;
-@forward 'checkbox-common' as mat-checkbox-*;
+@forward './style-legacy-index';
 
 @import './variables';
diff --git a/src/material/core/style/_elevation.import.scss b/src/material/core/style/_elevation.import.scss
index 63d3fc138176..ef957a52d7f1 100644
--- a/src/material/core/style/_elevation.import.scss
+++ b/src/material/core/style/_elevation.import.scss
@@ -1,17 +1,3 @@
-@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
-$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
-@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
-$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
-$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
-$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
-$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
-$mat-z-index-fab;
-@forward 'elevation' hide $color, $opacity, $prefix, $transition-duration,
-$transition-timing-function, elevation, overridable-elevation, elevation-transition,
-private-transition-property-value;
-@forward 'elevation' as mat-* hide $mat-color, $mat-opacity, $mat-prefix, $mat-transition-duration,
-$mat-transition-timing-function, mat-get-ambient-map, mat-get-penumbra-map, mat-get-umbra-map;
-@forward 'elevation' as mat-elevation-* hide mat-elevation-elevation, mat-elevation-get-ambient-map,
-mat-elevation-get-penumbra-map, mat-elevation-get-umbra-map, mat-elevation-overridable-elevation;
+@forward './style-legacy-index';
 
 @import 'variables';
diff --git a/src/material/core/style/_form-common.import.scss b/src/material/core/style/_form-common.import.scss
index 7611d8844647..45a925b6b4e6 100644
--- a/src/material/core/style/_form-common.import.scss
+++ b/src/material/core/style/_form-common.import.scss
@@ -11,6 +11,6 @@ $mat-light-focused, $mat-light-primary-text, $mat-light-secondary-text, $mat-whi
 $mat-white-6-opacity, $mat-white-87-opacity;
 @forward '../density/private/compatibility' as mat-*;
 @forward '../theming/theming' as mat-*;
-@forward 'form-common' as mat-*;
+@forward './style-legacy-index';
 
 @import '../theming/theming';
diff --git a/src/material/core/style/_layout-common.import.scss b/src/material/core/style/_layout-common.import.scss
index 652b5d5efa52..76db941f8e3d 100644
--- a/src/material/core/style/_layout-common.import.scss
+++ b/src/material/core/style/_layout-common.import.scss
@@ -1 +1 @@
-@forward 'layout-common' as mat-*;
+@forward './style-legacy-index';
diff --git a/src/material/core/style/_list-common.import.scss b/src/material/core/style/_list-common.import.scss
index 6b641e614a11..76db941f8e3d 100644
--- a/src/material/core/style/_list-common.import.scss
+++ b/src/material/core/style/_list-common.import.scss
@@ -1,2 +1 @@
-@forward 'list-common' as mat-* hide mat-base, mat-wrapper-base;
-@forward 'list-common' as mat-line-* hide mat-line-normalize-text, mat-line-truncate-line;
+@forward './style-legacy-index';
diff --git a/src/material/core/style/_menu-common.import.scss b/src/material/core/style/_menu-common.import.scss
index c0c19d9bcf65..c3d68af10b4d 100644
--- a/src/material/core/style/_menu-common.import.scss
+++ b/src/material/core/style/_menu-common.import.scss
@@ -1,16 +1,4 @@
-@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
-$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
-@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
-$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
-$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
-$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
-$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
-$mat-z-index-fab;
-@forward 'list-common' as mat-* hide mat-base, mat-wrapper-base;
-@forward 'list-common' as mat-line-* hide mat-line-normalize-text, mat-line-truncate-line;
-@forward 'layout-common' as mat-*;
-@forward 'vendor-prefixes';
-@forward 'menu-common' as mat-menu-*;
+@forward './style-legacy-index';
 
 @import './variables';
 @import './list-common';
diff --git a/src/material/core/style/_private.import.scss b/src/material/core/style/_private.import.scss
index 4a0d646c3120..b5ab93edb689 100644
--- a/src/material/core/style/_private.import.scss
+++ b/src/material/core/style/_private.import.scss
@@ -1,15 +1,3 @@
-@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
-$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
-@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
-$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
-$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
-$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
-$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
-$mat-z-index-fab;
-@forward 'elevation' as mat-* hide $mat-color, $mat-opacity, $mat-prefix, $mat-transition-duration,
-$mat-transition-timing-function, mat-transition, mat-transition-property-value;
-@forward 'elevation' as mat-elevation-* hide mat-elevation-elevation,
-mat-elevation-overridable-elevation;
-@forward 'private' as mat-*;
+@forward './style-legacy-index';
 
 @import './elevation';
diff --git a/src/material/core/style/_style-legacy-index.scss b/src/material/core/style/_style-legacy-index.scss
new file mode 100644
index 000000000000..234e68901434
--- /dev/null
+++ b/src/material/core/style/_style-legacy-index.scss
@@ -0,0 +1,24 @@
+@forward 'button-common' as mat-button-*;
+@forward 'checkbox-common' as mat-checkbox-*;
+@forward 'elevation' hide $color, $opacity, $prefix, $transition-duration,
+$transition-timing-function, elevation, overridable-elevation, elevation-transition,
+private-transition-property-value;
+@forward 'elevation' as mat-* hide $mat-color, $mat-opacity, $mat-prefix, $mat-transition-duration,
+$mat-transition-timing-function, mat-get-ambient-map, mat-get-penumbra-map, mat-get-umbra-map;
+@forward 'elevation' as mat-elevation-* hide mat-elevation-elevation, mat-elevation-get-ambient-map,
+mat-elevation-get-penumbra-map, mat-elevation-get-umbra-map, mat-elevation-overridable-elevation;
+@forward 'form-common' as mat-*;
+@forward 'layout-common' as mat-*;
+@forward 'list-common' as mat-* hide mat-base, mat-wrapper-base;
+@forward 'list-common' as mat-line-* hide mat-line-normalize-text, mat-line-truncate-line;
+@forward 'menu-common' as mat-menu-*;
+@forward 'private' as mat-*;
+@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
+$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
+@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
+$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
+$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
+$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
+$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
+$mat-z-index-fab;
+@forward 'vendor-prefixes';
diff --git a/src/material/core/style/_variables.import.scss b/src/material/core/style/_variables.import.scss
index 0571591622ee..76db941f8e3d 100644
--- a/src/material/core/style/_variables.import.scss
+++ b/src/material/core/style/_variables.import.scss
@@ -1,8 +1 @@
-@forward 'variables' hide $fast-out-linear-in-timing-function, $fast-out-slow-in-timing-function,
-$linear-out-slow-in-timing-function, $small, $toggle-padding, $toggle-size, $xsmall;
-@forward 'variables' as mat-* hide $mat-ease-in-out-curve-function, $mat-pi, $mat-swift-ease-in,
-$mat-swift-ease-in-duration, $mat-swift-ease-in-out, $mat-swift-ease-in-out-duration,
-$mat-swift-ease-in-out-timing-function, $mat-swift-ease-in-timing-function, $mat-swift-ease-out,
-$mat-swift-ease-out-duration, $mat-swift-ease-out-timing-function, $mat-swift-linear,
-$mat-swift-linear-duration, $mat-swift-linear-timing-function, $mat-z-index-drawer,
-$mat-z-index-fab;
+@forward './style-legacy-index';
diff --git a/src/material/core/style/_vendor-prefixes.import.scss b/src/material/core/style/_vendor-prefixes.import.scss
index 3d57e24440f0..76db941f8e3d 100644
--- a/src/material/core/style/_vendor-prefixes.import.scss
+++ b/src/material/core/style/_vendor-prefixes.import.scss
@@ -1 +1 @@
-@forward 'vendor-prefixes';
+@forward './style-legacy-index';
diff --git a/src/material/core/theming/_all-theme.import.scss b/src/material/core/theming/_all-theme.import.scss
index bbf7e7f93643..b49d45b75c7e 100644
--- a/src/material/core/theming/_all-theme.import.scss
+++ b/src/material/core/theming/_all-theme.import.scss
@@ -46,7 +46,7 @@
 @forward '../core-theme' as mat-* hide mat-color, mat-theme;
 @forward '../core' as mat-core-* hide mat-core-core;
 @forward '../core-theme' as mat-core-*;
-@forward 'all-theme';
+@forward './theming-legacy-index';
 
 @import '../core';
 @import '../../autocomplete/autocomplete-theme';
diff --git a/src/material/core/theming/_palette.import.scss b/src/material/core/theming/_palette.import.scss
index 7dbb18f25fb1..51f71236f486 100644
--- a/src/material/core/theming/_palette.import.scss
+++ b/src/material/core/theming/_palette.import.scss
@@ -1,12 +1 @@
-@forward 'palette' hide $amber-palette, $blue-palette, $blue-gray-palette, $blue-grey-palette,
-$brown-palette, $cyan-palette, $dark-theme-background-palette, $dark-theme-foreground-palette,
-$deep-orange-palette, $deep-purple-palette, $gray-palette, $green-palette, $grey-palette,
-$indigo-palette, $light-blue-palette, $light-green-palette, $light-theme-background-palette,
-$light-theme-foreground-palette, $lime-palette, $orange-palette, $pink-palette, $purple-palette,
-$red-palette, $teal-palette, $yellow-palette;
-@forward 'palette' as mat-* hide $mat-black-12-opacity, $mat-black-6-opacity, $mat-black-87-opacity,
-$mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-focused, $mat-dark-primary-text,
-$mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused,
-$mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity,
-$mat-white-87-opacity;
-@forward 'palette-deprecated' as mat-*;
+@forward './theming-legacy-index';
diff --git a/src/material/core/theming/_theming-legacy-index.scss b/src/material/core/theming/_theming-legacy-index.scss
new file mode 100644
index 000000000000..f8ad0b57bfad
--- /dev/null
+++ b/src/material/core/theming/_theming-legacy-index.scss
@@ -0,0 +1,21 @@
+@forward 'palette' hide $amber-palette, $blue-palette, $blue-gray-palette, $blue-grey-palette,
+$brown-palette, $cyan-palette, $dark-theme-background-palette, $dark-theme-foreground-palette,
+$deep-orange-palette, $deep-purple-palette, $gray-palette, $green-palette, $grey-palette,
+$indigo-palette, $light-blue-palette, $light-green-palette, $light-theme-background-palette,
+$light-theme-foreground-palette, $lime-palette, $orange-palette, $pink-palette, $purple-palette,
+$red-palette, $teal-palette, $yellow-palette;
+@forward 'palette' as mat-* hide $mat-black-12-opacity, $mat-black-6-opacity, $mat-black-87-opacity,
+$mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-focused, $mat-dark-primary-text,
+$mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused,
+$mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity,
+$mat-white-87-opacity;
+@forward 'palette-deprecated' as mat-*;
+@forward 'theming' hide $theme-ignore-duplication-warnings, get-color-from-palette,
+get-color-config, get-density-config, get-typography-config, define-palette, define-light-theme,
+define-dark-theme, private-check-duplicate-theme-styles,
+private-create-backwards-compatibility-theme, private-is-legacy-constructed-theme,
+private-is-theme-object, private-legacy-get-theme;
+@forward 'theming' as mat-* hide $mat-theme-duplicate-warning, $mat-theme-emitted-color,
+$mat-theme-emitted-density, $mat-theme-emitted-typography, $mat-theme-generate-default-density,
+mat-create-dark-color-config, mat-create-light-color-config, mat-validate-theme;
+@forward 'theming-deprecated' as mat-*;
diff --git a/src/material/core/theming/_theming.import.scss b/src/material/core/theming/_theming.import.scss
index 80ab9c8a419a..eae311ddb75b 100644
--- a/src/material/core/theming/_theming.import.scss
+++ b/src/material/core/theming/_theming.import.scss
@@ -1,24 +1,5 @@
-@forward 'palette' hide $amber-palette, $blue-palette, $blue-gray-palette,
-$blue-grey-palette, $brown-palette, $cyan-palette, $dark-theme-background-palette,
-$dark-theme-foreground-palette, $deep-orange-palette, $deep-purple-palette, $gray-palette,
-$green-palette, $grey-palette, $indigo-palette, $light-blue-palette, $light-green-palette,
-$light-theme-background-palette, $light-theme-foreground-palette, $lime-palette, $orange-palette,
-$pink-palette, $purple-palette, $red-palette, $teal-palette, $yellow-palette;
-@forward 'palette' as mat-* hide $mat-black-12-opacity, $mat-black-6-opacity, $mat-black-87-opacity,
-$mat-dark-disabled-text, $mat-dark-dividers, $mat-dark-focused, $mat-dark-primary-text,
-$mat-dark-secondary-text, $mat-light-disabled-text, $mat-light-dividers, $mat-light-focused,
-$mat-light-primary-text, $mat-light-secondary-text, $mat-white-12-opacity, $mat-white-6-opacity,
-$mat-white-87-opacity;
 @forward '../density/private/compatibility' as mat-*;
-@forward 'theming' hide $theme-ignore-duplication-warnings, get-color-from-palette,
-get-color-config, get-density-config, get-typography-config, define-palette, define-light-theme,
-define-dark-theme, private-check-duplicate-theme-styles,
-private-create-backwards-compatibility-theme, private-is-legacy-constructed-theme,
-private-is-theme-object, private-legacy-get-theme;
-@forward 'theming' as mat-* hide $mat-theme-duplicate-warning, $mat-theme-emitted-color,
-$mat-theme-emitted-density, $mat-theme-emitted-typography, $mat-theme-generate-default-density,
-mat-create-dark-color-config, mat-create-light-color-config, mat-validate-theme;
-@forward 'theming-deprecated' as mat-*;
+@forward './theming-legacy-index';
 
 @import 'palette';
 @import '../density/private/compatibility';
diff --git a/src/material/core/typography/_all-typography.import.scss b/src/material/core/typography/_all-typography.import.scss
index 0a2350eecd00..3e0272146388 100644
--- a/src/material/core/typography/_all-typography.import.scss
+++ b/src/material/core/typography/_all-typography.import.scss
@@ -35,7 +35,7 @@
 @forward '../../tabs/tabs-theme.import';
 @forward '../option/option-theme.import';
 @forward '../option/optgroup-theme.import';
-@forward 'all-typography';
+@forward './typography-legacy-index';
 
 @import './typography';
 @import '../../autocomplete/autocomplete-theme';
diff --git a/src/material/core/typography/_typography-legacy-index.scss b/src/material/core/typography/_typography-legacy-index.scss
new file mode 100644
index 000000000000..69c377218479
--- /dev/null
+++ b/src/material/core/typography/_typography-legacy-index.scss
@@ -0,0 +1,18 @@
+@forward 'all-typography';
+@forward 'typography-utils' hide font-family, font-shorthand, font-size, font-weight, line-height,
+letter-spacing, typography-level;
+@forward 'typography-utils' as mat-* hide mat-font-shorthand, mat-get-type-value,
+mat-typography-level;
+@forward 'typography-utils' as mat-typography-* hide mat-typography-font-family,
+mat-typography-font-size, mat-typography-font-weight, mat-typography-get-type-value,
+mat-typography-line-height, mat-typography-letter-spacing;
+@forward 'typography-utils' as mat-line-* hide mat-line-font-family, mat-line-font-shorthand,
+mat-line-font-size, mat-line-font-weight, mat-line-letter-spacing, mat-line-typography-level;
+@forward 'typography' as mat-* hide mat-define-typography-config, mat-define-typography-level;
+@forward 'typography' as mat-typography-* hide mat-typography-typography-hierarchy,
+mat-typography-private-typography-is-2014-config, mat-typography-private-typography-is-2018-config,
+mat-typography-private-typography-to-2014-config, mat-typography-private-typography-to-2018-config;
+@forward 'typography-utils-deprecated' as mat-typography-*;
+@forward 'typography-deprecated' as mat-typography-*;
+@forward 'typography-deprecated' as mat-typography-* hide mat-typography-base-typography;
+@forward 'typography-deprecated' as mat-* show mat-base-typography;
diff --git a/src/material/core/typography/_typography-utils.import.scss b/src/material/core/typography/_typography-utils.import.scss
index 90f10e1d8822..64345c96c9af 100644
--- a/src/material/core/typography/_typography-utils.import.scss
+++ b/src/material/core/typography/_typography-utils.import.scss
@@ -1,9 +1 @@
-@forward 'typography-utils' hide font-family, font-shorthand, font-size, font-weight, line-height,
-letter-spacing, typography-level;
-@forward 'typography-utils' as mat-* hide mat-font-shorthand, mat-get-type-value,
-mat-typography-level;
-@forward 'typography-utils' as mat-typography-* hide mat-typography-font-family,
-mat-typography-font-size, mat-typography-font-weight, mat-typography-get-type-value,
-mat-typography-line-height, mat-typography-letter-spacing;
-@forward 'typography-deprecated' as mat-typography-*;
-@forward 'typography-utils-deprecated' as mat-typography-*;
+@forward './typography-legacy-index';
diff --git a/src/material/core/typography/_typography.import.scss b/src/material/core/typography/_typography.import.scss
index bb4481ab03e8..7cf5c79ac8eb 100644
--- a/src/material/core/typography/_typography.import.scss
+++ b/src/material/core/typography/_typography.import.scss
@@ -1,14 +1,2 @@
-@forward 'typography-utils' as mat-* hide mat-font-shorthand, mat-line-height, mat-typography-level;
-@forward 'typography-utils' as mat-line-* hide mat-line-font-family, mat-line-font-shorthand,
-mat-line-font-size, mat-line-font-weight, mat-line-letter-spacing, mat-line-typography-level;
-@forward 'typography-utils' as mat-typography-* hide mat-typography-font-family,
-mat-typography-font-size, mat-typography-font-weight, mat-typography-line-height,
-mat-typography-letter-spacing;
-@forward 'typography' as mat-* hide mat-define-typography-config, mat-define-typography-level;
-@forward 'typography' as mat-typography-* hide mat-typography-typography-hierarchy,
-mat-typography-private-typography-is-2014-config, mat-typography-private-typography-is-2018-config,
-mat-typography-private-typography-to-2014-config, mat-typography-private-typography-to-2018-config;
-@forward 'typography-deprecated' as mat-typography-* hide mat-typography-base-typography;
-@forward 'typography-deprecated' as mat-* show mat-base-typography;
-
+@forward './typography-legacy-index';
 @import 'typography-utils';
diff --git a/src/material/datepicker/_datepicker-legacy-index.scss b/src/material/datepicker/_datepicker-legacy-index.scss
new file mode 100644
index 000000000000..a22c9ae76f2a
--- /dev/null
+++ b/src/material/datepicker/_datepicker-legacy-index.scss
@@ -0,0 +1,9 @@
+@forward 'datepicker-theme' hide $calendar-body-font-size, $calendar-weekday-table-font-size,
+$range-fade-amount, $selected-fade-amount, $selected-today-box-shadow-width, $today-fade-amount,
+color, date-range-colors, theme, typography;
+@forward 'datepicker-theme' as mat-* hide $mat-range-fade-amount, $mat-selected-fade-amount,
+$mat-selected-today-box-shadow-width, $mat-today-fade-amount, mat-color, mat-density, mat-theme,
+mat-typography, mat-unselected-cell;
+@forward 'datepicker-theme' as mat-datepicker-* hide $mat-datepicker-calendar-body-font-size,
+$mat-datepicker-calendar-weekday-table-font-size, mat-datepicker-color,
+mat-datepicker-date-range-colors, mat-datepicker-density, mat-datepicker-unselected-cell;
diff --git a/src/material/datepicker/_datepicker-theme.import.scss b/src/material/datepicker/_datepicker-theme.import.scss
index 4859e735daca..25c33244fd45 100644
--- a/src/material/datepicker/_datepicker-theme.import.scss
+++ b/src/material/datepicker/_datepicker-theme.import.scss
@@ -1,15 +1,7 @@
 @forward '../core/style/private.import';
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'datepicker-theme' hide $calendar-body-font-size, $calendar-weekday-table-font-size,
-$range-fade-amount, $selected-fade-amount, $selected-today-box-shadow-width, $today-fade-amount,
-color, date-range-colors, theme, typography;
-@forward 'datepicker-theme' as mat-* hide $mat-range-fade-amount, $mat-selected-fade-amount,
-$mat-selected-today-box-shadow-width, $mat-today-fade-amount, mat-color, mat-density, mat-theme,
-mat-typography, mat-unselected-cell;
-@forward 'datepicker-theme' as mat-datepicker-* hide $mat-datepicker-calendar-body-font-size,
-$mat-datepicker-calendar-weekday-table-font-size, mat-datepicker-color,
-mat-datepicker-date-range-colors, mat-datepicker-density, mat-datepicker-unselected-cell;
+@forward './datepicker-legacy-index';
 
 @import '../core/style/private';
 @import '../core/theming/palette';
diff --git a/src/material/dialog/_dialog-legacy-index.scss b/src/material/dialog/_dialog-legacy-index.scss
new file mode 100644
index 000000000000..0924173ad0b8
--- /dev/null
+++ b/src/material/dialog/_dialog-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'dialog-theme' hide color, theme, typography;
+@forward 'dialog-theme' as mat-dialog-* hide mat-dialog-density;
diff --git a/src/material/dialog/_dialog-theme.import.scss b/src/material/dialog/_dialog-theme.import.scss
index 2b3782bcbcc2..0d4c33197d17 100644
--- a/src/material/dialog/_dialog-theme.import.scss
+++ b/src/material/dialog/_dialog-theme.import.scss
@@ -1,8 +1,7 @@
 @forward '../core/style/private.import';
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'dialog-theme' hide color, theme, typography;
-@forward 'dialog-theme' as mat-dialog-* hide mat-dialog-density;
+@forward './dialog-legacy-index';
 
 @import '../core/style/private';
 @import '../core/theming/palette';
diff --git a/src/material/divider/_divider-legacy-index.scss b/src/material/divider/_divider-legacy-index.scss
new file mode 100644
index 000000000000..d3e1bb4e57e1
--- /dev/null
+++ b/src/material/divider/_divider-legacy-index.scss
@@ -0,0 +1,3 @@
+@forward 'divider-theme' hide color, theme, typography;
+@forward 'divider-theme' as mat-divider-* hide mat-divider-density;
+@forward 'divider-offset' as mat-*;
diff --git a/src/material/divider/_divider-offset.import.scss b/src/material/divider/_divider-offset.import.scss
index 2d3dd7e337a4..0ec8fb8c816c 100644
--- a/src/material/divider/_divider-offset.import.scss
+++ b/src/material/divider/_divider-offset.import.scss
@@ -1 +1 @@
-@forward 'divider-offset' as mat-*;
+@forward './divider-legacy-index.scss';
diff --git a/src/material/divider/_divider-theme.import.scss b/src/material/divider/_divider-theme.import.scss
index 863c37206bc3..65cbc80309a6 100644
--- a/src/material/divider/_divider-theme.import.scss
+++ b/src/material/divider/_divider-theme.import.scss
@@ -1,6 +1,5 @@
 @forward '../core/theming/theming.import';
-@forward 'divider-theme' hide color, theme, typography;
-@forward 'divider-theme' as mat-divider-* hide mat-divider-density;
+@forward './divider-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/expansion/_expansion-legacy-index.scss b/src/material/expansion/_expansion-legacy-index.scss
new file mode 100644
index 000000000000..4023472a1a76
--- /dev/null
+++ b/src/material/expansion/_expansion-legacy-index.scss
@@ -0,0 +1,3 @@
+@forward 'expansion-variables' as mat-expansion-panel-*;
+@forward 'expansion-mixins' as mat-*;
+@forward 'expansion-theme' as mat-expansion-panel-*;
diff --git a/src/material/expansion/_expansion-theme.import.scss b/src/material/expansion/_expansion-theme.import.scss
index 77b02cd64727..b1d2d5349d31 100644
--- a/src/material/expansion/_expansion-theme.import.scss
+++ b/src/material/expansion/_expansion-theme.import.scss
@@ -1,9 +1,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/style/private.import';
-@forward 'expansion-variables' as mat-expansion-panel-*;
 @forward '../core/typography/typography-utils.import';
-@forward 'expansion-mixins' as mat-*;
-@forward 'expansion-theme' as mat-expansion-panel-*;
+@forward './expansion-legacy-index';
 
 @import '../core/density/private/compatibility';
 @import '../core/theming/palette';
diff --git a/src/material/form-field/.form-field.md.swp b/src/material/form-field/.form-field.md.swp
deleted file mode 100644
index 9039143c4e59..000000000000
Binary files a/src/material/form-field/.form-field.md.swp and /dev/null differ
diff --git a/src/material/form-field/_form-field-fill-theme.import.scss b/src/material/form-field/_form-field-fill-theme.import.scss
index 3d26f476e65f..42d629397c0f 100644
--- a/src/material/form-field/_form-field-fill-theme.import.scss
+++ b/src/material/form-field/_form-field-fill-theme.import.scss
@@ -1,11 +1,6 @@
 @forward '../core/style/form-common.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'form-field-fill-theme' hide $fill-dedupe, fill-color, fill-theme, fill-typography,
-private-form-field-fill-density;
-@forward 'form-field-fill-theme' as mat-* hide $mat-fill-dedupe, mat-fill-color,
-mat-fill-label-floating, mat-fill-theme, mat-fill-typography;
-@forward 'form-field-fill-theme' as mat-form-field-* hide mat-form-field-fill-label-floating,
-mat-form-field-private-form-field-fill-density;
+@forward './form-field-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/form-field/_form-field-legacy-index.scss b/src/material/form-field/_form-field-legacy-index.scss
new file mode 100644
index 000000000000..659211b89b10
--- /dev/null
+++ b/src/material/form-field/_form-field-legacy-index.scss
@@ -0,0 +1,24 @@
+@forward 'form-field-fill-theme' hide $fill-dedupe, fill-color, fill-theme, fill-typography,
+private-form-field-fill-density;
+@forward 'form-field-fill-theme' as mat-* hide $mat-fill-dedupe, mat-fill-color,
+mat-fill-label-floating, mat-fill-theme, mat-fill-typography;
+@forward 'form-field-fill-theme' as mat-form-field-* hide mat-form-field-fill-label-floating,
+mat-form-field-private-form-field-fill-density;
+@forward 'form-field-legacy-theme' hide $legacy-dedupe, legacy-color, legacy-theme,
+legacy-typography, private-form-field-legacy-density;
+@forward 'form-field-legacy-theme' as mat-* hide $mat-legacy-dedupe, mat-legacy-color,
+mat-legacy-label-floating, mat-legacy-label-floating-print, mat-legacy-theme, mat-legacy-typography;
+@forward 'form-field-legacy-theme' as mat-form-field-* hide mat-form-field-legacy-label-floating,
+mat-form-field-legacy-label-floating-print, mat-form-field-private-form-field-legacy-density;
+@forward 'form-field-outline-theme' hide $outline-dedupe, outline-color, outline-theme,
+outline-typography, private-form-field-outline-density;
+@forward 'form-field-outline-theme' as mat-* hide $mat-outline-dedupe, mat-outline-color,
+mat-outline-label-floating, mat-outline-theme, mat-outline-typography;
+@forward 'form-field-outline-theme' as mat-form-field-* hide mat-form-field-outline-label-floating,
+mat-form-field-private-form-field-outline-density;
+@forward 'form-field-standard-theme' as mat-* hide mat-standard-color, mat-standard-theme,
+mat-standard-typography;
+@forward 'form-field-standard-theme' as mat-form-field-* hide
+mat-form-field-private-form-field-standard-density;
+@forward 'form-field-theme' hide $dedupe, color, density, theme, typography;
+@forward 'form-field-theme' as mat-form-field-* hide mat-form-field-label-floating;
diff --git a/src/material/form-field/_form-field-legacy-theme.import.scss b/src/material/form-field/_form-field-legacy-theme.import.scss
index 5ddf9b7bbfea..42d629397c0f 100644
--- a/src/material/form-field/_form-field-legacy-theme.import.scss
+++ b/src/material/form-field/_form-field-legacy-theme.import.scss
@@ -1,11 +1,6 @@
 @forward '../core/style/form-common.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'form-field-legacy-theme' hide $legacy-dedupe, legacy-color, legacy-theme,
-legacy-typography, private-form-field-legacy-density;
-@forward 'form-field-legacy-theme' as mat-* hide $mat-legacy-dedupe, mat-legacy-color,
-mat-legacy-label-floating, mat-legacy-label-floating-print, mat-legacy-theme, mat-legacy-typography;
-@forward 'form-field-legacy-theme' as mat-form-field-* hide mat-form-field-legacy-label-floating,
-mat-form-field-legacy-label-floating-print, mat-form-field-private-form-field-legacy-density;
+@forward './form-field-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/form-field/_form-field-outline-theme.import.scss b/src/material/form-field/_form-field-outline-theme.import.scss
index f4ad9ac8d6c5..42d629397c0f 100644
--- a/src/material/form-field/_form-field-outline-theme.import.scss
+++ b/src/material/form-field/_form-field-outline-theme.import.scss
@@ -1,11 +1,6 @@
 @forward '../core/style/form-common.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'form-field-outline-theme' hide $outline-dedupe, outline-color, outline-theme,
-outline-typography, private-form-field-outline-density;
-@forward 'form-field-outline-theme' as mat-* hide $mat-outline-dedupe, mat-outline-color,
-mat-outline-label-floating, mat-outline-theme, mat-outline-typography;
-@forward 'form-field-outline-theme' as mat-form-field-* hide mat-form-field-outline-label-floating,
-mat-form-field-private-form-field-outline-density;
+@forward './form-field-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/form-field/_form-field-standard-theme.import.scss b/src/material/form-field/_form-field-standard-theme.import.scss
index e47749fe3563..42d629397c0f 100644
--- a/src/material/form-field/_form-field-standard-theme.import.scss
+++ b/src/material/form-field/_form-field-standard-theme.import.scss
@@ -1,9 +1,6 @@
 @forward '../core/style/form-common.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'form-field-standard-theme' as mat-* hide mat-standard-color, mat-standard-theme,
-mat-standard-typography;
-@forward 'form-field-standard-theme' as mat-form-field-* hide
-mat-form-field-private-form-field-standard-density;
+@forward './form-field-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/form-field/_form-field-theme.import.scss b/src/material/form-field/_form-field-theme.import.scss
index 36523a2d3eb4..7d61bdc3d033 100644
--- a/src/material/form-field/_form-field-theme.import.scss
+++ b/src/material/form-field/_form-field-theme.import.scss
@@ -1,23 +1,5 @@
 @forward '../core/style/form-common.import';
-@forward 'form-field-fill-theme' as mat-* hide $mat-fill-dedupe, mat-fill-color, mat-fill-theme,
-mat-fill-typography;
-@forward 'form-field-fill-theme' as mat-form-field-* hide
-mat-form-field-private-form-field-fill-density;
-@forward 'form-field-legacy-theme' as mat-* hide $mat-legacy-dedupe, mat-legacy-color,
-mat-legacy-theme, mat-legacy-typography;
-@forward 'form-field-legacy-theme' as mat-form-field-* hide
-mat-form-field-private-form-field-legacy-density;
-@forward 'form-field-outline-theme' as mat-* hide $mat-outline-dedupe, mat-outline-color,
-mat-outline-theme, mat-outline-typography;
-@forward 'form-field-outline-theme' as mat-form-field-* hide
-mat-form-field-private-form-field-outline-density;
-@forward '../core/typography/typography-utils.import';
-@forward 'form-field-standard-theme' as mat-* hide mat-standard-color, mat-standard-theme,
-mat-standard-typography;
-@forward 'form-field-standard-theme' as mat-form-field-* hide
-mat-form-field-private-form-field-standard-density;
-@forward 'form-field-theme' hide $dedupe, color, density, theme, typography;
-@forward 'form-field-theme' as mat-form-field-* hide mat-form-field-label-floating;
+@forward './form-field-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/grid-list/_grid-list-legacy-index.scss b/src/material/grid-list/_grid-list-legacy-index.scss
new file mode 100644
index 000000000000..058d60f12092
--- /dev/null
+++ b/src/material/grid-list/_grid-list-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'grid-list-theme' hide color, theme, typography;
+@forward 'grid-list-theme' as mat-grid-list-* hide mat-grid-list-density;
diff --git a/src/material/grid-list/_grid-list-theme.import.scss b/src/material/grid-list/_grid-list-theme.import.scss
index 3dfcf1e4199f..187d004fc02d 100644
--- a/src/material/grid-list/_grid-list-theme.import.scss
+++ b/src/material/grid-list/_grid-list-theme.import.scss
@@ -1,8 +1,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
 @forward '../core/style/list-common.import';
-@forward 'grid-list-theme' hide color, theme, typography;
-@forward 'grid-list-theme' as mat-grid-list-* hide mat-grid-list-density;
+@forward './grid-list-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/icon/_icon-legacy-index.scss b/src/material/icon/_icon-legacy-index.scss
new file mode 100644
index 000000000000..d90ca52d8c76
--- /dev/null
+++ b/src/material/icon/_icon-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'icon-theme' hide color, theme, typography;
+@forward 'icon-theme' as mat-icon-* hide mat-icon-density;
diff --git a/src/material/icon/_icon-theme.import.scss b/src/material/icon/_icon-theme.import.scss
index 57b46365c6fd..7ea7f77da417 100644
--- a/src/material/icon/_icon-theme.import.scss
+++ b/src/material/icon/_icon-theme.import.scss
@@ -1,5 +1,4 @@
 @forward '../core/theming/theming.import';
-@forward 'icon-theme' hide color, theme, typography;
-@forward 'icon-theme' as mat-icon-* hide mat-icon-density;
+@forward './icon-legacy-index';
 
 @import '../core/theming/theming';
diff --git a/src/material/input/_input-legacy-index.scss b/src/material/input/_input-legacy-index.scss
new file mode 100644
index 000000000000..9e266d7608ec
--- /dev/null
+++ b/src/material/input/_input-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'input-theme' hide color, theme, typography;
+@forward 'input-theme' as mat-input-* hide mat-input-density;
diff --git a/src/material/input/_input-theme.import.scss b/src/material/input/_input-theme.import.scss
index e2414e5da693..8e5af94fcbfe 100644
--- a/src/material/input/_input-theme.import.scss
+++ b/src/material/input/_input-theme.import.scss
@@ -1,8 +1,7 @@
 @forward '../core/style/form-common.import';
 @forward '../core/typography/typography-utils.import';
 @forward '../core/style/vendor-prefixes.import';
-@forward 'input-theme' hide color, theme, typography;
-@forward 'input-theme' as mat-input-* hide mat-input-density;
+@forward './input-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/list/_list-legacy-index.scss b/src/material/list/_list-legacy-index.scss
new file mode 100644
index 000000000000..271fe4dc8537
--- /dev/null
+++ b/src/material/list/_list-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'list-theme' hide color, theme, typography;
+@forward 'list-theme' as mat-list-* hide mat-list-density;
diff --git a/src/material/list/_list-theme.import.scss b/src/material/list/_list-theme.import.scss
index 7d9dba1a9e42..ddc70f0e6f2d 100644
--- a/src/material/list/_list-theme.import.scss
+++ b/src/material/list/_list-theme.import.scss
@@ -1,8 +1,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
 @forward '../core/style/list-common.import';
-@forward 'list-theme' hide color, theme, typography;
-@forward 'list-theme' as mat-list-* hide mat-list-density;
+@forward './list-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/menu/_menu-legacy-index.scss b/src/material/menu/_menu-legacy-index.scss
new file mode 100644
index 000000000000..ba7bb2f503f2
--- /dev/null
+++ b/src/material/menu/_menu-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'menu-theme' hide color, theme, typography;
+@forward 'menu-theme' as mat-menu-* hide mat-menu-density;
diff --git a/src/material/menu/_menu-theme.import.scss b/src/material/menu/_menu-theme.import.scss
index f1c9e9cdcb28..208fe4cb0b9c 100644
--- a/src/material/menu/_menu-theme.import.scss
+++ b/src/material/menu/_menu-theme.import.scss
@@ -1,8 +1,7 @@
 @forward '../core/style/private.import';
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'menu-theme' hide color, theme, typography;
-@forward 'menu-theme' as mat-menu-* hide mat-menu-density;
+@forward './menu-legacy-index';
 
 @import '../core/style/private';
 @import '../core/theming/palette';
diff --git a/src/material/paginator/_paginator-legacy-index.scss b/src/material/paginator/_paginator-legacy-index.scss
new file mode 100644
index 000000000000..a1994c7a10f4
--- /dev/null
+++ b/src/material/paginator/_paginator-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'paginator-variables' as mat-paginator-*;
+@forward 'paginator-theme' as mat-paginator-*;
diff --git a/src/material/paginator/_paginator-theme.import.scss b/src/material/paginator/_paginator-theme.import.scss
index 3bdfabf4fc91..aa7bc009c40c 100644
--- a/src/material/paginator/_paginator-theme.import.scss
+++ b/src/material/paginator/_paginator-theme.import.scss
@@ -1,8 +1,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/density/private/compatibility.import';
-@forward 'paginator-variables' as mat-paginator-*;
 @forward '../core/typography/typography-utils.import';
-@forward 'paginator-theme' as mat-paginator-*;
+@forward './paginator-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/progress-bar/_progress-bar-legacy-index.scss b/src/material/progress-bar/_progress-bar-legacy-index.scss
new file mode 100644
index 000000000000..34a313f57369
--- /dev/null
+++ b/src/material/progress-bar/_progress-bar-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'progress-bar-theme' hide color, theme, typography;
+@forward 'progress-bar-theme' as mat-progress-bar-* hide mat-progress-bar-density;
diff --git a/src/material/progress-bar/_progress-bar-theme.import.scss b/src/material/progress-bar/_progress-bar-theme.import.scss
index 7fe2df21b04e..6832724769fd 100644
--- a/src/material/progress-bar/_progress-bar-theme.import.scss
+++ b/src/material/progress-bar/_progress-bar-theme.import.scss
@@ -1,6 +1,5 @@
 @forward '../core/theming/theming.import';
-@forward 'progress-bar-theme' hide color, theme, typography;
-@forward 'progress-bar-theme' as mat-progress-bar-* hide mat-progress-bar-density;
+@forward './progress-bar-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/progress-spinner/_progress-spinner-legacy-index.scss b/src/material/progress-spinner/_progress-spinner-legacy-index.scss
new file mode 100644
index 000000000000..8a2ba2a328e9
--- /dev/null
+++ b/src/material/progress-spinner/_progress-spinner-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'progress-spinner-theme' hide color, theme, typography;
+@forward 'progress-spinner-theme' as mat-progress-spinner-* hide mat-progress-spinner-density;
diff --git a/src/material/progress-spinner/_progress-spinner-theme.import.scss b/src/material/progress-spinner/_progress-spinner-theme.import.scss
index 647ca3b87e02..8ee9bd0367c8 100644
--- a/src/material/progress-spinner/_progress-spinner-theme.import.scss
+++ b/src/material/progress-spinner/_progress-spinner-theme.import.scss
@@ -1,6 +1,5 @@
 @forward '../core/theming/theming.import';
-@forward 'progress-spinner-theme' hide color, theme, typography;
-@forward 'progress-spinner-theme' as mat-progress-spinner-* hide mat-progress-spinner-density;
+@forward './progress-spinner-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/radio/_radio-legacy-index.scss b/src/material/radio/_radio-legacy-index.scss
new file mode 100644
index 000000000000..2ea7eafb154b
--- /dev/null
+++ b/src/material/radio/_radio-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'radio-theme' hide color, theme, typography;
+@forward 'radio-theme' as mat-radio-* hide mat-radio-color, mat-radio-density;
diff --git a/src/material/radio/_radio-theme.import.scss b/src/material/radio/_radio-theme.import.scss
index 4225856445dd..bf4a207ab110 100644
--- a/src/material/radio/_radio-theme.import.scss
+++ b/src/material/radio/_radio-theme.import.scss
@@ -1,7 +1,6 @@
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'radio-theme' hide color, theme, typography;
-@forward 'radio-theme' as mat-radio-* hide mat-radio-color, mat-radio-density;
+@forward './radio-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/select/_select-legacy-index.scss b/src/material/select/_select-legacy-index.scss
new file mode 100644
index 000000000000..c91010b78935
--- /dev/null
+++ b/src/material/select/_select-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'select-theme' hide color, theme, typography;
+@forward 'select-theme' as mat-select-* hide mat-select-density;
diff --git a/src/material/select/_select-theme.import.scss b/src/material/select/_select-theme.import.scss
index 2a042325d99b..0db88102fd85 100644
--- a/src/material/select/_select-theme.import.scss
+++ b/src/material/select/_select-theme.import.scss
@@ -1,8 +1,7 @@
 @forward '../core/style/form-common.import';
 @forward '../core/style/private.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'select-theme' hide color, theme, typography;
-@forward 'select-theme' as mat-select-* hide mat-select-density;
+@forward './select-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/sidenav/_sidenav-legacy-index.scss b/src/material/sidenav/_sidenav-legacy-index.scss
new file mode 100644
index 000000000000..a33c0cc10330
--- /dev/null
+++ b/src/material/sidenav/_sidenav-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'sidenav-theme' hide color, theme, typography;
+@forward 'sidenav-theme' as mat-sidenav-* hide mat-sidenav-density;
diff --git a/src/material/sidenav/_sidenav-theme.import.scss b/src/material/sidenav/_sidenav-theme.import.scss
index 7280dbcf548a..7b4a53674c5e 100644
--- a/src/material/sidenav/_sidenav-theme.import.scss
+++ b/src/material/sidenav/_sidenav-theme.import.scss
@@ -1,7 +1,6 @@
 @forward '../core/style/private.import';
 @forward '../core/theming/theming.import';
-@forward 'sidenav-theme' hide color, theme, typography;
-@forward 'sidenav-theme' as mat-sidenav-* hide mat-sidenav-density;
+@forward './sidenav-legacy-index';
 
 @import '../core/style/private';
 @import '../core/theming/palette';
diff --git a/src/material/slide-toggle/_slide-toggle-legacy-index.scss b/src/material/slide-toggle/_slide-toggle-legacy-index.scss
new file mode 100644
index 000000000000..4ed8c0b37161
--- /dev/null
+++ b/src/material/slide-toggle/_slide-toggle-legacy-index.scss
@@ -0,0 +1,3 @@
+@forward 'slide-toggle-theme' hide color, theme, typography;
+@forward 'slide-toggle-theme' as mat-slide-toggle-* hide mat-slide-toggle-checked,
+mat-slide-toggle-density;
diff --git a/src/material/slide-toggle/_slide-toggle-theme.import.scss b/src/material/slide-toggle/_slide-toggle-theme.import.scss
index bfda867ea93d..5b22071081c1 100644
--- a/src/material/slide-toggle/_slide-toggle-theme.import.scss
+++ b/src/material/slide-toggle/_slide-toggle-theme.import.scss
@@ -1,9 +1,7 @@
 @forward '../core/style/private.import';
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'slide-toggle-theme' hide color, theme, typography;
-@forward 'slide-toggle-theme' as mat-slide-toggle-* hide mat-slide-toggle-checked,
-mat-slide-toggle-density;
+@forward './slide-toggle-legacy-index';
 
 @import '../core/style/private';
 @import '../core/theming/palette';
diff --git a/src/material/slider/_slider-legacy-index.scss b/src/material/slider/_slider-legacy-index.scss
new file mode 100644
index 000000000000..6055dcce5d8a
--- /dev/null
+++ b/src/material/slider/_slider-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'slider-theme' hide color, theme, typography;
+@forward 'slider-theme' as mat-slider-* hide mat-slider-density, mat-slider-inner-content-theme;
diff --git a/src/material/slider/_slider-theme.import.scss b/src/material/slider/_slider-theme.import.scss
index 33b2b790d0cb..054b2a82e2d3 100644
--- a/src/material/slider/_slider-theme.import.scss
+++ b/src/material/slider/_slider-theme.import.scss
@@ -1,7 +1,6 @@
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'slider-theme' hide color, theme, typography;
-@forward 'slider-theme' as mat-slider-* hide mat-slider-density, mat-slider-inner-content-theme;
+@forward './slider-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/snack-bar/_snack-bar-legacy-index.scss b/src/material/snack-bar/_snack-bar-legacy-index.scss
new file mode 100644
index 000000000000..5882682b0b48
--- /dev/null
+++ b/src/material/snack-bar/_snack-bar-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'snack-bar-theme' hide color, theme, typography;
+@forward 'snack-bar-theme' as mat-snack-bar-* hide mat-snack-bar-density;
diff --git a/src/material/snack-bar/_snack-bar-theme.import.scss b/src/material/snack-bar/_snack-bar-theme.import.scss
index cb499e497743..ef6f2006b741 100644
--- a/src/material/snack-bar/_snack-bar-theme.import.scss
+++ b/src/material/snack-bar/_snack-bar-theme.import.scss
@@ -2,8 +2,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/style/private.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'snack-bar-theme' hide color, theme, typography;
-@forward 'snack-bar-theme' as mat-snack-bar-* hide mat-snack-bar-density;
+@forward './snack-bar-legacy-index';
 
 @import '../core/typography/typography-utils';
 @import '../core/theming/theming';
diff --git a/src/material/sort/_sort-legacy-index.scss b/src/material/sort/_sort-legacy-index.scss
new file mode 100644
index 000000000000..77854b06aac6
--- /dev/null
+++ b/src/material/sort/_sort-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'sort-theme' hide color, theme, typography;
+@forward 'sort-theme' as mat-sort-* hide mat-sort-density;
diff --git a/src/material/sort/_sort-theme.import.scss b/src/material/sort/_sort-theme.import.scss
index 36b714f6be06..7207b667e986 100644
--- a/src/material/sort/_sort-theme.import.scss
+++ b/src/material/sort/_sort-theme.import.scss
@@ -1,5 +1,4 @@
 @forward '../core/theming/theming.import';
-@forward 'sort-theme' hide color, theme, typography;
-@forward 'sort-theme' as mat-sort-* hide mat-sort-density;
+@forward './sort-legacy-index';
 
 @import '../core/theming/theming';
diff --git a/src/material/stepper/_stepper-legacy-index.scss b/src/material/stepper/_stepper-legacy-index.scss
new file mode 100644
index 000000000000..ed6b4bbebc1b
--- /dev/null
+++ b/src/material/stepper/_stepper-legacy-index.scss
@@ -0,0 +1,7 @@
+@forward 'stepper-variables' as mat-* hide $mat-density-config, $mat-header-height,
+$mat-header-maximum-height, $mat-header-minimum-height, $mat-label-header-height,
+$mat-label-min-width, $mat-label-position-bottom-top-gap, $mat-line-gap, $mat-line-width,
+$mat-side-gap;
+@forward 'stepper-variables' as mat-stepper-* hide $mat-stepper-step-header-icon-size,
+$mat-stepper-step-sub-label-font-size, $mat-stepper-vertical-stepper-content-margin;
+@forward 'stepper-theme' as mat-stepper-*;
diff --git a/src/material/stepper/_stepper-theme.import.scss b/src/material/stepper/_stepper-theme.import.scss
index 95dcc2b634f3..4b6000a6d7fb 100644
--- a/src/material/stepper/_stepper-theme.import.scss
+++ b/src/material/stepper/_stepper-theme.import.scss
@@ -1,13 +1,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/density/private/compatibility.import';
-@forward 'stepper-variables' as mat-* hide $mat-density-config, $mat-header-height,
-$mat-header-maximum-height, $mat-header-minimum-height, $mat-label-header-height,
-$mat-label-min-width, $mat-label-position-bottom-top-gap, $mat-line-gap, $mat-line-width,
-$mat-side-gap;
-@forward 'stepper-variables' as mat-stepper-* hide $mat-stepper-step-header-icon-size,
-$mat-stepper-step-sub-label-font-size, $mat-stepper-vertical-stepper-content-margin;
 @forward '../core/typography/typography-utils.import';
-@forward 'stepper-theme' as mat-stepper-*;
+@forward './stepper-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/table/_table-flex-styles.import.scss b/src/material/table/_table-flex-styles.import.scss
index ce779389f77e..9000ce48b89f 100644
--- a/src/material/table/_table-flex-styles.import.scss
+++ b/src/material/table/_table-flex-styles.import.scss
@@ -1 +1 @@
-@forward 'table-flex-styles' as mat-*;
+@forward './table-legacy-index';
diff --git a/src/material/table/_table-legacy-index.scss b/src/material/table/_table-legacy-index.scss
new file mode 100644
index 000000000000..9347678e9e20
--- /dev/null
+++ b/src/material/table/_table-legacy-index.scss
@@ -0,0 +1,3 @@
+@forward 'table-theme' hide color, theme, typography;
+@forward 'table-theme' as mat-table-* hide mat-table-density;
+@forward 'table-flex-styles' as mat-*;
diff --git a/src/material/table/_table-theme.import.scss b/src/material/table/_table-theme.import.scss
index 8a64a0ef6a7d..8219d4c8f42f 100644
--- a/src/material/table/_table-theme.import.scss
+++ b/src/material/table/_table-theme.import.scss
@@ -1,7 +1,6 @@
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'table-theme' hide color, theme, typography;
-@forward 'table-theme' as mat-table-* hide mat-table-density;
+@forward './table-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/tabs/_tabs-common.import.scss b/src/material/tabs/_tabs-common.import.scss
index 71662e338162..954fbfa5ba5d 100644
--- a/src/material/tabs/_tabs-common.import.scss
+++ b/src/material/tabs/_tabs-common.import.scss
@@ -1,9 +1,7 @@
 @forward '../core/style/private.import';
 @forward '../core/style/vendor-prefixes.import';
 @forward '../../cdk/a11y/index.import';
-@forward 'tabs-common' hide $tab-animation-duration, $tab-bar-height;
-@forward 'tabs-common' as mat-* hide mat-ink-bar, mat-paginated-tab-header,
-mat-paginated-tab-header-container, mat-paginated-tab-header-item-wrapper, mat-tab-label;
+@forward './tabs-legacy-index';
 
 @import '../core/style/variables';
 @import '../core/style/private';
diff --git a/src/material/tabs/_tabs-legacy-index.scss b/src/material/tabs/_tabs-legacy-index.scss
new file mode 100644
index 000000000000..fab3462be5c4
--- /dev/null
+++ b/src/material/tabs/_tabs-legacy-index.scss
@@ -0,0 +1,6 @@
+@forward 'tabs-theme' hide color, theme, typography;
+@forward 'tabs-theme' as mat-tabs-* hide mat-tabs-background, mat-tabs-density, mat-tabs-ink-bar,
+mat-tabs-tab-label-focus;
+@forward 'tabs-common' hide $tab-animation-duration, $tab-bar-height;
+@forward 'tabs-common' as mat-* hide mat-ink-bar, mat-paginated-tab-header,
+mat-paginated-tab-header-container, mat-paginated-tab-header-item-wrapper, mat-tab-label;
diff --git a/src/material/tabs/_tabs-theme.import.scss b/src/material/tabs/_tabs-theme.import.scss
index 56058307fa2c..52dd9468d601 100644
--- a/src/material/tabs/_tabs-theme.import.scss
+++ b/src/material/tabs/_tabs-theme.import.scss
@@ -1,8 +1,6 @@
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'tabs-theme' hide color, theme, typography;
-@forward 'tabs-theme' as mat-tabs-* hide mat-tabs-background, mat-tabs-density, mat-tabs-ink-bar,
-mat-tabs-tab-label-focus;
+@forward './tabs-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/toolbar/_toolbar-legacy-index.scss b/src/material/toolbar/_toolbar-legacy-index.scss
new file mode 100644
index 000000000000..6c53bb15cf37
--- /dev/null
+++ b/src/material/toolbar/_toolbar-legacy-index.scss
@@ -0,0 +1,4 @@
+@forward 'toolbar-variables' as mat-toolbar-*;
+@forward 'toolbar-theme' hide color, density, theme, typography;
+@forward 'toolbar-theme' as mat-toolbar-* hide mat-toolbar-color, mat-toolbar-form-field-overrides,
+mat-toolbar-height;
diff --git a/src/material/toolbar/_toolbar-theme.import.scss b/src/material/toolbar/_toolbar-theme.import.scss
index e0c0dbf55779..b682fb9532cd 100644
--- a/src/material/toolbar/_toolbar-theme.import.scss
+++ b/src/material/toolbar/_toolbar-theme.import.scss
@@ -1,10 +1,7 @@
 @forward '../core/theming/theming.import';
 @forward '../core/style/variables.import';
-@forward 'toolbar-variables' as mat-toolbar-*;
 @forward '../core/typography/typography-utils.import';
-@forward 'toolbar-theme' hide color, density, theme, typography;
-@forward 'toolbar-theme' as mat-toolbar-* hide mat-toolbar-color, mat-toolbar-form-field-overrides,
-mat-toolbar-height;
+@forward './toolbar-legacy-index';
 
 @import '../core/density/private/compatibility';
 @import '../core/style/variables';
diff --git a/src/material/toolbar/_toolbar-variables.import.scss b/src/material/toolbar/_toolbar-variables.import.scss
index e9053691d0d1..9faf8d47773b 100644
--- a/src/material/toolbar/_toolbar-variables.import.scss
+++ b/src/material/toolbar/_toolbar-variables.import.scss
@@ -1 +1 @@
-@forward 'toolbar-variables' as mat-toolbar-*;
+@forward './toolbar-legacy-index';
diff --git a/src/material/tooltip/_tooltip-legacy-index.scss b/src/material/tooltip/_tooltip-legacy-index.scss
new file mode 100644
index 000000000000..d33660bb43f3
--- /dev/null
+++ b/src/material/tooltip/_tooltip-legacy-index.scss
@@ -0,0 +1,3 @@
+@forward 'tooltip-theme' hide $font-size, $handset-font-size, $handset-target-height,
+$handset-vertical-padding, $target-height, $vertical-padding, color, theme, typography;
+@forward 'tooltip-theme' as mat-tooltip-* hide mat-tooltip-density;
diff --git a/src/material/tooltip/_tooltip-theme.import.scss b/src/material/tooltip/_tooltip-theme.import.scss
index 4a0efa17862d..4bfeab03767f 100644
--- a/src/material/tooltip/_tooltip-theme.import.scss
+++ b/src/material/tooltip/_tooltip-theme.import.scss
@@ -1,8 +1,6 @@
 @forward '../core/theming/theming.import';
 @forward '../core/typography/typography-utils.import';
-@forward 'tooltip-theme' hide $font-size, $handset-font-size, $handset-target-height,
-$handset-vertical-padding, $target-height, $vertical-padding, color, theme, typography;
-@forward 'tooltip-theme' as mat-tooltip-* hide mat-tooltip-density;
+@forward './tooltip-legacy-index';
 
 @import '../core/theming/palette';
 @import '../core/theming/theming';
diff --git a/src/material/tree/_tree-legacy-index.scss b/src/material/tree/_tree-legacy-index.scss
new file mode 100644
index 000000000000..5faf229eccb6
--- /dev/null
+++ b/src/material/tree/_tree-legacy-index.scss
@@ -0,0 +1,2 @@
+@forward 'tree-variables' as mat-tree-*;
+@forward 'tree-theme' as mat-tree-*;
diff --git a/src/material/tree/_tree-theme.import.scss b/src/material/tree/_tree-theme.import.scss
index c7ed1fdf06dd..ed42dcb4c785 100644
--- a/src/material/tree/_tree-theme.import.scss
+++ b/src/material/tree/_tree-theme.import.scss
@@ -1,7 +1,6 @@
 @forward '../core/theming/theming.import';
-@forward 'tree-variables' as mat-tree-*;
 @forward '../core/typography/typography-utils.import';
-@forward 'tree-theme' as mat-tree-*;
+@forward './tree-legacy-index';
 
 @import '../core/density/private/compatibility';
 @import '../core/theming/palette';
diff --git a/src/material/tree/_tree-variables.import.scss b/src/material/tree/_tree-variables.import.scss
index 8cd583945dce..465eb38e9be6 100644
--- a/src/material/tree/_tree-variables.import.scss
+++ b/src/material/tree/_tree-variables.import.scss
@@ -1 +1 @@
-@forward 'tree-variables' as mat-tree-*;
+@forward './tree-legacy-index';