Make it so we can use {$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} instead of {$SetPEFlags 1}. Move the other directives in the 2 DLLs as well for consistency and cleanup an unneeded Version.inc include.

Projects/Compil32.dpr

@@ -9,11 +9,6 @@ program Compil32;
   Compiler
 }
 
-{$SetPEFlags 1} 
-{$SETPEOSVERSION 6.0}
-{$SETPESUBSYSVERSION 6.0}
-{$WEAKLINKRTTI ON}
-
 uses
   SafeDLLPath in 'SafeDLLPath.pas',
   Windows,
@@ -44,6 +39,11 @@ uses
   CompMessageBoxDesigner in 'CompMessageBoxDesigner.pas' {MBDForm},
   CompScintEdit in 'CompScintEdit.pas';
 
+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} 
+{$SETPEOSVERSION 6.0}
+{$SETPESUBSYSVERSION 6.0}
+{$WEAKLINKRTTI ON}
+
 {$R Compil32.docicon.res}
 {$R Compil32.manifest.res}
 {$R Compil32.versionandicon.res}

Projects/ISCC.dpr

@@ -10,11 +10,6 @@ program ISCC;
   Command-line compiler
 }
 
-{$SetPEFlags 1} 
-{$SETPEOSVERSION 6.0}
-{$SETPESUBSYSVERSION 6.0}
-{$WEAKLINKRTTI ON}
-
 {x$DEFINE STATICCOMPILER}
 { For debugging purposes, remove the 'x' to have it link the compiler code
   into this program and not depend on ISCmplr.dll. }
@@ -25,6 +20,11 @@ uses
   {$IFDEF STATICCOMPILER} Compile, {$ENDIF}
   PathFunc, CmnFunc2, CompInt, FileClass, CompTypes;
 
+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} 
+{$SETPEOSVERSION 6.0}
+{$SETPESUBSYSVERSION 6.0}
+{$WEAKLINKRTTI ON}
+
 {$R ISCC.manifest.res}
 {$R ISCC.versionandicon.res}
 

Projects/ISCmplr.dpr

@@ -9,11 +9,6 @@ library ISCmplr;
   Compiler DLL
 }
 
-{$IMAGEBASE $00800000}
-{$SETPEOSVERSION 6.0}
-{$SETPESUBSYSVERSION 6.0}
-{$WEAKLINKRTTI ON}
-
 uses
   SafeDLLPath in 'SafeDLLPath.pas',
   SysUtils,
@@ -36,6 +31,11 @@ uses
   ArcFour in 'ArcFour.pas',
   VerInfo in 'VerInfo.pas';
 
+{$IMAGEBASE $00800000}
+{$SETPEOSVERSION 6.0}
+{$SETPESUBSYSVERSION 6.0}
+{$WEAKLINKRTTI ON}
+
 {$R ISCmplr.images.res}
 {$R ISCmplr.version.res}
 

Projects/ISPP/ISPP.dpr

@@ -10,12 +10,6 @@
 
 library ISPP;
 
-{$IMAGEBASE $01800000}
-{$SETPEOSVERSION 6.0}
-{$SETPESUBSYSVERSION 6.0}
-{$WEAKLINKRTTI ON}
-{$I ..\Version.inc}
-
 uses
   SysUtils,
   Windows,
@@ -41,6 +35,11 @@ uses
   SHA1 in '..\SHA1.pas',
   Struct in '..\Struct.pas';
   
+{$IMAGEBASE $01800000}
+{$SETPEOSVERSION 6.0}
+{$SETPESUBSYSVERSION 6.0}
+{$WEAKLINKRTTI ON}
+
 {$R ISPP.version.res}
 
 exports

Projects/Setup.dpr

@@ -9,11 +9,6 @@ program Setup;
   Setup program
 }
 
-{$SetPEFlags 1} 
-{$SETPEOSVERSION 6.1}
-{$SETPESUBSYSVERSION 6.1}
-{$WEAKLINKRTTI ON}
-
 uses
   SafeDLLPath in 'SafeDLLPath.pas',
   XPTheme in 'XPTheme.pas',
@@ -74,6 +69,11 @@ uses
   SpawnClient in 'SpawnClient.pas',
   TaskDialog in 'TaskDialog.pas';
 
+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED}
+{$SETPEOSVERSION 6.1}
+{$SETPESUBSYSVERSION 6.1}
+{$WEAKLINKRTTI ON}
+
 {$R Setup.icon.res}
 {$R Setup.images.res}
 {$R Setup.version.res}

Projects/SetupLdr.dpr

@@ -9,11 +9,6 @@ program SetupLdr;
   Setup Loader
 }
 
-{$SetPEFlags 1} 
-{$SETPEOSVERSION 6.1}
-{$SETPESUBSYSVERSION 6.1}
-{$WEAKLINKRTTI ON}
-
 uses
   SafeDLLPath in 'SafeDLLPath.pas',
   XPTheme in 'XPTheme.pas',
@@ -31,6 +26,11 @@ uses
   InstFunc in 'InstFunc.pas',
   FileClass in 'FileClass.pas';
 
+{$SetPEFlags IMAGE_FILE_RELOCS_STRIPPED} 
+{$SETPEOSVERSION 6.1}
+{$SETPESUBSYSVERSION 6.1}
+{$WEAKLINKRTTI ON}
+
 {$R Setup.icon.res}
 {$R SetupLdr.version.res}
 {$R SetupLdr.offsettable.res}