--- p/rts/filename.pas.orig	Sun Jul  4 14:52:01 2004
+++ p/rts/filename.pas	Sun Jul  4 16:16:11 2004
@@ -597,10 +597,12 @@
   GetCurrentDirectory := FExpand (DirSelf)
 end;
 
+var
+  TempDirectory: TString; attribute (static);
+
 function GetTempDirectory: TString;
 var
   TempDirectorySet: Boolean = False; attribute (static);
-  TempDirectory: TString; attribute (static);
   Buffer: TStringBuf;
 
   function CheckDir (const s: String): Boolean;
@@ -641,10 +643,12 @@
   GetTempDirectory := ForceAddDirSeparator (TempDirectory)
 end;
 
+var
+  TempStr: TString; attribute (static);
+
 function GetTempFileNameInDirectory (const Directory: String) = Result: TString;
 var
   TempStrSet: Boolean = False; attribute (static);
-  TempStr: TString; attribute (static);
   Dir: TString;
   i: Integer;
 begin
@@ -1440,10 +1444,12 @@
   if @Option <> nil then Option := ShellExecCommand
 end;
 
+var
+  Buffer: TString; attribute (static);
+
 function ExecutablePath: TString;
 var
   CStringBuffer: TStringBuf;
-  Buffer: TString; attribute (static);
   BufferInitialized: Boolean = False; attribute (static);
 begin
   if not BufferInitialized then
--- p/rts/time.pas.orig	Mon May 17 02:57:24 2004
+++ p/rts/time.pas	Sun Jul  4 16:17:24 2004
@@ -376,8 +376,9 @@
       WriteStr (Result, Day : 2, ' ', Copy (MonthName[Month], 1, 3), ' ', Year : 4)
 end;
 
-function GPC_Time (protected var aTimeStamp: TimeStamp) = Result: DateTimeString;
 const Zero: array [Boolean] of String (1) = ('', '0');
+
+function GPC_Time (protected var aTimeStamp: TimeStamp) = Result: DateTimeString;
 begin
   with aTimeStamp do
     if not TimeValid
@@ -466,6 +467,8 @@
   GetMicroSecondTime := 1000000 * UnixTime + MicroSecond
 end;
 
+const Epoch: TimeStamp = (True, True, 1970, 1, 1, 0, 0, 0, 0, 0);
+
 function FormatTime (const Time: TimeStamp; const Format: String) = Res: TString;
 const
   FillNone = #0;
@@ -480,7 +483,6 @@
   StrFTimeInvalid: set of 'A' .. 'z' = []; attribute (static);
 
   function FormatItem (Item: Char; const Alternative: String; Width: Integer; Fill: Char; Clip: Boolean) = Res: TString;
-  const Epoch: TimeStamp = (True, True, 1970, 1, 1, 0, 0, 0, 0, 0);
   var
     CurrentWidth, Tmp: Integer;
     CurrentFill: Char;