diff --git a/compiler/cp1251.pas b/compiler/cp1251.pas
index 83beeabfbb..c13a667956 100644
--- a/compiler/cp1251.pas
+++ b/compiler/cp1251.pas
@@ -6,7 +6,7 @@ unit cp1251;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (
diff --git a/compiler/cp1252.pp b/compiler/cp1252.pp
index 2f661834ca..dc538efc83 100644
--- a/compiler/cp1252.pp
+++ b/compiler/cp1252.pp
@@ -6,7 +6,7 @@ unit CP1252;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (
diff --git a/compiler/cp437.pas b/compiler/cp437.pas
index 6a416833af..4776c5ef0e 100644
--- a/compiler/cp437.pas
+++ b/compiler/cp437.pas
@@ -6,7 +6,7 @@ unit cp437;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (
diff --git a/compiler/cp850.pas b/compiler/cp850.pas
index 3eac682738..c624590d5f 100644
--- a/compiler/cp850.pas
+++ b/compiler/cp850.pas
@@ -6,7 +6,7 @@ unit cp850;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (
diff --git a/compiler/cp866.pas b/compiler/cp866.pas
index 4990a73267..d36527aee7 100644
--- a/compiler/cp866.pas
+++ b/compiler/cp866.pas
@@ -6,7 +6,7 @@ unit cp866;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (
diff --git a/compiler/cp8859_1.pas b/compiler/cp8859_1.pas
index 88b6360261..ed4f04d3b6 100644
--- a/compiler/cp8859_1.pas
+++ b/compiler/cp8859_1.pas
@@ -6,7 +6,7 @@ unit cp8859_1;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+    {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (
diff --git a/compiler/cp8859_5.pas b/compiler/cp8859_5.pas
index 12ea9d6870..641c1c0582 100644
--- a/compiler/cp8859_5.pas
+++ b/compiler/cp8859_5.pas
@@ -6,7 +6,7 @@ unit cp8859_5;
   implementation
 
   uses
-     {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4};
+     {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif};
 
   const
      map : array[0..255] of tunicodecharmapping = (
diff --git a/compiler/cresstr.pas b/compiler/cresstr.pas
index c15e90e242..b110030ec1 100644
--- a/compiler/cresstr.pas
+++ b/compiler/cresstr.pas
@@ -40,7 +40,7 @@ uses
    aasmcpu,
 {$if FPC_FULLVERSION<20700}
    ccharset,
-{$endif }
+{$endif}
    asmutils;
 
     Type
diff --git a/compiler/options.pas b/compiler/options.pas
index e356f81eb3..e1c758ed68 100644
--- a/compiler/options.pas
+++ b/compiler/options.pas
@@ -78,7 +78,7 @@ implementation
 
 uses
   widestr,
-  {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4},
+  {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif},
   SysUtils,
   version,
   cutils,cmsgs,
diff --git a/compiler/scanner.pas b/compiler/scanner.pas
index 15a6ebe7c7..b6afcb3d41 100644
--- a/compiler/scanner.pas
+++ b/compiler/scanner.pas
@@ -269,7 +269,7 @@ implementation
       { This is needed for tcputype }
       cpuinfo,
       fmodule
-{$ifdef VER2_4}
+{$if FPC_FULLVERSION<20700}
       ,ccharset
 {$endif}
       ;
diff --git a/compiler/widestr.pas b/compiler/widestr.pas
index 87701708c8..a1be761dec 100644
--- a/compiler/widestr.pas
+++ b/compiler/widestr.pas
@@ -28,7 +28,7 @@ unit widestr;
   interface
 
     uses
-       {$ifdef VER2_4}ccharset{$else VER2_4}charset{$endif VER2_4},globtype;
+       {$if FPC_FULLVERSION<20700}ccharset{$else}charset{$endif},globtype;
 
 
     type