diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index 22f323d74e..29509f275e 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -425,7 +425,7 @@ type
 
   TTabControlNoteBookStrings = class(TTabControlStrings)
   private
-    FNoteBook: TNoteBook;
+    FNoteBook: TNoteBook{%H-};
   protected
     function Get(Index: Integer): string; override;
     function GetCount: Integer; override;
diff --git a/lcl/extctrls.pp b/lcl/extctrls.pp
index b836966a77..970f8c1b05 100644
--- a/lcl/extctrls.pp
+++ b/lcl/extctrls.pp
@@ -1298,7 +1298,6 @@ type
     FBalloonHint: string;
     FBalloonTimeout: Integer;
     FBalloonTitle: string;
-    FIconList: TImageList;
     FPopUpMenu: TPopupMenu;
     FIcon: TIcon;
     FIcons: TCustomImageList;
@@ -1399,7 +1398,7 @@ begin
     {$ifdef INSTALL_TUNTABBEDNOTEBOOK} TUntabbedNotebook, {$ENDIF}
     TLabeledEdit, TSplitter, TTrayIcon]);
   RegisterComponents('System',[TTimer,TIdleTimer]);
-  RegisterNoIcon([TNotebook, TPage{$ifdef INSTALL_TUNTABBEDNOTEBOOK}, TUNBPage{$ENDIF}]);
+  RegisterNoIcon([TNotebook{%H-}, TPage{$ifdef INSTALL_TUNTABBEDNOTEBOOK}, TUNBPage{$ENDIF}]);
 end;
 
 {$I custompage.inc}
diff --git a/lcl/include/notebook.inc b/lcl/include/notebook.inc
index 84b8d31dfd..bfdfd7a51e 100644
--- a/lcl/include/notebook.inc
+++ b/lcl/include/notebook.inc
@@ -19,12 +19,12 @@
 
 function TNotebook.GetActiveNotebookPageComponent: TPage;
 begin
-  Result:=TPage(GetActivePageComponent);
+  Result:=TPage{%H-}(GetActivePageComponent);
 end;
 
 function TNotebook.GetNoteBookPage(Index: Integer): TPage;
 begin
-  Result:=TPage(GetPage(Index));
+  Result:=TPage{%H-}(GetPage(Index));
 end;
 
 procedure TNotebook.SetActiveNotebookPageComponent(const AValue: TPage);
@@ -37,7 +37,7 @@ end;
  ------------------------------------------------------------------------------}
 constructor TNotebook.Create(TheOwner: TComponent);
 begin
-  PageClass:=TPage;
+  PageClass:=TPage{%H-};
   inherited Create(TheOwner);
 end;
 
diff --git a/lcl/include/tabcontrol.inc b/lcl/include/tabcontrol.inc
index b8e963e0aa..74de0936a6 100644
--- a/lcl/include/tabcontrol.inc
+++ b/lcl/include/tabcontrol.inc
@@ -233,7 +233,7 @@ end;
 constructor TTabControlNoteBookStrings.Create(TheTabControl: TCustomTabControl);
 begin
   inherited Create(TheTabControl);
-  FNoteBook := TNoteBook.Create(nil);
+  FNoteBook := TNoteBook{%H-}.Create(nil);
   FNoteBook.ControlStyle := FNoteBook.ControlStyle + [csNoDesignSelectable];
   FNoteBook.Parent := TabControl;
   FNoteBook.OnGetImageIndex := @NBGetImageIndex;