diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 3acf38e938..e41d7912ba 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,19 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-12-01 21:52 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+  * harbour/include/hbwince.h
+    ! Fixed compilation in C++ mode by renaming local variable
+      named "template" to "tmplt". "template" is a reserved
+      word in MSVC C++.
+    + Added few missing WINAPI function declarations under
+      MSVC WinCE.
+
+  * harbour/source/common/hbwince.c
+    ! Fixed compilation in C++ mode by renaming local variable
+      named "template" to "tmplt". "template" is a reserved
+      word in MSVC C++.
+
 2007-12-01 20:12 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
   * harbour/make_vcce.bat
     + Added existence verification of HB and HBPPGEN environment
diff --git a/harbour/include/hbwince.h b/harbour/include/hbwince.h
index dfee0caf11..e9760b7deb 100644
--- a/harbour/include/hbwince.h
+++ b/harbour/include/hbwince.h
@@ -119,7 +119,7 @@ extern char *strerror( int errnum );
    UINT WINAPI SetErrorMode( UINT mode );
    HANDLE WINAPI CreateFileA( LPCSTR filename, DWORD access,
                        DWORD sharing, LPSECURITY_ATTRIBUTES sa,
-                       DWORD creation, DWORD attributes, HANDLE template );
+                       DWORD creation, DWORD attributes, HANDLE tmplt );
    BOOL WINAPI MoveFileA( LPCSTR fn1, LPCSTR fn2 );
    BOOL WINAPI DeleteFileA( LPCSTR path );
    BOOL WINAPI RemoveDirectoryA( LPCSTR path );
@@ -143,6 +143,10 @@ extern char *strerror( int errnum );
    BOOL WINAPI GetKeyboardState( PBYTE p );
    BOOL WINAPI SetKeyboardState( PBYTE p );
 
+   int WINAPI FrameRect( HDC hDC, CONST RECT *lprc, HBRUSH hbr );
+   BOOL WINAPI FloodFill( HDC hdc, int x, int y, COLORREF color);
+   BOOL  WINAPI Arc( HDC hdc, int x1, int y1, int x2, int y2, int x3, int y3, int x4, int y4);
+
    #if defined( __POCC__ ) || defined( __XCC__ )
       #define GlobalAlloc(flags, cb)      LocalAlloc(flags, cb)
       #define GlobalLock(lp)              LocalLock(lp)
diff --git a/harbour/source/common/hbwince.c b/harbour/source/common/hbwince.c
index 611ab811d1..1f8ee235de 100644
--- a/harbour/source/common/hbwince.c
+++ b/harbour/source/common/hbwince.c
@@ -370,13 +370,13 @@ UINT WINAPI SetErrorMode( UINT mode )
 
 HANDLE WINAPI CreateFileA( LPCSTR filename, DWORD access,
                     DWORD sharing, LPSECURITY_ATTRIBUTES sa,
-                    DWORD creation, DWORD attributes, HANDLE template )
+                    DWORD creation, DWORD attributes, HANDLE tmplt )
 {
    LPWSTR wfilename;
    HANDLE h;
 
    wfilename = hb_mbtowc( filename );
-   h = CreateFileW( wfilename, access, sharing, sa, creation, attributes, template );
+   h = CreateFileW( wfilename, access, sharing, sa, creation, attributes, tmplt );
    hb_xfree( wfilename );
 
    return h;