diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a908cba488..effadf9e4d 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,18 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-09-16 12:59 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * utils/hbmk2/examples/contribf.hbc
+  * contrib/Makefile
+  - contrib/hbvpdf
+  + examples/hbvpdf
+    * Moved hbvpdf lib to examples section.
+      This code is barely updated and offers duplicate functionality
+      of superior hbhpdf lib.
+
+  * source/rtl/filesys.c
+    * Minor formatting.
+
 2009-09-16 11:07 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     - Deleted experimental status from beos target.
diff --git a/harbour/contrib/Makefile b/harbour/contrib/Makefile
index 43b8162855..cfa673f4b5 100644
--- a/harbour/contrib/Makefile
+++ b/harbour/contrib/Makefile
@@ -23,7 +23,6 @@ DIRS := \
    hbsqlit3 \
    hbtip \
    hbtpathy \
-   hbvpdf \
    hbwin \
    hbziparc \
    rddado \
diff --git a/harbour/contrib/hbvpdf/ChangeLog b/harbour/examples/hbvpdf/ChangeLog
similarity index 100%
rename from harbour/contrib/hbvpdf/ChangeLog
rename to harbour/examples/hbvpdf/ChangeLog
diff --git a/harbour/contrib/hbvpdf/Makefile b/harbour/examples/hbvpdf/Makefile
similarity index 100%
rename from harbour/contrib/hbvpdf/Makefile
rename to harbour/examples/hbvpdf/Makefile
diff --git a/harbour/contrib/hbvpdf/hbvpdf.ch b/harbour/examples/hbvpdf/hbvpdf.ch
similarity index 100%
rename from harbour/contrib/hbvpdf/hbvpdf.ch
rename to harbour/examples/hbvpdf/hbvpdf.ch
diff --git a/harbour/contrib/hbvpdf/hbvpdf.hbc b/harbour/examples/hbvpdf/hbvpdf.hbc
similarity index 100%
rename from harbour/contrib/hbvpdf/hbvpdf.hbc
rename to harbour/examples/hbvpdf/hbvpdf.hbc
diff --git a/harbour/contrib/hbvpdf/hbvpdf.prg b/harbour/examples/hbvpdf/hbvpdf.prg
similarity index 100%
rename from harbour/contrib/hbvpdf/hbvpdf.prg
rename to harbour/examples/hbvpdf/hbvpdf.prg
diff --git a/harbour/contrib/hbvpdf/hbvpdft.prg b/harbour/examples/hbvpdf/hbvpdft.prg
similarity index 100%
rename from harbour/contrib/hbvpdf/hbvpdft.prg
rename to harbour/examples/hbvpdf/hbvpdft.prg
diff --git a/harbour/contrib/hbvpdf/hbvpsup.prg b/harbour/examples/hbvpdf/hbvpsup.prg
similarity index 100%
rename from harbour/contrib/hbvpdf/hbvpsup.prg
rename to harbour/examples/hbvpdf/hbvpsup.prg
diff --git a/harbour/contrib/hbvpdf/tests/files/color.jpg b/harbour/examples/hbvpdf/tests/files/color.jpg
similarity index 100%
rename from harbour/contrib/hbvpdf/tests/files/color.jpg
rename to harbour/examples/hbvpdf/tests/files/color.jpg
diff --git a/harbour/contrib/hbvpdf/tests/files/color.tif b/harbour/examples/hbvpdf/tests/files/color.tif
similarity index 100%
rename from harbour/contrib/hbvpdf/tests/files/color.tif
rename to harbour/examples/hbvpdf/tests/files/color.tif
diff --git a/harbour/contrib/hbvpdf/tests/files/test.txt b/harbour/examples/hbvpdf/tests/files/test.txt
similarity index 100%
rename from harbour/contrib/hbvpdf/tests/files/test.txt
rename to harbour/examples/hbvpdf/tests/files/test.txt
diff --git a/harbour/contrib/hbvpdf/tests/hbmk.hbm b/harbour/examples/hbvpdf/tests/hbmk.hbm
similarity index 100%
rename from harbour/contrib/hbvpdf/tests/hbmk.hbm
rename to harbour/examples/hbvpdf/tests/hbmk.hbm
diff --git a/harbour/contrib/hbvpdf/tests/pdf_demo.prg b/harbour/examples/hbvpdf/tests/pdf_demo.prg
similarity index 100%
rename from harbour/contrib/hbvpdf/tests/pdf_demo.prg
rename to harbour/examples/hbvpdf/tests/pdf_demo.prg
diff --git a/harbour/contrib/hbvpdf/tests/tstpdf.prg b/harbour/examples/hbvpdf/tests/tstpdf.prg
similarity index 100%
rename from harbour/contrib/hbvpdf/tests/tstpdf.prg
rename to harbour/examples/hbvpdf/tests/tstpdf.prg
diff --git a/harbour/source/rtl/filesys.c b/harbour/source/rtl/filesys.c
index c7bd3fa45a..bcbff4d904 100644
--- a/harbour/source/rtl/filesys.c
+++ b/harbour/source/rtl/filesys.c
@@ -2115,14 +2115,14 @@ BOOL hb_fsLock( HB_FHANDLE hFileHandle, ULONG ulStart,
       {
          case FL_LOCK:
 
-            lock_info.l_type   = (uiMode & FLX_SHARED) ? F_RDLCK : F_WRLCK;
+            lock_info.l_type   = ( uiMode & FLX_SHARED ) ? F_RDLCK : F_WRLCK;
             lock_info.l_start  = ulStart;
             lock_info.l_len    = ulLength;
             lock_info.l_whence = SEEK_SET;   /* start from the beginning of the file */
             lock_info.l_pid    = getpid();
 
             bResult = ( fcntl( hFileHandle,
-                               (uiMode & FLX_WAIT) ? F_SETLKW: F_SETLK,
+                               ( uiMode & FLX_WAIT ) ? F_SETLKW: F_SETLK,
                                &lock_info ) >= 0 );
             break;
 
@@ -2251,14 +2251,14 @@ BOOL hb_fsLockLarge( HB_FHANDLE hFileHandle, HB_FOFFSET ulStart,
       {
          case FL_LOCK:
 
-            lock_info.l_type   = (uiMode & FLX_SHARED) ? F_RDLCK : F_WRLCK;
+            lock_info.l_type   = ( uiMode & FLX_SHARED ) ? F_RDLCK : F_WRLCK;
             lock_info.l_start  = ulStart;
             lock_info.l_len    = ulLength;
             lock_info.l_whence = SEEK_SET;   /* start from the beginning of the file */
             lock_info.l_pid    = getpid();
 
             bResult = ( fcntl( hFileHandle,
-                               (uiMode & FLX_WAIT) ? F_SETLKW64: F_SETLK64,
+                               ( uiMode & FLX_WAIT ) ? F_SETLKW64: F_SETLK64,
                                &lock_info ) != -1 );
             break;
 
@@ -2416,7 +2416,7 @@ HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT u
       hb_vmUnlock();
       if( llOffset < 0 && Flags == SEEK_SET )
       {
-         llPos = (HB_FOFFSET) -1;
+         llPos = ( HB_FOFFSET ) -1;
          hb_fsSetError( 25 ); /* 'Seek Error' */
       }
       else
@@ -2425,14 +2425,14 @@ HB_FOFFSET hb_fsSeekLarge( HB_FHANDLE hFileHandle, HB_FOFFSET llOffset, USHORT u
          hb_fsSetIOError( llPos != ( HB_FOFFSET ) -1, 0 );
       }
 
-      if( llPos == (HB_FOFFSET) -1 )
+      if( llPos == ( HB_FOFFSET ) -1 )
       {
          llPos = lseek64( hFileHandle, 0L, SEEK_CUR );
       }
       hb_vmLock();
    }
 #else
-   llPos = (HB_FOFFSET) hb_fsSeek( hFileHandle, ( LONG ) llOffset, uiFlags );
+   llPos = ( HB_FOFFSET ) hb_fsSeek( hFileHandle, ( LONG ) llOffset, uiFlags );
 #endif
 
    return llPos;
@@ -2787,7 +2787,7 @@ USHORT hb_fsChDrv( BYTE nDrive )
 {
    USHORT uiResult;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_fsChDrv(%d)", (int) nDrive));
+   HB_TRACE(HB_TR_DEBUG, ("hb_fsChDrv(%d)", ( int ) nDrive));
 
 #if defined( HB_OS_HAS_DRIVE_LETTER )
    {
@@ -2860,7 +2860,7 @@ USHORT hb_fsIsDrv( BYTE nDrive )
 {
    USHORT uiResult;
 
-   HB_TRACE(HB_TR_DEBUG, ("hb_fsIsDrv(%d)", (int) nDrive));
+   HB_TRACE(HB_TR_DEBUG, ("hb_fsIsDrv(%d)", ( int ) nDrive));
 
 #if defined( HB_OS_WIN ) && !defined( HB_OS_WIN_CE )
    {
diff --git a/harbour/utils/hbmk2/examples/contribf.hbc b/harbour/utils/hbmk2/examples/contribf.hbc
index 9d417baea9..a25fc3d0e1 100644
--- a/harbour/utils/hbmk2/examples/contribf.hbc
+++ b/harbour/utils/hbmk2/examples/contribf.hbc
@@ -6,7 +6,7 @@
 # [ This should be kept in sync with local Makefile information. ]
 
 # contribs portable, with no external dependencies:
-libs=hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnf hbtpathy hbvpdf hbziparc rddsql xhb
+libs=hbbmcdx hbbtree hbclipsm hbct hbgt hbmisc hbmzip hbnf hbtpathy hbziparc rddsql xhb
 
 # contribs portable, with external dependencies:
 libs=hbcurl hbfbird hbgd hbhpdf hbmysql hbpgsql hbqt hbtip sddfb sddmy sddpg