diff --git a/components/synedit/Source/SynEdit.inc b/components/synedit/Source/SynEdit.inc
index c0fdbaf2..7c2cc585 100644
--- a/components/synedit/Source/SynEdit.inc
+++ b/components/synedit/Source/SynEdit.inc
@@ -76,293 +76,65 @@
 
 {$DEFINE SYNEDIT_INCLUDE}
 
-{$IFDEF WIN32}
-  {$DEFINE SYN_WIN32}
-{$ENDIF}
+{$IFDEF WIN32}           {$DEFINE SYN_WIN32}           {$ENDIF}
+{$IFDEF LINUX}           {$DEFINE SYN_KYLIX}           {$ENDIF}
+{$IFDEF LINUX}           {$DEFINE SYN_LINUX}           {$ENDIF}
 
-{$IFDEF LINUX}
-  {$DEFINE SYN_LINUX}
+{$IFDEF COMPILER_2}      {$DEFINE SYN_COMPILER_2}      {$ENDIF}
+{$IFDEF COMPILER_2_UP}   {$DEFINE SYN_COMPILER_2_UP}   {$ENDIF}
+{$IFDEF COMPILER_3}      {$DEFINE SYN_COMPILER_3}      {$ENDIF}
+{$IFDEF COMPILER_3_UP}   {$DEFINE SYN_COMPILER_3_UP}   {$ENDIF}
+{$IFDEF COMPILER_4}      {$DEFINE SYN_COMPILER_4}      {$ENDIF}
+{$IFDEF COMPILER_4_UP}   {$DEFINE SYN_COMPILER_4_UP}   {$ENDIF}
+{$IFDEF COMPILER_5}      {$DEFINE SYN_COMPILER_5}      {$ENDIF}
+{$IFDEF COMPILER_5_UP}   {$DEFINE SYN_COMPILER_5_UP}   {$ENDIF}
+{$IFDEF COMPILER_6}      {$DEFINE SYN_COMPILER_6}      {$ENDIF}
+{$IFDEF COMPILER_6_UP}   {$DEFINE SYN_COMPILER_6_UP}   {$ENDIF}
+{$IFDEF COMPILER_7}      {$DEFINE SYN_COMPILER_7}      {$ENDIF}
+{$IFDEF COMPILER_7_UP}   {$DEFINE SYN_COMPILER_7_UP}   {$ENDIF}
+{$IFDEF COMPILER_8}      {$DEFINE SYN_COMPILER_8}      {$ENDIF}
+{$IFDEF COMPILER_8_UP}   {$DEFINE SYN_COMPILER_8_UP}   {$ENDIF}
+{$IFDEF COMPILER_9}      {$DEFINE SYN_COMPILER_9}      {$ENDIF}
+{$IFDEF COMPILER_9_UP}   {$DEFINE SYN_COMPILER_9_UP}   {$ENDIF}
+{$IFDEF COMPILER_10}     {$DEFINE SYN_COMPILER_10}     {$ENDIF}
+{$IFDEF COMPILER_10_UP}  {$DEFINE SYN_COMPILER_10_UP}  {$ENDIF}
+
+{$IFDEF CPPB}            {$DEFINE SYN_CPPB}            {$ENDIF}
+
+{$IFDEF CPPB_1}          {$DEFINE SYN_CPPB_1}          {$ENDIF}
+{$IFDEF CPPB_3}          {$DEFINE SYN_CPPB_3}          {$ENDIF}
+{$IFDEF CPPB_3_UP}       {$DEFINE SYN_CPPB_3_UP}       {$ENDIF}
+{$IFDEF CPPB_4}          {$DEFINE SYN_CPPB_4}          {$ENDIF}
+{$IFDEF CPPB_4_UP}       {$DEFINE SYN_CPPB_4_UP}       {$ENDIF}
+{$IFDEF CPPB_5}          {$DEFINE SYN_CPPB_5}          {$ENDIF}
+{$IFDEF CPPB_5_UP}       {$DEFINE SYN_CPPB_5_UP}       {$ENDIF}
+{$IFDEF CPPB_6}          {$DEFINE SYN_CPPB_6}          {$ENDIF}
+{$IFDEF CPPB_6_UP}       {$DEFINE SYN_CPPB_6_UP}       {$ENDIF}
+
+{$IFDEF DELPHI}          {$DEFINE SYN_DELPHI}          {$ENDIF}
+
+{$IFDEF DELPHI_2}        {$DEFINE SYN_DELPHI_2}        {$ENDIF}
+{$IFDEF DELPHI_2_UP}     {$DEFINE SYN_DELPHI_2_UP}     {$ENDIF}
+{$IFDEF DELPHI_3}        {$DEFINE SYN_DELPHI_3}        {$ENDIF}
+{$IFDEF DELPHI_3_UP}     {$DEFINE SYN_DELPHI_3_UP}     {$ENDIF}
+{$IFDEF DELPHI_4}        {$DEFINE SYN_DELPHI_4}        {$ENDIF}
+{$IFDEF DELPHI_4_UP}     {$DEFINE SYN_DELPHI_4_UP}     {$ENDIF}
+{$IFDEF DELPHI_5}        {$DEFINE SYN_DELPHI_5}        {$ENDIF}
+{$IFDEF DELPHI_5_UP}     {$DEFINE SYN_DELPHI_5_UP}     {$ENDIF}
+{$IFDEF DELPHI_6}        {$DEFINE SYN_DELPHI_6}        {$ENDIF}
+{$IFDEF DELPHI_6_UP}     {$DEFINE SYN_DELPHI_6_UP}     {$ENDIF}
+{$IFDEF DELPHI_7}        {$DEFINE SYN_DELPHI_7}        {$ENDIF}
+{$IFDEF DELPHI_7_UP}     {$DEFINE SYN_DELPHI_7_UP}     {$ENDIF}
+{$IFDEF DELPHI_8}        {$DEFINE SYN_DELPHI_8}        {$ENDIF}
+{$IFDEF DELPHI_8_UP}     {$DEFINE SYN_DELPHI_8_UP}     {$ENDIF}
+{$IFDEF DELPHI_9}        {$DEFINE SYN_DELPHI_2005}     {$ENDIF}
+{$IFDEF DELPHI_9_UP}     {$DEFINE SYN_DELPHI_2005_UP}  {$ENDIF}
+{$IFDEF DELPHI_10}       {$DEFINE SYN_DELPHI_2006}     {$ENDIF}
+{$IFDEF DELPHI_10_UP}    {$DEFINE SYN_DELPHI_2006_UP}  {$ENDIF}
+
+{$IFDEF KYLIX}
   {$DEFINE SYN_KYLIX}
