* Dotted filenames for package winceunits

packages/winceunits/namespaced/WinceApi.Aygshell.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Aygshell;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i aygshell.pp}

packages/winceunits/namespaced/WinceApi.Bt_api.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Bt_api;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i bt_api.pp}

packages/winceunits/namespaced/WinceApi.Bt_sdp.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Bt_sdp;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i bt_sdp.pp}

packages/winceunits/namespaced/WinceApi.Bthapi.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Bthapi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i bthapi.pp}

packages/winceunits/namespaced/WinceApi.Bthutil.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Bthutil;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i bthutil.pp}

packages/winceunits/namespaced/WinceApi.Buildwinceunits.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Buildwinceunits;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i buildwinceunits.pp}

packages/winceunits/namespaced/WinceApi.Cesync.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Cesync;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cesync.pp}

packages/winceunits/namespaced/WinceApi.Commctrl.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Commctrl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i commctrl.pp}

packages/winceunits/namespaced/WinceApi.Commdlg.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Commdlg;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i commdlg.pp}

packages/winceunits/namespaced/WinceApi.Connmgr.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Connmgr;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i connmgr.pp}

packages/winceunits/namespaced/WinceApi.Cpl.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Cpl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i cpl.pp}

packages/winceunits/namespaced/WinceApi.Devload.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Devload;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i devload.pp}

packages/winceunits/namespaced/WinceApi.Devmgmt.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Devmgmt;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i devmgmt.pp}

packages/winceunits/namespaced/WinceApi.Extapi.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Extapi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i extapi.pp}

packages/winceunits/namespaced/WinceApi.Gpsapi.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Gpsapi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gpsapi.pp}

packages/winceunits/namespaced/WinceApi.Gx.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Gx;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i gx.pp}

packages/winceunits/namespaced/WinceApi.Htmlctrl.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Htmlctrl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i htmlctrl.pp}

packages/winceunits/namespaced/WinceApi.Iphlpapi.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Iphlpapi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i iphlpapi.pp}

packages/winceunits/namespaced/WinceApi.Keybd.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Keybd;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i keybd.pp}

packages/winceunits/namespaced/WinceApi.Mmreg.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Mmreg;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i mmreg.pp}

packages/winceunits/namespaced/WinceApi.Mmsystem.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Mmsystem;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i mmsystem.pp}

packages/winceunits/namespaced/WinceApi.Msacm.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Msacm;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i msacm.pp}

packages/winceunits/namespaced/WinceApi.Msgqueue.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Msgqueue;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i msgqueue.pp}

packages/winceunits/namespaced/WinceApi.Nled.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Nled;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i nled.pp}

packages/winceunits/namespaced/WinceApi.Notify.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Notify;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i notify.pp}

packages/winceunits/namespaced/WinceApi.Oleauto.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Oleauto;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i oleauto.pp}

packages/winceunits/namespaced/WinceApi.Phone.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Phone;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i phone.pp}

packages/winceunits/namespaced/WinceApi.Pimstore.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Pimstore;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pimstore.pp}

packages/winceunits/namespaced/WinceApi.Pm.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Pm;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pm.pp}

packages/winceunits/namespaced/WinceApi.Pnp.pas

@@ -0,0 +1,3 @@
+unit WinceApi.Pnp;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i pnp.pas}

packages/winceunits/namespaced/WinceApi.Power.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Power;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i power.pp}

packages/winceunits/namespaced/WinceApi.Projects.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Projects;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i projects.pp}

packages/winceunits/namespaced/WinceApi.Rapi.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Rapi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i rapi.pp}

packages/winceunits/namespaced/WinceApi.Rapitypes.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Rapitypes;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i rapitypes.pp}

packages/winceunits/namespaced/WinceApi.Ras.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Ras;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ras.pp}

packages/winceunits/namespaced/WinceApi.Raserror.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Raserror;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i raserror.pp}

packages/winceunits/namespaced/WinceApi.Ril.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Ril;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ril.pp}

packages/winceunits/namespaced/WinceApi.Service.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Service;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i service.pp}

packages/winceunits/namespaced/WinceApi.Shellapi.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Shellapi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i shellapi.pp}

