diff --git a/Lib/Core/IdCustomTCPServer.pas b/Lib/Core/IdCustomTCPServer.pas
index fd66a16b9..53e322097 100644
--- a/Lib/Core/IdCustomTCPServer.pas
+++ b/Lib/Core/IdCustomTCPServer.pas
@@ -425,7 +425,11 @@ implementation
 uses
   {$IFDEF VCL_2010_OR_ABOVE}
     {$IFDEF WINDOWS}
-  Windows,
+      {$IFDEF VCL_XE2_OR_ABOVE}
+      WinAPI.Windows,
+      {$ELSE}
+      Windows,
+      {$ENDIF}
     {$ENDIF}
   {$ENDIF}
   IdGlobalCore,
diff --git a/Lib/Core/IdIOHandler.pas b/Lib/Core/IdIOHandler.pas
index 27140486d..866509b3b 100644
--- a/Lib/Core/IdIOHandler.pas
+++ b/Lib/Core/IdIOHandler.pas
@@ -792,7 +792,11 @@ implementation
     {$ENDIF}
   {$ENDIF}
   {$IFDEF WIN32_OR_WIN64}
-  Windows,
+    {$IFDEF VCL_XE2_OR_ABOVE}
+    WinAPI.Windows,
+    {$ELSE}
+    Windows,
+    {$ENDIF}
   {$ENDIF}
   {$IFDEF USE_VCL_POSIX}
     {$IFDEF OSX}
diff --git a/Lib/Core/IdIOHandlerSocket.pas b/Lib/Core/IdIOHandlerSocket.pas
index c8b3367c0..42a355988 100644
--- a/Lib/Core/IdIOHandlerSocket.pas
+++ b/Lib/Core/IdIOHandlerSocket.pas
@@ -234,7 +234,11 @@ implementation
     {$ENDIF}
   {$ENDIF}
   {$IFDEF WIN32_OR_WIN64 }
-  Windows,
+    {$IFDEF VCL_XE2_OR_ABOVE}
+    WinAPI.Windows,
+    {$ELSE}
+    Windows,
+    {$ENDIF}
   {$ENDIF}
   SysUtils,
   IdStack,
diff --git a/Lib/Core/IdIOHandlerStack.pas b/Lib/Core/IdIOHandlerStack.pas
index b166268d5..404af2e54 100644
--- a/Lib/Core/IdIOHandlerStack.pas
+++ b/Lib/Core/IdIOHandlerStack.pas
@@ -209,7 +209,11 @@ implementation
   Posix.SysTime,
   {$ENDIF}
   {$IFDEF WINDOWS}
-  Windows,
+    {$IFDEF VCL_XE2_OR_ABOVE}
+    WinAPI.Windows,
+    {$ELSE}
+    Windows,
+    {$ENDIF}
   {$ENDIF}
   IdAntiFreezeBase, IdResourceStringsCore, IdStackConsts, IdException,
   IdComponent, IdIOHandler, IdCustomTransparentProxy;
diff --git a/Lib/Core/IdScheduler.pas b/Lib/Core/IdScheduler.pas
index ca0c883a6..19aae0858 100644
--- a/Lib/Core/IdScheduler.pas
+++ b/Lib/Core/IdScheduler.pas
@@ -121,7 +121,11 @@ implementation
   {$ENDIF}
   {$IFDEF VCL_2010_OR_ABOVE}
     {$IFDEF WINDOWS}
-  Windows,
+      {$IFDEF VCL_XE2_OR_ABOVE}
+      WinAPI.Windows,
+      {$ELSE}
+      Windows,
+      {$ENDIF}
     {$ENDIF}
   {$ENDIF}
   {$IFDEF USE_VCL_POSIX}
diff --git a/Lib/Core/IdSchedulerOfThreadPool.pas b/Lib/Core/IdSchedulerOfThreadPool.pas
index 56b662942..c51cd0405 100644
--- a/Lib/Core/IdSchedulerOfThreadPool.pas
+++ b/Lib/Core/IdSchedulerOfThreadPool.pas
@@ -116,7 +116,11 @@ implementation
 uses
   {$IFDEF VCL_2010_OR_ABOVE}
     {$IFDEF WINDOWS}
-  Windows,
+      {$IFDEF VCL_XE2_OR_ABOVE}
+      WinAPI.Windows,
+      {$ELSE}
+      Windows,
+      {$ENDIF}
     {$ENDIF}
   {$ENDIF}
   IdGlobal, SysUtils;
diff --git a/Lib/Core/IdSync.pas b/Lib/Core/IdSync.pas
index 5ec7b5b15..60c712178 100644
--- a/Lib/Core/IdSync.pas
+++ b/Lib/Core/IdSync.pas
@@ -182,7 +182,11 @@ implementation
   {$ENDIF}
   {$IFDEF VCL_2010_OR_ABOVE}
     {$IFDEF WINDOWS}
-  Windows,
+      {$IFDEF VCL_XE2_OR_ABOVE}
+      WinAPI.Windows,
+      {$ELSE}
+      Windows,
+      {$ENDIF}
     {$ENDIF}
   {$ENDIF}
   {$IFDEF USE_VCL_POSIX}
diff --git a/Lib/Core/IdThreadSafe.pas b/Lib/Core/IdThreadSafe.pas
index 0abd94773..3313cd91c 100644
--- a/Lib/Core/IdThreadSafe.pas
+++ b/Lib/Core/IdThreadSafe.pas
@@ -237,7 +237,11 @@ implementation
 uses
   {$IFDEF VCL_2010_OR_ABOVE}
     {$IFDEF WINDOWS}
-  Windows,
+      {$IFDEF VCL_XE2_OR_ABOVE}
+      WinAPI.Windows,
+      {$ELSE}
+      Windows,
+      {$ENDIF}
     {$ENDIF}
   {$ENDIF}
   {$IFDEF VCL_XE3_OR_ABOVE}
diff --git a/Lib/Core/IdUDPServer.pas b/Lib/Core/IdUDPServer.pas
index c197ecbf3..ea1f2b242 100644
--- a/Lib/Core/IdUDPServer.pas
+++ b/Lib/Core/IdUDPServer.pas
@@ -196,7 +196,11 @@ implementation
 uses
   {$IFDEF VCL_2010_OR_ABOVE}
     {$IFDEF WINDOWS}
-  Windows,
+      {$IFDEF VCL_XE2_OR_ABOVE}
+      WinAPI.Windows,
+      {$ELSE}
+      Windows,
+      {$ENDIF}
     {$ENDIF}
   {$ENDIF}
   IdGlobalCore, SysUtils;
diff --git a/Lib/Protocols/IdGlobalProtocols.pas b/Lib/Protocols/IdGlobalProtocols.pas
index ad2c20ac6..224635a57 100644
--- a/Lib/Protocols/IdGlobalProtocols.pas
+++ b/Lib/Protocols/IdGlobalProtocols.pas
@@ -618,7 +618,11 @@ implementation
   {$ENDIF}
   {$IFDEF WINDOWS}
   Messages,
-  Registry,
+    {$IFDEF VCL_XE2_OR_ABOVE}
+    System.Win.Registry,
+    {$ELSE}
+    Registry,
+    {$ENDIF}
   {$ENDIF}
   {$IFDEF DOTNET}
   System.IO,