diff --git a/packages/arosunits/src/agraphics.pas b/packages/arosunits/src/agraphics.pas
index 39575ed4f4..95ab2404b3 100644
--- a/packages/arosunits/src/agraphics.pas
+++ b/packages/arosunits/src/agraphics.pas
@@ -637,9 +637,16 @@ type
     TxBaseline: Word;      // text baseline
     TxSpacing: SmallInt;   // text spacing (per character)
     RP_User: APTR;
+    {$ifdef AROS_ABIv0}
     longreserved: array[0..1] of IPTR;
     wordreserved: array[0..6] of Word; // used to be a node
     reserved: array[0..7] of Byte;     // for future use
+    {$endif}
+    {$ifdef AROS_ABIv1}
+    RP_Extra: APTR;
+    longreserved: array[0..5] of IPTR;
+    reserved: array[0..1] of Byte;
+    {$endif}
   end;
 
 const
@@ -2047,198 +2054,231 @@ const
 var
   GfxBase: PGfxBase;
 
-procedure AddAnimOb(AnOb: PAnimOb; AnKey: PPAnimOb; Rp: PRastPort); syscall GfxBase 26;
-procedure AddBob(Bob: PBob; Rp: PRastPort); syscall GfxBase 16;
-function AddDisplayDriverA(GfxHidd: APTR; Tags: PTagItem): LongInt; syscall GfxBase 181;
-procedure AddFont(TextFont: PTextFont); syscall GfxBase 80;
-procedure AddVSprite(VSprite: PVSprite; Rp: PRastPort); syscall GfxBase 17;
-function AllocBitMap(Sizex, Sizey, Depth, Flags: LongWord; Friend_Bitmap: PBitMap): PBitMap; syscall GfxBase 153;
-function AllocDBufInfo(Vp: PViewPort): PDBufInfo; syscall GfxBase 161;
-function AllocRaster(Width, Height: LongWord): TPlanePtr; syscall GfxBase 82;
-function AllocSpriteDataA(Bitmap: PBitMap; TagList: PTagItem): PExtSprite; syscall GfxBase 170;
-function AndRectRect(Rect1: PRectangle; Rect2: PRectangle; Intersect: PRectangle): LongBool; syscall GfxBase 193;
-procedure AndRectRegion(Reg: PRegion; Rect :PRectangle); syscall GfxBase 84;
-procedure AndRectRegionND(Reg: PRegion; Rect: PRectangle); syscall GfxBase 107;
-function AndRegionRegion(SrcRegion: PRegion; DestRegion: PRegion): LongBool; syscall GfxBase 104;
-function AndRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 108;
-procedure Animate(AnKey: PPAnimOb; Rp: PRastPort); syscall GfxBase 27;
-function AreaDraw(Rp: PRastPort; x, y: SmallInt): LongWord; syscall GfxBase 43;
-function AreaEllipse(Rp: PRastPort; xCenter, yCenter, a, b: SmallInt): LongWord; syscall GfxBase 31;
-function AreaEnd(Rp: PRastPort): LongInt; syscall GfxBase 44;
-function AreaMove(Rp: PRastPort; x, y: SmallInt): LongWord; syscall GfxBase 42;
-function AreRegionsEqual(R1: PRegion; R2: PRegion): LongBool; syscall GfxBase 189;
-procedure AskFont(Rp: PRastPort; TextAttr: PTextAttr); syscall GfxBase 79;
-function AskSoftStyle(Rp: PRastPort): LongWord; syscall GfxBase 14;
-function AttachPalExtra(Cm: PColorMap; Vp: PViewPort): LongInt; syscall GfxBase 139;
-function AttemptLockLayerRom(l: PLayer): LongBool; syscall GfxBase 109;
-function BestModeIDA(Tags: PTagItem): LongWord; syscall GfxBase 175;
-procedure BitMapScale(BitScaleArgs: PBitScaleArgs); syscall GfxBase 113;
+
+
 function BltBitMap(const SrcBitMap: PBitMap; xSrc, ySrc: LongInt; DestBitMap: PBitMap; xDest, yDest, xSize, ySize: LongInt; MinTerm : LongWord; Mask: LongWord; TempA: TPlanePtr): LongInt; syscall GfxBase 5;
-procedure BltBitMapRastPort(const SrcBitMap: PBitMap; xSrc, ySrc: LongInt; DestRP: PRastPort; xDest, yDest, xSize, ySize: LongInt; MinTerm: LongWord); syscall GfxBase 101;
-procedure BltClear(MemBlock: Pointer; ByteCount: LongWord; Flags: LongWord); syscall GfxBase 50; deprecated;
-procedure BltMaskBitMapRastPort(SrcBitMap: PBitMap; xSrc, ySrc: LongInt; DestRP: PRastPort; xDest, yDest, xSize, ySize: LongInt; MinTerm: LongWord; bltMask: TPlanePtr); syscall GfxBase 106;
-procedure BltPattern(Rp: PRastPort; mask: TPlanePtr; xMin, yMin, xMax, yMax: LongInt; ByteCnt: LongWord); syscall GfxBase 52;
-procedure BltRastPortBitMap(SrcRastPort: PRastPort; xSrc, ySrc: LongInt; DestBitMap: PBitMap; xDest, yDest, xSize, ySize, MinTerm: LongWord); syscall GfxBase 196;
 procedure BltTemplate(const Source: TPlanePtr; xSrc, srcMod: LongInt; DestRP: PRastPort; xDest, yDest, xSize, ySize: LongInt); syscall GfxBase 6;
-function CalcIVG(View: PView; ViewPort: PViewPort): Word; syscall GfxBase 138; unimplemented;
-procedure CBump(CopList: PUCopList); syscall GfxBase 61;
-function ChangeExtSpriteA(Vp: PViewPort; Oldsprite: PExtSprite; NewSprite: PExtSprite; Tags: PTagItem): LongInt; syscall GfxBase 171;
-procedure ChangeSprite(Vp: PViewPort; s: PSimpleSprite; NewData: Pointer); syscall GfxBase 70; unimplemented;
-procedure ChangeVPBitMap(Vp: PViewPort; Bm: PBitMap; Db: PDBufInfo); syscall GfxBase 157;
 procedure ClearEOL(Rp: PRastPort); syscall GfxBase 7;
-function ClearRectRegion(Reg: PRegion; Rect: PRectangle): LongBool; syscall GfxBase 87;
-function ClearRectRegionND(Reg: PRegion; Rect: PRectangle): PRegion; syscall GfxBase 124;
-procedure ClearRegion(Region: PRegion); syscall GfxBase 88;
-function ClearRegionRegion(R1: PRegion; R2: PRegion): LongBool; syscall GfxBase 187;
-function ClearRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 141;
 procedure ClearScreen(Rp: PRastPort); syscall GfxBase 8;
-procedure ClipBlit(SrcRP: PRastPort; xSrc, ySrc: LongInt; DestRP: PRastPort; xDest, yDest, xSize, ySize: LongInt; MinTerm: Byte); syscall GfxBase 92;
+function TextLength(Rp: PRastPort; const string_: STRPTR; Count: LongWord): SmallInt; syscall GfxBase 9;
+procedure GfxText(Rp: PRastPort; const String_: STRPTR; Count: LongWord); syscall GfxBase 10;
+procedure SetFont(Rp: PRastPort; TextFont: PTextFont); syscall GfxBase 11;
+function OpenFont(TextAttr: PTextAttr): PTextFont; syscall GfxBase 12;
 procedure CloseFont(TextFont: PTextFont); syscall GfxBase 13;
-function CloseMonitor(Monitor_Spec: PMonitorSpec): LongInt; syscall GfxBase 120;
+function AskSoftStyle(Rp: PRastPort): LongWord; syscall GfxBase 14;
+function SetSoftStyle(Rp: PRastPort; Style: LongWord; Enable: LongWord): LongWord; syscall GfxBase 15;
+procedure AddBob(Bob: PBob; Rp: PRastPort); syscall GfxBase 16;
+procedure AddVSprite(VSprite: PVSprite; Rp: PRastPort); syscall GfxBase 17;
+procedure DoCollision(Rp: PRastPort); syscall GfxBase 18;
+procedure DrawGList(Rp: PRastPort; Vp: PViewPort); syscall GfxBase 19;
+procedure InitGels(Head: PVSprite; Tail: PVSprite; GelsInfo: PGelsInfo); syscall GfxBase 20;
+procedure InitMasks(VSprite: PVSprite); syscall GfxBase 21;
+procedure RemIBob(Bob: PBob; Rp: PRastPort; Vp: PViewPort); syscall GfxBase 22;
+procedure RemVSprite(VSprite: PVSprite); syscall GfxBase 23;
+procedure SetCollision(Num: LongWord; Routine: TProcedure; GInfo: PGelsInfo); syscall GfxBase 24;
+procedure SortGList(Rp: PRastPort); syscall GfxBase 25;
+procedure AddAnimOb(AnOb: PAnimOb; AnKey: PPAnimOb; Rp: PRastPort); syscall GfxBase 26;
+procedure Animate(AnKey: PPAnimOb; Rp: PRastPort); syscall GfxBase 27;
+function GetGBuffers(AnOb: PAnimOb; Rp: PRastPort; Db: LongBool): LongBool; syscall GfxBase 28;
+procedure InitGMasks(AnOb: PAnimOb); syscall GfxBase 29;
+procedure DrawEllipse(Rp: PRastPort; xCenter, yCenter, a, b: LongInt); syscall GfxBase 30;
+function AreaEllipse(Rp: PRastPort; xCenter, yCenter, a, b: SmallInt): LongWord; syscall GfxBase 31;
+procedure LoadRGB4(Vp: PViewPort; Colors: PWord; Count: LongInt); syscall GfxBase 32;
+procedure InitRastPort(Rp: PRastPort); syscall GfxBase 33;
+procedure InitVPort(Vp: PViewPort); syscall GfxBase 34;
+function MrgCop(View: PView): LongWord; syscall GfxBase 35;
+function MakeVPort(View: PView; ViewPort: PViewPort): LongWord; syscall GfxBase 36;
+procedure LoadView(View: PView); syscall GfxBase 37;
+procedure WaitBlit; syscall GfxBase 38; unimplemented;
+procedure SetRast(Rp: PRastPort; Pen: LongWord); syscall GfxBase 39;
+procedure GfxMove(Rp: PRastPort; x, y: SmallInt); syscall GfxBase 40;
+procedure Draw(Rp: PRastPort; x, y: LongInt); syscall GfxBase 41;
+function AreaMove(Rp: PRastPort; x, y: SmallInt): LongWord; syscall GfxBase 42;
+function AreaDraw(Rp: PRastPort; x, y: SmallInt): LongWord; syscall GfxBase 43;
+function AreaEnd(Rp: PRastPort): LongInt; syscall GfxBase 44;
+procedure WaitTOF; syscall GfxBase 45;
+procedure QBlit(Blit: PBltNode); syscall GfxBase 46;
+procedure InitArea(AreaInfo: PAreaInfo; Buffer: Pointer; MaxVectors: SmallInt); syscall GfxBase 47;
+procedure SetRGB4(Vp: PViewPort; n, r, g, b: LongWord); syscall GfxBase 48;
+procedure QBSBlit(Blit: PBltNode); syscall GfxBase 49;
+procedure BltClear(MemBlock: Pointer; ByteCount: LongWord; Flags: LongWord); syscall GfxBase 50; deprecated;
+procedure RectFill(Rp: PRastPort; xMin, yMin, xMax, yMax : LongInt); syscall GfxBase 51;
+procedure BltPattern(Rp: PRastPort; mask: TPlanePtr; xMin, yMin, xMax, yMax: LongInt; ByteCnt: LongWord); syscall GfxBase 52;
+function ReadPixel(Rp: PRastPort; x, y: LongInt): LongInt; syscall GfxBase 53;
+function WritePixel(Rp: PRastPort; x, y: LongInt): LongInt; syscall GfxBase 54;
+function Flood(Rp: PRastPort; Mode: LongWord; x, y: LongInt): LongBool; syscall GfxBase 55;
+procedure PolyDraw(Rp: PRastPort; Count: LongInt; PolyTable: PSmallInt); syscall GfxBase 56;
+procedure SetAPen(Rp: PRastPort; Pen: LongWord); syscall GfxBase 57;
+procedure SetBPen(Rp: PRastPort; Pen: LongWord); syscall GfxBase 58;
+procedure SetDrMd(Rp: PRastPort; DrawMode: LongWord); syscall GfxBase 59;
+procedure InitView(View: PView); syscall GfxBase 60;
+procedure CBump(CopList: PUCopList); syscall GfxBase 61;
 procedure CMove(CopList: PUCopList; Reg: Pointer; Value: LongInt); syscall GfxBase 62;
