diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d1c0281517..a187750312 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,20 @@
    2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2009-04-08 11:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
+  * source/vm/maindllh.c
+  * source/vm/maindllp.c
+    ! Fixed for wce/poccarm's strange Windows headers.
+    ; Now this problem surfaced with wce/poccarm, and this one I really
+      cannot fix:
+      ---
+      hbmk: Processing configuration: C:\devl\hbvc-1.1\bin\hbmk.cfg
+      POLINK: error: Unresolved external symbol 'hb_wctomb'.
+      POLINK: fatal error: 1 unresolved external(s).
+      hbmk: Error: Running linker. 1:
+      polink.exe hbtest.obj rt_array.obj rt_date.obj rt_file.obj rt_hvm.obj rt_hvma.obj rt_math.obj rt_misc.obj rt_mt.obj rt_str.obj rt_stra.obj rt_trans.obj rt_class.obj rt_miscc.obj /libpath:C:\work\harbour-new\harbour\_hb_install_temp\harbour-wce-poccarm\lib  /subsystem:windows /out:C:\work\harbour-new\harbour\_hb_install_temp\harbour-wce-poccarm\bin\hbtest-dll.exe /libpath:C:\work\harbour-new\harbour\_hb_install_temp\harbour-wce-poccarm\bin harbour-11-arm.lib hbmainstd.lib hbmainwin.lib hbcplr.lib hbdebug.lib wininet.lib ws2.lib commdlg.lib commctrl.lib uuid.lib ole32.lib
+      ---
+
 2009-04-08 10:22 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * INSTALL
     * Cross build text fixed to be multiplatform.
diff --git a/harbour/source/vm/maindllh.c b/harbour/source/vm/maindllh.c
index 157af2d726..0369fce087 100644
--- a/harbour/source/vm/maindllh.c
+++ b/harbour/source/vm/maindllh.c
@@ -62,7 +62,11 @@
 
 #if defined( HB_OS_WIN )
 
+#if defined( HB_OS_WIN_CE ) && defined( __POCC__ )
+HB_EXPORT BOOL WINAPI HB_DLL_ENTRY_POINT( HANDLE hInstance, DWORD fdwReason, PVOID pvReserved )
+#else
 HB_EXPORT BOOL WINAPI HB_DLL_ENTRY_POINT( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )
+#endif
 {
    HB_TRACE( HB_TR_DEBUG, ("DllEntryPoint(%p, %p, %d)", hInstance, fdwReason,
              pvReserved ) );
diff --git a/harbour/source/vm/maindllp.c b/harbour/source/vm/maindllp.c
index d062da11c4..786ee8adc9 100644
--- a/harbour/source/vm/maindllp.c
+++ b/harbour/source/vm/maindllp.c
@@ -122,7 +122,11 @@ static FARPROC hb_getProcAddress( LPCSTR szProcName )
    return pProcAddr;
 }
 
+#if defined( HB_OS_WIN_CE ) && defined( __POCC__ )
+HB_EXPORT BOOL WINAPI HB_DLL_ENTRY_POINT( HANDLE hInstance, DWORD fdwReason, PVOID pvReserved )
+#else
 HB_EXPORT BOOL WINAPI HB_DLL_ENTRY_POINT( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserved )
+#endif
 {
    HB_TRACE( HB_TR_DEBUG, ("DllEntryPoint(%p, %p, %d)", hInstance, fdwReason,
              pvReserved ) );