Move shared but self-contained and generally useful units to Components.

Projects/Src/Shared.BrowseFunc.pas → Components/BrowseFunc.pas

@@ -1,4 +1,4 @@
-unit Shared.BrowseFunc;
+unit BrowseFunc;
 
 {
   Inno Setup

Projects/Src/Shared.SafeDLLPath.pas → Components/SafeDLLPath.pas

@@ -1,4 +1,4 @@
-unit Shared.SafeDLLPath;
+unit SafeDLLPath;
 
 {
   Inno Setup

Projects/Src/Shared.SimpleExpression.pas → Components/SimpleExpression.pas

@@ -1,4 +1,4 @@
-unit Shared.SimpleExpression;
+unit SimpleExpression;
 
 {
   Inno Setup

Projects/Src/Shared.TaskbarProgressFunc.pas → Components/TaskbarProgressFunc.pas

@@ -1,4 +1,4 @@
-unit Shared.TaskbarProgressFunc;
+unit TaskbarProgressFunc;
 
 {
   Inno Setup

Projects/Src/Shared.UIStateForm.pas → Components/UIStateForm.pas

@@ -1,4 +1,4 @@
-unit Shared.UIStateForm;
+unit UIStateForm;
 
 {
   Inno Setup

Projects/Compil32.dpr

@@ -10,7 +10,7 @@ program Compil32;
 }
 
 uses
-  Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
   Windows,
   SysUtils,
   Forms,
@@ -29,7 +29,7 @@ uses
   NewUxTheme.TmSchema in '..\Components\NewUxTheme.TmSchema.pas',
   NewUxTheme in '..\Components\NewUxTheme.pas',
   Shared.DebugStruct in 'Src\Shared.DebugStruct.pas',
-  Shared.BrowseFunc in 'Src\Shared.BrowseFunc.pas',
+  BrowseFunc in '..\Components\BrowseFunc.pas',
   IDE.SignToolsForm in 'Src\IDE.SignToolsForm.pas' {SignToolsForm},
   IDE.InputQueryComboForm in 'Src\IDE.InputQueryComboForm.pas',
   ScintInt in '..\Components\ScintInt.pas',
@@ -46,9 +46,9 @@ uses
   DropListBox in '..\Components\DropListBox.pas',
   NewCheckListBox in '..\Components\NewCheckListBox.pas',
   NewNotebook in '..\Components\NewNotebook.pas',
-  Shared.TaskbarProgressFunc in 'Src\Shared.TaskbarProgressFunc.pas',
+  TaskbarProgressFunc in '..\Components\TaskbarProgressFunc.pas',
   IDE.HtmlHelpFunc in 'Src\IDE.HtmlHelpFunc.pas',
-  Shared.UIStateForm in 'Src\Shared.UIStateForm.pas',
+  UIStateForm in '..\Components\UIStateForm.pas',
   Shared.LangOptionsSectionDirectives in 'Src\Shared.LangOptionsSectionDirectives.pas',
   Shared.SetupMessageIDs in 'Src\Shared.SetupMessageIDs.pas',
   Shared.SetupSectionDirectives in 'Src\Shared.SetupSectionDirectives.pas',

Projects/Compil32.dproj

@@ -75,7 +75,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="Src\IDE.CompileForm.pas">
             <Form>CompileForm</Form>
@@ -101,7 +101,7 @@
         <DCCReference Include="..\Components\NewUxTheme.TmSchema.pas"/>
         <DCCReference Include="..\Components\NewUxTheme.pas"/>
         <DCCReference Include="Src\Shared.DebugStruct.pas"/>
-        <DCCReference Include="Src\Shared.BrowseFunc.pas"/>
+        <DCCReference Include="..\Components\BrowseFunc.pas"/>
         <DCCReference Include="Src\IDE.SignToolsForm.pas">
             <Form>SignToolsForm</Form>
         </DCCReference>
@@ -124,9 +124,9 @@
         <DCCReference Include="..\Components\DropListBox.pas"/>
         <DCCReference Include="..\Components\NewCheckListBox.pas"/>
         <DCCReference Include="..\Components\NewNotebook.pas"/>
-        <DCCReference Include="Src\Shared.TaskbarProgressFunc.pas"/>
+        <DCCReference Include="..\Components\TaskbarProgressFunc.pas"/>
         <DCCReference Include="Src\IDE.HtmlHelpFunc.pas"/>
-        <DCCReference Include="Src\Shared.UIStateForm.pas"/>
+        <DCCReference Include="..\Components\UIStateForm.pas"/>
         <DCCReference Include="Src\Shared.LangOptionsSectionDirectives.pas"/>
         <DCCReference Include="Src\Shared.SetupMessageIDs.pas"/>
         <DCCReference Include="Src\Shared.SetupSectionDirectives.pas"/>

Projects/ISCC.dpr

@@ -15,7 +15,7 @@ program ISCC;
   into this program and not depend on ISCmplr.dll. }
 
 uses
-  Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
   Windows,
   SysUtils,
   Classes,

Projects/ISCC.dproj

@@ -74,7 +74,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
         <DCCReference Include="Src\ISCmplr\ISCmplr.Compile.pas"/>
         <DCCReference Include="..\Components\PathFunc.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.pas"/>

Projects/ISCmplr.dpr

@@ -10,7 +10,7 @@ library ISCmplr;
 }
 
 uses
-  Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
   SysUtils,
   Shared.CompilerInt in 'Src\Shared.CompilerInt.pas',
   Shared.PreprocInt in 'Src\Shared.PreprocInt.pas',
@@ -40,7 +40,7 @@ uses
   Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
   Shared.SetupSectionDirectives in 'Src\Shared.SetupSectionDirectives.pas',
   Shared.SetupTypes in 'Src\Shared.SetupTypes.pas',
-  Shared.SimpleExpression in 'Src\Shared.SimpleExpression.pas',
+  SimpleExpression in '..\Components\SimpleExpression.pas',
   MD5 in '..\Components\MD5.pas',
   Shared.DotNetVersion in 'Src\Shared.DotNetVersion.pas';
 

Projects/ISCmplr.dproj

@@ -77,7 +77,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
         <DCCReference Include="Src\Shared.CompilerInt.pas"/>
         <DCCReference Include="Src\Shared.PreprocInt.pas"/>
         <DCCReference Include="Src\Compiler.Compile.pas"/>
@@ -106,7 +106,7 @@
         <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupSectionDirectives.pas"/>
         <DCCReference Include="Src\Shared.SetupTypes.pas"/>
-        <DCCReference Include="Src\Shared.SimpleExpression.pas"/>
+        <DCCReference Include="..\Components\SimpleExpression.pas"/>
         <DCCReference Include="..\Components\MD5.pas"/>
         <DCCReference Include="Src\Shared.DotNetVersion.pas"/>
         <BuildConfiguration Include="Base">

Projects/Setup.dpr

@@ -10,7 +10,7 @@ program Setup;
 }
 
 uses
-  Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
   Setup.XPTheme in 'Src\Setup.XPTheme.pas',
   Forms,
   Windows,
@@ -53,11 +53,11 @@ uses
   Setup.Uninstall in 'Src\Setup.Uninstall.pas',
   Setup.UninstallProgressForm in 'Src\Setup.UninstallProgressForm.pas' {UninstallProgressForm},
   Setup.UninstallSharedFileForm in 'Src\Setup.UninstallSharedFileForm.pas' {UninstallSharedFileForm},
-  Shared.SimpleExpression in 'Src\Shared.SimpleExpression.pas',
-  Shared.UIStateForm in 'Src\Shared.UIStateForm.pas',
+  SimpleExpression in '..\Components\SimpleExpression.pas',
+  UIStateForm in '..\Components\UIStateForm.pas',
   Setup.SetupForm in 'Src\Setup.SetupForm.pas',
   Setup.RegSvr in 'Src\Setup.RegSvr.pas',
-  Shared.BrowseFunc in 'Src\Shared.BrowseFunc.pas',
+  BrowseFunc in '..\Components\BrowseFunc.pas',
   Setup.RedirFunc in 'Src\Setup.RedirFunc.pas',
   Setup.SecurityFunc in 'Src\Setup.SecurityFunc.pas',
   Setup.Helper in 'Src\Setup.Helper.pas',
@@ -82,7 +82,7 @@ uses
   RestartManager in '..\Components\RestartManager.pas',
   Resample in '..\Components\Resample.pas',
   ASMInline in '..\Components\ASMInline.pas',
-  Shared.TaskbarProgressFunc in 'Src\Shared.TaskbarProgressFunc.pas',
+  TaskbarProgressFunc in '..\Components\TaskbarProgressFunc.pas',
   Setup.DotNetFunc in 'Src\Setup.DotNetFunc.pas',
   Shared.SetupEntFunc in 'Src\Shared.SetupEntFunc.pas',
   Setup.MsiFunc in 'Src\Setup.MsiFunc.pas',

Projects/Setup.dproj

@@ -73,7 +73,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
         <DCCReference Include="Src\Setup.XPTheme.pas"/>
         <DCCReference Include="..\Components\RichEditViewer.pas"/>
         <DCCReference Include="Src\Shared.CommonFunc.Vcl.pas"/>
@@ -126,11 +126,11 @@
         <DCCReference Include="Src\Setup.UninstallSharedFileForm.pas">
             <Form>UninstallSharedFileForm</Form>
         </DCCReference>
-        <DCCReference Include="Src\Shared.SimpleExpression.pas"/>
-        <DCCReference Include="Src\Shared.UIStateForm.pas"/>
+        <DCCReference Include="..\Components\SimpleExpression.pas"/>
+        <DCCReference Include="..\Components\UIStateForm.pas"/>
         <DCCReference Include="Src\Setup.SetupForm.pas"/>
         <DCCReference Include="Src\Setup.RegSvr.pas"/>
-        <DCCReference Include="Src\Shared.BrowseFunc.pas"/>
+        <DCCReference Include="..\Components\BrowseFunc.pas"/>
         <DCCReference Include="Src\Setup.RedirFunc.pas"/>
         <DCCReference Include="Src\Setup.SecurityFunc.pas"/>
         <DCCReference Include="Src\Setup.Helper.pas"/>
@@ -155,7 +155,7 @@
         <DCCReference Include="..\Components\RestartManager.pas"/>
         <DCCReference Include="..\Components\Resample.pas"/>
         <DCCReference Include="..\Components\ASMInline.pas"/>
-        <DCCReference Include="Src\Shared.TaskbarProgressFunc.pas"/>
+        <DCCReference Include="..\Components\TaskbarProgressFunc.pas"/>
         <DCCReference Include="Src\Setup.DotNetFunc.pas"/>
         <DCCReference Include="Src\Shared.SetupEntFunc.pas"/>
         <DCCReference Include="Src\Setup.MsiFunc.pas"/>

Projects/SetupLdr.dpr

@@ -10,7 +10,7 @@ program SetupLdr;
 }
 
 uses
