diff --git a/components/education/educomppalette.pas b/components/education/educomppalette.pas
index b010228e9d..00ca7c7a9d 100644
--- a/components/education/educomppalette.pas
+++ b/components/education/educomppalette.pas
@@ -21,7 +21,7 @@ uses
   Classes, SysUtils, LCLProc, FileUtil, LResources, Forms, Controls, Graphics,
   Dialogs, ComCtrls, ExtCtrls, StdCtrls, AvgLvlTree,
   FormEditingIntf, LazConfigStorage, IDEOptionsIntf, ComponentReg,
-  IDEImagesIntf, LazIDEIntf,
+  IDEImagesIntf, LazIDEIntf, LCLType,
   EduOptions;
 
 type
diff --git a/examples/xmlresource/xmlresourcefile.pas b/examples/xmlresource/xmlresourcefile.pas
index 159cc92b9c..a294ded4df 100644
--- a/examples/xmlresource/xmlresourcefile.pas
+++ b/examples/xmlresource/xmlresourcefile.pas
@@ -5,7 +5,7 @@ unit xmlresourcefile;
 interface
 
 uses
-  Classes, SysUtils,
+  Classes, Controls, SysUtils,
   LCLMemManager, forms,
   dom, XMLRead,XMLWrite,
   ProjectIntf,
diff --git a/lcl/tests/test1_1simpleform1.lpr b/lcl/tests/test1_1simpleform1.lpr
index d03bba9478..2e3b521212 100644
--- a/lcl/tests/test1_1simpleform1.lpr
+++ b/lcl/tests/test1_1simpleform1.lpr
@@ -38,7 +38,7 @@ type
     procedure Form1Deactivate(Sender: TObject);
     procedure Form1Enter(Sender: TObject);
     procedure Form1Exit(Sender: TObject);
-    function Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+    function Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
       ): Boolean;
     procedure Form1Hide(Sender: TObject);
     procedure Form1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -114,7 +114,7 @@ begin
   debugln('TForm1.Form1Exit ',DbgSName(Sender));
 end;
 
-function TForm1.Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+function TForm1.Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
   ): Boolean;
 begin
   debugln('TForm1.Form1Help Command=',dbgs(Command),' Data=',HexStr(Cardinal(Data),8),' CallHelp=',dbgs(CallHelp));
diff --git a/lcl/tests/test1_2button.lpr b/lcl/tests/test1_2button.lpr
index 115273eace..067903c4ac 100644
--- a/lcl/tests/test1_2button.lpr
+++ b/lcl/tests/test1_2button.lpr
@@ -56,7 +56,7 @@ type
     procedure Form1Deactivate(Sender: TObject);
     procedure Form1Enter(Sender: TObject);
     procedure Form1Exit(Sender: TObject);
-    function Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+    function Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
       ): Boolean;
     procedure Form1Hide(Sender: TObject);
     procedure Form1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -228,7 +228,7 @@ begin
   debugln('TForm1.Form1Exit ',DbgSName(Sender));
 end;
 
-function TForm1.Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+function TForm1.Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
   ): Boolean;
 begin
   debugln('TForm1.Form1Help Command=',dbgs(Command),' Data=',HexStr(Cardinal(Data),8),' CallHelp=',dbgs(CallHelp));
diff --git a/lcl/tests/test1_3label.lpr b/lcl/tests/test1_3label.lpr
index fa5d93cca6..edc666ba59 100644
--- a/lcl/tests/test1_3label.lpr
+++ b/lcl/tests/test1_3label.lpr
@@ -54,7 +54,7 @@ type
     procedure Form1Deactivate(Sender: TObject);
     procedure Form1Enter(Sender: TObject);
     procedure Form1Exit(Sender: TObject);
-    function Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+    function Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
       ): Boolean;
     procedure Form1Hide(Sender: TObject);
     procedure Form1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -218,7 +218,7 @@ begin
   debugln('TForm1.Form1Exit ',DbgSName(Sender));
 end;
 
-function TForm1.Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+function TForm1.Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
   ): Boolean;
 begin
   debugln('TForm1.Form1Help Command=',dbgs(Command),' Data=',HexStr(Cardinal(Data),8),' CallHelp=',dbgs(CallHelp));
diff --git a/lcl/tests/test1_4edit.lpr b/lcl/tests/test1_4edit.lpr
index 6e2ada9c1e..68c593c27a 100644
--- a/lcl/tests/test1_4edit.lpr
+++ b/lcl/tests/test1_4edit.lpr
@@ -57,7 +57,7 @@ type
     procedure Form1Deactivate(Sender: TObject);
     procedure Form1Enter(Sender: TObject);
     procedure Form1Exit(Sender: TObject);
-    function Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+    function Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
       ): Boolean;
     procedure Form1Hide(Sender: TObject);
     procedure Form1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -235,7 +235,7 @@ begin
   debugln('TForm1.Form1Exit ',DbgSName(Sender));
 end;
 
-function TForm1.Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+function TForm1.Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
   ): Boolean;
 begin
   debugln('TForm1.Form1Help Command=',dbgs(Command),' Data=',HexStr(Cardinal(Data),8),' CallHelp=',dbgs(CallHelp));
diff --git a/lcl/tests/test1_5checkbox.lpr b/lcl/tests/test1_5checkbox.lpr
index 8c1f491733..5f366f5ca8 100644
--- a/lcl/tests/test1_5checkbox.lpr
+++ b/lcl/tests/test1_5checkbox.lpr
@@ -63,7 +63,7 @@ type
     procedure Form1Deactivate(Sender: TObject);
     procedure Form1Enter(Sender: TObject);
     procedure Form1Exit(Sender: TObject);
