diff --git a/lcl/forms.pp b/lcl/forms.pp
index 59ae3ae055..1a4001fa2b 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -820,6 +820,7 @@ type
     procedure SetHideInterval(Value : Integer);
   protected
     class procedure WSRegisterClass; override;
+    procedure WMNCHitTest(var Message: TLMessage); message LM_NCHITTEST;
     procedure DoShowWindow; override;
     procedure UpdateRegion;
   public
diff --git a/lcl/include/canvas.inc b/lcl/include/canvas.inc
index da6304bda0..426e6d7684 100644
--- a/lcl/include/canvas.inc
+++ b/lcl/include/canvas.inc
@@ -979,7 +979,7 @@ end;
 procedure TCanvas.Frame3D(var ARect: TRect; TopColor, BottomColor: TColor;
   const FrameWidth: integer);
 var
-  Delta, W, ii : Integer;
+  W, ii : Integer;
 begin
   if ARect.Bottom-ARect.Top > ARect.Right-ARect.Left
   then
diff --git a/lcl/include/hintwindow.inc b/lcl/include/hintwindow.inc
index 23ea845e91..1d9ebfa98f 100644
--- a/lcl/include/hintwindow.inc
+++ b/lcl/include/hintwindow.inc
@@ -66,6 +66,11 @@ begin
   RegisterHintWindow;
 end;
 
+procedure THintWindow.WMNCHitTest(var Message: TLMessage);
+begin
+  Message.Result := HTTRANSPARENT;
+end;
+
 procedure THintWindow.DoShowWindow;
 begin
   if (ActiveControl = nil) and (not (csDesigning in ComponentState)) and (Parent=nil) then
diff --git a/lcl/interfaces/win32/win32wsforms.pp b/lcl/interfaces/win32/win32wsforms.pp
index 423643f5ac..1f3d8a55c0 100644
--- a/lcl/interfaces/win32/win32wsforms.pp
+++ b/lcl/interfaces/win32/win32wsforms.pp
@@ -732,16 +732,6 @@ end;
 
 { TWin32WSHintWindow }
 
-function HintWindowWndProc(Window: HWnd; Msg: UInt; WParam: Windows.WParam; LParam: Windows.LParam): LResult; stdcall;
-begin
-  case Msg of
-    WM_NCHITTEST:
-      Result := HTTRANSPARENT;
-    else
-      Result := CustomFormWndProc(Window, Msg, WParam, LParam);
-  end;
-end;
-
 class function TWin32WSHintWindow.CreateHandle(const AWinControl: TWinControl;
   const AParams: TCreateParams): HWND;
 var
@@ -760,7 +750,6 @@ begin
     Top := LongInt(CW_USEDEFAULT);
     Width := LongInt(CW_USEDEFAULT);
     Height := LongInt(CW_USEDEFAULT);
-    SubClassWndProc := @HintWindowWndProc;
   end;
   // create window
   FinishCreateWindow(AWinControl, Params, false);