-  Shared.SafeDLLPath in 'Src\Shared.SafeDLLPath.pas',
+  SafeDLLPath in '..\Components\SafeDLLPath.pas',
   Setup.XPTheme in 'Src\Setup.XPTheme.pas',
   Windows,
   Messages,

Projects/SetupLdr.dproj

@@ -70,7 +70,7 @@
         <DelphiCompile Include="$(MainSource)">
             <MainSource>MainSource</MainSource>
         </DelphiCompile>
-        <DCCReference Include="Src\Shared.SafeDLLPath.pas"/>
+        <DCCReference Include="..\Components\SafeDLLPath.pas"/>
         <DCCReference Include="Src\Setup.XPTheme.pas"/>
         <DCCReference Include="Src\Compression.Base.pas"/>
         <DCCReference Include="Src\Compression.LZMA1SmallDecompressor.pas"/>

Projects/Src/Compiler.Compile.pas

@@ -38,7 +38,7 @@ uses
 {$IFDEF STATICPREPROC}
   IsppPreprocess,
 {$ENDIF}
-  Compiler.ScriptCompiler, Shared.SimpleExpression, Shared.SetupTypes;
+  Compiler.ScriptCompiler, SimpleExpression, Shared.SetupTypes;
 
 type
   TParamInfo = record