-function CoerceMode(RealViewPort: PViewPort; MonitorID: LongWord; Flags: LongWord): LongWord; syscall GfxBase 156; unimplemented;
-function CopyRegion(Region: PRegion): PRegion; syscall GfxBase 188;
+procedure CWait(CopList: PUCopList; V: SmallInt; H: SmallInt); syscall GfxBase 63;
+function VBeamPos: LongInt; syscall GfxBase 64; platform;
+procedure InitBitMap(Bm: PBitMap; Depth: ShortInt; Width, Height: Word); syscall GfxBase 65;
+procedure ScrollRaster(Rp: PRastPort; dx, dy, xMin, yMin, xMax, yMax: LongInt); syscall GfxBase 66;
+procedure WaitBOVP(Vp: PViewPort); syscall GfxBase 67; unimplemented;
+function GetSprite(Sprite: PSimpleSprite; Pick: SmallInt): SmallInt; syscall GfxBase 68;
+procedure FreeSprite(Pick: SmallInt); syscall GfxBase 69;
+procedure ChangeSprite(Vp: PViewPort; s: PSimpleSprite; NewData: Pointer); syscall GfxBase 70; unimplemented;
+procedure MoveSprite(Vp: PViewPort; Sprite: PSimpleSprite; x, y: SmallInt); syscall GfxBase 71;
+procedure LockLayerRom(l: PLayer); syscall GfxBase 72;
+procedure UnlockLayerRom(l: PLayer); syscall GfxBase 73;
+procedure SyncSBitMap(l: PLayer); syscall GfxBase 74;
 procedure CopySBitMap(l: PLayer); syscall GfxBase 75;
+procedure OwnBlitter; syscall GfxBase 76;
+procedure DisownBlitter; syscall GfxBase 77;
+function InitTmpRas(TmpRas: PTmpRas; Buffer: Pointer; Size: LongWord): PTmpRas; syscall GfxBase 78;
+procedure AskFont(Rp: PRastPort; TextAttr: PTextAttr); syscall GfxBase 79;
+procedure AddFont(TextFont: PTextFont); syscall GfxBase 80;
+procedure RemFont(TextFont: PTextFont); syscall GfxBase 81;
+function AllocRaster(Width, Height: LongWord): TPlanePtr; syscall GfxBase 82;
+procedure FreeRaster(p: TPlanePtr; Width, Height: LongWord); syscall GfxBase 83;
+procedure AndRectRegion(Reg: PRegion; Rect :PRectangle); syscall GfxBase 84;
+function OrRectRegion(Reg: PRegion; Rect: PRectangle): LongBool; syscall GfxBase 85;
+function NewRegion: PRegion; syscall GfxBase 86;
+function ClearRectRegion(Reg: PRegion; Rect: PRectangle): LongBool; syscall GfxBase 87;
+procedure ClearRegion(Region: PRegion); syscall GfxBase 88;
+procedure DisposeRegion(Region: PRegion); syscall GfxBase 89;
+procedure FreeVPortCopLists(Vp: PViewPort); syscall GfxBase 90;
+procedure FreeCopList(CopList: PCopList); syscall GfxBase 91;
+procedure ClipBlit(SrcRP: PRastPort; xSrc, ySrc: LongInt; DestRP: PRastPort; xDest, yDest, xSize, ySize: LongInt; MinTerm: Byte); syscall GfxBase 92;
+function XorRectRegion(Reg: PRegion; Rect: PRectangle): LongBool; syscall GfxBase 93;
+procedure FreeCprList(CprList: PCprList); syscall GfxBase 94;
+function GetColorMap(Entries: LongWord): PColorMap; syscall GfxBase 95;
+procedure FreeColorMap(ColorMap: PColorMap); syscall GfxBase 96;
+function GetRGB4(ColorMap: PColorMap; Entry: LongInt): LongWord; syscall GfxBase 97;
+procedure ScrollVPort(Vp: PViewPort); syscall GfxBase 98;
+function UCopperListInit(Ucl: PUCopList; n: SmallInt): PCopList; syscall GfxBase 99;
+procedure FreeGBuffers(AnOb: PAnimOb; Rp: PRastPort; db: LongBool); syscall GfxBase 100;
+procedure BltBitMapRastPort(const SrcBitMap: PBitMap; xSrc, ySrc: LongInt; DestRP: PRastPort; xDest, yDest, xSize, ySize: LongInt; MinTerm: LongWord); syscall GfxBase 101;
+function OrRegionRegion(SrcRegion: PRegion; DestRegion: PRegion): LongBool; syscall GfxBase 102;
+function XorRegionRegion(SrcRegion: PRegion; DestRegion: PRegion): LongBool; syscall GfxBase 103;
+function AndRegionRegion(SrcRegion: PRegion; DestRegion: PRegion): LongBool; syscall GfxBase 104;
+procedure SetRGB4CM(Cm: PColorMap; n: SmallInt; r, g, b: Byte); syscall GfxBase 105;
+procedure BltMaskBitMapRastPort(SrcBitMap: PBitMap; xSrc, ySrc: LongInt; DestRP: PRastPort; xDest, yDest, xSize, ySize: LongInt; MinTerm: LongWord; bltMask: TPlanePtr); syscall GfxBase 106;
+function AttemptLockLayerRom(l: PLayer): LongBool; syscall GfxBase 109;
+function GfxNew(Node_Type: LongWord): PExtendedNode; syscall GfxBase 110;
+procedure GfxFree(Node: PExtendedNode); syscall GfxBase 111;
+procedure GfxAssociate(Pointer_: Pointer; Node: PExtendedNode); syscall GfxBase 112;
+procedure BitMapScale(BitScaleArgs: PBitScaleArgs); syscall GfxBase 113;
+function ScalerDiv(Factor: LongWord; Numerator: LongWord; Denominator: LongWord): Word; syscall GfxBase 114;
+procedure TextExtent(Rp: PRastPort; const String_: STRPTR; Count: LongWord; TextExtent_: PTextExtent); syscall GfxBase 115;
+function TextFit(Rp: PRastPort; const String_: STRPTR; StrLen: LongWord; TextExtent_: PTextExtent; ConstrainingExtent: PTextExtent; StrDirection: LongInt; ConstrainingBitWidth: LongWord; ConstrainingBitHeight: LongWord): LongWord; syscall GfxBase 116;
+function GfxLookUp(Pointer_: Pointer): PExtendedNode; syscall GfxBase 117;
+function VideoControl(Cm: PColorMap; Tags: PTagItem): LongWord; syscall GfxBase 118; unimplemented;
+function OpenMonitor(MonitorName: STRPTR; DisplayID: LongWord): PMonitorSpec; syscall GfxBase 119;
+function CloseMonitor(Monitor_Spec: PMonitorSpec): LongInt; syscall GfxBase 120;
+function FindDisplayInfo(ID: LongWord): DisplayInfoHandle; syscall GfxBase 121;
+function NextDisplayInfo(Last_ID: LongWord): LongWord; syscall GfxBase 122;
+function GetDisplayInfoData(Handle: DisplayInfoHandle; Buf: PChar; Size: LongWord; TagID: LongWord; ID: LongWord): LongWord; syscall GfxBase 126;
+procedure FontExtent(Font: PTextFont; FontExtent: PTextExtent); syscall GfxBase 127;
+function ReadPixelLine8(Rp: PRastPort; xStart, yStart, Width: LongWord; Array_: PByte; TempRP: PRastPort): LongInt; syscall GfxBase 128;
+function WritePixelLine8(Rp: PRastPort; xStart, yStart, Width: LongWord; Array_: PByte; TempRP: PRastPort): LongInt; syscall GfxBase 129;
+function ReadPixelArray8(Rp: PRastPort; xStart, yStart, xStop, yStop: LongWord; Array_: PByte; TempRp: PRastPort): LongInt; syscall GfxBase 130;
+function WritePixelArray8(Rp: PRastPort; xStart, yStart, xStop, yStop: LongWord; Array_: PByte; TempRp: PRastPort): LongInt; syscall GfxBase 131;
+function GetVPModeID(Vp: PViewPort): LongWord; syscall GfxBase 132;
+function ModeNotAvailable(ModeID: LongWord): LongWord; syscall GfxBase 133;
+function WeighTAMatch(ReqTextAttr: PTextAttr; TargetTextAttr: PTextAttr; TargetTags: PTagItem): SmallInt; syscall GfxBase 134;
+procedure EraseRect(Rp: PRastPort; xMin, yMin, xMax, yMax: LongInt); syscall GfxBase 135;
+function ExtendFont(Font: PTextFont; FontTags: PTagItem): LongWord; syscall GfxBase 136;
+procedure StripFont(Font: PTextFont); syscall GfxBase 137;
+function CalcIVG(View: PView; ViewPort: PViewPort): Word; syscall GfxBase 138; unimplemented;
+function AttachPalExtra(Cm: PColorMap; Vp: PViewPort): LongInt; syscall GfxBase 139;
+function ObtainBestPenA(Cm: PColorMap; r, g, b: LongWord; Tags: PTagItem): LongInt; syscall GfxBase 140;
+procedure SetRGB32(Vp: PViewPort; n, r, g, b : LongWord); syscall GfxBase 142;
+function GetAPen(Rp: PRastPort): LongWord; syscall GfxBase 143;
+function GetBPen(Rp: PRastPort): LongWord; syscall GfxBase 144;
+function GetDrMd(Rp: PRastPort): LongWord; syscall GfxBase 145;
+function GetOutlinePen(Rp: PRastPort): LongWord; syscall GfxBase 146;
+procedure LoadRGB32(Vp: PViewPort; const Table: PLongWord); syscall GfxBase 147;
+function SetChipRev(ChipRev: LongWord): LongWord; syscall GfxBase 148; platform;
+procedure SetABPenDrMd(Rp: PRastPort; APen: LongWord; BPen: LongWord; DrawMode: LongWord); syscall GfxBase 149;
+procedure GetRGB32(Cm: PColorMap; FirstColor: LongWord; NColors: LongWord; Table: PLongWord); syscall GfxBase 150;
+function AllocBitMap(Sizex, Sizey, Depth, Flags: LongWord; Friend_Bitmap: PBitMap): PBitMap; syscall GfxBase 153;
+procedure FreeBitMap(Bm: PBitMap); syscall GfxBase 154;
+function GetExtSpriteA(Sprite: PExtSprite; Tags: PTagItem): LongInt; syscall GfxBase 155;
+function CoerceMode(RealViewPort: PViewPort; MonitorID: LongWord; Flags: LongWord): LongWord; syscall GfxBase 156; unimplemented;
+procedure ChangeVPBitMap(Vp: PViewPort; Bm: PBitMap; Db: PDBufInfo); syscall GfxBase 157;
+procedure ReleasePen(Cm: PColorMap; n: LongWord); syscall GfxBase 158;
+function ObtainPen(Cm: PColorMap; n, r, g, b: LongWord; Flags: LongWord): LongInt; syscall GfxBase 159;
+function GetBitMapAttr(BitMap: PBitMap; Attribute: LongWord): IPTR; syscall GfxBase 160;
+function AllocDBufInfo(Vp: PViewPort): PDBufInfo; syscall GfxBase 161;
+procedure FreeDBufInfo(Dbi: PDBufInfo); syscall GfxBase 162;
+function SetOutlinePen(Rp: PRastPort; Pen: LongWord): LongWord; syscall GfxBase 163;
+function SetWriteMask(Rp: PRastPort; Mask: LongWord): LongWord; syscall GfxBase 164;
+procedure SetMaxPen(Rp: PRastPort; MaxPen: LongWord); syscall GfxBase 165;
+procedure SetRGB32CM(Cm: PColorMap; n, r, g, b: LongWord); syscall GfxBase 166;
+procedure ScrollRasterBF(Rp: PRastPort; dx, dy, xMin, yMin, xMax, yMax: LongInt); syscall GfxBase 167;
+function FindColor(Cm: PColorMap; r, g, b, MaxPen: LongWord): LongWord; syscall GfxBase 168;
+function AllocSpriteDataA(Bitmap: PBitMap; TagList: PTagItem): PExtSprite; syscall GfxBase 170;
+function ChangeExtSpriteA(Vp: PViewPort; Oldsprite: PExtSprite; NewSprite: PExtSprite; Tags: PTagItem): LongInt; syscall GfxBase 171;
+procedure FreeSpriteData(ExtSp: PExtSprite); syscall GfxBase 172;
+procedure SetRPAttrsA(Rp: PRastPort; Tags: PTagItem); syscall GfxBase 173;
+procedure GetRPAttrsA(Rp: PRastPort; Tags: PTagItem); syscall GfxBase 174;
+function BestModeIDA(Tags: PTagItem): LongWord; syscall GfxBase 175;
+procedure WriteChunkyPixels(Rp: PRastPort; xStart, yStart, xStop, yStop: LongWord; Array_: PByte; BytesPerRow: LongInt); syscall GfxBase 176;
+
+{$ifdef AROS_ABIv0}
+procedure AndRectRegionND(Reg: PRegion; Rect: PRectangle); syscall GfxBase 107;
+function AndRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 108;
+function OrRectRegionND(Reg: PRegion; Rect: PRectangle): PRegion; syscall GfxBase 123;
+function ClearRectRegionND(Reg: PRegion; Rect: PRectangle): PRegion; syscall GfxBase 124;
+function OrRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 125;
+function ClearRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 141;
+function XorRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 151;
+function XorRectRegionND(Reg: PRegion; Rect: PRectangle): PRegion; syscall GfxBase 152;
 function CreateRastPort: PRastPort; syscall GfxBase 177;
 function CloneRastPort(Rp: PRastPort): PRastPort; syscall GfxBase 178;
 procedure DeinitRastPort(Rp: PRastPort); syscall GfxBase 179;
 procedure FreeRastPort(Rp: PRastPort); syscall GfxBase 180;
