diff --git a/components/lazcontrols/checkboxthemed.pas b/components/lazcontrols/checkboxthemed.pas
index a4317310d3..04f3291aee 100644
--- a/components/lazcontrols/checkboxthemed.pas
+++ b/components/lazcontrols/checkboxthemed.pas
@@ -151,16 +151,8 @@ type
     property OnUTF8KeyPress;
   end;
 
-procedure Register;
-
 implementation
 
-procedure Register;
-begin
-  RegisterComponents('LazControls', [TCheckBoxThemed]);
-  //RegisterPropertyEditor(TypeInfo(TCaption), TCheckBoxThemed, 'Caption', TStringMultilinePropertyEditor);
-end;
-
 { TCheckBoxThemedActionLink }
 
 procedure TCheckBoxThemedActionLink.AssignClient(AClient: TObject);
diff --git a/components/lazcontrols/design/registerlazcontrols.pas b/components/lazcontrols/design/registerlazcontrols.pas
index 44b55b1167..acf8b5440b 100644
--- a/components/lazcontrols/design/registerlazcontrols.pas
+++ b/components/lazcontrols/design/registerlazcontrols.pas
@@ -6,7 +6,8 @@ interface
 
 uses
   Classes, SysUtils, ExtendedTabControls, ComponentEditors, ObjInspStrConsts, PropEdits,
-  ComCtrls;
+  ComCtrls, CheckBoxThemed, DividerBevel, ExtendedNotebook, ListFilterEdit,
+  ListViewFilterEdit, LvlGraphCtrl, ShortPathEdit, SpinEx, TreeFilterEdit;
 
 type
 
@@ -25,9 +26,15 @@ procedure Register;
 
 implementation
 
+{$R ../lazcontrols.res}
+
 procedure Register;
 begin
-  RegisterComponents('LazControls',[TExtendedTabControl]);
+  RegisterComponents('LazControls', [TCheckBoxThemed,
+    TDividerBevel, TExtendedNotebook, TListFilterEdit, TListViewFilterEdit,
+    TLvlGraphControl, TShortPathEdit, TSpinEditEx, TFloatSpinEditEx,
+    TTreeFilterEdit, TExtendedTabControl]);
+  //RegisterPropertyEditor(TypeInfo(TCaption), TCheckBoxThemed, 'Caption', TStringMultilinePropertyEditor);
   RegisterNoIcon([TExtendedTabToolbar, TExtendedTabToolButton, TExtendedTabSheet]);
   RegisterComponentEditor(TExtendedTabControl, TExtendedTabControlComponentEditor);
 end;
diff --git a/components/lazcontrols/dividerbevel.pas b/components/lazcontrols/dividerbevel.pas
index 4b6fa5c256..8f6f55ef27 100644
--- a/components/lazcontrols/dividerbevel.pas
+++ b/components/lazcontrols/dividerbevel.pas
@@ -100,15 +100,8 @@ type
     property OnStartDrag;
 end;
 
-procedure Register;
-
 implementation
 
-procedure Register;
-begin
-  RegisterComponents('LazControls', [TDividerBevel]);
-end;
-
 { TDividerBevel }
 
 procedure TDividerBevel.SetBevelStyle(AValue: TBevelStyle);
diff --git a/components/lazcontrols/extendednotebook.pas b/components/lazcontrols/extendednotebook.pas
index 30ec22dc5a..8248e7cc1b 100644
--- a/components/lazcontrols/extendednotebook.pas
+++ b/components/lazcontrols/extendednotebook.pas
@@ -102,15 +102,8 @@ type
              default dmManual;
   end;
 
-procedure Register;
-
 implementation
 
-procedure Register;
-begin
-  RegisterComponents('LazControls',[TExtendedNotebook]);
-end;
-
 { TExtendedNotebook }
 
 procedure TExtendedNotebook.InitDrag;
diff --git a/components/lazcontrols/lazcontrols.lpk b/components/lazcontrols/lazcontrols.lpk
index cdfb03e19c..db846fbc16 100644
--- a/components/lazcontrols/lazcontrols.lpk
+++ b/components/lazcontrols/lazcontrols.lpk
@@ -12,9 +12,6 @@
       <SearchPaths>
         <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)\$(LCLWidgetType)"/>
       </SearchPaths>
-      <Other>
-        <CustomOptions Value="$(IDEBuildOptions)"/>
-      </Other>
     </CompilerOptions>
     <Description Value="Some extra LCL controls needed by the IDE."/>
     <License Value="modified LGPL-2"/>
@@ -22,42 +19,34 @@
     <Files Count="11">
       <Item1>
         <Filename Value="checkboxthemed.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="CheckBoxThemed"/>
       </Item1>
       <Item2>
         <Filename Value="dividerbevel.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="DividerBevel"/>
       </Item2>
       <Item3>
         <Filename Value="extendednotebook.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="ExtendedNotebook"/>
       </Item3>
       <Item4>
         <Filename Value="listfilteredit.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="ListFilterEdit"/>
       </Item4>
       <Item5>
         <Filename Value="listviewfilteredit.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="ListViewFilterEdit"/>
       </Item5>
       <Item6>
         <Filename Value="treefilteredit.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="TreeFilterEdit"/>
       </Item6>
       <Item7>
         <Filename Value="shortpathedit.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="ShortPathEdit"/>
       </Item7>
       <Item8>
         <Filename Value="lvlgraphctrl.pas"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="LvlGraphCtrl"/>
       </Item8>
       <Item9>
@@ -66,7 +55,6 @@
       </Item9>
       <Item10>
         <Filename Value="spinex.pp"/>
-        <HasRegisterProc Value="True"/>
         <UnitName Value="SpinEx"/>
       </Item10>
       <Item11>