-    function Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+    function Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
       ): Boolean;
     procedure Form1Hide(Sender: TObject);
     procedure Form1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -291,7 +291,7 @@ begin
   debugln('TForm1.Form1Exit ',DbgSName(Sender));
 end;
 
-function TForm1.Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+function TForm1.Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
   ): Boolean;
 begin
   debugln('TForm1.Form1Help Command=',dbgs(Command),' Data=',HexStr(Cardinal(Data),8),' CallHelp=',dbgs(CallHelp));
diff --git a/lcl/tests/test1_6checkgroup.lpr b/lcl/tests/test1_6checkgroup.lpr
index 138d084a3b..56ca4cfdf5 100644
--- a/lcl/tests/test1_6checkgroup.lpr
+++ b/lcl/tests/test1_6checkgroup.lpr
@@ -58,7 +58,7 @@ type
     procedure Form1Deactivate(Sender: TObject);
     procedure Form1Enter(Sender: TObject);
     procedure Form1Exit(Sender: TObject);
-    function Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+    function Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
       ): Boolean;
     procedure Form1Hide(Sender: TObject);
     procedure Form1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -225,7 +225,7 @@ begin
   debugln('TForm1.Form1Exit ',DbgSName(Sender));
 end;
 
-function TForm1.Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+function TForm1.Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
   ): Boolean;
 begin
   debugln('TForm1.Form1Help Command=',dbgs(Command),' Data=',HexStr(Cardinal(Data),8),' CallHelp=',dbgs(CallHelp));
diff --git a/lcl/tests/test2_1buttonnavigation.lpr b/lcl/tests/test2_1buttonnavigation.lpr
index b2494cf544..51a8e0849d 100644
--- a/lcl/tests/test2_1buttonnavigation.lpr
+++ b/lcl/tests/test2_1buttonnavigation.lpr
@@ -54,7 +54,7 @@ type
     procedure Form1Deactivate(Sender: TObject);
     procedure Form1Enter(Sender: TObject);
     procedure Form1Exit(Sender: TObject);
-    function Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+    function Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
       ): Boolean;
     procedure Form1Hide(Sender: TObject);
     procedure Form1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -236,7 +236,7 @@ begin
   debugln('TForm1.Form1Exit ',DbgSName(Sender));
 end;
 
-function TForm1.Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+function TForm1.Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
   ): Boolean;
 begin
   debugln('TForm1.Form1Help Command=',dbgs(Command),' Data=',HexStr(Cardinal(Data),8),' CallHelp=',dbgs(CallHelp));
diff --git a/lcl/tests/test2_2labelattributes.lpr b/lcl/tests/test2_2labelattributes.lpr
index 9dd6a1e3cb..6520fa1160 100644
--- a/lcl/tests/test2_2labelattributes.lpr
+++ b/lcl/tests/test2_2labelattributes.lpr
@@ -58,7 +58,7 @@ type
     procedure Form1Deactivate(Sender: TObject);
     procedure Form1Enter(Sender: TObject);
     procedure Form1Exit(Sender: TObject);
-    function Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+    function Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
       ): Boolean;
     procedure Form1Hide(Sender: TObject);
     procedure Form1KeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -253,7 +253,7 @@ begin
   debugln('TForm1.Form1Exit ',DbgSName(Sender));
 end;
 
-function TForm1.Form1Help(Command: Word; Data: Longint; var CallHelp: Boolean
+function TForm1.Form1Help(Command: Word; Data: PtrInt; var CallHelp: Boolean
   ): Boolean;
 begin
   debugln('TForm1.Form1Help Command=',dbgs(Command),' Data=',HexStr(Cardinal(Data),8),' CallHelp=',dbgs(CallHelp));
diff --git a/lcl/tests/test2_3twosimpleforms1.lpr b/lcl/tests/test2_3twosimpleforms1.lpr
index fa9b87dda2..37e896891d 100644
--- a/lcl/tests/test2_3twosimpleforms1.lpr
+++ b/lcl/tests/test2_3twosimpleforms1.lpr
@@ -38,7 +38,7 @@ type
     procedure FormDeactivate(Sender: TObject);
     procedure FormEnter(Sender: TObject);
     procedure FormExit(Sender: TObject);
-    function FormHelp(Command: Word; Data: Longint; var CallHelp: Boolean
+    function FormHelp(Command: Word; Data: PtrInt; var CallHelp: Boolean
       ): Boolean;
     procedure FormHide(Sender: TObject);
     procedure FormKeyDown(Sender: TObject; var Key: Word; Shift: TShiftState);
@@ -118,7 +118,7 @@ begin
   debugln('TForm1And2.FormExit ',DbgSName(Sender));
 end;
 
-function TForm1And2.FormHelp(Command: Word; Data: Longint; var CallHelp: Boolean
+function TForm1And2.FormHelp(Command: Word; Data: PtrInt; var CallHelp: Boolean
   ): Boolean;
 begin
   debugln('TForm1And2.FormHelp Command=',dbgs(Command),' Data=',HexStr(Cardinal(Data),8),' CallHelp=',dbgs(CallHelp));
diff --git a/test/bugs/12204/bug12204.pas b/test/bugs/12204/bug12204.pas
index 8972cb51d7..4bcedc0635 100644
--- a/test/bugs/12204/bug12204.pas
+++ b/test/bugs/12204/bug12204.pas
@@ -6,8 +6,8 @@ var
 
 begin
  s1 := 's1';
- WriteLn('s1 = ', s1, ' : ', SizeOf(s1));
+ WriteLn('s1 = ', s1, ' : ', SizeOf(s1)+4-SizeOf(pointer));
 
  s2 := 's2';
- WriteLn('s2 = ', s2, ' : ', SizeOf(s2));
+ WriteLn('s2 = ', s2, ' : ', SizeOf(s2)+4-SizeOf(pointer));
 end.