-procedure CWait(CopList: PUCopList; V: SmallInt; H: SmallInt); syscall GfxBase 63;
-procedure DisownBlitter; syscall GfxBase 77;
-procedure DisposeRegion(Region: PRegion); syscall GfxBase 89;
-procedure DoCollision(Rp: PRastPort); syscall GfxBase 18;
-function DoPixelFunc(Rp: PRastPort; x, y: LongInt; Render_Func: Pointer; FuncData: APTR; Do_Update: LongBool): LongInt; syscall GfxBase 185;
-function DoRenderFunc(Rp: PRastPort; Src: PPoint; Rr: PRectangle; Render_Func: Pointer; FuncData: APTR; Do_Update: LongBool): LongInt; syscall GfxBase 184;
-procedure Draw(Rp: PRastPort; x, y: LongInt); syscall GfxBase 41;
-procedure DrawEllipse(Rp: PRastPort; xCenter, yCenter, a, b: LongInt); syscall GfxBase 30;
-procedure DrawGList(Rp: PRastPort; Vp: PViewPort); syscall GfxBase 19;
-procedure EraseRect(Rp: PRastPort; xMin, yMin, xMax, yMax: LongInt); syscall GfxBase 135;
-function ExtendFont(Font: PTextFont; FontTags: PTagItem): LongWord; syscall GfxBase 136;
-function FillRectPenDrMd(Rp: PRastPort; x1, y1, x2, y2: LongInt; Pix: Pointer{HIDDT_Pixel}; drmd: Pointer{HIDDT_DrawMode}; Do_Update: LongBool): LongInt; syscall GfxBase 183;
-function FindColor(Cm: PColorMap; r, g, b, MaxPen: LongWord): LongWord; syscall GfxBase 168;
-function FindDisplayInfo(ID: LongWord): DisplayInfoHandle; syscall GfxBase 121;
-function Flood(Rp: PRastPort; Mode: LongWord; x, y: LongInt): LongBool; syscall GfxBase 55;
-procedure FontExtent(Font: PTextFont; FontExtent: PTextExtent); syscall GfxBase 127;
-procedure FreeBitMap(Bm: PBitMap); syscall GfxBase 154;
-procedure FreeColorMap(ColorMap: PColorMap); syscall GfxBase 96;
-procedure FreeCopList(CopList: PCopList); syscall GfxBase 91;
-procedure FreeCprList(CprList: PCprList); syscall GfxBase 94;
-procedure FreeDBufInfo(Dbi: PDBufInfo); syscall GfxBase 162;
-procedure FreeGBuffers(AnOb: PAnimOb; Rp: PRastPort; db: LongBool); syscall GfxBase 100;
-procedure FreeRaster(p: TPlanePtr; Width, Height: LongWord); syscall GfxBase 83;
-procedure FreeSprite(Pick: SmallInt); syscall GfxBase 69;
-procedure FreeSpriteData(ExtSp: PExtSprite); syscall GfxBase 172;
-procedure FreeVPortCopLists(Vp: PViewPort); syscall GfxBase 90;
-function GetAPen(Rp: PRastPort): LongWord; syscall GfxBase 143;
-function GetBitMapAttr(BitMap: PBitMap; Attribute: LongWord): IPTR; syscall GfxBase 160;
-function GetBPen(Rp: PRastPort): LongWord; syscall GfxBase 144;
-function GetColorMap(Entries: LongWord): PColorMap; syscall GfxBase 95;
-function GetDisplayInfoData(Handle: DisplayInfoHandle; Buf: PChar; Size: LongWord; TagID: LongWord; ID: LongWord): LongWord; syscall GfxBase 126;
-function GetDrMd(Rp: PRastPort): LongWord; syscall GfxBase 145;
-function GetExtSpriteA(Sprite: PExtSprite; Tags: PTagItem): LongInt; syscall GfxBase 155;
-function GetGBuffers(AnOb: PAnimOb; Rp: PRastPort; Db: LongBool): LongBool; syscall GfxBase 28;
-function GetOutlinePen(Rp: PRastPort): LongWord; syscall GfxBase 146;
-procedure GetRGB32(Cm: PColorMap; FirstColor: LongWord; NColors: LongWord; Table: PLongWord); syscall GfxBase 150;
-function GetRGB4(ColorMap: PColorMap; Entry: LongInt): LongWord; syscall GfxBase 97;
-procedure GetRPAttrsA(Rp: PRastPort; Tags: PTagItem); syscall GfxBase 174;
-function GetSprite(Sprite: PSimpleSprite; Pick: SmallInt): SmallInt; syscall GfxBase 68;
-function GetVPModeID(Vp: PViewPort): LongWord; syscall GfxBase 132;
-procedure GfxAssociate(Pointer_: Pointer; Node: PExtendedNode); syscall GfxBase 112;
-procedure GfxFree(Node: PExtendedNode); syscall GfxBase 111;
-function GfxLookUp(Pointer_: Pointer): PExtendedNode; syscall GfxBase 117;
-function GfxNew(Node_Type: LongWord): PExtendedNode; syscall GfxBase 110;
-procedure InitArea(AreaInfo: PAreaInfo; Buffer: Pointer; MaxVectors: SmallInt); syscall GfxBase 47;
-procedure InitBitMap(Bm: PBitMap; Depth: ShortInt; Width, Height: Word); syscall GfxBase 65;
-procedure InitGels(Head: PVSprite; Tail: PVSprite; GelsInfo: PGelsInfo); syscall GfxBase 20;
-procedure InitGMasks(AnOb: PAnimOb); syscall GfxBase 29;
-procedure InitMasks(VSprite: PVSprite); syscall GfxBase 21;
-procedure InitRastPort(Rp: PRastPort); syscall GfxBase 33;
-function InitTmpRas(TmpRas: PTmpRas; Buffer: Pointer; Size: LongWord): PTmpRas; syscall GfxBase 78;
-procedure InitView(View: PView); syscall GfxBase 60;
-procedure InitVPort(Vp: PViewPort); syscall GfxBase 34;
-function IsPointInRegion(Reg: PRegion; x, y: SmallInt): LongBool; syscall GfxBase 190;
-procedure LoadRGB32(Vp: PViewPort; const Table: PLongWord); syscall GfxBase 147;
-procedure LoadRGB4(Vp: PViewPort; Colors: PWord; Count: LongInt); syscall GfxBase 32;
-procedure LoadView(View: PView); syscall GfxBase 37;
-procedure LockLayerRom(l: PLayer); syscall GfxBase 72;
-function MakeVPort(View: PView; ViewPort: PViewPort): LongWord; syscall GfxBase 36;
-function ModeNotAvailable(ModeID: LongWord): LongWord; syscall GfxBase 133;
-procedure GfxMove(Rp: PRastPort; x, y: SmallInt); syscall GfxBase 40;
-procedure MoveSprite(Vp: PViewPort; Sprite: PSimpleSprite; x, y: SmallInt); syscall GfxBase 71;
-function MrgCop(View: PView): LongWord; syscall GfxBase 35;
-function NewRectRegion(MinX, MinY, MaxX, MaxY: SmallInt): PRegion; syscall GfxBase 194;
-function NewRegion: PRegion; syscall GfxBase 86;
-function NextDisplayInfo(Last_ID: LongWord): LongWord; syscall GfxBase 122;
-function ObtainBestPenA(Cm: PColorMap; r, g, b: LongWord; Tags: PTagItem): LongInt; syscall GfxBase 140;
-function ObtainPen(Cm: PColorMap; n, r, g, b: LongWord; Flags: LongWord): LongInt; syscall GfxBase 159;
-function OpenFont(TextAttr: PTextAttr): PTextFont; syscall GfxBase 12;
-function OpenMonitor(MonitorName: STRPTR; DisplayID: LongWord): PMonitorSpec; syscall GfxBase 119;
-function OrRectRegion(Reg: PRegion; Rect: PRectangle): LongBool; syscall GfxBase 85;
-function OrRectRegionND(Reg: PRegion; Rect: PRectangle): PRegion; syscall GfxBase 123;
-function OrRegionRegion(SrcRegion: PRegion; DestRegion: PRegion): LongBool; syscall GfxBase 102;
-function OrRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 125;
-procedure OwnBlitter; syscall GfxBase 76;
-procedure PolyDraw(Rp: PRastPort; Count: LongInt; PolyTable: PSmallInt); syscall GfxBase 56;
-procedure QBlit(Blit: PBltNode); syscall GfxBase 46;
-procedure QBSBlit(Blit: PBltNode); syscall GfxBase 49;
-function ReadPixel(Rp: PRastPort; x, y: LongInt): LongInt; syscall GfxBase 53;
-function ReadPixelArray8(Rp: PRastPort; xStart, yStart, xStop, yStop: LongWord; Array_: PByte; TempRp: PRastPort): LongInt; syscall GfxBase 130;
-function ReadPixelLine8(Rp: PRastPort; xStart, yStart, Width: LongWord; Array_: PByte; TempRP: PRastPort): LongInt; syscall GfxBase 128;
-procedure RectFill(Rp: PRastPort; xMin, yMin, xMax, yMax : LongInt); syscall GfxBase 51;
-procedure ReleasePen(Cm: PColorMap; n: LongWord); syscall GfxBase 158;
-procedure RemFont(TextFont: PTextFont); syscall GfxBase 81;
-procedure RemIBob(Bob: PBob; Rp: PRastPort; Vp: PViewPort); syscall GfxBase 22;
-procedure RemVSprite(VSprite: PVSprite); syscall GfxBase 23;
-function ScalerDiv(Factor: LongWord; Numerator: LongWord; Denominator: LongWord): Word; syscall GfxBase 114;
-procedure ShowImminentReset; syscall GfxBase 197;
-procedure ScrollRaster(Rp: PRastPort; dx, dy, xMin, yMin, xMax, yMax: LongInt); syscall GfxBase 66;
-procedure ScrollRasterBF(Rp: PRastPort; dx, dy, xMin, yMin, xMax, yMax: LongInt); syscall GfxBase 167;
-function ScrollRegion(Region: PRegion; Rect: PRectangle; Dx, Dy: SmallInt): LongBool; syscall GfxBase 191;
-procedure ScrollVPort(Vp: PViewPort); syscall GfxBase 98;
-procedure SetABPenDrMd(Rp: PRastPort; APen: LongWord; BPen: LongWord; DrawMode: LongWord); syscall GfxBase 149;
-procedure SetAPen(Rp: PRastPort; Pen: LongWord); syscall GfxBase 57;
-procedure SetBPen(Rp: PRastPort; Pen: LongWord); syscall GfxBase 58;
-function SetChipRev(ChipRev: LongWord): LongWord; syscall GfxBase 148; platform;
-procedure SetCollision(Num: LongWord; Routine: TProcedure; GInfo: PGelsInfo); syscall GfxBase 24;
-procedure SetDisplayDriverCallback(CallBack: TDriverNotifyFunc; UserData: APTR); syscall GfxBase 186;
-procedure SetDrMd(Rp: PRastPort; DrawMode: LongWord); syscall GfxBase 59;
-procedure SetFont(Rp: PRastPort; TextFont: PTextFont); syscall GfxBase 11;
-procedure SetMaxPen(Rp: PRastPort; MaxPen: LongWord); syscall GfxBase 165;
-function SetOutlinePen(Rp: PRastPort; Pen: LongWord): LongWord; syscall GfxBase 163;
-procedure SetRast(Rp: PRastPort; Pen: LongWord); syscall GfxBase 39;
-function SetRegion(Src: PRegion; Dest: PRegion): LongBool; syscall GfxBase 195;
-procedure SetRGB32(Vp: PViewPort; n, r, g, b : LongWord); syscall GfxBase 142;
-procedure SetRGB32CM(Cm: PColorMap; n, r, g, b: LongWord); syscall GfxBase 166;
-procedure SetRGB4(Vp: PViewPort; n, r, g, b: LongWord); syscall GfxBase 48;
-procedure SetRGB4CM(Cm: PColorMap; n: SmallInt; r, g, b: Byte); syscall GfxBase 105;
-procedure SetRPAttrsA(Rp: PRastPort; Tags: PTagItem); syscall GfxBase 173;
-function SetSoftStyle(Rp: PRastPort; Style: LongWord; Enable: LongWord): LongWord; syscall GfxBase 15;
-function SetWriteMask(Rp: PRastPort; Mask: LongWord): LongWord; syscall GfxBase 164;
-procedure SortGList(Rp: PRastPort); syscall GfxBase 25;
-procedure StripFont(Font: PTextFont); syscall GfxBase 137;
-function SwapRegions(Region1: PRegion; Region2: PRegion; Intersect: PRectangle): LongBool; syscall GfxBase 192;
-procedure SyncSBitMap(l: PLayer); syscall GfxBase 74;
-procedure GfxText(Rp: PRastPort; const String_: STRPTR; Count: LongWord); syscall GfxBase 10;
-procedure TextExtent(Rp: PRastPort; const String_: STRPTR; Count: LongWord; TextExtent_: PTextExtent); syscall GfxBase 115;
-function TextFit(Rp: PRastPort; const String_: STRPTR; StrLen: LongWord; TextExtent_: PTextExtent; ConstrainingExtent: PTextExtent; StrDirection: LongInt; ConstrainingBitWidth: LongWord; ConstrainingBitHeight: LongWord): LongWord; syscall GfxBase 116;
-function TextLength(Rp: PRastPort; const string_: STRPTR; Count: LongWord): SmallInt; syscall GfxBase 9;
-function UCopperListInit(Ucl: PUCopList; n: SmallInt): PCopList; syscall GfxBase 99;
-procedure UnlockLayerRom(l: PLayer); syscall GfxBase 73;
-function VBeamPos: LongInt; syscall GfxBase 64; platform;
-function VideoControl(Cm: PColorMap; Tags: PTagItem): LongWord; syscall GfxBase 118; unimplemented;
-procedure WaitBlit; syscall GfxBase 38; unimplemented;
-procedure WaitBOVP(Vp: PViewPort); syscall GfxBase 67; unimplemented;
-procedure WaitTOF; syscall GfxBase 45;
-function WeighTAMatch(ReqTextAttr: PTextAttr; TargetTextAttr: PTextAttr; TargetTags: PTagItem): SmallInt; syscall GfxBase 134;
-procedure WriteChunkyPixels(Rp: PRastPort; xStart, yStart, xStop, yStop: LongWord; Array_: PByte; BytesPerRow: LongInt); syscall GfxBase 176;
-function WritePixel(Rp: PRastPort; x, y: LongInt): LongInt; syscall GfxBase 54;
-function WritePixelArray8(Rp: PRastPort; xStart, yStart, xStop, yStop: LongWord; Array_: PByte; TempRp: PRastPort): LongInt; syscall GfxBase 131;
-function WritePixelLine8(Rp: PRastPort; xStart, yStart, Width: LongWord; Array_: PByte; TempRP: PRastPort): LongInt; syscall GfxBase 129;
+function AddDisplayDriverA(GfxHidd: APTR; Tags: PTagItem): LongInt; syscall GfxBase 181;
 function WritePixels8(Rp: PRastPort; Array_: PByte; Modulo: LongWord; xStart, yStart, xStop, yStop: LongWord; PixLUT: Pointer{PHIDDT_PixelLUT}; Do_Update: LongBool): LongInt; syscall GfxBase 182;
