diff --git a/lcl/forms.pp b/lcl/forms.pp
index 06e533ddbb..7dcea57874 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -38,7 +38,7 @@ interface
 
 uses
   Classes, Controls, VCLGlobals, SysUtils, GraphType, Graphics, Menus,
-  LCLLinux, LCLType, LMessages;
+  LCLLinux, LCLType, LMessages, CustomTimer;
 
 type
   TPosition = (poDesigned, poDefault, poDefaultPosOnly, poDefaultSizeOnly,
@@ -514,7 +514,7 @@ implementation
 
 
 uses 
-  StdCtrls, Interfaces, LResources, Dialogs, ExtCtrls, Math;
+  StdCtrls, Interfaces, LResources, Dialogs, {ExtCtrls, }Math;
 
 const
   FocusMessages : Boolean = true;
diff --git a/lcl/include/hintwindow.inc b/lcl/include/hintwindow.inc
index a33f681a69..fd7f212668 100644
--- a/lcl/include/hintwindow.inc
+++ b/lcl/include/hintwindow.inc
@@ -25,7 +25,7 @@
 
 constructor THintWindow.Create(AOwner: TComponent);
 var
-  TheTimer: TTimer;
+  TheTimer: TCustomTimer;
 begin
   inherited Create(AOwner);
   fCompStyle := csHintWindow;
@@ -35,7 +35,7 @@ begin
   Caption := 'THintWindow';
   SetBounds(1,1,25,25);
   FHideInterval := 3000;
-  TheTimer := TTimer.Create(self);
+  TheTimer := TCustomTimer.Create(self);
   FAutoHideTimer := TheTimer;
   TheTimer.Interval := HideInterval;
   TheTimer.Enabled := False;
@@ -53,21 +53,21 @@ Procedure THintWindow.SetHideInterval(Value : Integer);
 Begin
   FHideInterval := Value;
   if FAutoHideTimer<>nil then
-    TTimer(FAutoHideTimer).Interval := FHideInterval;
+    TCustomTimer(FAutoHideTimer).Interval := FHideInterval;
 end;
 
 Procedure THintWindow.SetAutoHide(Value : Boolean);
 Begin
   FAutoHide := Value;
   if not (value) and (FAutoHideTimer<>nil) then
-    TTimer(FAutoHideTimer).Enabled := False;
+    TCustomTimer(FAutoHideTimer).Enabled := False;
 end;
 
 
 Procedure THintWindow.AutoHideHint(Sender : TObject);
 Begin
   if FAutoHideTimer<>nil then
-    TTimer(FAutoHideTimer).Enabled := False;
+    TCustomTimer(FAutoHideTimer).Enabled := False;
   if Visible then
     Visible := False;//Hide;
 End;
@@ -112,8 +112,8 @@ begin
     SetBounds(ARect.Left, ARect.Top,
               ARect.Right - ARect.Left, ARect.Bottom - ARect.Top);
     Visible := True;
-    TTimer(FAutoHideTimer).Enabled := False;
-    TTimer(FAutoHideTimer).Enabled := FAutoHide;
+    TCustomTimer(FAutoHideTimer).Enabled := False;
+    TCustomTimer(FAutoHideTimer).Enabled := FAutoHide;
   finally
     FActivating := False;
   end;
diff --git a/lcl/include/timer.inc b/lcl/include/timer.inc
index 7d3dfaed4b..96d0ad0afc 100644
--- a/lcl/include/timer.inc
+++ b/lcl/include/timer.inc
@@ -18,7 +18,7 @@
  *****************************************************************************
 
 }
-{
+(*{
   TTimer Delphi compatibility:
 
     nearly 100% compatible, only WndProc is missing
@@ -181,11 +181,15 @@ begin
     UpdateTimer;
   end;
 end;
+*)
 
 // included by extctrls.pp
 
 {
   $Log$
+  Revision 1.8  2002/10/24 10:27:52  lazarus
+  MG: broke extctrls.pp <-> forms.pp circle
+
   Revision 1.7  2002/10/15 16:01:36  lazarus
   MG: fixed timers