Debugger: Moved dsState to new unit

components/debuggerintf/dbgintfbasetypes.pas

@@ -9,15 +9,15 @@ unit DbgIntfBaseTypes;
 interface
 
 uses
-  Classes, SysUtils;
+  Classes, SysUtils, LazDebuggerIntfBaseTypes;
 
 type
   (* TDBGPtr
      datatype pointing to data on the target
   *)
-  TDBGPtr = type QWord;
+  TDBGPtr      = LazDebuggerIntfBaseTypes.TDBGPtr;
-  PDBGPtr = ^TDBGPtr;
+  PDBGPtr      = LazDebuggerIntfBaseTypes.PDBGPtr;
-  TDBGPtrArray = Array of TDBGPtr;
+  TDBGPtrArray = LazDebuggerIntfBaseTypes.TDBGPtrArray;
 
   (* TDbgSymbolKind
      Enum of types that a value can have.

components/debuggerintf/dbgintfdebuggerbase.pp

@@ -51,7 +51,8 @@ uses
   LazClasses, {$ifdef FORCE_LAZLOGGER_DUMMY} LazLoggerDummy {$else} LazLoggerBase {$endif}, LazFileUtils, LazStringUtils, Maps, LazMethodList,
   // DebuggerIntf
   DbgIntfBaseTypes, DbgIntfMiscClasses, DbgIntfPseudoTerminal,
-  DbgIntfCommonStrings, LazDebuggerIntf, LazDebuggerTemplate;
+  DbgIntfCommonStrings, LazDebuggerIntf, LazDebuggerTemplate,
+  LazDebuggerIntfBaseTypes;
 
 const
   DebuggerIntfVersion = 0;

components/lazdebuggergdbmi/cmdlinedebugger.pp

@@ -47,7 +47,7 @@ uses
   // DebuggerIntf
   DbgIntfDebuggerBase,
   // LazDebuggerGdbmi
-  DebugUtils, LazDebuggerIntf;
+  DebugUtils, LazDebuggerIntf, LazDebuggerIntfBaseTypes;
 
 type
 

components/lazdebuggergdbmi/gdbmidebugger.pp

@@ -64,7 +64,7 @@ uses
   // DebuggerIntf
   DbgIntfBaseTypes, DbgIntfDebuggerBase,
   // CmdLineDebuggerBase
-  DebuggerPropertiesBase, LazDebuggerIntf,
+  DebuggerPropertiesBase, LazDebuggerIntf, LazDebuggerIntfBaseTypes,
 {$IFDEF DBG_ENABLE_TERMINAL}
   DbgIntfPseudoTerminal,
 {$ENDIF}

components/lazdebuggergdbmi/gdbmimiscclasses.pp

@@ -35,7 +35,7 @@ uses
   // DebuggerIntf
   DbgIntfDebuggerBase,
   // LazDebuggerGdbmi
-  DebugUtils, LazDebuggerIntf;
+  DebugUtils, LazDebuggerIntf, LazDebuggerIntfBaseTypes;
 
 type
 

components/lazdebuggergdbmi/gdbmiserverdebugger.pas

@@ -35,7 +35,7 @@ uses
   // DebuggerIntf
   DbgIntfDebuggerBase,
   // CmdLineDebuggerBase
-  DebuggerPropertiesBase, LazDebuggerIntf,
+  DebuggerPropertiesBase, LazDebuggerIntf, LazDebuggerIntfBaseTypes,
   // LazDebuggerGdbmi
   GDBMIDebugger, GDBMIMiscClasses, GdbmiStringConstants;
   

components/lazdebuggergdbmi/sshgdbmidebugger.pas

@@ -47,7 +47,8 @@ uses
   // DebuggerIntf
   DbgIntfDebuggerBase,
   // LazDebuggerGdbmi
-  GDBMIDebugger, GdbmiStringConstants, LazDebuggerIntf;
+  GDBMIDebugger, GdbmiStringConstants, LazDebuggerIntf,
+  LazDebuggerIntfBaseTypes;
 
 type
 

components/lazdebuggergdbmi/test/gdbmitestutils/testbase.pas

@@ -8,7 +8,8 @@ uses
   Classes, SysUtils, FileUtil, fpcunit, testregistry, LCLProc, LazLogger,
   LazFileUtils, DbgIntfDebuggerBase, Dialogs, Forms, RegExpr, GDBMIDebugger,
   TestDbgConfig, TestDbgTestSuites, TTestDbgExecuteables, TTestDebuggerClasses,
-  TestDbgCompilerProcess, TestDbgControl, TestOutputLogger, LazDebuggerIntf; // , FpGdbmiDebugger;
+  TestDbgCompilerProcess, TestDbgControl, TestOutputLogger, LazDebuggerIntf,
+  LazDebuggerIntfBaseTypes; // , FpGdbmiDebugger;
   // EnvironmentOpts, ExtToolDialog, TransferMacros,
 
 

components/lazdebuggergdbmi/test/gdbmitestutils/testwatchutils.pas

@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, RegExpr, TestBase, LazLoggerBase, DbgIntfBaseTypes,
   DbgIntfDebuggerBase, TestDbgConfig, TTestDebuggerClasses, IdeDebuggerBase,
-  LazDebuggerIntf;
+  IdeDebuggerWatchResult, LazDebuggerIntf, LazDebuggerIntfBaseTypes;
 
 type
 

components/lazdebuggergdbmi/test/testargv.pas

@@ -7,7 +7,8 @@ interface
 uses
   SysUtils, fpcunit, testutils, testregistry, TestBase, GDBMIDebugger, LCLProc,
   FileUtil, LazUTF8, DbgIntfDebuggerBase, TestDbgControl, TestDbgTestSuites,
-  TestDbgConfig, TestDbgCompilerProcess, LazDebuggerIntf, TestWatches;
+  TestDbgConfig, TestDbgCompilerProcess, LazDebuggerIntf,
+  LazDebuggerIntfBaseTypes, TestWatches;
 
 const
   BREAK_LINE_ARGV = 40;

components/lazdebuggergdbmi/test/testbreakpoint.pas

@@ -7,8 +7,8 @@ interface
 uses
   SysUtils, fpcunit, testutils, testregistry, DbgIntfBaseTypes,
   DbgIntfDebuggerBase, DbgIntfMiscClasses, TestBase, GDBMIDebugger,
-  TestDbgControl, TestDbgTestSuites, TestDbgConfig, LazDebuggerIntf, LCLProc,
+  TestDbgControl, TestDbgTestSuites, TestDbgConfig, LazDebuggerIntf,
-  TestWatches;
+  LazDebuggerIntfBaseTypes, LCLProc, TestWatches;
 
 type
 

components/lazdebuggergdbmi/test/testdisass.pas

@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, fpcunit, testutils, testregistry, LCLProc,
   DbgIntfBaseTypes, DbgIntfDebuggerBase, GDBMIDebugger, TestBase, maps,
-  TTestDebuggerClasses, LazDebuggerIntf;
+  TTestDebuggerClasses, LazDebuggerIntf, LazDebuggerIntfBaseTypes;
 
 type
   TTestDisAssRegion = record

components/lazdebuggergdbmi/test/testexception.pas

@@ -7,7 +7,8 @@ interface
 uses
   Classes, sysutils, fpcunit, testutils, testregistry, TestBase, GDBMIDebugger,
   LCLProc, DbgIntfDebuggerBase, TestDbgControl, TestDbgTestSuites,
-  TestDbgConfig, TestCommonSources, TestOutputLogger, LazDebuggerIntf;
+  TestDbgConfig, TestCommonSources, TestOutputLogger, LazDebuggerIntf,
+  LazDebuggerIntfBaseTypes;
 
 type
 

components/lazdebuggergdbmi/test/testwatches.pas

@@ -8,7 +8,7 @@ uses
   Classes, SysUtils, fpcunit, testutils, testregistry, RegExpr,
   DbgIntfBaseTypes, DbgIntfDebuggerBase, TestBase, GDBMIDebugger, TestDbgConfig,
   TestDbgControl, TTestDbgExecuteables, TestDbgTestSuites, LazDebuggerIntf,
-  LCLProc, TestWatchUtils, IdeDebuggerBase;
+  LazDebuggerIntfBaseTypes, LCLProc, TestWatchUtils, IdeDebuggerBase;
 
 const
   BREAK_LINE_FOOFUNC_NEST  = 206;

components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas

@@ -35,7 +35,7 @@ uses
   Classes, {$IfDef WIN64}windows,{$EndIf} SysUtils, fgl, math, process,
   Forms, Dialogs, syncobjs,
   Maps, LazLoggerBase, LazUTF8, lazCollections,
-  DbgIntfBaseTypes, DbgIntfDebuggerBase,
+  DbgIntfDebuggerBase, LazDebuggerIntfBaseTypes,
   FpDebugDebuggerUtils, FpDebugDebuggerWorkThreads, LazDebuggerIntf,
   // FpDebug
   {$IFDEF FPDEBUG_THREAD_CHECK} FpDbgCommon, {$ENDIF}

components/lazdebuggers/lazdebuggerfp/test/testbase.pas

@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, LazFileUtils, LazLogger, DbgIntfDebuggerBase,
   TestDbgConfig, TTestDbgExecuteables, TestDbgTestSuites, TestDbgControl,
-  FpDebugDebugger, LazDebuggerIntf, Dialogs, Forms,
+  FpDebugDebugger, LazDebuggerIntf, LazDebuggerIntfBaseTypes, Dialogs, Forms,
   FpDbgDwarfFreePascal;
 
 type

components/lazdebuggers/lazdebuggerfp/test/testbreakpoint.pas

@@ -7,8 +7,8 @@ interface
 uses
   Classes, SysUtils, math, TestDbgControl, TestDbgTestSuites,
   TTestWatchUtilities, TestCommonSources, TestDbgConfig, TTestDebuggerClasses,
-  LazDebuggerIntf, DbgIntfDebuggerBase, DbgIntfBaseTypes, LazLoggerBase,
+  LazDebuggerIntf, LazDebuggerIntfBaseTypes, DbgIntfDebuggerBase,
-  Forms;
+  DbgIntfBaseTypes, LazLoggerBase, Forms;
 
 type
 

components/lazdebuggers/lazdebuggerfp/test/teststepping.pas

@@ -7,8 +7,8 @@ interface
 uses
   Classes, SysUtils, math, TestDbgControl, TestDbgTestSuites, TestBase,
   TTestWatchUtilities, TestCommonSources, TestDbgConfig, TestOutputLogger,
-  FpDebugDebugger, FpDebugDebuggerUtils, LazDebuggerIntf, DbgIntfDebuggerBase,
+  FpDebugDebugger, FpDebugDebuggerUtils, LazDebuggerIntf,
-  DbgIntfBaseTypes,
+  LazDebuggerIntfBaseTypes, DbgIntfDebuggerBase, DbgIntfBaseTypes,
   {$ifdef FORCE_LAZLOGGER_DUMMY} LazLoggerDummy {$else} LazLoggerBase {$endif}, Forms;
 
 type

components/lazdebuggers/lazdebuggerfp/test/testwatches.pas

@@ -7,7 +7,8 @@ interface
 uses
   Classes, SysUtils, fpcunit, testregistry, TestBase, TestDbgControl,
   TestDbgTestSuites, TestOutputLogger, TTestWatchUtilities, TestCommonSources,
-  TestDbgConfig, LazDebuggerIntf, DbgIntfDebuggerBase, DbgIntfBaseTypes, Forms,
+  TestDbgConfig, LazDebuggerIntf, LazDebuggerIntfBaseTypes,
+  DbgIntfDebuggerBase, DbgIntfBaseTypes, Forms,
   IdeDebuggerBase;
 
 type

components/lazdebuggers/lazdebuggerfpgdbmi/fpgdbmidebugger.pp

@@ -17,7 +17,7 @@ uses
   GDBTypeInfo, LCLProc, Forms, FpDbgLoader, FpDbgDwarf, LazLoggerBase,
   LazLoggerProfiling, LazClasses, FpPascalParser, FpPascalBuilder,
   FpErrorMessages, FpDbgDwarfDataClasses, FpDbgDwarfFreePascal, FpDbgCommon,
-  MenuIntf, LazDebuggerIntf;
+  MenuIntf, LazDebuggerIntf, LazDebuggerIntfBaseTypes;
 
 type
 

components/lazdebuggers/lazdebuggerfpgdbmi/test/testwatches.pas

@@ -9,7 +9,7 @@ uses
   DbgIntfBaseTypes, DbgIntfDebuggerBase, TestBase, FpGdbmiDebugger, LCLProc,
   IdeDebuggerBase, TestWatchUtils, GDBMIDebugger, FpErrorMessages,
   TestDbgControl, TestDbgConfig, TTestDbgExecuteables, TestDbgTestSuites,
-  LazDebuggerIntf;
+  LazDebuggerIntf, LazDebuggerIntfBaseTypes;
 
 const
   BREAK_COUNT_TestWatchesUnitSimple = 17;

components/lazdebuggers/lazdebuggerfplldb/fplldbdebugger.pas

@@ -26,7 +26,7 @@ uses
   windows,
   {$ENDIF}
   Classes, sysutils, math, FpdMemoryTools, FpDbgInfo, LldbDebugger,
-  LldbInstructions, LldbHelper, LazDebuggerIntf, DbgIntfBaseTypes,
+  LldbInstructions, LldbHelper, LazDebuggerIntf, DbgIntfBaseTypes, LazDebuggerIntfBaseTypes,
   DbgIntfDebuggerBase, LCLProc, Forms, FpDbgLoader, FpDbgDwarf, LazLoggerBase,
   LazClasses, FpPascalParser, FpPascalBuilder, FpErrorMessages,
   FpDbgDwarfDataClasses, FpDbgDwarfFreePascal, FpDbgCommon;

components/lazdebuggers/lazdebuggerfplldb/test/testbase.pas

@@ -7,7 +7,7 @@ interface
 uses
   Classes, SysUtils, LazFileUtils, LazLogger, DbgIntfDebuggerBase,
   TestDbgConfig, TTestDbgExecuteables, TestDbgTestSuites, TestDbgControl,
-  FpLldbDebugger, LazDebuggerIntf, Dialogs, Forms,
+  FpLldbDebugger, LazDebuggerIntf, LazDebuggerIntfBaseTypes, Dialogs, Forms,
   FpDbgDwarfFreePascal;
 
 implementation

components/lazdebuggers/lazdebuggerfplldb/test/testwatches.pas

@@ -7,8 +7,8 @@ interface
 uses
   Classes, SysUtils, testutils, testregistry, fpcunit, TestBase,
   TestDbgTestSuites, TestDbgControl, TTestWatchUtilities, TestCommonSources,
-  TestDbgConfig, TestOutputLogger, LazDebuggerIntf, DbgIntfDebuggerBase,
+  TestDbgConfig, TestOutputLogger, LazDebuggerIntf, LazDebuggerIntfBaseTypes,
-  DbgIntfBaseTypes;
+  DbgIntfDebuggerBase, DbgIntfBaseTypes;
 
 type
 

components/lazdebuggers/lazdebuggerintf/lazdebuggerintf.lpk

@@ -33,6 +33,10 @@ See LCL license for details."/>
         <Type Value="Main Unit"/>
         <UnitName Value="lazdebuggerintfpackage"/>
       </Item>
+      <Item>
+        <Filename Value="lazdebuggerintfbasetypes.pas"/>
+        <UnitName Value="lazdebuggerintfbasetypes"/>
+      </Item>
     </Files>
     <RequiredPkgs>
       <Item>

components/lazdebuggers/lazdebuggerintf/lazdebuggerintf.pas

@@ -21,61 +21,10 @@ unit LazDebuggerIntf;
 interface
 
 uses
-  Classes, SysUtils;
+  Classes, SysUtils, LazDebuggerIntfBaseTypes;
 
 type
-
+  TDBGState = LazDebuggerIntfBaseTypes.TDBGState deprecated 'Use LazDebuggerIntfBaseTypes.TDBGState';
-  { Debugger states
-    --------------------------------------------------------------------------
-    dsNone:
-      The debug object is created, but no instance of an external debugger
-      exists.
-      Initial state, leave with Init, enter with Done
-
-    dsIdle:
-      The external debugger is started, but no filename (or no other params
-      required to start) were given.
-
-    dsStop:
-      (Optional) The execution of the target is stopped
-      The external debugger is loaded and ready to (re)start the execution
-      of the target.
-      Breakpoints, watches etc can be defined
-
-    dsPause:
-      The debugger has paused the target. Target variables can be examined
-
-    dsInternalPause:
-      Pause, not visible to user.
-      For examble auto continue breakpoint: Allow collection of Snapshot data
-
-    dsInit:
-      (Optional, Internal) The debugger is about to run
-
-    dsRun:
-      The target is running.
-
-    dsError:
-      Something unforseen has happened. A shutdown of the debugger is in
-      most cases needed.
-
-    -dsDestroying
-      The debugger is about to be destroyed.
-      Should normally happen immediate on calling Release.
-      But the debugger may be in nested calls, and has to exit them first.
-    --------------------------------------------------------------------------
-  }
-  TDBGState = (
-    dsNone,
-    dsIdle,
-    dsStop,
-    dsPause,
-    dsInternalPause,
-    dsInit,
-    dsRun,
-    dsError,
-    dsDestroying
-    );
 
   {$REGION ***** Internal types ***** }
 

components/lazdebuggers/lazdebuggerintf/lazdebuggerintfbasetypes.pas

@@ -0,0 +1,71 @@
+unit LazDebuggerIntfBaseTypes;
+
+{$mode objfpc}{$H+}
+
+interface
+
+type
+
+  (* TDBGPtr
+     datatype pointing to data on the target
+  *)
+  TDBGPtr = type QWord;
+  PDBGPtr = ^TDBGPtr;
+  TDBGPtrArray = Array of TDBGPtr;
+
+  { Debugger states
+    --------------------------------------------------------------------------
+    dsNone:
+      The debug object is created, but no instance of an external debugger
+      exists.
+      Initial state, leave with Init, enter with Done
+
+    dsIdle:
+      The external debugger is started, but no filename (or no other params
+      required to start) were given.
+
+    dsStop:
+      (Optional) The execution of the target is stopped
+      The external debugger is loaded and ready to (re)start the execution
+      of the target.
+      Breakpoints, watches etc can be defined
+
+    dsPause:
+      The debugger has paused the target. Target variables can be examined
+
+    dsInternalPause:
+      Pause, not visible to user.
+      For examble auto continue breakpoint: Allow collection of Snapshot data
+
+    dsInit:
+      (Optional, Internal) The debugger is about to run
+
+    dsRun:
+      The target is running.
+
+    dsError:
+      Something unforseen has happened. A shutdown of the debugger is in
+      most cases needed.
+
+    -dsDestroying
+      The debugger is about to be destroyed.
+      Should normally happen immediate on calling Release.
+      But the debugger may be in nested calls, and has to exit them first.
+    --------------------------------------------------------------------------
+  }
+  TDBGState = (
+    dsNone,
+    dsIdle,
+    dsStop,
+    dsPause,
+    dsInternalPause,
+    dsInit,
+    dsRun,
+    dsError,
+    dsDestroying
+    );
+
+implementation
+
+end.
+

components/lazdebuggers/lazdebuggerintf/lazdebuggerintfpackage.pas

@@ -2,13 +2,13 @@
   This source is only used to compile and install the package.
  }
 
