diff --git a/lcl/interfaces/carbon/carboncanvas.pp b/lcl/interfaces/carbon/carboncanvas.pp
index 9f2921b18b..11f855f599 100644
--- a/lcl/interfaces/carbon/carboncanvas.pp
+++ b/lcl/interfaces/carbon/carboncanvas.pp
@@ -1,5 +1,4 @@
-{ $Id$
-                  -----------------------------------------
+{                 -----------------------------------------
                   carboncanvas.pp  -  Carbon device context
                   -----------------------------------------
 
@@ -127,7 +126,7 @@ type
     procedure Frame3D(var ARect: TRect; const FrameWidth: integer; const Style: TBevelCut);
     function GetClipRect: TRect;
     function GetLineLastPixelPos(PrevPos, NewPos: TPoint): TPoint;
-    function GetPixel(X, Y: Integer): TGraphicsColor; virtual;
+    function GetPixel({%H-}X, {%H-}Y: Integer): TGraphicsColor; virtual;
     function GetTextExtentPoint(Str: PChar; Count: Integer; var Size: TSize): Boolean;
     function GetTextMetrics(var TM: TTextMetric): Boolean;
     procedure InvertRectangle(X1, Y1, X2, Y2: Integer);
@@ -139,7 +138,7 @@ type
     procedure SetPixel(X, Y: Integer; AColor: TGraphicsColor);
     function StretchDraw(X, Y, Width, Height: Integer; SrcDC: TCarbonBitmapContext;
       XSrc, YSrc, SrcWidth, SrcHeight: Integer; Msk: TCarbonBitmap; XMsk,
-      YMsk: Integer; Rop: DWORD): Boolean;
+      YMsk: Integer; {%H-}Rop: DWORD): Boolean;
     function SetClipRegion(AClipRegion: TCarbonRegion; Mode: Integer): Integer;
     function CopyClipRegion(ADstRegion: TCarbonRegion): Integer;
 
@@ -790,7 +789,7 @@ var
 begin
   // LCL thinks that focus cannot be drawn outside focus rects, but carbon do that
   // => correct rect
-  OSError(GetThemeMetric(kThemeMetricFocusRectOutset, AOutSet),
+  OSError(GetThemeMetric(kThemeMetricFocusRectOutset, AOutSet{%H-}),
     Self, 'DrawFocusRect', 'GetThemeMetric');
   InflateRect(ARect, -AOutSet, -AOutSet);
   OSError(
@@ -1495,8 +1494,8 @@ begin
 
 
   UseLayer:=Assigned(MskImage)
-            or (CGImageGetWidth(Image)<>SrcWidth)
-            or (CGImageGetHeight(Image)<>SrcHeight);
+            or (CGImageGetWidth(Image){%H-}<>SrcWidth)
+            or (CGImageGetHeight(Image){%H-}<>SrcHeight);
 
   try
     if not UseLayer then
@@ -1512,7 +1511,7 @@ begin
       Layer := CGLayerCreateWithContext(SrcDC.CGContext, LayRect.size, nil);
 
       // the sub-image is out of edges
-      if (CGImageGetWidth(Image)<>SrcWidth) or (CGImageGetHeight(Image)<>SrcHeight) then
+      if (CGImageGetWidth(Image){%H-}<>SrcWidth) or (CGImageGetHeight(Image){%H-}<>SrcHeight) then
       begin
         with ImgRect do
           if XSrc<0 then origin.x:=SrcWidth-CGImageGetWidth(Image) else origin.x:=0;
@@ -1599,7 +1598,7 @@ var
   dx, dy: Integer;
 begin
   if isSamePoint(AWindowOfs, fWindowOfs) and isSamePoint(AViewOfs, fViewPortOfs) then Exit;
-  GetWindowViewTranslate(fWindowOfs, fViewPortOfs, dx, dy);
+  GetWindowViewTranslate(fWindowOfs, fViewPortOfs, dx{%H-}, dy{%H-});
   CGContextTranslateCTM(CGContext, -dx, -dy);
 
   fWindowOfs:=AWindowOfs;
@@ -1651,7 +1650,7 @@ function TCarbonControlContext.GetSize: TPoint;
 var
   R: TRect;
 begin
-  FOwner.GetClientRect(R);
+  FOwner.GetClientRect(R{%H-});
   Result.X := (R.Right - R.Left);
   Result.Y := (R.Bottom - R.Top);
 end;
diff --git a/lcl/interfaces/carbon/carboncaret.pas b/lcl/interfaces/carbon/carboncaret.pas
index e196202133..f0457f8516 100644
--- a/lcl/interfaces/carbon/carboncaret.pas
+++ b/lcl/interfaces/carbon/carboncaret.pas
@@ -32,12 +32,10 @@ interface
 {$I carbondefines.inc}
 
 uses
-  // Bindings
-  MacOSAll,
   // Free Pascal
   Classes, SysUtils, Types,
   // Widgetset
-  CarbonDef, CarbonGDIObjects, CarbonInt,
+  CarbonDef, CarbonGDIObjects,
   // LCL
   LCLType, LCLIntf, LCLProc, Graphics, ExtCtrls, Forms;
 
@@ -59,7 +57,7 @@ type
     FCaretCS: System.PRTLCriticalSection;
     FWidgetSetReleased: Boolean;
     procedure SetPos(const Value: TPoint);
-    procedure UpdateCall(Data: PtrInt);
+    procedure UpdateCall({%H-}Data: PtrInt);
   protected
     procedure DoTimer(Sender: TObject);
     procedure DrawCaret; virtual;
@@ -86,7 +84,7 @@ type
   end;
 
 function CreateCaret(Widget: TCarbonWidget; Bitmap: PtrUInt; Width, Height: Integer): Boolean; overload;
-function HideCaret(Widget: TCarbonWidget): Boolean;
+function HideCaret({%H-}Widget: TCarbonWidget): Boolean;
 function ShowCaret(Widget: TCarbonWidget): Boolean;
 function SetCaretPos(X, Y: Integer): Boolean;
 function GetCaretPos(var P: TPoint): Boolean;
diff --git a/lcl/interfaces/carbon/carbonmenus.pp b/lcl/interfaces/carbon/carbonmenus.pp
index 0a86900320..1b17c3eb0f 100644
--- a/lcl/interfaces/carbon/carbonmenus.pp
+++ b/lcl/interfaces/carbon/carbonmenus.pp
@@ -1,5 +1,4 @@
-{ $Id: $
-                  ----------------------------------------
+{                 ----------------------------------------
                   carbonmenus.pp  -  Carbon internal menus
                   ----------------------------------------
 
@@ -27,15 +26,15 @@ interface
 
 uses
  // rtl+ftl
-  Types, Classes, SysUtils, Math, Contnrs,
+  Classes, SysUtils, Contnrs,
  // carbon bindings
   MacOSAll,
   CarbonUtils,
  // widgetset
-  WSControls, WSLCLClasses, WSProc,
+  WSLCLClasses,
  // LCL
-  LMessages, LCLMessageGlue, LCLProc, LCLType, Graphics, Controls, Forms,
-  Dialogs, StdCtrls, ComCtrls, Menus,
+  LMessages, LCLProc, LCLType, Graphics, Controls, Forms,
+  Dialogs, Menus,
  // LCL Carbon
   CarbonDef, CarbonGDIObjects, CarbonProc, CarbonDbgConsts;
   
@@ -67,7 +66,7 @@ type
     procedure Attach(AParentMenu: TCarbonMenu);
     procedure AttachToMenuBar;
 
-    procedure SetCaption(const ACaption: String);
+    procedure SetCaption(const {%H-}ACaption: String);
     procedure SetVisible(AVisible: Boolean);
     procedure SetEnable(AEnabled: Boolean);
     procedure SetBitmap(const ABitmap: TBitmap);
@@ -283,7 +282,7 @@ begin
   // menu item has sub menu - call click when opening
   if LCLMenuItem.IsInMenuBar or (LCLMenuItem.Count > 0) then
   begin
-    FillChar(Msg, SizeOf(Msg), 0);
+    FillChar(Msg{%H-}, SizeOf(Msg), 0);
     Msg.msg := LM_ACTIVATE;
     LCLMenuItem.Dispatch(Msg);
   end;
@@ -762,7 +761,7 @@ function TCarbonMenu.GetShortCutKey: AnsiChar;
 var
   KeyValue: UInt16;
 begin
-  if GetMenuItemCommandKey(FParentMenu.Menu, GetIndex + 1, False, KeyValue)<>noErr then
+  if GetMenuItemCommandKey(FParentMenu.Menu, GetIndex + 1, False, KeyValue{%H-})<>noErr then
     Result:=#0
   else
     Result:=AnsiChar(KeyValue);
diff --git a/lcl/interfaces/carbon/carbonproc.pp b/lcl/interfaces/carbon/carbonproc.pp
index 0d383ab2dc..26735dc2e9 100644
--- a/lcl/interfaces/carbon/carbonproc.pp
+++ b/lcl/interfaces/carbon/carbonproc.pp
@@ -35,7 +35,7 @@ interface
 
 uses
   MacOSAll,
-  Classes, SysUtils, Types, LCLType, LCLProc, LCLClasses, LMessages,
+  Classes, SysUtils, Types, LCLType, LCLProc,
   Controls, Forms, Graphics, Math, GraphType;
 
 function OSError(AResult: OSStatus; const AMethodName, ACallName: String;
@@ -648,7 +648,7 @@ end;
  ------------------------------------------------------------------------------}
 function GetCarbonThemeMetric(Metric: ThemeMetric; DefaultValue: Integer): Integer;
 begin
-  if OSError(GetThemeMetric(Metric, Result),
+  if OSError(GetThemeMetric(Metric, Result{%H-}),
     'GetCarbonThemeMetric', 'GetThemeMetric') then Result := DefaultValue;
 end;
 
@@ -701,7 +701,7 @@ var
   Data: Word;
   ControlSize: Integer;
 begin
-  FillChar(R, SizeOf(R), 0);
+  FillChar(R{%H-}, SizeOf(R), 0);
   GetControlBounds(Control, R);
   if ControlHeight then ControlSize := R.Bottom - R.Top
   else ControlSize := R.Right - R.Left;
@@ -731,7 +731,7 @@ var
   mp    : MacOSAll.point;
 begin
   Result := false;
-  if CreateEvent(kCFAllocatorDefault, kEventClassControl, kEventControlHitTest, 0, 0, event) <> noErr then
+  if CreateEvent(kCFAllocatorDefault, kEventClassControl, kEventControlHitTest, 0, 0, event{%H-}) <> noErr then
     Exit;
   mp.h := X;
   mp.v := Y;
@@ -814,7 +814,7 @@ begin
     StrRange.length := CFStringGetLength(AString);
     
     CFStringGetBytes(AString, StrRange, Encoding,
-      Ord('?'), False, nil, 0, StrSize);
+      Ord('?'), False, nil, 0, StrSize{%H-});
     SetLength(Result, StrSize);
 
     if StrSize > 0 then
@@ -1294,7 +1294,7 @@ end;
  ------------------------------------------------------------------------------}
 function CustomControlHandler(ANextHandler: EventHandlerCallRef;
   AEvent: EventRef;
-  AData: Pointer): OSStatus; {$IFDEF darwin}mwpascal;{$ENDIF}
+  {%H-}AData: Pointer): OSStatus; {$IFDEF darwin}mwpascal;{$ENDIF}
 var
   EventClass, EventKind: LongWord;
   Part: ControlPartCode;
@@ -1340,7 +1340,7 @@ var
   sz  : SInt16;
 begin
   //Note: the GetThemeFont is deprecated in 10.5. CoreText functions should be used!
-  MacOSAll.GetThemeFont(kThemeSystemFont, GetApplicationScript, @s, sz, st);
+  MacOSAll.GetThemeFont(kThemeSystemFont, GetApplicationScript, @s, sz{%H-{%H-}}, st);
   CarbonDefaultFont := s;
   CarbonDefaultFontSize := sz;
 end;
diff --git a/lcl/interfaces/carbon/carbonwsarrow.pp b/lcl/interfaces/carbon/carbonwsarrow.pp
index e5c585170f..c12a7ae26d 100644
--- a/lcl/interfaces/carbon/carbonwsarrow.pp
+++ b/lcl/interfaces/carbon/carbonwsarrow.pp
@@ -43,8 +43,8 @@ type
 
   TCarbonWSArrow = class(TWSArrow)
   published
-    class procedure SetType(const AArrow: TArrow; const AArrowType: TArrowType;
-      const AShadowType: TShadowType); override;
+    class procedure SetType(const {%H-}AArrow: TArrow; const {%H-}AArrowType: TArrowType;
+      const {%H-}AShadowType: TShadowType); override;
   end;
 
 
diff --git a/lcl/interfaces/carbon/glgrab.pas b/lcl/interfaces/carbon/glgrab.pas
index e5124cb880..88bf3f0732 100644
--- a/lcl/interfaces/carbon/glgrab.pas
+++ b/lcl/interfaces/carbon/glgrab.pas
@@ -60,8 +60,8 @@ begin
 
   while ( top < bottom ) do
   begin
-        topP := Pointer((top * rowBytes) + PtrInt(base));
-        bottomP := Pointer((bottom * rowBytes) + PtrInt(base));
+        topP := {%H-}Pointer((top * rowBytes) + {%H-}PtrInt(base));
+        bottomP := {%H-}Pointer((bottom * rowBytes) + {%H-}PtrInt(base));
 
         {
          * Save and swap scanlines.
@@ -103,7 +103,6 @@ var
   data: Pointer;
   bytewidth: Longint;
   width, height: GLint;
-  bytes: Longint;
   cSpace: CGColorSpaceRef;
 
   glContextObj: CGLContextObj;
@@ -147,7 +146,7 @@ begin
 
     bytewidth := width * 4; // Assume 4 bytes/pixel for now
     bytewidth := (bytewidth + 3) and (not 3); // Align to 4 bytes
-    bytes := bytewidth * height; // width * height
+    //bytes := bytewidth * height; // width * height
 
     { Build bitmap context }
     data := System.GetMem(height * bytewidth);
diff --git a/lcl/interfaces/carbon/objc/error.inc b/lcl/interfaces/carbon/objc/error.inc
index e350104880..2f724d68da 100644
--- a/lcl/interfaces/carbon/objc/error.inc
+++ b/lcl/interfaces/carbon/objc/error.inc
@@ -112,7 +112,7 @@ procedure _NXRaiseError(code: cint; const data1, data2: Pointer); cdecl; externa
 #endif}
 
 
-procedure NX_RAISE(code: cint; const data1, data2: Pointer);
+procedure NX_RAISE({%H-}code: cint; const {%H-}data1, {%H-}data2: Pointer);
 
 procedure NX_RERAISE();
 
diff --git a/lcl/interfaces/carbon/objc/lobjc.pas b/lcl/interfaces/carbon/objc/lobjc.pas
index 8531321c89..c040fe1cd3 100644
--- a/lcl/interfaces/carbon/objc/lobjc.pas
+++ b/lcl/interfaces/carbon/objc/lobjc.pas
@@ -19,7 +19,7 @@ unit lobjc;
 
 interface
 
-uses ctypes, unix;
+uses unix;
 
 {$include lobjc-api.inc}
 {$include lobjc.inc}
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSBitmapImageRep.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSBitmapImageRep.inc
index eb00262268..5913f2f529 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSBitmapImageRep.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSBitmapImageRep.inc
@@ -298,32 +298,32 @@ end;
 
 function NSBitmapImageRep.isPlanar: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_isPlanar)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_isPlanar)), []));
 end;
 
 function NSBitmapImageRep.samplesPerPixel: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_samplesPerPixel)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_samplesPerPixel)), []));
 end;
 
 function NSBitmapImageRep.bitsPerPixel: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_bitsPerPixel)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_bitsPerPixel)), []));
 end;
 
 function NSBitmapImageRep.bytesPerRow: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_bytesPerRow)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_bytesPerRow)), []));
 end;
 
 function NSBitmapImageRep.bytesPerPlane: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_bytesPerPlane)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_bytesPerPlane)), []));
 end;
 
 function NSBitmapImageRep.numberOfPlanes: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_numberOfPlanes)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSBitmapImageRep_numberOfPlanes)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4}
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSButton.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSButton.inc
index ba25278b8b..f165cc9daa 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSButton.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSButton.inc
@@ -220,7 +220,7 @@ end;
 
 function NSButton.state: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_state)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_state)), []));
 end;
 
 procedure NSButton.setState(_value: Integer);
