* Dotted filenames for package rtl-objpas

packages/rtl-objpas/namespaced/Data.FMTBcd.pp

@@ -0,0 +1,3 @@
+unit Data.FMTBcd;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i fmtbcd.pp}

packages/rtl-objpas/namespaced/System.ConvUtils.pp

@@ -0,0 +1,3 @@
+unit System.ConvUtils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i convutils.pp}

packages/rtl-objpas/namespaced/System.DateUtils.pp

@@ -0,0 +1,3 @@
+unit System.DateUtils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i dateutil.inc}

packages/rtl-objpas/namespaced/System.Nullable.pp

@@ -0,0 +1,3 @@
+unit System.Nullable;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i nullable.pp}

packages/rtl-objpas/namespaced/System.Rtti.pp

@@ -0,0 +1,3 @@
+unit System.Rtti;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i rtti.pp}

packages/rtl-objpas/namespaced/System.StdConvs.pp

@@ -0,0 +1,3 @@
+unit System.StdConvs;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i stdconvs.pp}

packages/rtl-objpas/namespaced/System.StrUtils.pp

@@ -0,0 +1,3 @@
+unit System.StrUtils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i strutils.pp}

packages/rtl-objpas/namespaced/System.Syshelpers.pp

@@ -0,0 +1,3 @@
+unit System.Syshelpers;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i syshelpers.pp}

packages/rtl-objpas/namespaced/System.System.timespan.pp

@@ -0,0 +1,3 @@
+unit System.System.timespan;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i system.timespan.pp}

packages/rtl-objpas/namespaced/System.System.uitypes.pp

@@ -0,0 +1,3 @@
+unit System.System.uitypes;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i system.uitypes.pp}

packages/rtl-objpas/namespaced/System.VarUtils.pp

@@ -0,0 +1,3 @@
+unit System.VarUtils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i varutils.pp}

packages/rtl-objpas/namespaced/System.Variants.pp

@@ -0,0 +1,3 @@
+unit System.Variants;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i variants.pp}

packages/rtl-objpas/namespaced/System.WideStrUtils.pp

@@ -0,0 +1,3 @@
+unit System.WideStrUtils;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i widestrutils.pp}

packages/rtl-objpas/namespaces.lst

@@ -0,0 +1,16 @@
+{s*:src/win/}=namespaced/
+{i+:src/win/}
+{s*:src/inc/}=namespaced/
+{i+:src/inc/}
+src/inc/stdconvs.pp=namespaced/System.StdConvs.pp
+src/inc/variants.pp=namespaced/System.Variants.pp
+src/inc/strutils.pp=namespaced/System.StrUtils.pp
+src/win/varutils.pp=namespaced/System.VarUtils.pp
+src/common/varutils.pp=namespaced/System.VarUtils.pp
+src/inc/convutils.pp=namespaced/System.ConvUtils.pp
+src/inc/dateutils.pp=namespaced/System.DateUtils.pp
+src/inc/nullable.pp=namespaced/System.Nullable.pp
+src/inc/rtti.pp=namespaced/System.Rtti.pp
+src/inc/widestrutils.pp=namespaced/System.WideStrUtils.pp
+src/inc/syshelpers.pp=namespaced/System.Syshelpers.pp
+src/inc/fmtbcd.pp=namespaced/Data.FMTBcd.pp

packages/rtl-objpas/src/common/varutils.pp

@@ -14,13 +14,17 @@
  **********************************************************************}
 
 {$MODE ObjFPC}
-
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit varutils;
+{$ENDIF}
 
 Interface
 
-Uses sysutils;
-
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.SysUtils, System.Variants;
+{$ELSE}
+uses sysutils, variants;
+{$ENDIF}
 // Read definitions.
 
 {$i varutilh.inc}

packages/rtl-objpas/src/inc/convutil.inc

@@ -17,8 +17,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 **********************************************************************}
-
+{$IFNDEF FPC_DOTTEDUNITS}
 unit ConvUtils;
+{$ENDIF}
 
 interface
 
@@ -26,8 +27,14 @@ interface
 {$H+}
 
 {$ifndef FPUNONE}
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Math;
+{$ELSE FPC_DOTTEDUNITS}  
 uses
   sysutils, math;
+{$ENDIF FPC_DOTTEDUNITS}
+
 
 Type TConvType        = type Word;
      TConvFamily      = type Word;
@@ -137,8 +144,13 @@ Type
 
 Implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.RtlConsts;
+{$ELSE}
 uses
   RtlConsts;
