diff --git a/src/components/alert/alert.ts b/src/components/alert/alert.ts
index a0a55ed81..dd007226b 100644
--- a/src/components/alert/alert.ts
+++ b/src/components/alert/alert.ts
@@ -1,13 +1,13 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
-import '../../components/icon-button/icon-button';
 import { animateTo, stopAnimations } from '../../internal/animate';
 import { emit, waitForEvent } from '../../internal/event';
 import { HasSlotController } from '../../internal/slot';
 import { watch } from '../../internal/watch';
 import { getAnimation, setDefaultAnimation } from '../../utilities/animation-registry';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon-button/icon-button';
 import styles from './alert.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/animated-image/animated-image.ts b/src/components/animated-image/animated-image.ts
index 63d1f8ae2..df3134de5 100644
--- a/src/components/animated-image/animated-image.ts
+++ b/src/components/animated-image/animated-image.ts
@@ -1,8 +1,8 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, query, state } from 'lit/decorators.js';
-import '../../components/icon/icon';
 import { emit } from '../../internal/event';
 import { watch } from '../../internal/watch';
+import '../icon/icon';
 import styles from './animated-image.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/avatar/avatar.ts b/src/components/avatar/avatar.ts
index 852a9203c..43f439714 100644
--- a/src/components/avatar/avatar.ts
+++ b/src/components/avatar/avatar.ts
@@ -1,8 +1,8 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
-import '../../components/icon/icon';
 import { watch } from '../../internal/watch';
+import '../icon/icon';
 import styles from './avatar.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/breadcrumb/breadcrumb.ts b/src/components/breadcrumb/breadcrumb.ts
index 35a07ffc3..042a09c14 100644
--- a/src/components/breadcrumb/breadcrumb.ts
+++ b/src/components/breadcrumb/breadcrumb.ts
@@ -1,9 +1,9 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
-import '../../components/icon/icon';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon/icon';
 import styles from './breadcrumb.styles';
