diff --git a/src/cdk-experimental/column-resize/column-resize.ts b/src/cdk-experimental/column-resize/column-resize.ts
index cba092eff599..5bf8c4359f55 100644
--- a/src/cdk-experimental/column-resize/column-resize.ts
+++ b/src/cdk-experimental/column-resize/column-resize.ts
@@ -21,7 +21,7 @@ import {_IdGenerator} from '@angular/cdk/a11y';
 import {merge, Subject} from 'rxjs';
 import {mapTo, pairwise, startWith, take, takeUntil} from 'rxjs/operators';
 
-import {_closest} from '@angular/cdk-experimental/popover-edit';
+import {_closest} from '../popover-edit';
 
 import {ColumnResizeNotifier, ColumnResizeNotifierSource} from './column-resize-notifier';
 import {HEADER_CELL_SELECTOR, RESIZE_OVERLAY_SELECTOR} from './selectors';
diff --git a/src/cdk-experimental/column-resize/event-dispatcher.ts b/src/cdk-experimental/column-resize/event-dispatcher.ts
index 1abd23ae827c..f7c8e19adf3d 100644
--- a/src/cdk-experimental/column-resize/event-dispatcher.ts
+++ b/src/cdk-experimental/column-resize/event-dispatcher.ts
@@ -10,7 +10,7 @@ import {Injectable, NgZone, inject} from '@angular/core';
 import {combineLatest, MonoTypeOperatorFunction, Observable, Subject} from 'rxjs';
 import {distinctUntilChanged, map, share, skip, startWith} from 'rxjs/operators';
 
-import {_closest} from '@angular/cdk-experimental/popover-edit';
+import {_closest} from '../popover-edit';
 
 import {HEADER_ROW_SELECTOR} from './selectors';
 
diff --git a/src/cdk-experimental/column-resize/overlay-handle.ts b/src/cdk-experimental/column-resize/overlay-handle.ts
index 5eb57991153d..0d8ab65e35d0 100644
--- a/src/cdk-experimental/column-resize/overlay-handle.ts
+++ b/src/cdk-experimental/column-resize/overlay-handle.ts
@@ -30,7 +30,7 @@ import {
   takeUntil,
 } from 'rxjs/operators';
 
-import {_closest} from '@angular/cdk-experimental/popover-edit';
+import {_closest} from '../popover-edit';
 
 import {HEADER_CELL_SELECTOR} from './selectors';
 import {ColumnResizeNotifierSource} from './column-resize-notifier';
diff --git a/src/cdk-experimental/column-resize/resizable.ts b/src/cdk-experimental/column-resize/resizable.ts
index 26016cf76f7f..fafe5141dd8a 100644
--- a/src/cdk-experimental/column-resize/resizable.ts
+++ b/src/cdk-experimental/column-resize/resizable.ts
@@ -26,7 +26,7 @@ import {CdkColumnDef, _CoalescedStyleScheduler} from '@angular/cdk/table';
 import {merge, Subject} from 'rxjs';
 import {distinctUntilChanged, filter, take, takeUntil} from 'rxjs/operators';
 
-import {_closest} from '@angular/cdk-experimental/popover-edit';
+import {_closest} from '../popover-edit';
 
 import {HEADER_ROW_SELECTOR} from './selectors';
 import {ResizeOverlayHandle} from './overlay-handle';
diff --git a/src/cdk-experimental/combobox/combobox.spec.ts b/src/cdk-experimental/combobox/combobox.spec.ts
index 88656cbb2bf8..f264de9024d0 100644
--- a/src/cdk-experimental/combobox/combobox.spec.ts
+++ b/src/cdk-experimental/combobox/combobox.spec.ts
@@ -1,4 +1,4 @@
-import {CdkComboboxPopup} from '@angular/cdk-experimental/combobox/combobox-popup';
+import {CdkComboboxPopup} from '../combobox';
 import {DOWN_ARROW, ESCAPE} from '@angular/cdk/keycodes';
 import {dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing/private';
 import {Component, DebugElement, ElementRef, ViewChild, signal} from '@angular/core';
diff --git a/src/cdk-experimental/listbox/listbox.ts b/src/cdk-experimental/listbox/listbox.ts
index f7e910faac80..c24b05876185 100644
--- a/src/cdk-experimental/listbox/listbox.ts
+++ b/src/cdk-experimental/listbox/listbox.ts
@@ -16,7 +16,7 @@ import {
   input,
   model,
 } from '@angular/core';
-import {ListboxPattern, OptionPattern} from '@angular/cdk-experimental/ui-patterns';
+import {ListboxPattern, OptionPattern} from '../ui-patterns';
 import {Directionality} from '@angular/cdk/bidi';
 import {toSignal} from '@angular/core/rxjs-interop';
 import {_IdGenerator} from '@angular/cdk/a11y';
diff --git a/src/cdk/a11y/a11y-module.ts b/src/cdk/a11y/a11y-module.ts
index 5f248f4b717e..34487dcc0821 100644
--- a/src/cdk/a11y/a11y-module.ts
+++ b/src/cdk/a11y/a11y-module.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ObserversModule} from '@angular/cdk/observers';
+import {ObserversModule} from '../observers';
 import {NgModule, inject} from '@angular/core';
 import {CdkMonitorFocus} from './focus-monitor/focus-monitor';
 import {CdkTrapFocus} from './focus-trap/focus-trap';
diff --git a/src/cdk/a11y/aria-describer/aria-describer.ts b/src/cdk/a11y/aria-describer/aria-describer.ts
index 4302739500d0..1b9d2fc3e666 100644
--- a/src/cdk/a11y/aria-describer/aria-describer.ts
+++ b/src/cdk/a11y/aria-describer/aria-describer.ts
@@ -8,9 +8,9 @@
 
 import {DOCUMENT} from '@angular/common';
 import {Injectable, OnDestroy, APP_ID, inject} from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
+import {Platform} from '../../platform';
 import {addAriaReferencedId, getAriaReferenceIds, removeAriaReferencedId} from './aria-reference';
-import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
+import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '../../private';
 
 /**
  * Interface used to register message elements and keep a count of how many registrations have
diff --git a/src/cdk/a11y/focus-monitor/focus-monitor.spec.ts b/src/cdk/a11y/focus-monitor/focus-monitor.spec.ts
index 1bed0e280003..56b8f03cefa2 100644
--- a/src/cdk/a11y/focus-monitor/focus-monitor.spec.ts
+++ b/src/cdk/a11y/focus-monitor/focus-monitor.spec.ts
@@ -1,5 +1,5 @@
-import {TAB} from '@angular/cdk/keycodes';
-import {Platform} from '@angular/cdk/platform';
+import {TAB} from '../../keycodes';
+import {Platform} from '../../platform';
 import {DOCUMENT} from '@angular/common';
 import {Component, ViewChild} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, flush, inject, tick} from '@angular/core/testing';
diff --git a/src/cdk/a11y/focus-monitor/focus-monitor.ts b/src/cdk/a11y/focus-monitor/focus-monitor.ts
index ef34ed52694b..d810b3044f61 100644
--- a/src/cdk/a11y/focus-monitor/focus-monitor.ts
+++ b/src/cdk/a11y/focus-monitor/focus-monitor.ts
@@ -11,7 +11,7 @@ import {
   normalizePassiveListenerOptions,
   _getShadowRoot,
   _getEventTarget,
-} from '@angular/cdk/platform';
+} from '../../platform';
 import {
   Directive,
   ElementRef,
@@ -26,7 +26,7 @@ import {
 } from '@angular/core';
 import {Observable, of as observableOf, Subject, Subscription} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
-import {coerceElement} from '@angular/cdk/coercion';
+import {coerceElement} from '../../coercion';
 import {DOCUMENT} from '@angular/common';
 import {InputModalityDetector, TOUCH_BUFFER_MS} from '../input-modality/input-modality-detector';
 
diff --git a/src/cdk/a11y/focus-monitor/focus-monitor.zone.spec.ts b/src/cdk/a11y/focus-monitor/focus-monitor.zone.spec.ts
index 33c1e386b953..7865bbf9d834 100644
--- a/src/cdk/a11y/focus-monitor/focus-monitor.zone.spec.ts
+++ b/src/cdk/a11y/focus-monitor/focus-monitor.zone.spec.ts
@@ -1,5 +1,5 @@
-import {Platform} from '@angular/cdk/platform';
-import {patchElementFocus} from '@angular/cdk/testing/private';
+import {Platform} from '../../platform';
+import {patchElementFocus} from '../../testing/private';
 import {Component, NgZone, provideZoneChangeDetection} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, inject, tick} from '@angular/core/testing';
 import {A11yModule} from '../a11y-module';
diff --git a/src/cdk/a11y/focus-trap/focus-trap.spec.ts b/src/cdk/a11y/focus-trap/focus-trap.spec.ts
index ec480249c73a..129b8fb881ea 100644
--- a/src/cdk/a11y/focus-trap/focus-trap.spec.ts
+++ b/src/cdk/a11y/focus-trap/focus-trap.spec.ts
@@ -1,5 +1,5 @@
-import {Platform, _supportsShadowDom} from '@angular/cdk/platform';
-import {CdkPortalOutlet, PortalModule, TemplatePortal} from '@angular/cdk/portal';
+import {Platform, _supportsShadowDom} from '../../platform';
+import {CdkPortalOutlet, PortalModule, TemplatePortal} from '../../portal';
 import {
   Component,
   TemplateRef,
diff --git a/src/cdk/a11y/focus-trap/focus-trap.ts b/src/cdk/a11y/focus-trap/focus-trap.ts
index b367d5c428a5..bb21c2b9bcde 100644
--- a/src/cdk/a11y/focus-trap/focus-trap.ts
+++ b/src/cdk/a11y/focus-trap/focus-trap.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Platform, _getFocusedElementPierceShadowDom} from '@angular/cdk/platform';
+import {Platform, _getFocusedElementPierceShadowDom} from '../../platform';
 import {DOCUMENT} from '@angular/common';
 import {
   AfterContentInit,
@@ -25,7 +25,7 @@ import {
   inject,
 } from '@angular/core';
 import {InteractivityChecker} from '../interactivity-checker/interactivity-checker';
-import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
+import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '../../private';
 
 /**
  * Class that allows for trapping focus within a DOM element.
diff --git a/src/cdk/a11y/high-contrast-mode/high-contrast-mode-detector.spec.ts b/src/cdk/a11y/high-contrast-mode/high-contrast-mode-detector.spec.ts
index 6cdd028145d6..8b9ca218d595 100644
--- a/src/cdk/a11y/high-contrast-mode/high-contrast-mode-detector.spec.ts
+++ b/src/cdk/a11y/high-contrast-mode/high-contrast-mode-detector.spec.ts
@@ -5,7 +5,7 @@ import {
   HighContrastModeDetector,
   WHITE_ON_BLACK_CSS_CLASS,
 } from './high-contrast-mode-detector';
-import {Platform} from '@angular/cdk/platform';
+import {Platform} from '../../platform';
 import {TestBed} from '@angular/core/testing';
 import {Provider} from '@angular/core';
 import {A11yModule} from '../a11y-module';
diff --git a/src/cdk/a11y/high-contrast-mode/high-contrast-mode-detector.ts b/src/cdk/a11y/high-contrast-mode/high-contrast-mode-detector.ts
index 7118366ebfea..6c3c62d88f3a 100644
--- a/src/cdk/a11y/high-contrast-mode/high-contrast-mode-detector.ts
+++ b/src/cdk/a11y/high-contrast-mode/high-contrast-mode-detector.ts
@@ -7,8 +7,8 @@
  */
 
 import {inject, Injectable, OnDestroy} from '@angular/core';
-import {BreakpointObserver} from '@angular/cdk/layout';
-import {Platform} from '@angular/cdk/platform';
+import {BreakpointObserver} from '../../layout';
+import {Platform} from '../../platform';
 import {DOCUMENT} from '@angular/common';
 import {Subscription} from 'rxjs';
 
diff --git a/src/cdk/a11y/input-modality/input-modality-detector.spec.ts b/src/cdk/a11y/input-modality/input-modality-detector.spec.ts
index a7dee553b5cf..32279e699e47 100644
--- a/src/cdk/a11y/input-modality/input-modality-detector.spec.ts
+++ b/src/cdk/a11y/input-modality/input-modality-detector.spec.ts
@@ -1,5 +1,5 @@
-import {A, ALT, B, C, CONTROL, MAC_META, META, SHIFT} from '@angular/cdk/keycodes';
-import {Platform} from '@angular/cdk/platform';
+import {A, ALT, B, C, CONTROL, MAC_META, META, SHIFT} from '../../keycodes';
+import {Platform} from '../../platform';
 
 import {
   createMouseEvent,
diff --git a/src/cdk/a11y/input-modality/input-modality-detector.ts b/src/cdk/a11y/input-modality/input-modality-detector.ts
index 87cebaf4fd7a..58252f742be5 100644
--- a/src/cdk/a11y/input-modality/input-modality-detector.ts
+++ b/src/cdk/a11y/input-modality/input-modality-detector.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ALT, CONTROL, MAC_META, META, SHIFT} from '@angular/cdk/keycodes';
+import {ALT, CONTROL, MAC_META, META, SHIFT} from '../../keycodes';
 import {
   Injectable,
   InjectionToken,
@@ -15,7 +15,7 @@ import {
   inject,
   RendererFactory2,
 } from '@angular/core';
-import {Platform, _bindEventWithOptions, _getEventTarget} from '@angular/cdk/platform';
+import {Platform, _bindEventWithOptions, _getEventTarget} from '../../platform';
 import {DOCUMENT} from '@angular/common';
 import {BehaviorSubject, Observable} from 'rxjs';
 import {distinctUntilChanged, skip} from 'rxjs/operators';
diff --git a/src/cdk/a11y/interactivity-checker/interactivity-checker.spec.ts b/src/cdk/a11y/interactivity-checker/interactivity-checker.spec.ts
index bfdb9c12de96..9b629f59a42c 100644
--- a/src/cdk/a11y/interactivity-checker/interactivity-checker.spec.ts
+++ b/src/cdk/a11y/interactivity-checker/interactivity-checker.spec.ts
@@ -1,4 +1,4 @@
-import {Platform} from '@angular/cdk/platform';
+import {Platform} from '../../platform';
 import {TestBed} from '@angular/core/testing';
 import {InteractivityChecker, IsFocusableConfig} from './interactivity-checker';
 
diff --git a/src/cdk/a11y/interactivity-checker/interactivity-checker.ts b/src/cdk/a11y/interactivity-checker/interactivity-checker.ts
index 25cf34505108..fb31fe4b989e 100644
--- a/src/cdk/a11y/interactivity-checker/interactivity-checker.ts
+++ b/src/cdk/a11y/interactivity-checker/interactivity-checker.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Platform} from '@angular/cdk/platform';
+import {Platform} from '../../platform';
 import {Injectable, inject} from '@angular/core';
 
 /**
diff --git a/src/cdk/a11y/key-manager/list-key-manager.spec.ts b/src/cdk/a11y/key-manager/list-key-manager.spec.ts
index ab4ca61e7087..51821330ed06 100644
--- a/src/cdk/a11y/key-manager/list-key-manager.spec.ts
+++ b/src/cdk/a11y/key-manager/list-key-manager.spec.ts
@@ -1,4 +1,4 @@
-import {DOWN_ARROW, END, HOME, LEFT_ARROW, RIGHT_ARROW, TAB, UP_ARROW} from '@angular/cdk/keycodes';
+import {DOWN_ARROW, END, HOME, LEFT_ARROW, RIGHT_ARROW, TAB, UP_ARROW} from '../../keycodes';
 import {createKeyboardEvent} from '../../testing/private';
 import {Component, QueryList, signal} from '@angular/core';
 import {TestBed, fakeAsync, tick} from '@angular/core/testing';
diff --git a/src/cdk/a11y/key-manager/list-key-manager.ts b/src/cdk/a11y/key-manager/list-key-manager.ts
index ef40642b7f25..55796cbe1d01 100644
--- a/src/cdk/a11y/key-manager/list-key-manager.ts
+++ b/src/cdk/a11y/key-manager/list-key-manager.ts
@@ -17,7 +17,7 @@ import {
   TAB,
   UP_ARROW,
   hasModifierKey,
-} from '@angular/cdk/keycodes';
+} from '../../keycodes';
 import {EffectRef, Injector, QueryList, Signal, effect, isSignal, signal} from '@angular/core';
 import {Subject, Subscription} from 'rxjs';
 import {Typeahead} from './typeahead';
diff --git a/src/cdk/a11y/key-manager/tree-key-manager.ts b/src/cdk/a11y/key-manager/tree-key-manager.ts
index 1e4bfa2a4122..fb16ee2d083b 100644
--- a/src/cdk/a11y/key-manager/tree-key-manager.ts
+++ b/src/cdk/a11y/key-manager/tree-key-manager.ts
@@ -7,7 +7,7 @@
  */
 
 import {InjectionToken, QueryList} from '@angular/core';
-import {coerceObservable} from '@angular/cdk/coercion/private';
+import {coerceObservable} from '../../coercion/private';
 import {Observable, Subject, Subscription, isObservable, of as observableOf} from 'rxjs';
 import {take} from 'rxjs/operators';
 import {
diff --git a/src/cdk/a11y/key-manager/typeahead.ts b/src/cdk/a11y/key-manager/typeahead.ts
index 1033a14066bc..a0d460d36516 100644
--- a/src/cdk/a11y/key-manager/typeahead.ts
+++ b/src/cdk/a11y/key-manager/typeahead.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {A, NINE, Z, ZERO} from '@angular/cdk/keycodes';
+import {A, NINE, Z, ZERO} from '../../keycodes';
 import {Subject, Observable} from 'rxjs';
 import {debounceTime, filter, map, tap} from 'rxjs/operators';
 
diff --git a/src/cdk/a11y/live-announcer/live-announcer.spec.ts b/src/cdk/a11y/live-announcer/live-announcer.spec.ts
index 2dbf2000fa4f..c92882f3a570 100644
--- a/src/cdk/a11y/live-announcer/live-announcer.spec.ts
+++ b/src/cdk/a11y/live-announcer/live-announcer.spec.ts
@@ -1,6 +1,6 @@
-import {MutationObserverFactory} from '@angular/cdk/observers';
-import {Overlay} from '@angular/cdk/overlay';
-import {ComponentPortal} from '@angular/cdk/portal';
+import {MutationObserverFactory} from '../../observers';
+import {Overlay} from '../../overlay';
+import {ComponentPortal} from '../../portal';
 import {Component, inject} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, flush, tick} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
diff --git a/src/cdk/a11y/live-announcer/live-announcer.ts b/src/cdk/a11y/live-announcer/live-announcer.ts
index 91cd457f6812..20a638e4fb7e 100644
--- a/src/cdk/a11y/live-announcer/live-announcer.ts
+++ b/src/cdk/a11y/live-announcer/live-announcer.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ContentObserver} from '@angular/cdk/observers';
+import {ContentObserver} from '../../observers';
 import {DOCUMENT} from '@angular/common';
 import {Directive, ElementRef, Injectable, Input, NgZone, OnDestroy, inject} from '@angular/core';
 import {Subscription} from 'rxjs';
@@ -16,7 +16,7 @@ import {
   LIVE_ANNOUNCER_ELEMENT_TOKEN,
   LIVE_ANNOUNCER_DEFAULT_OPTIONS,
 } from './live-announcer-tokens';
-import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
+import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '../../private';
 
 let uniqueIds = 0;
 
diff --git a/src/cdk/accordion/accordion-item.ts b/src/cdk/accordion/accordion-item.ts
index 9c1a856b24c0..97a9cdd07d5b 100644
--- a/src/cdk/accordion/accordion-item.ts
+++ b/src/cdk/accordion/accordion-item.ts
@@ -17,8 +17,8 @@ import {
   inject,
   OnInit,
 } from '@angular/core';
-import {_IdGenerator} from '@angular/cdk/a11y';
-import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
+import {_IdGenerator} from '../a11y';
+import {UniqueSelectionDispatcher} from '../collections';
 import {CDK_ACCORDION, CdkAccordion} from './accordion';
 import {Subscription} from 'rxjs';
 
diff --git a/src/cdk/accordion/accordion.ts b/src/cdk/accordion/accordion.ts
index b110380f67c8..9a5f6200ea3f 100644
--- a/src/cdk/accordion/accordion.ts
+++ b/src/cdk/accordion/accordion.ts
@@ -16,7 +16,7 @@ import {
   booleanAttribute,
   inject,
 } from '@angular/core';
-import {_IdGenerator} from '@angular/cdk/a11y';
+import {_IdGenerator} from '../a11y';
 import {Subject} from 'rxjs';
 
 /**
diff --git a/src/cdk/coercion/string-array.spec.ts b/src/cdk/coercion/string-array.spec.ts
index e83779f7d44b..19f7768d42e1 100644
--- a/src/cdk/coercion/string-array.spec.ts
+++ b/src/cdk/coercion/string-array.spec.ts
@@ -1,4 +1,4 @@
-import {coerceStringArray} from '@angular/cdk/coercion/string-array';
+import {coerceStringArray} from '../coercion/string-array';
 
 describe('coerceStringArray', () => {
   it('should split a string', () => {
diff --git a/src/cdk/dialog/dialog-config.ts b/src/cdk/dialog/dialog-config.ts
index 82c07662fc24..b78b427b93ff 100644
--- a/src/cdk/dialog/dialog-config.ts
+++ b/src/cdk/dialog/dialog-config.ts
@@ -7,9 +7,9 @@
  */
 
 import {ViewContainerRef, Injector, StaticProvider, Type} from '@angular/core';
-import {Direction} from '@angular/cdk/bidi';
-import {PositionStrategy, ScrollStrategy} from '@angular/cdk/overlay';
-import {BasePortalOutlet} from '@angular/cdk/portal';
+import {Direction} from '../bidi';
+import {PositionStrategy, ScrollStrategy} from '../overlay';
+import {BasePortalOutlet} from '../portal';
 
 /** Options for where to set focus to automatically on dialog open */
 export type AutoFocusTarget = 'dialog' | 'first-tabbable' | 'first-heading';
diff --git a/src/cdk/dialog/dialog-container.ts b/src/cdk/dialog/dialog-container.ts
index 7f426063e700..38836bdda0fd 100644
--- a/src/cdk/dialog/dialog-container.ts
+++ b/src/cdk/dialog/dialog-container.ts
@@ -12,16 +12,16 @@ import {
   FocusTrap,
   FocusTrapFactory,
   InteractivityChecker,
-} from '@angular/cdk/a11y';
-import {OverlayRef} from '@angular/cdk/overlay';
-import {Platform, _getFocusedElementPierceShadowDom} from '@angular/cdk/platform';
+} from '../a11y';
+import {OverlayRef} from '../overlay';
+import {Platform, _getFocusedElementPierceShadowDom} from '../platform';
 import {
   BasePortalOutlet,
   CdkPortalOutlet,
   ComponentPortal,
   DomPortal,
   TemplatePortal,
-} from '@angular/cdk/portal';
+} from '../portal';
 import {DOCUMENT} from '@angular/common';
 import {
   ChangeDetectionStrategy,
diff --git a/src/cdk/dialog/dialog-injectors.ts b/src/cdk/dialog/dialog-injectors.ts
index db4d69955d81..9d1cc780f395 100644
--- a/src/cdk/dialog/dialog-injectors.ts
+++ b/src/cdk/dialog/dialog-injectors.ts
@@ -7,7 +7,7 @@
  */
 
 import {InjectionToken, inject} from '@angular/core';
-import {Overlay, ScrollStrategy} from '@angular/cdk/overlay';
+import {Overlay, ScrollStrategy} from '../overlay';
 import {DialogConfig} from './dialog-config';
 
 /** Injection token for the Dialog's ScrollStrategy. */
diff --git a/src/cdk/dialog/dialog-module.ts b/src/cdk/dialog/dialog-module.ts
index 826035881579..4c800bc30304 100644
--- a/src/cdk/dialog/dialog-module.ts
+++ b/src/cdk/dialog/dialog-module.ts
@@ -7,9 +7,9 @@
  */
 
 import {NgModule} from '@angular/core';
-import {OverlayModule} from '@angular/cdk/overlay';
-import {PortalModule} from '@angular/cdk/portal';
-import {A11yModule} from '@angular/cdk/a11y';
+import {OverlayModule} from '../overlay';
+import {PortalModule} from '../portal';
+import {A11yModule} from '../a11y';
 import {Dialog} from './dialog';
 import {CdkDialogContainer} from './dialog-container';
 
diff --git a/src/cdk/dialog/dialog-ref.ts b/src/cdk/dialog/dialog-ref.ts
index db361b6b9001..4e971d30548a 100644
--- a/src/cdk/dialog/dialog-ref.ts
+++ b/src/cdk/dialog/dialog-ref.ts
@@ -6,12 +6,12 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {OverlayRef} from '@angular/cdk/overlay';
-import {ESCAPE, hasModifierKey} from '@angular/cdk/keycodes';
+import {OverlayRef} from '../overlay';
+import {ESCAPE, hasModifierKey} from '../keycodes';
 import {Observable, Subject, Subscription} from 'rxjs';
 import {DialogConfig} from './dialog-config';
-import {FocusOrigin} from '@angular/cdk/a11y';
-import {BasePortalOutlet} from '@angular/cdk/portal';
+import {FocusOrigin} from '../a11y';
+import {BasePortalOutlet} from '../portal';
 import {ComponentRef} from '@angular/core';
 
 /** Additional options that can be passed in when closing a dialog. */
diff --git a/src/cdk/dialog/dialog.spec.ts b/src/cdk/dialog/dialog.spec.ts
index bda16129413e..9bf9c6fae664 100644
--- a/src/cdk/dialog/dialog.spec.ts
+++ b/src/cdk/dialog/dialog.spec.ts
@@ -1,12 +1,8 @@
-import {Directionality} from '@angular/cdk/bidi';
-import {A, ESCAPE} from '@angular/cdk/keycodes';
-import {Overlay, OverlayContainer, ScrollDispatcher} from '@angular/cdk/overlay';
-import {_supportsShadowDom} from '@angular/cdk/platform';
-import {
-  createKeyboardEvent,
-  dispatchEvent,
-  dispatchKeyboardEvent,
-} from '@angular/cdk/testing/private';
+import {Directionality} from '../bidi';
+import {A, ESCAPE} from '../keycodes';
+import {Overlay, OverlayContainer, ScrollDispatcher} from '../overlay';
+import {_supportsShadowDom} from '../platform';
+import {createKeyboardEvent, dispatchEvent, dispatchKeyboardEvent} from '../testing/private';
 import {Location} from '@angular/common';
 import {SpyLocation} from '@angular/common/testing';
 import {
diff --git a/src/cdk/dialog/dialog.ts b/src/cdk/dialog/dialog.ts
index 0c9e9f06c8e2..1804a41844ea 100644
--- a/src/cdk/dialog/dialog.ts
+++ b/src/cdk/dialog/dialog.ts
@@ -16,19 +16,13 @@ import {
   ComponentRef,
   inject,
 } from '@angular/core';
-import {BasePortalOutlet, ComponentPortal, TemplatePortal} from '@angular/cdk/portal';
+import {BasePortalOutlet, ComponentPortal, TemplatePortal} from '../portal';
 import {of as observableOf, Observable, Subject, defer} from 'rxjs';
 import {DialogRef} from './dialog-ref';
 import {DialogConfig} from './dialog-config';
-import {Directionality} from '@angular/cdk/bidi';
-import {_IdGenerator} from '@angular/cdk/a11y';
-import {
-  ComponentType,
-  Overlay,
-  OverlayRef,
-  OverlayConfig,
-  OverlayContainer,
-} from '@angular/cdk/overlay';
+import {Directionality} from '../bidi';
+import {_IdGenerator} from '../a11y';
+import {ComponentType, Overlay, OverlayRef, OverlayConfig, OverlayContainer} from '../overlay';
 import {startWith} from 'rxjs/operators';
 
 import {DEFAULT_DIALOG_CONFIG, DIALOG_DATA, DIALOG_SCROLL_STRATEGY} from './dialog-injectors';
diff --git a/src/cdk/drag-drop/directives/drag.ts b/src/cdk/drag-drop/directives/drag.ts
index d051a972e1dd..b30c42a2fe5e 100644
--- a/src/cdk/drag-drop/directives/drag.ts
+++ b/src/cdk/drag-drop/directives/drag.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Directionality} from '@angular/cdk/bidi';
+import {Directionality} from '../../bidi';
 import {
   Directive,
   ElementRef,
@@ -27,7 +27,7 @@ import {
   Injector,
   numberAttribute,
 } from '@angular/core';
-import {coerceElement, coerceNumberProperty} from '@angular/cdk/coercion';
+import {coerceElement, coerceNumberProperty} from '../../coercion';
 import {BehaviorSubject, Observable, Observer, Subject, merge} from 'rxjs';
 import {startWith, take, map, takeUntil, switchMap, tap} from 'rxjs/operators';
 import type {
diff --git a/src/cdk/drag-drop/directives/drop-list-shared.spec.ts b/src/cdk/drag-drop/directives/drop-list-shared.spec.ts
index e8b123c199a8..27295d770aea 100644
--- a/src/cdk/drag-drop/directives/drop-list-shared.spec.ts
+++ b/src/cdk/drag-drop/directives/drop-list-shared.spec.ts
@@ -1,6 +1,6 @@
-import {Directionality} from '@angular/cdk/bidi';
-import {Platform, _supportsShadowDom} from '@angular/cdk/platform';
-import {CdkScrollable, ViewportRuler} from '@angular/cdk/scrolling';
+import {Directionality} from '../../bidi';
+import {Platform, _supportsShadowDom} from '../../platform';
+import {CdkScrollable, ViewportRuler} from '../../scrolling';
 import {
   createMouseEvent,
   createTouchEvent,
@@ -8,7 +8,7 @@ import {
   dispatchFakeEvent,
   dispatchMouseEvent,
   dispatchTouchEvent,
-} from '@angular/cdk/testing/private';
+} from '../../testing/private';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
diff --git a/src/cdk/drag-drop/directives/drop-list.ts b/src/cdk/drag-drop/directives/drop-list.ts
index 5e9c210d4c44..40fa7955189d 100644
--- a/src/cdk/drag-drop/directives/drop-list.ts
+++ b/src/cdk/drag-drop/directives/drop-list.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {NumberInput, coerceArray, coerceNumberProperty} from '@angular/cdk/coercion';
+import {NumberInput, coerceArray, coerceNumberProperty} from '../../coercion';
 import {
   ElementRef,
   EventEmitter,
@@ -18,9 +18,9 @@ import {
   booleanAttribute,
   inject,
 } from '@angular/core';
-import {Directionality} from '@angular/cdk/bidi';
-import {_IdGenerator} from '@angular/cdk/a11y';
-import {ScrollDispatcher} from '@angular/cdk/scrolling';
+import {Directionality} from '../../bidi';
+import {_IdGenerator} from '../../a11y';
+import {ScrollDispatcher} from '../../scrolling';
 import {CDK_DROP_LIST, CdkDrag} from './drag';
 import {CdkDragDrop, CdkDragEnter, CdkDragExit, CdkDragSortEvent} from '../drag-events';
 import {CDK_DROP_LIST_GROUP, CdkDropListGroup} from './drop-list-group';
diff --git a/src/cdk/drag-drop/directives/single-axis-drop-list.spec.ts b/src/cdk/drag-drop/directives/single-axis-drop-list.spec.ts
index 28e8938b6c32..4525a3e193c0 100644
--- a/src/cdk/drag-drop/directives/single-axis-drop-list.spec.ts
+++ b/src/cdk/drag-drop/directives/single-axis-drop-list.spec.ts
@@ -1,6 +1,6 @@
 import {fakeAsync, flush} from '@angular/core/testing';
-import {dispatchMouseEvent} from '@angular/cdk/testing/private';
-import {_supportsShadowDom} from '@angular/cdk/platform';
+import {dispatchMouseEvent} from '../../testing/private';
+import {_supportsShadowDom} from '../../platform';
 import {createComponent, startDraggingViaMouse} from './test-utils.spec';
 import {
   ConnectedDropZones,
diff --git a/src/cdk/drag-drop/directives/standalone-drag.spec.ts b/src/cdk/drag-drop/directives/standalone-drag.spec.ts
index 049637833356..a40a5e76d345 100644
--- a/src/cdk/drag-drop/directives/standalone-drag.spec.ts
+++ b/src/cdk/drag-drop/directives/standalone-drag.spec.ts
@@ -18,8 +18,8 @@ import {
   dispatchFakeEvent,
   dispatchMouseEvent,
   dispatchTouchEvent,
-} from '@angular/cdk/testing/private';
-import {_supportsShadowDom} from '@angular/cdk/platform';
+} from '../../testing/private';
+import {_supportsShadowDom} from '../../platform';
 import {CdkDragHandle} from './drag-handle';
 import {CdkDrag} from './drag';
 import {CDK_DRAG_CONFIG, DragAxis, DragDropConfig} from './config';
diff --git a/src/cdk/drag-drop/directives/test-utils.spec.ts b/src/cdk/drag-drop/directives/test-utils.spec.ts
index 7ec7189a63f0..77d741971b5c 100644
--- a/src/cdk/drag-drop/directives/test-utils.spec.ts
+++ b/src/cdk/drag-drop/directives/test-utils.spec.ts
@@ -1,6 +1,6 @@
 import {EnvironmentProviders, Provider, Type, ViewEncapsulation} from '@angular/core';
 import {ComponentFixture, TestBed, tick} from '@angular/core/testing';
-import {dispatchMouseEvent, dispatchTouchEvent} from '@angular/cdk/testing/private';
+import {dispatchMouseEvent, dispatchTouchEvent} from '../../testing/private';
 import {CDK_DRAG_CONFIG, DragDropConfig, DropListOrientation} from './config';
 
 /** Options that can be used to configure a test. */
diff --git a/src/cdk/drag-drop/dom/parent-position-tracker.ts b/src/cdk/drag-drop/dom/parent-position-tracker.ts
index 2a96cea42c86..17c23907e0e7 100644
--- a/src/cdk/drag-drop/dom/parent-position-tracker.ts
+++ b/src/cdk/drag-drop/dom/parent-position-tracker.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {_getEventTarget} from '@angular/cdk/platform';
+import {_getEventTarget} from '../../platform';
 import {getMutableClientRect, adjustDomRect} from './dom-rect';
 
 /** Object holding the scroll position of something. */
diff --git a/src/cdk/drag-drop/drag-drop-module.ts b/src/cdk/drag-drop/drag-drop-module.ts
index 481c62154bd1..4452a0eb50c3 100644
--- a/src/cdk/drag-drop/drag-drop-module.ts
+++ b/src/cdk/drag-drop/drag-drop-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {CdkScrollableModule} from '@angular/cdk/scrolling';
+import {CdkScrollableModule} from '../scrolling';
 import {CdkDropList} from './directives/drop-list';
 import {CdkDropListGroup} from './directives/drop-list-group';
 import {CdkDrag} from './directives/drag';
diff --git a/src/cdk/drag-drop/drag-drop-registry.ts b/src/cdk/drag-drop/drag-drop-registry.ts
index 96d48c3a3d2e..9fdc66b75e5d 100644
--- a/src/cdk/drag-drop/drag-drop-registry.ts
+++ b/src/cdk/drag-drop/drag-drop-registry.ts
@@ -19,8 +19,8 @@ import {
   signal,
 } from '@angular/core';
 import {DOCUMENT} from '@angular/common';
-import {_bindEventWithOptions, _ListenerOptions} from '@angular/cdk/platform';
-import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
+import {_bindEventWithOptions, _ListenerOptions} from '../platform';
+import {_CdkPrivateStyleLoader} from '../private';
 import {Observable, Observer, Subject, merge} from 'rxjs';
 import type {DropListRef} from './drop-list-ref';
 import type {DragRef} from './drag-ref';
diff --git a/src/cdk/drag-drop/drag-drop.ts b/src/cdk/drag-drop/drag-drop.ts
index f3b43d3d5d3c..023a5f4bc85e 100644
--- a/src/cdk/drag-drop/drag-drop.ts
+++ b/src/cdk/drag-drop/drag-drop.ts
@@ -8,7 +8,7 @@
 
 import {Injectable, NgZone, ElementRef, inject, RendererFactory2} from '@angular/core';
 import {DOCUMENT} from '@angular/common';
-import {ViewportRuler} from '@angular/cdk/scrolling';
+import {ViewportRuler} from '../scrolling';
 import {DragRef, DragRefConfig} from './drag-ref';
 import {DropListRef} from './drop-list-ref';
 import {DragDropRegistry} from './drag-drop-registry';
diff --git a/src/cdk/drag-drop/drag-ref.ts b/src/cdk/drag-drop/drag-ref.ts
index fa24a4e76576..7296c3f59440 100644
--- a/src/cdk/drag-drop/drag-ref.ts
+++ b/src/cdk/drag-drop/drag-ref.ts
@@ -6,11 +6,11 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {isFakeMousedownFromScreenReader, isFakeTouchstartFromScreenReader} from '@angular/cdk/a11y';
-import {Direction} from '@angular/cdk/bidi';
-import {coerceElement} from '@angular/cdk/coercion';
-import {_getEventTarget, _getShadowRoot, _bindEventWithOptions} from '@angular/cdk/platform';
-import {ViewportRuler} from '@angular/cdk/scrolling';
+import {isFakeMousedownFromScreenReader, isFakeTouchstartFromScreenReader} from '../a11y';
+import {Direction} from '../bidi';
+import {coerceElement} from '../coercion';
+import {_getEventTarget, _getShadowRoot, _bindEventWithOptions} from '../platform';
+import {ViewportRuler} from '../scrolling';
 import {
   ElementRef,
   EmbeddedViewRef,
diff --git a/src/cdk/drag-drop/drop-list-ref.ts b/src/cdk/drag-drop/drop-list-ref.ts
index f6e9683612ed..ee94e4617793 100644
--- a/src/cdk/drag-drop/drop-list-ref.ts
+++ b/src/cdk/drag-drop/drop-list-ref.ts
@@ -7,10 +7,10 @@
  */
 
 import {ElementRef, NgZone} from '@angular/core';
-import {Direction} from '@angular/cdk/bidi';
-import {coerceElement} from '@angular/cdk/coercion';
-import {ViewportRuler} from '@angular/cdk/scrolling';
-import {_getShadowRoot} from '@angular/cdk/platform';
+import {Direction} from '../bidi';
+import {coerceElement} from '../coercion';
+import {ViewportRuler} from '../scrolling';
+import {_getShadowRoot} from '../platform';
 import {Subject, Subscription, interval, animationFrameScheduler} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
 import {DragDropRegistry} from './drag-drop-registry';
diff --git a/src/cdk/drag-drop/preview-ref.ts b/src/cdk/drag-drop/preview-ref.ts
index d1ddbfbddf16..7ffab115a7fb 100644
--- a/src/cdk/drag-drop/preview-ref.ts
+++ b/src/cdk/drag-drop/preview-ref.ts
@@ -7,7 +7,7 @@
  */
 
 import {EmbeddedViewRef, Renderer2, TemplateRef, ViewContainerRef} from '@angular/core';
-import {Direction} from '@angular/cdk/bidi';
+import {Direction} from '../bidi';
 import {
   extendStyles,
   getTransform,
diff --git a/src/cdk/drag-drop/sorting/mixed-sort-strategy.ts b/src/cdk/drag-drop/sorting/mixed-sort-strategy.ts
index b8165ae88e86..9fbe5d4f3a16 100644
--- a/src/cdk/drag-drop/sorting/mixed-sort-strategy.ts
+++ b/src/cdk/drag-drop/sorting/mixed-sort-strategy.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {_getShadowRoot} from '@angular/cdk/platform';
+import {_getShadowRoot} from '../../platform';
 import {moveItemInArray} from '../drag-utils';
 import {DropListSortStrategy, SortPredicate} from './drop-list-sort-strategy';
 import {DragDropRegistry} from '../drag-drop-registry';
diff --git a/src/cdk/drag-drop/sorting/single-axis-sort-strategy.ts b/src/cdk/drag-drop/sorting/single-axis-sort-strategy.ts
index affd9e158696..b3c5858234f3 100644
--- a/src/cdk/drag-drop/sorting/single-axis-sort-strategy.ts
+++ b/src/cdk/drag-drop/sorting/single-axis-sort-strategy.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Direction} from '@angular/cdk/bidi';
+import {Direction} from '../../bidi';
 import {DragDropRegistry} from '../drag-drop-registry';
 import {moveItemInArray} from '../drag-utils';
 import {combineTransforms} from '../dom/styling';
diff --git a/src/cdk/layout/breakpoints-observer.ts b/src/cdk/layout/breakpoints-observer.ts
index d81fa9bf7816..5373c85ecd63 100644
--- a/src/cdk/layout/breakpoints-observer.ts
+++ b/src/cdk/layout/breakpoints-observer.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {coerceArray} from '@angular/cdk/coercion';
+import {coerceArray} from '../coercion';
 import {Injectable, NgZone, OnDestroy, inject} from '@angular/core';
 import {combineLatest, concat, Observable, Observer, Subject} from 'rxjs';
 import {debounceTime, map, skip, startWith, take, takeUntil} from 'rxjs/operators';
diff --git a/src/cdk/layout/media-matcher.spec.ts b/src/cdk/layout/media-matcher.spec.ts
index 5a990e2e2bbe..50eb7b1ab548 100644
--- a/src/cdk/layout/media-matcher.spec.ts
+++ b/src/cdk/layout/media-matcher.spec.ts
@@ -7,7 +7,7 @@
  */
 import {MediaMatcher} from './media-matcher';
 import {inject} from '@angular/core/testing';
-import {Platform} from '@angular/cdk/platform';
+import {Platform} from '../platform';
 
 describe('MediaMatcher', () => {
   let mediaMatcher: MediaMatcher;
diff --git a/src/cdk/layout/media-matcher.ts b/src/cdk/layout/media-matcher.ts
index 5ec611317fa6..1dcad6ef72d0 100644
--- a/src/cdk/layout/media-matcher.ts
+++ b/src/cdk/layout/media-matcher.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import {Injectable, CSP_NONCE, inject} from '@angular/core';
-import {Platform} from '@angular/cdk/platform';
+import {Platform} from '../platform';
 
 /** Global registry for all dynamically-created, injected media queries. */
 const mediaQueriesForWebkitCompatibility: Set<string> = new Set<string>();
diff --git a/src/cdk/listbox/listbox.spec.ts b/src/cdk/listbox/listbox.spec.ts
index 46e304fae7f6..a986f13eaf18 100644
--- a/src/cdk/listbox/listbox.spec.ts
+++ b/src/cdk/listbox/listbox.spec.ts
@@ -1,14 +1,4 @@
-import {
-  A,
-  B,
-  DOWN_ARROW,
-  END,
-  HOME,
-  LEFT_ARROW,
-  RIGHT_ARROW,
-  SPACE,
-  UP_ARROW,
-} from '@angular/cdk/keycodes';
+import {A, B, DOWN_ARROW, END, HOME, LEFT_ARROW, RIGHT_ARROW, SPACE, UP_ARROW} from '../keycodes';
 import {Component, Type, signal} from '@angular/core';
 import {TestBed, fakeAsync, tick} from '@angular/core/testing';
 import {FormControl, ReactiveFormsModule} from '@angular/forms';
diff --git a/src/cdk/listbox/listbox.ts b/src/cdk/listbox/listbox.ts
index 0c1b86e0db02..b4405757ea89 100644
--- a/src/cdk/listbox/listbox.ts
+++ b/src/cdk/listbox/listbox.ts
@@ -11,10 +11,10 @@ import {
   ActiveDescendantKeyManager,
   Highlightable,
   ListKeyManagerOption,
-} from '@angular/cdk/a11y';
-import {Directionality} from '@angular/cdk/bidi';
-import {coerceArray} from '@angular/cdk/coercion';
-import {SelectionModel} from '@angular/cdk/collections';
+} from '../a11y';
+import {Directionality} from '../bidi';
+import {coerceArray} from '../coercion';
+import {SelectionModel} from '../collections';
 import {
   A,
   DOWN_ARROW,
@@ -26,8 +26,8 @@ import {
   RIGHT_ARROW,
   SPACE,
   UP_ARROW,
-} from '@angular/cdk/keycodes';
-import {Platform} from '@angular/cdk/platform';
+} from '../keycodes';
+import {Platform} from '../platform';
 import {
   AfterContentInit,
   booleanAttribute,
diff --git a/src/cdk/menu/context-menu-trigger.spec.ts b/src/cdk/menu/context-menu-trigger.spec.ts
index e67f38bec303..3b760d73a450 100644
--- a/src/cdk/menu/context-menu-trigger.spec.ts
+++ b/src/cdk/menu/context-menu-trigger.spec.ts
@@ -3,12 +3,12 @@ import {CdkMenuModule} from './menu-module';
 import {TestBed, waitForAsync, ComponentFixture} from '@angular/core/testing';
 import {CdkMenu} from './menu';
 import {CdkContextMenuTrigger} from './context-menu-trigger';
-import {dispatchKeyboardEvent, dispatchMouseEvent} from '@angular/cdk/testing/private';
+import {dispatchKeyboardEvent, dispatchMouseEvent} from '../testing/private';
 import {By} from '@angular/platform-browser';
 import {CdkMenuItem} from './menu-item';
 import {CdkMenuTrigger} from './menu-trigger';
 import {CdkMenuBar} from './menu-bar';
-import {LEFT_ARROW, RIGHT_ARROW} from '@angular/cdk/keycodes';
+import {LEFT_ARROW, RIGHT_ARROW} from '../keycodes';
 
 describe('CdkContextMenuTrigger', () => {
   describe('with simple context menu trigger', () => {
diff --git a/src/cdk/menu/context-menu-trigger.ts b/src/cdk/menu/context-menu-trigger.ts
index 558385b62082..739e29b3d412 100644
--- a/src/cdk/menu/context-menu-trigger.ts
+++ b/src/cdk/menu/context-menu-trigger.ts
@@ -15,14 +15,14 @@ import {
   Input,
   OnDestroy,
 } from '@angular/core';
-import {Directionality} from '@angular/cdk/bidi';
+import {Directionality} from '../bidi';
 import {
   FlexibleConnectedPositionStrategy,
   Overlay,
   OverlayConfig,
   STANDARD_DROPDOWN_BELOW_POSITIONS,
-} from '@angular/cdk/overlay';
-import {_getEventTarget} from '@angular/cdk/platform';
+} from '../overlay';
+import {_getEventTarget} from '../platform';
 import {merge, partition} from 'rxjs';
 import {skip, takeUntil, skipWhile} from 'rxjs/operators';
 import {MENU_STACK, MenuStack} from './menu-stack';
diff --git a/src/cdk/menu/event-detection.ts b/src/cdk/menu/event-detection.ts
index 3270bef4db5a..51af8775ce50 100644
--- a/src/cdk/menu/event-detection.ts
+++ b/src/cdk/menu/event-detection.ts
@@ -7,7 +7,7 @@
  */
 
 import {ElementRef} from '@angular/core';
-import {ENTER, SPACE} from '@angular/cdk/keycodes';
+import {ENTER, SPACE} from '../keycodes';
 
 /** Checks whether a keyboard event will trigger a native `click` event on an element. */
 export function eventDispatchesNativeClick(
diff --git a/src/cdk/menu/menu-bar.spec.ts b/src/cdk/menu/menu-bar.spec.ts
index 10f0d7c1b895..ea016465a9e1 100644
--- a/src/cdk/menu/menu-bar.spec.ts
+++ b/src/cdk/menu/menu-bar.spec.ts
@@ -22,7 +22,7 @@ import {
   SPACE,
   TAB,
   UP_ARROW,
-} from '@angular/cdk/keycodes';
+} from '../keycodes';
 import {
   createKeyboardEvent,
   dispatchEvent,
diff --git a/src/cdk/menu/menu-bar.ts b/src/cdk/menu/menu-bar.ts
index 062b223ff3f1..5d09bc9c6e6d 100644
--- a/src/cdk/menu/menu-bar.ts
+++ b/src/cdk/menu/menu-bar.ts
@@ -15,7 +15,7 @@ import {
   RIGHT_ARROW,
   TAB,
   UP_ARROW,
-} from '@angular/cdk/keycodes';
+} from '../keycodes';
 import {takeUntil} from 'rxjs/operators';
 import {CdkMenuGroup} from './menu-group';
 import {CDK_MENU} from './menu-interface';
diff --git a/src/cdk/menu/menu-base.ts b/src/cdk/menu/menu-base.ts
index 7bf538e8b040..1e51f35e0a8b 100644
--- a/src/cdk/menu/menu-base.ts
+++ b/src/cdk/menu/menu-base.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {_IdGenerator, FocusKeyManager, FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
-import {Directionality} from '@angular/cdk/bidi';
+import {_IdGenerator, FocusKeyManager, FocusMonitor, FocusOrigin} from '../a11y';
+import {Directionality} from '../bidi';
 import {
   AfterContentInit,
   ContentChildren,
diff --git a/src/cdk/menu/menu-group.ts b/src/cdk/menu/menu-group.ts
index 23ad88438ef7..2f05c5c469c6 100644
--- a/src/cdk/menu/menu-group.ts
+++ b/src/cdk/menu/menu-group.ts
@@ -7,7 +7,7 @@
  */
 
 import {Directive} from '@angular/core';
-import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
+import {UniqueSelectionDispatcher} from '../collections';
 
 /**
  * A grouping container for `CdkMenuItemRadio` instances, similar to a `role="radiogroup"` element.
diff --git a/src/cdk/menu/menu-interface.ts b/src/cdk/menu/menu-interface.ts
index 41293d9f3487..2029dfa05998 100644
--- a/src/cdk/menu/menu-interface.ts
+++ b/src/cdk/menu/menu-interface.ts
@@ -8,7 +8,7 @@
 
 import {InjectionToken} from '@angular/core';
 import {MenuStackItem} from './menu-stack';
-import {FocusOrigin} from '@angular/cdk/a11y';
+import {FocusOrigin} from '../a11y';
 
 /** Injection token used to return classes implementing the Menu interface */
 export const CDK_MENU = new InjectionToken<Menu>('cdk-menu');
diff --git a/src/cdk/menu/menu-item-radio.ts b/src/cdk/menu/menu-item-radio.ts
index a5c55c6d804e..8fbd60907995 100644
--- a/src/cdk/menu/menu-item-radio.ts
+++ b/src/cdk/menu/menu-item-radio.ts
@@ -7,8 +7,8 @@
  */
 
 import {Directive, inject, OnDestroy} from '@angular/core';
-import {UniqueSelectionDispatcher} from '@angular/cdk/collections';
-import {_IdGenerator} from '@angular/cdk/a11y';
+import {UniqueSelectionDispatcher} from '../collections';
+import {_IdGenerator} from '../a11y';
 import {CdkMenuItemSelectable} from './menu-item-selectable';
 import {CdkMenuItem} from './menu-item';
 
diff --git a/src/cdk/menu/menu-item.spec.ts b/src/cdk/menu/menu-item.spec.ts
index 83f19a7fb016..698e331ba72a 100644
--- a/src/cdk/menu/menu-item.spec.ts
+++ b/src/cdk/menu/menu-item.spec.ts
@@ -1,8 +1,8 @@
 import {Component, Type} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {dispatchKeyboardEvent} from '@angular/cdk/testing/private';
+import {dispatchKeyboardEvent} from '../testing/private';
 import {By} from '@angular/platform-browser';
-import {ENTER} from '@angular/cdk/keycodes';
+import {ENTER} from '../keycodes';
 import {CdkMenuModule} from './menu-module';
 import {CdkMenuItem} from './menu-item';
 
diff --git a/src/cdk/menu/menu-item.ts b/src/cdk/menu/menu-item.ts
index 1496720412af..3b81ffb3d740 100644
--- a/src/cdk/menu/menu-item.ts
+++ b/src/cdk/menu/menu-item.ts
@@ -18,9 +18,9 @@ import {
   Output,
   Renderer2,
 } from '@angular/core';
-import {FocusableOption, InputModalityDetector} from '@angular/cdk/a11y';
-import {ENTER, hasModifierKey, LEFT_ARROW, RIGHT_ARROW, SPACE} from '@angular/cdk/keycodes';
-import {Directionality} from '@angular/cdk/bidi';
+import {FocusableOption, InputModalityDetector} from '../a11y';
+import {ENTER, hasModifierKey, LEFT_ARROW, RIGHT_ARROW, SPACE} from '../keycodes';
+import {Directionality} from '../bidi';
 import {Subject} from 'rxjs';
 import {CdkMenuTrigger} from './menu-trigger';
 import {CDK_MENU, Menu} from './menu-interface';
diff --git a/src/cdk/menu/menu-module.ts b/src/cdk/menu/menu-module.ts
index 3f1f9824fc86..b56b1e79558f 100644
--- a/src/cdk/menu/menu-module.ts
+++ b/src/cdk/menu/menu-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {OverlayModule} from '@angular/cdk/overlay';
+import {OverlayModule} from '../overlay';
 import {CdkMenu} from './menu';
 import {CdkMenuBar} from './menu-bar';
 import {CdkMenuItem} from './menu-item';
diff --git a/src/cdk/menu/menu-stack.ts b/src/cdk/menu/menu-stack.ts
index b9c397b5ff2f..dee4e7532228 100644
--- a/src/cdk/menu/menu-stack.ts
+++ b/src/cdk/menu/menu-stack.ts
@@ -7,7 +7,7 @@
  */
 
 import {inject, Inject, Injectable, InjectionToken, Optional, SkipSelf} from '@angular/core';
-import {_IdGenerator} from '@angular/cdk/a11y';
+import {_IdGenerator} from '../a11y';
 import {Observable, Subject} from 'rxjs';
 import {debounceTime, distinctUntilChanged, startWith} from 'rxjs/operators';
 
diff --git a/src/cdk/menu/menu-trigger-base.ts b/src/cdk/menu/menu-trigger-base.ts
index 629a55173636..c800e0c8bb52 100644
--- a/src/cdk/menu/menu-trigger-base.ts
+++ b/src/cdk/menu/menu-trigger-base.ts
@@ -18,8 +18,8 @@ import {
 } from '@angular/core';
 import {Menu} from './menu-interface';
 import {MENU_STACK, MenuStack} from './menu-stack';
-import {ConnectedPosition, Overlay, OverlayRef, ScrollStrategy} from '@angular/cdk/overlay';
-import {TemplatePortal} from '@angular/cdk/portal';
+import {ConnectedPosition, Overlay, OverlayRef, ScrollStrategy} from '../overlay';
+import {TemplatePortal} from '../portal';
 import {merge, Subject} from 'rxjs';
 
 /** Injection token used for an implementation of MenuStack. */
diff --git a/src/cdk/menu/menu-trigger.spec.ts b/src/cdk/menu/menu-trigger.spec.ts
index d9b138a12cc8..fe821303eced 100644
--- a/src/cdk/menu/menu-trigger.spec.ts
+++ b/src/cdk/menu/menu-trigger.spec.ts
@@ -1,4 +1,4 @@
-import {ENTER, SPACE, TAB} from '@angular/cdk/keycodes';
+import {ENTER, SPACE, TAB} from '../keycodes';
 import {Component, ElementRef, QueryList, Type, ViewChild, ViewChildren} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, tick, waitForAsync} from '@angular/core/testing';
 import {By} from '@angular/platform-browser';
diff --git a/src/cdk/menu/menu-trigger.ts b/src/cdk/menu/menu-trigger.ts
index fbc0bbcfda11..b6438b58188c 100644
--- a/src/cdk/menu/menu-trigger.ts
+++ b/src/cdk/menu/menu-trigger.ts
@@ -17,8 +17,8 @@ import {
   Renderer2,
   SimpleChanges,
 } from '@angular/core';
-import {InputModalityDetector} from '@angular/cdk/a11y';
-import {Directionality} from '@angular/cdk/bidi';
+import {InputModalityDetector} from '../a11y';
+import {Directionality} from '../bidi';
 import {
   ConnectedPosition,
   FlexibleConnectedPositionStrategy,
@@ -26,7 +26,7 @@ import {
   OverlayConfig,
   STANDARD_DROPDOWN_ADJACENT_POSITIONS,
   STANDARD_DROPDOWN_BELOW_POSITIONS,
-} from '@angular/cdk/overlay';
+} from '../overlay';
 import {
   DOWN_ARROW,
   ENTER,
@@ -35,8 +35,8 @@ import {
   RIGHT_ARROW,
   SPACE,
   UP_ARROW,
-} from '@angular/cdk/keycodes';
-import {_getEventTarget} from '@angular/cdk/platform';
+} from '../keycodes';
+import {_getEventTarget} from '../platform';
 import {takeUntil} from 'rxjs/operators';
 import {CDK_MENU, Menu} from './menu-interface';
 import {PARENT_OR_NEW_MENU_STACK_PROVIDER} from './menu-stack';
diff --git a/src/cdk/menu/menu.spec.ts b/src/cdk/menu/menu.spec.ts
index 11e9b6bf5acd..9cb6983d73ec 100644
--- a/src/cdk/menu/menu.spec.ts
+++ b/src/cdk/menu/menu.spec.ts
@@ -1,4 +1,4 @@
-import {TAB} from '@angular/cdk/keycodes';
+import {TAB} from '../keycodes';
 import {Component, ElementRef, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {
   ComponentFixture,
diff --git a/src/cdk/menu/menu.ts b/src/cdk/menu/menu.ts
index f46e721d736d..96182eff66cf 100644
--- a/src/cdk/menu/menu.ts
+++ b/src/cdk/menu/menu.ts
@@ -7,7 +7,7 @@
  */
 
 import {AfterContentInit, Directive, EventEmitter, inject, OnDestroy, Output} from '@angular/core';
-import {ESCAPE, hasModifierKey, LEFT_ARROW, RIGHT_ARROW, TAB} from '@angular/cdk/keycodes';
+import {ESCAPE, hasModifierKey, LEFT_ARROW, RIGHT_ARROW, TAB} from '../keycodes';
 import {takeUntil} from 'rxjs/operators';
 import {CdkMenuGroup} from './menu-group';
 import {CDK_MENU} from './menu-interface';
diff --git a/src/cdk/observers/observe-content.ts b/src/cdk/observers/observe-content.ts
index bd6dcd72dca2..b6eab4a88634 100644
--- a/src/cdk/observers/observe-content.ts
+++ b/src/cdk/observers/observe-content.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {NumberInput, coerceElement, coerceNumberProperty} from '@angular/cdk/coercion';
+import {NumberInput, coerceElement, coerceNumberProperty} from '../coercion';
 import {
   AfterContentInit,
   Directive,
diff --git a/src/cdk/overlay/dispatchers/overlay-keyboard-dispatcher.spec.ts b/src/cdk/overlay/dispatchers/overlay-keyboard-dispatcher.spec.ts
index 9691374ed25c..7f031daca3f5 100644
--- a/src/cdk/overlay/dispatchers/overlay-keyboard-dispatcher.spec.ts
+++ b/src/cdk/overlay/dispatchers/overlay-keyboard-dispatcher.spec.ts
@@ -1,5 +1,5 @@
-import {ESCAPE} from '@angular/cdk/keycodes';
-import {ComponentPortal} from '@angular/cdk/portal';
+import {ESCAPE} from '../../keycodes';
+import {ComponentPortal} from '../../portal';
 import {ApplicationRef, Component} from '@angular/core';
 import {TestBed, inject} from '@angular/core/testing';
 import {dispatchKeyboardEvent} from '../../testing/private';
diff --git a/src/cdk/overlay/dispatchers/overlay-outside-click-dispatcher.spec.ts b/src/cdk/overlay/dispatchers/overlay-outside-click-dispatcher.spec.ts
index b866be5c91bd..87658b891cbf 100644
--- a/src/cdk/overlay/dispatchers/overlay-outside-click-dispatcher.spec.ts
+++ b/src/cdk/overlay/dispatchers/overlay-outside-click-dispatcher.spec.ts
@@ -3,7 +3,7 @@ import {ApplicationRef, Component, afterRender} from '@angular/core';
 import {dispatchFakeEvent, dispatchMouseEvent} from '../../testing/private';
 import {OverlayModule, Overlay} from '../index';
 import {OverlayOutsideClickDispatcher} from './overlay-outside-click-dispatcher';
-import {ComponentPortal} from '@angular/cdk/portal';
+import {ComponentPortal} from '../../portal';
 import {filter, take} from 'rxjs/operators';
 
 describe('OverlayOutsideClickDispatcher', () => {
diff --git a/src/cdk/overlay/dispatchers/overlay-outside-click-dispatcher.ts b/src/cdk/overlay/dispatchers/overlay-outside-click-dispatcher.ts
index daef17c474de..3aa681fb0532 100644
--- a/src/cdk/overlay/dispatchers/overlay-outside-click-dispatcher.ts
+++ b/src/cdk/overlay/dispatchers/overlay-outside-click-dispatcher.ts
@@ -7,7 +7,7 @@
  */
 
 import {Injectable, NgZone, RendererFactory2, inject} from '@angular/core';
-import {Platform, _bindEventWithOptions, _getEventTarget} from '@angular/cdk/platform';
+import {Platform, _bindEventWithOptions, _getEventTarget} from '../../platform';
 import {BaseOverlayDispatcher} from './base-overlay-dispatcher';
 import type {OverlayRef} from '../overlay-ref';
 
diff --git a/src/cdk/overlay/fullscreen-overlay-container.spec.ts b/src/cdk/overlay/fullscreen-overlay-container.spec.ts
index 0d18a687b77f..237d5694f5b8 100644
--- a/src/cdk/overlay/fullscreen-overlay-container.spec.ts
+++ b/src/cdk/overlay/fullscreen-overlay-container.spec.ts
@@ -1,7 +1,7 @@
 import {DOCUMENT} from '@angular/common';
 import {waitForAsync, inject, TestBed} from '@angular/core/testing';
 import {Component, NgModule, ViewChild, ViewContainerRef, inject as inject_1} from '@angular/core';
-import {PortalModule, CdkPortal} from '@angular/cdk/portal';
+import {PortalModule, CdkPortal} from '../portal';
 import {Overlay, OverlayContainer, OverlayModule, FullscreenOverlayContainer} from './index';
 import {TemplatePortalDirective} from '../portal/portal-directives';
 
diff --git a/src/cdk/overlay/overlay-config.ts b/src/cdk/overlay/overlay-config.ts
index a8fc7ac6bf78..e8107805c0c9 100644
--- a/src/cdk/overlay/overlay-config.ts
+++ b/src/cdk/overlay/overlay-config.ts
@@ -7,7 +7,7 @@
  */
 
 import {PositionStrategy} from './position/position-strategy';
-import {Direction, Directionality} from '@angular/cdk/bidi';
+import {Direction, Directionality} from '../bidi';
 import {ScrollStrategy, NoopScrollStrategy} from './scroll/index';
 
 /** Initial configuration used when creating an overlay. */
diff --git a/src/cdk/overlay/overlay-container.spec.ts b/src/cdk/overlay/overlay-container.spec.ts
index 5f41778c0f1a..698726afae0a 100644
--- a/src/cdk/overlay/overlay-container.spec.ts
+++ b/src/cdk/overlay/overlay-container.spec.ts
@@ -1,6 +1,6 @@
 import {waitForAsync, TestBed} from '@angular/core/testing';
 import {Component, NgModule, ViewChild, ViewContainerRef, inject} from '@angular/core';
-import {PortalModule, CdkPortal} from '@angular/cdk/portal';
+import {PortalModule, CdkPortal} from '../portal';
 import {Overlay, OverlayContainer, OverlayModule} from './index';
 
 describe('OverlayContainer', () => {
diff --git a/src/cdk/overlay/overlay-container.ts b/src/cdk/overlay/overlay-container.ts
index 3057169cf19d..a79249d69162 100644
--- a/src/cdk/overlay/overlay-container.ts
+++ b/src/cdk/overlay/overlay-container.ts
@@ -15,8 +15,8 @@ import {
   ViewEncapsulation,
   inject,
 } from '@angular/core';
-import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
-import {Platform, _isTestEnvironment} from '@angular/cdk/platform';
+import {_CdkPrivateStyleLoader} from '../private';
+import {Platform, _isTestEnvironment} from '../platform';
 
 @Component({
   template: '',
diff --git a/src/cdk/overlay/overlay-directives.spec.ts b/src/cdk/overlay/overlay-directives.spec.ts
index 43f9272d1b61..8f51b0f61cb2 100644
--- a/src/cdk/overlay/overlay-directives.spec.ts
+++ b/src/cdk/overlay/overlay-directives.spec.ts
@@ -1,5 +1,5 @@
-import {Directionality} from '@angular/cdk/bidi';
-import {A, ESCAPE} from '@angular/cdk/keycodes';
+import {Directionality} from '../bidi';
+import {A, ESCAPE} from '../keycodes';
 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {
   ComponentFixture,
diff --git a/src/cdk/overlay/overlay-directives.ts b/src/cdk/overlay/overlay-directives.ts
index a7933dc59a06..053565e14ac7 100644
--- a/src/cdk/overlay/overlay-directives.ts
+++ b/src/cdk/overlay/overlay-directives.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {ESCAPE, hasModifierKey} from '@angular/cdk/keycodes';
-import {TemplatePortal} from '@angular/cdk/portal';
+import {Direction, Directionality} from '../bidi';
+import {ESCAPE, hasModifierKey} from '../keycodes';
+import {TemplatePortal} from '../portal';
 import {
   Directive,
   ElementRef,
@@ -25,7 +25,7 @@ import {
   booleanAttribute,
   inject,
 } from '@angular/core';
-import {_getEventTarget} from '@angular/cdk/platform';
+import {_getEventTarget} from '../platform';
 import {Subscription} from 'rxjs';
 import {takeWhile} from 'rxjs/operators';
 import {Overlay} from './overlay';
diff --git a/src/cdk/overlay/overlay-module.ts b/src/cdk/overlay/overlay-module.ts
index 7634e638af67..0b5721275ec2 100644
--- a/src/cdk/overlay/overlay-module.ts
+++ b/src/cdk/overlay/overlay-module.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {BidiModule} from '@angular/cdk/bidi';
-import {PortalModule} from '@angular/cdk/portal';
-import {ScrollingModule} from '@angular/cdk/scrolling';
+import {BidiModule} from '../bidi';
+import {PortalModule} from '../portal';
+import {ScrollingModule} from '../scrolling';
 import {NgModule} from '@angular/core';
 import {Overlay} from './overlay';
 import {
diff --git a/src/cdk/overlay/overlay-ref.ts b/src/cdk/overlay/overlay-ref.ts
index d3cf30439fe7..b127c3ddc81b 100644
--- a/src/cdk/overlay/overlay-ref.ts
+++ b/src/cdk/overlay/overlay-ref.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {ComponentPortal, Portal, PortalOutlet, TemplatePortal} from '@angular/cdk/portal';
+import {Direction, Directionality} from '../bidi';
+import {ComponentPortal, Portal, PortalOutlet, TemplatePortal} from '../portal';
 import {
   AfterRenderRef,
   ComponentRef,
@@ -25,7 +25,7 @@ import {takeUntil} from 'rxjs/operators';
 import {OverlayKeyboardDispatcher} from './dispatchers/overlay-keyboard-dispatcher';
 import {OverlayOutsideClickDispatcher} from './dispatchers/overlay-outside-click-dispatcher';
 import {OverlayConfig} from './overlay-config';
-import {coerceCssPixelValue, coerceArray} from '@angular/cdk/coercion';
+import {coerceCssPixelValue, coerceArray} from '../coercion';
 import {PositionStrategy} from './position/position-strategy';
 import {ScrollStrategy} from './scroll';
 import {BackdropRef} from './backdrop-ref';
diff --git a/src/cdk/overlay/overlay.spec.ts b/src/cdk/overlay/overlay.spec.ts
index e4c32cba3907..566987a72068 100644
--- a/src/cdk/overlay/overlay.spec.ts
+++ b/src/cdk/overlay/overlay.spec.ts
@@ -1,5 +1,5 @@
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {CdkPortal, ComponentPortal, TemplatePortal} from '@angular/cdk/portal';
+import {Direction, Directionality} from '../bidi';
+import {CdkPortal, ComponentPortal, TemplatePortal} from '../portal';
 import {Location} from '@angular/common';
 import {SpyLocation} from '@angular/common/testing';
 import {
diff --git a/src/cdk/overlay/overlay.ts b/src/cdk/overlay/overlay.ts
index 047b89417bfb..1896d6b8b008 100644
--- a/src/cdk/overlay/overlay.ts
+++ b/src/cdk/overlay/overlay.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Directionality} from '@angular/cdk/bidi';
-import {DomPortalOutlet} from '@angular/cdk/portal';
+import {Directionality} from '../bidi';
+import {DomPortalOutlet} from '../portal';
 import {DOCUMENT, Location} from '@angular/common';
 import {
   ApplicationRef,
@@ -19,8 +19,8 @@ import {
   inject,
   RendererFactory2,
 } from '@angular/core';
-import {_IdGenerator} from '@angular/cdk/a11y';
-import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
+import {_IdGenerator} from '../a11y';
+import {_CdkPrivateStyleLoader} from '../private';
 import {OverlayKeyboardDispatcher} from './dispatchers/overlay-keyboard-dispatcher';
 import {OverlayOutsideClickDispatcher} from './dispatchers/overlay-outside-click-dispatcher';
 import {OverlayConfig} from './overlay-config';
diff --git a/src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts b/src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts
index ad1b821aacb8..cc06ed69ee5d 100644
--- a/src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/flexible-connected-position-strategy.spec.ts
@@ -1,5 +1,5 @@
-import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
-import {CdkScrollable, ScrollingModule, ViewportRuler} from '@angular/cdk/scrolling';
+import {ComponentPortal, PortalModule} from '../../portal';
+import {CdkScrollable, ScrollingModule, ViewportRuler} from '../../scrolling';
 import {dispatchFakeEvent} from '../../testing/private';
 import {
   ApplicationRef,
diff --git a/src/cdk/overlay/position/flexible-connected-position-strategy.ts b/src/cdk/overlay/position/flexible-connected-position-strategy.ts
index e69afb2fe49d..7e14097ac4cd 100644
--- a/src/cdk/overlay/position/flexible-connected-position-strategy.ts
+++ b/src/cdk/overlay/position/flexible-connected-position-strategy.ts
@@ -8,7 +8,7 @@
 
 import {PositionStrategy} from './position-strategy';
 import {ElementRef} from '@angular/core';
-import {ViewportRuler, CdkScrollable, ViewportScrollPosition} from '@angular/cdk/scrolling';
+import {ViewportRuler, CdkScrollable, ViewportScrollPosition} from '../../scrolling';
 import {
   ConnectedOverlayPositionChange,
   ConnectionPositionPair,
@@ -18,8 +18,8 @@ import {
 } from './connected-position';
 import {Observable, Subscription, Subject} from 'rxjs';
 import {isElementScrolledOutsideView, isElementClippedByScrolling} from './scroll-clip';
-import {coerceCssPixelValue, coerceArray} from '@angular/cdk/coercion';
-import {Platform} from '@angular/cdk/platform';
+import {coerceCssPixelValue, coerceArray} from '../../coercion';
+import {Platform} from '../../platform';
 import {OverlayContainer} from '../overlay-container';
 import {OverlayRef} from '../overlay-ref';
 
diff --git a/src/cdk/overlay/position/global-position-strategy.spec.ts b/src/cdk/overlay/position/global-position-strategy.spec.ts
index fa70c2bb67f3..5588702b1b30 100644
--- a/src/cdk/overlay/position/global-position-strategy.spec.ts
+++ b/src/cdk/overlay/position/global-position-strategy.spec.ts
@@ -1,6 +1,6 @@
 import {Component, ApplicationRef} from '@angular/core';
 import {TestBed} from '@angular/core/testing';
-import {PortalModule, ComponentPortal} from '@angular/cdk/portal';
+import {PortalModule, ComponentPortal} from '../../portal';
 import {OverlayModule, Overlay, OverlayConfig, OverlayRef} from '../index';
 
 describe('GlobalPositonStrategy', () => {
diff --git a/src/cdk/overlay/position/overlay-position-builder.ts b/src/cdk/overlay/position/overlay-position-builder.ts
index 512b213099c3..4b4b03e1eac8 100644
--- a/src/cdk/overlay/position/overlay-position-builder.ts
+++ b/src/cdk/overlay/position/overlay-position-builder.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Platform} from '@angular/cdk/platform';
-import {ViewportRuler} from '@angular/cdk/scrolling';
+import {Platform} from '../../platform';
+import {ViewportRuler} from '../../scrolling';
 import {DOCUMENT} from '@angular/common';
 import {Injectable, inject} from '@angular/core';
 import {OverlayContainer} from '../overlay-container';
diff --git a/src/cdk/overlay/public-api.ts b/src/cdk/overlay/public-api.ts
index 158e4e0f4aed..82367446c882 100644
--- a/src/cdk/overlay/public-api.ts
+++ b/src/cdk/overlay/public-api.ts
@@ -16,8 +16,8 @@ export {OverlayContainer} from './overlay-container';
 export {CdkOverlayOrigin, CdkConnectedOverlay} from './overlay-directives';
 export {FullscreenOverlayContainer} from './fullscreen-overlay-container';
 export {OverlayRef, OverlaySizeConfig} from './overlay-ref';
-export {ViewportRuler} from '@angular/cdk/scrolling';
-export {ComponentType} from '@angular/cdk/portal';
+export {ViewportRuler} from '../scrolling';
+export {ComponentType} from '../portal';
 export {OverlayPositionBuilder} from './position/overlay-position-builder';
 
 // Export pre-defined position strategies and interface to build custom ones.
diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
index af8bfe4e8501..d6063546d31f 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.spec.ts
@@ -1,8 +1,8 @@
 import {Component} from '@angular/core';
 import {waitForAsync, inject, TestBed} from '@angular/core/testing';
-import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
-import {Platform} from '@angular/cdk/platform';
-import {ViewportRuler} from '@angular/cdk/scrolling';
+import {ComponentPortal, PortalModule} from '../../portal';
+import {Platform} from '../../platform';
+import {ViewportRuler} from '../../scrolling';
 import {Overlay, OverlayContainer, OverlayModule, OverlayRef, OverlayConfig} from '../index';
 
 describe('BlockScrollStrategy', () => {
diff --git a/src/cdk/overlay/scroll/block-scroll-strategy.ts b/src/cdk/overlay/scroll/block-scroll-strategy.ts
index b8028f1df193..5ebff3d04a5d 100644
--- a/src/cdk/overlay/scroll/block-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/block-scroll-strategy.ts
@@ -7,9 +7,9 @@
  */
 
 import {ScrollStrategy} from './scroll-strategy';
-import {ViewportRuler} from '@angular/cdk/scrolling';
-import {coerceCssPixelValue} from '@angular/cdk/coercion';
-import {supportsScrollBehavior} from '@angular/cdk/platform';
+import {ViewportRuler} from '../../scrolling';
+import {coerceCssPixelValue} from '../../coercion';
+import {supportsScrollBehavior} from '../../platform';
 
 const scrollBehaviorSupported = supportsScrollBehavior();
 
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
index 22b501164df9..0b1fb8b267c8 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.spec.ts
@@ -1,5 +1,5 @@
-import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
-import {CdkScrollable, ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
+import {ComponentPortal, PortalModule} from '../../portal';
+import {CdkScrollable, ScrollDispatcher, ViewportRuler} from '../../scrolling';
 import {Component, ElementRef} from '@angular/core';
 import {TestBed, fakeAsync, inject} from '@angular/core/testing';
 import {Subject} from 'rxjs';
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.ts b/src/cdk/overlay/scroll/close-scroll-strategy.ts
index 364520ee567a..027a53526c32 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.ts
@@ -8,7 +8,7 @@
 import {NgZone} from '@angular/core';
 import {ScrollStrategy, getMatScrollStrategyAlreadyAttachedError} from './scroll-strategy';
 import {Subscription} from 'rxjs';
-import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
+import {ScrollDispatcher, ViewportRuler} from '../../scrolling';
 import {filter} from 'rxjs/operators';
 import type {OverlayRef} from '../overlay-ref';
 
diff --git a/src/cdk/overlay/scroll/close-scroll-strategy.zone.spec.ts b/src/cdk/overlay/scroll/close-scroll-strategy.zone.spec.ts
index 396428f9f4a3..12f46b81701d 100644
--- a/src/cdk/overlay/scroll/close-scroll-strategy.zone.spec.ts
+++ b/src/cdk/overlay/scroll/close-scroll-strategy.zone.spec.ts
@@ -1,4 +1,4 @@
-import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
+import {ComponentPortal, PortalModule} from '../../portal';
 import {Component, NgZone, provideZoneChangeDetection} from '@angular/core';
 import {TestBed, fakeAsync, inject} from '@angular/core/testing';
 import {Subject} from 'rxjs';
diff --git a/src/cdk/overlay/scroll/index.ts b/src/cdk/overlay/scroll/index.ts
index 66393ba0cf33..82b4ca51aa2e 100644
--- a/src/cdk/overlay/scroll/index.ts
+++ b/src/cdk/overlay/scroll/index.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-export {CdkScrollable, ScrollDispatcher} from '@angular/cdk/scrolling';
+export {CdkScrollable, ScrollDispatcher} from '../../scrolling';
 
 // Export pre-defined scroll strategies and interface to build custom ones.
 export {ScrollStrategy} from './scroll-strategy';
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
index 261e4754f429..3bcd476a8a68 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.spec.ts
@@ -1,7 +1,7 @@
 import {waitForAsync, inject, TestBed} from '@angular/core/testing';
 import {Component} from '@angular/core';
 import {Subject} from 'rxjs';
-import {ComponentPortal, PortalModule} from '@angular/cdk/portal';
+import {ComponentPortal, PortalModule} from '../../portal';
 import {
   Overlay,
   OverlayContainer,
diff --git a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
index ed92b0b7bf0f..73596477e3a7 100644
--- a/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
+++ b/src/cdk/overlay/scroll/reposition-scroll-strategy.ts
@@ -9,7 +9,7 @@
 import {NgZone} from '@angular/core';
 import {Subscription} from 'rxjs';
 import {ScrollStrategy, getMatScrollStrategyAlreadyAttachedError} from './scroll-strategy';
-import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
+import {ScrollDispatcher, ViewportRuler} from '../../scrolling';
 import {isElementScrolledOutsideView} from '../position/scroll-clip';
 import type {OverlayRef} from '../overlay-ref';
 
diff --git a/src/cdk/overlay/scroll/scroll-strategy-options.ts b/src/cdk/overlay/scroll/scroll-strategy-options.ts
index 481b1d8d852a..f7a8339a1241 100644
--- a/src/cdk/overlay/scroll/scroll-strategy-options.ts
+++ b/src/cdk/overlay/scroll/scroll-strategy-options.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ScrollDispatcher, ViewportRuler} from '@angular/cdk/scrolling';
+import {ScrollDispatcher, ViewportRuler} from '../../scrolling';
 import {DOCUMENT} from '@angular/common';
 import {Injectable, NgZone, inject} from '@angular/core';
 import {BlockScrollStrategy} from './block-scroll-strategy';
diff --git a/src/cdk/scrolling/fixed-size-virtual-scroll.ts b/src/cdk/scrolling/fixed-size-virtual-scroll.ts
index c563edccdad8..d7ba2648a027 100644
--- a/src/cdk/scrolling/fixed-size-virtual-scroll.ts
+++ b/src/cdk/scrolling/fixed-size-virtual-scroll.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {coerceNumberProperty, NumberInput} from '@angular/cdk/coercion';
+import {coerceNumberProperty, NumberInput} from '../coercion';
 import {Directive, forwardRef, Input, OnChanges} from '@angular/core';
 import {Observable, Subject} from 'rxjs';
 import {distinctUntilChanged} from 'rxjs/operators';
diff --git a/src/cdk/scrolling/scroll-dispatcher.ts b/src/cdk/scrolling/scroll-dispatcher.ts
index eefe30167944..912cb3f79e52 100644
--- a/src/cdk/scrolling/scroll-dispatcher.ts
+++ b/src/cdk/scrolling/scroll-dispatcher.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {coerceElement} from '@angular/cdk/coercion';
-import {Platform} from '@angular/cdk/platform';
+import {coerceElement} from '../coercion';
+import {Platform} from '../platform';
 import {ElementRef, Injectable, NgZone, OnDestroy, RendererFactory2, inject} from '@angular/core';
 import {of as observableOf, Subject, Subscription, Observable, Observer} from 'rxjs';
 import {auditTime, filter} from 'rxjs/operators';
diff --git a/src/cdk/scrolling/scrollable.spec.ts b/src/cdk/scrolling/scrollable.spec.ts
index de0db2eabdc5..01e8902e6ef4 100644
--- a/src/cdk/scrolling/scrollable.spec.ts
+++ b/src/cdk/scrolling/scrollable.spec.ts
@@ -1,5 +1,5 @@
-import {Direction} from '@angular/cdk/bidi';
-import {CdkScrollable, ScrollingModule} from '@angular/cdk/scrolling';
+import {Direction} from '../bidi';
+import {CdkScrollable, ScrollingModule} from '../scrolling';
 import {Component, ElementRef, Input, ViewChild} from '@angular/core';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
 
diff --git a/src/cdk/scrolling/scrollable.ts b/src/cdk/scrolling/scrollable.ts
index e56ec2658998..1469e210e3db 100644
--- a/src/cdk/scrolling/scrollable.ts
+++ b/src/cdk/scrolling/scrollable.ts
@@ -6,12 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Directionality} from '@angular/cdk/bidi';
-import {
-  getRtlScrollAxisType,
-  RtlScrollAxisType,
-  supportsScrollBehavior,
-} from '@angular/cdk/platform';
+import {Directionality} from '../bidi';
+import {getRtlScrollAxisType, RtlScrollAxisType, supportsScrollBehavior} from '../platform';
 import {Directive, ElementRef, NgZone, OnDestroy, OnInit, Renderer2, inject} from '@angular/core';
 import {Observable, Subject} from 'rxjs';
 import {ScrollDispatcher} from './scroll-dispatcher';
diff --git a/src/cdk/scrolling/scrolling-module.ts b/src/cdk/scrolling/scrolling-module.ts
index 10c1f4c58f5a..276aa83a9121 100644
--- a/src/cdk/scrolling/scrolling-module.ts
+++ b/src/cdk/scrolling/scrolling-module.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {BidiModule} from '@angular/cdk/bidi';
+import {BidiModule} from '../bidi';
 import {NgModule} from '@angular/core';
 import {CdkFixedSizeVirtualScroll} from './fixed-size-virtual-scroll';
 import {CdkScrollable} from './scrollable';
diff --git a/src/cdk/scrolling/viewport-ruler.ts b/src/cdk/scrolling/viewport-ruler.ts
index a053c8736f4f..b60d65dcb122 100644
--- a/src/cdk/scrolling/viewport-ruler.ts
+++ b/src/cdk/scrolling/viewport-ruler.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Platform} from '@angular/cdk/platform';
+import {Platform} from '../platform';
 import {Injectable, NgZone, OnDestroy, RendererFactory2, inject} from '@angular/core';
 import {Observable, Subject} from 'rxjs';
 import {auditTime} from 'rxjs/operators';
diff --git a/src/cdk/scrolling/virtual-for-of.ts b/src/cdk/scrolling/virtual-for-of.ts
index 3707b0260c80..dc08e87a821c 100644
--- a/src/cdk/scrolling/virtual-for-of.ts
+++ b/src/cdk/scrolling/virtual-for-of.ts
@@ -15,7 +15,7 @@ import {
   _RecycleViewRepeaterStrategy,
   _VIEW_REPEATER_STRATEGY,
   _ViewRepeaterItemInsertArgs,
-} from '@angular/cdk/collections';
+} from '../collections';
 import {
   Directive,
   DoCheck,
@@ -33,7 +33,7 @@ import {
   ViewContainerRef,
   inject,
 } from '@angular/core';
-import {NumberInput, coerceNumberProperty} from '@angular/cdk/coercion';
+import {NumberInput, coerceNumberProperty} from '../coercion';
 import {Observable, Subject, of as observableOf, isObservable} from 'rxjs';
 import {pairwise, shareReplay, startWith, switchMap, takeUntil} from 'rxjs/operators';
 import {CdkVirtualScrollRepeater} from './virtual-scroll-repeater';
diff --git a/src/cdk/scrolling/virtual-scroll-repeater.ts b/src/cdk/scrolling/virtual-scroll-repeater.ts
index 50148ef54e77..be2b78553100 100644
--- a/src/cdk/scrolling/virtual-scroll-repeater.ts
+++ b/src/cdk/scrolling/virtual-scroll-repeater.ts
@@ -7,7 +7,7 @@
  */
 
 import {Observable} from 'rxjs';
-import {ListRange} from '@angular/cdk/collections';
+import {ListRange} from '../collections';
 
 /**
  * An item to be repeated by the VirtualScrollViewport
diff --git a/src/cdk/scrolling/virtual-scroll-viewport.spec.ts b/src/cdk/scrolling/virtual-scroll-viewport.spec.ts
index 796fbad2ffa5..4f3137f7ac39 100644
--- a/src/cdk/scrolling/virtual-scroll-viewport.spec.ts
+++ b/src/cdk/scrolling/virtual-scroll-viewport.spec.ts
@@ -1,11 +1,11 @@
-import {ArrayDataSource} from '@angular/cdk/collections';
+import {ArrayDataSource} from '../collections';
 import {
   CdkScrollable,
   CdkVirtualForOf,
   CdkVirtualScrollViewport,
   ScrollDispatcher,
   ScrollingModule,
-} from '@angular/cdk/scrolling';
+} from '../scrolling';
 import {
   ApplicationRef,
   Component,
diff --git a/src/cdk/scrolling/virtual-scroll-viewport.ts b/src/cdk/scrolling/virtual-scroll-viewport.ts
index 1f3d428d3341..ac37f1be340a 100644
--- a/src/cdk/scrolling/virtual-scroll-viewport.ts
+++ b/src/cdk/scrolling/virtual-scroll-viewport.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ListRange} from '@angular/cdk/collections';
-import {Platform} from '@angular/cdk/platform';
+import {ListRange} from '../collections';
+import {Platform} from '../platform';
 import {
   afterNextRender,
   booleanAttribute,
diff --git a/src/cdk/stepper/step-header.ts b/src/cdk/stepper/step-header.ts
index b758390d5aa7..f0709e3f9878 100644
--- a/src/cdk/stepper/step-header.ts
+++ b/src/cdk/stepper/step-header.ts
@@ -7,7 +7,7 @@
  */
 
 import {Directive, ElementRef, inject} from '@angular/core';
-import {FocusableOption} from '@angular/cdk/a11y';
+import {FocusableOption} from '../a11y';
 
 @Directive({
   selector: '[cdkStepHeader]',
diff --git a/src/cdk/stepper/stepper-module.ts b/src/cdk/stepper/stepper-module.ts
index 73ebbcd1e96b..585d9e7b3b70 100644
--- a/src/cdk/stepper/stepper-module.ts
+++ b/src/cdk/stepper/stepper-module.ts
@@ -11,7 +11,7 @@ import {CdkStepper, CdkStep} from './stepper';
 import {CdkStepLabel} from './step-label';
 import {CdkStepperNext, CdkStepperPrevious} from './stepper-button';
 import {CdkStepHeader} from './step-header';
-import {BidiModule} from '@angular/cdk/bidi';
+import {BidiModule} from '../bidi';
 
 @NgModule({
   imports: [
diff --git a/src/cdk/stepper/stepper.ts b/src/cdk/stepper/stepper.ts
index a2e765f12502..7e8c370855e7 100644
--- a/src/cdk/stepper/stepper.ts
+++ b/src/cdk/stepper/stepper.ts
@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {_IdGenerator, FocusableOption, FocusKeyManager} from '@angular/cdk/a11y';
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {ENTER, hasModifierKey, SPACE} from '@angular/cdk/keycodes';
+import {_IdGenerator, FocusableOption, FocusKeyManager} from '../a11y';
+import {Direction, Directionality} from '../bidi';
+import {ENTER, hasModifierKey, SPACE} from '../keycodes';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -39,7 +39,7 @@ import {
   type NgForm,
   type FormGroupDirective,
 } from '@angular/forms';
-import {_getFocusedElementPierceShadowDom} from '@angular/cdk/platform';
+import {_getFocusedElementPierceShadowDom} from '../platform';
 import {Observable, of as observableOf, Subject} from 'rxjs';
 import {startWith, takeUntil} from 'rxjs/operators';
 
diff --git a/src/cdk/table/public-api.ts b/src/cdk/table/public-api.ts
index 6504288a5b77..699c79cec600 100644
--- a/src/cdk/table/public-api.ts
+++ b/src/cdk/table/public-api.ts
@@ -18,4 +18,4 @@ export * from './text-column';
 export * from './tokens';
 
 /** Re-export DataSource for a more intuitive experience for users of just the table. */
-export {DataSource} from '@angular/cdk/collections';
+export {DataSource} from '../collections';
diff --git a/src/cdk/table/sticky-styler.ts b/src/cdk/table/sticky-styler.ts
index 8592a9278aa7..42ff7b713f3a 100644
--- a/src/cdk/table/sticky-styler.ts
+++ b/src/cdk/table/sticky-styler.ts
@@ -11,7 +11,7 @@
  * @docs-private
  */
 import {afterNextRender, Injector} from '@angular/core';
-import {Direction} from '@angular/cdk/bidi';
+import {Direction} from '../bidi';
 import {_CoalescedStyleScheduler} from './coalesced-style-scheduler';
 import {StickyPositioningListener} from './sticky-position-listener';
 
diff --git a/src/cdk/table/table-module.ts b/src/cdk/table/table-module.ts
index e2041c6ec5c7..c7ec0fab90e9 100644
--- a/src/cdk/table/table-module.ts
+++ b/src/cdk/table/table-module.ts
@@ -35,7 +35,7 @@ import {
   CdkFooterCell,
 } from './cell';
 import {CdkTextColumn} from './text-column';
-import {ScrollingModule} from '@angular/cdk/scrolling';
+import {ScrollingModule} from '../scrolling';
 
 const EXPORTED_DECLARATIONS = [
   CdkTable,
diff --git a/src/cdk/table/table.spec.ts b/src/cdk/table/table.spec.ts
index 09cf5910300b..095d08513354 100644
--- a/src/cdk/table/table.spec.ts
+++ b/src/cdk/table/table.spec.ts
@@ -1,5 +1,5 @@
-import {BidiModule} from '@angular/cdk/bidi';
-import {CollectionViewer, DataSource} from '@angular/cdk/collections';
+import {BidiModule} from '../bidi';
+import {CollectionViewer, DataSource} from '../collections';
 import {
   AfterContentInit,
   AfterViewInit,
diff --git a/src/cdk/table/table.ts b/src/cdk/table/table.ts
index b7b352d502ee..e19f32a8c213 100644
--- a/src/cdk/table/table.ts
+++ b/src/cdk/table/table.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Direction, Directionality} from '@angular/cdk/bidi';
+import {Direction, Directionality} from '../bidi';
 import {
   CollectionViewer,
   DataSource,
@@ -18,9 +18,9 @@ import {
   _ViewRepeaterItemChange,
   _ViewRepeaterItemInsertArgs,
   _ViewRepeaterOperation,
-} from '@angular/cdk/collections';
-import {Platform} from '@angular/cdk/platform';
-import {ViewportRuler} from '@angular/cdk/scrolling';
+} from '../collections';
+import {Platform} from '../platform';
+import {ViewportRuler} from '../scrolling';
 import {DOCUMENT} from '@angular/common';
 import {
   AfterContentChecked,
diff --git a/src/cdk/testing/protractor/protractor-element.ts b/src/cdk/testing/protractor/protractor-element.ts
index 9caf06699ffe..f8bc58dcf78b 100644
--- a/src/cdk/testing/protractor/protractor-element.ts
+++ b/src/cdk/testing/protractor/protractor-element.ts
@@ -15,7 +15,7 @@ import {
   TestKey,
   TextOptions,
   EventData,
-} from '@angular/cdk/testing';
+} from '../../testing';
 import {browser, Button, by, ElementFinder, Key} from 'protractor';
 
 /** Maps the `TestKey` constants to Protractor's `Key` constants. */
diff --git a/src/cdk/testing/protractor/protractor-harness-environment.ts b/src/cdk/testing/protractor/protractor-harness-environment.ts
index 80d66a039f23..0b5e647baf8d 100644
--- a/src/cdk/testing/protractor/protractor-harness-environment.ts
+++ b/src/cdk/testing/protractor/protractor-harness-environment.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {HarnessEnvironment, HarnessLoader, TestElement} from '@angular/cdk/testing';
+import {HarnessEnvironment, HarnessLoader, TestElement} from '../../testing';
 import {by, element as protractorElement, ElementArrayFinder, ElementFinder} from 'protractor';
 import {ProtractorElement} from './protractor-element';
 
diff --git a/src/cdk/testing/selenium-webdriver/selenium-web-driver-element.ts b/src/cdk/testing/selenium-webdriver/selenium-web-driver-element.ts
index 72b10d1e3db8..7529384c45d1 100644
--- a/src/cdk/testing/selenium-webdriver/selenium-web-driver-element.ts
+++ b/src/cdk/testing/selenium-webdriver/selenium-web-driver-element.ts
@@ -6,17 +6,11 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {
-  _getTextWithExcludedElements,
-  ElementDimensions,
-  EventData,
-  getNoKeysSpecifiedError,
-  ModifierKeys,
-  TestElement,
-  TestKey,
-  TextOptions,
-} from '@angular/cdk/testing';
 import * as webdriver from 'selenium-webdriver';
+import {ElementDimensions} from '../element-dimensions';
+import {EventData, ModifierKeys, TestElement, TestKey, TextOptions} from '../test-element';
+import {getNoKeysSpecifiedError} from '../test-element-errors';
+import {_getTextWithExcludedElements} from '../text-filtering';
 import {getSeleniumWebDriverModifierKeys, seleniumWebDriverKeyMap} from './selenium-webdriver-keys';
 
 /** A `TestElement` implementation for WebDriver. */
diff --git a/src/cdk/testing/selenium-webdriver/selenium-web-driver-harness-environment.ts b/src/cdk/testing/selenium-webdriver/selenium-web-driver-harness-environment.ts
index c05413a6bf37..4ef2de119fe5 100644
--- a/src/cdk/testing/selenium-webdriver/selenium-web-driver-harness-environment.ts
+++ b/src/cdk/testing/selenium-webdriver/selenium-web-driver-harness-environment.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {HarnessEnvironment, HarnessLoader, TestElement} from '@angular/cdk/testing';
+import {HarnessEnvironment, HarnessLoader, TestElement} from '../../testing';
 import * as webdriver from 'selenium-webdriver';
 import {SeleniumWebDriverElement} from './selenium-web-driver-element';
 
diff --git a/src/cdk/testing/selenium-webdriver/selenium-webdriver-keys.ts b/src/cdk/testing/selenium-webdriver/selenium-webdriver-keys.ts
index d2197e5984a5..270af150aa2c 100644
--- a/src/cdk/testing/selenium-webdriver/selenium-webdriver-keys.ts
+++ b/src/cdk/testing/selenium-webdriver/selenium-webdriver-keys.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ModifierKeys, TestKey} from '@angular/cdk/testing';
+import {ModifierKeys, TestKey} from '../../testing';
 import * as webdriver from 'selenium-webdriver';
 
 /**
diff --git a/src/cdk/testing/testbed/fake-events/dispatch-events.ts b/src/cdk/testing/testbed/fake-events/dispatch-events.ts
index b2cd3e9ae0df..c51efc1d5c91 100644
--- a/src/cdk/testing/testbed/fake-events/dispatch-events.ts
+++ b/src/cdk/testing/testbed/fake-events/dispatch-events.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ModifierKeys} from '@angular/cdk/testing';
+import {ModifierKeys} from '../../test-element';
 import {
   createFakeEvent,
   createKeyboardEvent,
diff --git a/src/cdk/testing/testbed/fake-events/event-objects.ts b/src/cdk/testing/testbed/fake-events/event-objects.ts
index 4329926a3e57..5674f1a77cf2 100644
--- a/src/cdk/testing/testbed/fake-events/event-objects.ts
+++ b/src/cdk/testing/testbed/fake-events/event-objects.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ModifierKeys} from '@angular/cdk/testing';
+import {ModifierKeys} from '../../test-element';
 
 /** Used to generate unique IDs for events. */
 let uniqueIds = 0;
diff --git a/src/cdk/testing/testbed/fake-events/type-in-element.ts b/src/cdk/testing/testbed/fake-events/type-in-element.ts
index 480c269c4c63..aff0b330dd7d 100644
--- a/src/cdk/testing/testbed/fake-events/type-in-element.ts
+++ b/src/cdk/testing/testbed/fake-events/type-in-element.ts
@@ -6,8 +6,9 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {getNoKeysSpecifiedError, ModifierKeys} from '@angular/cdk/testing';
-import {PERIOD} from '@angular/cdk/keycodes';
+import {PERIOD} from '../../../keycodes';
+import {ModifierKeys} from '../../test-element';
+import {getNoKeysSpecifiedError} from '../../test-element-errors';
 import {dispatchFakeEvent, dispatchKeyboardEvent} from './dispatch-events';
 import {triggerFocus} from './element-focus';
 
diff --git a/src/cdk/testing/testbed/testbed-harness-environment.ts b/src/cdk/testing/testbed/testbed-harness-environment.ts
index 7bd87d91daae..11805d6b0fe4 100644
--- a/src/cdk/testing/testbed/testbed-harness-environment.ts
+++ b/src/cdk/testing/testbed/testbed-harness-environment.ts
@@ -14,7 +14,7 @@ import {
   HarnessLoader,
   stopHandlingAutoChangeDetectionStatus,
   TestElement,
-} from '@angular/cdk/testing';
+} from '../../testing';
 import {ComponentFixture, flush} from '@angular/core/testing';
 import {Observable} from 'rxjs';
 import {takeWhile} from 'rxjs/operators';
diff --git a/src/cdk/testing/testbed/unit-test-element.ts b/src/cdk/testing/testbed/unit-test-element.ts
index 0860a12e234c..9edb55433497 100644
--- a/src/cdk/testing/testbed/unit-test-element.ts
+++ b/src/cdk/testing/testbed/unit-test-element.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import * as keyCodes from '@angular/cdk/keycodes';
+import * as keyCodes from '../../keycodes';
 import {
   _getTextWithExcludedElements,
   ElementDimensions,
@@ -15,7 +15,7 @@ import {
   TestKey,
   TextOptions,
   EventData,
-} from '@angular/cdk/testing';
+} from '../../testing';
 import {
   clearElement,
   createFakeEvent,
diff --git a/src/cdk/testing/tests/cross-environment.spec.ts b/src/cdk/testing/tests/cross-environment.spec.ts
index 661732f065b0..eb4f034ceb14 100644
--- a/src/cdk/testing/tests/cross-environment.spec.ts
+++ b/src/cdk/testing/tests/cross-environment.spec.ts
@@ -14,7 +14,7 @@ import {
   HarnessPredicate,
   parallel,
   TestElement,
-} from '@angular/cdk/testing';
+} from '../../testing';
 import {MainComponentHarness} from './harnesses/main-component-harness';
 import {SubComponentHarness, SubComponentSpecialHarness} from './harnesses/sub-component-harness';
 
diff --git a/src/cdk/testing/tests/protractor.e2e.spec.ts b/src/cdk/testing/tests/protractor.e2e.spec.ts
index 0e857142fae4..49eaba3127d6 100644
--- a/src/cdk/testing/tests/protractor.e2e.spec.ts
+++ b/src/cdk/testing/tests/protractor.e2e.spec.ts
@@ -1,5 +1,5 @@
-import {HarnessLoader} from '@angular/cdk/testing';
-import {ProtractorHarnessEnvironment} from '@angular/cdk/testing/protractor';
+import {HarnessLoader} from '../../testing';
+import {ProtractorHarnessEnvironment} from '../../testing/protractor';
 import {browser, by, element as protractorElement, ElementFinder} from 'protractor';
 import {parallel} from '../change-detection';
 import {crossEnvironmentSpecs} from './cross-environment.spec';
diff --git a/src/cdk/testing/tests/test-main-component.ts b/src/cdk/testing/tests/test-main-component.ts
index 2881127c673b..243c423bb09d 100644
--- a/src/cdk/testing/tests/test-main-component.ts
+++ b/src/cdk/testing/tests/test-main-component.ts
@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {ENTER} from '@angular/cdk/keycodes';
-import {_supportsShadowDom} from '@angular/cdk/platform';
+import {ENTER} from '../../keycodes';
+import {_supportsShadowDom} from '../../platform';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
 import {
   ChangeDetectionStrategy,
diff --git a/src/cdk/testing/tests/testbed.spec.ts b/src/cdk/testing/tests/testbed.spec.ts
index 62f44b6b54fa..3c60a45db041 100644
--- a/src/cdk/testing/tests/testbed.spec.ts
+++ b/src/cdk/testing/tests/testbed.spec.ts
@@ -1,6 +1,6 @@
-import {_supportsShadowDom} from '@angular/cdk/platform';
-import {HarnessLoader, manualChangeDetection, parallel} from '@angular/cdk/testing';
-import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
+import {_supportsShadowDom} from '../../platform';
+import {HarnessLoader, manualChangeDetection, parallel} from '../../testing';
+import {TestbedHarnessEnvironment} from '../../testing/testbed';
 import {waitForAsync, ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
 import {provideZoneChangeDetection} from '@angular/core';
 import {querySelectorAll as piercingQuerySelectorAll} from 'kagekiri';
diff --git a/src/cdk/testing/tests/webdriver.e2e.spec.ts b/src/cdk/testing/tests/webdriver.e2e.spec.ts
index 3b0720fba3d4..f3b0b5cb281b 100644
--- a/src/cdk/testing/tests/webdriver.e2e.spec.ts
+++ b/src/cdk/testing/tests/webdriver.e2e.spec.ts
@@ -1,8 +1,8 @@
-import {HarnessLoader, parallel} from '@angular/cdk/testing';
+import {HarnessLoader, parallel} from '../../testing';
 import {
   SeleniumWebDriverHarnessEnvironment,
   waitForAngularReady,
-} from '@angular/cdk/testing/selenium-webdriver';
+} from '../../testing/selenium-webdriver';
 import {runfiles} from '@bazel/runfiles';
 import * as webdriver from 'selenium-webdriver';
 import {crossEnvironmentSpecs} from './cross-environment.spec';
diff --git a/src/cdk/text-field/autofill.spec.ts b/src/cdk/text-field/autofill.spec.ts
index cb9f2965e7e6..7031298c06f5 100644
--- a/src/cdk/text-field/autofill.spec.ts
+++ b/src/cdk/text-field/autofill.spec.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {normalizePassiveListenerOptions} from '@angular/cdk/platform';
+import {normalizePassiveListenerOptions} from '../platform';
 import {Component, ElementRef, ViewChild} from '@angular/core';
 import {ComponentFixture, TestBed, inject} from '@angular/core/testing';
 import {EMPTY} from 'rxjs';
diff --git a/src/cdk/text-field/autofill.ts b/src/cdk/text-field/autofill.ts
index 23b7ea72883c..26928753351a 100644
--- a/src/cdk/text-field/autofill.ts
+++ b/src/cdk/text-field/autofill.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Platform, _bindEventWithOptions} from '@angular/cdk/platform';
+import {Platform, _bindEventWithOptions} from '../platform';
 import {
   Directive,
   ElementRef,
@@ -19,8 +19,8 @@ import {
   Output,
   RendererFactory2,
 } from '@angular/core';
-import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
-import {coerceElement} from '@angular/cdk/coercion';
+import {_CdkPrivateStyleLoader} from '../private';
+import {coerceElement} from '../coercion';
 import {EMPTY, Observable, Subject} from 'rxjs';
 import {_CdkTextFieldStyleLoader} from './text-field-style-loader';
 
diff --git a/src/cdk/text-field/autosize.ts b/src/cdk/text-field/autosize.ts
index 7d17f795de54..e8ecc9fbaf63 100644
--- a/src/cdk/text-field/autosize.ts
+++ b/src/cdk/text-field/autosize.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {NumberInput, coerceNumberProperty} from '@angular/cdk/coercion';
+import {NumberInput, coerceNumberProperty} from '../coercion';
 import {
   Directive,
   ElementRef,
@@ -20,8 +20,8 @@ import {
   Renderer2,
 } from '@angular/core';
 import {DOCUMENT} from '@angular/common';
-import {Platform} from '@angular/cdk/platform';
-import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
+import {Platform} from '../platform';
+import {_CdkPrivateStyleLoader} from '../private';
 import {auditTime} from 'rxjs/operators';
 import {Subject} from 'rxjs';
 import {_CdkTextFieldStyleLoader} from './text-field-style-loader';
diff --git a/src/cdk/tree/control/base-tree-control.ts b/src/cdk/tree/control/base-tree-control.ts
index 5d467fb2ba6c..d0cb38b5c3ad 100644
--- a/src/cdk/tree/control/base-tree-control.ts
+++ b/src/cdk/tree/control/base-tree-control.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import {SelectionModel} from '@angular/cdk/collections';
+import {SelectionModel} from '../../collections';
 import {Observable} from 'rxjs';
 import {TreeControl} from './tree-control';
 
diff --git a/src/cdk/tree/control/tree-control.ts b/src/cdk/tree/control/tree-control.ts
index e9fdf1f98f71..fbd0169334e0 100644
--- a/src/cdk/tree/control/tree-control.ts
+++ b/src/cdk/tree/control/tree-control.ts
@@ -5,7 +5,7 @@
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.dev/license
  */
-import {SelectionModel} from '@angular/cdk/collections';
+import {SelectionModel} from '../../collections';
 import {Observable} from 'rxjs';
 
 /**
diff --git a/src/cdk/tree/padding.ts b/src/cdk/tree/padding.ts
index efe5b4ca9632..4dac40d9870c 100644
--- a/src/cdk/tree/padding.ts
+++ b/src/cdk/tree/padding.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {Directionality} from '@angular/cdk/bidi';
+import {Directionality} from '../bidi';
 import {Directive, ElementRef, Input, numberAttribute, OnDestroy, inject} from '@angular/core';
 import {takeUntil} from 'rxjs/operators';
 import {Subject} from 'rxjs';
diff --git a/src/cdk/tree/tree-using-legacy-key-manager.spec.ts b/src/cdk/tree/tree-using-legacy-key-manager.spec.ts
index 00b6afd22767..54f34e0ea048 100644
--- a/src/cdk/tree/tree-using-legacy-key-manager.spec.ts
+++ b/src/cdk/tree/tree-using-legacy-key-manager.spec.ts
@@ -2,7 +2,7 @@ import {Component, ElementRef, QueryList, ViewChild, ViewChildren} from '@angula
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {of} from 'rxjs';
 import {CdkTreeModule} from './tree-module';
-import {NOOP_TREE_KEY_MANAGER_FACTORY_PROVIDER} from '@angular/cdk/a11y';
+import {NOOP_TREE_KEY_MANAGER_FACTORY_PROVIDER} from '../a11y';
 
 describe('CdkTree when provided LegacyTreeKeyManager', () => {
   let fixture: ComponentFixture<SimpleCdkTreeApp>;
diff --git a/src/cdk/tree/tree-with-tree-control.spec.ts b/src/cdk/tree/tree-with-tree-control.spec.ts
index 2ec6401edd32..d74997773e4d 100644
--- a/src/cdk/tree/tree-with-tree-control.spec.ts
+++ b/src/cdk/tree/tree-with-tree-control.spec.ts
@@ -17,9 +17,9 @@ import {
   QueryList,
 } from '@angular/core';
 
-import {CollectionViewer, DataSource} from '@angular/cdk/collections';
-import {Directionality, Direction} from '@angular/cdk/bidi';
-import {createKeyboardEvent} from '@angular/cdk/testing/testbed/fake-events';
+import {CollectionViewer, DataSource} from '../collections';
+import {Directionality, Direction} from '../bidi';
+import {createKeyboardEvent} from '../testing/testbed/fake-events';
 import {combineLatest, BehaviorSubject, Observable} from 'rxjs';
 import {map} from 'rxjs/operators';
 
diff --git a/src/cdk/tree/tree.spec.ts b/src/cdk/tree/tree.spec.ts
index 824ac56d5b61..b9d5dce285ab 100644
--- a/src/cdk/tree/tree.spec.ts
+++ b/src/cdk/tree/tree.spec.ts
@@ -20,14 +20,14 @@ import {
   ElementRef,
 } from '@angular/core';
 
-import {Direction, Directionality} from '@angular/cdk/bidi';
-import {CollectionViewer, DataSource} from '@angular/cdk/collections';
+import {Direction, Directionality} from '../bidi';
+import {CollectionViewer, DataSource} from '../collections';
 import {combineLatest, BehaviorSubject, Observable, of} from 'rxjs';
 import {map} from 'rxjs/operators';
 
 import {CdkTreeModule, CdkTreeNodePadding} from './index';
 import {CdkTree, CdkTreeNode} from './tree';
-import {createKeyboardEvent} from '@angular/cdk/testing/testbed/fake-events';
+import {createKeyboardEvent} from '../testing/testbed/fake-events';
 
 /**
  * This is a cloned version of `tree.spec.ts` that contains all the same tests,
diff --git a/src/cdk/tree/tree.ts b/src/cdk/tree/tree.ts
index 5a27c8bb479f..6101fb08225d 100644
--- a/src/cdk/tree/tree.ts
+++ b/src/cdk/tree/tree.ts
@@ -11,15 +11,15 @@ import {
   TreeKeyManagerItem,
   TreeKeyManagerOptions,
   TreeKeyManagerStrategy,
-} from '@angular/cdk/a11y';
-import {Directionality} from '@angular/cdk/bidi';
+} from '../a11y';
+import {Directionality} from '../bidi';
 import {
   CollectionViewer,
   DataSource,
   isDataSource,
   SelectionChange,
   SelectionModel,
-} from '@angular/cdk/collections';
+} from '../collections';
 import {
   AfterContentChecked,
   AfterContentInit,
@@ -48,7 +48,7 @@ import {
   inject,
   booleanAttribute,
 } from '@angular/core';
-import {coerceObservable} from '@angular/cdk/coercion/private';
+import {coerceObservable} from '../coercion/private';
 import {
   BehaviorSubject,
   combineLatest,
diff --git a/src/material/autocomplete/autocomplete-trigger.ts b/src/material/autocomplete/autocomplete-trigger.ts
index 951ba952c3e6..b1c9f4ae6147 100644
--- a/src/material/autocomplete/autocomplete-trigger.ts
+++ b/src/material/autocomplete/autocomplete-trigger.ts
@@ -48,8 +48,8 @@ import {
   MatOptionSelectionChange,
   _countGroupLabelsBeforeOption,
   _getOptionScrollPosition,
-} from '@angular/material/core';
-import {MAT_FORM_FIELD, MatFormField} from '@angular/material/form-field';
+} from '../core';
+import {MAT_FORM_FIELD, MatFormField} from '../form-field';
 import {Observable, Subject, Subscription, defer, merge, of as observableOf} from 'rxjs';
 import {delay, filter, map, startWith, switchMap, take, tap} from 'rxjs/operators';
 import {
diff --git a/src/material/autocomplete/autocomplete.spec.ts b/src/material/autocomplete/autocomplete.spec.ts
index 0c4faee25baa..2b7bb5ba3f8b 100644
--- a/src/material/autocomplete/autocomplete.spec.ts
+++ b/src/material/autocomplete/autocomplete.spec.ts
@@ -35,9 +35,9 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatOption, MatOptionSelectionChange} from '@angular/material/core';
-import {MatFormField, MatFormFieldModule} from '@angular/material/form-field';
-import {MatInputModule} from '@angular/material/input';
+import {MatOption, MatOptionSelectionChange} from '../core';
+import {MatFormField, MatFormFieldModule} from '../form-field';
+import {MatInputModule} from '../input';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {EMPTY, Observable, Subject, Subscription} from 'rxjs';
diff --git a/src/material/autocomplete/autocomplete.ts b/src/material/autocomplete/autocomplete.ts
index 705b08879fb5..5bb5f3bb3b14 100644
--- a/src/material/autocomplete/autocomplete.ts
+++ b/src/material/autocomplete/autocomplete.ts
@@ -32,7 +32,7 @@ import {
   MatOptgroup,
   MatOption,
   ThemePalette,
-} from '@angular/material/core';
+} from '../core';
 import {_IdGenerator, ActiveDescendantKeyManager} from '@angular/cdk/a11y';
 import {Platform} from '@angular/cdk/platform';
 import {Subscription} from 'rxjs';
diff --git a/src/material/autocomplete/module.ts b/src/material/autocomplete/module.ts
index d1e9983fad63..95f50a8936ab 100644
--- a/src/material/autocomplete/module.ts
+++ b/src/material/autocomplete/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule, MatOptionModule} from '@angular/material/core';
+import {MatCommonModule, MatOptionModule} from '../core';
 import {CdkScrollableModule} from '@angular/cdk/scrolling';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {MatAutocomplete} from './autocomplete';
diff --git a/src/material/autocomplete/public-api.ts b/src/material/autocomplete/public-api.ts
index 5421eba07280..84c5f45e2f2f 100644
--- a/src/material/autocomplete/public-api.ts
+++ b/src/material/autocomplete/public-api.ts
@@ -12,4 +12,4 @@ export * from './autocomplete-origin';
 export * from './autocomplete-trigger';
 
 // Re-export these since they're required to be used together with `mat-autocomplete`.
-export {MatOption, MatOptgroup} from '@angular/material/core';
+export {MatOption, MatOptgroup} from '../core';
diff --git a/src/material/autocomplete/testing/autocomplete-harness.spec.ts b/src/material/autocomplete/testing/autocomplete-harness.spec.ts
index 1f034a97716c..57e2a73c66c0 100644
--- a/src/material/autocomplete/testing/autocomplete-harness.spec.ts
+++ b/src/material/autocomplete/testing/autocomplete-harness.spec.ts
@@ -1,5 +1,5 @@
 import {Component} from '@angular/core';
-import {MatAutocompleteModule} from '@angular/material/autocomplete';
+import {MatAutocompleteModule} from '../module';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
diff --git a/src/material/autocomplete/testing/autocomplete-harness.ts b/src/material/autocomplete/testing/autocomplete-harness.ts
index 9a0c5307bb3f..41d08a05f061 100644
--- a/src/material/autocomplete/testing/autocomplete-harness.ts
+++ b/src/material/autocomplete/testing/autocomplete-harness.ts
@@ -18,7 +18,7 @@ import {
   MatOptionHarness,
   OptgroupHarnessFilters,
   OptionHarnessFilters,
-} from '@angular/material/core/testing';
+} from '../../core/testing';
 import {AutocompleteHarnessFilters} from './autocomplete-harness-filters';
 
 export class MatAutocompleteHarness extends ComponentHarness {
diff --git a/src/material/badge/badge-module.ts b/src/material/badge/badge-module.ts
index 2eb36853c89c..c3837bb9b88f 100644
--- a/src/material/badge/badge-module.ts
+++ b/src/material/badge/badge-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {A11yModule} from '@angular/cdk/a11y';
 import {MatBadge, _MatBadgeStyleLoader} from './badge';
 
diff --git a/src/material/badge/badge.spec.ts b/src/material/badge/badge.spec.ts
index 2e0e1a996b9e..e13a1b59c811 100644
--- a/src/material/badge/badge.spec.ts
+++ b/src/material/badge/badge.spec.ts
@@ -2,7 +2,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {Component, DebugElement, ViewEncapsulation, ViewChild, signal} from '@angular/core';
 import {By} from '@angular/platform-browser';
 import {MatBadge, MatBadgeModule} from './index';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 
 describe('MatBadge', () => {
   let fixture: ComponentFixture<any>;
diff --git a/src/material/badge/badge.ts b/src/material/badge/badge.ts
index 1efdeb72ba23..a5aef2248693 100644
--- a/src/material/badge/badge.ts
+++ b/src/material/badge/badge.ts
@@ -23,7 +23,7 @@ import {
   ViewEncapsulation,
   ANIMATION_MODULE_TYPE,
 } from '@angular/core';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
 
 /** Allowed position options for matBadgePosition */
diff --git a/src/material/badge/testing/badge-harness.spec.ts b/src/material/badge/testing/badge-harness.spec.ts
index 71261c9c3acd..8073b99b3288 100644
--- a/src/material/badge/testing/badge-harness.spec.ts
+++ b/src/material/badge/testing/badge-harness.spec.ts
@@ -2,7 +2,7 @@ import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatBadgeModule, MatBadgePosition, MatBadgeSize} from '@angular/material/badge';
+import {MatBadgeModule, MatBadgePosition, MatBadgeSize} from '../../badge';
 import {MatBadgeHarness} from './badge-harness';
 
 describe('MatBadgeHarness', () => {
diff --git a/src/material/badge/testing/badge-harness.ts b/src/material/badge/testing/badge-harness.ts
index 89c38bd54107..93a49ff12b93 100644
--- a/src/material/badge/testing/badge-harness.ts
+++ b/src/material/badge/testing/badge-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
-import {MatBadgePosition, MatBadgeSize} from '@angular/material/badge';
+import {MatBadgePosition, MatBadgeSize} from '../badge';
 import {BadgeHarnessFilters} from './badge-harness-filters';
 
 /** Harness for interacting with a standard Material badge in tests. */
diff --git a/src/material/bottom-sheet/bottom-sheet-module.ts b/src/material/bottom-sheet/bottom-sheet-module.ts
index dc85c389e05f..c0133c251691 100644
--- a/src/material/bottom-sheet/bottom-sheet-module.ts
+++ b/src/material/bottom-sheet/bottom-sheet-module.ts
@@ -9,7 +9,7 @@
 import {DialogModule} from '@angular/cdk/dialog';
 import {PortalModule} from '@angular/cdk/portal';
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatBottomSheetContainer} from './bottom-sheet-container';
 import {MatBottomSheet} from './bottom-sheet';
 
diff --git a/src/material/bottom-sheet/bottom-sheet.md b/src/material/bottom-sheet/bottom-sheet.md
index 3dc4a822fdee..3b84652f6875 100644
--- a/src/material/bottom-sheet/bottom-sheet.md
+++ b/src/material/bottom-sheet/bottom-sheet.md
@@ -38,7 +38,7 @@ Afterwards you can access the injected data using the `MAT_BOTTOM_SHEET_DATA` in
 
 ```ts
 import {Component, Inject} from '@angular/core';
-import {MAT_BOTTOM_SHEET_DATA} from '@angular/material/bottom-sheet';
+import {MAT_BOTTOM_SHEET_DATA} from '../bottom-sheet';
 
 @Component({
   selector: 'hobbit-sheet',
diff --git a/src/material/bottom-sheet/testing/bottom-sheet-harness.spec.ts b/src/material/bottom-sheet/testing/bottom-sheet-harness.spec.ts
index cf3fe77b1a5c..c7951159a894 100644
--- a/src/material/bottom-sheet/testing/bottom-sheet-harness.spec.ts
+++ b/src/material/bottom-sheet/testing/bottom-sheet-harness.spec.ts
@@ -2,11 +2,7 @@ import {Component, TemplateRef, ViewChild, inject} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {
-  MatBottomSheet,
-  MatBottomSheetConfig,
-  MatBottomSheetModule,
-} from '@angular/material/bottom-sheet';
+import {MatBottomSheet, MatBottomSheetConfig, MatBottomSheetModule} from '../../bottom-sheet';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatBottomSheetHarness} from './bottom-sheet-harness';
 
diff --git a/src/material/button-toggle/button-toggle-module.ts b/src/material/button-toggle/button-toggle-module.ts
index 4fce3a32cf3b..0c3aa80777bc 100644
--- a/src/material/button-toggle/button-toggle-module.ts
+++ b/src/material/button-toggle/button-toggle-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule, MatRippleModule} from '@angular/material/core';
+import {MatCommonModule, MatRippleModule} from '../core';
 import {MatButtonToggle, MatButtonToggleGroup} from './button-toggle';
 
 @NgModule({
diff --git a/src/material/button-toggle/button-toggle.ts b/src/material/button-toggle/button-toggle.ts
index 8ccdbce0ad52..e9b42db0540c 100644
--- a/src/material/button-toggle/button-toggle.ts
+++ b/src/material/button-toggle/button-toggle.ts
@@ -36,7 +36,7 @@ import {
   ViewEncapsulation,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {_StructuralStylesLoader, MatPseudoCheckbox, MatRipple} from '@angular/material/core';
+import {_StructuralStylesLoader, MatPseudoCheckbox, MatRipple} from '../core';
 
 /**
  * @deprecated No longer used.
diff --git a/src/material/button-toggle/testing/button-toggle-group-harness.ts b/src/material/button-toggle/testing/button-toggle-group-harness.ts
index 8719a1719cde..7f05a5b1e9da 100644
--- a/src/material/button-toggle/testing/button-toggle-group-harness.ts
+++ b/src/material/button-toggle/testing/button-toggle-group-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
-import {MatButtonToggleAppearance} from '@angular/material/button-toggle';
+import {MatButtonToggleAppearance} from '../button-toggle';
 import {ButtonToggleGroupHarnessFilters} from './button-toggle-group-harness-filters';
 import {ButtonToggleHarnessFilters} from './button-toggle-harness-filters';
 import {MatButtonToggleHarness} from './button-toggle-harness';
diff --git a/src/material/button-toggle/testing/button-toggle-group.spec.ts b/src/material/button-toggle/testing/button-toggle-group.spec.ts
index 178451dd8964..20d36bb2dee4 100644
--- a/src/material/button-toggle/testing/button-toggle-group.spec.ts
+++ b/src/material/button-toggle/testing/button-toggle-group.spec.ts
@@ -2,7 +2,7 @@ import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatButtonToggleAppearance, MatButtonToggleModule} from '@angular/material/button-toggle';
+import {MatButtonToggleAppearance, MatButtonToggleModule} from '../../button-toggle';
 import {MatButtonToggleGroupHarness} from './button-toggle-group-harness';
 
 describe('MatButtonToggleGroupHarness', () => {
diff --git a/src/material/button-toggle/testing/button-toggle-harness.spec.ts b/src/material/button-toggle/testing/button-toggle-harness.spec.ts
index a712846a45f0..427b6052fff9 100644
--- a/src/material/button-toggle/testing/button-toggle-harness.spec.ts
+++ b/src/material/button-toggle/testing/button-toggle-harness.spec.ts
@@ -2,7 +2,7 @@ import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatButtonToggleModule} from '@angular/material/button-toggle';
+import {MatButtonToggleModule} from '../../button-toggle';
 import {MatButtonToggleHarness} from './button-toggle-harness';
 
 describe('MatButtonToggleHarness', () => {
diff --git a/src/material/button-toggle/testing/button-toggle-harness.ts b/src/material/button-toggle/testing/button-toggle-harness.ts
index cb2b1bf36851..c80c1cbb6ae1 100644
--- a/src/material/button-toggle/testing/button-toggle-harness.ts
+++ b/src/material/button-toggle/testing/button-toggle-harness.ts
@@ -8,7 +8,7 @@
 
 import {ComponentHarness, HarnessPredicate, parallel} from '@angular/cdk/testing';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
-import {MatButtonToggleAppearance} from '@angular/material/button-toggle';
+import {MatButtonToggleAppearance} from '../button-toggle';
 import {ButtonToggleHarnessFilters} from './button-toggle-harness-filters';
 
 /** Harness for interacting with a standard mat-button-toggle in tests. */
diff --git a/src/material/button/button-base.ts b/src/material/button/button-base.ts
index b2e9194bfb5b..3b54a1794391 100644
--- a/src/material/button/button-base.ts
+++ b/src/material/button/button-base.ts
@@ -21,7 +21,7 @@ import {
   OnDestroy,
   Renderer2,
 } from '@angular/core';
-import {_StructuralStylesLoader, MatRippleLoader, ThemePalette} from '@angular/material/core';
+import {_StructuralStylesLoader, MatRippleLoader, ThemePalette} from '../core';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
 
 /** Object that can be used to configure the default options for the button component. */
diff --git a/src/material/button/button.spec.ts b/src/material/button/button.spec.ts
index 74ec8821cc81..300684f6c214 100644
--- a/src/material/button/button.spec.ts
+++ b/src/material/button/button.spec.ts
@@ -1,7 +1,7 @@
 import {createMouseEvent, dispatchEvent} from '@angular/cdk/testing/private';
 import {ApplicationRef, Component} from '@angular/core';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 import {By} from '@angular/platform-browser';
 import {
   MAT_BUTTON_CONFIG,
diff --git a/src/material/button/fab.ts b/src/material/button/fab.ts
index ce8dcb200352..010649c9a2d8 100644
--- a/src/material/button/fab.ts
+++ b/src/material/button/fab.ts
@@ -17,7 +17,7 @@ import {
 } from '@angular/core';
 
 import {MAT_BUTTON_HOST, MatButtonBase} from './button-base';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 
 /** Default FAB options that can be overridden. */
 export interface MatFabDefaultOptions {
diff --git a/src/material/button/module.ts b/src/material/button/module.ts
index e5e5bd99e495..6532935bddc5 100644
--- a/src/material/button/module.ts
+++ b/src/material/button/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule, MatRippleModule} from '@angular/material/core';
+import {MatCommonModule, MatRippleModule} from '../core';
 import {MatButton} from './button';
 import {MatFabButton, MatMiniFabButton} from './fab';
 import {MatIconButton} from './icon-button';
diff --git a/src/material/button/testing/button-harness.spec.ts b/src/material/button/testing/button-harness.spec.ts
index ab4a01fa4c6e..963519892949 100644
--- a/src/material/button/testing/button-harness.spec.ts
+++ b/src/material/button/testing/button-harness.spec.ts
@@ -3,9 +3,9 @@ import {ComponentFixture, inject, TestBed} from '@angular/core/testing';
 import {Platform, PlatformModule} from '@angular/cdk/platform';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatButtonModule} from '@angular/material/button';
-import {MatIconModule} from '@angular/material/icon';
-import {MatIconHarness} from '@angular/material/icon/testing';
+import {MatButtonModule} from '../module';
+import {MatIconModule} from '../../icon';
+import {MatIconHarness} from '../../icon/testing';
 import {MatButtonHarness} from './button-harness';
 
 describe('MatButtonHarness', () => {
diff --git a/src/material/card/module.ts b/src/material/card/module.ts
index a72ce0bf1404..35c2895b01f7 100644
--- a/src/material/card/module.ts
+++ b/src/material/card/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {
   MatCard,
   MatCardActions,
diff --git a/src/material/card/testing/card-harness.spec.ts b/src/material/card/testing/card-harness.spec.ts
index 06ebb6a3cd93..559b4b46e73c 100644
--- a/src/material/card/testing/card-harness.spec.ts
+++ b/src/material/card/testing/card-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {ComponentHarness, HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatCardModule} from '@angular/material/card';
+import {MatCardModule} from '../module';
 import {MatCardHarness, MatCardSection} from './card-harness';
 
 describe('MatCardHarness', () => {
diff --git a/src/material/checkbox/checkbox-config.ts b/src/material/checkbox/checkbox-config.ts
index 70ed060f00dd..db8a06161d54 100644
--- a/src/material/checkbox/checkbox-config.ts
+++ b/src/material/checkbox/checkbox-config.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import {InjectionToken} from '@angular/core';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 
 /** Default `mat-checkbox` options that can be overridden. */
 export interface MatCheckboxDefaultOptions {
diff --git a/src/material/checkbox/checkbox.spec.ts b/src/material/checkbox/checkbox.spec.ts
index ac44a8beb73b..d420cf6be39a 100644
--- a/src/material/checkbox/checkbox.spec.ts
+++ b/src/material/checkbox/checkbox.spec.ts
@@ -2,7 +2,7 @@ import {dispatchFakeEvent} from '@angular/cdk/testing/private';
 import {ChangeDetectionStrategy, Component, DebugElement, Type} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, flush, flushMicrotasks} from '@angular/core/testing';
 import {FormControl, FormsModule, NgModel, ReactiveFormsModule} from '@angular/forms';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 import {By} from '@angular/platform-browser';
 import {
   MAT_CHECKBOX_DEFAULT_OPTIONS,
diff --git a/src/material/checkbox/checkbox.ts b/src/material/checkbox/checkbox.ts
index dae4ac6777ce..b95d4ed88cc4 100644
--- a/src/material/checkbox/checkbox.ts
+++ b/src/material/checkbox/checkbox.ts
@@ -36,7 +36,7 @@ import {
   ValidationErrors,
   Validator,
 } from '@angular/forms';
-import {MatRipple, _MatInternalFormField, _StructuralStylesLoader} from '@angular/material/core';
+import {MatRipple, _MatInternalFormField, _StructuralStylesLoader} from '../core';
 import {
   MAT_CHECKBOX_DEFAULT_OPTIONS,
   MAT_CHECKBOX_DEFAULT_OPTIONS_FACTORY,
diff --git a/src/material/checkbox/module.ts b/src/material/checkbox/module.ts
index 267266fa6907..1d75aa7b4bc1 100644
--- a/src/material/checkbox/module.ts
+++ b/src/material/checkbox/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatCheckbox} from './checkbox';
 
 @NgModule({
diff --git a/src/material/checkbox/testing/checkbox-harness.spec.ts b/src/material/checkbox/testing/checkbox-harness.spec.ts
index aabff5d91b00..bcd2f57fd4c9 100644
--- a/src/material/checkbox/testing/checkbox-harness.spec.ts
+++ b/src/material/checkbox/testing/checkbox-harness.spec.ts
@@ -3,7 +3,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {FormControl, ReactiveFormsModule} from '@angular/forms';
-import {MatCheckboxModule} from '@angular/material/checkbox';
+import {MatCheckboxModule} from '../module';
 import {MatCheckboxHarness} from './checkbox-harness';
 
 describe('MatCheckboxHarness', () => {
diff --git a/src/material/chips/chip-action.ts b/src/material/chips/chip-action.ts
index c4b81a0833e7..af665cf6cc64 100644
--- a/src/material/chips/chip-action.ts
+++ b/src/material/chips/chip-action.ts
@@ -17,7 +17,7 @@ import {
 import {ENTER, SPACE} from '@angular/cdk/keycodes';
 import {MAT_CHIP} from './tokens';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
-import {_StructuralStylesLoader} from '@angular/material/core';
+import {_StructuralStylesLoader} from '../core';
 
 /**
  * Section within a chip.
diff --git a/src/material/chips/chip-grid.spec.ts b/src/material/chips/chip-grid.spec.ts
index ae569dede561..d536692baebb 100644
--- a/src/material/chips/chip-grid.spec.ts
+++ b/src/material/chips/chip-grid.spec.ts
@@ -34,8 +34,8 @@ import {
 import {takeUntilDestroyed} from '@angular/core/rxjs-interop';
 import {ComponentFixture, TestBed, fakeAsync, flush, tick} from '@angular/core/testing';
 import {FormControl, FormsModule, NgForm, ReactiveFormsModule, Validators} from '@angular/forms';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatInputModule} from '@angular/material/input';
+import {MatFormFieldModule} from '../form-field';
+import {MatInputModule} from '../input';
 import {By} from '@angular/platform-browser';
 import {MatChipEvent, MatChipGrid, MatChipInputEvent, MatChipRow, MatChipsModule} from './index';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
diff --git a/src/material/chips/chip-grid.ts b/src/material/chips/chip-grid.ts
index 9e0132d0e5d2..9741ca8453e9 100644
--- a/src/material/chips/chip-grid.ts
+++ b/src/material/chips/chip-grid.ts
@@ -30,8 +30,8 @@ import {
   NgForm,
   Validators,
 } from '@angular/forms';
-import {_ErrorStateTracker, ErrorStateMatcher} from '@angular/material/core';
-import {MatFormFieldControl} from '@angular/material/form-field';
+import {_ErrorStateTracker, ErrorStateMatcher} from '../core';
+import {MatFormFieldControl} from '../form-field';
 import {merge, Observable, Subject} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
 import {MatChipEvent} from './chip';
diff --git a/src/material/chips/chip-input.spec.ts b/src/material/chips/chip-input.spec.ts
index 7dc78400e713..b227d11fae30 100644
--- a/src/material/chips/chip-input.spec.ts
+++ b/src/material/chips/chip-input.spec.ts
@@ -8,7 +8,7 @@ import {
 } from '@angular/cdk/testing/private';
 import {Component, DebugElement, ViewChild} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, flush, waitForAsync} from '@angular/core/testing';
-import {MatFormFieldModule} from '@angular/material/form-field';
+import {MatFormFieldModule} from '../form-field';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Subject} from 'rxjs';
diff --git a/src/material/chips/chip-input.ts b/src/material/chips/chip-input.ts
index 7be51abefbac..1fd8c53395ee 100644
--- a/src/material/chips/chip-input.ts
+++ b/src/material/chips/chip-input.ts
@@ -19,7 +19,7 @@ import {
   inject,
 } from '@angular/core';
 import {_IdGenerator} from '@angular/cdk/a11y';
-import {MatFormField, MAT_FORM_FIELD} from '@angular/material/form-field';
+import {MatFormField, MAT_FORM_FIELD} from '../form-field';
 import {MatChipsDefaultOptions, MAT_CHIPS_DEFAULT_OPTIONS} from './tokens';
 import {MatChipGrid} from './chip-grid';
 import {MatChipTextControl} from './chip-text-control';
diff --git a/src/material/chips/chip-option.spec.ts b/src/material/chips/chip-option.spec.ts
index 809d1c5fad00..582482acff81 100644
--- a/src/material/chips/chip-option.spec.ts
+++ b/src/material/chips/chip-option.spec.ts
@@ -3,7 +3,7 @@ import {ENTER, SPACE} from '@angular/cdk/keycodes';
 import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing/private';
 import {Component, DebugElement, ViewChild} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, flush, waitForAsync} from '@angular/core/testing';
-import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '@angular/material/core';
+import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '../core';
 import {By} from '@angular/platform-browser';
 import {Subject} from 'rxjs';
 import {
diff --git a/src/material/chips/chip.ts b/src/material/chips/chip.ts
index c49f81fd07d1..3860dd4c6b78 100644
--- a/src/material/chips/chip.ts
+++ b/src/material/chips/chip.ts
@@ -39,7 +39,7 @@ import {
   MatRippleLoader,
   RippleGlobalOptions,
   _StructuralStylesLoader,
-} from '@angular/material/core';
+} from '../core';
 import {Subject, Subscription, merge} from 'rxjs';
 import {MatChipAction} from './chip-action';
 import {MatChipAvatar, MatChipRemove, MatChipTrailingIcon} from './chip-icons';
diff --git a/src/material/chips/module.ts b/src/material/chips/module.ts
index 31f85e1f6c9e..36771d4f9a41 100644
--- a/src/material/chips/module.ts
+++ b/src/material/chips/module.ts
@@ -8,7 +8,7 @@
 
 import {ENTER} from '@angular/cdk/keycodes';
 import {NgModule} from '@angular/core';
-import {ErrorStateMatcher, MatCommonModule, MatRippleModule} from '@angular/material/core';
+import {ErrorStateMatcher, MatCommonModule, MatRippleModule} from '../core';
 import {MatChip} from './chip';
 import {MAT_CHIPS_DEFAULT_OPTIONS, MatChipsDefaultOptions} from './tokens';
 import {MatChipEditInput} from './chip-edit-input';
diff --git a/src/material/chips/testing/chip-harness.spec.ts b/src/material/chips/testing/chip-harness.spec.ts
index 2509afa602e3..52ddafdd4c60 100644
--- a/src/material/chips/testing/chip-harness.spec.ts
+++ b/src/material/chips/testing/chip-harness.spec.ts
@@ -2,8 +2,8 @@ import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatIconModule} from '@angular/material/icon';
-import {MatIconHarness} from '@angular/material/icon/testing';
+import {MatIconModule} from '../../icon';
+import {MatIconHarness} from '../../icon/testing';
 import {MatChipsModule} from '../index';
 import {MatChipHarness} from './chip-harness';
 
diff --git a/src/material/core/testing/optgroup-harness.spec.ts b/src/material/core/testing/optgroup-harness.spec.ts
index f2fc0492d5ae..b4e52149e0c8 100644
--- a/src/material/core/testing/optgroup-harness.spec.ts
+++ b/src/material/core/testing/optgroup-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatOptionModule} from '@angular/material/core';
+import {MatOptionModule} from '../option';
 import {MatOptgroupHarness} from './optgroup-harness';
 
 describe('MatOptgroupHarness', () => {
diff --git a/src/material/core/testing/option-harness.spec.ts b/src/material/core/testing/option-harness.spec.ts
index c10cba3afc89..5f4ca157b8b9 100644
--- a/src/material/core/testing/option-harness.spec.ts
+++ b/src/material/core/testing/option-harness.spec.ts
@@ -7,7 +7,7 @@ import {
   MatOption,
   MatOptionModule,
   MatOptionParentComponent,
-} from '@angular/material/core';
+} from '../option';
 import {MatOptionHarness} from './option-harness';
 
 describe('MatOptionHarness', () => {
diff --git a/src/material/datepicker/calendar-body.ts b/src/material/datepicker/calendar-body.ts
index a0620f72829f..da7f3d83056d 100644
--- a/src/material/datepicker/calendar-body.ts
+++ b/src/material/datepicker/calendar-body.ts
@@ -28,7 +28,7 @@ import {
 import {_IdGenerator} from '@angular/cdk/a11y';
 import {NgClass} from '@angular/common';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
-import {_StructuralStylesLoader} from '@angular/material/core';
+import {_StructuralStylesLoader} from '../core';
 import {MatDatepickerIntl} from './datepicker-intl';
 
 /** Extra CSS classes that can be associated with a calendar cell. */
diff --git a/src/material/datepicker/calendar-header.spec.ts b/src/material/datepicker/calendar-header.spec.ts
index d9ed1edf6415..c053e0ac453f 100644
--- a/src/material/datepicker/calendar-header.spec.ts
+++ b/src/material/datepicker/calendar-header.spec.ts
@@ -1,7 +1,7 @@
 import {Directionality} from '@angular/cdk/bidi';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
-import {MatNativeDateModule, DateAdapter} from '@angular/material/core';
+import {MatNativeDateModule, DateAdapter} from '../core';
 import {DEC, FEB, JAN} from '../testing';
 import {By} from '@angular/platform-browser';
 import {MatCalendar} from './calendar';
diff --git a/src/material/datepicker/calendar.spec.ts b/src/material/datepicker/calendar.spec.ts
index 34eaa23bc29b..cb49c37c304e 100644
--- a/src/material/datepicker/calendar.spec.ts
+++ b/src/material/datepicker/calendar.spec.ts
@@ -7,7 +7,7 @@ import {
 } from '@angular/cdk/testing/private';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed, inject, waitForAsync} from '@angular/core/testing';
-import {DateAdapter, MatNativeDateModule} from '@angular/material/core';
+import {DateAdapter, MatNativeDateModule} from '../core';
 import {By} from '@angular/platform-browser';
 import {DEC, FEB, JAN, JUL, NOV} from '../testing';
 import {MatCalendar} from './calendar';
diff --git a/src/material/datepicker/calendar.ts b/src/material/datepicker/calendar.ts
index 18c97679e604..48eaf22b7de7 100644
--- a/src/material/datepicker/calendar.ts
+++ b/src/material/datepicker/calendar.ts
@@ -24,7 +24,7 @@ import {
   ViewEncapsulation,
   inject,
 } from '@angular/core';
-import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
+import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '../core';
 import {Subject, Subscription} from 'rxjs';
 import {MatCalendarUserEvent, MatCalendarCellClassFunction} from './calendar-body';
 import {createMissingDateImplError} from './datepicker-errors';
@@ -38,7 +38,7 @@ import {
 } from './multi-year-view';
 import {MatYearView} from './year-view';
 import {MAT_SINGLE_DATE_SELECTION_MODEL_PROVIDER, DateRange} from './date-selection-model';
-import {MatIconButton, MatButton} from '@angular/material/button';
+import {MatIconButton, MatButton} from '../button';
 import {_IdGenerator, CdkMonitorFocus} from '@angular/cdk/a11y';
 import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
 
diff --git a/src/material/datepicker/date-range-input-parts.ts b/src/material/datepicker/date-range-input-parts.ts
index c1fa43d499d9..6bc39f0d527d 100644
--- a/src/material/datepicker/date-range-input-parts.ts
+++ b/src/material/datepicker/date-range-input-parts.ts
@@ -29,7 +29,7 @@ import {
   ValidatorFn,
   Validators,
 } from '@angular/forms';
-import {ErrorStateMatcher, _ErrorStateTracker} from '@angular/material/core';
+import {ErrorStateMatcher, _ErrorStateTracker} from '../core';
 import {_computeAriaAccessibleName} from './aria-accessible-name';
 import {DateRange, DateSelectionModelChange} from './date-selection-model';
 import {MatDatepickerInputBase} from './datepicker-input-base';
diff --git a/src/material/datepicker/date-range-input.spec.ts b/src/material/datepicker/date-range-input.spec.ts
index b5f594457af4..6fb59091ec42 100644
--- a/src/material/datepicker/date-range-input.spec.ts
+++ b/src/material/datepicker/date-range-input.spec.ts
@@ -15,9 +15,9 @@ import {
   Validator,
   Validators,
 } from '@angular/forms';
-import {ErrorStateMatcher, MatNativeDateModule} from '@angular/material/core';
-import {MatFormField, MatFormFieldModule, MatLabel} from '@angular/material/form-field';
-import {MatInputModule} from '@angular/material/input';
+import {ErrorStateMatcher, MatNativeDateModule} from '../core';
+import {MatFormField, MatFormFieldModule, MatLabel} from '../form-field';
+import {MatInputModule} from '../input';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Subscription} from 'rxjs';
 import {MatDateRangeInput} from './date-range-input';
diff --git a/src/material/datepicker/date-range-input.ts b/src/material/datepicker/date-range-input.ts
index 695c08b43308..d3260df328d9 100644
--- a/src/material/datepicker/date-range-input.ts
+++ b/src/material/datepicker/date-range-input.ts
@@ -23,8 +23,8 @@ import {
   inject,
 } from '@angular/core';
 import {ControlContainer, NgControl, Validators} from '@angular/forms';
-import {DateAdapter, ThemePalette} from '@angular/material/core';
-import {MAT_FORM_FIELD, MatFormFieldControl} from '@angular/material/form-field';
+import {DateAdapter, ThemePalette} from '../core';
+import {MAT_FORM_FIELD, MatFormFieldControl} from '../form-field';
 import {Subject, Subscription, merge} from 'rxjs';
 import type {MatEndDate, MatStartDate} from './date-range-input-parts';
 import {MatDateRangePickerInput} from './date-range-picker';
diff --git a/src/material/datepicker/date-range-selection-strategy.spec.ts b/src/material/datepicker/date-range-selection-strategy.spec.ts
index 135cb0bb5790..bc4e6f7c5abf 100644
--- a/src/material/datepicker/date-range-selection-strategy.spec.ts
+++ b/src/material/datepicker/date-range-selection-strategy.spec.ts
@@ -1,5 +1,5 @@
 import {TestBed} from '@angular/core/testing';
-import {MatNativeDateModule} from '@angular/material/core';
+import {MatNativeDateModule} from '../core';
 
 import {JAN, FEB, MAR} from '../testing';
 import {
diff --git a/src/material/datepicker/date-range-selection-strategy.ts b/src/material/datepicker/date-range-selection-strategy.ts
index 7e11d83dfcb9..8f16c611481c 100644
--- a/src/material/datepicker/date-range-selection-strategy.ts
+++ b/src/material/datepicker/date-range-selection-strategy.ts
@@ -7,6 +7,7 @@
  */
 
 import {Injectable, InjectionToken, Optional, SkipSelf, FactoryProvider} from '@angular/core';
+// TODO: Change to relative import
 import {DateAdapter} from '@angular/material/core';
 import {DateRange} from './date-selection-model';
 
diff --git a/src/material/datepicker/date-selection-model.ts b/src/material/datepicker/date-selection-model.ts
index 31ba72b62f0c..83c8d3b6cf05 100644
--- a/src/material/datepicker/date-selection-model.ts
+++ b/src/material/datepicker/date-selection-model.ts
@@ -7,6 +7,7 @@
  */
 
 import {FactoryProvider, Injectable, Optional, SkipSelf, OnDestroy} from '@angular/core';
+// TODO: Change to relative import
 import {DateAdapter} from '@angular/material/core';
 import {Observable, Subject} from 'rxjs';
 
diff --git a/src/material/datepicker/datepicker-actions.spec.ts b/src/material/datepicker/datepicker-actions.spec.ts
index e428604489bc..d5ed05cb757a 100644
--- a/src/material/datepicker/datepicker-actions.spec.ts
+++ b/src/material/datepicker/datepicker-actions.spec.ts
@@ -1,9 +1,9 @@
 import {Component, ElementRef, Type, ViewChild} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, flush, tick} from '@angular/core/testing';
 import {FormControl, FormsModule, ReactiveFormsModule} from '@angular/forms';
-import {MatNativeDateModule} from '@angular/material/core';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatInputModule} from '@angular/material/input';
+import {MatNativeDateModule} from '../core';
+import {MatFormFieldModule} from '../form-field';
+import {MatInputModule} from '../input';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatDatepicker} from './datepicker';
 import {MatDatepickerModule} from './datepicker-module';
diff --git a/src/material/datepicker/datepicker-base.ts b/src/material/datepicker/datepicker-base.ts
index c7504bf6db8f..a80ba4791e32 100644
--- a/src/material/datepicker/datepicker-base.ts
+++ b/src/material/datepicker/datepicker-base.ts
@@ -56,8 +56,8 @@ import {
   ViewContainerRef,
   ViewEncapsulation,
 } from '@angular/core';
-import {MatButton} from '@angular/material/button';
-import {DateAdapter, ThemePalette} from '@angular/material/core';
+import {MatButton} from '../button';
+import {DateAdapter, ThemePalette} from '../core';
 import {merge, Observable, Subject, Subscription} from 'rxjs';
 import {filter, take} from 'rxjs/operators';
 import {MatCalendar, MatCalendarView} from './calendar';
diff --git a/src/material/datepicker/datepicker-input-base.ts b/src/material/datepicker/datepicker-input-base.ts
index 9349d51159f5..632cec9d45a4 100644
--- a/src/material/datepicker/datepicker-input-base.ts
+++ b/src/material/datepicker/datepicker-input-base.ts
@@ -27,7 +27,7 @@ import {
   Validator,
   ValidatorFn,
 } from '@angular/forms';
-import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats, ThemePalette} from '@angular/material/core';
+import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats, ThemePalette} from '../core';
 import {Subscription, Subject} from 'rxjs';
 import {createMissingDateImplError} from './datepicker-errors';
 import {
diff --git a/src/material/datepicker/datepicker-input.ts b/src/material/datepicker/datepicker-input.ts
index 558e1fa90c85..d555a1b5812e 100644
--- a/src/material/datepicker/datepicker-input.ts
+++ b/src/material/datepicker/datepicker-input.ts
@@ -8,9 +8,9 @@
 
 import {Directive, ElementRef, forwardRef, Input, OnDestroy, signal, inject} from '@angular/core';
 import {NG_VALIDATORS, NG_VALUE_ACCESSOR, ValidatorFn, Validators} from '@angular/forms';
-import {ThemePalette} from '@angular/material/core';
-import {MAT_FORM_FIELD} from '@angular/material/form-field';
-import {MAT_INPUT_VALUE_ACCESSOR} from '@angular/material/input';
+import {ThemePalette} from '../core';
+import {MAT_FORM_FIELD} from '../form-field';
+import {MAT_INPUT_VALUE_ACCESSOR} from '../input';
 import {Subscription} from 'rxjs';
 import {DateSelectionModelChange} from './date-selection-model';
 import {MatDatepickerControl, MatDatepickerPanel} from './datepicker-base';
diff --git a/src/material/datepicker/datepicker-module.ts b/src/material/datepicker/datepicker-module.ts
index abe21e81f077..46f241ea934a 100644
--- a/src/material/datepicker/datepicker-module.ts
+++ b/src/material/datepicker/datepicker-module.ts
@@ -10,9 +10,9 @@ import {A11yModule} from '@angular/cdk/a11y';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {PortalModule} from '@angular/cdk/portal';
 import {NgModule} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
+import {MatButtonModule} from '../button';
 import {CdkScrollableModule} from '@angular/cdk/scrolling';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatCalendar, MatCalendarHeader} from './calendar';
 import {MatCalendarBody} from './calendar-body';
 import {MatDatepicker} from './datepicker';
diff --git a/src/material/datepicker/datepicker-toggle.ts b/src/material/datepicker/datepicker-toggle.ts
index 6d7fb59a951c..e311e6103367 100644
--- a/src/material/datepicker/datepicker-toggle.ts
+++ b/src/material/datepicker/datepicker-toggle.ts
@@ -23,7 +23,7 @@ import {
   inject,
   HostAttributeToken,
 } from '@angular/core';
-import {MatButton, MatIconButton} from '@angular/material/button';
+import {MatButton, MatIconButton} from '../button';
 import {merge, Observable, of as observableOf, Subscription} from 'rxjs';
 import {MatDatepickerIntl} from './datepicker-intl';
 import {MatDatepickerControl, MatDatepickerPanel} from './datepicker-base';
diff --git a/src/material/datepicker/datepicker.spec.ts b/src/material/datepicker/datepicker.spec.ts
index 4c1d64537219..d721ce5d05f0 100644
--- a/src/material/datepicker/datepicker.spec.ts
+++ b/src/material/datepicker/datepicker.spec.ts
@@ -30,9 +30,9 @@ import {
   ReactiveFormsModule,
   Validator,
 } from '@angular/forms';
-import {MAT_DATE_LOCALE, MatNativeDateModule, NativeDateModule} from '@angular/material/core';
-import {MatFormField, MatFormFieldModule} from '@angular/material/form-field';
-import {MatInputModule} from '@angular/material/input';
+import {MAT_DATE_LOCALE, MatNativeDateModule, NativeDateModule} from '../core';
+import {MatFormField, MatFormFieldModule} from '../form-field';
+import {MatInputModule} from '../input';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Subject} from 'rxjs';
diff --git a/src/material/datepicker/month-view.spec.ts b/src/material/datepicker/month-view.spec.ts
index 45823af1fd8f..3d4ccf41f4b2 100644
--- a/src/material/datepicker/month-view.spec.ts
+++ b/src/material/datepicker/month-view.spec.ts
@@ -21,7 +21,7 @@ import {
 } from '@angular/cdk/testing/private';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
-import {MAT_DATE_FORMATS, MatNativeDateModule} from '@angular/material/core';
+import {MAT_DATE_FORMATS, MatNativeDateModule} from '../core';
 import {By} from '@angular/platform-browser';
 import {DEC, FEB, JAN, MAR, NOV} from '../testing';
 import {MatCalendarBody, MatCalendarUserEvent} from './calendar-body';
diff --git a/src/material/datepicker/month-view.ts b/src/material/datepicker/month-view.ts
index 655549c702b2..c9067801d168 100644
--- a/src/material/datepicker/month-view.ts
+++ b/src/material/datepicker/month-view.ts
@@ -35,7 +35,7 @@ import {
   OnChanges,
   inject,
 } from '@angular/core';
-import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
+import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '../core';
 import {Directionality} from '@angular/cdk/bidi';
 import {
   MatCalendarBody,
diff --git a/src/material/datepicker/multi-year-view.spec.ts b/src/material/datepicker/multi-year-view.spec.ts
index f305f4008daa..7228dc7d2796 100644
--- a/src/material/datepicker/multi-year-view.spec.ts
+++ b/src/material/datepicker/multi-year-view.spec.ts
@@ -12,7 +12,7 @@ import {
 import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing/private';
 import {Component, ViewChild} from '@angular/core';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
-import {MatNativeDateModule} from '@angular/material/core';
+import {MatNativeDateModule} from '../core';
 import {By} from '@angular/platform-browser';
 import {JAN, MAR} from '../testing';
 import {MatCalendarBody} from './calendar-body';
diff --git a/src/material/datepicker/multi-year-view.ts b/src/material/datepicker/multi-year-view.ts
index b8b670f9fee9..be12f2ea1c44 100644
--- a/src/material/datepicker/multi-year-view.ts
+++ b/src/material/datepicker/multi-year-view.ts
@@ -31,7 +31,7 @@ import {
   OnDestroy,
   inject,
 } from '@angular/core';
-import {DateAdapter} from '@angular/material/core';
+import {DateAdapter} from '../core';
 import {Directionality} from '@angular/cdk/bidi';
 import {
   MatCalendarBody,
diff --git a/src/material/datepicker/testing/calendar-harness.spec.ts b/src/material/datepicker/testing/calendar-harness.spec.ts
index 31bab381a5f9..b2c6c16bff45 100644
--- a/src/material/datepicker/testing/calendar-harness.spec.ts
+++ b/src/material/datepicker/testing/calendar-harness.spec.ts
@@ -2,13 +2,13 @@ import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatNativeDateModule} from '@angular/material/core';
+import {MatNativeDateModule} from '../../core';
 import {
   DateRange,
   DefaultMatCalendarRangeStrategy,
   MAT_DATE_RANGE_SELECTION_STRATEGY,
   MatDatepickerModule,
-} from '@angular/material/datepicker';
+} from '../../datepicker';
 import {CalendarView, MatCalendarHarness} from './calendar-harness';
 
 /** Date at which the calendars are set. */
diff --git a/src/material/datepicker/testing/date-range-input-harness.spec.ts b/src/material/datepicker/testing/date-range-input-harness.spec.ts
index 0877e381e76d..e3822e0b55e3 100644
--- a/src/material/datepicker/testing/date-range-input-harness.spec.ts
+++ b/src/material/datepicker/testing/date-range-input-harness.spec.ts
@@ -3,14 +3,14 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {FormsModule} from '@angular/forms';
-import {MatNativeDateModule} from '@angular/material/core';
+import {MatNativeDateModule} from '../../core';
 import {
   MatDateRangeInput,
   MatDateRangePicker,
   MatDatepickerModule,
   MatEndDate,
   MatStartDate,
-} from '@angular/material/datepicker';
+} from '../../datepicker';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatCalendarHarness} from './calendar-harness';
 import {
diff --git a/src/material/datepicker/testing/datepicker-input-harness-base.ts b/src/material/datepicker/testing/datepicker-input-harness-base.ts
index 007d24324a98..6e736928836f 100644
--- a/src/material/datepicker/testing/datepicker-input-harness-base.ts
+++ b/src/material/datepicker/testing/datepicker-input-harness-base.ts
@@ -7,7 +7,7 @@
  */
 
 import {ComponentHarnessConstructor, HarnessPredicate} from '@angular/cdk/testing';
-import {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
+import {MatFormFieldControlHarness} from '../../form-field/testing/control';
 import {DatepickerInputHarnessFilters} from './datepicker-harness-filters';
 
 /** Sets up the filter predicates for a datepicker input harness. */
diff --git a/src/material/datepicker/testing/datepicker-input-harness.spec.ts b/src/material/datepicker/testing/datepicker-input-harness.spec.ts
index 25cca010c24c..27a1e7d70a87 100644
--- a/src/material/datepicker/testing/datepicker-input-harness.spec.ts
+++ b/src/material/datepicker/testing/datepicker-input-harness.spec.ts
@@ -3,8 +3,8 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {FormsModule} from '@angular/forms';
-import {DateAdapter, MatNativeDateModule} from '@angular/material/core';
-import {MatDatepickerModule} from '@angular/material/datepicker';
+import {DateAdapter, MatNativeDateModule} from '../../core';
+import {MatDatepickerModule} from '../../datepicker';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatCalendarHarness} from './calendar-harness';
 import {MatDatepickerInputHarness} from './datepicker-input-harness';
diff --git a/src/material/datepicker/testing/datepicker-toggle-harness.spec.ts b/src/material/datepicker/testing/datepicker-toggle-harness.spec.ts
index 238b643686d2..93bd48305070 100644
--- a/src/material/datepicker/testing/datepicker-toggle-harness.spec.ts
+++ b/src/material/datepicker/testing/datepicker-toggle-harness.spec.ts
@@ -2,8 +2,8 @@ import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatNativeDateModule} from '@angular/material/core';
-import {MatDatepickerModule} from '@angular/material/datepicker';
+import {MatNativeDateModule} from '../../core';
+import {MatDatepickerModule} from '../../datepicker';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatCalendarHarness} from './calendar-harness';
 import {MatDatepickerToggleHarness} from './datepicker-toggle-harness';
diff --git a/src/material/datepicker/year-view.spec.ts b/src/material/datepicker/year-view.spec.ts
index e833fa5153f0..6ed6c2f17bca 100644
--- a/src/material/datepicker/year-view.spec.ts
+++ b/src/material/datepicker/year-view.spec.ts
@@ -12,7 +12,7 @@ import {
 import {dispatchFakeEvent, dispatchKeyboardEvent} from '@angular/cdk/testing/private';
 import {Component, ViewChild} from '@angular/core';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
-import {MatNativeDateModule} from '@angular/material/core';
+import {MatNativeDateModule} from '../core';
 import {By} from '@angular/platform-browser';
 import {AUG, DEC, FEB, JAN, JUL, JUN, MAR, MAY, NOV, OCT, SEP} from '../testing';
 import {MatCalendarBody} from './calendar-body';
diff --git a/src/material/datepicker/year-view.ts b/src/material/datepicker/year-view.ts
index 5d9ea3df989b..011e2a556cce 100644
--- a/src/material/datepicker/year-view.ts
+++ b/src/material/datepicker/year-view.ts
@@ -31,7 +31,7 @@ import {
   OnDestroy,
   inject,
 } from '@angular/core';
-import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '@angular/material/core';
+import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats} from '../core';
 import {Directionality} from '@angular/cdk/bidi';
 import {
   MatCalendarBody,
diff --git a/src/material/dialog/dialog.md b/src/material/dialog/dialog.md
index c05b3c89cab2..05ab96a9179f 100644
--- a/src/material/dialog/dialog.md
+++ b/src/material/dialog/dialog.md
@@ -65,7 +65,7 @@ To access the data in your dialog component, you have to use the MAT_DIALOG_DATA
 
 ```ts
 import {Component, Inject} from '@angular/core';
-import {MAT_DIALOG_DATA} from '@angular/material/dialog';
+import {MAT_DIALOG_DATA} from '../dialog';
 
 @Component({
   selector: 'your-dialog',
diff --git a/src/material/dialog/dialog.zone.spec.ts b/src/material/dialog/dialog.zone.spec.ts
index efbbb3496553..0c945017dade 100644
--- a/src/material/dialog/dialog.zone.spec.ts
+++ b/src/material/dialog/dialog.zone.spec.ts
@@ -12,7 +12,7 @@ import {
   inject,
 } from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, flush} from '@angular/core/testing';
-import {MatDialog, MatDialogModule, MatDialogRef} from '@angular/material/dialog';
+import {MatDialog, MatDialogModule, MatDialogRef} from '../dialog';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Subject} from 'rxjs';
 
diff --git a/src/material/dialog/module.ts b/src/material/dialog/module.ts
index 888503cedb59..160ea9487cb9 100644
--- a/src/material/dialog/module.ts
+++ b/src/material/dialog/module.ts
@@ -10,7 +10,7 @@ import {DialogModule} from '@angular/cdk/dialog';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {PortalModule} from '@angular/cdk/portal';
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatDialog} from './dialog';
 import {MatDialogContainer} from './dialog-container';
 import {
diff --git a/src/material/dialog/testing/dialog-harness.spec.ts b/src/material/dialog/testing/dialog-harness.spec.ts
index 174529ffc617..fe12ab6382d6 100644
--- a/src/material/dialog/testing/dialog-harness.spec.ts
+++ b/src/material/dialog/testing/dialog-harness.spec.ts
@@ -8,7 +8,7 @@ import {
   MatDialogConfig,
   MatDialogContent,
   MatDialogTitle,
-} from '@angular/material/dialog';
+} from '../../dialog';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatDialogHarness} from './dialog-harness';
 
diff --git a/src/material/dialog/testing/dialog-harness.ts b/src/material/dialog/testing/dialog-harness.ts
index f7df99492359..a4562affb8f8 100644
--- a/src/material/dialog/testing/dialog-harness.ts
+++ b/src/material/dialog/testing/dialog-harness.ts
@@ -13,7 +13,7 @@ import {
   TestKey,
 } from '@angular/cdk/testing';
 import {DialogHarnessFilters} from './dialog-harness-filters';
-import {DialogRole} from '@angular/material/dialog';
+import {DialogRole} from '../../dialog';
 
 /** Selectors for different sections of the mat-dialog that can contain user content. */
 export enum MatDialogSection {
diff --git a/src/material/dialog/testing/dialog-opener.spec.ts b/src/material/dialog/testing/dialog-opener.spec.ts
index 8d87ef7d0fed..670fc28bb6a6 100644
--- a/src/material/dialog/testing/dialog-opener.spec.ts
+++ b/src/material/dialog/testing/dialog-opener.spec.ts
@@ -1,8 +1,8 @@
 import {Component, inject} from '@angular/core';
 import {TestBed, fakeAsync, flush} from '@angular/core/testing';
-import {MAT_DIALOG_DATA, MatDialogRef, MatDialogState} from '@angular/material/dialog';
-import {MatTestDialogOpener, MatTestDialogOpenerModule} from '@angular/material/dialog/testing';
+import {MAT_DIALOG_DATA, MatDialogRef, MatDialogState} from '../../dialog';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
+import {MatTestDialogOpener, MatTestDialogOpenerModule} from './dialog-opener';
 
 describe('MatTestDialogOpener', () => {
   beforeEach(fakeAsync(() => {
diff --git a/src/material/dialog/testing/dialog-opener.ts b/src/material/dialog/testing/dialog-opener.ts
index 7a34215eaf12..68cff6c9269f 100644
--- a/src/material/dialog/testing/dialog-opener.ts
+++ b/src/material/dialog/testing/dialog-opener.ts
@@ -16,7 +16,7 @@ import {
   ViewEncapsulation,
   inject,
 } from '@angular/core';
-import {MatDialog, MatDialogConfig, MatDialogModule, MatDialogRef} from '@angular/material/dialog';
+import {MatDialog, MatDialogConfig, MatDialogModule, MatDialogRef} from '../../dialog';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Subscription} from 'rxjs';
 
diff --git a/src/material/divider/divider-module.ts b/src/material/divider/divider-module.ts
index 9733bc103c1b..d016af47a90a 100644
--- a/src/material/divider/divider-module.ts
+++ b/src/material/divider/divider-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatDivider} from './divider';
 
 @NgModule({
diff --git a/src/material/divider/testing/divider-harness.spec.ts b/src/material/divider/testing/divider-harness.spec.ts
index c0b784c62488..7f3d67423b45 100644
--- a/src/material/divider/testing/divider-harness.spec.ts
+++ b/src/material/divider/testing/divider-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatDividerModule} from '@angular/material/divider';
+import {MatDividerModule} from '../../divider';
 import {MatDividerHarness} from './divider-harness';
 
 describe('MatLegacyButtonHarness', () => {
diff --git a/src/material/expansion/expansion-module.ts b/src/material/expansion/expansion-module.ts
index d926736e272a..448501438b57 100644
--- a/src/material/expansion/expansion-module.ts
+++ b/src/material/expansion/expansion-module.ts
@@ -9,7 +9,7 @@
 import {CdkAccordionModule} from '@angular/cdk/accordion';
 import {PortalModule} from '@angular/cdk/portal';
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatAccordion} from './accordion';
 import {MatExpansionPanel, MatExpansionPanelActionRow} from './expansion-panel';
 import {MatExpansionPanelContent} from './expansion-panel-content';
diff --git a/src/material/expansion/expansion-panel-header.ts b/src/material/expansion/expansion-panel-header.ts
index 88405bc289bd..a9641381d280 100644
--- a/src/material/expansion/expansion-panel-header.ts
+++ b/src/material/expansion/expansion-panel-header.ts
@@ -31,7 +31,7 @@ import {
   MAT_EXPANSION_PANEL_DEFAULT_OPTIONS,
 } from './expansion-panel';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
-import {_StructuralStylesLoader} from '@angular/material/core';
+import {_StructuralStylesLoader} from '../core';
 
 /**
  * Header element of a `<mat-expansion-panel>`.
diff --git a/src/material/expansion/testing/expansion-harness.spec.ts b/src/material/expansion/testing/expansion-harness.spec.ts
index cc93787cf573..f6e73173ed49 100644
--- a/src/material/expansion/testing/expansion-harness.spec.ts
+++ b/src/material/expansion/testing/expansion-harness.spec.ts
@@ -2,7 +2,7 @@ import {ComponentHarness, HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatAccordionTogglePosition, MatExpansionModule} from '@angular/material/expansion';
+import {MatAccordionTogglePosition, MatExpansionModule} from '../../expansion';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatAccordionHarness} from './accordion-harness';
 import {MatExpansionPanelHarness} from './expansion-harness';
diff --git a/src/material/form-field/form-field.ts b/src/material/form-field/form-field.ts
index 0aa19d044ccc..6bdcbf2a745c 100644
--- a/src/material/form-field/form-field.ts
+++ b/src/material/form-field/form-field.ts
@@ -34,7 +34,7 @@ import {
   inject,
 } from '@angular/core';
 import {AbstractControlDirective, ValidatorFn} from '@angular/forms';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 import {_IdGenerator} from '@angular/cdk/a11y';
 import {Subject, Subscription, merge} from 'rxjs';
 import {map, pairwise, takeUntil, filter, startWith} from 'rxjs/operators';
diff --git a/src/material/form-field/module.ts b/src/material/form-field/module.ts
index 4e09f29dff33..a2163e1e5dc6 100644
--- a/src/material/form-field/module.ts
+++ b/src/material/form-field/module.ts
@@ -8,7 +8,7 @@
 
 import {ObserversModule} from '@angular/cdk/observers';
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatError} from './directives/error';
 import {MatHint} from './directives/hint';
 import {MatLabel} from './directives/label';
diff --git a/src/material/form-field/testing/form-field-harness.spec.ts b/src/material/form-field/testing/form-field-harness.spec.ts
index dc6a8e34aad2..25ab06c3302e 100644
--- a/src/material/form-field/testing/form-field-harness.spec.ts
+++ b/src/material/form-field/testing/form-field-harness.spec.ts
@@ -5,18 +5,11 @@ import {createFakeEvent, dispatchFakeEvent} from '@angular/cdk/testing/private';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {FormControl, ReactiveFormsModule, Validators} from '@angular/forms';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {
-  MatError,
-  MatFormField,
-  MatHint,
-  MatLabel,
-  MatPrefix,
-  MatSuffix,
-} from '@angular/material/form-field';
-import {MatAutocomplete, MatAutocompleteTrigger} from '@angular/material/autocomplete';
-import {MatInput} from '@angular/material/input';
-import {MatSelect} from '@angular/material/select';
-import {MatNativeDateModule, MatOption} from '@angular/material/core';
+import {MatError, MatFormField, MatHint, MatLabel, MatPrefix, MatSuffix} from '../../form-field';
+import {MatAutocomplete, MatAutocompleteTrigger} from '../../autocomplete';
+import {MatInput} from '../../input';
+import {MatSelect} from '../../select';
+import {MatNativeDateModule, MatOption} from '../../core';
 import {
   MatDateRangeInput,
   MatDateRangePicker,
@@ -25,13 +18,10 @@ import {
   MatDatepickerModule,
   MatEndDate,
   MatStartDate,
-} from '@angular/material/datepicker';
-import {MatInputHarness} from '@angular/material/input/testing';
-import {MatSelectHarness} from '@angular/material/select/testing';
-import {
-  MatDateRangeInputHarness,
-  MatDatepickerInputHarness,
-} from '@angular/material/datepicker/testing';
+} from '../../datepicker';
+import {MatInputHarness} from '../../input/testing';
+import {MatSelectHarness} from '../../select/testing';
+import {MatDateRangeInputHarness, MatDatepickerInputHarness} from '../../datepicker/testing';
 import {MatFormFieldHarness} from './form-field-harness';
 import {MatErrorHarness} from './error-harness';
 
diff --git a/src/material/form-field/testing/form-field-harness.ts b/src/material/form-field/testing/form-field-harness.ts
index ab4c0ce2d14a..a33e760c248f 100644
--- a/src/material/form-field/testing/form-field-harness.ts
+++ b/src/material/form-field/testing/form-field-harness.ts
@@ -14,13 +14,10 @@ import {
   parallel,
 } from '@angular/cdk/testing';
 import {ErrorHarnessFilters, MatErrorHarness} from './error-harness';
-import {MatInputHarness} from '@angular/material/input/testing';
-import {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
-import {MatSelectHarness} from '@angular/material/select/testing';
-import {
-  MatDatepickerInputHarness,
-  MatDateRangeInputHarness,
-} from '@angular/material/datepicker/testing';
+import {MatInputHarness} from '../../input/testing';
+import {MatFormFieldControlHarness} from './control';
+import {MatSelectHarness} from '../../select/testing';
+import {MatDatepickerInputHarness, MatDateRangeInputHarness} from '../../datepicker/testing';
 import {FormFieldHarnessFilters} from './form-field-harness-filters';
 
 /** Possible harnesses of controls which can be bound to a form-field. */
diff --git a/src/material/form-field/testing/public-api.ts b/src/material/form-field/testing/public-api.ts
index a9e703f2adb0..e837753695fc 100644
--- a/src/material/form-field/testing/public-api.ts
+++ b/src/material/form-field/testing/public-api.ts
@@ -9,7 +9,7 @@
 // Re-export the base control harness from the "form-field/testing/control" entry-point. To
 // avoid circular dependencies, harnesses for form-field controls (i.e. input, select)
 // need to import the base form-field control harness through a separate entry-point.
-export {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
+export {MatFormFieldControlHarness} from './control';
 
 export * from './form-field-harness-filters';
 export * from './form-field-harness';
diff --git a/src/material/grid-list/grid-list-module.ts b/src/material/grid-list/grid-list-module.ts
index 9fd892efe2c1..8a67e6822d97 100644
--- a/src/material/grid-list/grid-list-module.ts
+++ b/src/material/grid-list/grid-list-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatLineModule, MatCommonModule} from '@angular/material/core';
+import {MatLineModule, MatCommonModule} from '../core';
 import {
   MatGridTile,
   MatGridTileText,
@@ -17,6 +17,9 @@ import {
 } from './grid-tile';
 import {MatGridList} from './grid-list';
 
+// Export required to fix compiler confusion about import module paths
+export {MatLine} from '../core';
+
 @NgModule({
   imports: [
     MatLineModule,
diff --git a/src/material/grid-list/grid-tile.ts b/src/material/grid-list/grid-tile.ts
index 1befa6a31964..733da2c79ecb 100644
--- a/src/material/grid-list/grid-tile.ts
+++ b/src/material/grid-list/grid-tile.ts
@@ -18,7 +18,7 @@ import {
   ChangeDetectionStrategy,
   inject,
 } from '@angular/core';
-import {MatLine, setLines} from '@angular/material/core';
+import {MatLine, setLines} from '../core';
 import {coerceNumberProperty, NumberInput} from '@angular/cdk/coercion';
 import {MAT_GRID_LIST, MatGridListBase} from './grid-list-base';
 
diff --git a/src/material/grid-list/testing/grid-list-harness.spec.ts b/src/material/grid-list/testing/grid-list-harness.spec.ts
index f0ceb23f1918..f6c70b23d4fe 100644
--- a/src/material/grid-list/testing/grid-list-harness.spec.ts
+++ b/src/material/grid-list/testing/grid-list-harness.spec.ts
@@ -3,7 +3,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MatGridListModule} from '@angular/material/grid-list';
+import {MatGridListModule} from '../../grid-list';
 import {MatGridListHarness} from './grid-list-harness';
 import {MatGridTileHarness} from './grid-tile-harness';
 
diff --git a/src/material/grid-list/testing/grid-list-harness.ts b/src/material/grid-list/testing/grid-list-harness.ts
index c57fc6ec444a..3bd237fa306e 100644
--- a/src/material/grid-list/testing/grid-list-harness.ts
+++ b/src/material/grid-list/testing/grid-list-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {ComponentHarness, HarnessPredicate, parallel} from '@angular/cdk/testing';
-import {ɵTileCoordinator as TileCoordinator} from '@angular/material/grid-list';
+import {ɵTileCoordinator as TileCoordinator} from '../../grid-list';
 import {GridListHarnessFilters, GridTileHarnessFilters} from './grid-list-harness-filters';
 import {MatGridTileHarness} from './grid-tile-harness';
 
diff --git a/src/material/icon/icon-module.ts b/src/material/icon/icon-module.ts
index d5b99c4e8066..029e76f5ae76 100644
--- a/src/material/icon/icon-module.ts
+++ b/src/material/icon/icon-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatIcon} from './icon';
 
 @NgModule({
diff --git a/src/material/icon/icon.ts b/src/material/icon/icon.ts
index 24e8d0be78d6..40870ee80228 100644
--- a/src/material/icon/icon.ts
+++ b/src/material/icon/icon.ts
@@ -22,7 +22,7 @@ import {
   ViewEncapsulation,
   HostAttributeToken,
 } from '@angular/core';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 import {Subscription} from 'rxjs';
 import {take} from 'rxjs/operators';
 
diff --git a/src/material/icon/testing/fake-icon-registry.ts b/src/material/icon/testing/fake-icon-registry.ts
index 0045b58c3284..b46617f26c45 100644
--- a/src/material/icon/testing/fake-icon-registry.ts
+++ b/src/material/icon/testing/fake-icon-registry.ts
@@ -7,7 +7,7 @@
  */
 
 import {Injectable, NgModule, OnDestroy} from '@angular/core';
-import {MatIconRegistry} from '@angular/material/icon';
+import {MatIconRegistry} from '../../icon';
 import {Observable, of as observableOf} from 'rxjs';
 
 type PublicApi<T> = {
diff --git a/src/material/icon/testing/icon-harness.spec.ts b/src/material/icon/testing/icon-harness.spec.ts
index f966db30c634..8880760b868e 100644
--- a/src/material/icon/testing/icon-harness.spec.ts
+++ b/src/material/icon/testing/icon-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatIconModule, MatIconRegistry} from '@angular/material/icon';
+import {MatIconModule, MatIconRegistry} from '../../icon';
 import {DomSanitizer} from '@angular/platform-browser';
 import {MatIconHarness} from './icon-harness';
 import {IconType} from './icon-harness-filters';
diff --git a/src/material/input/input.spec.ts b/src/material/input/input.spec.ts
index 20eeff03e5ee..b019faca0fc0 100644
--- a/src/material/input/input.spec.ts
+++ b/src/material/input/input.spec.ts
@@ -19,11 +19,7 @@ import {
   ReactiveFormsModule,
   Validators,
 } from '@angular/forms';
-import {
-  ErrorStateMatcher,
-  ShowOnDirtyErrorStateMatcher,
-  ThemePalette,
-} from '@angular/material/core';
+import {ErrorStateMatcher, ShowOnDirtyErrorStateMatcher, ThemePalette} from '../core';
 import {
   FloatLabelType,
   MAT_FORM_FIELD_DEFAULT_OPTIONS,
@@ -33,8 +29,8 @@ import {
   SubscriptSizing,
   getMatFormFieldDuplicatedHintError,
   getMatFormFieldMissingControlError,
-} from '@angular/material/form-field';
-import {MatIconModule} from '@angular/material/icon';
+} from '../form-field';
+import {MatIconModule} from '../icon';
 import {By} from '@angular/platform-browser';
 import {MAT_INPUT_VALUE_ACCESSOR, MatInput, MatInputModule} from './index';
 
diff --git a/src/material/input/input.ts b/src/material/input/input.ts
index e0a768ebaffc..869b38abb0aa 100644
--- a/src/material/input/input.ts
+++ b/src/material/input/input.ts
@@ -28,8 +28,8 @@ import {
 } from '@angular/core';
 import {_IdGenerator} from '@angular/cdk/a11y';
 import {FormGroupDirective, NgControl, NgForm, Validators} from '@angular/forms';
-import {ErrorStateMatcher, _ErrorStateTracker} from '@angular/material/core';
-import {MatFormFieldControl, MatFormField, MAT_FORM_FIELD} from '@angular/material/form-field';
+import {ErrorStateMatcher, _ErrorStateTracker} from '../core';
+import {MatFormFieldControl, MatFormField, MAT_FORM_FIELD} from '../form-field';
 import {Subject} from 'rxjs';
 import {getMatInputUnsupportedTypeError} from './input-errors';
 import {MAT_INPUT_VALUE_ACCESSOR} from './input-value-accessor';
diff --git a/src/material/input/module.ts b/src/material/input/module.ts
index 985bf6635d23..995be4031a61 100644
--- a/src/material/input/module.ts
+++ b/src/material/input/module.ts
@@ -8,8 +8,8 @@
 
 import {TextFieldModule} from '@angular/cdk/text-field';
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
-import {MatFormFieldModule} from '@angular/material/form-field';
+import {MatCommonModule} from '../core';
+import {MatFormFieldModule} from '../form-field';
 import {MatInput} from './input';
 
 @NgModule({
diff --git a/src/material/input/public-api.ts b/src/material/input/public-api.ts
index b9e99456916b..773c49cf5cbd 100644
--- a/src/material/input/public-api.ts
+++ b/src/material/input/public-api.ts
@@ -12,11 +12,4 @@ export * from './input-value-accessor';
 export * from './input-errors';
 
 // Re-provide these for convenience since they used to be provided implicitly.
-export {
-  MatFormField,
-  MatLabel,
-  MatHint,
-  MatError,
-  MatPrefix,
-  MatSuffix,
-} from '@angular/material/form-field';
+export {MatFormField, MatLabel, MatHint, MatError, MatPrefix, MatSuffix} from '../form-field';
diff --git a/src/material/input/testing/BUILD.bazel b/src/material/input/testing/BUILD.bazel
index e7bf64737e1a..53f6c8688cc5 100644
--- a/src/material/input/testing/BUILD.bazel
+++ b/src/material/input/testing/BUILD.bazel
@@ -28,6 +28,8 @@ ng_test_library(
         "//src/cdk/platform",
         "//src/cdk/testing",
         "//src/cdk/testing/testbed",
+        "//src/material/form-field",
+        "//src/material/form-field/testing/control",
         "//src/material/input",
         "@npm//@angular/forms",
         "@npm//@angular/platform-browser",
diff --git a/src/material/input/testing/input-harness.spec.ts b/src/material/input/testing/input-harness.spec.ts
index e546a4561b1d..e2e1e9b6f270 100644
--- a/src/material/input/testing/input-harness.spec.ts
+++ b/src/material/input/testing/input-harness.spec.ts
@@ -3,7 +3,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {FormsModule} from '@angular/forms';
-import {MatInputModule} from '@angular/material/input';
+import {MatInputModule} from '../module';
 import {getSupportedInputTypes} from '@angular/cdk/platform';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatInputHarness} from './input-harness';
diff --git a/src/material/input/testing/input-harness.ts b/src/material/input/testing/input-harness.ts
index 1ba9a41d1a24..61e087f01cbb 100644
--- a/src/material/input/testing/input-harness.ts
+++ b/src/material/input/testing/input-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {HarnessPredicate, parallel} from '@angular/cdk/testing';
-import {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
+import {MatFormFieldControlHarness} from '../../form-field/testing/control';
 import {coerceBooleanProperty} from '@angular/cdk/coercion';
 import {InputHarnessFilters} from './input-harness-filters';
 
diff --git a/src/material/input/testing/native-select-harness.spec.ts b/src/material/input/testing/native-select-harness.spec.ts
index 4bc7b6c0d5a4..acf2349d8abe 100644
--- a/src/material/input/testing/native-select-harness.spec.ts
+++ b/src/material/input/testing/native-select-harness.spec.ts
@@ -3,7 +3,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {FormsModule} from '@angular/forms';
-import {MatInputModule} from '@angular/material/input';
+import {MatInputModule} from '../module';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatNativeSelectHarness} from './native-select-harness';
 
diff --git a/src/material/input/testing/native-select-harness.ts b/src/material/input/testing/native-select-harness.ts
index 3a45205611fd..3641d08b3438 100644
--- a/src/material/input/testing/native-select-harness.ts
+++ b/src/material/input/testing/native-select-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {HarnessPredicate, parallel} from '@angular/cdk/testing';
-import {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
+import {MatFormFieldControlHarness} from '../../form-field/testing/control';
 import {MatNativeOptionHarness} from './native-option-harness';
 import {
   NativeOptionHarnessFilters,
diff --git a/src/material/list/list-base.ts b/src/material/list/list-base.ts
index 80273507047e..24d5e93b478f 100644
--- a/src/material/list/list-base.ts
+++ b/src/material/list/list-base.ts
@@ -28,7 +28,7 @@ import {
   RippleGlobalOptions,
   RippleRenderer,
   RippleTarget,
-} from '@angular/material/core';
+} from '../core';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
 import {Subscription, merge} from 'rxjs';
 import {
diff --git a/src/material/list/list-module.ts b/src/material/list/list-module.ts
index 75c4cec2676b..d69163454ab3 100644
--- a/src/material/list/list-module.ts
+++ b/src/material/list/list-module.ts
@@ -7,8 +7,8 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatPseudoCheckboxModule, MatRippleModule, MatCommonModule} from '@angular/material/core';
-import {MatDividerModule} from '@angular/material/divider';
+import {MatPseudoCheckboxModule, MatRippleModule, MatCommonModule} from '../core';
+import {MatDividerModule, MatDivider} from '@angular/material/divider';
 import {MatActionList} from './action-list';
 import {MatList, MatListItem} from './list';
 import {MatListOption} from './list-option';
@@ -24,6 +24,9 @@ import {MatNavList} from './nav-list';
 import {MatSelectionList} from './selection-list';
 import {ObserversModule} from '@angular/cdk/observers';
 
+// Export required to fix compiler confusion about import module paths
+export {MatDivider};
+
 @NgModule({
   imports: [
     ObserversModule,
diff --git a/src/material/list/list-option.ts b/src/material/list/list-option.ts
index 12edfdd1eef8..7c6b82c4d30a 100644
--- a/src/material/list/list-option.ts
+++ b/src/material/list/list-option.ts
@@ -25,7 +25,7 @@ import {
   ViewEncapsulation,
   inject,
 } from '@angular/core';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 import {MatListBase, MatListItemBase} from './list-base';
 import {LIST_OPTION, ListOption, MatListOptionTogglePosition} from './list-option-types';
 import {MatListItemLine, MatListItemTitle} from './list-item-sections';
diff --git a/src/material/list/selection-list.spec.ts b/src/material/list/selection-list.spec.ts
index 4ed99d669957..2afcc06ef32b 100644
--- a/src/material/list/selection-list.spec.ts
+++ b/src/material/list/selection-list.spec.ts
@@ -22,7 +22,7 @@ import {
   waitForAsync,
 } from '@angular/core/testing';
 import {FormControl, FormsModule, NgModel, ReactiveFormsModule} from '@angular/forms';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 import {By} from '@angular/platform-browser';
 import {
   MAT_LIST_CONFIG,
diff --git a/src/material/list/selection-list.ts b/src/material/list/selection-list.ts
index 850bb0815558..3bbbec2dad04 100644
--- a/src/material/list/selection-list.ts
+++ b/src/material/list/selection-list.ts
@@ -32,7 +32,7 @@ import {
   inject,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 import {Subject} from 'rxjs';
 import {takeUntil} from 'rxjs/operators';
 import {MatListBase} from './list-base';
diff --git a/src/material/list/testing/list-harness-base.ts b/src/material/list/testing/list-harness-base.ts
index bd720fe22ffe..7166168d331c 100644
--- a/src/material/list/testing/list-harness-base.ts
+++ b/src/material/list/testing/list-harness-base.ts
@@ -12,7 +12,7 @@ import {
   HarnessPredicate,
   parallel,
 } from '@angular/cdk/testing';
-import {DividerHarnessFilters, MatDividerHarness} from '@angular/material/divider/testing';
+import {DividerHarnessFilters, MatDividerHarness} from '../../divider/testing';
 import {BaseListItemHarnessFilters, SubheaderHarnessFilters} from './list-harness-filters';
 import {MatSubheaderHarness} from './list-item-harness-base';
 
diff --git a/src/material/list/testing/list-harness.spec.ts b/src/material/list/testing/list-harness.spec.ts
index d39f4d650588..65d3cb6f8d75 100644
--- a/src/material/list/testing/list-harness.spec.ts
+++ b/src/material/list/testing/list-harness.spec.ts
@@ -8,8 +8,8 @@ import {
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component, Type, WritableSignal, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {MatDividerHarness} from '@angular/material/divider/testing';
-import {MatListModule} from '@angular/material/list';
+import {MatDividerHarness} from '../../divider/testing';
+import {MatListModule} from '../../list';
 import {MatActionListHarness, MatActionListItemHarness} from './action-list-harness';
 import {MatListHarness, MatListItemHarness} from './list-harness';
 import {
diff --git a/src/material/list/testing/selection-list-harness.ts b/src/material/list/testing/selection-list-harness.ts
index 7860454d1def..999f951dbcb7 100644
--- a/src/material/list/testing/selection-list-harness.ts
+++ b/src/material/list/testing/selection-list-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {ComponentHarnessConstructor, HarnessPredicate, parallel} from '@angular/cdk/testing';
-import {MatListOptionTogglePosition} from '@angular/material/list';
+import {MatListOptionTogglePosition} from '../../list';
 import {MatListHarnessBase} from './list-harness-base';
 import {
   ListItemHarnessFilters,
diff --git a/src/material/menu/menu-item.ts b/src/material/menu/menu-item.ts
index b8b0a763986e..6f6cfb5ec3b6 100644
--- a/src/material/menu/menu-item.ts
+++ b/src/material/menu/menu-item.ts
@@ -22,7 +22,7 @@ import {FocusableOption, FocusMonitor, FocusOrigin} from '@angular/cdk/a11y';
 import {Subject} from 'rxjs';
 import {DOCUMENT} from '@angular/common';
 import {MatMenuPanel, MAT_MENU_PANEL} from './menu-panel';
-import {_StructuralStylesLoader, MatRipple} from '@angular/material/core';
+import {_StructuralStylesLoader, MatRipple} from '../core';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
 
 /**
diff --git a/src/material/menu/menu.spec.ts b/src/material/menu/menu.spec.ts
index a065f4404038..8b990c7ddf3f 100644
--- a/src/material/menu/menu.spec.ts
+++ b/src/material/menu/menu.spec.ts
@@ -29,7 +29,7 @@ import {
   ViewChildren,
 } from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, flush, tick} from '@angular/core/testing';
-import {MatRipple} from '@angular/material/core';
+import {MatRipple} from '../core';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Subject} from 'rxjs';
diff --git a/src/material/menu/module.ts b/src/material/menu/module.ts
index 0888920c6a18..901b65b60c78 100644
--- a/src/material/menu/module.ts
+++ b/src/material/menu/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule, MatRippleModule} from '@angular/material/core';
+import {MatCommonModule, MatRippleModule} from '../core';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {CdkScrollableModule} from '@angular/cdk/scrolling';
 import {MatMenu} from './menu';
diff --git a/src/material/menu/testing/menu-harness.spec.ts b/src/material/menu/testing/menu-harness.spec.ts
index 3238f0b85b3d..3d2898ce8d42 100644
--- a/src/material/menu/testing/menu-harness.spec.ts
+++ b/src/material/menu/testing/menu-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatMenuModule} from '@angular/material/menu';
+import {MatMenuModule} from '../module';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatMenuHarness} from './menu-harness';
 
diff --git a/src/material/paginator/module.ts b/src/material/paginator/module.ts
index 74ddade9fa57..7555721fb969 100644
--- a/src/material/paginator/module.ts
+++ b/src/material/paginator/module.ts
@@ -8,9 +8,9 @@
 
 import {NgModule} from '@angular/core';
 import {MAT_PAGINATOR_INTL_PROVIDER} from './paginator-intl';
-import {MatButtonModule} from '@angular/material/button';
-import {MatSelectModule} from '@angular/material/select';
-import {MatTooltipModule} from '@angular/material/tooltip';
+import {MatButtonModule} from '../button';
+import {MatSelectModule} from '../select';
+import {MatTooltipModule} from '../tooltip';
 import {MatPaginator} from './paginator';
 
 @NgModule({
diff --git a/src/material/paginator/paginator.spec.ts b/src/material/paginator/paginator.spec.ts
index 54180cd4bc07..28cbc64df470 100644
--- a/src/material/paginator/paginator.spec.ts
+++ b/src/material/paginator/paginator.spec.ts
@@ -1,7 +1,7 @@
 import {ChangeDetectorRef, Component, Provider, Type, ViewChild, inject} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, tick} from '@angular/core/testing';
-import {ThemePalette} from '@angular/material/core';
-import {MatSelect} from '@angular/material/select';
+import {ThemePalette} from '../core';
+import {MatSelect} from '../select';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {
diff --git a/src/material/paginator/paginator.ts b/src/material/paginator/paginator.ts
index 7ea27e892cf3..2d429a7e2d7b 100644
--- a/src/material/paginator/paginator.ts
+++ b/src/material/paginator/paginator.ts
@@ -22,11 +22,11 @@ import {
   numberAttribute,
 } from '@angular/core';
 import {_IdGenerator} from '@angular/cdk/a11y';
-import {MatOption, ThemePalette} from '@angular/material/core';
-import {MatSelect} from '@angular/material/select';
-import {MatIconButton} from '@angular/material/button';
-import {MatTooltip} from '@angular/material/tooltip';
-import {MatFormField, MatFormFieldAppearance} from '@angular/material/form-field';
+import {MatOption, ThemePalette} from '../core';
+import {MatSelect} from '../select';
+import {MatIconButton} from '../button';
+import {MatTooltip} from '../tooltip';
+import {MatFormField, MatFormFieldAppearance} from '../form-field';
 import {Observable, ReplaySubject, Subscription} from 'rxjs';
 import {MatPaginatorIntl} from './paginator-intl';
 
diff --git a/src/material/paginator/testing/paginator-harness.spec.ts b/src/material/paginator/testing/paginator-harness.spec.ts
index 1b77d893f510..f26d892abd84 100644
--- a/src/material/paginator/testing/paginator-harness.spec.ts
+++ b/src/material/paginator/testing/paginator-harness.spec.ts
@@ -3,7 +3,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MatPaginatorModule, PageEvent} from '@angular/material/paginator';
+import {MatPaginatorModule, PageEvent} from '../../paginator';
 import {MatPaginatorHarness} from './paginator-harness';
 
 describe('MatPaginatorHarness', () => {
diff --git a/src/material/paginator/testing/paginator-harness.ts b/src/material/paginator/testing/paginator-harness.ts
index 448a8a5fda07..94b4ef77df8e 100644
--- a/src/material/paginator/testing/paginator-harness.ts
+++ b/src/material/paginator/testing/paginator-harness.ts
@@ -11,7 +11,7 @@ import {
   ComponentHarnessConstructor,
   HarnessPredicate,
 } from '@angular/cdk/testing';
-import {MatSelectHarness} from '@angular/material/select/testing';
+import {MatSelectHarness} from '../../select/testing';
 import {coerceNumberProperty} from '@angular/cdk/coercion';
 import {PaginatorHarnessFilters} from './paginator-harness-filters';
 
diff --git a/src/material/progress-bar/module.ts b/src/material/progress-bar/module.ts
index e4c3fa122a97..7c1020607484 100644
--- a/src/material/progress-bar/module.ts
+++ b/src/material/progress-bar/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatProgressBar} from './progress-bar';
 
 @NgModule({
diff --git a/src/material/progress-bar/progress-bar.ts b/src/material/progress-bar/progress-bar.ts
index bcaa9e4af0c3..a1e2c99e6acc 100644
--- a/src/material/progress-bar/progress-bar.ts
+++ b/src/material/progress-bar/progress-bar.ts
@@ -25,7 +25,7 @@ import {
   Renderer2,
 } from '@angular/core';
 import {DOCUMENT} from '@angular/common';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 
 /** Last animation end data. */
 export interface ProgressAnimationEnd {
diff --git a/src/material/progress-bar/testing/progress-bar-harness.spec.ts b/src/material/progress-bar/testing/progress-bar-harness.spec.ts
index 3415805f14ac..c1284d2d9774 100644
--- a/src/material/progress-bar/testing/progress-bar-harness.spec.ts
+++ b/src/material/progress-bar/testing/progress-bar-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatProgressBarModule} from '@angular/material/progress-bar';
+import {MatProgressBarModule} from '../module';
 import {MatProgressBarHarness} from './progress-bar-harness';
 
 describe('MatProgressBarHarness', () => {
diff --git a/src/material/progress-spinner/module.ts b/src/material/progress-spinner/module.ts
index 4ea6aa671114..a3b00d166a1b 100644
--- a/src/material/progress-spinner/module.ts
+++ b/src/material/progress-spinner/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatProgressSpinner, MatSpinner} from './progress-spinner';
 
 @NgModule({
diff --git a/src/material/progress-spinner/progress-spinner.ts b/src/material/progress-spinner/progress-spinner.ts
index 89eec823123d..3074aa39ff27 100644
--- a/src/material/progress-spinner/progress-spinner.ts
+++ b/src/material/progress-spinner/progress-spinner.ts
@@ -18,7 +18,7 @@ import {
   ANIMATION_MODULE_TYPE,
   inject,
 } from '@angular/core';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 import {NgTemplateOutlet} from '@angular/common';
 
 /** Possible mode for a progress spinner. */
diff --git a/src/material/progress-spinner/testing/progress-spinner-harness.spec.ts b/src/material/progress-spinner/testing/progress-spinner-harness.spec.ts
index 5ddd5d1ce558..296e6a020d79 100644
--- a/src/material/progress-spinner/testing/progress-spinner-harness.spec.ts
+++ b/src/material/progress-spinner/testing/progress-spinner-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
+import {MatProgressSpinnerModule} from '../module';
 import {MatProgressSpinnerHarness} from './progress-spinner-harness';
 
 describe('MatProgressSpinnerHarness', () => {
diff --git a/src/material/progress-spinner/testing/progress-spinner-harness.ts b/src/material/progress-spinner/testing/progress-spinner-harness.ts
index 5c161cfd165b..9995ac722f93 100644
--- a/src/material/progress-spinner/testing/progress-spinner-harness.ts
+++ b/src/material/progress-spinner/testing/progress-spinner-harness.ts
@@ -12,7 +12,7 @@ import {
   ComponentHarnessConstructor,
   HarnessPredicate,
 } from '@angular/cdk/testing';
-import {ProgressSpinnerMode} from '@angular/material/progress-spinner';
+import {ProgressSpinnerMode} from '../progress-spinner';
 import {ProgressSpinnerHarnessFilters} from './progress-spinner-harness-filters';
 
 /** Harness for interacting with a MDC based mat-progress-spinner in tests. */
diff --git a/src/material/radio/module.ts b/src/material/radio/module.ts
index ec9d5f40fc41..15aec187f57c 100644
--- a/src/material/radio/module.ts
+++ b/src/material/radio/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule, MatRippleModule} from '@angular/material/core';
+import {MatCommonModule, MatRippleModule} from '../core';
 import {MatRadioButton, MatRadioGroup} from './radio';
 
 @NgModule({
diff --git a/src/material/radio/radio.ts b/src/material/radio/radio.ts
index 1478434860eb..9b931bfac628 100644
--- a/src/material/radio/radio.ts
+++ b/src/material/radio/radio.ts
@@ -39,12 +39,7 @@ import {
   Renderer2,
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {
-  MatRipple,
-  ThemePalette,
-  _MatInternalFormField,
-  _StructuralStylesLoader,
-} from '@angular/material/core';
+import {MatRipple, ThemePalette, _MatInternalFormField, _StructuralStylesLoader} from '../core';
 import {Subscription} from 'rxjs';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
 
diff --git a/src/material/radio/testing/radio-harness.spec.ts b/src/material/radio/testing/radio-harness.spec.ts
index 929a1f5b8537..fc40a9e0cdb0 100644
--- a/src/material/radio/testing/radio-harness.spec.ts
+++ b/src/material/radio/testing/radio-harness.spec.ts
@@ -3,7 +3,7 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {ReactiveFormsModule} from '@angular/forms';
-import {MatRadioModule} from '@angular/material/radio';
+import {MatRadioModule} from '../module';
 import {MatRadioButtonHarness, MatRadioGroupHarness} from './radio-harness';
 
 describe('radio harness', () => {
diff --git a/src/material/select/module.ts b/src/material/select/module.ts
index 2bc3d42ebabe..73719296f87e 100644
--- a/src/material/select/module.ts
+++ b/src/material/select/module.ts
@@ -8,8 +8,8 @@
 
 import {OverlayModule} from '@angular/cdk/overlay';
 import {NgModule} from '@angular/core';
-import {MatCommonModule, MatOptionModule} from '@angular/material/core';
-import {MatFormFieldModule} from '@angular/material/form-field';
+import {MatCommonModule, MatOptionModule} from '../core';
+import {MatFormFieldModule} from '../form-field';
 import {CdkScrollableModule} from '@angular/cdk/scrolling';
 import {MatSelect, MatSelectTrigger, MAT_SELECT_SCROLL_STRATEGY_PROVIDER} from './select';
 
diff --git a/src/material/select/public-api.ts b/src/material/select/public-api.ts
index 5e7a1e9b24fc..e3ab73617e26 100644
--- a/src/material/select/public-api.ts
+++ b/src/material/select/public-api.ts
@@ -12,12 +12,5 @@ export * from './select-animations';
 
 // Re-export these since they're required to be used together with `mat-select`.
 // Also they used to be provided implicitly with `MatSelectModule`.
-export {MatOption, MatOptgroup} from '@angular/material/core';
-export {
-  MatFormField,
-  MatLabel,
-  MatHint,
-  MatError,
-  MatPrefix,
-  MatSuffix,
-} from '@angular/material/form-field';
+export {MatOption, MatOptgroup} from '../core';
+export {MatFormField, MatLabel, MatHint, MatError, MatPrefix, MatSuffix} from '../form-field';
diff --git a/src/material/select/select.spec.ts b/src/material/select/select.spec.ts
index 878a64e61c10..bf7965388cba 100644
--- a/src/material/select/select.spec.ts
+++ b/src/material/select/select.spec.ts
@@ -56,13 +56,9 @@ import {
   ReactiveFormsModule,
   Validators,
 } from '@angular/forms';
-import {ErrorStateMatcher, MatOption, MatOptionSelectionChange} from '@angular/material/core';
-import {
-  FloatLabelType,
-  MAT_FORM_FIELD_DEFAULT_OPTIONS,
-  MatFormFieldModule,
-} from '@angular/material/form-field';
-import {MAT_SELECT_CONFIG, MatSelectConfig} from '@angular/material/select';
+import {ErrorStateMatcher, MatOption, MatOptionSelectionChange} from '../core';
+import {FloatLabelType, MAT_FORM_FIELD_DEFAULT_OPTIONS, MatFormFieldModule} from '../form-field';
+import {MAT_SELECT_CONFIG, MatSelectConfig} from '../select';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {EMPTY, Observable, Subject, Subscription} from 'rxjs';
diff --git a/src/material/select/select.ts b/src/material/select/select.ts
index 8b851c65b372..9640ce37d5e1 100644
--- a/src/material/select/select.ts
+++ b/src/material/select/select.ts
@@ -80,8 +80,8 @@ import {
   MatOptgroup,
   MatOption,
   MatOptionSelectionChange,
-} from '@angular/material/core';
-import {MAT_FORM_FIELD, MatFormField, MatFormFieldControl} from '@angular/material/form-field';
+} from '../core';
+import {MAT_FORM_FIELD, MatFormField, MatFormFieldControl} from '../form-field';
 import {defer, merge, Observable, Subject} from 'rxjs';
 import {filter, map, startWith, switchMap, take, takeUntil} from 'rxjs/operators';
 import {
diff --git a/src/material/select/testing/BUILD.bazel b/src/material/select/testing/BUILD.bazel
index 5f9893096a5c..9d64a0aa81c4 100644
--- a/src/material/select/testing/BUILD.bazel
+++ b/src/material/select/testing/BUILD.bazel
@@ -29,6 +29,7 @@ ng_test_library(
         "//src/cdk/testing",
         "//src/cdk/testing/testbed",
         "//src/material/form-field",
+        "//src/material/form-field/testing/control",
         "//src/material/select",
         "@npm//@angular/forms",
         "@npm//@angular/platform-browser",
diff --git a/src/material/select/testing/select-harness.spec.ts b/src/material/select/testing/select-harness.spec.ts
index 01a48d30617d..8e3f7b1622b7 100644
--- a/src/material/select/testing/select-harness.spec.ts
+++ b/src/material/select/testing/select-harness.spec.ts
@@ -4,8 +4,8 @@ import {OverlayContainer} from '@angular/cdk/overlay';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {FormControl, ReactiveFormsModule, Validators} from '@angular/forms';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatSelectModule} from '@angular/material/select';
+import {MatFormFieldModule} from '../../form-field';
+import {MatSelectModule} from '../module';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatSelectHarness} from './select-harness';
 
diff --git a/src/material/select/testing/select-harness.ts b/src/material/select/testing/select-harness.ts
index 0755971ceccf..8c577d63cc99 100644
--- a/src/material/select/testing/select-harness.ts
+++ b/src/material/select/testing/select-harness.ts
@@ -12,8 +12,8 @@ import {
   MatOptgroupHarness,
   OptionHarnessFilters,
   OptgroupHarnessFilters,
-} from '@angular/material/core/testing';
-import {MatFormFieldControlHarness} from '@angular/material/form-field/testing/control';
+} from '../../core/testing';
+import {MatFormFieldControlHarness} from '../../form-field/testing/control';
 import {SelectHarnessFilters} from './select-harness-filters';
 
 /** Harness for interacting with a mat-select in tests. */
diff --git a/src/material/sidenav/sidenav-module.ts b/src/material/sidenav/sidenav-module.ts
index c12f61821837..75e523c8748f 100644
--- a/src/material/sidenav/sidenav-module.ts
+++ b/src/material/sidenav/sidenav-module.ts
@@ -7,7 +7,7 @@
  */
 import {CdkScrollableModule} from '@angular/cdk/scrolling';
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatDrawer, MatDrawerContainer, MatDrawerContent} from './drawer';
 import {MatSidenav, MatSidenavContainer, MatSidenavContent} from './sidenav';
 
diff --git a/src/material/sidenav/testing/sidenav-harness.spec.ts b/src/material/sidenav/testing/sidenav-harness.spec.ts
index 14d42b2761e5..f96ced26dba1 100644
--- a/src/material/sidenav/testing/sidenav-harness.spec.ts
+++ b/src/material/sidenav/testing/sidenav-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatSidenavModule} from '@angular/material/sidenav';
+import {MatSidenavModule} from '../../sidenav';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatDrawerContainerHarness} from './drawer-container-harness';
 import {MatDrawerContentHarness} from './drawer-content-harness';
diff --git a/src/material/slide-toggle/module.ts b/src/material/slide-toggle/module.ts
index 0e8bfd531f01..4ec05f3cde63 100644
--- a/src/material/slide-toggle/module.ts
+++ b/src/material/slide-toggle/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatSlideToggle} from './slide-toggle';
 
 @NgModule({
diff --git a/src/material/slide-toggle/slide-toggle-config.ts b/src/material/slide-toggle/slide-toggle-config.ts
index 44e3007fcc51..f8b21b1bd1db 100644
--- a/src/material/slide-toggle/slide-toggle-config.ts
+++ b/src/material/slide-toggle/slide-toggle-config.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import {InjectionToken} from '@angular/core';
-import {ThemePalette} from '@angular/material/core';
+import {ThemePalette} from '../core';
 
 /** Default `mat-slide-toggle` options that can be overridden. */
 export interface MatSlideToggleDefaultOptions {
diff --git a/src/material/slide-toggle/slide-toggle.ts b/src/material/slide-toggle/slide-toggle.ts
index 6dd97599792a..b6ff2d5e7eac 100644
--- a/src/material/slide-toggle/slide-toggle.ts
+++ b/src/material/slide-toggle/slide-toggle.ts
@@ -40,7 +40,7 @@ import {
   MAT_SLIDE_TOGGLE_DEFAULT_OPTIONS,
   MatSlideToggleDefaultOptions,
 } from './slide-toggle-config';
-import {_MatInternalFormField, _StructuralStylesLoader, MatRipple} from '@angular/material/core';
+import {_MatInternalFormField, _StructuralStylesLoader, MatRipple} from '../core';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
 
 /** Change event object emitted by a slide toggle. */
diff --git a/src/material/slide-toggle/testing/slide-toggle-harness.spec.ts b/src/material/slide-toggle/testing/slide-toggle-harness.spec.ts
index aa2e6e64220d..ad637142587e 100644
--- a/src/material/slide-toggle/testing/slide-toggle-harness.spec.ts
+++ b/src/material/slide-toggle/testing/slide-toggle-harness.spec.ts
@@ -3,7 +3,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {FormControl, ReactiveFormsModule} from '@angular/forms';
-import {MatSlideToggleModule} from '@angular/material/slide-toggle';
+import {MatSlideToggleModule} from '../module';
 import {MatSlideToggleHarness} from './slide-toggle-harness';
 
 describe('MatSlideToggleHarness', () => {
diff --git a/src/material/slider/module.ts b/src/material/slider/module.ts
index e5c4bb16219f..877a6ed08a86 100644
--- a/src/material/slider/module.ts
+++ b/src/material/slider/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule, MatRippleModule} from '@angular/material/core';
+import {MatCommonModule, MatRippleModule} from '../core';
 import {MatSlider} from './slider';
 import {MatSliderVisualThumb} from './slider-thumb';
 import {MatSliderThumb, MatSliderRangeThumb} from './slider-input';
diff --git a/src/material/slider/slider-interface.ts b/src/material/slider/slider-interface.ts
index 9cf99d276c2f..f01668110868 100644
--- a/src/material/slider/slider-interface.ts
+++ b/src/material/slider/slider-interface.ts
@@ -7,7 +7,7 @@
  */
 
 import {InjectionToken, ChangeDetectorRef, WritableSignal} from '@angular/core';
-import {MatRipple, RippleGlobalOptions} from '@angular/material/core';
+import {MatRipple, RippleGlobalOptions} from '../core';
 
 /**
  * Thumb types: range slider has two thumbs (START, END) whereas single point
diff --git a/src/material/slider/slider-thumb.ts b/src/material/slider/slider-thumb.ts
index 6d54c0274d95..13f8ac1375fd 100644
--- a/src/material/slider/slider-thumb.ts
+++ b/src/material/slider/slider-thumb.ts
@@ -20,7 +20,7 @@ import {
   ViewEncapsulation,
   inject,
 } from '@angular/core';
-import {MatRipple, RippleAnimationConfig, RippleRef, RippleState} from '@angular/material/core';
+import {MatRipple, RippleAnimationConfig, RippleRef, RippleState} from '../core';
 import {
   _MatThumb,
   _MatSlider,
diff --git a/src/material/slider/slider.ts b/src/material/slider/slider.ts
index 5b23f8112494..a1c626fc784b 100644
--- a/src/material/slider/slider.ts
+++ b/src/material/slider/slider.ts
@@ -33,7 +33,7 @@ import {
   MAT_RIPPLE_GLOBAL_OPTIONS,
   RippleGlobalOptions,
   ThemePalette,
-} from '@angular/material/core';
+} from '../core';
 import {Subscription} from 'rxjs';
 import {
   _MatThumb,
diff --git a/src/material/slider/testing/slider-harness.spec.ts b/src/material/slider/testing/slider-harness.spec.ts
index 6a264b827b2f..227dc1c91665 100644
--- a/src/material/slider/testing/slider-harness.spec.ts
+++ b/src/material/slider/testing/slider-harness.spec.ts
@@ -10,7 +10,7 @@ import {Component, signal} from '@angular/core';
 import {ComponentFixture, fakeAsync, TestBed} from '@angular/core/testing';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatSliderModule} from '@angular/material/slider';
+import {MatSliderModule} from '../module';
 import {MatSliderHarness} from './slider-harness';
 import {MatSliderThumbHarness} from './slider-thumb-harness';
 import {ThumbPosition} from './slider-harness-filters';
diff --git a/src/material/snack-bar/module.ts b/src/material/snack-bar/module.ts
index 5231eba71944..7aeae8b4fbb6 100644
--- a/src/material/snack-bar/module.ts
+++ b/src/material/snack-bar/module.ts
@@ -9,8 +9,8 @@
 import {OverlayModule} from '@angular/cdk/overlay';
 import {PortalModule} from '@angular/cdk/portal';
 import {NgModule} from '@angular/core';
-import {MatButtonModule} from '@angular/material/button';
-import {MatCommonModule} from '@angular/material/core';
+import {MatButtonModule} from '../button';
+import {MatCommonModule} from '../core';
 
 import {SimpleSnackBar} from './simple-snack-bar';
 import {MatSnackBarContainer} from './snack-bar-container';
diff --git a/src/material/snack-bar/simple-snack-bar.ts b/src/material/snack-bar/simple-snack-bar.ts
index 765f9e1e276b..09070641000e 100644
--- a/src/material/snack-bar/simple-snack-bar.ts
+++ b/src/material/snack-bar/simple-snack-bar.ts
@@ -7,7 +7,7 @@
  */
 
 import {ChangeDetectionStrategy, Component, ViewEncapsulation, inject} from '@angular/core';
-import {MatButton} from '@angular/material/button';
+import {MatButton} from '../button';
 import {MatSnackBarRef} from './snack-bar-ref';
 import {MAT_SNACK_BAR_DATA} from './snack-bar-config';
 import {MatSnackBarAction, MatSnackBarActions, MatSnackBarLabel} from './snack-bar-content';
diff --git a/src/material/snack-bar/snack-bar.md b/src/material/snack-bar/snack-bar.md
index dc52bae46070..58b50ede7b42 100644
--- a/src/material/snack-bar/snack-bar.md
+++ b/src/material/snack-bar/snack-bar.md
@@ -62,7 +62,7 @@ To access the data in your component, you have to use the `MAT_SNACK_BAR_DATA` i
 
 ```ts
 import {Component, Inject} from '@angular/core';
-import {MAT_SNACK_BAR_DATA} from '@angular/material/snack-bar';
+import {MAT_SNACK_BAR_DATA} from '../snack-bar';
 
 @Component({
   selector: 'your-snackbar',
diff --git a/src/material/snack-bar/testing/snack-bar-harness.spec.ts b/src/material/snack-bar/testing/snack-bar-harness.spec.ts
index e876df34dcc6..379eb6c3bd9e 100644
--- a/src/material/snack-bar/testing/snack-bar-harness.spec.ts
+++ b/src/material/snack-bar/testing/snack-bar-harness.spec.ts
@@ -8,7 +8,7 @@ import {
   MatSnackBarActions,
   MatSnackBarConfig,
   MatSnackBarLabel,
-} from '@angular/material/snack-bar';
+} from '../../snack-bar';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatSnackBarHarness} from './snack-bar-harness';
 
diff --git a/src/material/sort/sort-header.ts b/src/material/sort/sort-header.ts
index eb491103a950..f8ca0b57276c 100644
--- a/src/material/sort/sort-header.ts
+++ b/src/material/sort/sort-header.ts
@@ -35,7 +35,7 @@ import {SortDirection} from './sort-direction';
 import {getSortHeaderNotContainedWithinSortError} from './sort-errors';
 import {MatSortHeaderIntl} from './sort-header-intl';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
-import {_StructuralStylesLoader} from '@angular/material/core';
+import {_StructuralStylesLoader} from '../core';
 
 /**
  * Valid positions for the arrow to be in for its opacity and translation. If the state is a
diff --git a/src/material/sort/sort-module.ts b/src/material/sort/sort-module.ts
index 544e311db638..2a5cbd6dc036 100644
--- a/src/material/sort/sort-module.ts
+++ b/src/material/sort/sort-module.ts
@@ -10,7 +10,7 @@ import {NgModule} from '@angular/core';
 import {MatSortHeader} from './sort-header';
 import {MatSort} from './sort';
 import {MAT_SORT_HEADER_INTL_PROVIDER} from './sort-header-intl';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 
 @NgModule({
   imports: [MatCommonModule, MatSort, MatSortHeader],
diff --git a/src/material/sort/sort.spec.ts b/src/material/sort/sort.spec.ts
index 55d21297694e..9828dc91d324 100644
--- a/src/material/sort/sort.spec.ts
+++ b/src/material/sort/sort.spec.ts
@@ -3,7 +3,7 @@ import {CdkTableModule} from '@angular/cdk/table';
 import {dispatchMouseEvent, wrappedErrorMessage} from '@angular/cdk/testing/private';
 import {Component, ElementRef, ViewChild, inject} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, tick, waitForAsync} from '@angular/core/testing';
-import {MatTableModule} from '@angular/material/table';
+import {MatTableModule} from '../table';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Observable} from 'rxjs';
diff --git a/src/material/sort/testing/sort-harness-filters.ts b/src/material/sort/testing/sort-harness-filters.ts
index 3c123584ad24..6cef060a0875 100644
--- a/src/material/sort/testing/sort-harness-filters.ts
+++ b/src/material/sort/testing/sort-harness-filters.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 import {BaseHarnessFilters} from '@angular/cdk/testing';
-import {SortDirection} from '@angular/material/sort';
+import {SortDirection} from '../../sort';
 
 export interface SortHarnessFilters extends BaseHarnessFilters {}
 
diff --git a/src/material/sort/testing/sort-harness.spec.ts b/src/material/sort/testing/sort-harness.spec.ts
index b5afa713b56c..057c2716a2e0 100644
--- a/src/material/sort/testing/sort-harness.spec.ts
+++ b/src/material/sort/testing/sort-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatSortModule, Sort} from '@angular/material/sort';
+import {MatSortModule, Sort} from '../../sort';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatSortHarness} from './sort-harness';
 
diff --git a/src/material/sort/testing/sort-header-harness.ts b/src/material/sort/testing/sort-header-harness.ts
index dce791595a10..e28171028565 100644
--- a/src/material/sort/testing/sort-header-harness.ts
+++ b/src/material/sort/testing/sort-header-harness.ts
@@ -7,7 +7,7 @@
  */
 
 import {ComponentHarness, HarnessPredicate} from '@angular/cdk/testing';
-import {SortDirection} from '@angular/material/sort';
+import {SortDirection} from '../../sort';
 import {SortHeaderHarnessFilters} from './sort-harness-filters';
 
 /** Harness for interacting with a standard Angular Material sort header in tests. */
diff --git a/src/material/stepper/step-header.ts b/src/material/stepper/step-header.ts
index 19efe841a043..c6f1815e0b5e 100644
--- a/src/material/stepper/step-header.ts
+++ b/src/material/stepper/step-header.ts
@@ -23,8 +23,8 @@ import {MatStepLabel} from './step-label';
 import {MatStepperIntl} from './stepper-intl';
 import {MatStepperIconContext} from './stepper-icon';
 import {CdkStepHeader, StepState} from '@angular/cdk/stepper';
-import {_StructuralStylesLoader, MatRipple, ThemePalette} from '@angular/material/core';
-import {MatIcon} from '@angular/material/icon';
+import {_StructuralStylesLoader, MatRipple, ThemePalette} from '../core';
+import {MatIcon} from '../icon';
 import {NgTemplateOutlet} from '@angular/common';
 import {_CdkPrivateStyleLoader, _VisuallyHiddenLoader} from '@angular/cdk/private';
 
diff --git a/src/material/stepper/stepper-module.ts b/src/material/stepper/stepper-module.ts
index 8b6c63fbb46e..5ce882afc479 100644
--- a/src/material/stepper/stepper-module.ts
+++ b/src/material/stepper/stepper-module.ts
@@ -9,8 +9,8 @@
 import {PortalModule} from '@angular/cdk/portal';
 import {CdkStepperModule} from '@angular/cdk/stepper';
 import {NgModule} from '@angular/core';
-import {ErrorStateMatcher, MatCommonModule, MatRippleModule} from '@angular/material/core';
-import {MatIconModule} from '@angular/material/icon';
+import {ErrorStateMatcher, MatCommonModule, MatRippleModule} from '../core';
+import {MatIconModule} from '../icon';
 import {MatStepHeader} from './step-header';
 import {MatStepLabel} from './step-label';
 import {MatStep, MatStepper} from './stepper';
diff --git a/src/material/stepper/stepper.spec.ts b/src/material/stepper/stepper.spec.ts
index cb4059ae8bec..a750bb709b3a 100644
--- a/src/material/stepper/stepper.spec.ts
+++ b/src/material/stepper/stepper.spec.ts
@@ -45,9 +45,9 @@ import {
   ValidationErrors,
   Validators,
 } from '@angular/forms';
-import {MatRipple, ThemePalette} from '@angular/material/core';
-import {MatFormFieldModule} from '@angular/material/form-field';
-import {MatInputModule} from '@angular/material/input';
+import {MatRipple, ThemePalette} from '../core';
+import {MatFormFieldModule} from '../form-field';
+import {MatInputModule} from '../input';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Observable, Subject, merge} from 'rxjs';
diff --git a/src/material/stepper/stepper.ts b/src/material/stepper/stepper.ts
index a320d3a2ad86..29bbb4dd86c5 100644
--- a/src/material/stepper/stepper.ts
+++ b/src/material/stepper/stepper.ts
@@ -32,7 +32,7 @@ import {
 } from '@angular/core';
 import {NgTemplateOutlet} from '@angular/common';
 import {AbstractControl, FormGroupDirective, NgForm} from '@angular/forms';
-import {ErrorStateMatcher, ThemePalette} from '@angular/material/core';
+import {ErrorStateMatcher, ThemePalette} from '../core';
 import {Platform} from '@angular/cdk/platform';
 import {CdkPortalOutlet, TemplatePortal} from '@angular/cdk/portal';
 import {Subscription} from 'rxjs';
diff --git a/src/material/stepper/testing/stepper-harness.spec.ts b/src/material/stepper/testing/stepper-harness.spec.ts
index 3755becf1e5e..0627dcd39abb 100644
--- a/src/material/stepper/testing/stepper-harness.spec.ts
+++ b/src/material/stepper/testing/stepper-harness.spec.ts
@@ -3,7 +3,7 @@ import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {ReactiveFormsModule, FormGroup, FormControl, Validators} from '@angular/forms';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatStepperModule} from '@angular/material/stepper';
+import {MatStepperModule} from '../../stepper';
 import {STEPPER_GLOBAL_OPTIONS} from '@angular/cdk/stepper';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatStepperHarness} from './stepper-harness';
diff --git a/src/material/table/module.ts b/src/material/table/module.ts
index 3a82dc3ea356..a1d23fc2e817 100644
--- a/src/material/table/module.ts
+++ b/src/material/table/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatRecycleRows, MatTable} from './table';
 import {CdkTableModule} from '@angular/cdk/table';
 import {
diff --git a/src/material/table/table-data-source.ts b/src/material/table/table-data-source.ts
index a5bcb8fc81b6..c19e8e1e921a 100644
--- a/src/material/table/table-data-source.ts
+++ b/src/material/table/table-data-source.ts
@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import {MatPaginator, PageEvent} from '@angular/material/paginator';
+import {MatPaginator, PageEvent} from '../paginator';
 import {
   BehaviorSubject,
   combineLatest,
@@ -17,7 +17,7 @@ import {
   Subscription,
 } from 'rxjs';
 import {DataSource} from '@angular/cdk/collections';
-import {MatSort, Sort} from '@angular/material/sort';
+import {MatSort, Sort} from '../sort';
 import {_isNumberValue} from '@angular/cdk/coercion';
 import {map} from 'rxjs/operators';
 
diff --git a/src/material/table/table.spec.ts b/src/material/table/table.spec.ts
index 2dbc82426740..6dfee1ccceb8 100644
--- a/src/material/table/table.spec.ts
+++ b/src/material/table/table.spec.ts
@@ -10,8 +10,8 @@ import {
 import {MatTable, MatTableDataSource, MatTableModule} from './index';
 import {DataSource} from '@angular/cdk/table';
 import {BehaviorSubject, Observable} from 'rxjs';
-import {MatSort, MatSortHeader, MatSortModule} from '@angular/material/sort';
-import {MatPaginator, MatPaginatorModule} from '@angular/material/paginator';
+import {MatSort, MatSortHeader, MatSortModule} from '../sort';
+import {MatPaginator, MatPaginatorModule} from '../paginator';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 
 describe('MatTable', () => {
diff --git a/src/material/tabs/module.ts b/src/material/tabs/module.ts
index f67f5bc232d8..242643b5de62 100644
--- a/src/material/tabs/module.ts
+++ b/src/material/tabs/module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatTabContent} from './tab-content';
 import {MatTabLabel} from './tab-label';
 import {MatTab} from './tab';
diff --git a/src/material/tabs/tab-body.spec.ts b/src/material/tabs/tab-body.spec.ts
index 1f418618af67..8cf271e1665c 100644
--- a/src/material/tabs/tab-body.spec.ts
+++ b/src/material/tabs/tab-body.spec.ts
@@ -11,7 +11,7 @@ import {
   signal,
 } from '@angular/core';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
-import {MatRippleModule} from '@angular/material/core';
+import {MatRippleModule} from '../core';
 import {By} from '@angular/platform-browser';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {Subject} from 'rxjs';
diff --git a/src/material/tabs/tab-group.ts b/src/material/tabs/tab-group.ts
index 9a928f78a85d..e40ac05a9cd1 100644
--- a/src/material/tabs/tab-group.ts
+++ b/src/material/tabs/tab-group.ts
@@ -31,7 +31,7 @@ import {
 } from '@angular/core';
 import {MAT_TAB_GROUP, MatTab} from './tab';
 import {MatTabHeader} from './tab-header';
-import {ThemePalette, MatRipple} from '@angular/material/core';
+import {ThemePalette, MatRipple} from '../core';
 import {merge, Subscription} from 'rxjs';
 import {MAT_TABS_CONFIG, MatTabsConfig} from './tab-config';
 import {startWith} from 'rxjs/operators';
diff --git a/src/material/tabs/tab-header.spec.ts b/src/material/tabs/tab-header.spec.ts
index 2e56a2f211f6..06705a3c6711 100644
--- a/src/material/tabs/tab-header.spec.ts
+++ b/src/material/tabs/tab-header.spec.ts
@@ -22,7 +22,7 @@ import {
   tick,
   waitForAsync,
 } from '@angular/core/testing';
-import {MatRippleModule} from '@angular/material/core';
+import {MatRippleModule} from '../core';
 import {By} from '@angular/platform-browser';
 import {Subject} from 'rxjs';
 import {MatTabHeader} from './tab-header';
diff --git a/src/material/tabs/tab-header.ts b/src/material/tabs/tab-header.ts
index 4baa27c58463..f1cdd8b8d17d 100644
--- a/src/material/tabs/tab-header.ts
+++ b/src/material/tabs/tab-header.ts
@@ -25,7 +25,7 @@ import {MatTabLabelWrapper} from './tab-label-wrapper';
 import {MatInkBar} from './ink-bar';
 import {MatPaginatedTabHeader} from './paginated-tab-header';
 import {CdkObserveContent} from '@angular/cdk/observers';
-import {MatRipple} from '@angular/material/core';
+import {MatRipple} from '../core';
 
 /**
  * The header of the tab group which displays a list of all the tabs in the tab group. Includes
diff --git a/src/material/tabs/tab-nav-bar/tab-nav-bar.spec.ts b/src/material/tabs/tab-nav-bar/tab-nav-bar.spec.ts
index d640cfd62abf..d23b685fcfac 100644
--- a/src/material/tabs/tab-nav-bar/tab-nav-bar.spec.ts
+++ b/src/material/tabs/tab-nav-bar/tab-nav-bar.spec.ts
@@ -8,7 +8,7 @@ import {
 } from '@angular/cdk/testing/private';
 import {Component, QueryList, ViewChild, ViewChildren} from '@angular/core';
 import {ComponentFixture, TestBed, fakeAsync, tick, waitForAsync} from '@angular/core/testing';
-import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '@angular/material/core';
+import {MAT_RIPPLE_GLOBAL_OPTIONS, RippleGlobalOptions} from '../../core';
 import {By} from '@angular/platform-browser';
 import {Subject} from 'rxjs';
 import {MAT_TABS_CONFIG} from '../index';
diff --git a/src/material/tabs/tab-nav-bar/tab-nav-bar.ts b/src/material/tabs/tab-nav-bar/tab-nav-bar.ts
index 3428d3721737..a96f0079510e 100644
--- a/src/material/tabs/tab-nav-bar/tab-nav-bar.ts
+++ b/src/material/tabs/tab-nav-bar/tab-nav-bar.ts
@@ -34,7 +34,7 @@ import {
   RippleTarget,
   ThemePalette,
   _StructuralStylesLoader,
-} from '@angular/material/core';
+} from '../../core';
 import {_IdGenerator, FocusableOption, FocusMonitor} from '@angular/cdk/a11y';
 import {Directionality} from '@angular/cdk/bidi';
 import {ViewportRuler} from '@angular/cdk/scrolling';
diff --git a/src/material/tabs/tab.ts b/src/material/tabs/tab.ts
index e532e68a6ab1..2bdd4d413dca 100644
--- a/src/material/tabs/tab.ts
+++ b/src/material/tabs/tab.ts
@@ -28,7 +28,7 @@ import {MAT_TAB, MatTabLabel} from './tab-label';
 import {TemplatePortal} from '@angular/cdk/portal';
 import {Subject} from 'rxjs';
 import {_CdkPrivateStyleLoader} from '@angular/cdk/private';
-import {_StructuralStylesLoader} from '@angular/material/core';
+import {_StructuralStylesLoader} from '../core';
 
 /**
  * Used to provide a tab group to a tab without causing a circular dependency.
diff --git a/src/material/tabs/testing/tab-group-harness.spec.ts b/src/material/tabs/testing/tab-group-harness.spec.ts
index 1bb0abfc32f1..5a55e068aaad 100644
--- a/src/material/tabs/testing/tab-group-harness.spec.ts
+++ b/src/material/tabs/testing/tab-group-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {ComponentHarness, HarnessLoader, parallel} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatTabsModule} from '@angular/material/tabs';
+import {MatTabsModule} from '../module';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatTabGroupHarness} from './tab-group-harness';
 import {MatTabHarness} from './tab-harness';
diff --git a/src/material/tabs/testing/tab-nav-bar-harness.spec.ts b/src/material/tabs/testing/tab-nav-bar-harness.spec.ts
index 510abdb65c4d..e55eec2b2eec 100644
--- a/src/material/tabs/testing/tab-nav-bar-harness.spec.ts
+++ b/src/material/tabs/testing/tab-nav-bar-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatTabsModule} from '@angular/material/tabs';
+import {MatTabsModule} from '../module';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatTabNavBarHarness} from './tab-nav-bar-harness';
 
diff --git a/src/material/timepicker/testing/timepicker-harness.spec.ts b/src/material/timepicker/testing/timepicker-harness.spec.ts
index 838dba190b21..70b5674d7c60 100644
--- a/src/material/timepicker/testing/timepicker-harness.spec.ts
+++ b/src/material/timepicker/testing/timepicker-harness.spec.ts
@@ -1,10 +1,10 @@
 import {Component, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader, parallel} from '@angular/cdk/testing';
-import {DateAdapter, provideNativeDateAdapter} from '@angular/material/core';
+import {DateAdapter, provideNativeDateAdapter} from '../../core';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MatTimepicker, MatTimepickerInput} from '@angular/material/timepicker';
+import {MatTimepicker, MatTimepickerInput} from '../../timepicker';
 import {MatTimepickerHarness} from './timepicker-harness';
 import {MatTimepickerInputHarness} from './timepicker-input-harness';
 
diff --git a/src/material/timepicker/testing/timepicker-harness.ts b/src/material/timepicker/testing/timepicker-harness.ts
index 06de38c22075..f682d40455c1 100644
--- a/src/material/timepicker/testing/timepicker-harness.ts
+++ b/src/material/timepicker/testing/timepicker-harness.ts
@@ -11,7 +11,7 @@ import {
   ComponentHarnessConstructor,
   HarnessPredicate,
 } from '@angular/cdk/testing';
-import {MatOptionHarness, OptionHarnessFilters} from '@angular/material/core/testing';
+import {MatOptionHarness, OptionHarnessFilters} from '../../core/testing';
 import {TimepickerHarnessFilters} from './timepicker-harness-filters';
 
 export class MatTimepickerHarness extends ComponentHarness {
diff --git a/src/material/timepicker/testing/timepicker-input-harness.spec.ts b/src/material/timepicker/testing/timepicker-input-harness.spec.ts
index 90c14aaeaabc..1d3c6c6d4483 100644
--- a/src/material/timepicker/testing/timepicker-input-harness.spec.ts
+++ b/src/material/timepicker/testing/timepicker-input-harness.spec.ts
@@ -3,8 +3,8 @@ import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {Component, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {DateAdapter, provideNativeDateAdapter} from '@angular/material/core';
-import {MatTimepicker, MatTimepickerInput} from '@angular/material/timepicker';
+import {DateAdapter, provideNativeDateAdapter} from '../../core';
+import {MatTimepicker, MatTimepickerInput} from '../../timepicker';
 import {MatTimepickerHarness} from './timepicker-harness';
 import {MatTimepickerInputHarness} from './timepicker-input-harness';
 
diff --git a/src/material/timepicker/testing/timepicker-toggle-harness.spec.ts b/src/material/timepicker/testing/timepicker-toggle-harness.spec.ts
index c1e48bbb0898..310f87a10184 100644
--- a/src/material/timepicker/testing/timepicker-toggle-harness.spec.ts
+++ b/src/material/timepicker/testing/timepicker-toggle-harness.spec.ts
@@ -1,10 +1,10 @@
 import {Component, signal} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
-import {DateAdapter, provideNativeDateAdapter} from '@angular/material/core';
+import {DateAdapter, provideNativeDateAdapter} from '../../core';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {MatTimepicker, MatTimepickerInput, MatTimepickerToggle} from '@angular/material/timepicker';
+import {MatTimepicker, MatTimepickerInput, MatTimepickerToggle} from '../../timepicker';
 import {MatTimepickerToggleHarness} from './timepicker-toggle-harness';
 
 describe('MatTimepickerToggleHarness', () => {
diff --git a/src/material/timepicker/timepicker-input.ts b/src/material/timepicker/timepicker-input.ts
index 6d090a2ad01f..8bb06ea23a07 100644
--- a/src/material/timepicker/timepicker-input.ts
+++ b/src/material/timepicker/timepicker-input.ts
@@ -24,7 +24,7 @@ import {
   Signal,
   signal,
 } from '@angular/core';
-import {DateAdapter, MAT_DATE_FORMATS} from '@angular/material/core';
+import {DateAdapter, MAT_DATE_FORMATS} from '../core';
 import {
   AbstractControl,
   ControlValueAccessor,
@@ -35,9 +35,9 @@ import {
   ValidatorFn,
   Validators,
 } from '@angular/forms';
-import {MAT_FORM_FIELD} from '@angular/material/form-field';
+import {MAT_FORM_FIELD} from '../form-field';
 import {MatTimepicker} from './timepicker';
-import {MAT_INPUT_VALUE_ACCESSOR} from '@angular/material/input';
+import {MAT_INPUT_VALUE_ACCESSOR} from '../input';
 import {Subscription} from 'rxjs';
 import {DOWN_ARROW, ESCAPE, hasModifierKey, UP_ARROW} from '@angular/cdk/keycodes';
 import {validateAdapter} from './util';
diff --git a/src/material/timepicker/timepicker-toggle.ts b/src/material/timepicker/timepicker-toggle.ts
index 1bf7a67fcdad..bd2bbcbd1cc1 100644
--- a/src/material/timepicker/timepicker-toggle.ts
+++ b/src/material/timepicker/timepicker-toggle.ts
@@ -18,7 +18,7 @@ import {
   InputSignalWithTransform,
   ViewEncapsulation,
 } from '@angular/core';
-import {MatIconButton} from '@angular/material/button';
+import {MatIconButton} from '../button';
 import {MAT_TIMEPICKER_CONFIG} from './util';
 import type {MatTimepicker} from './timepicker';
 
diff --git a/src/material/timepicker/timepicker.md b/src/material/timepicker/timepicker.md
index 820e5aff6722..1240110c7c78 100644
--- a/src/material/timepicker/timepicker.md
+++ b/src/material/timepicker/timepicker.md
@@ -81,7 +81,7 @@ Furthermore, the default interval can be controlled for the entire application u
 default all timepickers to a 90 minute interval:
 
 ```ts
-import {MAT_TIMEPICKER_CONFIG} from '@angular/material/timepicker';
+import {MAT_TIMEPICKER_CONFIG} from '../timepicker';
 
 {
   provide: MAT_TIMEPICKER_CONFIG,
diff --git a/src/material/timepicker/timepicker.spec.ts b/src/material/timepicker/timepicker.spec.ts
index 9182f2efed11..d147c6f6c58c 100644
--- a/src/material/timepicker/timepicker.spec.ts
+++ b/src/material/timepicker/timepicker.spec.ts
@@ -1,7 +1,7 @@
 import {Component, inject, Provider, signal, ViewChild} from '@angular/core';
 import {ComponentFixture, fakeAsync, flush, TestBed} from '@angular/core/testing';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {DateAdapter, provideNativeDateAdapter} from '@angular/material/core';
+import {DateAdapter, provideNativeDateAdapter} from '../core';
 import {
   clearElement,
   dispatchFakeEvent,
@@ -21,8 +21,8 @@ import {
   TAB,
   UP_ARROW,
 } from '@angular/cdk/keycodes';
-import {MatInput} from '@angular/material/input';
-import {MatFormField, MatLabel, MatSuffix} from '@angular/material/form-field';
+import {MatInput} from '../input';
+import {MatFormField, MatLabel, MatSuffix} from '../form-field';
 import {MatTimepickerInput} from './timepicker-input';
 import {MAT_TIMEPICKER_SCROLL_STRATEGY, MatTimepicker} from './timepicker';
 import {MatTimepickerToggle} from './timepicker-toggle';
diff --git a/src/material/timepicker/timepicker.ts b/src/material/timepicker/timepicker.ts
index 76a0a3b45843..77d7c92aaf63 100644
--- a/src/material/timepicker/timepicker.ts
+++ b/src/material/timepicker/timepicker.ts
@@ -40,7 +40,7 @@ import {
   MAT_OPTION_PARENT_COMPONENT,
   MatOption,
   MatOptionParentComponent,
-} from '@angular/material/core';
+} from '../core';
 import {Directionality} from '@angular/cdk/bidi';
 import {Overlay, OverlayRef, ScrollStrategy} from '@angular/cdk/overlay';
 import {TemplatePortal} from '@angular/cdk/portal';
diff --git a/src/material/timepicker/util.spec.ts b/src/material/timepicker/util.spec.ts
index 20a2cc8e4390..f3225eace971 100644
--- a/src/material/timepicker/util.spec.ts
+++ b/src/material/timepicker/util.spec.ts
@@ -1,10 +1,5 @@
 import {TestBed} from '@angular/core/testing';
-import {
-  DateAdapter,
-  MAT_DATE_FORMATS,
-  MatDateFormats,
-  provideNativeDateAdapter,
-} from '@angular/material/core';
+import {DateAdapter, MAT_DATE_FORMATS, MatDateFormats, provideNativeDateAdapter} from '../core';
 import {generateOptions, parseInterval} from './util';
 
 describe('timepicker utilities', () => {
diff --git a/src/material/timepicker/util.ts b/src/material/timepicker/util.ts
index 1a7b0ddc8f7d..f8dfa4c94e61 100644
--- a/src/material/timepicker/util.ts
+++ b/src/material/timepicker/util.ts
@@ -7,7 +7,7 @@
  */
 
 import {InjectionToken} from '@angular/core';
-import {DateAdapter, MatDateFormats} from '@angular/material/core';
+import {DateAdapter, MatDateFormats} from '../core';
 
 /** Pattern that interval strings have to match. */
 const INTERVAL_PATTERN = /^(\d*\.?\d+)\s*(h|hour|hours|m|min|minute|minutes|s|second|seconds)?$/i;
diff --git a/src/material/toolbar/testing/toolbar-harness.spec.ts b/src/material/toolbar/testing/toolbar-harness.spec.ts
index 81315d1984db..5b64239630e6 100644
--- a/src/material/toolbar/testing/toolbar-harness.spec.ts
+++ b/src/material/toolbar/testing/toolbar-harness.spec.ts
@@ -1,7 +1,7 @@
 import {Component} from '@angular/core';
 import {ComponentHarness, HarnessLoader} from '@angular/cdk/testing';
-import {MatToolbarModule} from '@angular/material/toolbar';
-import {MatToolbarHarness, MatToolbarSection} from '@angular/material/toolbar/testing';
+import {MatToolbarModule} from '../../toolbar';
+import {MatToolbarHarness, MatToolbarSection} from './toolbar-harness';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 
diff --git a/src/material/toolbar/toolbar-module.ts b/src/material/toolbar/toolbar-module.ts
index bc72a3039e3e..6d5de647ea06 100644
--- a/src/material/toolbar/toolbar-module.ts
+++ b/src/material/toolbar/toolbar-module.ts
@@ -7,7 +7,7 @@
  */
 
 import {NgModule} from '@angular/core';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatToolbar, MatToolbarRow} from './toolbar';
 
 @NgModule({
diff --git a/src/material/tooltip/module.ts b/src/material/tooltip/module.ts
index 97e26a05f7f8..6ac91476bea1 100644
--- a/src/material/tooltip/module.ts
+++ b/src/material/tooltip/module.ts
@@ -10,7 +10,7 @@ import {NgModule} from '@angular/core';
 import {A11yModule} from '@angular/cdk/a11y';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {CdkScrollableModule} from '@angular/cdk/scrolling';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {
   MatTooltip,
   TooltipComponent,
diff --git a/src/material/tooltip/testing/tooltip-harness.spec.ts b/src/material/tooltip/testing/tooltip-harness.spec.ts
index 538433b8090a..c4334ea9eab3 100644
--- a/src/material/tooltip/testing/tooltip-harness.spec.ts
+++ b/src/material/tooltip/testing/tooltip-harness.spec.ts
@@ -2,7 +2,7 @@ import {Component, provideZoneChangeDetection} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
-import {MatTooltipModule} from '@angular/material/tooltip';
+import {MatTooltipModule} from '../module';
 import {NoopAnimationsModule} from '@angular/platform-browser/animations';
 import {MatTooltipHarness} from './tooltip-harness';
 
diff --git a/src/material/tree/testing/tree-harness.spec.ts b/src/material/tree/testing/tree-harness.spec.ts
index 222ab037abaa..85bf47115134 100644
--- a/src/material/tree/testing/tree-harness.spec.ts
+++ b/src/material/tree/testing/tree-harness.spec.ts
@@ -6,7 +6,7 @@ import {
   MatTreeFlattener,
   MatTreeModule,
   MatTreeNestedDataSource,
-} from '@angular/material/tree';
+} from '../../tree';
 import {HarnessLoader} from '@angular/cdk/testing';
 import {TestbedHarnessEnvironment} from '@angular/cdk/testing/testbed';
 import {MatTreeHarness} from './tree-harness';
diff --git a/src/material/tree/tree-module.ts b/src/material/tree/tree-module.ts
index 766f274354c9..25e44e31d387 100644
--- a/src/material/tree/tree-module.ts
+++ b/src/material/tree/tree-module.ts
@@ -9,7 +9,7 @@
 import {NgModule} from '@angular/core';
 
 import {CdkTreeModule} from '@angular/cdk/tree';
-import {MatCommonModule} from '@angular/material/core';
+import {MatCommonModule} from '../core';
 import {MatNestedTreeNode, MatTreeNodeDef, MatTreeNode} from './node';
 import {MatTree} from './tree';
 import {MatTreeNodeToggle} from './toggle';
diff --git a/tools/public_api_guard/cdk/a11y.md b/tools/public_api_guard/cdk/a11y.md
index ce3629d5b870..153795268585 100644
--- a/tools/public_api_guard/cdk/a11y.md
+++ b/tools/public_api_guard/cdk/a11y.md
@@ -10,7 +10,6 @@ import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/cdk/observers';
 import { InjectionToken } from '@angular/core';
 import { Injector } from '@angular/core';
 import { NgZone } from '@angular/core';
diff --git a/tools/public_api_guard/cdk/accordion.md b/tools/public_api_guard/cdk/accordion.md
index 272ecd145787..2cb8fd3981c7 100644
--- a/tools/public_api_guard/cdk/accordion.md
+++ b/tools/public_api_guard/cdk/accordion.md
@@ -12,7 +12,6 @@ import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
 import { SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs';
-import { UniqueSelectionDispatcher } from '@angular/cdk/collections';
 
 // @public
 export const CDK_ACCORDION: InjectionToken<CdkAccordion>;
diff --git a/tools/public_api_guard/cdk/dialog.md b/tools/public_api_guard/cdk/dialog.md
index 30dc7104b9dc..a296d812d85a 100644
--- a/tools/public_api_guard/cdk/dialog.md
+++ b/tools/public_api_guard/cdk/dialog.md
@@ -4,34 +4,33 @@
 
 ```ts
 
-import { BasePortalOutlet } from '@angular/cdk/portal';
-import { CdkPortalOutlet } from '@angular/cdk/portal';
+import { AfterContentInit } from '@angular/core';
+import { AfterViewInit } from '@angular/core';
+import { BasePortalOutlet as BasePortalOutlet_2 } from '@angular/cdk/portal';
 import { ChangeDetectorRef } from '@angular/core';
-import { ComponentPortal } from '@angular/cdk/portal';
 import { ComponentRef } from '@angular/core';
-import { ComponentType } from '@angular/cdk/overlay';
-import { Direction } from '@angular/cdk/bidi';
-import { DomPortal } from '@angular/cdk/portal';
+import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { EmbeddedViewRef } from '@angular/core';
-import { FocusOrigin } from '@angular/cdk/a11y';
-import { FocusTrapFactory } from '@angular/cdk/a11y';
+import { EnvironmentInjector } from '@angular/core';
+import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/cdk/overlay';
-import * as i2 from '@angular/cdk/portal';
-import * as i3 from '@angular/cdk/a11y';
 import { InjectionToken } from '@angular/core';
 import { Injector } from '@angular/core';
+import { Location as Location_2 } from '@angular/common';
+import { NgIterable } from '@angular/core';
 import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
+import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
-import { OverlayRef } from '@angular/cdk/overlay';
-import { PositionStrategy } from '@angular/cdk/overlay';
-import { ScrollStrategy } from '@angular/cdk/overlay';
+import { OnInit } from '@angular/core';
+import { Renderer2 } from '@angular/core';
+import { SimpleChanges } from '@angular/core';
 import { StaticProvider } from '@angular/core';
 import { Subject } from 'rxjs';
-import { TemplatePortal } from '@angular/cdk/portal';
+import { Subscription } from 'rxjs';
 import { TemplateRef } from '@angular/core';
+import { TrackByFunction } from '@angular/core';
 import { Type } from '@angular/core';
 import { ViewContainerRef } from '@angular/core';
 
@@ -78,7 +77,7 @@ export class CdkDialogContainer<C extends DialogConfig = DialogConfig> extends B
 }
 
 // @public
-export const DEFAULT_DIALOG_CONFIG: InjectionToken<DialogConfig<unknown, unknown, BasePortalOutlet>>;
+export const DEFAULT_DIALOG_CONFIG: InjectionToken<DialogConfig<unknown, unknown, BasePortalOutlet_2>>;
 
 // @public (undocumented)
 export class Dialog implements OnDestroy {
@@ -155,7 +154,7 @@ export class DialogModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<DialogModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<DialogModule, never, [typeof i1.OverlayModule, typeof i2.PortalModule, typeof i3.A11yModule, typeof i4.CdkDialogContainer], [typeof i2.PortalModule, typeof i4.CdkDialogContainer]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<DialogModule, never, [typeof i1.OverlayModule, typeof i2.PortalModule, typeof i3_3.A11yModule, typeof i4_4.CdkDialogContainer], [typeof i2.PortalModule, typeof i4_4.CdkDialogContainer]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/cdk/drag-drop.md b/tools/public_api_guard/cdk/drag-drop.md
index 95b58933c86c..33321d5e370a 100644
--- a/tools/public_api_guard/cdk/drag-drop.md
+++ b/tools/public_api_guard/cdk/drag-drop.md
@@ -4,24 +4,26 @@
 
 ```ts
 
+import { AfterContentInit } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
-import { Direction } from '@angular/cdk/bidi';
+import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i7 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
+import { NgIterable } from '@angular/core';
 import { NgZone } from '@angular/core';
-import { NumberInput } from '@angular/cdk/coercion';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { Renderer2 } from '@angular/core';
 import { SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs';
+import { Subscription } from 'rxjs';
 import { TemplateRef } from '@angular/core';
+import { TrackByFunction } from '@angular/core';
 import { ViewContainerRef } from '@angular/core';
-import { ViewportRuler } from '@angular/cdk/scrolling';
 
 // @public
 export const CDK_DRAG_CONFIG: InjectionToken<DragDropConfig>;
diff --git a/tools/public_api_guard/cdk/listbox.md b/tools/public_api_guard/cdk/listbox.md
index ce5f10c3bf77..e168f829a7ed 100644
--- a/tools/public_api_guard/cdk/listbox.md
+++ b/tools/public_api_guard/cdk/listbox.md
@@ -4,17 +4,15 @@
 
 ```ts
 
-import { ActiveDescendantKeyManager } from '@angular/cdk/a11y';
 import { AfterContentInit } from '@angular/core';
 import { ChangeDetectorRef } from '@angular/core';
 import { ControlValueAccessor } from '@angular/forms';
-import { Highlightable } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import { ListKeyManagerOption } from '@angular/cdk/a11y';
+import { Injector } from '@angular/core';
 import { NgZone } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { QueryList } from '@angular/core';
-import { SelectionModel } from '@angular/cdk/collections';
+import { Signal } from '@angular/core';
 import { Subject } from 'rxjs';
 
 // @public (undocumented)
diff --git a/tools/public_api_guard/cdk/menu.md b/tools/public_api_guard/cdk/menu.md
index d51f531f304a..9e85050b6d8b 100644
--- a/tools/public_api_guard/cdk/menu.md
+++ b/tools/public_api_guard/cdk/menu.md
@@ -5,30 +5,32 @@
 ```ts
 
 import { AfterContentInit } from '@angular/core';
-import { ConnectedPosition } from '@angular/cdk/overlay';
-import { Directionality } from '@angular/cdk/bidi';
+import { ComponentRef } from '@angular/core';
+import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
+import { EmbeddedViewRef } from '@angular/core';
+import { EnvironmentInjector } from '@angular/core';
 import { EventEmitter } from '@angular/core';
-import { FocusableOption } from '@angular/cdk/a11y';
-import { FocusKeyManager } from '@angular/cdk/a11y';
-import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/cdk/overlay';
 import { InjectionToken } from '@angular/core';
 import { Injector } from '@angular/core';
+import { Location as Location_2 } from '@angular/common';
+import { NgIterable } from '@angular/core';
 import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { Optional } from '@angular/core';
-import { OverlayRef } from '@angular/cdk/overlay';
 import { QueryList } from '@angular/core';
 import { Renderer2 } from '@angular/core';
-import { ScrollStrategy } from '@angular/cdk/overlay';
+import { Signal } from '@angular/core';
 import { SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs';
-import { TemplatePortal } from '@angular/cdk/portal';
+import { Subscription } from 'rxjs';
 import { TemplateRef } from '@angular/core';
+import { TrackByFunction } from '@angular/core';
+import { Type } from '@angular/core';
 import { ViewContainerRef } from '@angular/core';
 
 // @public
@@ -200,7 +202,7 @@ export class CdkMenuModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<CdkMenuModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<CdkMenuModule, never, [typeof i1.OverlayModule, typeof i2.CdkMenuBar, typeof i3.CdkMenu, typeof i4.CdkMenuItem, typeof i5.CdkMenuItemRadio, typeof i6.CdkMenuItemCheckbox, typeof i7.CdkMenuTrigger, typeof i8.CdkMenuGroup, typeof i9.CdkContextMenuTrigger, typeof i10.CdkTargetMenuAim], [typeof i2.CdkMenuBar, typeof i3.CdkMenu, typeof i4.CdkMenuItem, typeof i5.CdkMenuItemRadio, typeof i6.CdkMenuItemCheckbox, typeof i7.CdkMenuTrigger, typeof i8.CdkMenuGroup, typeof i9.CdkContextMenuTrigger, typeof i10.CdkTargetMenuAim]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<CdkMenuModule, never, [typeof i1.OverlayModule, typeof i2_2.CdkMenuBar, typeof i3_3.CdkMenu, typeof i4_3.CdkMenuItem, typeof i5_2.CdkMenuItemRadio, typeof i6_2.CdkMenuItemCheckbox, typeof i7_2.CdkMenuTrigger, typeof i8.CdkMenuGroup, typeof i9.CdkContextMenuTrigger, typeof i10.CdkTargetMenuAim], [typeof i2_2.CdkMenuBar, typeof i3_3.CdkMenu, typeof i4_3.CdkMenuItem, typeof i5_2.CdkMenuItemRadio, typeof i6_2.CdkMenuItemCheckbox, typeof i7_2.CdkMenuTrigger, typeof i8.CdkMenuGroup, typeof i9.CdkContextMenuTrigger, typeof i10.CdkTargetMenuAim]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/cdk/observers.md b/tools/public_api_guard/cdk/observers.md
index f4c8684f1feb..135e16d23b0f 100644
--- a/tools/public_api_guard/cdk/observers.md
+++ b/tools/public_api_guard/cdk/observers.md
@@ -8,7 +8,6 @@ import { AfterContentInit } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import { NumberInput } from '@angular/cdk/coercion';
 import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
 
diff --git a/tools/public_api_guard/cdk/overlay.md b/tools/public_api_guard/cdk/overlay.md
index 7fc52a2baed2..7417e10dd94c 100644
--- a/tools/public_api_guard/cdk/overlay.md
+++ b/tools/public_api_guard/cdk/overlay.md
@@ -4,35 +4,31 @@
 
 ```ts
 
-import { _CdkPrivateStyleLoader } from '@angular/cdk/private';
-import { CdkScrollable } from '@angular/cdk/scrolling';
-import { ComponentPortal } from '@angular/cdk/portal';
+import { AfterContentInit } from '@angular/core';
 import { ComponentRef } from '@angular/core';
-import { ComponentType } from '@angular/cdk/portal';
-import { Direction } from '@angular/cdk/bidi';
-import { Directionality } from '@angular/cdk/bidi';
+import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { EmbeddedViewRef } from '@angular/core';
 import { EnvironmentInjector } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/cdk/bidi';
-import * as i2 from '@angular/cdk/portal';
-import * as i3 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
+import { Injector } from '@angular/core';
 import { Location as Location_2 } from '@angular/common';
+import { NgIterable } from '@angular/core';
 import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
-import { Platform } from '@angular/cdk/platform';
-import { PortalOutlet } from '@angular/cdk/portal';
+import { OnInit } from '@angular/core';
 import { Renderer2 } from '@angular/core';
-import { ScrollDispatcher } from '@angular/cdk/scrolling';
 import { SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs';
-import { TemplatePortal } from '@angular/cdk/portal';
-import { ViewportRuler } from '@angular/cdk/scrolling';
+import { Subscription } from 'rxjs';
+import { TemplateRef } from '@angular/core';
+import { TrackByFunction } from '@angular/core';
+import { Type } from '@angular/core';
+import { ViewContainerRef } from '@angular/core';
 
 // @public
 export class BlockScrollStrategy implements ScrollStrategy {
@@ -113,7 +109,34 @@ export class CdkOverlayOrigin {
     static ɵfac: i0.ɵɵFactoryDeclaration<CdkOverlayOrigin, never>;
 }
 
-export { CdkScrollable }
+// @public
+export class CdkScrollable implements OnInit, OnDestroy {
+    constructor(...args: unknown[]);
+    // (undocumented)
+    protected readonly _destroyed: Subject<void>;
+    // (undocumented)
+    protected dir?: Directionality | null | undefined;
+    // (undocumented)
+    protected elementRef: ElementRef<HTMLElement>;
+    elementScrolled(): Observable<Event>;
+    getElementRef(): ElementRef<HTMLElement>;
+    measureScrollOffset(from: 'top' | 'left' | 'right' | 'bottom' | 'start' | 'end'): number;
+    // (undocumented)
+    ngOnDestroy(): void;
+    // (undocumented)
+    ngOnInit(): void;
+    // (undocumented)
+    protected ngZone: NgZone;
+    // (undocumented)
+    protected scrollDispatcher: ScrollDispatcher;
+    // (undocumented)
+    protected _scrollElement: EventTarget;
+    scrollTo(options: ExtendedScrollToOptions): void;
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<CdkScrollable, "[cdk-scrollable], [cdkScrollable]", never, {}, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<CdkScrollable, never>;
+}
 
 // @public
 export class CloseScrollStrategy implements ScrollStrategy {
@@ -125,7 +148,11 @@ export class CloseScrollStrategy implements ScrollStrategy {
     enable(): void;
 }
 
-export { ComponentType }
+// @public
+export interface ComponentType<T> {
+    // (undocumented)
+    new (...args: any[]): T;
+}
 
 // @public
 export class ConnectedOverlayPositionChange {
@@ -333,7 +360,7 @@ export class OverlayModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<OverlayModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<OverlayModule, never, [typeof i1.BidiModule, typeof i2.PortalModule, typeof i3.ScrollingModule, typeof i4.CdkConnectedOverlay, typeof i4.CdkOverlayOrigin], [typeof i4.CdkConnectedOverlay, typeof i4.CdkOverlayOrigin, typeof i3.ScrollingModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<OverlayModule, never, [typeof i1.BidiModule, typeof i2.PortalModule, typeof i3.ScrollingModule, typeof i4_2.CdkConnectedOverlay, typeof i4_2.CdkOverlayOrigin], [typeof i4_2.CdkConnectedOverlay, typeof i4_2.CdkOverlayOrigin, typeof i3.ScrollingModule]>;
 }
 
 // @public
@@ -431,7 +458,22 @@ export interface RepositionScrollStrategyConfig {
     scrollThrottle?: number;
 }
 
-export { ScrollDispatcher }
+// @public
+export class ScrollDispatcher implements OnDestroy {
+    constructor(...args: unknown[]);
+    ancestorScrolled(elementOrElementRef: ElementRef | HTMLElement, auditTimeInMs?: number): Observable<CdkScrollable | void>;
+    deregister(scrollable: CdkScrollable): void;
+    getAncestorScrollContainers(elementOrElementRef: ElementRef | HTMLElement): CdkScrollable[];
+    // (undocumented)
+    ngOnDestroy(): void;
+    register(scrollable: CdkScrollable): void;
+    scrollContainers: Map<CdkScrollable, Subscription>;
+    scrolled(auditTimeInMs?: number): Observable<CdkScrollable | void>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<ScrollDispatcher, never>;
+    // (undocumented)
+    static ɵprov: i0.ɵɵInjectableDeclaration<ScrollDispatcher>;
+}
 
 // @public
 export class ScrollingVisibility {
@@ -481,7 +523,31 @@ export function validateVerticalPosition(property: string, value: VerticalConnec
 // @public
 export type VerticalConnectionPos = 'top' | 'center' | 'bottom';
 
-export { ViewportRuler }
+// @public
+export class ViewportRuler implements OnDestroy {
+    constructor(...args: unknown[]);
+    change(throttleTime?: number): Observable<Event>;
+    protected _document: Document;
+    getViewportRect(): {
+        top: number;
+        left: number;
+        bottom: number;
+        right: number;
+        height: number;
+        width: number;
+    };
+    getViewportScrollPosition(): ViewportScrollPosition;
+    getViewportSize(): Readonly<{
+        width: number;
+        height: number;
+    }>;
+    // (undocumented)
+    ngOnDestroy(): void;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<ViewportRuler, never>;
+    // (undocumented)
+    static ɵprov: i0.ɵɵInjectableDeclaration<ViewportRuler>;
+}
 
 // (No @packageDocumentation comment for this package)
 
diff --git a/tools/public_api_guard/cdk/scrolling.md b/tools/public_api_guard/cdk/scrolling.md
index 287bc7126494..d88583807bde 100644
--- a/tools/public_api_guard/cdk/scrolling.md
+++ b/tools/public_api_guard/cdk/scrolling.md
@@ -4,18 +4,14 @@
 
 ```ts
 
-import { CollectionViewer } from '@angular/cdk/collections';
-import { DataSource } from '@angular/cdk/collections';
-import { Directionality } from '@angular/cdk/bidi';
+import { AfterContentInit } from '@angular/core';
 import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
+import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
-import { ListRange } from '@angular/cdk/collections';
 import { NgIterable } from '@angular/core';
 import { NgZone } from '@angular/core';
-import { NumberInput } from '@angular/cdk/coercion';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
diff --git a/tools/public_api_guard/cdk/stepper.md b/tools/public_api_guard/cdk/stepper.md
index 80a9ffe0cf7a..77a62c51159e 100644
--- a/tools/public_api_guard/cdk/stepper.md
+++ b/tools/public_api_guard/cdk/stepper.md
@@ -9,10 +9,8 @@ import { AfterContentInit } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
-import { FocusableOption } from '@angular/cdk/a11y';
 import { FormGroupDirective } from '@angular/forms';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
 import { NgForm } from '@angular/forms';
 import { OnChanges } from '@angular/core';
diff --git a/tools/public_api_guard/cdk/table.md b/tools/public_api_guard/cdk/table.md
index 663756ef942c..33b8ae5b2147 100644
--- a/tools/public_api_guard/cdk/table.md
+++ b/tools/public_api_guard/cdk/table.md
@@ -8,29 +8,29 @@ import { AfterContentChecked } from '@angular/core';
 import { AfterContentInit } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { ChangeDetectorRef } from '@angular/core';
-import { CollectionViewer } from '@angular/cdk/collections';
-import { DataSource } from '@angular/cdk/collections';
-import { Direction } from '@angular/cdk/bidi';
-import { Directionality } from '@angular/cdk/bidi';
+import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
 import { Injector } from '@angular/core';
+import { IterableChangeRecord } from '@angular/core';
 import { IterableChanges } from '@angular/core';
 import { IterableDiffer } from '@angular/core';
 import { IterableDiffers } from '@angular/core';
+import { NgIterable } from '@angular/core';
+import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
 import { QueryList } from '@angular/core';
 import { SimpleChanges } from '@angular/core';
+import { Subject } from 'rxjs';
+import { Subscription } from 'rxjs';
 import { TemplateRef } from '@angular/core';
 import { TrackByFunction } from '@angular/core';
 import { ViewContainerRef } from '@angular/core';
-import { _ViewRepeater } from '@angular/cdk/collections';
 
 // @public
 export class BaseCdkCell {
@@ -392,7 +392,7 @@ export class CdkTableModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<CdkTableModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<CdkTableModule, never, [typeof i1.ScrollingModule, typeof i2.CdkTable, typeof i3.CdkRowDef, typeof i4.CdkCellDef, typeof i3.CdkCellOutlet, typeof i4.CdkHeaderCellDef, typeof i4.CdkFooterCellDef, typeof i4.CdkColumnDef, typeof i4.CdkCell, typeof i3.CdkRow, typeof i4.CdkHeaderCell, typeof i4.CdkFooterCell, typeof i3.CdkHeaderRow, typeof i3.CdkHeaderRowDef, typeof i3.CdkFooterRow, typeof i3.CdkFooterRowDef, typeof i2.DataRowOutlet, typeof i2.HeaderRowOutlet, typeof i2.FooterRowOutlet, typeof i5.CdkTextColumn, typeof i3.CdkNoDataRow, typeof i2.CdkRecycleRows, typeof i2.NoDataRowOutlet], [typeof i2.CdkTable, typeof i3.CdkRowDef, typeof i4.CdkCellDef, typeof i3.CdkCellOutlet, typeof i4.CdkHeaderCellDef, typeof i4.CdkFooterCellDef, typeof i4.CdkColumnDef, typeof i4.CdkCell, typeof i3.CdkRow, typeof i4.CdkHeaderCell, typeof i4.CdkFooterCell, typeof i3.CdkHeaderRow, typeof i3.CdkHeaderRowDef, typeof i3.CdkFooterRow, typeof i3.CdkFooterRowDef, typeof i2.DataRowOutlet, typeof i2.HeaderRowOutlet, typeof i2.FooterRowOutlet, typeof i5.CdkTextColumn, typeof i3.CdkNoDataRow, typeof i2.CdkRecycleRows, typeof i2.NoDataRowOutlet]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<CdkTableModule, never, [typeof i1.ScrollingModule, typeof i2_2.CdkTable, typeof i3_2.CdkRowDef, typeof i4_2.CdkCellDef, typeof i3_2.CdkCellOutlet, typeof i4_2.CdkHeaderCellDef, typeof i4_2.CdkFooterCellDef, typeof i4_2.CdkColumnDef, typeof i4_2.CdkCell, typeof i3_2.CdkRow, typeof i4_2.CdkHeaderCell, typeof i4_2.CdkFooterCell, typeof i3_2.CdkHeaderRow, typeof i3_2.CdkHeaderRowDef, typeof i3_2.CdkFooterRow, typeof i3_2.CdkFooterRowDef, typeof i2_2.DataRowOutlet, typeof i2_2.HeaderRowOutlet, typeof i2_2.FooterRowOutlet, typeof i5_2.CdkTextColumn, typeof i3_2.CdkNoDataRow, typeof i2_2.CdkRecycleRows, typeof i2_2.NoDataRowOutlet], [typeof i2_2.CdkTable, typeof i3_2.CdkRowDef, typeof i4_2.CdkCellDef, typeof i3_2.CdkCellOutlet, typeof i4_2.CdkHeaderCellDef, typeof i4_2.CdkFooterCellDef, typeof i4_2.CdkColumnDef, typeof i4_2.CdkCell, typeof i3_2.CdkRow, typeof i4_2.CdkHeaderCell, typeof i4_2.CdkFooterCell, typeof i3_2.CdkHeaderRow, typeof i3_2.CdkHeaderRowDef, typeof i3_2.CdkFooterRow, typeof i3_2.CdkFooterRowDef, typeof i2_2.DataRowOutlet, typeof i2_2.HeaderRowOutlet, typeof i2_2.FooterRowOutlet, typeof i5_2.CdkTextColumn, typeof i3_2.CdkNoDataRow, typeof i2_2.CdkRecycleRows, typeof i2_2.NoDataRowOutlet]>;
 }
 
 // @public
@@ -452,7 +452,11 @@ export class DataRowOutlet implements RowOutlet {
     static ɵfac: i0.ɵɵFactoryDeclaration<DataRowOutlet, never>;
 }
 
-export { DataSource }
+// @public (undocumented)
+export abstract class DataSource<T> {
+    abstract connect(collectionViewer: CollectionViewer): Observable<readonly T[]>;
+    abstract disconnect(collectionViewer: CollectionViewer): void;
+}
 
 // @public
 export class FooterRowOutlet implements RowOutlet {
diff --git a/tools/public_api_guard/cdk/testing-selenium-webdriver.md b/tools/public_api_guard/cdk/testing-selenium-webdriver.md
index 29ca687246b2..50f3d40ab861 100644
--- a/tools/public_api_guard/cdk/testing-selenium-webdriver.md
+++ b/tools/public_api_guard/cdk/testing-selenium-webdriver.md
@@ -4,14 +4,6 @@
 
 ```ts
 
-import { ElementDimensions } from '@angular/cdk/testing';
-import { EventData } from '@angular/cdk/testing';
-import { HarnessEnvironment } from '@angular/cdk/testing';
-import { HarnessLoader } from '@angular/cdk/testing';
-import { ModifierKeys } from '@angular/cdk/testing';
-import { TestElement } from '@angular/cdk/testing';
-import { TestKey } from '@angular/cdk/testing';
-import { TextOptions } from '@angular/cdk/testing';
 import * as webdriver from 'selenium-webdriver';
 
 // @public
diff --git a/tools/public_api_guard/cdk/testing-testbed.md b/tools/public_api_guard/cdk/testing-testbed.md
index 5428700b67db..fea2418ec45e 100644
--- a/tools/public_api_guard/cdk/testing-testbed.md
+++ b/tools/public_api_guard/cdk/testing-testbed.md
@@ -5,16 +5,6 @@
 ```ts
 
 import { ComponentFixture } from '@angular/core/testing';
-import { ComponentHarness } from '@angular/cdk/testing';
-import { ComponentHarnessConstructor } from '@angular/cdk/testing';
-import { ElementDimensions } from '@angular/cdk/testing';
-import { EventData } from '@angular/cdk/testing';
-import { HarnessEnvironment } from '@angular/cdk/testing';
-import { HarnessLoader } from '@angular/cdk/testing';
-import { ModifierKeys } from '@angular/cdk/testing';
-import { TestElement } from '@angular/cdk/testing';
-import { TestKey } from '@angular/cdk/testing';
-import { TextOptions } from '@angular/cdk/testing';
 
 // @public
 export class TestbedHarnessEnvironment extends HarnessEnvironment<Element> {
diff --git a/tools/public_api_guard/cdk/text-field.md b/tools/public_api_guard/cdk/text-field.md
index 71426016f962..e251254de44a 100644
--- a/tools/public_api_guard/cdk/text-field.md
+++ b/tools/public_api_guard/cdk/text-field.md
@@ -9,7 +9,6 @@ import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import { NumberInput } from '@angular/cdk/coercion';
 import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
diff --git a/tools/public_api_guard/cdk/tree.md b/tools/public_api_guard/cdk/tree.md
index dda4541d9306..18880f93918f 100644
--- a/tools/public_api_guard/cdk/tree.md
+++ b/tools/public_api_guard/cdk/tree.md
@@ -8,8 +8,6 @@ import { AfterContentChecked } from '@angular/core';
 import { AfterContentInit } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
-import { CollectionViewer } from '@angular/cdk/collections';
-import { DataSource } from '@angular/cdk/collections';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
@@ -20,12 +18,9 @@ import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
 import { QueryList } from '@angular/core';
-import { SelectionModel } from '@angular/cdk/collections';
 import { Subject } from 'rxjs';
 import { TemplateRef } from '@angular/core';
 import { TrackByFunction } from '@angular/core';
-import { TreeKeyManagerItem } from '@angular/cdk/a11y';
-import { TreeKeyManagerStrategy } from '@angular/cdk/a11y';
 import { ViewContainerRef } from '@angular/core';
 
 // @public @deprecated
diff --git a/tools/public_api_guard/material/autocomplete-testing.md b/tools/public_api_guard/material/autocomplete-testing.md
index ed3f78f2057a..d4b6edfe1b09 100644
--- a/tools/public_api_guard/material/autocomplete-testing.md
+++ b/tools/public_api_guard/material/autocomplete-testing.md
@@ -7,11 +7,8 @@
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
+import { ContentContainerComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatOptgroupHarness } from '@angular/material/core/testing';
-import { MatOptionHarness } from '@angular/material/core/testing';
-import { OptgroupHarnessFilters } from '@angular/material/core/testing';
-import { OptionHarnessFilters } from '@angular/material/core/testing';
 
 // @public
 export interface AutocompleteHarnessFilters extends BaseHarnessFilters {
diff --git a/tools/public_api_guard/material/autocomplete.md b/tools/public_api_guard/material/autocomplete.md
index c2560dedfe9b..94a78e09aae1 100644
--- a/tools/public_api_guard/material/autocomplete.md
+++ b/tools/public_api_guard/material/autocomplete.md
@@ -6,27 +6,33 @@
 
 import { ActiveDescendantKeyManager } from '@angular/cdk/a11y';
 import { AfterContentInit } from '@angular/core';
+import { AfterViewChecked } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
+import { ChangeDetectorRef } from '@angular/core';
 import { ControlValueAccessor } from '@angular/forms';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
+import { FocusableOption } from '@angular/cdk/a11y';
+import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/overlay';
-import * as i2 from '@angular/material/core';
-import * as i6 from '@angular/cdk/scrolling';
+import * as i1_3 from '@angular/cdk/bidi';
+import * as i7 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
-import { MatOptgroup } from '@angular/material/core';
-import { MatOption } from '@angular/material/core';
-import { MatOptionSelectionChange } from '@angular/material/core';
+import { Injector } from '@angular/core';
+import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { Overlay } from '@angular/cdk/overlay';
+import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
 import { ScrollStrategy } from '@angular/cdk/overlay';
+import { Signal } from '@angular/core';
 import { SimpleChanges } from '@angular/core';
+import { Subject } from 'rxjs';
 import { TemplateRef } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 
 // @public
 export function getMatAutocompleteMissingPanelError(): Error;
@@ -141,7 +147,7 @@ export class MatAutocompleteModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatAutocompleteModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatAutocompleteModule, never, [typeof i1.OverlayModule, typeof i2.MatOptionModule, typeof i2.MatCommonModule, typeof i3.MatAutocomplete, typeof i4.MatAutocompleteTrigger, typeof i5.MatAutocompleteOrigin], [typeof i6.CdkScrollableModule, typeof i3.MatAutocomplete, typeof i2.MatOptionModule, typeof i2.MatCommonModule, typeof i4.MatAutocompleteTrigger, typeof i5.MatAutocompleteOrigin]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatAutocompleteModule, never, [typeof i1.OverlayModule, typeof i2.MatOptionModule, typeof i3.MatCommonModule, typeof i4_2.MatAutocomplete, typeof i5_2.MatAutocompleteTrigger, typeof i6.MatAutocompleteOrigin], [typeof i7.CdkScrollableModule, typeof i4_2.MatAutocomplete, typeof i2.MatOptionModule, typeof i3.MatCommonModule, typeof i5_2.MatAutocompleteTrigger, typeof i6.MatAutocompleteOrigin]>;
 }
 
 // @public
@@ -211,9 +217,62 @@ export class MatAutocompleteTrigger implements ControlValueAccessor, AfterViewIn
     static ɵfac: i0.ɵɵFactoryDeclaration<MatAutocompleteTrigger, never>;
 }
 
-export { MatOptgroup }
+// @public
+export class MatOptgroup {
+    constructor(...args: unknown[]);
+    disabled: boolean;
+    _inert: boolean;
+    label: string;
+    _labelId: string;
+    // (undocumented)
+    static ngAcceptInputType_disabled: unknown;
+    // (undocumented)
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatOptgroup, "mat-optgroup", ["matOptgroup"], { "label": { "alias": "label"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, ["*", "mat-option, ng-container"], true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatOptgroup, never>;
+}
 
-export { MatOption }
+// @public
+export class MatOption<T = any> implements FocusableOption, AfterViewChecked, OnDestroy {
+    constructor(...args: unknown[]);
+    get active(): boolean;
+    // (undocumented)
+    _changeDetectorRef: ChangeDetectorRef;
+    deselect(emitEvent?: boolean): void;
+    get disabled(): boolean;
+    set disabled(value: boolean);
+    get disableRipple(): boolean;
+    focus(_origin?: FocusOrigin, options?: FocusOptions): void;
+    _getHostElement(): HTMLElement;
+    getLabel(): string;
+    _getTabIndex(): string;
+    // (undocumented)
+    group: MatOptgroup | null;
+    _handleKeydown(event: KeyboardEvent): void;
+    get hideSingleSelectionIndicator(): boolean;
+    id: string;
+    get multiple(): boolean | null | undefined;
+    // (undocumented)
+    static ngAcceptInputType_disabled: unknown;
+    // (undocumented)
+    ngAfterViewChecked(): void;
+    // (undocumented)
+    ngOnDestroy(): void;
+    readonly onSelectionChange: EventEmitter<MatOptionSelectionChange<T>>;
+    select(emitEvent?: boolean): void;
+    get selected(): boolean;
+    _selectViaInteraction(): void;
+    setActiveStyles(): void;
+    setInactiveStyles(): void;
+    readonly _stateChanges: Subject<void>;
+    _text: ElementRef<HTMLElement> | undefined;
+    value: T;
+    get viewValue(): string;
+    // (undocumented)
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatOption<any>, "mat-option", ["matOption"], { "value": { "alias": "value"; "required": false; }; "id": { "alias": "id"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "onSelectionChange": "onSelectionChange"; }, never, ["mat-icon", "*"], true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatOption<any>, never>;
+}
 
 // (No @packageDocumentation comment for this package)
 
diff --git a/tools/public_api_guard/material/badge-testing.md b/tools/public_api_guard/material/badge-testing.md
index 02fa458dd2df..4c0297dd4eeb 100644
--- a/tools/public_api_guard/material/badge-testing.md
+++ b/tools/public_api_guard/material/badge-testing.md
@@ -7,8 +7,6 @@
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatBadgePosition } from '@angular/material/badge';
-import { MatBadgeSize } from '@angular/material/badge';
 
 // @public (undocumented)
 export interface BadgeHarnessFilters extends BaseHarnessFilters {
diff --git a/tools/public_api_guard/material/badge.md b/tools/public_api_guard/material/badge.md
index e42871f140e8..fe3b9213377e 100644
--- a/tools/public_api_guard/material/badge.md
+++ b/tools/public_api_guard/material/badge.md
@@ -6,10 +6,10 @@
 
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/a11y';
-import * as i2 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
+import { InjectionToken } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 
 // @public
 export class MatBadge implements OnInit, OnDestroy {
diff --git a/tools/public_api_guard/material/bottom-sheet.md b/tools/public_api_guard/material/bottom-sheet.md
index 11d0bac8127b..d2deff06989e 100644
--- a/tools/public_api_guard/material/bottom-sheet.md
+++ b/tools/public_api_guard/material/bottom-sheet.md
@@ -12,7 +12,7 @@ import { Direction } from '@angular/cdk/bidi';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/dialog';
-import * as i2 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import * as i3 from '@angular/cdk/portal';
 import { InjectionToken } from '@angular/core';
 import { Observable } from 'rxjs';
diff --git a/tools/public_api_guard/material/button-toggle-testing.md b/tools/public_api_guard/material/button-toggle-testing.md
index bec81e611211..c01a9f4620f0 100644
--- a/tools/public_api_guard/material/button-toggle-testing.md
+++ b/tools/public_api_guard/material/button-toggle-testing.md
@@ -7,7 +7,6 @@
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatButtonToggleAppearance } from '@angular/material/button-toggle';
 
 // @public
 export interface ButtonToggleGroupHarnessFilters extends BaseHarnessFilters {
diff --git a/tools/public_api_guard/material/button-toggle.md b/tools/public_api_guard/material/button-toggle.md
index 65c4ca8ee072..f292b2566abd 100644
--- a/tools/public_api_guard/material/button-toggle.md
+++ b/tools/public_api_guard/material/button-toggle.md
@@ -11,10 +11,13 @@ import { Direction } from '@angular/cdk/bidi';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
+import { Injector } from '@angular/core';
+import { NgZone } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
+import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
 
 // @public
@@ -164,7 +167,7 @@ export class MatButtonToggleModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatButtonToggleModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatButtonToggleModule, never, [typeof i1.MatCommonModule, typeof i1.MatRippleModule, typeof i2.MatButtonToggleGroup, typeof i2.MatButtonToggle], [typeof i1.MatCommonModule, typeof i2.MatButtonToggleGroup, typeof i2.MatButtonToggle]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatButtonToggleModule, never, [typeof i1.MatCommonModule, typeof i2.MatRippleModule, typeof i3.MatButtonToggleGroup, typeof i3.MatButtonToggle], [typeof i1.MatCommonModule, typeof i3.MatButtonToggleGroup, typeof i3.MatButtonToggle]>;
 }
 
 // @public @deprecated (undocumented)
diff --git a/tools/public_api_guard/material/button.md b/tools/public_api_guard/material/button.md
index 58a35fa75e82..003c8758e170 100644
--- a/tools/public_api_guard/material/button.md
+++ b/tools/public_api_guard/material/button.md
@@ -8,12 +8,13 @@ import { AfterViewInit } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
-import { MatRippleLoader } from '@angular/material/core';
+import { Injector } from '@angular/core';
 import { NgZone } from '@angular/core';
 import { OnDestroy } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
+import { OnInit } from '@angular/core';
+import { Platform } from '@angular/cdk/platform';
 
 // @public
 export const MAT_BUTTON_CONFIG: InjectionToken<MatButtonConfig>;
@@ -51,7 +52,7 @@ export class MatButtonModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatButtonModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatButtonModule, never, [typeof i1.MatCommonModule, typeof i1.MatRippleModule, typeof i2.MatButton, typeof i3.MatMiniFabButton, typeof i4.MatIconButton, typeof i3.MatFabButton], [typeof i1.MatCommonModule, typeof i2.MatButton, typeof i3.MatMiniFabButton, typeof i4.MatIconButton, typeof i3.MatFabButton]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatButtonModule, never, [typeof i1.MatCommonModule, typeof i2.MatRippleModule, typeof i3.MatButton, typeof i4.MatMiniFabButton, typeof i5.MatIconButton, typeof i4.MatFabButton], [typeof i1.MatCommonModule, typeof i3.MatButton, typeof i4.MatMiniFabButton, typeof i5.MatIconButton, typeof i4.MatFabButton]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/card.md b/tools/public_api_guard/material/card.md
index 628fe507ac5b..bc7d717c3b4e 100644
--- a/tools/public_api_guard/material/card.md
+++ b/tools/public_api_guard/material/card.md
@@ -5,7 +5,7 @@
 ```ts
 
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
 
 // @public
diff --git a/tools/public_api_guard/material/checkbox.md b/tools/public_api_guard/material/checkbox.md
index 9d7d5b6ecc99..192c9bad9635 100644
--- a/tools/public_api_guard/material/checkbox.md
+++ b/tools/public_api_guard/material/checkbox.md
@@ -11,11 +11,10 @@ import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { FocusableOption } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import * as i2 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
 import { OnChanges } from '@angular/core';
 import { SimpleChanges } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 import { ValidationErrors } from '@angular/forms';
 import { Validator } from '@angular/forms';
 
diff --git a/tools/public_api_guard/material/chips.md b/tools/public_api_guard/material/chips.md
index 7cbccee7cdff..2ac72c5d6914 100644
--- a/tools/public_api_guard/material/chips.md
+++ b/tools/public_api_guard/material/chips.md
@@ -4,26 +4,29 @@
 
 ```ts
 
+import { AbstractControl } from '@angular/forms';
+import { AbstractControlDirective } from '@angular/forms';
 import { AfterContentInit } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
 import { ChangeDetectorRef } from '@angular/core';
 import { ControlValueAccessor } from '@angular/forms';
 import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
-import { ErrorStateMatcher } from '@angular/material/core';
 import { EventEmitter } from '@angular/core';
 import { FocusKeyManager } from '@angular/cdk/a11y';
+import { FormGroupDirective } from '@angular/forms';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
 import { Injector } from '@angular/core';
-import { MatFormFieldControl } from '@angular/material/form-field';
 import { NgControl } from '@angular/forms';
+import { NgForm } from '@angular/forms';
 import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
+import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
 import { Subject } from 'rxjs';
 
@@ -499,7 +502,7 @@ export class MatChipsModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatChipsModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatChipsModule, never, [typeof i1.MatCommonModule, typeof i1.MatRippleModule, typeof i2.MatChipAction, typeof i3.MatChip, typeof i4.MatChipAvatar, typeof i5.MatChipEditInput, typeof i6.MatChipGrid, typeof i7.MatChipInput, typeof i8.MatChipListbox, typeof i9.MatChipOption, typeof i4.MatChipRemove, typeof i10.MatChipRow, typeof i11.MatChipSet, typeof i4.MatChipTrailingIcon], [typeof i1.MatCommonModule, typeof i3.MatChip, typeof i4.MatChipAvatar, typeof i5.MatChipEditInput, typeof i6.MatChipGrid, typeof i7.MatChipInput, typeof i8.MatChipListbox, typeof i9.MatChipOption, typeof i4.MatChipRemove, typeof i10.MatChipRow, typeof i11.MatChipSet, typeof i4.MatChipTrailingIcon]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatChipsModule, never, [typeof i1.MatCommonModule, typeof i2.MatRippleModule, typeof i3.MatChipAction, typeof i4.MatChip, typeof i5.MatChipAvatar, typeof i6.MatChipEditInput, typeof i7.MatChipGrid, typeof i8.MatChipInput, typeof i9.MatChipListbox, typeof i10.MatChipOption, typeof i5.MatChipRemove, typeof i11.MatChipRow, typeof i12.MatChipSet, typeof i5.MatChipTrailingIcon], [typeof i1.MatCommonModule, typeof i4.MatChip, typeof i5.MatChipAvatar, typeof i6.MatChipEditInput, typeof i7.MatChipGrid, typeof i8.MatChipInput, typeof i9.MatChipListbox, typeof i10.MatChipOption, typeof i5.MatChipRemove, typeof i11.MatChipRow, typeof i12.MatChipSet, typeof i5.MatChipTrailingIcon]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/datepicker-testing.md b/tools/public_api_guard/material/datepicker-testing.md
index e58538ebf732..98816dc5eeed 100644
--- a/tools/public_api_guard/material/datepicker-testing.md
+++ b/tools/public_api_guard/material/datepicker-testing.md
@@ -7,7 +7,6 @@
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatFormFieldControlHarness } from '@angular/material/form-field/testing/control';
 
 // @public
 export interface CalendarCellHarnessFilters extends BaseHarnessFilters {
diff --git a/tools/public_api_guard/material/datepicker.md b/tools/public_api_guard/material/datepicker.md
index 592c92d4ff40..fa22dee0c6cb 100644
--- a/tools/public_api_guard/material/datepicker.md
+++ b/tools/public_api_guard/material/datepicker.md
@@ -5,6 +5,7 @@
 ```ts
 
 import { AbstractControl } from '@angular/forms';
+import { AbstractControlDirective } from '@angular/forms';
 import { AfterContentInit } from '@angular/core';
 import { AfterViewChecked } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
@@ -15,35 +16,33 @@ import { DateAdapter } from '@angular/material/core';
 import { Directionality } from '@angular/cdk/bidi';
 import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
-import { ErrorStateMatcher } from '@angular/material/core';
 import { EventEmitter } from '@angular/core';
 import { FactoryProvider } from '@angular/core';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import { FormGroupDirective } from '@angular/forms';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/button';
 import * as i19 from '@angular/cdk/scrolling';
-import * as i2 from '@angular/cdk/overlay';
-import * as i3 from '@angular/cdk/a11y';
-import * as i4 from '@angular/cdk/portal';
-import * as i5 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
+import * as i2_3 from '@angular/cdk/overlay';
+import * as i3_2 from '@angular/cdk/a11y';
+import * as i4_2 from '@angular/cdk/portal';
 import { InjectionToken } from '@angular/core';
-import { MatButton } from '@angular/material/button';
-import { MatFormFieldControl } from '@angular/material/form-field';
+import { Injector } from '@angular/core';
 import { NgControl } from '@angular/forms';
 import { NgForm } from '@angular/forms';
+import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
 import { Overlay } from '@angular/cdk/overlay';
+import { Platform } from '@angular/cdk/platform';
 import { Portal } from '@angular/cdk/portal';
 import { ScrollStrategy } from '@angular/cdk/overlay';
 import { SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs';
 import { TemplatePortal } from '@angular/cdk/portal';
 import { TemplateRef } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 import { ValidationErrors } from '@angular/forms';
 import { Validator } from '@angular/forms';
 import { ValidatorFn } from '@angular/forms';
@@ -507,7 +506,7 @@ export class MatDatepickerModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatDatepickerModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatDatepickerModule, never, [typeof i1.MatButtonModule, typeof i2.OverlayModule, typeof i3.A11yModule, typeof i4.PortalModule, typeof i5.MatCommonModule, typeof i6.MatCalendar, typeof i7.MatCalendarBody, typeof i8.MatDatepicker, typeof i9.MatDatepickerContent, typeof i10.MatDatepickerInput, typeof i11.MatDatepickerToggle, typeof i11.MatDatepickerToggleIcon, typeof i12.MatMonthView, typeof i13.MatYearView, typeof i14.MatMultiYearView, typeof i6.MatCalendarHeader, typeof i15.MatDateRangeInput, typeof i16.MatStartDate, typeof i16.MatEndDate, typeof i17.MatDateRangePicker, typeof i18.MatDatepickerActions, typeof i18.MatDatepickerCancel, typeof i18.MatDatepickerApply], [typeof i19.CdkScrollableModule, typeof i6.MatCalendar, typeof i7.MatCalendarBody, typeof i8.MatDatepicker, typeof i9.MatDatepickerContent, typeof i10.MatDatepickerInput, typeof i11.MatDatepickerToggle, typeof i11.MatDatepickerToggleIcon, typeof i12.MatMonthView, typeof i13.MatYearView, typeof i14.MatMultiYearView, typeof i6.MatCalendarHeader, typeof i15.MatDateRangeInput, typeof i16.MatStartDate, typeof i16.MatEndDate, typeof i17.MatDateRangePicker, typeof i18.MatDatepickerActions, typeof i18.MatDatepickerCancel, typeof i18.MatDatepickerApply]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatDatepickerModule, never, [typeof i1.MatButtonModule, typeof i2_3.OverlayModule, typeof i3_2.A11yModule, typeof i4_2.PortalModule, typeof i5.MatCommonModule, typeof i6.MatCalendar, typeof i7.MatCalendarBody, typeof i8.MatDatepicker, typeof i9.MatDatepickerContent, typeof i10.MatDatepickerInput, typeof i11.MatDatepickerToggle, typeof i11.MatDatepickerToggleIcon, typeof i12.MatMonthView, typeof i13.MatYearView, typeof i14.MatMultiYearView, typeof i6.MatCalendarHeader, typeof i15.MatDateRangeInput, typeof i16.MatStartDate, typeof i16.MatEndDate, typeof i17.MatDateRangePicker, typeof i18.MatDatepickerActions, typeof i18.MatDatepickerCancel, typeof i18.MatDatepickerApply], [typeof i19.CdkScrollableModule, typeof i6.MatCalendar, typeof i7.MatCalendarBody, typeof i8.MatDatepicker, typeof i9.MatDatepickerContent, typeof i10.MatDatepickerInput, typeof i11.MatDatepickerToggle, typeof i11.MatDatepickerToggleIcon, typeof i12.MatMonthView, typeof i13.MatYearView, typeof i14.MatMultiYearView, typeof i6.MatCalendarHeader, typeof i15.MatDateRangeInput, typeof i16.MatStartDate, typeof i16.MatEndDate, typeof i17.MatDateRangePicker, typeof i18.MatDatepickerActions, typeof i18.MatDatepickerCancel, typeof i18.MatDatepickerApply]>;
 }
 
 // @public
@@ -705,7 +704,7 @@ export class MatMonthView<D> implements AfterContentInit, OnChanges, OnDestroy {
     _comparisonRangeStart: number | null;
     comparisonStart: D | null;
     // (undocumented)
-    _dateAdapter: DateAdapter<D, any>;
+    _dateAdapter: DateAdapter_2<D, any>;
     dateClass: MatCalendarCellClassFunction<D>;
     dateFilter: (date: D) => boolean;
     _dateSelected(event: MatCalendarUserEvent<number>): void;
@@ -763,7 +762,7 @@ export class MatMultiYearView<D> implements AfterContentInit, OnDestroy {
     set activeDate(value: D);
     readonly activeDateChange: EventEmitter<D>;
     // (undocumented)
-    _dateAdapter: DateAdapter<D, any>;
+    _dateAdapter: DateAdapter_2<D, any>;
     dateClass: MatCalendarCellClassFunction<D>;
     dateFilter: (date: D) => boolean;
     _focusActiveCell(): void;
@@ -852,7 +851,7 @@ export class MatYearView<D> implements AfterContentInit, OnDestroy {
     // (undocumented)
     readonly _changeDetectorRef: ChangeDetectorRef;
     // (undocumented)
-    _dateAdapter: DateAdapter<D, any>;
+    _dateAdapter: DateAdapter_2<D, any>;
     dateClass: MatCalendarCellClassFunction<D>;
     dateFilter: (date: D) => boolean;
     _focusActiveCell(): void;
diff --git a/tools/public_api_guard/material/dialog-testing.md b/tools/public_api_guard/material/dialog-testing.md
index 600104df7283..b84668a92946 100644
--- a/tools/public_api_guard/material/dialog-testing.md
+++ b/tools/public_api_guard/material/dialog-testing.md
@@ -6,16 +6,26 @@
 
 import { AsyncFactoryFn } from '@angular/cdk/testing';
 import { BaseHarnessFilters } from '@angular/cdk/testing';
+import { CdkDialogContainer } from '@angular/cdk/dialog';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
+import { ComponentPortal } from '@angular/cdk/portal';
+import { ComponentRef } from '@angular/core';
 import { ComponentType } from '@angular/cdk/overlay';
 import { ContentContainerComponentHarness } from '@angular/cdk/testing';
-import { DialogRole } from '@angular/material/dialog';
+import { Dialog } from '@angular/cdk/dialog';
+import { DialogRef } from '@angular/cdk/dialog';
+import { Direction } from '@angular/cdk/bidi';
+import { EventEmitter } from '@angular/core';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatDialog } from '@angular/material/dialog';
-import { MatDialogConfig } from '@angular/material/dialog';
-import { MatDialogRef } from '@angular/material/dialog';
+import * as i0 from '@angular/core';
+import { Injector } from '@angular/core';
+import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
+import { ScrollStrategy } from '@angular/cdk/overlay';
+import { Subject } from 'rxjs';
+import { TemplateRef } from '@angular/core';
 import { TestElement } from '@angular/cdk/testing';
+import { ViewContainerRef } from '@angular/core';
 
 // @public
 export interface DialogHarnessFilters extends BaseHarnessFilters {
diff --git a/tools/public_api_guard/material/dialog.md b/tools/public_api_guard/material/dialog.md
index e3b05054ccaa..6dc4ef9b239e 100644
--- a/tools/public_api_guard/material/dialog.md
+++ b/tools/public_api_guard/material/dialog.md
@@ -16,9 +16,9 @@ import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/scrolling';
 import * as i1_2 from '@angular/cdk/dialog';
+import * as i1_3 from '@angular/cdk/bidi';
 import * as i2 from '@angular/cdk/overlay';
 import * as i3 from '@angular/cdk/portal';
-import * as i4 from '@angular/material/core';
 import { InjectionToken } from '@angular/core';
 import { Injector } from '@angular/core';
 import { Observable } from 'rxjs';
diff --git a/tools/public_api_guard/material/divider.md b/tools/public_api_guard/material/divider.md
index 72f2be2976b1..27c5ce9a9117 100644
--- a/tools/public_api_guard/material/divider.md
+++ b/tools/public_api_guard/material/divider.md
@@ -6,7 +6,8 @@
 
 import { BooleanInput } from '@angular/cdk/coercion';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
+import { InjectionToken } from '@angular/core';
 
 // @public (undocumented)
 export class MatDivider {
diff --git a/tools/public_api_guard/material/expansion.md b/tools/public_api_guard/material/expansion.md
index 8ad5de6059eb..1314d684b6fc 100644
--- a/tools/public_api_guard/material/expansion.md
+++ b/tools/public_api_guard/material/expansion.md
@@ -13,7 +13,7 @@ import { EventEmitter } from '@angular/core';
 import { FocusableOption } from '@angular/cdk/a11y';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import * as i2 from '@angular/cdk/accordion';
 import * as i3 from '@angular/cdk/portal';
 import { InjectionToken } from '@angular/core';
diff --git a/tools/public_api_guard/material/form-field-testing.md b/tools/public_api_guard/material/form-field-testing.md
index 5b5ce6dd5c17..75c9067167be 100644
--- a/tools/public_api_guard/material/form-field-testing.md
+++ b/tools/public_api_guard/material/form-field-testing.md
@@ -7,12 +7,8 @@
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
+import { ContentContainerComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatDatepickerInputHarness } from '@angular/material/datepicker/testing';
-import { MatDateRangeInputHarness } from '@angular/material/datepicker/testing';
-import { MatFormFieldControlHarness } from '@angular/material/form-field/testing/control';
-import { MatInputHarness } from '@angular/material/input/testing';
-import { MatSelectHarness } from '@angular/material/select/testing';
 
 // @public
 export interface ErrorHarnessFilters extends BaseHarnessFilters {
@@ -39,7 +35,9 @@ export class MatErrorHarness extends ComponentHarness {
     static with<T extends MatErrorHarness>(this: ComponentHarnessConstructor<T>, options?: ErrorHarnessFilters): HarnessPredicate<T>;
 }
 
-export { MatFormFieldControlHarness }
+// @public
+export abstract class MatFormFieldControlHarness extends ComponentHarness {
+}
 
 // @public (undocumented)
 export class MatFormFieldHarness extends ComponentHarness {
diff --git a/tools/public_api_guard/material/form-field.md b/tools/public_api_guard/material/form-field.md
index 55b0ec7d297c..eb5169b91012 100644
--- a/tools/public_api_guard/material/form-field.md
+++ b/tools/public_api_guard/material/form-field.md
@@ -11,7 +11,7 @@ import { AfterViewInit } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { ElementRef } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import * as i2 from '@angular/cdk/observers';
 import { InjectionToken } from '@angular/core';
 import { NgControl } from '@angular/forms';
@@ -19,7 +19,6 @@ import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
 import { QueryList } from '@angular/core';
 import { Signal } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 
 // @public
 export type FloatLabelType = 'always' | 'auto';
diff --git a/tools/public_api_guard/material/grid-list.md b/tools/public_api_guard/material/grid-list.md
index 151710ca5458..29277298b839 100644
--- a/tools/public_api_guard/material/grid-list.md
+++ b/tools/public_api_guard/material/grid-list.md
@@ -6,9 +6,10 @@
 
 import { AfterContentChecked } from '@angular/core';
 import { AfterContentInit } from '@angular/core';
+import { ElementRef } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
-import { MatLine } from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
+import { InjectionToken } from '@angular/core';
 import { NumberInput } from '@angular/cdk/coercion';
 import { OnInit } from '@angular/core';
 import { QueryList } from '@angular/core';
@@ -48,7 +49,7 @@ export class MatGridListModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatGridListModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatGridListModule, never, [typeof i1.MatLineModule, typeof i1.MatCommonModule, typeof i2.MatGridList, typeof i3.MatGridTile, typeof i3.MatGridTileText, typeof i3.MatGridTileHeaderCssMatStyler, typeof i3.MatGridTileFooterCssMatStyler, typeof i3.MatGridAvatarCssMatStyler], [typeof i2.MatGridList, typeof i3.MatGridTile, typeof i3.MatGridTileText, typeof i1.MatLineModule, typeof i1.MatCommonModule, typeof i3.MatGridTileHeaderCssMatStyler, typeof i3.MatGridTileFooterCssMatStyler, typeof i3.MatGridAvatarCssMatStyler]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatGridListModule, never, [typeof i1.MatLineModule, typeof i2.MatCommonModule, typeof i3.MatGridList, typeof i4.MatGridTile, typeof i4.MatGridTileText, typeof i4.MatGridTileHeaderCssMatStyler, typeof i4.MatGridTileFooterCssMatStyler, typeof i4.MatGridAvatarCssMatStyler], [typeof i3.MatGridList, typeof i4.MatGridTile, typeof i4.MatGridTileText, typeof i1.MatLineModule, typeof i2.MatCommonModule, typeof i4.MatGridTileHeaderCssMatStyler, typeof i4.MatGridTileFooterCssMatStyler, typeof i4.MatGridAvatarCssMatStyler]>;
 }
 
 // @public (undocumented)
@@ -100,6 +101,14 @@ export class MatGridTileText implements AfterContentInit {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatGridTileText, never>;
 }
 
+// @public
+export class MatLine {
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatLine, "[mat-line], [matLine]", never, {}, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatLine, never>;
+}
+
 // (No @packageDocumentation comment for this package)
 
 ```
diff --git a/tools/public_api_guard/material/icon-testing.md b/tools/public_api_guard/material/icon-testing.md
index d6baf30d75eb..a0c1bb15f0c6 100644
--- a/tools/public_api_guard/material/icon-testing.md
+++ b/tools/public_api_guard/material/icon-testing.md
@@ -6,11 +6,15 @@
 
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
+import { DomSanitizer } from '@angular/platform-browser';
+import { ErrorHandler } from '@angular/core';
 import { HarnessPredicate } from '@angular/cdk/testing';
+import { HttpClient } from '@angular/common/http';
 import * as i0 from '@angular/core';
-import { MatIconRegistry } from '@angular/material/icon';
 import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
+import { SafeHtml } from '@angular/platform-browser';
+import { SafeResourceUrl } from '@angular/platform-browser';
 
 // @public
 export class FakeMatIconRegistry implements PublicApi<MatIconRegistry>, OnDestroy {
diff --git a/tools/public_api_guard/material/icon.md b/tools/public_api_guard/material/icon.md
index b4e5fcb334ba..6b320c47c221 100644
--- a/tools/public_api_guard/material/icon.md
+++ b/tools/public_api_guard/material/icon.md
@@ -10,7 +10,7 @@ import { ElementRef } from '@angular/core';
 import { ErrorHandler } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
@@ -18,7 +18,6 @@ import { OnInit } from '@angular/core';
 import { Optional } from '@angular/core';
 import { SafeHtml } from '@angular/platform-browser';
 import { SafeResourceUrl } from '@angular/platform-browser';
-import { ThemePalette } from '@angular/material/core';
 
 // @public
 export function getMatIconFailedToSanitizeLiteralError(literal: SafeHtml): Error;
diff --git a/tools/public_api_guard/material/input-testing.md b/tools/public_api_guard/material/input-testing.md
index b7f89a405059..70748f9e573c 100644
--- a/tools/public_api_guard/material/input-testing.md
+++ b/tools/public_api_guard/material/input-testing.md
@@ -7,7 +7,6 @@
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatFormFieldControlHarness } from '@angular/material/form-field/testing/control';
 
 // @public
 export interface InputHarnessFilters extends BaseHarnessFilters {
diff --git a/tools/public_api_guard/material/input.md b/tools/public_api_guard/material/input.md
index 98fc6612dd51..2cbafe181a09 100644
--- a/tools/public_api_guard/material/input.md
+++ b/tools/public_api_guard/material/input.md
@@ -4,27 +4,28 @@
 
 ```ts
 
+import { AbstractControl } from '@angular/forms';
+import { AbstractControlDirective } from '@angular/forms';
+import { AfterContentChecked } from '@angular/core';
+import { AfterContentInit } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
 import { BooleanInput } from '@angular/cdk/coercion';
 import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
-import { ErrorStateMatcher } from '@angular/material/core';
+import { FormGroupDirective } from '@angular/forms';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
-import * as i2 from '@angular/material/form-field';
-import * as i4 from '@angular/cdk/text-field';
+import * as i1_2 from '@angular/cdk/bidi';
+import * as i2_2 from '@angular/cdk/observers';
+import * as i4_2 from '@angular/cdk/text-field';
 import { InjectionToken } from '@angular/core';
-import { MatError } from '@angular/material/form-field';
-import { MatFormField } from '@angular/material/form-field';
-import { MatFormFieldControl } from '@angular/material/form-field';
-import { MatHint } from '@angular/material/form-field';
-import { MatLabel } from '@angular/material/form-field';
-import { MatPrefix } from '@angular/material/form-field';
-import { MatSuffix } from '@angular/material/form-field';
 import { NgControl } from '@angular/forms';
+import { NgForm } from '@angular/forms';
+import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { Platform } from '@angular/cdk/platform';
+import { QueryList } from '@angular/core';
+import { Signal } from '@angular/core';
 import { Subject } from 'rxjs';
 import { WritableSignal } from '@angular/core';
 
@@ -39,11 +40,113 @@ export const MAT_INPUT_VALUE_ACCESSOR: InjectionToken<{
     value: any | WritableSignal<any>;
 }>;
 
-export { MatError }
+// @public
+export class MatError {
+    constructor(...args: unknown[]);
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatError, "mat-error, [matError]", never, { "id": { "alias": "id"; "required": false; }; }, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatError, never>;
+}
 
-export { MatFormField }
+// @public
+export class MatFormField implements FloatingLabelParent, AfterContentInit, AfterContentChecked, AfterViewInit, OnDestroy {
+    constructor(...args: unknown[]);
+    _animateAndLockLabel(): void;
+    // (undocumented)
+    protected readonly _animationsDisabled: boolean;
+    get appearance(): MatFormFieldAppearance;
+    set appearance(value: MatFormFieldAppearance);
+    color: ThemePalette;
+    get _control(): MatFormFieldControl_2<any>;
+    set _control(value: MatFormFieldControl_2<any>);
+    // (undocumented)
+    _elementRef: ElementRef<any>;
+    // (undocumented)
+    _errorChildren: QueryList<MatError>;
+    // (undocumented)
+    _floatingLabel: MatFormFieldFloatingLabel | undefined;
+    get floatLabel(): FloatLabelType;
+    set floatLabel(value: FloatLabelType);
+    _forceDisplayInfixLabel(): boolean | 0;
+    // (undocumented)
+    _formFieldControl: MatFormFieldControl_2<any>;
+    getConnectedOverlayOrigin(): ElementRef;
+    _getDisplayedMessages(): 'error' | 'hint';
+    getLabelId: Signal<string | null>;
+    _handleLabelResized(): void;
+    // (undocumented)
+    _hasFloatingLabel: Signal<boolean>;
+    // (undocumented)
+    _hasIconPrefix: boolean;
+    // (undocumented)
+    _hasIconSuffix: boolean;
+    // (undocumented)
+    _hasOutline(): boolean;
+    // (undocumented)
+    _hasTextPrefix: boolean;
+    // (undocumented)
+    _hasTextSuffix: boolean;
+    get hideRequiredMarker(): boolean;
+    set hideRequiredMarker(value: BooleanInput);
+    // (undocumented)
+    _hintChildren: QueryList<MatHint>;
+    get hintLabel(): string;
+    set hintLabel(value: string);
+    // (undocumented)
+    readonly _hintLabelId: string;
+    // (undocumented)
+    _iconPrefixContainer: ElementRef<HTMLElement>;
+    // (undocumented)
+    _iconSuffixContainer: ElementRef<HTMLElement>;
+    // (undocumented)
+    readonly _labelId: string;
+    // (undocumented)
+    _lineRipple: MatFormFieldLineRipple | undefined;
+    // (undocumented)
+    ngAfterContentChecked(): void;
+    // (undocumented)
+    ngAfterContentInit(): void;
+    // (undocumented)
+    ngAfterViewInit(): void;
+    // (undocumented)
+    ngOnDestroy(): void;
+    // (undocumented)
+    _notchedOutline: MatFormFieldNotchedOutline | undefined;
+    // (undocumented)
+    _prefixChildren: QueryList<MatPrefix>;
+    _refreshOutlineNotchWidth(): void;
+    _shouldAlwaysFloat(): boolean;
+    _shouldForward(prop: keyof AbstractControlDirective): boolean;
+    // (undocumented)
+    _shouldLabelFloat(): boolean;
+    get subscriptSizing(): SubscriptSizing;
+    set subscriptSizing(value: SubscriptSizing);
+    // (undocumented)
+    _suffixChildren: QueryList<MatSuffix>;
+    // (undocumented)
+    _textField: ElementRef<HTMLElement>;
+    // (undocumented)
+    _textPrefixContainer: ElementRef<HTMLElement>;
+    // (undocumented)
+    _textSuffixContainer: ElementRef<HTMLElement>;
+    // (undocumented)
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatFormField, "mat-form-field", ["matFormField"], { "hideRequiredMarker": { "alias": "hideRequiredMarker"; "required": false; }; "color": { "alias": "color"; "required": false; }; "floatLabel": { "alias": "floatLabel"; "required": false; }; "appearance": { "alias": "appearance"; "required": false; }; "subscriptSizing": { "alias": "subscriptSizing"; "required": false; }; "hintLabel": { "alias": "hintLabel"; "required": false; }; }, {}, ["_labelChild", "_formFieldControl", "_prefixChildren", "_suffixChildren", "_errorChildren", "_hintChildren"], ["mat-label", "[matPrefix], [matIconPrefix]", "[matTextPrefix]", "*", "[matTextSuffix]", "[matSuffix], [matIconSuffix]", "mat-error, [matError]", "mat-hint:not([align='end'])", "mat-hint[align='end']"], true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatFormField, never>;
+}
 
-export { MatHint }
+// @public
+export class MatHint {
+    align: 'start' | 'end';
+    id: string;
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatHint, "mat-hint", never, { "align": { "alias": "align"; "required": false; }; "id": { "alias": "id"; "required": false; }; }, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatHint, never>;
+}
 
 // @public (undocumented)
 export class MatInput implements MatFormFieldControl<any>, OnChanges, OnDestroy, AfterViewInit, DoCheck {
@@ -142,14 +245,40 @@ export class MatInputModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatInputModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatInputModule, never, [typeof i1.MatCommonModule, typeof i2.MatFormFieldModule, typeof i3.MatInput], [typeof i3.MatInput, typeof i2.MatFormFieldModule, typeof i4.TextFieldModule, typeof i1.MatCommonModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatInputModule, never, [typeof i1.MatCommonModule, typeof i2.MatFormFieldModule, typeof i3_2.MatInput], [typeof i3_2.MatInput, typeof i2.MatFormFieldModule, typeof i4_2.TextFieldModule, typeof i1.MatCommonModule]>;
 }
 
-export { MatLabel }
+// @public
+export class MatLabel {
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatLabel, "mat-label", never, {}, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatLabel, never>;
+}
 
-export { MatPrefix }
+// @public
+export class MatPrefix {
+    // (undocumented)
+    _isText: boolean;
+    // (undocumented)
+    set _isTextSelector(value: '');
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatPrefix, "[matPrefix], [matIconPrefix], [matTextPrefix]", never, { "_isTextSelector": { "alias": "matTextPrefix"; "required": false; }; }, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatPrefix, never>;
+}
 
-export { MatSuffix }
+// @public
+export class MatSuffix {
+    // (undocumented)
+    _isText: boolean;
+    // (undocumented)
+    set _isTextSelector(value: '');
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatSuffix, "[matSuffix], [matIconSuffix], [matTextSuffix]", never, { "_isTextSelector": { "alias": "matTextSuffix"; "required": false; }; }, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatSuffix, never>;
+}
 
 // (No @packageDocumentation comment for this package)
 
diff --git a/tools/public_api_guard/material/list-testing.md b/tools/public_api_guard/material/list-testing.md
index 279f855de780..4f88745e5902 100644
--- a/tools/public_api_guard/material/list-testing.md
+++ b/tools/public_api_guard/material/list-testing.md
@@ -8,10 +8,7 @@ import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
 import { ContentContainerComponentHarness } from '@angular/cdk/testing';
-import { DividerHarnessFilters } from '@angular/material/divider/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatDividerHarness } from '@angular/material/divider/testing';
-import { MatListOptionTogglePosition } from '@angular/material/list';
 
 // @public (undocumented)
 export interface ActionListHarnessFilters extends BaseHarnessFilters {
diff --git a/tools/public_api_guard/material/list.md b/tools/public_api_guard/material/list.md
index b199e2e7c21f..6f3c84294de4 100644
--- a/tools/public_api_guard/material/list.md
+++ b/tools/public_api_guard/material/list.md
@@ -11,20 +11,19 @@ import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/observers';
-import * as i10 from '@angular/material/divider';
-import * as i2 from '@angular/material/core';
+import * as i12 from '@angular/material/divider';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
+import { Injector } from '@angular/core';
+import { MatDivider } from '@angular/material/divider';
 import { NgZone } from '@angular/core';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
+import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
-import { RippleConfig } from '@angular/material/core';
-import { RippleGlobalOptions } from '@angular/material/core';
-import { RippleTarget } from '@angular/material/core';
 import { SelectionModel } from '@angular/cdk/collections';
 import { SimpleChanges } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 
 // @public
 export const MAT_LIST: InjectionToken<MatList>;
@@ -48,6 +47,8 @@ export class MatActionList extends MatListBase {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatActionList, never>;
 }
 
+export { MatDivider }
+
 // @public (undocumented)
 export class MatList extends MatListBase {
     // (undocumented)
@@ -152,7 +153,7 @@ export class MatListModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatListModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatListModule, never, [typeof i1.ObserversModule, typeof i2.MatCommonModule, typeof i2.MatRippleModule, typeof i2.MatPseudoCheckboxModule, typeof i3.MatList, typeof i4.MatActionList, typeof i5.MatNavList, typeof i6.MatSelectionList, typeof i3.MatListItem, typeof i7.MatListOption, typeof i8.MatListSubheaderCssMatStyler, typeof i9.MatListItemAvatar, typeof i9.MatListItemIcon, typeof i9.MatListItemLine, typeof i9.MatListItemTitle, typeof i9.MatListItemMeta], [typeof i3.MatList, typeof i4.MatActionList, typeof i5.MatNavList, typeof i6.MatSelectionList, typeof i3.MatListItem, typeof i7.MatListOption, typeof i9.MatListItemAvatar, typeof i9.MatListItemIcon, typeof i8.MatListSubheaderCssMatStyler, typeof i10.MatDividerModule, typeof i9.MatListItemLine, typeof i9.MatListItemTitle, typeof i9.MatListItemMeta]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatListModule, never, [typeof i1.ObserversModule, typeof i2.MatCommonModule, typeof i3.MatRippleModule, typeof i4.MatPseudoCheckboxModule, typeof i5.MatList, typeof i6.MatActionList, typeof i7.MatNavList, typeof i8.MatSelectionList, typeof i5.MatListItem, typeof i9.MatListOption, typeof i10.MatListSubheaderCssMatStyler, typeof i11.MatListItemAvatar, typeof i11.MatListItemIcon, typeof i11.MatListItemLine, typeof i11.MatListItemTitle, typeof i11.MatListItemMeta], [typeof i5.MatList, typeof i6.MatActionList, typeof i7.MatNavList, typeof i8.MatSelectionList, typeof i5.MatListItem, typeof i9.MatListOption, typeof i11.MatListItemAvatar, typeof i11.MatListItemIcon, typeof i10.MatListSubheaderCssMatStyler, typeof i12.MatDividerModule, typeof i11.MatListItemLine, typeof i11.MatListItemTitle, typeof i11.MatListItemMeta]>;
 }
 
 // @public (undocumented)
diff --git a/tools/public_api_guard/material/menu.md b/tools/public_api_guard/material/menu.md
index 5c8d334ec8ca..fb53375fbf2b 100644
--- a/tools/public_api_guard/material/menu.md
+++ b/tools/public_api_guard/material/menu.md
@@ -7,18 +7,22 @@
 import { AfterContentInit } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
 import { Direction } from '@angular/cdk/bidi';
+import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { FocusableOption } from '@angular/cdk/a11y';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
-import * as i2 from '@angular/cdk/overlay';
-import * as i7 from '@angular/cdk/scrolling';
+import * as i1_2 from '@angular/cdk/bidi';
+import * as i3 from '@angular/cdk/overlay';
+import * as i8 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
+import { Injector } from '@angular/core';
+import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
 import { Overlay } from '@angular/cdk/overlay';
+import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
 import { ScrollStrategy } from '@angular/cdk/overlay';
 import { Subject } from 'rxjs';
@@ -191,7 +195,7 @@ export class MatMenuModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatMenuModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatMenuModule, never, [typeof i1.MatRippleModule, typeof i1.MatCommonModule, typeof i2.OverlayModule, typeof i3.MatMenu, typeof i4.MatMenuItem, typeof i5.MatMenuContent, typeof i6.MatMenuTrigger], [typeof i7.CdkScrollableModule, typeof i3.MatMenu, typeof i1.MatCommonModule, typeof i4.MatMenuItem, typeof i5.MatMenuContent, typeof i6.MatMenuTrigger]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatMenuModule, never, [typeof i1.MatRippleModule, typeof i2.MatCommonModule, typeof i3.OverlayModule, typeof i4.MatMenu, typeof i5.MatMenuItem, typeof i6.MatMenuContent, typeof i7.MatMenuTrigger], [typeof i8.CdkScrollableModule, typeof i4.MatMenu, typeof i2.MatCommonModule, typeof i5.MatMenuItem, typeof i6.MatMenuContent, typeof i7.MatMenuTrigger]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/paginator-testing.md b/tools/public_api_guard/material/paginator-testing.md
index cbdbdb8254e4..8f84fb0d7291 100644
--- a/tools/public_api_guard/material/paginator-testing.md
+++ b/tools/public_api_guard/material/paginator-testing.md
@@ -8,8 +8,8 @@ import { AsyncFactoryFn } from '@angular/cdk/testing';
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
+import { ContentContainerComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatSelectHarness } from '@angular/material/select/testing';
 import { TestElement } from '@angular/cdk/testing';
 
 // @public
diff --git a/tools/public_api_guard/material/paginator.md b/tools/public_api_guard/material/paginator.md
index 078b87634a49..4cdd35ff89ed 100644
--- a/tools/public_api_guard/material/paginator.md
+++ b/tools/public_api_guard/material/paginator.md
@@ -4,19 +4,55 @@
 
 ```ts
 
+import { AbstractControl } from '@angular/forms';
+import { AbstractControlDirective } from '@angular/forms';
+import { ActiveDescendantKeyManager } from '@angular/cdk/a11y';
+import { AfterContentChecked } from '@angular/core';
+import { AfterContentInit } from '@angular/core';
+import { AfterViewChecked } from '@angular/core';
+import { AfterViewInit } from '@angular/core';
+import { BooleanInput } from '@angular/cdk/coercion';
+import { CdkConnectedOverlay } from '@angular/cdk/overlay';
+import { CdkOverlayOrigin } from '@angular/cdk/overlay';
+import { ChangeDetectorRef } from '@angular/core';
+import { ConnectedPosition } from '@angular/cdk/overlay';
+import { ControlValueAccessor } from '@angular/forms';
+import { Directionality } from '@angular/cdk/bidi';
+import { DoCheck } from '@angular/core';
+import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
+import { FocusableOption } from '@angular/cdk/a11y';
+import { FocusOrigin } from '@angular/cdk/a11y';
+import { FormGroupDirective } from '@angular/forms';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/button';
-import * as i2 from '@angular/material/select';
-import * as i3 from '@angular/material/tooltip';
+import * as i1_3 from '@angular/cdk/bidi';
+import * as i1_4 from '@angular/cdk/overlay';
+import * as i1_5 from '@angular/cdk/a11y';
+import * as i2_6 from '@angular/cdk/observers';
+import * as i5_3 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
-import { MatFormFieldAppearance } from '@angular/material/form-field';
+import { Injector } from '@angular/core';
+import { NgControl } from '@angular/forms';
+import { NgForm } from '@angular/forms';
+import { NgZone } from '@angular/core';
+import { NumberInput } from '@angular/cdk/coercion';
 import { Observable } from 'rxjs';
+import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
 import { Optional } from '@angular/core';
+import { OriginConnectionPosition } from '@angular/cdk/overlay';
+import { Overlay } from '@angular/cdk/overlay';
+import { OverlayConnectionPosition } from '@angular/cdk/overlay';
+import { OverlayRef } from '@angular/cdk/overlay';
+import { Platform } from '@angular/cdk/platform';
+import { QueryList } from '@angular/core';
+import { ScrollStrategy } from '@angular/cdk/overlay';
+import { SelectionModel } from '@angular/cdk/collections';
+import { Signal } from '@angular/core';
+import { SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs';
-import { ThemePalette } from '@angular/material/core';
+import { ViewportRuler } from '@angular/cdk/scrolling';
 
 // @public
 export const MAT_PAGINATOR_DEFAULT_OPTIONS: InjectionToken<MatPaginatorDefaultOptions>;
@@ -118,7 +154,7 @@ export class MatPaginatorModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatPaginatorModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatPaginatorModule, never, [typeof i1.MatButtonModule, typeof i2.MatSelectModule, typeof i3.MatTooltipModule, typeof i4.MatPaginator], [typeof i4.MatPaginator]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatPaginatorModule, never, [typeof i1.MatButtonModule, typeof i2_3.MatSelectModule, typeof i3_4.MatTooltipModule, typeof i4_6.MatPaginator], [typeof i4_6.MatPaginator]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/progress-bar.md b/tools/public_api_guard/material/progress-bar.md
index 3005307de1c0..6358a14b2387 100644
--- a/tools/public_api_guard/material/progress-bar.md
+++ b/tools/public_api_guard/material/progress-bar.md
@@ -8,10 +8,9 @@ import { AfterViewInit } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i2 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
 import { OnDestroy } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 
 // @public
 export const MAT_PROGRESS_BAR_DEFAULT_OPTIONS: InjectionToken<MatProgressBarDefaultOptions>;
diff --git a/tools/public_api_guard/material/progress-spinner-testing.md b/tools/public_api_guard/material/progress-spinner-testing.md
index 8f362764daea..30de3e56a6c3 100644
--- a/tools/public_api_guard/material/progress-spinner-testing.md
+++ b/tools/public_api_guard/material/progress-spinner-testing.md
@@ -8,7 +8,6 @@ import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { ProgressSpinnerMode } from '@angular/material/progress-spinner';
 
 // @public
 export class MatProgressSpinnerHarness extends ComponentHarness {
diff --git a/tools/public_api_guard/material/progress-spinner.md b/tools/public_api_guard/material/progress-spinner.md
index f401ed839ddb..c68d44f090f6 100644
--- a/tools/public_api_guard/material/progress-spinner.md
+++ b/tools/public_api_guard/material/progress-spinner.md
@@ -6,9 +6,8 @@
 
 import { ElementRef } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i2 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 
 // @public
 export const MAT_PROGRESS_SPINNER_DEFAULT_OPTIONS: InjectionToken<MatProgressSpinnerDefaultOptions>;
diff --git a/tools/public_api_guard/material/radio.md b/tools/public_api_guard/material/radio.md
index 0c9ca0a8bdd7..5b31dd19860b 100644
--- a/tools/public_api_guard/material/radio.md
+++ b/tools/public_api_guard/material/radio.md
@@ -12,12 +12,14 @@ import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
+import { Injector } from '@angular/core';
+import { NgZone } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
+import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 
 // @public (undocumented)
 export const MAT_RADIO_DEFAULT_OPTIONS: InjectionToken<MatRadioDefaultOptions>;
@@ -165,7 +167,7 @@ export class MatRadioModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatRadioModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatRadioModule, never, [typeof i1.MatCommonModule, typeof i1.MatRippleModule, typeof i2.MatRadioGroup, typeof i2.MatRadioButton], [typeof i1.MatCommonModule, typeof i2.MatRadioGroup, typeof i2.MatRadioButton]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatRadioModule, never, [typeof i1.MatCommonModule, typeof i2.MatRippleModule, typeof i3.MatRadioGroup, typeof i3.MatRadioButton], [typeof i1.MatCommonModule, typeof i3.MatRadioGroup, typeof i3.MatRadioButton]>;
 }
 
 // (No @packageDocumentation comment for this package)
diff --git a/tools/public_api_guard/material/select-testing.md b/tools/public_api_guard/material/select-testing.md
index ac912e6f2665..d585bd768f27 100644
--- a/tools/public_api_guard/material/select-testing.md
+++ b/tools/public_api_guard/material/select-testing.md
@@ -5,13 +5,10 @@
 ```ts
 
 import { BaseHarnessFilters } from '@angular/cdk/testing';
+import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
+import { ContentContainerComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatFormFieldControlHarness } from '@angular/material/form-field/testing/control';
-import { MatOptgroupHarness } from '@angular/material/core/testing';
-import { MatOptionHarness } from '@angular/material/core/testing';
-import { OptgroupHarnessFilters } from '@angular/material/core/testing';
-import { OptionHarnessFilters } from '@angular/material/core/testing';
 
 // @public
 export class MatSelectHarness extends MatFormFieldControlHarness {
diff --git a/tools/public_api_guard/material/select.md b/tools/public_api_guard/material/select.md
index fe7b7fd0ac51..2e409493443f 100644
--- a/tools/public_api_guard/material/select.md
+++ b/tools/public_api_guard/material/select.md
@@ -4,8 +4,14 @@
 
 ```ts
 
+import { AbstractControl } from '@angular/forms';
+import { AbstractControlDirective } from '@angular/forms';
 import { ActiveDescendantKeyManager } from '@angular/cdk/a11y';
+import { AfterContentChecked } from '@angular/core';
 import { AfterContentInit } from '@angular/core';
+import { AfterViewChecked } from '@angular/core';
+import { AfterViewInit } from '@angular/core';
+import { BooleanInput } from '@angular/cdk/coercion';
 import { CdkConnectedOverlay } from '@angular/cdk/overlay';
 import { CdkOverlayOrigin } from '@angular/cdk/overlay';
 import { ChangeDetectorRef } from '@angular/core';
@@ -13,33 +19,30 @@ import { ConnectedPosition } from '@angular/cdk/overlay';
 import { ControlValueAccessor } from '@angular/forms';
 import { DoCheck } from '@angular/core';
 import { ElementRef } from '@angular/core';
-import { ErrorStateMatcher } from '@angular/material/core';
 import { EventEmitter } from '@angular/core';
+import { FocusableOption } from '@angular/cdk/a11y';
+import { FocusOrigin } from '@angular/cdk/a11y';
+import { FormGroupDirective } from '@angular/forms';
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/overlay';
-import * as i2 from '@angular/material/core';
-import * as i4 from '@angular/cdk/scrolling';
-import * as i5 from '@angular/material/form-field';
+import * as i1_3 from '@angular/cdk/bidi';
+import * as i2_4 from '@angular/cdk/observers';
+import * as i5_2 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
-import { MatError } from '@angular/material/form-field';
-import { MatFormField } from '@angular/material/form-field';
-import { MatFormFieldControl } from '@angular/material/form-field';
-import { MatHint } from '@angular/material/form-field';
-import { MatLabel } from '@angular/material/form-field';
-import { MatOptgroup } from '@angular/material/core';
-import { MatOption } from '@angular/material/core';
-import { MatOptionSelectionChange } from '@angular/material/core';
-import { MatPrefix } from '@angular/material/form-field';
-import { MatSuffix } from '@angular/material/form-field';
+import { Injector } from '@angular/core';
 import { NgControl } from '@angular/forms';
+import { NgForm } from '@angular/forms';
+import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
 import { Overlay } from '@angular/cdk/overlay';
+import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
 import { ScrollStrategy } from '@angular/cdk/overlay';
 import { SelectionModel } from '@angular/cdk/collections';
+import { Signal } from '@angular/core';
 import { SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs';
 import { ViewportRuler } from '@angular/cdk/scrolling';
@@ -63,22 +66,193 @@ export function MAT_SELECT_SCROLL_STRATEGY_PROVIDER_FACTORY(overlay: Overlay): (
 // @public
 export const MAT_SELECT_TRIGGER: InjectionToken<MatSelectTrigger>;
 
-export { MatError }
+// @public
+export class MatError {
+    constructor(...args: unknown[]);
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatError, "mat-error, [matError]", never, { "id": { "alias": "id"; "required": false; }; }, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatError, never>;
+}
 
-export { MatFormField }
+// @public
+export class MatFormField implements FloatingLabelParent, AfterContentInit, AfterContentChecked, AfterViewInit, OnDestroy {
+    constructor(...args: unknown[]);
+    _animateAndLockLabel(): void;
+    // (undocumented)
+    protected readonly _animationsDisabled: boolean;
+    get appearance(): MatFormFieldAppearance;
+    set appearance(value: MatFormFieldAppearance);
+    color: ThemePalette;
+    get _control(): MatFormFieldControl<any>;
+    set _control(value: MatFormFieldControl<any>);
+    // (undocumented)
+    _elementRef: ElementRef<any>;
+    // (undocumented)
+    _errorChildren: QueryList<MatError>;
+    // (undocumented)
+    _floatingLabel: MatFormFieldFloatingLabel | undefined;
+    get floatLabel(): FloatLabelType;
+    set floatLabel(value: FloatLabelType);
+    _forceDisplayInfixLabel(): boolean | 0;
+    // (undocumented)
+    _formFieldControl: MatFormFieldControl<any>;
+    getConnectedOverlayOrigin(): ElementRef;
+    _getDisplayedMessages(): 'error' | 'hint';
+    getLabelId: Signal<string | null>;
+    _handleLabelResized(): void;
+    // (undocumented)
+    _hasFloatingLabel: Signal<boolean>;
+    // (undocumented)
+    _hasIconPrefix: boolean;
+    // (undocumented)
+    _hasIconSuffix: boolean;
+    // (undocumented)
+    _hasOutline(): boolean;
+    // (undocumented)
+    _hasTextPrefix: boolean;
+    // (undocumented)
+    _hasTextSuffix: boolean;
+    get hideRequiredMarker(): boolean;
+    set hideRequiredMarker(value: BooleanInput);
+    // (undocumented)
+    _hintChildren: QueryList<MatHint>;
+    get hintLabel(): string;
+    set hintLabel(value: string);
+    // (undocumented)
+    readonly _hintLabelId: string;
+    // (undocumented)
+    _iconPrefixContainer: ElementRef<HTMLElement>;
+    // (undocumented)
+    _iconSuffixContainer: ElementRef<HTMLElement>;
+    // (undocumented)
+    readonly _labelId: string;
+    // (undocumented)
+    _lineRipple: MatFormFieldLineRipple | undefined;
+    // (undocumented)
+    ngAfterContentChecked(): void;
+    // (undocumented)
+    ngAfterContentInit(): void;
+    // (undocumented)
+    ngAfterViewInit(): void;
+    // (undocumented)
+    ngOnDestroy(): void;
+    // (undocumented)
+    _notchedOutline: MatFormFieldNotchedOutline | undefined;
+    // (undocumented)
+    _prefixChildren: QueryList<MatPrefix>;
+    _refreshOutlineNotchWidth(): void;
+    _shouldAlwaysFloat(): boolean;
+    _shouldForward(prop: keyof AbstractControlDirective): boolean;
+    // (undocumented)
+    _shouldLabelFloat(): boolean;
+    get subscriptSizing(): SubscriptSizing;
+    set subscriptSizing(value: SubscriptSizing);
+    // (undocumented)
+    _suffixChildren: QueryList<MatSuffix>;
+    // (undocumented)
+    _textField: ElementRef<HTMLElement>;
+    // (undocumented)
+    _textPrefixContainer: ElementRef<HTMLElement>;
+    // (undocumented)
+    _textSuffixContainer: ElementRef<HTMLElement>;
+    // (undocumented)
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatFormField, "mat-form-field", ["matFormField"], { "hideRequiredMarker": { "alias": "hideRequiredMarker"; "required": false; }; "color": { "alias": "color"; "required": false; }; "floatLabel": { "alias": "floatLabel"; "required": false; }; "appearance": { "alias": "appearance"; "required": false; }; "subscriptSizing": { "alias": "subscriptSizing"; "required": false; }; "hintLabel": { "alias": "hintLabel"; "required": false; }; }, {}, ["_labelChild", "_formFieldControl", "_prefixChildren", "_suffixChildren", "_errorChildren", "_hintChildren"], ["mat-label", "[matPrefix], [matIconPrefix]", "[matTextPrefix]", "*", "[matTextSuffix]", "[matSuffix], [matIconSuffix]", "mat-error, [matError]", "mat-hint:not([align='end'])", "mat-hint[align='end']"], true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatFormField, never>;
+}
 
-export { MatHint }
+// @public
+export class MatHint {
+    align: 'start' | 'end';
+    id: string;
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatHint, "mat-hint", never, { "align": { "alias": "align"; "required": false; }; "id": { "alias": "id"; "required": false; }; }, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatHint, never>;
+}
 
-export { MatLabel }
+// @public
+export class MatLabel {
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatLabel, "mat-label", never, {}, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatLabel, never>;
+}
 
-export { MatOptgroup }
+// @public
+export class MatOptgroup {
+    constructor(...args: unknown[]);
+    disabled: boolean;
+    _inert: boolean;
+    label: string;
+    _labelId: string;
+    // (undocumented)
+    static ngAcceptInputType_disabled: unknown;
+    // (undocumented)
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatOptgroup, "mat-optgroup", ["matOptgroup"], { "label": { "alias": "label"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, {}, never, ["*", "mat-option, ng-container"], true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatOptgroup, never>;
+}
 
-export { MatOption }
+// @public
+export class MatOption<T = any> implements FocusableOption, AfterViewChecked, OnDestroy {
+    constructor(...args: unknown[]);
+    get active(): boolean;
+    // (undocumented)
+    _changeDetectorRef: ChangeDetectorRef;
+    deselect(emitEvent?: boolean): void;
+    get disabled(): boolean;
+    set disabled(value: boolean);
+    get disableRipple(): boolean;
+    focus(_origin?: FocusOrigin, options?: FocusOptions): void;
+    _getHostElement(): HTMLElement;
+    getLabel(): string;
+    _getTabIndex(): string;
+    // (undocumented)
+    group: MatOptgroup | null;
+    _handleKeydown(event: KeyboardEvent): void;
+    get hideSingleSelectionIndicator(): boolean;
+    id: string;
+    get multiple(): boolean | null | undefined;
+    // (undocumented)
+    static ngAcceptInputType_disabled: unknown;
+    // (undocumented)
+    ngAfterViewChecked(): void;
+    // (undocumented)
+    ngOnDestroy(): void;
+    readonly onSelectionChange: EventEmitter<MatOptionSelectionChange<T>>;
+    select(emitEvent?: boolean): void;
+    get selected(): boolean;
+    _selectViaInteraction(): void;
+    setActiveStyles(): void;
+    setInactiveStyles(): void;
+    readonly _stateChanges: Subject<void>;
+    _text: ElementRef<HTMLElement> | undefined;
+    value: T;
+    get viewValue(): string;
+    // (undocumented)
+    static ɵcmp: i0.ɵɵComponentDeclaration<MatOption<any>, "mat-option", ["matOption"], { "value": { "alias": "value"; "required": false; }; "id": { "alias": "id"; "required": false; }; "disabled": { "alias": "disabled"; "required": false; }; }, { "onSelectionChange": "onSelectionChange"; }, never, ["mat-icon", "*"], true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatOption<any>, never>;
+}
 
-export { MatPrefix }
+// @public
+export class MatPrefix {
+    // (undocumented)
+    _isText: boolean;
+    // (undocumented)
+    set _isTextSelector(value: '');
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatPrefix, "[matPrefix], [matIconPrefix], [matTextPrefix]", never, { "_isTextSelector": { "alias": "matTextPrefix"; "required": false; }; }, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatPrefix, never>;
+}
 
 // @public (undocumented)
-export class MatSelect implements AfterContentInit, OnChanges, OnDestroy, OnInit, DoCheck, ControlValueAccessor, MatFormFieldControl<any> {
+export class MatSelect implements AfterContentInit, OnChanges, OnDestroy, OnInit, DoCheck, ControlValueAccessor, MatFormFieldControl_2<any> {
     constructor(...args: unknown[]);
     // (undocumented)
     protected _animationsDisabled: boolean;
@@ -247,7 +421,7 @@ export class MatSelectModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatSelectModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatSelectModule, never, [typeof i1.OverlayModule, typeof i2.MatOptionModule, typeof i2.MatCommonModule, typeof i3.MatSelect, typeof i3.MatSelectTrigger], [typeof i4.CdkScrollableModule, typeof i5.MatFormFieldModule, typeof i3.MatSelect, typeof i3.MatSelectTrigger, typeof i2.MatOptionModule, typeof i2.MatCommonModule]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatSelectModule, never, [typeof i1.OverlayModule, typeof i2.MatOptionModule, typeof i3.MatCommonModule, typeof i4_2.MatSelect, typeof i4_2.MatSelectTrigger], [typeof i5_2.CdkScrollableModule, typeof i6.MatFormFieldModule, typeof i4_2.MatSelect, typeof i4_2.MatSelectTrigger, typeof i2.MatOptionModule, typeof i3.MatCommonModule]>;
 }
 
 // @public
@@ -258,7 +432,17 @@ export class MatSelectTrigger {
     static ɵfac: i0.ɵɵFactoryDeclaration<MatSelectTrigger, never>;
 }
 
-export { MatSuffix }
+// @public
+export class MatSuffix {
+    // (undocumented)
+    _isText: boolean;
+    // (undocumented)
+    set _isTextSelector(value: '');
+    // (undocumented)
+    static ɵdir: i0.ɵɵDirectiveDeclaration<MatSuffix, "[matSuffix], [matIconSuffix], [matTextSuffix]", never, { "_isTextSelector": { "alias": "matTextSuffix"; "required": false; }; }, {}, never, never, true, never>;
+    // (undocumented)
+    static ɵfac: i0.ɵɵFactoryDeclaration<MatSuffix, never>;
+}
 
 // (No @packageDocumentation comment for this package)
 
diff --git a/tools/public_api_guard/material/sidenav.md b/tools/public_api_guard/material/sidenav.md
index cb4ad744edeb..7ba58a1fd8c6 100644
--- a/tools/public_api_guard/material/sidenav.md
+++ b/tools/public_api_guard/material/sidenav.md
@@ -13,7 +13,7 @@ import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import * as i2 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
 import { NumberInput } from '@angular/cdk/coercion';
diff --git a/tools/public_api_guard/material/slide-toggle.md b/tools/public_api_guard/material/slide-toggle.md
index ecae09c3fa7a..10e7e7f7d802 100644
--- a/tools/public_api_guard/material/slide-toggle.md
+++ b/tools/public_api_guard/material/slide-toggle.md
@@ -12,12 +12,11 @@ import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import { FocusMonitor } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import * as i2 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { SimpleChanges } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 import { ValidationErrors } from '@angular/forms';
 import { Validator } from '@angular/forms';
 
diff --git a/tools/public_api_guard/material/slider.md b/tools/public_api_guard/material/slider.md
index 3ef7b8ab020b..63142ec5927d 100644
--- a/tools/public_api_guard/material/slider.md
+++ b/tools/public_api_guard/material/slider.md
@@ -11,14 +11,15 @@ import { Directionality } from '@angular/cdk/bidi';
 import { ElementRef } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
-import { MatRipple } from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
+import { InjectionToken } from '@angular/core';
+import { Injector } from '@angular/core';
 import { NgZone } from '@angular/core';
 import { OnDestroy } from '@angular/core';
+import { OnInit } from '@angular/core';
+import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
-import { RippleGlobalOptions } from '@angular/material/core';
 import { Subject } from 'rxjs';
-import { ThemePalette } from '@angular/material/core';
 import { WritableSignal } from '@angular/core';
 
 // @public
@@ -147,7 +148,7 @@ export class MatSliderModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatSliderModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatSliderModule, never, [typeof i1.MatCommonModule, typeof i1.MatRippleModule, typeof i2.MatSlider, typeof i3.MatSliderThumb, typeof i3.MatSliderRangeThumb, typeof i4.MatSliderVisualThumb], [typeof i2.MatSlider, typeof i3.MatSliderThumb, typeof i3.MatSliderRangeThumb]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatSliderModule, never, [typeof i1.MatCommonModule, typeof i2.MatRippleModule, typeof i3.MatSlider, typeof i4.MatSliderThumb, typeof i4.MatSliderRangeThumb, typeof i5.MatSliderVisualThumb], [typeof i3.MatSlider, typeof i4.MatSliderThumb, typeof i4.MatSliderRangeThumb]>;
 }
 
 // @public (undocumented)
diff --git a/tools/public_api_guard/material/snack-bar.md b/tools/public_api_guard/material/snack-bar.md
index 2203619d11bd..93292847f984 100644
--- a/tools/public_api_guard/material/snack-bar.md
+++ b/tools/public_api_guard/material/snack-bar.md
@@ -4,6 +4,7 @@
 
 ```ts
 
+import { AfterViewInit } from '@angular/core';
 import { AriaLivePoliteness } from '@angular/cdk/a11y';
 import { BasePortalOutlet } from '@angular/cdk/portal';
 import { CdkPortalOutlet } from '@angular/cdk/portal';
@@ -14,15 +15,19 @@ import { Direction } from '@angular/cdk/bidi';
 import { DomPortal } from '@angular/cdk/portal';
 import { ElementRef } from '@angular/core';
 import { EmbeddedViewRef } from '@angular/core';
+import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/overlay';
+import * as i1_2 from '@angular/cdk/bidi';
 import * as i2 from '@angular/cdk/portal';
-import * as i3 from '@angular/material/button';
-import * as i4 from '@angular/material/core';
 import { InjectionToken } from '@angular/core';
+import { Injector } from '@angular/core';
+import { NgZone } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { OverlayRef } from '@angular/cdk/overlay';
+import { Platform } from '@angular/cdk/platform';
 import { Subject } from 'rxjs';
 import { TemplatePortal } from '@angular/cdk/portal';
 import { TemplateRef } from '@angular/core';
@@ -144,7 +149,7 @@ export class MatSnackBarModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatSnackBarModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatSnackBarModule, never, [typeof i1.OverlayModule, typeof i2.PortalModule, typeof i3.MatButtonModule, typeof i4.MatCommonModule, typeof i5.SimpleSnackBar, typeof i6.MatSnackBarContainer, typeof i7.MatSnackBarLabel, typeof i7.MatSnackBarActions, typeof i7.MatSnackBarAction], [typeof i4.MatCommonModule, typeof i6.MatSnackBarContainer, typeof i7.MatSnackBarLabel, typeof i7.MatSnackBarActions, typeof i7.MatSnackBarAction]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatSnackBarModule, never, [typeof i1.OverlayModule, typeof i2.PortalModule, typeof i3.MatButtonModule, typeof i4.MatCommonModule, typeof i5_2.SimpleSnackBar, typeof i6.MatSnackBarContainer, typeof i7.MatSnackBarLabel, typeof i7.MatSnackBarActions, typeof i7.MatSnackBarAction], [typeof i4.MatCommonModule, typeof i6.MatSnackBarContainer, typeof i7.MatSnackBarLabel, typeof i7.MatSnackBarActions, typeof i7.MatSnackBarAction]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/sort-testing.md b/tools/public_api_guard/material/sort-testing.md
index 968143c9036a..b63afe5d7fe0 100644
--- a/tools/public_api_guard/material/sort-testing.md
+++ b/tools/public_api_guard/material/sort-testing.md
@@ -7,7 +7,6 @@
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { SortDirection } from '@angular/material/sort';
 
 // @public
 export class MatSortHarness extends ComponentHarness {
diff --git a/tools/public_api_guard/material/sort.md b/tools/public_api_guard/material/sort.md
index c90bf778d7f4..a91bf58c79b9 100644
--- a/tools/public_api_guard/material/sort.md
+++ b/tools/public_api_guard/material/sort.md
@@ -7,7 +7,7 @@
 import { AfterViewInit } from '@angular/core';
 import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnChanges } from '@angular/core';
diff --git a/tools/public_api_guard/material/stepper.md b/tools/public_api_guard/material/stepper.md
index 25e9f489d97e..a5be347cd7b0 100644
--- a/tools/public_api_guard/material/stepper.md
+++ b/tools/public_api_guard/material/stepper.md
@@ -6,6 +6,7 @@
 
 import { AbstractControl } from '@angular/forms';
 import { AfterContentInit } from '@angular/core';
+import { AfterViewChecked } from '@angular/core';
 import { AfterViewInit } from '@angular/core';
 import { CdkStep } from '@angular/cdk/stepper';
 import { CdkStepHeader } from '@angular/cdk/stepper';
@@ -14,25 +15,27 @@ import { CdkStepper } from '@angular/cdk/stepper';
 import { CdkStepperNext } from '@angular/cdk/stepper';
 import { CdkStepperPrevious } from '@angular/cdk/stepper';
 import { ElementRef } from '@angular/core';
-import { ErrorStateMatcher } from '@angular/material/core';
 import { EventEmitter } from '@angular/core';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import { FormGroupDirective } from '@angular/forms';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import * as i2 from '@angular/cdk/portal';
 import * as i3 from '@angular/cdk/stepper';
-import * as i4 from '@angular/material/icon';
+import { InjectionToken } from '@angular/core';
+import { Injector } from '@angular/core';
 import { NgForm } from '@angular/forms';
+import { NgZone } from '@angular/core';
 import { OnDestroy } from '@angular/core';
+import { OnInit } from '@angular/core';
 import { Optional } from '@angular/core';
+import { Platform } from '@angular/cdk/platform';
 import { QueryList } from '@angular/core';
 import { StepperOrientation } from '@angular/cdk/stepper';
 import { StepState } from '@angular/cdk/stepper';
 import { Subject } from 'rxjs';
 import { TemplatePortal } from '@angular/cdk/portal';
 import { TemplateRef } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 import { WritableSignal } from '@angular/core';
 
 // @public
@@ -194,7 +197,7 @@ export class MatStepperModule {
     // (undocumented)
     static ɵinj: i0.ɵɵInjectorDeclaration<MatStepperModule>;
     // (undocumented)
-    static ɵmod: i0.ɵɵNgModuleDeclaration<MatStepperModule, never, [typeof i1.MatCommonModule, typeof i2.PortalModule, typeof i3.CdkStepperModule, typeof i4.MatIconModule, typeof i1.MatRippleModule, typeof i5.MatStep, typeof i6.MatStepLabel, typeof i5.MatStepper, typeof i7.MatStepperNext, typeof i7.MatStepperPrevious, typeof i8.MatStepHeader, typeof i9.MatStepperIcon, typeof i10.MatStepContent], [typeof i1.MatCommonModule, typeof i5.MatStep, typeof i6.MatStepLabel, typeof i5.MatStepper, typeof i7.MatStepperNext, typeof i7.MatStepperPrevious, typeof i8.MatStepHeader, typeof i9.MatStepperIcon, typeof i10.MatStepContent]>;
+    static ɵmod: i0.ɵɵNgModuleDeclaration<MatStepperModule, never, [typeof i1.MatCommonModule, typeof i2.PortalModule, typeof i3.CdkStepperModule, typeof i4.MatIconModule, typeof i5.MatRippleModule, typeof i6.MatStep, typeof i7.MatStepLabel, typeof i6.MatStepper, typeof i8.MatStepperNext, typeof i8.MatStepperPrevious, typeof i9.MatStepHeader, typeof i10.MatStepperIcon, typeof i11.MatStepContent], [typeof i1.MatCommonModule, typeof i6.MatStep, typeof i7.MatStepLabel, typeof i6.MatStepper, typeof i8.MatStepperNext, typeof i8.MatStepperPrevious, typeof i9.MatStepHeader, typeof i10.MatStepperIcon, typeof i11.MatStepContent]>;
 }
 
 // @public
diff --git a/tools/public_api_guard/material/table.md b/tools/public_api_guard/material/table.md
index df5d004e5ae3..5850b0de5e82 100644
--- a/tools/public_api_guard/material/table.md
+++ b/tools/public_api_guard/material/table.md
@@ -22,11 +22,16 @@ import { CdkRowDef } from '@angular/cdk/table';
 import { CdkTable } from '@angular/cdk/table';
 import { CdkTextColumn } from '@angular/cdk/table';
 import { DataSource } from '@angular/cdk/collections';
+import { EventEmitter } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import * as i2 from '@angular/cdk/table';
-import { MatPaginator } from '@angular/material/paginator';
-import { MatSort } from '@angular/material/sort';
+import { InjectionToken } from '@angular/core';
+import { Observable } from 'rxjs';
+import { OnChanges } from '@angular/core';
+import { OnDestroy } from '@angular/core';
+import { OnInit } from '@angular/core';
+import { Subject } from 'rxjs';
 import { Subscription } from 'rxjs';
 
 // @public
diff --git a/tools/public_api_guard/material/tabs.md b/tools/public_api_guard/material/tabs.md
index 1f43838d5c80..008a32d7d9b5 100644
--- a/tools/public_api_guard/material/tabs.md
+++ b/tools/public_api_guard/material/tabs.md
@@ -17,20 +17,16 @@ import { EventEmitter } from '@angular/core';
 import { FocusableOption } from '@angular/cdk/a11y';
 import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
 import { InjectionToken } from '@angular/core';
 import { OnChanges } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
 import { QueryList } from '@angular/core';
-import { RippleConfig } from '@angular/material/core';
-import { RippleGlobalOptions } from '@angular/material/core';
-import { RippleTarget } from '@angular/material/core';
 import { SimpleChanges } from '@angular/core';
 import { Subject } from 'rxjs';
 import { TemplatePortal } from '@angular/cdk/portal';
 import { TemplateRef } from '@angular/core';
-import { ThemePalette } from '@angular/material/core';
 
 // @public
 export const _MAT_INK_BAR_POSITIONER: InjectionToken<_MatInkBarPositioner>;
diff --git a/tools/public_api_guard/material/timepicker-testing.md b/tools/public_api_guard/material/timepicker-testing.md
index edd0e626e0b7..e740d3c95a64 100644
--- a/tools/public_api_guard/material/timepicker-testing.md
+++ b/tools/public_api_guard/material/timepicker-testing.md
@@ -7,9 +7,8 @@
 import { BaseHarnessFilters } from '@angular/cdk/testing';
 import { ComponentHarness } from '@angular/cdk/testing';
 import { ComponentHarnessConstructor } from '@angular/cdk/testing';
+import { ContentContainerComponentHarness } from '@angular/cdk/testing';
 import { HarnessPredicate } from '@angular/cdk/testing';
-import { MatOptionHarness } from '@angular/material/core/testing';
-import { OptionHarnessFilters } from '@angular/material/core/testing';
 
 // @public (undocumented)
 export class MatTimepickerHarness extends ComponentHarness {
diff --git a/tools/public_api_guard/material/timepicker.md b/tools/public_api_guard/material/timepicker.md
index 6357d8e23de2..10950f9326d3 100644
--- a/tools/public_api_guard/material/timepicker.md
+++ b/tools/public_api_guard/material/timepicker.md
@@ -5,20 +5,24 @@
 ```ts
 
 import { AbstractControl } from '@angular/forms';
+import { AfterViewChecked } from '@angular/core';
+import { ChangeDetectorRef } from '@angular/core';
 import { ControlValueAccessor } from '@angular/forms';
 import { ElementRef } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { FocusableOption } from '@angular/cdk/a11y';
+import { FocusOrigin } from '@angular/cdk/a11y';
 import * as i0 from '@angular/core';
 import * as i4 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
 import { InputSignal } from '@angular/core';
 import { InputSignalWithTransform } from '@angular/core';
-import { MatOption } from '@angular/material/core';
-import { MatOptionParentComponent } from '@angular/material/core';
 import { ModelSignal } from '@angular/core';
 import { OnDestroy } from '@angular/core';
 import { OutputEmitterRef } from '@angular/core';
 import { ScrollStrategy } from '@angular/cdk/overlay';
 import { Signal } from '@angular/core';
+import { Subject } from 'rxjs';
 import { TemplateRef } from '@angular/core';
 import { ValidationErrors } from '@angular/forms';
 import { Validator } from '@angular/forms';
diff --git a/tools/public_api_guard/material/toolbar.md b/tools/public_api_guard/material/toolbar.md
index 8031848e3fe8..258671c4e091 100644
--- a/tools/public_api_guard/material/toolbar.md
+++ b/tools/public_api_guard/material/toolbar.md
@@ -7,7 +7,8 @@
 import { AfterViewInit } from '@angular/core';
 import { ElementRef } from '@angular/core';
 import * as i0 from '@angular/core';
-import * as i1 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
+import { InjectionToken } from '@angular/core';
 import { QueryList } from '@angular/core';
 
 // @public (undocumented)
diff --git a/tools/public_api_guard/material/tooltip.md b/tools/public_api_guard/material/tooltip.md
index ec2d78bf856e..1a9cfc5d9aee 100644
--- a/tools/public_api_guard/material/tooltip.md
+++ b/tools/public_api_guard/material/tooltip.md
@@ -11,8 +11,8 @@ import { Directionality } from '@angular/cdk/bidi';
 import { ElementRef } from '@angular/core';
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/a11y';
+import * as i1_2 from '@angular/cdk/bidi';
 import * as i2 from '@angular/cdk/overlay';
-import * as i3 from '@angular/material/core';
 import * as i5 from '@angular/cdk/scrolling';
 import { InjectionToken } from '@angular/core';
 import { NumberInput } from '@angular/cdk/coercion';
diff --git a/tools/public_api_guard/material/tree.md b/tools/public_api_guard/material/tree.md
index d63d1c0ee9ca..fca57e62844d 100644
--- a/tools/public_api_guard/material/tree.md
+++ b/tools/public_api_guard/material/tree.md
@@ -17,7 +17,8 @@ import { DataSource } from '@angular/cdk/collections';
 import { FlatTreeControl } from '@angular/cdk/tree';
 import * as i0 from '@angular/core';
 import * as i1 from '@angular/cdk/tree';
-import * as i2 from '@angular/material/core';
+import * as i1_2 from '@angular/cdk/bidi';
+import { InjectionToken } from '@angular/core';
 import { Observable } from 'rxjs';
 import { OnDestroy } from '@angular/core';
 import { OnInit } from '@angular/core';
diff --git a/tslint.json b/tslint.json
index 4315abeda607..001155ea6094 100644
--- a/tslint.json
+++ b/tslint.json
@@ -160,16 +160,6 @@
         "**/*.spec.ts"
       ]
     ],
-    "no-cross-entry-point-relative-imports": [
-      true,
-      [
-        // Files that we don't publish to npm so the relative imports don't matter.
-        "**/+(dev-app|components-examples|ui-patterns|schematics|tools)/**",
-        "**/google-maps/testing/**",
-        "**/cdk/testing/+(tests|private)/**",
-        "**/*.spec.ts"
-      ]
-    ],
     "file-name-casing": [
       true,
       {