@@ -235,7 +235,7 @@ end;
 
 function NSButton.isBordered: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_isBordered)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_isBordered)), []));
 end;
 
 procedure NSButton.setBordered(_flag: LongBool);
@@ -250,7 +250,7 @@ end;
 
 function NSButton.isTransparent: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_isTransparent)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_isTransparent)), []));
 end;
 
 procedure NSButton.setTransparent(_flag: LongBool);
@@ -300,7 +300,7 @@ end;
 
 function NSButton.keyEquivalentModifierMask: LongWord;
 begin
-  Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_keyEquivalentModifierMask)), []));
+  Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_keyEquivalentModifierMask)), []));
 end;
 
 procedure NSButton.setKeyEquivalentModifierMask(_mask: LongWord);
@@ -400,7 +400,7 @@ end;
 
 function NSButton.allowsMixedState: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_allowsMixedState)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_allowsMixedState)), []));
 end;
 
 procedure NSButton.setNextState;
@@ -420,7 +420,7 @@ end;
 
 function NSButton.showsBorderOnlyWhileMouseInside: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_showsBorderOnlyWhileMouseInside)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSButton_showsBorderOnlyWhileMouseInside)), []));
 end;
 
 procedure NSButton.setSound(_aSound: lobjc.id {NSSound});
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSColor.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSColor.inc
index 7a7dca6dee..0703185034 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSColor.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSColor.inc
@@ -1188,7 +1188,7 @@ end;
 
 function NSColor.numberOfComponents: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSColor_numberOfComponents)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSColor_numberOfComponents)), []));
 end;
 
 procedure NSColor.getComponents(_components: Single);
