From 2801c30b5d51f1c5f22c3e9d7c0bcccf466c47b1 Mon Sep 17 00:00:00 2001
From: juha <juha@lazarus-ide.org>
Date: Mon, 6 Mar 2017 12:24:52 +0000
Subject: [PATCH] OpkMan: Use Socket.IOTimeout in FPC 3.0.2. Clean and order
 uses sections.

git-svn-id: trunk@54351 -
---
 .../fpcmod/opkman_httpclient.pas              |  4 ++--
 .../opkman_categoriesfrm.pas                  |  9 +++++---
 .../onlinepackagemanager/opkman_common.pas    |  8 ++++---
 .../opkman_createjsonforupdates.pas           | 11 +++++----
 .../opkman_createrepositorypackage.pas        |  7 +++---
 .../opkman_downloader.pas                     |  7 +++---
 .../onlinepackagemanager/opkman_fpcdef.inc    | 12 ++++++----
 .../onlinepackagemanager/opkman_installer.pas | 12 ++++++----
 .../onlinepackagemanager/opkman_mainfrm.pas   | 23 +++++++++++--------
 .../onlinepackagemanager/opkman_options.pas   |  9 ++++++--
 .../opkman_optionsfrm.pas                     | 11 ++++++---
 .../opkman_packagedetailsfrm.pas              |  4 ++--
 .../opkman_packagelistfrm.pas                 |  8 ++++---
 .../opkman_progressfrm.pas                    | 10 +++++---
 .../opkman_repositories.pas                   |  9 +++++---
 .../opkman_serializablepackages.pas           | 10 +++++---
 .../onlinepackagemanager/opkman_timer.pas     |  1 -
 .../onlinepackagemanager/opkman_updates.pas   | 13 +++++++----
 .../onlinepackagemanager/opkman_uploader.pas  |  9 ++++----
 .../opkman_visualtree.pas                     | 10 ++++----
 .../onlinepackagemanager/opkman_zipper.pas    |  8 ++++---
 21 files changed, 122 insertions(+), 73 deletions(-)

diff --git a/components/onlinepackagemanager/fpcmod/opkman_httpclient.pas b/components/onlinepackagemanager/fpcmod/opkman_httpclient.pas
index 02c663a62c..6e9ea85ff0 100644
--- a/components/onlinepackagemanager/fpcmod/opkman_httpclient.pas
+++ b/components/onlinepackagemanager/fpcmod/opkman_httpclient.pas
@@ -489,7 +489,7 @@ procedure TFPCustomHTTPClient.SetIOTimeout(AValue: Integer);
 begin
   if AValue=FIOTimeout then exit;
   FIOTimeout:=AValue;
-  {$IFDEF FPC311}
+  {$IFDEF FPC302}
    if Assigned(FSocket) then
      FSocket.IOTimeout:=AValue;
   {$ENDIF}
@@ -596,7 +596,7 @@ begin
   G:=GetSocketHandler(UseSSL);    
   FSocket:=TInetSocket.Create(AHost,APort,G);
   try
-    {$IFDEF FPC311}
+    {$IFDEF FPC302}
     if FIOTimeout<>0 then
       FSocket.IOTimeout:=FIOTimeout;
     {$ENDIF}
diff --git a/components/onlinepackagemanager/opkman_categoriesfrm.pas b/components/onlinepackagemanager/opkman_categoriesfrm.pas
index f2f05d01a4..a0f52b48d3 100644
--- a/components/onlinepackagemanager/opkman_categoriesfrm.pas
+++ b/components/onlinepackagemanager/opkman_categoriesfrm.pas
@@ -28,8 +28,11 @@ unit opkman_categoriesfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, opkman_VirtualTrees;
+  Classes, SysUtils,
+  // LCL
+  Forms, Controls, Graphics, ExtCtrls, StdCtrls,
+  // OpkMan
+  opkman_const, opkman_common, opkman_VirtualTrees;
 
 type
 
@@ -72,7 +75,7 @@ var
   CategoriesFrm: TCategoriesFrm;
 
 implementation
-uses opkman_const, opkman_common;
+
 {$R *.lfm}
 
 type
