diff --git a/.changeset/eleven-pans-turn.md b/.changeset/eleven-pans-turn.md
new file mode 100644
index 0000000000..a929928114
--- /dev/null
+++ b/.changeset/eleven-pans-turn.md
@@ -0,0 +1,17 @@
+---
+'@backstage/plugin-catalog-backend-module-incremental-ingestion': patch
+'@backstage/plugin-search-backend-module-elasticsearch': patch
+'@backstage/backend-dynamic-feature-service': patch
+'@backstage/plugin-catalog-backend-module-puppetdb': patch
+'@backstage/plugin-catalog-backend-module-msgraph': patch
+'@backstage/plugin-catalog-backend-module-ldap': patch
+'@backstage/frontend-app-api': patch
+'@backstage/plugin-permission-common': patch
+'@backstage/plugin-kubernetes-node': patch
+'@backstage/plugin-permission-node': patch
+'@backstage/catalog-model': patch
+'@backstage/plugin-catalog-react': patch
+'@backstage/config': patch
+---
+
+Just some more circular dep cleanup
diff --git a/packages/backend-dynamic-feature-service/src/server/frontendRemotesServer.ts b/packages/backend-dynamic-feature-service/src/server/frontendRemotesServer.ts
index 11c2838691..a12804ba48 100644
--- a/packages/backend-dynamic-feature-service/src/server/frontendRemotesServer.ts
+++ b/packages/backend-dynamic-feature-service/src/server/frontendRemotesServer.ts
@@ -13,14 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 import {
   coreServices,
   createServiceFactory,
   createServiceRef,
 } from '@backstage/backend-plugin-api';
 import { createRouter } from './router';
-import { dynamicPluginsServiceRef } from '../manager';
-import { spec } from '../schema/openapi';
+import { dynamicPluginsServiceRef } from '../manager/plugin-manager';
+import { spec } from '../schema/openapi/generated';
 import { ManifestFileName } from '@module-federation/sdk';
 import { RemoteInfo } from '../schema/openapi/generated/models';
 import { JsonObject } from '@backstage/types';
diff --git a/packages/backend-dynamic-feature-service/src/server/router.ts b/packages/backend-dynamic-feature-service/src/server/router.ts
index 7c533b6c58..9e2fb59c59 100644
--- a/packages/backend-dynamic-feature-service/src/server/router.ts
+++ b/packages/backend-dynamic-feature-service/src/server/router.ts
@@ -19,8 +19,8 @@ import {
   RootConfigService,
 } from '@backstage/backend-plugin-api';
 import express from 'express';
-import { createOpenApiRouter, spec } from '../schema/openapi';
-import { DynamicPluginProvider } from '../manager';
+import { createOpenApiRouter, spec } from '../schema/openapi/generated';
+import { DynamicPluginProvider } from '../manager/types';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as url from 'url';
diff --git a/packages/catalog-model/src/kinds/types.ts b/packages/catalog-model/src/kinds/types.ts
index f4bc151384..f4096b4876 100644
--- a/packages/catalog-model/src/kinds/types.ts
+++ b/packages/catalog-model/src/kinds/types.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { Entity } from '../entity';
+import { Entity } from '../entity/Entity';
 
 /**
  * Validates entities of a certain kind.
diff --git a/packages/catalog-model/src/location/helpers.ts b/packages/catalog-model/src/location/helpers.ts
index a2f4d84f6f..a7eec97196 100644
--- a/packages/catalog-model/src/location/helpers.ts
+++ b/packages/catalog-model/src/location/helpers.ts
@@ -14,7 +14,8 @@
  * limitations under the License.
  */
 
-import { Entity, stringifyEntityRef } from '../entity';
+import { Entity } from '../entity/Entity';
+import { stringifyEntityRef } from '../entity/ref';
 import { ANNOTATION_LOCATION, ANNOTATION_SOURCE_LOCATION } from './annotation';
 
 // See https://github.com/facebook/react/blob/f0cf832e1d0c8544c36aa8b310960885a11a847c/packages/react-dom-bindings/src/shared/sanitizeURL.js
