diff --git a/components/datetimectrls/dbdatetimepicker.pas b/components/datetimectrls/dbdatetimepicker.pas
index f210d7eaf4..1610687f28 100644
--- a/components/datetimectrls/dbdatetimepicker.pas
+++ b/components/datetimectrls/dbdatetimepicker.pas
@@ -29,7 +29,11 @@ unit DBDateTimePicker;
 interface
 
 uses
-  Classes, SysUtils, DateTimePicker, db, DBCtrls, LMessages;
+  Classes, SysUtils, db,
+  // LCL
+  DBCtrls, LMessages,
+  // DateTimeCtrls
+  DateTimePicker;
 
 type
 
diff --git a/components/datetimectrls/design/datetimecontrolsreg.pas b/components/datetimectrls/design/datetimecontrolsreg.pas
index befb9d2bfb..1e723c5c00 100644
--- a/components/datetimectrls/design/datetimecontrolsreg.pas
+++ b/components/datetimectrls/design/datetimecontrolsreg.pas
@@ -27,15 +27,19 @@ unit DateTimeControlsReg;
 
 interface
 
+uses
+  Classes,
+  // LCL
+  LResources,
+  // DateTimeCtrls
+  DateTimePicker, DBDateTimePicker;
+
 procedure Register;
 
 implementation
 
 {$R datetimectrls.res}
 
-uses
-  Classes, DateTimePicker, DBDateTimePicker, LResources;
-
 procedure Register;
 begin
   RegisterComponents('Common Controls', [TDateTimePicker]);
diff --git a/components/datetimectrls/design/datetimepickerpropedit.pas b/components/datetimectrls/design/datetimepickerpropedit.pas
index 04bcdd2778..bf55cae963 100644
--- a/components/datetimectrls/design/datetimepickerpropedit.pas
+++ b/components/datetimectrls/design/datetimepickerpropedit.pas
@@ -27,16 +27,20 @@ unit DateTimePickerPropEdit;
 {$mode objfpc}{$H+}
 
 interface
-// Nothing needs to be in interface section!
+
+uses
+  Classes, SysUtils, Math,
+  // LCL
+  Forms, Controls, StdCtrls, Menus, ButtonPanel,
+  // IdeIntf
+  ComponentEditors, PropEdits,
+  // DateTimeCtrls
+  DateTimePicker, DBDateTimePicker;
 
 implementation
 
-uses
-  Classes, SysUtils, Forms, Controls, ButtonPanel, DateTimePicker,
-  DBDateTimePicker, StdCtrls, Math, Menus, ComponentEditors, PropEdits;
-
 type
-    { TFormDateTimePickerEditor }
+  { TFormDateTimePickerEditor }
 
   TFormDateTimePickerEditor = class(TForm)
   private