diff --git a/rtl/inc/systemh.inc b/rtl/inc/systemh.inc
index c437c30671..2ef3512b2e 100644
--- a/rtl/inc/systemh.inc
+++ b/rtl/inc/systemh.inc
@@ -23,7 +23,7 @@
 {$modeswitch advancedrecords}
 
 { At least 3.0.0 is required }
-{$if defined(VER1) or defined(VER2_0) or defined(VER2_2) or defined(VER2_4) or defined(VER2_6) }
+{$if FPC_FULLVERSION<30000}
   {$fatal You need at least FPC 3.0.0 to build this version of FPC}
 {$endif}
 
diff --git a/rtl/linux/system.pp b/rtl/linux/system.pp
index d59156454c..f16da372e3 100644
--- a/rtl/linux/system.pp
+++ b/rtl/linux/system.pp
@@ -48,9 +48,9 @@ const
 function get_cmdline:Pchar; deprecated 'use paramstr' ;
 property cmdline:Pchar read get_cmdline;
 
-{$if defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6)) or defined(CPUXTENSA)}
+{$if defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or defined(CPUXTENSA)}
 {$define FPC_LOAD_SOFTFPU}
-{$endif defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6)) or defined(CPUXTENSA)}
+{$endif defined(CPURISCV32) or defined(CPURISCV64) or defined(CPUARM) or defined(CPUM68K) or defined(CPUXTENSA)}
 
 {$ifdef FPC_SOFT_FPUX80}
 {$define FPC_SOFTFLOAT_FLOATX80}
diff --git a/rtl/solaris/system.pp b/rtl/solaris/system.pp
index 17e2e31450..245efd50bd 100644
--- a/rtl/solaris/system.pp
+++ b/rtl/solaris/system.pp
@@ -32,18 +32,18 @@ var argc:longint;
 var
    StackTopPtr : pointer;
 
-{$if defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
+{$if defined(CPUARM) or defined(CPUM68K)}
 
 {$define fpc_softfpu_interface}
 {$i softfpu.pp}
 {$undef fpc_softfpu_interface}
 
-{$endif defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
+{$endif defined(CPUARM) or defined(CPUM68K)}
 
 implementation
 
 
-{$if defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
+{$if defined(CPUARM) or defined(CPUM68K)}
 
 {$define fpc_softfpu_implementation}
 {$i softfpu.pp}
@@ -61,7 +61,7 @@ implementation
 {$define FPC_SYSTEM_HAS_extractFloat32Exp}
 {$define FPC_SYSTEM_HAS_extractFloat32Sign}
 
-{$endif defined(CPUARM) or defined(CPUM68K) or (defined(CPUSPARC) and defined(VER2_6))}
+{$endif defined(CPUARM) or defined(CPUM68K)}
 
 { OS independant parts}
 
diff --git a/rtl/win/syswin.inc b/rtl/win/syswin.inc
index f79b9849cd..19c1c9bb2c 100644
--- a/rtl/win/syswin.inc
+++ b/rtl/win/syswin.inc
@@ -691,7 +691,7 @@ type
 
   PWStrInitTablesTable = ^TWStrInitTablesTable;
   TWStrInitTablesTable = packed record
-    count  : {$ifdef VER2_6}longint{$else}sizeint{$endif};
+    count  : sizeint;
     tables : packed array [1..32767] of PWStrInitEntry;
   end;