diff --git a/solvers/UGearRatios.pas b/solvers/UGearRatios.pas
index 647960d..eeb38a5 100644
--- a/solvers/UGearRatios.pas
+++ b/solvers/UGearRatios.pas
@@ -22,7 +22,7 @@ unit UGearRatios;
 interface
 
 uses
-  Classes, SysUtils, fgl, USolver;
+  Classes, SysUtils, Generics.Collections, USolver;
 
 const
   CDigitChars = ['0'..'9'];
@@ -45,7 +45,7 @@ type
 
   { TGearCandidates }
 
-  TGearCandidates = specialize TFPGObjectList<TGearCandidate>;
+  TGearCandidates = specialize TObjectList<TGearCandidate>;
 
   { TGearCandidateTracker }
 
diff --git a/solvers/UGiveSeedFertilizer.pas b/solvers/UGiveSeedFertilizer.pas
index 3b3b84f..c6c26e3 100644
--- a/solvers/UGiveSeedFertilizer.pas
+++ b/solvers/UGiveSeedFertilizer.pas
@@ -23,7 +23,7 @@ unit UGiveSeedFertilizer;
 interface
 
 uses
-  Classes, SysUtils, fgl, Math, USolver;
+  Classes, SysUtils, Generics.Collections, Math, USolver;
 
 type
 
@@ -36,7 +36,7 @@ type
     class operator = (Left, Right : TValueRange): Boolean;
   end;
 
-  TValueRanges = specialize TFPGList<TValueRange>;
+  TValueRanges = specialize TList<TValueRange>;
 
   { TAlmanacMapRange }
 
diff --git a/solvers/UScratchcards.pas b/solvers/UScratchcards.pas
index c22ddfa..3777410 100644
--- a/solvers/UScratchcards.pas
+++ b/solvers/UScratchcards.pas
@@ -22,7 +22,7 @@ unit UScratchcards;
 interface
 
 uses
-  Classes, SysUtils, fgl, USolver;
+  Classes, SysUtils, Generics.Collections, USolver;
 
 type
 
@@ -30,7 +30,7 @@ type
 
   TScratchcards = class(TSolver)
   private
-    FCardCopies: specialize TFPGList<Integer>;
+    FCardCopies: specialize TList<Integer>;
     function GetNumber(const AString: string; const AIndex: Integer): Integer;
   public
     constructor Create;
@@ -53,7 +53,7 @@ end;
 
 constructor TScratchcards.Create;
 begin
-  FCardCopies := specialize TFPGList<Integer>.Create;
+  FCardCopies := specialize TList<Integer>.Create;
 end;
 
 destructor TScratchcards.Destroy;
diff --git a/solvers/UWaitForIt.pas b/solvers/UWaitForIt.pas
index e2c08fd..f789c8a 100644
--- a/solvers/UWaitForIt.pas
+++ b/solvers/UWaitForIt.pas
@@ -22,7 +22,7 @@ unit UWaitForIt;
 interface
 
 uses
-  Classes, SysUtils, fgl, Math, USolver;
+  Classes, SysUtils, Generics.Collections, Math, USolver;
 
 type
 
@@ -30,7 +30,7 @@ type
 
   TWaitForIt = class(TSolver)
   private
-    FTimes, FDistances: specialize TFPGList<Cardinal>;
+    FTimes, FDistances: specialize TList<Cardinal>;
     FLongTime, FLongDistance: UInt64;
     function CalcRange(const ATime, ADistance: UInt64): Cardinal;
   public
@@ -60,8 +60,8 @@ end;
 
 constructor TWaitForIt.Create;
 begin
-  FTimes := specialize TFPGList<Cardinal>.Create;
-  FDistances := specialize TFPGList<Cardinal>.Create;
+  FTimes := specialize TList<Cardinal>.Create;
+  FDistances := specialize TList<Cardinal>.Create;
 end;
 
 destructor TWaitForIt.Destroy;
@@ -74,7 +74,7 @@ end;
 procedure TWaitForIt.ProcessDataLine(const ALine: string);
 var
   split: TStringArray;
-  list: specialize TFPGList<Cardinal>;
+  list: specialize TList<Cardinal>;
   value: PUInt64;
   i: Integer;
   cleaned: string;