-function XorRectRegion(Reg: PRegion; Rect: PRectangle): LongBool; syscall GfxBase 93;
-function XorRectRegionND(Reg: PRegion; Rect: PRectangle): PRegion; syscall GfxBase 152;
-function XorRegionRegion(SrcRegion: PRegion; DestRegion: PRegion): LongBool; syscall GfxBase 103;
-function XorRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 151;
+function FillRectPenDrMd(Rp: PRastPort; x1, y1, x2, y2: LongInt; Pix: Pointer{HIDDT_Pixel}; drmd: Pointer{HIDDT_DrawMode}; Do_Update: LongBool): LongInt; syscall GfxBase 183;
+function DoRenderFunc(Rp: PRastPort; Src: PPoint; Rr: PRectangle; Render_Func: Pointer; FuncData: APTR; Do_Update: LongBool): LongInt; syscall GfxBase 184;
+function DoPixelFunc(Rp: PRastPort; x, y: LongInt; Render_Func: Pointer; FuncData: APTR; Do_Update: LongBool): LongInt; syscall GfxBase 185;
+procedure SetDisplayDriverCallback(CallBack: TDriverNotifyFunc; UserData: APTR); syscall GfxBase 186;
+function ClearRegionRegion(R1: PRegion; R2: PRegion): LongBool; syscall GfxBase 187;
+function CopyRegion(Region: PRegion): PRegion; syscall GfxBase 188;
+function AreRegionsEqual(R1: PRegion; R2: PRegion): LongBool; syscall GfxBase 189;
+function IsPointInRegion(Reg: PRegion; x, y: SmallInt): LongBool; syscall GfxBase 190;
+function ScrollRegion(Region: PRegion; Rect: PRectangle; Dx, Dy: SmallInt): LongBool; syscall GfxBase 191;
+function SwapRegions(Region1: PRegion; Region2: PRegion; Intersect: PRectangle): LongBool; syscall GfxBase 192;
+function AndRectRect(Rect1: PRectangle; Rect2: PRectangle; Intersect: PRectangle): LongBool; syscall GfxBase 193;
+function NewRectRegion(MinX, MinY, MaxX, MaxY: SmallInt): PRegion; syscall GfxBase 194;
+function SetRegion(Src: PRegion; Dest: PRegion): LongBool; syscall GfxBase 195;
+procedure BltRastPortBitMap(SrcRastPort: PRastPort; xSrc, ySrc: LongInt; DestBitMap: PBitMap; xDest, yDest, xSize, ySize, MinTerm: LongWord); syscall GfxBase 196;
+procedure ShowImminentReset; syscall GfxBase 197;
+{$endif}
+
+{$ifdef AROS_ABIv1}
+function AddDisplayDriverA(GfxHidd: APTR; Tags: PTagItem): LongInt; syscall GfxBase 107;
+procedure SetDisplayDriverCallback(CallBack: TDriverNotifyFunc; UserData: APTR); syscall GfxBase 108;
+function SetRegion(Src: PRegion; Dest: PRegion): LongBool; syscall GfxBase 181;
+function ClearRegionRegion(R1: PRegion; R2: PRegion): LongBool; syscall GfxBase 182;
+function AreRegionsEqual(R1: PRegion; R2: PRegion): LongBool; syscall GfxBase 183;
+function IsPointInRegion(Reg: PRegion; x, y: SmallInt): LongBool; syscall GfxBase 184;
+function ScrollRegion(Region: PRegion; Rect: PRectangle; Dx, Dy: SmallInt): LongBool; syscall GfxBase 185;
+procedure AndRectRegionND(Reg: PRegion; Rect: PRectangle); syscall GfxBase 186;
+function AndRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 187;
+function OrRectRegionND(Reg: PRegion; Rect: PRectangle): PRegion; syscall GfxBase 188;
+function OrRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 189;
+function XorRectRegionND(Reg: PRegion; Rect: PRectangle): PRegion; syscall GfxBase 190;
+function XorRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 191;
+function ClearRectRegionND(Reg: PRegion; Rect: PRectangle): PRegion; syscall GfxBase 192;
+function ClearRegionRegionND(R1: PRegion; R2: PRegion): PRegion; syscall GfxBase 193;
+function WritePixels8(Rp: PRastPort; Array_: PByte; Modulo: LongWord; xStart, yStart, xStop, yStop: LongWord; PixLUT: Pointer{PHIDDT_PixelLUT}; Do_Update: LongBool): LongInt; syscall GfxBase 197;
+function FillRectPenDrMd(Rp: PRastPort; x1, y1, x2, y2: LongInt; Pix: Pointer{HIDDT_Pixel}; drmd: Pointer{HIDDT_DrawMode}; Do_Update: LongBool): LongInt; syscall GfxBase 198;
+function DoRenderFunc(Rp: PRastPort; Src: PPoint; Rr: PRectangle; Render_Func: Pointer; FuncData: APTR; Do_Update: LongBool): LongInt; syscall GfxBase 199;
+function DoPixelFunc(Rp: PRastPort; x, y: LongInt; Render_Func: Pointer; FuncData: APTR; Do_Update: LongBool): LongInt; syscall GfxBase 200;
+procedure UpdateBitMap(Bitmap: PBitmap; x, y, Width, Height: LongWord); syscall GfxBase 201;
+
+function CreateRastPort: PRastPort;
+function CloneRastPort(Rp: PRastPort): PRastPort;
+procedure DeinitRastPort(Rp: PRastPort);
+procedure FreeRastPort(Rp: PRastPort);
+{$endif}
 
 function BestModeID(const Tags: array of PtrUInt): LongWord;
 function AllocSpriteData(Bitmap: PBitMap; const Tags: array of PtrUInt): PExtSprite;
