diff --git a/components/codetools/codetoolmanager.pas b/components/codetools/codetoolmanager.pas
index ca10aad7a0..1d90886096 100644
--- a/components/codetools/codetoolmanager.pas
+++ b/components/codetools/codetoolmanager.pas
@@ -147,8 +147,8 @@ type
       Code: TCodeBuffer; GoToMainCode: boolean): TFindDeclarationTool;
     function OnGetDirectoryCache(const ADirectory: string): TCTDirectoryCache;
     procedure OnToolSetWriteLock(Lock: boolean);
-    procedure OnToolGetChangeSteps(out SourcesChangeStep, FilesChangeStep,
-                                   InitValuesChangeStep: int64);
+    procedure OnToolGetChangeSteps(out SourcesChangeStep, FilesChangeStep: int64;
+                                   out InitValuesChangeStep: integer);
     function OnParserProgress(Tool: TCustomCodeTool): boolean;
     procedure OnToolTreeChange(Tool: TCustomCodeTool; NodesDeleting: boolean);
     function OnScannerProgress(Sender: TLinkScanner): boolean;
@@ -5324,7 +5324,7 @@ begin
 end;
 
 procedure TCodeToolManager.OnToolGetChangeSteps(out SourcesChangeStep,
-  FilesChangeStep, InitValuesChangeStep: int64);
+  FilesChangeStep: int64; out InitValuesChangeStep: integer);
 begin
   SourcesChangeStep:=SourceCache.ChangeStamp;
   FilesChangeStep:=FileStateCache.TimeStamp;
diff --git a/components/codetools/definetemplates.pas b/components/codetools/definetemplates.pas
index fa12b608ed..3b366a8444 100644
--- a/components/codetools/definetemplates.pas
+++ b/components/codetools/definetemplates.pas
@@ -377,7 +377,7 @@ type
     FFirstDefineTemplate: TDefineTemplate;
     FCache: TAVLTree; // tree of TDirectoryDefines
     FDefineStrings: TStringTree;
-    FChangeStep: int64;
+    FChangeStep: integer;
     FErrorDescription: string;
     FErrorTemplate: TDefineTemplate;
     FMacroFunctions: TKeyWordFunctionList;
@@ -406,7 +406,7 @@ type
   public
     property RootTemplate: TDefineTemplate
                            read FFirstDefineTemplate write FFirstDefineTemplate;
-    property ChangeStep: int64 read FChangeStep;
+    property ChangeStep: integer read FChangeStep;
     property ErrorTemplate: TDefineTemplate read FErrorTemplate;
     property ErrorDescription: string read FErrorDescription;
     property OnGetVirtualDirectoryAlias: TOnGetVirtualDirectoryAlias
@@ -3710,7 +3710,7 @@ end;
 constructor TDefineTree.Create;
 begin
   inherited Create;
-  FChangeStep:=CTInvalidChangeStamp64;
+  FChangeStep:=CTInvalidChangeStamp;
   FFirstDefineTemplate:=nil;
   FCache:=TAVLTree.Create(@CompareDirectoryDefines);
   FDefineStrings:=TStringTree.Create;
@@ -4425,7 +4425,7 @@ end;
 
 procedure TDefineTree.IncreaseChangeStep;
 begin
-  CTIncreaseChangeStamp64(FChangeStep);
+  CTIncreaseChangeStamp(FChangeStep);
   if DirectoryCachePool<>nil then DirectoryCachePool.IncreaseConfigTimeStamp;
 end;
 
diff --git a/components/codetools/finddeclarationtool.pas b/components/codetools/finddeclarationtool.pas
index 7c9fc817f0..ccdb48a0cc 100644
--- a/components/codetools/finddeclarationtool.pas
+++ b/components/codetools/finddeclarationtool.pas
@@ -579,7 +579,8 @@ type
     FDependsOnCodeTools: TAVLTree;// the codetools, that this codetool depends on
     FClearingDependentNodeCaches: boolean;
     FCheckingNodeCacheDependencies: boolean;
-    FSourcesChangeStep, FFilesChangeStep, FInitValuesChangeStep: int64;
+    FSourcesChangeStep, FFilesChangeStep: int64;
+    FInitValuesChangeStep: integer;
     {$IFDEF DebugPrefix}
     DebugPrefix: string;
     procedure IncPrefix;
@@ -8802,7 +8803,7 @@ begin
   inherited Create;
   FSourcesChangeStep:=CTInvalidChangeStamp64;
   FFilesChangeStep:=CTInvalidChangeStamp64;
-  FInitValuesChangeStep:=CTInvalidChangeStamp64;
+  FInitValuesChangeStep:=CTInvalidChangeStamp;
 end;
 
 procedure TFindDeclarationTool.DoDeleteNodes(StartNode: TCodeTreeNode);
@@ -8821,7 +8822,8 @@ var
   ANode: TAVLTreeNode;
   ATool: TFindDeclarationTool;
   FreeCheckedTools: Boolean;
-  SourcesChangeStep, FilesChangeStep, InitValuesChangeStep: int64;
+  SourcesChangeStep, FilesChangeStep: int64;
+  InitValuesChangeStep: integer;
 begin
   Result:=false;
   //debugln(['TFindDeclarationTool.CheckDependsOnNodeCaches ',MainFilename,' FDependsOnCodeTools=',FDependsOnCodeTools]);
diff --git a/components/codetools/linkscanner.pas b/components/codetools/linkscanner.pas
index b32816c688..0a54920f7d 100644
--- a/components/codetools/linkscanner.pas
+++ b/components/codetools/linkscanner.pas
@@ -82,8 +82,8 @@ type
                        out ChangeStep: integer): TExpressionEvaluator of object;
   TOnIncludeCode = procedure(ParentCode, IncludeCode: Pointer) of object;
   TOnSetWriteLock = procedure(Lock: boolean) of object;
-  TLSOnGetGlobalChangeSteps = procedure(out SourcesChangeStep, FilesChangeStep,
-                                       InitValuesChangeStep: int64) of object;
+  TLSOnGetGlobalChangeSteps = procedure(out SourcesChangeStep, FilesChangeStep: int64;
+                                   out InitValuesChangeStep: integer) of object;
 
   { TSourceLink is used to map between the codefiles and the cleaned source }
   PSourceLink = ^TSourceLink;
@@ -268,7 +268,7 @@ type
     FOnSetGlobalWriteLock: TOnSetWriteLock;
     FGlobalSourcesChangeStep: int64;
     FGlobalFilesChangeStep: int64;
-    FGlobalInitValuesChangeStep: int64;
+    FGlobalInitValuesChangeStep: integer;
     function GetLinks(Index: integer): TSourceLink;
     procedure SetLinks(Index: integer; const Value: TSourceLink);
     procedure SetSource(ACode: Pointer); // set current source
@@ -1639,7 +1639,8 @@ var i: integer;
   NewInitValues: TExpressionEvaluator;
   NewInitValuesChangeStep: integer;
   SrcChange: PSourceChangeStep;
-  CurSourcesChangeStep, CurFilesChangeStep, CurInitValuesChangeStep: int64;
+  CurSourcesChangeStep, CurFilesChangeStep: int64;
+  CurInitValuesChangeStep: integer;
 begin
   Result:=true;