diff --git a/.gitattributes b/.gitattributes
index 0f02eb2c6b..d8239dd3e0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4659,6 +4659,7 @@ lcl/include/interfacebase.inc svneol=native#text/pascal
 lcl/include/intfbaselcl.inc svneol=native#text/pascal
 lcl/include/intfbasewinapi.inc svneol=native#text/pascal
 lcl/include/jpegimage.inc svneol=native#text/pascal
+lcl/include/lcl_defines.inc svneol=native#text/pascal
 lcl/include/lclaction.inc svneol=native#text/pascal
 lcl/include/lclintf.inc svneol=native#text/pascal
 lcl/include/lclintfh.inc svneol=native#text/pascal
diff --git a/lcl/comctrls.pp b/lcl/comctrls.pp
index 2f3ccba12e..96ce884bc0 100644
--- a/lcl/comctrls.pp
+++ b/lcl/comctrls.pp
@@ -31,9 +31,8 @@
 }
 unit ComCtrls;
 
-{$mode objfpc}
-{$H+}
-
+{$mode objfpc}{$H+}
+{$I lcl_defines.inc}
 
 interface
 
diff --git a/lcl/controls.pp b/lcl/controls.pp
index 3d6542f3b0..8481501fb8 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -25,6 +25,7 @@
 unit Controls;
 
 {$mode objfpc}{$H+}
+{$I lcl_defines.inc}
 {off $DEFINE BUFFERED_WMPAINT}
 
 interface
diff --git a/lcl/extctrls.pp b/lcl/extctrls.pp
index 5a666a664d..2c5fef7226 100644
--- a/lcl/extctrls.pp
+++ b/lcl/extctrls.pp
@@ -23,8 +23,8 @@
 }
 unit ExtCtrls;
 
-{$mode objfpc}
-{$H+}
+{$mode objfpc}{$H+}
+{$I lcl_defines.inc}
 
 interface
 
diff --git a/lcl/forms.pp b/lcl/forms.pp
index 21a69d31d8..ae1a40ce1e 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -27,6 +27,7 @@
 unit Forms;
 
 {$mode objfpc}{$H+}{$macro on}
+{$I lcl_defines.inc}
 
 interface
 
diff --git a/lcl/graphics.pp b/lcl/graphics.pp
index de3ea491df..8d02813205 100644
--- a/lcl/graphics.pp
+++ b/lcl/graphics.pp
@@ -24,6 +24,7 @@
 unit Graphics;
 
 {$mode objfpc}{$H+}
+{$I lcl_defines.inc}
 
 interface
 
diff --git a/lcl/include/lcl_defines.inc b/lcl/include/lcl_defines.inc
new file mode 100644
index 0000000000..2166559eed
--- /dev/null
+++ b/lcl/include/lcl_defines.inc
@@ -0,0 +1 @@
+// Add defines here. This file should be included in all LCL units headers
\ No newline at end of file
diff --git a/lcl/stdctrls.pp b/lcl/stdctrls.pp
index 89e634b7db..0349682eb9 100644
--- a/lcl/stdctrls.pp
+++ b/lcl/stdctrls.pp
@@ -24,6 +24,7 @@
 unit StdCtrls;
 
 {$mode objfpc}{$H+}
+{$I lcl_defines.inc}
 
 interface