@@ -2439,6 +2479,35 @@ begin
   CWAIT(c, 10000, 255);
 end;
 
+function CreateRastPort: PRastPort;
+var
+  RP: PRastPort;
+begin
+  RP := AllocMem(SizeOf(TRastPort));
+  InitRastPort(RP);
+  CreateRastPort := RP;
+end;
+
+function CloneRastPort(Rp: PRastPort): PRastPort;
+var
+  NRP: PRastPort;
+begin
+  NRP := AllocMem(SizeOf(TRastPort));
+  Move(Rp^, NRP^, SizeOf(TRastPort));
+  CloneRastPort := NRP;
+end;
+
+procedure DeinitRastPort(Rp: PRastPort);
+begin
+  // nothing to do;
+end;
+
+procedure FreeRastPort(Rp: PRastPort);
+begin
+  if Assigned(Rp) then
+    FreeMem(Rp);
+end;
+
 initialization
   GfxBase := PGfxBase(OpenLibrary(GRAPHICSNAME, 36));
 finalization
diff --git a/packages/arosunits/src/exec.pas b/packages/arosunits/src/exec.pas
index d869956558..58f37a57ac 100644
--- a/packages/arosunits/src/exec.pas
+++ b/packages/arosunits/src/exec.pas
@@ -501,7 +501,7 @@ type
     mh_First: PMemChunk; // first free region
     mh_Lower,            // lower memory bound
     mh_Upper: APTR;      // upper memory bound+1
-    mh_Free: ULONG;      // total number of free bytes
+    mh_Free: IPTR;       // total number of free bytes
   end;
 
 //****** MemEntry ****************************************************
@@ -512,7 +512,7 @@ type
         0: (meu_Reqs: ULONG);
         1: (meu_Addr: APTR);
       end;
-    me_Length: ULONG;
+    me_Length: IPTR;
   end;
 
 //****** MemList *****************************************************
@@ -558,9 +558,9 @@ type
 // Note:  This structure is *READ ONLY* and only EXEC can create it!
  PMemHandlerData = ^TMemHandlerData;
  TMemHandlerData = record
-        memh_RequestSize,  // Requested allocation size
-        memh_RequestFlags, // Requested allocation flags
-        memh_Flags: ULONG; // Flags (see below)
+   memh_RequestSize: IPTR;  // Requested allocation size
+   memh_RequestFlags,       // Requested allocation flags
+   memh_Flags: ULONG;       // Flags (see below)
  end;
 
 const
@@ -1010,7 +1010,7 @@ type
 { ******* Static System Variables ******* }
     SoftVer: Word;          // kickstart release number (obs.)
     LowMemChkSum: SmallInt; // checksum of 68000 trap vectors
-    ChkBase: ULONG;         // system base pointer complement
+    ChkBase: IPTR;          // system base pointer complement
     ColdCapture,            // coldstart soft capture vector
     CoolCapture,            // coolstart soft capture vector
     WarmCapture,            // warmstart soft capture vector
diff --git a/packages/arosunits/src/intuition.pas b/packages/arosunits/src/intuition.pas
index 4cad797169..1dd135ab57 100644
--- a/packages/arosunits/src/intuition.pas
+++ b/packages/arosunits/src/intuition.pas
@@ -3191,150 +3191,161 @@ const
 var
   IntuitionBase: PIntuitionBase;
 
-
-function ActivateGadget(Gadget: PGadget; Window: PWindow; Requester: PRequester): LongBool; syscall IntuitionBase 77;
-procedure ActivateWindow(Window: PWindow); syscall IntuitionBase 75;
-procedure AddClass(ClassPtr: PIClass); syscall IntuitionBase 114;
 function AddGadget(Window: PWindow; Gadget: PGadget; Position: LongWord): Word; syscall IntuitionBase 7;
-function AddGList(Window: PWindow; Gadget: PGadget; Position: LongWord; NumGad: LongInt; Requester: PRequester): Word; syscall IntuitionBase 73;
-function AllocIntuiMessage(Window: PWindow): PIntuiMessage; syscall IntuitionBase 148;
-function AllocRemember(var RememberKey: PRemember; Size: LongWord; Flags: LongWord): APTR; syscall IntuitionBase 66;
-function AllocScreenBuffer(Screen: PScreen; Bitmap: PBitMap; Flags: LongWord): PScreenBuffer; syscall IntuitionBase 128;
-procedure AlohaWorkbench(MsgPort: PMsgPort); syscall IntuitionBase 67;
-function AutoRequest(Window: PWindow; Body: PIntuiText; PosText: PIntuiText; NegText: PIntuiText; PFlag: LongWord; NFlag: LongWord; Width: LongWord; Height: LongWord): LongBool; syscall IntuitionBase 58;
-procedure BeginRefresh(Window: PWindow); syscall IntuitionBase 59;
-function BuildEasyRequestArgs(Window: PWindow; EasyStruct: PEasyStruct; IDCMP: LongWord; Args: APTR): PWindow; syscall IntuitionBase 99;
-function BuildSysRequest(Window: PWindow; Body: PIntuiText; PosText: PIntuiText; NegText: PIntuiText; Flags: LongWord; Width: LongWord; Height: LongWord): PWindow; syscall IntuitionBase 60;
-function ChangeScreenBuffer(Screen: PScreen; ScreenBuffer: PScreenBuffer): LongWord; syscall IntuitionBase 130;
-procedure ChangeWindowBox(Window: PWindow; Left: LongInt; Top: LongInt; Width: LongInt; Height: LongInt); syscall IntuitionBase 81;
 function ClearDMRequest(Window: PWindow): LongBool; syscall IntuitionBase 8;
 procedure ClearMenuStrip(Window: PWindow); syscall IntuitionBase 9;
 procedure ClearPointer(Window: PWindow); syscall IntuitionBase 10;
 function CloseScreen(Screen: PScreen): LongBool; syscall IntuitionBase 11;
 procedure CloseWindow(Window: PWindow); syscall IntuitionBase 12;
 function CloseWorkBench: LongInt; syscall IntuitionBase 13;
-procedure ChangeDecoration(ID: LongWord; Decor: PNewDecorator); syscall IntuitionBase 153;
-function ChangeWindowShape(Window: PWindow; NewShape: PRegion; CallBack: PHook): PRegion; syscall IntuitionBase 143; unimplemented;
 procedure CurrentTime(var Seconds: LongWord; var Micros: LongWord); syscall IntuitionBase 14;
 function DisplayAlert(AlertNumber: LongWord; String_: PChar; Height: Word): LongBool; syscall IntuitionBase 15; deprecated;
 procedure DisplayBeep(Screen: PScreen); syscall IntuitionBase 16;
-procedure DisposeObject(Object_: APTR); syscall IntuitionBase 107;
-function DoGadgetMethodA(Gad: PGadget; Win: PWindow; Req: PRequester; Msg: TMsg): IPTR; syscall IntuitionBase 135;
-function DoNotify(Cl: PIClass; O: PObject_; Ic: Pointer; Msg: TopUpdate): Pointer; syscall IntuitionBase 145;
 function DoubleClick(SSeconds: LongWord; SMicros: LongWord; CSeconds: LongWord; CMicros: LongWord): LongBool; syscall IntuitionBase 17;
 procedure DrawBorder(Rp: PRastPort; Border: PBorder; LeftOffset: LongInt; TopOffset: LongInt); syscall IntuitionBase 18;
 procedure DrawImage(Rp: PRastPort; Image: PImage; LeftOffset: LongInt; TopOffset: LongInt); syscall IntuitionBase 19;
-procedure DrawImageState(Rp: PRastPort; Image: PImage; LeftOffset: LongInt; TopOffset: LongInt; state: LongWord; DrawInfo: PDrawInfo); syscall IntuitionBase 103;
-function EasyRequestArgs(Window: PWindow; EasyStruct: PEasyStruct; IDCMP_Ptr: PLongWord; Args: APTR): LongInt; syscall IntuitionBase 98;
-procedure EndRefresh(Window: PWindow; Complete: LongBool); syscall IntuitionBase 61;
 procedure EndRequest(Requester: PRequester; Window: PWindow); syscall IntuitionBase 20;
