diff --git a/components/codetools/codecache.pas b/components/codetools/codecache.pas
index 8f648c86be..8e85cb91e6 100644
--- a/components/codetools/codecache.pas
+++ b/components/codetools/codecache.pas
@@ -158,15 +158,15 @@ type
     function FindIncludeLink(const IncludeFilename: string): string;
     function FindIncludeLinkNode(const IncludeFilename: string): TIncludedByLink;
     function FindIncludeLinkAVLNode(const IncludeFilename: string): TAVLTreeNode;
-    function OnScannerCheckFileOnDisk(Code: pointer): boolean; // true if code changed
-    function OnScannerGetFileName(Sender: TObject; Code: pointer): string;
+    function OnScannerCheckFileOnDisk(Code: TSourceLog): boolean; // true if code changed
+    function OnScannerGetFileName(Sender: TObject; Code: TSourceLog): string;
     function OnScannerLoadSource(Sender: TObject; const AFilename: string;
                                  OnlyIfExists: boolean): TSourceLog;
-    procedure OnScannerDeleteSource(Sender: TObject; Code: Pointer;
+    procedure OnScannerDeleteSource(Sender: TObject; Code: TSourceLog;
                  Pos, Len: integer);
-    procedure OnScannerGetSourceStatus(Sender: TObject; Code:Pointer;
+    procedure OnScannerGetSourceStatus(Sender: TObject; Code: TSourceLog;
                  var ReadOnly: boolean);
-    procedure OnScannerIncludeCode(ParentCode, IncludeCode: pointer);
+    procedure OnScannerIncludeCode(ParentCode, IncludeCode: TSourceLog);
     procedure UpdateIncludeLinks;
     procedure IncreaseChangeStep;
     procedure DecodeLoaded(Code: TCodeBuffer; const AFilename: string;
@@ -895,8 +895,8 @@ begin
     FItems.Add(Sender);
 end;
 
-function TCodeCache.OnScannerGetFileName(Sender: TObject;
-  Code: pointer): string;
+function TCodeCache.OnScannerGetFileName(Sender: TObject; Code: TSourceLog
+  ): string;
 begin
   if (Code<>nil) then
     Result:=TCodeBuffer(Code).Filename
@@ -919,7 +919,7 @@ begin
     OnScannerCheckFileOnDisk(Result);
 end;
 
-function TCodeCache.OnScannerCheckFileOnDisk(Code: pointer): boolean;
+function TCodeCache.OnScannerCheckFileOnDisk(Code: TSourceLog): boolean;
 var Buf: TCodeBuffer;
 begin
   Result:=false;
@@ -944,7 +944,7 @@ begin
   //if buf.IsDeleted then debugln(['TCodeCache.OnScannerCheckFileOnDisk ',Buf.Filename,' still deleted']);
 end;
 
-procedure TCodeCache.OnScannerIncludeCode(ParentCode, IncludeCode: pointer);
+procedure TCodeCache.OnScannerIncludeCode(ParentCode, IncludeCode: TSourceLog);
 var
   CodeBuffer: TCodeBuffer;
 begin
@@ -957,13 +957,13 @@ begin
   end;
 end;
 
-procedure TCodeCache.OnScannerGetSourceStatus(Sender: TObject; Code:Pointer;
-  var ReadOnly: boolean);
+procedure TCodeCache.OnScannerGetSourceStatus(Sender: TObject;
+  Code: TSourceLog; var ReadOnly: boolean);
 begin
   ReadOnly:=TCodeBuffer(Code).ReadOnly;
 end;
 
-procedure TCodeCache.OnScannerDeleteSource(Sender: TObject; Code: Pointer;
+procedure TCodeCache.OnScannerDeleteSource(Sender: TObject; Code: TSourceLog;
   Pos, Len: integer);
 begin
   TCodeBuffer(Code).Delete(Pos,Len);
diff --git a/components/codetools/codetoolmanager.pas b/components/codetools/codetoolmanager.pas
index 0d4f0d9bb6..c94246df19 100644
--- a/components/codetools/codetoolmanager.pas
+++ b/components/codetools/codetoolmanager.pas
@@ -52,7 +52,7 @@ uses
   PPUCodeTools, LFMTrees, DirectivesTree, CodeCompletionTemplater,
   PascalParserTool, CodeToolsConfig, CustomCodeTool, FindDeclarationTool,
   IdentCompletionTool, StdCodeTools, ResourceCodeTool, CodeToolsStructs,
-  CTUnitGraph, ExtractProcTool;
+  CTUnitGraph, ExtractProcTool, SourceLog;
 
 type
   TCodeToolManager = class;
@@ -152,7 +152,7 @@ type
       const ContextFlags: TIdentifierListContextFlags);
     procedure DoOnRescanFPCDirectoryCache(Sender: TObject);
     function GetBeautifier: TBeautifyCodeOptions; inline;
-    function DoOnScannerGetInitValues(Scanner: TLinkScanner; Code: Pointer;
+    function DoOnScannerGetInitValues(Scanner: TLinkScanner; Code: TSourceLog;
       out AChangeStep: integer): TExpressionEvaluator;
     procedure DoOnDefineTreeReadValue(Sender: TObject; const VariableName: string;
                                     var Value: string; var Handled: boolean);
@@ -6093,7 +6093,7 @@ begin
 end;
 
 function TCodeToolManager.DoOnScannerGetInitValues(Scanner: TLinkScanner;
-  Code: Pointer; out AChangeStep: integer): TExpressionEvaluator;
+  Code: TSourceLog; out AChangeStep: integer): TExpressionEvaluator;
 begin
   Result:=nil;
   AChangeStep:=DefineTree.ChangeStep;
diff --git a/components/codetools/linkscanner.pas b/components/codetools/linkscanner.pas
index 77118a426d..07d6eb917f 100644
--- a/components/codetools/linkscanner.pas
+++ b/components/codetools/linkscanner.pas
@@ -77,15 +77,15 @@ type
                  of object;
   TOnLoadSource = function(Sender: TObject; const AFilename: string;
                        OnlyIfExists: boolean): TSourceLog of object;
-  TOnGetSourceStatus = procedure(Sender: TObject; Code: Pointer;
+  TOnGetSourceStatus = procedure(Sender: TObject; Code: TSourceLog;
                  var ReadOnly: boolean) of object;
-  TOnDeleteSource = procedure(Sender: TObject; Code: Pointer; Pos, Len: integer)
+  TOnDeleteSource = procedure(Sender: TObject; Code: TSourceLog; Pos, Len: integer)
                     of object;
-  TOnGetFileName = function(Sender: TObject; Code: Pointer): string of object;
-  TOnCheckFileOnDisk = function(Code: Pointer): boolean of object;
-  TOnGetInitValues = function(Scanner: TLinkScanner; Code: Pointer;
+  TOnGetFileName = function(Sender: TObject; Code: TSourceLog): string of object;
+  TOnCheckFileOnDisk = function(Code: TSourceLog): boolean of object;
+  TOnGetInitValues = function(Scanner: TLinkScanner; Code: TSourceLog;
                        out ChangeStep: integer): TExpressionEvaluator of object;
-  TOnIncludeCode = procedure(ParentCode, IncludeCode: Pointer) of object;
+  TOnIncludeCode = procedure(ParentCode, IncludeCode: TSourceLog) of object;
   TOnSetWriteLock = procedure(Lock: boolean) of object;
   TLSOnGetGlobalChangeSteps = procedure(out SourcesChangeStep, FilesChangeStep: int64;
                                    out InitValuesChangeStep: integer) of object;
@@ -5044,7 +5044,7 @@ procedure TLinkScanner.DeleteRange(CleanStartPos,CleanEndPos: integer);
 }
 var
   LinkIndex, StartPos, Len, aLinkSize: integer;
-  ACode: Pointer;
+  ACode: TSourceLog;
 begin
   if CleanStartPos<1 then CleanStartPos:=1;
   if CleanEndPos>CleanedLen then CleanEndPos:=CleanedLen+1;