* Dotted filenames for package graph

packages/graph/namespaced/System.PTC.Ptccrt.pp

@@ -0,0 +1,3 @@
+unit System.PTC.Ptccrt;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ptccrt.pp}

packages/graph/namespaced/System.PTC.Ptcgraph.pp

@@ -0,0 +1,3 @@
+unit System.PTC.Ptcgraph;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ptcgraph.pp}

packages/graph/namespaced/System.PTC.Ptcmouse.pp

@@ -0,0 +1,3 @@
+unit System.PTC.Ptcmouse;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ptcmouse.pp}

packages/graph/namespaced/System.Sdlgraph.pp

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

packages/graph/namespaced/System.Unix.Ggigraph.pp

@@ -0,0 +1,3 @@
+unit System.Unix.Ggigraph;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ggigraph.pp}

packages/graph/namespaced/TP.Graph.pp

@@ -0,0 +1,3 @@
+unit TP.Graph;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i graph.pp}

packages/graph/namespaced/TP.Wincrt.pp

@@ -0,0 +1,3 @@
+unit TP.Wincrt;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i wincrt.pp}

packages/graph/namespaced/TP.Winmouse.pp

@@ -0,0 +1,3 @@
+unit TP.Winmouse;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i winmouse.pp}

packages/graph/namespaces.lst

@@ -0,0 +1,26 @@
+src/win32/graph.pp=namespaced/TP.Graph.pp
+{s*:src/win32/}=namespaced/
+{i+:src/win32/}
+src/win32/wincrt.pp=namespaced/TP.Wincrt.pp
+src/win32/winmouse.pp=namespaced/TP.Winmouse.pp
+src/go32v2/graph.pp=namespaced/TP.Graph.pp
+{s*:src/go32v2/}=namespaced/
+{i+:src/go32v2/}
+src/msdos/graph.pp=namespaced/TP.Graph.pp
+{s*:src/msdos/}=namespaced/
+{i+:src/msdos/}
+src/unix/ggigraph.pp=namespaced/System.Unix.Ggigraph.pp
+{s*:src/unix/}=namespaced/
+{i+:src/unix/}
+src/unix/graph.pp=namespaced/TP.Graph.pp
+src/ptcgraph/ptcgraph.pp=namespaced/System.PTC.Ptcgraph.pp
+{s*:src/ptcgraph/}=namespaced/
+{i+:src/ptcgraph/}
+src/ptcgraph/ptcmouse.pp=namespaced/System.PTC.Ptcmouse.pp
+src/ptcgraph/ptccrt.pp=namespaced/System.PTC.Ptccrt.pp
+src/sdlgraph/sdlgraph.pp=namespaced/System.Sdlgraph.pp
+{s*:src/sdlgraph/}=namespaced/
+{i+:src/sdlgraph/}
+src/macosx/graph.pp=namespaced/TP.Graph.pp
+{s*:src/macosx/}=namespaced/
+{i+:src/macosx/}

packages/graph/src/ptcgraph/ptccrt.pp

@@ -13,7 +13,9 @@
 
  **********************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit ptccrt;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 {$DEFINE HasCRT}
@@ -25,21 +27,26 @@ unit ptccrt;
 interface
 
 {$IFDEF HasCRT}
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Console.Crt;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   crt;
+{$ENDIF FPC_DOTTEDUNITS}
 {$ENDIF HasCRT}
 
 type
 {$IFDEF HasCRT}
