diff --git a/ide/mainintf.pas b/ide/mainintf.pas
index 138ddd113b..47258a8d70 100644
--- a/ide/mainintf.pas
+++ b/ide/mainintf.pas
@@ -70,7 +70,7 @@ uses
   PropEdits, ObjectInspector, MenuIntf, SrcEditorIntf, ProjectIntf,
   CompOptsIntf, LazIDEIntf, IDEWindowIntf,
   // IDE
-  LazConf, LazarusIDEStrConsts, Project, PublishModule, BuildLazDialog,
+  LazConf, LazarusIDEStrConsts, Project, BuildLazDialog,
   ProgressDlg, EnvironmentOpts, IDEDefs, PackageDefs;
 
 type
diff --git a/packager/addfpmakedependencydlg.pas b/packager/addfpmakedependencydlg.pas
index a5e17723fb..4844afb838 100644
--- a/packager/addfpmakedependencydlg.pas
+++ b/packager/addfpmakedependencydlg.pas
@@ -6,7 +6,7 @@ interface
 
 uses
   Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, ButtonPanel, StdCtrls,
-  ListFilterEdit, fgl,
+  ListFilterEdit,
   ProjPackCommon,
   PackageDefs,
   LazarusIDEStrConsts,
@@ -34,7 +34,7 @@ type
     destructor Destroy; override;
   end;
 
-function ShowAddFPMakeDependencyDlg(AProjPack: IProjPack;
+function ShowAddFPMakeDependencyDlg({%H-}AProjPack: IProjPack;
   out AResultDependencies: TPkgDependencyList): TModalResult;
 
 implementation
diff --git a/packager/addtopackagedlg.pas b/packager/addtopackagedlg.pas
index b4e7f12129..c003c7d28f 100644
--- a/packager/addtopackagedlg.pas
+++ b/packager/addtopackagedlg.pas
@@ -30,7 +30,7 @@ unit AddToPackageDlg;
 interface
 
 uses
-  Math, Classes, SysUtils, Laz_AVL_Tree,
+  Classes, SysUtils, Laz_AVL_Tree,
   // LCL
   LCLProc, LCLType, Forms, Controls, Buttons, ExtDlgs, StdCtrls, ExtCtrls,
   Dialogs, ComCtrls, ButtonPanel,
@@ -40,8 +40,8 @@ uses
   NewItemIntf, PackageIntf, FormEditingIntf, IDEWindowIntf, ComponentReg,
   IDEDialogs,
   // IDE
-  LazarusIDEStrConsts, InputHistory, IDEDefs, EnvironmentOpts,
-  PackageSystem, PackageDefs, ProjPackChecks;
+  LazarusIDEStrConsts, InputHistory, EnvironmentOpts,
+  PackageSystem, PackageDefs;
   
 type
 
@@ -81,6 +81,7 @@ type
     InfoLabel: TLabel;
     Title: string;
     FileName: string;
+  public
     constructor Create(aBtn: TBitBtn; aInfoLabel: TLabel; aTitle: string);
     procedure LoadIcon(aLazPackage: TLazPackage; aFileName: string);
   end;
diff --git a/packager/packageeditor.pas b/packager/packageeditor.pas
index 58db7c4d91..d90d4cb120 100644
--- a/packager/packageeditor.pas
+++ b/packager/packageeditor.pas
@@ -724,7 +724,6 @@ type
 procedure TPackageEditorForm.ItemsPopupMenuPopup(Sender: TObject);
 var
   UserSelection: PackageSelTypes;
-  SingleSelectedNode: TPkgDependency;
   SingleSelectedFile: TPkgFile;
   SingleSelectedDep: TPkgDependency;