diff --git a/src/u_ceproject.pas b/src/u_ceproject.pas
index 77284d46..57a9496f 100644
--- a/src/u_ceproject.pas
+++ b/src/u_ceproject.pas
@@ -39,7 +39,7 @@ type
     fConfigs: TCollection;
     fSrcs: TStringList;
     fConfIx: Integer;
-    fUpdateCount: NativeInt;
+    fUpdateCount: PtrInt;
     fProjectSubject: TProjectSubject;
     fRunner: TDexedProcess;
     fOutputFilename: string;
@@ -222,7 +222,7 @@ end;
 
 procedure TNativeProject.setOptsColl(value: TCollection);
 var
-  i: nativeInt;
+  i: PtrInt;
 begin
   fConfigs.Assign(value);
   for i:= 0 to fConfigs.Count-1 do
@@ -286,7 +286,7 @@ procedure TNativeProject.customSaveToFile(const fname: string);
 var
   oldAbs, newRel, oldBase: string;
   f: string;
-  i: NativeInt;
+  i: PtrInt;
 begin
   beginUpdate;
   f := fname;
diff --git a/src/u_ceprojeditor.pas b/src/u_ceprojeditor.pas
index 82237b7e..52f694cb 100644
--- a/src/u_ceprojeditor.pas
+++ b/src/u_ceprojeditor.pas
@@ -406,7 +406,7 @@ end;
 
 procedure TProjectConfigurationWidget.updateImperative;
 var
-  i: NativeInt;
+  i: PtrInt;
 begin
   selConf.ItemIndex:= -1;
   selConf.Clear;
diff --git a/src/u_common.pas b/src/u_common.pas
index 57c78ccc..e4a7b719 100644
--- a/src/u_common.pas
+++ b/src/u_common.pas
@@ -764,13 +764,13 @@ end;
 function uniqueObjStr(const value: TObject): string;
 begin
   {$PUSH}{$HINTS OFF}{$WARNINGS OFF}{$R-}
-  exit( format('%.8X',[NativeUint(value)]));
+  exit( format('%.8X',[PtrUint(value)]));
   {$POP}
 end;
 
 function shortenPath(const path: string; thresh: Word = 60): string;
 var
-  i: NativeInt;
+  i: PtrInt;
   sepCnt: integer = 0;
   drv: string;
   pth1: string;
diff --git a/src/u_main.lfm b/src/u_main.lfm
index 37f73115..974c02f2 100644
--- a/src/u_main.lfm
+++ b/src/u_main.lfm
@@ -11,7 +11,7 @@ object MainForm: TMainForm
   OnDropFiles = FormDropFiles
   OnResize = FormResize
   ShowHint = True
-  LCLVersion = '2.0.6.0'
+  LCLVersion = '2.0.8.0'
   object mainMenu: TMainMenu
     top = 1
     object MenuItem1: TMenuItem
diff --git a/src/u_main.pas b/src/u_main.pas
index be44e1d3..7dcf1639 100644
--- a/src/u_main.pas
+++ b/src/u_main.pas
@@ -400,7 +400,7 @@ type
     fFirstTimeRun: boolean;
     fMultidoc: IMultiDocHandler;
     fProcInputHandler: IProcInputHandler;
-    fUpdateCount: NativeInt;
+    fUpdateCount: PtrInt;
     fProj: ICommonProject;
     fFreeProj: ICommonProject;
     fProjBeforeGroup: ICommonProject;
diff --git a/src/u_symlist.pas b/src/u_symlist.pas
index 1e297949..06e62914 100644
--- a/src/u_symlist.pas
+++ b/src/u_symlist.pas
@@ -725,7 +725,7 @@ begin
     exit;
 
   {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
-  line := NativeUInt(Tree.Selected.Data);
+  line := PtrUInt(Tree.Selected.Data);
   {$POP}
   fDoc.setFocus;
   fDoc.CaretY := line;
@@ -903,7 +903,7 @@ var
       or (n.Parent = ndVar) then
           continue;
       {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
-      j := NativeUInt(n.Data);
+      j := PtrUint(n.Data);
       {$POP}
       if j > target then
         continue;
diff --git a/src/u_synmemo.pas b/src/u_synmemo.pas
index 13df5aad..abbcb0ee 100644
--- a/src/u_synmemo.pas
+++ b/src/u_synmemo.pas
@@ -936,7 +936,7 @@ begin
   Inc(fPos);
   {$HINTS OFF}
   if fPos < fList.Count then
-    fMemo.CaretY := NativeInt(fList.Items[fPos])
+    fMemo.CaretY := PtrInt(fList.Items[fPos])
   {$HINTS ON}
   else Dec(fPos);
 end;
@@ -946,14 +946,14 @@ begin
   Dec(fPos);
   {$HINTS OFF}
   if fPos > -1 then
-    fMemo.CaretY := NativeInt(fList.Items[fPos])
+    fMemo.CaretY := PtrInt(fList.Items[fPos])
   {$HINTS ON}
   else Inc(fPos);
 end;
 
 procedure TSynMemoPositions.store;
 var
-  delta: NativeInt;
+  delta: PtrInt;
 const
   thresh = 6;
 begin
@@ -962,11 +962,11 @@ begin
   {$HINTS OFF}{$WARNINGS OFF}
   if fList.Count > 0 then
   begin
-    delta := fMemo.CaretY - NativeInt(fList.Items[fPos]);
+    delta := fMemo.CaretY - PtrInt(fList.Items[fPos]);
     if (delta > -thresh) and (delta < thresh) then
       exit;
   end;
-  fList.Insert(0, Pointer(NativeInt(fMemo.CaretY)));
+  fList.Insert(0, Pointer(PtrInt(fMemo.CaretY)));
   {$POP}
   while fList.Count > fMax do
     fList.Delete(fList.Count-1);