diff --git a/components/zmsql/zmsql.lpk b/components/zmsql/zmsql.lpk
index f5540cd4e..4263fafb4 100644
--- a/components/zmsql/zmsql.lpk
+++ b/components/zmsql/zmsql.lpk
@@ -34,120 +34,120 @@ It is working with flat .csv files as tables and folders as databases."/>
         <Type Value="LRS"/>
       </Item2>
       <Item3>
-        <Filename Value="source/janSQL.pas"/>
-        <UnitName Value="janSQL"/>
-      </Item3>
-      <Item4>
-        <Filename Value="source/janSQLExpression2.pas"/>
-        <UnitName Value="janSQLExpression2"/>
-      </Item4>
-      <Item5>
-        <Filename Value="source/janSQLStrings.pas"/>
-        <UnitName Value="janSQLStrings"/>
-      </Item5>
-      <Item6>
-        <Filename Value="source/janSQLTokenizer.pas"/>
-        <UnitName Value="janSQLTokenizer"/>
-      </Item6>
-      <Item7>
-        <Filename Value="source/mwStringHashList.pas"/>
-        <UnitName Value="mwStringHashList"/>
-      </Item7>
-      <Item8>
         <Filename Value="source/zmbufdataset.pas"/>
         <UnitName Value="ZMBufDataset"/>
-      </Item8>
-      <Item9>
+      </Item3>
+      <Item4>
         <Filename Value="source/zmconnection.pas"/>
         <UnitName Value="ZMConnection"/>
-      </Item9>
-      <Item10>
+      </Item4>
+      <Item5>
         <Filename Value="source/zmquerydataset.pas"/>
         <UnitName Value="ZMQueryDataSet"/>
-      </Item10>
-      <Item11>
+      </Item5>
+      <Item6>
         <Filename Value="source/zmreferentialkey.pas"/>
         <UnitName Value="ZMReferentialKey"/>
-      </Item11>
-      <Item12>
+      </Item6>
+      <Item7>
         <Filename Value="source/zmbufdataset_parser.pp"/>
         <UnitName Value="ZMBufDataset_parser"/>
+      </Item7>
+      <Item8>
+        <Filename Value="source/QBEZmsql/QBLnkFrm.lfm"/>
+        <Type Value="LFM"/>
+      </Item8>
+      <Item9>
+        <Filename Value="source/QBEZmsql/QBuilder_license.txt"/>
+        <Type Value="Text"/>
+      </Item9>
+      <Item10>
+        <Filename Value="source/QBEZmsql/QBDBFrm2.lfm"/>
+        <Type Value="LFM"/>
+      </Item10>
+      <Item11>
+        <Filename Value="source/QBEZmsql/QBDBFrm2.pas"/>
+        <UnitName Value="QBDBFrm2"/>
+      </Item11>
+      <Item12>
+        <Filename Value="source/QBEZmsql/QBuilder_readme.txt"/>
+        <Type Value="Text"/>
       </Item12>
       <Item13>
-        <Filename Value="source/QBEZmsql/QBLnkFrm.lfm"/>
+        <Filename Value="source/QBEZmsql/QBuilder.lfm"/>
         <Type Value="LFM"/>
       </Item13>
       <Item14>
-        <Filename Value="source/QBEZmsql/QBuilder_license.txt"/>
-        <Type Value="Text"/>
+        <Filename Value="source/QBEZmsql/QBuilder.pas"/>
+        <UnitName Value="QBuilder"/>
       </Item14>
       <Item15>
-        <Filename Value="source/QBEZmsql/QBDBFrm2.lfm"/>
+        <Filename Value="source/QBEZmsql/QBDirFrm.lfm"/>
         <Type Value="LFM"/>
       </Item15>
       <Item16>
-        <Filename Value="source/QBEZmsql/QBDBFrm2.pas"/>
-        <UnitName Value="QBDBFrm2"/>
+        <Filename Value="source/QBEZmsql/QBDirFrm.pas"/>
+        <UnitName Value="QBDirFrm"/>
       </Item16>
       <Item17>
-        <Filename Value="source/QBEZmsql/QBuilder_readme.txt"/>
-        <Type Value="Text"/>
+        <Filename Value="source/QBEZmsql/QBDBFrm.lfm"/>
+        <Type Value="LFM"/>
       </Item17>
       <Item18>
         <Filename Value="source/QBEZmsql/QBuilder.lfm"/>
         <Type Value="LFM"/>
       </Item18>
       <Item19>
-        <Filename Value="source/QBEZmsql/QBuilder.pas"/>
-        <UnitName Value="QBuilder"/>
+        <Filename Value="source/QBEZmsql/QBDirFrm.lfm"/>
+        <Type Value="LFM"/>
       </Item19>
       <Item20>
