Reintroduce SetupLdrAndSetup prefix.

Projects/Setup.dpr

@@ -11,7 +11,7 @@ program Setup;
 
 uses
   SafeDLLPath in '..\Components\SafeDLLPath.pas',
-  Setup.XPTheme in 'Src\Setup.XPTheme.pas',
+  SetupLdrAndSetup.XPTheme in 'Src\SetupLdrAndSetup.XPTheme.pas',
   Forms,
   Windows,
   SysUtils,
@@ -21,12 +21,12 @@ uses
   Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
   Setup.MainForm in 'Src\Setup.MainForm.pas' {MainForm},
   Setup.Install in 'Src\Setup.Install.pas',
-  Setup.Messages in 'Src\Setup.Messages.pas',
+  SetupLdrAndSetup.Messages in 'Src\SetupLdrAndSetup.Messages.pas',
   Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
   Setup.UninstallLog in 'Src\Setup.UninstallLog.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
   Setup.NewDiskForm in 'Src\Setup.NewDiskForm.pas' {NewDiskForm},
-  Setup.InstFunc in 'Src\Setup.InstFunc.pas',
+  SetupLdrAndSetup.InstFunc in 'Src\SetupLdrAndSetup.InstFunc.pas',
   Setup.InstFunc.Ole in 'Src\Setup.InstFunc.Ole.pas',
   Setup.WizardForm in 'Src\Setup.WizardForm.pas' {WizardForm},
   Setup.ScriptFunc in 'Src\Setup.ScriptFunc.pas',
@@ -58,7 +58,7 @@ uses
   Setup.SetupForm in 'Src\Setup.SetupForm.pas',
   Setup.RegSvr in 'Src\Setup.RegSvr.pas',
   BrowseFunc in '..\Components\BrowseFunc.pas',
-  Setup.RedirFunc in 'Src\Setup.RedirFunc.pas',
+  SetupLdrAndSetup.RedirFunc in 'Src\SetupLdrAndSetup.RedirFunc.pas',
   Setup.SecurityFunc in 'Src\Setup.SecurityFunc.pas',
   Setup.Helper in 'Src\Setup.Helper.pas',
   Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas',

Projects/Setup.dproj

@@ -74,7 +74,7 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="..\Components\SafeDLLPath.pas"/>
-        <DCCReference Include="Src\Setup.XPTheme.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup.XPTheme.pas"/>
         <DCCReference Include="..\Components\RichEditViewer.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.Vcl.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.pas"/>
@@ -82,14 +82,14 @@
             <Form>MainForm</Form>
         </DCCReference>
         <DCCReference Include="Src\Setup.Install.pas"/>
-        <DCCReference Include="Src\Setup.Messages.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup.Messages.pas"/>
         <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
         <DCCReference Include="Src\Setup.UninstallLog.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
         <DCCReference Include="Src\Setup.NewDiskForm.pas">
             <Form>NewDiskForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Setup.InstFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup.InstFunc.pas"/>
         <DCCReference Include="Src\Setup.InstFunc.Ole.pas"/>
         <DCCReference Include="Src\Setup.WizardForm.pas">
             <Form>WizardForm</Form>
@@ -131,7 +131,7 @@
         <DCCReference Include="Src\Setup.SetupForm.pas"/>
         <DCCReference Include="Src\Setup.RegSvr.pas"/>
         <DCCReference Include="..\Components\BrowseFunc.pas"/>
-        <DCCReference Include="Src\Setup.RedirFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup.RedirFunc.pas"/>
         <DCCReference Include="Src\Setup.SecurityFunc.pas"/>
         <DCCReference Include="Src\Setup.Helper.pas"/>
         <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>

Projects/SetupLdr.dpr

@@ -11,7 +11,7 @@ program SetupLdr;
 
 uses
   SafeDLLPath in '..\Components\SafeDLLPath.pas',
-  Setup.XPTheme in 'Src\Setup.XPTheme.pas',
+  SetupLdrAndSetup.XPTheme in 'Src\SetupLdrAndSetup.XPTheme.pas',
   Windows,
   Messages,
   SysUtils,
@@ -20,15 +20,15 @@ uses
   Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
   PathFunc in '..\Components\PathFunc.pas',
   Shared.CommonFunc in 'Src\Shared.CommonFunc.pas',
-  Setup.Messages in 'Src\Setup.Messages.pas',
+  SetupLdrAndSetup.Messages in 'Src\SetupLdrAndSetup.Messages.pas',
   Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
   Shared.Struct in 'Src\Shared.Struct.pas',
