diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b4fce2e1dd..06301e370e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,15 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-02-12 10:50 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/pp/ppcore.c
+    ! fix line numbering when preprocess static buffers, f.e. by
+       __PP_PROCESS()
+
+  * harbour/source/rtl/strcase.c
+  * harbour/source/rtl/transfrm.c
+    - removed unnecessary extern PHB_CODEPAGE hb_cdp_page;
+
 2007-02-09 00:28 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
    * harbour/source/rtl/isprint.c
    * harbour/include/hbapi.h
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 3f5168a4cf..bc539ce338 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -1636,6 +1636,7 @@ static PHB_PP_FILE hb_pp_FileBufNew( char * pLineBuf, ULONG ulLineBufLen )
 
    pFile->pLineBuf = pLineBuf;
    pFile->ulLineBufLen = ulLineBufLen;
+   pFile->iLastLine = 1;
 
    return pFile;
 }
diff --git a/harbour/source/rtl/strcase.c b/harbour/source/rtl/strcase.c
index 48928df404..8ce2e713ee 100644
--- a/harbour/source/rtl/strcase.c
+++ b/harbour/source/rtl/strcase.c
@@ -57,8 +57,6 @@
 #include "hbapierr.h"
 #include "hbapicdp.h"
 
-extern PHB_CODEPAGE hb_cdp_page;
-
 /* converts szText to lower case. Does not create a new string! */
 char * hb_strLower( char * szText, ULONG ulLen )
 {
diff --git a/harbour/source/rtl/transfrm.c b/harbour/source/rtl/transfrm.c
index 842c7accbf..038d4f3119 100644
--- a/harbour/source/rtl/transfrm.c
+++ b/harbour/source/rtl/transfrm.c
@@ -86,7 +86,6 @@
 #define PF_WIDTH      0x0800   /* @S */
 #define PF_PARNEGWOS  0x1000   /* @) Similar to PF_PARNEG but without leading spaces */
 
-extern PHB_CODEPAGE hb_cdp_page;
 #define TOUPPER(c)    ((hb_cdp_page->nChars)? (char)hb_cdp_page->s_upper[(UCHAR)c] : (char)toupper((UCHAR)(c)))
 
 HB_FUNC( TRANSFORM )