diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f002d7ceff..aa0d05b5f2 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-06-15 08:41 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+  * harbour/contrib/hbxbp/apig.ch
+  * harbour/contrib/hbxbp/gra.ch
+  * harbour/contrib/hbxbp/hbxbp.hbc
+  * harbour/contrib/hbxbp/xbp.ch
+    - Copyright notice where not applicable.
+
 2009-06-15 16:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * utils/hbmk2/hbmk2.prg
     ! Fixed extension-less parameters not recognized as .prg
diff --git a/harbour/contrib/hbxbp/apig.ch b/harbour/contrib/hbxbp/apig.ch
index 530f95c9e5..9e4fec8f06 100644
--- a/harbour/contrib/hbxbp/apig.ch
+++ b/harbour/contrib/hbxbp/apig.ch
@@ -63,6 +63,8 @@
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/
 
+#ifndef _APIG_CH
+
 #define QT_PTROF( oObj )                          ( oObj:pPtr )
 
 #define QWS_THICKFRAME                            0
@@ -137,3 +139,6 @@
 #define QTC_MENU_ACTION                           4
 
 /*----------------------------------------------------------------------*/
+
+#define _APIG_CH
+#endif
diff --git a/harbour/contrib/hbxbp/gra.ch b/harbour/contrib/hbxbp/gra.ch
index b5252df4a1..e92535fe33 100644
--- a/harbour/contrib/hbxbp/gra.ch
+++ b/harbour/contrib/hbxbp/gra.ch
@@ -2,6 +2,11 @@
  * $Id$
  */
 
+#ifndef _GRA_CH
+
 #define GRA_CLR_INVALID                           -6
 
+#define _GRA_CH
+#endif
+
 
diff --git a/harbour/contrib/hbxbp/hbxbp.hbc b/harbour/contrib/hbxbp/hbxbp.hbc
index 3ead70361f..49e8790e1d 100644
--- a/harbour/contrib/hbxbp/hbxbp.hbc
+++ b/harbour/contrib/hbxbp/hbxbp.hbc
@@ -4,5 +4,5 @@
 
 incpaths=.
 
-libs=hbxbp
+libs=hbxbp hbwin
 libs=../hbqt/hbqt.hbc
diff --git a/harbour/contrib/hbxbp/xbp.ch b/harbour/contrib/hbxbp/xbp.ch
index 63145305b0..f31910557c 100644
--- a/harbour/contrib/hbxbp/xbp.ch
+++ b/harbour/contrib/hbxbp/xbp.ch
@@ -2,62 +2,8 @@
  * $Id$
  */
 
-/*
- * Harbour Project source code:
- * Header file for the WVT*Classes
- *
- * Copyright 2008 Pritpal Bedi <pritpal@vouchcac.com>
- * www - http://www.xharbour.org http://www.harbour-project.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this software; see the file COPYING.  If not, write to
- * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/).
- *
- * As a special exception, the Harbour Project gives permission for
- * additional uses of the text contained in its release of Harbour.
- *
- * The exception is that, if you link the Harbour libraries with other
- * files to produce an executable, this does not by itself cause the
- * resulting executable to be covered by the GNU General Public License.
- * Your use of that executable is in no way restricted on account of
- * linking the Harbour library code into it.
- *
- * This exception does not however invalidate any other reasons why
- * the executable file might be covered by the GNU General Public License.
- *
- * This exception applies only to the code released by the Harbour
- * Project under the name Harbour.  If you copy code from other
- * Harbour Project or Free Software Foundation releases into a copy of
- * Harbour, as the General Public License permits, the exception does
- * not apply to the code that you add in this way.  To avoid misleading
- * anyone as to the status of such modified files, you must delete
- * this exception notice from them.
- *
- * If you write modifications of your own for Harbour, it is your choice
- * whether to permit this exception to apply to your modifications.
- * If you do not wish that, delete this exception notice.
- *
- */
-
-/*----------------------------------------------------------------------*/
-/*                                 xbp.ch                               */
-/*----------------------------------------------------------------------*/
 
 #ifndef  _XBP_CH
-#define _XBP_CH
-
-/*----------------------------------------------------------------------*/
 
 #if defined( __HB_OUTDEBUG__ )
    #xtranslate HB_OUTDEBUG( [<x>] ) => WAPI_OUTPUTDEBUGSTRING( <x> )
@@ -91,15 +37,6 @@
 #define objTypeScrollBar                          21
 #define objTypeTabPage                            22
 
-/*----------------------------------------------------------------------*/
-/*  NMHDR info */
-
-#define NMH_code                                  1
-#define NMH_controlID                             2
-#define NMH_hWnd                                  3
-#define NMH_dwItemSpec                            4  /* NMHMOUSE    */
-#define NMH_action                                4  /* NMHTREEVIEW */
-
 /*----------------------------------------------------------------------*/
 
 #define EVENT_HANDELLED                           0
@@ -231,10 +168,8 @@
 #define XBPMENUBAR_MIA_DEFAULT                    65536
 #define XBPMENUBAR_MIA_OWNERDRAW                  131072
 
-#ifndef __DBG_PARTS__
-   #xtranslate hb_ToOutDebug( [<x,...>] ) =>
-#endif
 
-#endif /* #ifndef _XBP_CH */
+#define _XBP_CH
+#endif 
 
 /*----------------------------------------------------------------------*/