-function EndScreenNotify(Notify: IPTR): LongBool; syscall IntuitionBase 162;
-procedure EraseImage(Rp: PRastPort; Image: PImage; LeftOffset: LongInt; TopOffset: LongInt); syscall IntuitionBase 105;
-function FindClass(ClassID: ClassID): PIClass; syscall IntuitionBase 112;
-function FreeClass(IClass: PIClass): LongBool; syscall IntuitionBase 119;
-procedure FreeICData(ICData: Pointer); syscall IntuitionBase 146;
-procedure FreeIntuiMessage(IMsg: PIntuiMessage); syscall IntuitionBase 149;
-procedure FreeMonitorList(Obj: PPObject_); syscall IntuitionBase 164;
-procedure FreeRemember(var RememberKey: PRemember; ReallyForget: LongInt); syscall IntuitionBase 68;
-procedure FreeScreenBuffer(Screen: PScreen; ScreenBuffer: PScreenBuffer); syscall IntuitionBase 129;
-procedure FreeScreenDrawInfo(Screen: PScreen; DrawInfo: PDrawInfo); syscall IntuitionBase 116;
-procedure FreeSysRequest(Window: PWindow); syscall IntuitionBase 62;
-procedure GadgetMouse(Gadget: PGadget; GInfo: PGadgetInfo; var MousePoint: SmallInt); syscall IntuitionBase 95;
-function GetAttr(AttrID: LongWord; Object_: PObject_; StoragePtr: PIPTR): LongWord; overload syscall IntuitionBase 109;
-function GetAttr(AttrID: LongWord; Object_: PObject_; var Storage: IPTR): LongWord; overload syscall IntuitionBase 109;
-function GetDefaultPubScreen(NameBuffer: PChar): PScreen; syscall IntuitionBase 97;
 function GetDefPrefs(Preferences: PPreferences; Size: SmallInt): PPreferences; syscall IntuitionBase 21;
-function GetMonitorList(Tags: PTagItem): PPObject_; syscall IntuitionBase 163;
 function GetPrefs(Preferences: PPreferences; Size: SmallInt): PPreferences; syscall IntuitionBase 22;
-function GetScreenData(Buffer: APTR; Size: LongWord; Type_: LongWord; Screen: PScreen): LongInt; syscall IntuitionBase 71;
-function GetScreenDrawInfo(Screen: PScreen): PDrawInfo; syscall IntuitionBase 115;
-procedure HelpControl(Window: PWindow; Flags: LongWord); syscall IntuitionBase 138;
-procedure HideWindow(Window: PWindow); syscall IntuitionBase 141;
 procedure InitRequester(Requester: PRequester); syscall IntuitionBase 23; deprecated;
-function IntuiTextLength(iText: PIntuiText): LongInt; syscall IntuitionBase 55;
 function ItemAddress(MenuStrip: PMenu; MenuNumber: Word): PMenuItem; syscall IntuitionBase 24;
-function IsWindowVisible(Window: PWindow): LongWord; syscall IntuitionBase 139;
-procedure LendMenus(FromWindow: PWindow; ToWindow: PWindow); syscall IntuitionBase 134;
-function LockIBase(LockNumber: LongWord): LongWord; syscall IntuitionBase 69;
-function LockPubScreen(const Name: STRPTR): PScreen; syscall IntuitionBase 85;
-function LockPubScreenList: PList; syscall IntuitionBase 87;
-function MakeClass(ClassID: ClassID; SuperClassID: ClassID; SuperClassPtr: PIClass; InstanceSize: LongWord; Flags: LongWord): PIClass; syscall IntuitionBase 113;
-function MakeScreen(Screen: PScreen): LongInt; syscall IntuitionBase 63;
 function ModifyIDCMP(Window: PWindow; Flags: LongWord): LongBool; syscall IntuitionBase 25;
 procedure ModifyProp(Gadget: PGadget; Window: PWindow; Requester: PRequester; Flags: LongWord; HorizPot: LongWord; VertPot: LongWord; HorizBody: LongWord; VertBody: LongWord); syscall IntuitionBase 26;
 procedure MoveScreen(Screen: PScreen; Dx: LongInt; Dy: LongInt); syscall IntuitionBase 27;
 procedure MoveWindow(Window: PWindow; Dx: LongInt; Dy: LongInt); syscall IntuitionBase 28;
-procedure MoveWindowInFrontOf(Window: PWindow; BehindWindow: PWindow); syscall IntuitionBase 80;
-procedure NewModifyProp(Gadget: PGadget; Window: PWindow; Requester: PRequester; Flags: LongWord; HorizPot: LongWord; VertPot: LongWord; HorizBody: LongWord; VertBody: LongWord; NumGad: LongInt); syscall IntuitionBase 78;
-function NewObjectA(ClassPtr: PIClass; ClassID: PChar; TagList: PTagItem): APTR; syscall IntuitionBase 106;
-function NextObject(ObjectPtrPtr: APTR): APTR; syscall IntuitionBase  111;
-function NextPubScreen(Screen: PScreen; Namebuf: PChar): PChar; syscall IntuitionBase 89;
-function ObtainGIRPort(GInfo: PGadgetInfo): PRastPort; syscall IntuitionBase 93;
 procedure OffGadget(Gadget: PGadget; Window: PWindow; Requester: PRequester); syscall IntuitionBase 29;
 procedure OffMenu(Window: PWindow; MenuNumber: Word); syscall IntuitionBase 30;
 procedure OnGadget(Gadget: PGadget; Window: PWindow; Requester: PRequester); syscall IntuitionBase 31;
 procedure OnMenu(Window: PWindow; MenuNumber: Word); syscall IntuitionBase 32;
 function OpenScreen(NewScreen: PNewScreen): PScreen; syscall IntuitionBase 33;
-function OpenScreenTagList(NewScreen: PNewScreen; TagList: PTagItem): PScreen; syscall IntuitionBase 102;
 function OpenWindow(NewWindow: PNewWindow): PWindow; syscall IntuitionBase 34;
-function OpenWindowTagList(NewWindow: PNewWindow; TagList: PTagItem): PWindow; syscall IntuitionBase 101;
 function OpenWorkBench: IPTR; syscall IntuitionBase 35;
-function PointInImage(Point: LongWord; Image: PImage): LongBool; syscall IntuitionBase 104;
 procedure PrintIText(Rp: PRastPort; IText: PIntuiText; Left: LongInt; Top: LongInt); syscall IntuitionBase 36;
-function PubScreenStatus(Screen: PScreen; StatusFlags: Word): Word; syscall IntuitionBase 92;
-function QueryOverscan(DisplayID: LongWord; Rect: PRectangle; OScanType: SmallInt): LongInt; syscall IntuitionBase 79;
 procedure RefreshGadgets(Gadgets: PGadget; Window: PWindow; Requester: PRequester); syscall IntuitionBase 37;
-procedure RefreshGList(Gadgets: PGadget; Window: PWindow; Requester: PRequester; NumGad: LongInt); syscall IntuitionBase 72;
-procedure RefreshWindowFrame(Window: PWindow); syscall IntuitionBase 76;
-procedure ReleaseGIRPort(Rp: PRastPort); syscall IntuitionBase 94;
-function RemakeDisplay: LongInt; syscall IntuitionBase 64;
-procedure RemoveClass(ClassPtr: PIClass); syscall IntuitionBase 118;
 function RemoveGadget(Window: PWindow; Gadget: PGadget): Word; syscall IntuitionBase 38;
-function RemoveGList(RemPtr: PWindow; Gadget: PGadget; NumGad: LongInt): Word; syscall IntuitionBase 74;
 procedure ReportMouse(Flag: LongInt; Window: PWindow); syscall IntuitionBase 39;
 function Request(Requester: PRequester; Window: PWindow): LongBool; syscall IntuitionBase 40;
-function ResetMenuStrip(Window: PWindow; Menu: PMenu): LongBool; syscall IntuitionBase 117;
-function RethinkDisplay: LongInt; syscall IntuitionBase 65;
-procedure ScreenDepth(Screen: PScreen; Flags: LongWord; Reserved: APTR); syscall IntuitionBase 131;
-procedure ScreenPosition(Screen: PScreen; Flags: LongWord; X1: LongInt; Y1: LongInt; X2: LongInt; Y2: LongInt); syscall IntuitionBase 132;
 procedure ScreenToBack(Screen: PScreen); syscall IntuitionBase 41;
 procedure ScreenToFront(Screen: PScreen); syscall IntuitionBase 42;
-procedure ScrollWindowRaster(Win: PWindow; Dx: SmallInt; Dy: SmallInt; XMin: SmallInt; YMin: SmallInt; XMax: SmallInt; YMax: SmallInt); syscall IntuitionBase 133;
-procedure ScrollWindowRasterNoFill(Window: PWindow; Dx, Dy, XMin, YMin, XMax, YMax: Word); syscall IntuitionBase 159;
-procedure SendIntuiMessage(Window: PWindow; IMsg: PIntuiMessage); syscall IntuitionBase 151;
-function SetAttrsA(Object_: APTR; TagList: PTagItem): IPTR; syscall IntuitionBase 108;
-procedure SetDefaultPubScreen(Name: PChar); syscall IntuitionBase 90;
-procedure SetDefaultScreenFont(TextFont: PTextFont); syscall IntuitionBase 144;
 function SetDMRequest(Window: PWindow; Requester: PRequester): LongBool; syscall IntuitionBase 43;
-function SetEditHook(Hook: PHook): PHook; syscall IntuitionBase 82;
-function SetGadgetAttrsA(Gadget: PGadget; Window: PWindow; Requester: PRequester; TagList: PTagItem): IPTR; syscall IntuitionBase 110;
-function SetIPrefs(Data: Pointer; Length: LongWord; Typ: LongWord): LongWord; syscall IntuitionBase 96;
 function SetMenuStrip(Window: PWindow; Menu: PMenu): LongBool; syscall IntuitionBase 44;
-function SetMouseQueue(Window: PWindow; QueueLength: LongWord): LongInt; syscall IntuitionBase 83;
 procedure SetPointer(Window: PWindow; Pointer_: PWord; Height: LongInt; Width: LongInt; XOffset: LongInt; YOffset: LongInt); syscall IntuitionBase 45;
-function SetPointerBounds(Screen: PScreen; Rect: TRectangle; Reserved: LongWord; Tags: PTagItem): LongWord; syscall IntuitionBase 160;
-function SetPrefs(PrefBuffer: PPreferences; Size: LongInt; Inform: LongBool): PPreferences; syscall IntuitionBase 54;
-function SetPubScreenModes(Modes: Word): Word; syscall IntuitionBase 91;
-procedure SetWindowPointerA(Win: PWindow; Taglist: PTagItem); syscall IntuitionBase 136;
 procedure SetWindowTitles(Window: PWindow; const WindowTitle: PChar; const ScreenTitle: PChar); syscall IntuitionBase 46;
 procedure ShowTitle(Screen: PScreen; ShowIt: LongBool); syscall IntuitionBase 47;
-procedure ShowWindow(Window: PWindow); syscall IntuitionBase 140;
 procedure SizeWindow(Window: PWindow; Dx: LongInt; Dy: LongInt); syscall IntuitionBase 48;
-function StartScreenNotifyTagList(Tags: PTagItem): IPTR; syscall IntuitionBase 161;
-function SysReqHandler(Window: PWindow; IDCMPFlagsPtr: PLongWord; WaitInput: LongBool): LongInt; syscall IntuitionBase 100;
-function TimedDisplayAlert(AlertNumber: LongWord; String_: PChar; Height: Word; Time: LongWord): LongBool; syscall IntuitionBase 137;
-procedure UnlockIBase(LockNumber: LongWord); syscall IntuitionBase 70;
-procedure UnlockPubScreen(Name: PChar; Screen: PScreen); syscall IntuitionBase 86;
-procedure UnlockPubScreenList; syscall IntuitionBase 88;
 function ViewAddress: PView; syscall IntuitionBase 49;
 function ViewPortAddress(Window: PWindow): PViewPort; syscall IntuitionBase 50;
