diff --git a/components/exctrls/source/excheckcombo.pas b/components/exctrls/source/excheckcombo.pas
index da984d027..87079855a 100644
--- a/components/exctrls/source/excheckcombo.pas
+++ b/components/exctrls/source/excheckcombo.pas
@@ -5,7 +5,7 @@ unit ExCheckCombo;
 interface
 
 uses
-  LCLIntf, LCLType, Classes, SysUtils, Controls, StdCtrls, ImgList, 
+  LCLIntf, LCLType, Classes, SysUtils, Controls, StdCtrls, ImgList,
   GroupedEdit, EditBtn, CheckLst, Forms;
 
 type
diff --git a/components/exctrls/source/exctrlsreg.pas b/components/exctrls/source/exctrlsreg.pas
index 01bcd5051..1ba2848df 100644
--- a/components/exctrls/source/exctrlsreg.pas
+++ b/components/exctrls/source/exctrlsreg.pas
@@ -7,6 +7,7 @@ interface
 uses
   Classes, SysUtils;
 
+
 procedure Register;
 
 implementation
diff --git a/components/exctrls/source/exeditctrls.pas b/components/exctrls/source/exeditctrls.pas
index c6dc6410f..93caa880d 100644
--- a/components/exctrls/source/exeditctrls.pas
+++ b/components/exctrls/source/exeditctrls.pas
@@ -11,7 +11,9 @@ uses
   Classes, SysUtils, LCLVersion, Controls, SpinEx, Math;
 
 // Fix of issues #39490 (FPC >v3.2.2/64bit) and #39793 (Laz >= 2.3.0)
-{.$define SAMEVALUE_FIX}
+{$IF ((FPC_FullVersion >= 30202) and (LCL_FullVersion >= 2030000)) or DEFINED(Win64)}
+ {$define SAMEVALUE_FIX}
+{$IFEND}
 
 type
   { TCustomCurrEditEx }
@@ -61,7 +63,7 @@ type
     function SafeInc(AValue: Currency): Currency; override;
     function SafeDec(AValue: Currency): Currency; override;
     {$IFDEF SAMEVALUE_FIX}
-    function SameValue(AValue1, AValue2: Currency): Boolean; override;
+    function SameValue(AValue1, AValue2: Currency): Boolean; {$IF LCL_FullVersion >= 2030000}override;{$IFEND}
     {$ENDIF}
     function TextIsNumber(const S: String; out ANumber: Currency): Boolean; override;
     function TryExtractCurrency(AText: String; out AValue: Currency;
@@ -306,7 +308,6 @@ begin
 end;
 
 { TCustomCurrSpinEditEx }
-
 constructor TCustomCurrSpinEditEx.Create(AOwner: TComponent);
 begin
   inherited;
@@ -549,6 +550,7 @@ begin
     end;
   end;
 end;
+
 {$IF LCL_FullVersion < 2010000}
 procedure TCustomFloatSISpinEditEx.EditKeyPress(var Key: char);
 begin