diff --git a/components/date-picker/style/token.ts b/components/date-picker/style/token.ts
index 84e63ef7ce..44cb3cee05 100644
--- a/components/date-picker/style/token.ts
+++ b/components/date-picker/style/token.ts
@@ -9,10 +9,8 @@ import type {
   GlobalToken,
   FullToken,
   GetDefaultToken,
-} from '../../theme/internal';
-import type {
   TokenWithCommonCls,
-} from '../../theme/util/genComponentStyleHook';
+} from '../../theme/internal';
 
 export interface PanelComponentToken extends MultipleSelectorToken {
   /**
diff --git a/components/modal/style/index.ts b/components/modal/style/index.ts
index eff9487a43..10a1d139de 100644
--- a/components/modal/style/index.ts
+++ b/components/modal/style/index.ts
@@ -9,9 +9,9 @@ import type {
   GenerateStyle,
   GlobalToken,
   GenStyleFn,
+  TokenWithCommonCls,
 } from '../../theme/internal';
 import { genStyleHooks, mergeToken } from '../../theme/internal';
-import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook';
 
 /** Component only token. Which will handle additional calculation of alias token */
 export interface ComponentToken {
diff --git a/components/select/style/multiple.ts b/components/select/style/multiple.ts
index 4eeebacc41..25897936bd 100644
--- a/components/select/style/multiple.ts
+++ b/components/select/style/multiple.ts
@@ -3,8 +3,7 @@ import { unit } from '@ant-design/cssinjs';
 
 import { resetIcon } from '../../style';
 import { mergeToken } from '../../theme/internal';
-import type { AliasToken } from '../../theme/internal';
-import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook';
+import type { AliasToken, TokenWithCommonCls } from '../../theme/internal';
 import type { SelectToken } from './token';
 
 type SelectItemToken = Pick<
diff --git a/components/style/motion/collapse.ts b/components/style/motion/collapse.ts
index 38c4fcf191..37cf3c53ce 100644
--- a/components/style/motion/collapse.ts
+++ b/components/style/motion/collapse.ts
@@ -1,5 +1,4 @@
-import type { AliasToken, GenerateStyle } from '../../theme/internal';
-import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook';
+import type { AliasToken, GenerateStyle, TokenWithCommonCls } from '../../theme/internal';
 
 const genCollapseMotion: GenerateStyle<TokenWithCommonCls<AliasToken>> = (token) => ({
   [token.componentCls]: {
diff --git a/components/style/motion/fade.ts b/components/style/motion/fade.ts
index 547ecf2f5e..f364f3062e 100644
--- a/components/style/motion/fade.ts
+++ b/components/style/motion/fade.ts
@@ -1,8 +1,7 @@
 import type { CSSInterpolation } from '@ant-design/cssinjs';
 import { Keyframes } from '@ant-design/cssinjs';
 
-import type { AliasToken } from '../../theme/internal';
-import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook';
+import type { AliasToken, TokenWithCommonCls } from '../../theme/internal';
 import { initMotion } from './motion';
 
 export const fadeIn = new Keyframes('antFadeIn', {
diff --git a/components/style/motion/move.ts b/components/style/motion/move.ts
index 3159f3c79a..130add57b2 100644
--- a/components/style/motion/move.ts
+++ b/components/style/motion/move.ts
@@ -1,8 +1,7 @@
 import type { CSSInterpolation } from '@ant-design/cssinjs';
 import { Keyframes } from '@ant-design/cssinjs';
 
-import type { AliasToken } from '../../theme/internal';
-import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook';
+import type { AliasToken, TokenWithCommonCls } from '../../theme/internal';
 import { initMotion } from './motion';
 
 export const moveDownIn = new Keyframes('antMoveDownIn', {
diff --git a/components/style/motion/slide.ts b/components/style/motion/slide.ts
index 419aaca0c5..65b96ef051 100644
--- a/components/style/motion/slide.ts
+++ b/components/style/motion/slide.ts
@@ -1,8 +1,7 @@
 import type { CSSInterpolation } from '@ant-design/cssinjs';
 import { Keyframes } from '@ant-design/cssinjs';
 
-import type { AliasToken } from '../../theme/internal';
-import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook';
+import type { AliasToken, TokenWithCommonCls } from '../../theme/internal';
 import { initMotion } from './motion';
 
 export const slideUpIn = new Keyframes('antSlideUpIn', {
diff --git a/components/style/motion/zoom.ts b/components/style/motion/zoom.ts
index a1a6446d87..3be47af4ce 100644
--- a/components/style/motion/zoom.ts
+++ b/components/style/motion/zoom.ts
@@ -1,8 +1,7 @@
 import type { CSSInterpolation } from '@ant-design/cssinjs';
 import { Keyframes } from '@ant-design/cssinjs';
 
-import type { AliasToken } from '../../theme/internal';
-import type { TokenWithCommonCls } from '../../theme/util/genComponentStyleHook';
+import type { AliasToken, TokenWithCommonCls } from '../../theme/internal';
 import { initMotion } from './motion';
 
 export const zoomIn = new Keyframes('antZoomIn', {
diff --git a/components/style/placementArrow.ts b/components/style/placementArrow.ts
index 1d65848b15..38e830416b 100644
--- a/components/style/placementArrow.ts
+++ b/components/style/placementArrow.ts
@@ -1,7 +1,6 @@
 import type { CSSInterpolation, CSSObject } from '@ant-design/cssinjs';
 
-import type { AliasToken } from '../theme/internal';
-import type { TokenWithCommonCls } from '../theme/util/genComponentStyleHook';
+import type { AliasToken, TokenWithCommonCls } from '../theme/internal';
 import type { ArrowToken } from './roundedArrow';
 import { genRoundedArrow } from './roundedArrow';
 
diff --git a/components/theme/internal.ts b/components/theme/internal.ts
index 8f821c687f..46ee5bba10 100644
--- a/components/theme/internal.ts
+++ b/components/theme/internal.ts
@@ -29,7 +29,7 @@ import genComponentStyleHook, {
 import genPresetColor from './util/genPresetColor';
 import useResetIconStyle from './util/useResetIconStyle';
 
-export type { CSSUtil } from '@ant-design/cssinjs-utils';
+export type { CSSUtil, TokenWithCommonCls } from '@ant-design/cssinjs-utils';
 
 export { DesignTokenContext, defaultConfig } from './context';
 export {
diff --git a/components/theme/util/genPresetColor.ts b/components/theme/util/genPresetColor.ts
index 11e8ab6769..ec9dbe4ee8 100644
--- a/components/theme/util/genPresetColor.ts
+++ b/components/theme/util/genPresetColor.ts
@@ -2,8 +2,7 @@
 import type { CSSObject } from '@ant-design/cssinjs';
 
 import { PresetColors } from '../interface';
-import type { AliasToken, PresetColorKey } from '../internal';
-import type { TokenWithCommonCls } from './genComponentStyleHook';
+import type { AliasToken, PresetColorKey, TokenWithCommonCls } from '../internal';
 
 interface CalcColor {
   /** token[`${colorKey}-1`] */