-function WBenchToBack: LongBool; syscall IntuitionBase 56;
-function WBenchToFront: LongBool; syscall IntuitionBase 57;
-procedure WindowAction(Window: PWindow; Action: LongWord; Tags: PTagItem); syscall IntuitionBase 157;
-function WindowLimits(Window: PWindow; WidthMin: SmallInt; HeightMin: SmallInt; WidthMax: Word; HeightMax: Word): LongBool; syscall IntuitionBase 53;
 procedure WindowToBack(Window: PWindow); syscall IntuitionBase 51;
 procedure WindowToFront(Window: PWindow); syscall IntuitionBase 52;
+function WindowLimits(Window: PWindow; WidthMin: SmallInt; HeightMin: SmallInt; WidthMax: Word; HeightMax: Word): LongBool; syscall IntuitionBase 53;
+function SetPrefs(PrefBuffer: PPreferences; Size: LongInt; Inform: LongBool): PPreferences; syscall IntuitionBase 54;
+function IntuiTextLength(iText: PIntuiText): LongInt; syscall IntuitionBase 55;
+function WBenchToBack: LongBool; syscall IntuitionBase 56;
+function WBenchToFront: LongBool; syscall IntuitionBase 57;
+function AutoRequest(Window: PWindow; Body: PIntuiText; PosText: PIntuiText; NegText: PIntuiText; PFlag: LongWord; NFlag: LongWord; Width: LongWord; Height: LongWord): LongBool; syscall IntuitionBase 58;
+procedure BeginRefresh(Window: PWindow); syscall IntuitionBase 59;
+function BuildSysRequest(Window: PWindow; Body: PIntuiText; PosText: PIntuiText; NegText: PIntuiText; Flags: LongWord; Width: LongWord; Height: LongWord): PWindow; syscall IntuitionBase 60;
+procedure EndRefresh(Window: PWindow; Complete: LongBool); syscall IntuitionBase 61;
+procedure FreeSysRequest(Window: PWindow); syscall IntuitionBase 62;
+function MakeScreen(Screen: PScreen): LongInt; syscall IntuitionBase 63;
+function RemakeDisplay: LongInt; syscall IntuitionBase 64;
+function RethinkDisplay: LongInt; syscall IntuitionBase 65;
+function AllocRemember(var RememberKey: PRemember; Size: LongWord; Flags: LongWord): APTR; syscall IntuitionBase 66;
+procedure AlohaWorkbench(MsgPort: PMsgPort); syscall IntuitionBase 67;
+procedure FreeRemember(var RememberKey: PRemember; ReallyForget: LongInt); syscall IntuitionBase 68;
+function LockIBase(LockNumber: LongWord): LongWord; syscall IntuitionBase 69;
+procedure UnlockIBase(LockNumber: LongWord); syscall IntuitionBase 70;
+function GetScreenData(Buffer: APTR; Size: LongWord; Type_: LongWord; Screen: PScreen): LongInt; syscall IntuitionBase 71;
+procedure RefreshGList(Gadgets: PGadget; Window: PWindow; Requester: PRequester; NumGad: LongInt); syscall IntuitionBase 72;
+function AddGList(Window: PWindow; Gadget: PGadget; Position: LongWord; NumGad: LongInt; Requester: PRequester): Word; syscall IntuitionBase 73;
+function RemoveGList(RemPtr: PWindow; Gadget: PGadget; NumGad: LongInt): Word; syscall IntuitionBase 74;
+procedure ActivateWindow(Window: PWindow); syscall IntuitionBase 75;
+procedure RefreshWindowFrame(Window: PWindow); syscall IntuitionBase 76;
+function ActivateGadget(Gadget: PGadget; Window: PWindow; Requester: PRequester): LongBool; syscall IntuitionBase 77;
+procedure NewModifyProp(Gadget: PGadget; Window: PWindow; Requester: PRequester; Flags: LongWord; HorizPot: LongWord; VertPot: LongWord; HorizBody: LongWord; VertBody: LongWord; NumGad: LongInt); syscall IntuitionBase 78;
+function QueryOverscan(DisplayID: LongWord; Rect: PRectangle; OScanType: SmallInt): LongInt; syscall IntuitionBase 79;
+procedure MoveWindowInFrontOf(Window: PWindow; BehindWindow: PWindow); syscall IntuitionBase 80;
+procedure ChangeWindowBox(Window: PWindow; Left: LongInt; Top: LongInt; Width: LongInt; Height: LongInt); syscall IntuitionBase 81;
+function SetEditHook(Hook: PHook): PHook; syscall IntuitionBase 82;
+function SetMouseQueue(Window: PWindow; QueueLength: LongWord): LongInt; syscall IntuitionBase 83;
 procedure ZipWindow(Window: PWindow); syscall IntuitionBase 84;
+function LockPubScreen(const Name: STRPTR): PScreen; syscall IntuitionBase 85;
+procedure UnlockPubScreen(Name: PChar; Screen: PScreen); syscall IntuitionBase 86;
+function LockPubScreenList: PList; syscall IntuitionBase 87;
+procedure UnlockPubScreenList; syscall IntuitionBase 88;
+function NextPubScreen(Screen: PScreen; Namebuf: PChar): PChar; syscall IntuitionBase 89;
+procedure SetDefaultPubScreen(Name: PChar); syscall IntuitionBase 90;
+function SetPubScreenModes(Modes: Word): Word; syscall IntuitionBase 91;
+function PubScreenStatus(Screen: PScreen; StatusFlags: Word): Word; syscall IntuitionBase 92;
+function ObtainGIRPort(GInfo: PGadgetInfo): PRastPort; syscall IntuitionBase 93;
+procedure ReleaseGIRPort(Rp: PRastPort); syscall IntuitionBase 94;
+procedure GadgetMouse(Gadget: PGadget; GInfo: PGadgetInfo; var MousePoint: SmallInt); syscall IntuitionBase 95;
+function SetIPrefs(Data: Pointer; Length: LongWord; Typ: LongWord): LongWord; syscall IntuitionBase 96;
+function GetDefaultPubScreen(NameBuffer: PChar): PScreen; syscall IntuitionBase 97;
+function EasyRequestArgs(Window: PWindow; EasyStruct: PEasyStruct; IDCMP_Ptr: PLongWord; Args: APTR): LongInt; syscall IntuitionBase 98;
+function BuildEasyRequestArgs(Window: PWindow; EasyStruct: PEasyStruct; IDCMP: LongWord; Args: APTR): PWindow; syscall IntuitionBase 99;
+function SysReqHandler(Window: PWindow; IDCMPFlagsPtr: PLongWord; WaitInput: LongBool): LongInt; syscall IntuitionBase 100;
+function OpenWindowTagList(NewWindow: PNewWindow; TagList: PTagItem): PWindow; syscall IntuitionBase 101;
+function OpenScreenTagList(NewScreen: PNewScreen; TagList: PTagItem): PScreen; syscall IntuitionBase 102;
+procedure DrawImageState(Rp: PRastPort; Image: PImage; LeftOffset: LongInt; TopOffset: LongInt; state: LongWord; DrawInfo: PDrawInfo); syscall IntuitionBase 103;
+function PointInImage(Point: LongWord; Image: PImage): LongBool; syscall IntuitionBase 104;
+procedure EraseImage(Rp: PRastPort; Image: PImage; LeftOffset: LongInt; TopOffset: LongInt); syscall IntuitionBase 105;
+function NewObjectA(ClassPtr: PIClass; ClassID: PChar; TagList: PTagItem): APTR; syscall IntuitionBase 106;
+procedure DisposeObject(Object_: APTR); syscall IntuitionBase 107;
+function SetAttrsA(Object_: APTR; TagList: PTagItem): IPTR; syscall IntuitionBase 108;
+function GetAttr(AttrID: LongWord; Object_: PObject_; StoragePtr: PIPTR): LongWord; overload syscall IntuitionBase 109;
+function GetAttr(AttrID: LongWord; Object_: PObject_; var Storage: IPTR): LongWord; overload syscall IntuitionBase 109;
+function SetGadgetAttrsA(Gadget: PGadget; Window: PWindow; Requester: PRequester; TagList: PTagItem): IPTR; syscall IntuitionBase 110;
+function NextObject(ObjectPtrPtr: APTR): APTR; syscall IntuitionBase 111;
+function FindClass(ClassID: ClassID): PIClass; syscall IntuitionBase 112;
+function MakeClass(ClassID: ClassID; SuperClassID: ClassID; SuperClassPtr: PIClass; InstanceSize: LongWord; Flags: LongWord): PIClass; syscall IntuitionBase 113;
+procedure AddClass(ClassPtr: PIClass); syscall IntuitionBase 114;
+function GetScreenDrawInfo(Screen: PScreen): PDrawInfo; syscall IntuitionBase 115;
+procedure FreeScreenDrawInfo(Screen: PScreen; DrawInfo: PDrawInfo); syscall IntuitionBase 116;
+function ResetMenuStrip(Window: PWindow; Menu: PMenu): LongBool; syscall IntuitionBase 117;
+procedure RemoveClass(ClassPtr: PIClass); syscall IntuitionBase 118;
+function FreeClass(IClass: PIClass): LongBool; syscall IntuitionBase 119;
+function AllocScreenBuffer(Screen: PScreen; Bitmap: PBitMap; Flags: LongWord): PScreenBuffer; syscall IntuitionBase 128;
+procedure FreeScreenBuffer(Screen: PScreen; ScreenBuffer: PScreenBuffer); syscall IntuitionBase 129;
+function ChangeScreenBuffer(Screen: PScreen; ScreenBuffer: PScreenBuffer): LongWord; syscall IntuitionBase 130;
+procedure ScreenDepth(Screen: PScreen; Flags: LongWord; Reserved: APTR); syscall IntuitionBase 131;
+procedure ScreenPosition(Screen: PScreen; Flags: LongWord; X1: LongInt; Y1: LongInt; X2: LongInt; Y2: LongInt); syscall IntuitionBase 132;
+procedure ScrollWindowRaster(Win: PWindow; Dx: SmallInt; Dy: SmallInt; XMin: SmallInt; YMin: SmallInt; XMax: SmallInt; YMax: SmallInt); syscall IntuitionBase 133;
+procedure LendMenus(FromWindow: PWindow; ToWindow: PWindow); syscall IntuitionBase 134;
+function DoGadgetMethodA(Gad: PGadget; Win: PWindow; Req: PRequester; Msg: TMsg): IPTR; syscall IntuitionBase 135;
+procedure SetWindowPointerA(Win: PWindow; Taglist: PTagItem); syscall IntuitionBase 136;
+function TimedDisplayAlert(AlertNumber: LongWord; String_: PChar; Height: Word; Time: LongWord): LongBool; syscall IntuitionBase 137;
+procedure HelpControl(Window: PWindow; Flags: LongWord); syscall IntuitionBase 138;
+function IsWindowVisible(Window: PWindow): LongWord; syscall IntuitionBase 139;
+procedure ShowWindow(Window: PWindow); syscall IntuitionBase 140;
+procedure HideWindow(Window: PWindow); syscall IntuitionBase 141;
+function ChangeWindowShape(Window: PWindow; NewShape: PRegion; CallBack: PHook): PRegion; syscall IntuitionBase 143; unimplemented;
+procedure SetDefaultScreenFont(TextFont: PTextFont); syscall IntuitionBase 144;
+function DoNotify(Cl: PIClass; O: PObject_; Ic: Pointer; Msg: TopUpdate): Pointer; syscall IntuitionBase 145;
+procedure FreeICData(ICData: Pointer); syscall IntuitionBase 146;
+function AllocIntuiMessage(Window: PWindow): PIntuiMessage; syscall IntuitionBase 148;
+procedure FreeIntuiMessage(IMsg: PIntuiMessage); syscall IntuitionBase 149;
+procedure SendIntuiMessage(Window: PWindow; IMsg: PIntuiMessage); syscall IntuitionBase 151;
+function GetDrawInfoAttr(DrawInfo: PDrawInfo; AttrID: LongWord; ErrorPtr: PIPTR): IPTR; syscall IntuitionBase 156;
+procedure WindowAction(Window: PWindow; Action: LongWord; Tags: PTagItem); syscall IntuitionBase 157;
+procedure ScrollWindowRasterNoFill(Window: PWindow; Dx, Dy, XMin, YMin, XMax, YMax: Word); syscall IntuitionBase 159;
+function SetPointerBounds(Screen: PScreen; Rect: TRectangle; Reserved: LongWord; Tags: PTagItem): LongWord; syscall IntuitionBase 160;
+
+{$ifdef AROS_ABIv0}
+procedure ChangeDecoration(ID: LongWord; Decor: PNewDecorator); syscall IntuitionBase 153;
+function StartScreenNotifyTagList(Tags: PTagItem): IPTR; syscall IntuitionBase 161;
+function EndScreenNotify(Notify: IPTR): LongBool; syscall IntuitionBase 162;
+function GetMonitorList(Tags: PTagItem): PPObject_; syscall IntuitionBase 163;
+procedure FreeMonitorList(Obj: PPObject_); syscall IntuitionBase 164;
+{$endif}
+
+{$ifdef AROS_ABIv1}
+procedure ChangeDecoration(ID: LongWord; Decor: PNewDecorator); syscall IntuitionBase 152;
+function StartScreenNotifyTagList(Tags: PTagItem): IPTR; syscall IntuitionBase 154;
+function EndScreenNotify(Notify: IPTR): LongBool; syscall IntuitionBase 155;
+procedure FreeMonitorList(Obj: PPObject_); syscall IntuitionBase 162;
+function GetMonitorList(Tags: PTagItem): PPObject_; syscall IntuitionBase 161;
+{$endif}
 
 // VarArgs Versions
 function SetAttrs(Obj: APTR; const Tags: array of PtrUInt): LongWord;