-  Setup.InstFunc in 'Src\Setup.InstFunc.pas',
+  SetupLdrAndSetup.InstFunc in 'Src\SetupLdrAndSetup.InstFunc.pas',
   Shared.FileClass in 'Src\Shared.FileClass.pas',
   Shared.Int64Em in 'Src\Shared.Int64Em.pas',
   SHA1 in '..\Components\SHA1.pas',
   MD5 in '..\Components\MD5.pas',
-  Setup.RedirFunc in 'Src\Setup.RedirFunc.pas',
+  SetupLdrAndSetup.RedirFunc in 'Src\SetupLdrAndSetup.RedirFunc.pas',
   Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
   Shared.VerInfoFunc in 'Src\Shared.VerInfoFunc.pas';
 
@@ -310,7 +310,7 @@ begin
           '/HELP, /?' + SNewLine +
            'Shows this information.' + SNewLine +
           '/SP-' + SNewLine +
-          'Disables the This will install... Do you wish to continue? prompt at the beginning of Setup.' + SNewLine +
+          'Disables the This will install... Do you wish to continue? prompt at the beginning of SetupLdrAndSetup.' + SNewLine +
           '/SILENT, /VERYSILENT' + SNewLine +
           'Instructs Setup to be silent or very silent.' + SNewLine +
           '/SUPPRESSMSGBOXES' + SNewLine +
@@ -495,7 +495,7 @@ begin
         Longint(OrigWndProc) := SetWindowLong(SetupLdrWnd, GWL_WNDPROC,
           Longint(@SetupLdrWndProc));
 
-        { Now execute Setup. Use the exit code it returns as our exit code. }
+        { Now execute SetupLdrAndSetup. Use the exit code it returns as our exit code. }
         ExecAndWait(TempFile, Format('/SL5="$%x,%d,%d,',
           [SetupLdrWnd, OffsetTable.Offset0, OffsetTable.Offset1]) +
           SelfFilename + '" ' + GetCmdTail, SetupLdrExitCode);

Projects/SetupLdr.dproj

@@ -71,21 +71,21 @@
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
         <DCCReference Include="..\Components\SafeDLLPath.pas"/>
-        <DCCReference Include="Src\Setup.XPTheme.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup.XPTheme.pas"/>
         <DCCReference Include="Src\Compression.Base.pas"/>
         <DCCReference Include="Src\Compression.LZMA1SmallDecompressor.pas"/>
         <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.pas"/>
-        <DCCReference Include="Src\Setup.Messages.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup.Messages.pas"/>
         <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
         <DCCReference Include="Src\Shared.Struct.pas"/>
-        <DCCReference Include="Src\Setup.InstFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup.InstFunc.pas"/>
         <DCCReference Include="Src\Shared.FileClass.pas"/>
         <DCCReference Include="Src\Shared.Int64Em.pas"/>
         <DCCReference Include="..\Components\SHA1.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
-        <DCCReference Include="Src\Setup.RedirFunc.pas"/>
+        <DCCReference Include="Src\SetupLdrAndSetup.RedirFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupTypes.pas"/>
         <DCCReference Include="Src\Shared.VerInfoFunc.pas"/>
         <BuildConfiguration Include="Base">

Projects/Src/Setup.DebugClient.pas

@@ -36,7 +36,7 @@ procedure SetDebugServerWnd(Wnd: HWND; WantCodeText: Boolean);
 implementation
 
 uses
-  Forms, Classes, Shared.CommonFunc, Shared.Struct, Setup.InstFunc, Setup.MainForm;
+  Forms, Classes, Shared.CommonFunc, Shared.Struct, SetupLdrAndSetup.InstFunc, Setup.MainForm;
 
 type
   TDummyClass = class

Projects/Src/Setup.DotNetFunc.pas

