diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 2546258325..ce640e5698 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,19 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-05-15 09:43 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/src/rtl/hbcom.c
+  * harbour/contrib/hbct/ctcom1.c
+  * harbour/contrib/hbct/ctcom2.c
+    * removed unused code and added parenthesis to pacify warning
+
+  * harbour/contrib/gtwvg/gtwvg.h
+  * harbour/contrib/gtwvg/wvggui.h
+  * harbour/contrib/hbwin/win_dlg.c
+    * updated included header files
+      (it fixes problem with BCC5.5 and POCC/XCC builds)
+
+
 2010-05-15 09:16 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/hbziparc/hbziparc.prg
     ! Fixed regression in HB_ZIPFILE() to make it work in
diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h
index c21d11a26a..aeab5fa14c 100644
--- a/harbour/contrib/gtwvg/gtwvg.h
+++ b/harbour/contrib/gtwvg/gtwvg.h
@@ -69,6 +69,7 @@
 #include <winuser.h>
 #include <commctrl.h>
 #if ! defined( HB_OS_WIN_CE )
+   #include <ole2.h>
    #include <olectl.h>
    #include <ocidl.h>
 #endif
diff --git a/harbour/contrib/gtwvg/wvggui.h b/harbour/contrib/gtwvg/wvggui.h
index b962a28ec4..22303bc4d8 100644
--- a/harbour/contrib/gtwvg/wvggui.h
+++ b/harbour/contrib/gtwvg/wvggui.h
@@ -68,6 +68,11 @@
 #include <windows.h>
 #include <winuser.h>
 #include <commctrl.h>
+#if ! defined( HB_OS_WIN_CE )
+   #include <ole2.h>
+   #include <olectl.h>
+   #include <ocidl.h>
+#endif
 #include <commdlg.h>
 #include <shellapi.h>
 
@@ -85,6 +90,10 @@
 
 #include "hbgtwvg.ch"
 
+#if defined( HB_OS_WIN_CE )
+   #include "hbwince.h"
+#endif
+
 HB_EXTERN_BEGIN
 
 /*----------------------------------------------------------------------*/
diff --git a/harbour/contrib/hbct/ctcom1.c b/harbour/contrib/hbct/ctcom1.c
index 1c5167dde2..d0666b878a 100644
--- a/harbour/contrib/hbct/ctcom1.c
+++ b/harbour/contrib/hbct/ctcom1.c
@@ -420,7 +420,7 @@ HB_FUNC( COM_READ )
    else
    {
       lLen = hb_comInputCount( iPort );
-      if( lLen < ( long ) sizeof( buffer ) >> 1 )
+      if( lLen < ( long ) ( sizeof( buffer ) >> 1 ) )
          lLen = sizeof( buffer );
       else
          lLen <<= 2;
diff --git a/harbour/contrib/hbct/ctcom2.c b/harbour/contrib/hbct/ctcom2.c
index b972244bbb..86e636d917 100644
--- a/harbour/contrib/hbct/ctcom2.c
+++ b/harbour/contrib/hbct/ctcom2.c
@@ -206,7 +206,6 @@ HB_FUNC( ZEROINSERT )
       nLen = hb_itemGetCLen( pString );
       uiVal = 0;
       nBits = 0;
-      uiVal = 0;
       /* NOTE: trailing zero accessed intentionally */
       for( n = 0; n <= nLen; ++n )
       {
diff --git a/harbour/contrib/hbwin/win_dlg.c b/harbour/contrib/hbwin/win_dlg.c
index e424dc6766..5b26a4d223 100644
--- a/harbour/contrib/hbwin/win_dlg.c
+++ b/harbour/contrib/hbwin/win_dlg.c
@@ -58,6 +58,9 @@
 #include "hbwin.h"
 #include "hbwapi.h"
 
+#if defined( __XCC__ )
+#  include <ole2.h>
+#endif
 #include <commdlg.h>
 
 /* WIN_PRINTDLGDC( [@<cDevice>], [<nFromPage>], [<nToPage>], [<nCopies>] )
diff --git a/harbour/src/rtl/hbcom.c b/harbour/src/rtl/hbcom.c
index 981e8c0169..ab44955f75 100644
--- a/harbour/src/rtl/hbcom.c
+++ b/harbour/src/rtl/hbcom.c
@@ -1833,8 +1833,6 @@ int hb_comInit( int iPort, int iBaud, int iParity, int iSize, int iStop )
          {
             if( iBaud )
                dcb.BaudRate = ( DWORD ) iBaud;
-            else
-               iBaud = ( int ) dcb.BaudRate;
             dcb.fBinary = 1;
             dcb.fParity = 0;
             dcb.fOutxCtsFlow = 0;