Projects/Src/IDE.CompileForm.pas

@@ -23,7 +23,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Contnrs, Graphics, Controls, Forms, Dialogs, CommDlg,
-  Generics.Collections, Shared.UIStateForm, StdCtrls, ExtCtrls, Menus, Buttons, ComCtrls, CommCtrl,
+  Generics.Collections, UIStateForm, StdCtrls, ExtCtrls, Menus, Buttons, ComCtrls, CommCtrl,
   ScintInt, ScintEdit, IDE.ScintStylerInnoSetup, NewTabSet, ModernColors, IDE.CompScintEdit,
   Shared.DebugStruct, Shared.CompilerInt, NewUxTheme, ImageList, ImgList, ToolWin, IDE.HelperFunc,
   VirtualImageList, BaseImageCollection, ImageCollection;
@@ -651,8 +651,8 @@ implementation
 uses
   ActiveX, Clipbrd, ShellApi, ShlObj, IniFiles, Registry, Consts, Types, UITypes,
   Math, StrUtils, WideStrUtils,
-  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.FileClass, IDE.Messages, NewUxTheme.TmSchema, Shared.BrowseFunc,
-  IDE.HtmlHelpFunc, Shared.TaskbarProgressFunc,
+  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.FileClass, IDE.Messages, NewUxTheme.TmSchema, BrowseFunc,
+  IDE.HtmlHelpFunc, TaskbarProgressFunc,
   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}
   IDE.OptionsForm, IDE.StartupForm, IDE.Wizard.WizardForm, IDE.SignToolsForm,
   Shared.ConfigIniFile, Shared.SignToolsFunc, IDE.InputQueryComboForm, IDE.MsgBoxDesignerForm,