diff --git a/packages/catalog-model/src/validation/entityKindSchemaValidator.ts b/packages/catalog-model/src/validation/entityKindSchemaValidator.ts
index dc5aa586aa..bfeb6f0d0c 100644
--- a/packages/catalog-model/src/validation/entityKindSchemaValidator.ts
+++ b/packages/catalog-model/src/validation/entityKindSchemaValidator.ts
@@ -15,7 +15,7 @@
  */
 
 import { Schema } from 'ajv';
-import { Entity } from '../entity';
+import { Entity } from '../entity/Entity';
 import { compileAjvSchema, throwAjvError } from './ajv';
 
 /**
diff --git a/packages/config/report.api.md b/packages/config/report.api.md
index ea9617b2a3..848687d0cc 100644
--- a/packages/config/report.api.md
+++ b/packages/config/report.api.md
@@ -3,7 +3,6 @@
 > Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
 
 ```ts
-import { Config as Config_2 } from '@backstage/config';
 import { HumanDuration } from '@backstage/types';
 import type { JsonArray as JsonArray_2 } from '@backstage/types';
 import { JsonObject as JsonObject_2 } from '@backstage/types';
@@ -85,7 +84,7 @@ export type JsonValue = JsonValue_2;
 
 // @public
 export function readDurationFromConfig(
-  config: Config_2,
+  config: Config,
   options?: {
     key?: string;
   },
diff --git a/packages/config/src/readDurationFromConfig.ts b/packages/config/src/readDurationFromConfig.ts
index e02651084e..6ee0d39145 100644
--- a/packages/config/src/readDurationFromConfig.ts
+++ b/packages/config/src/readDurationFromConfig.ts
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-import { Config } from '@backstage/config';
 import { InputError, stringifyError } from '@backstage/errors';
 import { HumanDuration } from '@backstage/types';
 import ms from 'ms';
+import { Config } from './types';
 
 export const propsOfHumanDuration = [
   'years',
diff --git a/packages/frontend-app-api/src/tree/resolveAppNodeSpecs.ts b/packages/frontend-app-api/src/tree/resolveAppNodeSpecs.ts
index 399e6ccb7b..5e27d571b5 100644
--- a/packages/frontend-app-api/src/tree/resolveAppNodeSpecs.ts
+++ b/packages/frontend-app-api/src/tree/resolveAppNodeSpecs.ts
@@ -25,7 +25,7 @@ import {
 } from '../../../frontend-plugin-api/src/wiring/createFrontendModule';
 // eslint-disable-next-line @backstage/no-relative-monorepo-imports
 import { toInternalExtension } from '../../../frontend-plugin-api/src/wiring/resolveExtensionDefinition';
-import { FrontendFeature } from '../wiring';
+import { FrontendFeature } from '../wiring/types';
 
 /** @internal */
 export function resolveAppNodeSpecs(options: {
diff --git a/plugins/catalog-backend-module-incremental-ingestion/report.api.md b/plugins/catalog-backend-module-incremental-ingestion/report.api.md
index b1fac447b2..fa69a0987c 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/report.api.md
+++ b/plugins/catalog-backend-module-incremental-ingestion/report.api.md
@@ -8,8 +8,6 @@ import type { DeferredEntity } from '@backstage/plugin-catalog-node';
 import { EventParams } from '@backstage/plugin-events-node';
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { HumanDuration } from '@backstage/types';
-import { IncrementalEntityProvider as IncrementalEntityProvider_2 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
-import { IncrementalEntityProviderOptions as IncrementalEntityProviderOptions_2 } from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
 
 // @public
 const catalogModuleIncrementalIngestionEntityProvider: BackendFeature;
@@ -68,8 +66,8 @@ export interface IncrementalEntityProviderOptions {
 // @public
 export interface IncrementalIngestionProviderExtensionPoint {
   addProvider<TCursor, TContext>(config: {
-    options: IncrementalEntityProviderOptions_2;
-    provider: IncrementalEntityProvider_2<TCursor, TContext>;
+    options: IncrementalEntityProviderOptions;
+    provider: IncrementalEntityProvider<TCursor, TContext>;
   }): void;
 }
 
diff --git a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
index 9e931c11fd..8c18f09798 100644
--- a/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
+++ b/plugins/catalog-backend-module-incremental-ingestion/src/module/catalogModuleIncrementalIngestionEntityProvider.ts
@@ -20,12 +20,12 @@ import {
   createExtensionPoint,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
+import { WrapperProviders } from './WrapperProviders';
+import { eventsServiceRef } from '@backstage/plugin-events-node';
 import {
   IncrementalEntityProvider,
   IncrementalEntityProviderOptions,
-} from '@backstage/plugin-catalog-backend-module-incremental-ingestion';
-import { WrapperProviders } from './WrapperProviders';
-import { eventsServiceRef } from '@backstage/plugin-events-node';
+} from '../types';
 
 /**
  * @public
diff --git a/plugins/catalog-backend-module-ldap/report.api.md b/plugins/catalog-backend-module-ldap/report.api.md
index c5eddd8778..1bcf59affb 100644
--- a/plugins/catalog-backend-module-ldap/report.api.md
+++ b/plugins/catalog-backend-module-ldap/report.api.md
@@ -12,7 +12,6 @@ import { EntityProvider } from '@backstage/plugin-catalog-node';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { GroupEntity } from '@backstage/catalog-model';
-import { GroupTransformer as GroupTransformer_2 } from '@backstage/plugin-catalog-backend-module-ldap';
 import { JsonValue } from '@backstage/types';
 import { LocationSpec } from '@backstage/plugin-catalog-common';
 import { LoggerService } from '@backstage/backend-plugin-api';
@@ -22,7 +21,6 @@ import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugi
 import { SearchEntry } from 'ldapjs';
 import { SearchOptions } from 'ldapjs';
 import { UserEntity } from '@backstage/catalog-model';
-import { UserTransformer as UserTransformer_2 } from '@backstage/plugin-catalog-backend-module-ldap';
 
 // @public
 export type BindConfig = {
@@ -152,10 +150,10 @@ export type LdapOrgEntityProviderOptions =
 // @public
 export interface LdapOrgEntityProviderTransformsExtensionPoint {
   setGroupTransformer(
-    transformer: GroupTransformer_2 | Record<string, GroupTransformer_2>,
+    transformer: GroupTransformer | Record<string, GroupTransformer>,
   ): void;
   setUserTransformer(
-    transformer: UserTransformer_2 | Record<string, UserTransformer_2>,
+    transformer: UserTransformer | Record<string, UserTransformer>,
   ): void;
 }
 
diff --git a/plugins/catalog-backend-module-ldap/src/module.ts b/plugins/catalog-backend-module-ldap/src/module.ts
index ad76b133f1..dd47bf48da 100644
--- a/plugins/catalog-backend-module-ldap/src/module.ts
+++ b/plugins/catalog-backend-module-ldap/src/module.ts
@@ -20,11 +20,8 @@ import {
   createExtensionPoint,
 } from '@backstage/backend-plugin-api';
 import { catalogProcessingExtensionPoint } from '@backstage/plugin-catalog-node/alpha';
-import {
-  GroupTransformer,
-  UserTransformer,
-} from '@backstage/plugin-catalog-backend-module-ldap';
 import { LdapOrgEntityProvider } from './processors';
+import { GroupTransformer, UserTransformer } from './ldap/types';
 
 /**
  * Interface for {@link LdapOrgEntityProviderTransformsExtensionPoint}.
diff --git a/plugins/catalog-backend-module-msgraph/report.api.md b/plugins/catalog-backend-module-msgraph/report.api.md
index 02d3949d04..c6687a638a 100644
--- a/plugins/catalog-backend-module-msgraph/report.api.md
+++ b/plugins/catalog-backend-module-msgraph/report.api.md
@@ -11,18 +11,14 @@ import { EntityProvider } from '@backstage/plugin-catalog-node';
 import { EntityProviderConnection } from '@backstage/plugin-catalog-node';
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { GroupEntity } from '@backstage/catalog-model';
-import { GroupTransformer as GroupTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
 import { LocationSpec } from '@backstage/plugin-catalog-common';
 import { LoggerService } from '@backstage/backend-plugin-api';
 import * as MicrosoftGraph from '@microsoft/microsoft-graph-types';
-import { OrganizationTransformer as OrganizationTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
-import { ProviderConfigTransformer as ProviderConfigTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
 import { SchedulerService } from '@backstage/backend-plugin-api';
 import { SchedulerServiceTaskRunner } from '@backstage/backend-plugin-api';
 import { SchedulerServiceTaskScheduleDefinition } from '@backstage/backend-plugin-api';
 import { TokenCredential } from '@azure/identity';
 import { UserEntity } from '@backstage/catalog-model';
-import { UserTransformer as UserTransformer_2 } from '@backstage/plugin-catalog-backend-module-msgraph';
 
 // @public
 const catalogModuleMicrosoftGraphOrgEntityProvider: BackendFeature;
@@ -184,20 +180,20 @@ export const microsoftGraphOrgEntityProviderTransformExtensionPoint: ExtensionPo
 // @public
 export interface MicrosoftGraphOrgEntityProviderTransformsExtensionPoint {
   setGroupTransformer(
-    transformer: GroupTransformer_2 | Record<string, GroupTransformer_2>,
+    transformer: GroupTransformer | Record<string, GroupTransformer>,
   ): void;
   setOrganizationTransformer(
     transformer:
-      | OrganizationTransformer_2
-      | Record<string, OrganizationTransformer_2>,
+      | OrganizationTransformer
+      | Record<string, OrganizationTransformer>,
   ): void;
   setProviderConfigTransformer(
     transformer:
-      | ProviderConfigTransformer_2
-      | Record<string, ProviderConfigTransformer_2>,
+      | ProviderConfigTransformer
+      | Record<string, ProviderConfigTransformer>,
   ): void;
   setUserTransformer(
-    transformer: UserTransformer_2 | Record<string, UserTransformer_2>,
+    transformer: UserTransformer | Record<string, UserTransformer>,
   ): void;
 }
 
diff --git a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts
index 262c56cf3f..a11748f021 100644
--- a/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts
+++ b/plugins/catalog-backend-module-msgraph/src/module/catalogModuleMicrosoftGraphOrgEntityProvider.ts
@@ -25,7 +25,7 @@ import {
   OrganizationTransformer,
   ProviderConfigTransformer,
   UserTransformer,
-} from '@backstage/plugin-catalog-backend-module-msgraph';
+} from '../microsoftGraph/types';
 import { MicrosoftGraphOrgEntityProvider } from '../processors';
 
 /**
diff --git a/plugins/catalog-backend-module-puppetdb/src/puppet/read.ts b/plugins/catalog-backend-module-puppetdb/src/puppet/read.ts
index 891b19691a..9527ddd774 100644
--- a/plugins/catalog-backend-module-puppetdb/src/puppet/read.ts
+++ b/plugins/catalog-backend-module-puppetdb/src/puppet/read.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { PuppetDbEntityProviderConfig } from '../providers';
+import { PuppetDbEntityProviderConfig } from '../providers/PuppetDbEntityProviderConfig';
 import { PuppetNode, ResourceTransformer } from './types';
 import { ResourceEntity } from '@backstage/catalog-model';
 import { defaultResourceTransformer } from './transformers';
diff --git a/plugins/catalog-react/src/alpha/blueprints/EntityContentBlueprint.ts b/plugins/catalog-react/src/alpha/blueprints/EntityContentBlueprint.ts
index dbfb11092a..4ff9d83282 100644
--- a/plugins/catalog-react/src/alpha/blueprints/EntityContentBlueprint.ts
+++ b/plugins/catalog-react/src/alpha/blueprints/EntityContentBlueprint.ts
@@ -27,7 +27,7 @@ import {
   entityContentGroupDataRef,
   defaultEntityContentGroups,
 } from './extensionData';
-import { EntityPredicate } from '../predicates';
+import { EntityPredicate } from '../predicates/types';
 import { resolveEntityFilterData } from './resolveEntityFilterData';
 import { createEntityPredicateSchema } from '../predicates/createEntityPredicateSchema';
 import { Entity } from '@backstage/catalog-model';
diff --git a/plugins/catalog-react/src/alpha/blueprints/EntityContentLayoutBlueprint.tsx b/plugins/catalog-react/src/alpha/blueprints/EntityContentLayoutBlueprint.tsx
index e529d60685..c13ea8ad56 100644
--- a/plugins/catalog-react/src/alpha/blueprints/EntityContentLayoutBlueprint.tsx
+++ b/plugins/catalog-react/src/alpha/blueprints/EntityContentLayoutBlueprint.tsx
@@ -25,7 +25,7 @@ import {
   EntityCardType,
 } from './extensionData';
 import { JSX } from 'react';
-import { EntityPredicate } from '../predicates';
+import { EntityPredicate } from '../predicates/types';
 import { resolveEntityFilterData } from './resolveEntityFilterData';
 import { createEntityPredicateSchema } from '../predicates/createEntityPredicateSchema';
 import { Entity } from '@backstage/catalog-model';
diff --git a/plugins/catalog-react/src/alpha/blueprints/EntityContextMenuItemBlueprint.tsx b/plugins/catalog-react/src/alpha/blueprints/EntityContextMenuItemBlueprint.tsx
index 470aa13646..4b9b166196 100644
--- a/plugins/catalog-react/src/alpha/blueprints/EntityContextMenuItemBlueprint.tsx
+++ b/plugins/catalog-react/src/alpha/blueprints/EntityContextMenuItemBlueprint.tsx
@@ -24,10 +24,8 @@ import MenuItem from '@material-ui/core/MenuItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
 import ListItemText from '@material-ui/core/ListItemText';
 import { useEntityContextMenu } from '../../hooks/useEntityContextMenu';
-import {
-  EntityPredicate,
-  entityPredicateToFilterFunction,
-} from '../predicates';
+import { EntityPredicate } from '../predicates/types';
+import { entityPredicateToFilterFunction } from '../predicates/entityPredicateToFilterFunction';
 import type { Entity } from '@backstage/catalog-model';
 import { entityFilterFunctionDataRef } from './extensionData';
 import { createEntityPredicateSchema } from '../predicates/createEntityPredicateSchema';
diff --git a/plugins/catalog-react/src/alpha/blueprints/EntityIconLinkBlueprint.tsx b/plugins/catalog-react/src/alpha/blueprints/EntityIconLinkBlueprint.tsx
index 11c9a2b805..2368945c65 100644
--- a/plugins/catalog-react/src/alpha/blueprints/EntityIconLinkBlueprint.tsx
+++ b/plugins/catalog-react/src/alpha/blueprints/EntityIconLinkBlueprint.tsx
@@ -20,7 +20,7 @@ import {
   createExtensionDataRef,
 } from '@backstage/frontend-plugin-api';
 
-import { EntityPredicate } from '../predicates';
+import { EntityPredicate } from '../predicates/types';
 import { createEntityPredicateSchema } from '../predicates/createEntityPredicateSchema';
 
 import {
diff --git a/plugins/catalog-react/src/alpha/converters/convertLegacyEntityCardExtension.tsx b/plugins/catalog-react/src/alpha/converters/convertLegacyEntityCardExtension.tsx
index 2a5dc115d4..fe0c386aea 100644
--- a/plugins/catalog-react/src/alpha/converters/convertLegacyEntityCardExtension.tsx
+++ b/plugins/catalog-react/src/alpha/converters/convertLegacyEntityCardExtension.tsx
@@ -18,9 +18,9 @@ import { compatWrapper } from '@backstage/core-compat-api';
 import { BackstagePlugin, getComponentData } from '@backstage/core-plugin-api';
 import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import { ComponentType } from 'react';
-import { EntityCardBlueprint } from '../blueprints';
+import { EntityCardBlueprint } from '../blueprints/EntityCardBlueprint';
 import kebabCase from 'lodash/kebabCase';
-import { EntityPredicate } from '../predicates';
+import { EntityPredicate } from '../predicates/types';
 import { Entity } from '@backstage/catalog-model';
 
 /** @alpha */
diff --git a/plugins/catalog-react/src/alpha/converters/convertLegacyEntityContentExtension.tsx b/plugins/catalog-react/src/alpha/converters/convertLegacyEntityContentExtension.tsx
index 740427e9b5..719eb9c6d5 100644
--- a/plugins/catalog-react/src/alpha/converters/convertLegacyEntityContentExtension.tsx
+++ b/plugins/catalog-react/src/alpha/converters/convertLegacyEntityContentExtension.tsx
@@ -27,8 +27,8 @@ import { ExtensionDefinition } from '@backstage/frontend-plugin-api';
 import kebabCase from 'lodash/kebabCase';
 import startCase from 'lodash/startCase';
 import { ComponentType } from 'react';
-import { EntityContentBlueprint } from '../blueprints';
-import { EntityPredicate } from '../predicates';
+import { EntityContentBlueprint } from '../blueprints/EntityContentBlueprint';
+import { EntityPredicate } from '../predicates/types';
 import { Entity } from '@backstage/catalog-model';
 
 /** @alpha */
diff --git a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts
index 9e5f44b327..cfd2e451df 100644
--- a/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts
+++ b/plugins/catalog-react/src/alpha/predicates/createEntityPredicateSchema.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { EntityPredicate, EntityPredicateValue } from '.';
+import { EntityPredicate, EntityPredicateValue } from './types';
 import type { z as zImpl, ZodType } from 'zod';
 
 /** @internal */
diff --git a/plugins/kubernetes-node/report.api.md b/plugins/kubernetes-node/report.api.md
index af0c2c599a..5758db9ea1 100644
--- a/plugins/kubernetes-node/report.api.md
+++ b/plugins/kubernetes-node/report.api.md
@@ -5,7 +5,6 @@
 ```ts
 import { AuthenticationStrategy as AuthenticationStrategy_2 } from '@backstage/plugin-kubernetes-node';
 import { BackstageCredentials } from '@backstage/backend-plugin-api';
-import { ClusterDetails as ClusterDetails_2 } from '@backstage/plugin-kubernetes-node';
 import { CustomResourceMatcher } from '@backstage/plugin-kubernetes-common';
 import { Entity } from '@backstage/catalog-model';
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
@@ -256,7 +255,7 @@ export class PinnipedHelper {
   constructor(logger: LoggerService);
   // (undocumented)
   tokenCredentialRequest(
-    clusterDetails: ClusterDetails_2,
+    clusterDetails: ClusterDetails,
     pinnipedParams: PinnipedParameters,
   ): Promise<PinnipedClientCerts>;
 }
diff --git a/plugins/kubernetes-node/src/auth/PinnipedHelper.ts b/plugins/kubernetes-node/src/auth/PinnipedHelper.ts
index 39421ecd62..d6c39d55de 100644
--- a/plugins/kubernetes-node/src/auth/PinnipedHelper.ts
+++ b/plugins/kubernetes-node/src/auth/PinnipedHelper.ts
@@ -15,9 +15,9 @@
  */
 
 import { LoggerService } from '@backstage/backend-plugin-api';
-import { ClusterDetails } from '@backstage/plugin-kubernetes-node';
 import * as https from 'https';
 import fetch, { RequestInit } from 'node-fetch';
+import { ClusterDetails } from '../types/types';
 
 /**
  *
diff --git a/plugins/permission-common/src/types/deprecated.ts b/plugins/permission-common/src/types/deprecated.ts
new file mode 100644
index 0000000000..e2a4e404e4
--- /dev/null
+++ b/plugins/permission-common/src/types/deprecated.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2025 The Backstage Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { EvaluatePermissionRequest, EvaluatePermissionResponse } from './api';
+import { AuthorizeRequestOptions } from './permission';
+
+/**
+ * A client interacting with the permission backend can implement this authorizer interface.
+ * @public
+ * @deprecated Use {@link @backstage/plugin-permission-common#PermissionEvaluator} instead
+ */
+export interface PermissionAuthorizer {
+  authorize(
+    requests: EvaluatePermissionRequest[],
+    options?: AuthorizeRequestOptions,
+  ): Promise<EvaluatePermissionResponse[]>;
+}
diff --git a/plugins/permission-common/src/types/index.ts b/plugins/permission-common/src/types/index.ts
index f5380541df..60a588ffd2 100644
--- a/plugins/permission-common/src/types/index.ts
+++ b/plugins/permission-common/src/types/index.ts
@@ -48,8 +48,8 @@ export type {
   BasicPermission,
   PermissionAttributes,
   Permission,
-  PermissionAuthorizer,
   PermissionBase,
   ResourcePermission,
   AuthorizeRequestOptions,
 } from './permission';
+export type { PermissionAuthorizer } from './deprecated';
diff --git a/plugins/permission-common/src/types/permission.ts b/plugins/permission-common/src/types/permission.ts
index eb1c0eb50d..69a0b0ebbd 100644
--- a/plugins/permission-common/src/types/permission.ts
+++ b/plugins/permission-common/src/types/permission.ts
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-import { EvaluatePermissionRequest, EvaluatePermissionResponse } from './api';
-
 /**
  * The attributes related to a given permission; these should be generic and widely applicable to
  * all permissions in the system.
@@ -88,18 +86,6 @@ export type ResourcePermission<TResourceType extends string = string> =
     }
   >;
 
-/**
- * A client interacting with the permission backend can implement this authorizer interface.
- * @public
- * @deprecated Use {@link @backstage/plugin-permission-common#PermissionEvaluator} instead
- */
-export interface PermissionAuthorizer {
-  authorize(
-    requests: EvaluatePermissionRequest[],
-    options?: AuthorizeRequestOptions,
-  ): Promise<EvaluatePermissionResponse[]>;
-}
-
 /**
  * Options for authorization requests.
  * @public
diff --git a/plugins/permission-node/src/index.ts b/plugins/permission-node/src/index.ts
index 32d71ddeb3..ab97b57021 100644
--- a/plugins/permission-node/src/index.ts
+++ b/plugins/permission-node/src/index.ts
@@ -21,5 +21,5 @@
  */
 export * from './integration';
 export * from './policy';
-export * from './types';
+export type { PermissionRule, PermissionRuleset } from './types';
 export { ServerPermissionClient } from './ServerPermissionClient';
diff --git a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
index 4ee937866b..522e60bac5 100644
--- a/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
+++ b/plugins/permission-node/src/integration/createPermissionIntegrationRouter.ts
@@ -30,9 +30,8 @@ import {
   PermissionCriteria,
   PolicyDecision,
 } from '@backstage/plugin-permission-common';
-import { PermissionRule, PermissionRuleset } from '../types';
+import { NoInfer, PermissionRule, PermissionRuleset } from '../types';
 import {
-  NoInfer,
   createGetRule,
   isAndCriteria,
   isNotCriteria,
diff --git a/plugins/permission-node/src/integration/createPermissionRule.ts b/plugins/permission-node/src/integration/createPermissionRule.ts
index ba6f41145b..36f8205cf8 100644
--- a/plugins/permission-node/src/integration/createPermissionRule.ts
+++ b/plugins/permission-node/src/integration/createPermissionRule.ts
@@ -18,10 +18,9 @@ import {
   PermissionCriteria,
   PermissionRuleParams,
 } from '@backstage/plugin-permission-common';
-import { PermissionRule } from '../types';
+import { NoInfer, PermissionRule } from '../types';
 import { z } from 'zod';
 import { PermissionResourceRef } from './createPermissionResourceRef';
-import { NoInfer } from './util';
 
 /**
  * @public
diff --git a/plugins/permission-node/src/integration/util.ts b/plugins/permission-node/src/integration/util.ts
index 9be90e15fc..c2fa200237 100644
--- a/plugins/permission-node/src/integration/util.ts
+++ b/plugins/permission-node/src/integration/util.ts
@@ -22,14 +22,6 @@ import {
 } from '@backstage/plugin-permission-common';
 import { PermissionRule } from '../types';
 
-/**
- * Prevent use of type parameter from contributing to type inference.
- *
- * https://github.com/Microsoft/TypeScript/issues/14829#issuecomment-980401795
- * @ignore
- */
-export type NoInfer<T> = T extends infer S ? S : never;
-
 /**
  * Utility function used to parse a PermissionCriteria
  * @param criteria - a PermissionCriteria
diff --git a/plugins/permission-node/src/types.ts b/plugins/permission-node/src/types.ts
index b1585d1827..578117a4f1 100644
--- a/plugins/permission-node/src/types.ts
+++ b/plugins/permission-node/src/types.ts
@@ -19,7 +19,15 @@ import type {
   PermissionRuleParams,
 } from '@backstage/plugin-permission-common';
 import { z } from 'zod';
-import { NoInfer } from './integration/util';
+
+/**
+ * Prevent use of type parameter from contributing to type inference.
+ *
+ * https://github.com/Microsoft/TypeScript/issues/14829#issuecomment-980401795
+ *
+ * @ignore
+ */
+export type NoInfer<T> = T extends infer S ? S : never;
 
 /**
  * A conditional rule that can be provided in an
diff --git a/plugins/search-backend-module-elasticsearch/report.api.md b/plugins/search-backend-module-elasticsearch/report.api.md
index 9250cfda31..19c44bd566 100644
--- a/plugins/search-backend-module-elasticsearch/report.api.md
+++ b/plugins/search-backend-module-elasticsearch/report.api.md
@@ -11,7 +11,6 @@ import { BulkHelper } from '@elastic/elasticsearch/lib/Helpers';
 import { BulkStats } from '@elastic/elasticsearch/lib/Helpers';
 import { Config } from '@backstage/config';
 import type { ConnectionOptions } from 'tls';
-import { ElasticSearchQueryTranslator as ElasticSearchQueryTranslator_2 } from '@backstage/plugin-search-backend-module-elasticsearch';
 import { ExtensionPoint } from '@backstage/backend-plugin-api';
 import { IndexableDocument } from '@backstage/plugin-search-common';
 import { IndexableResultSet } from '@backstage/plugin-search-common';
@@ -332,7 +331,7 @@ export type ElasticSearchQueryTranslator = (
 // @public (undocumented)
 export interface ElasticSearchQueryTranslatorExtensionPoint {
   // (undocumented)
-  setTranslator(translator: ElasticSearchQueryTranslator_2): void;
+  setTranslator(translator: ElasticSearchQueryTranslator): void;
 }
 
 // @public
diff --git a/plugins/search-backend-module-elasticsearch/src/module.ts b/plugins/search-backend-module-elasticsearch/src/module.ts
index c5c2a6fc1d..d4ce249093 100644
--- a/plugins/search-backend-module-elasticsearch/src/module.ts
+++ b/plugins/search-backend-module-elasticsearch/src/module.ts
@@ -22,7 +22,7 @@ import { searchEngineRegistryExtensionPoint } from '@backstage/plugin-search-bac
 import {
   ElasticSearchQueryTranslator,
   ElasticSearchSearchEngine,
-} from '@backstage/plugin-search-backend-module-elasticsearch';
+} from './engines/ElasticSearchSearchEngine';
 
 /** @public */
 export interface ElasticSearchQueryTranslatorExtensionPoint {