diff --git a/components/rx/trunk/dcl_rx_ctrl/register_rxctrl.pas b/components/rx/trunk/dcl_rx_ctrl/register_rxctrl.pas
index bbd043eef..1df22c990 100644
--- a/components/rx/trunk/dcl_rx_ctrl/register_rxctrl.pas
+++ b/components/rx/trunk/dcl_rx_ctrl/register_rxctrl.pas
@@ -31,7 +31,7 @@
 
 unit register_rxctrl;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 uses
diff --git a/components/rx/trunk/dcl_rx_ctrl/rxceeditlookupfields.pas b/components/rx/trunk/dcl_rx_ctrl/rxceeditlookupfields.pas
index 5cfbc51fe..478dc1795 100644
--- a/components/rx/trunk/dcl_rx_ctrl/rxceeditlookupfields.pas
+++ b/components/rx/trunk/dcl_rx_ctrl/rxceeditlookupfields.pas
@@ -31,7 +31,7 @@
 
 unit rxceEditLookupFields;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/dcl_rxtools/register_rxtools.pas b/components/rx/trunk/dcl_rxtools/register_rxtools.pas
index aecc67e84..237b5af0f 100644
--- a/components/rx/trunk/dcl_rxtools/register_rxtools.pas
+++ b/components/rx/trunk/dcl_rxtools/register_rxtools.pas
@@ -30,7 +30,7 @@
 }
 unit register_rxtools;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/dcl_rxtools/rxtextholder_editor.pas b/components/rx/trunk/dcl_rxtools/rxtextholder_editor.pas
index da6364cc0..b618f9398 100644
--- a/components/rx/trunk/dcl_rxtools/rxtextholder_editor.pas
+++ b/components/rx/trunk/dcl_rxtools/rxtextholder_editor.pas
@@ -30,7 +30,7 @@
 }
 unit RxTextHolder_Editor;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rx_sort_fbdataset/exsortfb.pas b/components/rx/trunk/rx_sort_fbdataset/exsortfb.pas
index c052ffefe..50d435024 100644
--- a/components/rx/trunk/rx_sort_fbdataset/exsortfb.pas
+++ b/components/rx/trunk/rx_sort_fbdataset/exsortfb.pas
@@ -30,7 +30,7 @@
 
 unit exsortfb;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rx_sort_fbdataset/rxsortfbdataset.pas b/components/rx/trunk/rx_sort_fbdataset/rxsortfbdataset.pas
index 633939c0d..fadd930e8 100644
--- a/components/rx/trunk/rx_sort_fbdataset/rxsortfbdataset.pas
+++ b/components/rx/trunk/rx_sort_fbdataset/rxsortfbdataset.pas
@@ -30,7 +30,7 @@
 }
 unit RxSortFBDataSet;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rx_sort_sqldb.lpk b/components/rx/trunk/rx_sort_sqldb.lpk
index ca25cb4b9..af2bc20fe 100644
--- a/components/rx/trunk/rx_sort_sqldb.lpk
+++ b/components/rx/trunk/rx_sort_sqldb.lpk
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <Name Value="rx_sort_sqldb"/>
     <Type Value="RunAndDesignTime"/>
+    <Author Value="Lagunov Aleksey"/>
     <CompilerOptions>
       <Version Value="11"/>
       <SearchPaths>
@@ -10,7 +11,8 @@
         <UnitOutputDirectory Value="lib/rx_sort_sqldb/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
-    <Version Major="1" Minor="1" Release="1" Build="2"/>
+    <License Value="LGLPL"/>
+    <Version Major="1" Minor="1" Release="2" Build="3"/>
     <Files Count="2">
       <Item1>
         <Filename Value="rx_sort_sqldb/rxsortsqldb.pas"/>
@@ -22,6 +24,7 @@
         <UnitName Value="exsortsql"/>
       </Item2>
     </Files>
+    <CompatibilityMode Value="True"/>
     <RequiredPkgs Count="2">
       <Item1>
         <PackageName Value="SQLDBLaz"/>
diff --git a/components/rx/trunk/rx_sort_sqldb/exsortsql.pas b/components/rx/trunk/rx_sort_sqldb/exsortsql.pas
index 47e4b4811..7af81535d 100644
--- a/components/rx/trunk/rx_sort_sqldb/exsortsql.pas
+++ b/components/rx/trunk/rx_sort_sqldb/exsortsql.pas
@@ -30,7 +30,7 @@
 
 unit exsortsql;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rx_sort_sqldb/rxsortsqldb.pas b/components/rx/trunk/rx_sort_sqldb/rxsortsqldb.pas
index a3472800b..84e7cfc4a 100644
--- a/components/rx/trunk/rx_sort_sqldb/rxsortsqldb.pas
+++ b/components/rx/trunk/rx_sort_sqldb/rxsortsqldb.pas
@@ -1,6 +1,6 @@
 unit RxSortSqlDB;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rx_sort_zeos/exsortzeos.pas b/components/rx/trunk/rx_sort_zeos/exsortzeos.pas