@@ -1265,7 +1265,7 @@ end;
 
 class function NSColor.ignoresAlpha: LongBool;
 begin
-  Result := LongBool(objc_msgSend(getClass, sel_registerName(PChar(StrNSColor_ignoresAlpha)), []));
+  Result := {%H-}LongBool(objc_msgSend(getClass, sel_registerName(PChar(StrNSColor_ignoresAlpha)), []));
 end;
 
 constructor NSColor.colorWithCIColor(_color: lobjc.id {CIColor});
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSControl.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSControl.inc
index a7a33a3ab6..4d9adcb112 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSControl.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSControl.inc
@@ -270,7 +270,7 @@ end;
 
 function NSControl.tag: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_tag)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_tag)), []));
 end;
 
 procedure NSControl.setTag(_anInt: Integer);
@@ -285,7 +285,7 @@ end;
 
 function NSControl.selectedTag: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_selectedTag)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_selectedTag)), []));
 end;
 
 procedure NSControl.setIgnoresMultiClick(_flag: LongBool);
@@ -300,7 +300,7 @@ end;
 
 function NSControl.ignoresMultiClick: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_ignoresMultiClick)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_ignoresMultiClick)), []));
 end;
 
 function NSControl.sendActionOn(_mask: Integer): Integer;
@@ -315,7 +315,7 @@ end;
 
 function NSControl.isContinuous: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_isContinuous)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_isContinuous)), []));
 end;
 
 procedure NSControl.setContinuous(_flag: LongBool);
@@ -330,7 +330,7 @@ end;
 
 function NSControl.isEnabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_isEnabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_isEnabled)), []));
 end;
 
 procedure NSControl.setEnabled(_flag: LongBool);
@@ -460,7 +460,7 @@ end;
 
 function NSControl.intValue: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_intValue)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_intValue)), []));
 end;
 
 function NSControl.floatValue: Single;
@@ -595,7 +595,7 @@ end;
 
 function NSControl.abortEditing: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_abortEditing)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_abortEditing)), []));
 end;
 
 procedure NSControl.validateEditing;
@@ -647,7 +647,7 @@ end;
 
 function NSControl.refusesFirstResponder: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_refusesFirstResponder)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSControl_refusesFirstResponder)), []));
 end;
 
 function NSControl.attributedStringValue: lobjc.id;
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSFont.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSFont.inc
index e56a77a417..635470dd31 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSFont.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSFont.inc
@@ -239,9 +239,9 @@ const
   StrNSFont_isFixedPitch = 'isFixedPitch';
   StrNSFont_boundingRectForGlyph = 'boundingRectForGlyph:';
   StrNSFont_advancementForGlyph = 'advancementForGlyph:';
-  StrNSFont_getBoundingRects_forGlyphs_count = 'getBoundingRects:forGlyphs:count:';
-  StrNSFont_getAdvancements_forGlyphs_count = 'getAdvancements:forGlyphs:count:';
-  StrNSFont_getAdvancements_forPackedGlyphs_length = 'getAdvancements:forPackedGlyphs:length:';
+  {%H-}StrNSFont_getBoundingRects_forGlyphs_count = 'getBoundingRects:forGlyphs:count:';
+  {%H-}StrNSFont_getAdvancements_forGlyphs_count = 'getAdvancements:forGlyphs:count:';
+  {%H-}StrNSFont_getAdvancements_forPackedGlyphs_length = 'getAdvancements:forPackedGlyphs:length:';
   StrNSFont_set = 'set';
   StrNSFont_setInContext = 'setInContext:';
   StrNSFont_printerFont = 'printerFont';
@@ -264,7 +264,7 @@ const
   StrNSFont_positionOfGlyph_struckOverGlyph_metricsExist = 'positionOfGlyph:struckOverGlyph:metricsExist:';
   StrNSFont_positionOfGlyph_struckOverRect_metricsExist = 'positionOfGlyph:struckOverRect:metricsExist:';
   StrNSFont_positionOfGlyph_forCharacter_struckOverRect = 'positionOfGlyph:forCharacter:struckOverRect:';
-  StrNSFont_positionOfGlyph_withRelation_toBaseGlyph_totalAdvancement_metricsExist = 'positionOfGlyph:withRelation:toBaseGlyph:totalAdvancement:metricsExist:';
+  {%H-}StrNSFont_positionOfGlyph_withRelation_toBaseGlyph_totalAdvancement_metricsExist = 'positionOfGlyph:withRelation:toBaseGlyph:totalAdvancement:metricsExist:';
 
 { NSFont }
 
@@ -532,12 +532,12 @@ end;
 
 function NSFont.numberOfGlyphs: LongWord;
 begin
-  Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSFont_numberOfGlyphs)), []));
+  Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSFont_numberOfGlyphs)), []));
 end;
 
 function NSFont.mostCompatibleStringEncoding: NSStringEncoding;
 begin
-  Result := NSStringEncoding(objc_msgSend(Handle, sel_registerName(PChar(StrNSFont_mostCompatibleStringEncoding)), []));
+  Result := {%H-}NSStringEncoding(objc_msgSend(Handle, sel_registerName(PChar(StrNSFont_mostCompatibleStringEncoding)), []));
 end;
 
 function NSFont.glyphWithName(_aName: CFStringRef): NSGlyph;
@@ -607,7 +607,7 @@ end;
 
 function NSFont.isFixedPitch: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFont_isFixedPitch)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFont_isFixedPitch)), []));
 end;
 
 function NSFont.boundingRectForGlyph(_aGlyph: NSGlyph): NSRect;
@@ -722,7 +722,7 @@ end;
 
 function NSFont.isBaseFont: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFont_isBaseFont)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFont_isBaseFont)), []));
 end;
 
 function NSFont.afmDictionary: CFDictionaryRef;
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSFontManager.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSFontManager.inc
index 3e3cde8698..2d174f6770 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSFontManager.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSFontManager.inc
@@ -229,7 +229,7 @@ end;
 
 function NSFontManager.isMultiple: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFontManager_isMultiple)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFontManager_isMultiple)), []));
 end;
 
 function NSFontManager.selectedFont: lobjc.id;