Projects/Src/IDE.FilesDesignerForm.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Classes, Controls, Forms, Dialogs, ExtCtrls, StdCtrls,
-  Shared.UIStateForm, NewStaticText, DropListBox, IDE.Wizard.WizardFormFilesHelper;
+  UIStateForm, NewStaticText, DropListBox, IDE.Wizard.WizardFormFilesHelper;
 
 type
   TFilesDesignerForm = class(TUIStateForm)

Projects/Src/IDE.InputQueryComboForm.pas

@@ -12,7 +12,7 @@ unit IDE.InputQueryComboForm;
 interface
 
 uses
-  Classes, Controls, StdCtrls, Shared.UIStateForm;
+  Classes, Controls, StdCtrls, UIStateForm;
 
 type
   TInputQueryComboForm = class(TUIStateForm)

Projects/Src/IDE.MsgBoxDesignerForm.pas

@@ -15,7 +15,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  Shared.UIStateForm, StdCtrls, ExtCtrls, NewStaticText, ComCtrls, pngimage;
+  UIStateForm, StdCtrls, ExtCtrls, NewStaticText, ComCtrls, pngimage;
 
 type
   TMsgBoxDesignerForm = class(TUIStateForm)

Projects/Src/IDE.OptionsForm.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  Shared.UIStateForm, StdCtrls, ExtCtrls, NewStaticText;
+  UIStateForm, StdCtrls, ExtCtrls, NewStaticText;
 
 type
   TOptionsForm = class(TUIStateForm)

Projects/Src/IDE.SignToolsForm.pas

@@ -12,7 +12,7 @@ unit IDE.SignToolsForm;
 interface
 
 uses
-    Classes, Controls, StdCtrls, Shared.UIStateForm;
+    Classes, Controls, StdCtrls, UIStateForm;
 
 type
   TSignToolsForm = class(TUIStateForm)

