diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bcac2689a6..c266c40947 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,7 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
-2009-06-19 09:20 UTC+0600 April White (april@users.sourceforge.net)
+2009-06-19 09:52 UTC+0600 April White (april users.sourceforge.net)
+  * contrib/hbblat/blatcls.prg
+  * contrib/hbgd/gdimage.prg
+  * contrib/xhb/hblog.prg
+  * contrib/xhb/stream.prg
+  * contrib/xhb/ttable.prg
+    * reverted to 'procedure' declaration as methods fail to compile without
+      a return value; will address this within the new hbextern
+
+2009-06-19 09:20 UTC+0600 April White (april users.sourceforge.net)
   * contrib/hbblat/blatcls.prg
   * contrib/hbgd/gdimage.prg
   * contrib/xhb/hblog.prg
@@ -251,7 +260,7 @@
   * utils/hbmk2/hbmk2.prg
     + Added -skip option support to .hbm files.
 
-2009-06-18 16:14 UTC+0600 April White (april@users.sourceforge.net)
+2009-06-18 16:14 UTC+0600 April White (april users.sourceforge.net)
   * source/rtl/mlcfunc.c
     * detect if parameter is a string vs array
     * allocate memory for the array before resetting the counter
diff --git a/harbour/contrib/hbblat/blatcls.prg b/harbour/contrib/hbblat/blatcls.prg
index a630075818..745d141d37 100644
--- a/harbour/contrib/hbblat/blatcls.prg
+++ b/harbour/contrib/hbblat/blatcls.prg
@@ -221,7 +221,7 @@ METHOD Send() CLASS HBBlat
 
    RETURN ::nError
 
-METHOD Check() CLASS HBBlat
+PROCEDURE Check() CLASS HBBlat
 
    // Not using registry, so every parameter has to be explicity set
    // No control apart from existence
diff --git a/harbour/contrib/hbgd/gdimage.prg b/harbour/contrib/hbgd/gdimage.prg
index f0c5c1df5a..03c5d5d73a 100644
--- a/harbour/contrib/hbgd/gdimage.prg
+++ b/harbour/contrib/hbgd/gdimage.prg
@@ -298,7 +298,7 @@ METHOD New( sx, sy ) CLASS GDImage
    ::Create( sx, sy )
 RETURN Self
 
-METHOD Destruct() CLASS GDImage
+PROCEDURE Destruct() CLASS GDImage
   //__OutDebug( "Destroyed" )
   IF ::lDestroy
      ::Destroy()
diff --git a/harbour/contrib/xhb/hblog.prg b/harbour/contrib/xhb/hblog.prg
index 72ed1b3652..955b4f84b3 100644
--- a/harbour/contrib/xhb/hblog.prg
+++ b/harbour/contrib/xhb/hblog.prg
@@ -251,7 +251,7 @@ RETURN Self
 * Open all the channels calling their ::Open() method
 */
 
-METHOD Open() CLASS HB_Logger
+PROCEDURE Open() CLASS HB_Logger
 
    LOCAL oChannel
 
@@ -268,7 +268,7 @@ RETURN
 /**
 * Close all the channels calling their ::Close() method
 */
-METHOD Close() CLASS HB_Logger
+PROCEDURE Close() CLASS HB_Logger
 
    LOCAL oChannel
 
@@ -285,7 +285,7 @@ RETURN
 /**
 * Send a log message to all the channels
 */
-METHOD Log( cMessage, nPriority ) CLASS HB_Logger
+PROCEDURE Log( cMessage, nPriority ) CLASS HB_Logger
    LOCAL oChannel
 
    IF nPriority == NIL
@@ -344,7 +344,7 @@ RETURN Self
 * if the log level is higher or equal than the channel setting
 */
 
-METHOD Log( nStyle, cMessage, cName, nPriority ) CLASS HB_LogChannel
+PROCEDURE Log( nStyle, cMessage, cName, nPriority ) CLASS HB_LogChannel
 
    IF nPriority <= ::nLevel .and. ::lActive
       ::Send( nStyle, cMessage, cName, nPriority )
@@ -459,7 +459,7 @@ METHOD Close( cName ) CLASS HB_LogConsole
 
 RETURN .T.
 
-METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogConsole
+PROCEDURE Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogConsole
 
    IF ::lRealConsole
       OutStd( ::Format( nStyle, cMessage, cName, nPriority ), HB_OSnewLine() )
@@ -657,7 +657,7 @@ METHOD New( nLevel, nMaxLevel ) CLASS HB_LogDebug
 
 RETURN Self
 
-METHOD Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogDebug
+PROCEDURE Send( nStyle, cMessage, cName, nPriority ) CLASS HB_LogDebug
 
    IF .not. Empty( ::nMaxLevel )
       IF nPriority < ::nMaxLevel
