diff --git a/src/ce_dlang.pas b/src/ce_dlang.pas
index ae926812..3543467c 100644
--- a/src/ce_dlang.pas
+++ b/src/ce_dlang.pas
@@ -110,11 +110,11 @@ type
   (*****************************************************************************
    * List of lexer tokens
    *)
-  TLexTokenList = class(TList)
+  TLexTokenList = class(TFPList)
   private
     function getToken(index: integer): TLexToken;
   public
-    procedure clear; override;
+    procedure clear;
     procedure addToken(aValue: PLexToken);
     property token[index: integer]: TLexToken read getToken;
   end;
@@ -139,11 +139,11 @@ type
   (*****************************************************************************
    * Error list
    *)
-  TLexErrorList = class(TList)
+  TLexErrorList = class(TFPList)
   private
     function getError(index: integer): TLexError;
   public
-    procedure clear; override;
+    procedure clear;
     procedure addError(aValue: PLexError);
     property error[index: integer]: TLexError read getError;
   end;
@@ -296,8 +296,7 @@ end;
 
 procedure TLexTokenList.clear;
 begin
-  while Count > 0 do
-  begin
+  while Count > 0 do begin
     Dispose( PLexToken(Items[Count-1]) );
     Delete(Count-1);
   end;
@@ -705,8 +704,7 @@ end;
 
 procedure TLexErrorList.clear;
 begin
-  while Count > 0 do
-  begin
+  while Count > 0 do begin
     Dispose( PLexError(Items[Count-1]) );
     Delete(Count-1);
   end;
diff --git a/src/ce_plugin.pas b/src/ce_plugin.pas
index 18d1ef69..ae153f82 100644
--- a/src/ce_plugin.pas
+++ b/src/ce_plugin.pas
@@ -145,7 +145,7 @@ type
     HostDispatchToPlug: THostDispatchToPlug;
   end;
 
-  TCEPlugDescriptorList = class(TList)
+  TCEPlugDescriptorList = class(TFPList)
   private
     function getPlugin(index: integer): TPlugDescriptor;
   public
diff --git a/src/ce_widget.pas b/src/ce_widget.pas
index 013ce18c..dbc24189 100644
--- a/src/ce_widget.pas
+++ b/src/ce_widget.pas
@@ -80,7 +80,7 @@ type
   (**
    * TCEWidget list.
    *)
-  TCEWidgetList = class(TList)
+  TCEWidgetList = class(TFPList)
   private
     function getWidget(index: integer): TCEWidget;
   public