diff --git a/components/lazcontrols/lazcontrols.pas b/components/lazcontrols/lazcontrols.pas
index c836f73937..fcfbc1502e 100644
--- a/components/lazcontrols/lazcontrols.pas
+++ b/components/lazcontrols/lazcontrols.pas
@@ -16,15 +16,6 @@ implementation
 
 procedure Register;
 begin
-  RegisterUnit('CheckBoxThemed', @CheckBoxThemed.Register);
-  RegisterUnit('DividerBevel', @DividerBevel.Register);
-  RegisterUnit('ExtendedNotebook', @ExtendedNotebook.Register);
-  RegisterUnit('ListFilterEdit', @ListFilterEdit.Register);
-  RegisterUnit('ListViewFilterEdit', @ListViewFilterEdit.Register);
-  RegisterUnit('TreeFilterEdit', @TreeFilterEdit.Register);
-  RegisterUnit('ShortPathEdit', @ShortPathEdit.Register);
-  RegisterUnit('LvlGraphCtrl', @LvlGraphCtrl.Register);
-  RegisterUnit('SpinEx', @SpinEx.Register);
 end;
 
 initialization
diff --git a/components/lazcontrols/listfilteredit.pas b/components/lazcontrols/listfilteredit.pas
index 21035a22a2..0f0211fcb1 100644
--- a/components/lazcontrols/listfilteredit.pas
+++ b/components/lazcontrols/listfilteredit.pas
@@ -68,15 +68,8 @@ type
 var
   ListFilterGlyph: TBitmap;
 
-procedure Register;
-
 implementation
 
-procedure Register;
-begin
-  RegisterComponents('LazControls',[TListFilterEdit]);
-end;
-
 { TListBoxFilterEdit }
 
 constructor TListFilterEdit.Create(AOwner: TComponent);
diff --git a/components/lazcontrols/listviewfilteredit.pas b/components/lazcontrols/listviewfilteredit.pas
index 38a171a552..8dd2a7246c 100644
--- a/components/lazcontrols/listviewfilteredit.pas
+++ b/components/lazcontrols/listviewfilteredit.pas
@@ -71,15 +71,8 @@ type
 var
   ListFilterGlyph: TBitmap;
 
-procedure Register;
-
 implementation
 
-procedure Register;
-begin
-  RegisterComponents('LazControls',[TListViewFilterEdit]);
-end;
-
 { TListViewFilterEdit }
 
 constructor TListViewFilterEdit.Create(AOwner: TComponent);
diff --git a/components/lazcontrols/lvlgraphctrl.pas b/components/lazcontrols/lvlgraphctrl.pas
index 86269d7933..8bb7cdde2a 100644
--- a/components/lazcontrols/lvlgraphctrl.pas
+++ b/components/lazcontrols/lvlgraphctrl.pas
@@ -606,8 +606,6 @@ function dbgs(p: TLvlGraphNodeCaptionPosition): string; overload;
 function dbgs(o: TLvlGraphCtrlOption): string; overload;
 function dbgs(Options: TLvlGraphCtrlOptions): string; overload;
 
-procedure Register;
-
 implementation
 
 type
@@ -991,11 +989,6 @@ begin
   Result:='['+Result+']';
 end;
 
-procedure Register;
-begin
-  RegisterComponents('LazControls',[TLvlGraphControl]);
-end;
-
 { TLvlGraphEdgeStyle }
 
 procedure TLvlGraphEdgeStyle.SetMouseDistMax(AValue: integer);
diff --git a/components/lazcontrols/shortpathedit.pas b/components/lazcontrols/shortpathedit.pas
index 8771890758..33d8a5e3db 100644
--- a/components/lazcontrols/shortpathedit.pas
+++ b/components/lazcontrols/shortpathedit.pas
@@ -2,8 +2,6 @@ unit ShortPathEdit;
 
 {$mode objfpc}{$H+}
 
-{$R lazcontrols.res}
-
 interface
 
 uses
@@ -25,8 +23,6 @@ type
     property OnAcceptDirectory: TAcceptFileNameEvent read FOnAcceptDir write FonAcceptDir;
   end;
 
-procedure Register;
-
 implementation
 
 function TShortPathEdit.CreateDialog: TCommonDialog;
@@ -73,11 +69,5 @@ begin
   end;
 end;
 
-procedure Register;
-begin
-  RegisterComponents('LazControls',[TShortPathEdit]);
-end;
-
-
 end.
 
diff --git a/components/lazcontrols/spinex.pp b/components/lazcontrols/spinex.pp
index 904b1340d5..957eed3432 100644
--- a/components/lazcontrols/spinex.pp
+++ b/components/lazcontrols/spinex.pp
@@ -356,15 +356,8 @@ type
 
 function DbgS(ANvb: TNullValueBehaviour): String; overload;
 
-procedure Register;
-
 implementation
 
-procedure Register;
-begin
-  RegisterComponents('LazControls', [TSpinEditEx, TFloatSpinEditEx]);
-end;
-
 {$I spinex.inc}
 
 end.
diff --git a/components/lazcontrols/treefilteredit.pas b/components/lazcontrols/treefilteredit.pas
index fbf5606d61..7e2bf4e729 100644
--- a/components/lazcontrols/treefilteredit.pas
+++ b/components/lazcontrols/treefilteredit.pas
@@ -130,15 +130,8 @@ type
 var
   TreeFilterGlyph: TBitmap;
 
-procedure Register;
-
 implementation
 
-procedure Register;
-begin
-  RegisterComponents('LazControls',[TTreeFilterEdit]);
-end;
-
 { TTreeFilterBranch }
 
 constructor TTreeFilterBranch.Create(AOwner: TTreeFilterEdit; ARootNode: TTreeNode);