-unit LazDebuggerIntfPackage;
+unit lazdebuggerintfpackage;
 
 {$warn 5023 off : no warning about unused units}
 interface
 
 uses
-  LazDebuggerIntf, LazDebuggerTemplate;
+  LazDebuggerIntf, LazDebuggerTemplate, LazDebuggerIntfBaseTypes;
 
 implementation
 

components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas

@@ -30,7 +30,7 @@ uses
   // CmdLineDebuggerBase
   DebugProcess,
   // LazDebuggerLldb
-  LldbInstructions, LldbHelper, LazDebuggerIntf;
+  LldbInstructions, LldbHelper, LazDebuggerIntf, LazDebuggerIntfBaseTypes;
 
 type
 

components/lazdebuggers/lazdebugtestbase/testdbgtestsuites.pas

@@ -6,7 +6,8 @@ interface
 
 uses
   Classes, SysUtils, TTestDbgExecuteables, TestDbgControl, TestDbgConfig,
-  TestOutputLogger, TestCommonSources, LazDebuggerIntf, LazFileUtils, LazLogger,
+  TestOutputLogger, TestCommonSources, LazDebuggerIntf, LazDebuggerIntfBaseTypes,
+  LazFileUtils, LazLogger,
   DbgIntfDebuggerBase, StrUtils, fpcunit, testregistry, RegExpr;
 
 const

