Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 71870)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 71871)
@@ -441,5 +441,4 @@
 	src/UITakeSnapshotDialog.h \
 	src/extensions/QIFlowLayout.h \
-	src/extensions/QIManagerDialog.h \
 	src/extensions/QIMenu.h \
 	src/extensions/QIStatusBar.h \
@@ -660,4 +659,5 @@
 	src/extensions/QIMainDialog.h \
 	src/extensions/QIMainWindow.h \
+	src/extensions/QIManagerDialog.h \
 	src/extensions/QIMessageBox.h \
 	src/extensions/QIProcess.h \
@@ -737,4 +737,5 @@
 	src/extensions/QIMainDialog.h \
 	src/extensions/QIMainWindow.h \
+	src/extensions/QIManagerDialog.h \
 	src/extensions/QIMessageBox.h \
 	src/extensions/QIProcess.h \
@@ -910,5 +911,4 @@
 	src/UITakeSnapshotDialog.cpp \
 	src/extensions/QIFlowLayout.cpp \
-	src/extensions/QIManagerDialog.cpp \
 	src/extensions/QIMenu.cpp \
 	src/extensions/QIStatusBar.cpp \
@@ -1161,4 +1161,5 @@
 	src/extensions/QIMainDialog.cpp \
 	src/extensions/QIMainWindow.cpp \
+	src/extensions/QIManagerDialog.cpp \
 	src/extensions/QIMessageBox.cpp \
 	src/extensions/QIProcess.cpp \
@@ -1265,4 +1266,5 @@
 	src/extensions/QIMainDialog.cpp \
 	src/extensions/QIMainWindow.cpp \
+	src/extensions/QIManagerDialog.cpp \
 	src/extensions/QIMessageBox.cpp \
 	src/extensions/QIProcess.cpp \
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp	(revision 71870)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp	(revision 71871)
@@ -1,9 +1,9 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QIManagerDialog class implementation.
+ * VBox Qt GUI - Qt extensions: QIManagerDialog class implementation.
  */
 
 /*
- * Copyright (C) 2009-2017 Oracle Corporation
+ * Copyright (C) 2009-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -29,10 +29,10 @@
 # include "QIDialogButtonBox.h"
 # include "QIManagerDialog.h"
+# include "VBoxGlobal.h"
 # include "UIDesktopWidgetWatchdog.h"
 # ifdef VBOX_WS_MAC
 #  include "UIToolBar.h"
 #  include "UIWindowMenuManager.h"
-# endif /* VBOX_WS_MAC */
-# include "VBoxGlobal.h"
+# endif
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h	(revision 71870)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.h	(revision 71871)
@@ -1,9 +1,9 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QIManagerDialog class declaration.
+ * VBox Qt GUI - Qt extensions: QIManagerDialog class declaration.
  */
 
 /*
- * Copyright (C) 2009-2017 Oracle Corporation
+ * Copyright (C) 2009-2018 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -23,4 +23,7 @@
 #include <QMap>
 
+/* GUI includes: */
+#include "UILibraryDefs.h"
+
 /* Other VBox includes: */
 #include <iprt/cdefs.h>
@@ -54,5 +57,5 @@
 
 /** Manager dialog factory insterface. */
-class QIManagerDialogFactory
+class SHARED_LIBRARY_STUFF QIManagerDialogFactory
 {
 public:
@@ -78,5 +81,5 @@
 
 /** QMainWindow sub-class used as various manager dialogs. */
-class QIManagerDialog : public QMainWindow
+class SHARED_LIBRARY_STUFF QIManagerDialog : public QMainWindow
 {
     Q_OBJECT;
@@ -127,4 +130,6 @@
         virtual void loadSettings() {}
 
+        /** Saves dialog setting into extradata. */
+        virtual void saveSettings() const {}
         /** Cleanup menu-bar.
           * @note Injected into cleanup(), normally you don't need to reimplement it. */
@@ -133,7 +138,4 @@
           * @note Normally you don't need to reimplement it. */
         void cleanup();
-        /** Saves dialog setting such as geometry into extradata. */
-        virtual void saveSettings() const {}
-
     /** @} */
 
@@ -210,4 +212,4 @@
 };
 
+
 #endif /* !___QIManagerDialog_h___ */
-