diff --git a/lcl/interfaces/carbon/carbondebug.pp b/lcl/interfaces/carbon/carbondebug.pp
index f731f5bfe9..c3649175a6 100644
--- a/lcl/interfaces/carbon/carbondebug.pp
+++ b/lcl/interfaces/carbon/carbondebug.pp
@@ -1,4 +1,3 @@
-{ $Id$ }
 {
                      -------------------------------------
                      carbondebug.pp  -  graphic dump utils 
diff --git a/lcl/interfaces/carbon/carbondef.pp b/lcl/interfaces/carbon/carbondef.pp
index e48bb74f24..6083af705a 100644
--- a/lcl/interfaces/carbon/carbondef.pp
+++ b/lcl/interfaces/carbon/carbondef.pp
@@ -1,5 +1,4 @@
-{ $Id$
-                    -----------------------------------------
+{                   -----------------------------------------
                     carbondef.pp  -  Type & Const definitions
                     -----------------------------------------
 
@@ -94,9 +93,9 @@ type
     procedure FocusKilled; virtual;
     procedure BoundsChanged; virtual;
     procedure ControlAdded; virtual;
-    function FilterKeyPress(SysKey: Boolean; const Char: TUTF8Char): Boolean; virtual;
-    procedure ProcessKeyEvent(const msg: TLMKey); virtual;
-    function NeedDeliverMouseEvent(Msg: Integer; const AMessage): Boolean; virtual;
+    function FilterKeyPress({%H-}SysKey: Boolean; const {%H-}Char: TUTF8Char): Boolean; virtual;
+    procedure ProcessKeyEvent(const {%H-}msg: TLMKey); virtual;
+    function NeedDeliverMouseEvent({%H-}Msg: Integer; const {%H-}AMessage): Boolean; virtual;
   public
     constructor Create(const AObject: TWinControl; const AParams: TCreateParams);
     destructor Destroy; override;
@@ -484,8 +483,8 @@ var
   ClientChanged: Boolean;
 begin
   if not Resizing then begin
-    GetBounds(R);
-    GetClientRect(ClientR);
+    GetBounds(R{%H-});
+    GetClientRect(ClientR{%H-});
     LCLR:=LCLObject.BoundsRect;
     LCLClientR:=LCLObject.ClientRect;
     RChanged:=not CompareRect(@R,@LCLR);
@@ -570,7 +569,7 @@ begin
     DebugLn('TCarbonWidget.BoundsChanged ' + LCLObject.Name);
   {$ENDIF}
 
-  GetBounds(WidgetBounds);
+  GetBounds(WidgetBounds{%H-});
   OldBounds := LCLObject.BoundsRect;
   
   {$IFDEF VerboseBounds}
@@ -771,7 +770,7 @@ var
 const
   SName = 'GetMousePos';
 begin
-  GetGlobalMouse(P);
+  GetGlobalMouse(P{%H-});
 
   OSError(GetWindowBounds(GetTopParentWindow, kWindowStructureRgn, R{%H-}),
     Self, SName, SGetWindowBounds);
diff --git a/lcl/interfaces/carbon/carbongdiobjects.pp b/lcl/interfaces/carbon/carbongdiobjects.pp
index f66467da34..9987e05020 100644
--- a/lcl/interfaces/carbon/carbongdiobjects.pp
+++ b/lcl/interfaces/carbon/carbongdiobjects.pp
@@ -388,7 +388,7 @@ function CheckGDIObject(const GDIObject: HGDIOBJ; const AMethodName: String; APa
 function CheckBitmap(const Bitmap: HBITMAP; const AMethodName: String; AParamName: String = ''): Boolean;
 function CheckCursor(const Cursor: HCURSOR; const AMethodName: String; AParamName: String = ''): Boolean;
 
-function FloodFillBitmap(const Bitmap: TCarbonBitmap; X,Y: Integer; ABorderColor, FillColor: TColor; isBorderColor: Boolean): Boolean;
+function FloodFillBitmap(const Bitmap: TCarbonBitmap; X,Y: Integer; {%H-}ABorderColor, FillColor: TColor; {%H-}isBorderColor: Boolean): Boolean;
 
 var
   StockSystemFont: TCarbonFont;
@@ -506,9 +506,9 @@ type
 const
 // missed error codes
   kQDNoColorHWCursorSupport = -3951;
-  kQDCursorAlreadyRegistered = -3952;
-  kQDCursorNotRegistered = -3953;
-  kQDCorruptPICTDataErr = -3954;
+  {%H-}kQDCursorAlreadyRegistered = -3952;
+  {%H-}kQDCursorNotRegistered = -3953;
+  {%H-}kQDCorruptPICTDataErr = -3954;
   
   kThemeCursorAnimationDelay = 70;
   LazarusCursorInfix = '_lazarus_';
@@ -2553,7 +2553,7 @@ type
     ai  : Byte;
   end;
 
-procedure GetRGBA24(Bitmap: TCarbonBitmap; X,Y: Integer; var r,g,b,a: Byte; const pos: TColorPos);
+procedure GetRGBA24(Bitmap: TCarbonBitmap; X,Y: Integer; out r,g,b,a: Byte; const pos: TColorPos);
 var
   line  : PByteArray;
 begin
@@ -2579,7 +2579,7 @@ begin
   line^[x*3+pos.bi]:=b;
 end;
 
-procedure GetRGBA32(Bitmap: TCarbonBitmap; X,Y: Integer; var r,g,b,a: Byte; const pos: TColorPos);
+procedure GetRGBA32(Bitmap: TCarbonBitmap; X,Y: Integer; out r,g,b,a: Byte; const pos: TColorPos);
 var
   line  : PByteArray;
 begin
@@ -2626,7 +2626,7 @@ const
   dx : array [0..3] of Integer = (-1,1,0,0);
   dy : array [0..3] of Integer = (0,0,-1,1);
 var
-  GetRGBA: procedure (Bitmap: TCarbonBitmap; X,Y: Integer; var r,g,b,a: Byte; const pos: TColorPos);
+  GetRGBA: procedure (Bitmap: TCarbonBitmap; X,Y: Integer; out r,g,b,a: Byte; const pos: TColorPos);
   SetRGBA: procedure (Bitmap: TCarbonBitmap; X,Y: Integer; r,g,b,a: Byte; const pos: TColorPos);
 begin
   FillColorRef:=ColorToRGB(FillColor);