-        <Filename Value="source/QBEZmsql/QBDirFrm.lfm"/>
+        <Filename Value="source/QBEZmsql/QBAbout.lfm"/>
         <Type Value="LFM"/>
       </Item20>
       <Item21>
-        <Filename Value="source/QBEZmsql/QBDirFrm.pas"/>
-        <UnitName Value="QBDirFrm"/>
+        <Filename Value="source/QBEZmsql/QBAbout.pas"/>
+        <UnitName Value="QBAbout"/>
       </Item21>
       <Item22>
-        <Filename Value="source/QBEZmsql/QBDBFrm.lfm"/>
-        <Type Value="LFM"/>
+        <Filename Value="source/QBEZmsql/QBLnkFrm.pas"/>
+        <UnitName Value="QBLnkFrm"/>
       </Item22>
       <Item23>
-        <Filename Value="source/QBEZmsql/QBuilder.lfm"/>
-        <Type Value="LFM"/>
+        <Filename Value="source/QBEZmsql/QBDBFrm.pas"/>
+        <UnitName Value="QBDBFrm"/>
       </Item23>
       <Item24>
-        <Filename Value="source/QBEZmsql/QBDirFrm.lfm"/>
-        <Type Value="LFM"/>
+        <Filename Value="source/QBEZmsql/QBEZmsql.pas"/>
+        <UnitName Value="QBEZmsql"/>
       </Item24>
       <Item25>
-        <Filename Value="source/QBEZmsql/QBAbout.lfm"/>
+        <Filename Value="source/QBEZmsql/QBDBFrm2.lfm"/>
         <Type Value="LFM"/>
       </Item25>
       <Item26>
-        <Filename Value="source/QBEZmsql/QBAbout.pas"/>
-        <UnitName Value="QBAbout"/>
-      </Item26>
-      <Item27>
-        <Filename Value="source/QBEZmsql/QBLnkFrm.pas"/>
-        <UnitName Value="QBLnkFrm"/>
-      </Item27>
-      <Item28>
-        <Filename Value="source/QBEZmsql/QBDBFrm.pas"/>
-        <UnitName Value="QBDBFrm"/>
-      </Item28>
-      <Item29>
-        <Filename Value="source/QBEZmsql/QBEZmsql.pas"/>
-        <UnitName Value="QBEZmsql"/>
-      </Item29>
-      <Item30>
-        <Filename Value="source/QBEZmsql/QBDBFrm2.lfm"/>
-        <Type Value="LFM"/>
-      </Item30>
-      <Item31>
         <Filename Value="source/zmquerybuilder.pas"/>
         <UnitName Value="ZMQueryBuilder"/>
+      </Item26>
+      <Item27>
+        <Filename Value="source/jansql.pas"/>
+        <UnitName Value="janSQL"/>
+      </Item27>
+      <Item28>
+        <Filename Value="source/jansqlexpression2.pas"/>
+        <UnitName Value="janSQLExpression2"/>
+      </Item28>
+      <Item29>
+        <Filename Value="source/jansqlstrings.pas"/>
+        <UnitName Value="janSQLStrings"/>
+      </Item29>
+      <Item30>
+        <Filename Value="source/jansqltokenizer.pas"/>
+        <UnitName Value="janSQLTokenizer"/>
+      </Item30>
+      <Item31>
+        <Filename Value="source/mwstringhashlist.pas"/>
+        <UnitName Value="mwStringHashList"/>
       </Item31>
     </Files>
     <RequiredPkgs Count="4">
diff --git a/components/zmsql/zmsql.pas b/components/zmsql/zmsql.pas
index 3ebed8dcf..eb2d91df5 100644
--- a/components/zmsql/zmsql.pas
+++ b/components/zmsql/zmsql.pas
@@ -1,16 +1,18 @@
-{ This file was automatically created by Typhon. Do not edit!
+{ This file was automatically created by Lazarus. Do not edit!
   This source is only used to compile and install the package.
  }
 
 unit zmsql;
 
+{$warn 5023 off : no warning about unused units}
 interface
 
 uses
-  AllzmsqlRegister, janSQL, janSQLExpression2, janSQLStrings, janSQLTokenizer, 
-  mwStringHashList, ZMBufDataset, ZMConnection, ZMQueryDataSet, 
+  AllzmsqlRegister, ZMBufDataset, ZMConnection, ZMQueryDataSet, 
   ZMReferentialKey, ZMBufDataset_parser, QBDBFrm2, QBuilder, QBDirFrm, 
-  QBAbout, QBLnkFrm, QBDBFrm, QBEZmsql, ZMQueryBuilder, LazarusPackageIntf;
+  QBAbout, QBLnkFrm, QBDBFrm, QBEZmsql, ZMQueryBuilder, janSQL, 
+  janSQLExpression2, janSQLStrings, janSQLTokenizer, mwStringHashList, 
+  LazarusPackageIntf;
 
 implementation