diff --git a/packages/SwingSet/src/controller/initializeSwingset.js b/packages/SwingSet/src/controller/initializeSwingset.js
index f7fc0b6186a..8c74aa86154 100644
--- a/packages/SwingSet/src/controller/initializeSwingset.js
+++ b/packages/SwingSet/src/controller/initializeSwingset.js
@@ -17,8 +17,6 @@ import {
   makeXsnapBundleData,
 } from './bundle-handler.js';
 
-import '../types-ambient.js';
-
 /**
  * @import {BundleFormat} from '../types-external.js';
  * @import {SwingSetConfig} from '../types-external.js';
diff --git a/packages/SwingSet/src/kernel/deviceManager.js b/packages/SwingSet/src/kernel/deviceManager.js
index c0035b69bcd..0e958b4b0d7 100644
--- a/packages/SwingSet/src/kernel/deviceManager.js
+++ b/packages/SwingSet/src/kernel/deviceManager.js
@@ -2,8 +2,6 @@ import { assert, Fail } from '@endo/errors';
 import { makeDeviceSlots } from './deviceSlots.js';
 import { insistCapData } from '../lib/capdata.js';
 
-import '../types-ambient.js';
-
 /**
  * @import {DeviceInvocation} from '../types-external.js';
  * @import {DeviceInvocationResult} from '../types-external.js';
diff --git a/packages/SwingSet/src/kernel/vat-loader/manager-helper.js b/packages/SwingSet/src/kernel/vat-loader/manager-helper.js
index 13a074cf118..d388a226b9f 100644
--- a/packages/SwingSet/src/kernel/vat-loader/manager-helper.js
+++ b/packages/SwingSet/src/kernel/vat-loader/manager-helper.js
@@ -1,5 +1,4 @@
 import { assert } from '@endo/errors';
-import '../../types-ambient.js';
 import {
   insistVatDeliveryResult,
   insistVatSyscallResult,
diff --git a/packages/SwingSet/src/supervisors/supervisor-helper.js b/packages/SwingSet/src/supervisors/supervisor-helper.js
index 497f0adcb32..0b14fd445b8 100644
--- a/packages/SwingSet/src/supervisors/supervisor-helper.js
+++ b/packages/SwingSet/src/supervisors/supervisor-helper.js
@@ -2,7 +2,6 @@ import {
   insistVatSyscallObject,
   insistVatSyscallResult,
 } from '../lib/message.js';
-import '../types-ambient.js';
 
 /**
  * @import {CapData} from '@endo/marshal';
diff --git a/packages/SwingSet/src/types-ambient.js b/packages/SwingSet/src/types-ambient.js
deleted file mode 100644
index 080f50cb76a..00000000000
--- a/packages/SwingSet/src/types-ambient.js
+++ /dev/null
@@ -1,14 +0,0 @@
-// XXX this file builds empty when `tsc --build` is run
-
-// XXX all on one line because otherwise tsc puts the `*` in the type name
-/**
- * @import { Bundle, BundleCap, BundleFormat, BundleID, BundleRef, BundleSpec, DeviceInvocation, DeviceInvocationResult, DeviceInvocationResultError, DeviceInvocationResultOk, EndoZipBase64Bundle, GetExportBundle, KernelDeliveryBringOutYourDead, KernelDeliveryChangeVatOptions, KernelDeliveryDropExports, KernelDeliveryMessage, KernelDeliveryNotify, KernelDeliveryObject, KernelDeliveryOneNotify, KernelDeliveryRetireExports, KernelDeliveryRetireImports, KernelDeliveryStartVat, KernelKeeper, KernelOneResolution, KernelOptions, KernelSlog, KernelSyscallDropImports, KernelSyscallExit, KernelSyscallInvoke, KernelSyscallObject, KernelSyscallResolve, KernelSyscallResult, KernelSyscallResultError, KernelSyscallResultOk, KernelSyscallRetireExports, KernelSyscallRetireImports, KernelSyscallSend, KernelSyscallSubscribe, KernelSyscallVatstoreDelete, KernelSyscallVatstoreGet, KernelSyscallVatstoreGetNextKey, KernelSyscallVatstoreSet, ManagerType, Message, MeteringVatPowers, NestedEvaluateBundle, PolicyInput, PolicyInputCrankComplete, PolicyInputCrankFailed, PolicyInputCreateVat, PolicyInputNone, PolicyOutput, ResolutionPolicy, RunPolicy, SlogFinishDelivery, SlogFinishSyscall, SnapshotResult, SnapStore, SourceOfBundle, SourceSpec, StaticVatPowers, SwingSetCapData, SwingSetConfig, SwingSetConfigDescriptor, SwingSetConfigProperties, SwingSetKernelConfig, TerminationVatPowers, VatAdminSvc, VatKeeper, VatPowers, VatSlog, VatStats, WaitUntilQuiescent, XSnap, } from './types-external.js';
- */
-
-/**
- * @import { TranscriptStore, SwingStore, SwingStoreKernelStorage, SwingStoreHostStorage, } from '@agoric/swing-store';
- */
-
-/**
- * @import { KVStore } from '@agoric/internal/src/kv-store.js';
- */
diff --git a/packages/builders/scripts/testing/provokeBOYD.js b/packages/builders/scripts/testing/provokeBOYD.js
index 49b2b3c7422..b9216633de8 100644
--- a/packages/builders/scripts/testing/provokeBOYD.js
+++ b/packages/builders/scripts/testing/provokeBOYD.js
@@ -9,7 +9,6 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
diff --git a/packages/builders/scripts/testing/restart-axelar-gmp.js b/packages/builders/scripts/testing/restart-axelar-gmp.js
index 5742bb89819..c1c176c5f74 100644
--- a/packages/builders/scripts/testing/restart-axelar-gmp.js
+++ b/packages/builders/scripts/testing/restart-axelar-gmp.js
@@ -9,8 +9,6 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 const trace = makeTracer('StartAxelarGmp', true);
 
 /**
diff --git a/packages/builders/scripts/testing/restart-basic-flows.js b/packages/builders/scripts/testing/restart-basic-flows.js
index 3802ff73f4e..556e57b17bb 100644
--- a/packages/builders/scripts/testing/restart-basic-flows.js
+++ b/packages/builders/scripts/testing/restart-basic-flows.js
@@ -9,8 +9,6 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 const trace = makeTracer('RestartBasicFlows', true);
 
 /**
diff --git a/packages/builders/scripts/testing/restart-send-anywhere.js b/packages/builders/scripts/testing/restart-send-anywhere.js
index 5a3ae962ee6..7dd57a735df 100644
--- a/packages/builders/scripts/testing/restart-send-anywhere.js
+++ b/packages/builders/scripts/testing/restart-send-anywhere.js
@@ -9,8 +9,6 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 const trace = makeTracer('StartSA', true);
 
 /**
diff --git a/packages/builders/scripts/testing/restart-stakeAtom.js b/packages/builders/scripts/testing/restart-stakeAtom.js
index 933d9476439..eaac3a2479d 100644
--- a/packages/builders/scripts/testing/restart-stakeAtom.js
+++ b/packages/builders/scripts/testing/restart-stakeAtom.js
@@ -6,8 +6,6 @@ import { deeplyFulfilledObject, makeTracer } from '@agoric/internal';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 const trace = makeTracer('RestartSA', true);
 
 /**
diff --git a/packages/builders/scripts/testing/restart-valueVow.js b/packages/builders/scripts/testing/restart-valueVow.js
index efcc366e66f..55337d904f8 100644
--- a/packages/builders/scripts/testing/restart-valueVow.js
+++ b/packages/builders/scripts/testing/restart-valueVow.js
@@ -5,7 +5,6 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Instance} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {start} from '@agoric/zoe/src/contracts/valueVow.contract.js';
diff --git a/packages/builders/scripts/testing/start-valueVow.js b/packages/builders/scripts/testing/start-valueVow.js
index 6356887a12c..12bc5cd0c5e 100644
--- a/packages/builders/scripts/testing/start-valueVow.js
+++ b/packages/builders/scripts/testing/start-valueVow.js
@@ -5,7 +5,6 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {start} from '@agoric/zoe/src/contracts/valueVow.contract.js';
diff --git a/packages/builders/scripts/testing/upgrade-send-anywhere.js b/packages/builders/scripts/testing/upgrade-send-anywhere.js
index d800edc54c8..90744d58ceb 100644
--- a/packages/builders/scripts/testing/upgrade-send-anywhere.js
+++ b/packages/builders/scripts/testing/upgrade-send-anywhere.js
@@ -9,11 +9,11 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
 /**
  * @import {Installation, Instance} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
  */
 
 const trace = makeTracer('UpgradeSA', true);
diff --git a/packages/client-utils/tsconfig.build.json b/packages/client-utils/tsconfig.build.json
index 6fad9988aed..03c3044b546 100644
--- a/packages/client-utils/tsconfig.build.json
+++ b/packages/client-utils/tsconfig.build.json
@@ -10,9 +10,6 @@
         "emitDeclarationOnly": false,
         "declaration": true,
         "declarationMap": true,
-        "target": "es2022",
-        "module": "es2022",
-        "moduleResolution": "bundler",
         "lib": [
             "es2022",
             "DOM"
diff --git a/packages/deploy-script-support/src/externalTypes.js b/packages/deploy-script-support/src/externalTypes.js
index 7201a2320d0..d65672f0291 100644
--- a/packages/deploy-script-support/src/externalTypes.js
+++ b/packages/deploy-script-support/src/externalTypes.js
@@ -4,6 +4,10 @@ export {};
 
 /**
  * @import {NameHub} from '@agoric/vats';
+ * @import {ScratchPad} from '@agoric/internal/src/scratch.js';
+ * @import {Bank} from '@agoric/vats/src/vat-bank.js';
+ * @import {Board} from '@agoric/vats';
+ * @import {NameAdmin} from '@agoric/vats';
  */
 
 // TODO move this type somewhere better
@@ -67,7 +71,7 @@ export {};
 
 /**
  * @typedef {{
- *   scratch: ERef<import('@agoric/internal/src/scratch.js').ScratchPad>,
+ *   scratch: ERef<ScratchPad>,
  * }} CommonHome
  */
 
@@ -75,10 +79,10 @@ export {};
 /**
  * @typedef {CommonHome & {
  * agoricNames: ERef<NameHub>,
- * bank: ERef<import("@agoric/vats/src/vat-bank.js").Bank>,
- * board: ERef<import("@agoric/vats").Board>,
+ * bank: ERef<Bank>,
+ * board: ERef<Board>,
  * faucet: unknown,
- * myAddressNameAdmin: ERef<import("@agoric/vats").NameAdmin>,
+ * myAddressNameAdmin: ERef<NameAdmin>,
  * namesByAddress: ERef<NameHub>,
  * wallet: any,
  * zoe: ERef<ZoeService>,
diff --git a/packages/governance/test/swingsetTests/contractGovernor/add-governedContract.js b/packages/governance/test/swingsetTests/contractGovernor/add-governedContract.js
index 68654f1abbb..8397cb34114 100644
--- a/packages/governance/test/swingsetTests/contractGovernor/add-governedContract.js
+++ b/packages/governance/test/swingsetTests/contractGovernor/add-governedContract.js
@@ -5,8 +5,6 @@
  *     agoric run /path/to/$0 [<bootstrap powers produce key> [<label>]]
  */
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 /* eslint-disable import/no-extraneous-dependencies */
 // dynamic import { makeHelpers } from '@agoric/deploy-script-support';
 // dynamic import { getSpecifier } from '@agoric/internal/src/module-utils.js';
diff --git a/packages/inter-protocol/src/index.js b/packages/inter-protocol/src/index.js
index 80ac7174be9..5208a577cbc 100644
--- a/packages/inter-protocol/src/index.js
+++ b/packages/inter-protocol/src/index.js
@@ -1,5 +1,4 @@
 // @jessie-check
 /// <reference types="@agoric/internal/exported.js" />
-/// <reference types="@agoric/vats/src/core/types-ambient.js" />
 
 export { calculateCurrentDebt } from './interest-math.js';
diff --git a/packages/inter-protocol/src/interest.js b/packages/inter-protocol/src/interest.js
index fc452d77928..4898d44c155 100644
--- a/packages/inter-protocol/src/interest.js
+++ b/packages/inter-protocol/src/interest.js
@@ -11,8 +11,8 @@ import { TimeMath } from '@agoric/time';
  * @import {RelativeTime} from '@agoric/time'
  * @import {AdminFacet, InvitationAmount, ZCFMint} from '@agoric/zoe';
  * @import {Ratio} from '@agoric/ertp';
- * @import {Calculate, CalculatorKit} from './vaultFactory/types-ambient.js';
- * @import {MintAndTransfer} from './vaultFactory/types-ambient.js';
+ * @import {Calculate, CalculatorKit} from './vaultFactory/types.js';
+ * @import {MintAndTransfer} from './vaultFactory/types.js';
  */
 
 export const SECONDS_PER_YEAR = 60n * 60n * 24n * 365n;
diff --git a/packages/inter-protocol/src/proposals/addAssetToVault.js b/packages/inter-protocol/src/proposals/addAssetToVault.js
index 6203bfa9c69..76995b8292f 100644
--- a/packages/inter-protocol/src/proposals/addAssetToVault.js
+++ b/packages/inter-protocol/src/proposals/addAssetToVault.js
@@ -31,8 +31,8 @@ export * from './startPSM.js';
 
 /**
  * @import {EconomyBootstrapPowers} from './econ-behaviors.js'
- * @import {FullSchedule} from '../auction/scheduler.js';
  * @import {TimerService} from '@agoric/time';
+ * @import {BootstrapPowers} from '@agoric/vats';
  */
 
 /**
diff --git a/packages/inter-protocol/src/proposals/deploy-price-feeds.js b/packages/inter-protocol/src/proposals/deploy-price-feeds.js
index 290acb6d817..dd877ed331c 100644
--- a/packages/inter-protocol/src/proposals/deploy-price-feeds.js
+++ b/packages/inter-protocol/src/proposals/deploy-price-feeds.js
@@ -27,6 +27,7 @@ export const DEFAULT_CONTRACT_TERMS = {
  * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
  * @import {ChainlinkConfig} from '@agoric/inter-protocol/src/price/fluxAggregatorKit.js';
  * @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js';
+ * @import {NamedVatPowers, PromiseSpaceOf} from '@agoric/vats';
  */
 /** @import {FluxStartFn} from '@agoric/inter-protocol/src/price/fluxAggregatorContract.js'; */
 
diff --git a/packages/inter-protocol/src/proposals/econ-behaviors.js b/packages/inter-protocol/src/proposals/econ-behaviors.js
index ba76e434396..68f5965b8d5 100644
--- a/packages/inter-protocol/src/proposals/econ-behaviors.js
+++ b/packages/inter-protocol/src/proposals/econ-behaviors.js
@@ -15,6 +15,12 @@ import { makeGovernedTerms as makeGovernedVFTerms } from '../vaultFactory/params
  * @import {StartedInstanceKit} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {AdminFacet} from '@agoric/zoe';
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {RelativeTime} from '@agoric/time';
+ * @import {WellKnownSpaces} from '@agoric/vats';
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
+ * @import {PromiseSpaceOf} from '@agoric/vats';
+ * @import {CommitteeElectorateCreatorFacet} from '@agoric/governance/src/committee.js';
+ * @import {PeriodicFeeCollector} from '../feeDistributor.js';
  */
 
 // Duplicated from vaultFactory/types-ambient.js to solve a CI problem.
diff --git a/packages/inter-protocol/src/proposals/price-feed-proposal.js b/packages/inter-protocol/src/proposals/price-feed-proposal.js
index abc3672934e..f22c33d041d 100644
--- a/packages/inter-protocol/src/proposals/price-feed-proposal.js
+++ b/packages/inter-protocol/src/proposals/price-feed-proposal.js
@@ -16,6 +16,7 @@ import {
 /**
  * @import {ChainlinkConfig} from '@agoric/inter-protocol/src/price/fluxAggregatorKit.js';
  * @import {EconomyBootstrapPowers} from './econ-behaviors.js';
+ * @import {start} from '@agoric/inter-protocol/src/price/fluxAggregatorContract.js';
  */
 
 // backwards compatibility
@@ -96,7 +97,7 @@ export const ensureOracleBrands = async (
  *       contractTerms: ChainlinkConfig;
  *       IN_BRAND_NAME: string;
  *       OUT_BRAND_NAME: string;
- *       priceAggregatorRef: Installation;
+ *       priceAggregatorRef?: Installation;
  *     };
  *   };
  * }} config
