diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index da9d75ef46..63a0c6fe41 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,18 @@
    2008-12-31 13:59 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2008-07-02 18:39 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/hbodbc/Makefile
+    * added test for header files in non W32 builds
+      ODBC is not standard system part in other then MS-Window platforms
+
+  * harbour/contrib/hbgf/hbgfgtk/Makefile
+    * updated path check for GTK header files
+      In fact it still can give wrong results in different
+      Linux or other *nixes distributions. The real path to GTK
+      header files is unknown and should be always tested by
+      pkg-config
+
 2008-07-02 15:34 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/contrib/hbziparch/hbziparc.c
     - removed HB_FUNC_EXIT( HBZIPCLEANUP )
diff --git a/harbour/contrib/hbgf/hbgfgtk/Makefile b/harbour/contrib/hbgf/hbgfgtk/Makefile
index fc89d3417c..6bd4368adc 100644
--- a/harbour/contrib/hbgf/hbgfgtk/Makefile
+++ b/harbour/contrib/hbgf/hbgfgtk/Makefile
@@ -9,7 +9,7 @@ LIBNAME=hbgfgtk
 ifeq ($(HB_ARCHITECTURE),linux)
 
 ifeq ($(HB_INC_GTK),)
-HB_INC_GTK = /usr/include
+HB_INC_GTK = /usr/include /usr/include/glib-2.0/
 endif
 HB_INC_GTK_OK += $(foreach d, $(HB_INC_GTK), $(if $(wildcard $(d)/glib.h),$(d),))
 
diff --git a/harbour/contrib/hbodbc/Makefile b/harbour/contrib/hbodbc/Makefile
index 2dbe6bdf7d..380077a594 100644
--- a/harbour/contrib/hbodbc/Makefile
+++ b/harbour/contrib/hbodbc/Makefile
@@ -10,6 +10,24 @@ ifeq ($(HB_COMPILER),rsxnt)
 HB_WITHOUT_ODBC=yes
 endif
 
+ifneq ($(HB_ARCHITECTURE),w32)
+ifeq ($(HB_WITHOUT_ODBC),)
+
+ifeq ($(HB_INC_ODBC),)
+HB_INC_ODBC = /usr/include /usr/local/include
+endif
+
+HB_INC_ODBC_OK += $(foreach d, $(HB_INC_ODBC), $(if $(wildcard $(d)/sql.h),$(d),))
+
+ifneq ($(strip $(HB_INC_ODBC_OK)),)
+C_USR += $(foreach d, $(HB_INC_ODBC_OK), -I$(d))
+else
+HB_WITHOUT_ODBC=yes
+endif
+
+endif
+endif
+
 ifneq ($(HB_WITHOUT_ODBC),yes)
 
 C_SOURCES= \