@@ -399,7 +399,7 @@ end;
 
 function NSFontManager.isEnabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFontManager_isEnabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFontManager_isEnabled)), []));
 end;
 
 procedure NSFontManager.setEnabled_(_flag: LongBool);
@@ -429,7 +429,7 @@ end;
 
 function NSFontManager.sendAction: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFontManager_sendAction)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSFontManager_sendAction)), []));
 end;
 
 procedure NSFontManager.setDelegate_(_anObject: lobjc.id);
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSImage.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSImage.inc
index cca35b0a1c..0baf7ecbb7 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSImage.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSImage.inc
@@ -353,7 +353,7 @@ end;
 
 function NSImage.scalesWhenResized: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_scalesWhenResized)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_scalesWhenResized)), []));
 end;
 
 procedure NSImage.setDataRetained(_flag: LongBool);
@@ -368,7 +368,7 @@ end;
 
 function NSImage.isDataRetained: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_isDataRetained)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_isDataRetained)), []));
 end;
 
 procedure NSImage.setCachedSeparately(_flag: LongBool);
@@ -383,7 +383,7 @@ end;
 
 function NSImage.isCachedSeparately: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_isCachedSeparately)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_isCachedSeparately)), []));
 end;
 
 procedure NSImage.setCacheDepthMatchesImageDepth(_flag: LongBool);
@@ -398,7 +398,7 @@ end;
 
 function NSImage.cacheDepthMatchesImageDepth: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_cacheDepthMatchesImageDepth)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_cacheDepthMatchesImageDepth)), []));
 end;
 
 procedure NSImage.setBackgroundColor(_aColor: lobjc.id {NSColor});
@@ -428,7 +428,7 @@ end;
 
 function NSImage.usesEPSOnResolutionMismatch: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_usesEPSOnResolutionMismatch)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_usesEPSOnResolutionMismatch)), []));
 end;
 
 procedure NSImage.setPrefersColorMatch(_flag: LongBool);
@@ -443,7 +443,7 @@ end;
 
 function NSImage.prefersColorMatch: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_prefersColorMatch)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_prefersColorMatch)), []));
 end;
 
 procedure NSImage.setMatchesOnMultipleResolution(_flag: LongBool);
@@ -458,7 +458,7 @@ end;
 
 function NSImage.matchesOnMultipleResolution: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_matchesOnMultipleResolution)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_matchesOnMultipleResolution)), []));
 end;
 
 procedure NSImage.dissolveToPoint_fraction(_point: NSPoint; _aFloat: Single);
@@ -608,7 +608,7 @@ end;
 
 function NSImage.isValid: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_isValid)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_isValid)), []));
 end;
 
 procedure NSImage.lockFocus;
@@ -698,7 +698,7 @@ end;
 
 function NSImage.isFlipped: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_isFlipped)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImage_isFlipped)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2}
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSImageRep.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSImageRep.inc
index df8317a186..2db6dfc38c 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSImageRep.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSImageRep.inc
@@ -151,7 +151,7 @@ end;
 
 function NSImageRep.draw: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_draw)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_draw)), []));
 end;
 
 function NSImageRep.drawAtPoint(_point: NSPoint): LongBool;
@@ -201,7 +201,7 @@ end;
 
 function NSImageRep.hasAlpha: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_hasAlpha)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_hasAlpha)), []));
 end;
 
 procedure NSImageRep.setOpaque(_flag: LongBool);
@@ -216,7 +216,7 @@ end;
 
 function NSImageRep.isOpaque: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_isOpaque)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_isOpaque)), []));
 end;
 
 procedure NSImageRep.setColorSpaceName(__string: CFStringRef);
@@ -246,7 +246,7 @@ end;
 
 function NSImageRep.bitsPerSample: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_bitsPerSample)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_bitsPerSample)), []));
 end;
 
 procedure NSImageRep.setPixelsWide(_anInt: Integer);
@@ -261,7 +261,7 @@ end;
 
 function NSImageRep.pixelsWide: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_pixelsWide)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_pixelsWide)), []));
 end;
 
 procedure NSImageRep.setPixelsHigh(_anInt: Integer);
@@ -276,7 +276,7 @@ end;
 
 function NSImageRep.pixelsHigh: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_pixelsHigh)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSImageRep_pixelsHigh)), []));
 end;
 
 class procedure NSImageRep.registerImageRepClass(_imageRepClass: _Class);
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSMenu.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSMenu.inc
index 5bf7e77345..8b8177f8f7 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSMenu.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSMenu.inc
@@ -230,7 +230,7 @@ end;
 
 class function NSMenu.menuBarVisible: LongBool;
 begin
-  Result := LongBool(objc_msgSend(getClass, sel_registerName(PChar(StrNSMenu_menuBarVisible)), []));
+  Result := {%H-}LongBool(objc_msgSend(getClass, sel_registerName(PChar(StrNSMenu_menuBarVisible)), []));
 end;
 
 {.$endif}
@@ -353,7 +353,7 @@ end;
 
 function NSMenu.numberOfItems: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_numberOfItems)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_numberOfItems)), []));
 end;
 
 function NSMenu.indexOfItem(__index: lobjc.id): Integer;
@@ -458,7 +458,7 @@ end;
 
 function NSMenu.autoenablesItems: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_autoenablesItems)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_autoenablesItems)), []));
 end;
 
 function NSMenu.performKeyEquivalent(_theEvent: lobjc.id {NSEvent}): LongBool;
@@ -488,7 +488,7 @@ end;
 
 function NSMenu.menuChangedMessagesEnabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_menuChangedMessagesEnabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_menuChangedMessagesEnabled)), []));
 end;
 
 procedure NSMenu.itemChanged(_item: lobjc.id);
@@ -558,7 +558,7 @@ end;
 
 function NSMenu.isTornOff: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_isTornOff)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_isTornOff)), []));
 end;
 
 function NSMenu.attachedMenu: lobjc.id;
@@ -568,7 +568,7 @@ end;
 
 function NSMenu.isAttached: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_isAttached)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenu_isAttached)), []));
 end;
 
 procedure NSMenu.sizeToFit;
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSMenuItem.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSMenuItem.inc
index 0ea411f444..2c666f0f14 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSMenuItem.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSMenuItem.inc
@@ -240,7 +240,7 @@ end;
 
 class function NSMenuItem.usesUserKeyEquivalents: LongBool;
 begin
-  Result := LongBool(objc_msgSend(getClass, sel_registerName(PChar(StrNSMenuItem_usesUserKeyEquivalents)), []));
+  Result := {%H-}LongBool(objc_msgSend(getClass, sel_registerName(PChar(StrNSMenuItem_usesUserKeyEquivalents)), []));
 end;
 
 constructor NSMenuItem.separatorItem;
@@ -283,7 +283,7 @@ end;
 
 function NSMenuItem.hasSubmenu: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_hasSubmenu)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_hasSubmenu)), []));
 end;
 
 procedure NSMenuItem.setSubmenu(_submenu: lobjc.id {NSMenu});
@@ -335,7 +335,7 @@ end;
 {.$endif}
 function NSMenuItem.isSeparatorItem: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_isSeparatorItem)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_isSeparatorItem)), []));
 end;
 
 procedure NSMenuItem.setKeyEquivalent(_aKeyEquivalent: CFStringRef);
@@ -365,7 +365,7 @@ end;
 
 function NSMenuItem.keyEquivalentModifierMask: LongWord;
 begin
-  Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_keyEquivalentModifierMask)), []));
+  Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_keyEquivalentModifierMask)), []));
 end;
 
 function NSMenuItem.userKeyEquivalent: CFStringRef;
@@ -385,7 +385,7 @@ end;
 
 function NSMenuItem.mnemonicLocation: LongWord;
 begin
-  Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_mnemonicLocation)), []));
+  Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_mnemonicLocation)), []));
 end;
 
 function NSMenuItem.mnemonic: CFStringRef;
@@ -430,7 +430,7 @@ end;
 
 function NSMenuItem.state: NSCellStateValue;
 begin
-  Result := NSCellStateValue(Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_state)), [])));
+  Result := NSCellStateValue({%H-}{%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_state)), [])));
 end;
 
 procedure NSMenuItem.setOnStateImage(_image: lobjc.id {NSImage});
