diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 33b1dade2f..291b0e89d1 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-02 01:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/xhb/hbchksum.c
+   * contrib/xhb/hbcomprs.c
+   - contrib/xhb/hbcomprs.h
+   + contrib/xhb/hbcomprs.ch
+     - Removed unnecessary C header.
+     + Added xhb compatibility .ch header.
+
 2008-07-02 01:13 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * contrib/xhb/hbcomprs.c
    * contrib/xhb/hbcomprs.h
diff --git a/harbour/contrib/xhb/hbchksum.c b/harbour/contrib/xhb/hbchksum.c
index d8f7ca8ff4..aa244803b3 100644
--- a/harbour/contrib/xhb/hbchksum.c
+++ b/harbour/contrib/xhb/hbchksum.c
@@ -60,12 +60,9 @@
  * http://www.gzip.org/zlib/
  */
 
-#include "hbcomprs.h"
 #include "hbapi.h"
 #include "hbapiitm.h"
-#include "hbfast.h"
 #include "hbstack.h"
-#include "hbdefs.h"
 #include "hbvm.h"
 #include "hbapierr.h"
 
diff --git a/harbour/contrib/xhb/hbcomprs.c b/harbour/contrib/xhb/hbcomprs.c
index c68d8b31e4..6c7dec8ee4 100644
--- a/harbour/contrib/xhb/hbcomprs.c
+++ b/harbour/contrib/xhb/hbcomprs.c
@@ -50,8 +50,6 @@
  *
  */
 
-#include "hbcomprs.h"
-
 #include "hbapi.h"
 #include "hbapiitm.h"
 #include "hbstack.h"
diff --git a/harbour/contrib/xhb/hbcomprs.ch b/harbour/contrib/xhb/hbcomprs.ch
new file mode 100644
index 0000000000..101ba9b92f
--- /dev/null
+++ b/harbour/contrib/xhb/hbcomprs.ch
@@ -0,0 +1,88 @@
+/*
+ * $Id$
+ */
+
+/*
+ * xHarbour Project source code:
+ * Compression related functions
+ *
+ * Copyright 2003 Giancarlo Niccolai <giancarlo@niccolai.ws>
+ * www - http://www.xharbour.org
+ * SEE ALSO COPYRIGHT NOTICE FOR ZLIB BELOW.
+ *
+ * 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.
+ *
+ */
+
+/* This file is based upon ZLIB source code, whose copyright holder is:
+ *
+ * Copyright (C) 1995-2002 Jean-loup Gailly.
+ *
+ * Also, this file includes code slices from adler32.c for advanced CRC
+ * Holder of copyright for this code is:
+ *
+ * Copyright (C) 1995-2002 Mark Adler
+ *
+ * ZLIB (containing adler32 code) can be found at:
+ * http://www.gzip.org/zlib/
+ */
+
+#ifndef HB_COMPRESS_CH
+#define HB_COMPRESS_CH
+
+#define HB_Z_OK            0
+#define HB_Z_STREAM_END    1
+#define HB_Z_NEED_DICT     2
+#define HB_Z_ERRNO        (-1)
+#define HB_Z_STREAM_ERROR (-2)
+#define HB_Z_DATA_ERROR   (-3)
+#define HB_Z_MEM_ERROR    (-4)
+#define HB_Z_BUF_ERROR    (-5)
+#define HB_Z_VERSION_ERROR (-6)
+/* Return codes for the compression/decompression functions. Negative
+ * values are errors, positive values are used for special but normal events.
+ */
+
+#define HB_Z_NO_COMPRESSION         0
+#define HB_Z_BEST_SPEED             1
+#define HB_Z_BEST_COMPRESSION       9
+#define HB_Z_DEFAULT_COMPRESSION  (-1)
+
+#endif
diff --git a/harbour/contrib/xhb/hbcomprs.h b/harbour/contrib/xhb/hbcomprs.h
deleted file mode 100644
index 5db8e2f74e..0000000000
--- a/harbour/contrib/xhb/hbcomprs.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
- * $Id$
- */
-
-#include "hbzlib.h"