index 06ad4edc6..370d0fe75 100644
--- a/components/rx/trunk/rx_sort_zeos/exsortzeos.pas
+++ b/components/rx/trunk/rx_sort_zeos/exsortzeos.pas
@@ -31,7 +31,7 @@
 
 unit exsortzeos;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rx_sort_zeos/rxsortzeos.pas b/components/rx/trunk/rx_sort_zeos/rxsortzeos.pas
index d553bc06f..ccb424702 100644
--- a/components/rx/trunk/rx_sort_zeos/rxsortzeos.pas
+++ b/components/rx/trunk/rx_sort_zeos/rxsortzeos.pas
@@ -32,7 +32,7 @@
 
 unit RxSortZeos;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet_paramsunit.pas b/components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet_paramsunit.pas
index ea5ee320e..140e827cc 100644
--- a/components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet_paramsunit.pas
+++ b/components/rx/trunk/rxdbgrid_export_spreadsheet/rxdbgridexportspreadsheet_paramsunit.pas
@@ -31,7 +31,7 @@
 
 unit RxDBGridExportSpreadSheet_ParamsUnit;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rxdbgrid_print.lpk b/components/rx/trunk/rxdbgrid_print.lpk
index b17cdd237..aa0928d1e 100644
--- a/components/rx/trunk/rxdbgrid_print.lpk
+++ b/components/rx/trunk/rxdbgrid_print.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <Name Value="rxdbgrid_print"/>
     <Type Value="RunAndDesignTime"/>
     <Author Value="Lagunov Aleksey"/>
@@ -11,7 +11,8 @@
         <UnitOutputDirectory Value="lib/rxdbgrid_print/$(TargetCPU)-$(TargetOS)/$(LCLWidgetType)"/>
       </SearchPaths>
     </CompilerOptions>
-    <Version Major="1" Minor="1" Release="1" Build="1"/>
+    <License Value="LGPL"/>
+    <Version Major="1" Minor="1" Release="2" Build="2"/>
     <Files Count="2">
       <Item1>
         <Filename Value="rxdbgrid_print/rxdbgridprintgrid.pas"/>
@@ -23,6 +24,7 @@
         <UnitName Value="RxDBGridPrintGrid_SetupUnit"/>
       </Item2>
     </Files>
+    <CompatibilityMode Value="True"/>
     <LazDoc Paths="docs"/>
     <RequiredPkgs Count="3">
       <Item1>
diff --git a/components/rx/trunk/rxtools.lpk b/components/rx/trunk/rxtools.lpk
index 6ebd213b8..0c3efe77e 100644
--- a/components/rx/trunk/rxtools.lpk
+++ b/components/rx/trunk/rxtools.lpk
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
-  <Package Version="4">
+  <Package Version="5">
     <Name Value="rxtools"/>
     <Type Value="RunAndDesignTime"/>
     <Author Value="Lagunov Aleksey "/>
@@ -14,7 +14,7 @@
     <Description Value="
 "/>
     <License Value="LGPL"/>
-    <Version Minor="5" Build="10"/>
+    <Version Minor="6" Build="12"/>
     <Files Count="11">
       <Item1>
         <Filename Value="rxtools/rxcrc.pas"/>
@@ -60,6 +60,7 @@
         <UnitName Value="rxlogging"/>
       </Item11>
     </Files>
+    <CompatibilityMode Value="True"/>
     <LazDoc Paths="docs;/usr/local/share/lazarus/components/rxnew/docs"/>
     <i18n>
       <EnableI18N Value="True"/>
diff --git a/components/rx/trunk/rxtools/rxcrc.pas b/components/rx/trunk/rxtools/rxcrc.pas
index e23f4f586..3327d8e1f 100644
--- a/components/rx/trunk/rxtools/rxcrc.pas
+++ b/components/rx/trunk/rxtools/rxcrc.pas
@@ -31,7 +31,7 @@
 
 unit rxCRC;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rxtools/rxdconst.pas b/components/rx/trunk/rxtools/rxdconst.pas
index f63395c9a..d80924066 100644
--- a/components/rx/trunk/rxtools/rxdconst.pas
+++ b/components/rx/trunk/rxtools/rxdconst.pas
@@ -31,8 +31,9 @@
 
 unit rxdconst;
 
-interface
+{$I rx.inc}
 
+interface
 
 resourcestring
 
diff --git a/components/rx/trunk/rxtools/rxtextholder.pas b/components/rx/trunk/rxtools/rxtextholder.pas
index 44b32a7f1..294f4f57f 100644
--- a/components/rx/trunk/rxtools/rxtextholder.pas
+++ b/components/rx/trunk/rxtools/rxtextholder.pas
@@ -31,7 +31,7 @@
 
 unit RxTextHolder;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface
 
diff --git a/components/rx/trunk/rxtools/rxutils.pas b/components/rx/trunk/rxtools/rxutils.pas
index 57f24b131..42b8df888 100644
--- a/components/rx/trunk/rxtools/rxutils.pas
+++ b/components/rx/trunk/rxtools/rxutils.pas
@@ -31,7 +31,7 @@
 
 unit rxutils;
 
-{$mode objfpc}{$H+}
+{$I rx.inc}
 
 interface