diff --git a/ChangeLog.txt b/ChangeLog.txt
index 05005001a7..4c1b760633 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,10 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-09-09 12:55 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/common/hbfsapi.c
+    * pacified warnings OS2 warnings reported by David
+
 2015-09-09 01:29 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/rtl/filesys.c
     * implemented hb_fsSetDevMode() only for DOS builds,
diff --git a/src/common/hbfsapi.c b/src/common/hbfsapi.c
index 8e6ad5a058..8922f1535b 100644
--- a/src/common/hbfsapi.c
+++ b/src/common/hbfsapi.c
@@ -336,9 +336,9 @@ HB_BOOL hb_isWSeB( void )
 
       /* what is the suggested form? [druzus] */
 #if 1
-      ret = DosQueryModuleHandle( "DOSCALLS", &hModule );
+      ret = DosQueryModuleHandle( ( PCSZ ) "DOSCALLS", &hModule );
 #else
-      ret = DosLoadModule( NULL, 0, "DOSCALL1", &hModule );
+      ret = DosLoadModule( NULL, 0, ( PCSZ ) "DOSCALL1", &hModule );
 #endif
       if( ret == NO_ERROR )
          ret = DosQueryProcAddr( hModule, 981, NULL, ( PFN * ) &s_DosOpenL );
@@ -465,7 +465,7 @@ HB_BOOL hb_fsOS2QueryPathInfo( const char * pszPathName,
    HB_BOOL fIsWSeB = hb_isWSeB();
 
    pszPathName = hb_fsNameConv( pszPathName, &pszFree );
-   ret = DosFindFirst( pszPathName, &hdirFindHandle,
+   ret = DosFindFirst( ( PCSZ ) pszPathName, &hdirFindHandle,
                        FILE_ARCHIVED | FILE_DIRECTORY |
                        FILE_SYSTEM | FILE_HIDDEN | FILE_READONLY,
                        &findBuffer, sizeof( findBuffer ), &ulFindCount,
@@ -531,8 +531,7 @@ HB_BOOL hb_fsNameExists( const char * pszFileName )
       if( lpFree )
          hb_xfree( lpFree );
 #elif defined( HB_OS_OS2 )
-      fExist = hb_fsOS2QueryPathInfo( ( PCSZ ) pszFileName,
-                                      NULL, NULL, NULL, NULL );
+      fExist = hb_fsOS2QueryPathInfo( pszFileName, NULL, NULL, NULL, NULL );
 #else
       char * pszFree = NULL;
 
@@ -589,8 +588,7 @@ HB_BOOL hb_fsFileExists( const char * pszFileName )
          hb_xfree( lpFree );
 #elif defined( HB_OS_OS2 )
       HB_FATTR nAttr;
-      fExist = hb_fsOS2QueryPathInfo( ( PCSZ ) pszFileName,
-                                      NULL, &nAttr, NULL, NULL ) &&
+      fExist = hb_fsOS2QueryPathInfo( pszFileName, NULL, &nAttr, NULL, NULL ) &&
                ( nAttr & HB_FA_DIRECTORY ) == 0;
 #else
       char * pszFree = NULL;
@@ -651,8 +649,7 @@ HB_BOOL hb_fsDirExists( const char * pszDirName )
          hb_xfree( lpFree );
 #elif defined( HB_OS_OS2 )
       HB_FATTR nAttr;
-      fExist = hb_fsOS2QueryPathInfo( ( PCSZ ) pszDirName,
-                                      NULL, &nAttr, NULL, NULL ) &&
+      fExist = hb_fsOS2QueryPathInfo( pszDirName, NULL, &nAttr, NULL, NULL ) &&
                ( nAttr & HB_FA_DIRECTORY ) != 0;
 #else
       char * pszFree = NULL;