@@ -490,7 +490,7 @@ end;
 
 function NSMenuItem.isEnabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_isEnabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_isEnabled)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3}
@@ -506,7 +506,7 @@ end;
 
 function NSMenuItem.isAlternate: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_isAlternate)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_isAlternate)), []));
 end;
 
 procedure NSMenuItem.setIndentationLevel(_indentationLevel: Integer);
@@ -521,7 +521,7 @@ end;
 
 function NSMenuItem.indentationLevel: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_indentationLevel)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_indentationLevel)), []));
 end;
 
 {.$endif}
@@ -567,7 +567,7 @@ end;
 
 function NSMenuItem.tag: PtrInt;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_tag)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSMenuItem_tag)), []));
 end;
 
 procedure NSMenuItem.setRepresentedObject(_anObject: lobjc.id);
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSOpenPanel.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSOpenPanel.inc
index af2379c184..a8d99c173f 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSOpenPanel.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSOpenPanel.inc
@@ -103,7 +103,7 @@ end;
 
 function NSOpenPanel.resolvesAliases: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSOpenPanel_resolvesAliases)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSOpenPanel_resolvesAliases)), []));
 end;
 
 procedure NSOpenPanel.setResolvesAliases(_flag: LongBool);
@@ -118,7 +118,7 @@ end;
 
 function NSOpenPanel.canChooseDirectories: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSOpenPanel_canChooseDirectories)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSOpenPanel_canChooseDirectories)), []));
 end;
 
 procedure NSOpenPanel.setCanChooseDirectories(_flag: LongBool);
@@ -133,7 +133,7 @@ end;
 
 function NSOpenPanel.allowsMultipleSelection: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSOpenPanel_allowsMultipleSelection)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSOpenPanel_allowsMultipleSelection)), []));
 end;
 
 procedure NSOpenPanel.setAllowsMultipleSelection(_flag: LongBool);
@@ -148,7 +148,7 @@ end;
 
 function NSOpenPanel.canChooseFiles: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSOpenPanel_canChooseFiles)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSOpenPanel_canChooseFiles)), []));
 end;
 
 procedure NSOpenPanel.setCanChooseFiles(_flag: LongBool);
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSPanel.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSPanel.inc
index ef5dc05199..ed55d76b54 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSPanel.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSPanel.inc
@@ -102,7 +102,7 @@ end;
 
 function NSPanel.isFloatingPanel: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSPanel_isFloatingPanel)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSPanel_isFloatingPanel)), []));
 end;
 
 procedure NSPanel.setFloatingPanel(_flag: LongBool);
@@ -117,7 +117,7 @@ end;
 
 function NSPanel.becomesKeyOnlyIfNeeded: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSPanel_becomesKeyOnlyIfNeeded)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSPanel_becomesKeyOnlyIfNeeded)), []));
 end;
 
 procedure NSPanel.setBecomesKeyOnlyIfNeeded(_flag: LongBool);
@@ -132,7 +132,7 @@ end;
 
 function NSPanel.worksWhenModal: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSPanel_worksWhenModal)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSPanel_worksWhenModal)), []));
 end;
 
 procedure NSPanel.setWorksWhenModal(_flag: LongBool);
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSSavePanel.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSSavePanel.inc
index 1296c1e0e0..c815d2119b 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSSavePanel.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSSavePanel.inc
@@ -220,7 +220,7 @@ end;
 
 function NSSavePanel.allowsOtherFileTypes: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_allowsOtherFileTypes)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_allowsOtherFileTypes)), []));
 end;
 
 procedure NSSavePanel.setAllowsOtherFileTypes(_flag: LongBool);
@@ -268,13 +268,13 @@ end;
 
 function NSSavePanel.isExpanded: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_isExpanded)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_isExpanded)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3}
 function NSSavePanel.canCreateDirectories: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_canCreateDirectories)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_canCreateDirectories)), []));
 end;
 
 procedure NSSavePanel.setCanCreateDirectories(_flag: LongBool);
@@ -291,7 +291,7 @@ end;
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3}
 function NSSavePanel.canSelectHiddenExtension: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_canSelectHiddenExtension)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_canSelectHiddenExtension)), []));
 end;
 
 {.$endif}
@@ -307,7 +307,7 @@ end;
 
 function NSSavePanel.isExtensionHidden: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_isExtensionHidden)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_isExtensionHidden)), []));
 end;
 
 procedure NSSavePanel.setExtensionHidden(_flag: LongBool);
@@ -322,7 +322,7 @@ end;
 
 function NSSavePanel.treatsFilePackagesAsDirectories: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_treatsFilePackagesAsDirectories)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_treatsFilePackagesAsDirectories)), []));
 end;
 
 procedure NSSavePanel.setTreatsFilePackagesAsDirectories(_flag: LongBool);
@@ -456,7 +456,7 @@ end;
 
 function NSSavePanel.runModal: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_runModal)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSSavePanel_runModal)), []));
 end;
 
 {$endif}
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSStatusBar.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSStatusBar.inc
index 8bbf519ceb..9971d9577e 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSStatusBar.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSStatusBar.inc
@@ -91,7 +91,7 @@ end;
 
 function NSStatusBar.isVertical: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSStatusBar_isVertical)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSStatusBar_isVertical)), []));
 end;
 
 function NSStatusBar.thickness: Single;
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSStatusItem.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSStatusItem.inc
index ba7fc29774..0d0ab74a26 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSStatusItem.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSStatusItem.inc
@@ -264,7 +264,7 @@ end;
 
 function NSStatusItem.isEnabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSStatusItem_isEnabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSStatusItem_isEnabled)), []));
 end;
 
 procedure NSStatusItem.setEnabled(_enabled: LongBool);
@@ -304,7 +304,7 @@ end;
 
 function NSStatusItem.highlightMode: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSStatusItem_highlightMode)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSStatusItem_highlightMode)), []));
 end;
 
 procedure NSStatusItem.sendActionOn(_mask: Integer);
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSText.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSText.inc
index 3a5debbe7b..d6fcdeb7c0 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSText.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSText.inc
@@ -348,7 +348,7 @@ end;
 
 function NSText.isEditable: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isEditable)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isEditable)), []));
 end;
 
 procedure NSText.setEditable(_flag: LongBool);
@@ -363,7 +363,7 @@ end;
 
 function NSText.isSelectable: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isSelectable)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isSelectable)), []));
 end;
 
 procedure NSText.setSelectable(_flag: LongBool);
@@ -378,7 +378,7 @@ end;
 
 function NSText.isRichText: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isRichText)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isRichText)), []));
 end;
 
 procedure NSText.setRichText(_flag: LongBool);
@@ -393,7 +393,7 @@ end;
 
 function NSText.importsGraphics: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_importsGraphics)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_importsGraphics)), []));
 end;
 
 procedure NSText.setImportsGraphics(_flag: LongBool);
@@ -433,7 +433,7 @@ end;
 
 function NSText.drawsBackground: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_drawsBackground)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_drawsBackground)), []));
 end;
 
 procedure NSText.setFont(_obj: lobjc.id {NSFont});
@@ -510,7 +510,7 @@ end;
 
 function NSText.isFieldEditor: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isFieldEditor)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isFieldEditor)), []));
 end;
 
 procedure NSText.setTextColor_range(_color: lobjc.id {NSColor}; _range: NSRange);
@@ -535,7 +535,7 @@ end;
 
 function NSText.usesFontPanel: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_usesFontPanel)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_usesFontPanel)), []));
 end;
 
 procedure NSText.setUsesFontPanel(_flag: LongBool);
@@ -580,7 +580,7 @@ end;
 
 function NSText.isHorizontallyResizable: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isHorizontallyResizable)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isHorizontallyResizable)), []));
 end;
 
 procedure NSText.setHorizontallyResizable(_flag: LongBool);
@@ -595,7 +595,7 @@ end;
 
 function NSText.isVerticallyResizable: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isVerticallyResizable)), []));
+  Result := {%H-}{%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isVerticallyResizable)), []));
 end;
 
 procedure NSText.setVerticallyResizable(_flag: LongBool);
