diff --git a/src/ol/format/GeoJSON.js b/src/ol/format/GeoJSON.js
index 060836f263..6d53add2a1 100644
--- a/src/ol/format/GeoJSON.js
+++ b/src/ol/format/GeoJSON.js
@@ -300,7 +300,7 @@ function readGeometry(object, opt_options) {
 /**
  * @param {GeoJSONGeometryCollection} object Object.
  * @param {import("./Feature.js").ReadOptions=} opt_options Read options.
- * @return {import("../geom/GeometryCollection.js").default} Geometry collection.
+ * @return {GeometryCollection} Geometry collection.
  */
 function readGeometryCollectionGeometry(object, opt_options) {
   const geometries = object['geometries'].map(
@@ -317,7 +317,7 @@ function readGeometryCollectionGeometry(object, opt_options) {
 
 /**
  * @param {GeoJSONPoint} object Object.
- * @return {import("../geom/Point.js").default} Point.
+ * @return {Point} Point.
  */
 function readPointGeometry(object) {
   return new Point(object['coordinates']);
@@ -326,7 +326,7 @@ function readPointGeometry(object) {
 
 /**
  * @param {GeoJSONLineString} object Object.
- * @return {import("../geom/LineString.js").default} LineString.
+ * @return {LineString} LineString.
  */
 function readLineStringGeometry(object) {
   return new LineString(object['coordinates']);
@@ -335,7 +335,7 @@ function readLineStringGeometry(object) {
 
 /**
  * @param {GeoJSONMultiLineString} object Object.
- * @return {import("../geom/MultiLineString.js").default} MultiLineString.
+ * @return {MultiLineString} MultiLineString.
  */
 function readMultiLineStringGeometry(object) {
   return new MultiLineString(object['coordinates']);
@@ -344,7 +344,7 @@ function readMultiLineStringGeometry(object) {
 
 /**
  * @param {GeoJSONMultiPoint} object Object.
- * @return {import("../geom/MultiPoint.js").default} MultiPoint.
+ * @return {MultiPoint} MultiPoint.
  */
 function readMultiPointGeometry(object) {
   return new MultiPoint(object['coordinates']);
@@ -353,7 +353,7 @@ function readMultiPointGeometry(object) {
 
 /**
  * @param {GeoJSONMultiPolygon} object Object.
- * @return {import("../geom/MultiPolygon.js").default} MultiPolygon.
+ * @return {MultiPolygon} MultiPolygon.
  */
 function readMultiPolygonGeometry(object) {
   return new MultiPolygon(object['coordinates']);
@@ -362,7 +362,7 @@ function readMultiPolygonGeometry(object) {
 
 /**
  * @param {GeoJSONPolygon} object Object.
- * @return {import("../geom/Polygon.js").default} Polygon.
+ * @return {Polygon} Polygon.
  */
 function readPolygonGeometry(object) {
   return new Polygon(object['coordinates']);
@@ -382,31 +382,31 @@ function writeGeometry(geometry, opt_options) {
   let geoJSON;
   switch (type) {
     case GeometryType.POINT: {
-      geoJSON = writePointGeometry(/** @type {import("../geom/Point.js").default} */ (geometry), opt_options);
+      geoJSON = writePointGeometry(/** @type {Point} */ (geometry), opt_options);
       break;
     }
     case GeometryType.LINE_STRING: {
-      geoJSON = writeLineStringGeometry(/** @type {import("../geom/LineString.js").default} */ (geometry), opt_options);
+      geoJSON = writeLineStringGeometry(/** @type {LineString} */ (geometry), opt_options);
       break;
     }
     case GeometryType.POLYGON: {
-      geoJSON = writePolygonGeometry(/** @type {import("../geom/Polygon.js").default} */ (geometry), opt_options);
+      geoJSON = writePolygonGeometry(/** @type {Polygon} */ (geometry), opt_options);
       break;
     }
     case GeometryType.MULTI_POINT: {
-      geoJSON = writeMultiPointGeometry(/** @type {import("../geom/MultiPoint.js").default} */ (geometry), opt_options);
+      geoJSON = writeMultiPointGeometry(/** @type {MultiPoint} */ (geometry), opt_options);
       break;
     }
     case GeometryType.MULTI_LINE_STRING: {
-      geoJSON = writeMultiLineStringGeometry(/** @type {import("../geom/MultiLineString.js").default} */ (geometry), opt_options);
+      geoJSON = writeMultiLineStringGeometry(/** @type {MultiLineString} */ (geometry), opt_options);
       break;
     }
     case GeometryType.MULTI_POLYGON: {
-      geoJSON = writeMultiPolygonGeometry(/** @type {import("../geom/MultiPolygon.js").default} */ (geometry), opt_options);
+      geoJSON = writeMultiPolygonGeometry(/** @type {MultiPolygon} */ (geometry), opt_options);
       break;
     }
     case GeometryType.GEOMETRY_COLLECTION: {
-      geoJSON = writeGeometryCollectionGeometry(/** @type {import("../geom/GeometryCollection.js").default} */ (geometry), opt_options);
+      geoJSON = writeGeometryCollectionGeometry(/** @type {GeometryCollection} */ (geometry), opt_options);
       break;
     }
     case GeometryType.CIRCLE: {
@@ -425,7 +425,7 @@ function writeGeometry(geometry, opt_options) {
 
 
 /**
- * @param {import("../geom/GeometryCollection.js").default} geometry Geometry.
+ * @param {GeometryCollection} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions=} opt_options Write options.
  * @return {GeoJSONGeometryCollection} GeoJSON geometry collection.
  */
@@ -443,7 +443,7 @@ function writeGeometryCollectionGeometry(geometry, opt_options) {
 
 
 /**
- * @param {import("../geom/LineString.js").default} geometry Geometry.
+ * @param {LineString} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions=} opt_options Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -456,7 +456,7 @@ function writeLineStringGeometry(geometry, opt_options) {
 
 
 /**
- * @param {import("../geom/MultiLineString.js").default} geometry Geometry.
+ * @param {MultiLineString} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions=} opt_options Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -469,7 +469,7 @@ function writeMultiLineStringGeometry(geometry, opt_options) {
 
 
 /**
- * @param {import("../geom/MultiPoint.js").default} geometry Geometry.
+ * @param {MultiPoint} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions=} opt_options Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -482,7 +482,7 @@ function writeMultiPointGeometry(geometry, opt_options) {
 
 
 /**
- * @param {import("../geom/MultiPolygon.js").default} geometry Geometry.
+ * @param {MultiPolygon} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions=} opt_options Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -499,7 +499,7 @@ function writeMultiPolygonGeometry(geometry, opt_options) {
 
 
 /**
- * @param {import("../geom/Point.js").default} geometry Geometry.
+ * @param {Point} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions=} opt_options Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
@@ -512,7 +512,7 @@ function writePointGeometry(geometry, opt_options) {
 
 
 /**
- * @param {import("../geom/Polygon.js").default} geometry Geometry.
+ * @param {Polygon} geometry Geometry.
  * @param {import("./Feature.js").WriteOptions=} opt_options Write options.
  * @return {GeoJSONGeometry} GeoJSON geometry.
  */
diff --git a/src/ol/render/Feature.js b/src/ol/render/Feature.js
index 48b16ad95a..c7ae4b266e 100644
--- a/src/ol/render/Feature.js
+++ b/src/ol/render/Feature.js
@@ -23,7 +23,7 @@ const tmpTransform = createTransform();
  * structure, optimized for vector tile rendering and styling. Geometry access
  * through the API is limited to getting the type and extent of the geometry.
  *
- * @param {import("../geom/GeometryType.js").default} type Geometry type.
+ * @param {GeometryType} type Geometry type.
  * @param {Array<number>} flatCoordinates Flat coordinates. These always need
  *     to be right-handed for polygons.
  * @param {Array<number>|Array<Array<number>>} ends Ends or Endss.
@@ -46,7 +46,7 @@ class RenderFeature {
 
     /**
     * @private
-    * @type {import("../geom/GeometryType.js").default}
+    * @type {GeometryType}
     */
     this.type_ = type;
 
@@ -216,7 +216,7 @@ class RenderFeature {
 
   /**
   * Get the type of this feature's geometry.
-  * @return {import("../geom/GeometryType.js").default} Geometry type.
+  * @return {GeometryType} Geometry type.
   * @api
   */
   getType() {
diff --git a/src/ol/render/replay.js b/src/ol/render/replay.js
index cce84cfe70..b761c58293 100644
--- a/src/ol/render/replay.js
+++ b/src/ol/render/replay.js
@@ -6,7 +6,7 @@ import ReplayType from '../render/ReplayType.js';
 
 /**
  * @const
- * @type {Array<import("./ReplayType.js").default>}
+ * @type {Array<ReplayType>}
  */
 export const ORDER = [
   ReplayType.POLYGON,
diff --git a/src/ol/source/TileImage.js b/src/ol/source/TileImage.js
index 9e2e9dbd8e..fbe2926469 100644
--- a/src/ol/source/TileImage.js
+++ b/src/ol/source/TileImage.js
@@ -95,7 +95,7 @@ class TileImage extends UrlTile {
 
     /**
      * @protected
-     * @type {function(new: import("../ImageTile.js").default, import("../tilecoord.js").TileCoord, import("../TileState.js").default, string,
+     * @type {function(new: ImageTile, import("../tilecoord.js").TileCoord, TileState, string,
      *        ?string, import("../Tile.js").LoadFunction, import("../Tile.js").Options=)}
      */
     this.tileClass = options.tileClass !== undefined ?
@@ -103,7 +103,7 @@ class TileImage extends UrlTile {
 
     /**
      * @protected
-     * @type {!Object<string, import("../TileCache.js").default>}
+     * @type {!Object<string, TileCache>}
      */
     this.tileCacheForProjection = {};
 
@@ -391,7 +391,7 @@ class TileImage extends UrlTile {
 
 
 /**
- * @param {import("../ImageTile.js").default} imageTile Image tile.
+ * @param {ImageTile} imageTile Image tile.
  * @param {string} src Source.
  */
 function defaultTileLoadFunction(imageTile, src) {
diff --git a/src/ol/source/UTFGrid.js b/src/ol/source/UTFGrid.js
index ba4123451c..74b9b532f4 100644
--- a/src/ol/source/UTFGrid.js
+++ b/src/ol/source/UTFGrid.js
@@ -28,7 +28,7 @@ export class CustomTile extends Tile {
 
   /**
    * @param {import("../tilecoord.js").TileCoord} tileCoord Tile coordinate.
-   * @param {import("../TileState.js").default} state State.
+   * @param {TileState} state State.
    * @param {string} src Image source URI.
    * @param {import("../extent.js").Extent} extent Extent of the tile.
    * @param {boolean} preemptive Load the tile when visible (before it's needed).
diff --git a/src/ol/source/VectorTile.js b/src/ol/source/VectorTile.js
index 410e1835dc..9667a12771 100644
--- a/src/ol/source/VectorTile.js
+++ b/src/ol/source/VectorTile.js
@@ -112,7 +112,7 @@ class VectorTile extends UrlTile {
 
     /**
        * @private
-       * @type {Object<string, import("../VectorTile.js").default>}
+       * @type {Object<string, Tile>}
        */
     this.sourceTiles_ = {};
 
@@ -124,7 +124,7 @@ class VectorTile extends UrlTile {
 
     /**
        * @protected
-       * @type {function(new: import("../VectorTile.js").default, import("../tilecoord.js").TileCoord, import("../TileState.js").default, string,
+       * @type {function(new: Tile, import("../tilecoord.js").TileCoord, TileState, string,
        *        import("../format/Feature.js").default, import("../Tile.js").LoadFunction)}
        */
     this.tileClass = options.tileClass ? options.tileClass : Tile;
diff --git a/src/ol/source/Zoomify.js b/src/ol/source/Zoomify.js
index 25793f712c..5381278a3d 100644
--- a/src/ol/source/Zoomify.js
+++ b/src/ol/source/Zoomify.js
@@ -28,7 +28,7 @@ export class CustomTile extends ImageTile {
   /**
    * @param {import("../tilegrid/TileGrid.js").default} tileGrid TileGrid that the tile belongs to.
    * @param {import("../tilecoord.js").TileCoord} tileCoord Tile coordinate.
-   * @param {import("../TileState.js").default} state State.
+   * @param {TileState} state State.
    * @param {string} src Image source URI.
    * @param {?string} crossOrigin Cross origin.
    * @param {import("../Tile.js").LoadFunction} tileLoadFunction Tile load function.