diff --git a/projects/solace-message-client/src/lib/logger.ts b/projects/solace-message-client/src/lib/logger.ts
index 194c646..47cd73a 100644
--- a/projects/solace-message-client/src/lib/logger.ts
+++ b/projects/solace-message-client/src/lib/logger.ts
@@ -1,5 +1,5 @@
 import {EnvironmentProviders, inject, Injectable, makeEnvironmentProviders, Type} from '@angular/core';
-import {LogLevel} from 'solclientjs';
+import {LogLevel} from 'solclientjs/lib-browser/solclient-full';
 
 /**
  * Logger used by the Angular Solace Message Client.
diff --git a/projects/solace-message-client/src/lib/multi-solace-message-client.spec.ts b/projects/solace-message-client/src/lib/multi-solace-message-client.spec.ts
index d8107c3..5968131 100644
--- a/projects/solace-message-client/src/lib/multi-solace-message-client.spec.ts
+++ b/projects/solace-message-client/src/lib/multi-solace-message-client.spec.ts
@@ -1,7 +1,7 @@
 import {SolaceMessageClient} from './solace-message-client';
 import {createEnvironmentInjector, EnvironmentInjector, inject, runInInjectionContext, Type} from '@angular/core';
 import {provideSolaceMessageClient} from './solace-message-client.provider';
-import {LogLevel, SessionEventCode} from 'solclientjs';
+import {LogLevel, SessionEventCode} from 'solclientjs/lib-browser/solclient-full';
 import {SessionFixture} from './testing/session.fixture';
 import {provideSession} from './testing/session-provider';
 import {TestBed} from '@angular/core/testing';
diff --git a/projects/solace-message-client/src/lib/oauth-access-token-provider.ts b/projects/solace-message-client/src/lib/oauth-access-token-provider.ts
index 7fa9bc6..50b0a1f 100644
--- a/projects/solace-message-client/src/lib/oauth-access-token-provider.ts
+++ b/projects/solace-message-client/src/lib/oauth-access-token-provider.ts
@@ -15,7 +15,7 @@ import {Observable} from 'rxjs';
  * ```ts
  * import {bootstrapApplication} from '@angular/platform-browser';
  * import {provideSolaceMessageClient} from '@solace-community/angular-solace-message-client';
- * import {AuthenticationScheme} from 'solclientjs';
+ * import {AuthenticationScheme} from 'solclientjs/lib-browser/solclient-full';
  * import {inject} from '@angular/core';
  *
  * bootstrapApplication(AppComponent, {
diff --git a/projects/solace-message-client/src/lib/oauth-solace-message-client.spec.ts b/projects/solace-message-client/src/lib/oauth-solace-message-client.spec.ts
index fbb29e7..76bab6e 100644
--- a/projects/solace-message-client/src/lib/oauth-solace-message-client.spec.ts
+++ b/projects/solace-message-client/src/lib/oauth-solace-message-client.spec.ts
@@ -1,6 +1,6 @@
 import {SolaceMessageClient} from './solace-message-client';
 import {provideSolaceMessageClient} from './solace-message-client.provider';
-import {AuthenticationScheme, SessionEventCode} from 'solclientjs';
+import {AuthenticationScheme, SessionEventCode} from 'solclientjs/lib-browser/solclient-full';
 import {SessionFixture} from './testing/session.fixture';
 import {provideSession} from './testing/session-provider';
 import {TestBed} from '@angular/core/testing';
diff --git a/projects/solace-message-client/src/lib/solace-message-client-browse.spec.ts b/projects/solace-message-client/src/lib/solace-message-client-browse.spec.ts
index ec0bf7a..3046d5c 100644
--- a/projects/solace-message-client/src/lib/solace-message-client-browse.spec.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client-browse.spec.ts
@@ -2,7 +2,7 @@ import {MessageEnvelope, SolaceMessageClient} from './solace-message-client';
 import {ObserveCaptor} from '@scion/toolkit/testing';
 import {TestBed} from '@angular/core/testing';
 import {NgZone} from '@angular/core';
-import {QueueBrowserEventName, QueueBrowserProperties, QueueDescriptor, QueueType, SDTFieldType, SDTMapContainer, SessionEventCode} from 'solclientjs';
+import {QueueBrowserEventName, QueueBrowserProperties, QueueDescriptor, QueueType, SDTFieldType, SDTMapContainer, SessionEventCode} from 'solclientjs/lib-browser/solclient-full';
 import {SessionFixture} from './testing/session.fixture';
 import {createOperationError, createQueueMessage, drainMicrotaskQueue, initSolclientFactory} from './testing/testing.utils';
 import {provideSession} from './testing/session-provider';
diff --git a/projects/solace-message-client/src/lib/solace-message-client-config.spec.ts b/projects/solace-message-client/src/lib/solace-message-client-config.spec.ts
index d0b9987..80dd2db 100644
--- a/projects/solace-message-client/src/lib/solace-message-client-config.spec.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client-config.spec.ts
@@ -1,6 +1,6 @@
 import {SolaceMessageClient} from './solace-message-client';
 import {TestBed} from '@angular/core/testing';
-import {DestinationType, SessionEventCode} from 'solclientjs';
+import {DestinationType, SessionEventCode} from 'solclientjs/lib-browser/solclient-full';
 import {SessionFixture} from './testing/session.fixture';
 import {provideSession} from './testing/session-provider';
 import {provideSolaceMessageClient} from './solace-message-client.provider';
diff --git a/projects/solace-message-client/src/lib/solace-message-client-connect.spec.ts b/projects/solace-message-client/src/lib/solace-message-client-connect.spec.ts
index 05718a4..1f78c92 100644
--- a/projects/solace-message-client/src/lib/solace-message-client-connect.spec.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client-connect.spec.ts
@@ -1,6 +1,6 @@
 import {MessageEnvelope, SolaceMessageClient} from './solace-message-client';
 import {TestBed} from '@angular/core/testing';
-import {SessionEventCode} from 'solclientjs';
+import {SessionEventCode} from 'solclientjs/lib-browser/solclient-full';
 import {SessionFixture} from './testing/session.fixture';
 import {provideSession} from './testing/session-provider';
 import {provideSolaceMessageClient} from './solace-message-client.provider';
diff --git a/projects/solace-message-client/src/lib/solace-message-client-consume.spec.ts b/projects/solace-message-client/src/lib/solace-message-client-consume.spec.ts
index c280af4..9eda7b7 100644
--- a/projects/solace-message-client/src/lib/solace-message-client-consume.spec.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client-consume.spec.ts
@@ -2,7 +2,7 @@ import {MessageEnvelope, SolaceMessageClient} from './solace-message-client';
 import {ObserveCaptor} from '@scion/toolkit/testing';
 import {TestBed} from '@angular/core/testing';
 import {NgZone} from '@angular/core';
-import {MessageConsumerEventName, MessageConsumerProperties, QueueDescriptor, QueueType, SDTFieldType, SDTMapContainer, SessionEventCode, SolclientFactory} from 'solclientjs';
+import {MessageConsumerEventName, MessageConsumerProperties, QueueDescriptor, QueueType, SDTFieldType, SDTMapContainer, SessionEventCode, SolclientFactory} from 'solclientjs/lib-browser/solclient-full';
 import {SessionFixture} from './testing/session.fixture';
 import {createOperationError, createTopicMessage, drainMicrotaskQueue, initSolclientFactory} from './testing/testing.utils';
 import {provideSession} from './testing/session-provider';
diff --git a/projects/solace-message-client/src/lib/solace-message-client-dispose.spec.ts b/projects/solace-message-client/src/lib/solace-message-client-dispose.spec.ts
index 7a5a1bd..e330ece 100644
--- a/projects/solace-message-client/src/lib/solace-message-client-dispose.spec.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client-dispose.spec.ts
@@ -1,7 +1,7 @@
 import {SolaceMessageClient} from './solace-message-client';
 import {createEnvironmentInjector, EnvironmentInjector} from '@angular/core';
 import {provideSolaceMessageClient} from './solace-message-client.provider';
-import {SessionEventCode} from 'solclientjs';
+import {SessionEventCode} from 'solclientjs/lib-browser/solclient-full';
 import {SessionFixture} from './testing/session.fixture';
 import {provideSession} from './testing/session-provider';
 import {TestBed} from '@angular/core/testing';
diff --git a/projects/solace-message-client/src/lib/solace-message-client-request-reply.spec.ts b/projects/solace-message-client/src/lib/solace-message-client-request-reply.spec.ts
index 9aea67d..aa9dcb4 100644
--- a/projects/solace-message-client/src/lib/solace-message-client-request-reply.spec.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client-request-reply.spec.ts
@@ -2,7 +2,7 @@ import {MessageEnvelope, SolaceMessageClient} from './solace-message-client';
 import {ObserveCaptor} from '@scion/toolkit/testing';
 import {TestBed} from '@angular/core/testing';
 import {NgZone} from '@angular/core';
-import {SessionEventCode, SolclientFactory} from 'solclientjs';
+import {SessionEventCode, SolclientFactory} from 'solclientjs/lib-browser/solclient-full';
 import {SessionFixture} from './testing/session.fixture';
 import {createRequestError, createTopicMessage, drainMicrotaskQueue, initSolclientFactory} from './testing/testing.utils';
 import {provideSession} from './testing/session-provider';
diff --git a/projects/solace-message-client/src/lib/solace-message-client.config.ts b/projects/solace-message-client/src/lib/solace-message-client.config.ts
index f2f93df..334b22c 100644
--- a/projects/solace-message-client/src/lib/solace-message-client.config.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client.config.ts
@@ -1,4 +1,4 @@
-import {SessionProperties} from 'solclientjs';
+import {SessionProperties} from 'solclientjs/lib-browser/solclient-full';
 import {InjectionToken} from '@angular/core';
 import {OAuthAccessTokenFn} from './oauth-access-token-provider';
 import {Observable} from 'rxjs';
diff --git a/projects/solace-message-client/src/lib/solace-message-client.provider.ts b/projects/solace-message-client/src/lib/solace-message-client.provider.ts
index 136ac83..c4568f5 100644
--- a/projects/solace-message-client/src/lib/solace-message-client.provider.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client.provider.ts
@@ -4,7 +4,7 @@ import {provideLogger} from './logger';
 import {ɵSolaceMessageClient} from './ɵsolace-message-client';
 import {SolaceSessionProvider, ɵSolaceSessionProvider} from './solace-session-provider';
 import {NullSolaceMessageClient, SolaceMessageClient} from './solace-message-client';
-import {LogLevel} from 'solclientjs';
+import {LogLevel} from 'solclientjs/lib-browser/solclient-full';
 
 /**
  * Enables and configures the Angular Solace Message Client, returning a set of dependency-injection providers to be registered in Angular.
@@ -96,7 +96,7 @@ import {LogLevel} from 'solclientjs';
  * ```ts
  * import {bootstrapApplication} from '@angular/platform-browser';
  * import {provideSolaceMessageClient} from '@solace-community/angular-solace-message-client';
- * import {LogLevel} from 'solclientjs';
+ * import {LogLevel} from 'solclientjs/lib-browser/solclient-full';
  *
  * bootstrapApplication(AppComponent, {
  *   providers: [
diff --git a/projects/solace-message-client/src/lib/solace-message-client.spec.ts b/projects/solace-message-client/src/lib/solace-message-client.spec.ts
index ffd270b..36c0bdc 100644
--- a/projects/solace-message-client/src/lib/solace-message-client.spec.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client.spec.ts
@@ -2,7 +2,7 @@ import {mapToBinary, mapToText, MessageEnvelope, Params, PublishOptions, SolaceM
 import {ObserveCaptor} from '@scion/toolkit/testing';
 import {TestBed} from '@angular/core/testing';
 import {Component, NgZone} from '@angular/core';
-import {DestinationType, Message, MessageDeliveryModeType, MessageType, SDTField, SDTFieldType, SDTMapContainer, SessionEventCode, SolclientFactory} from 'solclientjs';
+import {DestinationType, Message, MessageDeliveryModeType, MessageType, SDTField, SDTFieldType, SDTMapContainer, SessionEventCode, SolclientFactory} from 'solclientjs/lib-browser/solclient-full';
 import {UUID} from '@scion/toolkit/uuid';
 import {SessionFixture} from './testing/session.fixture';
 import {createTopicMessage, drainMicrotaskQueue, initSolclientFactory} from './testing/testing.utils';
diff --git a/projects/solace-message-client/src/lib/solace-message-client.ts b/projects/solace-message-client/src/lib/solace-message-client.ts
index 6de43c9..9409833 100644
--- a/projects/solace-message-client/src/lib/solace-message-client.ts
+++ b/projects/solace-message-client/src/lib/solace-message-client.ts
@@ -1,6 +1,6 @@
 import {Injectable} from '@angular/core';
 import {BehaviorSubject, NEVER, noop, Observable, OperatorFunction} from 'rxjs';
-import {Destination, Message, MessageConsumer, MessageConsumerProperties, MessageDeliveryModeType, MessageType, QueueBrowserProperties, SDTField, Session} from 'solclientjs';
+import {Destination, Message, MessageConsumer, MessageConsumerProperties, MessageDeliveryModeType, MessageType, QueueBrowserProperties, SDTField, Session} from 'solclientjs/lib-browser/solclient-full';
 import {map} from 'rxjs/operators';
 
 /**
diff --git a/projects/solace-message-client/src/lib/solace-session-provider.ts b/projects/solace-message-client/src/lib/solace-session-provider.ts
index c8d30f1..bcb94c7 100644
--- a/projects/solace-message-client/src/lib/solace-session-provider.ts
+++ b/projects/solace-message-client/src/lib/solace-session-provider.ts
@@ -1,5 +1,5 @@
 import {inject, Injectable} from '@angular/core';
-import {Session, SessionProperties, SolclientFactory, SolclientFactoryProfiles, SolclientFactoryProperties} from 'solclientjs';
+import {Session, SessionProperties, SolclientFactory, SolclientFactoryProfiles, SolclientFactoryProperties} from 'solclientjs/lib-browser/solclient-full';
 import {Logger} from './logger';
 
 /**
diff --git a/projects/solace-message-client/src/lib/testing/message-consumer.fixture.ts b/projects/solace-message-client/src/lib/testing/message-consumer.fixture.ts
index afe120a..f9e6e19 100644
--- a/projects/solace-message-client/src/lib/testing/message-consumer.fixture.ts
+++ b/projects/solace-message-client/src/lib/testing/message-consumer.fixture.ts
@@ -1,4 +1,4 @@
-import {Message, MessageConsumer, MessageConsumerEvent, MessageConsumerEventName, MessageConsumerProperties, OperationError, Session} from 'solclientjs';
+import {Message, MessageConsumer, MessageConsumerEvent, MessageConsumerEventName, MessageConsumerProperties, OperationError, Session} from 'solclientjs/lib-browser/solclient-full';
 import {noop} from 'rxjs';
 import {drainMicrotaskQueue} from './testing.utils';
 
diff --git a/projects/solace-message-client/src/lib/testing/queue-browser.fixture.ts b/projects/solace-message-client/src/lib/testing/queue-browser.fixture.ts
index aee5d92..487f620 100644
--- a/projects/solace-message-client/src/lib/testing/queue-browser.fixture.ts
+++ b/projects/solace-message-client/src/lib/testing/queue-browser.fixture.ts
@@ -1,4 +1,4 @@
-import {Message, OperationError, QueueBrowser, QueueBrowserEventName, QueueBrowserProperties, Session} from 'solclientjs';
+import {Message, OperationError, QueueBrowser, QueueBrowserEventName, QueueBrowserProperties, Session} from 'solclientjs/lib-browser/solclient-full';
 import {drainMicrotaskQueue} from './testing.utils';
 
 /**
diff --git a/projects/solace-message-client/src/lib/testing/send-request.fixture.ts b/projects/solace-message-client/src/lib/testing/send-request.fixture.ts
index 939669d..0eb2ee1 100644
--- a/projects/solace-message-client/src/lib/testing/send-request.fixture.ts
+++ b/projects/solace-message-client/src/lib/testing/send-request.fixture.ts
@@ -1,4 +1,4 @@
-import {Message, RequestError, Session} from 'solclientjs';
+import {Message, RequestError, Session} from 'solclientjs/lib-browser/solclient-full';
 
 /**
  * Fixture to simulate request-response communication.
diff --git a/projects/solace-message-client/src/lib/testing/session-provider.ts b/projects/solace-message-client/src/lib/testing/session-provider.ts
index ac8e3ed..cce09cf 100644
--- a/projects/solace-message-client/src/lib/testing/session-provider.ts
+++ b/projects/solace-message-client/src/lib/testing/session-provider.ts
@@ -1,7 +1,7 @@
 import {EnvironmentProviders, makeEnvironmentProviders} from '@angular/core';
 import {SolaceSessionProvider} from '../solace-session-provider';
 import {SessionFixture} from './session.fixture';
-import {SessionProperties} from 'solclientjs';
+import {SessionProperties} from 'solclientjs/lib-browser/solclient-full';
 
 /**
  * Creates {@link EnvironmentProviders} with a {@link SolaceSessionProvider} that provides the {@link Session} of the passed {@link SessionFixture}.
diff --git a/projects/solace-message-client/src/lib/testing/session.fixture.ts b/projects/solace-message-client/src/lib/testing/session.fixture.ts
index cba6378..dcb187f 100644
--- a/projects/solace-message-client/src/lib/testing/session.fixture.ts
+++ b/projects/solace-message-client/src/lib/testing/session.fixture.ts
@@ -1,4 +1,4 @@
-import {Destination, Message, MessageType, Session, SessionEvent, SessionEventCode, SessionProperties} from 'solclientjs';
+import {Destination, Message, MessageType, Session, SessionEvent, SessionEventCode, SessionProperties} from 'solclientjs/lib-browser/solclient-full';
 import {drainMicrotaskQueue} from './testing.utils';
 import {MessageConsumerFixture} from './message-consumer.fixture';
 import {QueueBrowserFixture} from './queue-browser.fixture';
diff --git a/projects/solace-message-client/src/lib/testing/testing.utils.ts b/projects/solace-message-client/src/lib/testing/testing.utils.ts
index c76ec2b..a0b0fba 100644
--- a/projects/solace-message-client/src/lib/testing/testing.utils.ts
+++ b/projects/solace-message-client/src/lib/testing/testing.utils.ts
@@ -1,5 +1,5 @@
 import {asyncScheduler} from 'rxjs';
-import {LogLevel, Message, OperationError, RequestError, SolclientFactory, SolclientFactoryProfiles, SolclientFactoryProperties} from 'solclientjs';
+import {LogLevel, Message, OperationError, RequestError, SolclientFactory, SolclientFactoryProfiles, SolclientFactoryProperties} from 'solclientjs/lib-browser/solclient-full';
 
 /**
  * Initializes `SolclientFactory`.
diff --git a/projects/solace-message-client/src/lib/topic-subscription-counter.ts b/projects/solace-message-client/src/lib/topic-subscription-counter.ts
index 3e407e8..c0c371e 100644
--- a/projects/solace-message-client/src/lib/topic-subscription-counter.ts
+++ b/projects/solace-message-client/src/lib/topic-subscription-counter.ts
@@ -1,4 +1,4 @@
-import {Destination} from 'solclientjs';
+import {Destination} from 'solclientjs/lib-browser/solclient-full';
 
 /**
  * Maintains the subscription count per topic.
diff --git "a/projects/solace-message-client/src/lib/\311\265solace-message-client.ts" "b/projects/solace-message-client/src/lib/\311\265solace-message-client.ts"
index ece6812..c316d49 100644
--- "a/projects/solace-message-client/src/lib/\311\265solace-message-client.ts"
+++ "b/projects/solace-message-client/src/lib/\311\265solace-message-client.ts"
@@ -7,7 +7,7 @@ import {TopicMatcher} from './topic-matcher';
 import {observeIn, subscribeIn} from '@scion/toolkit/operators';
 import {SolaceSessionProvider} from './solace-session-provider';
 import {SOLACE_MESSAGE_CLIENT_CONFIG, SolaceMessageClientConfig} from './solace-message-client.config';
-import {AuthenticationScheme, Destination, Message, MessageConsumer, MessageConsumerEventName, MessageConsumerProperties, MessageDeliveryModeType, OperationError, QueueBrowser, QueueBrowserEventName, QueueBrowserProperties, QueueDescriptor, QueueType, RequestError, SDTField, SDTFieldType, SDTMapContainer, Session, SessionEvent, SessionEventCode, SessionProperties as SolaceSessionProperties, SolclientFactory} from 'solclientjs';
+import {AuthenticationScheme, Destination, Message, MessageConsumer, MessageConsumerEventName, MessageConsumerProperties, MessageDeliveryModeType, OperationError, QueueBrowser, QueueBrowserEventName, QueueBrowserProperties, QueueDescriptor, QueueType, RequestError, SDTField, SDTFieldType, SDTMapContainer, Session, SessionEvent, SessionEventCode, SessionProperties as SolaceSessionProperties, SolclientFactory} from 'solclientjs/lib-browser/solclient-full';
 import {TopicSubscriptionCounter} from './topic-subscription-counter';
 import {SerialExecutor} from './serial-executor.service';
 import {Logger} from './logger';
diff --git a/projects/solace-message-client/src/public-api.ts b/projects/solace-message-client/src/public-api.ts
index b9a74d6..7c0a953 100644
--- a/projects/solace-message-client/src/public-api.ts
+++ b/projects/solace-message-client/src/public-api.ts
@@ -1,3 +1,4 @@
+/// <reference path="./solclientjs.d.ts" />
 export {type SolaceMessageClientConfig, type SolaceMessageClientConfigFn} from './lib/solace-message-client.config';
 export {type OAuthAccessTokenFn} from './lib/oauth-access-token-provider';
 export {SolaceSessionProvider} from './lib/solace-session-provider';
diff --git a/projects/solace-message-client/src/solclientjs.d.ts b/projects/solace-message-client/src/solclientjs.d.ts
new file mode 100644
index 0000000..2811cc0
--- /dev/null
+++ b/projects/solace-message-client/src/solclientjs.d.ts
@@ -0,0 +1,4 @@
+declare module 'solclientjs/lib-browser/solclient-full' {
+  import solace = require('solclientjs/lib-browser/index');
+  export = solace;
+}