Index: /trunk/src/VBox/Frontends/Common/PasswordInput.h
===================================================================
--- /trunk/src/VBox/Frontends/Common/PasswordInput.h	(revision 80572)
+++ /trunk/src/VBox/Frontends/Common/PasswordInput.h	(revision 80573)
@@ -16,6 +16,6 @@
  */
 
-#ifndef VBOX_INCLUDED_SRC_Common_PasswordFileImpl_h
-#define VBOX_INCLUDED_SRC_Common_PasswordFileImpl_h
+#ifndef VBOX_INCLUDED_SRC_Common_PasswordInput_h
+#define VBOX_INCLUDED_SRC_Common_PasswordInput_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -32,3 +32,3 @@
 RTEXITCODE settingsPasswordFile(ComPtr<IVirtualBox> virtualBox, const char *pszFilename);
 
-#endif /* !VBOX_INCLUDED_SRC_VBoxAutostart_VBoxAutostart_h */
+#endif /* !VBOX_INCLUDED_SRC_Common_PasswordInput_h */
Index: /trunk/src/VBox/Frontends/VBoxAutostart/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VBoxAutostart/Makefile.kmk	(revision 80572)
+++ /trunk/src/VBox/Frontends/VBoxAutostart/Makefile.kmk	(revision 80573)
@@ -30,5 +30,5 @@
 	VBoxAutostart-win.cpp \
 	../Common/PasswordInput.cpp
- VBoxAutostartSvc_LIBS.win += Secur32.lib	
+ VBoxAutostartSvc_LIBS.win += Secur32.lib
 else
  PROGRAMS += VBoxAutostart
Index: /trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp	(revision 80572)
+++ /trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart-win.cpp	(revision 80573)
@@ -488,5 +488,5 @@
     int vrc = autostartGetServiceName(pszUser, sServiceName);
     if (!RT_FAILURE(vrc))
-        return autostartSvcDisplayError("delete - DeleteService failed, service name for user %s can not be constructed.\n", 
+        return autostartSvcDisplayError("delete - DeleteService failed, service name for user %s can not be constructed.\n",
                                         pszUser);
     /*
Index: /trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart.h
===================================================================
--- /trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart.h	(revision 80572)
+++ /trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart.h	(revision 80573)
@@ -322,3 +322,2 @@
 
 #endif /* !VBOX_INCLUDED_SRC_VBoxAutostart_VBoxAutostart_h */
-
Index: /trunk/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp
===================================================================
--- /trunk/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp	(revision 80572)
+++ /trunk/src/VBox/Main/src-all/MachineLaunchVMCommonWorker.cpp	(revision 80573)
@@ -127,5 +127,5 @@
         {
             /** @todo r=bird: Broken escaping rule, how to end a variable with '\\'?
-              * E.g. TMP=C:\TEMP\  */
+              * E.g. TMP=C:\\TEMP\\  */
             char const ch = *psz;
             if (   (ch == '\n' && (psz == pszEnvMutable || psz[-1] != '\\'))
Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 80572)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 80573)
@@ -7491,5 +7491,5 @@
          * sessions and the caller in the interactive one.
          */
-        fUseVBoxSDS = false; 
+        fUseVBoxSDS = false;
 
         /* Get windows session of the current process.  The process token used
@@ -7497,5 +7497,5 @@
            1. The token is absent for the current thread except someone set it
               for us.
-           2. Needs to get the id of the session where the process is started. 
+           2. Needs to get the id of the session where the process is started.
            We only need to do this once, though. */
         static DWORD s_idCurrentSession = ~(DWORD)0;