diff --git a/components/onlinepackagemanager/opkman_common.pas b/components/onlinepackagemanager/opkman_common.pas
index b45ade2383..f9a4593ce1 100644
--- a/components/onlinepackagemanager/opkman_common.pas
+++ b/components/onlinepackagemanager/opkman_common.pas
@@ -29,8 +29,11 @@ unit opkman_common;
 interface
 
 uses
-  Classes, SysUtils, Dialogs, Forms, Controls, LazIDEIntf, LazFileUtils, contnrs,
-  opkman_const;
+  Classes, SysUtils, contnrs,
+  // LCL
+  Dialogs, Forms, Controls, LazIDEIntf, LazFileUtils,
+  // OpkMan
+  opkman_const, opkman_options;
 
 type
   TPackageAction = (paDownloadTo, paInstall, paUpdate);
@@ -122,7 +125,6 @@ procedure FindAllFilesEx(const ADirName: String; AFileList: TStrings);
 function FixProtocol(const AURL: String): String;
 
 implementation
-uses opkman_options;
 
 function MessageDlgEx(const AMsg: string; ADlgType: TMsgDlgType;
   AButtons: TMsgDlgButtons; AParent: TForm): TModalResult;
diff --git a/components/onlinepackagemanager/opkman_createjsonforupdates.pas b/components/onlinepackagemanager/opkman_createjsonforupdates.pas
index 46b0865632..4502e8606e 100644
--- a/components/onlinepackagemanager/opkman_createjsonforupdates.pas
+++ b/components/onlinepackagemanager/opkman_createjsonforupdates.pas
@@ -28,9 +28,12 @@ unit opkman_createjsonforupdates;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, EditBtn, LCLIntf, MaskEdit, fpjson,
-  opkman_VirtualTrees, opkman_serializablepackages;
+  Classes, SysUtils, fpjson,
+  // LCL
+  Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, LCLIntf,
+  // OpkMan
+  opkman_serializablepackages, opkman_const, opkman_common, opkman_updates,
+  opkman_VirtualTrees;
 
 type
 
@@ -75,7 +78,7 @@ var
   CreateJSONForUpdatesFrm: TCreateJSONForUpdatesFrm;
 
 implementation
-uses opkman_const, opkman_common, opkman_updates;
+
 {$R *.lfm}
 
 { TCreateJSONForUpdatesFrm }
diff --git a/components/onlinepackagemanager/opkman_createrepositorypackage.pas b/components/onlinepackagemanager/opkman_createrepositorypackage.pas
index ca0ba3c139..b289fa54c7 100644
--- a/components/onlinepackagemanager/opkman_createrepositorypackage.pas
+++ b/components/onlinepackagemanager/opkman_createrepositorypackage.pas
@@ -28,8 +28,10 @@ unit opkman_createrepositorypackage;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, opkman_createrepositorypackagefr, Forms,
-  Controls, Graphics, Dialogs, ExtCtrls;
+  // LCL
+  Forms,
+  // OpkMan
+  opkman_const, opkman_createrepositorypackagefr;
 
 type
 
@@ -50,7 +52,6 @@ var
 
 implementation
 
-uses opkman_const;
 {$R *.lfm}
 
 { TCreateRepositoryPackagesFrm }
diff --git a/components/onlinepackagemanager/opkman_downloader.pas b/components/onlinepackagemanager/opkman_downloader.pas
index 14e44c7008..8be1bccb58 100644
--- a/components/onlinepackagemanager/opkman_downloader.pas
+++ b/components/onlinepackagemanager/opkman_downloader.pas
@@ -31,10 +31,11 @@ unit opkman_downloader;
 interface
 
 uses
