diff --git a/components/codetools/codecache.pas b/components/codetools/codecache.pas
index 2714527b94..f36441c23c 100644
--- a/components/codetools/codecache.pas
+++ b/components/codetools/codecache.pas
@@ -489,7 +489,7 @@ function Dbgs(const p: TCodePosition): string;
 var
   CodeXYPosition: TCodeXYPosition;
 begin
-  FillChar(CodeXYPosition,SizeOf(TCodeXYPosition),0);
+  FillChar(CodeXYPosition{%H-},SizeOf(TCodeXYPosition),0);
   CodeXYPosition.Code:=p.Code;
   if CodeXYPosition.Code<>nil then begin
     CodeXYPosition.Code.AbsoluteToLineCol(p.P,CodeXYPosition.Y,CodeXYPosition.X);
diff --git a/components/codetools/codetree.pas b/components/codetools/codetree.pas
index add526e78f..158cfb078b 100644
--- a/components/codetools/codetree.pas
+++ b/components/codetools/codetree.pas
@@ -43,7 +43,7 @@ uses
   MemCheck,
   {$ENDIF}
   Classes, SysUtils, FileProcs, CodeToolsStructs, BasicCodeTools,
-  AVL_Tree, CodeToolMemManager;
+  AVL_Tree;
 
 //-----------------------------------------------------------------------------
 
@@ -289,7 +289,7 @@ type
     constructor Create;
     destructor Destroy; override;
     procedure ConsistencyCheck;
-    procedure WriteDebugReport(WithChilds: boolean);
+    procedure WriteDebugReport(WithChildren: boolean);
   end;
 
 
@@ -1051,11 +1051,11 @@ begin
     raise Exception.Create('');
 end;
 
-procedure TCodeTree.WriteDebugReport(WithChilds: boolean);
+procedure TCodeTree.WriteDebugReport(WithChildren: boolean);
 begin
   DebugLn('[TCodeTree.WriteDebugReport] Root=',dbgs(Root<>nil));
   if Root<>nil then
-    Root.WriteDebugReport(' ',true);
+    Root.WriteDebugReport(' ',WithChildren);
 end;
 
 { TCodeTreeNodeExtension }
diff --git a/components/codetools/linkscanner.pas b/components/codetools/linkscanner.pas
index 274ed2943d..5c430a97e3 100644
--- a/components/codetools/linkscanner.pas
+++ b/components/codetools/linkscanner.pas
@@ -427,8 +427,7 @@ type
     procedure HandleDirective;
     procedure UpdateCleanedSource(NewCopiedSrcPos: integer);
     function ReturnFromIncludeFile: boolean;
-    function ParseKeyWord(StartPos, WordLen: integer; LastTokenType: TLSTokenType
-                          ): boolean;
+    function ParseKeyWord(StartPos: integer; LastTokenType: TLSTokenType): boolean;
     function DoEndToken: boolean; inline;
     function DoSourceTypeToken: boolean; inline;
     function DoInterfaceToken: boolean; inline;
@@ -1836,7 +1835,7 @@ begin
         //debugln(['TLinkScanner.Scan Token ',dbgstr(Src,TokenStart,SrcPos-TokenStart)]);
         ReadNextToken;
         if TokenType=lsttWord then
-          ParseKeyWord(TokenStart,SrcPos-TokenStart,LastTokenType);
+          ParseKeyWord(TokenStart,LastTokenType);
 
         //writeln('TLinkScanner.Scan G "',copy(Src,TokenStart,SrcPos-TokenStart),'" LastTokenType=',LastTokenType,' TokenType=',TokenType);
         if (LastTokenType=lsttEnd) and (TokenType=lsttPoint) then begin
@@ -2621,8 +2620,8 @@ function TLinkScanner.GuessMisplacedIfdefEndif(StartCursorPos: integer;
     IfStack:=nil;
   end;
   
-  function InitGuessMisplaced(var CurToken: TToken; ACode: Pointer;
-    var ASrc: string; var ASrcLen: integer): boolean;
+  function InitGuessMisplaced(out CurToken: TToken; ACode: Pointer;
+    out ASrc: string; out ASrcLen: integer): boolean;
   var
     ASrcLog: TSourceLog;
   begin
@@ -2698,7 +2697,6 @@ function TLinkScanner.GuessMisplacedIfdefEndif(StartCursorPos: integer;
   end;
 
   function GuessMisplacedIfdefEndifInCode(ACode: Pointer;
-    StartCursorPos: integer; StartCode: Pointer;
     var EndCursorPos: integer; var EndCode: Pointer): boolean;
   var
     ASrc: string;
@@ -2798,7 +2796,7 @@ begin
   try
     while LinkId<LinkCount do begin
       Result:=GuessMisplacedIfdefEndifInCode(FLinks[LinkID].Code,
-        StartCursorPos,StartCode,EndCursorPos,EndCode);
+        EndCursorPos,EndCode);
       if Result then exit;
       // search next code
       LastCode:=FLinks[LinkID].Code;
@@ -4103,7 +4101,7 @@ begin
   Result:=SrcPos<=SrcLen;
 end;
 
-function TLinkScanner.ParseKeyWord(StartPos, WordLen: integer;
+function TLinkScanner.ParseKeyWord(StartPos: integer;
   LastTokenType: TLSTokenType): boolean;
 var
   p: PChar;
@@ -4491,6 +4489,7 @@ begin
     exit;
   end;
   ACode:=FLinks[LinkIndex].Code;
+  CodeIsReadOnly:=false;
   FOnGetSourceStatus(Self,ACode,CodeIsReadOnly);
   if CodeIsReadOnly then begin
     EditError(ctsfileIsReadOnly, ACode);