diff --git a/packages/arosunits/src/utility.pas b/packages/arosunits/src/utility.pas
index bf8e0c9034..c2439a996f 100644
--- a/packages/arosunits/src/utility.pas
+++ b/packages/arosunits/src/utility.pas
@@ -208,45 +208,45 @@ type
     ub_Reserved: Byte;
   end;
 
-function AddNamedObject(NameSpace, Object_: PNamedObject): LongBool; syscall AOS_UtilityBase 37;
-function AllocateTagItems(Num: LongWord): PTagItem; syscall AOS_UtilityBase 11;
-function AllocNamedObjectA(const Name: STRPTR; TagList: PTagItem): PNamedObject; syscall AOS_UtilityBase 38;
-procedure Amiga2Date(Seconds: LongWord; Resultat: PClockData); syscall AOS_UtilityBase 20;
-procedure ApplyTagChanges(List: PTagItem; ChangeList: PTagItem); syscall AOS_UtilityBase 31;
-function AttemptRemNamedObject(Object_: PNamedObject): LongInt; syscall AOS_UtilityBase 39;
-function CallHookPkt(Hook: PHook; Object_, ParamPaket: APTR): IPTR; syscall AOS_UtilityBase 17;
-function CheckDate(Date: PClockData): LongWord; syscall AOS_UtilityBase 22;
-function CloneTagItems(const TagList: PTagItem): PTagItem; syscall AOS_UtilityBase 12;
-function Date2Amiga(Date: PClockData): LongWord; syscall AOS_UtilityBase 21;
-procedure FilterTagChanges(ChangeList: PTagItem; const Oldvalues: PTagItem; Apply: LongBool); syscall AOS_UtilityBase 9;
-function FilterTagItems(TagList: PTagItem; FilterArray: PTag; Logic: LongWord): LongWord; syscall AOS_UtilityBase 16;
-function FindNamedObject(NameSpace: PNamedObject; const Name: STRPTR; LastObject: PNamedObject): PNamedObject; syscall AOS_UtilityBase 40;
 function FindTagItem(TagValue: Tag; const TagList: PTagItem): PTagItem; syscall AOS_UtilityBase 5;
-procedure FreeNamedObject(Object_: PNamedObject); syscall AOS_UtilityBase 41;
-procedure FreeTagItems(TagList: PTagItem); syscall AOS_UtilityBase 13;
 function GetTagData(TagValue: Tag; Default: IPTR; const TagList: PTagItem): IPTR; syscall AOS_UtilityBase 6;
-function GetUniqueID: LongWord; syscall AOS_UtilityBase 45;
-procedure MapTags(TagList: PTagItem; const MapList: PTagItem; MapType: LongWord); syscall AOS_UtilityBase 10;
-function NamedObjectName(Object_: PNamedObject): STRPTR; syscall AOS_UtilityBase 42;
+function PackBoolTags(InitialFlags: LongWord; const TagList, BoolMap: PTagItem): IPTR; syscall AOS_UtilityBase 7;
 function NextTagItem(var Item: PTagItem): PTagItem; overload; syscall AOS_UtilityBase 8;
 function NextTagItem(ItemPtr: PPTagItem): PTagItem; overload; syscall AOS_UtilityBase 8;
-function PackBoolTags(InitialFlags: LongWord; const TagList, BoolMap: PTagItem): IPTR; syscall AOS_UtilityBase 7;
-function PackStructureTags(Pack: APTR; PackTable: PLongWord; TagList: PTagItem): LongWord; syscall AOS_UtilityBase 35;
+procedure FilterTagChanges(ChangeList: PTagItem; const Oldvalues: PTagItem; Apply: LongBool); syscall AOS_UtilityBase 9;
+procedure MapTags(TagList: PTagItem; const MapList: PTagItem; MapType: LongWord); syscall AOS_UtilityBase 10;
+function AllocateTagItems(Num: LongWord): PTagItem; syscall AOS_UtilityBase 11;
+function CloneTagItems(const TagList: PTagItem): PTagItem; syscall AOS_UtilityBase 12;
+procedure FreeTagItems(TagList: PTagItem); syscall AOS_UtilityBase 13;
 procedure RefreshTagItemClones(Clone: PTagItem; const Original: PTagItem); syscall AOS_UtilityBase 14;
-procedure ReleaseNamedObject(Object_: PNamedObject); syscall AOS_UtilityBase 43;
-procedure RemNamedObject(Object_: PNamedObject; Message: PMessage); syscall AOS_UtilityBase 44;
-function SDivMod32(Dividend, Divisor: LongInt): Int64; syscall AOS_UtilityBase 25;
+function TagInArray(TagValue: Tag; TagArray: PTag): LongBool; syscall AOS_UtilityBase 15;
+function FilterTagItems(TagList: PTagItem; FilterArray: PTag; Logic: LongWord): LongWord; syscall AOS_UtilityBase 16;
+function CallHookPkt(Hook: PHook; Object_, ParamPaket: APTR): IPTR; syscall AOS_UtilityBase 17;
+procedure Amiga2Date(Seconds: LongWord; Resultat: PClockData); syscall AOS_UtilityBase 20;
+function Date2Amiga(Date: PClockData): LongWord; syscall AOS_UtilityBase 21;
+function CheckDate(Date: PClockData): LongWord; syscall AOS_UtilityBase 22;
 function SMult32(Arg1, Arg2: LongInt): LongInt; syscall AOS_UtilityBase 23;
-function SMult64(Arg1, Arg2: LongInt): Int64; syscall AOS_UtilityBase 33;
+function UMult32(Arg1, Arg2: LongWord): LongWord; syscall AOS_UtilityBase 24;
+function SDivMod32(Dividend, Divisor: LongInt): Int64; syscall AOS_UtilityBase 25;
+function UDivMod32(Dividend, Divisor: LongWord): LongWord; syscall AOS_UtilityBase 26;
 function Stricmp(const Str1: STRPTR; const Str2: STRPTR): LongInt; syscall AOS_UtilityBase 27;
 function Strnicmp(const Str1: STRPTR; const Str2 : STRPTR; Length_: LongInt): LongInt; syscall AOS_UtilityBase 28;
-function TagInArray(TagValue: Tag; TagArray: PTag): LongBool; syscall AOS_UtilityBase 15;
-function ToLower(c: LongWord): Char; syscall AOS_UtilityBase 30;
 function ToUpper(c: LongWord): Char; syscall AOS_UtilityBase 29;
-function UDivMod32(Dividend, Divisor: LongWord): LongWord; syscall AOS_UtilityBase 26;
-function UMult32(Arg1, Arg2: LongWord): LongWord; syscall AOS_UtilityBase 24;
+function ToLower(c: LongWord): Char; syscall AOS_UtilityBase 30;
+procedure ApplyTagChanges(List: PTagItem; ChangeList: PTagItem); syscall AOS_UtilityBase 31;
+function SMult64(Arg1, Arg2: LongInt): Int64; syscall AOS_UtilityBase 33;
 function UMult64(Arg1, Arg2: LongWord): QWord; syscall AOS_UtilityBase 34;
+function PackStructureTags(Pack: APTR; PackTable: PLongWord; TagList: PTagItem): LongWord; syscall AOS_UtilityBase 35;
 function UnpackStructureTags(Pack: APTR; PackTable: PLongWord; TagList: PTagItem): LongWord; syscall AOS_UtilityBase 36;
+function AddNamedObject(NameSpace, Object_: PNamedObject): LongBool; syscall AOS_UtilityBase 37;
+function AllocNamedObjectA(const Name: STRPTR; TagList: PTagItem): PNamedObject; syscall AOS_UtilityBase 38;
+function AttemptRemNamedObject(Object_: PNamedObject): LongInt; syscall AOS_UtilityBase 39;
+function FindNamedObject(NameSpace: PNamedObject; const Name: STRPTR; LastObject: PNamedObject): PNamedObject; syscall AOS_UtilityBase 40;
+procedure FreeNamedObject(Object_: PNamedObject); syscall AOS_UtilityBase 41;
+function NamedObjectName(Object_: PNamedObject): STRPTR; syscall AOS_UtilityBase 42;
+procedure ReleaseNamedObject(Object_: PNamedObject); syscall AOS_UtilityBase 43;
+procedure RemNamedObject(Object_: PNamedObject; Message: PMessage); syscall AOS_UtilityBase 44;
+function GetUniqueID: LongWord; syscall AOS_UtilityBase 45;
 
 // Macros
 function CALLHOOKPKT_(Hook: PHook; Object_: APTR; Message: APTR): IPTR; inline;