diff --git a/components/lazdebuggergdbmi/test/gdbmitestutils/testwatchutils.pas b/components/lazdebuggergdbmi/test/gdbmitestutils/testwatchutils.pas
index 4675199ceb..5cf3fb3c5e 100644
--- a/components/lazdebuggergdbmi/test/gdbmitestutils/testwatchutils.pas
+++ b/components/lazdebuggergdbmi/test/gdbmitestutils/testwatchutils.pas
@@ -8,7 +8,7 @@ uses
   Classes, SysUtils, RegExpr, TestBase, LazLoggerBase, DbgIntfBaseTypes,
   DbgIntfDebuggerBase, TestDbgConfig, TTestDebuggerClasses, IdeDebuggerBase,
   IdeDebuggerWatchResult, IdeDebuggerWatchResPrinter, LazDebuggerIntf,
-  LazDebuggerIntfBaseTypes;
+  LazDebuggerIntfBaseTypes, IdeDebuggerWatchValueIntf;
 
 type
 
diff --git a/components/lazdebuggers/lazdebuggerfp/test/testwatches.pas b/components/lazdebuggers/lazdebuggerfp/test/testwatches.pas
index 8caf1264ef..d6a902bef5 100644
--- a/components/lazdebuggers/lazdebuggerfp/test/testwatches.pas
+++ b/components/lazdebuggers/lazdebuggerfp/test/testwatches.pas
@@ -9,9 +9,9 @@ uses
   FpDebugDebugger, TestDbgControl, TestDbgTestSuites, TestOutputLogger,
   TTestWatchUtilities, TestCommonSources, TestDbgConfig, LazDebuggerIntf,
   LazDebuggerIntfBaseTypes, LazDebuggerValueConverter, DbgIntfDebuggerBase,
-  DbgIntfBaseTypes, FpDbgInfo, FpPascalParser, FpDbgCommon, Forms,
-  IdeDebuggerBase, IdeDebuggerWatchResult, IdeDebuggerBackendValueConv,
-  FpDebugStringConstants;
+  DbgIntfBaseTypes, FpDbgInfo, FpPascalParser, FpDbgCommon,
+  IdeDebuggerWatchValueIntf, Forms, IdeDebuggerBase, IdeDebuggerWatchResult,
+  IdeDebuggerBackendValueConv, FpDebugStringConstants;
 
 type
 
diff --git a/components/lazdebuggers/lazdebugtestbase/ttestdebuggerclasses.pas b/components/lazdebuggers/lazdebugtestbase/ttestdebuggerclasses.pas
index ca77ef93ae..06f9bfc21c 100644
--- a/components/lazdebuggers/lazdebugtestbase/ttestdebuggerclasses.pas
+++ b/components/lazdebuggers/lazdebugtestbase/ttestdebuggerclasses.pas
@@ -5,9 +5,9 @@ unit TTestDebuggerClasses;
 interface
 
 uses
-  Classes, SysUtils, DbgIntfDebuggerBase, IdeDebuggerBase, Debugger,
-  IdeDebuggerWatchResult, LazDebuggerIntf, LazDebuggerIntfBaseTypes,
-  LazDebuggerValueConverter, LazDebuggerTemplate;
+  Classes, SysUtils, DbgIntfDebuggerBase, IdeDebuggerWatchValueIntf,
+  IdeDebuggerBase, Debugger, IdeDebuggerWatchResult, LazDebuggerIntf,
+  LazDebuggerIntfBaseTypes, LazDebuggerValueConverter, LazDebuggerTemplate;
 
 type
 
diff --git a/components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas b/components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas
index a7c3553049..68f7f07528 100644
--- a/components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas
+++ b/components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas
@@ -9,10 +9,11 @@ interface
 
 uses
   Classes, SysUtils, math, DbgIntfBaseTypes, DbgIntfDebuggerBase,
-  FpPascalBuilder, LazLoggerBase, Forms, IdeDebuggerBase, IdeDebuggerUtils,
-  IdeDebuggerWatchResult, IdeDebuggerWatchResPrinter, RegExpr,
-  TestDbgTestSuites, TTestDebuggerClasses, TTestDbgExecuteables, TestDbgConfig,
-  LazDebuggerIntf, LazDebuggerIntfBaseTypes, TestOutputLogger;
+  FpPascalBuilder, LazLoggerBase, IdeDebuggerWatchValueIntf, Forms,
+  IdeDebuggerBase, IdeDebuggerUtils, IdeDebuggerWatchResult,
+  IdeDebuggerWatchResPrinter, RegExpr, TestDbgTestSuites, TTestDebuggerClasses,
+  TTestDbgExecuteables, TestDbgConfig, LazDebuggerIntf,
+  LazDebuggerIntfBaseTypes, TestOutputLogger;
 
 const
   SIZE_1 = 1;
diff --git a/ide/packages/idedebugger/test/testwatchresult.pas b/ide/packages/idedebugger/test/testwatchresult.pas
index 5a962c4904..dd07c18636 100644
--- a/ide/packages/idedebugger/test/testwatchresult.pas
+++ b/ide/packages/idedebugger/test/testwatchresult.pas
@@ -5,9 +5,9 @@ unit TestWatchResult;
 interface
 
 uses
-  Classes, SysUtils, Math, Debugger,
-  fpcunit, testutils, testregistry,
-  IdeDebuggerWatchResult, LazDebuggerIntf, Laz2_XMLCfg, LazLogger;
+  Classes, SysUtils, Math, Debugger, fpcunit, testutils, testregistry,
+  IdeDebuggerWatchResult, LazDebuggerIntf, Laz2_XMLCfg, LazLogger,
+  IdeDebuggerWatchValueIntf;
 
 const
   SkipSubTestCopy = False; // Skip CreateCopy in Assert....