diff --git a/components/gradcontrols/gradcontrols.lpk b/components/gradcontrols/gradcontrols.lpk
index ca99ac025..06354068b 100644
--- a/components/gradcontrols/gradcontrols.lpk
+++ b/components/gradcontrols/gradcontrols.lpk
@@ -1,10 +1,11 @@
 <?xml version="1.0"?>
 <CONFIG>
-  <Package Version="3">
+  <Package Version="4">
     <PathDelim Value="\"/>
     <Name Value="gradcontrols"/>
+    <AddToProjectUsesSection Value="True"/>
     <CompilerOptions>
-      <Version Value="9"/>
+      <Version Value="11"/>
       <PathDelim Value="\"/>
       <SearchPaths>
         <IncludeFiles Value="src"/>
@@ -57,10 +58,7 @@
       </Item4>
     </RequiredPkgs>
     <UsageOptions>
-      <IncludePath Value="$(PkgOutDir);$(PkgOutDir)\.."/>
-      <LibraryPath Value="$(PkgOutDir);$(PkgOutDir)\.."/>
-      <ObjectPath Value="$(PkgOutDir);$(PkgOutDir)\.."/>
-      <UnitPath Value="$(PkgOutDir);$(PkgOutDir)\.."/>
+      <UnitPath Value="$(PkgOutDir)"/>
     </UsageOptions>
     <PublishOptions>
       <Version Value="2"/>
diff --git a/components/gradcontrols/src/dummylogger.pas b/components/gradcontrols/src/dummylogger.pas
index ea1937e20..7528e6471 100644
--- a/components/gradcontrols/src/dummylogger.pas
+++ b/components/gradcontrols/src/dummylogger.pas
@@ -17,8 +17,8 @@ type
     procedure ExitMethod(AStr: string);
     procedure EnterMethod(AObj: TObject; AStr: string);
     procedure ExitMethod(AObj: TObject; AStr: string);
-    procedure Send(AStr: string; AVar: Variant = 0);
-    procedure Watch(AStr: string; AVar: Variant = 0);
+    procedure Send(AStr: string; AVar: Variant);
+    procedure Watch(AStr: string; AVar: Variant);
   end;
 
 var
diff --git a/components/gradcontrols/src/gradtabcontroleditor.pas b/components/gradcontrols/src/gradtabcontroleditor.pas
index bcd40223f..8fe5471da 100644
--- a/components/gradcontrols/src/gradtabcontroleditor.pas
+++ b/components/gradcontrols/src/gradtabcontroleditor.pas
@@ -5,7 +5,7 @@ unit gradtabcontroleditor;
 interface
 
 uses
-  Classes, SysUtils, ugradtabcontrol, ComponentEditors, Menus, PropEdits;
+  Classes, SysUtils, ComCtrls, ugradtabcontrol, ComponentEditors, Menus, PropEdits;
 
 type
   { TGradTabControlComponentEditor
@@ -111,7 +111,7 @@ begin
   if (OldIndex>=0) and (OldIndex<GradTabControl.PageCount) then begin
     if not GetHook(Hook) then exit;
     PageComponent:=TComponent(GradTabControl.Tabs.Objects[OldIndex]);
-    Hook.DeletePersistent(PageComponent);
+    Hook.DeletePersistent(TPersistent(PageComponent));
   end;
 end;
 
diff --git a/components/gradcontrols/src/gradtabstyle.pas b/components/gradcontrols/src/gradtabstyle.pas
index d691af9fe..ac46b4cf2 100644
--- a/components/gradcontrols/src/gradtabstyle.pas
+++ b/components/gradcontrols/src/gradtabstyle.pas
@@ -11,7 +11,7 @@ Style-Class for TGradTabControl
 interface
 
 uses
-  Classes, SysUtils, Controls, Graphics, Buttons, ExtCtrls, ugradbtn
+  Classes, SysUtils, Controls, Graphics, Buttons, ComCtrls, ExtCtrls, ugradbtn
   {$IFDEF DEBUGTAB}
   , sharedloggerlcl
   {$ELSE}
diff --git a/components/gradcontrols/src/ugradtabcontrol.pas b/components/gradcontrols/src/ugradtabcontrol.pas
index 12ec77bc0..27dfd6da9 100644
--- a/components/gradcontrols/src/ugradtabcontrol.pas
+++ b/components/gradcontrols/src/ugradtabcontrol.pas
@@ -16,7 +16,7 @@ unit ugradtabcontrol;
 interface
 
 uses
-  Classes, LResources, SysUtils, Menus, LCLType,
+  Classes, LResources, SysUtils, Menus, LCLType, ComCtrls,
   LCLProc, LCLIntf, ExtCtrls, Graphics, ugradbtn, Controls,
   uRotateBitmap, Buttons, Forms, ImgList, gradtabstyle
   {$IFDEF DEBUGTAB}
@@ -580,7 +580,8 @@ var
 begin
   if not HasParent then Exit;
 
-  GetBackgroundRect(TheRect);
+  //GetBackgroundRect(TheRect);
+  GetContentRect(TheRect);
 
   DisplayWidth:= TheRect.Right-TheRect.Left;
   DisplayHeight:=TheRect.Bottom-TheRect.Top;
@@ -1461,7 +1462,7 @@ begin
       B.BorderSides := NewBorderSides;
       B.GradientType := NewGradientType;
 
-      Logger.Send('Before');
+      Logger.Send('Before', 0);
       Logger.Send('i', i);
       Logger.Send('Width', B.Width);
       Logger.Send('Height', B.Height);
@@ -1555,7 +1556,7 @@ begin
         end;
       end;
 
-      Logger.Send('After');
+      Logger.Send('After', 0);
       Logger.Send('i', i);
       Logger.Send('Width', B.Width);
       Logger.Send('Height', B.Height);
@@ -1853,7 +1854,7 @@ begin
       OrderButtons;
       if IsVisible(PIndex) then
       begin
-        Logger.Send('Tab is Visible');
+        Logger.Send('Tab is Visible', 0);
         Logger.ExitMethod(Self, 'ScrollToTab('+IntToStr(PIndex)+')');
         Exit;
       end;
@@ -2276,7 +2277,7 @@ begin
 
   if FPagesBar.NeedOrderButtons then
   begin
-    Logger.Send('OrderButtonsNeeded');
+    Logger.Send('OrderButtonsNeeded', 0);
     FPagesBar.OrderButtons;
   end;
   Logger.ExitMethod(Self, 'EndUpdate');
@@ -2951,9 +2952,7 @@ begin
     if (pfAdded in APage.FFlags) then exit;
     Include(APage.FFlags,pfAdding);
     APage.FFlags:=APage.FFlags+[pfAdded]-[pfAdding];
-    {$IFNDEF DARWIN}
-    APage.ResizeDelayedAutoSizeChildren;
-    {$ENDIF}
+    APage.AdjustSize;
   end else begin
     {$IFDEF NOTEBOOK_DEBUG}
     DebugLn(['TGradTabControl.AddRemovePageHandle REMOVE ',DbgSName(APage),' pfAdded=',pfAdded in APage.FFlags]);