packages/winceunits/namespaced/WinceApi.Simmgr.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Simmgr;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i simmgr.pp}

packages/winceunits/namespaced/WinceApi.Sip.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Sip;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sip.pp}

packages/winceunits/namespaced/WinceApi.Sipapi.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Sipapi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sipapi.pp}

packages/winceunits/namespaced/WinceApi.Sms.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Sms;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i sms.pp}

packages/winceunits/namespaced/WinceApi.Storemgr.pas

@@ -0,0 +1,3 @@
+unit WinceApi.Storemgr;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i storemgr.pas}

packages/winceunits/namespaced/WinceApi.Tapi.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Tapi;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i tapi.pp}

packages/winceunits/namespaced/WinceApi.Tlhelp32.pas

@@ -0,0 +1,3 @@
+unit WinceApi.Tlhelp32;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i tlhelp32.pas}

packages/winceunits/namespaced/WinceApi.Todaycmn.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Todaycmn;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i todaycmn.pp}

packages/winceunits/namespaced/WinceApi.Tsp.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Tsp;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i tsp.pp}

packages/winceunits/namespaced/WinceApi.Wap.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Wap;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i wap.pp}

packages/winceunits/namespaced/WinceApi.Windbase.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Windbase;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i windbase.pp}

packages/winceunits/namespaced/WinceApi.Wininet.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Wininet;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i wininet.pp}

packages/winceunits/namespaced/WinceApi.Winioctl.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Winioctl;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i winioctl.pp}

packages/winceunits/namespaced/WinceApi.Ws2bth.pp

@@ -0,0 +1,3 @@
+unit WinceApi.Ws2bth;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i ws2bth.pp}

packages/winceunits/namespaces.lst

@@ -0,0 +1,56 @@
+src/ril.pp=namespaced/WinceApi.Ril.pp
+{s*:src/}=namespaced/
+{i+:src/}
+src/buildwinceunits.pp=namespaced/WinceApi.Buildwinceunits.pp
+src/winioctl.pp=namespaced/WinceApi.Winioctl.pp
+src/sip.pp=namespaced/WinceApi.Sip.pp
+src/pimstore.pp=namespaced/WinceApi.Pimstore.pp
+src/rapitypes.pp=namespaced/WinceApi.Rapitypes.pp
+src/aygshell.pp=namespaced/WinceApi.Aygshell.pp
+src/connmgr.pp=namespaced/WinceApi.Connmgr.pp
+src/devmgmt.pp=namespaced/WinceApi.Devmgmt.pp
+src/tapi.pp=namespaced/WinceApi.Tapi.pp
+src/msacm.pp=namespaced/WinceApi.Msacm.pp
+src/gpsapi.pp=namespaced/WinceApi.Gpsapi.pp
+src/bthapi.pp=namespaced/WinceApi.Bthapi.pp
+src/commdlg.pp=namespaced/WinceApi.Commdlg.pp
+src/mmsystem.pp=namespaced/WinceApi.Mmsystem.pp
+src/raserror.pp=namespaced/WinceApi.Raserror.pp
+src/power.pp=namespaced/WinceApi.Power.pp
+src/ras.pp=namespaced/WinceApi.Ras.pp
+src/imm.pp=namespaced/WinceApi.Imm.pp
+src/wap.pp=namespaced/WinceApi.Wap.pp
+src/rapi.pp=namespaced/WinceApi.Rapi.pp
+src/service.pp=namespaced/WinceApi.Service.pp
+src/tlhelp32.pas=namespaced/WinceApi.Tlhelp32.pas
+src/sipapi.pp=namespaced/WinceApi.Sipapi.pp
+src/simmgr.pp=namespaced/WinceApi.Simmgr.pp
+src/pm.pp=namespaced/WinceApi.Pm.pp
+src/shellapi.pp=namespaced/WinceApi.Shellapi.pp
+src/notify.pp=namespaced/WinceApi.Notify.pp
+src/devload.pp=namespaced/WinceApi.Devload.pp
+src/extapi.pp=namespaced/WinceApi.Extapi.pp
+src/wininet.pp=namespaced/WinceApi.Wininet.pp
+src/projects.pp=namespaced/WinceApi.Projects.pp
+src/cpl.pp=namespaced/WinceApi.Cpl.pp
+src/mmreg.pp=namespaced/WinceApi.Mmreg.pp
+src/ws2bth.pp=namespaced/WinceApi.Ws2bth.pp
+src/storemgr.pas=namespaced/WinceApi.Storemgr.pas
+src/windbase.pp=namespaced/WinceApi.Windbase.pp
+src/oleauto.pp=namespaced/WinceApi.Oleauto.pp
+src/bthutil.pp=namespaced/WinceApi.Bthutil.pp
+src/iphlpapi.pp=namespaced/WinceApi.Iphlpapi.pp
+src/todaycmn.pp=namespaced/WinceApi.Todaycmn.pp
+src/phone.pp=namespaced/WinceApi.Phone.pp
+src/msgqueue.pp=namespaced/WinceApi.Msgqueue.pp
+src/bt_sdp.pp=namespaced/WinceApi.Bt_sdp.pp
+src/pnp.pas=namespaced/WinceApi.Pnp.pas
+src/sms.pp=namespaced/WinceApi.Sms.pp
+src/tsp.pp=namespaced/WinceApi.Tsp.pp
+src/bt_api.pp=namespaced/WinceApi.Bt_api.pp
+src/gx.pp=namespaced/WinceApi.Gx.pp
+src/nled.pp=namespaced/WinceApi.Nled.pp
+src/keybd.pp=namespaced/WinceApi.Keybd.pp
+src/cesync.pp=namespaced/WinceApi.Cesync.pp
+src/htmlctrl.pp=namespaced/WinceApi.Htmlctrl.pp
+src/commctrl.pp=namespaced/WinceApi.Commctrl.pp