-  Classes, SysUtils, fpjson, opkman_timer, opkman_common, opkman_serializablepackages,
+  Classes, SysUtils, fpjson,
+  // OpkMan
+  opkman_timer, opkman_common, opkman_serializablepackages, opkman_const, opkman_options,
   {$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
 
-
 type
   TDownloadType = (dtJSON, dtPackage, dtUpdate);
   TErrorType = (etNone, etConfig, etTimeOut, etHTTPClient);
@@ -182,8 +183,6 @@ var
 
 implementation
 
-uses opkman_const, opkman_options;
-
 { TDownloadStream }
 constructor TDownloadStream.Create(AStream: TStream);
 begin
diff --git a/components/onlinepackagemanager/opkman_fpcdef.inc b/components/onlinepackagemanager/opkman_fpcdef.inc
index b044d443d7..7384c1192a 100644
--- a/components/onlinepackagemanager/opkman_fpcdef.inc
+++ b/components/onlinepackagemanager/opkman_fpcdef.inc
@@ -1,7 +1,11 @@
 {$IF FPC_VERSION = 3}
-  {$IF FPC_RELEASE > 0}
-   {$IF FPC_PATCH > 0}
-     {$DEFINE FPC311}
+  {$IF FPC_RELEASE = 0}
+    {$IF FPC_PATCH > 1}
+      {$DEFINE FPC302}
+    {$ENDIF}
+  {$ELSE}
+    {$IF FPC_PATCH > 0}
+      {$DEFINE FPC311}
     {$ENDIF}
   {$ENDIF}
-{$ENDIF}
\ No newline at end of file
+{$ENDIF}
diff --git a/components/onlinepackagemanager/opkman_installer.pas b/components/onlinepackagemanager/opkman_installer.pas
index a9b41b8b49..717a78705f 100644
--- a/components/onlinepackagemanager/opkman_installer.pas
+++ b/components/onlinepackagemanager/opkman_installer.pas
@@ -31,10 +31,13 @@ unit opkman_installer;
 interface
 
 uses
-  Classes, SysUtils, contnrs, Controls, Forms, PackageIntf, LCLVersion,
-  opkman_serializablepackages;
-
-
+  Classes, SysUtils, contnrs,
+  // LCL
+  Controls, LCLVersion,
+  // IdeIntf
+  PackageIntf,
+  // OpkMan
+  opkman_serializablepackages, opkman_const, opkman_common;
 
 type
   TInstallStatus = (isSuccess, isPartiallyFailed, isFailed);
@@ -86,7 +89,6 @@ var
 
 implementation
 
-uses opkman_const, opkman_common;
 { TPackageInstaller }
 
 constructor TPackageInstaller.Create;
diff --git a/components/onlinepackagemanager/opkman_mainfrm.pas b/components/onlinepackagemanager/opkman_mainfrm.pas
index ffcabfb55b..fd84636094 100644
--- a/components/onlinepackagemanager/opkman_mainfrm.pas
+++ b/components/onlinepackagemanager/opkman_mainfrm.pas
@@ -29,10 +29,20 @@ unit opkman_mainfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, contnrs,
-  StdCtrls, ExtCtrls, Buttons, Menus, ComCtrls, IDECommands, LazFileUtils,
-  LCLIntf, fpjson, opkman_VirtualTrees, opkman_downloader, opkman_installer,
-  PackageIntf, Clipbrd, md5;
+  Classes, SysUtils, contnrs, fpjson, md5,
+  // LCL
+  Forms, Controls, Dialogs, StdCtrls, ExtCtrls, Buttons, Menus, ComCtrls, Clipbrd,
+  LCLIntf, LCLVersion,
+  // LazUtils
+  LazFileUtils,
+  // IdeIntf
+  IDECommands,
+  // OpkMan
+  opkman_VirtualTrees, opkman_downloader, opkman_installer,
+  opkman_serializablepackages, opkman_visualtree, opkman_const, opkman_common,
+  opkman_progressfrm, opkman_zipper, opkman_packagelistfrm, opkman_options,
+  opkman_optionsfrm, opkman_createrepositorypackage, opkman_updates,
+  opkman_createjsonforupdates;
 
 type
 
@@ -145,11 +155,6 @@ var
 
 implementation
 
-uses LCLVersion,
-     opkman_serializablepackages, opkman_visualtree, opkman_const, opkman_common,
-     opkman_progressfrm, opkman_zipper, opkman_packagelistfrm, opkman_options,
-     opkman_optionsfrm, opkman_createrepositorypackage, opkman_updates,
-     opkman_createjsonforupdates;
 {$R *.lfm}
 
 { TMainFrm }
diff --git a/components/onlinepackagemanager/opkman_options.pas b/components/onlinepackagemanager/opkman_options.pas
index ddc13706e6..ad59f292dc 100644
--- a/components/onlinepackagemanager/opkman_options.pas
+++ b/components/onlinepackagemanager/opkman_options.pas
@@ -27,7 +27,13 @@ unit opkman_options;
 interface
 
 uses
-  Classes, SysUtils, LazIDEIntf, Laz2_XMLCfg, LazFileUtils;
+  Classes, SysUtils,
+  // LazUtils
+  Laz2_XMLCfg, LazFileUtils,
+  // IdeIntf
+  LazIDEIntf,
+  // OpkMan
+  opkman_const;
 
 const
   OpkVersion = 1;
@@ -107,7 +113,6 @@ var
   Options: TOptions = nil;
 
 implementation
-uses opkman_const;
 
 { TOptions }
 
diff --git a/components/onlinepackagemanager/opkman_optionsfrm.pas b/components/onlinepackagemanager/opkman_optionsfrm.pas
index 14fafdc675..28c08bd3cb 100644
--- a/components/onlinepackagemanager/opkman_optionsfrm.pas
+++ b/components/onlinepackagemanager/opkman_optionsfrm.pas
@@ -30,8 +30,13 @@ unit opkman_optionsfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, opkman_VirtualTrees, Forms, Controls, Graphics, Dialogs,
-  StdCtrls, ExtCtrls, Spin, ComCtrls, Buttons, EditBtn, LazFileUtils, Math;
+  SysUtils, Math,
+  // LCL
+  Forms, Controls, Dialogs, StdCtrls, ExtCtrls, Spin, ComCtrls, EditBtn,
+  // LazUtils
+  LazFileUtils,
+  // OpkMan
+  opkman_options, opkman_common, opkman_const, opkman_repositories;
 
 type
 
@@ -121,7 +126,7 @@ var
   OptionsFrm: TOptionsFrm;
 
 implementation
-uses opkman_options, opkman_common, opkman_const, opkman_repositories;
+
 {$R *.lfm}
 
 { TOptionsFrm }
diff --git a/components/onlinepackagemanager/opkman_packagedetailsfrm.pas b/components/onlinepackagemanager/opkman_packagedetailsfrm.pas
index f29fbc187b..a9d6f71d7b 100644
--- a/components/onlinepackagemanager/opkman_packagedetailsfrm.pas
+++ b/components/onlinepackagemanager/opkman_packagedetailsfrm.pas
@@ -28,8 +28,8 @@ unit opkman_packagedetailsfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, StdCtrls,
-  ExtCtrls;
+  // LCL
+  Forms, StdCtrls, ExtCtrls;
 
 type
 
diff --git a/components/onlinepackagemanager/opkman_packagelistfrm.pas b/components/onlinepackagemanager/opkman_packagelistfrm.pas
index 1ab42b63c1..dcbe6ff8b8 100644
--- a/components/onlinepackagemanager/opkman_packagelistfrm.pas
+++ b/components/onlinepackagemanager/opkman_packagelistfrm.pas
@@ -26,8 +26,11 @@ unit opkman_packagelistfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, opkman_VirtualTrees;
+  SysUtils,
+  // LCL
+  Forms, Controls, Graphics, ExtCtrls, StdCtrls,
+  // OpkMan
+  opkman_VirtualTrees, opkman_const, opkman_serializablepackages;
 
 type
 
@@ -69,7 +72,6 @@ var
   PackageListFrm: TPackageListFrm;
 
 implementation
-uses opkman_const, opkman_serializablepackages;
 
 {$R *.lfm}
 
diff --git a/components/onlinepackagemanager/opkman_progressfrm.pas b/components/onlinepackagemanager/opkman_progressfrm.pas
index 9c01b0b511..07c2eb2cc8 100644
--- a/components/onlinepackagemanager/opkman_progressfrm.pas
+++ b/components/onlinepackagemanager/opkman_progressfrm.pas
@@ -27,8 +27,12 @@ unit opkman_progressfrm;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ComCtrls,
-  StdCtrls, ExtCtrls, opkman_serializablepackages, opkman_installer, opkman_VirtualTrees;
+  SysUtils,
+  // LCL
+  Forms, Controls, Graphics, Dialogs, ComCtrls, StdCtrls, ExtCtrls,
+  // OpkMan
+  opkman_installer, opkman_common, opkman_const, opkman_downloader, opkman_zipper,
+  opkman_VirtualTrees;
 
 type
 
@@ -102,7 +106,7 @@ var
   ProgressFrm: TProgressFrm;
 
 implementation
-uses opkman_common, opkman_const, opkman_downloader, opkman_zipper;
+
 {$R *.lfm}
 
 { TProgressFrm }
diff --git a/components/onlinepackagemanager/opkman_repositories.pas b/components/onlinepackagemanager/opkman_repositories.pas
index 6bd550aa33..7759a7a433 100644
--- a/components/onlinepackagemanager/opkman_repositories.pas
+++ b/components/onlinepackagemanager/opkman_repositories.pas
@@ -28,8 +28,11 @@ unit opkman_repositories;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Forms, Controls, Graphics, Dialogs, ExtCtrls,
-  StdCtrls, Menus, opkman_VirtualTrees;
+  Classes, SysUtils,
+  // LCL
+  Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls,
+  // OpkMan
+  opkman_const, opkman_common, opkman_options, opkman_VirtualTrees;
 
 type
 
@@ -74,7 +77,7 @@ var
   RepositoriesFrm: TRepositoriesFrm;
 
 implementation
-uses opkman_const, opkman_common, opkman_options;
+
 {$R *.lfm}
 
 type
diff --git a/components/onlinepackagemanager/opkman_serializablepackages.pas b/components/onlinepackagemanager/opkman_serializablepackages.pas
index 12bd092300..5155ded090 100644
--- a/components/onlinepackagemanager/opkman_serializablepackages.pas
+++ b/components/onlinepackagemanager/opkman_serializablepackages.pas
@@ -31,8 +31,13 @@ unit opkman_serializablepackages;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, Variants, fpjson, jsonparser, contnrs,
-  PackageIntf, Laz2_XMLCfg, LazFileUtils, dateutils;
+  Classes, SysUtils, Variants, contnrs, dateutils, fpjson, jsonparser,
+  // LazUtils
+  FileUtil, Laz2_XMLCfg, LazFileUtils,
+  // IdeIntf
+  PackageIntf,
+  // OpkMan
+  opkman_common, opkman_const, opkman_options;
 
 
 type
@@ -312,7 +317,6 @@ var
 
 
 implementation
-uses opkman_common, opkman_const, opkman_options;
 
 { TPackageVersion }
 
diff --git a/components/onlinepackagemanager/opkman_timer.pas b/components/onlinepackagemanager/opkman_timer.pas
index cd7f17868c..5790e8cc1a 100644
--- a/components/onlinepackagemanager/opkman_timer.pas
+++ b/components/onlinepackagemanager/opkman_timer.pas
@@ -29,7 +29,6 @@ interface
 uses
   Classes, SysUtils;
 
-
 type
    { TThreadTimer }
    TThreadTimer = class(TThread)
diff --git a/components/onlinepackagemanager/opkman_updates.pas b/components/onlinepackagemanager/opkman_updates.pas
index ef549f543f..4d487167ee 100644
--- a/components/onlinepackagemanager/opkman_updates.pas
+++ b/components/onlinepackagemanager/opkman_updates.pas
@@ -30,8 +30,12 @@ unit opkman_updates;
 interface
 
 uses
-  Classes, SysUtils, LazIDEIntf, Laz2_XMLCfg, LazFileUtils, fpjson, fpjsonrtti,
-  opkman_timer, opkman_serializablepackages, dateutils,
+  Classes, SysUtils, fpjson, fpjsonrtti, dateutils,
+  // LazUtils
+  Laz2_XMLCfg,
+  // OpkMan
+  opkman_timer, opkman_serializablepackages,
+  opkman_options, opkman_common,
   {$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
 
 const
@@ -131,9 +135,6 @@ var
 
 implementation
 
-uses opkman_options, opkman_common, opkman_const,
-     {$IFDEF FPC311}zipper{$ELSE}opkman_zip{$ENDIF};
-
 { TUpdatePackage }
 
 procedure TUpdatePackage.Clear;
@@ -403,9 +404,11 @@ begin
 end;
 
 procedure TUpdates.CheckForOpenSSL;
+{$IFDEF MSWINDOWS}
 var
   ZipFile: String;
   UnZipper: TUnZipper;
+{$ENDIF}
 begin
   {$IFDEF MSWINDOWS}
    FOpenSSLAvaialable := FileExistsUTF8(ExtractFilePath(ParamStr(0)) + 'libeay32.dll') and
diff --git a/components/onlinepackagemanager/opkman_uploader.pas b/components/onlinepackagemanager/opkman_uploader.pas
index a2d1e348af..7c435ca1da 100644
--- a/components/onlinepackagemanager/opkman_uploader.pas
+++ b/components/onlinepackagemanager/opkman_uploader.pas
@@ -31,11 +31,13 @@ unit opkman_uploader;
 interface
 
 uses
- Classes, SysUtils, fpjson, base64, LazFileUtils,
+ Classes, SysUtils, base64,
+ // LazUtils
+ LazFileUtils,
+ // OpkMan
+ opkman_options, opkman_const,
  {$IFDEF FPC311}fphttpclient{$ELSE}opkman_httpclient{$ENDIF};
 
-
-
 type
  TOnUploadProgress = procedure(Sender: TObject; AFileName: String) of object;
  TOnUploadError = procedure(Sender: TObject; AErrMsg: String) of object;
@@ -78,7 +80,6 @@ var
  Uploader: TUploader = nil;
 
 implementation
-uses opkman_options, opkman_const;
 
 { TUploader }
 
diff --git a/components/onlinepackagemanager/opkman_visualtree.pas b/components/onlinepackagemanager/opkman_visualtree.pas
index 36b89913be..4e90ac1906 100644
--- a/components/onlinepackagemanager/opkman_visualtree.pas
+++ b/components/onlinepackagemanager/opkman_visualtree.pas
@@ -30,9 +30,12 @@ unit opkman_visualtree;
 interface
 
 uses
-  Classes, SysUtils, Controls, Graphics, Menus, Dialogs, Forms, LCLIntf, contnrs,
-  PackageIntf, Buttons, Math, dateutils, opkman_VirtualTrees, opkman_common,
-  opkman_serializablepackages;
+  Classes, SysUtils, contnrs, Math, dateutils,
+  // LCL
+  Controls, Graphics, Menus, Dialogs, Forms, LCLIntf, Buttons,
+  // OpkMan
+  opkman_VirtualTrees, opkman_common, opkman_serializablepackages, opkman_const,
+  opkman_options, opkman_packagedetailsfrm;
 
 
 type
@@ -161,7 +164,6 @@ var
   VisualTree: TVisualTree = nil;
 
 implementation
-uses opkman_const, opkman_options, opkman_packagedetailsfrm;
 
 { TVisualTree }
 
diff --git a/components/onlinepackagemanager/opkman_zipper.pas b/components/onlinepackagemanager/opkman_zipper.pas
index 3e2f43cc6b..60d1845865 100644
--- a/components/onlinepackagemanager/opkman_zipper.pas
+++ b/components/onlinepackagemanager/opkman_zipper.pas
@@ -31,7 +31,11 @@ unit opkman_zipper;
 interface
 
 uses
-  Classes, SysUtils, FileUtil, LazFileUtils, strutils, opkman_timer,
+  Classes, SysUtils, strutils,
+  // LazUtils
+  FileUtil, LazFileUtils,
+  // OpkMan
+  opkman_timer, opkman_serializablepackages, opkman_common,
   {$IFDEF FPC311}zipper{$ELSE}opkman_zip{$ENDIF};
 
 type
@@ -117,8 +121,6 @@ var
 
 implementation
 
-uses opkman_serializablepackages, opkman_common;
-
 { TPackageUnZipper }
 
 procedure TPackageUnzipper.DoOnZipProgress;