Index: /trunk/src/VBox/HostServices/SharedFolders/shflhandle.h
===================================================================
--- /trunk/src/VBox/HostServices/SharedFolders/shflhandle.h	(revision 75335)
+++ /trunk/src/VBox/HostServices/SharedFolders/shflhandle.h	(revision 75336)
@@ -1,6 +1,5 @@
+/* $Id$ */
 /** @file
- *
- * Shared Folders:
- * Handles helper functions header.
+ * Shared Folders Host Service - Handles helper functions header.
  */
 
@@ -17,6 +16,6 @@
  */
 
-#ifndef __SHFLHANDLE__H
-#define __SHFLHANDLE__H
+#ifndef ___SHFLHANDLE_H
+#define ___SHFLHANDLE_H
 
 #include "shfl.h"
@@ -76,3 +75,3 @@
                                     SHFLHANDLE handle);
 
-#endif /* __SHFLHANDLE__H */
+#endif /* !___SHFLHANDLE_H */
Index: /trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp
===================================================================
--- /trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp	(revision 75335)
+++ /trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp	(revision 75336)
@@ -1904,5 +1904,5 @@
 
     /* Validate input */
-    if (   flags & ~(SHFL_REMOVE_FILE|SHFL_REMOVE_DIR|SHFL_RENAME_REPLACE_IF_EXISTS)
+    if (   flags & ~(SHFL_RENAME_FILE|SHFL_RENAME_DIR|SHFL_RENAME_REPLACE_IF_EXISTS)
         || pSrc == 0
         || pDest == 0)
@@ -1935,5 +1935,10 @@
         if (RT_SUCCESS(rc))
         {
-            if (flags & SHFL_RENAME_FILE)
+            if ((flags & (SHFL_RENAME_FILE | SHFL_RENAME_DIR)) == (SHFL_RENAME_FILE | SHFL_RENAME_DIR))
+            {
+                rc = RTPathRename(pszFullPathSrc, pszFullPathDest,
+                                  flags & SHFL_RENAME_REPLACE_IF_EXISTS ? RTPATHRENAME_FLAGS_REPLACE : 0);
+            }
+            else if (flags & SHFL_RENAME_FILE)
             {
                 rc = RTFileMove(pszFullPathSrc, pszFullPathDest,