diff --git a/components/jvcllaz/run/JvCore/JvThemes.pas b/components/jvcllaz/run/JvCore/JvThemes.pas
index 97c6f6f00..aa364dce5 100644
--- a/components/jvcllaz/run/JvCore/JvThemes.pas
+++ b/components/jvcllaz/run/JvCore/JvThemes.pas
@@ -25,26 +25,17 @@ Known Issues:
 unit JvThemes;
 
 {$mode objfpc}{$H+}
-{$DEFINE JVCLThemesEnabled}
 
+{$DEFINE JVCLThemesEnabled}
 {$DEFINE COMPILER7_UP}
 
-(*
-{$I jvcl.inc}
-{$IFDEF JVCLThemesEnabled}
-{$I windowsonly.inc}
-{$ENDIF JVCLThemesEnabled}
-*)
 
 interface
 
 uses
-{
-  Windows, Messages, CommCtrl,
-  }
   Types, SysUtils, Classes, Contnrs,
   {$IFDEF JVCLThemesEnabled}
-  Themes, UxTheme,
+  Themes,
   {$ENDIF JVCLThemesEnabled}
   Controls, Forms, Graphics, Buttons;
 
diff --git a/components/jvcllaz/run/JvCtrls/JvHtControls.pas b/components/jvcllaz/run/JvCtrls/JvHtControls.pas
index d92172319..3c72190c3 100644
--- a/components/jvcllaz/run/JvCtrls/JvHtControls.pas
+++ b/components/jvcllaz/run/JvCtrls/JvHtControls.pas
@@ -109,9 +109,9 @@ unit JvHtControls;
 interface
 
 uses
-  SysUtils, Classes,
-  {LMessages,} Graphics, {Contnrs,} Controls, StdCtrls, Dialogs,
-  JvJVCLUtils, {JvDataSourceIntf,} Types, LCLType{, JvExStdCtrls};
+  LCLType, {LMessages,} Types,
+  SysUtils, Classes, Graphics, {Contnrs,} Controls, StdCtrls, Dialogs,
+  JvJVCLUtils {JvDataSourceIntf, JvExStdCtrls} ;
 
 const
   DefaultSuperSubScriptRatio: Double = 2/3;
diff --git a/components/jvcllaz/run/JvCustomControls/JvBaseThumbnail.pas b/components/jvcllaz/run/JvCustomControls/JvBaseThumbnail.pas
index 9c2ea55aa..d9632ee52 100644
--- a/components/jvcllaz/run/JvCustomControls/JvBaseThumbnail.pas
+++ b/components/jvcllaz/run/JvCustomControls/JvBaseThumbnail.pas
@@ -184,7 +184,7 @@ function ReplaceAllStr(const Str, SearchFor, ReplaceWith: string;
 implementation
 
 uses
-  SysUtils, Types, //LazFileUtils,
+  SysUtils, Types,
   JvJCLUtils, JvThemes;
 
 function ReplaceAllStr(const Str, SearchFor, ReplaceWith: string;
diff --git a/components/jvcllaz/run/JvCustomControls/JvTabBar.pas b/components/jvcllaz/run/JvCustomControls/JvTabBar.pas
index c072e20ac..d4e4c1477 100644
--- a/components/jvcllaz/run/JvCustomControls/JvTabBar.pas
+++ b/components/jvcllaz/run/JvCustomControls/JvTabBar.pas
@@ -32,7 +32,6 @@ interface
 
 uses
   LCLIntf, LCLType, LMessages, Types,
-//  Windows, Messages,
   Graphics, Controls, Forms, ImgList, Menus, Buttons,
   ExtCtrls, SysUtils, Classes, Contnrs, Themes;
 
diff --git a/components/jvcllaz/run/JvJans/JvMarkupLabel.pas b/components/jvcllaz/run/JvJans/JvMarkupLabel.pas
index d3777a020..81b70ce3e 100644
--- a/components/jvcllaz/run/JvJans/JvMarkupLabel.pas
+++ b/components/jvcllaz/run/JvJans/JvMarkupLabel.pas
@@ -32,9 +32,7 @@ unit JvMarkupLabel;
 interface
 
 uses
-  //Messages,
-  Graphics, Controls,
-  SysUtils, Classes,
+  Graphics, Controls, SysUtils, Classes,
   JvMarkupCommon;
 
 type
diff --git a/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas b/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas
index dd95b888d..656fbe4c5 100644
--- a/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas
+++ b/components/jvcllaz/run/JvRuntimeDesign/jvdesignutils.pas
@@ -9,7 +9,8 @@ uses
   {$IFDEF UNITVERSIONING}
   JclUnitVersioning,
   {$ENDIF UNITVERSIONING}
-  SysUtils, LCLProc, LCLType, LResources, LCLIntf, LMessages,    Classes, Controls, Graphics, Forms, dialogs;
+  SysUtils, LCLProc, LCLType, LResources, LCLIntf, LMessages,
+  Classes, Controls, Graphics, Forms, dialogs;
 
 type
   TDesignerDCFlag = (