packages/winceunits/src/aygshell.pp

@@ -265,13 +265,19 @@
            236    VerifyTrust
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit aygshell;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 {$MODE OBJFPC}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/bt_api.pp

@@ -33,13 +33,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit bt_api;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinApi.Winsock2, WinceAPI.Winioctl, WinceAPI.Ws2bth;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, WinSock2, WinIOCtl, ws2bth;
+{$ENDIF FPC_DOTTEDUNITS}
 
 //
 //		COD classes
@@ -592,4 +598,4 @@ function rfCloseHandle(_hFile:HANDLE):BOOL; external KernelDLL name 'CloseHandle
 
 implementation
 
-end.
+end.

packages/winceunits/src/bt_sdp.pp

@@ -28,11 +28,17 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit bt_sdp;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
       SDP_ERROR_INVALID_SDP_VERSION           = $0001;
@@ -225,4 +231,4 @@ const
 
 implementation
 
-end.
+end.

packages/winceunits/src/bthapi.pp

@@ -18,13 +18,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit bthapi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
       LIBID_BTHAPILib:TIID = '{00BC26C8-0A87-41d0-82BA-61FF9E0B1BB5}';

packages/winceunits/src/bthutil.pp

@@ -14,13 +14,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit bthutil;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 ////////////////////////////////////////////////////////////////////////////////
 //
@@ -80,4 +86,4 @@ function BthGetMode(pdwMode:LPDWORD):longint; external BthutilDLL name 'BthGetMo
 
 implementation
 
-end.
+end.

packages/winceunits/src/buildwinceunits.pp

@@ -16,10 +16,21 @@
    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit buildwinceunits;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  WinceAPI.Aygshell, WinApi.Commctrl, WinApi.Commdlg, WinceAPI.Iphlpapi, WinceAPI.Notify, WinceAPI.Oleauto, MacOsApi.Power, WinApi.Shellapi, WinceAPI.Simmgr, WinceAPI.Tapi,