diff --git a/harbour/contrib/xhb/stream.prg b/harbour/contrib/xhb/stream.prg
index 29effdd64f..f53fb70f9c 100644
--- a/harbour/contrib/xhb/stream.prg
+++ b/harbour/contrib/xhb/stream.prg
@@ -94,7 +94,7 @@ CREATE CLASS TStream
 
 ENDCLASS
 
-METHOD CopyTo( oTargetStream ) CLASS TStream
+PROCEDURE CopyTo( oTargetStream ) CLASS TStream
 
    LOCAL nBytesToRead := ::nLength
    LOCAL sBuffer := Space( BUFFER_SIZE )
@@ -164,7 +164,7 @@ METHOD New( cFile, nMode ) CLASS TStreamFileReader
 
    RETURN Self
 
-METHOD Finalize CLASS TStreamFileReader
+PROCEDURE Finalize CLASS TStreamFileReader
    ::Close()
    RETURN
 
@@ -242,7 +242,7 @@ METHOD New( cFile, nMode ) CLASS TStreamFileWriter
 
    RETURN Self
 
-METHOD Finalize CLASS TStreamFileWriter
+PROCEDURE Finalize CLASS TStreamFileWriter
    ::Close()
    RETURN
 
@@ -260,7 +260,7 @@ METHOD Write( sBuffer, nOffset, nCount ) CLASS TStreamFileWriter
 
    RETURN nWritten
 
-METHOD WriteByte( cByte ) CLASS TStreamFileWriter
+PROCEDURE WriteByte( cByte ) CLASS TStreamFileWriter
 
    LOCAL nWritten := FWrite( ::Handle, cByte, 1 )
 
diff --git a/harbour/contrib/xhb/ttable.prg b/harbour/contrib/xhb/ttable.prg
index c8b439fc83..7e291d94be 100644
--- a/harbour/contrib/xhb/ttable.prg
+++ b/harbour/contrib/xhb/ttable.prg
@@ -574,7 +574,7 @@ METHOD NEW( cAlias ) CLASS HBRecord
 RETURN Self
 
 
-METHOD GET() CLASS HBRecord
+PROCEDURE GET() CLASS HBRecord
 
    LOCAL xField
 
@@ -586,7 +586,7 @@ METHOD GET() CLASS HBRecord
 RETURN
 
 
-METHOD Put() CLASS HBRecord
+PROCEDURE Put() CLASS HBRecord
 
    LOCAL xField
 
@@ -850,7 +850,7 @@ METHOD OPEN() CLASS HBTable
 RETURN ( lSuccess )
 
 
-METHOD DBMove( nDirection ) CLASS HBTable
+PROCEDURE DBMove( nDirection ) CLASS HBTable
 
    DEFAULT nDirection TO 0
 
@@ -943,7 +943,7 @@ METHOD FldInit() CLASS HBTable
 RETURN oNew
 
 
-METHOD READ( lKeepBuffer ) CLASS HBTable
+PROCEDURE READ( lKeepBuffer ) CLASS HBTable
 
    LOCAL i
    LOCAL nSel   := SELECT( ::Alias )
@@ -973,7 +973,7 @@ METHOD READ( lKeepBuffer ) CLASS HBTable
 RETURN
 
 
-METHOD ReadBlank( lKeepBuffer ) CLASS HBTable
+PROCEDURE ReadBlank( lKeepBuffer ) CLASS HBTable
 
    LOCAL i
    LOCAL nSel   := SELECT( ::Alias )
@@ -1417,7 +1417,7 @@ RETURN aRet
 // Relation Methods
 //
 
-METHOD AddChild( oChild, cKey ) CLASS HBTable                 // ::addChild()
+PROCEDURE AddChild( oChild, cKey ) CLASS HBTable                 // ::addChild()
 
    AADD( ::aChildren, { oChild, cKey } )
    oChild:oParent := Self
@@ -1447,13 +1447,13 @@ METHOD CreateTable( cFile ) CLASS HBTable
 RETURN Self
 
 
-METHOD AddField( f, t, l, d ) CLASS HBTable
+PROCEDURE AddField( f, t, l, d ) CLASS HBTable
 
    AADD( ::aStruc, { f, t, l, d } )
 RETURN
 
 
-METHOD Gentable() CLASS HBTable
+PROCEDURE Gentable() CLASS HBTable
 
    DBCREATE( ::cDbf, ::aStruc, ::Driver )
 RETURN
@@ -1544,7 +1544,7 @@ METHOD New( cTag, cKey, cLabel, cFor, cWhile, lUnique, bEval, nInterval, cOrderB
 RETURN Self
 
 
-METHOD Create() CLASS HBOrder
+PROCEDURE Create() CLASS HBOrder
 
    DEFAULT ::cOrderBag TO ::oTable:cOrderBag
    //? "<<<",::alias, ::cOrderBag