Isolate Setup(Ldr) specific units. Compil32 not using XPTheme is correct, it has its own manifest.

Projects/Setup.dpr

@@ -11,7 +11,7 @@ program Setup;
 
 uses
   SafeDLLPath in 'Src\SafeDLLPath.pas',
-  XPTheme in 'Src\XPTheme.pas',
+  XPTheme in 'Src\SetupLdrAndSetup\XPTheme.pas',
   Forms,
   Windows,
   SysUtils,
@@ -21,12 +21,12 @@ uses
   CmnFunc2 in 'Src\CmnFunc2.pas',
   Main in 'Src\Setup\Main.pas' {MainForm},
   Install in 'Src\Setup\Install.pas',
-  Msgs in 'Src\Msgs.pas',
+  Msgs in 'Src\SetupLdrAndSetup\Msgs.pas',
   MsgIDs in 'Src\MsgIDs.pas',
   Undo in 'Src\Setup\Undo.pas',
   Struct in 'Src\Struct.pas',
   NewDisk in 'Src\Setup\NewDisk.pas' {NewDiskForm},
-  InstFunc in 'Src\InstFunc.pas',
+  InstFunc in 'Src\SetupLdrAndSetup\InstFunc.pas',
   InstFnc2 in 'Src\Setup\InstFnc2.pas',
   Wizard in 'Src\Setup\Wizard.pas' {WizardForm},
   ScriptFunc_R in 'Src\ScriptFunc_R.pas',

Projects/Setup.dproj

@@ -75,7 +75,7 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Src\SafeDLLPath.pas"/>
-        <DCCReference Include="Src\XPTheme.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\XPTheme.pas"/>
         <DCCReference Include="..\Components\RichEditViewer.pas"/>
         <DCCReference Include="Src\CmnFunc.pas"/>
         <DCCReference Include="Src\CmnFunc2.pas"/>
@@ -83,14 +83,14 @@
             <Form>MainForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Setup\Install.pas"/>
-        <DCCReference Include="Src\Msgs.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Msgs.pas"/>
         <DCCReference Include="Src\MsgIDs.pas"/>
         <DCCReference Include="Src\Setup\Undo.pas"/>
         <DCCReference Include="Src\Struct.pas"/>
         <DCCReference Include="Src\Setup\NewDisk.pas">
             <Form>NewDiskForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\InstFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\InstFunc.pas"/>
         <DCCReference Include="Src\Setup\InstFnc2.pas"/>
         <DCCReference Include="Src\Setup\Wizard.pas">
             <Form>WizardForm</Form>

Projects/SetupLdr.dpr

@@ -11,7 +11,7 @@ program SetupLdr;
 
 uses
   SafeDLLPath in 'Src\SafeDLLPath.pas',
-  XPTheme in 'Src\XPTheme.pas',
+  XPTheme in 'Src\SetupLdrAndSetup\XPTheme.pas',
   Windows,
   Messages,
   SysUtils,
@@ -20,10 +20,10 @@ uses
   SetupEnt in 'Src\SetupEnt.pas',
   PathFunc in '..\Components\PathFunc.pas',
   CmnFunc2 in 'Src\CmnFunc2.pas',
-  Msgs in 'Src\Msgs.pas',
+  Msgs in 'Src\SetupLdrAndSetup\Msgs.pas',
   MsgIDs in 'Src\MsgIDs.pas',
   Struct in 'Src\Struct.pas',
-  InstFunc in 'Src\InstFunc.pas',
+  InstFunc in 'Src\SetupLdrAndSetup\InstFunc.pas',
   FileClass in 'Src\FileClass.pas',
   Int64Em in 'Src\Int64Em.pas',
   SHA1 in 'Src\SHA1.pas',

Projects/SetupLdr.dproj

@@ -72,16 +72,16 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="Src\SafeDLLPath.pas"/>
-        <DCCReference Include="Src\XPTheme.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\XPTheme.pas"/>
         <DCCReference Include="Src\Compress.pas"/>
         <DCCReference Include="Src\SetupLdr\LZMADecompSmall.pas"/>
         <DCCReference Include="Src\SetupEnt.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="Src\CmnFunc2.pas"/>
-        <DCCReference Include="Src\Msgs.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\Msgs.pas"/>
         <DCCReference Include="Src\MsgIDs.pas"/>
         <DCCReference Include="Src\Struct.pas"/>
-        <DCCReference Include="Src\InstFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup\InstFunc.pas"/>
         <DCCReference Include="Src\FileClass.pas"/>
         <DCCReference Include="Src\Int64Em.pas"/>
         <DCCReference Include="Src\SHA1.pas"/>