Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 48315)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 48316)
@@ -30,12 +30,13 @@
 
 /* GUI includes: */
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
 #include "UIMessageCenter.h"
-#include "VBoxGlobal.h"
 #include "UISelectorWindow.h"
 #include "UIProgressDialog.h"
 #include "UINetworkManager.h"
 #include "UINetworkManagerDialog.h"
-#include "UIConverter.h"
 #include "UIModalWindowManager.h"
+#include "UIMedium.h"
 #ifdef VBOX_OSE
 # include "UIDownloaderUserManual.h"
Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 48315)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 48316)
@@ -39,4 +39,5 @@
 #include "UIIconPool.h"
 #include "UIMediumTypeChangeDialog.h"
+#include "UIMedium.h"
 
 /* COM includes: */
@@ -1753,17 +1754,18 @@
 
 /* static */
-bool UIMediumManager::isMediumAttachedToHiddenMachinesOnly(UIMedium medium)
+bool UIMediumManager::isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium)
 {
     /* Iterate till the root: */
+    UIMedium mediumIterator = medium;
     do
     {
         /* Ignore medium if its hidden
          * or attached to hidden machines only: */
-        if (medium.isHidden())
+        if (mediumIterator.isHidden())
             return true;
         /* Move iterator to parent: */
-        medium = medium.parent();
-    }
-    while (!medium.isNull());
+        mediumIterator = mediumIterator.parent();
+    }
+    while (!mediumIterator.isNull());
     /* False by default: */
     return false;
Index: /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h	(revision 48315)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h	(revision 48316)
@@ -24,5 +24,5 @@
 #include "QIWithRetranslateUI.h"
 #include "QIMainDialog.h"
-#include "UIMedium.h"
+#include "UIMediumDefs.h"
 
 /* COM includes: */
@@ -35,4 +35,5 @@
 class UIMediumItem;
 class UIEnumerationProgressBar;
+class UIMedium;
 
 /* Medium Manager Dialog: */
@@ -152,5 +153,5 @@
 
     /* Static helper: Enumeration stuff: */
-    static bool isMediumAttachedToHiddenMachinesOnly(UIMedium medium);
+    static bool isMediumAttachedToHiddenMachinesOnly(const UIMedium &medium);
 
     /* Variable: Singleton instance: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 48315)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 48316)
@@ -46,4 +46,5 @@
 #include "UIVirtualBoxEventHandler.h"
 #include "UIMediumManager.h"
+#include "UIMedium.h"
 #include "UIMessageCenter.h"
 #include "UISelectorWindow.h"
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 48315)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 48316)
@@ -26,5 +26,4 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "UIMedium.h"
 #include "UINetworkDefs.h"
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp	(revision 48315)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp	(revision 48316)
@@ -44,6 +44,7 @@
 
 /* COM includes: */
+#include "CVirtualBox.h"
 #include "CMachine.h"
-#include "CVirtualBox.h"
+#include "CMedium.h"
 
 /* Type defs: */