-import type SlBreadcrumbItem from '../../components/breadcrumb-item/breadcrumb-item';
+import type SlBreadcrumbItem from '../breadcrumb-item/breadcrumb-item';
 import type { CSSResultGroup } from 'lit';
 
 /**
diff --git a/src/components/button/button.ts b/src/components/button/button.ts
index 5a21d942d..4bb2eed79 100644
--- a/src/components/button/button.ts
+++ b/src/components/button/button.ts
@@ -3,11 +3,11 @@ import { customElement, property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { html, literal } from 'lit/static-html.js';
-import '../../components/spinner/spinner';
 import { emit } from '../../internal/event';
 import { FormSubmitController } from '../../internal/form';
 import { HasSlotController } from '../../internal/slot';
 import { LocalizeController } from '../../utilities/localize';
+import '../spinner/spinner';
 import styles from './button.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/color-picker/color-picker.ts b/src/components/color-picker/color-picker.ts
index 58c5a5c1c..634ceeea3 100644
--- a/src/components/color-picker/color-picker.ts
+++ b/src/components/color-picker/color-picker.ts
@@ -5,12 +5,6 @@ import { classMap } from 'lit/directives/class-map.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { live } from 'lit/directives/live.js';
 import { styleMap } from 'lit/directives/style-map.js';
-import '../../components/button-group/button-group';
-import '../../components/button/button';
-import '../../components/dropdown/dropdown';
-import '../../components/icon/icon';
-import '../../components/input/input';
-import '../../components/visually-hidden/visually-hidden';
 import { defaultValue } from '../../internal/default-value';
 import { drag } from '../../internal/drag';
 import { emit } from '../../internal/event';
@@ -18,9 +12,15 @@ import { FormSubmitController } from '../../internal/form';
 import { clamp } from '../../internal/math';
 import { watch } from '../../internal/watch';
 import { LocalizeController } from '../../utilities/localize';
+import '../button-group/button-group';
+import '../button/button';
+import '../dropdown/dropdown';
+import '../icon/icon';
+import '../input/input';
+import '../visually-hidden/visually-hidden';
 import styles from './color-picker.styles';
-import type SlDropdown from '../../components/dropdown/dropdown';
-import type SlInput from '../../components/input/input';
+import type SlDropdown from '../dropdown/dropdown';
+import type SlInput from '../input/input';
 import type { CSSResultGroup } from 'lit';
 
 const hasEyeDropper = 'EyeDropper' in window;
diff --git a/src/components/details/details.ts b/src/components/details/details.ts
index 56c420360..8b6dc8595 100644
--- a/src/components/details/details.ts
+++ b/src/components/details/details.ts
@@ -1,12 +1,12 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
-import '../../components/icon/icon';
 import { animateTo, shimKeyframesHeightAuto, stopAnimations } from '../../internal/animate';
 import { emit, waitForEvent } from '../../internal/event';
 import { watch } from '../../internal/watch';
 import { getAnimation, setDefaultAnimation } from '../../utilities/animation-registry';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon/icon';
 import styles from './details.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/dialog/dialog.ts b/src/components/dialog/dialog.ts
index cb8d4e6cb..26e43470b 100644
--- a/src/components/dialog/dialog.ts
+++ b/src/components/dialog/dialog.ts
@@ -2,7 +2,6 @@ import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import '../../components/icon-button/icon-button';
 import { animateTo, stopAnimations } from '../../internal/animate';
 import { emit, waitForEvent } from '../../internal/event';
 import Modal from '../../internal/modal';
@@ -11,6 +10,7 @@ import { HasSlotController } from '../../internal/slot';
 import { watch } from '../../internal/watch';
 import { getAnimation, setDefaultAnimation } from '../../utilities/animation-registry';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon-button/icon-button';
 import styles from './dialog.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/drawer/drawer.ts b/src/components/drawer/drawer.ts
index 9417a2084..fa3bb7c74 100644
--- a/src/components/drawer/drawer.ts
+++ b/src/components/drawer/drawer.ts
@@ -2,7 +2,6 @@ import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
-import '../../components/icon-button/icon-button';
 import { animateTo, stopAnimations } from '../../internal/animate';
 import { emit, waitForEvent } from '../../internal/event';
 import Modal from '../../internal/modal';
@@ -12,6 +11,7 @@ import { uppercaseFirstLetter } from '../../internal/string';
 import { watch } from '../../internal/watch';
 import { getAnimation, setDefaultAnimation } from '../../utilities/animation-registry';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon-button/icon-button';
 import styles from './drawer.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/dropdown/dropdown.ts b/src/components/dropdown/dropdown.ts
index e806c1d1f..4d543dcae 100644
--- a/src/components/dropdown/dropdown.ts
+++ b/src/components/dropdown/dropdown.ts
@@ -10,10 +10,10 @@ import { watch } from '../../internal/watch';
 import { getAnimation, setDefaultAnimation } from '../../utilities/animation-registry';
 import { LocalizeController } from '../../utilities/localize';
 import styles from './dropdown.styles';
-import type SlButton from '../../components/button/button';
-import type SlIconButton from '../../components/icon-button/icon-button';
-import type SlMenuItem from '../../components/menu-item/menu-item';
-import type SlMenu from '../../components/menu/menu';
+import type SlButton from '../button/button';
+import type SlIconButton from '../icon-button/icon-button';
+import type SlMenuItem from '../menu-item/menu-item';
+import type SlMenu from '../menu/menu';
 import type { CSSResultGroup } from 'lit';
 
 /**
diff --git a/src/components/icon-button/icon-button.ts b/src/components/icon-button/icon-button.ts
index 66d872e94..c9416c11c 100644
--- a/src/components/icon-button/icon-button.ts
+++ b/src/components/icon-button/icon-button.ts
@@ -3,8 +3,8 @@ import { customElement, property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { html, literal } from 'lit/static-html.js';
-import '../../components/icon/icon';
 import { emit } from '../../internal/event';
+import '../icon/icon';
 import styles from './icon-button.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/icon/library.ts b/src/components/icon/library.ts
index 2e9713490..2c1dbad65 100644
--- a/src/components/icon/library.ts
+++ b/src/components/icon/library.ts
@@ -1,6 +1,6 @@
 import defaultLibrary from './library.default';
 import systemLibrary from './library.system';
-import type SlIcon from '../../components/icon/icon';
+import type SlIcon from '../icon/icon';
 
 export type IconLibraryResolver = (name: string) => string;
 export type IconLibraryMutator = (svg: SVGElement) => void;
diff --git a/src/components/icon/request.ts b/src/components/icon/request.ts
index 61571eb1e..073b9ae58 100644
--- a/src/components/icon/request.ts
+++ b/src/components/icon/request.ts
@@ -1,4 +1,4 @@
-import { requestInclude } from '../../components/include/request';
+import { requestInclude } from '../include/request';
 
 type IconFile =
   | {
diff --git a/src/components/image-comparer/image-comparer.ts b/src/components/image-comparer/image-comparer.ts
index e20eff51b..d3dadac3a 100644
--- a/src/components/image-comparer/image-comparer.ts
+++ b/src/components/image-comparer/image-comparer.ts
@@ -1,11 +1,11 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { styleMap } from 'lit/directives/style-map.js';
-import '../../components/icon/icon';
 import { drag } from '../../internal/drag';
 import { emit } from '../../internal/event';
 import { clamp } from '../../internal/math';
 import { watch } from '../../internal/watch';
+import '../icon/icon';
 import styles from './image-comparer.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/input/input.ts b/src/components/input/input.ts
index be341cb47..1ebf5c6ca 100644
--- a/src/components/input/input.ts
+++ b/src/components/input/input.ts
@@ -3,13 +3,13 @@ import { customElement, property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { live } from 'lit/directives/live.js';
-import '../../components/icon/icon';
 import { defaultValue } from '../../internal/default-value';
 import { emit } from '../../internal/event';
 import { FormSubmitController } from '../../internal/form';
 import { HasSlotController } from '../../internal/slot';
 import { watch } from '../../internal/watch';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon/icon';
 import styles from './input.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/menu-item/menu-item.ts b/src/components/menu-item/menu-item.ts
index 641741192..4edb91d1b 100644
--- a/src/components/menu-item/menu-item.ts
+++ b/src/components/menu-item/menu-item.ts
@@ -1,10 +1,10 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
-import '../../components/icon/icon';
 import { emit } from '../../internal/event';
 import { getTextContent } from '../../internal/slot';
 import { watch } from '../../internal/watch';
+import '../icon/icon';
 import styles from './menu-item.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/menu/menu.ts b/src/components/menu/menu.ts
index 86aeeb338..e7ca842d2 100644
--- a/src/components/menu/menu.ts
+++ b/src/components/menu/menu.ts
@@ -3,7 +3,7 @@ import { customElement, query } from 'lit/decorators.js';
 import { emit } from '../../internal/event';
 import { getTextContent } from '../../internal/slot';
 import styles from './menu.styles';
-import type SlMenuItem from '../../components/menu-item/menu-item';
+import type SlMenuItem from '../menu-item/menu-item';
 import type { CSSResultGroup } from 'lit';
 export interface MenuSelectEventDetail {
   item: SlMenuItem;
diff --git a/src/components/radio-button/radio-button.test.ts b/src/components/radio-button/radio-button.test.ts
index b6430c7f7..8d55efbb1 100644
--- a/src/components/radio-button/radio-button.test.ts
+++ b/src/components/radio-button/radio-button.test.ts
@@ -1,5 +1,5 @@
 import { expect, fixture, html } from '@open-wc/testing';
-import type SlRadioGroup from '../../components/radio-group/radio-group';
+import type SlRadioGroup from '../radio-group/radio-group';
 import type SlRadioButton from './radio-button';
 
 describe('<sl-radio-button>', () => {
diff --git a/src/components/radio-group/radio-group.ts b/src/components/radio-group/radio-group.ts
index 50d02e299..b70dcf826 100644
--- a/src/components/radio-group/radio-group.ts
+++ b/src/components/radio-group/radio-group.ts
@@ -4,10 +4,10 @@ import { classMap } from 'lit/directives/class-map.js';
 import { emit } from 'src/internal/event';
 import { FormSubmitController } from 'src/internal/form';
 import { watch } from 'src/internal/watch';
-import '../../components/button-group/button-group';
+import '../button-group/button-group';
 import styles from './radio-group.styles';
-import type SlRadio from '../../components/radio/radio';
 import type SlRadioButton from '../radio-button/radio-button';
+import type SlRadio from '../radio/radio';
 import type { CSSResultGroup } from 'lit';
 
 /**
diff --git a/src/components/radio/radio.test.ts b/src/components/radio/radio.test.ts
index 8cdd3aa78..9017b3d2d 100644
--- a/src/components/radio/radio.test.ts
+++ b/src/components/radio/radio.test.ts
@@ -1,5 +1,5 @@
 import { expect, fixture, html } from '@open-wc/testing';
-import type SlRadioGroup from '../../components/radio-group/radio-group';
+import type SlRadioGroup from '../radio-group/radio-group';
 import type SlRadio from './radio';
 
 describe('<sl-radio>', () => {
diff --git a/src/components/rating/rating.ts b/src/components/rating/rating.ts
index c0488035c..3fbd5a9db 100644
--- a/src/components/rating/rating.ts
+++ b/src/components/rating/rating.ts
@@ -3,11 +3,11 @@ import { customElement, property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { styleMap } from 'lit/directives/style-map.js';
 import { unsafeHTML } from 'lit/directives/unsafe-html.js';
-import '../../components/icon/icon';
 import { emit } from '../../internal/event';
 import { clamp } from '../../internal/math';
 import { watch } from '../../internal/watch';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon/icon';
 import styles from './rating.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/select/select.ts b/src/components/select/select.ts
index 69696859e..8d8a30b44 100644
--- a/src/components/select/select.ts
+++ b/src/components/select/select.ts
@@ -1,23 +1,23 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
-import '../../components/dropdown/dropdown';
-import '../../components/icon-button/icon-button';
-import '../../components/icon/icon';
-import '../../components/menu/menu';
-import '../../components/tag/tag';
 import { defaultValue } from '../../internal/default-value';
 import { emit } from '../../internal/event';
 import { FormSubmitController } from '../../internal/form';
 import { HasSlotController } from '../../internal/slot';
 import { watch } from '../../internal/watch';
 import { LocalizeController } from '../../utilities/localize';
+import '../dropdown/dropdown';
+import '../icon-button/icon-button';
+import '../icon/icon';
+import '../menu/menu';
+import '../tag/tag';
 import styles from './select.styles';
-import type SlDropdown from '../../components/dropdown/dropdown';
-import type SlIconButton from '../../components/icon-button/icon-button';
-import type SlMenuItem from '../../components/menu-item/menu-item';
-import type { MenuSelectEventDetail } from '../../components/menu/menu';
-import type SlMenu from '../../components/menu/menu';
+import type SlDropdown from '../dropdown/dropdown';
+import type SlIconButton from '../icon-button/icon-button';
+import type SlMenuItem from '../menu-item/menu-item';
+import type { MenuSelectEventDetail } from '../menu/menu';
+import type SlMenu from '../menu/menu';
 import type { TemplateResult, CSSResultGroup } from 'lit';
 
 /**
diff --git a/src/components/tab-group/tab-group.ts b/src/components/tab-group/tab-group.ts
index 684b0adf7..729fef38e 100644
--- a/src/components/tab-group/tab-group.ts
+++ b/src/components/tab-group/tab-group.ts
@@ -1,14 +1,14 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, query, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
-import '../../components/icon-button/icon-button';
 import { emit } from '../../internal/event';
 import { scrollIntoView } from '../../internal/scroll';
 import { watch } from '../../internal/watch';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon-button/icon-button';
 import styles from './tab-group.styles';
-import type SlTabPanel from '../../components/tab-panel/tab-panel';
-import type SlTab from '../../components/tab/tab';
+import type SlTabPanel from '../tab-panel/tab-panel';
+import type SlTab from '../tab/tab';
 import type { CSSResultGroup } from 'lit';
 
 /**
diff --git a/src/components/tab/tab.ts b/src/components/tab/tab.ts
index bca400e5f..2c5a27f9f 100644
--- a/src/components/tab/tab.ts
+++ b/src/components/tab/tab.ts
@@ -1,11 +1,11 @@
 import { html, LitElement } from 'lit';
 import { customElement, property, query } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
-import '../../components/icon-button/icon-button';
 import { autoIncrement } from '../../internal/auto-increment';
 import { emit } from '../../internal/event';
 import { watch } from '../../internal/watch';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon-button/icon-button';
 import styles from './tab.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/tag/tag.ts b/src/components/tag/tag.ts
index 285be10f7..e27b0c03d 100644
--- a/src/components/tag/tag.ts
+++ b/src/components/tag/tag.ts
@@ -1,9 +1,9 @@
 import { html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
-import '../../components/icon-button/icon-button';
 import { emit } from '../../internal/event';
 import { LocalizeController } from '../../utilities/localize';
+import '../icon-button/icon-button';
 import styles from './tag.styles';
 import type { CSSResultGroup } from 'lit';
 
diff --git a/src/components/tooltip/tooltip.ts b/src/components/tooltip/tooltip.ts
index 09f3ae92b..7b6f9fb5c 100644
--- a/src/components/tooltip/tooltip.ts
+++ b/src/components/tooltip/tooltip.ts
@@ -7,6 +7,7 @@ import { emit, waitForEvent } from '../../internal/event';
 import { watch } from '../../internal/watch';
 import { getAnimation, setDefaultAnimation } from '../../utilities/animation-registry';
 import { LocalizeController } from '../../utilities/localize';
+import '../popup/popup';
 import styles from './tooltip.styles';
 import type { CSSResultGroup } from 'lit';
 
@@ -14,6 +15,8 @@ import type { CSSResultGroup } from 'lit';
  * @since 2.0
  * @status stable
  *
+ * @dependency sl-popup
+ *
  * @slot - The tooltip's target element. Only the first element will be used as the target.
  * @slot content - The tooltip's content. Alternatively, you can use the `content` attribute.
  *
diff --git a/src/components/tree-item/tree-item.ts b/src/components/tree-item/tree-item.ts
index c24e132e0..6dc918dd5 100644
--- a/src/components/tree-item/tree-item.ts
+++ b/src/components/tree-item/tree-item.ts
@@ -5,12 +5,12 @@ import { live } from 'lit/directives/live.js';
 import { when } from 'lit/directives/when.js';
 import { animateTo, shimKeyframesHeightAuto, stopAnimations } from 'src/internal/animate';
 import { getAnimation, setDefaultAnimation } from 'src/utilities/animation-registry';
-import '../../components/checkbox/checkbox';
-import '../../components/icon/icon';
-import '../../components/spinner/spinner';
 import { emit } from '../../internal/event';
 import { watch } from '../../internal/watch';
 import { LocalizeController } from '../../utilities/localize';
+import '../checkbox/checkbox';
+import '../icon/icon';
+import '../spinner/spinner';
 import styles from './tree-item.styles';
 import type { PropertyValueMap } from 'lit';