@@ -815,7 +815,7 @@ end;
 
 function NSText.isRulerVisible: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isRulerVisible)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSText_isRulerVisible)), []));
 end;
 
 function NSText.selectedRange: NSRange;
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSTextField.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSTextField.inc
index fc336c16be..76516a8d01 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSTextField.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSTextField.inc
@@ -141,7 +141,7 @@ end;
 
 function NSTextField.drawsBackground: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_drawsBackground)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_drawsBackground)), []));
 end;
 
 procedure NSTextField.setTextColor(_color: lobjc.id {NSColor});
@@ -161,7 +161,7 @@ end;
 
 function NSTextField.isBordered: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_isBordered)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_isBordered)), []));
 end;
 
 procedure NSTextField.setBordered(_flag: LongBool);
@@ -176,7 +176,7 @@ end;
 
 function NSTextField.isBezeled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_isBezeled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_isBezeled)), []));
 end;
 
 procedure NSTextField.setBezeled(_flag: LongBool);
@@ -191,7 +191,7 @@ end;
 
 function NSTextField.isEditable: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_isEditable)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_isEditable)), []));
 end;
 
 procedure NSTextField.setEditable(_flag: LongBool);
@@ -206,7 +206,7 @@ end;
 
 function NSTextField.isSelectable: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_isSelectable)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_isSelectable)), []));
 end;
 
 procedure NSTextField.setSelectable(_flag: LongBool);
@@ -296,7 +296,7 @@ end;
 
 function NSTextField.acceptsFirstResponder: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_acceptsFirstResponder)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_acceptsFirstResponder)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2}
@@ -328,7 +328,7 @@ end;
 
 function NSTextField.allowsEditingTextAttributes: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_allowsEditingTextAttributes)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_allowsEditingTextAttributes)), []));
 end;
 
 procedure NSTextField.setAllowsEditingTextAttributes(_flag: LongBool);
@@ -343,7 +343,7 @@ end;
 
 function NSTextField.importsGraphics: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_importsGraphics)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextField_importsGraphics)), []));
 end;
 
 procedure NSTextField.setImportsGraphics(_flag: LongBool);
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSTextFieldCell.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSTextFieldCell.inc
index fae3fdab09..32fa694c27 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSTextFieldCell.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSTextFieldCell.inc
@@ -118,7 +118,7 @@ end;
 
 function NSTextFieldCell.drawsBackground: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextFieldCell_drawsBackground)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextFieldCell_drawsBackground)), []));
 end;
 
 procedure NSTextFieldCell.setTextColor(_color: lobjc.id {NSColor});
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSTextView.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSTextView.inc
index 539e52f637..946de6f7c1 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSTextView.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSTextView.inc
@@ -958,7 +958,7 @@ end;
 
 function NSTextView.shouldDrawInsertionPoint: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_shouldDrawInsertionPoint)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_shouldDrawInsertionPoint)), []));
 end;
 
 procedure NSTextView.drawInsertionPointInRect_color_turnedOn(_rect: NSRect; _color: lobjc.id {NSColor}; _flag: LongBool);
@@ -1208,7 +1208,7 @@ end;
 
 function NSTextView.acceptsGlyphInfo: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_acceptsGlyphInfo)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_acceptsGlyphInfo)), []));
 end;
 
 procedure NSTextView.setAcceptsGlyphInfo(_flag: LongBool);
@@ -1358,7 +1358,7 @@ end;
 
 function NSTextView.usesRuler: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_usesRuler)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_usesRuler)), []));
 end;
 
 procedure NSTextView.setUsesRuler(_flag: LongBool);
@@ -1383,7 +1383,7 @@ end;
 
 function NSTextView.isContinuousSpellCheckingEnabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isContinuousSpellCheckingEnabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isContinuousSpellCheckingEnabled)), []));
 end;
 
 procedure NSTextView.toggleContinuousSpellChecking(_sender: lobjc.id);
@@ -1398,7 +1398,7 @@ end;
 
 function NSTextView.spellCheckerDocumentTag: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_spellCheckerDocumentTag)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_spellCheckerDocumentTag)), []));
 end;
 
 function NSTextView.typingAttributes: CFDictionaryRef;
@@ -1483,7 +1483,7 @@ end;
 
 function NSTextView.usesFindPanel: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_usesFindPanel)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_usesFindPanel)), []));
 end;
 
 procedure NSTextView.setAllowsDocumentBackgroundColorChange(_flag: LongBool);
@@ -1498,7 +1498,7 @@ end;
 
 function NSTextView.allowsDocumentBackgroundColorChange: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_allowsDocumentBackgroundColorChange)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_allowsDocumentBackgroundColorChange)), []));
 end;
 
 procedure NSTextView.setDefaultParagraphStyle(_paragraphStyle: lobjc.id {NSParagraphStyle});
@@ -1524,7 +1524,7 @@ end;
 
 function NSTextView.isSelectable: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isSelectable)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isSelectable)), []));
 end;
 
 procedure NSTextView.setSelectable(_flag: LongBool);
@@ -1539,7 +1539,7 @@ end;
 
 function NSTextView.isEditable: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isEditable)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isEditable)), []));
 end;
 
 procedure NSTextView.setEditable(_flag: LongBool);
@@ -1554,7 +1554,7 @@ end;
 
 function NSTextView.isRichText: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isRichText)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isRichText)), []));
 end;
 
 procedure NSTextView.setRichText(_flag: LongBool);
@@ -1569,7 +1569,7 @@ end;
 
 function NSTextView.importsGraphics: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_importsGraphics)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_importsGraphics)), []));
 end;
 
 procedure NSTextView.setImportsGraphics(_flag: LongBool);
@@ -1599,7 +1599,7 @@ end;
 
 function NSTextView.isFieldEditor: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isFieldEditor)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isFieldEditor)), []));
 end;
 
 procedure NSTextView.setFieldEditor(_flag: LongBool);
@@ -1614,7 +1614,7 @@ end;
 
 function NSTextView.usesFontPanel: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_usesFontPanel)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_usesFontPanel)), []));
 end;
 
 procedure NSTextView.setUsesFontPanel(_flag: LongBool);
@@ -1629,7 +1629,7 @@ end;
 
 function NSTextView.isRulerVisible: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isRulerVisible)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_isRulerVisible)), []));
 end;
 
 procedure NSTextView.setBackgroundColor(_color: lobjc.id {NSColor});
@@ -1659,7 +1659,7 @@ end;
 
 function NSTextView.drawsBackground: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_drawsBackground)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_drawsBackground)), []));
 end;
 
 procedure NSTextView.setSelectedRange(_charRange: NSRange);
@@ -1674,7 +1674,7 @@ end;
 
 function NSTextView.allowsUndo: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_allowsUndo)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_allowsUndo)), []));
 end;
 
 procedure NSTextView.setAllowsUndo(_flag: LongBool);
@@ -1689,17 +1689,17 @@ end;
 
 function NSTextView.resignFirstResponder: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_resignFirstResponder)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_resignFirstResponder)), []));
 end;
 
 function NSTextView.becomeFirstResponder: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_becomeFirstResponder)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_becomeFirstResponder)), []));
 end;
 
 function NSTextView.smartInsertDeleteEnabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_smartInsertDeleteEnabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSTextView_smartInsertDeleteEnabled)), []));
 end;
 
 procedure NSTextView.setSmartInsertDeleteEnabled(_flag: LongBool);
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSToolbar.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSToolbar.inc
index 092b65e247..0bebd2a152 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSToolbar.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSToolbar.inc
@@ -219,7 +219,7 @@ end;
 
 function NSToolbar.isVisible: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_isVisible)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_isVisible)), []));
 end;
 
 procedure NSToolbar.runCustomizationPalette(_sender: lobjc.id);
@@ -234,7 +234,7 @@ end;
 
 function NSToolbar.customizationPaletteIsRunning: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_customizationPaletteIsRunning)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_customizationPaletteIsRunning)), []));
 end;
 
 procedure NSToolbar.setDisplayMode(_displayMode: NSToolbarDisplayMode);
@@ -299,7 +299,7 @@ end;
 
 function NSToolbar.showsBaselineSeparator: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_showsBaselineSeparator)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_showsBaselineSeparator)), []));
 end;
 
 {.$endif}
