Amiga: systemvartags and longarray removed, array of const -> array of PtrUInt

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@33222 3ad0048d-3df7-0310-abae-a5850022a9f2

49 files changed, 1023 insertions, 1266 deletions

diff --git a/packages/amunits/Makefile.fpc.fpcmake b/packages/amunits/Makefile.fpc.fpcmake
index 4dca390b00..46e01ecd0a 100644
--- a/packages/amunits/Makefile.fpc.fpcmake
+++ b/packages/amunits/Makefile.fpc.fpcmake
@@ -7,8 +7,8 @@ name=amunits
 version=3.1.1
 
 [target]
-units= amsgbox amigautils wbargs vartags pastoc tagsarray systemvartags deadkeys \
-       deadkeys consoleio pcq longarray linklist hisoft exec timerutils easyasl \
+units= amsgbox amigautils wbargs vartags pastoc tagsarray deadkeys \
+       deadkeys consoleio pcq linklist hisoft exec timerutils easyasl \
        doublebuffer intuition agraphics amigalib nonvolatile iffparse hardware  \
        expansion diskfont conunit amigados configvars keyboard bootblock icon  \
        cd realtime rexx translator scsidisk lowlevel configregs prefs parallel \
diff --git a/packages/amunits/examples/asltest.pas b/packages/amunits/examples/asltest.pas
index 169ffc1702..4b741f7950 100644
--- a/packages/amunits/examples/asltest.pas
+++ b/packages/amunits/examples/asltest.pas
@@ -1,6 +1,6 @@
 PROGRAM AslTest;
 
-uses Exec, Utility, Asl, amsgbox, systemvartags;
+uses Exec, Utility, Asl, amsgbox;
 
 
 {
diff --git a/packages/amunits/examples/bezier.pas b/packages/amunits/examples/bezier.pas
index f17f6d5f41..8b989a2ada 100644
--- a/packages/amunits/examples/bezier.pas
+++ b/packages/amunits/examples/bezier.pas
@@ -35,7 +35,7 @@ Program Bezier;
    nils.sjoholm@mailbox.swipnet.se
 }
 
-uses exec, intuition, agraphics, utility, systemvartags;
+uses exec, intuition, agraphics, utility;
 
 type
     PointRec = packed Record
diff --git a/packages/amunits/examples/bezier2.pas b/packages/amunits/examples/bezier2.pas
index f14a7fbc92..0302aff6a2 100644
--- a/packages/amunits/examples/bezier2.pas
+++ b/packages/amunits/examples/bezier2.pas
@@ -26,7 +26,7 @@ Program Bezier2;
    nils.sjoholm@mailbox.swipnet.se
 }
 
-uses exec, intuition, agraphics, utility, systemvartags;
+uses exec, intuition, agraphics, utility;
 
 type
     PointRec = Record
diff --git a/packages/amunits/examples/easygadtools.pas b/packages/amunits/examples/easygadtools.pas
index 2aff40b2ee..8eb6e6986b 100644
--- a/packages/amunits/examples/easygadtools.pas
+++ b/packages/amunits/examples/easygadtools.pas
@@ -15,7 +15,7 @@ PROGRAM EasyGadtools;
 
 }
 
-USES Intuition, Exec, AGraphics, GadTools, Utility, pastoc,systemvartags;
+USES Intuition, Exec, AGraphics, GadTools, Utility, pastoc;
 
 CONST
 
diff --git a/packages/amunits/examples/gtmenu.pas b/packages/amunits/examples/gtmenu.pas
index 96cd1ab086..75931f084a 100644
--- a/packages/amunits/examples/gtmenu.pas
+++ b/packages/amunits/examples/gtmenu.pas
@@ -16,7 +16,7 @@ Program GadtoolsMenu;
    nils.sjoholm@mailbox.swipnet.se
 }
 
-uses Exec, Intuition, Utility, GadTools, systemvartags;
+uses Exec, Intuition, Utility, GadTools;
 
 
 
diff --git a/packages/amunits/examples/imagegadget.pas b/packages/amunits/examples/imagegadget.pas
index feb11af070..f93788482e 100644
--- a/packages/amunits/examples/imagegadget.pas
+++ b/packages/amunits/examples/imagegadget.pas
@@ -21,7 +21,7 @@ PROGRAM ImageGadget;
    nils.sjoholm@mailbox.swipnet.se
 }
 
-USES Intuition, Exec, AGraphics, GadTools, Utility, systemvartags,pastoc;
+USES Intuition, Exec, AGraphics, GadTools, Utility,pastoc;
 
 
 CONST
diff --git a/packages/amunits/examples/moire.pas b/packages/amunits/examples/moire.pas
index 2499618cd4..e0d98b95ec 100644
--- a/packages/amunits/examples/moire.pas
+++ b/packages/amunits/examples/moire.pas
@@ -21,7 +21,7 @@ Program Moire;
       nils.sjoholm@mailbox.swipnet.se
 }
 
-uses Exec, Intuition, AGraphics, Utility, systemvartags;
+uses Exec, Intuition, AGraphics, Utility;
 
 
 const
diff --git a/packages/amunits/examples/otherlibs/openscreen.pas b/packages/amunits/examples/otherlibs/openscreen.pas
index f4df90085e..6d1b07166e 100644
--- a/packages/amunits/examples/otherlibs/openscreen.pas
+++ b/packages/amunits/examples/otherlibs/openscreen.pas
@@ -20,7 +20,7 @@ PROGRAM OpenScreen;
 }
 
 
-uses exec, amigados, agraphics, intuition, picasso96api, utility,systemvartags;
+uses exec, amigados, agraphics, intuition, picasso96api, utility;
 
 Const
 
@@ -89,11 +89,11 @@ BEGIN
     Dimensions[2]:=sc^.Width;
     Dimensions[3]:=sc^.Height-sc^.BarHeight-1;
 