@@ -172,9 +173,7 @@ export const createPriceFeed = async (
   /**
    * @type {[
    *   [Brand<'nat'>, Brand<'nat'>],
-   *   Installation<
-   *     typeof import('@agoric/inter-protocol/src/price/fluxAggregatorContract.js').start
-   *   >,
+   *   Installation<typeof start>,
    *   Timer,
    * ]}
    */
diff --git a/packages/inter-protocol/src/proposals/replace-scaledPriceAuthorities.js b/packages/inter-protocol/src/proposals/replace-scaledPriceAuthorities.js
index 8723af3ce7b..d838134937f 100644
--- a/packages/inter-protocol/src/proposals/replace-scaledPriceAuthorities.js
+++ b/packages/inter-protocol/src/proposals/replace-scaledPriceAuthorities.js
@@ -4,6 +4,11 @@ import { E } from '@endo/far';
 import { startScaledPriceAuthority } from './addAssetToVault.js';
 import { scaledPriceFeedName } from './utils.js';
 
+/**
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
+ */
+
 const trace = makeTracer('replaceScaledPA', true);
 
 /**
diff --git a/packages/inter-protocol/src/proposals/replaceElectorate.js b/packages/inter-protocol/src/proposals/replaceElectorate.js
index efaa4ccd0b1..db5fa03fa58 100644
--- a/packages/inter-protocol/src/proposals/replaceElectorate.js
+++ b/packages/inter-protocol/src/proposals/replaceElectorate.js
@@ -17,7 +17,10 @@ import {
 } from '@agoric/internal/src/lib-chainStorage.js';
 import { provideRetiredInstances, reserveThenDeposit } from './utils.js';
 
-/** @import {EconomyBootstrapPowers} from './econ-behaviors.js' */
+/**
+ * @import {EconomyBootstrapPowers} from './econ-behaviors.js'
+ * @import {PromiseSpaceOf} from '@agoric/vats';
+ */
 /** @import {EconCharterStartResult} from './econ-behaviors.js' */
 /** @import {CommitteeElectorateCreatorFacet} from '@agoric/governance/src/committee.js'; */
 
diff --git a/packages/inter-protocol/src/proposals/startPSM.js b/packages/inter-protocol/src/proposals/startPSM.js
index 8ab917bbb35..6e393ae487c 100644
--- a/packages/inter-protocol/src/proposals/startPSM.js
+++ b/packages/inter-protocol/src/proposals/startPSM.js
@@ -28,6 +28,8 @@ import {
  * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js'
  * @import {PSMKit} from './econ-behaviors.js';
  * @import {FeeMintAccess} from '@agoric/zoe';
+ * @import {WellKnownSpaces} from '@agoric/vats';
+ * @import {ChainStorageVatParams} from '@agoric/vats';
  */
 /** @import {MetricsNotification} from '../psm/psm.js' */
 /** @import {EconomyBootstrapPowers} from './econ-behaviors.js' */
diff --git a/packages/inter-protocol/src/proposals/upgrade-scaledPriceAuthorities.js b/packages/inter-protocol/src/proposals/upgrade-scaledPriceAuthorities.js
index d208987830f..02201daba74 100644
--- a/packages/inter-protocol/src/proposals/upgrade-scaledPriceAuthorities.js
+++ b/packages/inter-protocol/src/proposals/upgrade-scaledPriceAuthorities.js
@@ -1,6 +1,11 @@
 import { makeTracer } from '@agoric/internal';
 import { E } from '@endo/far';
 
+/**
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
+ * @import {StartedInstanceKit} from '@agoric/vats';
+ */
+
 const trace = makeTracer('upgradeScaledPA', true);
 
 /**
diff --git a/packages/inter-protocol/src/proposals/utils.js b/packages/inter-protocol/src/proposals/utils.js
index 2635a9be4d7..0d73d6c06d9 100644
--- a/packages/inter-protocol/src/proposals/utils.js
+++ b/packages/inter-protocol/src/proposals/utils.js
@@ -8,7 +8,7 @@ import { makeScalarBigMapStore } from '@agoric/vat-data';
 /**
  * @import {CopyMap} from '@endo/patterns';
  * @import {MapStore, SetStore} from '@agoric/store';
- * @import {NameAdmin} from '@agoric/vats';
+ * @import {NameAdmin, Producer} from '@agoric/vats';
  * @import {ScratchPad} from '@agoric/internal/src/scratch.js';
  * @import {Bundle} from '@agoric/swingset-vat';
  */
diff --git a/packages/inter-protocol/src/proposals/withdraw-reserve-proposal.js b/packages/inter-protocol/src/proposals/withdraw-reserve-proposal.js
index 5b354c7a7c3..7e16abf22d2 100644
--- a/packages/inter-protocol/src/proposals/withdraw-reserve-proposal.js
+++ b/packages/inter-protocol/src/proposals/withdraw-reserve-proposal.js
@@ -2,11 +2,16 @@ import { E } from '@endo/far';
 import { makeTracer } from '@agoric/internal/src/debug.js';
 import { reserveThenDeposit } from './utils.js';
 
+/**
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {start} from '../reserve/assetReserve.js';
+ */
+
 /**
  * @param {BootstrapPowers & {
  *   consume: {
  *     reserveKit: Promise<
- *       ReturnType<typeof import('../reserve/assetReserve.js').start>
+ *       ReturnType<typeof start>
  *     >;
  *   };
  * }} powers
diff --git a/packages/inter-protocol/src/psm/types-ambient.js b/packages/inter-protocol/src/psm/types.js
similarity index 100%
rename from packages/inter-protocol/src/psm/types-ambient.js
rename to packages/inter-protocol/src/psm/types.js
diff --git a/packages/inter-protocol/src/vaultFactory/params.js b/packages/inter-protocol/src/vaultFactory/params.js
index d797c335941..49074e7f19a 100644
--- a/packages/inter-protocol/src/vaultFactory/params.js
+++ b/packages/inter-protocol/src/vaultFactory/params.js
@@ -1,7 +1,6 @@
 // @jessie-check
 
 /// <reference types="@agoric/internal/exported.js" />
-/// <reference path="./types-ambient.js" />
 
 import {
   CONTRACT_ELECTORATE,
@@ -27,7 +26,7 @@ import { amountPattern, ratioPattern } from '../contractSupport.js';
  * @import {Baggage} from '@agoric/vat-data';
  * @import {Ratio} from '@agoric/ertp';
  * @import {AssetReservePublicFacet} from '../reserve/assetReserve.js';
- * @import {InterestTiming, VaultManagerParamValues} from './types-ambient.js';
+ * @import {InterestTiming, VaultManagerParamValues} from './types.js';
  */
 
 export const CHARGING_PERIOD_KEY = 'ChargingPeriod';
diff --git a/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js b/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js
index 6dd27058883..fcf6b0b534b 100644
--- a/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js
+++ b/packages/inter-protocol/src/vaultFactory/prioritizedVaults.js
@@ -18,7 +18,7 @@ import {
  * @import {Vault} from './vault.js';
  * @import {NormalizedDebt} from './storeUtils.js';
  * @import {Ratio} from '@agoric/ertp';
- * @import {VaultId} from './types-ambient.js';
+ * @import {VaultId} from './types.js';
  */
 
 const trace = makeTracer('PVaults', true);
diff --git a/packages/inter-protocol/src/vaultFactory/storeUtils.js b/packages/inter-protocol/src/vaultFactory/storeUtils.js
index a7b5557fde6..a895b340d95 100644
--- a/packages/inter-protocol/src/vaultFactory/storeUtils.js
+++ b/packages/inter-protocol/src/vaultFactory/storeUtils.js
@@ -8,7 +8,7 @@
 /**
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  * @import {Ratio} from '@agoric/ertp';
- * @import {VaultId} from './types-ambient.js';
+ * @import {VaultId} from './types.js';
  */
 
 // XXX importing these that are declared to be used only for testing
diff --git a/packages/inter-protocol/src/vaultFactory/types-ambient.js b/packages/inter-protocol/src/vaultFactory/types.js
similarity index 67%
rename from packages/inter-protocol/src/vaultFactory/types-ambient.js
rename to packages/inter-protocol/src/vaultFactory/types.js
index 2feeb134d85..d1040f59117 100644
--- a/packages/inter-protocol/src/vaultFactory/types-ambient.js
+++ b/packages/inter-protocol/src/vaultFactory/types.js
@@ -1,12 +1,19 @@
-/* eslint-disable @agoric/group-jsdoc-imports */
 // @jessie-check
 
-// XXX filename is still "ambient" but this module is not
 // Make this a module
 export {};
 
 /**
- * @typedef {import('./vaultFactory.js').VaultFactoryContract['publicFacet']} VaultFactoryPublicFacet
+ * @import {VaultFactoryContract} from './vaultFactory.js';
+ * @import {Ratio} from '@agoric/ertp';
+ * @import {Allocation} from '@agoric/zoe';
+ * @import {PriceQuote} from '@agoric/zoe/tools/types.js';
+ * @import {KeywordKeywordRecord} from '@agoric/zoe/src/contractSupport/types.js';
+ * @import {Proposal} from '@agoric/zoe';
+ */
+
+/**
+ * @typedef {VaultFactoryContract['publicFacet']} VaultFactoryPublicFacet
  * @import {VaultNotification} from './vault.js'
  * @import {Vault} from './vault.js'
  * @import {VaultKit} from './vaultKit.js'
@@ -26,17 +33,17 @@ export {};
 
 /**
  * @typedef {object} VaultManagerParamValues
- * @property {import('@agoric/ertp').Ratio} liquidationMargin - margin below
- *   which collateral will be liquidated to satisfy the debt.
- * @property {import('@agoric/ertp').Ratio} liquidationPenalty - penalty charged
- *   upon liquidation as proportion of debt
- * @property {import('@agoric/ertp').Ratio} interestRate - annual interest rate
- *   charged on debt positions
- * @property {import('@agoric/ertp').Ratio} mintFee - The fee (in BasisPoints)
- *   charged when creating or increasing a debt position.
+ * @property {Ratio} liquidationMargin - margin below which collateral will be
+ *   liquidated to satisfy the debt.
+ * @property {Ratio} liquidationPenalty - penalty charged upon liquidation as
+ *   proportion of debt
+ * @property {Ratio} interestRate - annual interest rate charged on debt
+ *   positions
+ * @property {Ratio} mintFee - The fee (in BasisPoints) charged when creating or
+ *   increasing a debt position.
  * @property {Amount<'nat'>} debtLimit
- * @property {import('@agoric/ertp').Ratio} [liquidationPadding] - vault must
- *   maintain this in order to remove collateral or add debt
+ * @property {Ratio} [liquidationPadding] - vault must maintain this in order to
+ *   remove collateral or add debt
  */
 
 /**
@@ -50,7 +57,7 @@ export {};
 /**
  * @typedef {object} VaultFactoryCreatorFacet
  * @property {AddVaultType} addVaultType
- * @property {() => import('@agoric/zoe').Allocation} getRewardAllocation
+ * @property {() => Allocation} getRewardAllocation
  * @property {() => Promise<Invitation<string, never>>} makeCollectFeesInvitation
  */
 
@@ -76,11 +83,11 @@ export {};
 
 /**
  * @typedef {object} GetVaultParams
- * @property {() => import('@agoric/ertp').Ratio} getLiquidationMargin
- * @property {() => import('@agoric/ertp').Ratio} getMintFee
- * @property {() => Promise<import('@agoric/zoe/tools/types.js').PriceQuote>} getCollateralQuote
- * @property {() => import('@agoric/ertp').Ratio} getInterestRate - The annual
- *   interest rate on a debt position
+ * @property {() => Ratio} getLiquidationMargin
+ * @property {() => Ratio} getMintFee
+ * @property {() => Promise<PriceQuote>} getCollateralQuote
+ * @property {() => Ratio} getInterestRate - The annual interest rate on a debt
+ *   position
  * @property {() => RelativeTime} getChargingPeriod - The period (in seconds) at
  *   which interest is charged to the debt position.
  * @property {() => RelativeTime} getRecordingPeriod - The period (in seconds)
@@ -97,21 +104,15 @@ export {};
 
 /**
  * @typedef {object} LiquidationStrategy
- * @property {() => import('@agoric/zoe/src/contractSupport/types-ambient.js').KeywordKeywordRecord} keywordMapping
- * @property {(
- *   collateral: Amount,
- *   run: Amount,
- * ) => import('@agoric/zoe').Proposal} makeProposal
+ * @property {() => KeywordKeywordRecord} keywordMapping
+ * @property {(collateral: Amount, run: Amount) => Proposal} makeProposal
  * @property {(debt: Amount) => Promise<Invitation>} makeInvitation
  */
 
 /**
  * @typedef {object} Liquidator
  * @property {() => Promise<
- *   Invitation<
- *     void,
- *     { debt: Amount<'nat'>; penaltyRate: import('@agoric/ertp').Ratio }
- *   >
+ *   Invitation<void, { debt: Amount<'nat'>; penaltyRate: Ratio }>
  * >} makeLiquidateInvitation
  */
 
diff --git a/packages/inter-protocol/src/vaultFactory/vault.js b/packages/inter-protocol/src/vaultFactory/vault.js
index d8e9ad01342..2982e21e2a3 100644
--- a/packages/inter-protocol/src/vaultFactory/vault.js
+++ b/packages/inter-protocol/src/vaultFactory/vault.js
@@ -28,7 +28,7 @@ const trace = makeTracer('Vault', true);
  * @import {MakeRecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  * @import {Ratio} from '@agoric/ertp/src/ratio.js';
  * @import {VaultKit} from './vaultKit.js';
- * @import {MintAndTransfer, VaultId} from './types-ambient.js';
+ * @import {MintAndTransfer, VaultId} from './types.js';
  */
 
 /**
diff --git a/packages/inter-protocol/src/vaultFactory/vaultDirector.js b/packages/inter-protocol/src/vaultFactory/vaultDirector.js
index d7dd4d186b9..b7a98e36875 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultDirector.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultDirector.js
@@ -53,9 +53,9 @@ import {
  * @import {MakeERecorderKit} from '@agoric/zoe/src/contractSupport/recorder.js';
  * @import {VaultManager} from './vaultManager.js';
  * @import {VaultManagerParamOverrides} from './params.js';
- * @import {BurnDebt, VaultManagerParamValues} from './types-ambient.js';
- * @import {MintAndTransfer} from './types-ambient.js';
- * @import {VaultFactoryParamPath} from './types-ambient.js';
+ * @import {BurnDebt, VaultManagerParamValues} from './types.js';
+ * @import {MintAndTransfer} from './types.js';
+ * @import {VaultFactoryParamPath} from './types.js';
  */
 
 const trace = makeTracer('VD', true);
diff --git a/packages/inter-protocol/src/vaultFactory/vaultManager.js b/packages/inter-protocol/src/vaultFactory/vaultManager.js
index 860e335839e..83425e6acf9 100644
--- a/packages/inter-protocol/src/vaultFactory/vaultManager.js
+++ b/packages/inter-protocol/src/vaultFactory/vaultManager.js
@@ -83,7 +83,7 @@ import { Phase, prepareVault } from './vault.js';
  * @import {Vault} from './vault.js';
  * @import {VaultPhase} from './vault.js';
  * @import {AuctioneerPublicFacet} from '../auction/auctioneer.js';
- * @import {MintAndTransfer, VaultId} from './types-ambient.js';
+ * @import {MintAndTransfer, VaultId} from './types.js';
  */
 
 const trace = makeTracer('VM');
diff --git a/packages/inter-protocol/test/psm/psm.test.js b/packages/inter-protocol/test/psm/psm.test.js
index 1fe35cd7efc..feeafd284b6 100644
--- a/packages/inter-protocol/test/psm/psm.test.js
+++ b/packages/inter-protocol/test/psm/psm.test.js
@@ -45,6 +45,8 @@ import { anchorAssets, chainStorageEntries } from './psm-storage-fixture.js';
  * @import {EconomyBootstrapPowers} from '../../src/proposals/econ-behaviors.js';
  * @import {Ratio} from '@agoric/ertp';
  * @import {PsmPublicFacet} from '../../src/psm/psm.js';
+ * @import {StartedInstanceKit} from '@agoric/vats';
+ * @import {BankManager} from '@agoric/vats';
  */
 
 /** @type {TestFn<Awaited<ReturnType<typeof makeTestContext>>>} */
diff --git a/packages/inter-protocol/test/smartWallet/boot-psm.js b/packages/inter-protocol/test/smartWallet/boot-psm.js
index f712c9585e2..d07ac25a7ea 100644
--- a/packages/inter-protocol/test/smartWallet/boot-psm.js
+++ b/packages/inter-protocol/test/smartWallet/boot-psm.js
@@ -55,6 +55,8 @@ import {
 /**
  * @import {EconomyBootstrapSpace} from '@agoric/inter-protocol/src/proposals/econ-behaviors.js'
  * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js';
+ * @import {DProxy} from '@agoric/swingset-vat';
+ * @import {BootstrapSpace, ChainBootstrapSpace} from '@agoric/vats';
  */
 
 /** @param {BootstrapSpace & EconomyBootstrapSpace} powers */
diff --git a/packages/inter-protocol/test/smartWallet/boot-test-utils.js b/packages/inter-protocol/test/smartWallet/boot-test-utils.js
index cab212ba87d..60235069e87 100644
--- a/packages/inter-protocol/test/smartWallet/boot-test-utils.js
+++ b/packages/inter-protocol/test/smartWallet/boot-test-utils.js
@@ -17,7 +17,7 @@ import { vatRoots } from '@agoric/vats/tools/boot-test-utils.js';
 import { bundles, devices } from './devices.js';
 
 /**
- * @import {VatAdminFacet} from '@agoric/swingset-vat';
+ * @import {DProxy, VatAdminFacet} from '@agoric/swingset-vat';
  */
 
 export const noop = () => {};
diff --git a/packages/inter-protocol/test/smartWallet/contexts.js b/packages/inter-protocol/test/smartWallet/contexts.js
index a280ad0c3b4..3871766b7fc 100644
--- a/packages/inter-protocol/test/smartWallet/contexts.js
+++ b/packages/inter-protocol/test/smartWallet/contexts.js
@@ -23,6 +23,8 @@ import { withAmountUtils } from '../supports.js';
  * @import {FluxStartFn} from '@agoric/inter-protocol/src/price/fluxAggregatorContract.js';
  * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
  * @import {ContinuingInvitationSpec} from '@agoric/smart-wallet/src/invitations.js';
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
+ * @import {EconomyBootstrapPowers} from '../../src/proposals/econ-behaviors.js';
  */
 
 // referenced by TS
@@ -51,7 +53,7 @@ export const importBootTestUtils = async (log, bundleCache) => {
 
 /**
  * @param {ExecutionContext} t
- * @param {(logger, cache) => Promise<ChainBootstrapSpace>} makeSpace
+ * @param {(logger, cache) => Promise<EconomyBootstrapPowers>} makeSpace
  */
 export const makeDefaultTestContext = async (t, makeSpace) => {
   // To debug, pass t.log instead of null logger
@@ -60,7 +62,6 @@ export const makeDefaultTestContext = async (t, makeSpace) => {
   const bundleCache = await unsafeMakeBundleCache('bundles/');
   const zone = makeHeapZone();
 
-  // @ts-expect-error xxx
   const { consume, produce, instance } = await makeSpace(log, bundleCache);
   const { agoricNames, zoe } = consume;
 
@@ -193,7 +194,6 @@ export const makeDefaultTestContext = async (t, makeSpace) => {
     produce.priceAuthorityAdmin.resolve(mockPriceAuthorityAdmin);
 
     await createPriceFeed(
-      // @ts-expect-error xxx
       { consume, produce, instance },
       {
         options: {
diff --git a/packages/inter-protocol/test/smartWallet/oracle-integration.test.js b/packages/inter-protocol/test/smartWallet/oracle-integration.test.js
index 7d708a94db2..b5a23ac426d 100644
--- a/packages/inter-protocol/test/smartWallet/oracle-integration.test.js
+++ b/packages/inter-protocol/test/smartWallet/oracle-integration.test.js
@@ -32,6 +32,8 @@ import {
  * @import {SmartWallet} from '@agoric/smart-wallet/src/smartWallet.js';
  * @import {PriceRound} from '@agoric/inter-protocol/src/price/roundsManager.js';
  * @import {ContinuingInvitationSpec} from '@agoric/smart-wallet/src/invitations.js';
+ * @import {ChainBootstrapSpace, NamedVatPowers} from '@agoric/vats';
+ * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
  */
 
 /**
diff --git a/packages/orchestration/index.js b/packages/orchestration/index.js
index 15c04ab858b..aea89616e11 100644
--- a/packages/orchestration/index.js
+++ b/packages/orchestration/index.js
@@ -1,5 +1,4 @@
 /// <reference types="@agoric/internal/exported.js" />
-/// <reference types="@agoric/vats/src/core/types-ambient.js" />
 /// <reference types="@agoric/zoe/exported.js" />
 
 // eslint-disable-next-line import/export
diff --git a/packages/orchestration/src/proposals/init-chain-info.js b/packages/orchestration/src/proposals/init-chain-info.js
index 3a0b079f231..03d7d332c03 100644
--- a/packages/orchestration/src/proposals/init-chain-info.js
+++ b/packages/orchestration/src/proposals/init-chain-info.js
@@ -6,7 +6,7 @@ import { registerKnownChains } from '../chain-info.js';
 import { HubName } from '../exos/chain-hub.js';
 
 /**
- * @import {NameHubKit} from '@agoric/vats';
+ * @import {BootstrapPowers, NameHubKit} from '@agoric/vats';
  * @import {Remote} from '@agoric/internal';
  */
 
diff --git a/packages/orchestration/src/proposals/orchestration-proposal.js b/packages/orchestration/src/proposals/orchestration-proposal.js
index 160f284d425..13c33a8c341 100644
--- a/packages/orchestration/src/proposals/orchestration-proposal.js
+++ b/packages/orchestration/src/proposals/orchestration-proposal.js
@@ -5,6 +5,9 @@ const trace = makeTracer('CoreEvalOrchestration', true);
 
 /**
  * @import {PortAllocator} from '@agoric/network';
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {Producer} from '@agoric/vats';
+ * @import {VatSourceRef} from '@agoric/vats';
  */
 
 /**
diff --git a/packages/orchestration/src/proposals/revise-chain-info.js b/packages/orchestration/src/proposals/revise-chain-info.js
index b864bfedfc1..a4fcabe6140 100644
--- a/packages/orchestration/src/proposals/revise-chain-info.js
+++ b/packages/orchestration/src/proposals/revise-chain-info.js
@@ -3,7 +3,10 @@ import { registerChain } from '../chain-info.js';
 
 const trace = makeTracer('ReviseChainInfo', true);
 
-/** @import {CosmosChainInfo} from '../types.js'; */
+/**
+ * @import {CosmosChainInfo} from '../types.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
+ */
 
 /**
  * This will add news values AND overwrite any existing values. Voters on a
diff --git a/packages/orchestration/src/proposals/start-auto-stake-it.js b/packages/orchestration/src/proposals/start-auto-stake-it.js
index 69cfc7721e5..847d4f8069a 100644
--- a/packages/orchestration/src/proposals/start-auto-stake-it.js
+++ b/packages/orchestration/src/proposals/start-auto-stake-it.js
@@ -12,6 +12,8 @@ import { deeplyFulfilled } from '@endo/marshal';
 /**
  * @import {AutoStakeItSF} from '@agoric/orchestration/src/examples/auto-stake-it.contract.js';
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {StartUpgradableOpts} from '@agoric/vats';
  */
 
 const contractName = 'autoAutoStakeIt';
diff --git a/packages/orchestration/src/proposals/start-axelar-gmp.js b/packages/orchestration/src/proposals/start-axelar-gmp.js
index 6a26d3f9917..3ca58623080 100644
--- a/packages/orchestration/src/proposals/start-axelar-gmp.js
+++ b/packages/orchestration/src/proposals/start-axelar-gmp.js
@@ -1,5 +1,3 @@
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 import {
   deeplyFulfilledObject,
   makeTracer,
@@ -12,6 +10,8 @@ import { E } from '@endo/far';
  * @import {Installation, Instance} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
  * @import {start as StartFn} from '@agoric/orchestration/src/examples/axelar-gmp.contract.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {Producer} from '@agoric/vats';
  */
 
 const trace = makeTracer('start axelarGmp', true);
diff --git a/packages/orchestration/src/proposals/start-basic-flows.js b/packages/orchestration/src/proposals/start-basic-flows.js
index 59682e21e10..ecd267627ee 100644
--- a/packages/orchestration/src/proposals/start-basic-flows.js
+++ b/packages/orchestration/src/proposals/start-basic-flows.js
@@ -8,6 +8,9 @@ import { E } from '@endo/far';
 /**
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
  * @import {BasicFlowsSF} from '../examples/basic-flows.contract.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {Producer} from '@agoric/vats';
+ * @import {StartUpgradableOpts} from '@agoric/vats';
  */
 
 const trace = makeTracer('StartBasicFlows', true);
diff --git a/packages/orchestration/src/proposals/start-send-anywhere.js b/packages/orchestration/src/proposals/start-send-anywhere.js
index bc072edc855..dd04edd4a81 100644
--- a/packages/orchestration/src/proposals/start-send-anywhere.js
+++ b/packages/orchestration/src/proposals/start-send-anywhere.js
@@ -5,12 +5,12 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 /**
  * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
  * @import {start as StartFn} from '@agoric/orchestration/src/examples/send-anywhere.contract.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {Producer} from '@agoric/vats';
  */
 
 const trace = makeTracer('StartSA', true);
diff --git a/packages/orchestration/src/proposals/start-stakeAtom.js b/packages/orchestration/src/proposals/start-stakeAtom.js
index 86ec01a9666..88e33829549 100644
--- a/packages/orchestration/src/proposals/start-stakeAtom.js
+++ b/packages/orchestration/src/proposals/start-stakeAtom.js
@@ -8,7 +8,7 @@ import { registerChainsAndAssets } from '../utils/chain-hub-helper.js';
 
 /**
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
- * @import {IBCConnectionID} from '@agoric/vats';
+ * @import {BootstrapPowers, IBCConnectionID, StartUpgradableOpts} from '@agoric/vats';
  * @import {StakeIcaSF,  StakeIcaTerms} from '../examples/stake-ica.contract.js';
  * @import {start} from '../examples/stake-ica.contract.js';
  */
diff --git a/packages/orchestration/src/proposals/start-stakeBld.js b/packages/orchestration/src/proposals/start-stakeBld.js
index 76877da22c1..77a07e99488 100644
--- a/packages/orchestration/src/proposals/start-stakeBld.js
+++ b/packages/orchestration/src/proposals/start-stakeBld.js
@@ -5,6 +5,8 @@ import { E } from '@endo/far';
 
 /**
  * @import {start} from '../../src/examples/stake-bld.contract.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {StartUpgradableOpts} from '@agoric/vats';
  */
 
 const trace = makeTracer('StartStakeBld', true);
diff --git a/packages/orchestration/src/proposals/start-stakeOsmo.js b/packages/orchestration/src/proposals/start-stakeOsmo.js
index 4ec97891ed4..3b99eb49359 100644
--- a/packages/orchestration/src/proposals/start-stakeOsmo.js
+++ b/packages/orchestration/src/proposals/start-stakeOsmo.js
@@ -8,7 +8,7 @@ import { registerChainsAndAssets } from '../utils/chain-hub-helper.js';
 
 /**
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
- * @import {IBCConnectionID} from '@agoric/vats';
+ * @import {BootstrapPowers, IBCConnectionID, StartUpgradableOpts} from '@agoric/vats';
  * @import {StakeIcaSF} from '../examples/stake-ica.contract.js';
  * @import {start} from '../examples/stake-ica.contract.js';
  */
diff --git a/packages/orchestration/src/proposals/start-swap-anything.js b/packages/orchestration/src/proposals/start-swap-anything.js
index 0b872835c46..765531af710 100644
--- a/packages/orchestration/src/proposals/start-swap-anything.js
+++ b/packages/orchestration/src/proposals/start-swap-anything.js
@@ -5,12 +5,12 @@ import {
 } from '@agoric/internal';
 import { E } from '@endo/far';
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 /**
  * @import {Installation} from '@agoric/zoe/src/zoeService/utils.js';
  * @import {CosmosChainInfo, Denom, DenomDetail} from '@agoric/orchestration';
  * @import {start as StartFn} from '@agoric/orchestration/src/examples/swap-anything.contract.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {Producer} from '@agoric/vats';
  */
 
 const trace = makeTracer('StartSA', true);
diff --git a/packages/orchestration/src/vat-orchestration.js b/packages/orchestration/src/vat-orchestration.js
index bb7365b4445..4b5206135a2 100644
--- a/packages/orchestration/src/vat-orchestration.js
+++ b/packages/orchestration/src/vat-orchestration.js
@@ -6,7 +6,7 @@ import { prepareCosmosInterchainService } from './exos/cosmos-interchain-service
 /**
  * @import {Baggage} from '@agoric/vat-data';
  * @import {CosmosOrchestrationPowers} from './exos/cosmos-interchain-service.js';
- * @import {VatPowers} from '@agoric/swingset-vat';
+ * @import {DProxy, VatPowers} from '@agoric/swingset-vat';
  */
 
 /**
diff --git a/packages/orchestration/test/utils/zoe-tools.test.ts b/packages/orchestration/test/utils/zoe-tools.test.ts
index b329f39a608..c4d4af0b77f 100644
--- a/packages/orchestration/test/utils/zoe-tools.test.ts
+++ b/packages/orchestration/test/utils/zoe-tools.test.ts
@@ -13,6 +13,7 @@ import {
   withAmountUtils,
 } from '@agoric/zoe/tools/test-utils.js';
 import { E, type EReturn } from '@endo/far';
+import type { StartedInstanceKit } from '@agoric/vats';
 import { commonSetup } from '../supports.js';
 
 import * as contractExports from '../fixtures/zoe-tools.contract.js';
diff --git a/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js b/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js
index 1257a6ecdaf..79761fb27af 100644
--- a/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js
+++ b/packages/smart-wallet/src/proposals/upgrade-wallet-factory2-proposal.js
@@ -1,9 +1,13 @@
 // @ts-check
-/// <reference types="@agoric/vats/src/core/types-ambient.js" />
-
 import { E } from '@endo/far';
 import { makeStorageNodeChild } from '@agoric/internal/src/lib-chainStorage.js';
 
+/**
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
+ * @import {VatSourceRef} from '@agoric/vats';
+ */
+
 /**
  * @param {BootstrapPowers & ChainBootstrapSpace} powers
  * @param {object} options
diff --git a/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js b/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js
index ada05f00363..8a712f1eadd 100644
--- a/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js
+++ b/packages/smart-wallet/src/proposals/upgrade-walletFactory-proposal.js
@@ -5,7 +5,7 @@ import { makeMarshal } from '@endo/marshal';
 import { allValues } from '@agoric/internal';
 
 /**
- * @import {NameHub} from '@agoric/vats';
+ * @import {BootstrapPowers, NameHub, VatSourceRef} from '@agoric/vats';
  * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js';
  */
 
diff --git a/packages/smart-wallet/test/addAsset.test.js b/packages/smart-wallet/test/addAsset.test.js
index 8d150590bad..8207c44f094 100644
--- a/packages/smart-wallet/test/addAsset.test.js
+++ b/packages/smart-wallet/test/addAsset.test.js
@@ -131,6 +131,7 @@ const the = async xP => {
  * @import {OfferSpec} from '../src/offers.js';
  * @import {UpdateRecord} from '../src/smartWallet.js';
  * @import {Bundle} from '@agoric/swingset-vat';
+ * @import {BootstrapPowers} from '@agoric/vats';
  */
 
 const IST_UNIT = 1_000_000n;
diff --git a/packages/smart-wallet/test/contexts.js b/packages/smart-wallet/test/contexts.js
index 8641f4c0d5c..a1f039b4c79 100644
--- a/packages/smart-wallet/test/contexts.js
+++ b/packages/smart-wallet/test/contexts.js
@@ -9,6 +9,7 @@ import { withAmountUtils } from './supports.js';
 /**
  * @import {ExecutionContext} from 'ava';
  * @import {start as StartWalletFactory} from '../src/walletFactory.js';
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
  */
 
 /**
diff --git a/packages/smart-wallet/test/invitation1.test.js b/packages/smart-wallet/test/invitation1.test.js
index 2c618467586..38616044552 100644
--- a/packages/smart-wallet/test/invitation1.test.js
+++ b/packages/smart-wallet/test/invitation1.test.js
@@ -26,6 +26,7 @@ import { prepareSmartWallet } from '../src/smartWallet.js';
  * @import {BrandDescriptorRegistry} from '../src/smartWallet.js';
  * @import {Bank} from '@agoric/vats/src/vat-bank.js';
  * @import {BridgeAction} from '../src/smartWallet.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
  */
 
 /** @type {TestFn<Awaited<ReturnType<typeof makeTestContext>>>} */
diff --git a/packages/smart-wallet/test/start-game1-proposal.js b/packages/smart-wallet/test/start-game1-proposal.js
index 88c29690360..3401fbb3bd7 100644
--- a/packages/smart-wallet/test/start-game1-proposal.js
+++ b/packages/smart-wallet/test/start-game1-proposal.js
@@ -6,6 +6,7 @@ import { AmountMath } from '@agoric/ertp/src/amountMath.js';
 
 /**
  * @import {BootstrapManifest} from '@agoric/vats/src/core/lib-boot.js';
+ * @import {BootstrapPowers} from '@agoric/vats';
  */
 
 console.warn('start-game1-proposal.js module evaluating');
diff --git a/packages/smart-wallet/test/supports.js b/packages/smart-wallet/test/supports.js
index b3f01150473..486791b6577 100644
--- a/packages/smart-wallet/test/supports.js
+++ b/packages/smart-wallet/test/supports.js
@@ -22,6 +22,11 @@ import { E, Far } from '@endo/far';
  * @import {StoredFacet} from '@agoric/internal/src/lib-chainStorage.js';
  * @import {BridgeManager} from '@agoric/vats';
  * @import {TopicsRecord} from '@agoric/zoe/src/contractSupport/index.js';
+ * @import {WellKnownVats} from '@agoric/vats';
+ * @import {BootstrapPowers} from '@agoric/vats';
+ * @import {ChainBootstrapSpace} from '@agoric/vats';
+ * @import {Producer} from '@agoric/vats';
+ * @import {VatLoader} from '@agoric/vats';
  */
 
 export { ActionType };
diff --git a/packages/vats/index.js b/packages/vats/index.js
index 6499c5ee3a9..55fcc55dcdf 100644
--- a/packages/vats/index.js
+++ b/packages/vats/index.js
@@ -1,5 +1,4 @@
-// Ambient types
-import './src/core/types-ambient.js';
+export * from './src/core/types.js';
 
 // eslint-disable-next-line import/export -- no named exports
 export * from './src/types-index.js';
diff --git a/packages/vats/src/bridge.js b/packages/vats/src/bridge.js
index 49b3ef22adb..2e6404f67b1 100644
--- a/packages/vats/src/bridge.js
+++ b/packages/vats/src/bridge.js
@@ -9,6 +9,8 @@ import { E } from '@endo/far';
  * @import {BridgeHandler} from './types.js';
  * @import {ScopedBridgeManager} from './types.js';
  * @import {Zone} from '@agoric/zone';
+ * @import {DProxy} from '@agoric/swingset-vat';
+ * @import {BridgeDevice} from './core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/core/basic-behaviors.js b/packages/vats/src/core/basic-behaviors.js
index 18922962e51..8c9e3258d41 100644
--- a/packages/vats/src/core/basic-behaviors.js
+++ b/packages/vats/src/core/basic-behaviors.js
@@ -27,6 +27,14 @@ import { makeScopedBridge } from '../bridge.js';
  * @import {InitMsg} from '@agoric/internal/src/chain-utils.js';
  * @import {start} from '../centralSupply.js';
  * @import {BootstrapManifest} from './lib-boot.js';
+ * @import {BootstrapPowers} from './types.js';
+ * @import {Producer} from './types.js';
+ * @import {VatLoader} from './types.js';
+ * @import {ChainBootstrapSpace} from './types.js';
+ * @import {BootstrapSpace} from './types.js';
+ * @import {StartedInstanceKitWithLabel} from './types.js';
+ * @import {StartUpgradable} from './types.js';
+ * @import {NamedVatPowers} from './types.js';
  */
 
 /**
diff --git a/packages/vats/src/core/boot-chain.js b/packages/vats/src/core/boot-chain.js
index ffcecd0c514..8db4180b489 100644
--- a/packages/vats/src/core/boot-chain.js
+++ b/packages/vats/src/core/boot-chain.js
@@ -7,7 +7,7 @@ import * as utils from './utils.js';
 
 /**
  * @import {Baggage} from '@agoric/vat-data';
- * @import {VatPowers} from '@agoric/swingset-vat';
+ * @import {DProxy, VatPowers} from '@agoric/swingset-vat';
  */
 
 const { BASIC_BOOTSTRAP_PERMITS: _b, ...basicBehaviors } = basicBehaviorsPlus;
diff --git a/packages/vats/src/core/boot-sim.js b/packages/vats/src/core/boot-sim.js
index d2cbdfb43a9..b79e0590239 100644
--- a/packages/vats/src/core/boot-sim.js
+++ b/packages/vats/src/core/boot-sim.js
@@ -6,7 +6,7 @@ import * as simBehaviorsPlus from './sim-behaviors.js';
 import * as utils from './utils.js';
 
 /**
- * @import {VatPowers} from '@agoric/swingset-vat';
+ * @import {DProxy, VatPowers} from '@agoric/swingset-vat';
  */
 
 const { BASIC_BOOTSTRAP_PERMITS: _b, ...basicBehaviors } = basicBehaviorsPlus;
diff --git a/packages/vats/src/core/boot-solo.js b/packages/vats/src/core/boot-solo.js
index 12b1fd6e0bb..3fb551958c3 100644
--- a/packages/vats/src/core/boot-solo.js
+++ b/packages/vats/src/core/boot-solo.js
@@ -6,7 +6,7 @@ import * as clientBehaviorsPlus from './client-behaviors.js';
 import * as utils from './utils.js';
 
 /**
- * @import {VatPowers} from '@agoric/swingset-vat';
+ * @import {DProxy, VatPowers} from '@agoric/swingset-vat';
  */
 
 const { BASIC_BOOTSTRAP_PERMITS: _b, ...basicBehaviors } = basicBehaviorsPlus;
diff --git a/packages/vats/src/core/chain-behaviors.js b/packages/vats/src/core/chain-behaviors.js
index d532b54c42c..98d826e8295 100644
--- a/packages/vats/src/core/chain-behaviors.js
+++ b/packages/vats/src/core/chain-behaviors.js
@@ -24,6 +24,15 @@ import { makeScopedBridge } from '../bridge.js';
  * @import {BridgeMessage} from '@agoric/cosmic-swingset/src/types.js';
  * @import {BootstrapManifest} from './lib-boot.js';
  * @import {BundleCap} from '@agoric/swingset-vat';
+ * @import {BootstrapPowers,
+ *   BootstrapSpace,
+ *   PropertyMaker,
+ *   ClientManager,
+ *   ClientCreator,
+ *   ClientFacet,
+ *   BootDevices,
+ *   ChainDevices,
+ *   NamedVatPowers,} from './types.js';
  */
 
 const { keys } = Object;
@@ -420,7 +429,6 @@ export const produceHighPrioritySendersManager = async ({
   managerP.resolve(manager);
 };
 
-/** @param {BootstrapPowers & NamedVatPowers} powers */
 export const publishAgoricNamesToChainStorage = async ({
   consume: { chainStorage: rootP },
   namedVat: {
diff --git a/packages/vats/src/core/client-behaviors.js b/packages/vats/src/core/client-behaviors.js
index 9a8d1f13f33..8fc54f9e146 100644
--- a/packages/vats/src/core/client-behaviors.js
+++ b/packages/vats/src/core/client-behaviors.js
@@ -6,6 +6,15 @@ import { deeplyFulfilledObject } from '@agoric/internal';
 import { registerNetworkProtocols } from '../proposals/network-proposal.js';
 import { makeVatsFromBundles } from './basic-behaviors.js';
 
+/**
+ * @import {BootstrapVatParams, SwingsetVats} from './types.js';
+ * @import {SoloDevices} from './types.js';
+ * @import {VatAdminSvc} from '@agoric/swingset-vat';
+ * @import {DProxy} from '@agoric/swingset-vat';
+ * @import {BootDevices} from './types.js';
+ * @import {BootstrapSpace} from './types.js';
+ */
+
 /**
  * @typedef SoloVats
  * @property {ERef<
diff --git a/packages/vats/src/core/demoIssuers.js b/packages/vats/src/core/demoIssuers.js
index 008d8e71a02..f776734dd07 100644
--- a/packages/vats/src/core/demoIssuers.js
+++ b/packages/vats/src/core/demoIssuers.js
@@ -14,6 +14,8 @@ import { Stake, Stable } from '@agoric/internal/src/tokens.js';
 /**
  * @import {FeeMintAccess, Installation} from '@agoric/zoe'
  * @import {EconomyBootstrapPowers} from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
+ * @import {MintsVat} from './types.js';
+ * @import {BootstrapSpace} from './types.js';
  */
 
 const { multiply, floorDivide } = natSafeMath;
diff --git a/packages/vats/src/core/lib-boot.js b/packages/vats/src/core/lib-boot.js
index f4ab2a02aaa..3a2b355f782 100644
--- a/packages/vats/src/core/lib-boot.js
+++ b/packages/vats/src/core/lib-boot.js
@@ -10,9 +10,12 @@ import { makePromiseSpace } from './promise-space.js';
 
 /**
  * @import {EReturn} from '@endo/far';
- * @import {VatPowers} from '@agoric/swingset-vat';
+ * @import {DProxy, VatPowers} from '@agoric/swingset-vat';
  * @import {Zone} from '@agoric/zone';
  * @import {BridgeHandler} from '../types.js';
+ * @import {SwingsetVats} from './types.js';
+ * @import {SoloDevices} from './types.js';
+ * @import {ChainDevices} from './types.js';
  */
 
 /**
diff --git a/packages/vats/src/core/promise-space.js b/packages/vats/src/core/promise-space.js
index ec4e36597b3..4d0c8d0a556 100644
--- a/packages/vats/src/core/promise-space.js
+++ b/packages/vats/src/core/promise-space.js
@@ -5,6 +5,7 @@ import { makePromiseKit } from '@endo/promise-kit';
 
 /**
  * @import {Passable} from '@endo/marshal';
+ * @import {PromiseSpaceOf} from './types.js';
  */
 
 /**
diff --git a/packages/vats/src/core/sim-behaviors.js b/packages/vats/src/core/sim-behaviors.js
index 00e494958b4..0705da3390f 100644
--- a/packages/vats/src/core/sim-behaviors.js
+++ b/packages/vats/src/core/sim-behaviors.js
@@ -4,6 +4,7 @@ import { addRemote } from './utils.js';
 
 /**
  * @import {BootstrapManifest} from './lib-boot.js';
+ * @import {BootstrapPowers} from './types.js';
  */
 
 export { connectFaucet };
diff --git a/packages/vats/src/core/startWalletFactory.js b/packages/vats/src/core/startWalletFactory.js
index d65c0ff2456..d7046016755 100644
--- a/packages/vats/src/core/startWalletFactory.js
+++ b/packages/vats/src/core/startWalletFactory.js
@@ -21,6 +21,9 @@ import {
  * @import {CommitteeElectorateCreatorFacet} from '@agoric/governance/src/committee.js';
  * @import {ScopedBridgeManager} from '../types.js';
  * @import {start} from '@agoric/inter-protocol/src/econCommitteeCharter.js';
+ * @import {BootstrapPowers} from './types.js';
+ * @import {ChainStorageVatParams} from './types.js';
+ * @import {PromiseSpaceOf} from './types.js';
  */
 
 const trace = makeTracer('StartWF', 'verbose');
diff --git a/packages/vats/src/core/types-ambient.js b/packages/vats/src/core/types-ambient.js
deleted file mode 100644
index 469002eeeed..00000000000
--- a/packages/vats/src/core/types-ambient.js
+++ /dev/null
@@ -1 +0,0 @@
-// Dummy file for .d.ts twin to declare ambients
diff --git a/packages/vats/src/core/types-ambient.d.ts b/packages/vats/src/core/types.ts
similarity index 80%
rename from packages/vats/src/core/types-ambient.d.ts
rename to packages/vats/src/core/types.ts
index f05036c22f9..43f1e77b4f2 100644
--- a/packages/vats/src/core/types-ambient.d.ts
+++ b/packages/vats/src/core/types.ts
@@ -1,59 +1,60 @@
-// Ambient type defs. Cannot use top-level import() because that would turn it into a module.
+import type {
+  Device,
+  DProxy,
+  VatAdminSvc,
+} from '@agoric/swingset-vat/src/types-external.js';
 
-type Device<T> = import('@agoric/swingset-vat/src/types-external.js').Device<T>;
+export type { Device, DProxy };
 
-type DProxy = import('@agoric/swingset-vat/src/types-external.js').DProxy;
+export type BootDevices<T> = { vatPowers: { D: DProxy }; devices: T };
 
-type BootDevices<T> = { vatPowers: { D: DProxy }; devices: T };
+export type { BridgeDevice } from '@agoric/swingset-vat/src/devices/bridge/device-bridge.js';
 
-type BridgeDevice =
-  import('@agoric/swingset-vat/src/devices/bridge/device-bridge.js').BridgeDevice;
-
-type CommandDevice = Device<
+export type CommandDevice = Device<
   ReturnType<
     typeof import('@agoric/swingset-vat/src/devices/command/device-command.js').buildRootDeviceNode
   >
 >;
 
-type MailboxDevice = Device<
+export type MailboxDevice = Device<
   ReturnType<
     typeof import('@agoric/swingset-vat/src/devices/mailbox/device-mailbox.js').buildRootDeviceNode
   >
 >;
 
-type PluginDevice = Device<
+export type PluginDevice = Device<
   ReturnType<
     typeof import('@agoric/swingset-vat/src/devices/plugin/device-plugin.js').buildRootDeviceNode
   >
 >;
 
-type TimerDevice =
+export type TimerDevice =
   import('@agoric/swingset-vat/src/devices/timer/device-timer.js').TimerDevice;
 
-type VatAdminDevice = Device<
+export type VatAdminDevice = Device<
   import('@agoric/swingset-vat/src/devices/vat-admin/device-vat-admin.js').VatAdminRootDeviceNode
 >;
 
-type VattpVat = ERef<
+export type VattpVat = ERef<
   ReturnType<
     typeof import('@agoric/swingset-vat/src/vats/vattp/vat-vattp.js').buildRootObject
   >
 >;
 
-type VatAdminVat = ERef<
+export type VatAdminVat = ERef<
   ReturnType<
     typeof import('@agoric/swingset-vat/src/vats/vat-admin/vat-vat-admin.js').buildRootObject
   >
 >;
 
 /** @see deliverToController in packages/SwingSet/src/vats/comms/controller.js */
-type TimerVat = ERef<
+export type TimerVat = ERef<
   ReturnType<
     typeof import('@agoric/swingset-vat/src/vats/timer/vat-timer.js').buildRootObject
   >
 >;
 
-type CommsVatRoot = ERef<{
+export type CommsVatRoot = ERef<{
   addRemote: (name: string, tx: unknown, rx: unknown) => void;
   addEgress: (addr: string, ix: number, provider: unknown) => void;
   addIngress: (
@@ -63,18 +64,18 @@ type CommsVatRoot = ERef<{
   ) => Promise<any>;
 }>;
 
-type SwingsetVats = {
+export type SwingsetVats = {
   comms: CommsVatRoot;
   timer: TimerVat;
   vatAdmin: VatAdminVat;
   vattp: VattpVat;
 };
 
-type ChainStorageVatParams = {
+export type ChainStorageVatParams = {
   vatParameters: { chainStorageEntries?: [k: string, v: string][] };
 };
 
-type SoloDevices = {
+export type SoloDevices = {
   vatAdmin: VatAdminDevice;
   mailbox: MailboxDevice;
   command: CommandDevice;
@@ -82,37 +83,39 @@ type SoloDevices = {
   plugin: PluginDevice;
 };
 
-type ChainDevices = {
+export type ChainDevices = {
   vatAdmin: VatAdminDevice;
   mailbox: MailboxDevice;
   timer: import('@agoric/swingset-vat/src/devices/timer/device-timer.js').TimerDevice;
   bridge?: import('@agoric/swingset-vat/src/devices/bridge/device-bridge.js').BridgeDevice;
 };
 
-type ClientProvider = {
+export type ClientProvider = {
   getChainBundle: () => unknown;
   getChainConfigNotifier: () => Notifier<unknown>;
 };
 
-type Producer<T> = {
+export type Producer<T> = {
   resolve: (v: ERef<T>) => void;
   reject: (r: unknown) => void;
   reset: (reason?: unknown) => void;
 };
 
-type VatSourceRef = { bundleName?: string; bundleID?: string };
-type VatLoader<Names extends keyof WellKnownVats = keyof WellKnownVats> = <
-  N extends Names,
->(
-  name: N,
-  sourceRef?: VatSourceRef,
-) => Promise<Awaited<WellKnownVats[N]>>;
+export type VatSourceRef = { bundleName?: string; bundleID?: string };
+export type VatLoader<Names extends keyof WellKnownVats = keyof WellKnownVats> =
+  <N extends Names>(
+    name: N,
+    sourceRef?: VatSourceRef,
+  ) => Promise<Awaited<WellKnownVats[N]>>;
 
 /** callback to assign a property onto the `home` object of the client */
-type PropertyMaker = (addr: string, flags: string[]) => Record<string, unknown>;
+export type PropertyMaker = (
+  addr: string,
+  flags: string[],
+) => Record<string, unknown>;
 
 /** tool to put properties onto the `home` object of the client */
-type ClientManager = {
+export type ClientManager = {
   assignBundle: (ps: PropertyMaker[]) => void;
 };
 /**
@@ -120,18 +123,18 @@ type ClientManager = {
  * @template C - Consume only
  * @template P - Produce only
  */
-type PromiseSpaceOf<B, C = object, P = object> = {
+export type PromiseSpaceOf<B, C = object, P = object> = {
   consume: { [K in keyof (B & C)]: Promise<(B & C)[K]> };
   produce: { [K in keyof (B & P)]: Producer<(B & P)[K]> };
 };
 
-type CreateUserBundle = (
+export type CreateUserBundle = (
   nickname: string,
   clientAddress: string,
   powerFlags: string[],
 ) => Promise<Record<string, Promise<any>>>;
 
-type ClientFacet = {
+export type ClientFacet = {
   /**
    * Required for ag-solo, but deprecated in favour of getConfiguration NOTE: we
    * use `any` rather than `unknown` because each client that wants to call a
@@ -145,7 +148,7 @@ type ClientFacet = {
     clientHome: Record<string, any>;
   }>;
 };
-type ClientCreator = {
+export type ClientCreator = {
   createClientFacet(
     nickname: string,
     clientAddress: string,
@@ -154,7 +157,7 @@ type ClientCreator = {
   createUserBundle: CreateUserBundle;
 };
 
-type WellKnownName = {
+export type WellKnownName = {
   issuer:
     | import('@agoric/internal/src/tokens.js').TokenKeyword
     | 'Invitation'
@@ -196,7 +199,7 @@ type WellKnownName = {
   uiConfig: 'VaultFactory';
 };
 
-type ContractInstallationPromises<
+export type ContractInstallationPromises<
   StartFns extends Record<
     WellKnownName['installation'],
     import('@agoric/zoe').ContractStartFn
@@ -205,7 +208,7 @@ type ContractInstallationPromises<
   [Property in keyof StartFns]: Promise<Installation<StartFns[Property]>>;
 };
 
-type ContractInstancePromises<
+export type ContractInstancePromises<
   StartFns extends Record<
     WellKnownName['instance'],
     import('@agoric/zoe').ContractStartFn
@@ -216,7 +219,7 @@ type ContractInstancePromises<
   >;
 };
 
-type WellKnownContracts = {
+export type WellKnownContracts = {
   centralSupply: typeof import('@agoric/vats/src/centralSupply.js').start;
   committee: typeof import('@agoric/governance/src/committee.js').start;
   contractGovernor: typeof import('@agoric/governance/src/contractGovernor.js').start;
@@ -233,7 +236,7 @@ type WellKnownContracts = {
   walletFactory: import('@agoric/smart-wallet/src/walletFactory.js').start;
 };
 
-type WellKnownSpaces = {
+export type WellKnownSpaces = {
   issuer: {
     produce: Record<WellKnownName['issuer'], Producer<Issuer>>;
     consume: Record<WellKnownName['issuer'], Promise<Issuer>> & {
@@ -276,7 +279,7 @@ type WellKnownSpaces = {
   };
 };
 
-type StartGovernedUpgradableOpts<SF extends GovernableStartFn> = {
+export type StartGovernedUpgradableOpts<SF extends GovernableStartFn> = {
   installation: ERef<Installation<SF>>;
   issuerKeywordRecord?: IssuerKeywordRecord;
   governedParams: Record<string, unknown>;
@@ -292,11 +295,11 @@ type StartGovernedUpgradableOpts<SF extends GovernableStartFn> = {
   label: string;
 };
 
-type StartGovernedUpgradable = <SF extends GovernableStartFn>(
+export type StartGovernedUpgradable = <SF extends GovernableStartFn>(
   opts: StartGovernedUpgradableOpts<SF>,
 ) => Promise<GovernanceFacetKit<SF>>;
 
-type StartUpgradableOpts<
+export type StartUpgradableOpts<
   SF extends
     import('@agoric/zoe/src/zoeService/utils.js').ContractStartFunction,
 > = {
@@ -310,7 +313,7 @@ type StartUpgradableOpts<
   label: string;
 };
 
-type StartUpgradable = <
+export type StartUpgradable = <
   SF extends
     import('@agoric/zoe/src/zoeService/utils.js').ContractStartFunction,
 >(
@@ -321,28 +324,28 @@ type StartUpgradable = <
   }
 >;
 
-type StartedInstanceKit<
+export type StartedInstanceKit<
   T extends import('@agoric/zoe/src/zoeService/utils.js').ContractStartFunction,
 > = import('@agoric/zoe/src/zoeService/utils.js').StartedInstanceKit<T>;
 
-type StartedInstanceKitWithLabel = {
+export type StartedInstanceKitWithLabel = {
   label: string;
 } & StartedInstanceKit<
   import('@agoric/zoe/src/zoeService/utils.js').ContractStartFunction
 >;
 
-type ChainBootstrapSpaceT = {
-  agoricNames: import('../types.js').NameHub;
+export type ChainBootstrapSpaceT = {
+  agoricNames: import('../types.ts').NameHub;
   agoricNamesAdmin: import('@agoric/vats').NameAdmin;
   bankManager: import('@agoric/vats/src/vat-bank.js').BankManager;
   bldIssuerKit: RemoteIssuerKit;
   board: import('@agoric/vats').Board;
-  bridgeManager: import('../types.js').BridgeManager | undefined;
+  bridgeManager: import('../types.ts').BridgeManager | undefined;
   chainStorage: import('@agoric/internal').Remote<StorageNode> | null;
   chainTimerService: import('@agoric/time').TimerService;
   client: ClientManager;
   clientCreator: any;
-  coreEvalBridgeHandler: import('../types.js').BridgeHandler;
+  coreEvalBridgeHandler: import('../types.ts').BridgeHandler;
   cosmosInterchainService: import('@agoric/orchestration').CosmosInterchainService;
   /** Utilities to support debugging */
   diagnostics: {
@@ -367,8 +370,8 @@ type ChainBootstrapSpaceT = {
   instancePrivateArgs: Map<Instance, unknown>;
   localchain: import('@agoric/vats/src/localchain.js').LocalChain;
   mints?: MintsVat;
-  namesByAddress: import('../types.js').NameHub;
-  namesByAddressAdmin: import('../types.js').NamesByAddressAdmin;
+  namesByAddress: import('../types.ts').NameHub;
+  namesByAddressAdmin: import('../types.ts').NamesByAddressAdmin;
   networkVat: NetworkVat;
   orchestration?: import('@agoric/orchestration').CosmosInterchainService;
   pegasusConnections: import('@agoric/vats').NameHubKit;
@@ -381,13 +384,13 @@ type ChainBootstrapSpaceT = {
   priceAuthorityAdmin: import('@agoric/vats/src/priceAuthorityRegistry.js').PriceAuthorityRegistryAdmin;
   provisioning: Awaited<ProvisioningVat> | undefined;
   provisionBridgeManager:
-    | import('../types.js').ScopedBridgeManager<'provision'>
+    | import('../types.ts').ScopedBridgeManager<'provision'>
     | undefined;
   provisionWalletBridgeManager:
-    | import('../types.js').ScopedBridgeManager<'provisionWallet'>
+    | import('../types.ts').ScopedBridgeManager<'provisionWallet'>
     | undefined;
   storageBridgeManager:
-    | import('../types.js').ScopedBridgeManager<'storage'>
+    | import('../types.ts').ScopedBridgeManager<'storage'>
     | undefined;
   transferMiddleware: import('../transfer.js').TransferMiddleware;
   /**
@@ -407,7 +410,7 @@ type ChainBootstrapSpaceT = {
   /** Used only for testing. Should not appear in any production proposals. */
   testFirstAnchorKit: import('../vat-bank.js').AssetIssuerKit;
   walletBridgeManager:
-    | import('../types.js').ScopedBridgeManager<'wallet'>
+    | import('../types.ts').ScopedBridgeManager<'wallet'>
     | undefined;
   walletFactoryStartResult: import('./startWalletFactory.js').WalletFactoryStartResult;
   provisionPoolStartResult: GovernanceFacetKit<
@@ -418,9 +421,9 @@ type ChainBootstrapSpaceT = {
   zoe: ZoeService;
 };
 
-type ChainBootstrapSpace = PromiseSpaceOf<ChainBootstrapSpaceT>;
+export type ChainBootstrapSpace = PromiseSpaceOf<ChainBootstrapSpaceT>;
 
-type BootstrapVatParams = {
+export type BootstrapVatParams = {
   argv: {
     hardcodedClientAddresses?: string[];
     FIXME_GCI: string;
@@ -428,7 +431,7 @@ type BootstrapVatParams = {
   };
 };
 
-type BootstrapPowers = BootstrapSpace & {
+export type BootstrapPowers = BootstrapSpace & {
   zone: import('@agoric/zone').Zone;
   devices: SoloDevices | ChainDevices;
   vats: SwingsetVats;
@@ -438,7 +441,7 @@ type BootstrapPowers = BootstrapSpace & {
   modules: import('./boot-chain.js').BootstrapModules;
 };
 
-type BootstrapSpace = WellKnownSpaces &
+export type BootstrapSpace = WellKnownSpaces &
   PromiseSpaceOf<
     ChainBootstrapSpaceT & {
       vatAdminSvc: VatAdminSvc;
@@ -450,64 +453,70 @@ type BootstrapSpace = WellKnownSpaces &
     object
   >;
 
-type LocalChainVat = ERef<
+export type LocalChainVat = ERef<
   ReturnType<typeof import('../vat-localchain.js').buildRootObject>
 >;
 
-type TransferVat = ERef<
+export type TransferVat = ERef<
   ReturnType<typeof import('../vat-transfer.js').buildRootObject>
 >;
 
-type ProvisioningVat = ERef<
+export type ProvisioningVat = ERef<
   ReturnType<typeof import('../vat-provisioning.js').buildRootObject>
 >;
 
-type MintsVat = ERef<
+export type MintsVat = ERef<
   ReturnType<typeof import('../vat-mints.js').buildRootObject>
 >;
 
-type PriceAuthorityVat = ERef<
+export type PriceAuthorityVat = ERef<
   ReturnType<typeof import('../vat-priceAuthority.js').buildRootObject>
 >;
 
-type NetworkVat = ERef<
+export type NetworkVat = ERef<
   ReturnType<typeof import('../vat-network.js').buildRootObject>
 >;
-type IBCVat = ERef<ReturnType<typeof import('../vat-ibc.js').buildRootObject>>;
-type NamedVatPowers = {
+export type IBCVat = ERef<
+  ReturnType<typeof import('../vat-ibc.js').buildRootObject>
+>;
+export type NamedVatPowers = {
   namedVat: PromiseSpaceOf<{
     agoricNames: Awaited<AgoricNamesVat>;
     board: Awaited<BoardVat>;
   }>;
 };
 
-type OrchestrationVat = ERef<import('@agoric/orchestration').OrchestrationVat>;
-type ZoeVat = ERef<import('../vat-zoe.js').ZoeVat>;
+export type OrchestrationVat = ERef<
+  import('@agoric/orchestration').OrchestrationVat
+>;
+export type ZoeVat = ERef<import('../vat-zoe.js').ZoeVat>;
 
-type RemoteIssuerKit = {
+export type RemoteIssuerKit = {
   mint: ERef<Mint>;
   issuer: ERef<Issuer>;
   brand: Brand;
 };
-type AgoricNamesVat = ERef<
+export type AgoricNamesVat = ERef<
   ReturnType<typeof import('../vat-agoricNames.js').buildRootObject>
 >;
-type BankVat = ERef<
+export type BankVat = ERef<
   ReturnType<typeof import('../vat-bank.js').buildRootObject>
 >;
-type BoardVat = ERef<
+export type BoardVat = ERef<
   ReturnType<typeof import('../vat-board.js').buildRootObject>
 >;
-type ChainStorageVat = ERef<
+export type ChainStorageVat = ERef<
   ReturnType<typeof import('../vat-bridge.js').buildRootObject>
 >;
-type BankManager = Awaited<ReturnType<Awaited<BankVat>['makeBankManager']>>;
+export type BankManager = Awaited<
+  ReturnType<Awaited<BankVat>['makeBankManager']>
+>;
 
-type DemoFaucetPowers = PromiseSpaceOf<{
+export type DemoFaucetPowers = PromiseSpaceOf<{
   mints: MintsVat;
 }>;
 
-type WellKnownVats = SwingsetVats & {
+export type WellKnownVats = SwingsetVats & {
   bank: BankVat;
   board: BoardVat;
   bridge: ChainStorageVat;
diff --git a/packages/vats/src/core/utils.js b/packages/vats/src/core/utils.js
index 8a9610f1004..25b99bde610 100644
--- a/packages/vats/src/core/utils.js
+++ b/packages/vats/src/core/utils.js
@@ -8,7 +8,7 @@ import { keyEQ } from '@agoric/store';
 import { makeNameHubKit } from '../nameHub.js';
 import { makeLogHooks, makePromiseSpace } from './promise-space.js';
 
-import './types-ambient.js';
+import './types.js';
 
 const { entries, fromEntries, keys } = Object;
 
@@ -320,6 +320,11 @@ export const makeMyAddressNameAdminKit = address => {
 
 /** @typedef {MapStore<string, CreateVatResults>} VatStore */
 
+/**
+ * @import {VatAdminVat} from './types.js';
+ * @import {NamedVatPowers} from './types.js';
+ */
+
 /**
  * @param {ERef<ReturnType<Awaited<VatAdminVat>['createVatAdminService']>>} svc
  * @param {unknown} criticalVatKey
@@ -330,6 +335,11 @@ export const makeMyAddressNameAdminKit = address => {
  * @import {NameAdmin} from '../types.js';
  * @import {NameHub} from '../types.js';
  * @import {MyAddressNameAdmin} from '../types.js';
+ * @import {WellKnownName} from './types.js';
+ * @import {VattpVat} from './types.js';
+ * @import {CommsVatRoot} from './types.js';
+ * @import {PromiseSpaceOf} from './types.js';
+ * @import {WellKnownSpaces} from './types.js';
  */
 export const makeVatSpace = (
   svc,
diff --git a/packages/vats/src/proposals/kread-proposal.js b/packages/vats/src/proposals/kread-proposal.js
index 7b8affda75a..0230541a706 100644
--- a/packages/vats/src/proposals/kread-proposal.js
+++ b/packages/vats/src/proposals/kread-proposal.js
@@ -1,5 +1,9 @@
 import { E } from '@endo/far';
 
+/**
+ * @import {BootstrapPowers} from '../core/types.js';
+ */
+
 /**
  * @param {BootstrapPowers & {
  *   consume: { kreadKit: any };
diff --git a/packages/vats/src/proposals/localchain-hook-msg-send.js b/packages/vats/src/proposals/localchain-hook-msg-send.js
index 36e01e03c63..31d33545035 100644
--- a/packages/vats/src/proposals/localchain-hook-msg-send.js
+++ b/packages/vats/src/proposals/localchain-hook-msg-send.js
@@ -9,6 +9,7 @@ import {
  * @import {ScopedBridgeManager} from '../types.js';
  * @import {TransferMiddleware} from '../transfer.js';
  * @import {CreateVatResults, VatAdminSvc} from '@agoric/swingset-vat';
+ * @import {BootstrapPowers} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/proposals/localchain-proposal.js b/packages/vats/src/proposals/localchain-proposal.js
index 90da715adb0..2a8c90e2fe8 100644
--- a/packages/vats/src/proposals/localchain-proposal.js
+++ b/packages/vats/src/proposals/localchain-proposal.js
@@ -10,6 +10,9 @@ import { makeScopedBridge } from '../bridge.js';
  * @import {TransferMiddleware} from '../transfer.js';
  * @import {LocalChainVat} from '../vat-localchain.js';
  * @import {LocalChain} from '../localchain.js';
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {Producer} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/proposals/localchain-test.js b/packages/vats/src/proposals/localchain-test.js
index d0e17f972b1..15ec6193fc9 100644
--- a/packages/vats/src/proposals/localchain-test.js
+++ b/packages/vats/src/proposals/localchain-test.js
@@ -9,6 +9,7 @@ import { MsgSend as MsgSendType } from '@agoric/cosmic-proto/cosmos/bank/v1beta1
  * @import {LocalChain} from '../localchain.js';
  * @import {ERemote} from '@agoric/internal';
  * @import {TargetApp} from '../bridge-target.js';
+ * @import {BootstrapPowers} from '../core/types.js';
  */
 
 const MsgSend = CodecHelper(MsgSendType);
diff --git a/packages/vats/src/proposals/namesByAddress-fix-proposal.js b/packages/vats/src/proposals/namesByAddress-fix-proposal.js
index 54fc7a5e5c1..a7a16a01184 100644
--- a/packages/vats/src/proposals/namesByAddress-fix-proposal.js
+++ b/packages/vats/src/proposals/namesByAddress-fix-proposal.js
@@ -3,6 +3,7 @@ import { E } from '@endo/far';
 
 /**
  * @import {BootstrapManifest} from '../core/lib-boot.js';
+ * @import {BootstrapPowers} from '../core/types.js';
  */
 
 const vatUpgrade = /** @type {const} */ ({
diff --git a/packages/vats/src/proposals/network-proposal.js b/packages/vats/src/proposals/network-proposal.js
index bc01c92bfe4..13245df6eff 100644
--- a/packages/vats/src/proposals/network-proposal.js
+++ b/packages/vats/src/proposals/network-proposal.js
@@ -18,6 +18,8 @@ const { when } = heapVowTools;
 /**
  * @import {ProtocolHandler} from '@agoric/network';
  * @import {Remote} from '@agoric/vow';
+ * @import {ScopedBridgeManager} from '../types.js';
+ * @import {BootstrapPowers, IBCVat, NetworkVat, Producer, ProvisioningVat, VatSourceRef} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/proposals/restart-vats-proposal.js b/packages/vats/src/proposals/restart-vats-proposal.js
index c7d25b96f74..c22a072a415 100644
--- a/packages/vats/src/proposals/restart-vats-proposal.js
+++ b/packages/vats/src/proposals/restart-vats-proposal.js
@@ -6,6 +6,7 @@ import { E, getInterfaceOf } from '@endo/far';
 /**
  * @import {AdminFacet, ContractOf, InvitationAmount, ZCFMint} from '@agoric/zoe';
  * @import {EconomyBootstrapSpace} from '@agoric/inter-protocol/src/proposals/econ-behaviors.js';
+ * @import {BootstrapPowers} from '../core/types.js';
  */
 
 const trace = makeTracer('RV');
diff --git a/packages/vats/src/proposals/terminate-governed-instance.js b/packages/vats/src/proposals/terminate-governed-instance.js
index 8d0385d4993..11b873047af 100644
--- a/packages/vats/src/proposals/terminate-governed-instance.js
+++ b/packages/vats/src/proposals/terminate-governed-instance.js
@@ -7,8 +7,6 @@
  *       agoric run /path/to/$0 <$instanceHandleBoardID:$instanceKitLabel>...
  */
 
-/// <reference types="@agoric/vats/src/core/types-ambient.js"/>
-
 /* eslint-disable import/no-extraneous-dependencies */
 // dynamic import { makeHelpers } from '@agoric/deploy-script-support';
 // dynamic import { getSpecifier } from '@agoric/internal/src/module-utils.js';
@@ -19,6 +17,7 @@ import { isAbandonedError } from '@agoric/internal/src/upgrade-api.js';
 /**
  * @import {CoreEvalBuilder} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {DeployScriptFunction} from '@agoric/deploy-script-support/src/externalTypes.js';
+ * @import {BootstrapPowers} from '../core/types.js';
  */
 
 const USAGE = `Usage: agoric run /path/to/terminate-governed-instance.js \\
diff --git a/packages/vats/src/proposals/transfer-proposal.js b/packages/vats/src/proposals/transfer-proposal.js
index 3646f42eca2..109e4a21566 100644
--- a/packages/vats/src/proposals/transfer-proposal.js
+++ b/packages/vats/src/proposals/transfer-proposal.js
@@ -8,6 +8,9 @@ import { makeScopedBridge } from '../bridge.js';
  * @import {EReturn} from '@endo/far';
  * @import {BridgeManager} from '../types.js';
  * @import {ScopedBridgeManager} from '../types.js';
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {Producer} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/proposals/upgrade-agoricNames-proposal.js b/packages/vats/src/proposals/upgrade-agoricNames-proposal.js
index 94143d29945..8146678d907 100644
--- a/packages/vats/src/proposals/upgrade-agoricNames-proposal.js
+++ b/packages/vats/src/proposals/upgrade-agoricNames-proposal.js
@@ -2,6 +2,8 @@ import { E } from '@endo/far';
 
 /**
  * @import {CreateVatResults, VatAdminSvc} from '@agoric/swingset-vat';
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/proposals/upgrade-asset-reserve-proposal.js b/packages/vats/src/proposals/upgrade-asset-reserve-proposal.js
index 7993f5f9152..f383b2b6f1d 100644
--- a/packages/vats/src/proposals/upgrade-asset-reserve-proposal.js
+++ b/packages/vats/src/proposals/upgrade-asset-reserve-proposal.js
@@ -2,6 +2,11 @@ import { E } from '@endo/far';
 import { deeplyFulfilled } from '@endo/marshal';
 import { makeTracer } from '@agoric/internal';
 
+/**
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
+ */
+
 const tracer = makeTracer('UpgradeAssetReserve');
 
 /**
diff --git a/packages/vats/src/proposals/upgrade-bank-proposal.js b/packages/vats/src/proposals/upgrade-bank-proposal.js
index 382ccc9bcee..4626f22dc3d 100644
--- a/packages/vats/src/proposals/upgrade-bank-proposal.js
+++ b/packages/vats/src/proposals/upgrade-bank-proposal.js
@@ -2,6 +2,8 @@ import { E } from '@endo/far';
 
 /**
  * @import {CreateVatResults, VatAdminSvc} from '@agoric/swingset-vat';
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/proposals/upgrade-board-proposal.js b/packages/vats/src/proposals/upgrade-board-proposal.js
index b8506fee0f4..6c753f0dc7a 100644
--- a/packages/vats/src/proposals/upgrade-board-proposal.js
+++ b/packages/vats/src/proposals/upgrade-board-proposal.js
@@ -2,6 +2,8 @@ import { E } from '@endo/far';
 
 /**
  * @import {CreateVatResults, VatAdminSvc} from '@agoric/swingset-vat';
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/proposals/upgrade-paRegistry-proposal.js b/packages/vats/src/proposals/upgrade-paRegistry-proposal.js
index 81387d7193b..4a5c183a99a 100644
--- a/packages/vats/src/proposals/upgrade-paRegistry-proposal.js
+++ b/packages/vats/src/proposals/upgrade-paRegistry-proposal.js
@@ -3,6 +3,11 @@ import { E } from '@endo/far';
 import { AmountMath } from '@agoric/ertp';
 import { Stable } from '@agoric/internal/src/tokens.js';
 
+/**
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
+ */
+
 /**
  * @param {BootstrapPowers} powers
  * @param {object} options
diff --git a/packages/vats/src/proposals/upgrade-provisionPool-proposal.js b/packages/vats/src/proposals/upgrade-provisionPool-proposal.js
index 1175d73a417..d5c0bf9c470 100644
--- a/packages/vats/src/proposals/upgrade-provisionPool-proposal.js
+++ b/packages/vats/src/proposals/upgrade-provisionPool-proposal.js
@@ -2,6 +2,11 @@ import { E } from '@endo/far';
 import { deeplyFulfilled } from '@endo/marshal';
 import { makeTracer } from '@agoric/internal';
 
+/**
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
+ */
+
 const trace = makeTracer('UpgradeProvisionPool');
 
 /**
diff --git a/packages/vats/src/proposals/upgrade-provisionPool-to-BLD-proposal.js b/packages/vats/src/proposals/upgrade-provisionPool-to-BLD-proposal.js
index 004ead95743..a6b398f8a4c 100644
--- a/packages/vats/src/proposals/upgrade-provisionPool-to-BLD-proposal.js
+++ b/packages/vats/src/proposals/upgrade-provisionPool-to-BLD-proposal.js
@@ -3,6 +3,11 @@ import { deeplyFulfilled } from '@endo/marshal';
 import { makeTracer } from '@agoric/internal';
 import { Stake } from '@agoric/internal/src/tokens.js';
 
+/**
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
+ */
+
 const trace = makeTracer('UpgradeProvisionPool');
 
 /**
diff --git a/packages/vats/src/proposals/upgrade-psm-proposal.js b/packages/vats/src/proposals/upgrade-psm-proposal.js
index 420223a7f3f..c0d210dd69e 100644
--- a/packages/vats/src/proposals/upgrade-psm-proposal.js
+++ b/packages/vats/src/proposals/upgrade-psm-proposal.js
@@ -2,6 +2,11 @@ import { E } from '@endo/far';
 import { deeplyFulfilled } from '@endo/marshal';
 import { makeTracer } from '@agoric/internal';
 
+/**
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
+ */
+
 const trace = makeTracer('UpgradePSM');
 
 /**
diff --git a/packages/vats/src/proposals/upgrade-vats-generic-proposal.js b/packages/vats/src/proposals/upgrade-vats-generic-proposal.js
index b046d859087..834117ab18a 100644
--- a/packages/vats/src/proposals/upgrade-vats-generic-proposal.js
+++ b/packages/vats/src/proposals/upgrade-vats-generic-proposal.js
@@ -5,6 +5,9 @@ import { makeTracer } from '@agoric/internal';
 /**
  * @import {CreateVatResults, VatAdminSvc} from '@agoric/swingset-vat';
  * @import {VatUpgradeOptions} from '@agoric/swingset-vat';
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
+ * @import {PromiseSpaceOf} from '../core/types.js';
  */
 
 const trace = makeTracer('UpgradeVats');
diff --git a/packages/vats/src/proposals/upgrade-zoe-proposal.js b/packages/vats/src/proposals/upgrade-zoe-proposal.js
index cb8bfafdce0..a1d14710089 100644
--- a/packages/vats/src/proposals/upgrade-zoe-proposal.js
+++ b/packages/vats/src/proposals/upgrade-zoe-proposal.js
@@ -2,6 +2,8 @@ import { E } from '@endo/far';
 
 /**
  * @import {CreateVatResults, VatAdminSvc} from '@agoric/swingset-vat';
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/proposals/vtransfer-echoer.js b/packages/vats/src/proposals/vtransfer-echoer.js
index 8edbafccfcb..d973b5b8ed1 100644
--- a/packages/vats/src/proposals/vtransfer-echoer.js
+++ b/packages/vats/src/proposals/vtransfer-echoer.js
@@ -4,6 +4,7 @@ import { E } from '@endo/far';
 
 /**
  * @import {TransferMiddleware} from '../transfer.js';
+ * @import {BootstrapPowers} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/proposals/zcf-only-proposal.js b/packages/vats/src/proposals/zcf-only-proposal.js
index 85d3fd1a569..d9ff8387b3f 100644
--- a/packages/vats/src/proposals/zcf-only-proposal.js
+++ b/packages/vats/src/proposals/zcf-only-proposal.js
@@ -1,6 +1,11 @@
 // @ts-check
 import { E } from '@endo/far';
 
+/**
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
+ */
+
 /**
  * @param {BootstrapPowers} powers
  * @param {object} options
diff --git a/packages/vats/src/proposals/zcf-proposal.js b/packages/vats/src/proposals/zcf-proposal.js
index 9b5e8aa4847..e0fd50c3a24 100644
--- a/packages/vats/src/proposals/zcf-proposal.js
+++ b/packages/vats/src/proposals/zcf-proposal.js
@@ -3,6 +3,8 @@ import { E } from '@endo/far';
 
 /**
  * @import {CreateVatResults, VatAdminSvc} from '@agoric/swingset-vat';
+ * @import {BootstrapPowers} from '../core/types.js';
+ * @import {VatSourceRef} from '../core/types.js';
  */
 
 /**
diff --git a/packages/vats/src/vat-agoricNames.js b/packages/vats/src/vat-agoricNames.js
index 670af6b9fda..c4e100e6101 100644
--- a/packages/vats/src/vat-agoricNames.js
+++ b/packages/vats/src/vat-agoricNames.js
@@ -10,6 +10,7 @@ import { prepareNameHubKit } from './nameHub.js';
  * @import {Zone} from '@agoric/zone';
  * @import {Baggage} from '@agoric/vat-data';
  * @import {NameAdmin} from './types.js';
+ * @import {BoardVat} from './core/types.js';
  */
 
 /** @param {Zone} zone */
diff --git a/packages/vats/src/vat-provisioning.js b/packages/vats/src/vat-provisioning.js
index 0f194432cd4..14293238b0b 100644
--- a/packages/vats/src/vat-provisioning.js
+++ b/packages/vats/src/vat-provisioning.js
@@ -20,6 +20,10 @@ import {
  * @import {NameHub} from './types.js';
  * @import {MyAddressNameAdmin} from './types.js';
  * @import {Baggage} from '@agoric/vat-data';
+ * @import {ClientCreator} from './core/types.js';
+ * @import {CommsVatRoot} from './core/types.js';
+ * @import {VattpVat} from './core/types.js';
+ * @import {ClientFacet} from './core/types.js';
  */
 
 // This vat contains the controller-side provisioning service. To enable local
diff --git a/packages/vats/test/clientBundle.test.js b/packages/vats/test/clientBundle.test.js
index 5da2388ccdf..03bcce40ce5 100644
--- a/packages/vats/test/clientBundle.test.js
+++ b/packages/vats/test/clientBundle.test.js
@@ -26,6 +26,14 @@ import { makeNameHubKit, prepareMixinMyAddress } from '../src/nameHub.js';
 /**
  * @import {UserPaymentRecord} from '../src/core/demoIssuers.js';
  * @import {MyAddressNameAdmin} from '../src/types.js';
+ * @import {BoardVat} from '../src/core/types.js';
+ * @import {MintsVat} from '../src/core/types.js';
+ * @import {BootstrapPowers} from '../src/core/types.js';
+ * @import {DemoFaucetPowers} from '../src/core/types.js';
+ * @import {Producer} from '../src/core/types.js';
+ * @import {VatLoader} from '../src/core/types.js';
+ * @import {WellKnownVats} from '../src/core/types.js';
+ * @import {BootstrapSpace} from '../src/core/types.js';
  */
 
 /**
diff --git a/packages/vats/test/types-ambient.test-d.ts b/packages/vats/test/core-types.test-d.ts
similarity index 93%
rename from packages/vats/test/types-ambient.test-d.ts
rename to packages/vats/test/core-types.test-d.ts
index c0917929e0e..d2224e00dbd 100644
--- a/packages/vats/test/types-ambient.test-d.ts
+++ b/packages/vats/test/core-types.test-d.ts
@@ -5,12 +5,11 @@
  *   https://www.typescriptlang.org/docs/handbook/jsdoc-supported-types.html
  */
 
-/// <reference path="../src/core/types-ambient.d.ts" />
-
 import type { start as assetReserveStart } from '@agoric/inter-protocol/src/reserve/assetReserve.js';
 import { expectNotType, expectType } from 'tsd';
 
 import type { Instance } from '@agoric/zoe/src/zoeService/utils.js';
+import type { WellKnownSpaces } from '../index.js';
 
 const mock = null as any;
 
diff --git a/packages/vats/test/vat-bank-integration.test.js b/packages/vats/test/vat-bank-integration.test.js
index fb271e3ae9f..76a424b3094 100644
--- a/packages/vats/test/vat-bank-integration.test.js
+++ b/packages/vats/test/vat-bank-integration.test.js
@@ -22,6 +22,10 @@ import { makePopulatedFakeVatAdmin } from '../tools/boot-test-utils.js';
 
 /**
  * @import {InitMsg} from '@agoric/internal/src/chain-utils.js';
+ * @import {BootstrapPowers} from '../src/core/types.js';
+ * @import {Producer} from '../src/core/types.js';
+ * @import {VatLoader} from '../src/core/types.js';
+ * @import {WellKnownVats} from '../src/core/types.js';
  */
 
 test('mintInitialSupply, addBankAssets bootstrap actions', async t => {
diff --git a/packages/vats/tools/boot-test-utils.js b/packages/vats/tools/boot-test-utils.js
index e1f252195ca..b131dbcb5b5 100644
--- a/packages/vats/tools/boot-test-utils.js
+++ b/packages/vats/tools/boot-test-utils.js
@@ -21,7 +21,7 @@ import { buildRootObject as provisioningRoot } from '../src/vat-provisioning.js'
 import { buildRootObject as zoeRoot } from '../src/vat-zoe.js';
 
 /**
- * @import {VatAdminFacet} from '@agoric/swingset-vat';
+ * @import {DProxy, VatAdminFacet} from '@agoric/swingset-vat';
  */
 
 export const vatRoots = {
diff --git a/packages/vats/tools/bootstrap-chain-reflective.js b/packages/vats/tools/bootstrap-chain-reflective.js
index 4f7098145ef..33ef02ebf19 100644
--- a/packages/vats/tools/bootstrap-chain-reflective.js
+++ b/packages/vats/tools/bootstrap-chain-reflective.js
@@ -18,7 +18,7 @@ import * as utils from '../src/core/utils.js';
 
 /**
  * @import {Baggage} from '@agoric/vat-data';
- * @import {CreateVatResults, VatPowers} from '@agoric/swingset-vat';
+ * @import {CreateVatResults, DProxy, VatPowers} from '@agoric/swingset-vat';
  */
 
 // Gather up all defined bootstrap behaviors.
diff --git a/packages/wallet/api/src/internal-types.js b/packages/wallet/api/src/internal-types.js
index 7bb10200043..be48caa1867 100644
--- a/packages/wallet/api/src/internal-types.js
+++ b/packages/wallet/api/src/internal-types.js
@@ -1,6 +1,6 @@
 // @ts-check
 
-/** @import {PursesJSONState, RecordMetadata} from './types-ambient.js'; */
+/** @import {PursesJSONState, RecordMetadata} from './types.js'; */
 
 /**
  * @typedef {object} PursesAddedState
diff --git a/packages/wallet/api/src/issuerTable.js b/packages/wallet/api/src/issuerTable.js
index 4ab7c0ac244..52f84812de7 100644
--- a/packages/wallet/api/src/issuerTable.js
+++ b/packages/wallet/api/src/issuerTable.js
@@ -7,7 +7,7 @@ import { makeScalarWeakMapStore } from '@agoric/store';
 
 /**
  * @import {ZoeIssuerRecord} from '@agoric/zoe';
- * @import {IssuerTable} from './types-ambient.js';
+ * @import {IssuerTable} from './types.js';
  */
 
 /**
diff --git a/packages/wallet/api/src/lib-wallet.js b/packages/wallet/api/src/lib-wallet.js
index dcbe65596ae..c1b12f13cdd 100644
--- a/packages/wallet/api/src/lib-wallet.js
+++ b/packages/wallet/api/src/lib-wallet.js
@@ -46,7 +46,7 @@ import { makePaymentActions } from './actions.js';
  * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {UserSeat} from '@agoric/zoe';
  * @import {BrandRecord, Contact, DappRecord, Mapping, PaymentRecord, PursesFullState} from './internal-types.js';
- * @import {InstallationManager, InstanceManager, IssuerManager, OfferState, PursesJSONState, RecordMetadata} from './types-ambient.js';
+ * @import {InstallationManager, InstanceManager, IssuerManager, OfferState, PursesJSONState, RecordMetadata} from './types.js';
  */
 
 // does nothing
diff --git a/packages/wallet/api/src/types-ambient.js b/packages/wallet/api/src/types.js
similarity index 100%
rename from packages/wallet/api/src/types-ambient.js
rename to packages/wallet/api/src/types.js
diff --git a/packages/wallet/api/src/wallet.js b/packages/wallet/api/src/wallet.js
index 5e1cd661ec7..a4ceeed65c1 100644
--- a/packages/wallet/api/src/wallet.js
+++ b/packages/wallet/api/src/wallet.js
@@ -21,7 +21,7 @@ import { makeTimerDeviceDateNow, makeTimerServiceDateNow } from './date-now.js';
 /**
  * @import {Petname} from '@agoric/deploy-script-support/src/externalTypes.js';
  * @import {WalletAdminFacet} from './internal-types.js';
- * @import {OfferState, PursesJSONState, WalletAdmin, WalletBridge} from './types-ambient.js';
+ * @import {OfferState, PursesJSONState, WalletAdmin, WalletBridge} from './types.js';
  */
 
 /**
diff --git a/packages/zoe/exported.d.ts b/packages/zoe/exported.d.ts
index 6c3144b57ee..cc540f0965f 100644
--- a/packages/zoe/exported.d.ts
+++ b/packages/zoe/exported.d.ts
@@ -3,8 +3,6 @@
 /// <reference types="@agoric/ertp/exported.js" />
 /// <reference types="@endo/pass-style" />
 
-import './src/contractSupport/types-ambient.js';
-
 import {
   AdminFacet as _AdminFacet,
   AmountKeywordRecord as _AmountKeywordRecord,
diff --git a/packages/zoe/src/contractSupport/types-ambient.js b/packages/zoe/src/contractSupport/types.js
similarity index 97%
rename from packages/zoe/src/contractSupport/types-ambient.js
rename to packages/zoe/src/contractSupport/types.js
index 86f32fb9821..8032142960b 100644
--- a/packages/zoe/src/contractSupport/types-ambient.js
+++ b/packages/zoe/src/contractSupport/types.js
@@ -3,7 +3,6 @@
 /// <reference types="ses" />
 /// <reference types="@agoric/zoe/exported.js" />
 
-// XXX filename is still "ambient" but this module is not
 // Make this a module
 export {};
 
diff --git a/packages/zoe/src/contractSupport/zoeHelpers.js b/packages/zoe/src/contractSupport/zoeHelpers.js
index 9d958777115..899d9b976b5 100644
--- a/packages/zoe/src/contractSupport/zoeHelpers.js
+++ b/packages/zoe/src/contractSupport/zoeHelpers.js
@@ -10,7 +10,7 @@ import { atomicTransfer, fromOnly, toOnly } from './atomicTransfer.js';
 /**
  * @import {Pattern} from '@endo/patterns';
  * @import {ContractMeta, Invitation, PaymentPKeywordRecord, Proposal, UserSeat, ZCF, ZCFSeat} from '@agoric/zoe';
- * @import {KeywordKeywordRecord, MapKeywords, Reverse, Swap, SwapExact} from './types-ambient.js';
+ * @import {KeywordKeywordRecord, MapKeywords, Reverse, Swap, SwapExact} from './types.js';
  * @import {Allocation} from '../contractFacet/types.ts';
  */
 
diff --git a/packages/zoe/src/contracts/callSpread/calculateShares.js b/packages/zoe/src/contracts/callSpread/calculateShares.js
index 8885504fddd..f4c1a8f9939 100644
--- a/packages/zoe/src/contracts/callSpread/calculateShares.js
+++ b/packages/zoe/src/contracts/callSpread/calculateShares.js
@@ -1,4 +1,4 @@
-/// <reference path="./types-ambient.js" />
+/// <reference path="./types.js" />
 
 import { AmountMath, isNatValue } from '@agoric/ertp';
 import { assert } from '@endo/errors';
@@ -6,7 +6,7 @@ import { makeRatio, oneMinus } from '../../contractSupport/index.js';
 import { make0Percent, make100Percent } from './percent.js';
 
 /**
- * @import {CalculateShares} from './types-ambient.js';
+ * @import {CalculateShares} from './types.js';
  */
 
 /**
diff --git a/packages/zoe/src/contracts/callSpread/fundedCallSpread.js b/packages/zoe/src/contracts/callSpread/fundedCallSpread.js
index 905a0fdb7f1..5e83a12bb5b 100644
--- a/packages/zoe/src/contracts/callSpread/fundedCallSpread.js
+++ b/packages/zoe/src/contracts/callSpread/fundedCallSpread.js
@@ -1,4 +1,4 @@
-/// <reference path="./types-ambient.js" />
+/// <reference path="./types.js" />
 
 import { AmountMath } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';
@@ -13,8 +13,8 @@ import { Position } from './position.js';
 
 /**
  * @import {PriceAuthority} from '@agoric/zoe/tools/types.js';
- * @import {PositionKind} from './types-ambient.js';
- * @import {PayoffHandler} from './types-ambient.js';
+ * @import {PositionKind} from './types.js';
+ * @import {PayoffHandler} from './types.js';
  */
 
 /**
diff --git a/packages/zoe/src/contracts/callSpread/payoffHandler.js b/packages/zoe/src/contracts/callSpread/payoffHandler.js
index 4fe88610b4e..ece2d8dbd31 100644
--- a/packages/zoe/src/contracts/callSpread/payoffHandler.js
+++ b/packages/zoe/src/contracts/callSpread/payoffHandler.js
@@ -1,4 +1,4 @@
-/// <reference path="./types-ambient.js" />
+/// <reference path="./types.js" />
 
 import { AmountMath } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';
@@ -11,9 +11,9 @@ import { calculateShares } from './calculateShares.js';
 import { Position } from './position.js';
 
 /**
- * @import {PositionKind} from './types-ambient.js';
- * @import {PayoffHandler} from './types-ambient.js';
- * @import {MakeOptionInvitation} from './types-ambient.js';
+ * @import {PositionKind} from './types.js';
+ * @import {PayoffHandler} from './types.js';
+ * @import {MakeOptionInvitation} from './types.js';
  */
 
 /**
diff --git a/packages/zoe/src/contracts/callSpread/percent.js b/packages/zoe/src/contracts/callSpread/percent.js
index 513ab4001c7..e0bf1cf8845 100644
--- a/packages/zoe/src/contracts/callSpread/percent.js
+++ b/packages/zoe/src/contracts/callSpread/percent.js
@@ -3,8 +3,8 @@
 import { makeRatio } from '../../contractSupport/index.js';
 
 /**
- * @import {Make100Percent} from './types-ambient.js';
- * @import {Make0Percent} from './types-ambient.js';
+ * @import {Make100Percent} from './types.js';
+ * @import {Make0Percent} from './types.js';
  */
 
 const BASIS_POINTS = 10000n;
diff --git a/packages/zoe/src/contracts/callSpread/pricedCallSpread.js b/packages/zoe/src/contracts/callSpread/pricedCallSpread.js
index 21c89252aa3..9fe6eba80f8 100644
--- a/packages/zoe/src/contracts/callSpread/pricedCallSpread.js
+++ b/packages/zoe/src/contracts/callSpread/pricedCallSpread.js
@@ -1,4 +1,4 @@
-/// <reference path="./types-ambient.js" />
+/// <reference path="./types.js" />
 
 import { AmountMath } from '@agoric/ertp';
 import { Fail } from '@endo/errors';
@@ -17,8 +17,8 @@ import { Position } from './position.js';
 
 /**
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
- * @import {PositionKind} from './types-ambient.js';
- * @import {PayoffHandler} from './types-ambient.js';
+ * @import {PositionKind} from './types.js';
+ * @import {PayoffHandler} from './types.js';
  */
 
 const PERCENT_BASE = 100n;
diff --git a/packages/zoe/src/contracts/callSpread/types-ambient.js b/packages/zoe/src/contracts/callSpread/types.js
similarity index 100%
rename from packages/zoe/src/contracts/callSpread/types-ambient.js
rename to packages/zoe/src/contracts/callSpread/types.js
diff --git a/packages/zoe/src/contracts/exported.js b/packages/zoe/src/contracts/exported.js
index c567a18fd4f..16441adb367 100644
--- a/packages/zoe/src/contracts/exported.js
+++ b/packages/zoe/src/contracts/exported.js
@@ -1,4 +1,4 @@
 /// <reference path="./types-ambient.js" />
 // eslint-disable-next-line no-restricted-syntax
-import './loan/types-ambient.js';
-import './callSpread/types-ambient.js';
+import './loan/types.js';
+import './callSpread/types.js';
diff --git a/packages/zoe/src/contracts/loan/addCollateral.js b/packages/zoe/src/contracts/loan/addCollateral.js
index 26f8f3860aa..dcc1ef86c47 100644
--- a/packages/zoe/src/contracts/loan/addCollateral.js
+++ b/packages/zoe/src/contracts/loan/addCollateral.js
@@ -6,7 +6,7 @@ import {
 import { scheduleLiquidation } from './scheduleLiquidation.js';
 
 /**
- * @import {MakeAddCollateralInvitation} from './types-ambient.js';
+ * @import {MakeAddCollateralInvitation} from './types.js';
  */
 
 // Create an invitation to add collateral to the loan. Part of the
diff --git a/packages/zoe/src/contracts/loan/borrow.js b/packages/zoe/src/contracts/loan/borrow.js
index eb1aacdff31..fb05718559b 100644
--- a/packages/zoe/src/contracts/loan/borrow.js
+++ b/packages/zoe/src/contracts/loan/borrow.js
@@ -17,10 +17,10 @@ import { scheduleLiquidation } from './scheduleLiquidation.js';
 import { calculateInterest, makeDebtCalculator } from './updateDebt.js';
 
 /**
- * @import {MakeBorrowInvitation} from './types-ambient.js';
- * @import {DebtCalculatorConfig} from './types-ambient.js';
- * @import {LoanConfigWithBorrower} from './types-ambient.js';
- * @import {BorrowFacet} from './types-ambient.js';
+ * @import {MakeBorrowInvitation} from './types.js';
+ * @import {DebtCalculatorConfig} from './types.js';
+ * @import {LoanConfigWithBorrower} from './types.js';
+ * @import {BorrowFacet} from './types.js';
  */
 
 /** @type {MakeBorrowInvitation} */
diff --git a/packages/zoe/src/contracts/loan/close.js b/packages/zoe/src/contracts/loan/close.js
index b920e0bb612..b0a884fcca8 100644
--- a/packages/zoe/src/contracts/loan/close.js
+++ b/packages/zoe/src/contracts/loan/close.js
@@ -1,4 +1,4 @@
-/// <reference path="./types-ambient.js" />
+/// <reference path="./types.js" />
 
 import { AmountMath } from '@agoric/ertp';
 import { Fail } from '@endo/errors';
@@ -6,7 +6,7 @@ import { Fail } from '@endo/errors';
 import { assertProposalShape } from '../../contractSupport/index.js';
 
 /**
- * @import {MakeCloseLoanInvitation} from './types-ambient.js';
+ * @import {MakeCloseLoanInvitation} from './types.js';
  */
 
 // The debt, the amount which must be repaid, is just the amount
diff --git a/packages/zoe/src/contracts/loan/index.js b/packages/zoe/src/contracts/loan/index.js
index f55ce7e9d00..3028b3d4ed2 100644
--- a/packages/zoe/src/contracts/loan/index.js
+++ b/packages/zoe/src/contracts/loan/index.js
@@ -9,7 +9,7 @@ import { makeLendInvitation } from './lend.js';
 /**
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  * @import {Ratio} from '@agoric/ertp';
- * @import {LoanTerms, PeriodNotifier} from './types-ambient.js';
+ * @import {LoanTerms, PeriodNotifier} from './types.js';
  */
 
 /**
diff --git a/packages/zoe/src/contracts/loan/lend.js b/packages/zoe/src/contracts/loan/lend.js
index f2bcdefe1e5..4699617a390 100644
--- a/packages/zoe/src/contracts/loan/lend.js
+++ b/packages/zoe/src/contracts/loan/lend.js
@@ -2,7 +2,7 @@ import { assertProposalShape } from '../../contractSupport/index.js';
 import { makeBorrowInvitation } from './borrow.js';
 
 /**
- * @import {MakeLendInvitation} from './types-ambient.js';
+ * @import {MakeLendInvitation} from './types.js';
  */
 
 // The lender puts up the amount to be loaned to the borrower, but has
diff --git a/packages/zoe/src/contracts/loan/liquidate.js b/packages/zoe/src/contracts/loan/liquidate.js
index 7871c4393e5..976c2a5d800 100644
--- a/packages/zoe/src/contracts/loan/liquidate.js
+++ b/packages/zoe/src/contracts/loan/liquidate.js
@@ -5,7 +5,7 @@ import { offerTo } from '../../contractSupport/zoeHelpers.js';
 
 /**
  * @import {ShutdownWithFailure} from '@agoric/swingset-vat';
- * @import {LoanConfigWithBorrower} from './types-ambient.js';
+ * @import {LoanConfigWithBorrower} from './types.js';
  */
 
 export const doLiquidation = async (
diff --git a/packages/zoe/src/contracts/loan/scheduleLiquidation.js b/packages/zoe/src/contracts/loan/scheduleLiquidation.js
index 9a1710d1ceb..f86cabf0ef7 100644
--- a/packages/zoe/src/contracts/loan/scheduleLiquidation.js
+++ b/packages/zoe/src/contracts/loan/scheduleLiquidation.js
@@ -9,7 +9,7 @@ import {
 import { liquidate } from './liquidate.js';
 
 /**
- * @import {ScheduleLiquidation} from './types-ambient.js';
+ * @import {ScheduleLiquidation} from './types.js';
  */
 
 /** @type {ScheduleLiquidation} */
diff --git a/packages/zoe/src/contracts/loan/types-ambient.js b/packages/zoe/src/contracts/loan/types.js
similarity index 66%
rename from packages/zoe/src/contracts/loan/types-ambient.js
rename to packages/zoe/src/contracts/loan/types.js
index 0f24dc348c0..5efeb1a9a6c 100644
--- a/packages/zoe/src/contracts/loan/types-ambient.js
+++ b/packages/zoe/src/contracts/loan/types.js
@@ -1,6 +1,5 @@
-/* eslint-disable @agoric/group-jsdoc-imports */
 /**
- * @typedef {Notifier<import('@agoric/time').TimestampRecord>} PeriodNotifier
+ * @typedef {Notifier<TimestampRecord>} PeriodNotifier
  *
  *  The Notifier that provides notifications that periods have passed.
  *  Since notifiers can't be relied on to produce an output every time
@@ -9,6 +8,18 @@
  *  using the interestRate.
  */
 
+/**
+ * @import {TimestampRecord} from '@agoric/time';
+ * @import {Ratio} from '@agoric/ertp';
+ * @import {PriceAuthority} from '../../../tools/types.js';
+ * @import {RelativeTime} from '@agoric/time';
+ * @import {ZCFSeat} from '../../types-index.js';
+ * @import {PriceQuote} from '../../../tools/types.js';
+ * @import {ZCF} from '../../types-index.js';
+ * @import {Invitation} from '../../types-index.js';
+ * @import {Timestamp} from '@agoric/time';
+ */
+
 /**
  * @typedef {Instance} AutoswapInstance
  *   The running contract instance for an Autoswap installation.  The
@@ -20,23 +31,23 @@
 /**
  * @typedef LoanTerms
  *
- * @property {import('@agoric/ertp').Ratio} mmr - Maintenance Margin Requirement, a Ratio record.
+ * @property {Ratio} mmr - Maintenance Margin Requirement, a Ratio record.
  * Default is 150%
  *
  * @property {AutoswapInstance} autoswapInstance
  *
- * @property {import('../../../tools/types.js').PriceAuthority} priceAuthority
+ * @property {PriceAuthority} priceAuthority
  *
  *   Used for getting the current value of collateral and setting
  *   liquidation triggers.
  *
  * @property {PeriodNotifier} periodNotifier
  *
- * @property {import('@agoric/ertp').Ratio} interestRate
+ * @property {Ratio} interestRate
  *   The rate in basis points that will be multiplied with the debt on
  *   every period to compound interest.
  *
- * @property {import('@agoric/time').RelativeTime} interestPeriod
+ * @property {RelativeTime} interestPeriod
  *
  * @property {Brand} loanBrand
  * @property {Brand} collateralBrand
@@ -44,7 +55,7 @@
 
 /**
  * @typedef LenderSeatProperty
- * @property {import('../../types-index.js').ZCFSeat} lenderSeat
+ * @property {ZCFSeat} lenderSeat
  *
  *   The ZCFSeat representing the lender's position in the contract.
  */
@@ -58,7 +69,7 @@
 /**
  * @typedef BorrowerConfigProperties
  *
- * @property {import('../../types-index.js').ZCFSeat} collateralSeat
+ * @property {ZCFSeat} collateralSeat
  *
  *   The ZCFSeat holding the collateral in escrow after the borrower
  *   escrows it
@@ -67,7 +78,7 @@
  *
  *   A function to get the current debt
  *
- * @property {PromiseRecord<import('../../../tools/types.js').PriceQuote>} liquidationPromiseKit
+ * @property {PromiseRecord<PriceQuote>} liquidationPromiseKit
  *
  *   PromiseKit that includes a promise that resolves to a PriceQuote
  *   when liquidation is triggered
@@ -76,12 +87,12 @@
 /**
  * @typedef BorrowerConfigPropertiesMinusDebt
  *
- * @property {import('../../types-index.js').ZCFSeat} collateralSeat
+ * @property {ZCFSeat} collateralSeat
  *
  *   The ZCFSeat holding the collateral in escrow after the borrower
  *   escrows it
  *
- * @property {PromiseRecord<import('../../../tools/types.js').PriceQuote>} liquidationPromiseKit
+ * @property {PromiseRecord<PriceQuote>} liquidationPromiseKit
  *
  *   PromiseKit that includes a promise that resolves to a PriceQuote
  *   when liquidation is triggered
@@ -100,29 +111,29 @@
 
 /**
  * @callback ScheduleLiquidation
- * @param {import('../../types-index.js').ZCF} zcf
+ * @param {ZCF} zcf
  * @param {LoanConfigWithBorrower} config
  */
 
 /**
  * @callback MakeLendInvitation
- * @param {import('../../types-index.js').ZCF} zcf
+ * @param {ZCF} zcf
  * @param {LoanTerms} config
- * @returns {Promise<import('../../types-index.js').Invitation>} lendInvitation
+ * @returns {Promise<Invitation>} lendInvitation
  */
 
 /**
  * @callback MakeBorrowInvitation
- * @param {import('../../types-index.js').ZCF} zcf
+ * @param {ZCF} zcf
  * @param {LoanConfigWithLender} config
- * @returns {Promise<import('../../types-index.js').Invitation>} borrowInvitation
+ * @returns {Promise<Invitation>} borrowInvitation
  */
 
 /**
  * @callback MakeCloseLoanInvitation
- * @param {import('../../types-index.js').ZCF} zcf
+ * @param {ZCF} zcf
  * @param {LoanConfigWithBorrower} config
- * @returns {Promise<import('../../types-index.js').Invitation>} closeLoanInvitation
+ * @returns {Promise<Invitation>} closeLoanInvitation
  */
 
 /**
@@ -130,9 +141,9 @@
  * after adding.
  *
  * @callback MakeAddCollateralInvitation
- * @param {import('../../types-index.js').ZCF} zcf
+ * @param {ZCF} zcf
  * @param {LoanConfigWithBorrower} config
- * @returns {Promise<import('../../types-index.js').Invitation>} addCollateralInvitation
+ * @returns {Promise<Invitation>} addCollateralInvitation
  */
 
 /**
@@ -162,51 +173,51 @@
  *
  *   The AsyncIterable to notify when a period has occurred
  *
- * @property {import('@agoric/ertp').Ratio} interestRate
- * @property {import('@agoric/time').RelativeTime} interestPeriod
+ * @property {Ratio} interestRate
+ * @property {RelativeTime} interestPeriod
  *
  *  the period at which the outstanding debt increases by the interestRate
  *
- * @property {import('../../types-index.js').ZCF} zcf
+ * @property {ZCF} zcf
  *
  * @property {LoanConfigWithBorrowerMinusDebt} configMinusGetDebt
- * @property {import('@agoric/time').Timestamp} basetime The starting point from which to calculate
+ * @property {Timestamp} basetime The starting point from which to calculate
  * interest.
  */
 
 /**
  * @typedef {object} ConfigMinusGetDebt
- * @property {import('../../types-index.js').ZCFSeat} collateralSeat
+ * @property {ZCFSeat} collateralSeat
  * @property {PromiseRecord<any>} liquidationPromiseKit
  * @property {bigint} [mmr]
  * @property {Handle<'Instance'>} autoswapInstance
- * @property {import('../../../tools/types.js').PriceAuthority} priceAuthority
+ * @property {PriceAuthority} priceAuthority
  * @property {PeriodNotifier} periodNotifier
  * @property {bigint} interestRate
- * @property {import('@agoric/time').RelativeTime} interestPeriod
- * @property {import('../../types-index.js').ZCFSeat} lenderSeat
+ * @property {RelativeTime} interestPeriod
+ * @property {ZCFSeat} lenderSeat
  */
 
 /**
  * @typedef {object} BorrowFacet
  *
- * @property {() => Promise<import('../../types-index.js').Invitation>} makeCloseLoanInvitation
+ * @property {() => Promise<Invitation>} makeCloseLoanInvitation
  *
  * Make an invitation to close the loan by repaying the debt
  *   (including interest).
  *
- * @property {() => Promise<import('../../types-index.js').Invitation>} makeAddCollateralInvitation
+ * @property {() => Promise<Invitation>} makeAddCollateralInvitation
  *
  * Make an invitation to add collateral to protect against liquidation
  *
- * @property {() => Promise<import('../../../tools/types.js').PriceQuote>} getLiquidationPromise
+ * @property {() => Promise<PriceQuote>} getLiquidationPromise
  *
  * Get a promise for a priceQuote that will resolve if liquidation
  * occurs. The priceQuote is for the value of the collateral that
  * triggered the liquidation. This may be lower than expected if the
  * price is moving quickly.
  *
- * @property {() => import('@agoric/time').Timestamp} getLastCalculationTimestamp
+ * @property {() => Timestamp} getLastCalculationTimestamp
  *
  * Get the timestamp at which the debt was most recently recalculated.
  *
diff --git a/packages/zoe/src/contracts/loan/updateDebt.js b/packages/zoe/src/contracts/loan/updateDebt.js
index 835095c0b46..c99374e2bd8 100644
--- a/packages/zoe/src/contracts/loan/updateDebt.js
+++ b/packages/zoe/src/contracts/loan/updateDebt.js
@@ -9,7 +9,7 @@ import { scheduleLiquidation } from './scheduleLiquidation.js';
 
 /**
  * @import {TimestampRecord} from '@agoric/time';
- * @import {CalcInterestFn, MakeDebtCalculator} from './types-ambient.js';
+ * @import {CalcInterestFn, MakeDebtCalculator} from './types.js';
  */
 
 // Update the debt by adding the new interest on every period, as
diff --git a/packages/zoe/src/types-ambient.js b/packages/zoe/src/types-ambient.js
deleted file mode 100644
index 6e44d045793..00000000000
--- a/packages/zoe/src/types-ambient.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @file @deprecated */
-
-console.error(
-  'NOTICE: src/types-ambient.js no longer provides types; use explicit imports or the top level `/exported.js`',
-);
diff --git a/packages/zoe/src/zoeService/types-ambient.js b/packages/zoe/src/zoeService/types-ambient.js
deleted file mode 100644
index 26b21e73097..00000000000
--- a/packages/zoe/src/zoeService/types-ambient.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/** @file @deprecated */
-
-console.error(
-  'NOTICE: src/zoeService/types-ambient.js no longer provides types; use explicit imports or the top level `/exported.js`',
-);
diff --git a/packages/zoe/src/zoeService/utils.d.ts b/packages/zoe/src/zoeService/utils.d.ts
index 5d50dfef140..9b8dec95db1 100644
--- a/packages/zoe/src/zoeService/utils.d.ts
+++ b/packages/zoe/src/zoeService/utils.d.ts
@@ -12,14 +12,14 @@ type SourceBundle = Record<string, any>;
 /**
  * Installation of a contract, typed by its start function.
  */
-export type Installation<SF extends ContractStartFunction | unknown> =
+export type Installation<SF extends ContractStartFunction | unknown = any> =
   TagContainer<SF> &
     RemotableObject & {
       getBundle: () => SourceBundle;
       getBundleLabel: () => string;
     };
 
-export type Instance<SF extends ContractStartFunction | unknown> =
+export type Instance<SF extends ContractStartFunction | unknown = any> =
   TagContainer<SF> & RemotableObject & Handle<'Instance'>;
 
 export type InstallationStart<I> =