Index: trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 51187)
@@ -544,4 +544,5 @@
 	src/extensions/QIAdvancedToolBar.cpp \
 	src/extensions/graphics/QIGraphicsWidget.cpp \
+	src/extradata/UIExtraDataDefs.cpp \
 	src/extradata/UIExtraDataManager.cpp \
 	src/globals/UIDefs.cpp \
Index: trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackend.h	(revision 51187)
@@ -27,4 +27,5 @@
 /* GUI includes: */
 #include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* Determines if 'Object of type X' can be converted to object of other type.
Index: trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 51187)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 51187)
@@ -0,0 +1,149 @@
+/* $Id$ */
+/** @file
+ * VBox Qt GUI - Extra-data related definitions.
+ */
+
+/*
+ * Copyright (C) 2006-2014 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+/* GUI includes: */
+#include "UIExtraDataDefs.h"
+
+/* Global definitions: */
+const char* UIExtraDataDefs::GUI_LanguageId = "GUI/LanguageID";
+const char* UIExtraDataDefs::GUI_ExtPackName = "Oracle VM VirtualBox Extension Pack";
+const char* UIExtraDataDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning";
+const char* UIExtraDataDefs::GUI_RecentFolderHD = "GUI/RecentFolderHD";
+const char* UIExtraDataDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD";
+const char* UIExtraDataDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD";
+const char* UIExtraDataDefs::GUI_RecentListHD = "GUI/RecentListHD";
+const char* UIExtraDataDefs::GUI_RecentListCD = "GUI/RecentListCD";
+const char* UIExtraDataDefs::GUI_RecentListFD = "GUI/RecentListFD";
+
+/* Message-center definitions: */
+const char* UIExtraDataDefs::GUI_SuppressMessages = "GUI/SuppressMessages";
+const char* UIExtraDataDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption";
+
+/* Settings-dialog definitions: */
+const char* UIExtraDataDefs::GUI_RestrictedGlobalSettingsPages = "GUI/RestrictedGlobalSettingsPages";
+const char* UIExtraDataDefs::GUI_RestrictedMachineSettingsPages = "GUI/RestrictedMachineSettingsPages";
+
+/* Wizards definitions: */
+const char* UIExtraDataDefs::GUI_FirstRun = "GUI/FirstRun";
+const char* UIExtraDataDefs::GUI_HideDescriptionForWizards = "GUI/HideDescriptionForWizards";
+const char* UIExtraDataDefs::GUI_Export_StorageType = "GUI/Export/StorageType";
+const char* UIExtraDataDefs::GUI_Export_Username = "GUI/Export/Username";
+const char* UIExtraDataDefs::GUI_Export_Hostname = "GUI/Export/Hostname";
+const char* UIExtraDataDefs::GUI_Export_Bucket = "GUI/Export/Bucket";
+
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+/* Update-manager definitions: */
+const char* UIExtraDataDefs::GUI_PreventApplicationUpdate = "GUI/PreventApplicationUpdate";
+const char* UIExtraDataDefs::GUI_UpdateDate = "GUI/UpdateDate";
+const char* UIExtraDataDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount";
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+
+#ifdef Q_WS_X11
+/* License GUI definitions: */
+const char* UIExtraDataDefs::GUI_LicenseKey = "GUI/LicenseAgreed";
+#endif /* Q_WS_X11 */
+
+/* Selector UI definitions: */
+const char* UIExtraDataDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts";
+const char* UIExtraDataDefs::GUI_LastSelectorWindowPosition = "GUI/LastWindowPosition";
+const char* UIExtraDataDefs::GUI_SplitterSizes = "GUI/SplitterSizes";
+const char* UIExtraDataDefs::GUI_Toolbar = "GUI/Toolbar";
+const char* UIExtraDataDefs::GUI_Statusbar = "GUI/Statusbar";
+const char* UIExtraDataDefs::GUI_PreviewUpdate = "GUI/PreviewUpdate";
+const char* UIExtraDataDefs::GUI_DetailsPageBoxes = "GUI/DetailsPageBoxes";
+const char* UIExtraDataDefs::GUI_SelectorVMPositions = "GUI/SelectorVMPositions";
+const char* UIExtraDataDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
+const char* UIExtraDataDefs::GUI_LastItemSelected = "GUI/LastItemSelected";
+const char* UIExtraDataDefs::GUI_GroupDefinitions = "GUI/GroupDefinitions";
+const char* UIExtraDataDefs::GUI_HideFromManager = "GUI/HideFromManager";
+const char* UIExtraDataDefs::GUI_PreventReconfiguration = "GUI/PreventReconfiguration";
+const char* UIExtraDataDefs::GUI_PreventSnapshotOperations = "GUI/PreventSnapshotOperations";
+const char* UIExtraDataDefs::GUI_HideDetails = "GUI/HideDetails";
+
+/* Runtime UI definitions: */
+const char* UIExtraDataDefs::GUI_RenderMode = "GUI/RenderMode";
+#ifndef Q_WS_MAC
+const char* UIExtraDataDefs::GUI_MachineWindowIcons = "GUI/MachineWindowIcons";
+const char* UIExtraDataDefs::GUI_MachineWindowNamePostfix = "GUI/MachineWindowNamePostfix";
+#endif /* !Q_WS_MAC */
+const char* UIExtraDataDefs::GUI_RestrictedRuntimeMenus = "GUI/RestrictedRuntimeMenus";
+#ifdef Q_WS_MAC
+const char* UIExtraDataDefs::GUI_RestrictedRuntimeApplicationMenuActions = "GUI/RestrictedRuntimeApplicationMenuActions";
+#endif /* Q_WS_MAC */
+const char* UIExtraDataDefs::GUI_RestrictedRuntimeMachineMenuActions = "GUI/RestrictedRuntimeMachineMenuActions";
+const char* UIExtraDataDefs::GUI_RestrictedRuntimeViewMenuActions = "GUI/RestrictedRuntimeViewMenuActions";
+const char* UIExtraDataDefs::GUI_RestrictedRuntimeDevicesMenuActions = "GUI/RestrictedRuntimeDevicesMenuActions";
+#ifdef VBOX_WITH_DEBUGGER_GUI
+const char* UIExtraDataDefs::GUI_RestrictedRuntimeDebuggerMenuActions = "GUI/RestrictedRuntimeDebuggerMenuActions";
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+const char* UIExtraDataDefs::GUI_RestrictedRuntimeHelpMenuActions = "GUI/RestrictedRuntimeHelpMenuActions";
+const char* UIExtraDataDefs::GUI_RestrictedVisualStates = "GUI/RestrictedVisualStates";
+const char* UIExtraDataDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts";
+const char* UIExtraDataDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition";
+const char* UIExtraDataDefs::GUI_LastScaleWindowPosition = "GUI/LastScaleWindowPosition";
+const char* UIExtraDataDefs::GUI_LastWindowState_Max = "max";
+const char* UIExtraDataDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint";
+const char* UIExtraDataDefs::GUI_LastGuestSizeHintWasFullscreen = "GUI/LastGuestSizeHintWasFullscreen";
+const char* UIExtraDataDefs::GUI_Fullscreen = "GUI/Fullscreen";
+const char* UIExtraDataDefs::GUI_Seamless = "GUI/Seamless";
+const char* UIExtraDataDefs::GUI_Scale = "GUI/Scale";
+const char* UIExtraDataDefs::GUI_VirtualScreenToHostScreen = "GUI/VirtualScreenToHostScreen";
+const char* UIExtraDataDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
+const char* UIExtraDataDefs::GUI_AutomountGuestScreens = "GUI/AutomountGuestScreens";
+const char* UIExtraDataDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
+const char* UIExtraDataDefs::GUI_PassCAD = "GUI/PassCAD";
+const char* UIExtraDataDefs::GUI_DefaultCloseAction = "GUI/DefaultCloseAction";
+const char* UIExtraDataDefs::GUI_RestrictedStatusBarIndicators = "GUI/RestrictedStatusBarIndicators";
+const char* UIExtraDataDefs::GUI_HidLedsSync = "GUI/HidLedsSync";
+const char* UIExtraDataDefs::GUI_GuruMeditationHandler = "GUI/GuruMeditationHandler";
+const char* UIExtraDataDefs::GUI_HiDPIOptimization = "GUI/HiDPI/Optimization";
+
+/* Runtime UI: Mini-toolbar definitions: */
+const char* UIExtraDataDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";
+const char* UIExtraDataDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment";
+const char* UIExtraDataDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide";
+
+#ifdef Q_WS_MAC
+/* Runtime UI: Mac-dock definitions: */
+const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
+const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";
+const char* UIExtraDataDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled";
+#endif /* Q_WS_MAC */
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+/* Runtime UI: Video-acceleration definitions: */
+const char* UIExtraDataDefs::GUI_Accelerate2D_StretchLinear = "GUI/Accelerate2D/StretchLinear";
+const char* UIExtraDataDefs::GUI_Accelerate2D_PixformatYV12 = "GUI/Accelerate2D/PixformatYV12";
+const char* UIExtraDataDefs::GUI_Accelerate2D_PixformatUYVY = "GUI/Accelerate2D/PixformatUYVY";
+const char* UIExtraDataDefs::GUI_Accelerate2D_PixformatYUY2 = "GUI/Accelerate2D/PixformatYUY2";
+const char* UIExtraDataDefs::GUI_Accelerate2D_PixformatAYUV = "GUI/Accelerate2D/PixformatAYUV";
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+
+/* Runtime UI: Close-dialog definitions: */
+const char* UIExtraDataDefs::GUI_RestrictedCloseActions = "GUI/RestrictedCloseActions";
+const char* UIExtraDataDefs::GUI_LastCloseAction = "GUI/LastCloseAction";
+const char* UIExtraDataDefs::GUI_CloseActionHook = "GUI/CloseActionHook";
+
+/* Runtime UI: Information-dialog definitions: */
+const char* UIExtraDataDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
+
+#ifdef VBOX_WITH_DEBUGGER_GUI
+/* Runtime UI: Debugger GUI definitions: */
+const char* UIExtraDataDefs::GUI_DbgEnabled = "GUI/Dbg/Enabled";
+const char* UIExtraDataDefs::GUI_DbgAutoShow = "GUI/Dbg/AutoShow";
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+
Index: trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 51187)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h	(revision 51187)
@@ -0,0 +1,396 @@
+/** @file
+ * VBox Qt GUI - Extra-data related definitions.
+ */
+
+/*
+ * Copyright (C) 2006-2014 Oracle Corporation
+ *
+ * This file is part of VirtualBox Open Source Edition (OSE), as
+ * available from http://www.virtualbox.org. This file is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License (GPL) as published by the Free Software
+ * Foundation, in version 2 as it comes in the "COPYING" file of the
+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
+ */
+
+#ifndef ___UIExtraDataDefs_h___
+#define ___UIExtraDataDefs_h___
+
+/* Qt includes: */
+#include <QMetaType>
+
+/* Other VBox includes: */
+#include <iprt/cdefs.h>
+
+/** Extra-data namespace. */
+namespace UIExtraDataDefs
+{
+    /* Global declarations: */
+    extern const char* GUI_LanguageId;
+    extern const char* GUI_ExtPackName;
+    extern const char* GUI_PreventBetaWarning;
+    extern const char* GUI_RecentFolderHD;
+    extern const char* GUI_RecentFolderCD;
+    extern const char* GUI_RecentFolderFD;
+    extern const char* GUI_RecentListHD;
+    extern const char* GUI_RecentListCD;
+    extern const char* GUI_RecentListFD;
+
+    /* Message-center declarations: */
+    extern const char* GUI_SuppressMessages;
+    extern const char* GUI_InvertMessageOption;
+
+    /* Settings-dialog declarations: */
+    extern const char* GUI_RestrictedGlobalSettingsPages;
+    extern const char* GUI_RestrictedMachineSettingsPages;
+
+    /* Wizard declarations: */
+    extern const char* GUI_FirstRun;
+    extern const char* GUI_HideDescriptionForWizards;
+    extern const char* GUI_Export_StorageType;
+    extern const char* GUI_Export_Username;
+    extern const char* GUI_Export_Hostname;
+    extern const char* GUI_Export_Bucket;
+
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+    /* Update-manager declarations: */
+    extern const char* GUI_PreventApplicationUpdate;
+    extern const char* GUI_UpdateDate;
+    extern const char* GUI_UpdateCheckCount;
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+
+#ifdef Q_WS_X11
+    /* License GUI declarations: */
+    extern const char* GUI_LicenseKey;
+#endif /* Q_WS_X11 */
+
+    /* Selector UI declarations: */
+    extern const char* GUI_Input_SelectorShortcuts;
+    extern const char* GUI_LastSelectorWindowPosition;
+    extern const char* GUI_SplitterSizes;
+    extern const char* GUI_Toolbar;
+    extern const char* GUI_Statusbar;
+    extern const char* GUI_PreviewUpdate;
+    extern const char* GUI_DetailsPageBoxes;
+    extern const char* GUI_SelectorVMPositions;
+    extern const char* GUI_LastVMSelected;
+    extern const char* GUI_LastItemSelected;
+    extern const char* GUI_GroupDefinitions;
+    extern const char* GUI_HideFromManager;
+    extern const char* GUI_PreventReconfiguration;
+    extern const char* GUI_PreventSnapshotOperations;
+    extern const char* GUI_HideDetails;
+
+    /* Runtime UI declarations: */
+    extern const char* GUI_RenderMode;
+#ifndef Q_WS_MAC
+    extern const char* GUI_MachineWindowIcons;
+    extern const char* GUI_MachineWindowNamePostfix;
+#endif /* !Q_WS_MAC */
+    extern const char* GUI_RestrictedRuntimeMenus;
+#ifdef Q_WS_MAC
+    extern const char* GUI_RestrictedRuntimeApplicationMenuActions;
+#endif /* Q_WS_MAC */
+    extern const char* GUI_RestrictedRuntimeMachineMenuActions;
+    extern const char* GUI_RestrictedRuntimeViewMenuActions;
+    extern const char* GUI_RestrictedRuntimeDevicesMenuActions;
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    extern const char* GUI_RestrictedRuntimeDebuggerMenuActions;
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+    extern const char* GUI_RestrictedRuntimeHelpMenuActions;
+    extern const char* GUI_RestrictedVisualStates;
+    extern const char* GUI_Input_MachineShortcuts;
+    extern const char* GUI_LastNormalWindowPosition;
+    extern const char* GUI_LastScaleWindowPosition;
+    extern const char* GUI_LastWindowState_Max;
+    extern const char* GUI_LastGuestSizeHint;
+    extern const char* GUI_LastGuestSizeHintWasFullscreen;
+    extern const char* GUI_Fullscreen;
+    extern const char* GUI_Seamless;
+    extern const char* GUI_Scale;
+    extern const char* GUI_VirtualScreenToHostScreen;
+    extern const char* GUI_AutoresizeGuest;
+    extern const char* GUI_AutomountGuestScreens;
+    extern const char* GUI_SaveMountedAtRuntime;
+    extern const char* GUI_PassCAD;
+    extern const char* GUI_DefaultCloseAction;
+    extern const char* GUI_RestrictedStatusBarIndicators;
+    extern const char* GUI_HidLedsSync;
+    extern const char* GUI_GuruMeditationHandler;
+    extern const char* GUI_HiDPIOptimization;
+
+    /* Runtime UI: Mini-toolbar declarations: */
+    extern const char* GUI_ShowMiniToolBar;
+    extern const char* GUI_MiniToolBarAlignment;
+    extern const char* GUI_MiniToolBarAutoHide;
+
+#ifdef Q_WS_MAC
+    /* Runtime UI: Mac-dock declarations: */
+    extern const char* GUI_RealtimeDockIconUpdateEnabled;
+    extern const char* GUI_RealtimeDockIconUpdateMonitor;
+    extern const char* GUI_PresentationModeEnabled;
+#endif /* Q_WS_MAC */
+
+#ifdef VBOX_WITH_VIDEOHWACCEL
+    /* Runtime UI: Video-acceleration declarations: */
+    extern const char* GUI_Accelerate2D_StretchLinear;
+    extern const char* GUI_Accelerate2D_PixformatYV12;
+    extern const char* GUI_Accelerate2D_PixformatUYVY;
+    extern const char* GUI_Accelerate2D_PixformatYUY2;
+    extern const char* GUI_Accelerate2D_PixformatAYUV;
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+
+    /* Runtime UI: Close-dialog declarations: */
+    extern const char* GUI_RestrictedCloseActions;
+    extern const char* GUI_LastCloseAction;
+    extern const char* GUI_CloseActionHook;
+
+    /* Runtime UI: Information-dialog declarations: */
+    extern const char* GUI_InfoDlgState;
+
+#ifdef VBOX_WITH_DEBUGGER_GUI
+    /* Runtime UI: Debugger GUI declarations: */
+    extern const char* GUI_DbgEnabled;
+    extern const char* GUI_DbgAutoShow;
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+}
+using namespace UIExtraDataDefs /* if header included */;
+
+
+/** Common UI: Global settings page types. */
+enum GlobalSettingsPageType
+{
+    GlobalSettingsPageType_Invalid,
+    GlobalSettingsPageType_General,
+    GlobalSettingsPageType_Input,
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+    GlobalSettingsPageType_Update,
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+    GlobalSettingsPageType_Language,
+    GlobalSettingsPageType_Display,
+    GlobalSettingsPageType_Network,
+    GlobalSettingsPageType_Extensions,
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+    GlobalSettingsPageType_Proxy,
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+    GlobalSettingsPageType_Max
+};
+Q_DECLARE_METATYPE(GlobalSettingsPageType);
+
+/** Common UI: Machine settings page types. */
+enum MachineSettingsPageType
+{
+    MachineSettingsPageType_Invalid,
+    MachineSettingsPageType_General,
+    MachineSettingsPageType_System,
+    MachineSettingsPageType_Display,
+    MachineSettingsPageType_Storage,
+    MachineSettingsPageType_Audio,
+    MachineSettingsPageType_Network,
+    MachineSettingsPageType_Ports,
+    MachineSettingsPageType_Serial,
+    MachineSettingsPageType_Parallel,
+    MachineSettingsPageType_USB,
+    MachineSettingsPageType_SF,
+    MachineSettingsPageType_Max
+};
+Q_DECLARE_METATYPE(MachineSettingsPageType);
+
+
+/** Selector UI: Details-element types. */
+enum DetailsElementType
+{
+    DetailsElementType_General,
+    DetailsElementType_System,
+    DetailsElementType_Preview,
+    DetailsElementType_Display,
+    DetailsElementType_Storage,
+    DetailsElementType_Audio,
+    DetailsElementType_Network,
+    DetailsElementType_Serial,
+#ifdef VBOX_WITH_PARALLEL_PORTS
+    DetailsElementType_Parallel,
+#endif /* VBOX_WITH_PARALLEL_PORTS */
+    DetailsElementType_USB,
+    DetailsElementType_SF,
+    DetailsElementType_Description
+};
+Q_DECLARE_METATYPE(DetailsElementType);
+
+
+/** Runtime UI: Menu types. */
+enum RuntimeMenuType
+{
+    RuntimeMenuType_Invalid = 0,
+    RuntimeMenuType_Machine = RT_BIT(0),
+    RuntimeMenuType_View    = RT_BIT(1),
+    RuntimeMenuType_Devices = RT_BIT(2),
+    RuntimeMenuType_Debug   = RT_BIT(3),
+    RuntimeMenuType_Help    = RT_BIT(4),
+    RuntimeMenuType_All     = 0xFF
+};
+
+#ifdef Q_WS_MAC
+/** Runtime UI: Menu "Application": Action types. */
+enum RuntimeMenuApplicationActionType
+{
+    RuntimeMenuApplicationActionType_Invalid = 0,
+    RuntimeMenuApplicationActionType_About   = RT_BIT(0),
+    RuntimeMenuApplicationActionType_All     = 0xFFFF
+};
+#endif /* Q_WS_MAC */
+
+/** Runtime UI: Menu "Machine": Action types. */
+enum RuntimeMenuMachineActionType
+{
+    RuntimeMenuMachineActionType_Invalid           = 0,
+    RuntimeMenuMachineActionType_SettingsDialog    = RT_BIT(0),
+    RuntimeMenuMachineActionType_TakeSnapshot      = RT_BIT(1),
+    RuntimeMenuMachineActionType_TakeScreenshot    = RT_BIT(2),
+    RuntimeMenuMachineActionType_InformationDialog = RT_BIT(3),
+    RuntimeMenuMachineActionType_MouseIntegration  = RT_BIT(4),
+    RuntimeMenuMachineActionType_TypeCAD           = RT_BIT(5),
+#ifdef Q_WS_X11
+    RuntimeMenuMachineActionType_TypeCABS          = RT_BIT(6),
+#endif /* Q_WS_X11 */
+    RuntimeMenuMachineActionType_Pause             = RT_BIT(7),
+    RuntimeMenuMachineActionType_Reset             = RT_BIT(8),
+    RuntimeMenuMachineActionType_SaveState         = RT_BIT(9),
+    RuntimeMenuMachineActionType_Shutdown          = RT_BIT(10),
+    RuntimeMenuMachineActionType_PowerOff          = RT_BIT(11),
+#ifndef Q_WS_MAC
+    RuntimeMenuMachineActionType_Close             = RT_BIT(12),
+#endif /* !Q_WS_MAC */
+    RuntimeMenuMachineActionType_All               = 0xFFFF
+};
+
+/** Runtime UI: Menu "View": Action types. */
+enum RuntimeMenuViewActionType
+{
+    RuntimeMenuViewActionType_Invalid         = 0,
+    RuntimeMenuViewActionType_Fullscreen      = RT_BIT(0),
+    RuntimeMenuViewActionType_Seamless        = RT_BIT(1),
+    RuntimeMenuViewActionType_Scale           = RT_BIT(2),
+    RuntimeMenuViewActionType_GuestAutoresize = RT_BIT(3),
+    RuntimeMenuViewActionType_AdjustWindow    = RT_BIT(4),
+    RuntimeMenuViewActionType_Multiscreen     = RT_BIT(5),
+    RuntimeMenuViewActionType_All             = 0xFFFF
+};
+
+/** Runtime UI: Menu "Devices": Action types. */
+enum RuntimeMenuDevicesActionType
+{
+    RuntimeMenuDevicesActionType_Invalid               = 0,
+    RuntimeMenuDevicesActionType_OpticalDevices        = RT_BIT(0),
+    RuntimeMenuDevicesActionType_FloppyDevices         = RT_BIT(1),
+    RuntimeMenuDevicesActionType_USBDevices            = RT_BIT(2),
+    RuntimeMenuDevicesActionType_WebCams               = RT_BIT(3),
+    RuntimeMenuDevicesActionType_SharedClipboard       = RT_BIT(4),
+    RuntimeMenuDevicesActionType_DragAndDrop           = RT_BIT(5),
+    RuntimeMenuDevicesActionType_NetworkSettings       = RT_BIT(6),
+    RuntimeMenuDevicesActionType_SharedFoldersSettings = RT_BIT(7),
+    RuntimeMenuDevicesActionType_VRDEServer            = RT_BIT(8),
+    RuntimeMenuDevicesActionType_VideoCapture          = RT_BIT(9),
+    RuntimeMenuDevicesActionType_InstallGuestTools     = RT_BIT(10),
+    RuntimeMenuDevicesActionType_All                   = 0xFFFF
+};
+
+#ifdef VBOX_WITH_DEBUGGER_GUI
+/** Runtime UI: Menu "Debugger": Action types. */
+enum RuntimeMenuDebuggerActionType
+{
+    RuntimeMenuDebuggerActionType_Invalid     = 0,
+    RuntimeMenuDebuggerActionType_Statistics  = RT_BIT(0),
+    RuntimeMenuDebuggerActionType_CommandLine = RT_BIT(1),
+    RuntimeMenuDebuggerActionType_Logging     = RT_BIT(2),
+    RuntimeMenuDebuggerActionType_LogDialog   = RT_BIT(3),
+    RuntimeMenuDebuggerActionType_All         = 0xFFFF
+};
+#endif /* VBOX_WITH_DEBUGGER_GUI */
+
+/** Runtime UI: Menu "Help": Action types. */
+enum RuntimeMenuHelpActionType
+{
+    RuntimeMenuHelpActionType_Invalid              = 0,
+    RuntimeMenuHelpActionType_Contents             = RT_BIT(0),
+    RuntimeMenuHelpActionType_WebSite              = RT_BIT(1),
+    RuntimeMenuHelpActionType_ResetWarnings        = RT_BIT(2),
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+    RuntimeMenuHelpActionType_NetworkAccessManager = RT_BIT(3),
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+#ifndef Q_WS_MAC
+    RuntimeMenuHelpActionType_About                = RT_BIT(4),
+#endif /* !Q_WS_MAC */
+    RuntimeMenuHelpActionType_All                  = 0xFFFF
+};
+
+/** Runtime UI: Rendering modes. */
+enum RenderMode
+{
+      InvalidRenderMode
+    , QImageMode
+#ifdef VBOX_GUI_USE_QUARTZ2D
+    , Quartz2DMode
+#endif /* VBOX_GUI_USE_QUARTZ2D */
+};
+
+/** Runtime UI: Visual-state types. */
+enum UIVisualStateType
+{
+    UIVisualStateType_Invalid    = 0,
+    UIVisualStateType_Normal     = RT_BIT(0),
+    UIVisualStateType_Fullscreen = RT_BIT(1),
+    UIVisualStateType_Seamless   = RT_BIT(2),
+    UIVisualStateType_Scale      = RT_BIT(3),
+    UIVisualStateType_All        = 0xFF
+};
+Q_DECLARE_METATYPE(UIVisualStateType);
+
+/** Runtime UI: Indicator types. */
+enum IndicatorType
+{
+    IndicatorType_Invalid,
+    IndicatorType_HardDisks,
+    IndicatorType_OpticalDisks,
+    IndicatorType_FloppyDisks,
+    IndicatorType_Network,
+    IndicatorType_USB,
+    IndicatorType_SharedFolders,
+    IndicatorType_VideoCapture,
+    IndicatorType_Features,
+    IndicatorType_Mouse,
+    IndicatorType_Keyboard,
+    IndicatorType_Max
+};
+Q_DECLARE_METATYPE(IndicatorType);
+
+/** Runtime UI: Machine close actions. */
+enum MachineCloseAction
+{
+    MachineCloseAction_Invalid                    = 0,
+    MachineCloseAction_SaveState                  = RT_BIT(0),
+    MachineCloseAction_Shutdown                   = RT_BIT(1),
+    MachineCloseAction_PowerOff                   = RT_BIT(2),
+    MachineCloseAction_PowerOff_RestoringSnapshot = RT_BIT(3),
+    MachineCloseAction_All                        = 0xFF
+};
+Q_DECLARE_METATYPE(MachineCloseAction);
+
+/** Guru Meditation handler types. */
+enum GuruMeditationHandlerType
+{
+    GuruMeditationHandlerType_Default,
+    GuruMeditationHandlerType_PowerOff,
+    GuruMeditationHandlerType_Ignore
+};
+
+/** Runtime UI: HiDPI optimization types. */
+enum HiDPIOptimizationType
+{
+    HiDPIOptimizationType_None,
+    HiDPIOptimizationType_Performance
+};
+
+
+#endif /* !___UIExtraDataDefs_h___ */
Index: trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h	(revision 51187)
@@ -23,5 +23,5 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* COM includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp	(revision 51187)
@@ -1,11 +1,9 @@
 /* $Id$ */
 /** @file
- *
- * VBox frontends: Qt GUI ("VirtualBox"):
- * Global definitions and function implementations
+ * VBox Qt GUI - Global definitions.
  */
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21,133 +19,4 @@
 #include "UIDefs.h"
 
