diff --git a/Source/DelphiAST.Classes.pas b/Source/DelphiAST.Classes.pas
index 869d614..a03af08 100644
--- a/Source/DelphiAST.Classes.pas
+++ b/Source/DelphiAST.Classes.pas
@@ -5,7 +5,7 @@
 interface
 
 uses
-  SysUtils, Generics.Collections, SimpleParser.Lexer.Types, DelphiAST.Consts;
+  SysUtils, {$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF}, SimpleParser.Lexer.Types, DelphiAST.Consts;
 
 type
   EParserException = class(Exception)
diff --git a/Source/DelphiAST.ProjectIndexer.pas b/Source/DelphiAST.ProjectIndexer.pas
index 77e217a..4655908 100644
--- a/Source/DelphiAST.ProjectIndexer.pas
+++ b/Source/DelphiAST.ProjectIndexer.pas
@@ -5,7 +5,12 @@
 interface
 
 uses
-  Classes, Generics.Defaults, Generics.Collections,
+  Classes,
+  {$IFDEF FPC_DOTTEDUNITS}
+  System.Generics.Defaults, System.Generics.Collections,
+  {$ELSE}
+  Generics.Defaults, Generics.Collections,
+  {$ENDIF}
   SimpleParser.Lexer.Types,
   DelphiAST, DelphiAST.Classes, DelphiAST.Consts;
 
diff --git a/Source/DelphiAST.Serialize.Binary.pas b/Source/DelphiAST.Serialize.Binary.pas
index 04ac283..f4a820e 100644
--- a/Source/DelphiAST.Serialize.Binary.pas
+++ b/Source/DelphiAST.Serialize.Binary.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes,
-  Generics.Collections,
+  {$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
   DelphiAST.Consts,
   DelphiAST.Classes;
 
diff --git a/Source/DelphiAST.SimpleParserEx.pas b/Source/DelphiAST.SimpleParserEx.pas
index 6afd710..6f015b2 100644
--- a/Source/DelphiAST.SimpleParserEx.pas
+++ b/Source/DelphiAST.SimpleParserEx.pas
@@ -3,7 +3,7 @@
 interface
 
 uses
-  SysUtils, Generics.Collections, SimpleParser, SimpleParser.Lexer.Types,
+  SysUtils, {$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF}, SimpleParser, SimpleParser.Lexer.Types,
   SimpleParser.Lexer, Classes;
 
 type
diff --git a/Source/DelphiAST.Writer.pas b/Source/DelphiAST.Writer.pas
index e85b06e..d98fda2 100644
--- a/Source/DelphiAST.Writer.pas
+++ b/Source/DelphiAST.Writer.pas
@@ -26,7 +26,7 @@   TSyntaxTreeWriter = class
 implementation
 
 uses
-  Generics.Collections,
+  {$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
   {$IFNDEF FPC}
     DelphiAST.Serialize.Binary,
   {$ENDIF}
diff --git a/Source/DelphiAST.pas b/Source/DelphiAST.pas
index 0b79f42..b812935 100644
--- a/Source/DelphiAST.pas
+++ b/Source/DelphiAST.pas
@@ -5,7 +5,7 @@
 interface
 
 uses
-  SysUtils, Classes, Generics.Collections, SimpleParser, SimpleParser.Lexer,
+  SysUtils, Classes, {$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF}, SimpleParser, SimpleParser.Lexer,
   SimpleParser.Lexer.Types, DelphiAST.Classes, DelphiAST.Consts, DelphiAST.SimpleParserEx;
 
 type
diff --git a/Source/SimpleParser/SimpleParser.Lexer.pas b/Source/SimpleParser/SimpleParser.Lexer.pas
index ef8428f..2257785 100644
--- a/Source/SimpleParser/SimpleParser.Lexer.pas
+++ b/Source/SimpleParser/SimpleParser.Lexer.pas
@@ -56,7 +56,7 @@ interface
 uses
   SysUtils, Classes, Character,
   {$IFDEF FPC}
-    Generics.Collections,
+    {$IFDEF FPC_DOTTEDUNITS}System.Generics.Collections{$ELSE}Generics.Collections{$ENDIF},
   {$ENDIF}
   SimpleParser.Lexer.Types;