components/lazdebuggers/lazdebugtestbase/ttestdbgexecuteables.pas

@@ -7,8 +7,8 @@ interface
 uses
   Classes, SysUtils, fgl, TestDbgConfig, TestDbgCompilerProcess,
   TestOutputLogger, TTestDebuggerClasses, TestCommonSources, LazDebuggerIntf,
-  LazFileUtils, LazLoggerBase, FileUtil, LazStringUtils, DbgIntfDebuggerBase,
+  LazDebuggerIntfBaseTypes, LazFileUtils, LazLoggerBase, FileUtil,
-  fpcunit;
+  LazStringUtils, DbgIntfDebuggerBase, fpcunit;
 
 type
 

components/lazdebuggers/lazdebugtestbase/ttestwatchutilities.pas

@@ -10,7 +10,7 @@ uses
   Classes, SysUtils, math, DbgIntfBaseTypes, DbgIntfDebuggerBase,
   FpPascalBuilder, LazLoggerBase, Forms, IdeDebuggerBase, RegExpr,
   TestDbgTestSuites, TTestDebuggerClasses, TTestDbgExecuteables, TestDbgConfig,
-  LazDebuggerIntf, TestOutputLogger;
+  LazDebuggerIntf, LazDebuggerIntfBaseTypes, TestOutputLogger;
 
 type
   TWatchExpectationResultKind = (

debugger/assemblerdlg.pp

@@ -16,7 +16,8 @@ uses
   // IdeIntf
   IDEWindowIntf, IDECommands, IDEImagesIntf,
   // DebuggerIntf
-  DbgIntfBaseTypes, DbgIntfDebuggerBase, LazDebuggerIntf,
+  DbgIntfDebuggerBase,
+  LazDebuggerIntfBaseTypes,
   // IDE
   DebuggerDlg, Debugger, BaseDebugManager, EditorOptions, SourceEditor;
 

debugger/inspectdlg.pas

@@ -35,6 +35,7 @@ uses
   IDEWindowIntf, IDEImagesIntf, ObjectInspector, PropEdits,
   // DebuggerIntf
   DbgIntfDebuggerBase, DbgIntfBaseTypes, LazDebuggerIntf,
+  LazDebuggerIntfBaseTypes,
   // IDE
   LazarusIDEStrConsts, BaseDebugManager, InputHistory, IDEProcs,
   Debugger, DebuggerDlg, DebuggerStrConst, EnvironmentOpts;

debugger/registersdlg.pp

@@ -44,7 +44,7 @@ uses
   // IdeIntf
   IDEWindowIntf, IDEImagesIntf,
   // DebuggerIntf
-  DbgIntfDebuggerBase, LazDebuggerIntf,
+  DbgIntfDebuggerBase, LazDebuggerIntf, LazDebuggerIntfBaseTypes,
   // IDE
   BaseDebugManager, LazarusIDEStrConsts, DebuggerStrConst, Debugger, DebuggerDlg;
 

debugger/watchesdlg.pp

@@ -44,7 +44,7 @@ uses
   IDEImagesIntf, LazarusIDEStrConsts, DebuggerStrConst, Debugger,
   DebuggerTreeView, IdeDebuggerBase, DebuggerDlg, DbgIntfBaseTypes,
   DbgIntfDebuggerBase, DbgIntfMiscClasses, SynEdit, laz.VirtualTrees,
-  LazDebuggerIntf, BaseDebugManager, EnvironmentOpts;
+  LazDebuggerIntf, LazDebuggerIntfBaseTypes, BaseDebugManager, EnvironmentOpts;
 
 type
 

ide/debugmanager.pas

@@ -59,7 +59,7 @@ uses
   InspectDlg, DebugEventsForm, PseudoTerminalDlg, FeedbackDlg, ThreadDlg,
   HistoryDlg, ProcessDebugger, DbgIntfBaseTypes, DbgIntfDebuggerBase,
   DbgIntfMiscClasses, DbgIntfPseudoTerminal, LazDebuggerIntf,
-  BaseDebugManager;
+  LazDebuggerIntfBaseTypes, BaseDebugManager;
 
 
 type

ide/packages/idedebugger/debugger.pp

@@ -44,7 +44,7 @@ uses
   LazClasses, Maps, LazMethodList,
   // DebuggerIntf
   DbgIntfBaseTypes, DbgIntfMiscClasses, DbgIntfDebuggerBase,
-  LazDebuggerIntf, IdeDebuggerBase;
+  LazDebuggerIntf, LazDebuggerIntfBaseTypes, IdeDebuggerBase;
 
 const
   XMLBreakPointsNode = 'BreakPoints';

ide/packages/idedebugger/processdebugger.pp

@@ -44,7 +44,7 @@ uses
   // LazUtils
   FileUtil, UTF8Process, LazFileUtils, LazLoggerBase,
   // DebuggerIntf
-  DbgIntfDebuggerBase, LazDebuggerIntf,
+  DbgIntfDebuggerBase, LazDebuggerIntfBaseTypes,
   // IDE
   ProcessList, Debugger;
 

ide/sourceeditor.pp

@@ -69,7 +69,7 @@ uses
   IDEWindowIntf, ProjectIntf, MacroDefIntf, ToolBarIntf, IDEDialogs, IDECommands,
   EditorSyntaxHighlighterDef,
   // DebuggerIntf
-  DbgIntfDebuggerBase, LazDebuggerIntf,
+  DbgIntfDebuggerBase, LazDebuggerIntf, LazDebuggerIntfBaseTypes,
   // IDE units
   IDECmdLine, LazarusIDEStrConsts, EditorOptions,
   EnvironmentOpts, WordCompletion, FindReplaceDialog, IDEProcs, IDEOptionDefs,