diff --git a/packages/components/src/divider/component.tsx b/packages/components/src/divider/component.tsx
index ef4325d76b9bf..085d2f5f012b7 100644
--- a/packages/components/src/divider/component.tsx
+++ b/packages/components/src/divider/component.tsx
@@ -9,8 +9,11 @@ import type { Ref } from 'react';
 /**
  * Internal dependencies
  */
-import { contextConnect, useContextSystem } from '../ui/context';
-import type { WordPressComponentProps } from '../ui/context';
+import {
+	contextConnect,
+	useContextSystem,
+	WordPressComponentProps,
+} from '../ui/context';
 import { DividerView } from './styles';
 import type { Props } from './types';
 
diff --git a/packages/components/src/heading/hook.ts b/packages/components/src/heading/hook.ts
index 2cbc7695e93d3..238e4e244c0f1 100644
--- a/packages/components/src/heading/hook.ts
+++ b/packages/components/src/heading/hook.ts
@@ -1,8 +1,7 @@
 /**
  * Internal dependencies
  */
-import { useContextSystem } from '../ui/context';
-import type { WordPressComponentProps } from '../ui/context';
+import { useContextSystem, WordPressComponentProps } from '../ui/context';
 import type { Props as TextProps } from '../text/types';
 import { useText } from '../text';
 import { getHeadingFontSize } from '../ui/utils/font-size';
diff --git a/packages/components/src/spacer/hook.ts b/packages/components/src/spacer/hook.ts
index ce4846be7c78e..c833ec90d896a 100644
--- a/packages/components/src/spacer/hook.ts
+++ b/packages/components/src/spacer/hook.ts
@@ -6,8 +6,7 @@ import { css } from '@emotion/react';
 /**
  * Internal dependencies
  */
-import { useContextSystem } from '../ui/context';
-import type { WordPressComponentProps } from '../ui/context';
+import { useContextSystem, WordPressComponentProps } from '../ui/context';
 import { space } from '../ui/utils/space';
 import { useCx } from '../utils/hooks/use-cx';
 import type { Props } from './types';
diff --git a/packages/components/src/ui/shortcut/component.tsx b/packages/components/src/ui/shortcut/component.tsx
index 850a89c00df81..f5bbb6a5d791e 100644
--- a/packages/components/src/ui/shortcut/component.tsx
+++ b/packages/components/src/ui/shortcut/component.tsx
@@ -7,8 +7,11 @@ import type { Ref } from 'react';
 /**
  * Internal dependencies
  */
-import { useContextSystem, contextConnect } from '../context';
-import type { WordPressComponentProps } from '../context';
+import {
+	useContextSystem,
+	contextConnect,
+	WordPressComponentProps,
+} from '../context';
 import { View } from '../../view';
 
 export interface ShortcutDescription {