-    wdp:=OpenWindowTags(NIL,[WA_CustomScreen, sc,
-                             WA_Title,'Writepixel',
+    wdp:=OpenWindowTags(NIL,[WA_CustomScreen, PtrUInt(sc),
+                             WA_Title,PtrUInt(PChar('Writepixel')),
                              WA_Left, (sc^.Width DIV 2-200) DIV 2+sc^.Width DIV 2,
                              WA_Top, (sc^.Height-sc^.BarHeight-300) DIV 2,
-                             WA_Zoom, @Dimensions,
+                             WA_Zoom, PtrUInt(@Dimensions),
                              WA_Width, 200,
                              WA_Height, 300,
                              WA_MinWidth, 100,
@@ -109,17 +109,17 @@ BEGIN
                              WA_SizeGadget, lTRUE,
                              WA_SizeBBottom, lTRUE,
                              WA_GimmeZeroZero, lTRUE,
-                             WA_ScreenTitle,ScreenTitle,
+                             WA_ScreenTitle, PtrUInt(PChar(ScreenTitle)),
                              WA_IDCMP, IDCMP_RAWKEY + IDCMP_CLOSEWINDOW,
                              TAG_DONE]);
 
     If wdp = Nil Then CleanUp('Unable to open window 1.');
 
-    wdf:=OpenWindowTags(NIL,[WA_CustomScreen,sc,
-                             WA_Title, 'FillRect',
+    wdf:=OpenWindowTags(NIL,[WA_CustomScreen, PtrUInt(sc),
+                             WA_Title, PtrUInt(PChar('FillRect')),
                              WA_Left,(sc^.Width div 2-200) div 2,
                              WA_Top,(sc^.Height-sc^.BarHeight-300)div 2,
-                             WA_Zoom, @Dimensions,
+                             WA_Zoom, PtrUInt(@Dimensions),
                              WA_Width, 200,
                              WA_Height, 300,
                              WA_MinWidth, 100,
@@ -135,7 +135,7 @@ BEGIN
                              WA_SizeGadget, lTRUE,
                              WA_SizeBBottom, lTRUE,
                              WA_GimmeZeroZero, lTRUE,
-                             WA_ScreenTitle, ScreenTitle,
+                             WA_ScreenTitle, PtrUInt(PChar(ScreenTitle)),
                              WA_IDCMP, IDCMP_RAWKEY or IDCMP_CLOSEWINDOW,
                              TAG_DONE]);
 
diff --git a/packages/amunits/examples/otherlibs/rtdemo.pas b/packages/amunits/examples/otherlibs/rtdemo.pas
index 400928ea23..e25568a064 100644
--- a/packages/amunits/examples/otherlibs/rtdemo.pas
+++ b/packages/amunits/examples/otherlibs/rtdemo.pas
@@ -24,7 +24,7 @@ PROGRAM RTDemo;
 
 }
 
-uses reqtools, strings, utility,longarray;
+uses reqtools, strings, utility;
 
 
 
@@ -88,8 +88,7 @@ BEGIN
     IF (ret=0) THEN
         rtEZRequestA('You entered nothing','I''m sorry', NIL, NIL, NIL)
     ELSE
-        rtEZRequestA('You entered this string:' + #10 + '%s','So I did', NIL,
-        readinlongs([buffer]),NIL);
+        rtEZRequestA('You entered this string:' + #10 + '%s','So I did', NIL, @buffer, NIL);
 
     ret := rtGetString(buffer, 127, 'Enter anything:', NIL,[
                 RTGS_GadFmt, ' _Ok |New _2.0 feature!|_Cancel',
diff --git a/packages/amunits/examples/otherlibs/writetruecolordata.pas b/packages/amunits/examples/otherlibs/writetruecolordata.pas
index ae31bbb67b..1166127b3f 100644
--- a/packages/amunits/examples/otherlibs/writetruecolordata.pas
+++ b/packages/amunits/examples/otherlibs/writetruecolordata.pas
@@ -17,7 +17,7 @@ Program WriteTrueColorData;
     nils.sjoholm@mailbox.swipnet.se
 }
 
-uses exec, amigados, intuition, agraphics, picasso96api, utility,systemvartags;
+uses exec, amigados, intuition, agraphics, picasso96api, utility;
 
 
 Const
@@ -91,8 +91,8 @@ Begin
                           P96SA_Height, height,
                           P96SA_Depth, depth,
                           P96SA_AutoScroll, lTRUE,
-                          P96SA_Pens, @Pens,
-                          P96SA_Title, 'WriteTrueColorData Test',
+                          P96SA_Pens, PtrUInt(@Pens),
+                          P96SA_Title, PtrUInt(PChar('WriteTrueColorData Test')),
                           TAG_DONE]);
 
 if sc = nil then CleanUp('Can''t open screen');
@@ -100,7 +100,7 @@ if sc = nil then CleanUp('Can''t open screen');
 
 
 
- win := OpenWindowTags(Nil,[WA_CustomScreen, sc,
+ win := OpenWindowTags(Nil,[WA_CustomScreen, PtrUInt(sc),
                             WA_Backdrop, lTRUE,
                             WA_Borderless, lTRUE,
                             WA_SimpleRefresh, lTRUE,
diff --git a/packages/amunits/examples/penshare.pas b/packages/amunits/examples/penshare.pas
index b3b412cf94..881a62029a 100644
--- a/packages/amunits/examples/penshare.pas
+++ b/packages/amunits/examples/penshare.pas
@@ -32,7 +32,7 @@ Program PenShare;
   nils.sjoholm@mailbox.swipnet.se
 }
 
-uses exec, agraphics, intuition, utility,systemvartags;
+uses exec, agraphics, intuition, utility;
 
 VAR RP : pRastPort;
     Win : pWindow;
diff --git a/packages/amunits/examples/snow.pas b/packages/amunits/examples/snow.pas
index a01ea9c01d..1d489f9a82 100644
--- a/packages/amunits/examples/snow.pas
+++ b/packages/amunits/examples/snow.pas
@@ -23,7 +23,7 @@ takes a long time, and frankly doesn't look as good as level 5.  }
 }
 
 
-uses exec,intuition,agraphics,utility,systemvartags;
+uses exec,intuition,agraphics,utility;
 
 
 
diff --git a/packages/amunits/examples/sortdemo.pas b/packages/amunits/examples/sortdemo.pas
index e94aa1c997..3a7b77e7b7 100644
--- a/packages/amunits/examples/sortdemo.pas
+++ b/packages/amunits/examples/sortdemo.pas
@@ -38,7 +38,7 @@ PROGRAM SortDemo;
     so you have to wait until it's finished.
 }
 
-uses Exec, Intuition, AGraphics, Utility, GadTools, amsgbox,systemvartags;
+uses Exec, Intuition, AGraphics, Utility, GadTools, amsgbox;
 
 
 CONST
diff --git a/packages/amunits/examples/stars.pas b/packages/amunits/examples/stars.pas
index 4075730a5a..1a64adfe9c 100644
--- a/packages/amunits/examples/stars.pas
+++ b/packages/amunits/examples/stars.pas
@@ -1,7 +1,7 @@
 PROGRAM Sterne;
 
 
-uses Exec, AGraphics, Intuition, Utility, systemvartags;
+uses Exec, AGraphics, Intuition, Utility;
 
 
 
diff --git a/packages/amunits/examples/talk2boopsi.pas b/packages/amunits/examples/talk2boopsi.pas
index 28de3a59d6..b1d6306938 100644
--- a/packages/amunits/examples/talk2boopsi.pas
+++ b/packages/amunits/examples/talk2boopsi.pas
@@ -28,7 +28,7 @@ make them  }
 
 }
 
-uses Exec, Intuition, Utility,amsgbox, systemvartags;
+uses Exec, Intuition, Utility,amsgbox;
 
 
 
diff --git a/packages/amunits/fpmake.pp b/packages/amunits/fpmake.pp
index 1517712b40..e034c711ea 100644
--- a/packages/amunits/fpmake.pp
+++ b/packages/amunits/fpmake.pp
@@ -39,11 +39,9 @@ begin
     T:=P.Targets.AddUnit('vartags.pas');
     T:=P.Targets.AddUnit('pastoc.pas');
     T:=P.Targets.AddUnit('tagsarray.pas');
-    T:=P.Targets.AddUnit('systemvartags.pas');
     T:=P.Targets.AddUnit('deadkeys.pas');
     T:=P.Targets.AddUnit('consoleio.pas');
     T:=P.Targets.AddUnit('pcq.pas');
-    T:=P.Targets.AddUnit('longarray.pas');
     T:=P.Targets.AddUnit('linklist.pas');
     T:=P.Targets.AddUnit('hisoft.pas');
     T:=P.Targets.AddUnit('timerutils.pas');
diff --git a/packages/amunits/src/coreunits/agraphics.pas b/packages/amunits/src/coreunits/agraphics.pas
index bad0aad741..230a86871b 100644
--- a/packages/amunits/src/coreunits/agraphics.pas
+++ b/packages/amunits/src/coreunits/agraphics.pas
@@ -2400,6 +2400,17 @@ FUNCTION WritePixelLine8(rp : pRastPort location 'a0'; xstart : ULONG location '
 FUNCTION XorRectRegion(region : pRegion location 'a0';const rectangle : pRectangle location 'a1') : LongBool; syscall GfxBase 558;
 FUNCTION XorRegionRegion(const srcRegion : pRegion location 'a0'; destRegion : pRegion location 'a1') : LongBool; syscall GfxBase 618;
 
+function AllocSpriteData(bm : pBitMap; Const argv : array of PtrUInt) : pExtSprite;
+function BestModeID(Const argv : array of PtrUInt) : ULONG;
+function ChangeExtSprite(vp : pViewPort; oldsprite : pExtSprite; newsprite : pExtSprite; Const argv : array of PtrUInt) : LONGINT;
+function ExtendFontTags(font : pTextFont; Const argv : array of PtrUInt) : ULONG;
+function GetExtSprite(ss : pExtSprite; Const argv : array of PtrUInt) : LONGINT;
+procedure GetRPAttrs(rp : pRastPort; Const argv : array of PtrUInt);
+function ObtainBestPen(cm : pColorMap; r : ULONG; g : ULONG; b : ULONG; Const argv : array of PtrUInt) : LONGINT;
+procedure SetRPAttrs(rp : pRastPort; Const argv : array of PtrUInt);
+function VideoControlTags(colorMap : pColorMap; Const argv : array of PtrUInt) : BOOLEAN;
+function WeighTAMatchTags(reqTextAttr : pTextAttr; targetTextAttr : pTextAttr; Const argv : array of PtrUInt) : smallint;
+
 { gfxmacros }
 
 PROCEDURE BNDRYOFF (w: pRastPort);
@@ -2426,6 +2437,56 @@ function RasSize(w, h: Word): Integer;
 
 IMPLEMENTATION
 
+function AllocSpriteData(bm : pBitMap; Const argv : array of PtrUInt) : pExtSprite;
+begin
+    AllocSpriteData := AllocSpriteDataA(bm,@argv);
+end;
+
+function BestModeID(Const argv : array of PtrUInt) : ULONG;
+begin
+    BestModeID := BestModeIDA(@argv);
+end;
+
+function ChangeExtSprite(vp : pViewPort; oldsprite : pExtSprite; newsprite : pExtSprite; Const argv : array of PtrUInt) : LONGINT;
+begin
+    ChangeExtSprite := ChangeExtSpriteA(vp,oldsprite,newsprite,@argv);
+end;
+
+function ExtendFontTags(font : pTextFont; Const argv : array of PtrUInt) : ULONG;
+begin
+    ExtendFontTags := ExtendFont(font,@argv);
+end;
+
+function GetExtSprite(ss : pExtSprite; Const argv : array of PtrUInt) : LONGINT;
+begin
+    GetExtSprite := GetExtSpriteA(ss,@argv);
+end;
+
+procedure GetRPAttrs(rp : pRastPort; Const argv : array of PtrUInt);
+begin
+    GetRPAttrsA(rp,@argv);
+end;
+
+function ObtainBestPen(cm : pColorMap; r : ULONG; g : ULONG; b : ULONG; Const argv : array of PtrUInt) : LONGINT;
+begin
+    ObtainBestPen := ObtainBestPenA(cm,r,g,b,@argv);
+end;
+
+procedure SetRPAttrs(rp : pRastPort; Const argv : array of PtrUInt);
+begin
+    SetRPAttrsA(rp,@argv);
+end;
+
+function VideoControlTags(colorMap : pColorMap; Const argv : array of PtrUInt) : BOOLEAN;
+begin
+    VideoControlTags := VideoControl(colorMap,@argv);
+end;
+
+function WeighTAMatchTags(reqTextAttr : pTextAttr; targetTextAttr : pTextAttr; Const argv : array of PtrUInt) : smallint;
+begin
+    WeighTAMatchTags := WeighTAMatch(reqTextAttr,targetTextAttr,@argv);
+end;
+
 PROCEDURE BNDRYOFF (w: pRastPort);
 BEGIN
     WITH w^ DO BEGIN
diff --git a/packages/amunits/src/coreunits/amigados.pas b/packages/amunits/src/coreunits/amigados.pas
index f02b475ca1..688d69ad17 100644
--- a/packages/amunits/src/coreunits/amigados.pas
+++ b/packages/amunits/src/coreunits/amigados.pas
@@ -1740,6 +1740,12 @@ FUNCTION WriteChars(const buf : pCHAR location 'd1'; buflen : ULONG location 'd2
 FUNCTION BADDR(bval :BPTR): POINTER;
 FUNCTION MKBADDR(adr: Pointer): BPTR;
 
+// var args version
+FUNCTION AllocDosObjectTags(type_ : ULONG; Const argv : Array of PtrUInt) : POINTER;
+FUNCTION CreateNewProcTags(Const argv : Array of PtrUInt) : pProcess;
+FUNCTION NewLoadSegTags(file_ : pCHAR; Const argv : Array of PtrUInt) : LONGINT;
+FUNCTION SystemTags(command : pCHAR; Const argv : Array of PtrUInt) : LONGINT;
+
 { overlay function and procedures}
 
 FUNCTION AddBuffers(const name : string; number : LONGINT) : BOOLEAN;
@@ -1824,6 +1830,26 @@ BEGIN
     MKBADDR := BPTR( LONGINT(adr) shr 2);
 END;
 
+FUNCTION AllocDosObjectTags(type_ : ULONG; Const argv : Array of PtrUInt) : POINTER;
+begin
+     AllocDosObjectTags := AllocDosObjectTagList(type_, @argv);
+end;
+
+FUNCTION CreateNewProcTags(Const argv : Array of PtrUInt) : pProcess;
+begin
+     CreateNewProcTags := CreateNewProcTagList(@argv);
+end;
+
+FUNCTION NewLoadSegTags(file_ : pCHAR; Const argv : Array of PtrUInt) : LONGINT;
+begin
+     NewLoadSegTags := NewLoadSegTagList(file_, @argv);
+end;
+
+FUNCTION SystemTags(command : pCHAR; Const argv : Array of PtrUInt) : LONGINT;
+begin
+     SystemTags := SystemTagList(command, @argv);
+end;
+
 FUNCTION AddBuffers(const name : string; number : LONGINT) : BOOLEAN;
 begin
      AddBuffers := AddBuffers(PChar(RawByteString(name)), number);
diff --git a/packages/amunits/src/coreunits/amigaguide.pas b/packages/amunits/src/coreunits/amigaguide.pas
index 9acac3fdab..e63dbba59f 100644
--- a/packages/amunits/src/coreunits/amigaguide.pas
+++ b/packages/amunits/src/coreunits/amigaguide.pas
@@ -17,7 +17,7 @@
 {
     History:
 
-    Added functions and procedures with array of const.
+    Added functions and procedures with array of PtrUInt.
     For use with fpc 1.0.7. They are in systemvartags.
     10 Nov 2002.
 
@@ -158,7 +158,7 @@ Type
 CONST
 { Types of cross reference nodes }
     XR_GENERIC     = 0;
-    XR_FUNCTION    = 1;
+    XR_function    = 1;
     XR_COMMAND     = 2;
     XR_INCLUDE     = 3;
     XR_MACRO       = 4;
@@ -244,32 +244,81 @@ VAR AmigaGuideBase : pLibrary = nil;
 const
     AMIGAGUIDENAME : Pchar = 'amigaguide.library';
 
-FUNCTION AddAmigaGuideHostA(h : pHook location 'a0'; name : pCHAR location 'd0'; attrs : pTagItem location 'a1') : POINTER; syscall AmigaGuideBase 138;
-FUNCTION AmigaGuideSignal(cl : POINTER location 'a0') : ULONG; syscall AmigaGuideBase 072;
-PROCEDURE CloseAmigaGuide(cl : POINTER location 'a0'); syscall AmigaGuideBase 066;
-PROCEDURE ExpungeXRef; syscall AmigaGuideBase 132;
-FUNCTION GetAmigaGuideAttr(tag : ULONG location 'd0'; cl : POINTER location 'a0'; storage : POINTER location 'a1') : LONGINT; syscall AmigaGuideBase 114;
-FUNCTION GetAmigaGuideMsg(cl : POINTER location 'a0') : pAmigaGuideMsg; syscall AmigaGuideBase 078;
-FUNCTION GetAmigaGuideString(id : LONGINT location 'd0') : pCHAR; syscall AmigaGuideBase 210;
-FUNCTION LoadXRef(lock : LONGINT location 'a0'; name : pCHAR location 'a1') : LONGINT; syscall AmigaGuideBase 126;
-FUNCTION LockAmigaGuideBase(handle : POINTER location 'a0') : LONGINT; syscall AmigaGuideBase 036;
-FUNCTION OpenAmigaGuideA(nag : pNewAmigaGuide location 'a0'; taglist : pTagItem location 'a1') : POINTER; syscall AmigaGuideBase 054;
-FUNCTION OpenAmigaGuideAsyncA(nag : pNewAmigaGuide location 'a0'; attrs : pTagItem location 'd0') : POINTER; syscall AmigaGuideBase 060;
-FUNCTION RemoveAmigaGuideHostA(hh : POINTER location 'a0'; attrs : pTagItem location 'a1') : LONGINT; syscall AmigaGuideBase 144;
-PROCEDURE ReplyAmigaGuideMsg(amsg : pAmigaGuideMsg location 'a0'); syscall AmigaGuideBase 084;
-FUNCTION SendAmigaGuideCmdA(cl : POINTER location 'a0'; cmd : pCHAR location 'd0'; attrs : pTagItem location 'd1') : LONGINT; syscall AmigaGuideBase 102;
-FUNCTION SendAmigaGuideContextA(cl : POINTER location 'a0'; attrs : pTagItem location 'd0') : LONGINT; syscall AmigaGuideBase 096;
-FUNCTION SetAmigaGuideAttrsA(cl : POINTER location 'a0'; attrs : pTagItem location 'a1') : LONGINT; syscall AmigaGuideBase 108;
-FUNCTION SetAmigaGuideContextA(cl : POINTER location 'a0'; id : ULONG location 'd0'; attrs : pTagItem location 'd1') : LONGINT; syscall AmigaGuideBase 090;
-PROCEDURE UnlockAmigaGuideBase(key : LONGINT location 'd0'); syscall AmigaGuideBase 042;
-
-IMPLEMENTATION
+function AddAmigaGuideHostA(h : pHook location 'a0'; name : pCHAR location 'd0'; attrs : pTagItem location 'a1') : POINTER; syscall AmigaGuideBase 138;
+function AmigaGuideSignal(cl : POINTER location 'a0') : ULONG; syscall AmigaGuideBase 072;
+procedure CloseAmigaGuide(cl : POINTER location 'a0'); syscall AmigaGuideBase 066;
+procedure ExpungeXRef; syscall AmigaGuideBase 132;
+function GetAmigaGuideAttr(tag : ULONG location 'd0'; cl : POINTER location 'a0'; storage : POINTER location 'a1') : LONGINT; syscall AmigaGuideBase 114;
+function GetAmigaGuideMsg(cl : POINTER location 'a0') : pAmigaGuideMsg; syscall AmigaGuideBase 078;
+function GetAmigaGuideString(id : LONGINT location 'd0') : pCHAR; syscall AmigaGuideBase 210;
+function LoadXRef(lock : LONGINT location 'a0'; name : pCHAR location 'a1') : LONGINT; syscall AmigaGuideBase 126;
+function LockAmigaGuideBase(handle : POINTER location 'a0') : LONGINT; syscall AmigaGuideBase 036;
+function OpenAmigaGuideA(nag : pNewAmigaGuide location 'a0'; taglist : pTagItem location 'a1') : POINTER; syscall AmigaGuideBase 054;
+function OpenAmigaGuideAsyncA(nag : pNewAmigaGuide location 'a0'; attrs : pTagItem location 'd0') : POINTER; syscall AmigaGuideBase 060;
+function RemoveAmigaGuideHostA(hh : POINTER location 'a0'; attrs : pTagItem location 'a1') : LONGINT; syscall AmigaGuideBase 144;
+procedure ReplyAmigaGuideMsg(amsg : pAmigaGuideMsg location 'a0'); syscall AmigaGuideBase 084;
+function SendAmigaGuideCmdA(cl : POINTER location 'a0'; cmd : pCHAR location 'd0'; attrs : pTagItem location 'd1') : LONGINT; syscall AmigaGuideBase 102;
+function SendAmigaGuideContextA(cl : POINTER location 'a0'; attrs : pTagItem location 'd0') : LONGINT; syscall AmigaGuideBase 096;
+function SetAmigaGuideAttrsA(cl : POINTER location 'a0'; attrs : pTagItem location 'a1') : LONGINT; syscall AmigaGuideBase 108;
+function SetAmigaGuideContextA(cl : POINTER location 'a0'; id : ULONG location 'd0'; attrs : pTagItem location 'd1') : LONGINT; syscall AmigaGuideBase 090;
+procedure UnlockAmigaGuideBase(key : LONGINT location 'd0'); syscall AmigaGuideBase 042;
+
+function AddAmigaGuideHost(h : pHook; name : pCHAR; Const argv : array of PtrUInt) : POINTER;
+function OpenAmigaGuide(nag : pNewAmigaGuide; Const argv : array of PtrUInt) : POINTER;
+function OpenAmigaGuideAsync(nag : pNewAmigaGuide; Const argv : array of PtrUInt) : POINTER;
+function RemoveAmigaGuideHost(hh : POINTER; Const argv : array of PtrUInt) : LONGINT;
+function SendAmigaGuideCmd(cl : POINTER; cmd : pCHAR; Const argv : array of PtrUInt) : LONGINT;
+function SendAmigaGuideContext(cl : POINTER; Const argv : array of PtrUInt) : LONGINT;
+function SetAmigaGuideAttrs(cl : POINTER; Const argv : array of PtrUInt) : LONGINT;
+function SetAmigaGuideContext(cl : POINTER; id : ULONG; Const argv : array of PtrUInt) : LONGINT;
+
+implementation
 
 const
     { Change VERSION and LIBVERSION to proper values }
     VERSION : string[2] = '0';
     LIBVERSION : longword = 0;
 
+function AddAmigaGuideHost(h : pHook; name : pCHAR; Const argv : array of PtrUInt) : POINTER;
+begin
+    AddAmigaGuideHost := AddAmigaGuideHostA(h, name, @argv);
+end;
+
+function OpenAmigaGuide(nag : pNewAmigaGuide; Const argv : array of PtrUInt) : POINTER;
+begin
+    OpenAmigaGuide := OpenAmigaGuideA(nag, @argv);
+end;
+
+function OpenAmigaGuideAsync(nag : pNewAmigaGuide; Const argv : array of PtrUInt) : POINTER;
+begin
+    OpenAmigaGuideAsync := OpenAmigaGuideAsyncA(nag,@argv);
+end;
+
+function RemoveAmigaGuideHost(hh : POINTER; Const argv : array of PtrUInt) : LONGINT;
+begin
+    RemoveAmigaGuideHost := RemoveAmigaGuideHostA(hh, @argv);
+end;
+
+function SendAmigaGuideCmd(cl : POINTER; cmd : pCHAR; Const argv : array of PtrUInt) : LONGINT;
+begin
+    SendAmigaGuideCmd := SendAmigaGuideCmdA(cl,cmd,@argv);
+end;
+
+function SendAmigaGuideContext(cl : POINTER; Const argv : array of PtrUInt) : LONGINT;
+begin
+    SendAmigaGuideContext := SendAmigaGuideContextA(cl, @argv);
+end;
+
+function SetAmigaGuideAttrs(cl : POINTER; Const argv : array of PtrUInt) : LONGINT;
+begin
+    SetAmigaGuideAttrs := SetAmigaGuideAttrsA(cl, @argv);
+end;
+
+function SetAmigaGuideContext(cl : POINTER; id : ULONG; Const argv : array of PtrUInt) : LONGINT;
+begin
+    SetAmigaGuideContext := SetAmigaGuideContextA(cl,id,@argv);
+end;
+
 initialization
   AmigaGuideBase := OpenLibrary(AMIGAGUIDENAME,LIBVERSION);
 finalization
diff --git a/packages/amunits/src/coreunits/asl.pas b/packages/amunits/src/coreunits/asl.pas
index b87bea65b2..18da51e93b 100644
--- a/packages/amunits/src/coreunits/asl.pas
+++ b/packages/amunits/src/coreunits/asl.pas
@@ -559,8 +559,22 @@ FUNCTION RequestFile(fileReq : pFileRequester location 'a0') : LongInt; syscall
 PROCEDURE AbortAslRequest(requester : POINTER location 'a0'); syscall AslBase 078;
 PROCEDURE ActivateAslRequest(requester : POINTER location 'a0'); syscall AslBase 084;
 
+function AllocAslRequestTags(reqType : ULONG; Const argv : array of PtrUInt) : POINTER;
+function AslRequestTags(requester : POINTER; Const argv : array of PtrUInt) : BOOLEAN;
+
 IMPLEMENTATION
 
+function AllocAslRequestTags(reqType : ULONG; Const argv : array of PtrUInt) : POINTER;
+begin
+    AllocAslRequestTags := AllocAslRequest(reqType,@argv);
+end;
+
+function AslRequestTags(requester : POINTER; Const argv : array of PtrUInt) : BOOLEAN;
+begin
+    AslRequestTags := AslRequest(requester,@argv) <> 0;
+end;
+
+
 const
     { Change VERSION and LIBVERSION to proper values }
     VERSION : string[2] = '0';
diff --git a/packages/amunits/src/coreunits/bullet.pas b/packages/amunits/src/coreunits/bullet.pas
index c3660f56dd..736c4092fc 100644
--- a/packages/amunits/src/coreunits/bullet.pas
+++ b/packages/amunits/src/coreunits/bullet.pas
@@ -380,9 +380,27 @@ FUNCTION OpenEngine : pGlyphEngine; syscall BulletBase 030;
 FUNCTION ReleaseInfoA(glyphEngine : pGlyphEngine location 'a0'; tagList : pTagItem location 'a1') : ULONG; syscall BulletBase 054;
 FUNCTION SetInfoA(glyphEngine : pGlyphEngine location 'a0'; tagList : pTagItem location 'a1') : ULONG; syscall BulletBase 042;
 
+function ObtainInfo(glyphEngine : pGlyphEngine; Const argv : array of PtrUInt) : ULONG;
+function ReleaseInfo(glyphEngine : pGlyphEngine; Const argv : array of PtrUInt) : ULONG;
+function SetInfo(glyphEngine : pGlyphEngine; Const argv : array of PtrUInt) : ULONG;
 
 IMPLEMENTATION
 
+function ObtainInfo(glyphEngine : pGlyphEngine; Const argv : array of PtrUInt) : ULONG;
+begin
+    ObtainInfo := ObtainInfoA(glyphEngine,@argv);
+end;
+
+function ReleaseInfo(glyphEngine : pGlyphEngine; Const argv : array of PtrUInt) : ULONG;
+begin
+    ReleaseInfo := releaseInfoA(glyphEngine,@argv);
+end;
+
+function SetInfo(glyphEngine : pGlyphEngine; Const argv : array of PtrUInt) : ULONG;
+begin
+    SetInfo := SetInfoA(glyphEngine,@argv);
+end;
+
 const
     { Change VERSION and LIBVERSION to proper values }
     VERSION : string[2] = '0';
diff --git a/packages/amunits/src/coreunits/datatypes.pas b/packages/amunits/src/coreunits/datatypes.pas
index 4decfc4f5f..f0954c62f9 100644
--- a/packages/amunits/src/coreunits/datatypes.pas
+++ b/packages/amunits/src/coreunits/datatypes.pas
@@ -1297,8 +1297,39 @@ FUNCTION ObtainDTDrawInfoA( o : pObject_ location 'a0'; attrs : pTagItem locatio
 FUNCTION DrawDTObjectA(rp : pRastPort location 'a0';  o : pObject_ location 'a1'; x : LONGINT location 'd0'; y : LONGINT location 'd1'; w : LONGINT location 'd2'; h : LONGINT location 'd3'; th : LONGINT location 'd4'; tv : LONGINT location 'd5'; attrs : pTagItem location 'a2') : LONGINT; syscall DataTypesBase 126;
 PROCEDURE ReleaseDTDrawInfo( o : pObject_ location 'a0'; handle : POINTER location 'a1'); syscall DataTypesBase 132;
 
+function GetDTAttrs(o : pObject_; Const argv : array of PtrUInt) : ULONG;
+function NewDTObject(name : POINTER; Const argv : array of PtrUInt): POINTER;
+function ObtainDataType(typ : ULONG; handle : POINTER; Const argv : array of PtrUInt) : pDataType;
+procedure RefreshDTObject(o : pObject_; win : pWindow; req : pRequester; Const argv : array of PtrUInt);
+function SetDTAttrs(o : pObject_; win : pWindow; req : pRequester; Const argv : array of PtrUInt) : ULONG;
+
 IMPLEMENTATION
 
+function GetDTAttrs(o : pObject_; Const argv : array of PtrUInt) : ULONG;
+begin
+    GetDTAttrs := GetDTAttrsA(o,@argv);
+end;
+
+function NewDTObject(name : POINTER; Const argv : array of PtrUInt): POINTER;
+begin
+    NewDTObject := NewDTObjectA(name,@argv);
+end;
+
+function ObtainDataType(typ : ULONG; handle : POINTER; Const argv : array of PtrUInt) : pDataType;
+begin
+    ObtainDataType := ObtainDataTypeA(typ,handle,@argv);
+end;
+procedure RefreshDTObject(o : pObject_; win : pWindow; req : pRequester; Const argv : array of PtrUInt);
+begin
+    RefreshDTObjectA(o,win,req,@argv);
+end;
+
+function SetDTAttrs(o : pObject_; win : pWindow; req : pRequester; Const argv : array of PtrUInt) : ULONG;
+begin
+    SetDTAttrs := SetDTAttrsA(o,win,req,@argv);
+end;
+
+
 const
     { Change VERSION and LIBVERSION to proper values }
     VERSION : string[2] = '0';
diff --git a/packages/amunits/src/coreunits/gadtools.pas b/packages/amunits/src/coreunits/gadtools.pas
index 8faddfc371..b67b8106d5 100644
--- a/packages/amunits/src/coreunits/gadtools.pas
+++ b/packages/amunits/src/coreunits/gadtools.pas
@@ -487,11 +487,60 @@ PROCEDURE GT_SetGadgetAttrsA(gad : pGadget location 'a0'; win : pWindow location
 FUNCTION LayoutMenuItemsA(firstitem : pMenuItem location 'a0'; vi : POINTER location 'a1'; const taglist : pTagItem location 'a2') : LongBool; syscall GadToolsBase 060;
 FUNCTION LayoutMenusA(firstmenu : pMenu location 'a0'; vi : POINTER location 'a1'; const taglist : pTagItem location 'a2') : LongBool; syscall GadToolsBase 066;
 
+function CreateGadget(kind : ULONG; gad : pGadget; ng : pNewGadget; Const argv : array of PtrUInt) : pGadget;
+function CreateMenus(newmenu : pNewMenu; Const argv : array of PtrUInt) : pMenu;
+procedure DrawBevelBox(rport : pRastPort; left : LONGINT; top : LONGINT; width : LONGINT; height : LONGINT; Const argv : array of PtrUInt);
+function GetVisualInfo(screen : pScreen; Const argv : array of PtrUInt) : POINTER;
+function GT_GetGadgetAttrs(gad : pGadget; win : pWindow; req : pRequester; Const argv : array of PtrUInt) : LONGINT;
+procedure GT_SetGadgetAttrs(gad : pGadget; win : pWindow; req : pRequester; Const argv : array of PtrUInt);
+function LayoutMenuItems(firstitem : pMenuItem; vi : POINTER; Const argv : array of PtrUInt) : BOOLEAN;
+function LayoutMenus(firstmenu : pMenu; vi : POINTER; Const argv : array of PtrUInt) : BOOLEAN;
+
 function GTMENUITEM_USERDATA(menuitem : pMenuItem): pointer;
 function GTMENU_USERDATA(menu : pMenu): pointer;
 
 IMPLEMENTATION
 
+function CreateGadget(kind : ULONG; gad : pGadget; ng : pNewGadget; Const argv : array of PtrUInt) : pGadget;
+begin
+    CreateGadget := CreateGadgetA(kind,gad,ng,@argv);
+end;
+
+function CreateMenus(newmenu : pNewMenu; Const argv : array of PtrUInt) : pMenu;
+begin
+    CreateMenus := CreateMenusA(newmenu,@argv);
+end;
+
+procedure DrawBevelBox(rport : pRastPort; left : LONGINT; top : LONGINT; width : LONGINT; height : LONGINT; Const argv : array of PtrUInt);
+begin
+    DrawBevelBoxA(rport,left,top,width,height,@argv);
+end;
+
+function GetVisualInfo(screen : pScreen; Const argv : array of PtrUInt) : POINTER;
+begin
+    GetVisualInfo := GetVisualInfoA(screen,@argv);
+end;
+
+function GT_GetGadgetAttrs(gad : pGadget; win : pWindow; req : pRequester; Const argv : array of PtrUInt) : LONGINT;
+begin
+    GT_GetGadgetAttrs := GT_GetGadgetAttrsA(gad,win,req,@argv);
+end;
+
+procedure GT_SetGadgetAttrs(gad : pGadget; win : pWindow; req : pRequester; Const argv : array of PtrUInt);
+begin
+    GT_SetGadgetAttrsA(gad,win,req,@argv);
+end;
+
+function LayoutMenuItems(firstitem : pMenuItem; vi : POINTER; Const argv : array of PtrUInt) : BOOLEAN;
+begin
+    LayoutMenuItems := LayoutMenuItemsA(firstitem,vi,@argv);
+end;
+
+function LayoutMenus(firstmenu : pMenu; vi : POINTER; Const argv : array of PtrUInt) : BOOLEAN;
+begin
+    LayoutMenus := LayoutMenusA(firstmenu,vi,@argv);
+end;
+
 function GTMENUITEM_USERDATA(menuitem : pMenuItem): pointer;
 begin
     GTMENUITEM_USERDATA := pointer((pMenuItem(menuitem)+1));
diff --git a/packages/amunits/src/coreunits/intuition.pas b/packages/amunits/src/coreunits/intuition.pas
index 42ab0cd47c..82f69f2075 100644
--- a/packages/amunits/src/coreunits/intuition.pas
+++ b/packages/amunits/src/coreunits/intuition.pas
@@ -4187,6 +4187,16 @@ PROCEDURE WindowToBack(window : pWindow location 'a0'); syscall _IntuitionBase 3
 PROCEDURE WindowToFront(window : pWindow location 'a0'); syscall _IntuitionBase 312;
 PROCEDURE ZipWindow(window : pWindow location 'a0'); syscall _IntuitionBase 504;
 
+function OpenScreenTags(newScreen : pNewScreen; tagList : array of PtrUInt) : pScreen;
+function OpenWindowTags(newWindow : pNewWindow; tagList : array of PtrUInt) : pWindow;
+function NewObject(classPtr : pIClass; classID : pCHAR; Const argv : array of PtrUInt) : POINTER;
+function SetAttrs(obj : POINTER; tags: array of DWord) : ULONG;
+function SetGadgetAttrs(gadget : pGadget; window : pWindow; requester : pRequester; Const argv : array of PtrUInt) : ULONG;
+function NewObject(classPtr : pIClass; classID : string; Const argv : array of PtrUInt ) : POINTER;
+function EasyRequest(window : pWindow;const easyStruct : pEasyStruct; idcmpPtr : pULONG; args : array of DWord) : LONGINT;
+procedure SetWindowPointer(win : pWindow; tags: array of DWord);
+
+
 { Intuition macros }
 function INST_DATA (cl: pIClass; o: p_Object): Pointer;
 function SIZEOF_INSTANCE (cl: pIClass): Longint;
@@ -4219,6 +4229,46 @@ PROCEDURE UnlockPubScreen(const name : string; screen : pScreen);
 
 IMPLEMENTATION
 
+function OpenScreenTags(newScreen : pNewScreen; tagList : array of PtrUInt) : pScreen;
+begin
+    OpenScreenTags := OpenScreenTagList(newScreen, @tagList);
+end;
+
+function OpenWindowTags(newWindow : pNewWindow; tagList : array of PtrUInt) : pWindow;
+begin
+    OpenWindowTags := OpenWindowTagList(newWindow, @tagList);
+end;
+
+function NewObject(classPtr : pIClass; classID : pCHAR; Const argv : array of PtrUInt) : POINTER;
+begin
+    NewObject := NewObjectA(classPtr,classID, @argv);
+end;
+
+function NewObject(classPtr : pIClass; classID : string; Const argv : array of PtrUInt ) : POINTER;
+begin
+      NewObject := NewObjectA(classPtr,PChar(RawByteString(classID)),@argv);
+end;
+
+function SetAttrs(obj : POINTER; tags: array of DWord) : ULONG;
+begin
+  SetAttrs := SetAttrsA(obj, @tags);
+end;
+
+function SetGadgetAttrs(gadget : pGadget; window : pWindow; requester : pRequester; Const argv : array of PtrUInt) : ULONG;
+begin
+    SetGadgetAttrs := SetGadgetAttrsA(gadget,window,requester,@argv);
+end;
+
+function EasyRequest(window : pWindow;const easyStruct : pEasyStruct; idcmpPtr : pULONG; args : array of DWord) : LONGINT;
+begin
+  EasyRequest := EasyRequestArgs(window, easystruct, idcmpptr, @args);
+end;
+
+procedure SetWindowPointer(win : pWindow; tags: array of DWord);
+begin
+  SetWindowPointerA(win, @tags);
+end;
+
 function INST_DATA (cl: pIClass; o: p_Object): Pointer; inline;
 begin
     INST_DATA := Pointer(Longint(o) + cl^.cl_InstOffset);
diff --git a/packages/amunits/src/coreunits/locale.pas b/packages/amunits/src/coreunits/locale.pas
index 66db3d1307..5b29ac0787 100644
--- a/packages/amunits/src/coreunits/locale.pas
+++ b/packages/amunits/src/coreunits/locale.pas
@@ -292,8 +292,15 @@ FUNCTION ParseDate(locale : pLocale location 'a0'; date : pDateStamp location 'a
 FUNCTION StrConvert(locale : pLocale location 'a0'; string1 : pCHAR location 'a1'; buffer : POINTER location 'a2'; bufferSize : ULONG location 'd0'; typ : ULONG location 'd1') : ULONG; syscall LocaleBase 174;
 FUNCTION StrnCmp(locale : pLocale location 'a0'; string1 : pCHAR location 'a1'; string2 : pCHAR location 'a2'; length : LONGINT location 'd0'; typ : ULONG location 'd1') : LONGINT; syscall LocaleBase 180;
 
+function OpenCatalog(locale : pLocale; name : pCHAR; Const argv : array of PtrUInt) : pCatalog;
+
 IMPLEMENTATION
 
+function OpenCatalog(locale : pLocale; name : pCHAR; Const argv : array of PtrUInt) : pCatalog;
+begin
+    OpenCatalog := OpenCatalogA(locale,name,@argv);
+end;
+
 const
     { Change VERSION and LIBVERSION to proper values }
     VERSION : string[2] = '0';
diff --git a/packages/amunits/src/coreunits/lowlevel.pas b/packages/amunits/src/coreunits/lowlevel.pas
index 174e81725a..3cce84a506 100644
--- a/packages/amunits/src/coreunits/lowlevel.pas
+++ b/packages/amunits/src/coreunits/lowlevel.pas
@@ -279,8 +279,21 @@ PROCEDURE StartTimerInt(intHandle : POINTER location 'a1'; timeInterval : ULONG
 PROCEDURE StopTimerInt(intHandle : POINTER location 'a1'); syscall LowLevelBase 090;
 FUNCTION SystemControlA(const tagList : pTagItem location 'a1') : ULONG; syscall LowLevelBase 072;
 
+function SetJoyPortAttrs(portNumber : ULONG; Const argv : array of PtrUInt) : BOOLEAN;
+function SystemControl(Const argv : array of PtrUInt) : ULONG;
+
 IMPLEMENTATION
 
+function SetJoyPortAttrs(portNumber : ULONG; Const argv : array of PtrUInt) : BOOLEAN;
+begin
+    SetJoyPortAttrs := SetJoyPortAttrsA(portNumber,@argv);
+end;
+
+function SystemControl(Const argv : array of PtrUInt) : ULONG;
+begin
+    SystemControl := SystemControlA(@argv);
+end;
+
 const
     { Change VERSION and LIBVERSION to proper values }
     VERSION : string[2] = '0';
diff --git a/packages/amunits/src/coreunits/realtime.pas b/packages/amunits/src/coreunits/realtime.pas
index 1bc99928fc..c56b3c4de4 100644
--- a/packages/amunits/src/coreunits/realtime.pas
+++ b/packages/amunits/src/coreunits/realtime.pas
@@ -248,8 +248,27 @@ FUNCTION SetConductorState(player : pPlayer location 'a0'; state : ULONG locatio
 FUNCTION SetPlayerAttrsA(player : pPlayer location 'a0'; const tagList : pTagItem location 'a1') : WordBool; syscall RealTimeBase 054;
 PROCEDURE UnlockRealTime(lock : POINTER location 'a0'); syscall RealTimeBase 036;
 
+function CreatePlayer(Const argv : array of PtrUInt) : pPlayer;
+function GetPlayerAttrs(player : pPlayer; Const argv : array of PtrUInt) : ULONG;
+function SetPlayerAttrs(player : pPlayer; Const argv : array of PtrUInt) : BOOLEAN;
+
 IMPLEMENTATION
 
+function CreatePlayer(Const argv : array of PtrUInt) : pPlayer;
+begin
+    CreatePlayer := CreatePlayerA(@argv);
+end;
+
+function GetPlayerAttrs(player : pPlayer; Const argv : array of PtrUInt) : ULONG;
+begin
+    GetPlayerAttrs := GetPlayerAttrsA(player,@argv);
+end;
+
+function SetPlayerAttrs(player : pPlayer; Const argv : array of PtrUInt) : BOOLEAN;
+begin
+    SetPlayerAttrs := SetPlayerAttrsA(player,@argv);
+end;
+
 const
     { Change VERSION and LIBVERSION to proper values }
     VERSION : string[2] = '0';
diff --git a/packages/amunits/src/coreunits/utility.pas b/packages/amunits/src/coreunits/utility.pas
index 68cfc09e36..2721c8e4a8 100644
--- a/packages/amunits/src/coreunits/utility.pas
+++ b/packages/amunits/src/coreunits/utility.pas
@@ -379,6 +379,8 @@ function UMult32(Arg1: ULONG location 'd0'; Arg2 : ULONG location 'd1') : ULONG;
 function UMult64(Arg1: ULONG location 'd0'; Arg2 : ULONG location 'd1') : ULONG; syscall _UtilityBase 204;
 function UnpackStructureTags(const pac: APTR location 'a0';const packTable: pULONG location 'a1';TagList : pTagItem location 'a2') : ULONG; syscall _UtilityBase 216;
 
+function AllocNamedObject(name : STRPTR; Const argv : array of PtrUInt) : pNamedObject;
+
 function AllocNamedObjectA(const name : string;const TagList : pTagItem) : pNamedObject;
 FUNCTION FindNamedObject(nameSpace : pNamedObject; CONST name : string; lastObject : pNamedObject) : pNamedObject;
 FUNCTION Stricmp(CONST string1 : string; CONST string2 : pCHAR) : LONGINT;
@@ -391,6 +393,11 @@ FUNCTION Strnicmp(CONST string1 : string; CONST string2 : string; length : LONGI
 
 IMPLEMENTATION
 
+function AllocNamedObject(name : STRPTR; Const argv : array of PtrUInt) : pNamedObject;
+begin
+    AllocNamedObject := AllocNamedObjectA(name,@argv);
+end;
+
 
 function AllocNamedObjectA(const name : string;const TagList : pTagItem) : pNamedObject;
 begin
diff --git a/packages/amunits/src/coreunits/workbench.pas b/packages/amunits/src/coreunits/workbench.pas
index 69a773e889..1089d62531 100644
--- a/packages/amunits/src/coreunits/workbench.pas
+++ b/packages/amunits/src/coreunits/workbench.pas
@@ -866,6 +866,9 @@ FUNCTION OpenWorkbenchObjectA(name : pCHAR location 'a0'; const tags : pTagItem
 FUNCTION RemoveAppWindowDropZone(aw : pAppWindow location 'a0'; dropZone : pAppWindowDropZone location 'a1') : longbool; syscall WorkbenchBase 120;
 FUNCTION WorkbenchControlA(name : pCHAR location 'a0'; const tags : pTagItem location 'a1') : longbool; syscall WorkbenchBase 108;
 
+function AddAppMenuItem(id : ULONG; userdata : ULONG; text_ : pCHAR; msgport : pMsgPort; Const argv : array of PtrUInt) : pAppMenuItem;
+function AddAppWindow(id : ULONG; userdata : ULONG; window : pWindow; msgport : pMsgPort; Const argv : array of PtrUInt) : pAppWindow;
+
 { overlays }
 FUNCTION AddAppIconA(id : ULONG; userdata : ULONG; const text_ : RawByteString; msgport : pMsgPort; lock : pFileLock; diskobj : pDiskObject;const taglist : pTagItem) : pAppIcon;
 FUNCTION AddAppMenuItemA(id : ULONG; userdata : ULONG; const text_ : RawByteString; msgport : pMsgPort;const taglist : pTagItem) : pAppMenuItem;
@@ -879,6 +882,16 @@ FUNCTION WorkbenchControlA(const name : RawByteString;const tags : pTagItem) : B
 
 IMPLEMENTATION
 
+function AddAppMenuItem(id : ULONG; userdata : ULONG; text_ : pCHAR; msgport : pMsgPort; Const argv : array of PtrUInt) : pAppMenuItem;
+begin
+    AddAppMenuItem := AddAppMenuItemA(id,userdata,text_,msgport,@argv);
+end;
+
+function AddAppWindow(id : ULONG; userdata : ULONG; window : pWindow; msgport : pMsgPort; Const argv : array of PtrUInt) : pAppWindow;
+begin
+    AddAppWindow := AddAppWindowA(id,userdata,window,msgport,@argv);
+end;
+
 FUNCTION AddAppIconA(id : ULONG; userdata : ULONG; const text_ : RawByteString; msgport : pMsgPort; lock : pFileLock; diskobj : pDiskObject;const taglist : pTagItem) : pAppIcon;
 begin
        AddAppIconA := AddAppIconA(id,userdata,PChar(text_),msgport,lock,diskobj,taglist);
diff --git a/packages/amunits/src/otherlibs/ahi.pas b/packages/amunits/src/otherlibs/ahi.pas
index a981558594..31f2c4229d 100644
--- a/packages/amunits/src/otherlibs/ahi.pas
+++ b/packages/amunits/src/otherlibs/ahi.pas
@@ -29,7 +29,6 @@
 }
 {$PACKRECORDS 2}
 
-{$mode objfpc}
 
 UNIT AHI;
 
@@ -522,57 +521,54 @@ PROCEDURE AHI_SetVol(Channel : WORD location 'd0'; Volume : LONGINT location 'd1
 PROCEDURE AHI_UnloadSound(Sound : WORD location 'd0'; Audioctrl : pAHIAudioCtrl location 'a2'); syscall AHIBase 96;
 
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AHI_AllocAudio(const tagList : Array Of Const) : pAHIAudioCtrl;
-FUNCTION AHI_AllocAudioRequest(const tagList : Array Of Const) : pAHIAudioModeRequester;
-FUNCTION AHI_AudioRequest(Requester : pAHIAudioModeRequester; const tagList : Array Of Const) : BOOLEAN;
-FUNCTION AHI_BestAudioID(const tagList : Array Of Const) : longword;
-FUNCTION AHI_ControlAudio(AudioCtrl : pAHIAudioCtrl; const tagList : Array Of Const) : longword;
-FUNCTION AHI_GetAudioAttrs(ID : longword; Audioctrl : pAHIAudioCtrl; const tagList : Array Of Const) : BOOLEAN;
-PROCEDURE AHI_Play(Audioctrl : pAHIAudioCtrl; const tagList : Array Of Const);
+FUNCTION AHI_AllocAudio(const tagList : array of PtrUInt) : pAHIAudioCtrl;
+FUNCTION AHI_AllocAudioRequest(const tagList : array of PtrUInt) : pAHIAudioModeRequester;
+FUNCTION AHI_AudioRequest(Requester : pAHIAudioModeRequester; const tagList : array of PtrUInt) : BOOLEAN;
+FUNCTION AHI_BestAudioID(const tagList : array of PtrUInt) : longword;
+FUNCTION AHI_ControlAudio(AudioCtrl : pAHIAudioCtrl; const tagList : array of PtrUInt) : longword;
+FUNCTION AHI_GetAudioAttrs(ID : longword; Audioctrl : pAHIAudioCtrl; const tagList : array of PtrUInt) : BOOLEAN;
+PROCEDURE AHI_Play(Audioctrl : pAHIAudioCtrl; const tagList : array of PtrUInt);
 
 IMPLEMENTATION
 
-uses
-tagsarray;
-
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AHI_AllocAudio(const tagList : Array Of Const) : pAHIAudioCtrl;
+FUNCTION AHI_AllocAudio(const tagList : array of PtrUInt) : pAHIAudioCtrl;
 begin
-    AHI_AllocAudio := AHI_AllocAudioA(readintags(tagList));
+    AHI_AllocAudio := AHI_AllocAudioA(@TagList);
 end;
 
-FUNCTION AHI_AllocAudioRequest(const tagList : Array Of Const) : pAHIAudioModeRequester;
+FUNCTION AHI_AllocAudioRequest(const tagList : array of PtrUInt) : pAHIAudioModeRequester;
 begin
-    AHI_AllocAudioRequest := AHI_AllocAudioRequestA(readintags(tagList));
+    AHI_AllocAudioRequest := AHI_AllocAudioRequestA(@TagList);
 end;
 
-FUNCTION AHI_AudioRequest(Requester : pAHIAudioModeRequester; const tagList : Array Of Const) : BOOLEAN;
+FUNCTION AHI_AudioRequest(Requester : pAHIAudioModeRequester; const tagList : array of PtrUInt) : BOOLEAN;
 begin
-    AHI_AudioRequest := AHI_AudioRequestA(Requester , readintags(tagList));
+    AHI_AudioRequest := AHI_AudioRequestA(Requester , @TagList);
 end;
 
-FUNCTION AHI_BestAudioID(const tagList : Array Of Const) : longword;
+FUNCTION AHI_BestAudioID(const tagList : array of PtrUInt) : longword;
 begin
-    AHI_BestAudioID := AHI_BestAudioIDA(readintags(tagList));
+    AHI_BestAudioID := AHI_BestAudioIDA(@TagList);
 end;
 
-FUNCTION AHI_ControlAudio(AudioCtrl : pAHIAudioCtrl; const tagList : Array Of Const) : longword;
+FUNCTION AHI_ControlAudio(AudioCtrl : pAHIAudioCtrl; const tagList : array of PtrUInt) : longword;
 begin
-    AHI_ControlAudio := AHI_ControlAudioA(AudioCtrl , readintags(tagList));
+    AHI_ControlAudio := AHI_ControlAudioA(AudioCtrl , @TagList);
 end;
 
-FUNCTION AHI_GetAudioAttrs(ID : longword; Audioctrl : pAHIAudioCtrl; const tagList : Array Of Const) : BOOLEAN;
+FUNCTION AHI_GetAudioAttrs(ID : longword; Audioctrl : pAHIAudioCtrl; const tagList : array of PtrUInt) : BOOLEAN;
 begin
-    AHI_GetAudioAttrs := AHI_GetAudioAttrsA(ID , Audioctrl , readintags(tagList));
+    AHI_GetAudioAttrs := AHI_GetAudioAttrsA(ID , Audioctrl , @TagList);
 end;
 
-PROCEDURE AHI_Play(Audioctrl : pAHIAudioCtrl; const tagList : Array Of Const);
+PROCEDURE AHI_Play(Audioctrl : pAHIAudioCtrl; const tagList : array of PtrUInt);
 begin
-    AHI_PlayA(Audioctrl , readintags(tagList));
+    AHI_PlayA(Audioctrl , @TagList);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/amarquee.pas b/packages/amunits/src/otherlibs/amarquee.pas
index 7b7fbef130..77522e8664 100644
--- a/packages/amunits/src/otherlibs/amarquee.pas
+++ b/packages/amunits/src/otherlibs/amarquee.pas
@@ -22,7 +22,7 @@
   in here. If you find any bugs please let me know.
   25 Aug 2000.
 
-  Added functions and procedures with array of const.
+  Added functions and procedures with array of PtrUInt.
   For use with fpc 1.0.7
   30 Nov 2002.
 
@@ -37,7 +37,6 @@
 
 }
 
-{$mode objfpc}
 {$I useamigasmartlink.inc}
 {$ifdef use_amiga_smartlink}
     {$smartlink on}
@@ -249,17 +248,17 @@ PROCEDURE QDeleteSharedMessagePort(mp : pQSharedMessagePort location 'a0'); sysc
 FUNCTION QGetLocalIP(session : pQSession location 'a0') : pCHAR; syscall AMarqueeBase 312;
 
 {
-     This is functions and procedures with array of const.
+     This is functions and procedures with array of PtrUInt.
      For use with fpc 1.0 and above.
 
 }
-FUNCTION QNewSocketSessiontags(host : pCHar; port : LONGINT; const argv : Array Of Const) : pQSession;
-FUNCTION QNewSocketSessionAsyncTags(host : pCHar; port : LONGINT; const argv : Array Of Const) : pQSession;
-FUNCTION QNewSocketServerSessionTags( port : pLONGINT; const argv : Array Of Const) : pQSession;
-FUNCTION QNewSessionTags(host : pCHar; port : LONGINT; name : pCHar; const argv : Array Of Const) : pQSession;
-FUNCTION QNewSessionAsyncTags(host : pCHar; port : LONGINT; name : pCHar; const argv : Array Of Const) : pQSession;
-FUNCTION QNewHostSessionTags(hostnames : pCHar; port : pLONGINT; names : pCHar; const argv : Array Of Const) : pQSession;
-FUNCTION QNewServerSessionTags(hostNames : pCHar; progNames : pCHar; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSocketSessiontags(host : pCHar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessionAsyncTags(host : pCHar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketServerSessionTags( port : pLONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionTags(host : pCHar; port : LONGINT; name : pCHar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionAsyncTags(host : pCHar; port : LONGINT; name : pCHar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewHostSessionTags(hostnames : pCHar; port : pLONGINT; names : pCHar; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewServerSessionTags(hostNames : pCHar; progNames : pCHar; const argv : array of PtrUInt) : pQSession;
 
 
 FUNCTION QDebugOp(session : pQSession; string_ : string) : LONGINT;
@@ -286,21 +285,21 @@ FUNCTION QNewHostSession(hostnames : string; port : pLONGINT; names : string; ta
 FUNCTION QNewServerSession(hostNames : string; progNames : string; taglist : pTagItem) : pQSession;
 
 {
-     This is functions and procedures with array of const.
+     This is functions and procedures with array of PtrUInt.
      For use with fpc 1.0 and above.
 }
 
-FUNCTION QNewSocketSessionTags(host : string; port : LONGINT; const argv : Array Of Const) : pQSession;
-FUNCTION QNewSocketSessionAsyncTags(host : string; port : LONGINT; const argv : Array Of Const) : pQSession;
-FUNCTION QNewSessionTags(host : string; port : LONGINT; name : string; const argv : Array Of Const) : pQSession;
-FUNCTION QNewSessionAsyncTags(host : string; port : LONGINT; name : string; const argv : Array Of Const) : pQSession;
-FUNCTION QNewHostSessionTags(hostnames : string; port : pLONGINT; names : string; const argv : Array Of Const) : pQSession;
-FUNCTION QNewServerSessionTags(hostNames : string; progNames : string; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSocketSessionTags(host : string; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSocketSessionAsyncTags(host : string; port : LONGINT; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionTags(host : string; port : LONGINT; name : string; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewSessionAsyncTags(host : string; port : LONGINT; name : string; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewHostSessionTags(hostnames : string; port : pLONGINT; names : string; const argv : array of PtrUInt) : pQSession;
+FUNCTION QNewServerSessionTags(hostNames : string; progNames : string; const argv : array of PtrUInt) : pQSession;
 
 IMPLEMENTATION
 
 uses
-  pastoc,tagsarray;
+  pastoc;
 
 FUNCTION QDebugOp(session : pQSession; string_ : string) : LONGINT;
 begin
@@ -412,70 +411,70 @@ begin
     QNewServerSession := QNewServerSession(pas2c(hostnames),pas2c(prognames),taglist);
 end;
 
-FUNCTION QNewSocketSessiontags(host : pCHar; port : LONGINT; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSocketSessiontags(host : pCHar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewSocketSessiontags := QNewSocketSession(host,port,readintags(argv));
+    QNewSocketSessiontags := QNewSocketSession(host,port,@argv);
 end;
 
-FUNCTION QNewSocketSessionAsyncTags(host : pCHar; port : LONGINT; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSocketSessionAsyncTags(host : pCHar; port : LONGINT; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewSocketSessionAsyncTags := QNewSocketSessionAsync(host,port,readintags(argv));
+    QNewSocketSessionAsyncTags := QNewSocketSessionAsync(host,port,@argv);
 end;
 
-FUNCTION QNewSocketServerSessionTags( port : pLONGINT; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSocketServerSessionTags( port : pLONGINT; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewSocketServerSessionTags := QNewSocketServerSession(port,readintags(argv));
+    QNewSocketServerSessionTags := QNewSocketServerSession(port,@argv);
 end;
 
-FUNCTION QNewSessionTags(host : pCHar; port : LONGINT; name : pCHar; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSessionTags(host : pCHar; port : LONGINT; name : pCHar; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewSessionTags := QNewSession(host,port,name,readintags(argv));
+    QNewSessionTags := QNewSession(host,port,name,@argv);
 end;
 
-FUNCTION QNewSessionAsyncTags(host : pCHar; port : LONGINT; name : pCHar; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSessionAsyncTags(host : pCHar; port : LONGINT; name : pCHar; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewSessionAsyncTags := QNewSessionAsync(host,port,name,readintags(argv));
+    QNewSessionAsyncTags := QNewSessionAsync(host,port,name,@argv);
 end;
 
-FUNCTION QNewHostSessionTags(hostnames : pCHar; port : pLONGINT; names : pCHar; const argv : Array Of Const) : pQSession;
+FUNCTION QNewHostSessionTags(hostnames : pCHar; port : pLONGINT; names : pCHar; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewHostSessionTags := QNewHostSession(hostnames,port,names,readintags(argv));
+    QNewHostSessionTags := QNewHostSession(hostnames,port,names,@argv);
 end;
 
-FUNCTION QNewServerSessionTags(hostNames : pCHar; progNames : pCHar; const argv : Array Of Const) : pQSession;
+FUNCTION QNewServerSessionTags(hostNames : pCHar; progNames : pCHar; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewServerSessionTags := QNewServerSession(hostnames,prognames,readintags(argv));
+    QNewServerSessionTags := QNewServerSession(hostnames,prognames,@argv);
 end;
 
 
-FUNCTION QNewSocketSessionTags(host : string; port : LONGINT; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSocketSessionTags(host : string; port : LONGINT; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewSocketSessionTags := QNewSocketSession(host,port,readintags(argv));
+    QNewSocketSessionTags := QNewSocketSession(host,port,@argv);
 end;
 
-FUNCTION QNewSocketSessionAsyncTags(host : string; port : LONGINT; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSocketSessionAsyncTags(host : string; port : LONGINT; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewSocketSessionAsyncTags := QNewSocketSessionAsync(host,port,readintags(argv));
+    QNewSocketSessionAsyncTags := QNewSocketSessionAsync(host,port,@argv);
 end;
 
-FUNCTION QNewSessionTags(host : string; port : LONGINT; name : string; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSessionTags(host : string; port : LONGINT; name : string; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewSessionTags := QNewSession(host,port,name,readintags(argv));
+    QNewSessionTags := QNewSession(host,port,name,@argv);
 end;
 
-FUNCTION QNewSessionAsyncTags(host : string; port : LONGINT; name : string; const argv : Array Of Const) : pQSession;
+FUNCTION QNewSessionAsyncTags(host : string; port : LONGINT; name : string; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewSessionAsyncTags := QNewSessionAsync(host,port,name,readintags(argv));
+    QNewSessionAsyncTags := QNewSessionAsync(host,port,name,@argv);
 end;
 
-FUNCTION QNewHostSessionTags(hostnames : string; port : pLONGINT; names : string; const argv : Array Of Const) : pQSession;
+FUNCTION QNewHostSessionTags(hostnames : string; port : pLONGINT; names : string; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewHostSessionTags := QNewHostSession(hostnames,port,names,readintags(argv));
+    QNewHostSessionTags := QNewHostSession(hostnames,port,names,@argv);
 end;
 
-FUNCTION QNewServerSessionTags(hostNames : string; progNames : string; const argv : Array Of Const) : pQSession;
+FUNCTION QNewServerSessionTags(hostNames : string; progNames : string; const argv : array of PtrUInt) : pQSession;
 begin
-    QNewServerSessionTags := QNewServerSession(hostnames,prognames,readintags(argv));
+    QNewServerSessionTags := QNewServerSession(hostnames,prognames,@argv);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/cybergraphics.pas b/packages/amunits/src/otherlibs/cybergraphics.pas
index 952251529b..3151207bd6 100644
--- a/packages/amunits/src/otherlibs/cybergraphics.pas
+++ b/packages/amunits/src/otherlibs/cybergraphics.pas
@@ -28,8 +28,6 @@
   nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
-{$mode objfpc}
-
 UNIT CYBERGRAPHICS;
 
 INTERFACE
@@ -243,59 +241,56 @@ FUNCTION WriteLUTPixelArray(srcRect : POINTER location 'a0'; SrcX : WORD locatio
 FUNCTION WritePixelArray(srcRect : POINTER location 'a0'; SrcX : WORD location 'd0'; SrcY : WORD location 'd1'; SrcMod : WORD location 'd2'; a1arg : pRastPort location 'a1'; DestX : WORD location 'd3'; DestY : WORD location 'd4'; SizeX : WORD location 'd5'; SizeY : WORD location 'd6'; SrcFormat : byte location 'd7') : longword; syscall CyberGfxBase 126;
 FUNCTION WriteRGBPixel(a1arg : pRastPort location 'a1'; x : WORD location 'd0'; y : WORD location 'd1'; argb : longword location 'd2') : LONGINT; syscall CyberGfxBase 114;
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AllocCModeListTags(const ModeListTags : Array Of Const) : pList;
-FUNCTION BestCModeIDTags(const BestModeIDTags : Array Of Const) : longword;
-FUNCTION CModeRequestTags(ModeRequest : POINTER; const ModeRequestTags : Array Of Const) : longword;
-PROCEDURE CVideoCtrlTags(ViewPort : pViewPort; const TagList : Array Of Const);
-PROCEDURE DoCDrawMethodTags(Hook : pHook; a1arg : pRastPort; const TagList : Array Of Const);
-FUNCTION LockBitMapTags(BitMap : POINTER; const TagList : Array Of Const) : POINTER;
-PROCEDURE UnLockBitMapTags(Handle : POINTER; const TagList : Array Of Const);
+FUNCTION AllocCModeListTags(const ModeListTags : array of PtrUInt) : pList;
+FUNCTION BestCModeIDTags(const BestModeIDTags : array of PtrUInt) : longword;
+FUNCTION CModeRequestTags(ModeRequest : POINTER; const ModeRequestTags : array of PtrUInt) : longword;
+PROCEDURE CVideoCtrlTags(ViewPort : pViewPort; const TagList : array of PtrUInt);
+PROCEDURE DoCDrawMethodTags(Hook : pHook; a1arg : pRastPort; const TagList : array of PtrUInt);
+FUNCTION LockBitMapTags(BitMap : POINTER; const TagList : array of PtrUInt) : POINTER;
+PROCEDURE UnLockBitMapTags(Handle : POINTER; const TagList : array of PtrUInt);
 
 function SHIFT_PIXFMT(fmt : longint) : longint;
 
 IMPLEMENTATION
 
-uses
-  tagsarray;
-
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AllocCModeListTags(const ModeListTags : Array Of Const) : pList;
+FUNCTION AllocCModeListTags(const ModeListTags : array of PtrUInt) : pList;
 begin
-    AllocCModeListTags := AllocCModeListTagList(readintags(ModeListTags));
+    AllocCModeListTags := AllocCModeListTagList(@ModeListTags);
 end;
 
-FUNCTION BestCModeIDTags(const BestModeIDTags : Array Of Const) : longword;
+FUNCTION BestCModeIDTags(const BestModeIDTags : array of PtrUInt) : longword;
 begin
-    BestCModeIDTags := BestCModeIDTagList(readintags(BestModeIDTags));
+    BestCModeIDTags := BestCModeIDTagList(@BestModeIDTags);
 end;
 
-FUNCTION CModeRequestTags(ModeRequest : POINTER; const ModeRequestTags : Array Of Const) : longword;
+FUNCTION CModeRequestTags(ModeRequest : POINTER; const ModeRequestTags : array of PtrUInt) : longword;
 begin
-    CModeRequestTags := CModeRequestTagList(ModeRequest , readintags(ModeRequestTags));
+    CModeRequestTags := CModeRequestTagList(ModeRequest , @ModeRequestTags);
 end;
 
-PROCEDURE CVideoCtrlTags(ViewPort : pViewPort; const TagList : Array Of Const);
+PROCEDURE CVideoCtrlTags(ViewPort : pViewPort; const TagList : array of PtrUInt);
 begin
-    CVideoCtrlTagList(ViewPort , readintags(TagList));
+    CVideoCtrlTagList(ViewPort , @TagList);
 end;
 
-PROCEDURE DoCDrawMethodTags(Hook : pHook; a1arg : pRastPort; const TagList : Array Of Const);
+PROCEDURE DoCDrawMethodTags(Hook : pHook; a1arg : pRastPort; const TagList : array of PtrUInt);
 begin
-    DoCDrawMethodTagList(Hook , a1arg , readintags(TagList));
+    DoCDrawMethodTagList(Hook , a1arg , @TagList);
 end;
 
-FUNCTION LockBitMapTags(BitMap : POINTER; const TagList : Array Of Const) : POINTER;
+FUNCTION LockBitMapTags(BitMap : POINTER; const TagList : array of PtrUInt) : POINTER;
 begin
-    LockBitMapTags := LockBitMapTagList(BitMap , readintags(TagList));
+    LockBitMapTags := LockBitMapTagList(BitMap , @TagList);
 end;
 
-PROCEDURE UnLockBitMapTags(Handle : POINTER; const TagList : Array Of Const);
+PROCEDURE UnLockBitMapTags(Handle : POINTER; const TagList : array of PtrUInt);
 begin
-    UnLockBitMapTagList(Handle , readintags(TagList));
+    UnLockBitMapTagList(Handle , @TagList);
 end;
 
 function SHIFT_PIXFMT(fmt : longint) : longint;
diff --git a/packages/amunits/src/otherlibs/gtlayout.pas b/packages/amunits/src/otherlibs/gtlayout.pas
index d2a570d02a..61bc879b0d 100644
--- a/packages/amunits/src/otherlibs/gtlayout.pas
+++ b/packages/amunits/src/otherlibs/gtlayout.pas
@@ -24,7 +24,7 @@
     Added MessageBox for error report.
     31 Jul 2000.
 
-    Added functions and procedures with array of const.
+    Added functions and procedures with array of PtrUInt.
     For use with fpc 1.0.
     06 Jan 2003.
 
@@ -38,8 +38,6 @@
     nils.sjoholm@mailbox.swipnet.se
 
 }
-{$mode objfpc}
-
 
 UNIT GTLAYOUT;
 
@@ -599,86 +597,83 @@ PROCEDURE LT_CatchUpRefresh(last : pLayoutHandle location 'a0'); syscall GTLayou
 FUNCTION LT_GetWindowUserData(par1 : pWindow location 'a0'; last : POINTER location 'a1') : POINTER; syscall GTLayoutBase 276;
 
 {
-     This is functions and procedures with array of const.
+     This is functions and procedures with array of PtrUInt.
      For use with fpc 1.0.7 and above.
 }
 
-FUNCTION LT_CreateHandleTags(screen : pScreen; const tagList : Array Of Const) : pLayoutHandle;
-FUNCTION LT_GetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : Array Of Const) : LONGINT;
-PROCEDURE LT_SetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : Array Of Const);
-PROCEDURE LT_Add(handle : pLayoutHandle; _type : LONGINT; _label : pCHAR; id : LONGINT; const tagList : Array Of Const);
-PROCEDURE LT_New(handle : pLayoutHandle; const tagList : Array Of Const);
-FUNCTION LT_Layout(handle : pLayoutHandle; title : pCHAR; bounds : pIBox; extraWidth : LONGINT; extraHeight : LONGINT; idcmp : longword; align : LONGINT; const tagParams : Array Of Const) : pWindow;
-FUNCTION LT_LayoutMenus(handle : pLayoutHandle; menuTemplate : pNewMenu; const tagParams : Array Of Const) : pMenu;
-FUNCTION LT_Build(handle : pLayoutHandle; const tagParams : Array Of Const) : pWindow;
-FUNCTION LT_RebuildTags(handle : pLayoutHandle; clear : LONGINT; const tags : Array Of Const) : BOOLEAN;
-FUNCTION LT_NewMenuTags(const tagList : Array Of Const) : pMenu;
-PROCEDURE LT_MenuControlTags(window : pWindow; intuitionMenu : pMenu; const tags : Array Of Const);
+FUNCTION LT_CreateHandleTags(screen : pScreen; const tagList : array of PtrUInt) : pLayoutHandle;
+FUNCTION LT_GetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : array of PtrUInt) : LONGINT;
+PROCEDURE LT_SetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : array of PtrUInt);
+PROCEDURE LT_Add(handle : pLayoutHandle; _type : LONGINT; _label : pCHAR; id : LONGINT; const tagList : array of PtrUInt);
+PROCEDURE LT_New(handle : pLayoutHandle; const tagList : array of PtrUInt);
+FUNCTION LT_Layout(handle : pLayoutHandle; title : pCHAR; bounds : pIBox; extraWidth : LONGINT; extraHeight : LONGINT; idcmp : longword; align : LONGINT; const tagParams : array of PtrUInt) : pWindow;
+FUNCTION LT_LayoutMenus(handle : pLayoutHandle; menuTemplate : pNewMenu; const tagParams : array of PtrUInt) : pMenu;
+FUNCTION LT_Build(handle : pLayoutHandle; const tagParams : array of PtrUInt) : pWindow;
+FUNCTION LT_RebuildTags(handle : pLayoutHandle; clear : LONGINT; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION LT_NewMenuTags(const tagList : array of PtrUInt) : pMenu;
+PROCEDURE LT_MenuControlTags(window : pWindow; intuitionMenu : pMenu; const tags : array of PtrUInt);
 
 
 
 
 IMPLEMENTATION
 
-uses
-  tagsarray;
-
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION LT_CreateHandleTags(screen : pScreen; const tagList : Array Of Const) : pLayoutHandle;
+FUNCTION LT_CreateHandleTags(screen : pScreen; const tagList : array of PtrUInt) : pLayoutHandle;
 begin
-    LT_CreateHandleTags := LT_CreateHandleTagList(screen , readintags(tagList));
+    LT_CreateHandleTags := LT_CreateHandleTagList(screen , @tagList);
 end;
 
-FUNCTION LT_GetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : Array Of Const) : LONGINT;
+FUNCTION LT_GetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : array of PtrUInt) : LONGINT;
 begin
-    LT_GetAttributes := LT_GetAttributesA(handle , id , readintags(tagList));
+    LT_GetAttributes := LT_GetAttributesA(handle , id , @tagList);
 end;
 
-PROCEDURE LT_SetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : Array Of Const);
+PROCEDURE LT_SetAttributes(handle : pLayoutHandle; id : LONGINT; const tagList : array of PtrUInt);
 begin
-    LT_SetAttributesA(handle , id , readintags(tagList));
+    LT_SetAttributesA(handle , id , @tagList);
 end;
 
-PROCEDURE LT_Add(handle : pLayoutHandle; _type : LONGINT; _label : pCHAR; id : LONGINT; const tagList : Array Of Const);
+PROCEDURE LT_Add(handle : pLayoutHandle; _type : LONGINT; _label : pCHAR; id : LONGINT; const tagList : array of PtrUInt);
 begin
-    LT_AddA(handle , _type , _label , id , readintags(tagList));
+    LT_AddA(handle , _type , _label , id , @tagList);
 end;
 
-PROCEDURE LT_New(handle : pLayoutHandle; const tagList : Array Of Const);
+PROCEDURE LT_New(handle : pLayoutHandle; const tagList : array of PtrUInt);
 begin
-    LT_NewA(handle , readintags(tagList));
+    LT_NewA(handle , @tagList);
 end;
 
-FUNCTION LT_Layout(handle : pLayoutHandle; title : pCHAR; bounds : pIBox; extraWidth : LONGINT; extraHeight : LONGINT; idcmp : longword; align : LONGINT; const tagParams : Array Of Const) : pWindow;
+FUNCTION LT_Layout(handle : pLayoutHandle; title : pCHAR; bounds : pIBox; extraWidth : LONGINT; extraHeight : LONGINT; idcmp : longword; align : LONGINT; const tagParams : array of PtrUInt) : pWindow;
 begin
-    LT_Layout := LT_LayoutA(handle , title , bounds , extraWidth , extraHeight , idcmp , align , readintags(tagParams));
+    LT_Layout := LT_LayoutA(handle , title , bounds , extraWidth , extraHeight , idcmp , align , @tagParams);
 end;
 
-FUNCTION LT_LayoutMenus(handle : pLayoutHandle; menuTemplate : pNewMenu; const tagParams : Array Of Const) : pMenu;
+FUNCTION LT_LayoutMenus(handle : pLayoutHandle; menuTemplate : pNewMenu; const tagParams : array of PtrUInt) : pMenu;
 begin
-    LT_LayoutMenus := LT_LayoutMenusA(handle , menuTemplate , readintags(tagParams));
+    LT_LayoutMenus := LT_LayoutMenusA(handle , menuTemplate , @tagParams);
 end;
 
-FUNCTION LT_Build(handle : pLayoutHandle; const tagParams : Array Of Const) : pWindow;
+FUNCTION LT_Build(handle : pLayoutHandle; const tagParams : array of PtrUInt) : pWindow;
 begin
-    LT_Build := LT_BuildA(handle , readintags(tagParams));
+    LT_Build := LT_BuildA(handle , @tagParams);
 end;
 
-FUNCTION LT_RebuildTags(handle : pLayoutHandle; clear : LONGINT; const tags : Array Of Const) : BOOLEAN;
+FUNCTION LT_RebuildTags(handle : pLayoutHandle; clear : LONGINT; const tags : array of PtrUInt) : BOOLEAN;
 begin
-    LT_RebuildTags := LT_RebuildTagList(handle , clear , readintags(tags));
+    LT_RebuildTags := LT_RebuildTagList(handle , clear , @tags);
 end;
 
-FUNCTION LT_NewMenuTags(const tagList : Array Of Const) : pMenu;
+FUNCTION LT_NewMenuTags(const tagList : array of PtrUInt) : pMenu;
 begin
-    LT_NewMenuTags := LT_NewMenuTagList(readintags(tagList));
+    LT_NewMenuTags := LT_NewMenuTagList(@tagList);
 end;
 
-PROCEDURE LT_MenuControlTags(window : pWindow; intuitionMenu : pMenu; const tags : Array Of Const);
+PROCEDURE LT_MenuControlTags(window : pWindow; intuitionMenu : pMenu; const tags : array of PtrUInt);
 begin
-    LT_MenuControlTagList(window , intuitionMenu , readintags(tags));
+    LT_MenuControlTagList(window , intuitionMenu , @tags);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/guigfx.pas b/packages/amunits/src/otherlibs/guigfx.pas
index b20f0b6ecd..2a4516646d 100644
--- a/packages/amunits/src/otherlibs/guigfx.pas
+++ b/packages/amunits/src/otherlibs/guigfx.pas
@@ -28,7 +28,6 @@
   nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
-{$mode objfpc}
 
 UNIT GUIGFX;
 
@@ -179,135 +178,132 @@ PROCEDURE ReleaseDrawHandle(drawhandle : POINTER location 'a0'); syscall GuiGFXB
 PROCEDURE RemColorHandle(colorhandle : POINTER location 'a0'); syscall GuiGFXBase 84;
 PROCEDURE UnLockPicture(pic : POINTER location 'a0'; mode : longword location 'd0'); syscall GuiGFXBase 156;
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AddPalette(psm : POINTER; palette : POINTER; const tags : Array Of Const) : POINTER;
-FUNCTION AddPicture(psm : POINTER; pic : POINTER; const tags : Array Of Const) : POINTER;
-FUNCTION AddPixelArray(psm : POINTER; _array : POINTER; width : WORD; height : WORD; const tags : Array Of Const) : POINTER;
-FUNCTION ClonePicture(pic : POINTER; const tags : Array Of Const) : POINTER;
-FUNCTION CreateDirectDrawHandle(drawhandle : POINTER; sw : WORD; sh : WORD; dw : WORD; dh : WORD; const tags : Array Of Const) : POINTER;
-FUNCTION CreatePenShareMap(const tags : Array Of Const) : POINTER;
-FUNCTION CreatePictureBitMap(drawhandle : POINTER; pic : POINTER; const tags : Array Of Const) : pBitMap;
-FUNCTION CreatePictureMask(pic : POINTER; mask : pCHAR; maskwidth : WORD; const tags : Array Of Const) : BOOLEAN;
-FUNCTION DirectDrawTrueColor(ddh : POINTER; _array : pULONG; x : WORD; y : WORD; const tags : Array Of Const) : BOOLEAN;
-FUNCTION DoPictureMethod(pic : POINTER; method : longword; const arguments : Array Of Const) : longword;
-FUNCTION DrawPicture(drawhandle : POINTER; pic : POINTER; x : WORD; y : WORD; const tags : Array Of Const) : BOOLEAN;
-FUNCTION GetPictureAttrs(pic : POINTER; const tags : Array Of Const) : longword;
-FUNCTION IsPicture(filename : pCHAR; const tags : Array Of Const) : BOOLEAN;
-FUNCTION LoadPicture(filename : pCHAR; const tags : Array Of Const) : POINTER;
-FUNCTION LockPicture(pic : POINTER; mode : longword; const args : Array Of Const) : longword;
-FUNCTION MakePicture(_array : POINTER; width : WORD; height : WORD; const tags : Array Of Const) : POINTER;
-FUNCTION MapPalette(drawhandle : POINTER; palette : POINTER; pentab : pCHAR; const tags : Array Of Const) : BOOLEAN;
-FUNCTION MapPen(drawhandle : POINTER; rgb : longword; const tags : Array Of Const) : LONGINT;
-FUNCTION ObtainDrawHandle(psm : POINTER; a1arg : pRastPort; cm : pColorMap; const tags : Array Of Const) : POINTER;
-FUNCTION ReadPicture(a0arg : pRastPort; colormap : pColorMap; x : WORD; y : WORD; width : WORD; height : WORD; const tags : Array Of Const) : POINTER;
+FUNCTION AddPalette(psm : POINTER; palette : POINTER; const tags : array of PtrUInt) : POINTER;
+FUNCTION AddPicture(psm : POINTER; pic : POINTER; const tags : array of PtrUInt) : POINTER;
+FUNCTION AddPixelArray(psm : POINTER; _array : POINTER; width : WORD; height : WORD; const tags : array of PtrUInt) : POINTER;
+FUNCTION ClonePicture(pic : POINTER; const tags : array of PtrUInt) : POINTER;
+FUNCTION CreateDirectDrawHandle(drawhandle : POINTER; sw : WORD; sh : WORD; dw : WORD; dh : WORD; const tags : array of PtrUInt) : POINTER;
+FUNCTION CreatePenShareMap(const tags : array of PtrUInt) : POINTER;
+FUNCTION CreatePictureBitMap(drawhandle : POINTER; pic : POINTER; const tags : array of PtrUInt) : pBitMap;
+FUNCTION CreatePictureMask(pic : POINTER; mask : pCHAR; maskwidth : WORD; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION DirectDrawTrueColor(ddh : POINTER; _array : pULONG; x : WORD; y : WORD; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION DoPictureMethod(pic : POINTER; method : longword; const arguments : array of PtrUInt) : longword;
+FUNCTION DrawPicture(drawhandle : POINTER; pic : POINTER; x : WORD; y : WORD; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION GetPictureAttrs(pic : POINTER; const tags : array of PtrUInt) : longword;
+FUNCTION IsPicture(filename : pCHAR; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION LoadPicture(filename : pCHAR; const tags : array of PtrUInt) : POINTER;
+FUNCTION LockPicture(pic : POINTER; mode : longword; const args : array of PtrUInt) : longword;
+FUNCTION MakePicture(_array : POINTER; width : WORD; height : WORD; const tags : array of PtrUInt) : POINTER;
+FUNCTION MapPalette(drawhandle : POINTER; palette : POINTER; pentab : pCHAR; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION MapPen(drawhandle : POINTER; rgb : longword; const tags : array of PtrUInt) : LONGINT;
+FUNCTION ObtainDrawHandle(psm : POINTER; a1arg : pRastPort; cm : pColorMap; const tags : array of PtrUInt) : POINTER;
+FUNCTION ReadPicture(a0arg : pRastPort; colormap : pColorMap; x : WORD; y : WORD; width : WORD; height : WORD; const tags : array of PtrUInt) : POINTER;
 
 IMPLEMENTATION
 
-uses
-  tagsarray,longarray;
-
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AddPalette(psm : POINTER; palette : POINTER; const tags : Array Of Const) : POINTER;
+FUNCTION AddPalette(psm : POINTER; palette : POINTER; const tags : array of PtrUInt) : POINTER;
 begin
-    AddPalette := AddPaletteA(psm , palette , readintags(tags));
+    AddPalette := AddPaletteA(psm , palette , @tags);
 end;
 
-FUNCTION AddPicture(psm : POINTER; pic : POINTER; const tags : Array Of Const) : POINTER;
+FUNCTION AddPicture(psm : POINTER; pic : POINTER; const tags : array of PtrUInt) : POINTER;
 begin
-    AddPicture := AddPictureA(psm , pic , readintags(tags));
+    AddPicture := AddPictureA(psm , pic , @tags);
 end;
 
-FUNCTION AddPixelArray(psm : POINTER; _array : POINTER; width : WORD; height : WORD; const tags : Array Of Const) : POINTER;
+FUNCTION AddPixelArray(psm : POINTER; _array : POINTER; width : WORD; height : WORD; const tags : array of PtrUInt) : POINTER;
 begin
-    AddPixelArray := AddPixelArrayA(psm , _array , width , height , readintags(tags));
+    AddPixelArray := AddPixelArrayA(psm , _array , width , height , @tags);
 end;
 
-FUNCTION ClonePicture(pic : POINTER; const tags : Array Of Const) : POINTER;
+FUNCTION ClonePicture(pic : POINTER; const tags : array of PtrUInt) : POINTER;
 begin
-    ClonePicture := ClonePictureA(pic , readintags(tags));
+    ClonePicture := ClonePictureA(pic , @tags);
 end;
 
-FUNCTION CreateDirectDrawHandle(drawhandle : POINTER; sw : WORD; sh : WORD; dw : WORD; dh : WORD; const tags : Array Of Const) : POINTER;
+FUNCTION CreateDirectDrawHandle(drawhandle : POINTER; sw : WORD; sh : WORD; dw : WORD; dh : WORD; const tags : array of PtrUInt) : POINTER;
 begin
-    CreateDirectDrawHandle := CreateDirectDrawHandleA(drawhandle , sw , sh , dw , dh , readintags(tags));
+    CreateDirectDrawHandle := CreateDirectDrawHandleA(drawhandle , sw , sh , dw , dh , @tags);
 end;
 
-FUNCTION CreatePenShareMap(const tags : Array Of Const) : POINTER;
+FUNCTION CreatePenShareMap(const tags : array of PtrUInt) : POINTER;
 begin
-    CreatePenShareMap := CreatePenShareMapA(readintags(tags));
+    CreatePenShareMap := CreatePenShareMapA(@tags);
 end;
 
-FUNCTION CreatePictureBitMap(drawhandle : POINTER; pic : POINTER; const tags : Array Of Const) : pBitMap;
+FUNCTION CreatePictureBitMap(drawhandle : POINTER; pic : POINTER; const tags : array of PtrUInt) : pBitMap;
 begin
-    CreatePictureBitMap := CreatePictureBitMapA(drawhandle , pic , readintags(tags));
+    CreatePictureBitMap := CreatePictureBitMapA(drawhandle , pic , @tags);
 end;
 
-FUNCTION CreatePictureMask(pic : POINTER; mask : pCHAR; maskwidth : WORD; const tags : Array Of Const) : BOOLEAN;
+FUNCTION CreatePictureMask(pic : POINTER; mask : pCHAR; maskwidth : WORD; const tags : array of PtrUInt) : BOOLEAN;
 begin
-    CreatePictureMask := CreatePictureMaskA(pic , mask , maskwidth , readintags(tags));
+    CreatePictureMask := CreatePictureMaskA(pic , mask , maskwidth , @tags);
 end;
 
-FUNCTION DirectDrawTrueColor(ddh : POINTER; _array : pULONG; x : WORD; y : WORD; const tags : Array Of Const) : BOOLEAN;
+FUNCTION DirectDrawTrueColor(ddh : POINTER; _array : pULONG; x : WORD; y : WORD; const tags : array of PtrUInt) : BOOLEAN;
 begin
-    DirectDrawTrueColor := DirectDrawTrueColorA(ddh , _array , x , y , readintags(tags));
+    DirectDrawTrueColor := DirectDrawTrueColorA(ddh , _array , x , y , @tags);
 end;
 
-FUNCTION DoPictureMethod(pic : POINTER; method : longword; const arguments : Array Of Const) : longword;
+FUNCTION DoPictureMethod(pic : POINTER; method : longword; const arguments : array of PtrUInt) : longword;
 begin
-    DoPictureMethod := DoPictureMethodA(pic , method , readinlongs(arguments));
+    DoPictureMethod := DoPictureMethodA(pic , method , @arguments);
 end;
 
-FUNCTION DrawPicture(drawhandle : POINTER; pic : POINTER; x : WORD; y : WORD; const tags : Array Of Const) : BOOLEAN;
+FUNCTION DrawPicture(drawhandle : POINTER; pic : POINTER; x : WORD; y : WORD; const tags : array of PtrUInt) : BOOLEAN;
 begin
-    DrawPicture := DrawPictureA(drawhandle , pic , x , y , readintags(tags));
+    DrawPicture := DrawPictureA(drawhandle , pic , x , y , @tags);
 end;
 
-FUNCTION GetPictureAttrs(pic : POINTER; const tags : Array Of Const) : longword;
+FUNCTION GetPictureAttrs(pic : POINTER; const tags : array of PtrUInt) : longword;
 begin
-    GetPictureAttrs := GetPictureAttrsA(pic , readintags(tags));
+    GetPictureAttrs := GetPictureAttrsA(pic , @tags);
 end;
 
-FUNCTION IsPicture(filename : pCHAR; const tags : Array Of Const) : BOOLEAN;
+FUNCTION IsPicture(filename : pCHAR; const tags : array of PtrUInt) : BOOLEAN;
 begin
-    IsPicture := IsPictureA(filename , readintags(tags));
+    IsPicture := IsPictureA(filename , @tags);
 end;
 
-FUNCTION LoadPicture(filename : pCHAR; const tags : Array Of Const) : POINTER;
+FUNCTION LoadPicture(filename : pCHAR; const tags : array of PtrUInt) : POINTER;
 begin
-    LoadPicture := LoadPictureA(filename , readintags(tags));
+    LoadPicture := LoadPictureA(filename , @tags);
 end;
 
-FUNCTION LockPicture(pic : POINTER; mode : longword; const args : Array Of Const) : longword;
+FUNCTION LockPicture(pic : POINTER; mode : longword; const args : array of PtrUInt) : longword;
 begin
-    LockPicture := LockPictureA(pic , mode , readinlongs(args));
+    LockPicture := LockPictureA(pic , mode , @args);
 end;
 
-FUNCTION MakePicture(_array : POINTER; width : WORD; height : WORD; const tags : Array Of Const) : POINTER;
+FUNCTION MakePicture(_array : POINTER; width : WORD; height : WORD; const tags : array of PtrUInt) : POINTER;
 begin
-    MakePicture := MakePictureA(_array , width , height , readintags(tags));
+    MakePicture := MakePictureA(_array , width , height , @tags);
 end;
 
-FUNCTION MapPalette(drawhandle : POINTER; palette : POINTER; pentab : pCHAR; const tags : Array Of Const) : BOOLEAN;
+FUNCTION MapPalette(drawhandle : POINTER; palette : POINTER; pentab : pCHAR; const tags : array of PtrUInt) : BOOLEAN;
 begin
-    MapPalette := MapPaletteA(drawhandle , palette , pentab , readintags(tags));
+    MapPalette := MapPaletteA(drawhandle , palette , pentab , @tags);
 end;
 
-FUNCTION MapPen(drawhandle : POINTER; rgb : longword; const tags : Array Of Const) : LONGINT;
+FUNCTION MapPen(drawhandle : POINTER; rgb : longword; const tags : array of PtrUInt) : LONGINT;
 begin
-    MapPen := MapPenA(drawhandle , rgb , readintags(tags));
+    MapPen := MapPenA(drawhandle , rgb , @tags);
 end;
 
-FUNCTION ObtainDrawHandle(psm : POINTER; a1arg : pRastPort; cm : pColorMap; const tags : Array Of Const) : POINTER;
+FUNCTION ObtainDrawHandle(psm : POINTER; a1arg : pRastPort; cm : pColorMap; const tags : array of PtrUInt) : POINTER;
 begin
-    ObtainDrawHandle := ObtainDrawHandleA(psm , a1arg , cm , readintags(tags));
+    ObtainDrawHandle := ObtainDrawHandleA(psm , a1arg , cm , @tags);
 end;
 
-FUNCTION ReadPicture(a0arg : pRastPort; colormap : pColorMap; x : WORD; y : WORD; width : WORD; height : WORD; const tags : Array Of Const) : POINTER;
+FUNCTION ReadPicture(a0arg : pRastPort; colormap : pColorMap; x : WORD; y : WORD; width : WORD; height : WORD; const tags : array of PtrUInt) : POINTER;
 begin
-    ReadPicture := ReadPictureA(a0arg , colormap , x , y , width , height , readintags(tags));
+    ReadPicture := ReadPictureA(a0arg , colormap , x , y , width , height , @tags);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/identify.pas b/packages/amunits/src/otherlibs/identify.pas
index ec3252857b..ac04f0a88f 100644
--- a/packages/amunits/src/otherlibs/identify.pas
+++ b/packages/amunits/src/otherlibs/identify.pas
@@ -21,7 +21,7 @@
     13 Mar 2001.
 
     Updated to use fpc 1.0.7
-    Added array of const and some
+    Added array of PtrUInt and some
     overlay functions.
     08 Jan 2003
 
@@ -36,8 +36,6 @@
     nils.sjoholm@mailbox.swipnet.se
 }
 
-{$mode objfpc}
-
 UNIT IDENTIFY;
 
 INTERFACE
@@ -417,17 +415,17 @@ FUNCTION IdFormatString(String_ : pCHAR location 'a0'; Buffer : pCHAR location '
 FUNCTION IdEstimateFormatSize(String_ : pCHAR location 'a0'; Tags : pTagItem location 'a1') : Ulong; syscall IdentifyBase 72;
 
 {
-     This is functions and procedures with array of const.
+     This is functions and procedures with array of PtrUInt.
      For use with fpc 1.0 and above.
 }
 
-FUNCTION IdExpansionTags(const TagList : Array Of Const) : LONGINT;
-FUNCTION IdHardwareTags(Type_ : longword; const TagList : Array Of Const) : pCHAR;
-FUNCTION IdAlertTags(ID : longword; const TagList : Array Of Const) : LONGINT;
-FUNCTION IdFunctionTags(LibName : pCHAR; Offset : LONGINT; const TagList : Array Of Const) : LONGINT;
-FUNCTION IdHardwareNumTags(Type_ : longword; const TagList : Array Of Const) : longword;
-FUNCTION IdFormatStringTags(String_ : pCHAR; Buffer : pCHAR; Length : longword; const Tags : Array Of Const) : longword;
-FUNCTION IdEstimateFormatSizeTags(String_ : pCHAR; const Tags : Array Of Const) : longword;
+FUNCTION IdExpansionTags(const TagList : array of PtrUInt) : LONGINT;
+FUNCTION IdHardwareTags(Type_ : longword; const TagList : array of PtrUInt) : pCHAR;
+FUNCTION IdAlertTags(ID : longword; const TagList : array of PtrUInt) : LONGINT;
+FUNCTION IdFunctionTags(LibName : pCHAR; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
+FUNCTION IdHardwareNumTags(Type_ : longword; const TagList : array of PtrUInt) : longword;
+FUNCTION IdFormatStringTags(String_ : pCHAR; Buffer : pCHAR; Length : longword; const Tags : array of PtrUInt) : longword;
+FUNCTION IdEstimateFormatSizeTags(String_ : pCHAR; const Tags : array of PtrUInt) : longword;
 
 {
      Overlay functions
@@ -436,51 +434,51 @@ FUNCTION IdEstimateFormatSizeTags(String_ : pCHAR; const Tags : Array Of Const)
 FUNCTION IdFunction(LibName : string; Offset : LONGINT; TagList : pTagItem) : LONGINT;
 FUNCTION IdFormatString(String_ : string; Buffer : pCHAR; Length : Ulong; Tags : pTagItem) : Ulong;
 FUNCTION IdEstimateFormatSize(String_ : string; Tags : pTagItem) : Ulong;
-FUNCTION IdFunctionTags(LibName : string; Offset : LONGINT; const TagList : Array Of Const) : LONGINT;
-FUNCTION IdFormatStringTags(String_ : string; Buffer : pCHAR; Length : longword; const Tags : Array Of Const) : longword;
-FUNCTION IdEstimateFormatSizeTags(String_ : string; const Tags : Array Of Const) : longword;
+FUNCTION IdFunctionTags(LibName : string; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
+FUNCTION IdFormatStringTags(String_ : string; Buffer : pCHAR; Length : longword; const Tags : array of PtrUInt) : longword;
+FUNCTION IdEstimateFormatSizeTags(String_ : string; const Tags : array of PtrUInt) : longword;
 
 IMPLEMENTATION
 
 uses
-  tagsarray,pastoc;
+  pastoc;
 
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION IdExpansionTags(const TagList : Array Of Const) : LONGINT;
+FUNCTION IdExpansionTags(const TagList : array of PtrUInt) : LONGINT;
 begin
-    IdExpansionTags := IdExpansion(readintags(TagList));
+    IdExpansionTags := IdExpansion(@TagList);
 end;
 
-FUNCTION IdHardwareTags(Type_ : longword; const TagList : Array Of Const) : pCHAR;
+FUNCTION IdHardwareTags(Type_ : longword; const TagList : array of PtrUInt) : pCHAR;
 begin
-    IdHardwareTags := IdHardware(Type_ , readintags(TagList));
+    IdHardwareTags := IdHardware(Type_ , @TagList);
 end;
 
-FUNCTION IdAlertTags(ID : longword; const TagList : Array Of Const) : LONGINT;
+FUNCTION IdAlertTags(ID : longword; const TagList : array of PtrUInt) : LONGINT;
 begin
-    IdAlertTags := IdAlert(ID , readintags(TagList));
+    IdAlertTags := IdAlert(ID , @TagList);
 end;
 
-FUNCTION IdFunctionTags(LibName : pCHAR; Offset : LONGINT; const TagList : Array Of Const) : LONGINT;
+FUNCTION IdFunctionTags(LibName : pCHAR; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
 begin
-    IdFunctionTags := IdFunction(LibName , Offset , readintags(TagList));
+    IdFunctionTags := IdFunction(LibName , Offset , @TagList);
 end;
 
-FUNCTION IdHardwareNumTags(Type_ : longword; const TagList : Array Of Const) : longword;
+FUNCTION IdHardwareNumTags(Type_ : longword; const TagList : array of PtrUInt) : longword;
 begin
-    IdHardwareNumTags := IdHardwareNum(Type_ , readintags(TagList));
+    IdHardwareNumTags := IdHardwareNum(Type_ , @TagList);
 end;
 
-FUNCTION IdFormatStringTags(String_ : pCHAR; Buffer : pCHAR; Length : longword; const Tags : Array Of Const) : longword;
+FUNCTION IdFormatStringTags(String_ : pCHAR; Buffer : pCHAR; Length : longword; const Tags : array of PtrUInt) : longword;
 begin
-    IdFormatStringTags := IdFormatString(String_ , Buffer , Length , readintags(Tags));
+    IdFormatStringTags := IdFormatString(String_ , Buffer , Length , @Tags);
 end;
 
-FUNCTION IdEstimateFormatSizeTags(String_ : pCHAR; const Tags : Array Of Const) : longword;
+FUNCTION IdEstimateFormatSizeTags(String_ : pCHAR; const Tags : array of PtrUInt) : longword;
 begin
-    IdEstimateFormatSizeTags := IdEstimateFormatSize(String_ , readintags(Tags));
+    IdEstimateFormatSizeTags := IdEstimateFormatSize(String_ , @Tags);
 end;
 
 {
@@ -502,19 +500,19 @@ begin
     IdEstimateFormatSize := IdEstimateFormatSize(pas2c(String_),Tags);
 end;
 
-FUNCTION IdFunctionTags(LibName : string; Offset : LONGINT; const TagList : Array Of Const) : LONGINT;
+FUNCTION IdFunctionTags(LibName : string; Offset : LONGINT; const TagList : array of PtrUInt) : LONGINT;
 begin
-    IdFunctionTags := IdFunction(pas2c(LibName),Offset,readintags(TagList));
+    IdFunctionTags := IdFunction(pas2c(LibName),Offset,@TagList);
 end;
 
-FUNCTION IdFormatStringTags(String_ : string; Buffer : pCHAR; Length : longword; const Tags : Array Of Const) : longword;
+FUNCTION IdFormatStringTags(String_ : string; Buffer : pCHAR; Length : longword; const Tags : array of PtrUInt) : longword;
 begin
-    IdFormatStringTags := IdFormatString(pas2c(String_),Buffer,Length,readintags(Tags));
+    IdFormatStringTags := IdFormatString(pas2c(String_),Buffer,Length,@Tags);
 end;
 
-FUNCTION IdEstimateFormatSizeTags(String_ : string; const Tags : Array Of Const) : longword;
+FUNCTION IdEstimateFormatSizeTags(String_ : string; const Tags : array of PtrUInt) : longword;
 begin
-    IdEstimateFormatSizeTags := IdEstimateFormatSize(pas2c(String_),readintags(Tags));
+    IdEstimateFormatSizeTags := IdEstimateFormatSize(pas2c(String_),@Tags);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/mui.pas b/packages/amunits/src/otherlibs/mui.pas
index 3313470617..cba10f7d33 100644
--- a/packages/amunits/src/otherlibs/mui.pas
+++ b/packages/amunits/src/otherlibs/mui.pas
@@ -33,7 +33,6 @@
 
     nils.sjoholm@mailbox.swipnet.se
 }
-{$mode objfpc}
 
 unit mui;
 
@@ -3566,31 +3565,16 @@ function MUIV_Window_Width_Visible(p : longint) : longint;
 function MUIV_Window_Width_Screen(p : longint) : longint;
 
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION MUI_AllocAslRequestTags(_type : longword; const tags : Array Of Const) : POINTER;
-FUNCTION MUI_AslRequestTags(req : POINTER; const tags : Array Of Const) : BOOLEAN;
-FUNCTION MUI_MakeObject(_type : LONGINT; const params : Array Of Const) : pULONG;
-FUNCTION MUI_NewObject(a0arg : pCHAR; const tags : Array Of Const) : pULONG;
-FUNCTION MUI_Request(app : POINTER; win : POINTER; flags : longword; title : pCHAR; gadgets : pCHAR; format : pCHAR; const params : Array Of Const) : LONGINT;
-
-{You can remove this include and use a define instead}
-{$I useautoopenlib.inc}
-{$ifdef use_init_openlib}
-procedure InitMUIMASTERLibrary;
-{$endif use_init_openlib}
-
-{This is a variable that knows how the unit is compiled}
-var
-    MUIMASTERIsCompiledHow : longint;
+FUNCTION MUI_AllocAslRequestTags(_type : longword; const tags : array of PtrUInt) : POINTER;
+FUNCTION MUI_AslRequestTags(req : POINTER; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION MUI_MakeObject(_type : LONGINT; const params : array of PtrUInt) : pULONG;
+FUNCTION MUI_NewObject(a0arg : pCHAR; const tags : array of PtrUInt) : pULONG;
+FUNCTION MUI_Request(app : POINTER; win : POINTER; flags : longword; title : pCHAR; gadgets : pCHAR; format : pCHAR; const params : array of PtrUInt) : LONGINT;
 
-implementation
 
-uses
-{$ifndef dont_use_openlib}
-amsgbox,
-{$endif dont_use_openlib}
-tagsarray,longarray;
+implementation
 
 function MUINotifyData(obj : APTR) : pMUI_NotifyData;
 begin
@@ -3864,31 +3848,31 @@ begin
 end;
 
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION MUI_AllocAslRequestTags(_type : longword; const tags : Array Of Const) : POINTER;
+FUNCTION MUI_AllocAslRequestTags(_type : longword; const tags : array of PtrUInt) : POINTER;
 begin
-    MUI_AllocAslRequestTags := MUI_AllocAslRequest(_type , readintags(tags));
+    MUI_AllocAslRequestTags := MUI_AllocAslRequest(_type , @tags);
 end;
 
-FUNCTION MUI_AslRequestTags(req : POINTER; const tags : Array Of Const) : BOOLEAN;
+FUNCTION MUI_AslRequestTags(req : POINTER; const tags : array of PtrUInt) : BOOLEAN;
 begin
-    MUI_AslRequestTags := MUI_AslRequest(req , readintags(tags));
+    MUI_AslRequestTags := MUI_AslRequest(req , @tags);
 end;
 
-FUNCTION MUI_MakeObject(_type : LONGINT; const params : Array Of Const) : pULONG;
+FUNCTION MUI_MakeObject(_type : LONGINT; const params : array of PtrUInt) : pULONG;
 begin
-    MUI_MakeObject := MUI_MakeObjectA(_type , readinlongs(params));
+    MUI_MakeObject := MUI_MakeObjectA(_type , @params);
 end;
 
-FUNCTION MUI_NewObject(a0arg : pCHAR; const tags : Array Of Const) : pULONG;
+FUNCTION MUI_NewObject(a0arg : pCHAR; const tags : array of PtrUInt) : pULONG;
 begin
-    MUI_NewObject := MUI_NewObjectA(a0arg , readintags(tags));
+    MUI_NewObject := MUI_NewObjectA(a0arg , @tags);
 end;
 
-FUNCTION MUI_Request(app : POINTER; win : POINTER; flags : longword; title : pCHAR; gadgets : pCHAR; format : pCHAR; const params : Array Of Const) : LONGINT;
+FUNCTION MUI_Request(app : POINTER; win : POINTER; flags : longword; title : pCHAR; gadgets : pCHAR; format : pCHAR; const params : array of PtrUInt) : LONGINT;
 begin
-    MUI_Request := MUI_RequestA(app , win , flags , title , gadgets , format , readintags(params));
+    MUI_Request := MUI_RequestA(app , win , flags , title , gadgets , format , @params);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/mysticview.pas b/packages/amunits/src/otherlibs/mysticview.pas
index aea8c5fc0c..099bbc0a36 100644
--- a/packages/amunits/src/otherlibs/mysticview.pas
+++ b/packages/amunits/src/otherlibs/mysticview.pas
@@ -27,7 +27,6 @@
   nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
-{$mode objfpc}
 
 UNIT MYSTICVIEW;
 
@@ -155,33 +154,30 @@ PROCEDURE MV_SetAttrsA(mview : POINTER location 'a0'; tags : pTagItem location '
 PROCEDURE MV_SetViewRelative(mview : POINTER location 'a0'; x : LONGINT location 'd0'; y : LONGINT location 'd1'); syscall MysticBase 78;
 PROCEDURE MV_SetViewStart(mview : POINTER location 'a0'; x : LONGINT location 'd0'; y : LONGINT location 'd1'); syscall MysticBase 72;
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION MV_Create(screen : pScreen; a1arg : pRastPort; const tags : Array Of Const) : POINTER;
-PROCEDURE MV_GetAttrs(mview : POINTER; const tags : Array Of Const);
-PROCEDURE MV_SetAttrs(mview : POINTER; const tags : Array Of Const);
+FUNCTION MV_Create(screen : pScreen; a1arg : pRastPort; const tags : array of PtrUInt) : POINTER;
+PROCEDURE MV_GetAttrs(mview : POINTER; const tags : array of PtrUInt);
+PROCEDURE MV_SetAttrs(mview : POINTER; const tags : array of PtrUInt);
 
 IMPLEMENTATION
 
-uses
-  tagsarray;
-
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION MV_Create(screen : pScreen; a1arg : pRastPort; const tags : Array Of Const) : POINTER;
+FUNCTION MV_Create(screen : pScreen; a1arg : pRastPort; const tags : array of PtrUInt) : POINTER;
 begin
-    MV_Create := MV_CreateA(screen , a1arg , readintags(tags));
+    MV_Create := MV_CreateA(screen , a1arg , @tags);
 end;
 
-PROCEDURE MV_GetAttrs(mview : POINTER; const tags : Array Of Const);
+PROCEDURE MV_GetAttrs(mview : POINTER; const tags : array of PtrUInt);
 begin
-    MV_GetAttrsA(mview , readintags(tags));
+    MV_GetAttrsA(mview , @tags);
 end;
 
-PROCEDURE MV_SetAttrs(mview : POINTER; const tags : Array Of Const);
+PROCEDURE MV_SetAttrs(mview : POINTER; const tags : array of PtrUInt);
 begin
-    MV_SetAttrsA(mview , readintags(tags));
+    MV_SetAttrsA(mview , @tags);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/picasso96api.pas b/packages/amunits/src/otherlibs/picasso96api.pas
index 03516d836e..20abcfd9a4 100644
--- a/packages/amunits/src/otherlibs/picasso96api.pas
+++ b/packages/amunits/src/otherlibs/picasso96api.pas
@@ -34,7 +34,6 @@
     nils.sjoholm@mailbox.swipnet.se
 
 }
-{$mode objfpc}
 
 UNIT PICASSO96API;
 
@@ -430,69 +429,66 @@ FUNCTION p96GetRTGDataTagList(Tags : pTagItem location 'a0') : LONGINT; syscall
 FUNCTION p96GetBoardDataTagList(Board : Ulong location 'd0'; Tags : pTagItem location 'a0') : LONGINT; syscall P96Base 186;
 FUNCTION p96EncodeColor(RGBFormat : RGBFTYPE location 'd0'; Color : Ulong location 'd1') : Ulong; syscall P96Base 192;
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION p96BestModeIDTags(const Tags : Array Of Const) : longword;
-FUNCTION p96RequestModeIDTags(const Tags : Array Of Const) : longword;
-FUNCTION p96AllocModeListTags(const Tags : Array Of Const) : pList;
-FUNCTION p96OpenScreenTags(const Tags : Array Of Const) : pScreen;
-FUNCTION p96PIP_OpenTags(const Tags : Array Of Const) : pWindow;
-FUNCTION p96PIP_SetTags(Window : pWindow; const Tags : Array Of Const) : LONGINT;
-FUNCTION p96PIP_GetTags(Window : pWindow; const Tags : Array Of Const) : LONGINT;
-FUNCTION p96GetRTGDataTags(const Tags : Array Of Const) : LONGINT;
-FUNCTION p96GetBoardDataTags(Board : longword; const Tags : Array Of Const) : LONGINT;
+FUNCTION p96BestModeIDTags(const Tags : array of PtrUInt) : longword;
+FUNCTION p96RequestModeIDTags(const Tags : array of PtrUInt) : longword;
+FUNCTION p96AllocModeListTags(const Tags : array of PtrUInt) : pList;
+FUNCTION p96OpenScreenTags(const Tags : array of PtrUInt) : pScreen;
+FUNCTION p96PIP_OpenTags(const Tags : array of PtrUInt) : pWindow;
+FUNCTION p96PIP_SetTags(Window : pWindow; const Tags : array of PtrUInt) : LONGINT;
+FUNCTION p96PIP_GetTags(Window : pWindow; const Tags : array of PtrUInt) : LONGINT;
+FUNCTION p96GetRTGDataTags(const Tags : array of PtrUInt) : LONGINT;
+FUNCTION p96GetBoardDataTags(Board : longword; const Tags : array of PtrUInt) : LONGINT;
 
 IMPLEMENTATION
 
-uses
-  tagsarray;
-
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION p96BestModeIDTags(const Tags : Array Of Const) : longword;
+FUNCTION p96BestModeIDTags(const Tags : array of PtrUInt) : longword;
 begin
-    p96BestModeIDTags := p96BestModeIDTagList(readintags(Tags));
+    p96BestModeIDTags := p96BestModeIDTagList(@Tags);
 end;
 
-FUNCTION p96RequestModeIDTags(const Tags : Array Of Const) : longword;
+FUNCTION p96RequestModeIDTags(const Tags : array of PtrUInt) : longword;
 begin
-    p96RequestModeIDTags := p96RequestModeIDTagList(readintags(Tags));
+    p96RequestModeIDTags := p96RequestModeIDTagList(@Tags);
 end;
 
-FUNCTION p96AllocModeListTags(const Tags : Array Of Const) : pList;
+FUNCTION p96AllocModeListTags(const Tags : array of PtrUInt) : pList;
 begin
-    p96AllocModeListTags := p96AllocModeListTagList(readintags(Tags));
+    p96AllocModeListTags := p96AllocModeListTagList(@Tags);
 end;
 
-FUNCTION p96OpenScreenTags(const Tags : Array Of Const) : pScreen;
+FUNCTION p96OpenScreenTags(const Tags : array of PtrUInt) : pScreen;
 begin
-    p96OpenScreenTags := p96OpenScreenTagList(readintags(Tags));
+    p96OpenScreenTags := p96OpenScreenTagList(@Tags);
 end;
 
-FUNCTION p96PIP_OpenTags(const Tags : Array Of Const) : pWindow;
+FUNCTION p96PIP_OpenTags(const Tags : array of PtrUInt) : pWindow;
 begin
-    p96PIP_OpenTags := p96PIP_OpenTagList(readintags(Tags));
+    p96PIP_OpenTags := p96PIP_OpenTagList(@Tags);
 end;
 
-FUNCTION p96PIP_SetTags(Window : pWindow; const Tags : Array Of Const) : LONGINT;
+FUNCTION p96PIP_SetTags(Window : pWindow; const Tags : array of PtrUInt) : LONGINT;
 begin
-    p96PIP_SetTags := p96PIP_SetTagList(Window , readintags(Tags));
+    p96PIP_SetTags := p96PIP_SetTagList(Window , @Tags);
 end;
 
-FUNCTION p96PIP_GetTags(Window : pWindow; const Tags : Array Of Const) : LONGINT;
+FUNCTION p96PIP_GetTags(Window : pWindow; const Tags : array of PtrUInt) : LONGINT;
 begin
-    p96PIP_GetTags := p96PIP_GetTagList(Window , readintags(Tags));
+    p96PIP_GetTags := p96PIP_GetTagList(Window , @Tags);
 end;
 
-FUNCTION p96GetRTGDataTags(const Tags : Array Of Const) : LONGINT;
+FUNCTION p96GetRTGDataTags(const Tags : array of PtrUInt) : LONGINT;
 begin
-    p96GetRTGDataTags := p96GetRTGDataTagList(readintags(Tags));
+    p96GetRTGDataTags := p96GetRTGDataTagList(@Tags);
 end;
 
-FUNCTION p96GetBoardDataTags(Board : longword; const Tags : Array Of Const) : LONGINT;
+FUNCTION p96GetBoardDataTags(Board : longword; const Tags : array of PtrUInt) : LONGINT;
 begin
-    p96GetBoardDataTags := p96GetBoardDataTagList(Board , readintags(Tags));
+    p96GetBoardDataTags := p96GetBoardDataTagList(Board , @Tags);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/render.pas b/packages/amunits/src/otherlibs/render.pas
index 6e11f3a3a0..73c9b62462 100644
--- a/packages/amunits/src/otherlibs/render.pas
+++ b/packages/amunits/src/otherlibs/render.pas
@@ -28,7 +28,6 @@
   nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
-{$mode objfpc}
 
 UNIT RENDER;
 
@@ -397,195 +396,192 @@ FUNCTION ScaleOrdinate(source : WORD location 'd0'; dest : WORD location 'd1'; o
 FUNCTION SortPaletteA(palette : POINTER location 'a0'; mode : longword location 'd0'; taglist : pTagItem location 'a1') : longword; syscall RenderBase 216;
 PROCEDURE TintRGBArrayA(source : pULONG location 'a0'; width : WORD location 'd0'; height : WORD location 'd1'; RGB : longword location 'd2'; ratio : WORD location 'd3'; dest : pULONG location 'a1'; taglist : pTagItem location 'a2'); syscall RenderBase 324;
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AddChunkyImage(histogram : POINTER; chunky : pByte; width : WORD; height : WORD; palette : POINTER; const taglist : Array Of Const) : longword;
-FUNCTION AddHistogram(histogram1 : POINTER; histogram2 : POINTER; const taglist : Array Of Const) : longword;
-FUNCTION AddRGBImage(histogram : POINTER; rgb : pULONG; width : WORD; height : WORD; const taglist : Array Of Const) : longword;
-PROCEDURE ApplyAlphaChannel(sourcearray : pULONG; width : WORD; height : WORD; destarray : pULONG; const taglist : Array Of Const);
-PROCEDURE Chunky2BitMap(chunky : pByte; sx : WORD; sy : WORD; width : WORD; height : WORD; bitmap : pBitMap; dx : WORD; dy : WORD; const taglist : Array Of Const);
-FUNCTION Chunky2RGB(chunky : pByte; width : WORD; height : WORD; rgb : pULONG; palette : POINTER; const taglist : Array Of Const) : longword;
-FUNCTION ChunkyArrayDiversity(chunky : pByte; palette : POINTER; width : WORD; height : WORD; const taglist : Array Of Const) : LONGINT;
-FUNCTION ConvertChunky(source : pByte; oldpalette : POINTER; width : WORD; height : WORD; dest : pByte; newpalette : POINTER; const taglist : Array Of Const) : longword;
-PROCEDURE CreateAlphaArray(rgbarray : pULONG; width : WORD; height : WORD; const taglist : Array Of Const);
-FUNCTION CreateHistogram(const taglist : Array Of Const) : POINTER;
-FUNCTION CreateMapEngine(palette : POINTER; const taglist : Array Of Const) : POINTER;
-FUNCTION CreatePalette(const taglist : Array Of Const) : POINTER;
-PROCEDURE CreatePenTable(chunky : pByte; oldpalette : POINTER; width : WORD; height : WORD; newpalette : POINTER; convtab : pByte; const taglist : Array Of Const);
-FUNCTION CreateRMHandler(const taglist : Array Of Const) : POINTER;
-FUNCTION CreateScaleEngine(sourcewidth : WORD; sourceheight : WORD; destwidth : WORD; destheight : WORD; const taglist : Array Of Const) : POINTER;
-PROCEDURE ExportPalette(palette : POINTER; coltab : POINTER; const taglist : Array Of Const);
-PROCEDURE ExtractAlphaChannel(rgbarray : pULONG; width : WORD; height : WORD; chunkyarray : pByte; const taglist : Array Of Const);
-FUNCTION ExtractPalette(histogram : POINTER; palette : pULONG; numcolors : WORD; const taglist : Array Of Const) : longword;
-PROCEDURE ImportPalette(palette : POINTER; coltab : POINTER; numcols : WORD; const taglist : Array Of Const);
-PROCEDURE InsertAlphaChannel(maskarray : pByte; width : WORD; height : WORD; rgbarray : pULONG; const taglist : Array Of Const);
-FUNCTION MapChunkyArray(engine : POINTER; source : pByte; palette : POINTER; width : WORD; height : WORD; dest : pByte; const taglist : Array Of Const) : longword;
-FUNCTION MapRGBArray(engine : POINTER; rgb : pULONG; width : WORD; height : WORD; chunky : pByte; const taglist : Array Of Const) : longword;
-PROCEDURE MixAlphaChannel(source1 : pULONG; source2 : pULONG; width : WORD; height : WORD; dest : pULONG; const taglist : Array Of Const);
-PROCEDURE MixRGBArray(sourcearray : pULONG; width : WORD; height : WORD; destarray : pULONG; ratio : WORD; const taglist : Array Of Const);
-PROCEDURE Planar2Chunky(planetab : pPLANEPTR; bytewidth : WORD; height : WORD; depth : WORD; bytesperrow : WORD; chunky : pByte; const taglist : Array Of Const);
-FUNCTION RenderTags(rgb : pULONG; width : WORD; height : WORD; chunky : pByte; palette : POINTER; const taglist : Array Of Const) : longword;
-FUNCTION RGBArrayDiversity(rgb : pULONG; width : WORD; height : WORD; const taglist : Array Of Const) : LONGINT;
-FUNCTION Scale(engine : POINTER; source : POINTER; dest : POINTER; const taglist : Array Of Const) : longword;
-FUNCTION SortPalette(palette : POINTER; mode : longword; const taglist : Array Of Const) : longword;
-PROCEDURE TintRGBArray(source : pULONG; width : WORD; height : WORD; RGB : longword; ratio : WORD; dest : pULONG; const taglist : Array Of Const);
+FUNCTION AddChunkyImage(histogram : POINTER; chunky : pByte; width : WORD; height : WORD; palette : POINTER; const taglist : array of PtrUInt) : longword;
+FUNCTION AddHistogram(histogram1 : POINTER; histogram2 : POINTER; const taglist : array of PtrUInt) : longword;
+FUNCTION AddRGBImage(histogram : POINTER; rgb : pULONG; width : WORD; height : WORD; const taglist : array of PtrUInt) : longword;
+PROCEDURE ApplyAlphaChannel(sourcearray : pULONG; width : WORD; height : WORD; destarray : pULONG; const taglist : array of PtrUInt);
+PROCEDURE Chunky2BitMap(chunky : pByte; sx : WORD; sy : WORD; width : WORD; height : WORD; bitmap : pBitMap; dx : WORD; dy : WORD; const taglist : array of PtrUInt);
+FUNCTION Chunky2RGB(chunky : pByte; width : WORD; height : WORD; rgb : pULONG; palette : POINTER; const taglist : array of PtrUInt) : longword;
+FUNCTION ChunkyArrayDiversity(chunky : pByte; palette : POINTER; width : WORD; height : WORD; const taglist : array of PtrUInt) : LONGINT;
+FUNCTION ConvertChunky(source : pByte; oldpalette : POINTER; width : WORD; height : WORD; dest : pByte; newpalette : POINTER; const taglist : array of PtrUInt) : longword;
+PROCEDURE CreateAlphaArray(rgbarray : pULONG; width : WORD; height : WORD; const taglist : array of PtrUInt);
+FUNCTION CreateHistogram(const taglist : array of PtrUInt) : POINTER;
+FUNCTION CreateMapEngine(palette : POINTER; const taglist : array of PtrUInt) : POINTER;
+FUNCTION CreatePalette(const taglist : array of PtrUInt) : POINTER;
+PROCEDURE CreatePenTable(chunky : pByte; oldpalette : POINTER; width : WORD; height : WORD; newpalette : POINTER; convtab : pByte; const taglist : array of PtrUInt);
+FUNCTION CreateRMHandler(const taglist : array of PtrUInt) : POINTER;
+FUNCTION CreateScaleEngine(sourcewidth : WORD; sourceheight : WORD; destwidth : WORD; destheight : WORD; const taglist : array of PtrUInt) : POINTER;
+PROCEDURE ExportPalette(palette : POINTER; coltab : POINTER; const taglist : array of PtrUInt);
+PROCEDURE ExtractAlphaChannel(rgbarray : pULONG; width : WORD; height : WORD; chunkyarray : pByte; const taglist : array of PtrUInt);
+FUNCTION ExtractPalette(histogram : POINTER; palette : pULONG; numcolors : WORD; const taglist : array of PtrUInt) : longword;
+PROCEDURE ImportPalette(palette : POINTER; coltab : POINTER; numcols : WORD; const taglist : array of PtrUInt);
+PROCEDURE InsertAlphaChannel(maskarray : pByte; width : WORD; height : WORD; rgbarray : pULONG; const taglist : array of PtrUInt);
+FUNCTION MapChunkyArray(engine : POINTER; source : pByte; palette : POINTER; width : WORD; height : WORD; dest : pByte; const taglist : array of PtrUInt) : longword;
+FUNCTION MapRGBArray(engine : POINTER; rgb : pULONG; width : WORD; height : WORD; chunky : pByte; const taglist : array of PtrUInt) : longword;
+PROCEDURE MixAlphaChannel(source1 : pULONG; source2 : pULONG; width : WORD; height : WORD; dest : pULONG; const taglist : array of PtrUInt);
+PROCEDURE MixRGBArray(sourcearray : pULONG; width : WORD; height : WORD; destarray : pULONG; ratio : WORD; const taglist : array of PtrUInt);
+PROCEDURE Planar2Chunky(planetab : pPLANEPTR; bytewidth : WORD; height : WORD; depth : WORD; bytesperrow : WORD; chunky : pByte; const taglist : array of PtrUInt);
+FUNCTION RenderTags(rgb : pULONG; width : WORD; height : WORD; chunky : pByte; palette : POINTER; const taglist : array of PtrUInt) : longword;
+FUNCTION RGBArrayDiversity(rgb : pULONG; width : WORD; height : WORD; const taglist : array of PtrUInt) : LONGINT;
+FUNCTION Scale(engine : POINTER; source : POINTER; dest : POINTER; const taglist : array of PtrUInt) : longword;
+FUNCTION SortPalette(palette : POINTER; mode : longword; const taglist : array of PtrUInt) : longword;
+PROCEDURE TintRGBArray(source : pULONG; width : WORD; height : WORD; RGB : longword; ratio : WORD; dest : pULONG; const taglist : array of PtrUInt);
 
 IMPLEMENTATION
 
-uses
-  tagsarray;
-
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION AddChunkyImage(histogram : POINTER; chunky : pByte; width : WORD; height : WORD; palette : POINTER; const taglist : Array Of Const) : longword;
+FUNCTION AddChunkyImage(histogram : POINTER; chunky : pByte; width : WORD; height : WORD; palette : POINTER; const taglist : array of PtrUInt) : longword;
 begin
-    AddChunkyImage := AddChunkyImageA(histogram , chunky , width , height , palette , readintags(taglist));
+    AddChunkyImage := AddChunkyImageA(histogram , chunky , width , height , palette , @taglist);
 end;
 
-FUNCTION AddHistogram(histogram1 : POINTER; histogram2 : POINTER; const taglist : Array Of Const) : longword;
+FUNCTION AddHistogram(histogram1 : POINTER; histogram2 : POINTER; const taglist : array of PtrUInt) : longword;
 begin
-    AddHistogram := AddHistogramA(histogram1 , histogram2 , readintags(taglist));
+    AddHistogram := AddHistogramA(histogram1 , histogram2 , @taglist);
 end;
 
-FUNCTION AddRGBImage(histogram : POINTER; rgb : pULONG; width : WORD; height : WORD; const taglist : Array Of Const) : longword;
+FUNCTION AddRGBImage(histogram : POINTER; rgb : pULONG; width : WORD; height : WORD; const taglist : array of PtrUInt) : longword;
 begin
-    AddRGBImage := AddRGBImageA(histogram , rgb , width , height , readintags(taglist));
+    AddRGBImage := AddRGBImageA(histogram , rgb , width , height , @taglist);
 end;
 
-PROCEDURE ApplyAlphaChannel(sourcearray : pULONG; width : WORD; height : WORD; destarray : pULONG; const taglist : Array Of Const);
+PROCEDURE ApplyAlphaChannel(sourcearray : pULONG; width : WORD; height : WORD; destarray : pULONG; const taglist : array of PtrUInt);
 begin
-    ApplyAlphaChannelA(sourcearray , width , height , destarray , readintags(taglist));
+    ApplyAlphaChannelA(sourcearray , width , height , destarray , @taglist);
 end;
 
-PROCEDURE Chunky2BitMap(chunky : pByte; sx : WORD; sy : WORD; width : WORD; height : WORD; bitmap : pBitMap; dx : WORD; dy : WORD; const taglist : Array Of Const);
+PROCEDURE Chunky2BitMap(chunky : pByte; sx : WORD; sy : WORD; width : WORD; height : WORD; bitmap : pBitMap; dx : WORD; dy : WORD; const taglist : array of PtrUInt);
 begin
-    Chunky2BitMapA(chunky , sx , sy , width , height , bitmap , dx , dy , readintags(taglist));
+    Chunky2BitMapA(chunky , sx , sy , width , height , bitmap , dx , dy , @taglist);
 end;
 
-FUNCTION Chunky2RGB(chunky : pByte; width : WORD; height : WORD; rgb : pULONG; palette : POINTER; const taglist : Array Of Const) : longword;
+FUNCTION Chunky2RGB(chunky : pByte; width : WORD; height : WORD; rgb : pULONG; palette : POINTER; const taglist : array of PtrUInt) : longword;
 begin
-    Chunky2RGB := Chunky2RGBA(chunky , width , height , rgb , palette , readintags(taglist));
+    Chunky2RGB := Chunky2RGBA(chunky , width , height , rgb , palette , @taglist);
 end;
 
-FUNCTION ChunkyArrayDiversity(chunky : pByte; palette : POINTER; width : WORD; height : WORD; const taglist : Array Of Const) : LONGINT;
+FUNCTION ChunkyArrayDiversity(chunky : pByte; palette : POINTER; width : WORD; height : WORD; const taglist : array of PtrUInt) : LONGINT;
 begin
-    ChunkyArrayDiversity := ChunkyArrayDiversityA(chunky , palette , width , height , readintags(taglist));
+    ChunkyArrayDiversity := ChunkyArrayDiversityA(chunky , palette , width , height , @taglist);
 end;
 
-FUNCTION ConvertChunky(source : pByte; oldpalette : POINTER; width : WORD; height : WORD; dest : pByte; newpalette : POINTER; const taglist : Array Of Const) : longword;
+FUNCTION ConvertChunky(source : pByte; oldpalette : POINTER; width : WORD; height : WORD; dest : pByte; newpalette : POINTER; const taglist : array of PtrUInt) : longword;
 begin
-    ConvertChunky := ConvertChunkyA(source , oldpalette , width , height , dest , newpalette , readintags(taglist));
+    ConvertChunky := ConvertChunkyA(source , oldpalette , width , height , dest , newpalette , @taglist);
 end;
 
-PROCEDURE CreateAlphaArray(rgbarray : pULONG; width : WORD; height : WORD; const taglist : Array Of Const);
+PROCEDURE CreateAlphaArray(rgbarray : pULONG; width : WORD; height : WORD; const taglist : array of PtrUInt);
 begin
-    CreateAlphaArrayA(rgbarray , width , height , readintags(taglist));
+    CreateAlphaArrayA(rgbarray , width , height , @taglist);
 end;
 
-FUNCTION CreateHistogram(const taglist : Array Of Const) : POINTER;
+FUNCTION CreateHistogram(const taglist : array of PtrUInt) : POINTER;
 begin
-    CreateHistogram := CreateHistogramA(readintags(taglist));
+    CreateHistogram := CreateHistogramA(@taglist);
 end;
 
-FUNCTION CreateMapEngine(palette : POINTER; const taglist : Array Of Const) : POINTER;
+FUNCTION CreateMapEngine(palette : POINTER; const taglist : array of PtrUInt) : POINTER;
 begin
-    CreateMapEngine := CreateMapEngineA(palette , readintags(taglist));
+    CreateMapEngine := CreateMapEngineA(palette , @taglist);
 end;
 
-FUNCTION CreatePalette(const taglist : Array Of Const) : POINTER;
+FUNCTION CreatePalette(const taglist : array of PtrUInt) : POINTER;
 begin
-    CreatePalette := CreatePaletteA(readintags(taglist));
+    CreatePalette := CreatePaletteA(@taglist);
 end;
 
-PROCEDURE CreatePenTable(chunky : pByte; oldpalette : POINTER; width : WORD; height : WORD; newpalette : POINTER; convtab : pByte; const taglist : Array Of Const);
+PROCEDURE CreatePenTable(chunky : pByte; oldpalette : POINTER; width : WORD; height : WORD; newpalette : POINTER; convtab : pByte; const taglist : array of PtrUInt);
 begin
-    CreatePenTableA(chunky , oldpalette , width , height , newpalette , convtab , readintags(taglist));
+    CreatePenTableA(chunky , oldpalette , width , height , newpalette , convtab , @taglist);
 end;
 
-FUNCTION CreateRMHandler(const taglist : Array Of Const) : POINTER;
+FUNCTION CreateRMHandler(const taglist : array of PtrUInt) : POINTER;
 begin
-    CreateRMHandler := CreateRMHandlerA(readintags(taglist));
+    CreateRMHandler := CreateRMHandlerA(@taglist);
 end;
 
-FUNCTION CreateScaleEngine(sourcewidth : WORD; sourceheight : WORD; destwidth : WORD; destheight : WORD; const taglist : Array Of Const) : POINTER;
+FUNCTION CreateScaleEngine(sourcewidth : WORD; sourceheight : WORD; destwidth : WORD; destheight : WORD; const taglist : array of PtrUInt) : POINTER;
 begin
-    CreateScaleEngine := CreateScaleEngineA(sourcewidth , sourceheight , destwidth , destheight , readintags(taglist));
+    CreateScaleEngine := CreateScaleEngineA(sourcewidth , sourceheight , destwidth , destheight , @taglist);
 end;
 
-PROCEDURE ExportPalette(palette : POINTER; coltab : POINTER; const taglist : Array Of Const);
+PROCEDURE ExportPalette(palette : POINTER; coltab : POINTER; const taglist : array of PtrUInt);
 begin
-    ExportPaletteA(palette , coltab , readintags(taglist));
+    ExportPaletteA(palette , coltab , @taglist);
 end;
 
-PROCEDURE ExtractAlphaChannel(rgbarray : pULONG; width : WORD; height : WORD; chunkyarray : pByte; const taglist : Array Of Const);
+PROCEDURE ExtractAlphaChannel(rgbarray : pULONG; width : WORD; height : WORD; chunkyarray : pByte; const taglist : array of PtrUInt);
 begin
-    ExtractAlphaChannelA(rgbarray , width , height , chunkyarray , readintags(taglist));
+    ExtractAlphaChannelA(rgbarray , width , height , chunkyarray , @taglist);
 end;
 
-FUNCTION ExtractPalette(histogram : POINTER; palette : pULONG; numcolors : WORD; const taglist : Array Of Const) : longword;
+FUNCTION ExtractPalette(histogram : POINTER; palette : pULONG; numcolors : WORD; const taglist : array of PtrUInt) : longword;
 begin
-    ExtractPalette := ExtractPaletteA(histogram , palette , numcolors , readintags(taglist));
+    ExtractPalette := ExtractPaletteA(histogram , palette , numcolors , @taglist);
 end;
 
-PROCEDURE ImportPalette(palette : POINTER; coltab : POINTER; numcols : WORD; const taglist : Array Of Const);
+PROCEDURE ImportPalette(palette : POINTER; coltab : POINTER; numcols : WORD; const taglist : array of PtrUInt);
 begin
-    ImportPaletteA(palette , coltab , numcols , readintags(taglist));
+    ImportPaletteA(palette , coltab , numcols , @taglist);
 end;
 
-PROCEDURE InsertAlphaChannel(maskarray : pByte; width : WORD; height : WORD; rgbarray : pULONG; const taglist : Array Of Const);
+PROCEDURE InsertAlphaChannel(maskarray : pByte; width : WORD; height : WORD; rgbarray : pULONG; const taglist : array of PtrUInt);
 begin
-    InsertAlphaChannelA(maskarray , width , height , rgbarray , readintags(taglist));
+    InsertAlphaChannelA(maskarray , width , height , rgbarray , @taglist);
 end;
 
-FUNCTION MapChunkyArray(engine : POINTER; source : pByte; palette : POINTER; width : WORD; height : WORD; dest : pByte; const taglist : Array Of Const) : longword;
+FUNCTION MapChunkyArray(engine : POINTER; source : pByte; palette : POINTER; width : WORD; height : WORD; dest : pByte; const taglist : array of PtrUInt) : longword;
 begin
-    MapChunkyArray := MapChunkyArrayA(engine , source , palette , width , height , dest , readintags(taglist));
+    MapChunkyArray := MapChunkyArrayA(engine , source , palette , width , height , dest , @taglist);
 end;
 
-FUNCTION MapRGBArray(engine : POINTER; rgb : pULONG; width : WORD; height : WORD; chunky : pByte; const taglist : Array Of Const) : longword;
+FUNCTION MapRGBArray(engine : POINTER; rgb : pULONG; width : WORD; height : WORD; chunky : pByte; const taglist : array of PtrUInt) : longword;
 begin
-    MapRGBArray := MapRGBArrayA(engine , rgb , width , height , chunky , readintags(taglist));
+    MapRGBArray := MapRGBArrayA(engine , rgb , width , height , chunky , @taglist);
 end;
 
-PROCEDURE MixAlphaChannel(source1 : pULONG; source2 : pULONG; width : WORD; height : WORD; dest : pULONG; const taglist : Array Of Const);
+PROCEDURE MixAlphaChannel(source1 : pULONG; source2 : pULONG; width : WORD; height : WORD; dest : pULONG; const taglist : array of PtrUInt);
 begin
-    MixAlphaChannelA(source1 , source2 , width , height , dest , readintags(taglist));
+    MixAlphaChannelA(source1 , source2 , width , height , dest , @taglist);
 end;
 
-PROCEDURE MixRGBArray(sourcearray : pULONG; width : WORD; height : WORD; destarray : pULONG; ratio : WORD; const taglist : Array Of Const);
+PROCEDURE MixRGBArray(sourcearray : pULONG; width : WORD; height : WORD; destarray : pULONG; ratio : WORD; const taglist : array of PtrUInt);
 begin
-    MixRGBArrayA(sourcearray , width , height , destarray , ratio , readintags(taglist));
+    MixRGBArrayA(sourcearray , width , height , destarray , ratio , @taglist);
 end;
 
-PROCEDURE Planar2Chunky(planetab : pPLANEPTR; bytewidth : WORD; height : WORD; depth : WORD; bytesperrow : WORD; chunky : pByte; const taglist : Array Of Const);
+PROCEDURE Planar2Chunky(planetab : pPLANEPTR; bytewidth : WORD; height : WORD; depth : WORD; bytesperrow : WORD; chunky : pByte; const taglist : array of PtrUInt);
 begin
-    Planar2ChunkyA(planetab , bytewidth , height , depth , bytesperrow , chunky , readintags(taglist));
+    Planar2ChunkyA(planetab , bytewidth , height , depth , bytesperrow , chunky , @taglist);
 end;
 
-FUNCTION RenderTags(rgb : pULONG; width : WORD; height : WORD; chunky : pByte; palette : POINTER; const taglist : Array Of Const) : longword;
+FUNCTION RenderTags(rgb : pULONG; width : WORD; height : WORD; chunky : pByte; palette : POINTER; const taglist : array of PtrUInt) : longword;
 begin
-    RenderTags := RenderA(rgb , width , height , chunky , palette , readintags(taglist));
+    RenderTags := RenderA(rgb , width , height , chunky , palette , @taglist);
 end;
 
-FUNCTION RGBArrayDiversity(rgb : pULONG; width : WORD; height : WORD; const taglist : Array Of Const) : LONGINT;
+FUNCTION RGBArrayDiversity(rgb : pULONG; width : WORD; height : WORD; const taglist : array of PtrUInt) : LONGINT;
 begin
-    RGBArrayDiversity := RGBArrayDiversityA(rgb , width , height , readintags(taglist));
+    RGBArrayDiversity := RGBArrayDiversityA(rgb , width , height , @taglist);
 end;
 
-FUNCTION Scale(engine : POINTER; source : POINTER; dest : POINTER; const taglist : Array Of Const) : longword;
+FUNCTION Scale(engine : POINTER; source : POINTER; dest : POINTER; const taglist : array of PtrUInt) : longword;
 begin
-    Scale := ScaleA(engine , source , dest , readintags(taglist));
+    Scale := ScaleA(engine , source , dest , @taglist);
 end;
 
-FUNCTION SortPalette(palette : POINTER; mode : longword; const taglist : Array Of Const) : longword;
+FUNCTION SortPalette(palette : POINTER; mode : longword; const taglist : array of PtrUInt) : longword;
 begin
-    SortPalette := SortPaletteA(palette , mode , readintags(taglist));
+    SortPalette := SortPaletteA(palette , mode , @taglist);
 end;
 
-PROCEDURE TintRGBArray(source : pULONG; width : WORD; height : WORD; RGB : longword; ratio : WORD; dest : pULONG; const taglist : Array Of Const);
+PROCEDURE TintRGBArray(source : pULONG; width : WORD; height : WORD; RGB : longword; ratio : WORD; dest : pULONG; const taglist : array of PtrUInt);
 begin
-    TintRGBArrayA(source , width , height , RGB , ratio , dest , readintags(taglist));
+    TintRGBArrayA(source , width , height , RGB , ratio , dest , @taglist);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/reqtools.pas b/packages/amunits/src/otherlibs/reqtools.pas
index de6f6b1cc6..a860999d72 100644
--- a/packages/amunits/src/otherlibs/reqtools.pas
+++ b/packages/amunits/src/otherlibs/reqtools.pas
@@ -22,7 +22,7 @@
     Added MessageBox for error report.
     31 Jul 2000.
 
-    Added functions and procedures with array of const.
+    Added functions and procedures with array of PtrUInt.
     For use with fpc 1.0.
     07 Dec 2002.
 
@@ -36,7 +36,6 @@
     nils.sjoholm@mailbox.swipnet.se
 }
 
-{$mode objfpc}
 {$packrecords 2}
 
 UNIT REQTOOLS;
@@ -627,20 +626,20 @@ PROCEDURE rtSpread(VAR posarray : ULONG location 'a0'; VAR sizearray : ULONG loc
 PROCEDURE rtUnlockWindow(win : pWindow location 'a0'; winlock : POINTER location 'a1'); syscall ReqToolsBase 162;
 
 {
-     This is functions and procedures with array of const.
+     This is functions and procedures with array of PtrUInt.
      For use with fpc 1.0 and above.
 }
 
-FUNCTION rtAllocRequest(typ : ULONG; const argv : Array Of Const) : POINTER;
-FUNCTION rtChangeReqAttr(req : POINTER; const argv : Array Of Const) : LONGINT;
-FUNCTION rtEZRequest(bodyfmt : PChar; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : Array Of Const) : ULONG;
-FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; title : PChar; const argv : Array Of Const) : POINTER;
-FUNCTION rtFontRequest(fontreq : prtFontRequester; title : PChar; const argv : Array Of Const) : ULONG;
-FUNCTION rtGetLong(VAR longptr : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : Array Of Const) : ULONG;
-FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : Array Of Const) : ULONG;
-FUNCTION rtPaletteRequest(title : PChar; reqinfo : prtReqInfo; const argv : Array Of Const) : LONGINT;
-FUNCTION rtReqHandler(handlerinfo : prtHandlerInfo; sigs : ULONG; const argv : Array Of Const) : ULONG;
-FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; title : PChar; const argv : Array Of Const) : ULONG;
+FUNCTION rtAllocRequest(typ : ULONG; const argv : array of PtrUInt) : POINTER;
+FUNCTION rtChangeReqAttr(req : POINTER; const argv : array of PtrUInt) : LONGINT;
+FUNCTION rtEZRequest(bodyfmt : PChar; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; title : PChar; const argv : array of PtrUInt) : POINTER;
+FUNCTION rtFontRequest(fontreq : prtFontRequester; title : PChar; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetLong(VAR longptr : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtPaletteRequest(title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : LONGINT;
+FUNCTION rtReqHandler(handlerinfo : prtHandlerInfo; sigs : ULONG; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; title : PChar; const argv : array of PtrUInt) : ULONG;
 
 {overlay functions}
 
@@ -655,25 +654,22 @@ FUNCTION rtPaletteRequestA(const title : RawByteString; reqinfo : prtReqInfo; ta
 FUNCTION rtScreenModeRequestA(screenmodereq : prtScreenModeRequester; const title : RawByteString; taglist : pTagItem) : ULONG;
 
 {
-     This is functions and procedures with array of const.
+     This is functions and procedures with array of PtrUInt.
      For use with fpc 1.0 and above. + overlay
 }
 
-FUNCTION rtEZRequest(bodyfmt : PChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : Array Of Const) : ULONG;
-FUNCTION rtEZRequest(const bodyfmt : RawByteString; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : Array Of Const) : ULONG;
-FUNCTION rtEZRequest(const bodyfmt : RawByteString; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : Array Of Const) : ULONG;
-FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; const title : RawByteString; const argv : Array Of Const) : POINTER;
-FUNCTION rtFontRequest(fontreq : prtFontRequester; const title : RawByteString; const argv : Array Of Const) : ULONG;
-FUNCTION rtGetLong(VAR longptr : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : Array Of Const) : ULONG;
-FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : Array Of Const) : ULONG;
-FUNCTION rtPaletteRequest(const title : RawByteString; reqinfo : prtReqInfo; const argv : Array Of Const) : LONGINT;
-FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; const title : RawByteString; const argv : Array Of Const) : ULONG;
+FUNCTION rtEZRequest(bodyfmt : PChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtEZRequest(const bodyfmt : RawByteString; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtEZRequest(const bodyfmt : RawByteString; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; const title : RawByteString; const argv : array of PtrUInt) : POINTER;
+FUNCTION rtFontRequest(fontreq : prtFontRequester; const title : RawByteString; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetLong(VAR longptr : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
+FUNCTION rtPaletteRequest(const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : LONGINT;
+FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; const title : RawByteString; const argv : array of PtrUInt) : ULONG;
 
 IMPLEMENTATION
 
-uses
-  tagsarray;
-
 
 FUNCTION rtEZRequestA(bodyfmt : PChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray: POINTER; taglist : pTagItem) : ULONG;
 BEGIN
@@ -721,99 +717,99 @@ BEGIN
 END;
 
 
-FUNCTION rtAllocRequest(typ : ULONG; const argv : Array Of Const) : POINTER;
+FUNCTION rtAllocRequest(typ : ULONG; const argv : array of PtrUInt) : POINTER;
 begin
-    rtAllocRequest := rtAllocRequestA(typ,readintags(argv));
+    rtAllocRequest := rtAllocRequestA(typ,@argv);
 end;
 
-FUNCTION rtChangeReqAttr(req : POINTER; const argv : Array Of Const) : LONGINT;
+FUNCTION rtChangeReqAttr(req : POINTER; const argv : array of PtrUInt) : LONGINT;
 begin
-    rtChangeReqAttr := rtChangeReqAttrA(req,readintags(argv));
+    rtChangeReqAttr := rtChangeReqAttrA(req,@argv);
 end;
 
-FUNCTION rtEZRequest(bodyfmt : PChar; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : Array Of Const) : ULONG;
+FUNCTION rtEZRequest(bodyfmt : PChar; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
 begin
-    rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,readintags(argv));
+    rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,@argv);
 end;
 
-FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; title : PChar; const argv : Array Of Const) : POINTER;
+FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; title : PChar; const argv : array of PtrUInt) : POINTER;
 begin
-    rtFileRequest := rtFileRequestA(filereq,filebuf,title,readintags(argv));
+    rtFileRequest := rtFileRequestA(filereq,filebuf,title,@argv);
 end;
 
-FUNCTION rtFontRequest(fontreq : prtFontRequester; title : PChar; const argv : Array Of Const) : ULONG;
+FUNCTION rtFontRequest(fontreq : prtFontRequester; title : PChar; const argv : array of PtrUInt) : ULONG;
 begin
-    rtFontRequest := rtFontRequestA(fontreq,title,readintags(argv));
+    rtFontRequest := rtFontRequestA(fontreq,title,@argv);
 end;
 
-FUNCTION rtGetLong(VAR longptr : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : Array Of Const) : ULONG;
+FUNCTION rtGetLong(VAR longptr : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
 begin
-    rtGetLong := rtGetLongA(longptr,title,reqinfo,readintags(argv));
+    rtGetLong := rtGetLongA(longptr,title,reqinfo,@argv);
 end;
 
-FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : Array Of Const) : ULONG;
+FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
 begin
-    rtGetString := rtGetStringA(buffer,maxchars,title,reqinfo,readintags(argv));
+    rtGetString := rtGetStringA(buffer,maxchars,title,reqinfo,@argv);
 end;
 
-FUNCTION rtPaletteRequest(title : PChar; reqinfo : prtReqInfo; const argv : Array Of Const) : LONGINT;
+FUNCTION rtPaletteRequest(title : PChar; reqinfo : prtReqInfo; const argv : array of PtrUInt) : LONGINT;
 begin
-    rtPaletteRequest := rtPaletteRequestA(title,reqinfo,readintags(argv));
+    rtPaletteRequest := rtPaletteRequestA(title,reqinfo,@argv);
 end;
 
-FUNCTION rtReqHandler(handlerinfo : prtHandlerInfo; sigs : ULONG; const argv : Array Of Const) : ULONG;
+FUNCTION rtReqHandler(handlerinfo : prtHandlerInfo; sigs : ULONG; const argv : array of PtrUInt) : ULONG;
 begin
-    rtReqHandler := rtReqHandlerA(handlerinfo,sigs,readintags(argv));
+    rtReqHandler := rtReqHandlerA(handlerinfo,sigs,@argv);
 end;
 
-FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; title : PChar; const argv : Array Of Const) : ULONG;
+FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; title : PChar; const argv : array of PtrUInt) : ULONG;
 begin
-    rtScreenModeRequest := rtScreenModeRequestA(screenmodereq,title,readintags(argv));
+    rtScreenModeRequest := rtScreenModeRequestA(screenmodereq,title,@argv);
 end;
 
-FUNCTION rtEZRequest(bodyfmt : PChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : Array Of Const) : ULONG;
+FUNCTION rtEZRequest(bodyfmt : PChar; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
 begin
-    rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,readintags(argv));
+    rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,@argv);
 end;
 
-FUNCTION rtEZRequest(const bodyfmt : RawByteString; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : Array Of Const) : ULONG;
+FUNCTION rtEZRequest(const bodyfmt : RawByteString; gadfmt : PChar; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
 begin
-    rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,readintags(argv));
+    rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,@argv);
 end;
 
-FUNCTION rtEZRequest(const bodyfmt : RawByteString; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : Array Of Const) : ULONG;
+FUNCTION rtEZRequest(const bodyfmt : RawByteString; const gadfmt : RawByteString; reqinfo : prtReqInfo; argarray : POINTER; const argv : array of PtrUInt) : ULONG;
 begin
-    rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,readintags(argv));
+    rtEZRequest := rtEZRequestA(bodyfmt,gadfmt,reqinfo,argarray,@argv);
 end;
 
-FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; const title : RawByteString; const argv : Array Of Const) : POINTER;
+FUNCTION rtFileRequest(filereq : prtFileRequester; filebuf : PChar; const title : RawByteString; const argv : array of PtrUInt) : POINTER;
 begin
-     rtFileRequest :=  rtFileRequestA(filereq,filebuf,title,readintags(argv));
+     rtFileRequest :=  rtFileRequestA(filereq,filebuf,title,@argv);
 end;
 
-FUNCTION rtFontRequest(fontreq : prtFontRequester; const title : RawByteString; const argv : Array Of Const) : ULONG;
+FUNCTION rtFontRequest(fontreq : prtFontRequester; const title : RawByteString; const argv : array of PtrUInt) : ULONG;
 begin
-     rtFontRequest := rtFontRequestA(fontreq,title,readintags(argv));
+     rtFontRequest := rtFontRequestA(fontreq,title,@argv);
 end;
 
-FUNCTION rtGetLong(VAR longptr : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : Array Of Const) : ULONG;
+FUNCTION rtGetLong(VAR longptr : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
 begin
-     rtGetLong := rtGetLongA(longptr,title,reqinfo,readintags(argv));
+     rtGetLong := rtGetLongA(longptr,title,reqinfo,@argv);
 end;
 
-FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : Array Of Const) : ULONG;
+FUNCTION rtGetString(buffer : pCHAR; maxchars : ULONG; const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : ULONG;
 begin
-     rtGetString := rtGetStringA(buffer,maxchars,title,reqinfo,readintags(argv));
+     rtGetString := rtGetStringA(buffer,maxchars,title,reqinfo,@argv);
 end;
 
-FUNCTION rtPaletteRequest(const title : RawByteString; reqinfo : prtReqInfo; const argv : Array Of Const) : LONGINT;
+FUNCTION rtPaletteRequest(const title : RawByteString; reqinfo : prtReqInfo; const argv : array of PtrUInt) : LONGINT;
 begin
-     rtPaletteRequest := rtPaletteRequestA(title,reqinfo,readintags(argv));
+     rtPaletteRequest := rtPaletteRequestA(title,reqinfo,@argv);
 end;
 
-FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; const title : RawByteString; const argv : Array Of Const) : ULONG;
+FUNCTION rtScreenModeRequest(screenmodereq : prtScreenModeRequester; const title : RawByteString; const argv : array of PtrUInt) : ULONG;
 begin
-     rtScreenModeRequest := rtScreenModeRequestA(screenmodereq,title,readintags(argv));
+     rtScreenModeRequest := rtScreenModeRequestA(screenmodereq,title,@argv);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/triton.pas b/packages/amunits/src/otherlibs/triton.pas
index d73896e12c..5a10e81236 100644
--- a/packages/amunits/src/otherlibs/triton.pas
+++ b/packages/amunits/src/otherlibs/triton.pas
@@ -17,7 +17,7 @@
 {
     History
 
-    Updated to triton 2.0. Added function with array of const.
+    Updated to triton 2.0. Added function with array of PtrUInt.
     09 Jan 2003.
 
     Added the defines use_amiga_smartlink and
@@ -33,7 +33,6 @@
 
 }
 
-{$mode objfpc}
 
 UNIT TRITON;
 
@@ -728,17 +727,17 @@ PROCEDURE TR_UnlockScreen(screen : pScreen location 'a0'); syscall TritonBase 14
 FUNCTION TR_Wait(app : pTR_App location 'a1'; otherbits : ULONG location 'd0') : ULONG; syscall TritonBase 120;
 
 {
-   Functions with array of const
+   Functions with array of PtrUInt
 }
 FUNCTION TR_AddClassTags(app : pTR_App; d0arg : longword; supertag : longword;
-defaultmethod : LONGINT; datasize : longword; const tags : Array Of Const) : BOOLEAN;
-FUNCTION TR_OpenProjectTags(app : pTR_App; const taglist : Array Of Const) : pTR_Project;
-FUNCTION TR_AutoRequestTags(app : pTR_App; lockproject : pTR_Project; const wintags : Array Of Const): ULONG;
-FUNCTION TR_CreateAppTags(const apptags : Array of Const) : pTR_App;
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : pCHAR; const taglist : Array Of Const) : ULONG;
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : String; Const taglist : Array Of Const) : ULONG;
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : pCHAR; Const taglist : Array Of Const) : ULONG;
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : String; Const taglist : Array Of Const) : ULONG;
+defaultmethod : LONGINT; datasize : longword; const tags : array of PtrUInt) : BOOLEAN;
+FUNCTION TR_OpenProjectTags(app : pTR_App; const taglist : array of PtrUInt) : pTR_Project;
+FUNCTION TR_AutoRequestTags(app : pTR_App; lockproject : pTR_Project; const wintags : array of PtrUInt): ULONG;
+FUNCTION TR_CreateAppTags(const apptags : array of PtrUInt) : pTR_App;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : pCHAR; const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : String; Const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : pCHAR; Const taglist : array of PtrUInt) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : String; Const taglist : array of PtrUInt) : ULONG;
 
 {  This are a few support functions for triton.
    Could be handy.
@@ -763,7 +762,7 @@ procedure TR_UpdateListView(p : pTR_Project; gadid : Longint; thelist: pList);
 IMPLEMENTATION
 
 uses
-  tagsarray,pastoc;
+  pastoc;
 
 procedure TR_Disable(p : pTR_Project; id : Longint);
 begin
@@ -896,49 +895,49 @@ BEGIN
 END;
 
 {
-   Functions with array of const
+   Functions with array of PtrUInt
 }
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION TR_AddClassTags(app : pTR_App; d0arg : longword; supertag : longword; defaultmethod : LONGINT; datasize : longword; const tags : Array Of Const) : BOOLEAN;
+FUNCTION TR_AddClassTags(app : pTR_App; d0arg : longword; supertag : longword; defaultmethod : LONGINT; datasize : longword; const tags : array of PtrUInt) : BOOLEAN;
 begin
-    TR_AddClassTags := TR_AddClass(app , d0arg , supertag , defaultmethod , datasize , readintags(tags));
+    TR_AddClassTags := TR_AddClass(app , d0arg , supertag , defaultmethod , datasize , @tags);
 end;
 
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : pCHAR; const taglist : Array Of Const) : Ulong;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : pCHAR; const taglist : array of PtrUInt) : Ulong;
 begin
-    TR_EasyRequestTags := TR_EasyRequest(app , bodyfmt , gadfmt , readintags(taglist));
+    TR_EasyRequestTags := TR_EasyRequest(app , bodyfmt , gadfmt , @taglist);
 end;
 
-FUNCTION TR_OpenProjectTags(app : pTR_App; const taglist : Array Of Const) : pTR_Project;
+FUNCTION TR_OpenProjectTags(app : pTR_App; const taglist : array of PtrUInt) : pTR_Project;
 begin
-    TR_OpenProjectTags := TR_OpenProject(app , readintags(taglist));
+    TR_OpenProjectTags := TR_OpenProject(app , @taglist);
 end;
 
-FUNCTION TR_AutoRequestTags(app : pTR_App; lockproject : pTR_Project; const wintags : Array Of Const): ULONG;
+FUNCTION TR_AutoRequestTags(app : pTR_App; lockproject : pTR_Project; const wintags : array of PtrUInt): ULONG;
 begin
-    TR_AutoRequestTags := TR_AutoRequest(app,lockproject,readintags(wintags));
+    TR_AutoRequestTags := TR_AutoRequest(app,lockproject, @wintags);
 end;
 
-FUNCTION TR_CreateAppTags(const apptags : Array of Const) : pTR_App;
+FUNCTION TR_CreateAppTags(const apptags : array of PtrUInt) : pTR_App;
 begin
-    TR_CreateAppTags := TR_CreateApp(readintags(apptags));
+    TR_CreateAppTags := TR_CreateApp(@apptags);
 end;
 
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : String; Const taglist : Array Of Const) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : pCHAR; gadfmt : String; Const taglist : array of PtrUInt) : ULONG;
 begin
-    TR_EasyRequestTags := TR_EasyRequest(app,bodyfmt,pas2c(gadfmt),readintags(taglist));
+    TR_EasyRequestTags := TR_EasyRequest(app,bodyfmt,pas2c(gadfmt), @taglist);
 end;
 
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : pCHAR; Const taglist : Array Of Const) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : pCHAR; Const taglist : array of PtrUInt) : ULONG;
 begin
-    TR_EasyRequestTags := TR_EasyRequest(app,pas2c(bodyfmt),gadfmt,readintags(taglist));
+    TR_EasyRequestTags := TR_EasyRequest(app,pas2c(bodyfmt),gadfmt, @taglist);
 end;
 
-FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : String; Const taglist : Array Of Const) : ULONG;
+FUNCTION TR_EasyRequestTags(app : pTR_App; bodyfmt : String; gadfmt : String; Const taglist : array of PtrUInt) : ULONG;
 begin
-    TR_EasyRequestTags := TR_EasyRequest(app,pas2c(bodyfmt),pas2c(gadfmt),readintags(taglist));
+    TR_EasyRequestTags := TR_EasyRequest(app,pas2c(bodyfmt),pas2c(gadfmt), @taglist);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/ttengine.pas b/packages/amunits/src/otherlibs/ttengine.pas
index 32befd66f9..567db9f2d1 100644
--- a/packages/amunits/src/otherlibs/ttengine.pas
+++ b/packages/amunits/src/otherlibs/ttengine.pas
@@ -28,7 +28,6 @@
   nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
-{$mode objfpc}
 
 UNIT TTENGINE;
 
@@ -207,45 +206,42 @@ PROCEDURE TT_TextExtent(rp : pRastPort location 'a1'; _string : POINTER location
 FUNCTION TT_TextFit(rp : pRastPort location 'a1'; _string : POINTER location 'a0'; count : longword location 'd0'; te : pTextExtent location 'a2'; tec : pTextExtent location 'a3'; dir : LONGINT location 'd1'; cwidth : longword location 'd2'; cheight : longword location 'd3') : longword; syscall TTEngineBase 78;
 FUNCTION TT_TextLength(rp : pRastPort location 'a1'; _string : POINTER location 'a0'; count : longword location 'd0') : longword; syscall TTEngineBase 66;
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION TT_GetAttrs(rp : pRastPort; const taglist : Array Of Const) : longword;
-FUNCTION TT_GetPixmap(font : POINTER; _string : POINTER; count : longword; const taglist : Array Of Const) : pTT_Pixmap;
-FUNCTION TT_OpenFont(const taglist : Array Of Const) : POINTER;
-FUNCTION TT_Request(request : POINTER; const taglist : Array Of Const) : pTagItem;
-FUNCTION TT_SetAttrs(rp : pRastPort; const taglist : Array Of Const) : longword;
+FUNCTION TT_GetAttrs(rp : pRastPort; const taglist : array of PtrUInt) : longword;
+FUNCTION TT_GetPixmap(font : POINTER; _string : POINTER; count : longword; const taglist : array of PtrUInt) : pTT_Pixmap;
+FUNCTION TT_OpenFont(const taglist : array of PtrUInt) : POINTER;
+FUNCTION TT_Request(request : POINTER; const taglist : array of PtrUInt) : pTagItem;
+FUNCTION TT_SetAttrs(rp : pRastPort; const taglist : array of PtrUInt) : longword;
 
 IMPLEMENTATION
 
-uses
-  tagsarray;
-
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION TT_GetAttrs(rp : pRastPort; const taglist : Array Of Const) : longword;
+FUNCTION TT_GetAttrs(rp : pRastPort; const taglist : array of PtrUInt) : longword;
 begin
-    TT_GetAttrs := TT_GetAttrsA(rp , readintags(taglist));
+    TT_GetAttrs := TT_GetAttrsA(rp , @taglist);
 end;
 
-FUNCTION TT_GetPixmap(font : POINTER; _string : POINTER; count : longword; const taglist : Array Of Const) : pTT_Pixmap;
+FUNCTION TT_GetPixmap(font : POINTER; _string : POINTER; count : longword; const taglist : array of PtrUInt) : pTT_Pixmap;
 begin
-    TT_GetPixmap := TT_GetPixmapA(font , _string , count , readintags(taglist));
+    TT_GetPixmap := TT_GetPixmapA(font , _string , count , @taglist);
 end;
 
-FUNCTION TT_OpenFont(const taglist : Array Of Const) : POINTER;
+FUNCTION TT_OpenFont(const taglist : array of PtrUInt) : POINTER;
 begin
-    TT_OpenFont := TT_OpenFontA(readintags(taglist));
+    TT_OpenFont := TT_OpenFontA(@taglist);
 end;
 
-FUNCTION TT_Request(request : POINTER; const taglist : Array Of Const) : pTagItem;
+FUNCTION TT_Request(request : POINTER; const taglist : array of PtrUInt) : pTagItem;
 begin
-    TT_Request := TT_RequestA(request , readintags(taglist));
+    TT_Request := TT_RequestA(request , @taglist);
 end;
 
-FUNCTION TT_SetAttrs(rp : pRastPort; const taglist : Array Of Const) : longword;
+FUNCTION TT_SetAttrs(rp : pRastPort; const taglist : array of PtrUInt) : longword;
 begin
-    TT_SetAttrs := TT_SetAttrsA(rp , readintags(taglist));
+    TT_SetAttrs := TT_SetAttrsA(rp , @taglist);
 end;
 
 const
diff --git a/packages/amunits/src/otherlibs/xadmaster.pas b/packages/amunits/src/otherlibs/xadmaster.pas
index f90dace6e6..43b131149e 100644
--- a/packages/amunits/src/otherlibs/xadmaster.pas
+++ b/packages/amunits/src/otherlibs/xadmaster.pas
@@ -22,7 +22,6 @@
   nils.sjoholm@mailbox.swipnet.se Nils Sjoholm
 }
 
-{$mode objfpc}
 
 UNIT XADMASTER;
 
@@ -1207,117 +1206,114 @@ FUNCTION xadHookAccess(command : longword location 'd0'; data : LONGINT location
 FUNCTION xadHookTagAccessA(command : longword location 'd0'; data : LONGINT location 'd1'; buffer : POINTER location 'a0'; ai : pxadArchiveInfo location 'a1'; CONST tags : pTagItem location 'a2') : LONGINT; syscall xadMasterBase 120;
 FUNCTION xadRecogFileA(size : longword location 'd0'; memory : POINTER location 'a0'; CONST tags : pTagItem location 'a1') : pxadClient; syscall xadMasterBase 42;
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION xadAddDiskEntry(di : pxadDiskInfo; ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-FUNCTION xadAddFileEntry(fi : pxadFileInfo; ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-FUNCTION xadAllocObject(_type : LONGINT; const tags : Array Of Const) : POINTER;
-FUNCTION xadConvertDates(const tags : Array Of Const) : LONGINT;
-FUNCTION xadConvertName(charset : longword; const tags : Array Of Const) : pCHAR;
-FUNCTION xadConvertProtection(const tags : Array Of Const) : LONGINT;
-FUNCTION xadDiskFileUnArc(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-FUNCTION xadDiskUnArc(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-FUNCTION xadFileUnArc(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-FUNCTION xadFreeHookAccess(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-PROCEDURE xadFreeObject(obj : POINTER; const tags : Array Of Const);
-FUNCTION xadGetDiskInfo(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-FUNCTION xadGetFilename(buffersize : longword; buffer : pCHAR; path : pCHAR; name : pCHAR; const tags : Array Of Const) : LONGINT;
-FUNCTION xadGetHookAccess(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-FUNCTION xadGetInfo(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-FUNCTION xadHookTagAccess(command : longword; data : LONGINT; buffer : POINTER; ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
-FUNCTION xadRecogFile(size : longword; memory : POINTER; const tags : Array Of Const) : pxadClient;
+FUNCTION xadAddDiskEntry(di : pxadDiskInfo; ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadAddFileEntry(fi : pxadFileInfo; ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadAllocObject(_type : LONGINT; const tags : array of PtrUInt) : POINTER;
+FUNCTION xadConvertDates(const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadConvertName(charset : longword; const tags : array of PtrUInt) : pCHAR;
+FUNCTION xadConvertProtection(const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadDiskFileUnArc(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadDiskUnArc(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadFileUnArc(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadFreeHookAccess(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+PROCEDURE xadFreeObject(obj : POINTER; const tags : array of PtrUInt);
+FUNCTION xadGetDiskInfo(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadGetFilename(buffersize : longword; buffer : pCHAR; path : pCHAR; name : pCHAR; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadGetHookAccess(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadGetInfo(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadHookTagAccess(command : longword; data : LONGINT; buffer : POINTER; ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
+FUNCTION xadRecogFile(size : longword; memory : POINTER; const tags : array of PtrUInt) : pxadClient;
 
 IMPLEMENTATION
 
-uses
-  tagsarray;
-
 {
- Functions and procedures with array of const go here
+ Functions and procedures with array of PtrUInt go here
 }
-FUNCTION xadAddDiskEntry(di : pxadDiskInfo; ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadAddDiskEntry(di : pxadDiskInfo; ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadAddDiskEntry := xadAddDiskEntryA(di , ai , readintags(tags));
+    xadAddDiskEntry := xadAddDiskEntryA(di , ai , @tags);
 end;
 
-FUNCTION xadAddFileEntry(fi : pxadFileInfo; ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadAddFileEntry(fi : pxadFileInfo; ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadAddFileEntry := xadAddFileEntryA(fi , ai , readintags(tags));
+    xadAddFileEntry := xadAddFileEntryA(fi , ai , @tags);
 end;
 
-FUNCTION xadAllocObject(_type : LONGINT; const tags : Array Of Const) : POINTER;
+FUNCTION xadAllocObject(_type : LONGINT; const tags : array of PtrUInt) : POINTER;
 begin
-    xadAllocObject := xadAllocObjectA(_type , readintags(tags));
+    xadAllocObject := xadAllocObjectA(_type , @tags);
 end;
 
-FUNCTION xadConvertDates(const tags : Array Of Const) : LONGINT;
+FUNCTION xadConvertDates(const tags : array of PtrUInt) : LONGINT;
 begin
-    xadConvertDates := xadConvertDatesA(readintags(tags));
+    xadConvertDates := xadConvertDatesA(@tags);
 end;
 
-FUNCTION xadConvertName(charset : longword; const tags : Array Of Const) : pCHAR;
+FUNCTION xadConvertName(charset : longword; const tags : array of PtrUInt) : pCHAR;
 begin
-    xadConvertName := xadConvertNameA(charset , readintags(tags));
+    xadConvertName := xadConvertNameA(charset , @tags);
 end;
 
-FUNCTION xadConvertProtection(const tags : Array Of Const) : LONGINT;
+FUNCTION xadConvertProtection(const tags : array of PtrUInt) : LONGINT;
 begin
-    xadConvertProtection := xadConvertProtectionA(readintags(tags));
+    xadConvertProtection := xadConvertProtectionA(@tags);
 end;
 
-FUNCTION xadDiskFileUnArc(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadDiskFileUnArc(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadDiskFileUnArc := xadDiskFileUnArcA(ai , readintags(tags));
+    xadDiskFileUnArc := xadDiskFileUnArcA(ai , @tags);
 end;
 
-FUNCTION xadDiskUnArc(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadDiskUnArc(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadDiskUnArc := xadDiskUnArcA(ai , readintags(tags));
+    xadDiskUnArc := xadDiskUnArcA(ai , @tags);
 end;
 
-FUNCTION xadFileUnArc(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadFileUnArc(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadFileUnArc := xadFileUnArcA(ai , readintags(tags));
+    xadFileUnArc := xadFileUnArcA(ai , @tags);
 end;
 
-FUNCTION xadFreeHookAccess(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadFreeHookAccess(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadFreeHookAccess := xadFreeHookAccessA(ai , readintags(tags));
+    xadFreeHookAccess := xadFreeHookAccessA(ai , @tags);
 end;
 
-PROCEDURE xadFreeObject(obj : POINTER; const tags : Array Of Const);
+PROCEDURE xadFreeObject(obj : POINTER; const tags : array of PtrUInt);
 begin
-    xadFreeObjectA(obj , readintags(tags));
+    xadFreeObjectA(obj , @tags);
 end;
 
-FUNCTION xadGetDiskInfo(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadGetDiskInfo(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadGetDiskInfo := xadGetDiskInfoA(ai , readintags(tags));
+    xadGetDiskInfo := xadGetDiskInfoA(ai , @tags);
 end;
 
-FUNCTION xadGetFilename(buffersize : longword; buffer : pCHAR; path : pCHAR; name : pCHAR; const tags : Array Of Const) : LONGINT;
+FUNCTION xadGetFilename(buffersize : longword; buffer : pCHAR; path : pCHAR; name : pCHAR; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadGetFilename := xadGetFilenameA(buffersize , buffer , path , name , readintags(tags));
+    xadGetFilename := xadGetFilenameA(buffersize , buffer , path , name , @tags);
 end;
 
-FUNCTION xadGetHookAccess(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadGetHookAccess(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadGetHookAccess := xadGetHookAccessA(ai , readintags(tags));
+    xadGetHookAccess := xadGetHookAccessA(ai , @tags);
 end;
 
-FUNCTION xadGetInfo(ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadGetInfo(ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadGetInfo := xadGetInfoA(ai , readintags(tags));
+    xadGetInfo := xadGetInfoA(ai , @tags);
 end;
 
-FUNCTION xadHookTagAccess(command : longword; data : LONGINT; buffer : POINTER; ai : pxadArchiveInfo; const tags : Array Of Const) : LONGINT;
+FUNCTION xadHookTagAccess(command : longword; data : LONGINT; buffer : POINTER; ai : pxadArchiveInfo; const tags : array of PtrUInt) : LONGINT;
 begin
-    xadHookTagAccess := xadHookTagAccessA(command , data , buffer , ai , readintags(tags));
+    xadHookTagAccess := xadHookTagAccessA(command , data , buffer , ai , @tags);
 end;
 
-FUNCTION xadRecogFile(size : longword; memory : POINTER; const tags : Array Of Const) : pxadClient;
+FUNCTION xadRecogFile(size : longword; memory : POINTER; const tags : array of PtrUInt) : pxadClient;
 begin
-    xadRecogFile := xadRecogFileA(size , memory , readintags(tags));
+    xadRecogFile := xadRecogFileA(size , memory , @tags);
 end;
 
 const
diff --git a/packages/amunits/src/utilunits/Makefile b/packages/amunits/src/utilunits/Makefile
index 92987c7224..7787510505 100644
--- a/packages/amunits/src/utilunits/Makefile
+++ b/packages/amunits/src/utilunits/Makefile
@@ -334,250 +334,250 @@ endif
 override PACKAGE_NAME=amunits
 override PACKAGE_VERSION=3.1.1
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i386-aros)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-iphonesim)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-aros)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),x86_64-dragonfly)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),mipsel-embedded)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),mipsel-android)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),i8086-win16)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),aarch64-linux)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 ifeq ($(FULL_TARGET),aarch64-darwin)
-override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist longarray msgbox pastoc pcq systemvartags tagsarray timerutils vartags wbargs
+override TARGET_UNITS+=amigautils consoleio deadkeys doublebuffer easyasl hisoft linklist msgbox pastoc pcq tagsarray timerutils vartags wbargs
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
diff --git a/packages/amunits/src/utilunits/Makefile.fpc b/packages/amunits/src/utilunits/Makefile.fpc
index a504d2af18..3d2e67888d 100644
--- a/packages/amunits/src/utilunits/Makefile.fpc
+++ b/packages/amunits/src/utilunits/Makefile.fpc
@@ -8,7 +8,7 @@ version=3.1.1
 
 [target]
 units=amigautils consoleio deadkeys doublebuffer easyasl hisoft \
-	linklist longarray msgbox pastoc pcq systemvartags \
+	linklist msgbox pastoc pcq \
 	tagsarray timerutils vartags wbargs
 
 
diff --git a/packages/amunits/src/utilunits/longarray.pas b/packages/amunits/src/utilunits/longarray.pas
deleted file mode 100644
index a644188e30..0000000000
--- a/packages/amunits/src/utilunits/longarray.pas
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-
-    A file in Amiga system run time library.
-    Copyright (c) 1998-2002 by Nils Sjoholm
-    member of the Amiga RTL development team.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{
-    History:
-
-    A simple unit that helps to build array of longint.
-    Uses array of const so don't forget to use
-    $mode objfpc.
-
-    05 Nov 2002.
-
-    nils.sjoholm@mailbox.swipnet.se
-}
-
-unit longarray;
-
-{$mode objfpc}
-
-interface
-
-function readinlongs(const args : array of const): pointer;
-
-implementation
-
-uses pastoc;
-
-var
-  argarray : array [0..20] of longint;
-
-function readinlongs(const args : array of const): pointer;
-var
-   i : longint;
-
-begin
-
-    for i := 0 to High(args) do begin
-        case args[i].vtype of
-            vtinteger : argarray[i] := longint(args[i].vinteger);
-            vtpchar   : argarray[i] := longint(args[i].vpchar);
-            vtchar    : argarray[i] := longint(args[i].vchar);
-            vtpointer : argarray[i] := longint(args[i].vpointer);
-            vtstring  : argarray[i] := longint(pas2c(args[i].vstring^));
-            vtboolean : argarray[i] := longint(byte(args[i].vboolean));
-        end;
-    end;
-    readinlongs := @argarray;
-end;
-
-end.
diff --git a/packages/amunits/src/utilunits/systemvartags.pas b/packages/amunits/src/utilunits/systemvartags.pas
deleted file mode 100644
index 0d4c203518..0000000000
--- a/packages/amunits/src/utilunits/systemvartags.pas
+++ /dev/null
@@ -1,432 +0,0 @@
-{
-    This file is part of the Free Pascal run time library.
-
-    A file in Amiga system run time library.
-    Copyright (c) 1998-2003 by Nils Sjoholm
-    member of the Amiga RTL development team.
-
-    See the file COPYING.FPC, included in this distribution,
-    for details about the copyright.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
- **********************************************************************}
-
-{$mode objfpc}
-
-{$I useamigasmartlink.inc}
-{$ifdef use_amiga_smartlink}
-    {$smartlink on}
-{$endif use_amiga_smartlink}
-
-unit systemvartags;
-
-interface
-
-uses exec,amigados, amigaguide, asl, bullet, intuition, datatypes ,
-     gadtools, agraphics, locale, lowlevel, realtime,
-     workbench, utility, tagsarray;
-
-{    As of today boolean and char doesn't function in
-     array of const. Use ltrue and lfalse instead. You
-     can just cast a char.
-
-     Added the define use_amiga_smartlink.
-     13 Jan 2003.
-
-     Changed integer > smallint.
-     Moved ltrue and lfalse to exec.
-     10 Feb 2003.
-
-     nils.sjoholm@mailbox.swipnet.se
-}
-
-
-{
-     This is functions and procedures with array of const.
-     For use with fpc 1.0 and above.
-}
-
-{ functions from amigados. }
-FUNCTION AllocDosObjectTags(type_ : ULONG; Const argv : Array of Const) : POINTER;
-FUNCTION CreateNewProcTags(Const argv : Array of Const) : pProcess;
-FUNCTION NewLoadSegTags(file_ : pCHAR; Const argv : Array of Const) : LONGINT;
-FUNCTION SystemTags(command : pCHAR; Const argv : Array of Const) : LONGINT;
-   {  This one as well, an overlay function }
-FUNCTION SystemTags(command : string; Const argv : Array of Const) : LONGINT;
-
-{ functions from amigaguide. }
-FUNCTION AddAmigaGuideHost(h : pHook; name : pCHAR; Const argv : Array Of Const) : POINTER;
-FUNCTION OpenAmigaGuide(nag : pNewAmigaGuide; Const argv : Array Of Const) : POINTER;
-FUNCTION OpenAmigaGuideAsync(nag : pNewAmigaGuide; Const argv : Array Of Const) : POINTER;
-FUNCTION RemoveAmigaGuideHost(hh : POINTER; Const argv : Array Of Const) : LONGINT;
-FUNCTION SendAmigaGuideCmd(cl : POINTER; cmd : pCHAR; Const argv : Array Of Const) : LONGINT;
-FUNCTION SendAmigaGuideContext(cl : POINTER; Const argv : Array Of Const) : LONGINT;
-FUNCTION SetAmigaGuideAttrs(cl : POINTER; Const argv : Array Of Const) : LONGINT;
-FUNCTION SetAmigaGuideContext(cl : POINTER; id : ULONG; Const argv : Array Of Const) : LONGINT;
-
-{ functions from asl. }
-FUNCTION AllocAslRequestTags(reqType : ULONG; Const argv : Array Of Const) : POINTER;
-FUNCTION AslRequestTags(requester : POINTER; Const argv : Array Of Const) : BOOLEAN;
-
-{ functions from bullet }
-FUNCTION ObtainInfo(glyphEngine : pGlyphEngine; Const argv : Array Of Const) : ULONG;
-FUNCTION ReleaseInfo(glyphEngine : pGlyphEngine; Const argv : Array Of Const) : ULONG;
-FUNCTION SetInfo(glyphEngine : pGlyphEngine; Const argv : Array Of Const) : ULONG;
-
-{ functions from datatypes }
-FUNCTION GetDTAttrs(o : pObject_; Const argv : Array Of Const) : ULONG;
-FUNCTION NewDTObject(name : POINTER; Const argv : Array Of Const): POINTER;
-FUNCTION ObtainDataType(typ : ULONG; handle : POINTER; Const argv : Array Of Const) : pDataType;
-PROCEDURE RefreshDTObject(o : pObject_; win : pWindow; req : pRequester; Const argv : Array Of Const);
-FUNCTION SetDTAttrs(o : pObject_; win : pWindow; req : pRequester; Const argv : Array Of Const) : ULONG;
-
-{ functions from gadtools }
-FUNCTION CreateGadget(kind : ULONG; gad : pGadget; ng : pNewGadget; Const argv : Array Of Const) : pGadget;
-FUNCTION CreateMenus(newmenu : pNewMenu; Const argv : Array Of Const) : pMenu;
-PROCEDURE DrawBevelBox(rport : pRastPort; left : LONGINT; top : LONGINT; width : LONGINT; height : LONGINT; Const argv : Array Of Const);
-FUNCTION GetVisualInfo(screen : pScreen; Const argv : Array Of Const) : POINTER;
-FUNCTION GT_GetGadgetAttrs(gad : pGadget; win : pWindow; req : pRequester; Const argv : Array Of Const) : LONGINT;
-PROCEDURE GT_SetGadgetAttrs(gad : pGadget; win : pWindow; req : pRequester; Const argv : Array Of Const);
-FUNCTION LayoutMenuItems(firstitem : pMenuItem; vi : POINTER; Const argv : Array Of Const) : BOOLEAN;
-FUNCTION LayoutMenus(firstmenu : pMenu; vi : POINTER; Const argv : Array Of Const) : BOOLEAN;
-
-{ functions from graphics }
-FUNCTION AllocSpriteData(bm : pBitMap; Const argv : Array Of Const) : pExtSprite;
-FUNCTION BestModeID(Const argv : Array Of Const) : ULONG;
-FUNCTION ChangeExtSprite(vp : pViewPort; oldsprite : pExtSprite; newsprite : pExtSprite; Const argv : Array Of Const) : LONGINT;
-FUNCTION ExtendFontTags(font : pTextFont; Const argv : Array Of Const) : ULONG;
-FUNCTION GetExtSprite(ss : pExtSprite; Const argv : Array Of Const) : LONGINT;
-PROCEDURE GetRPAttrs(rp : pRastPort; Const argv : Array Of Const);
-FUNCTION ObtainBestPen(cm : pColorMap; r : ULONG; g : ULONG; b : ULONG; Const argv : Array Of Const) : LONGINT;
-PROCEDURE SetRPAttrs(rp : pRastPort; Const argv : Array Of Const);
-FUNCTION VideoControlTags(colorMap : pColorMap; Const argv : Array Of Const) : BOOLEAN;
-FUNCTION WeighTAMatchTags(reqTextAttr : pTextAttr; targetTextAttr : pTextAttr; Const argv : Array Of Const) : smallint;
-
-{ functions from intuition. }
-FUNCTION OpenScreenTags(newScreen : pNewScreen; tagList : array of const) : pScreen;
-FUNCTION OpenWindowTags(newWindow : pNewWindow; tagList : array of const) : pWindow;
-FUNCTION NewObject(classPtr : pIClass; classID : pCHAR; Const argv : Array Of Const) : POINTER;
-FUNCTION SetAttrs(obj : POINTER; tags: array of DWord) : ULONG;
-FUNCTION SetGadgetAttrs(gadget : pGadget; window : pWindow; requester : pRequester; Const argv : Array Of Const) : ULONG;
-FUNCTION NewObject(classPtr : pIClass; classID : string; Const argv : array of const ) : POINTER;
-FUNCTION EasyRequest(window : pWindow;const easyStruct : pEasyStruct; idcmpPtr : pULONG; args : array of DWord) : LONGINT;
-PROCEDURE SetWindowPointer(win : pWindow; tags: array of DWord);
-
-{ from locale }
-FUNCTION OpenCatalog(locale : pLocale; name : pCHAR; Const argv : Array Of Const) : pCatalog;
-
-{ functions from lowlevel }
-FUNCTION SetJoyPortAttrs(portNumber : ULONG; Const argv : Array Of Const) : BOOLEAN;
-FUNCTION SystemControl(Const argv : Array Of Const) : ULONG;
-
-{ functions from realtime }
-FUNCTION CreatePlayer(Const argv : Array Of Const) : pPlayer;
-FUNCTION GetPlayerAttrs(player : pPlayer; Const argv : Array Of Const) : ULONG;
-FUNCTION SetPlayerAttrs(player : pPlayer; Const argv : Array Of Const) : BOOLEAN;
-
-{ from utility }
-function AllocNamedObject(name : STRPTR; Const argv : Array Of Const) : pNamedObject;
-
-{ functions from workbench }
-FUNCTION AddAppMenuItem(id : ULONG; userdata : ULONG; text_ : pCHAR; msgport : pMsgPort; Const argv : Array Of Const) : pAppMenuItem;
-FUNCTION AddAppWindow(id : ULONG; userdata : ULONG; window : pWindow; msgport : pMsgPort; Const argv : Array Of Const) : pAppWindow;
-
-implementation
-
-uses pastoc;
-
-FUNCTION AllocDosObjectTags(type_ : ULONG; Const argv : Array of Const) : POINTER;
-begin
-     AllocDosObjectTags := AllocDosObjectTagList(type_, readintags(argv));
-end;
-
-FUNCTION CreateNewProcTags(Const argv : Array of Const) : pProcess;
-begin
-     CreateNewProcTags := CreateNewProcTagList(readintags(argv));
-end;
-
-FUNCTION NewLoadSegTags(file_ : pCHAR; Const argv : Array of Const) : LONGINT;
-begin
-     NewLoadSegTags := NewLoadSegTagList(file_,readintags(argv));
-end;
-
-FUNCTION SystemTags(command : pCHAR; Const argv : Array of Const) : LONGINT;
-begin
-     SystemTags := SystemTagList(command,readintags(argv));
-end;
-
-FUNCTION SystemTags(command : string; Const argv : Array of Const) : LONGINT;
-begin
-     SystemTags := SystemTagList(command,readintags(argv));
-end;
-
-FUNCTION OpenScreenTags(newScreen : pNewScreen; tagList : array of const) : pScreen;
-begin
-    OpenScreenTags := OpenScreenTagList(newScreen, readintags(tagList));
-end;
-
-FUNCTION OpenWindowTags(newWindow : pNewWindow; tagList : array of const) : pWindow;
-begin
-    OpenWindowTags := OpenWindowTagList(newWindow, readintags(tagList));
-end;
-
-FUNCTION NewObject(classPtr : pIClass; classID : pCHAR; Const argv : Array Of Const) : POINTER;
-begin
-    NewObject := NewObjectA(classPtr,classID, readintags(argv));
-end;
-
-FUNCTION NewObject(classPtr : pIClass; classID : string; Const argv : array of const ) : POINTER;
-begin
-      NewObject := NewObjectA(classPtr,pas2c(classID),readintags(argv));
-end;
-
-FUNCTION SetAttrs(obj : POINTER; tags: array of DWord) : ULONG;
-begin
-  SetAttrs := SetAttrsA(obj, @tags);
-end;
-
-FUNCTION SetGadgetAttrs(gadget : pGadget; window : pWindow; requester : pRequester; Const argv : Array Of Const) : ULONG;
-begin
-    SetGadgetAttrs := SetGadgetAttrsA(gadget,window,requester,readintags(argv));
-end;
-
-FUNCTION EasyRequest(window : pWindow;const easyStruct : pEasyStruct; idcmpPtr : pULONG; args : array of DWord) : LONGINT;
-begin
-  EasyRequest := EasyRequestArgs(window, easystruct, idcmpptr, @args);
-end;
-
-PROCEDURE SetWindowPointer(win : pWindow; tags: array of DWord);
-begin
-  SetWindowPointerA(win, @tags);
-end;
-
-FUNCTION AddAmigaGuideHost(h : pHook; name : pCHAR; Const argv : Array Of Const) : POINTER;
-begin
-    AddAmigaGuideHost := AddAmigaGuideHostA(h,name,readintags(argv));
-end;
-
-FUNCTION OpenAmigaGuide(nag : pNewAmigaGuide; Const argv : Array Of Const) : POINTER;
-begin
-    OpenAmigaGuide := OpenAmigaGuideA(nag,readintags(argv));
-end;
-
-FUNCTION OpenAmigaGuideAsync(nag : pNewAmigaGuide; Const argv : Array Of Const) : POINTER;
-begin
-    OpenAmigaGuideAsync := OpenAmigaGuideAsyncA(nag,readintags(argv));
-end;
-
-FUNCTION RemoveAmigaGuideHost(hh : POINTER; Const argv : Array Of Const) : LONGINT;
-begin
-    RemoveAmigaGuideHost := RemoveAmigaGuideHostA(hh,readintags(argv));
-end;
-
-FUNCTION SendAmigaGuideCmd(cl : POINTER; cmd : pCHAR; Const argv : Array Of Const) : LONGINT;
-begin
-    SendAmigaGuideCmd := SendAmigaGuideCmdA(cl,cmd,readintags(argv));
-end;
-
-FUNCTION SendAmigaGuideContext(cl : POINTER; Const argv : Array Of Const) : LONGINT;
-begin
-    SendAmigaGuideContext := SendAmigaGuideContextA(cl,readintags(argv));
-end;
-
-FUNCTION SetAmigaGuideAttrs(cl : POINTER; Const argv : Array Of Const) : LONGINT;
-begin
-    SetAmigaGuideAttrs := SetAmigaGuideAttrsA(cl,readintags(argv));
-end;
-
-FUNCTION SetAmigaGuideContext(cl : POINTER; id : ULONG; Const argv : Array Of Const) : LONGINT;
-begin
-    SetAmigaGuideContext := SetAmigaGuideContextA(cl,id,readintags(argv));
-end;
-
-FUNCTION AllocAslRequestTags(reqType : ULONG; Const argv : Array Of Const) : POINTER;
-begin
-    AllocAslRequestTags := AllocAslRequest(reqType,readintags(argv));
-end;
-
-FUNCTION AslRequestTags(requester : POINTER; Const argv : Array Of Const) : BOOLEAN;
-begin
-    AslRequestTags := AslRequest(requester,readintags(argv)) <> 0;
-end;
-
-FUNCTION ObtainInfo(glyphEngine : pGlyphEngine; Const argv : Array Of Const) : ULONG;
-begin
-    ObtainInfo := ObtainInfoA(glyphEngine,readintags(argv));
-end;
-
-FUNCTION ReleaseInfo(glyphEngine : pGlyphEngine; Const argv : Array Of Const) : ULONG;
-begin
-    ReleaseInfo := releaseInfoA(glyphEngine,readintags(argv));
-end;
-
-FUNCTION SetInfo(glyphEngine : pGlyphEngine; Const argv : Array Of Const) : ULONG;
-begin
-    SetInfo := SetInfoA(glyphEngine,readintags(argv));
-end;
-
-FUNCTION GetDTAttrs(o : pObject_; Const argv : Array Of Const) : ULONG;
-begin
-    GetDTAttrs := GetDTAttrsA(o,readintags(argv));
-end;
-
-FUNCTION NewDTObject(name : POINTER; Const argv : Array Of Const): POINTER;
-begin
-    NewDTObject := NewDTObjectA(name,readintags(argv));
-end;
-
-FUNCTION ObtainDataType(typ : ULONG; handle : POINTER; Const argv : Array Of Const) : pDataType;
-begin
-    ObtainDataType := ObtainDataTypeA(typ,handle,readintags(argv));
-end;
-PROCEDURE RefreshDTObject(o : pObject_; win : pWindow; req : pRequester; Const argv : Array Of Const);
-begin
-    RefreshDTObjectA(o,win,req,readintags(argv));
-end;
-
-FUNCTION SetDTAttrs(o : pObject_; win : pWindow; req : pRequester; Const argv : Array Of Const) : ULONG;
-begin
-    SetDTAttrs := SetDTAttrsA(o,win,req,readintags(argv));
-end;
-
-FUNCTION CreateGadget(kind : ULONG; gad : pGadget; ng : pNewGadget; Const argv : Array Of Const) : pGadget;
-begin
-    CreateGadget := CreateGadgetA(kind,gad,ng,readintags(argv));
-end;
-
-FUNCTION CreateMenus(newmenu : pNewMenu; Const argv : Array Of Const) : pMenu;
-begin
-    CreateMenus := CreateMenusA(newmenu,readintags(argv));
-end;
-
-PROCEDURE DrawBevelBox(rport : pRastPort; left : LONGINT; top : LONGINT; width : LONGINT; height : LONGINT; Const argv : Array Of Const);
-begin
-    DrawBevelBoxA(rport,left,top,width,height,readintags(argv));
-end;
-
-FUNCTION GetVisualInfo(screen : pScreen; Const argv : Array Of Const) : POINTER;
-begin
-    GetVisualInfo := GetVisualInfoA(screen,readintags(argv));
-end;
-
-FUNCTION GT_GetGadgetAttrs(gad : pGadget; win : pWindow; req : pRequester; Const argv : Array Of Const) : LONGINT;
-begin
-    GT_GetGadgetAttrs := GT_GetGadgetAttrsA(gad,win,req,readintags(argv));
-end;
-
-PROCEDURE GT_SetGadgetAttrs(gad : pGadget; win : pWindow; req : pRequester; Const argv : Array Of Const);
-begin
-    GT_SetGadgetAttrsA(gad,win,req,readintags(argv));
-end;
-
-FUNCTION LayoutMenuItems(firstitem : pMenuItem; vi : POINTER; Const argv : Array Of Const) : BOOLEAN;
-begin
-    LayoutMenuItems := LayoutMenuItemsA(firstitem,vi,readintags(argv));
-end;
-
-FUNCTION LayoutMenus(firstmenu : pMenu; vi : POINTER; Const argv : Array Of Const) : BOOLEAN;
-begin
-    LayoutMenus := LayoutMenusA(firstmenu,vi,readintags(argv));
-end;
-
-FUNCTION AllocSpriteData(bm : pBitMap; Const argv : Array Of Const) : pExtSprite;
-begin
-    AllocSpriteData := AllocSpriteDataA(bm,readintags(argv));
-end;
-
-FUNCTION BestModeID(Const argv : Array Of Const) : ULONG;
-begin
-    BestModeID := BestModeIDA(readintags(argv));
-end;
-
-FUNCTION ChangeExtSprite(vp : pViewPort; oldsprite : pExtSprite; newsprite : pExtSprite; Const argv : Array Of Const) : LONGINT;
-begin
-    ChangeExtSprite := ChangeExtSpriteA(vp,oldsprite,newsprite,readintags(argv));
-end;
-
-FUNCTION ExtendFontTags(font : pTextFont; Const argv : Array Of Const) : ULONG;
-begin
-    ExtendFontTags := ExtendFont(font,readintags(argv));
-end;
-
-FUNCTION GetExtSprite(ss : pExtSprite; Const argv : Array Of Const) : LONGINT;
-begin
-    GetExtSprite := GetExtSpriteA(ss,readintags(argv));
-end;
-
-PROCEDURE GetRPAttrs(rp : pRastPort; Const argv : Array Of Const);
-begin
-    GetRPAttrsA(rp,readintags(argv));
-end;
-
-FUNCTION ObtainBestPen(cm : pColorMap; r : ULONG; g : ULONG; b : ULONG; Const argv : Array Of Const) : LONGINT;
-begin
-    ObtainBestPen := ObtainBestPenA(cm,r,g,b,readintags(argv));
-end;
-
-PROCEDURE SetRPAttrs(rp : pRastPort; Const argv : Array Of Const);
-begin
-    SetRPAttrsA(rp,readintags(argv));
-end;
-
-FUNCTION VideoControlTags(colorMap : pColorMap; Const argv : Array Of Const) : BOOLEAN;
-begin
-    VideoControlTags := VideoControl(colorMap,readintags(argv));
-end;
-
-FUNCTION WeighTAMatchTags(reqTextAttr : pTextAttr; targetTextAttr : pTextAttr; Const argv : Array Of Const) : smallint;
-begin
-    WeighTAMatchTags := WeighTAMatch(reqTextAttr,targetTextAttr,readintags(argv));
-end;
-
-FUNCTION OpenCatalog(locale : pLocale; name : pCHAR; Const argv : Array Of Const) : pCatalog;
-begin
-    OpenCatalog := OpenCatalogA(locale,name,readintags(argv));
-end;
-
-FUNCTION SetJoyPortAttrs(portNumber : ULONG; Const argv : Array Of Const) : BOOLEAN;
-begin
-    SetJoyPortAttrs := SetJoyPortAttrsA(portNumber,readintags(argv));
-end;
-
-FUNCTION SystemControl(Const argv : Array Of Const) : ULONG;
-begin
-    SystemControl := SystemControlA(readintags(argv));
-end;
-
-FUNCTION CreatePlayer(Const argv : Array Of Const) : pPlayer;
-begin
-    CreatePlayer := CreatePlayerA(readintags(argv));
-end;
-
-FUNCTION GetPlayerAttrs(player : pPlayer; Const argv : Array Of Const) : ULONG;
-begin
-    GetPlayerAttrs := GetPlayerAttrsA(player,readintags(argv));
-end;
-
-FUNCTION SetPlayerAttrs(player : pPlayer; Const argv : Array Of Const) : BOOLEAN;
-begin
-    SetPlayerAttrs := SetPlayerAttrsA(player,readintags(argv));
-end;
-
-function AllocNamedObject(name : STRPTR; Const argv : Array Of Const) : pNamedObject;
-begin
-    AllocNamedObject := AllocNamedObjectA(name,readintags(argv));
-end;
-
-FUNCTION AddAppMenuItem(id : ULONG; userdata : ULONG; text_ : pCHAR; msgport : pMsgPort; Const argv : Array Of Const) : pAppMenuItem;
-begin
-    AddAppMenuItem := AddAppMenuItemA(id,userdata,text_,msgport,readintags(argv));
-end;
-
-FUNCTION AddAppWindow(id : ULONG; userdata : ULONG; window : pWindow; msgport : pMsgPort; Const argv : Array Of Const) : pAppWindow;
-begin
-    AddAppWindow := AddAppWindowA(id,userdata,window,msgport,readintags(argv));
-end;
-
-
-
-end.
diff --git a/packages/amunits/src/utilunits/tagsarray.pas b/packages/amunits/src/utilunits/tagsarray.pas
index ff5c857417..ac10e7ee55 100644
--- a/packages/amunits/src/utilunits/tagsarray.pas
+++ b/packages/amunits/src/utilunits/tagsarray.pas
@@ -26,16 +26,11 @@ type
   TTagsList = array of ttagitem;
   PMyTags = ^TTagsList;
 
-
-function ReadInTags(const Args: array of const): PTagItem;
 procedure AddTags(var Taglist: TTagsList; const Args: array of const);
 function GetTagPtr(var TagList: TTagsList): PTagItem;
 
 implementation
 
-var
-  MyTags: PMyTags;
-
 procedure AddTags(var Taglist: TTagsList; const Args: array of const);
 var
   i: PtrInt;
@@ -69,43 +64,8 @@ begin
   GetTagPtr := @(TagList[0]);
 end;
 
-function ReadInTags(const Args: array of const): PTagItem;
-var
-  i: PtrInt;
-  ii: PtrInt;
-begin
-  ii := 0;
-  SetLength(MyTags^, (Length(Args) div 2) + 4); // some more at the end
-  for i := 0 to High(Args) do
-  begin
-    if not Odd(i) then
-    begin
-      mytags^[ii].ti_tag := PtrInt(Args[i].vinteger);
-    end else
-    begin
-      case Args[i].vtype of
-        vtinteger: mytags^[ii].ti_data := PtrInt(Args[i].vinteger);
-        vtboolean: mytags^[ii].ti_data := PtrInt(Byte(Args[i].vboolean));
-        vtpchar: mytags^[ii].ti_data := PtrInt(Args[i].vpchar);
-        vtchar: mytags^[ii].ti_data := PtrInt(Args[i].vchar);
-        vtstring: mytags^[ii].ti_data := PtrInt(PChar(string(Args[i].vstring^)));
-        vtpointer: mytags^[ii].ti_data := PtrInt(Args[i].vpointer);
-      end;
-      Inc(ii);
-    end;
-  end;
-  Inc(ii);
-  // Add additional TAG_DONE (if user forget)
-  mytags^[ii].ti_tag := TAG_DONE;
-  mytags^[ii].ti_data := 0;
-  // return the pointer
-  ReadInTags := @(MyTags^[0]);
-end;
-
 initialization
-  New(MyTags);
-  SetLength(MyTags^, 200);
+
 finalization
-  SetLength(MyTags^, 0);
-  Dispose(MyTags);
+
 end.