diff --git a/packages/oid4vci/src/credential-offer/credential-offer.ts b/packages/oid4vci/src/credential-offer/credential-offer.ts
index 21f0a38..e82eff1 100644
--- a/packages/oid4vci/src/credential-offer/credential-offer.ts
+++ b/packages/oid4vci/src/credential-offer/credential-offer.ts
@@ -1,8 +1,9 @@
 import * as v from 'valibot'
 import { Oid4vcError } from '../error/Oid4vcError'
 import { Oid4vcValidationError } from '../error/Oid4vcValidationError'
+import type { Fetch } from '../globals'
 import { getQueryParams } from '../utils/url'
-import { type Fetch, createValibotFetcher } from '../utils/valibot-fetcher'
+import { createValibotFetcher } from '../utils/valibot-fetcher'
 import {
   type CredentialOfferObject,
   preAuthorizedCodeGrantIdentifier,
diff --git a/packages/oid4vci/src/credential-request/format-payload.ts b/packages/oid4vci/src/credential-request/format-payload.ts
index 091b132..04a11bf 100644
--- a/packages/oid4vci/src/credential-request/format-payload.ts
+++ b/packages/oid4vci/src/credential-request/format-payload.ts
@@ -8,7 +8,7 @@ import {
   vSdJwtVcCredentialIssuerMetadata,
 } from '../formats/credential'
 import type { IssuerMetadataResult } from '../metadata/fetch-issuer-metadata'
-import type { CredentialRequestFormats } from './v-credential-request'
+import type { CredentialRequestWithFormats } from './v-credential-request'
 
 export interface GetCredentialRequestFormatPayloadForCredentialConfigurationIdOptions {
   /**
@@ -24,7 +24,7 @@ export interface GetCredentialRequestFormatPayloadForCredentialConfigurationIdOp
 
 export function getCredentialRequestFormatPayloadForCredentialConfigurationId(
   options: GetCredentialRequestFormatPayloadForCredentialConfigurationIdOptions
-): CredentialRequestFormats {
+): CredentialRequestWithFormats {
   const credentialConfiguration =
     options.issuerMetadata.credentialIssuer.credential_configurations_supported[options.credentialConfigurationId]
 
diff --git a/packages/oid4vci/src/metadata/authorization-server/authorization-server-metadata.ts b/packages/oid4vci/src/metadata/authorization-server/authorization-server-metadata.ts
index 4812ca9..3eeef57 100644
--- a/packages/oid4vci/src/metadata/authorization-server/authorization-server-metadata.ts
+++ b/packages/oid4vci/src/metadata/authorization-server/authorization-server-metadata.ts
@@ -1,6 +1,6 @@
 import { Oid4vcError } from '../../error/Oid4vcError'
+import type { Fetch } from '../../globals'
 import { joinUriParts } from '../../utils/path'
-import type { Fetch } from '../../utils/valibot-fetcher'
 import { fetchWellKnownMetadata } from '../fetch-metadata'
 import { type AuthorizationServerMetadata, vAuthorizationServerMetadata } from './v-authorization-server-metadata'
 
diff --git a/packages/oid4vci/src/metadata/credential-issuer/credential-issuer-metadata.ts b/packages/oid4vci/src/metadata/credential-issuer/credential-issuer-metadata.ts
index 8299107..ee9f4d2 100644
--- a/packages/oid4vci/src/metadata/credential-issuer/credential-issuer-metadata.ts
+++ b/packages/oid4vci/src/metadata/credential-issuer/credential-issuer-metadata.ts
@@ -1,6 +1,6 @@
 import { Oid4vcError } from '../../error/Oid4vcError'
+import type { Fetch } from '../../globals'
 import { joinUriParts } from '../../utils/path'
-import type { Fetch } from '../../utils/valibot-fetcher'
 import type { Oid4vciDraftVersion } from '../../versions/draft-version'
 import { fetchWellKnownMetadata } from '../fetch-metadata'
 import {