-/* Global definitions: */
-const char* UIDefs::GUI_RenderMode = "GUI/RenderMode";
-const char* UIDefs::GUI_LanguageId = "GUI/LanguageID";
-const char* UIDefs::GUI_ExtPackName = "Oracle VM VirtualBox Extension Pack";
-const char* UIDefs::GUI_PreventBetaWarning = "GUI/PreventBetaWarning";
-const char* UIDefs::GUI_RecentFolderHD = "GUI/RecentFolderHD";
-const char* UIDefs::GUI_RecentFolderCD = "GUI/RecentFolderCD";
-const char* UIDefs::GUI_RecentFolderFD = "GUI/RecentFolderFD";
-const char* UIDefs::GUI_RecentListHD = "GUI/RecentListHD";
-const char* UIDefs::GUI_RecentListCD = "GUI/RecentListCD";
-const char* UIDefs::GUI_RecentListFD = "GUI/RecentListFD";
-
-/* Selector-window definitions: */
-const char* UIDefs::GUI_Input_SelectorShortcuts = "GUI/Input/SelectorShortcuts";
-const char* UIDefs::GUI_LastSelectorWindowPosition = "GUI/LastWindowPosition";
-const char* UIDefs::GUI_SplitterSizes = "GUI/SplitterSizes";
-const char* UIDefs::GUI_Toolbar = "GUI/Toolbar";
-const char* UIDefs::GUI_Statusbar = "GUI/Statusbar";
-const char* UIDefs::GUI_PreviewUpdate = "GUI/PreviewUpdate";
-const char* UIDefs::GUI_DetailsPageBoxes = "GUI/DetailsPageBoxes";
-const char* UIDefs::GUI_SelectorVMPositions = "GUI/SelectorVMPositions";
-const char* UIDefs::GUI_LastVMSelected = "GUI/LastVMSelected";
-const char* UIDefs::GUI_LastItemSelected = "GUI/LastItemSelected";
-const char* UIDefs::GUI_GroupDefinitions = "GUI/GroupDefinitions";
-const char* UIDefs::GUI_HideFromManager = "GUI/HideFromManager";
-const char* UIDefs::GUI_PreventReconfiguration = "GUI/PreventReconfiguration";
-const char* UIDefs::GUI_PreventSnapshotOperations = "GUI/PreventSnapshotOperations";
-const char* UIDefs::GUI_HideDetails = "GUI/HideDetails";
-
-/* Machine-window definitions: */
-#ifndef Q_WS_MAC
-const char* UIDefs::GUI_MachineWindowIcons = "GUI/MachineWindowIcons";
-const char* UIDefs::GUI_MachineWindowNamePostfix = "GUI/MachineWindowNamePostfix";
-#endif /* !Q_WS_MAC */
-const char* UIDefs::GUI_RestrictedRuntimeMenus = "GUI/RestrictedRuntimeMenus";
-#ifdef Q_WS_MAC
-const char* UIDefs::GUI_RestrictedRuntimeApplicationMenuActions = "GUI/RestrictedRuntimeApplicationMenuActions";
-#endif /* Q_WS_MAC */
-const char* UIDefs::GUI_RestrictedRuntimeMachineMenuActions = "GUI/RestrictedRuntimeMachineMenuActions";
-const char* UIDefs::GUI_RestrictedRuntimeViewMenuActions = "GUI/RestrictedRuntimeViewMenuActions";
-const char* UIDefs::GUI_RestrictedRuntimeDevicesMenuActions = "GUI/RestrictedRuntimeDevicesMenuActions";
-#ifdef VBOX_WITH_DEBUGGER_GUI
-const char* UIDefs::GUI_RestrictedRuntimeDebuggerMenuActions = "GUI/RestrictedRuntimeDebuggerMenuActions";
-#endif /* VBOX_WITH_DEBUGGER_GUI */
-const char* UIDefs::GUI_RestrictedRuntimeHelpMenuActions = "GUI/RestrictedRuntimeHelpMenuActions";
-const char* UIDefs::GUI_RestrictedVisualStates = "GUI/RestrictedVisualStates";
-const char* UIDefs::GUI_Input_MachineShortcuts = "GUI/Input/MachineShortcuts";
-const char* UIDefs::GUI_LastNormalWindowPosition = "GUI/LastNormalWindowPosition";
-const char* UIDefs::GUI_LastScaleWindowPosition = "GUI/LastScaleWindowPosition";
-const char* UIDefs::GUI_LastWindowState_Max = "max";
-const char* UIDefs::GUI_LastGuestSizeHint = "GUI/LastGuestSizeHint";
-const char* UIDefs::GUI_LastGuestSizeHintWasFullscreen = "GUI/LastGuestSizeHintWasFullscreen";
-const char* UIDefs::GUI_Fullscreen = "GUI/Fullscreen";
-const char* UIDefs::GUI_Seamless = "GUI/Seamless";
-const char* UIDefs::GUI_Scale = "GUI/Scale";
-const char* UIDefs::GUI_VirtualScreenToHostScreen = "GUI/VirtualScreenToHostScreen";
-const char* UIDefs::GUI_AutoresizeGuest = "GUI/AutoresizeGuest";
-const char* UIDefs::GUI_AutomountGuestScreens = "GUI/AutomountGuestScreens";
-const char* UIDefs::GUI_SaveMountedAtRuntime = "GUI/SaveMountedAtRuntime";
-const char* UIDefs::GUI_PassCAD = "GUI/PassCAD";
-const char* UIDefs::GUI_DefaultCloseAction = "GUI/DefaultCloseAction";
-const char* UIDefs::GUI_RestrictedStatusBarIndicators = "GUI/RestrictedStatusBarIndicators";
-const char* UIDefs::GUI_HidLedsSync = "GUI/HidLedsSync";
-const char* UIDefs::GUI_GuruMeditationHandler = "GUI/GuruMeditationHandler";
-const char* UIDefs::GUI_HiDPIOptimization = "GUI/HiDPI/Optimization";
-
-/* Settings dialogs stuff: */
-const char* UIDefs::GUI_RestrictedGlobalSettingsPages = "GUI/RestrictedGlobalSettingsPages";
-const char* UIDefs::GUI_RestrictedMachineSettingsPages = "GUI/RestrictedMachineSettingsPages";
-
-/* Mini tool-bar definitions: */
-const char* UIDefs::GUI_ShowMiniToolBar = "GUI/ShowMiniToolBar";
-const char* UIDefs::GUI_MiniToolBarAlignment = "GUI/MiniToolBarAlignment";
-const char* UIDefs::GUI_MiniToolBarAutoHide = "GUI/MiniToolBarAutoHide";
-
-/* Close-dialog definitions: */
-const char* UIDefs::GUI_RestrictedCloseActions = "GUI/RestrictedCloseActions";
-const char* UIDefs::GUI_LastCloseAction = "GUI/LastCloseAction";
-const char* UIDefs::GUI_CloseActionHook = "GUI/CloseActionHook";
-
-/* Wizards definitions: */
-const char* UIDefs::GUI_FirstRun = "GUI/FirstRun";
-const char* UIDefs::GUI_HideDescriptionForWizards = "GUI/HideDescriptionForWizards";
-const char* UIDefs::GUI_Export_StorageType = "GUI/Export/StorageType";
-const char* UIDefs::GUI_Export_Username = "GUI/Export/Username";
-const char* UIDefs::GUI_Export_Hostname = "GUI/Export/Hostname";
-const char* UIDefs::GUI_Export_Bucket = "GUI/Export/Bucket";
-
-/* Message-center definitions: */
-const char* UIDefs::GUI_SuppressMessages = "GUI/SuppressMessages";
-const char* UIDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption";
-
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-/* Update manager definitions: */
-const char* UIDefs::GUI_PreventApplicationUpdate = "GUI/PreventApplicationUpdate";
-const char* UIDefs::GUI_UpdateDate = "GUI/UpdateDate";
-const char* UIDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount";
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-
-/* Information dialog definitions: */
-const char* UIDefs::GUI_InfoDlgState = "GUI/InfoDlgState";
-
-#ifdef VBOX_WITH_DEBUGGER_GUI
-/* Debugger GUI declarations: */
-const char* UIDefs::GUI_DbgEnabled = "GUI/Dbg/Enabled";
-const char* UIDefs::GUI_DbgAutoShow = "GUI/Dbg/AutoShow";
-#endif /* VBOX_WITH_DEBUGGER_GUI */
-
-#ifdef Q_WS_X11
-/* License GUI declarations: */
-const char* UIDefs::GUI_LicenseKey = "GUI/LicenseAgreed";
-#endif /* Q_WS_X11 */
-
-#ifdef Q_WS_MAC
-/* Mac dock declarations: */
-const char* UIDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
-const char* UIDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";
-const char* UIDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled";
-#endif /* Q_WS_MAC */
-
-#ifdef VBOX_WITH_VIDEOHWACCEL
-/* Video-acceleration declarations: */
-const char* UIDefs::GUI_Accelerate2D_StretchLinear = "GUI/Accelerate2D/StretchLinear";
-const char* UIDefs::GUI_Accelerate2D_PixformatYV12 = "GUI/Accelerate2D/PixformatYV12";
-const char* UIDefs::GUI_Accelerate2D_PixformatUYVY = "GUI/Accelerate2D/PixformatUYVY";
-const char* UIDefs::GUI_Accelerate2D_PixformatYUY2 = "GUI/Accelerate2D/PixformatYUY2";
-const char* UIDefs::GUI_Accelerate2D_PixformatAYUV = "GUI/Accelerate2D/PixformatAYUV";
-#endif /* VBOX_WITH_VIDEOHWACCEL */
-
 /* File extensions definitions: */
 QStringList UIDefs::VBoxFileExts = QStringList() << "xml" << "vbox";
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(revision 51187)
@@ -1,8 +1,8 @@
 /** @file
- * VBox Qt GUI - UIDefs namespace and other global declarations.
+ * VBox Qt GUI - Global definitions.
  */
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25,11 +25,9 @@
 #include "COMEnums.h"
 