+  WinceAPI.Gpsapi, WinceAPI.Todaycmn, WinceAPI.Windbase, WinceAPI.Cesync, WinceAPI.Gx, WinceAPI.Winioctl, WinceAPI.Msgqueue, WinceAPI.Pm, WinceAPI.Service, WinceAPI.Htmlctrl,
+  WinceAPI.Sipapi, WinceAPI.Cpl, WinceAPI.Bt_api, WinceAPI.Bt_sdp, WinceAPI.Bthapi, WinceAPI.Bthutil, WinceAPI.Pimstore, WinceAPI.Ril, SinclairApi.Sms, WinceAPI.Ws2bth,
+  WinceAPI.Keybd, WinceAPI.Nled, WinceAPI.Phone, WinceAPI.Connmgr, WinceAPI.Devload, WinceAPI.Devmgmt, WinceAPI.Mmreg, WinApi.Mmsystem, WinceAPI.Msacm,
+  WinApi.Wininet, WinceAPI.Ras, WinceAPI.Raserror, WinceAPI.Sip, WinceAPI.Projects, WinceAPI.Wap, WinceAPI.Tsp, WinceAPI.Extapi, WinceAPI.Imm, WinceAPI.Rapitypes,
+  WinceAPI.Storemgr, WinceAPI.Pnp, WinceAPI.Tlhelp32;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   aygshell, commctrl, commdlg, iphlpapi, notify, oleauto, power, shellapi, simmgr, tapi,
   gpsapi, todaycmn, windbase, cesync, gx, winioctl, msgqueue, pm, service, htmlctrl,
@@ -27,6 +38,7 @@ uses
   keybd, nled, phone, connmgr, devload, devmgmt, mmreg, mmsystem, msacm,
   wininet, ras, raserror, sip, projects, wap, tsp, extapi, imm, rapitypes,
   storemgr, pnp, tlhelp32;
+{$ENDIF FPC_DOTTEDUNITS}
 
 implementation
 

packages/winceunits/src/cesync.pp

@@ -15,11 +15,17 @@
  Converted from cesync.h by Yury Sidorov                               }
 
 {$mode objfpc}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cesync;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows {$ifdef UNDER_CE}, WinceAPI.Windbase {$endif};
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows {$ifdef UNDER_CE}, windbase {$endif};
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
 {$PACKRECORDS C}

packages/winceunits/src/commctrl.pp

@@ -80,11 +80,17 @@
             33    Str_SetPtrW
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit commctrl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/commdlg.pp

@@ -14,11 +14,17 @@
 {  Declarations for comdlg WinCE API
 
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit commdlg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/connmgr.pp

@@ -36,13 +36,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit connmgr;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinApi.Winsock2;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, WinSock2;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
       CellcoreDLL = 'cellcore.dll';

packages/winceunits/src/cpl.pp

@@ -50,7 +50,9 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit cpl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$ifdef FPC_OS_UNICODE}
   {$define UNICODE}
@@ -58,7 +60,11 @@ unit cpl;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$PACKRECORDS 1} // #include "pshpack1.h"   /* Assume byte packing throughout */
 

packages/winceunits/src/devload.pp

@@ -25,13 +25,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit devload;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // @doc DRIVERS
 

packages/winceunits/src/devmgmt.pp

@@ -33,13 +33,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit devmgmt;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Aygshell;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, aygshell;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // - cfgmgrapi.h
 

packages/winceunits/src/extapi.pp

@@ -29,13 +29,19 @@
 //
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit extapi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Tapi;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, TAPI;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 // ExTAPI LINEERR_ constants
@@ -430,4 +436,4 @@ function lineUnregister(hLine:HLINE):LONG; external ExTapiDLL name 'lineUnregist
 
 implementation
 
-end.
+end.

packages/winceunits/src/gpsapi.pp

@@ -21,13 +21,19 @@
 // Microsoft Windows Mobile 5.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit GPSApi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
       GPS_MAX_SATELLITES    = 12;

packages/winceunits/src/gx.pp

@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 Unit gx;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE objfpc}
 
@@ -7,8 +9,13 @@ Unit gx;
 
 Interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+Uses
+  WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 Uses
   Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 Const
   GXDLL = 'gx.dll';

packages/winceunits/src/htmlctrl.pp

@@ -18,11 +18,17 @@
     -w
     htmlctrl.h
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit htmlctrl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$IFDEF FPC}
 {$PACKRECORDS C}

packages/winceunits/src/iphlpapi.pp

@@ -78,11 +78,17 @@
                   UnenableRouter
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit iphlpapi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/keybd.pp

@@ -20,11 +20,17 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit keybd;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Winioctl;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows, WinIOCtl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // EXTERNAL DRIVERS
 // KEY_STATE_FLAGS | Flags for keyboard events and shift state.