Projects/Src/IDE.StartupForm.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  Shared.UIStateForm, StdCtrls, ExtCtrls;
+  UIStateForm, StdCtrls, ExtCtrls;
 
 type
   TStartupFormResult = (srNone, srEmpty, srWizard, srOpenFile, srOpenDialog,

Projects/Src/IDE.Wizard.WizardFileForm.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, Dialogs,
-  Shared.UIStateForm, StdCtrls, ExtCtrls, NewStaticText;
+  UIStateForm, StdCtrls, ExtCtrls, NewStaticText;
 
 type
 

Projects/Src/IDE.Wizard.WizardForm.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, Forms, Classes, Graphics, StdCtrls, ExtCtrls, Controls, Dialogs, pngimage,
-  Shared.UIStateForm, NewStaticText, DropListBox, NewCheckListBox, NewNotebook,
+  UIStateForm, NewStaticText, DropListBox, NewCheckListBox, NewNotebook,
   IDE.Wizard.WizardFormFilesHelper, IDE.Wizard.WizardFormRegistryHelper;
 
 type
@@ -187,7 +187,7 @@ implementation
 
 uses
   SysUtils, ShlObj, ActiveX, UITypes, Shared.FileClass,
-  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelperFunc, Shared.BrowseFunc,
+  PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, IDE.HelperFunc, BrowseFunc,
   IDE.Messages, IDE.Wizard.WizardFileForm;
 
 type

Projects/Src/IDE.Wizard.WizardFormFilesHelper.pas

@@ -48,7 +48,7 @@ implementation
 
 uses
   SysUtils, UITypes,
-  Shared.CommonFunc.Vcl, Shared.CommonFunc, Shared.BrowseFunc, PathFunc,
+  Shared.CommonFunc.Vcl, Shared.CommonFunc, BrowseFunc, PathFunc,
   IDE.Messages, IDE.Wizard.WizardFileForm;
 
 constructor TWizardFormFilesHelper.Create(const Form: TForm;

Projects/Src/IDE.Wizard.WizardFormRegistryHelper.pas

@@ -47,7 +47,7 @@ implementation
 uses
   Windows, Classes, SysUtils, StrUtils, TypInfo, Graphics, UITypes,
   ComCtrls,
-  IDE.CompileForm, IDE.HelperFunc, IDE.Messages, Shared.BrowseFunc, Shared.CommonFunc, IDE.HtmlHelpFunc;
+  IDE.CompileForm, IDE.HelperFunc, IDE.Messages, BrowseFunc, Shared.CommonFunc, IDE.HtmlHelpFunc;
 
 { TWizardFormRegistryHelper }
 

Projects/Src/Setup.Install.pas

@@ -33,7 +33,7 @@ uses
   Setup.MainForm, Setup.LoggingFunc, Setup.FileExtractor, Shared.FileClass,
   Compression.Base, SHA1, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, Setup.RedirFunc, Shared.Int64Em, Shared.SetupMessageIDs,
   Setup.WizardForm, Shared.DebugStruct, Setup.DebugClient, Shared.VerInfoFunc, Setup.ScriptRunner, Setup.RegDLL, Setup.Helper,
-  Shared.ResUpdateFunc, Setup.DotNetFunc, Shared.TaskbarProgressFunc, NewProgressBar, RestartManager,
+  Shared.ResUpdateFunc, Setup.DotNetFunc, TaskbarProgressFunc, NewProgressBar, RestartManager,
   Net.HTTPClient, Net.URLClient, NetEncoding, RegStr;
 
 type

Projects/Src/Setup.MainForm.pas

@@ -270,7 +270,7 @@ uses
   Setup.Messages, Shared.SetupMessageIDs, Setup.Install, Setup.InstFunc, Setup.InstFunc.Ole, Setup.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,
-  Shared.SimpleExpression, Setup.Helper, Setup.SpawnClient, Setup.SpawnServer, Setup.DotNetFunc, BitmapImage,
+  SimpleExpression, Setup.Helper, Setup.SpawnClient, Setup.SpawnServer, Setup.DotNetFunc, BitmapImage,
   Shared.TaskDialogFunc, RegStr;
 
 {$R *.DFM}

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, Shared.BrowseFunc,
+  Setup.Messages, Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc, BrowseFunc,
   Setup.MainForm, Setup.WizardForm;
 
 {$R *.DFM}

Projects/Src/Setup.ScriptClasses.pas

@@ -24,7 +24,7 @@ uses
   uPSR_std, uPSR_classes, uPSR_graphics, uPSR_controls, uPSR_forms,
   uPSR_stdctrls, uPSR_extctrls, uPSR_comobj,
   NewStaticText, NewCheckListBox, NewProgressBar, RichEditViewer,
-  ExtCtrls, Shared.UIStateForm, Setup.SetupForm, Setup.MainForm, Setup.WizardForm, Shared.SetupTypes, PasswordEdit,
+  ExtCtrls, UIStateForm, Setup.SetupForm, Setup.MainForm, Setup.WizardForm, Shared.SetupTypes, PasswordEdit,
   FolderTreeView, BitmapImage, NewNotebook, Setup.ScriptDlg, BidiCtrls,
   Setup.UninstallProgressForm;
 

Projects/Src/Setup.ScriptDlg.pas

@@ -15,7 +15,7 @@ uses
   Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, StdCtrls, Contnrs,
   Setup.WizardForm, Setup.Install,
   NewCheckListBox, NewStaticText, NewProgressBar, PasswordEdit, RichEditViewer,
-  BidiCtrls, Shared.TaskbarProgressFunc;
+  BidiCtrls, TaskbarProgressFunc;
 
 type
   TInputQueryWizardPage = class(TWizardPage)
@@ -203,7 +203,7 @@ uses
   StrUtils,
   Shared.Struct, Setup.MainForm, Setup.SelectFolderForm, Setup.Messages,
   Shared.SetupMessageIDs, PathFunc, Shared.CommonFunc.Vcl, Shared.CommonFunc,
-  Shared.BrowseFunc, Setup.LoggingFunc, Setup.InstFunc;
+  BrowseFunc, Setup.LoggingFunc, Setup.InstFunc;
 
 const
   DefaultLabelHeight = 14;

Projects/Src/Setup.ScriptFunc.pas

@@ -24,7 +24,7 @@ uses
   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.SetupMessageIDs, Setup.NewDiskForm, Shared.BrowseFunc, Setup.WizardForm, Shared.VerInfoFunc,
+  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,
   Shared.DotNetVersion, Setup.MsiFunc, BitmapImage;

Projects/Src/Setup.SetupForm.pas

@@ -13,7 +13,7 @@ interface
 
 uses
   Windows, SysUtils, Messages, Classes, Graphics, Controls, Forms, Dialogs,
-  Shared.UIStateForm, Shared.SetupMessageIDs;
+  UIStateForm, Shared.SetupMessageIDs;
 
 type
   TSetupForm = class(TUIStateForm)

Projects/Src/Setup.UninstallProgressForm.pas

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