diff --git a/packages/common/src/font-metadata.ts b/packages/common/src/font-metadata.ts
index 8cc59c4d7..de4cc57bf 100644
--- a/packages/common/src/font-metadata.ts
+++ b/packages/common/src/font-metadata.ts
@@ -3,7 +3,7 @@ import type {
   FontFamilyValues,
 } from "@excalidraw/element/types";
 
-import { FONT_FAMILY, FONT_FAMILY_FALLBACKS } from ".";
+import { FONT_FAMILY, FONT_FAMILY_FALLBACKS } from "./constants";
 
 /**
  * Encapsulates font metrics with additional font metadata.
diff --git a/packages/element/src/frame.ts b/packages/element/src/frame.ts
index 576961236..7f40148b7 100644
--- a/packages/element/src/frame.ts
+++ b/packages/element/src/frame.ts
@@ -1,9 +1,7 @@
 import { arrayToMap } from "@excalidraw/common";
 import { isPointWithinBounds, pointFrom } from "@excalidraw/math";
-import {
-  doLineSegmentsIntersect,
-  elementsOverlappingBBox,
-} from "@excalidraw/utils";
+import { doLineSegmentsIntersect } from "@excalidraw/utils/bbox";
+import { elementsOverlappingBBox } from "@excalidraw/utils/withinBounds";
 
 import type { ExcalidrawElementsIncludingDeleted } from "@excalidraw/excalidraw/scene/Scene";
 
diff --git a/packages/utils/src/collision.ts b/packages/utils/src/collision.ts
index 47431511b..b7c155f66 100644
--- a/packages/utils/src/collision.ts
+++ b/packages/utils/src/collision.ts
@@ -12,9 +12,9 @@ import {
 
 import type { Curve } from "@excalidraw/math";
 
-import { pointInEllipse, pointOnEllipse, type GeometricShape } from "./shape";
+import { pointInEllipse, pointOnEllipse } from "./shape";
 
-import type { Polycurve, Polyline } from "./shape";
+import type { Polycurve, Polyline, GeometricShape } from "./shape";
 
 // check if the given point is considered on the given shape's border
 export const isPointOnShape = <Point extends GlobalPoint | LocalPoint>(
diff --git a/packages/utils/src/shape.ts b/packages/utils/src/shape.ts
index 0c802ff53..b750c232e 100644
--- a/packages/utils/src/shape.ts
+++ b/packages/utils/src/shape.ts
@@ -11,6 +11,7 @@
  * also included in this file are methods for converting an Excalidraw element or a Drawable from roughjs
  * to pure shapes
  */
+import { pointsOnBezierCurves } from "points-on-curve";
 
 import { invariant } from "@excalidraw/common";
 import {
@@ -32,7 +33,6 @@ import {
   type GlobalPoint,
   type LocalPoint,
 } from "@excalidraw/math";
-import { pointsOnBezierCurves } from "points-on-curve";
 
 import { getElementAbsoluteCoords } from "@excalidraw/element/bounds";