@@ -312,4 +318,4 @@ begin
   KeyStateIsDownTransition:=KeyStateIsDown(Flags) and (not KeyStateIsPrevDown(Flags));
 end;
 
-end.
+end.

packages/winceunits/src/mmreg.pp

@@ -25,11 +25,17 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit mmreg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {
   Automatically converted by H2Pas 1.0.0 from mmreg.h

packages/winceunits/src/mmsystem.pp

@@ -28,7 +28,9 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit mmsystem;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
@@ -38,7 +40,11 @@ unit mmsystem;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Mmreg;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, mmreg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$PACKRECORDS 1} // #include "pshpack1.h"   // Assume byte packing throughout
 

packages/winceunits/src/msacm.pp

@@ -21,14 +21,20 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit msacm;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 {$PACKRECORDS 1} // #pragma pack(1)         /* Assume byte packing throughout */
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Mmreg;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, mmreg;
+{$ENDIF FPC_DOTTEDUNITS}
 
 //
 //  there are four types of 'handles' used by the ACM. the first three

packages/winceunits/src/msgqueue.pp

@@ -18,13 +18,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit MsgQueue;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // Declarations of constants and structures transferred from winbase.h.
 
@@ -80,4 +86,4 @@ function CloseMsgQueue(hMsgQ:HANDLE):BOOL; external KernelDLL name 'CloseMsgQueu
 
 implementation
 
-end.
+end.

packages/winceunits/src/nled.pp

@@ -26,13 +26,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit NLed;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Winioctl;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, WinIOCtl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // @CESYSGEN IF COREDLL_NLED
 
@@ -241,4 +247,4 @@ function NLedSetDevice(nDeviceId:UINT; pInput:pointer):BOOL;  external KernelDLL
 
 implementation
 
-end.
+end.

packages/winceunits/src/notify.pp

@@ -19,11 +19,17 @@
     notify.h
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit notify;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/oleauto.pp

@@ -240,11 +240,17 @@
        E2 VectorFromBstr
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit oleauto;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/phone.pp

@@ -20,13 +20,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit phone;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
      CALLERIDTYPE = (CALLERIDTYPE_UNAVAILABLE,
@@ -322,4 +328,4 @@ function PhoneIsEmergencyNumber(fTailMatchOnly:BOOL;
 
 implementation
 
-end.
+end.

packages/winceunits/src/pimstore.pp

@@ -18,13 +18,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit pimstore;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$MODE OBJFPC}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinApi.Activex, WinceAPI.Windbase;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, ActiveX, windbase;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
 // Flags for receiving notifications
@@ -1158,4 +1164,4 @@ begin
   PIM_PROP_TAG:=(ulPropID shl 16) or ulPropType;
 end;
 
-end.
+end.

packages/winceunits/src/pm.pp

@@ -24,13 +24,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit PM;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Winioctl;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, WinIOCtl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 //**********************************************************************
 // WinCE Device Interface GUIDs for Power Manager controlled devices.
@@ -360,4 +366,4 @@ begin
   VALID_DX:=(dx>DWORD(PwrDeviceUnspecified)) and (dx<DWORD(PwrDeviceMaximum));
 end;
 
-end.
+end.

packages/winceunits/src/pnp.pas

@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit PnP;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 
@@ -22,8 +24,13 @@ unit PnP;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   // Maximum size of a device interface name. The choice of value is arbitrary

packages/winceunits/src/power.pp

@@ -21,11 +21,17 @@
 
 { Power Management APIs }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit power;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/projects.pp

@@ -24,13 +24,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit projects;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
       Note_prjDLL = 'note_prj.dll';
@@ -342,4 +348,4 @@ function EnumProjectsFilesEx(pfnEnumProc:PROJECTSFILES_ENUMPROC_EX;
 
 implementation
 
-end.
+end.

packages/winceunits/src/rapi.pp

@@ -1,5 +1,7 @@
 {$mode delphi}
+{$IFNDEF FPC_DOTTEDUNITS}
 UNIT RAPI;
+{$ENDIF FPC_DOTTEDUNITS}
 
 // Created and donated to the public domain 2001
 //   by Scott Crossen, [email protected]
@@ -8,7 +10,11 @@ UNIT RAPI;
 
 INTERFACE
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Rapitypes;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, RAPITypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   FAF_ATTRIBUTES = $00000001;

packages/winceunits/src/rapitypes.pp

@@ -15,14 +15,21 @@
   Types from rapitypes.h, others are directly in rapi.pp, but this unit is used
   from Win32 and WinCE.
 }
+{$IFNDEF FPC_DOTTEDUNITS}
 unit RAPITypes;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}{$H+}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  System.Types;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   types;