-/* Other VBox defines: */
+/* Define GUI log group.
+ * This define should go *before* VBox/log.h include: */
 #define LOG_GROUP LOG_GROUP_GUI
-
 /* Other VBox includes: */
 #include <VBox/log.h>
-#include <iprt/assert.h>
-#include <iprt/alloc.h>
 
 /* Defines: */
@@ -50,17 +48,7 @@
 #endif /* SIZEOF_ARRAY */
 
-/* Global UI namespace: */
+/** Global namespace. */
 namespace UIDefs
 {
-    /* VM display rendering mode: */
-    enum RenderMode
-    {
-          InvalidRenderMode
-        , QImageMode
-#ifdef VBOX_GUI_USE_QUARTZ2D
-        , Quartz2DMode
-#endif /* VBOX_GUI_USE_QUARTZ2D */
-    };
-
     /* Additional Qt event types: */
     enum UIEventType
@@ -90,133 +78,4 @@
     };
 
-    /* Global declarations: */
-    extern const char* GUI_RenderMode;
-    extern const char* GUI_LanguageId;
-    extern const char* GUI_ExtPackName;
-    extern const char* GUI_PreventBetaWarning;
-    extern const char* GUI_RecentFolderHD;
-    extern const char* GUI_RecentFolderCD;
-    extern const char* GUI_RecentFolderFD;
-    extern const char* GUI_RecentListHD;
-    extern const char* GUI_RecentListCD;
-    extern const char* GUI_RecentListFD;
-
-    /* Selector-window declarations: */
-    extern const char* GUI_Input_SelectorShortcuts;
-    extern const char* GUI_LastSelectorWindowPosition;
-    extern const char* GUI_SplitterSizes;
-    extern const char* GUI_Toolbar;
-    extern const char* GUI_Statusbar;
-    extern const char* GUI_PreviewUpdate;
-    extern const char* GUI_DetailsPageBoxes;
-    extern const char* GUI_SelectorVMPositions;
-    extern const char* GUI_LastVMSelected;
-    extern const char* GUI_LastItemSelected;
-    extern const char* GUI_GroupDefinitions;
-    extern const char* GUI_HideFromManager;
-    extern const char* GUI_PreventReconfiguration;
-    extern const char* GUI_PreventSnapshotOperations;
-    extern const char* GUI_HideDetails;
-
-    /* Machine-window declarations: */
-#ifndef Q_WS_MAC
-    extern const char* GUI_MachineWindowIcons;
-    extern const char* GUI_MachineWindowNamePostfix;
-#endif /* !Q_WS_MAC */
-    extern const char* GUI_RestrictedRuntimeMenus;
-#ifdef Q_WS_MAC
-    extern const char* GUI_RestrictedRuntimeApplicationMenuActions;
-#endif /* Q_WS_MAC */
-    extern const char* GUI_RestrictedRuntimeMachineMenuActions;
-    extern const char* GUI_RestrictedRuntimeViewMenuActions;
-    extern const char* GUI_RestrictedRuntimeDevicesMenuActions;
-#ifdef VBOX_WITH_DEBUGGER_GUI
-    extern const char* GUI_RestrictedRuntimeDebuggerMenuActions;
-#endif /* VBOX_WITH_DEBUGGER_GUI */
-    extern const char* GUI_RestrictedRuntimeHelpMenuActions;
-    extern const char* GUI_RestrictedVisualStates;
-    extern const char* GUI_Input_MachineShortcuts;
-    extern const char* GUI_LastNormalWindowPosition;
-    extern const char* GUI_LastScaleWindowPosition;
-    extern const char* GUI_LastWindowState_Max;
-    extern const char* GUI_LastGuestSizeHint;
-    extern const char* GUI_LastGuestSizeHintWasFullscreen;
-    extern const char* GUI_Fullscreen;
-    extern const char* GUI_Seamless;
-    extern const char* GUI_Scale;
-    extern const char* GUI_VirtualScreenToHostScreen;
-    extern const char* GUI_AutoresizeGuest;
-    extern const char* GUI_AutomountGuestScreens;
-    extern const char* GUI_SaveMountedAtRuntime;
-    extern const char* GUI_PassCAD;
-    extern const char* GUI_DefaultCloseAction;
-    extern const char* GUI_RestrictedStatusBarIndicators;
-    extern const char* GUI_HidLedsSync;
-    extern const char* GUI_GuruMeditationHandler;
-    extern const char* GUI_HiDPIOptimization;
-
-    /* Settings dialogs stuff: */
-    extern const char* GUI_RestrictedGlobalSettingsPages;
-    extern const char* GUI_RestrictedMachineSettingsPages;
-
-    /* Mini tool-bar declarations: */
-    extern const char* GUI_ShowMiniToolBar;
-    extern const char* GUI_MiniToolBarAlignment;
-    extern const char* GUI_MiniToolBarAutoHide;
-
-    /* Close-dialog declarations: */
-    extern const char* GUI_RestrictedCloseActions;
-    extern const char* GUI_LastCloseAction;
-    extern const char* GUI_CloseActionHook;
-
-    /* Wizards declarations: */
-    extern const char* GUI_FirstRun;
-    extern const char* GUI_HideDescriptionForWizards;
-    extern const char* GUI_Export_StorageType;
-    extern const char* GUI_Export_Username;
-    extern const char* GUI_Export_Hostname;
-    extern const char* GUI_Export_Bucket;
-
-    /* Message-center declarations: */
-    extern const char* GUI_SuppressMessages;
-    extern const char* GUI_InvertMessageOption;
-
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-    /* Update manager declarations: */
-    extern const char* GUI_PreventApplicationUpdate;
-    extern const char* GUI_UpdateDate;
-    extern const char* GUI_UpdateCheckCount;
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-
-    /* Information dialog declarations: */
-    extern const char* GUI_InfoDlgState;
-
-#ifdef VBOX_WITH_DEBUGGER_GUI
-    /* Debugger GUI declarations: */
-    extern const char* GUI_DbgEnabled;
-    extern const char* GUI_DbgAutoShow;
-#endif /* VBOX_WITH_DEBUGGER_GUI */
-
-#ifdef Q_WS_X11
-    /* License GUI declarations: */
-    extern const char* GUI_LicenseKey;
-#endif /* Q_WS_X11 */
-
-#ifdef Q_WS_MAC
-    /* Mac dock declarations: */
-    extern const char* GUI_RealtimeDockIconUpdateEnabled;
-    extern const char* GUI_RealtimeDockIconUpdateMonitor;
-    extern const char* GUI_PresentationModeEnabled;
-#endif /* Q_WS_MAC */
-
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    /* Video-acceleration declarations: */
-    extern const char* GUI_Accelerate2D_StretchLinear;
-    extern const char* GUI_Accelerate2D_PixformatYV12;
-    extern const char* GUI_Accelerate2D_PixformatUYVY;
-    extern const char* GUI_Accelerate2D_PixformatYUY2;
-    extern const char* GUI_Accelerate2D_PixformatAYUV;
-#endif /* VBOX_WITH_VIDEOHWACCEL */
-
     /* File extensions declarations: */
     extern QStringList VBoxFileExts;
