diff --git a/components/fpdebug/fpdbgclasses.pp b/components/fpdebug/fpdbgclasses.pp
index 17c6c33da1..b945e58975 100644
--- a/components/fpdebug/fpdbgclasses.pp
+++ b/components/fpdebug/fpdbgclasses.pp
@@ -85,7 +85,7 @@ type
     constructor Create(ADbgProcess: TDbgProcess);
     function ReadMemory(AnAddress: TDbgPtr; ASize: Cardinal; ADest: Pointer): Boolean; override;
     function ReadMemoryEx(AnAddress, AnAddressSpace: TDbgPtr; ASize: Cardinal; ADest: Pointer): Boolean; override;
-    function ReadRegister(ARegNum: Cardinal; out AValue: TDbgPtr): Boolean; override;
+    function ReadRegister(ARegNum: Cardinal; out AValue: TDbgPtr; AContext: TFpDbgAddressContext): Boolean; override;
     function RegisterSize(ARegNum: Cardinal): Integer; override;
   end;
 
@@ -312,15 +312,11 @@ begin
   FDbgProcess.ReadData(AnAddress, ASize, ADest^);
 end;
 
-function TDbgMemReader.ReadRegister(ARegNum: Cardinal; out AValue: TDbgPtr): Boolean;
+function TDbgMemReader.ReadRegister(ARegNum: Cardinal; out AValue: TDbgPtr; AContext: TFpDbgAddressContext): Boolean;
 begin
-  result := true;
-  case ARegNum of
-    // ToDo: Link the Dwarf-register-numbers to the actual registers.
-    // 0: AValue:=FDbgProcess.MainThread.RegisterValueList.GetDbgRegister('eax').NumValue;
-  else
-    result := false;
-  end
+  result := false;
+  // ToDo: Link the Dwarf-register-numbers to the actual registers.
+  // AValue:=FDbgProcess.MainThread.RegisterValueList.GetDbgRegister('eax').NumValue;
 end;
 
 function TDbgMemReader.RegisterSize(ARegNum: Cardinal): Integer;
diff --git a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
index 64fa55cf35..96880244ab 100644
--- a/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
+++ b/components/lazdebuggers/lazdebuggerfp/fpdebugdebugger.pas
@@ -125,7 +125,7 @@ end;
 
 procedure TFPWatches.InternalRequestData(AWatchValue: TWatchValue);
 var
-  AContext: TDbgInfoAddressContext;
+  AContext: TFpDbgInfoContext;
   AController: TDbgController;
   APasExpr: TFpPascalExpression;