+{$ENDIF}
 
 const
   macheps=1E-9;

packages/rtl-objpas/src/inc/dateutil.inc

@@ -15,14 +15,21 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-
+{$IFNDEF FPC_DOTTEDUNITS}
 unit DateUtils;
+{$ENDIF}
 
 interface
 
+
 {$ifndef FPUNONE}
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Math;
+{$ELSE}
 uses
   SysUtils, Math;
+{$ENDIF}
 
 { ---------------------------------------------------------------------
     Various constants
@@ -588,7 +595,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysConst;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysconst;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   TDateTimeEpsilon = 2.2204460493e-16;
@@ -2847,25 +2858,25 @@ end;
 function UniversalTimeToLocal(UT: TDateTime): TDateTime;
 
 begin
-  Result:=SysUtils.UniversalTimeToLocal(UT,-GetLocalTimeOffset(UT, True));
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.UniversalTimeToLocal(UT,-GetLocalTimeOffset(UT, True));
 end;
 
 function UniversalTimeToLocal(UT: TDateTime; TZOffset : Integer): TDateTime;
 
 begin
-  Result:=SysUtils.UniversalTimeToLocal(UT,TZOffset);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.UniversalTimeToLocal(UT,TZOffset);
 end;
  
 Function LocalTimeToUniversal(LT: TDateTime): TDateTime;
 
 begin
-  Result:=SysUtils.LocalTimeToUniversal(LT,-GetLocalTimeOffset(LT, False));
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.LocalTimeToUniversal(LT,-GetLocalTimeOffset(LT, False));
 end;
 
 Function LocalTimeToUniversal(LT: TDateTime;TZOffset: Integer): TDateTime;
 
 begin
-  Result:=SysUtils.LocalTimeToUniversal(LT,TZOffset);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.LocalTimeToUniversal(LT,TZOffset);
 end;
 
 Const
@@ -3240,7 +3251,7 @@ end;
 
 function TDateTimeHelper.DaysBetween(const aDateTime: TDateTime): Integer;
 begin
-  Result :=DateUtils.DaysBetween(Self, aDateTime);
+  Result :={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.DaysBetween(Self, aDateTime);
 end;
 
 function TDateTimeHelper.EndOfDay: TDateTime;
@@ -3310,7 +3321,7 @@ end;
 
 class function TDateTimeHelper.GetNow: TDateTime;
 begin
-  Result := SysUtils.Now;
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Now;
 end;
 
 function TDateTimeHelper.GetSecond: Word;
@@ -3325,12 +3336,12 @@ end;
 
 class function TDateTimeHelper.GetToday: TDateTime;
 begin
-  Result := SysUtils.Date;
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Date;
 end;
 
 class function TDateTimeHelper.GetTomorrow: TDateTime;
 begin
-  Result := SysUtils.Date + 1;
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Date + 1;
 end;
 
 function TDateTimeHelper.GetTotalSecounds: Int64;
@@ -3350,12 +3361,12 @@ end;
 
 class function TDateTimeHelper.GetYesterDay: TDateTime;
 begin
-  Result := SysUtils.Date - 1;
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Date - 1;
 end;
 
 function TDateTimeHelper.HoursBetween(const aDateTime: TDateTime): Int64;
 begin
-  Result := DateUtils.HoursBetween(Self, aDateTime);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.HoursBetween(Self, aDateTime);
 end;
 
 function TDateTimeHelper.InRange(const aStartDateTime, aEndDateTime: TDateTime;
@@ -3366,47 +3377,47 @@ end;
 
 function TDateTimeHelper.IsAM: Boolean;
 begin
-  Result := DateUtils.IsAM(Self);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.IsAM(Self);
 end;
 
 function TDateTimeHelper.IsInLeapYear: Boolean;
 begin
-  Result := DateUtils.IsInLeapYear(Self);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.IsInLeapYear(Self);
 end;
 
 function TDateTimeHelper.IsPM: Boolean;
 begin
-  Result := DateUtils.IsPM(Self);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.IsPM(Self);
 end;
 
 function TDateTimeHelper.IsSameDay(const aDateTime: TDateTime): Boolean;
 begin
-  Result := DateUtils.IsSameDay(Self, aDateTime);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.IsSameDay(Self, aDateTime);
 end;
 
 function TDateTimeHelper.IsToday: Boolean;
 begin
-  Result := DateUtils.IsToday(Self);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.IsToday(Self);
 end;
 
 function TDateTimeHelper.MilliSecondsBetween(const aDateTime: TDateTime): Int64;
 begin
-  Result := DateUtils.MilliSecondsBetween(Self, aDateTime);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.MilliSecondsBetween(Self, aDateTime);
 end;
 
 function TDateTimeHelper.MinutesBetween(const aDateTime: TDateTime): Int64;
 begin
-  Result := DateUtils.MinutesBetween(Self, aDateTime);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.MinutesBetween(Self, aDateTime);
 end;
 
 function TDateTimeHelper.MonthsBetween(const aDateTime: TDateTime): Integer;
 begin
-  Result := DateUtils.MonthsBetween(Self, aDateTime);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.MonthsBetween(Self, aDateTime);
 end;
 
 function TDateTimeHelper.SecondsBetween(const aDateTime: TDateTime): Int64;
 begin
-  Result := DateUtils.SecondsBetween(Self, aDateTime);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.SecondsBetween(Self, aDateTime);
 end;
 
 function TDateTimeHelper.StartOfDay: TDateTime;
@@ -3439,60 +3450,60 @@ end;
 
 function TDateTimeHelper.WeeksBetween(const aDateTime: TDateTime): Integer;
 begin
-  Result := DateUtils.WeeksBetween(Self, aDateTime);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.WeeksBetween(Self, aDateTime);
 end;
 
 function TDateTimeHelper.WithinDays(const aDateTime: TDateTime; const aDays:
   Integer): Boolean;
 begin
-  Result := DateUtils.WithinPastDays(Self, aDateTime, aDays);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.WithinPastDays(Self, aDateTime, aDays);
 end;
 
 function TDateTimeHelper.WithinHours(const aDateTime: TDateTime; const aHours:
   Int64): Boolean;
 begin
-  Result := DateUtils.WithinPastHours(Self, aDateTime, aHours);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.WithinPastHours(Self, aDateTime, aHours);
 end;
 
 function TDateTimeHelper.WithinMilliseconds(const aDateTime: TDateTime; const
   AMilliseconds: Int64): Boolean;
 begin
-  Result := DateUtils.WithinPastMilliSeconds(Self, aDateTime, AMilliseconds);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.WithinPastMilliSeconds(Self, aDateTime, AMilliseconds);
 end;
 
 function TDateTimeHelper.WithinMinutes(const aDateTime: TDateTime; const
   aMinutes: Int64): Boolean;
 begin
-  Result := DateUtils.WithinPastMinutes(Self, aDateTime, aMinutes);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.WithinPastMinutes(Self, aDateTime, aMinutes);
 end;
 
 function TDateTimeHelper.WithinMonths(const aDateTime: TDateTime; const aMonths:
   Integer): Boolean;
 begin
-  Result := DateUtils.WithinPastMonths(Self, aDateTime, aMonths);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.WithinPastMonths(Self, aDateTime, aMonths);
 end;
 
 function TDateTimeHelper.WithinSeconds(const aDateTime: TDateTime; const
   aSeconds: Int64): Boolean;
 begin
-  Result := DateUtils.WithinPastSeconds(Self, aDateTime, aSeconds);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.WithinPastSeconds(Self, aDateTime, aSeconds);
 end;
 
 function TDateTimeHelper.WithinWeeks(const aDateTime: TDateTime; const aWeeks:
   Integer): Boolean;
 begin
-  Result := DateUtils.WithinPastWeeks(Self, aDateTime, aWeeks);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.WithinPastWeeks(Self, aDateTime, aWeeks);
 end;
 
 function TDateTimeHelper.WithinYears(const aDateTime: TDateTime; const aYears:
   Integer): Boolean;
 begin
-  Result := DateUtils.WithinPastYears(Self, aDateTime, aYears);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.WithinPastYears(Self, aDateTime, aYears);
 end;
 
 function TDateTimeHelper.YearsBetween(const aDateTime: TDateTime): Integer;
 begin
-  Result := DateUtils.YearsBetween(Self, aDateTime);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}DateUtils.YearsBetween(Self, aDateTime);
 end;
 
 class function TDateTimeHelper.Parse(Date: string; aFormat: string = '';

packages/rtl-objpas/src/inc/fmtbcd.pp

@@ -136,13 +136,21 @@
   {$define maybe_packed := (**)}
 {$endif}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 UNIT FmtBCD;
+{$ENDIF}
 
 INTERFACE
 
+{$IFDEF FPC_DOTTEDUNITS}
+  USES
+    System.SysUtils,
+    System.Variants;
+{$ELSE FPC_DOTTEDUNITS}
   USES
     SysUtils,
     Variants;
+{$ENDIF FPC_DOTTEDUNITS}
 
   const
     MaxStringDigits = 100;          { not used ! }
@@ -858,8 +866,13 @@ INTERFACE
 
 IMPLEMENTATION
 
+{$IFDEF FPC_DOTTEDUNITS}
+  USES
+    System.Classes {$ifopt r+}, System.SysConst {$endif};
+{$ELSE}
   USES
     classes {$ifopt r+}, sysconst {$endif};
+{$ENDIF}
 
   type
     TFMTBcdFactory = CLASS(TPublishableVarianttype)
@@ -2592,10 +2605,10 @@ writeln ( '> ', i4, ' ', bh.Singles[i4], ' ', Add );
           if E < 0 then
           begin
             System.Delete(Result, P+E-1, -E);
-            Result := Result + SysUtils.Format('E%.*d' , [Digits,E])
+            Result := Result + {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Format('E%.*d' , [Digits,E])
           end
           else
-            Result := Result + SysUtils.Format('E+%.*d', [Digits,E]);
+            Result := Result + {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.Format('E+%.*d', [Digits,E]);
         End;
 
         ffFixed:

packages/rtl-objpas/src/inc/nullable.pp

@@ -12,14 +12,20 @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit nullable;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$modeswitch advancedrecords}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
 
@@ -61,7 +67,11 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.RtlConsts,System.TypInfo;
+{$ELSE FPC_DOTTEDUNITS}
 uses rtlconsts,typinfo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { TNullable }
 

packages/rtl-objpas/src/inc/rtti.pp

@@ -12,7 +12,9 @@
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 }
-unit Rtti experimental;
+{$IFNDEF FPC_DOTTEDUNITS}
+unit Rtti;
+{$ENDIF}
 
 {$mode objfpc}{$H+}
 {$modeswitch advancedrecords}
@@ -37,11 +39,17 @@ unit Rtti experimental;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes,
+  System.SysUtils,
+  System.TypInfo;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes,
   SysUtils,
   typinfo;
-
+{$ENDIF FPC_DOTTEDUNITS}
 type
   TRttiObject = class;
   TRttiType = class;
@@ -688,14 +696,25 @@ resourcestring
 implementation
 
 uses
+{$IFDEF FPC_DOTTEDUNITS}
+  System.Variants,
+{$ifdef windows}
+  WinApi.Windows,
+{$endif}
+{$ifdef unix}
+  UnixApi.Base,
+{$endif}
+  System.FGL;
+{$ELSE FPC_DOTTEDUNITS}
+  Variants,
 {$ifdef windows}
   Windows,
 {$endif}
 {$ifdef unix}
   BaseUnix,
 {$endif}
-  variants,
   fgl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function AlignToPtr(aPtr: Pointer): Pointer; inline;
 begin
@@ -1968,7 +1987,7 @@ var
 
 begin
   Result:=Default(TValue);
-  aType:=VarType(aValue);
+  aType:=TVarType(aValue);
   case aType of
     varEmpty,
     VarNull : TValue.Make(@aValue,System.TypeInfo(Variant),Result);
@@ -3637,7 +3656,7 @@ begin
       addr := vmt[VirtualIndex];
   end;
 
-  Result := Rtti.Invoke(Name, addr, CallingConvention, IsStatic, aInstance, aArgs, GetParameters(True), ReturnType);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Rtti.Invoke(Name, addr, CallingConvention, IsStatic, aInstance, aArgs, GetParameters(True), ReturnType);
 end;
 
 function TRttiMethod.CreateImplementation(aUserData: Pointer; aCallback: TMethodImplementationCallbackMethod): TMethodImplementation;
@@ -3965,7 +3984,7 @@ begin
   { by using a pointer we can also use this for non-class instance methods }
   TValue.Make(@method^.Data, PTypeInfo(TypeInfo(Pointer)), inst);
 
-  Result := Rtti.Invoke(Name, method^.Code, CallingConvention, False, inst, aArgs, GetParameters(True), ReturnType);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Rtti.Invoke(Name, method^.Code, CallingConvention, False, inst, aArgs, GetParameters(True), ReturnType);
 end;
 
 { TRttiProcedureType }
@@ -4050,7 +4069,7 @@ begin
   if aCallable.Kind <> tkProcVar then
     raise EInvocationError.CreateFmt(SErrInvokeCallableNotProc, [Name]);
 
-  Result := Rtti.Invoke(Name, PCodePointer(aCallable.GetReferenceToRawData)^, CallingConvention, True, TValue.Empty, aArgs, GetParameters(True), ReturnType);
+  Result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Rtti.Invoke(Name, PCodePointer(aCallable.GetReferenceToRawData)^, CallingConvention, True, TValue.Empty, aArgs, GetParameters(True), ReturnType);
 end;
 
 { TRttiStringType }
@@ -4311,7 +4330,7 @@ begin
         begin
           SetLength(FAttributes, at^.AttributeCount);
           for i := 0 to High(FAttributes) do
-            FAttributes[i] := TCustomAttribute(typinfo.GetAttribute(at, i));
+            FAttributes[i] := TCustomAttribute({$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}TypInfo.GetAttribute(at, i));
         end;
       FAttributesResolved:=true;
     end;
@@ -4561,7 +4580,7 @@ end;
 
 function TRttiType.GetIsManaged: boolean;
 begin
-  result := Rtti.IsManaged(FTypeInfo);
+  result := {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}Rtti.IsManaged(FTypeInfo);
 end;
 
 function TRttiType.GetIsOrdinal: boolean;
@@ -4639,7 +4658,7 @@ begin
       begin
       setlength(FAttributes,at^.AttributeCount);
       for i := 0 to at^.AttributeCount-1 do
-        FAttributes[i]:=TypInfo.GetAttribute(at,i);
+        FAttributes[i]:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}TypInfo.GetAttribute(at,i);
       end;
     FAttributesResolved:=true;
     end;

packages/rtl-objpas/src/inc/stdconvs.pp

@@ -15,7 +15,9 @@
 
 **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit StdConvs;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -23,7 +25,11 @@ interface
 {$H+}
 
 {$ifndef FPUNONE}
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.ConvUtils;
+{$ELSE FPC_DOTTEDUNITS}
 Uses convutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   // Powers of 10

packages/rtl-objpas/src/inc/strutils.pp

@@ -15,12 +15,19 @@
 {$mode objfpc}
 {$h+}
 {$inline on}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit StrUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Types;
+{$ENDIF FPC_DOTTEDUNITS}
 
 { ---------------------------------------------------------------------
     Case insensitive search/replace
@@ -300,7 +307,11 @@ Function SplitCommandLine(S : UnicodeString) : TUnicodeStringArray;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysConst; // HexDigits
+{$ELSE FPC_DOTTEDUNITS}
 uses sysconst; // HexDigits
+{$ENDIF FPC_DOTTEDUNITS}
 
 (*
   FindMatchesBoyerMooreCaseSensitive
@@ -861,7 +872,7 @@ Function StringReplace(const S, OldPattern, NewPattern: string; Flags: TReplaceF
 
 begin
   Case Algorithm of
-    sraDefault    : Result:=sysutils.StringReplace(S,OldPattern,NewPattern,Flags,aCount);
+    sraDefault    : Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.StringReplace(S,OldPattern,NewPattern,Flags,aCount);
     sraManySmall  : Result:=StringReplaceFast(S,OldPattern,NewPattern,Flags,aCount);
     sraBoyerMoore : Result:=StringReplaceBoyerMoore(S,OldPattern,NewPattern,Flags,aCount);
   end;
@@ -872,13 +883,13 @@ end;
 function StringReplace(const S, OldPattern, NewPattern: unicodestring; Flags: TReplaceFlags): unicodestring;
 
 begin
-  Result:=sysutils.StringReplace(S,OldPattern,NewPattern,Flags);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.StringReplace(S,OldPattern,NewPattern,Flags);
 end;
 
 function StringReplace(const S, OldPattern, NewPattern: widestring; Flags: TReplaceFlags): widestring;
 
 begin
-  Result:=sysutils.StringReplace(S,OldPattern,NewPattern,Flags);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.StringReplace(S,OldPattern,NewPattern,Flags);
 end;
 {$ENDIF}
 

packages/rtl-objpas/src/inc/syshelpers.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit syshelpers;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
@@ -24,8 +26,13 @@ unit syshelpers;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   classes, sysutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 ///////////////////////
 //                   //
@@ -197,7 +204,11 @@ type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses System.SysConst;
+{$ELSE FPC_DOTTEDUNITS}
 uses sysconst;
+{$ENDIF FPC_DOTTEDUNITS}
 
 ///////////////////////
 //                   //

packages/rtl-objpas/src/inc/system.timespan.pp

@@ -20,8 +20,13 @@ unit system.timespan;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Classes, System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Classes, SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Type
     TTimeSpan = record
@@ -117,7 +122,11 @@ Type
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.Math;
+{$ELSE FPC_DOTTEDUNITS}
 Uses Math;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // Embacadero documentation is poor, I used MS' http://www1.cs.columbia.edu/~lok/csharp/refdocs/System/types/TimeSpan.html
 // mscorlib's docs seems to be not locale dependent, while C# docs mention "culture".

packages/rtl-objpas/src/inc/system.uitypes.pp

@@ -14,6 +14,7 @@
 
  **********************************************************************}
 unit System.UITypes;
+
 {$mode delphi}
 
 // LCL defined all sets with SizeOf()=4

packages/rtl-objpas/src/inc/variants.pp

@@ -23,12 +23,19 @@
 {$inline on}
 {$define VARIANTINLINE}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Variants;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+  uses
+    System.SysUtils,System.SysConst,System.RtlConsts,System.TypInfo;
+{$ELSE FPC_DOTTEDUNITS}
   uses
     sysutils,sysconst,rtlconsts,typinfo;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   EVariantParamNotFoundError = class(EVariantError);
@@ -357,9 +364,15 @@ var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Math,
+  System.VarUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Math,
   VarUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   customvarianttypes    : array of TCustomVariantType;
@@ -1504,9 +1517,9 @@ begin
 {$endif}
       end;
     except
-      on E: SysUtils.ERangeError do
+      on E: {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.ERangeError do
         Overflow := True;
-      on E: SysUtils.EIntOverflow do
+      on E: {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.EIntOverflow do
         Overflow := True;
     end;
 {$pop}
@@ -4245,14 +4258,14 @@ function TInvokeableVariantType.SetProperty(var V: TVarData; const Name: AnsiStr
 function TPublishableVariantType.GetProperty(var Dest: TVarData; const V: TVarData; const Name: AnsiString): Boolean;
   begin
     Result:=true;
-    Variant(Dest):=TypInfo.GetPropValue(getinstance(v),name);
+    Variant(Dest):={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}TypInfo.GetPropValue(getinstance(v),name);
   end;
 
 
 function TPublishableVariantType.SetProperty(var V: TVarData; const Name: AnsiString; const Value: TVarData): Boolean;
   begin
     Result:=true;
-    TypInfo.SetPropValue(getinstance(v),name,Variant(value));
+    {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}TypInfo.SetPropValue(getinstance(v),name,Variant(value));
   end;
 
 
@@ -4573,7 +4586,7 @@ end;
 
 Function GetPropValue(Instance: TObject; const PropName: AnsiString): Variant;
 begin
-  Result:=TypInfo.GetPropValue(Instance,PropName,True);
+  Result:={$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}TypInfo.GetPropValue(Instance,PropName,True);
 end;
 
 

packages/rtl-objpas/src/inc/widestrutils.pp

@@ -12,7 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit widestrutils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 {$H+}
@@ -20,8 +22,13 @@ unit widestrutils;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.SysUtils, System.Classes;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   SysUtils, Classes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function WideStringReplace(const S, OldPattern, NewPattern: WideString; Flags: TReplaceFlags): WideString;
 function WideReplaceStr(const AText, AFromText, AToText: WideString): WideString; inline;
@@ -135,13 +142,13 @@ end;
 Function WideStringReplace(const S, OldPattern, NewPattern: WideString; Flags: TReplaceFlags): WideString;
 
 begin
-  Result:= sysutils.WideStringReplace(S,OldPattern,NewPattern,Flags);
+  Result:= {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.WideStringReplace(S,OldPattern,NewPattern,Flags);
 end;
 
 Function UnicodeStringReplace(const S, OldPattern, NewPattern: UnicodeString; Flags: TReplaceFlags): UnicodeString;
 
 begin
-  Result:= sysutils.UnicodeStringReplace(S,OldPattern,NewPattern,Flags);
+  Result:=  {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}SysUtils.UnicodeStringReplace(S,OldPattern,NewPattern,Flags);
 end;
 
 function HasUTF8BOM(S: TStream): boolean;

packages/rtl-objpas/src/win/varutils.pp

@@ -19,11 +19,17 @@
 {$smartlink on}
 {$endif}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit VarUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses System.SysUtils,System.Types;
+{$ELSE FPC_DOTTEDUNITS}
 Uses sysutils,Types;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$i varutilh.inc}