diff --git a/components/sqldb/sqldblaz.lpk b/components/sqldb/sqldblaz.lpk
index 526a06b32a..83e011e754 100644
--- a/components/sqldb/sqldblaz.lpk
+++ b/components/sqldb/sqldblaz.lpk
@@ -24,7 +24,7 @@
 
 With the exception of the unit registersqldb, which is GPL-2. This unit contains code for the IDE and is usually not used by programs."/>
     <Version Major="1" Release="2"/>
-    <Files Count="4">
+    <Files Count="3">
       <Item1>
         <Filename Value="registersqldb.pas"/>
         <HasRegisterProc Value="True"/>
@@ -32,33 +32,31 @@ With the exception of the unit registersqldb, which is GPL-2. This unit contains
         <UnitName Value="registersqldb"/>
       </Item1>
       <Item2>
-        <Filename Value="sqldb.pp"/>
-        <Type Value="Virtual Unit"/>
-        <UnitName Value="sqldb"/>
-      </Item2>
-      <Item3>
         <Filename Value="sqlstringspropertyeditordlg.lfm"/>
         <Type Value="LFM"/>
-      </Item3>
-      <Item4>
+      </Item2>
+      <Item3>
         <Filename Value="sqlstringspropertyeditordlg.pas"/>
         <UnitName Value="SQLStringsPropertyEditorDlg"/>
-      </Item4>
+      </Item3>
     </Files>
     <i18n>
       <EnableI18N Value="True"/>
       <OutDir Value="languages"/>
     </i18n>
-    <RequiredPkgs Count="3">
+    <RequiredPkgs Count="4">
       <Item1>
         <PackageName Value="CodeTools"/>
       </Item1>
       <Item2>
-        <PackageName Value="SynEdit"/>
+        <PackageName Value="IDEIntf"/>
       </Item2>
       <Item3>
-        <PackageName Value="IDEIntf"/>
+        <PackageName Value="SynEdit"/>
       </Item3>
+      <Item4>
+        <PackageName Value="FCL"/>
+      </Item4>
     </RequiredPkgs>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>
diff --git a/components/sqldb/sqldblaz.pas b/components/sqldb/sqldblaz.pas
index ab9b693d09..7ed720c96d 100644
--- a/components/sqldb/sqldblaz.pas
+++ b/components/sqldb/sqldblaz.pas
@@ -8,7 +8,7 @@ unit SQLDBLaz;
 interface
 
 uses
-  registersqldb, sqldb, SQLStringsPropertyEditorDlg, LazarusPackageIntf;
+  registersqldb, SQLStringsPropertyEditorDlg, LazarusPackageIntf;
 
 implementation
 
diff --git a/packager/registration/fcl.lpk b/packager/registration/fcl.lpk
index da0652e5fc..2e992fd096 100644
--- a/packager/registration/fcl.lpk
+++ b/packager/registration/fcl.lpk
@@ -1,7 +1,8 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <Package Version="4">
     <Name Value="FCL"/>
+    <Type Value="RunAndDesignTime"/>
     <Author Value="Lazarus"/>
     <CompilerOptions>
       <Version Value="11"/>
@@ -10,13 +11,12 @@
       </SearchPaths>
       <Other>
         <CustomOptions Value="$(IDEBuildOptions)"/>
-        <CompilerPath Value="$(CompPath)"/>
       </Other>
     </CompilerOptions>
     <Description Value="The FCL - FreePascal Component Library provides the base classes for object pascal."/>
     <License Value="modified LGPL-2"/>
     <Version Major="1" Release="1"/>
-    <Files Count="9">
+    <Files Count="10">
       <Item1>
         <Filename Value="lazaruspackageintf.pas"/>
         <AddToUsesPkgSection Value="False"/>
@@ -59,13 +59,17 @@
       </Item8>
       <Item9>
         <Filename Value="servicemanager.pas"/>
-        <AddToUsesPkgSection Value="False"/>
         <Type Value="Virtual Unit"/>
+        <AddToUsesPkgSection Value="False"/>
         <UnitName Value="ServiceManager"/>
       </Item9>
+      <Item10>
+        <Filename Value="sqldb.pp"/>
+        <Type Value="Virtual Unit"/>
+        <UnitName Value="sqldb"/>
+      </Item10>
     </Files>
     <LazDoc Paths="docs"/>
-    <Type Value="RunAndDesignTime"/>
     <UsageOptions>
       <UnitPath Value="$(PkgOutDir)"/>
     </UsageOptions>
diff --git a/packager/registration/fcllaz.pas b/packager/registration/fcllaz.pas
index 7881c701b5..03a7b4d873 100644
--- a/packager/registration/fcllaz.pas
+++ b/packager/registration/fcllaz.pas
@@ -8,7 +8,8 @@ unit fcllaz;
 interface
 
 uses
-  RegisterFCL, db, process, simpleipc, eventlog, XMLConf, LazarusPackageIntf;
+  RegisterFCL, db, process, simpleipc, eventlog, XMLConf, sqldb, 
+  LazarusPackageIntf;
 
 implementation