+{$ENDIF FPC_DOTTEDUNITS}
 
 type
   RAPISTREAMFLAG = (

packages/winceunits/src/ras.pp

@@ -24,13 +24,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit RAS;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Tapi;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, Tapi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$PACKRECORDS 4} // #include "pshpack4.h"
 
@@ -898,4 +904,4 @@ function RasSetEapConnectionData(pszPhonebook:LPCTSTR;    // path to phone book
 
 implementation
 
-end.
+end.

packages/winceunits/src/raserror.pp

@@ -25,7 +25,9 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit RASError;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
@@ -207,4 +209,4 @@ const
 
 implementation
 
-end.
+end.

packages/winceunits/src/ril.pp

@@ -21,14 +21,20 @@
 //
 
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit RIL;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 {$INLINE ON}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
       RILDLL = 'ril.dll';

packages/winceunits/src/service.pp

@@ -23,13 +23,19 @@ Notes:
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit service;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, WinceAPI.Winioctl;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, WinIOCtl;
+{$ENDIF FPC_DOTTEDUNITS}
 
 //
 //  Return codes

packages/winceunits/src/shellapi.pp

@@ -173,11 +173,17 @@
 }
 
 {$mode objfpc}
+{$IFNDEF FPC_DOTTEDUNITS}
 unit shellapi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/simmgr.pp

@@ -20,11 +20,17 @@
   contact S0vNark0m for more information [email protected] (en, ru)
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit simmgr;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/sip.pp

@@ -17,13 +17,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sip;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
 {$MODE OBJFPC}
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows, System.Types, WinceAPI.Sipapi;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows, Types, SIPAPI;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
       IID_IIMCallback:TIID    = '{42429669-AE04-11D0-A4F8-00AA00A749B9}';
@@ -120,4 +126,4 @@ type
 
 implementation
 
-end.
+end.

packages/winceunits/src/sipapi.pp

@@ -18,13 +18,19 @@
 //  Microsoft Windows Mobile 5.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit SIPApi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
       SIP_STATUS_UNAVAILABLE	= 0;
@@ -104,4 +110,4 @@ const
 
 implementation
 
-end.
+end.

packages/winceunits/src/sms.pp

@@ -18,13 +18,19 @@
 //  Microsoft Windows Mobile 6.0 for PocketPC SDK.
 //
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit sms;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$CALLING cdecl}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 //
 // Errors
@@ -579,4 +585,4 @@ function SmsGetTime(ptsCurrentTime:LPSYSTEMTIME;  // (UTC time)
 
 implementation
 
-end.
+end.

packages/winceunits/src/storemgr.pas

@@ -1,4 +1,6 @@
+{$IFNDEF FPC_DOTTEDUNITS}
 unit StoreMgr;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$PACKSET 1}
 {$mode objfpc}
@@ -25,8 +27,13 @@ unit StoreMgr;
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   Windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   BLOCK_DRIVER_GUID: GUID                    = '{A4E7EDDA-E575-4252-9D6B-4195D48BB865}';

packages/winceunits/src/tapi.pp

@@ -19,11 +19,17 @@
   contact S0vNark0m for more information [email protected] (en, ru)
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit tapi;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$calling cdecl}
 

packages/winceunits/src/tlhelp32.pas

@@ -44,14 +44,21 @@
 {                                                                              }
 {******************************************************************************}
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit TlHelp32;
+{$ENDIF FPC_DOTTEDUNITS}
 
 {$mode objfpc}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+  WinApi.Windows;
+{$ELSE FPC_DOTTEDUNITS}
 uses
   windows;
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   libtoolhelp = 'toolhelp.dll';