-  {$DEFINE SYN_COMPILER_6}
-  {$DEFINE SYN_DELPHI}
-  {$DEFINE SYN_DELPHI_6}
-{$ENDIF}
-
-{$IFDEF VER180}
-  {$DEFINE SYN_COMPILER_10}
-    {$DEFINE SYN_DELPHI}
-    {$DEFINE SYN_DELPHI_2006}
-{$ENDIF}
-
-{$IFDEF VER170}
-  {$DEFINE SYN_COMPILER_9}
-  {$DEFINE SYN_DELPHI}
-  {$DEFINE SYN_DELPHI_2005}
-{$ENDIF}
-
-{$IFDEF VER160}
-  {$DEFINE SYN_COMPILER_8}
-  {$DEFINE SYN_DELPHI}
-  {$DEFINE SYN_DELPHI_8}
-{$ENDIF}
-
-{$IFDEF VER150}
-  {$DEFINE SYN_COMPILER_7}
-  {$IFNDEF BCB}
-    {$DEFINE SYN_DELPHI}
-    {$DEFINE SYN_DELPHI_7}
-  {$ELSE}
-    {.$DEFINE SYN_CPPB}
-    {.$DEFINE SYN_CPPB_7}
-  {$ENDIF}
-{$ENDIF}
-
-{$IFDEF VER140}
-  {$DEFINE SYN_COMPILER_6}
-  {$IFNDEF BCB}
-    {$DEFINE SYN_DELPHI}
-    {$DEFINE SYN_DELPHI_6}
-  {$ELSE}
-    {$DEFINE SYN_CPPB}
-    {$DEFINE SYN_CPPB_6}
-  {$ENDIF}
-{$ENDIF}
-
-{$IFDEF VER130}
-  {$DEFINE SYN_COMPILER_5}
-  {$IFNDEF BCB}
-    {$DEFINE SYN_DELPHI}
-    {$DEFINE SYN_DELPHI_5}
-  {$ELSE}
-    {$DEFINE SYN_CPPB}
-    {$DEFINE SYN_CPPB_5}
-  {$ENDIF}
-{$ENDIF}
-
-{$IFDEF VER125}
-  {$DEFINE SYN_COMPILER_4}
-  {$DEFINE SYN_CPPB}
-  {$DEFINE SYN_CPPB_4}
-{$ENDIF}
-
-{$IFDEF VER120}
-  {$DEFINE SYN_COMPILER_4}
-  {$DEFINE SYN_DELPHI}
-  {$DEFINE SYN_DELPHI_4}
-{$ENDIF}
-
-{$IFDEF VER110}
-  {$DEFINE SYN_COMPILER_3}
-  {$DEFINE SYN_CPPB}
-  {$DEFINE SYN_CPPB_3}
-{$ENDIF}
-
-{$IFDEF VER100}
-  {$DEFINE SYN_COMPILER_3}
-  {$DEFINE SYN_DELPHI}
-  {$DEFINE SYN_DELPHI_3}
-{$ENDIF}
-
-{$IFDEF VER93}
-  {$DEFINE SYN_COMPILER_2}  { C++B v1 compiler is really v2 }
-  {$DEFINE SYN_CPPB}
-  {$DEFINE SYN_CPPB_1}
-{$ENDIF}
-
-{$IFDEF VER90}
-  {$DEFINE SYN_COMPILER_2}
-  {$DEFINE SYN_DELPHI}
-  {$DEFINE SYN_DELPHI_2}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_2}
-  {$DEFINE SYN_COMPILER_1_UP}
-  {$DEFINE SYN_COMPILER_2_UP}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_3}
-  {$DEFINE SYN_COMPILER_1_UP}
-  {$DEFINE SYN_COMPILER_2_UP}
-  {$DEFINE SYN_COMPILER_3_UP}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_4}
-  {$DEFINE SYN_COMPILER_1_UP}
-  {$DEFINE SYN_COMPILER_2_UP}
-  {$DEFINE SYN_COMPILER_3_UP}
-  {$DEFINE SYN_COMPILER_4_UP}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_5}
-  {$DEFINE SYN_COMPILER_1_UP}
-  {$DEFINE SYN_COMPILER_2_UP}
-  {$DEFINE SYN_COMPILER_3_UP}
-  {$DEFINE SYN_COMPILER_4_UP}
-  {$DEFINE SYN_COMPILER_5_UP}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_6}
-  {$DEFINE SYN_COMPILER_1_UP}
-  {$DEFINE SYN_COMPILER_2_UP}
-  {$DEFINE SYN_COMPILER_3_UP}
-  {$DEFINE SYN_COMPILER_4_UP}
-  {$DEFINE SYN_COMPILER_5_UP}
-  {$DEFINE SYN_COMPILER_6_UP}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_7}
-  {$DEFINE SYN_COMPILER_1_UP}
-  {$DEFINE SYN_COMPILER_2_UP}
-  {$DEFINE SYN_COMPILER_3_UP}
-  {$DEFINE SYN_COMPILER_4_UP}
-  {$DEFINE SYN_COMPILER_5_UP}
-  {$DEFINE SYN_COMPILER_6_UP}
-  {$DEFINE SYN_COMPILER_7_UP}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_8}
-  {$DEFINE SYN_COMPILER_1_UP}
-  {$DEFINE SYN_COMPILER_2_UP}
-  {$DEFINE SYN_COMPILER_3_UP}
-  {$DEFINE SYN_COMPILER_4_UP}
-  {$DEFINE SYN_COMPILER_5_UP}
-  {$DEFINE SYN_COMPILER_6_UP}
-  {$DEFINE SYN_COMPILER_7_UP}
-  {$DEFINE SYN_COMPILER_8_UP}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_9}
-  {$DEFINE SYN_COMPILER_1_UP}
-  {$DEFINE SYN_COMPILER_2_UP}
-  {$DEFINE SYN_COMPILER_3_UP}
-  {$DEFINE SYN_COMPILER_4_UP}
-  {$DEFINE SYN_COMPILER_5_UP}
-  {$DEFINE SYN_COMPILER_6_UP}
-  {$DEFINE SYN_COMPILER_7_UP}
-  {$DEFINE SYN_COMPILER_8_UP}
-  {$DEFINE SYN_COMPILER_9_UP}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_10}
-  {$DEFINE SYN_COMPILER_1_UP}
-  {$DEFINE SYN_COMPILER_2_UP}
-  {$DEFINE SYN_COMPILER_3_UP}
-  {$DEFINE SYN_COMPILER_4_UP}
-  {$DEFINE SYN_COMPILER_5_UP}
-  {$DEFINE SYN_COMPILER_6_UP}
-  {$DEFINE SYN_COMPILER_7_UP}
-  {$DEFINE SYN_COMPILER_8_UP}
-  {$DEFINE SYN_COMPILER_9_UP}
-  {$DEFINE SYN_COMPILER_10_UP}
-{$ENDIF}
-
-{$IFDEF SYN_DELPHI_2}
-  {$DEFINE SYN_DELPHI_2_UP}
-{$ENDIF}
-
-{$IFDEF SYN_DELPHI_3}
-  {$DEFINE SYN_DELPHI_2_UP}
-  {$DEFINE SYN_DELPHI_3_UP}
-{$ENDIF}
-
-{$IFDEF SYN_DELPHI_4}
-  {$DEFINE SYN_DELPHI_2_UP}
-  {$DEFINE SYN_DELPHI_3_UP}
-  {$DEFINE SYN_DELPHI_4_UP}
-{$ENDIF}
-
-{$IFDEF SYN_DELPHI_5}
-  {$DEFINE SYN_DELPHI_2_UP}
-  {$DEFINE SYN_DELPHI_3_UP}
-  {$DEFINE SYN_DELPHI_4_UP}
-  {$DEFINE SYN_DELPHI_5_UP}
-{$ENDIF}
-
-{$IFDEF SYN_DELPHI_6}
-  {$DEFINE SYN_DELPHI_2_UP}
-  {$DEFINE SYN_DELPHI_3_UP}
-  {$DEFINE SYN_DELPHI_4_UP}
-  {$DEFINE SYN_DELPHI_5_UP}
-  {$DEFINE SYN_DELPHI_6_UP}
-{$ENDIF}
-
-{$IFDEF SYN_DELPHI_7}
-  {$DEFINE SYN_DELPHI_2_UP}
-  {$DEFINE SYN_DELPHI_3_UP}
-  {$DEFINE SYN_DELPHI_4_UP}
-  {$DEFINE SYN_DELPHI_5_UP}
-  {$DEFINE SYN_DELPHI_6_UP}
-  {$DEFINE SYN_DELPHI_7_UP}
-{$ENDIF}
-
-{$IFDEF SYN_DELPHI_8}
-  {$DEFINE SYN_DELPHI_2_UP}
-  {$DEFINE SYN_DELPHI_3_UP}
-  {$DEFINE SYN_DELPHI_4_UP}
-  {$DEFINE SYN_DELPHI_5_UP}
-  {$DEFINE SYN_DELPHI_6_UP}
-  {$DEFINE SYN_DELPHI_7_UP}
-  {$DEFINE SYN_DELPHI_8_UP}
-{$ENDIF}
-
-{$IFDEF SYN_DELPHI_2005}
-  {$DEFINE SYN_DELPHI_2_UP}
-  {$DEFINE SYN_DELPHI_3_UP}
-  {$DEFINE SYN_DELPHI_4_UP}
-  {$DEFINE SYN_DELPHI_5_UP}
-  {$DEFINE SYN_DELPHI_6_UP}
-  {$DEFINE SYN_DELPHI_7_UP}
-  {$DEFINE SYN_DELPHI_8_UP}
-  {$DEFINE SYN_DELPHI_2005_UP}
-{$ENDIF}
-
-{$IFDEF SYN_DELPHI_2006}
-  {$DEFINE SYN_DELPHI_2_UP}
-  {$DEFINE SYN_DELPHI_3_UP}
-  {$DEFINE SYN_DELPHI_4_UP}
-  {$DEFINE SYN_DELPHI_5_UP}
-  {$DEFINE SYN_DELPHI_6_UP}
-  {$DEFINE SYN_DELPHI_7_UP}
-  {$DEFINE SYN_DELPHI_8_UP}
-  {$DEFINE SYN_DELPHI_2005_UP}
-  {$DEFINE SYN_DELPHI_2006_UP}
-{$ENDIF}
-
-{$IFDEF SYN_CPPB_6}
-  {$DEFINE SYN_CPPB_3_UP}
-  {$DEFINE SYN_CPPB_4_UP}
-  {$DEFINE SYN_CPPB_5_UP}
-  {$DEFINE SYN_CPPB_6_UP}
-{$ENDIF}
-
-{$IFDEF SYN_CPPB_3}
-  {$DEFINE SYN_CPPB_3_UP}
-{$ENDIF}
-
-{$IFDEF SYN_COMPILER_3_UP}
-  {$DEFINE SYN_NO_COM_CLEANUP}
-{$ENDIF}
-
-{$IFDEF SYN_CPPB_3_UP}
-  // C++Builder requires this if you use Delphi components in run-time packages.
-  {$ObjExportAll On}
-{$ENDIF}
-
-{$IFDEF SYN_KYLIX}
-  // A Kylix application is always a CLX application
   {$DEFINE SYN_CLX}
-
-  {$IF not Declared(CompilerVersion)}
-    {$DEFINE SYN_KYLIX_1}
-  {$ELSEIF Declared(CompilerVersion) and (CompilerVersion > +14)}
-    {$DEFINE SYN_KYLIX_2}
-  {$ELSEIF Declared(CompilerVersion) and (CompilerVersion < +15)}
-    {$DEFINE SYN_KYLIX_3}
-  {$ELSEIF True}
-    Add new Kylix version
-  {$IFEND}
-{$ELSE}
-  {$DEFINE SYN_WIN32}
 {$ENDIF}
 
 {------------------------------------------------------------------------------}