diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bf122d399f..1e4a830af3 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-08-26 22:41 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+   * contrib/gtalleg/Makefile
+     * Excluded for POCC and XCC.
+
+   * contrib/gtalleg/ssf.h
+     ! Setting platform before include Allegro headers.
+       (I'm not sure this is necessary for all platforms, 
+       but it surely is for BCC and MinGW).
+
+   * contrib/gtwvg/gtwvg.h
+     ! __MINGW__ -> __MINGW32__. __MINGW__ is not #defined by MinGW.
+
 2008-08-26 22:23 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
    * contrib/hbct/atnum.c
      ! Workaround for PelleC 5.00.1 bug in AMD64 mode.
diff --git a/harbour/contrib/gtalleg/Makefile b/harbour/contrib/gtalleg/Makefile
index 66ee65f42c..123760ed5e 100644
--- a/harbour/contrib/gtalleg/Makefile
+++ b/harbour/contrib/gtalleg/Makefile
@@ -6,6 +6,9 @@ ROOT = ../../
 
 LIBNAME=gtalleg
 
+ifneq ($(HB_ARCHITECTURE),pocc)
+ifneq ($(HB_ARCHITECTURE),xcc)
+
 ifeq ($(HB_INC_ALLEGRO),)
 ifeq ($(HB_XBUILD),)
 HB_INC_ALLEGRO = /usr/include
@@ -27,3 +30,9 @@ include $(TOP)$(ROOT)config/lib.cf
 else
 include $(TOP)$(ROOT)config/none.cf
 endif
+else
+include $(TOP)$(ROOT)config/none.cf
+endif
+else
+include $(TOP)$(ROOT)config/none.cf
+endif
diff --git a/harbour/contrib/gtalleg/ssf.h b/harbour/contrib/gtalleg/ssf.h
index ab8fecd960..9bc1babd53 100644
--- a/harbour/contrib/gtalleg/ssf.h
+++ b/harbour/contrib/gtalleg/ssf.h
@@ -65,6 +65,18 @@
 #if defined(__BORLANDC__)
    #define ALLEGRO_NO_ASM
    #define ALLEGRO_BCC32
+#elif defined(_MSC_VER)
+   #define ALLEGRO_MSVC
+#elif defined(__MINGW32__)
+   #define ALLEGRO_MINGW32
+#elif defined(__DMC__)
+   #define ALLEGRO_DMC
+#elif defined(__DJGPP__)
+   #define ALLEGRO_DJGPP
+#elif defined(__WATCOMC__)
+   #define ALLEGRO_WATCOM
+#elif defined(HB_OS_DARWIN)
+   #define ALLEGRO_MACOSX
 #endif
 
 #include <allegro.h>
diff --git a/harbour/contrib/gtwvg/gtwvg.h b/harbour/contrib/gtwvg/gtwvg.h
index 82f744960f..91b7beb6a0 100644
--- a/harbour/contrib/gtwvg/gtwvg.h
+++ b/harbour/contrib/gtwvg/gtwvg.h
@@ -77,7 +77,7 @@
 #include <oleauto.h>
 #include <olectl.h>
 #include <commdlg.h>
-#if defined(__MINGW__)
+#if defined(__MINGW32__)
 #   include <comctl32.h>
 #endif
 #include <shlobj.h>