diff --git a/lib/delphi/src/Thrift.Server.pas b/lib/delphi/src/Thrift.Server.pas
index 2935747..8d95ed2 100644
--- a/lib/delphi/src/Thrift.Server.pas
+++ b/lib/delphi/src/Thrift.Server.pas
@@ -20,11 +20,18 @@
  unit Thrift.Server;
 
 {$I-}  // prevent annoying errors with default log delegate and no console
+{$IF CompilerVersion >= 23.0}
+  {$LEGACYIFEND ON}
+{$IFEND}
 
 interface
 
 uses
-  Windows, SysUtils,
+  {$IF CompilerVersion < 23.0}
+    Windows, SysUtils,
+  {$ELSE}
+    Winapi.Windows, System.SysUtils,
+  {$IFEND}
   Thrift,
   Thrift.Protocol,
   Thrift.Transport;