@@ -315,7 +315,7 @@ end;
 
 function NSToolbar.allowsUserCustomization: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_allowsUserCustomization)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_allowsUserCustomization)), []));
 end;
 
 function NSToolbar.identifier: CFStringRef;
@@ -345,7 +345,7 @@ end;
 
 function NSToolbar.autosavesConfiguration: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_autosavesConfiguration)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbar_autosavesConfiguration)), []));
 end;
 
 procedure NSToolbar.setConfigurationFromDictionary(_configDict: CFDictionaryRef);
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSToolbarItem.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSToolbarItem.inc
index bb75a5ec6c..d5e38b0547 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSToolbarItem.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSToolbarItem.inc
@@ -269,7 +269,7 @@ end;
 
 function NSToolbarItem.tag: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_tag)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_tag)), []));
 end;
 
 procedure NSToolbarItem.setTarget(_target: lobjc.id);
@@ -314,7 +314,7 @@ end;
 
 function NSToolbarItem.isEnabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_isEnabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_isEnabled)), []));
 end;
 
 procedure NSToolbarItem.setImage(_image: lobjc.id {NSImage});
@@ -390,7 +390,7 @@ end;
 
 function NSToolbarItem.visibilityPriority: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_visibilityPriority)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_visibilityPriority)), []));
 end;
 
 {.$endif}
@@ -412,13 +412,13 @@ end;
 
 function NSToolbarItem.autovalidates: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_autovalidates)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_autovalidates)), []));
 end;
 
 {.$endif}
 function NSToolbarItem.allowsDuplicatesInToolbar: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_allowsDuplicatesInToolbar)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSToolbarItem_allowsDuplicatesInToolbar)), []));
 end;
 
 {$endif}
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSView.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSView.inc
index 5fce6622c1..76de11984d 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSView.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSView.inc
@@ -518,12 +518,12 @@ end;
 
 function NSView.isHidden: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isHidden)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isHidden)), []));
 end;
 
 function NSView.isHiddenOrHasHiddenAncestor: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isHiddenOrHasHiddenAncestor)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isHiddenOrHasHiddenAncestor)), []));
 end;
 
 procedure NSView.getRectsBeingDrawn_count(_rects: NSRect; _count: Integer);
@@ -548,7 +548,7 @@ end;
 
 function NSView.wantsDefaultClipping: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_wantsDefaultClipping)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_wantsDefaultClipping)), []));
 end;
 
 {.$endif}
@@ -664,7 +664,7 @@ end;
 
 function NSView.postsFrameChangedNotifications: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_postsFrameChangedNotifications)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_postsFrameChangedNotifications)), []));
 end;
 
 procedure NSView.resizeSubviewsWithOldSize(_oldSize: NSSize);
@@ -699,7 +699,7 @@ end;
 
 function NSView.autoresizesSubviews: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_autoresizesSubviews)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_autoresizesSubviews)), []));
 end;
 
 procedure NSView.setAutoresizingMask(_mask: LongWord);
@@ -714,7 +714,7 @@ end;
 
 function NSView.autoresizingMask: LongWord;
 begin
-  Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_autoresizingMask)), []));
+  Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_autoresizingMask)), []));
 end;
 
 procedure NSView.setFrameOrigin(_newOrigin: NSPoint);
@@ -849,22 +849,22 @@ end;
 
 function NSView.isFlipped: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isFlipped)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isFlipped)), []));
 end;
 
 function NSView.isRotatedFromBase: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isRotatedFromBase)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isRotatedFromBase)), []));
 end;
 
 function NSView.isRotatedOrScaledFromBase: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isRotatedOrScaledFromBase)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isRotatedOrScaledFromBase)), []));
 end;
 
 function NSView.isOpaque: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isOpaque)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_isOpaque)), []));
 end;
 
 function NSView.convertPoint_fromView(_aPoint: NSPoint; _aView: lobjc.id {NSView}): NSPoint;
@@ -939,7 +939,7 @@ end;
 
 function NSView.canDraw: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_canDraw)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_canDraw)), []));
 end;
 
 procedure NSView.setNeedsDisplay(_flag: LongBool);
@@ -964,7 +964,7 @@ end;
 
 function NSView.needsDisplay: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_needsDisplay)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_needsDisplay)), []));
 end;
 
 procedure NSView.lockFocus;
@@ -979,7 +979,7 @@ end;
 
 function NSView.lockFocusIfCanDraw: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_lockFocusIfCanDraw)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_lockFocusIfCanDraw)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4}
@@ -1109,7 +1109,7 @@ end;
 {.$endif}
 function NSView.gState: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_gState)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_gState)), []));
 end;
 
 procedure NSView.allocateGState;
@@ -1214,7 +1214,7 @@ end;
 
 function NSView.tag: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_tag)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_tag)), []));
 end;
 
 function NSView.performKeyEquivalent(_theEvent: lobjc.id {NSEvent}): LongBool;
@@ -1249,13 +1249,13 @@ end;
 
 function NSView.needsPanelToBecomeKey: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_needsPanelToBecomeKey)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_needsPanelToBecomeKey)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2}
 function NSView.mouseDownCanMoveWindow: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_mouseDownCanMoveWindow)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_mouseDownCanMoveWindow)), []));
 end;
 
 {.$endif}
@@ -1311,7 +1311,7 @@ end;
 
 function NSView.shouldDrawColor: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_shouldDrawColor)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_shouldDrawColor)), []));
 end;
 
 procedure NSView.setPostsBoundsChangedNotifications(_flag: LongBool);
@@ -1326,7 +1326,7 @@ end;
 
 function NSView.postsBoundsChangedNotifications: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_postsBoundsChangedNotifications)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_postsBoundsChangedNotifications)), []));
 end;
 
 function NSView.enclosingScrollView: lobjc.id;
@@ -1401,13 +1401,13 @@ end;
 
 function NSView.inLiveResize: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_inLiveResize)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_inLiveResize)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4}
 function NSView.preservesContentDuringLiveResize: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_preservesContentDuringLiveResize)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_preservesContentDuringLiveResize)), []));
 end;
 
 function NSView.rectPreservedDuringLiveResize: NSRect;
@@ -1464,7 +1464,7 @@ end;
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3}
 function NSView.canBecomeKeyView: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_canBecomeKeyView)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSView_canBecomeKeyView)), []));
 end;
 
 {.$endif}
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/NSWindow.inc b/lcl/interfaces/carbon/pascocoa/appkit/NSWindow.inc
index 83dc447e7d..edd8ce402a 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/NSWindow.inc
+++ b/lcl/interfaces/carbon/pascocoa/appkit/NSWindow.inc
@@ -666,7 +666,7 @@ end;
 
 class function NSWindow.defaultDepthLimit: NSWindowDepth;
 begin
-  Result := NSWindowDepth(objc_msgSend(getClass, sel_registerName(PChar(StrNSWindow_defaultDepthLimit)), []));
+  Result := {%H-}NSWindowDepth(objc_msgSend(getClass, sel_registerName(PChar(StrNSWindow_defaultDepthLimit)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_3}
@@ -767,7 +767,7 @@ end;
 
 function NSWindow.isExcludedFromWindowsMenu: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isExcludedFromWindowsMenu)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isExcludedFromWindowsMenu)), []));
 end;
 
 procedure NSWindow.setContentView(_aView: lobjc.id {NSView});
@@ -802,12 +802,12 @@ end;
 
 function NSWindow.windowNumber: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_windowNumber)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_windowNumber)), []));
 end;
 
 function NSWindow.styleMask: LongWord;
 begin
-  Result := LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_styleMask)), []));
+  Result := {%H-}LongWord(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_styleMask)), []));
 end;
 
 function NSWindow.fieldEditor_forObject(_createFlag: LongBool; _anObject: lobjc.id): lobjc.id;
@@ -927,7 +927,7 @@ end;
 
 function NSWindow.showsResizeIndicator: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_showsResizeIndicator)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_showsResizeIndicator)), []));
 end;
 
 procedure NSWindow.setResizeIncrements(_increments: NSSize);
@@ -1014,7 +1014,7 @@ end;
 
 function NSWindow.isFlushWindowDisabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isFlushWindowDisabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isFlushWindowDisabled)), []));
 end;
 
 procedure NSWindow.flushWindow;
