Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 51668)
@@ -142,5 +142,4 @@
 #endif /* VBOX_WITH_DEBUGGER_GUI */
 }
-using namespace UIExtraDataDefs /* if header included */;
 
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 51668)
@@ -33,4 +33,7 @@
 #include "CVirtualBox.h"
 #include "CMachine.h"
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
 
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp	(revision 51668)
@@ -22,4 +22,8 @@
 #include "UIActionPool.h"
 #include "UIExtraDataManager.h"
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
 
 void UIShortcut::setDescription(const QString &strDescription)
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 51668)
@@ -175,4 +175,8 @@
 typedef unsigned long Q_ULONG;      /* word up to 64 bit unsigned */
 #endif
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
 
 // VBoxGlobal
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp	(revision 51668)
@@ -23,4 +23,8 @@
 #include "UIShortcutPool.h"
 #include "VBoxGlobal.h"
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
 
 class UIActionMenuMachineRuntime : public UIActionMenu
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp	(revision 51668)
@@ -27,4 +27,8 @@
 #include "UIMachineWindow.h"
 #include "UIShortcutPool.h"
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
 
 /* Fullscreen keyboard-handler constructor: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp	(revision 51668)
@@ -27,4 +27,8 @@
 #include "UIMachineWindow.h"
 #include "UIShortcutPool.h"
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
 
 /* Fullscreen keyboard-handler constructor: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp	(revision 51668)
@@ -27,4 +27,8 @@
 #include "UIMachineWindow.h"
 #include "UIShortcutPool.h"
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
 
 /* Fullscreen keyboard-handler constructor: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp	(revision 51668)
@@ -27,4 +27,8 @@
 #include "UIMachineWindow.h"
 #include "UIShortcutPool.h"
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
 
 /* Fullscreen keyboard-handler constructor: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.cpp	(revision 51668)
@@ -23,4 +23,8 @@
 #include "UIShortcutPool.h"
 #include "UIDefs.h"
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
 
 class UIActionMenuFile : public UIActionMenu
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp	(revision 51668)
@@ -33,4 +33,8 @@
 #include "UIHostComboEditor.h"
 #include "VBoxGlobalSettings.h"
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
 
 /* Input page constructor: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 51668)
@@ -60,4 +60,7 @@
 # include <Carbon/Carbon.h>
 #endif /* Q_WS_MAC */
+
+/* Namespaces: */
+using namespace UIExtraDataDefs;
 
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 51667)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 51668)
@@ -35,4 +35,8 @@
 #include "CStorageController.h"
 
+/* Namespaces: */
+using namespace UIExtraDataDefs;
+
+
 UIWizardNewVM::UIWizardNewVM(QWidget *pParent, const QString &strGroup /* = QString() */)
     : UIWizard(pParent, WizardType_NewVM)