Cherry pick from setup-styles: Components.dpk: define VCLSTYLES. Requires explicit use of Vcl.Themes, otherwise it finds our special Themes.pas.

Components/Components.dpk

@@ -24,6 +24,7 @@ package Components;
 {$MINENUMSIZE 1}
 {$IMAGEBASE $400000}
 {$DEFINE DEBUG}
+{$DEFINE VCLSTYLES}
 {$ENDIF IMPLICITBUILDING}
 {$DESCRIPTION 'Inno Setup Components'}
 {$IMPLICITBUILD ON}

Components/NewCheckListBox.pas

@@ -17,7 +17,8 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  StdCtrls, NewUxTheme, Themes;
+  {$IFDEF VCLSTYLES} Vcl.Themes, {$ELSE} Themes, {$ENDIF}
+  StdCtrls, NewUxTheme;
 
 const
   WM_UPDATEUISTATE = $0128;

Components/NewProgressBar.pas

@@ -19,7 +19,9 @@ unit NewProgressBar;
 interface
 
 uses
-  Windows, Messages, Classes, Controls, ComCtrls, Themes, ExtCtrls, Types, Graphics;
+  Windows, Messages, Classes, Controls, ComCtrls,
+  {$IFDEF VCLSTYLES} Vcl.Themes, {$ELSE} Themes, {$ENDIF}
+  ExtCtrls, Types, Graphics;
 
 type
   TNewProgressBarState = (npbsNormal, npbsError, npbsPaused);

Components/NewStaticText.pas

@@ -10,7 +10,9 @@ unit NewStaticText;
 interface
 
 uses
-  Windows, Messages, SysUtils, Classes, Controls, Forms, Graphics, Themes;
+  Windows, Messages, SysUtils, Classes, Controls, Forms,
+  {$IFDEF VCLSTYLES} Vcl.Themes, {$ELSE} Themes, {$ENDIF}
+  Graphics;
 
 {$IFDEF VCLSTYLES}
   {$DEFINE TRANSPARENCYSUPPORT}