@@ -1039,7 +1039,7 @@ end;
 
 function NSWindow.viewsNeedDisplay: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_viewsNeedDisplay)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_viewsNeedDisplay)), []));
 end;
 
 procedure NSWindow.displayIfNeeded;
@@ -1064,13 +1064,13 @@ end;
 
 function NSWindow.isAutodisplay: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isAutodisplay)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isAutodisplay)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4}
 function NSWindow.preservesContentDuringLiveResize: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_preservesContentDuringLiveResize)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_preservesContentDuringLiveResize)), []));
 end;
 
 procedure NSWindow.setPreservesContentDuringLiveResize(_flag: LongBool);
@@ -1106,7 +1106,7 @@ end;
 
 function NSWindow.resizeFlags: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_resizeFlags)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_resizeFlags)), []));
 end;
 
 procedure NSWindow.keyDown(_theEvent: lobjc.id {NSEvent});
@@ -1136,7 +1136,7 @@ end;
 
 function NSWindow.isReleasedWhenClosed: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isReleasedWhenClosed)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isReleasedWhenClosed)), []));
 end;
 
 procedure NSWindow.miniaturize(_sender: lobjc.id);
@@ -1161,7 +1161,7 @@ end;
 
 function NSWindow.isZoomed: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isZoomed)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isZoomed)), []));
 end;
 
 procedure NSWindow.zoom(_sender: lobjc.id);
@@ -1176,7 +1176,7 @@ end;
 
 function NSWindow.isMiniaturized: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isMiniaturized)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isMiniaturized)), []));
 end;
 
 function NSWindow.tryToPerform_with(_anAction: SEL; _anObject: lobjc.id): LongBool;
@@ -1227,7 +1227,7 @@ end;
 
 function NSWindow.isMovableByWindowBackground: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isMovableByWindowBackground)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isMovableByWindowBackground)), []));
 end;
 
 {.$endif}
@@ -1243,7 +1243,7 @@ end;
 
 function NSWindow.hidesOnDeactivate: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_hidesOnDeactivate)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_hidesOnDeactivate)), []));
 end;
 
 procedure NSWindow.setCanHide(_flag: LongBool);
@@ -1258,7 +1258,7 @@ end;
 
 function NSWindow.canHide: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_canHide)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_canHide)), []));
 end;
 
 procedure NSWindow.center;
@@ -1363,32 +1363,32 @@ end;
 
 function NSWindow.isDocumentEdited: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isDocumentEdited)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isDocumentEdited)), []));
 end;
 
 function NSWindow.isVisible: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isVisible)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isVisible)), []));
 end;
 
 function NSWindow.isKeyWindow: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isKeyWindow)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isKeyWindow)), []));
 end;
 
 function NSWindow.isMainWindow: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isMainWindow)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isMainWindow)), []));
 end;
 
 function NSWindow.canBecomeKeyWindow: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_canBecomeKeyWindow)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_canBecomeKeyWindow)), []));
 end;
 
 function NSWindow.canBecomeMainWindow: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_canBecomeMainWindow)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_canBecomeMainWindow)), []));
 end;
 
 procedure NSWindow.makeKeyWindow;
@@ -1423,7 +1423,7 @@ end;
 
 function NSWindow.worksWhenModal: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_worksWhenModal)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_worksWhenModal)), []));
 end;
 
 function NSWindow.convertBaseToScreen(_aPoint: NSPoint): NSPoint;
@@ -1478,7 +1478,7 @@ end;
 
 function NSWindow.gState: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_gState)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_gState)), []));
 end;
 
 procedure NSWindow.setOneShot(_flag: LongBool);
@@ -1493,7 +1493,7 @@ end;
 
 function NSWindow.isOneShot: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isOneShot)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isOneShot)), []));
 end;
 
 function NSWindow.dataWithEPSInsideRect(_rect: NSRect): CFDataRef;
@@ -1543,7 +1543,7 @@ end;
 
 function NSWindow.areCursorRectsEnabled: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_areCursorRectsEnabled)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_areCursorRectsEnabled)), []));
 end;
 
 procedure NSWindow.invalidateCursorRectsForView(_aView: lobjc.id {NSView});
@@ -1574,7 +1574,7 @@ end;
 
 function NSWindow.allowsToolTipsWhenApplicationIsInactive: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_allowsToolTipsWhenApplicationIsInactive)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_allowsToolTipsWhenApplicationIsInactive)), []));
 end;
 
 {.$endif}
@@ -1605,7 +1605,7 @@ end;
 
 function NSWindow.level: Integer;
 begin
-  Result := Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_level)), []));
+  Result := {%H-}Integer(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_level)), []));
 end;
 
 procedure NSWindow.setDepthLimit(_limit: NSWindowDepth);
@@ -1620,7 +1620,7 @@ end;
 
 function NSWindow.depthLimit: NSWindowDepth;
 begin
-  Result := NSWindowDepth(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_depthLimit)), []));
+  Result := {%H-}NSWindowDepth(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_depthLimit)), []));
 end;
 
 procedure NSWindow.setDynamicDepthLimit(_flag: LongBool);
@@ -1635,7 +1635,7 @@ end;
 
 function NSWindow.hasDynamicDepthLimit: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_hasDynamicDepthLimit)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_hasDynamicDepthLimit)), []));
 end;
 
 function NSWindow.screen: lobjc.id;
@@ -1650,7 +1650,7 @@ end;
 
 function NSWindow.canStoreColor: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_canStoreColor)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_canStoreColor)), []));
 end;
 
 procedure NSWindow.setHasShadow(_hasShadow: LongBool);
@@ -1665,7 +1665,7 @@ end;
 
 function NSWindow.hasShadow: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_hasShadow)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_hasShadow)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2}
@@ -1702,13 +1702,13 @@ end;
 
 function NSWindow.isOpaque: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isOpaque)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isOpaque)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4}
 function NSWindow.displaysWhenScreenProfileChanges: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_displaysWhenScreenProfileChanges)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_displaysWhenScreenProfileChanges)), []));
 end;
 
 procedure NSWindow.setDisplaysWhenScreenProfileChanges(_flag: LongBool);
@@ -1936,7 +1936,7 @@ end;
 
 function NSWindow.acceptsMouseMovedEvents: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_acceptsMouseMovedEvents)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_acceptsMouseMovedEvents)), []));
 end;
 
 {.$ifdef  MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_2}
@@ -1952,7 +1952,7 @@ end;
 
 function NSWindow.ignoresMouseEvents: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_ignoresMouseEvents)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_ignoresMouseEvents)), []));
 end;
 
 {.$endif}
@@ -2003,7 +2003,7 @@ end;
 
 function NSWindow.isSheet: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isSheet)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_isSheet)), []));
 end;
 
 function NSWindow.attachedSheet: lobjc.id;
@@ -2185,7 +2185,7 @@ end;
 
 function NSWindow.autorecalculatesKeyViewLoop: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_autorecalculatesKeyViewLoop)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_autorecalculatesKeyViewLoop)), []));
 end;
 
 procedure NSWindow.recalculateKeyViewLoop;
@@ -2242,7 +2242,7 @@ end;
 
 function NSWindow.showsToolbarButton: LongBool;
 begin
-  Result := LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_showsToolbarButton)), []));
+  Result := {%H-}LongBool(objc_msgSend(Handle, sel_registerName(PChar(StrNSWindow_showsToolbarButton)), []));
 end;
 
 {.$endif}
diff --git a/lcl/interfaces/carbon/pascocoa/appkit/appkit.pas b/lcl/interfaces/carbon/pascocoa/appkit/appkit.pas
index 7c65905b8f..a052b399a7 100644
--- a/lcl/interfaces/carbon/pascocoa/appkit/appkit.pas
+++ b/lcl/interfaces/carbon/pascocoa/appkit/appkit.pas
@@ -15,7 +15,7 @@ unit appkit;
 
 interface
 
-uses ctypes, MacOSAll, lobjc, foundation;
+uses MacOSAll, lobjc, foundation;
 
 {$define HEADER}
 {$include AppKit.inc}