diff --git a/packages/client/src/connection.ts b/packages/client/src/connection.ts
index f259828c..a52564a3 100644
--- a/packages/client/src/connection.ts
+++ b/packages/client/src/connection.ts
@@ -4,14 +4,14 @@
  * ------------------------------------------------------------------------------------------ */
 'use strict';
 
-import {
+import type {
     Message,
     RequestType, RequestType0, RequestHandler, RequestHandler0, GenericRequestHandler,
     NotificationType, NotificationType0,
     NotificationHandler, NotificationHandler0, GenericNotificationHandler,
     Trace, Tracer, CancellationToken, MessageConnection, MessageSignature, Disposable, ProgressType
-} from 'vscode-jsonrpc';
-import { MessageTransports } from 'vscode-languageclient';
+} from 'vscode-jsonrpc/lib/common/api';
+import type { MessageTransports } from 'vscode-languageclient/lib/common/api';
 
 import {
     InitializeRequest, InitializeParams, InitializeResult,
diff --git a/packages/client/src/converters.ts b/packages/client/src/converters.ts
index b806d4c7..b10ba2c5 100644
--- a/packages/client/src/converters.ts
+++ b/packages/client/src/converters.ts
@@ -1,6 +1,6 @@
 import * as p2c from 'vscode-languageclient/lib/common/protocolConverter';
 import * as c2p from 'vscode-languageclient/lib/common/codeConverter';
-import { WillSaveTextDocumentParams } from 'vscode-languageclient';
+import type { WillSaveTextDocumentParams } from 'vscode-languageserver-protocol';
 import * as code from 'vscode';
 import * as proto from 'vscode-languageserver-protocol';
 
diff --git a/packages/client/src/monaco-language-client.ts b/packages/client/src/monaco-language-client.ts
index 5fc8b86f..5f180133 100644
--- a/packages/client/src/monaco-language-client.ts
+++ b/packages/client/src/monaco-language-client.ts
@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 import {
     BaseLanguageClient, MessageTransports, LanguageClientOptions
-} from "vscode-languageclient";
+} from "vscode-languageclient/lib/common/client";
 import * as p2c from 'vscode-languageclient/lib/common/protocolConverter';
 import * as c2p from 'vscode-languageclient/lib/common/codeConverter';
 import { IConnectionProvider } from './connection';
diff --git a/packages/client/src/services.ts b/packages/client/src/services.ts
index 8f524d0f..0a9a7df8 100644
--- a/packages/client/src/services.ts
+++ b/packages/client/src/services.ts
@@ -24,7 +24,7 @@ import { TextDocument } from 'vscode-languageserver-textdocument';
 
 import {
     Disposable, CancellationToken, Event, Emitter
-} from 'vscode-jsonrpc';
+} from 'vscode-jsonrpc/lib/common/api';
 
 import { URI as Uri } from 'vscode-uri';
 import { TextDocumentShowOptions } from 'vscode';