diff --git a/client/src/components/History/Content/model/states.ts b/client/src/components/History/Content/model/states.ts
index 4dc6bd81b8a..2994100c6c0 100644
--- a/client/src/components/History/Content/model/states.ts
+++ b/client/src/components/History/Content/model/states.ts
@@ -1,4 +1,4 @@
-import { components } from "@/api/schema";
+import type { components } from "@/api/schema";
 
 type DatasetState = components["schemas"]["DatasetState"];
 // The 'failed' state is for the collection job state summary, not a dataset state.
diff --git a/client/src/components/History/CurrentCollection/CollectionPanel.vue b/client/src/components/History/CurrentCollection/CollectionPanel.vue
index 551f579c52c..7269918545a 100644
--- a/client/src/components/History/CurrentCollection/CollectionPanel.vue
+++ b/client/src/components/History/CurrentCollection/CollectionPanel.vue
@@ -3,8 +3,8 @@
 <script setup lang="ts">
 import { computed, ref, watch } from "vue";
 
-import type { HistorySummary } from "@/api";
-import { CollectionEntry, DCESummary, isCollectionElement, isHDCA, SubCollection } from "@/api";
+import type { CollectionEntry, DCESummary, HistorySummary, SubCollection } from "@/api";
+import { isCollectionElement, isHDCA } from "@/api";
 import ExpandedItems from "@/components/History/Content/ExpandedItems";
 import { updateContentFields } from "@/components/History/model/queries";
 import { useCollectionElementsStore } from "@/stores/collectionElementsStore";
diff --git a/client/src/stores/collectionAttributesStore.test.ts b/client/src/stores/collectionAttributesStore.test.ts
index 77e0afdb63c..58e28d20851 100644
--- a/client/src/stores/collectionAttributesStore.test.ts
+++ b/client/src/stores/collectionAttributesStore.test.ts
@@ -1,7 +1,7 @@
 import flushPromises from "flush-promises";
 import { createPinia, setActivePinia } from "pinia";
 
-import { DatasetCollectionAttributes } from "@/api";
+import type { DatasetCollectionAttributes } from "@/api";
 import { mockFetcher } from "@/api/schema/__mocks__";
 
 import { useCollectionAttributesStore } from "./collectionAttributesStore";
diff --git a/client/src/stores/collectionAttributesStore.ts b/client/src/stores/collectionAttributesStore.ts
index 2f4e1dcaac8..fcde0198fd0 100644
--- a/client/src/stores/collectionAttributesStore.ts
+++ b/client/src/stores/collectionAttributesStore.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { computed, del, ref, set } from "vue";
 
-import { DatasetCollectionAttributes } from "@/api";
+import type { DatasetCollectionAttributes } from "@/api";
 import { fetchCollectionAttributes } from "@/api/datasetCollections";
 
 export const useCollectionAttributesStore = defineStore("collectionAttributesStore", () => {
diff --git a/client/src/stores/collectionElementsStore.test.ts b/client/src/stores/collectionElementsStore.test.ts
index b4e0a8766c0..b3443528855 100644
--- a/client/src/stores/collectionElementsStore.test.ts
+++ b/client/src/stores/collectionElementsStore.test.ts
@@ -1,7 +1,7 @@
 import flushPromises from "flush-promises";
 import { createPinia, setActivePinia } from "pinia";
 
-import { DCESummary, HDCASummary } from "@/api";
+import type { DCESummary, HDCASummary } from "@/api";
 import { mockFetcher } from "@/api/schema/__mocks__";
 import { DCEEntry, useCollectionElementsStore } from "@/stores/collectionElementsStore";
 
diff --git a/client/src/stores/collectionElementsStore.ts b/client/src/stores/collectionElementsStore.ts
index 3384b3f9d12..ddeb6010201 100644
--- a/client/src/stores/collectionElementsStore.ts
+++ b/client/src/stores/collectionElementsStore.ts
@@ -1,7 +1,8 @@
 import { defineStore } from "pinia";
 import { computed, del, ref, set } from "vue";
 
-import { CollectionEntry, DCESummary, HDCASummary, HistoryContentItemBase, isHDCA } from "@/api";
+import type { CollectionEntry, DCESummary, HDCASummary, HistoryContentItemBase } from "@/api";
+import { isHDCA } from "@/api";
 import { fetchCollectionDetails, fetchElementsFromCollection } from "@/api/datasetCollections";
 
 /**
diff --git a/client/src/stores/datasetStore.ts b/client/src/stores/datasetStore.ts
index 5649c357eb9..4b401a27dff 100644
--- a/client/src/stores/datasetStore.ts
+++ b/client/src/stores/datasetStore.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import Vue, { computed, ref } from "vue";
 
-import { DatasetDetails, DatasetEntry, HistoryContentItemBase } from "@/api";
+import type { DatasetDetails, DatasetEntry, HistoryContentItemBase } from "@/api";
 import { fetchDatasetDetails } from "@/api/datasets";
 
 export const useDatasetStore = defineStore("datasetStore", () => {
diff --git a/client/src/stores/userStore.ts b/client/src/stores/userStore.ts
index 6bd48805c04..849cb491f98 100644
--- a/client/src/stores/userStore.ts
+++ b/client/src/stores/userStore.ts
@@ -1,7 +1,7 @@
 import { defineStore } from "pinia";
 import { computed, ref } from "vue";
 
-import { components } from "@/api/schema";
+import type { components } from "@/api/schema";
 import { useUserLocalStorage } from "@/composables/userLocalStorage";
 import { useHistoryStore } from "@/stores/historyStore";
 import {