-  tcrtcoord = crt.tcrtcoord;
+  tcrtcoord = {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.tcrtcoord;
 {$ELSE HasCRT}
   tcrtcoord = 1..255;
 {$ENDIF HasCRT}
   tkeymode = (kmTP7, kmGO32, kmFPWINCRT);
 
 var
-  DirectVideo: Boolean {$IFDEF HasCRT}absolute crt.DirectVideo{$ENDIF HasCRT};
-  TextAttr: Byte {$IFDEF HasCRT}absolute crt.TextAttr{$ENDIF HasCRT};
+  DirectVideo: Boolean {$IFDEF HasCRT}absolute {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.DirectVideo{$ENDIF HasCRT};
+  TextAttr: Byte {$IFDEF HasCRT}absolute {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.TextAttr{$ENDIF HasCRT};
   KeyMode: TKeyMode = kmTP7;
 
 function KeyPressed: Boolean;
@@ -55,6 +62,17 @@ procedure NoSound;
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.PTC.Ptcgraph, Ptc, PTC.Wrapper
+  {$IFDEF Unix}
+  , UnixApi.Base
+  {$ENDIF UNIX}
+  {$IF defined(Win32) or defined(Win64) or defined(WinCE)}
+  , WinApi.Windows
+  {$ENDIF defined(Win32) or defined(Win64) or defined(WinCE)}
+  ;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   ptcgraph, ptc, ptcwrapper
   {$IFDEF UNIX}
@@ -64,6 +82,7 @@ uses
   , windows
   {$ENDIF defined(Win32) or defined(Win64) or defined(WinCE)}
   ;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function InGraphMode: Boolean;
 begin
@@ -538,7 +557,7 @@ begin
   if not InGraphMode then
   begin
 {$IFDEF HasCRT}
-    Result := crt.KeyPressed
+    Result := {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.KeyPressed
 {$ELSE HasCRT}
     Result := False;
 {$ENDIF HasCRT}
@@ -559,7 +578,7 @@ begin
   if not InGraphMode then
   begin
 {$IFDEF HasCRT}
-    Result := crt.ReadKey;
+    Result := {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.ReadKey;
 {$ELSE HasCRT}
     Result := #0;
 {$ENDIF HasCRT}
@@ -584,56 +603,56 @@ end;
 procedure ClrScr;
 begin
 {$IFDEF HasCRT}
-  crt.ClrScr;
+  {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.ClrScr;
 {$ENDIF HasCRT}
 end;
 
 procedure ClrEol;
 begin
 {$IFDEF HasCRT}
-  crt.ClrEol;
+  {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.ClrEol;
 {$ENDIF HasCRT}
 end;
 
 procedure GotoXY(X, Y: tcrtcoord);
 begin
 {$IFDEF HasCRT}
-  crt.GotoXY(X, Y);
+  {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.GotoXY(X, Y);
 {$ENDIF HasCRT}
 end;
 
 procedure TextColor(Color: Byte);
 begin
 {$IFDEF HasCRT}
-  crt.TextColor(Color);
+  {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.TextColor(Color);
 {$ENDIF HasCRT}
 end;
 
 procedure TextBackground(Color: Byte);
 begin
 {$IFDEF HasCRT}
-  crt.TextBackground(Color);
+  {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.TextBackground(Color);
 {$ENDIF HasCRT}
 end;
 
 procedure Delay(MS: Word);
 begin
 {$IFDEF HasCRT}
-  crt.Delay(MS);
+  {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.Delay(MS);
 {$ENDIF HasCRT}
 end;
 
 procedure Sound(HZ: Word);
 begin
 {$IFDEF HasCRT}
-  crt.Sound(HZ);
+  {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.Sound(HZ);
 {$ENDIF HasCRT}
 end;
 
 procedure NoSound;
 begin
 {$IFDEF HasCRT}
-  crt.NoSound;
+  {$IFDEF FPC_DOTTEDUNITS}System.Console.{$ENDIF}Crt.NoSound;
 {$ENDIF HasCRT}
 end;
 

packages/graph/src/ptcgraph/ptcgraph.pp

@@ -14,7 +14,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit ptcgraph;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {//$define logging}
 {$define FPC_GRAPH_SUPPORTS_TRUECOLOR}
@@ -24,8 +26,13 @@ unit ptcgraph;
                                     interface
 {******************************************************************************}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  Ptc, PTC.Wrapper;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   ptc, ptcwrapper;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef VER2_6}
 type

packages/graph/src/ptcgraph/ptcmouse.pp

@@ -15,7 +15,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit ptcmouse;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 
@@ -104,8 +106,13 @@ var
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+   System.PTC.Ptcgraph, Ptc, PTC.Wrapper;
+{$ELSE FPC_DOTTEDUNITS}
 uses
    ptcgraph, ptc, ptcwrapper;
+{$ENDIF FPC_DOTTEDUNITS}
 
 function InGraphMode: Boolean;
 begin

packages/graph/src/sdlgraph/sdlgraph.pp

@@ -43,7 +43,9 @@ TODO: configure refresh (flip) time. SDL_AddTimer(100...: time interval must be
 }
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sdlgraph;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef darwin}
 {$linkframework Cocoa}
@@ -138,10 +140,17 @@ It's highly recommended to use Detect (0 constant) for grDriver and grmode: init
   m1280x1024x64k    = $11A;
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses {$ifdef Unix}UnixApi.CThreads,{$endif}
+   Api.Sdl,Api.Sdl.Utils,
+          Api.Sdl.Logger,
+          System.SysUtils;
+{$ELSE FPC_DOTTEDUNITS}
 uses {$ifdef unix}cthreads,{$endif}
    sdl,sdlutils,
           logger,
           SysUtils;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   InternalDriverName = 'SDL';

packages/graph/src/unix/ggigraph.pp

@@ -12,7 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit GGIGraph;
+{$ENDIF FPC_DOTTEDUNITS}
 interface
 
 { objfpc is needed for array of const support }
@@ -86,8 +88,13 @@ Const
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  UnixApi.TermIO;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   termio;
+{$ENDIF FPC_DOTTEDUNITS}
 
 var
   OldIO : TermIos;

packages/graph/src/unix/graph.pp

@@ -12,7 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Graph;
+{$ENDIF FPC_DOTTEDUNITS}
 interface
 
 {$i graphh.inc}
@@ -83,8 +85,13 @@ Const
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  UnixApi.TermIO,System.X86;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   termio,x86;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   InternalDriverName = 'LinuxVGA';

packages/graph/src/win32/graph.pp

@@ -12,7 +12,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit Graph;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -44,8 +46,13 @@ interface
   {$define USE_SYSTEM_BEGIN_THREAD}
 {$endif ndef USE_WINDOWS_API_THREAD_FUNCTIONS}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$i graphh.inc}
 
@@ -129,8 +136,13 @@ CONST
 
 implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Strings;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   strings;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
    Remarks:
@@ -245,7 +257,7 @@ function GetPixel16Win32GUI(x,y : smallint) : word;
     if graphrunning then
       begin
          EnterCriticalSection(graphdrawing);
-         c:=Windows.GetPixel(bitmapdc,x,y);
+         c:={$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetPixel(bitmapdc,x,y);
          LeaveCriticalSection(graphdrawing);
          GetPixel16Win32GUI:=GetPaletteEntry(GetRValue(c),GetGValue(c),GetBValue(c));
       end
@@ -270,7 +282,7 @@ procedure DirectPutPixel16Win32GUI(x,y : smallint);
          case currentwritemode of
            XorPut:
              Begin
-                c2:=Windows.GetPixel(windc,x,y);
+                c2:={$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetPixel(windc,x,y);
                 c:=RGB(pal[col].red,pal[col].green,pal[col].blue) xor c2;
                 if drawtobitmap then
                   SetPixelV(bitmapdc,x,y,c);
@@ -279,7 +291,7 @@ procedure DirectPutPixel16Win32GUI(x,y : smallint);
              End;
            AndPut:
              Begin
-                c2:=Windows.GetPixel(windc,x,y);
+                c2:={$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetPixel(windc,x,y);
                 c:=RGB(pal[col].red,pal[col].green,pal[col].blue) and c2;
                 if drawtobitmap then
                   SetPixelV(bitmapdc,x,y,c);
@@ -288,7 +300,7 @@ procedure DirectPutPixel16Win32GUI(x,y : smallint);
              End;
            OrPut:
              Begin
-                c2:=Windows.GetPixel(windc,x,y);
+                c2:={$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetPixel(windc,x,y);
                 c:=RGB(pal[col].red,pal[col].green,pal[col].blue) or c2;
                 if drawtobitmap then
                   SetPixelV(bitmapdc,x,y,c);
@@ -796,7 +808,7 @@ procedure HLine16Win32GUI(x,x2,y: smallint);
                   col:=CurrentColor;
                   for i:=x to x2 do
                     begin
-                       c2:=Windows.GetPixel(windc,i,y);
+                       c2:={$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetPixel(windc,i,y);
                        c:=RGB(pal[col].red,pal[col].green,pal[col].blue) and c2;
                        if drawtobitmap then
                          SetPixelV(bitmapdc,i,y,c);
@@ -812,7 +824,7 @@ procedure HLine16Win32GUI(x,x2,y: smallint);
                   col:=CurrentColor;
                   for i:=x to x2 do
                     begin
-                       c2:=Windows.GetPixel(windc,i,y);
+                       c2:={$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetPixel(windc,i,y);
                        c:=RGB(pal[col].red,pal[col].green,pal[col].blue) xor c2;
 
                        if drawtobitmap then
@@ -829,7 +841,7 @@ procedure HLine16Win32GUI(x,x2,y: smallint);
                   col:=CurrentColor;
                   for i:=x to x2 do
                     begin
-                       c2:=Windows.GetPixel(windc,i,y);
+                       c2:={$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.GetPixel(windc,i,y);
                        c:=RGB(pal[col].red,pal[col].green,pal[col].blue) or c2;
 
                        if drawtobitmap then
@@ -877,16 +889,16 @@ procedure HLine16Win32GUI(x,x2,y: smallint);
                        if drawtobitmap then
                          begin
                             oldpen:=SelectObject(bitmapdc,pen);
-                            Windows.MoveToEx(bitmapdc,x,y,nil);
-                            Windows.LineTo(bitmapdc,x2+1,y);
+                            {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.MoveToEx(bitmapdc,x,y,nil);
+                            {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.LineTo(bitmapdc,x2+1,y);
                             SelectObject(bitmapdc,oldpen);
                          end;
 
                        if drawtoscreen then
                          begin
                             oldpen:=SelectObject(windc,pen);
-                            Windows.MoveToEx(windc,x,y,nil);
-                            Windows.LineTo(windc,x2+1,y);
+                            {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.MoveToEx(windc,x,y,nil);
+                            {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.LineTo(windc,x2+1,y);
                             SelectObject(windc,oldpen);
                          end;
 
@@ -962,16 +974,16 @@ Begin
             if drawtobitmap then
               begin
                  oldpen:=SelectObject(bitmapdc,pen);
-                 Windows.MoveToEx(bitmapdc,x,y,nil);
-                 Windows.LineTo(bitmapdc,x,y2+1);
+                 {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.MoveToEx(bitmapdc,x,y,nil);
+                 {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.LineTo(bitmapdc,x,y2+1);
                  SelectObject(bitmapdc,oldpen);
               end;
 
             if drawtoscreen then
               begin
                  oldpen:=SelectObject(windc,pen);
-                 Windows.MoveToEx(windc,x,y,nil);
-                 Windows.LineTo(windc,x,y2+1);
+                 {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.MoveToEx(windc,x,y,nil);
+                 {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.LineTo(windc,x,y2+1);
                  SelectObject(windc,oldpen);
               end;
             if (col<0) or (col>high(pens)) then
@@ -1053,7 +1065,7 @@ procedure Circle16Win32GUI(X, Y: smallint; Radius:Word);
           if drawtobitmap then
             begin
                oldpen:=SelectObject(bitmapdc,pen);
-               windows.arc(bitmapdc,x-radius,y-radius,x+radius,y+radius,
+               {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.arc(bitmapdc,x-radius,y-radius,x+radius,y+radius,
                  x,y-radius,x,y-radius);
                SelectObject(bitmapdc,oldpen);
             end;
@@ -1061,7 +1073,7 @@ procedure Circle16Win32GUI(X, Y: smallint; Radius:Word);
           if drawtoscreen then
             begin
                oldpen:=SelectObject(windc,pen);
-               windows.arc(windc,x-radius,y-radius,x+radius,y+radius,
+               {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.arc(windc,x-radius,y-radius,x+radius,y+radius,
                  x,y-radius,x,y-radius);
                SelectObject(windc,oldpen);
             end;
@@ -1307,13 +1319,13 @@ begin
          // clear everything
          oldpen:=SelectObject(bitmapdc,GetStockObject(BLACK_PEN));
          oldbrush:=SelectObject(bitmapdc,GetStockObject(BLACK_BRUSH));
-         Windows.Rectangle(bitmapdc,0,0,maxx,maxy);
+         {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.Rectangle(bitmapdc,0,0,maxx,maxy);
          SelectObject(bitmapdc,oldpen);
          SelectObject(bitmapdc,oldbrush);
          // ... the window too
          oldpen:=SelectObject(windc,GetStockObject(BLACK_PEN));
          oldbrush:=SelectObject(windc,GetStockObject(BLACK_BRUSH));
-         Windows.Rectangle(windc,0,0,maxx,maxy);
+         {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.Rectangle(windc,0,0,maxx,maxy);
          SelectObject(windc,oldpen);
          SelectObject(windc,oldbrush);
          // clear font cache
@@ -1539,7 +1551,7 @@ function MessageHandleThread(p : pointer) : DWord; stdcall;
 {$ifdef USE_SYSTEM_BEGIN_THREAD}
                     System.EndThread(1);
 {$else not USE_SYSTEM_BEGIN_THREAD}
-                    Windows.ExitThread(1);
+                    {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.ExitThread(1);
 {$endif not USE_SYSTEM_BEGIN_THREAD}
                  end;
             end
@@ -1551,7 +1563,7 @@ function MessageHandleThread(p : pointer) : DWord; stdcall;
 {$ifdef USE_SYSTEM_BEGIN_THREAD}
                     System.EndThread(1);
 {$else not USE_SYSTEM_BEGIN_THREAD}
-                    Windows.ExitThread(1);
+                    {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.ExitThread(1);
 {$endif not USE_SYSTEM_BEGIN_THREAD}
                  end;
             end;
@@ -1563,7 +1575,7 @@ function MessageHandleThread(p : pointer) : DWord; stdcall;
 {$ifdef USE_SYSTEM_BEGIN_THREAD}
        System.EndThread(1);
 {$else not USE_SYSTEM_BEGIN_THREAD}
-       Windows.ExitThread(1);
+       {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.ExitThread(1);
 {$endif not USE_SYSTEM_BEGIN_THREAD}
      end;
      while longint(GetMessage(@AMessage, 0, 0, 0))=longint(true) do
@@ -1710,13 +1722,13 @@ procedure LineWin32GUI(X1, Y1, X2, Y2: smallint); {$ifndef fpc}far;{$endif fpc}
 
                       oldpen:=SelectObject(windc,pen);
                       MoveToEx(windc,x1,y1,nil);
-                      Windows.LineTo(windc,x2,y2);
+                      {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.LineTo(windc,x2,y2);
                       SetPixel(windc,x2,y2,col);
                       SelectObject(windc,oldpen);
 
                       oldpen:=SelectObject(bitmapdc,pen);
                       MoveToEx(bitmapdc,x1,y1,nil);
-                      Windows.LineTo(bitmapdc,x2,y2);
+                      {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.LineTo(bitmapdc,x2,y2);
                       SetPixel(bitmapdc,x2,y2,col);
                       SelectObject(bitmapdc,oldpen);
 

packages/graph/src/win32/wincrt.pp

@@ -14,7 +14,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit WinCRT;
+{$ENDIF FPC_DOTTEDUNITS}
 
   interface
 
@@ -41,8 +43,13 @@ unit WinCRT;
 
   implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+    uses
+       WinApi.Windows, TP.Graph;
+{$ELSE FPC_DOTTEDUNITS}
     uses
        windows,graph;
+{$ENDIF FPC_DOTTEDUNITS}
 
     const
        keybuffersize = 32;
@@ -93,7 +100,7 @@ unit WinCRT;
                 end;
               LeaveCriticalSection(keyboardhandling);
               { give other threads a chance }
-              Windows.Sleep(10);
+              {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.Sleep(10);
            end;
       end;
 
@@ -119,7 +126,7 @@ unit WinCRT;
     procedure sound(hz : word);
 
       begin
-         Windows.Beep(hz,500);
+         {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.Beep(hz,500);
       end;
 
     procedure nosound;

packages/graph/src/win32/winmouse.pp

@@ -14,7 +14,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit WinMouse;
+{$ENDIF FPC_DOTTEDUNITS}
 
   interface
     { initializes the mouse with the default values for the current screen mode }
@@ -100,8 +102,13 @@ unit WinMouse;
 
   implementation
 
+{$IFDEF FPC_DOTTEDUNITS}
+    uses
+       WinApi.Windows, TP.Graph;
+{$ELSE FPC_DOTTEDUNITS}
     uses
        windows,graph;
+{$ENDIF FPC_DOTTEDUNITS}
 
     var
        oldexitproc : pointer;
@@ -116,13 +123,13 @@ unit WinMouse;
     procedure ShowMouse;
 
       begin
-         Windows.ShowCursor(true);
+         {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.ShowCursor(true);
       end;
 
     procedure HideMouse;
 
       begin
-         Windows.ShowCursor(false);
+         {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}Windows.ShowCursor(false);
       end;
 
     function msghandler(Window: HWnd; AMessage:UInt; WParam : WParam; LParam: LParam): LResult; stdcall;