diff --git a/components/lazdebuggers/cmdlinedebuggerbase/debugprocess.pas b/components/lazdebuggers/cmdlinedebuggerbase/debugprocess.pas
index a0c225f7f4..e1cbc5148a 100644
--- a/components/lazdebuggers/cmdlinedebuggerbase/debugprocess.pas
+++ b/components/lazdebuggers/cmdlinedebuggerbase/debugprocess.pas
@@ -37,8 +37,12 @@ unit DebugProcess;
 interface
 
 uses
-  Classes, sysutils, LCLIntf, InterfaceBase, process,
-  Pipes, {$ifdef FORCE_LAZLOGGER_DUMMY} LazLoggerDummy {$else} LazLoggerBase {$endif}, UTF8Process;
+  Classes, sysutils, process, Pipes,
+  // LCL
+  InterfaceBase,
+  // LazUtils
+  {$ifdef FORCE_LAZLOGGER_DUMMY} LazLoggerDummy {$else} LazLoggerBase {$endif},
+  UTF8Process;
 
 type
 
diff --git a/ide/packages/idedebugger/idedebuggerbackendvalueconv.pas b/ide/packages/idedebugger/idedebuggerbackendvalueconv.pas
index e5ac3c4103..3d37122ad2 100644
--- a/ide/packages/idedebugger/idedebuggerbackendvalueconv.pas
+++ b/ide/packages/idedebugger/idedebuggerbackendvalueconv.pas
@@ -5,8 +5,13 @@ unit IdeDebuggerBackendValueConv;
 interface
 
 uses
-  Classes, SysUtils, fgl, Laz2_XMLCfg, LazClasses, lazCollections, IdeDebuggerUtils,
-  LazDebuggerValueConverter;
+  Classes, SysUtils, fgl,
+  // LazUtils
+  Laz2_XMLCfg, LazClasses, lazCollections,
+  // LazDebuggerIntf
+  LazDebuggerValueConverter,
+  // IdeDebugger
+  IdeDebuggerUtils;
 
 type
 
diff --git a/ide/packages/idedebugger/idedebuggeropts.pas b/ide/packages/idedebugger/idedebuggeropts.pas
index a771808e88..66cc170bd8 100644
--- a/ide/packages/idedebugger/idedebuggeropts.pas
+++ b/ide/packages/idedebugger/idedebuggeropts.pas
@@ -5,10 +5,19 @@ unit IdeDebuggerOpts;
 interface
 
 uses
-  Classes, SysUtils, IDEOptionsIntf, Laz2_XMLCfg, LazFileUtils, LazUTF8,
-  LazLoggerBase, Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite, DbgIntfDebuggerBase,
+  Classes, SysUtils,
+  // LazUtils
+  Laz2_XMLCfg, LazFileUtils, LazUTF8, LazLoggerBase,
+  Laz2_DOM, Laz2_XMLRead, Laz2_XMLWrite,
+  // BuildIntf
+  IDEOptionsIntf,
+  // IdeConfig
+  EnvironmentOpts,
+  // DebuggerIntf
+  DbgIntfDebuggerBase,
+  // IdeDebugger
   IdeDebuggerStringConstants, IdeDebuggerBackendValueConv,
-  IdeDebuggerValueFormatter, IdeDebuggerDisplayFormats, EnvironmentOpts;
+  IdeDebuggerValueFormatter, IdeDebuggerDisplayFormats;
 
 type
 
diff --git a/ide/sourcefilemanager.pas b/ide/sourcefilemanager.pas
index fc02571d1f..6438506cce 100644
--- a/ide/sourcefilemanager.pas
+++ b/ide/sourcefilemanager.pas
@@ -698,7 +698,6 @@ begin
     SourceEditorManager.ActiveEditor := NewSrcEdit;
     SourceEditorManager.ShowActiveWindowOnTop(True);
   end;
-  SrcNoteBook.UpdateStatusBar;
   SrcNotebook.BringToFront;
 
   Result:=mrOk;
diff --git a/lcl/include/customnotebook.inc b/lcl/include/customnotebook.inc
index 97bf16085a..5e5692980c 100644
--- a/lcl/include/customnotebook.inc
+++ b/lcl/include/customnotebook.inc
@@ -1245,7 +1245,8 @@ begin
   if HandleAllocated then
   begin
     if Assigned(Images) then
-      TWSCustomTabControlClass(WidgetSetClass).SetImageList(Self, Images.ResolutionForPPI[ImagesWidth, Font.PixelsPerInch, 1].Resolution) // to-do: support scaling factor
+      TWSCustomTabControlClass(WidgetSetClass).SetImageList(Self, // to-do: support scaling factor
+            Images.ResolutionForPPI[ImagesWidth,Font.PixelsPerInch,1].Resolution)
     else
       TWSCustomTabControlClass(WidgetSetClass).SetImageList(Self, nil);
   end;