Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.cpp	(revision 70602)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.cpp	(revision 70603)
@@ -23,4 +23,5 @@
 # include "QIMainWindow.h"
 # include "VBoxGlobal.h"
+# include "UIDesktopWidgetWatchdog.h"
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -34,12 +35,12 @@
 void QIMainWindow::restoreGeometry()
 {
-#ifdef VBOX_WS_MAC
-    /* Use the old approach for OSX: */
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
+    /* Use the old approach for OSX/Win: */
     move(m_geometry.topLeft());
     resize(m_geometry.size());
-#else /* VBOX_WS_MAC */
-    /* Use the new approach for Windows/X11: */
+#else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
+    /* Use the new approach for X11: */
     VBoxGlobal::setTopLevelGeometry(this, m_geometry);
-#endif /* !VBOX_WS_MAC */
+#endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
 
     /* Maximize (if necessary): */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 70602)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 70603)
@@ -1271,10 +1271,10 @@
             if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
             {
-#ifdef VBOX_WS_MAC
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
                 QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
                 m_geometry.moveTo(pMoveEvent->pos());
-#else /* VBOX_WS_MAC */
+#else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
                 m_geometry.moveTo(geometry().x(), geometry().y());
-#endif /* !VBOX_WS_MAC */
+#endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
             }
             break;