diff --git a/components/thtmlport/package/gdipl2a.pas b/components/thtmlport/package/gdipl2a.pas
index 2e6ed2a5c..83087050c 100644
--- a/components/thtmlport/package/gdipl2a.pas
+++ b/components/thtmlport/package/gdipl2a.pas
@@ -16,7 +16,7 @@ uses
   Graphics;
 
 var
-  GDIPlusActive: boolean;
+  GDIPlusActive: boolean = False;
 
 type
   TGpImage = class(TObject)
diff --git a/components/thtmlport/package/htmlcomp.pas b/components/thtmlport/package/htmlcomp.pas
index 54cab4fb6..25634d1fa 100644
--- a/components/thtmlport/package/htmlcomp.pas
+++ b/components/thtmlport/package/htmlcomp.pas
@@ -7,9 +7,9 @@ unit HtmlComp;
 interface
 
 uses
-  HtmlCompReg, URLSubs, DitherUnit, FramBrwz, FramView, GDIPL2A,
-  HtmlGif1, HTMLGif2, HtmlMisc, Htmlsbs1, Htmlsubs, HTMLUn2, Htmlview, 
-  Readhtml, StylePars, StyleUn, LazarusPackageIntf;
+  HtmlCompReg, URLSubs, DitherUnit, FramBrwz, FramView, GDIPL2A, HtmlGif1, 
+  HTMLGif2, HtmlMisc, Htmlsbs1, Htmlsubs, htmlun2, htmlview, Readhtml, 
+  StylePars, StyleUn, LazarusPackageIntf;
 
 implementation
 
diff --git a/components/thtmlport/package/htmlcons.inc b/components/thtmlport/package/htmlcons.inc
index 739310610..1840666bc 100755
--- a/components/thtmlport/package/htmlcons.inc
+++ b/components/thtmlport/package/htmlcons.inc
@@ -119,6 +119,7 @@
 {$ENDIF}        
 
 {$IFDEF MSWINDOWS}
+{$IFDEF LCL}{$Define NoGDIPlus}{$ENDIF}
 {.$Define NoGDIPlus} {The gdiplus.dll provides Alpha transparency support for
         PNG images.  If, for some reason the use of the gdiplus.dll is
         undesirable, define "NoGDIPlus" by removing the '.'.  Defining both
diff --git a/components/thtmlport/package/htmlun2.pas b/components/thtmlport/package/htmlun2.pas
index d175f8927..cf2995c8c 100755
--- a/components/thtmlport/package/htmlun2.pas
+++ b/components/thtmlport/package/htmlun2.pas
@@ -28,16 +28,17 @@ URLCON.PAS are covered by separate copyright notices located in those modules.
 
 {$i htmlcons.inc}
 
-unit HTMLUn2;
+unit htmlun2;
 
 interface
+
 uses
   SysUtils, Classes,
   {$IFNDEF LCL}
    Windows, Messages,
   {$ELSE}
    LclIntf, LMessages, Types, LclType, LResources, IntfGraphics, HtmlMisc,
-  {$ENDIF} 
+  {$ENDIF}
   Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls, Clipbrd,
   StyleUn, GDIPL2A; 
 
@@ -485,7 +486,7 @@ function GetImageWidth(Image: TGpObject): integer;
 implementation
 
 uses
-   {$IFNDEF LCL} jpeg, {$ENDIF} DitherUnit,
+  {$IFNDEF LCL} jpeg, {$ENDIF} DitherUnit,
   {$ifndef NoOldPng}
      PngImage1,   
   {$endif}
diff --git a/components/thtmlport/package/htmlview.pas b/components/thtmlport/package/htmlview.pas
index ec696a799..4acffe152 100755
--- a/components/thtmlport/package/htmlview.pas
+++ b/components/thtmlport/package/htmlview.pas
@@ -28,7 +28,7 @@ URLCON.PAS are covered by separate copyright notices located in those modules.
 
 {$i htmlcons.inc}
 
-unit Htmlview;
+unit htmlview;
 
 interface
 
@@ -43,7 +43,7 @@ uses
   {$IFNDEF LCL}
    vwPrint, MetafilePrinter, mmSystem,
   {$ENDIF}
-  HTMLUn2, Forms, Dialogs, ExtCtrls, ReadHTML, HTMLSubs, StyleUn, Printers, Menus,
+  htmlun2, Forms, Dialogs, ExtCtrls, ReadHTML, HTMLSubs, StyleUn, Printers, Menus,
   GDIPL2A;
 
 const