@@ -61,7 +61,7 @@ function IsDotNetInstalled(const RegView: TRegView; const MinVersion: TDotNetVer
 implementation
 
 uses
-  Setup.InstFunc, PathFunc;
+  SetupLdrAndSetup.InstFunc, PathFunc;
 
 var
   DotNetRoot: array [TRegView] of String;

Projects/Src/Setup.FileExtractor.pas

@@ -50,8 +50,8 @@ procedure FreeFileExtractor;
 implementation
 
 uses
-  PathFunc, Shared.CommonFunc, Setup.MainForm, Setup.Messages, Shared.SetupMessageIDs,
-  Setup.InstFunc, Compression.Zlib, Compression.bzlib,
+  PathFunc, Shared.CommonFunc, Setup.MainForm, SetupLdrAndSetup.Messages, Shared.SetupMessageIDs,
+  SetupLdrAndSetup.InstFunc, Compression.Zlib, Compression.bzlib,
   Compression.LZMADecompressor, SHA1, Setup.LoggingFunc, Setup.NewDiskForm;
 
 var

Projects/Src/Setup.Helper.pas

@@ -31,8 +31,8 @@ implementation
 {x$DEFINE HELPERDEBUG}
 
 uses
-  Forms, Shared.Int64Em, Shared.CommonFunc.Vcl, Shared.CommonFunc, PathFunc, Setup.MainForm, Setup.InstFunc,
-  Setup.LoggingFunc, Setup.Messages, Shared.SetupMessageIDs;
+  Forms, Shared.Int64Em, Shared.CommonFunc.Vcl, Shared.CommonFunc, PathFunc, Setup.MainForm, SetupLdrAndSetup.InstFunc,
+  Setup.LoggingFunc, SetupLdrAndSetup.Messages, Shared.SetupMessageIDs;
 
 const
   HELPER_VERSION = 105;

Projects/Src/Setup.InstFunc.Ole.pas

@@ -23,8 +23,8 @@ function UnpinShellLink(const Filename: String): Boolean;
 implementation
 
 uses
-  Windows, SysUtils, PathFunc, Shared.CommonFunc, Setup.InstFunc, Setup.MainForm,
-  Setup.Messages, Shared.SetupMessageIDs,
+  Windows, SysUtils, PathFunc, Shared.CommonFunc, SetupLdrAndSetup.InstFunc, Setup.MainForm,
+  SetupLdrAndSetup.Messages, Shared.SetupMessageIDs,
   ActiveX, ComObj, PropSys, ShellAPI, ShlObj;
 
 procedure AssignWorkingDir(const SL: IShellLink; const WorkingDir: String);

Projects/Src/Setup.Install.pas

@@ -29,9 +29,9 @@ implementation
 
 uses
   Windows, SysUtils, Messages, Classes, Forms, ShlObj, Shared.Struct, Setup.UninstallLog, Shared.SetupTypes,
-  Setup.InstFunc, Setup.InstFunc.Ole, Setup.SecurityFunc, Setup.Messages,
+  SetupLdrAndSetup.InstFunc, Setup.InstFunc.Ole, Setup.SecurityFunc, SetupLdrAndSetup.Messages,
   Setup.MainForm, Setup.LoggingFunc, Setup.FileExtractor, Shared.FileClass,
-  Compression.Base, SHA1, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.RedirFunc, Shared.Int64Em, Shared.SetupMessageIDs,
+  Compression.Base, SHA1, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, SetupLdrAndSetup.RedirFunc, Shared.Int64Em, Shared.SetupMessageIDs,
   Setup.WizardForm, Shared.DebugStruct, Setup.DebugClient, Shared.VerInfoFunc, Setup.ScriptRunner, Setup.RegDLL, Setup.Helper,
   Shared.ResUpdateFunc, Setup.DotNetFunc, TaskbarProgressFunc, NewProgressBar, RestartManager,
   Net.HTTPClient, Net.URLClient, NetEncoding, RegStr;

Projects/Src/Setup.MainForm.pas

@@ -267,7 +267,7 @@ implementation
 
 uses
   ShellAPI, ShlObj, StrUtils,
-  Setup.Messages, Shared.SetupMessageIDs, Setup.Install, Setup.InstFunc, Setup.InstFunc.Ole, Setup.RedirFunc, PathFunc,
+  SetupLdrAndSetup.Messages, Shared.SetupMessageIDs, Setup.Install, SetupLdrAndSetup.InstFunc, Setup.InstFunc.Ole, SetupLdrAndSetup.RedirFunc, PathFunc,
   Compression.Base, Compression.Zlib, Compression.bzlib, Compression.LZMADecompressor, Shared.ArcFour, Shared.SetupEntFunc, Setup.SelectLanguageForm,
   Setup.WizardForm, Setup.DebugClient, Shared.VerInfoFunc, Setup.FileExtractor, Shared.FileClass, Setup.LoggingFunc, MD5, SHA1, ActiveX,
   SimpleExpression, Setup.Helper, Setup.SpawnClient, Setup.SpawnServer, Setup.DotNetFunc, BitmapImage,

Projects/Src/Setup.NewDiskForm.pas

@@ -40,7 +40,7 @@ function SelectDisk(const DiskNumber: Integer; const AFilename: String; var Path
 implementation
 
 uses
-  Setup.Messages, Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, BrowseFunc,
+  SetupLdrAndSetup.Messages, Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, BrowseFunc,
   Setup.MainForm, Setup.WizardForm;
 
 {$R *.DFM}

Projects/Src/Setup.RegDLL.pas

@@ -20,8 +20,8 @@ procedure RegisterServer(const AUnregister: Boolean; const AIs64Bit: Boolean;
 implementation
 
 uses
-  SysUtils, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.InstFunc, Setup.Messages, Shared.SetupMessageIDs,
-  Setup.LoggingFunc, Setup.RedirFunc, Setup.MainForm;
+  SysUtils, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, SetupLdrAndSetup.InstFunc, SetupLdrAndSetup.Messages, Shared.SetupMessageIDs,
+  Setup.LoggingFunc, SetupLdrAndSetup.RedirFunc, Setup.MainForm;
 
 function WaitForAndCloseProcessHandle(var AProcessHandle: THandle): DWORD;
 var

Projects/Src/Setup.RegSvr.pas

@@ -16,8 +16,8 @@ procedure RunRegSvr;
 implementation
 
 uses
-  Windows, SysUtils, Classes, Forms, PathFunc, Shared.CommonFunc, Setup.InstFunc, Setup.InstFunc.Ole,
-  Shared.FileClass, Shared.CommonFunc.Vcl, Shared.Struct, Setup.MainForm, Setup.Messages, Shared.SetupMessageIDs, Setup.RegDLL, Setup.Helper;
+  Windows, SysUtils, Classes, Forms, PathFunc, Shared.CommonFunc, SetupLdrAndSetup.InstFunc, Setup.InstFunc.Ole,
+  Shared.FileClass, Shared.CommonFunc.Vcl, Shared.Struct, Setup.MainForm, SetupLdrAndSetup.Messages, Shared.SetupMessageIDs, Setup.RegDLL, Setup.Helper;
 
 procedure DeleteOldTempFiles(const Path: String);
 { Removes any old isRS-???.tmp files from Path. Not strictly necessary, but

Projects/Src/Setup.ScriptDlg.pas

@@ -201,9 +201,9 @@ implementation
 
 uses
   StrUtils,
-  Shared.Struct, Setup.MainForm, Setup.SelectFolderForm, Setup.Messages,
+  Shared.Struct, Setup.MainForm, Setup.SelectFolderForm, SetupLdrAndSetup.Messages,
   Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
-  BrowseFunc, Setup.LoggingFunc, Setup.InstFunc;
+  BrowseFunc, Setup.LoggingFunc, SetupLdrAndSetup.InstFunc;
 
 const
   DefaultLabelHeight = 14;

Projects/Src/Setup.ScriptFunc.pas

@@ -22,8 +22,8 @@ uses
   Windows, Shared.ScriptFunc,
   Forms, uPSUtils, SysUtils, Classes, Graphics, Controls, TypInfo, ActiveX,
   Shared.Struct, Setup.ScriptDlg, Setup.MainForm, PathFunc, Shared.CommonFunc.Vcl,
-  Shared.CommonFunc, Shared.FileClass, Setup.RedirFunc,
-  Setup.Install, Setup.InstFunc, Setup.InstFunc.Ole, Setup.Messages,
+  Shared.CommonFunc, Shared.FileClass, SetupLdrAndSetup.RedirFunc,
+  Setup.Install, SetupLdrAndSetup.InstFunc, Setup.InstFunc.Ole, SetupLdrAndSetup.Messages,
   Shared.SetupMessageIDs, Setup.NewDiskForm, BrowseFunc, Setup.WizardForm, Shared.VerInfoFunc,
   Shared.SetupTypes, Shared.Int64Em, MD5, SHA1, Setup.LoggingFunc, Setup.SetupForm, Setup.RegDLL, Setup.Helper,
   Setup.SpawnClient, Setup.UninstallProgressForm, ASMInline, Setup.DotNetFunc,

Projects/Src/Setup.SecurityFunc.pas

@@ -23,8 +23,8 @@ function GrantPermissionOnKey(const RegView: TRegView; const RootKey: HKEY;
 implementation
 
 uses
-  PathFunc, Setup.Messages, Setup.InstFunc, Setup.LoggingFunc,
-  Setup.RedirFunc, Setup.Helper;
+  PathFunc, SetupLdrAndSetup.Messages, SetupLdrAndSetup.InstFunc, Setup.LoggingFunc,
+  SetupLdrAndSetup.RedirFunc, Setup.Helper;
 
 function InternalGrantPermission(const ObjectType: DWORD; const ObjectName: String;
   const Entries: TGrantPermissionEntry; const EntryCount: Integer;

Projects/Src/Setup.SelectFolderForm.pas

@@ -42,7 +42,7 @@ function ShowSelectFolderDialog(const StartMenu, AppendDir: Boolean;
 implementation
 
 uses
-  PathFunc, Setup.Messages, Shared.SetupMessageIDs, Setup.MainForm,
+  PathFunc, SetupLdrAndSetup.Messages, Shared.SetupMessageIDs, Setup.MainForm,
   Shared.SetupTypes, Setup.WizardForm, Shared.CommonFunc;
 
 {$R *.DFM}

Projects/Src/Setup.SelectLanguageForm.pas

@@ -36,7 +36,7 @@ function AskForLanguage: Boolean;
 implementation
 
 uses
-  Shared.Struct, Setup.Messages, Shared.SetupMessageIDs, Setup.MainForm;
+  Shared.Struct, SetupLdrAndSetup.Messages, Shared.SetupMessageIDs, Setup.MainForm;
 
 {$R *.DFM}
 

Projects/Src/Setup.SetupForm.pas

@@ -74,7 +74,7 @@ implementation
 
 uses
   Generics.Collections, UITypes,
-  Shared.CommonFunc, Setup.MainForm, Setup.Messages, BidiUtils;
+  Shared.CommonFunc, Setup.MainForm, SetupLdrAndSetup.Messages, BidiUtils;
 
 var
   WM_QueryCancelAutoPlay: UINT;

Projects/Src/Setup.SpawnClient.pas

@@ -15,7 +15,7 @@ unit Setup.SpawnClient;
 interface
 
 uses
-  Windows, SysUtils, Messages, Setup.InstFunc, Shared.CommonFunc;
+  Windows, SysUtils, Messages, SetupLdrAndSetup.InstFunc, Shared.CommonFunc;
 
 procedure InitializeSpawnClient(const AServerWnd: HWND);
 function InstExecEx(const RunAsOriginalUser: Boolean;

Projects/Src/Setup.SpawnServer.pas

@@ -46,7 +46,7 @@ implementation
 {x$DEFINE SPAWNSERVER_RESPAWN_ALWAYS}
 
 uses
-  Classes, Forms, ShellApi, Shared.Int64Em, PathFunc, Shared.CommonFunc, Setup.InstFunc, Setup.SpawnCommon;
+  Classes, Forms, ShellApi, Shared.Int64Em, PathFunc, Shared.CommonFunc, SetupLdrAndSetup.InstFunc, Setup.SpawnCommon;
 
 type
   TPtrAndSize = record

Projects/Src/Setup.Uninstall.pas

@@ -17,8 +17,8 @@ procedure HandleUninstallerEndSession;
 implementation
 
 uses
-  Windows, SysUtils, Messages, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.UninstallLog, Setup.Messages,
-  Shared.SetupMessageIDs, Setup.InstFunc, Shared.Struct, Shared.SetupEntFunc, Setup.UninstallProgressForm, Setup.UninstallSharedFileForm,
+  Windows, SysUtils, Messages, Forms, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.UninstallLog, SetupLdrAndSetup.Messages,
+  Shared.SetupMessageIDs, SetupLdrAndSetup.InstFunc, Shared.Struct, Shared.SetupEntFunc, Setup.UninstallProgressForm, Setup.UninstallSharedFileForm,
   Shared.FileClass, Setup.ScriptRunner, Setup.DebugClient, Shared.SetupTypes, Setup.LoggingFunc, Setup.MainForm,
   Setup.SpawnServer;
 

Projects/Src/Setup.UninstallLog.pas

@@ -155,8 +155,8 @@ implementation
 
 uses
   Messages, ShlObj, AnsiStrings,
-  PathFunc, Shared.Struct, Setup.Messages, Shared.SetupMessageIDs, Setup.InstFunc,
-  Setup.InstFunc.Ole, Setup.RedirFunc, Compression.Base,
+  PathFunc, Shared.Struct, SetupLdrAndSetup.Messages, Shared.SetupMessageIDs, SetupLdrAndSetup.InstFunc,
+  Setup.InstFunc.Ole, SetupLdrAndSetup.RedirFunc, Compression.Base,
   Setup.LoggingFunc, Setup.RegDLL, Setup.Helper, Setup.DotNetFunc;
 
 type

Projects/Src/Setup.UninstallProgressForm.pas

@@ -65,7 +65,7 @@ var
 implementation
 
 uses
-  TaskbarProgressFunc, Setup.MainForm, Setup.Messages,
+  TaskbarProgressFunc, Setup.MainForm, SetupLdrAndSetup.Messages,
   Shared.SetupMessageIDs, Shared.CommonFunc.Vcl;
 
 {$R *.DFM}

Projects/Src/Setup.UninstallSharedFileForm.pas

@@ -41,7 +41,7 @@ function ExecuteRemoveSharedFileDlg(const Filename: String;
 implementation
 
 uses
-  PathFunc, Shared.Struct, Setup.Messages, Shared.SetupMessageIDs, Setup.MainForm;
+  PathFunc, Shared.Struct, SetupLdrAndSetup.Messages, Shared.SetupMessageIDs, Setup.MainForm;
 
 {$R *.DFM}
 

Projects/Src/Setup.WizardForm.pas

@@ -342,8 +342,8 @@ function ValidateCustomDirEdit(const AEdit: TEdit;
 implementation
 
 uses
-  ShellApi, ShlObj, Types, Setup.Messages, Setup.MainForm, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
-  MD5, Setup.InstFunc, Setup.SelectFolderForm, Setup.FileExtractor, Setup.LoggingFunc, RestartManager, Setup.ScriptRunner;
+  ShellApi, ShlObj, Types, SetupLdrAndSetup.Messages, Setup.MainForm, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
+  MD5, SetupLdrAndSetup.InstFunc, Setup.SelectFolderForm, Setup.FileExtractor, Setup.LoggingFunc, RestartManager, Setup.ScriptRunner;
 
 {$R *.DFM}
 

Projects/Src/Setup.InstFunc.pas → Projects/Src/SetupLdrAndSetup.InstFunc.pas

@@ -1,4 +1,4 @@
-unit Setup.InstFunc;
+unit SetupLdrAndSetup.InstFunc;
 
 {
   Inno Setup
@@ -118,7 +118,7 @@ function ForceDirectories(const DisableFsRedir: Boolean; Dir: String): Boolean;
 implementation
 
 uses
-  Messages, ShellApi, PathFunc, Setup.Messages, Shared.SetupMessageIDs, Shared.FileClass, Setup.RedirFunc, Shared.SetupTypes,
+  Messages, ShellApi, PathFunc, SetupLdrAndSetup.Messages, Shared.SetupMessageIDs, Shared.FileClass, SetupLdrAndSetup.RedirFunc, Shared.SetupTypes,
   Hash, Classes, RegStr, Math;
 
 procedure InternalError(const Id: String);

Projects/Src/Setup.Messages.pas → Projects/Src/SetupLdrAndSetup.Messages.pas

@@ -1,4 +1,4 @@
-unit Setup.Messages;
+unit SetupLdrAndSetup.Messages;
 
 {
   Inno Setup

Projects/Src/Setup.RedirFunc.pas → Projects/Src/SetupLdrAndSetup.RedirFunc.pas

@@ -1,4 +1,4 @@
-unit Setup.RedirFunc;
+unit SetupLdrAndSetup.RedirFunc;
 
 {
   Inno Setup

Projects/Src/Setup.XPTheme.pas → Projects/Src/SetupLdrAndSetup.XPTheme.pas

@@ -1,4 +1,4 @@
-unit Setup.XPTheme;
+unit SetupLdrAndSetup.XPTheme;
 
 {
   Inno Setup
@@ -16,7 +16,7 @@ interface
 
 implementation
 
-{$R Setup.XPTheme.res}
+{$R SetupLdrAndSetup.XPTheme.res}
 
 uses
   Windows;

Projects/Src/Shared.TaskDialogFunc.pas

@@ -20,7 +20,7 @@ implementation
 
 uses
   Classes, StrUtils, Math, Forms, Dialogs, SysUtils,
-  Commctrl, Shared.CommonFunc, {$IFDEF SETUPPROJ} Setup.InstFunc, {$ENDIF} PathFunc;
+  Commctrl, Shared.CommonFunc, {$IFDEF SETUPPROJ} SetupLdrAndSetup.InstFunc, {$ENDIF} PathFunc;
 
 var
   TaskDialogIndirectFunc: function(const pTaskConfig: TTaskDialogConfig;