@@ -224,8 +83,8 @@
     extern QStringList OVFFileExts;
 }
-using namespace UIDefs /* globally */;
+using namespace UIDefs /* if header included */;
 
 #ifdef Q_WS_MAC
-/** Known MacOS X releases. */
+/** Mac OS X: Known OS releases. */
 enum MacOSXRelease
 {
@@ -238,4 +97,17 @@
 #endif /* Q_WS_MAC */
 
+/** Common UI: Size suffixes. */
+enum SizeSuffix
+{
+    SizeSuffix_Byte = 0,
+    SizeSuffix_KiloByte,
+    SizeSuffix_MegaByte,
+    SizeSuffix_GigaByte,
+    SizeSuffix_TeraByte,
+    SizeSuffix_PetaByte,
+    SizeSuffix_Max
+};
+
+/** Common UI: Storage-slot struct. */
 struct StorageSlot
 {
@@ -257,238 +129,3 @@
 Q_DECLARE_METATYPE(StorageSlot);
 
-/* Common UI size suffixes: */
-enum SizeSuffix
-{
-    SizeSuffix_Byte = 0,
-    SizeSuffix_KiloByte,
-    SizeSuffix_MegaByte,
-    SizeSuffix_GigaByte,
-    SizeSuffix_TeraByte,
-    SizeSuffix_PetaByte,
-    SizeSuffix_Max
-};
-
-/* Runtime UI menu types: */
-enum RuntimeMenuType
-{
-    RuntimeMenuType_Invalid = 0,
-    RuntimeMenuType_Machine = RT_BIT(0),
-    RuntimeMenuType_View    = RT_BIT(1),
-    RuntimeMenuType_Devices = RT_BIT(2),
-    RuntimeMenuType_Debug   = RT_BIT(3),
-    RuntimeMenuType_Help    = RT_BIT(4),
-    RuntimeMenuType_All     = 0xFF
-};
-
-#ifdef Q_WS_MAC
-/** Runtime UI: Application menu: Action types. */
-enum RuntimeMenuApplicationActionType
-{
-    RuntimeMenuApplicationActionType_Invalid = 0,
-    RuntimeMenuApplicationActionType_About   = RT_BIT(0),
-    RuntimeMenuApplicationActionType_All     = 0xFFFF
-};
-#endif /* Q_WS_MAC */
-
-/** Runtime UI: Machine menu: Action types. */
-enum RuntimeMenuMachineActionType
-{
-    RuntimeMenuMachineActionType_Invalid           = 0,
-    RuntimeMenuMachineActionType_SettingsDialog    = RT_BIT(0),
-    RuntimeMenuMachineActionType_TakeSnapshot      = RT_BIT(1),
-    RuntimeMenuMachineActionType_TakeScreenshot    = RT_BIT(2),
-    RuntimeMenuMachineActionType_InformationDialog = RT_BIT(3),
-    RuntimeMenuMachineActionType_MouseIntegration  = RT_BIT(4),
-    RuntimeMenuMachineActionType_TypeCAD           = RT_BIT(5),
-#ifdef Q_WS_X11
-    RuntimeMenuMachineActionType_TypeCABS          = RT_BIT(6),
-#endif /* Q_WS_X11 */
-    RuntimeMenuMachineActionType_Pause             = RT_BIT(7),
-    RuntimeMenuMachineActionType_Reset             = RT_BIT(8),
-    RuntimeMenuMachineActionType_SaveState         = RT_BIT(9),
-    RuntimeMenuMachineActionType_Shutdown          = RT_BIT(10),
-    RuntimeMenuMachineActionType_PowerOff          = RT_BIT(11),
-#ifndef Q_WS_MAC
-    RuntimeMenuMachineActionType_Close             = RT_BIT(12),
-#endif /* !Q_WS_MAC */
-    RuntimeMenuMachineActionType_All               = 0xFFFF
-};
-
-/** Runtime UI: View menu: Action types. */
-enum RuntimeMenuViewActionType
-{
-    RuntimeMenuViewActionType_Invalid         = 0,
-    RuntimeMenuViewActionType_Fullscreen      = RT_BIT(0),
-    RuntimeMenuViewActionType_Seamless        = RT_BIT(1),
-    RuntimeMenuViewActionType_Scale           = RT_BIT(2),
-    RuntimeMenuViewActionType_GuestAutoresize = RT_BIT(3),
-    RuntimeMenuViewActionType_AdjustWindow    = RT_BIT(4),
-    RuntimeMenuViewActionType_Multiscreen     = RT_BIT(5),
-    RuntimeMenuViewActionType_All             = 0xFFFF
-};
-
-/** Runtime UI: Devices menu: Action types. */
-enum RuntimeMenuDevicesActionType
-{
-    RuntimeMenuDevicesActionType_Invalid               = 0,
-    RuntimeMenuDevicesActionType_OpticalDevices        = RT_BIT(0),
-    RuntimeMenuDevicesActionType_FloppyDevices         = RT_BIT(1),
-    RuntimeMenuDevicesActionType_USBDevices            = RT_BIT(2),
-    RuntimeMenuDevicesActionType_WebCams               = RT_BIT(3),
-    RuntimeMenuDevicesActionType_SharedClipboard       = RT_BIT(4),
-    RuntimeMenuDevicesActionType_DragAndDrop           = RT_BIT(5),
-    RuntimeMenuDevicesActionType_NetworkSettings       = RT_BIT(6),
-    RuntimeMenuDevicesActionType_SharedFoldersSettings = RT_BIT(7),
-    RuntimeMenuDevicesActionType_VRDEServer            = RT_BIT(8),
-    RuntimeMenuDevicesActionType_VideoCapture          = RT_BIT(9),
-    RuntimeMenuDevicesActionType_InstallGuestTools     = RT_BIT(10),
-    RuntimeMenuDevicesActionType_All                   = 0xFFFF
-};
-
-#ifdef VBOX_WITH_DEBUGGER_GUI
-/** Runtime UI: Debugger menu: Action types. */
-enum RuntimeMenuDebuggerActionType
-{
-    RuntimeMenuDebuggerActionType_Invalid     = 0,
-    RuntimeMenuDebuggerActionType_Statistics  = RT_BIT(0),
-    RuntimeMenuDebuggerActionType_CommandLine = RT_BIT(1),
-    RuntimeMenuDebuggerActionType_Logging     = RT_BIT(2),
-    RuntimeMenuDebuggerActionType_LogDialog   = RT_BIT(3),
-    RuntimeMenuDebuggerActionType_All         = 0xFFFF
-};
-#endif /* VBOX_WITH_DEBUGGER_GUI */
-
-/** Runtime UI: Help menu: Action types. */
-enum RuntimeMenuHelpActionType
-{
-    RuntimeMenuHelpActionType_Invalid              = 0,
-    RuntimeMenuHelpActionType_Contents             = RT_BIT(0),
-    RuntimeMenuHelpActionType_WebSite              = RT_BIT(1),
-    RuntimeMenuHelpActionType_ResetWarnings        = RT_BIT(2),
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-    RuntimeMenuHelpActionType_NetworkAccessManager = RT_BIT(3),
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-#ifndef Q_WS_MAC
-    RuntimeMenuHelpActionType_About                = RT_BIT(4),
-#endif /* !Q_WS_MAC */
-    RuntimeMenuHelpActionType_All                  = 0xFFFF
-};
-
-/* Runtime UI visual-state types: */
-enum UIVisualStateType
-{
-    UIVisualStateType_Invalid    = 0,
-    UIVisualStateType_Normal     = RT_BIT(0),
-    UIVisualStateType_Fullscreen = RT_BIT(1),
-    UIVisualStateType_Seamless   = RT_BIT(2),
-    UIVisualStateType_Scale      = RT_BIT(3),
-    UIVisualStateType_All        = 0xFF
-};
-Q_DECLARE_METATYPE(UIVisualStateType);
-
-/* Details element type: */
-enum DetailsElementType
-{
-    DetailsElementType_General,
-    DetailsElementType_System,
-    DetailsElementType_Preview,
-    DetailsElementType_Display,
-    DetailsElementType_Storage,
-    DetailsElementType_Audio,
-    DetailsElementType_Network,
-    DetailsElementType_Serial,
-#ifdef VBOX_WITH_PARALLEL_PORTS
-    DetailsElementType_Parallel,
-#endif /* VBOX_WITH_PARALLEL_PORTS */
-    DetailsElementType_USB,
-    DetailsElementType_SF,
-    DetailsElementType_Description
-};
-Q_DECLARE_METATYPE(DetailsElementType);
-
-/* Global settings page type: */
-enum GlobalSettingsPageType
-{
-    GlobalSettingsPageType_Invalid,
-    GlobalSettingsPageType_General,
-    GlobalSettingsPageType_Input,
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-    GlobalSettingsPageType_Update,
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-    GlobalSettingsPageType_Language,
-    GlobalSettingsPageType_Display,
-    GlobalSettingsPageType_Network,
-    GlobalSettingsPageType_Extensions,
-#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-    GlobalSettingsPageType_Proxy,
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-    GlobalSettingsPageType_Max
-};
-Q_DECLARE_METATYPE(GlobalSettingsPageType);
-
-/* Machine settings page type: */
-enum MachineSettingsPageType
-{
-    MachineSettingsPageType_Invalid,
-    MachineSettingsPageType_General,
-    MachineSettingsPageType_System,
-    MachineSettingsPageType_Display,
-    MachineSettingsPageType_Storage,
-    MachineSettingsPageType_Audio,
-    MachineSettingsPageType_Network,
-    MachineSettingsPageType_Ports,
-    MachineSettingsPageType_Serial,
-    MachineSettingsPageType_Parallel,
-    MachineSettingsPageType_USB,
-    MachineSettingsPageType_SF,
-    MachineSettingsPageType_Max
-};
-Q_DECLARE_METATYPE(MachineSettingsPageType);
-
-/* Indicator type: */
-enum IndicatorType
-{
-    IndicatorType_Invalid,
-    IndicatorType_HardDisks,
-    IndicatorType_OpticalDisks,
-    IndicatorType_FloppyDisks,
-    IndicatorType_Network,
-    IndicatorType_USB,
-    IndicatorType_SharedFolders,
-    IndicatorType_VideoCapture,
-    IndicatorType_Features,
-    IndicatorType_Mouse,
-    IndicatorType_Keyboard,
-    IndicatorType_Max
-};
-Q_DECLARE_METATYPE(IndicatorType);
-
-/* Machine close action: */
-enum MachineCloseAction
-{
-    MachineCloseAction_Invalid                    = 0,
-    MachineCloseAction_SaveState                  = RT_BIT(0),
-    MachineCloseAction_Shutdown                   = RT_BIT(1),
-    MachineCloseAction_PowerOff                   = RT_BIT(2),
-    MachineCloseAction_PowerOff_RestoringSnapshot = RT_BIT(3),
-    MachineCloseAction_All                        = 0xFF
-};
-Q_DECLARE_METATYPE(MachineCloseAction);
-
-/** Guru Meditation handler types. */
-enum GuruMeditationHandlerType
-{
-    GuruMeditationHandlerType_Default,
-    GuruMeditationHandlerType_PowerOff,
-    GuruMeditationHandlerType_Ignore
-};
-
-/** Runtime UI: HiDPI optimization types. */
-enum HiDPIOptimizationType
-{
-    HiDPIOptimizationType_None,
-    HiDPIOptimizationType_Performance
-};
-
 #endif /* !___UIDefs_h___ */
-
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp	(revision 51187)
@@ -20,13 +20,6 @@
 
 /* GUI includes: */
-#include "COMDefs.h"
 #include "UIThreadPool.h"
-
-/* Other VBox defines: */
-#define LOG_GROUP LOG_GROUP_GUI
-
-/* Other VBox includes: */
-#include <VBox/log.h>
-#include <VBox/sup.h>
+#include "UIDefs.h"
 
 /**
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h	(revision 51187)
@@ -33,4 +33,5 @@
 #include "UIDefs.h"
 #include "UIMediumDefs.h"
+#include "UIExtraDataDefs.h"
 #include "VBoxGlobalSettings.h"
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h	(revision 51187)
@@ -24,4 +24,5 @@
 /* GUI includes: */
 #include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* COM includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.h	(revision 51187)
@@ -22,5 +22,5 @@
 /* GUI includes: */
 #include "QIStateIndicator.h"
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* Forward declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h	(revision 51187)
@@ -25,5 +25,5 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 #ifdef Q_WS_MAC
 # include <CoreFoundation/CFBase.h>
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h	(revision 51187)
@@ -22,5 +22,5 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 #include "UIMachineDefs.h"
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.h	(revision 51187)
@@ -19,5 +19,5 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 #include <QIWithRetranslateUI.h>
 #ifdef VBOX_WITH_DEBUGGER_GUI
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.h	(revision 51187)
@@ -22,5 +22,5 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* Forward declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.h	(revision 51187)
@@ -25,6 +25,6 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
 #include "UIMachineDefs.h"
+#include "UIExtraDataDefs.h"
 #ifdef Q_WS_MAC
 # include <CoreFoundation/CFBase.h>
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.h	(revision 51187)
@@ -25,5 +25,5 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* COM includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h	(revision 51187)
@@ -28,5 +28,5 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* Forward declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h	(revision 51187)
@@ -25,5 +25,5 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* COM includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp	(revision 51187)
@@ -33,5 +33,5 @@
 #include "UIGChooserItemGroup.h"
 #include "UIGChooserItemMachine.h"
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 #include "VBoxGlobal.h"
 #include "UIMessageCenter.h"
@@ -1706,5 +1706,5 @@
 {
     /* Prepare extra-data key for the parent-item: */
-    QString strExtraDataKey = UIDefs::GUI_GroupDefinitions + pParentItem->fullName();
+    QString strExtraDataKey = GUI_GroupDefinitions + pParentItem->fullName();
     /* Read group definitions: */
     QStringList definitions = vboxGlobal().virtualBox().GetExtraDataStringList(strExtraDataKey);
@@ -1777,5 +1777,5 @@
 {
     /* Prepare extra-data key for the parent-item: */
-    QString strExtraDataKey = UIDefs::GUI_GroupDefinitions + pParentItem->fullName();
+    QString strExtraDataKey = GUI_GroupDefinitions + pParentItem->fullName();
     /* Read group definitions: */
     QStringList definitions = vboxGlobal().virtualBox().GetExtraDataStringList(strExtraDataKey);
@@ -1885,5 +1885,5 @@
 {
     /* Prepare extra-data key for current group: */
-    QString strExtraDataKey = UIDefs::GUI_GroupDefinitions + pParentItem->fullName();
+    QString strExtraDataKey = GUI_GroupDefinitions + pParentItem->fullName();
     /* Iterate over all the group-items: */
     foreach (UIGChooserItem *pItem, pParentItem->items(UIGChooserItemType_Group))
@@ -2095,5 +2095,5 @@
     const QVector<QString> extraDataKeys = vboxGlobal().virtualBox().GetExtraDataKeys();
     foreach (const QString &strKey, extraDataKeys)
-        if (strKey.startsWith(UIDefs::GUI_GroupDefinitions))
+        if (strKey.startsWith(GUI_GroupDefinitions))
             vboxGlobal().virtualBox().SetExtraData(strKey, QString());
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.h	(revision 51187)
@@ -25,5 +25,5 @@
 /* GUI includes: */
 #include "UIGDetailsItem.h"
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* Forward declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsModel.h	(revision 51187)
@@ -27,5 +27,5 @@
 
 /* GUI includes: */
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 
 /* COM includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.h	(revision 51187)
@@ -22,5 +22,5 @@
 /* GUI includes: */
 #include "UIGDetailsItem.h"
-#include "UIDefs.h"
+#include "UIExtraDataDefs.h"
 #include "UISettingsDefs.h"
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h	(revision 51179)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h	(revision 51187)
@@ -26,6 +26,6 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "UIDefs.h"
 #include "UISettingsDefs.h"
+#include "UIExtraDataDefs.h"
 #include "VBoxGlobalSettings.h"
 
