diff --git a/js/common/model/ModeConfig.ts b/js/common/model/ModeConfig.ts
index f32f48e3..4359c02a 100644
--- a/js/common/model/ModeConfig.ts
+++ b/js/common/model/ModeConfig.ts
@@ -13,7 +13,7 @@ import Vector2 from '../../../../dot/js/Vector2.js';
 import gravityAndOrbits from '../../gravityAndOrbits.js';
 import GravityAndOrbitsClock from './GravityAndOrbitsClock.js';
 import BodyConfiguration from './BodyConfiguration.js';
-import Line from '../../../../kite/js/segments/Line.js';
+import { Line } from '../../../../kite/js/imports.js';
 
 // constants
 const DEFAULT_DT = GravityAndOrbitsClock.DEFAULT_DT;
diff --git a/js/common/view/BodyNode.ts b/js/common/view/BodyNode.ts
index daca02c1..bfed8860 100644
--- a/js/common/view/BodyNode.ts
+++ b/js/common/view/BodyNode.ts
@@ -12,7 +12,7 @@ import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import Body from '../model/Body.js';
 import Property from '../../../../axon/js/Property.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import { DragListener } from '../../../../scenery/js/imports.js';
 import { Line } from '../../../../scenery/js/imports.js';
diff --git a/js/common/view/BodyRenderer.ts b/js/common/view/BodyRenderer.ts
index c68f0630..31e1b339 100644
--- a/js/common/view/BodyRenderer.ts
+++ b/js/common/view/BodyRenderer.ts
@@ -15,7 +15,7 @@
 import Matrix3 from '../../../../dot/js/Matrix3.js';
 import Body from '../model/Body.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import { Image } from '../../../../scenery/js/imports.js';
 import { Node } from '../../../../scenery/js/imports.js';
 import { Path } from '../../../../scenery/js/imports.js';
diff --git a/js/common/view/CheckboxPanel.ts b/js/common/view/CheckboxPanel.ts
index 7d87ff65..020aef03 100644
--- a/js/common/view/CheckboxPanel.ts
+++ b/js/common/view/CheckboxPanel.ts
@@ -9,7 +9,7 @@
 
 import Property from '../../../../axon/js/Property.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import ModelViewTransform2 from '../../../../phetcommon/js/view/ModelViewTransform2.js';
 import ArrowNode from '../../../../scenery-phet/js/ArrowNode.js';
diff --git a/js/common/view/DraggableVectorNode.ts b/js/common/view/DraggableVectorNode.ts
index 2c2909e3..b140ee09 100644
--- a/js/common/view/DraggableVectorNode.ts
+++ b/js/common/view/DraggableVectorNode.ts
@@ -8,7 +8,7 @@
  */
 
 import Property from '../../../../axon/js/Property.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import { DragListener, PressListenerEvent } from '../../../../scenery/js/imports.js';
 import { Path } from '../../../../scenery/js/imports.js';
diff --git a/js/common/view/GravityAndOrbitsGridNode.ts b/js/common/view/GravityAndOrbitsGridNode.ts
index aab77b42..38819111 100644
--- a/js/common/view/GravityAndOrbitsGridNode.ts
+++ b/js/common/view/GravityAndOrbitsGridNode.ts
@@ -8,7 +8,7 @@
  * @author Aaron Davis (PhET Interactive Simulations)
  */
 
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Path } from '../../../../scenery/js/imports.js';
 import { Node } from '../../../../scenery/js/imports.js';
diff --git a/js/common/view/ZoomControl.ts b/js/common/view/ZoomControl.ts
index 7c1777b6..1b9dadf1 100644
--- a/js/common/view/ZoomControl.ts
+++ b/js/common/view/ZoomControl.ts
@@ -11,7 +11,7 @@ import Property from '../../../../axon/js/Property.js';
 import Bounds2 from '../../../../dot/js/Bounds2.js';
 import Range from '../../../../dot/js/Range.js';
 import Dimension2 from '../../../../dot/js/Dimension2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Node } from '../../../../scenery/js/imports.js';
 import { Rectangle } from '../../../../scenery/js/imports.js';