Index: trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/UITakeSnapshotDialog.cpp	(revision 76606)
@@ -16,30 +16,24 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGridLayout>
-# include <QLabel>
-# include <QLineEdit>
-# include <QPushButton>
-# include <QStyle>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QStyle>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QILabel.h"
-# include "VBoxUtils.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIMessageCenter.h"
-# include "UITakeSnapshotDialog.h"
+#include "QIDialogButtonBox.h"
+#include "QILabel.h"
+#include "VBoxUtils.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIMessageCenter.h"
+#include "UITakeSnapshotDialog.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CMachine.h"
-# include "CMedium.h"
-# include "CMediumAttachment.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "COMEnums.h"
+#include "CMachine.h"
+#include "CMedium.h"
+#include "CMediumAttachment.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/VBox2DHelpers.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/VBox2DHelpers.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/VBox2DHelpers.cpp	(revision 76606)
@@ -19,19 +19,15 @@
 #if defined(VBOX_GUI_USE_QGL) || defined(VBOX_WITH_VIDEOHWACCEL)
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-# define LOG_GROUP LOG_GROUP_GUI
+#define LOG_GROUP LOG_GROUP_GUI
 
 // WORKAROUND:
 // QGLWidget drags in Windows.h and stdint.h
-# ifdef RT_OS_WINDOWS
-#  include <iprt/win/windows.h>
-#  include <iprt/stdint.h>
-# endif
+#ifdef RT_OS_WINDOWS
+# include <iprt/win/windows.h>
+# include <iprt/stdint.h>
+#endif
 
 /* Qt includes: */
-# include <QGLWidget>
+#include <QGLWidget>
 
 /* GUI includes: */
@@ -39,7 +35,5 @@
 
 /* Other VBox includes: */
-# include <VBox/VBoxGL2D.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <VBox/VBoxGL2D.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp	(revision 76606)
@@ -16,30 +16,25 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDialogButtonBox>
-# include <QDir>
-# include <QEvent>
-# include <QLabel>
-# include <QPainter>
-# include <QPushButton>
-# include <QStyle>
-# include <QVBoxLayout>
+#include <QDialogButtonBox>
+#include <QDir>
+#include <QEvent>
+#include <QLabel>
+#include <QPainter>
+#include <QPushButton>
+#include <QStyle>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIConverter.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "VBoxAboutDlg.h"
-# include "VBoxGlobal.h"
+#include "UIConverter.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "VBoxAboutDlg.h"
+#include "VBoxGlobal.h"
 
 /* Other VBox includes: */
-# include <iprt/path.h>
-# include <VBox/version.h> /* VBOX_VENDOR */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/path.h>
+#include <VBox/version.h> /* VBOX_VENDOR */
+
 
 VBoxAboutDlg::VBoxAboutDlg(QWidget *pParent, const QString &strVersion)
Index: trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp	(revision 76606)
@@ -22,47 +22,41 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-# define LOG_GROUP LOG_GROUP_GUI
+#define LOG_GROUP LOG_GROUP_GUI
 
 /* Qt includes: */
-# ifdef RT_OS_WINDOWS
-#  include <iprt/win/windows.h> /* QGLWidget drags in Windows.h; -Wall forces us to use wrapper. */
-#  include <iprt/stdint.h>      /* QGLWidget drags in stdint.h; -Wall forces us to use wrapper. */
-# endif
-# include <QApplication>
-# include <QGLWidget>
-# include <QFile>
-# include <QTextStream>
+#ifdef RT_OS_WINDOWS
+# include <iprt/win/windows.h> /* QGLWidget drags in Windows.h; -Wall forces us to use wrapper. */
+# include <iprt/stdint.h>      /* QGLWidget drags in stdint.h; -Wall forces us to use wrapper. */
+#endif
+#include <QApplication>
+#include <QGLWidget>
+#include <QFile>
+#include <QTextStream>
 
 /* GUI includes: */
-# include "VBoxFBOverlay.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UIPopupCenter.h"
-# include "VBoxGlobal.h"
+#include "VBoxFBOverlay.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UIPopupCenter.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CSession.h"
-# include "CConsole.h"
-# include "CMachine.h"
-# include "CDisplay.h"
+#include "CSession.h"
+#include "CConsole.h"
+#include "CMachine.h"
+#include "CDisplay.h"
 
 /* Other VBox includes: */
-# include <iprt/asm.h>
-# include <iprt/semaphore.h>
-# include <VBox/AssertGuest.h>
-
-# include <VBox/VBoxGL2D.h>
+#include <iprt/asm.h>
+#include <iprt/semaphore.h>
+#include <VBox/AssertGuest.h>
+
+#include <VBox/VBoxGL2D.h>
 
 #ifdef VBOX_WS_MAC
-# include "VBoxUtils-darwin.h"
-#endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxUtils-darwin.h"
+#endif
 
 /* Other VBox includes: */
@@ -73,5 +67,5 @@
 # include <VBoxVideo.h>
 # include <VBox/vmm/ssm.h>
-#endif /* VBOX_WITH_VIDEOHWACCEL */
+#endif
 
 /* Other includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp	(revision 76606)
@@ -16,28 +16,22 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-# ifdef RT_OS_WINDOWS
-#  include <iprt/win/windows.h> /* QGLWidget drags in Windows.h; -Wall forces us to use wrapper. */
-#  include <iprt/stdint.h>      /* QGLWidget drags in stdint.h; -Wall forces us to use wrapper. */
-# endif
-# include <QGLWidget>
-
-# include <iprt/assert.h>
-# include <iprt/log.h>
-# include <iprt/env.h>
-# include <iprt/param.h>
-# include <iprt/path.h>
-# include <iprt/process.h>
-# include <iprt/string.h>
-# include <iprt/time.h>
-# include <iprt/thread.h>
-
-# include <VBox/VBoxGL2D.h>
-# include "VBoxFBOverlayCommon.h"
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
+#ifdef RT_OS_WINDOWS
+# include <iprt/win/windows.h> /* QGLWidget drags in Windows.h; -Wall forces us to use wrapper. */
+# include <iprt/stdint.h>      /* QGLWidget drags in stdint.h; -Wall forces us to use wrapper. */
+#endif
+#include <QGLWidget>
+
+#include <iprt/assert.h>
+#include <iprt/log.h>
+#include <iprt/env.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
+#include <iprt/process.h>
+#include <iprt/string.h>
+#include <iprt/time.h>
+#include <iprt/thread.h>
+
+#include <VBox/VBoxGL2D.h>
+#include "VBoxFBOverlayCommon.h"
 #include <iprt/err.h>
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QFile>
-# include <QPushButton>
-# include <QScrollBar>
-# include <QTextBrowser>
-# include <QVBoxLayout>
+#include <QFile>
+#include <QPushButton>
+#include <QScrollBar>
+#include <QTextBrowser>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "VBoxLicenseViewer.h"
-# include "UIMessageCenter.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIDialogButtonBox.h"
+#include "VBoxLicenseViewer.h"
+#include "UIMessageCenter.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileDetailsWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileDetailsWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileDetailsWidget.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGridLayout>
-# include <QHeaderView>
-# include <QLabel>
-# include <QLineEdit>
-# include <QPushButton>
-# include <QTableWidget>
-# include <QVBoxLayout>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QTableWidget>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "UICloudProfileDetailsWidget.h"
+#include "QIDialogButtonBox.h"
+#include "UICloudProfileDetailsWidget.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/cloud/UICloudProfileManager.cpp	(revision 76606)
@@ -16,28 +16,24 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHeaderView>
-# include <QPushButton>
-# include <QVBoxLayout>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QIInputDialog.h"
-# include "QITreeWidget.h"
-# include "VBoxGlobal.h"
-# include "UIActionPoolManager.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UICloudProfileDetailsWidget.h"
-# include "UICloudProfileManager.h"
-# include "UIMessageCenter.h"
-# include "UIToolBar.h"
-# ifdef VBOX_WS_MAC
-#  include "UIWindowMenuManager.h"
-# endif
+#include "QIDialogButtonBox.h"
+#include "QIInputDialog.h"
+#include "QITreeWidget.h"
+#include "VBoxGlobal.h"
+#include "UIActionPoolManager.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UICloudProfileDetailsWidget.h"
+#include "UICloudProfileManager.h"
+#include "UIMessageCenter.h"
+#include "UIToolBar.h"
+#ifdef VBOX_WS_MAC
+# include "UIWindowMenuManager.h"
+#endif
 
 /* COM includes: */
@@ -45,6 +41,4 @@
 #include "CCloudProvider.h"
 #include "CCloudProviderManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverter.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverter.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverter.cpp	(revision 76606)
@@ -16,10 +16,6 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else
 /* GUI includes: */
-# include "UIConverter.h"
-#endif
+#include "UIConverter.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendCOM.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QHash>
+#include <QApplication>
+#include <QHash>
 
 /* GUI includes: */
-# include "UIConverterBackend.h"
-# include "UIIconPool.h"
+#include "UIConverterBackend.h"
+#include "UIIconPool.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "COMEnums.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QHash>
-# include <QRegularExpression>
+#include <QApplication>
+#include <QHash>
+#include <QRegularExpression>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIConverterBackend.h"
-# include "UIIconPool.h"
+#include "VBoxGlobal.h"
+#include "UIConverterBackend.h"
+#include "UIIconPool.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIAdvancedSlider.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QPainter>
-# include <QSlider>
-# include <QStyle>
-# include <QVBoxLayout>
+#include <QPainter>
+#include <QSlider>
+#include <QStyle>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIAdvancedSlider.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIAdvancedSlider.h"
 
 /* Qt includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QKeyEvent>
+#include <QKeyEvent>
 
 /* GUI includes: */
-# include "QIArrowButtonPress.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIArrowButtonPress.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QKeyEvent>
+#include <QKeyEvent>
 
 /* GUI includes: */
-# include "QIArrowButtonSwitch.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIArrowButtonSwitch.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QHBoxLayout>
-# include <QStyle>
-# include <QTextEdit>
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QStyle>
+#include <QTextEdit>
 
 /* GUI includes: */
-# include "QIArrowSplitter.h"
-# include "QIArrowButtonPress.h"
-# include "QIArrowButtonSwitch.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIIconPool.h"
+#include "QIArrowSplitter.h"
+#include "QIArrowButtonPress.h"
+#include "QIArrowButtonSwitch.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIIconPool.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIComboBox.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QHBoxLayout>
-# include <QLineEdit>
+#include <QAccessibleWidget>
+#include <QHBoxLayout>
+#include <QLineEdit>
 
 /* GUI includes: */
-# include "QIComboBox.h"
+#include "QIComboBox.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp	(revision 76606)
@@ -16,16 +16,10 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QEventLoop>
+#include <QEventLoop>
 
 /* GUI includes: */
-# include "QIDialog.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIDialog.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp	(revision 76606)
@@ -15,21 +15,15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QBoxLayout>
-# include <QEvent>
-# include <QPushButton>
+#include <QBoxLayout>
+#include <QEvent>
+#include <QPushButton>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "UISpecialControls.h"
+#include "QIDialogButtonBox.h"
+#include "UISpecialControls.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# ifdef VBOX_WS_MAC
-#  include <QEventLoop>
-# endif
+#ifdef VBOX_WS_MAC
+# include <QEventLoop>
+#endif
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "UIModalWindowManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIFileDialog.h"
+#include "UIModalWindowManager.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFlowLayout.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFlowLayout.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFlowLayout.cpp	(revision 76606)
@@ -16,8 +16,4 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
 #include <QWidget>
@@ -25,6 +21,4 @@
 /* GUI includes: */
 #include "QIFlowLayout.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIInputDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIInputDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIInputDialog.cpp	(revision 76606)
@@ -16,8 +16,4 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
 #include <QLabel>
@@ -27,8 +23,6 @@
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QIInputDialog.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIDialogButtonBox.h"
+#include "QIInputDialog.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp	(revision 76606)
@@ -20,24 +20,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QClipboard>
-# include <QContextMenuEvent>
-# include <QDrag>
-# include <QFocusEvent>
-# include <QMenu>
-# include <QMimeData>
-# include <QMouseEvent>
-# include <QPainter>
-# include <QStyleOptionFocusRect>
+#include <QApplication>
+#include <QClipboard>
+#include <QContextMenuEvent>
+#include <QDrag>
+#include <QFocusEvent>
+#include <QMenu>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QStyleOptionFocusRect>
 
 /* GUI includes: */
-# include "QILabel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QILabel.h"
 
 /* Type definitions: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp	(revision 76606)
@@ -16,16 +16,10 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QLabel>
+#include <QHBoxLayout>
+#include <QLabel>
 
 /* GUI includes: */
-# include "QILabelSeparator.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QILabelSeparator.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp	(revision 76606)
@@ -16,12 +16,6 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "QILineEdit.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QILineEdit.h"
 
 /* Qt includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp	(revision 76606)
@@ -16,28 +16,22 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QDialogButtonBox>
-# include <QDir>
-# include <QEventLoop>
-# include <QMenu>
-# include <QProcess>
-# include <QPushButton>
-# include <QSizeGrip>
-# include <QUrl>
+#include <QApplication>
+#include <QDialogButtonBox>
+#include <QDir>
+#include <QEventLoop>
+#include <QMenu>
+#include <QProcess>
+#include <QPushButton>
+#include <QSizeGrip>
+#include <QUrl>
 
 /* GUI includes: */
-# include "QIMainDialog.h"
-# include "VBoxGlobal.h"
-# include "VBoxUtils.h"
+#include "QIMainDialog.h"
+#include "VBoxGlobal.h"
+#include "VBoxUtils.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "QIMainWindow.h"
-# ifdef VBOX_WS_X11
-#  include "VBoxGlobal.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIMainWindow.h"
+#ifdef VBOX_WS_X11
+# include "VBoxGlobal.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMenuBar>
-# include <QPushButton>
-# include <QStyle>
-# include <QVBoxLayout>
+#include <QMenuBar>
+#include <QPushButton>
+#include <QStyle>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QIManagerDialog.h"
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# ifdef VBOX_WS_MAC
-#  include "UIToolBar.h"
-#  include "UIWindowMenuManager.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIDialogButtonBox.h"
+#include "QIManagerDialog.h"
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#ifdef VBOX_WS_MAC
+# include "UIToolBar.h"
+# include "UIWindowMenuManager.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMenu.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMenu.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMenu.cpp	(revision 76606)
@@ -16,12 +16,6 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else
-
 /* GUI includes: */
-# include "QIMenu.h"
-
-#endif
+#include "QIMenu.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QClipboard>
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QMimeData>
-# include <QPushButton>
-# include <QStyle>
-# include <QVBoxLayout>
+#include <QCheckBox>
+#include <QClipboard>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMimeData>
+#include <QPushButton>
+#include <QStyle>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIArrowSplitter.h"
-# include "QIDialogButtonBox.h"
-# include "QILabel.h"
-# include "QIMessageBox.h"
-# include "UIIconPool.h"
+#include "QIArrowSplitter.h"
+#include "QIDialogButtonBox.h"
+#include "QILabel.h"
+#include "QIMessageBox.h"
+#include "UIIconPool.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIProcess.cpp	(revision 76606)
@@ -16,12 +16,6 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "QIProcess.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIProcess.h"
 
 /* External includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichTextLabel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichTextLabel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichTextLabel.cpp	(revision 76606)
@@ -16,16 +16,10 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QUrl>
-# include <QVBoxLayout>
+#include <QUrl>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIRichTextLabel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIRichTextLabel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QKeyEvent>
-# include <QLabel>
-# include <QStyleOptionFocusRect>
-# include <QStylePainter>
+#include <QHBoxLayout>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QStyleOptionFocusRect>
+#include <QStylePainter>
 
 /* GUI includes: */
-# include "QIRichToolButton.h"
-# include "QIToolButton.h"
+#include "QIRichToolButton.h"
+#include "QIToolButton.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QISplitter.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QEvent>
-# include <QPainter>
-# include <QPaintEvent>
+#include <QApplication>
+#include <QEvent>
+#include <QPainter>
+#include <QPaintEvent>
 
 /* GUI includes: */
-# include "QISplitter.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QISplitter.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else
-
 /* Qt includes: */
-# include <QAccessibleWidget>
+#include <QAccessibleWidget>
 
 /* GUI includes: */
-# include "QIStatusBar.h"
-
-#endif
+#include "QIStatusBar.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBarIndicator.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QIcon>
-# include <QPainter>
-# include <QStyle>
-# ifdef VBOX_WS_MAC
-#  include <QContextMenuEvent>
-# endif /* VBOX_WS_MAC */
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QIcon>
+#include <QPainter>
+#include <QStyle>
+#ifdef VBOX_WS_MAC
+# include <QContextMenuEvent>
+#endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
-# include "QIStatusBarIndicator.h"
+#include "QIStatusBarIndicator.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITableView.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
+#include <QAccessibleWidget>
 
 /* GUI includes: */
-# include "QIStyledItemDelegate.h"
-# include "QITableView.h"
+#include "QIStyledItemDelegate.h"
+#include "QITableView.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QMouseEvent>
-# include <QPainter>
-# include <QSortFilterProxyModel>
+#include <QAccessibleWidget>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QSortFilterProxyModel>
 
 /* GUI includes: */
-# include "QITreeView.h"
+#include "QITreeView.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QPainter>
-# include <QResizeEvent>
+#include <QAccessibleWidget>
+#include <QPainter>
+#include <QResizeEvent>
 
 /* GUI includes: */
-# include "QITreeWidget.h"
+#include "QITreeWidget.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp	(revision 76606)
@@ -16,13 +16,7 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "QIWidgetValidator.h"
-# include "UISettingsPage.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIWidgetValidator.h"
+#include "UISettingsPage.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsView.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QScrollBar>
-# include <QTouchEvent>
+#include <QScrollBar>
+#include <QTouchEvent>
 
 /* GUI includes: */
-# include "QIGraphicsView.h"
+#include "QIGraphicsView.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extensions/graphics/QIGraphicsWidget.cpp	(revision 76606)
@@ -16,12 +16,6 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "QIGraphicsWidget.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIGraphicsWidget.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp	(revision 76606)
@@ -16,12 +16,6 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIExtraDataDefs.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIExtraDataDefs.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp	(revision 76606)
@@ -16,65 +16,56 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QFontDatabase>
-# include <QMetaEnum>
-# include <QMutex>
-# include <QRegularExpression>
-# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
-#  include <QComboBox>
-#  include <QHeaderView>
-#  include <QLabel>
-#  include <QLineEdit>
-#  include <QListView>
-#  include <QMenuBar>
-#  include <QPainter>
-#  include <QPushButton>
-#  include <QSortFilterProxyModel>
-#  include <QStyledItemDelegate>
-#  include <QTableView>
-#  include <QVBoxLayout>
-# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
-
-/* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIActionPool.h"
-# include "UIConverter.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIHostComboEditor.h"
-# include "UIMainEventListener.h"
-# include "UIMessageCenter.h"
-# include "UISettingsDefs.h"
-# ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
-#  include "QIDialog.h"
-#  include "QIDialogButtonBox.h"
-#  include "QIFileDialog.h"
-#  include "QIMainWindow.h"
-#  include "QISplitter.h"
-#  include "QIWidgetValidator.h"
-#  include "VBoxUtils.h"
-#  include "UIIconPool.h"
-#  include "UIToolBar.h"
-#  include "UIVirtualBoxEventHandler.h"
-# endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
-
-/* COM includes: */
-# include "COMEnums.h"
-# include "CEventListener.h"
-# include "CEventSource.h"
-# include "CMachine.h"
-# include "CVirtualBox.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
+#include <QFontDatabase>
+#include <QMetaEnum>
+#include <QMutex>
+#include <QRegularExpression>
 #ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
+# include <QComboBox>
+# include <QHeaderView>
+# include <QLabel>
+# include <QLineEdit>
+# include <QListView>
+# include <QMenuBar>
+# include <QPainter>
+# include <QPushButton>
+# include <QSortFilterProxyModel>
+# include <QStyledItemDelegate>
+# include <QTableView>
+# include <QVBoxLayout>
 # include <QStandardItemModel>
 # include <QXmlStreamWriter>
 # include <QXmlStreamReader>
 #endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
+
+/* GUI includes: */
+#include "VBoxGlobal.h"
+#include "UIActionPool.h"
+#include "UIConverter.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIHostComboEditor.h"
+#include "UIMainEventListener.h"
+#include "UIMessageCenter.h"
+#include "UISettingsDefs.h"
+#ifdef VBOX_GUI_WITH_EXTRADATA_MANAGER_UI
+# include "QIDialog.h"
+# include "QIDialogButtonBox.h"
+# include "QIFileDialog.h"
+# include "QIMainWindow.h"
+# include "QISplitter.h"
+# include "QIWidgetValidator.h"
+# include "VBoxUtils.h"
+# include "UIIconPool.h"
+# include "UIToolBar.h"
+# include "UIVirtualBoxEventHandler.h"
+#endif /* VBOX_GUI_WITH_EXTRADATA_MANAGER_UI */
+
+/* COM includes: */
+#include "COMEnums.h"
+#include "CEventListener.h"
+#include "CEventSource.h"
+#include "CMachine.h"
+#include "CVirtualBox.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QSocketNotifier>
+#include <QSocketNotifier>
 
 /* GUI includes: */
-# include "COMDefs.h"
+#include "COMDefs.h"
 
 /* COM includes: */
-# include "CVirtualBoxErrorInfo.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CVirtualBoxErrorInfo.h"
 
 /* VirtualBox interface declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 76606)
@@ -16,28 +16,22 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHelpEvent>
-# include <QToolTip>
+#include <QHelpEvent>
+#include <QToolTip>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIActionPool.h"
-# include "UIActionPoolManager.h"
-# include "UIActionPoolRuntime.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "UIShortcutPool.h"
-# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-#  include "UIExtraDataManager.h"
-#  include "UINetworkManager.h"
-#  include "UIUpdateManager.h"
-# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIActionPool.h"
+#include "UIActionPoolManager.h"
+#include "UIActionPoolRuntime.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "UIShortcutPool.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UIExtraDataManager.h"
+# include "UINetworkManager.h"
+# include "UIUpdateManager.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolManager.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIActionPoolManager.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIShortcutPool.h"
-# include "UIDefs.h"
+#include "VBoxGlobal.h"
+#include "UIActionPoolManager.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIShortcutPool.h"
+#include "UIDefs.h"
 
 /* COM includes: */
-# include "CExtPack.h"
-# include "CExtPackManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CExtPack.h"
+#include "CExtPackManager.h"
 
 /* TEMPORARY! */
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPoolRuntime.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIActionPoolRuntime.h"
-# include "UIConverter.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIShortcutPool.h"
+#include "VBoxGlobal.h"
+#include "UIActionPoolRuntime.h"
+#include "UIConverter.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIShortcutPool.h"
 
 /* COM includes: */
-# include "CExtPack.h"
-# include "CExtPackManager.h"
+#include "CExtPack.h"
+#include "CExtPackManager.h"
 
 /* External includes: */
-# include <math.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <math.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIAnimationFramework.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIAnimationFramework.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIAnimationFramework.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QPropertyAnimation>
-# include <QSignalTransition>
-# include <QStateMachine>
-# include <QWidget>
+#include <QPropertyAnimation>
+#include <QSignalTransition>
+#include <QStateMachine>
+#include <QWidget>
 
 /* GUI includes: */
-# include "UIAnimationFramework.h"
+#include "UIAnimationFramework.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UICustomFileSystemModel.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QDateTime>
-# include <QHeaderView>
+#include <QApplication>
+#include <QDateTime>
+#include <QHeaderView>
 
 /* GUI includes: */
-# include "UIErrorString.h"
-# include "UICustomFileSystemModel.h"
-# include "UIPathOperations.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-const char* UICustomFileSystemModel::strUpDirectoryString = "..";
+#include "UIErrorString.h"
+#include "UICustomFileSystemModel.h"
+#include "UIPathOperations.h"
+#include "VBoxGlobal.h"
+
+const char *UICustomFileSystemModel::strUpDirectoryString = "..";
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp	(revision 76606)
@@ -16,12 +16,6 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIDefs.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIDefs.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(revision 76606)
@@ -25,5 +25,7 @@
 // WORKAROUND:
 // This define should go *before* VBox/log.h include!
-#define LOG_GROUP LOG_GROUP_GUI
+#ifndef LOG_GROUP
+# define LOG_GROUP LOG_GROUP_GUI
+#endif
 
 /* Qt includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDesktopWidgetWatchdog.cpp	(revision 76606)
@@ -16,37 +16,31 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QDesktopWidget>
-# include <QScreen>
-# ifdef VBOX_WS_WIN
-#  include <QLibrary>
-# endif
-# ifdef VBOX_WS_X11
-#  include <QTimer>
-# endif
+#include <QApplication>
+#include <QDesktopWidget>
+#include <QScreen>
+#ifdef VBOX_WS_WIN
+# include <QLibrary>
+#endif
+#ifdef VBOX_WS_X11
+# include <QTimer>
+#endif
 
 /* GUI includes: */
-# include "UIDesktopWidgetWatchdog.h"
-# ifdef VBOX_WS_X11
-#  include "VBoxGlobal.h"
-# endif /* VBOX_WS_X11 */
+#include "UIDesktopWidgetWatchdog.h"
+#ifdef VBOX_WS_X11
+# include "VBoxGlobal.h"
+#endif /* VBOX_WS_X11 */
 
 /* Other VBox includes: */
-# include <iprt/asm.h>
-# include <iprt/assert.h>
-# include <iprt/ldr.h>
-# include <VBox/log.h>
+#include <iprt/asm.h>
+#include <iprt/assert.h>
+#include <iprt/ldr.h>
+#include <VBox/log.h>
 
 /* Platform includes: */
-# ifdef VBOX_WS_WIN
-#  include <iprt/win/windows.h>
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#ifdef VBOX_WS_WIN
+# include <iprt/win/windows.h>
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIErrorString.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIErrorString.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIErrorString.cpp	(revision 76606)
@@ -16,8 +16,4 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
 #include <QApplication>
@@ -32,6 +28,4 @@
 #include "CProgress.h"
 #include "CVirtualBoxErrorInfo.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp	(revision 76606)
@@ -16,27 +16,21 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QFile>
-# include <QStyle>
-# include <QWidget>
+#include <QApplication>
+#include <QFile>
+#include <QStyle>
+#include <QWidget>
 
 /* GUI includes: */
-# include "UIIconPool.h"
-# include "UIExtraDataManager.h"
-# include "UIModalWindowManager.h"
+#include "UIIconPool.h"
+#include "UIExtraDataManager.h"
+#include "UIModalWindowManager.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CMachine.h"
+#include "COMEnums.h"
+#include "CMachine.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QPainter>
+#include <QPainter>
 
 /* GUI include */
-# include "UIImageTools.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIImageTools.h"
 
 /* External includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp	(revision 76606)
@@ -16,56 +16,50 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMutex>
-# include <QThread>
+#include <QMutex>
+#include <QThread>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIMainEventListener.h"
+#include "VBoxGlobal.h"
+#include "UIMainEventListener.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CCanShowWindowEvent.h"
-# include "CCursorPositionChangedEvent.h"
-# include "CEvent.h"
-# include "CEventSource.h"
-# include "CEventListener.h"
-# include "CExtraDataCanChangeEvent.h"
-# include "CExtraDataChangedEvent.h"
-# include "CGuestMonitorChangedEvent.h"
-# include "CGuestProcessIOEvent.h"
-# include "CGuestProcessRegisteredEvent.h"
-# include "CGuestProcessStateChangedEvent.h"
-# include "CGuestSessionRegisteredEvent.h"
-# include "CGuestSessionStateChangedEvent.h"
-# include "CKeyboardLedsChangedEvent.h"
-# include "CMachineDataChangedEvent.h"
-# include "CMachineStateChangedEvent.h"
-# include "CMachineRegisteredEvent.h"
-# include "CMediumChangedEvent.h"
-# include "CMouseCapabilityChangedEvent.h"
-# include "CMousePointerShapeChangedEvent.h"
-# include "CNetworkAdapterChangedEvent.h"
-# include "CProgressPercentageChangedEvent.h"
-# include "CProgressTaskCompletedEvent.h"
-# include "CRuntimeErrorEvent.h"
-# include "CSessionStateChangedEvent.h"
-# include "CShowWindowEvent.h"
-# include "CSnapshotChangedEvent.h"
-# include "CSnapshotDeletedEvent.h"
-# include "CSnapshotRestoredEvent.h"
-# include "CSnapshotTakenEvent.h"
-# include "CStateChangedEvent.h"
-# include "CStorageDeviceChangedEvent.h"
-# include "CUSBDevice.h"
-# include "CUSBDeviceStateChangedEvent.h"
-# include "CVBoxSVCAvailabilityChangedEvent.h"
-# include "CVirtualBoxErrorInfo.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "COMEnums.h"
+#include "CCanShowWindowEvent.h"
+#include "CCursorPositionChangedEvent.h"
+#include "CEvent.h"
+#include "CEventSource.h"
+#include "CEventListener.h"
+#include "CExtraDataCanChangeEvent.h"
+#include "CExtraDataChangedEvent.h"
+#include "CGuestMonitorChangedEvent.h"
+#include "CGuestProcessIOEvent.h"
+#include "CGuestProcessRegisteredEvent.h"
+#include "CGuestProcessStateChangedEvent.h"
+#include "CGuestSessionRegisteredEvent.h"
+#include "CGuestSessionStateChangedEvent.h"
+#include "CKeyboardLedsChangedEvent.h"
+#include "CMachineDataChangedEvent.h"
+#include "CMachineStateChangedEvent.h"
+#include "CMachineRegisteredEvent.h"
+#include "CMediumChangedEvent.h"
+#include "CMouseCapabilityChangedEvent.h"
+#include "CMousePointerShapeChangedEvent.h"
+#include "CNetworkAdapterChangedEvent.h"
+#include "CProgressPercentageChangedEvent.h"
+#include "CProgressTaskCompletedEvent.h"
+#include "CRuntimeErrorEvent.h"
+#include "CSessionStateChangedEvent.h"
+#include "CShowWindowEvent.h"
+#include "CSnapshotChangedEvent.h"
+#include "CSnapshotDeletedEvent.h"
+#include "CSnapshotRestoredEvent.h"
+#include "CSnapshotTakenEvent.h"
+#include "CStateChangedEvent.h"
+#include "CStorageDeviceChangedEvent.h"
+#include "CUSBDevice.h"
+#include "CUSBDeviceStateChangedEvent.h"
+#include "CVBoxSVCAvailabilityChangedEvent.h"
+#include "CVirtualBoxErrorInfo.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 76606)
@@ -16,78 +16,72 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QFileInfo>
-# include <QLocale>
-# include <QThread>
-# include <QProcess>
-# ifdef VBOX_WS_MAC
-#  include <QPushButton>
-# endif
+#include <QDir>
+#include <QFileInfo>
+#include <QLocale>
+#include <QThread>
+#include <QProcess>
+#ifdef VBOX_WS_MAC
+# include <QPushButton>
+#endif
 
 /* GUI includes: */
-# include "QIMessageBox.h"
-# include "VBoxGlobal.h"
-# include "UIConverter.h"
-# include "UIMessageCenter.h"
-# include "UIProgressDialog.h"
-# include "UIErrorString.h"
-# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-#  include "UINetworkManager.h"
-#  include "UINetworkManagerDialog.h"
-# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-# include "UIModalWindowManager.h"
-# include "UIExtraDataManager.h"
-# include "UIMedium.h"
-# ifdef VBOX_OSE
-#  include "UIDownloaderUserManual.h"
-# endif /* VBOX_OSE */
-# include "VBoxAboutDlg.h"
-# include "UIHostComboEditor.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif
-# ifdef VBOX_WS_WIN
-#  include <Htmlhelp.h>
-# endif
+#include "QIMessageBox.h"
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
+#include "UIMessageCenter.h"
+#include "UIProgressDialog.h"
+#include "UIErrorString.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManager.h"
+# include "UINetworkManagerDialog.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+#include "UIModalWindowManager.h"
+#include "UIExtraDataManager.h"
+#include "UIMedium.h"
+#ifdef VBOX_OSE
+# include "UIDownloaderUserManual.h"
+#endif /* VBOX_OSE */
+#include "VBoxAboutDlg.h"
+#include "UIHostComboEditor.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
+#ifdef VBOX_WS_WIN
+# include <Htmlhelp.h>
+#endif
 
 /* COM includes: */
-# include "CCloudClient.h"
-# include "CCloudProfile.h"
-# include "CCloudProvider.h"
-# include "CCloudProviderManager.h"
-# include "CNATNetwork.h"
-# include "CDHCPServer.h"
-# include "CNATEngine.h"
-# include "CSerialPort.h"
-# include "CSharedFolder.h"
-# include "CSnapshot.h"
-# include "CStorageController.h"
-# include "CConsole.h"
-# include "CMachine.h"
-# include "CSystemProperties.h"
-# include "CVirtualBoxErrorInfo.h"
-# include "CMediumAttachment.h"
-# include "CMediumFormat.h"
-# include "CAppliance.h"
-# include "CExtPackManager.h"
-# include "CExtPackFile.h"
-# include "CHostNetworkInterface.h"
-# include "CVFSExplorer.h"
-# ifdef VBOX_WITH_DRAG_AND_DROP
-#  include "CGuest.h"
-#  include "CDnDSource.h"
-#  include "CDnDTarget.h"
-# endif /* VBOX_WITH_DRAG_AND_DROP */
+#include "CCloudClient.h"
+#include "CCloudProfile.h"
+#include "CCloudProvider.h"
+#include "CCloudProviderManager.h"
+#include "CNATNetwork.h"
+#include "CDHCPServer.h"
+#include "CNATEngine.h"
+#include "CSerialPort.h"
+#include "CSharedFolder.h"
+#include "CSnapshot.h"
+#include "CStorageController.h"
+#include "CConsole.h"
+#include "CMachine.h"
+#include "CSystemProperties.h"
+#include "CVirtualBoxErrorInfo.h"
+#include "CMediumAttachment.h"
+#include "CMediumFormat.h"
+#include "CAppliance.h"
+#include "CExtPackManager.h"
+#include "CExtPackFile.h"
+#include "CHostNetworkInterface.h"
+#include "CVFSExplorer.h"
+#ifdef VBOX_WITH_DRAG_AND_DROP
+# include "CGuest.h"
+# include "CDnDSource.h"
+# include "CDnDTarget.h"
+#endif /* VBOX_WITH_DRAG_AND_DROP */
 
 /* Other VBox includes: */
-# include <iprt/param.h>
-# include <iprt/path.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/param.h>
+#include <iprt/path.h>
 
 #include <iprt/errcore.h>
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIModalWindowManager.h"
-# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-#  include "UINetworkManager.h"
-#  include "UINetworkManagerDialog.h"
-# endif
-# include "UIProgressDialog.h"
+#include "UIModalWindowManager.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManager.h"
+# include "UINetworkManagerDialog.h"
+#endif
+#include "UIProgressDialog.h"
 
 /* Other VBox includes: */
-# include <VBox/sup.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <VBox/sup.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPathOperations.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPathOperations.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPathOperations.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QList>
+#include <QList>
 
 /* GUI includes: */
-# include "UIPathOperations.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIPathOperations.h"
 
 const QChar UIPathOperations::delimiter = QChar('/');
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIPopupCenter.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "QIMessageBox.h"
-# include "VBoxGlobal.h"
-# include "UIErrorString.h"
-# include "UIExtraDataManager.h"
-# include "UIHostComboEditor.h"
-# include "UIPopupCenter.h"
-# include "UIPopupStack.h"
+#include "QIMessageBox.h"
+#include "VBoxGlobal.h"
+#include "UIErrorString.h"
+#include "UIExtraDataManager.h"
+#include "UIHostComboEditor.h"
+#include "UIPopupCenter.h"
+#include "UIPopupStack.h"
 
 /* COM includes: */
-# include "CAudioAdapter.h"
-# include "CConsole.h"
-# include "CEmulatedUSB.h"
-# include "CMachine.h"
-# include "CNetworkAdapter.h"
-# include "CVRDEServer.h"
+#include "CAudioAdapter.h"
+#include "CConsole.h"
+#include "CEmulatedUSB.h"
+#include "CMachine.h"
+#include "CNetworkAdapter.h"
+#include "CVRDEServer.h"
 
 /* Other VBox includes: */
-# include <VBox/sup.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <VBox/sup.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressEventHandler.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressEventHandler.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIProgressEventHandler.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIExtraDataManager.h"
-# include "UIMainEventListener.h"
-# include "UIProgressEventHandler.h"
-# include "VBoxGlobal.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIExtraDataManager.h"
+#include "UIMainEventListener.h"
+#include "UIProgressEventHandler.h"
+#include "VBoxGlobal.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif /* VBOX_WS_MAC */
 
 UIProgressEventHandler::UIProgressEventHandler(QObject *pParent, const CProgress &comProgress)
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIShortcutPool.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIActionPool.h"
-# include "UIExtraDataManager.h"
-# include "UIShortcutPool.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIActionPool.h"
+#include "UIExtraDataManager.h"
+#include "UIShortcutPool.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIThreadPool.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QThread>
+#include <QThread>
 
 /* GUI includes: */
-# include "COMDefs.h"
-# include "UIDefs.h"
-# include "UIThreadPool.h"
+#include "COMDefs.h"
+#include "UIDefs.h"
+#include "UIThreadPool.h"
 
 /* Other VBox includes: */
 #include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVersion.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVersion.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVersion.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QStringList>
+#include <QStringList>
 
 /* GUI includes: */
-# include "UIVersion.h"
+#include "UIVersion.h"
 
 /* Other VBox includes: */
-# include <iprt/string.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/string.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/UIVirtualBoxEventHandler.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIExtraDataManager.h"
-# include "UIMainEventListener.h"
-# include "UIVirtualBoxEventHandler.h"
+#include "VBoxGlobal.h"
+#include "UIExtraDataManager.h"
+#include "UIMainEventListener.h"
+#include "UIVirtualBoxEventHandler.h"
 
 /* COM includes: */
-# include "CEventListener.h"
-# include "CEventSource.h"
-# include "CVirtualBox.h"
-# include "CVirtualBoxClient.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CEventListener.h"
+#include "CEventSource.h"
+#include "CVirtualBox.h"
+#include "CVirtualBoxClient.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 76606)
@@ -16,126 +16,21 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDesktopServices>
-# include <QDir>
-# include <QFileDialog>
-# include <QGraphicsWidget>
-# include <QLocale>
-# include <QMenu>
-# include <QMutex>
-# include <QPainter>
-# include <QProcess>
-# include <QSpinBox>
-# include <QStandardPaths>
-# include <QThread>
-# include <QTimer>
-# include <QToolButton>
-# include <QToolTip>
-# include <QTranslator>
-# ifdef VBOX_WS_WIN
-#  include <QEventLoop>
-# endif /* VBOX_WS_WIN */
-# ifdef VBOX_WS_X11
-#  include <QScrollBar>
-#  include <QTextBrowser>
-#  include <QX11Info>
-# endif /* VBOX_WS_X11 */
-# ifdef VBOX_GUI_WITH_PIDFILE
-#  include <QTextStream>
-# endif /* VBOX_GUI_WITH_PIDFILE */
-# ifdef VBOX_WS_X11
-#  include <QScreen>
-# endif
-
-/* GUI includes: */
-# include "VBoxGlobal.h"
-# include "VBoxLicenseViewer.h"
-# include "UIMessageCenter.h"
-# include "UIPopupCenter.h"
-# include "QIMessageBox.h"
-# include "QIDialogButtonBox.h"
-# include "UIFDCreationDialog.h"
-# include "UIIconPool.h"
-# include "UIThreadPool.h"
-# include "UIShortcutPool.h"
-# include "UIExtraDataManager.h"
-# include "QIFileDialog.h"
-# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-#  include "UINetworkManager.h"
-#  include "UIUpdateManager.h"
-# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-# include "UIConverter.h"
-# include "UIMediumEnumerator.h"
-# include "UIMedium.h"
-# include "UIMediumSelector.h"
-# include "UIModalWindowManager.h"
-# include "UIIconPool.h"
-# include "UIVirtualBoxEventHandler.h"
-# include "UIDesktopWidgetWatchdog.h"
-# ifdef VBOX_WS_X11
-#  include "UIHostComboEditor.h"
-#  include "VBoxX11Helper.h"
-# endif
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-#  include "UIMachineWindowFullscreen.h"
-#  include "UIMachineWindowSeamless.h"
-# endif /* VBOX_WS_MAC */
-
-/* COM includes: */
-# include "CExtPack.h"
-# include "CExtPackFile.h"
-# include "CExtPackManager.h"
-# include "CMachine.h"
-# include "CUSBDevice.h"
-# include "CUSBDeviceFilters.h"
-# include "CUSBDeviceFilter.h"
-# include "CBIOSSettings.h"
-# include "CVRDEServer.h"
-# include "CStorageController.h"
-# include "CMediumAttachment.h"
-# include "CAudioAdapter.h"
-# include "CNetworkAdapter.h"
-# include "CSerialPort.h"
-# include "CUSBController.h"
-# include "CHostUSBDevice.h"
-# include "CHostVideoInputDevice.h"
-# include "CSharedFolder.h"
-# include "CConsole.h"
-# include "CSnapshot.h"
-
-/* Other VBox includes: */
-# include <iprt/asm.h>
-# include <iprt/env.h>
-# include <iprt/getopt.h>
-# include <iprt/ldr.h>
-# include <iprt/param.h>
-# include <iprt/path.h>
-# include <iprt/system.h>
-# include <iprt/stream.h>
-# ifdef VBOX_WS_X11
-#  include <iprt/mem.h>
-# endif /* VBOX_WS_X11 */
-# include <VBox/sup.h>
-# include <VBox/com/Guid.h>
-
-/* External includes: */
-# ifdef VBOX_WS_WIN
-#  include <iprt/win/shlobj.h>
-# endif
-# ifdef VBOX_WS_X11
-#  include <xcb/xcb.h>
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* VirtualBox interface declarations: */
-#include <VBox/com/VirtualBox.h>
-
-/* Qt includes: */
+#include <QDesktopServices>
+#include <QDir>
+#include <QFileDialog>
+#include <QGraphicsWidget>
+#include <QLocale>
+#include <QMenu>
+#include <QMutex>
+#include <QPainter>
+#include <QProcess>
+#include <QSpinBox>
+#include <QStandardPaths>
+#include <QThread>
+#include <QTimer>
+#include <QToolButton>
+#include <QToolTip>
+#include <QTranslator>
 #include <QLibraryInfo>
 #include <QProgressDialog>
@@ -143,11 +38,106 @@
 #include <QStyleOptionSpinBox>
 #include <QSessionManager>
+#ifdef VBOX_WS_WIN
+# include <QEventLoop>
+#endif /* VBOX_WS_WIN */
+#ifdef VBOX_WS_X11
+# include <QScrollBar>
+# include <QTextBrowser>
+# include <QX11Info>
+#endif /* VBOX_WS_X11 */
+#ifdef VBOX_GUI_WITH_PIDFILE
+# include <QTextStream>
+#endif /* VBOX_GUI_WITH_PIDFILE */
+#ifdef VBOX_WS_X11
+# include <QScreen>
+#endif
+
+/* GUI includes: */
+#include "VBoxGlobal.h"
+#include "VBoxLicenseViewer.h"
+#include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
+#include "QIMessageBox.h"
+#include "QIDialogButtonBox.h"
+#include "UIFDCreationDialog.h"
+#include "UIIconPool.h"
+#include "UIThreadPool.h"
+#include "UIShortcutPool.h"
+#include "UIExtraDataManager.h"
+#include "QIFileDialog.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManager.h"
+# include "UIUpdateManager.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+#include "UIConverter.h"
+#include "UIMediumEnumerator.h"
+#include "UIMedium.h"
+#include "UIMediumSelector.h"
+#include "UIModalWindowManager.h"
+#include "UIIconPool.h"
+#include "UIVirtualBoxEventHandler.h"
+#include "UIDesktopWidgetWatchdog.h"
+#ifdef VBOX_WS_X11
+# include "UIHostComboEditor.h"
+# include "VBoxX11Helper.h"
+#endif
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+# include "UIMachineWindowFullscreen.h"
+# include "UIMachineWindowSeamless.h"
+#endif /* VBOX_WS_MAC */
+
+/* COM includes: */
+#include "CExtPack.h"
+#include "CExtPackFile.h"
+#include "CExtPackManager.h"
+#include "CMachine.h"
+#include "CUSBDevice.h"
+#include "CUSBDeviceFilters.h"
+#include "CUSBDeviceFilter.h"
+#include "CBIOSSettings.h"
+#include "CVRDEServer.h"
+#include "CStorageController.h"
+#include "CMediumAttachment.h"
+#include "CAudioAdapter.h"
+#include "CNetworkAdapter.h"
+#include "CSerialPort.h"
+#include "CUSBController.h"
+#include "CHostUSBDevice.h"
+#include "CHostVideoInputDevice.h"
+#include "CSharedFolder.h"
+#include "CConsole.h"
+#include "CSnapshot.h"
 
 /* Other VBox includes: */
+#include <iprt/asm.h>
+#include <iprt/ctype.h>
+#include <iprt/err.h>
+#include <iprt/env.h>
+#include <iprt/file.h>
+#include <iprt/getopt.h>
+#include <iprt/ldr.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
+#include <iprt/system.h>
+#include <iprt/stream.h>
+#ifdef VBOX_WS_X11
+# include <iprt/mem.h>
+#endif /* VBOX_WS_X11 */
+#include <VBox/sup.h>
 #include <VBox/VBoxOGL.h>
 #include <VBox/vd.h>
-#include <iprt/ctype.h>
-#include <iprt/err.h>
-#include <iprt/file.h>
+#include <VBox/com/Guid.h>
+
+/* VirtualBox interface declarations: */
+#include <VBox/com/VirtualBox.h>
+
+/* External includes: */
+#ifdef VBOX_WS_WIN
+# include <iprt/win/shlobj.h>
+#endif
+#ifdef VBOX_WS_X11
+# include <xcb/xcb.h>
+#endif
 
 /* External includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp	(revision 76606)
@@ -16,49 +16,44 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAbstractItemModel>
-# include <QCheckBox>
-# include <QHBoxLayout>
-# include <QHeaderView>
-# include <QPushButton>
-# include <QSplitter>
-# include <QTableWidget>
-# include <QTextEdit>
+#include <QAbstractItemModel>
+#include <QCheckBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QSplitter>
+#include <QTableWidget>
+#include <QTextEdit>
 
 /* GUI includes: */
-# include "QILabel.h"
-# include "QILineEdit.h"
-# include "QITabWidget.h"
-# include "QITreeWidget.h"
-# include "QIWithRetranslateUI.h"
-# include "UIActionPool.h"
-# include "UIErrorString.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIGuestControlConsole.h"
-# include "UIFileManager.h"
-# include "UIFileManagerSessionPanel.h"
-# include "UIFileManagerOptionsPanel.h"
-# include "UIFileManagerLogPanel.h"
-# include "UIFileManagerOperationsPanel.h"
-# include "UIFileManagerGuestTable.h"
-# include "UIGuestControlInterface.h"
-# include "UIFileManagerHostTable.h"
-# include "UIToolBar.h"
-# include "VBoxGlobal.h"
+#include "QILabel.h"
+#include "QILineEdit.h"
+#include "QITabWidget.h"
+#include "QITreeWidget.h"
+#include "QIWithRetranslateUI.h"
+#include "UIActionPool.h"
+#include "UIErrorString.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIGuestControlConsole.h"
+#include "UIFileManager.h"
+#include "UIFileManagerSessionPanel.h"
+#include "UIFileManagerOptionsPanel.h"
+#include "UIFileManagerLogPanel.h"
+#include "UIFileManagerOperationsPanel.h"
+#include "UIFileManagerGuestTable.h"
+#include "UIGuestControlInterface.h"
+#include "UIFileManagerHostTable.h"
+#include "UIToolBar.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CFsObjInfo.h"
-# include "CGuest.h"
-# include "CGuestDirectory.h"
-# include "CGuestFsObjInfo.h"
-# include "CGuestProcess.h"
-# include "CGuestSession.h"
-# include "CGuestSessionStateChangedEvent.h"
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CFsObjInfo.h"
+#include "CGuest.h"
+#include "CGuestDirectory.h"
+#include "CGuestFsObjInfo.h"
+#include "CGuestProcess.h"
+#include "CGuestSession.h"
+#include "CGuestSessionStateChangedEvent.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerDialog.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QPushButton>
-# include <QVBoxLayout>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIFileManager.h"
-# include "UIFileManagerDialog.h"
-# include "VBoxGlobal.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIFileManager.h"
+#include "UIFileManagerDialog.h"
+#include "VBoxGlobal.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerGuestTable.cpp	(revision 76606)
@@ -16,31 +16,25 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDateTime>
-# include <QFileInfo>
-# include <QUuid>
+#include <QDateTime>
+#include <QFileInfo>
+#include <QUuid>
 
 /* GUI includes: */
-# include "QILabel.h"
-# include "UIActionPool.h"
-# include "UIErrorString.h"
-# include "UICustomFileSystemModel.h"
-# include "UIFileManager.h"
-# include "UIFileManagerGuestTable.h"
-# include "UIMessageCenter.h"
-# include "UIPathOperations.h"
-# include "UIToolBar.h"
+#include "QILabel.h"
+#include "UIActionPool.h"
+#include "UIErrorString.h"
+#include "UICustomFileSystemModel.h"
+#include "UIFileManager.h"
+#include "UIFileManagerGuestTable.h"
+#include "UIMessageCenter.h"
+#include "UIPathOperations.h"
+#include "UIToolBar.h"
 
 /* COM includes: */
-# include "CFsObjInfo.h"
-# include "CGuestFsObjInfo.h"
-# include "CGuestDirectory.h"
-# include "CProgress.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CFsObjInfo.h"
+#include "CGuestFsObjInfo.h"
+#include "CGuestDirectory.h"
+#include "CProgress.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerHostTable.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAction>
-# include <QDateTime>
-# include <QDir>
+#include <QAction>
+#include <QDateTime>
+#include <QDir>
 
 /* GUI includes: */
-# include "QILabel.h"
-# include "UIActionPool.h"
-# include "UIFileManager.h"
-# include "UICustomFileSystemModel.h"
-# include "UIFileManagerHostTable.h"
-# include "UIPathOperations.h"
-# include "UIToolBar.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QILabel.h"
+#include "UIActionPool.h"
+#include "UIFileManager.h"
+#include "UICustomFileSystemModel.h"
+#include "UIFileManagerHostTable.h"
+#include "UIPathOperations.h"
+#include "UIToolBar.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerLogPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerLogPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerLogPanel.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QMenu>
-# include <QSpinBox>
-# include <QTextEdit>
-# include <QTime>
+#include <QHBoxLayout>
+#include <QMenu>
+#include <QSpinBox>
+#include <QTextEdit>
+#include <QTime>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIFileManager.h"
-# include "UIFileManagerLogPanel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIFileManager.h"
+#include "UIFileManagerLogPanel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOperationsPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOperationsPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOperationsPanel.cpp	(revision 76606)
@@ -16,33 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QGridLayout>
-# include <QLabel>
-# include <QMenu>
-# include <QProgressBar>
-# include <QScrollArea>
-# include <QScrollBar>
-# include <QStyle>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QLabel>
+#include <QMenu>
+#include <QProgressBar>
+#include <QScrollArea>
+#include <QScrollBar>
+#include <QStyle>
 
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "QILabel.h"
-# include "UIErrorString.h"
-# include "UIIconPool.h"
-# include "UIFileManager.h"
-# include "UIFileManagerOperationsPanel.h"
-# include "UIProgressEventHandler.h"
+#include "QIToolButton.h"
+#include "QILabel.h"
+#include "UIErrorString.h"
+#include "UIIconPool.h"
+#include "UIFileManager.h"
+#include "UIFileManagerOperationsPanel.h"
+#include "UIProgressEventHandler.h"
 
 /* COM includes: */
-# include "CProgress.h"
-
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CProgress.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOptionsPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOptionsPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOptionsPanel.cpp	(revision 76606)
@@ -16,24 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QComboBox>
-# include <QHBoxLayout>
-# include <QFontDatabase>
-# include <QFontDialog>
-# include <QCheckBox>
-# include <QLabel>
-# include <QSpinBox>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QFontDatabase>
+#include <QFontDialog>
+#include <QCheckBox>
+#include <QLabel>
+#include <QSpinBox>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIFileManager.h"
-# include "UIFileManagerOptionsPanel.h"
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIFileManager.h"
+#include "UIFileManagerOptionsPanel.h"
 
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 UIFileManagerOptionsPanel::UIFileManagerOptionsPanel(UIFileManager *pManagerWidget,
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.cpp	(revision 76606)
@@ -16,25 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QComboBox>
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QPlainTextEdit>
-# include <QTextCursor>
-# include <QToolButton>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPlainTextEdit>
+#include <QTextCursor>
+#include <QToolButton>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIFileManager.h"
-# include "UIFileManagerPanel.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIFileManager.h"
+#include "UIFileManagerPanel.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerSessionPanel.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QHBoxLayout>
-# include <QMenu>
-# include <QPushButton>
-# include <QSpinBox>
-# include <QTextEdit>
+#include <QCheckBox>
+#include <QHBoxLayout>
+#include <QMenu>
+#include <QPushButton>
+#include <QSpinBox>
+#include <QTextEdit>
 
 /* GUI includes: */
-# include "QILineEdit.h"
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIFileManager.h"
-# include "UIFileManagerSessionPanel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QILineEdit.h"
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIFileManager.h"
+#include "UIFileManagerSessionPanel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp	(revision 76606)
@@ -16,47 +16,40 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAction>
-# include <QComboBox>
-# include <QCheckBox>
-# include <QDateTime>
-# include <QDir>
-# include <QHeaderView>
-# include <QItemDelegate>
-# include <QGridLayout>
-# include <QMenu>
-# include <QSortFilterProxyModel>
-# include <QTextEdit>
-# include <QPushButton>
+#include <QAction>
+#include <QComboBox>
+#include <QCheckBox>
+#include <QDateTime>
+#include <QDir>
+#include <QHeaderView>
+#include <QItemDelegate>
+#include <QGridLayout>
+#include <QMenu>
+#include <QSortFilterProxyModel>
+#include <QTextEdit>
+#include <QPushButton>
 
 /* GUI includes: */
-# include "QIDialog.h"
-# include "QIDialogButtonBox.h"
-# include "QILabel.h"
-# include "QILineEdit.h"
-# include "QIMessageBox.h"
-# include "VBoxGlobal.h"
-# include "UIActionPool.h"
-# include "UICustomFileSystemModel.h"
-# include "UIErrorString.h"
-# include "UIFileManagerGuestTable.h"
-# include "UIFileManagerTable.h"
-# include "UIFileManager.h"
-# include "UIIconPool.h"
-# include "UIPathOperations.h"
-# include "UIToolBar.h"
+#include "QIDialog.h"
+#include "QIDialogButtonBox.h"
+#include "QILabel.h"
+#include "QILineEdit.h"
+#include "QIMessageBox.h"
+#include "VBoxGlobal.h"
+#include "UIActionPool.h"
+#include "UICustomFileSystemModel.h"
+#include "UIErrorString.h"
+#include "UIFileManagerGuestTable.h"
+#include "UIFileManagerTable.h"
+#include "UIFileManager.h"
+#include "UIIconPool.h"
+#include "UIPathOperations.h"
+#include "UIToolBar.h"
 
 /* COM includes: */
-# include "CFsObjInfo.h"
-# include "CGuestFsObjInfo.h"
-# include "CGuestDirectory.h"
-# include "CProgress.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
+#include "CFsObjInfo.h"
+#include "CGuestFsObjInfo.h"
+#include "CGuestDirectory.h"
+#include "CProgress.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlConsole.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlConsole.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlConsole.cpp	(revision 76606)
@@ -16,17 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QApplication>
-# include <QTextBlock>
+#include <QVBoxLayout>
+#include <QApplication>
+#include <QTextBlock>
 
 /* GUI includes: */
-# include "UIGuestControlConsole.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGuestControlConsole.h"
+
 
 UIGuestControlConsole::UIGuestControlConsole(QWidget* parent /* = 0 */)
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlInterface.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlInterface.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlInterface.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIErrorString.h"
-# include "UIGuestControlInterface.h"
-# include "VBoxGlobal.h"
+#include "UIErrorString.h"
+#include "UIGuestControlInterface.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CFsObjInfo.h"
-# include "CGuestDirectory.h"
-# include "CGuestProcess.h"
-# include "CGuestSession.h"
-# include "CGuestFsObjInfo.h"
+#include "CFsObjInfo.h"
+#include "CGuestDirectory.h"
+#include "CGuestProcess.h"
+#include "CGuestSession.h"
+#include "CGuestFsObjInfo.h"
 
 /* Misc. includes: */
-# include <iprt/err.h>
-# include <iprt/getopt.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/err.h>
+#include <iprt/getopt.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlTreeItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlTreeItem.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestControlTreeItem.cpp	(revision 76606)
@@ -16,19 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIExtraDataManager.h"
-# include "UIGuestControlTreeItem.h"
-# include "VBoxGlobal.h"
+#include "UIExtraDataManager.h"
+#include "UIGuestControlTreeItem.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CGuest.h"
-# include "CEventSource.h"
-# include "CGuestProcessStateChangedEvent.h"
-# include "CGuestSessionStateChangedEvent.h"
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CGuest.h"
+#include "CEventSource.h"
+#include "CGuestProcessStateChangedEvent.h"
+#include "CGuestSessionStateChangedEvent.h"
+
 
 QString sessionStatusString(KGuestSessionStatus status)
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlDialog.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QPushButton>
-# include <QVBoxLayout>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIGuestProcessControlDialog.h"
-# include "UIGuestProcessControlWidget.h"
-# include "VBoxGlobal.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIGuestProcessControlDialog.h"
+#include "UIGuestProcessControlWidget.h"
+#include "VBoxGlobal.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIGuestProcessControlWidget.cpp	(revision 76606)
@@ -16,32 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QMenu>
-# include <QSplitter>
-# include <QVBoxLayout>
-
+#include <QApplication>
+#include <QMenu>
+#include <QSplitter>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QITreeWidget.h"
-# include "UIActionPool.h"
-# include "UIExtraDataManager.h"
-# include "UIGuestControlConsole.h"
-# include "UIGuestControlInterface.h"
-# include "UIGuestControlTreeItem.h"
-# include "UIGuestProcessControlWidget.h"
-# include "UIToolBar.h"
-# include "UIVMInformationDialog.h"
-# include "VBoxGlobal.h"
+#include "QITreeWidget.h"
+#include "UIActionPool.h"
+#include "UIExtraDataManager.h"
+#include "UIGuestControlConsole.h"
+#include "UIGuestControlInterface.h"
+#include "UIGuestControlTreeItem.h"
+#include "UIGuestProcessControlWidget.h"
+#include "UIToolBar.h"
+#include "UIVMInformationDialog.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CGuest.h"
-# include "CEventSource.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CGuest.h"
+#include "CEventSource.h"
+
 
 class UIGuestControlTreeWidget : public QITreeWidget
Index: trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkDetailsWidget.cpp	(revision 76606)
@@ -16,30 +16,24 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QLabel>
-# include <QPushButton>
-# include <QRadioButton>
-# include <QRegExpValidator>
-# include <QStyleOption>
-# include <QVBoxLayout>
+#include <QCheckBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QRegExpValidator>
+#include <QStyleOption>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QILineEdit.h"
-# include "QITabWidget.h"
-# include "UIHostNetworkDetailsWidget.h"
-# include "UIHostNetworkUtils.h"
-# include "UIIconPool.h"
+#include "QIDialogButtonBox.h"
+#include "QILineEdit.h"
+#include "QITabWidget.h"
+#include "UIHostNetworkDetailsWidget.h"
+#include "UIHostNetworkUtils.h"
+#include "UIIconPool.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-# include "iprt/cidr.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
+#include "iprt/cidr.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp	(revision 76606)
@@ -16,39 +16,33 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHeaderView>
-# include <QMenuBar>
-# include <QPushButton>
-# include <QVBoxLayout>
+#include <QHeaderView>
+#include <QMenuBar>
+#include <QPushButton>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QITreeWidget.h"
-# include "UIActionPoolManager.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIHostNetworkDetailsWidget.h"
-# include "UIHostNetworkManager.h"
-# include "UIHostNetworkUtils.h"
-# include "UIMessageCenter.h"
-# include "UIToolBar.h"
-# ifdef VBOX_WS_MAC
-#  include "UIWindowMenuManager.h"
-# endif /* VBOX_WS_MAC */
-# include "VBoxGlobal.h"
+#include "QIDialogButtonBox.h"
+#include "QITreeWidget.h"
+#include "UIActionPoolManager.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIHostNetworkDetailsWidget.h"
+#include "UIHostNetworkManager.h"
+#include "UIHostNetworkUtils.h"
+#include "UIMessageCenter.h"
+#include "UIToolBar.h"
+#ifdef VBOX_WS_MAC
+# include "UIWindowMenuManager.h"
+#endif /* VBOX_WS_MAC */
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CDHCPServer.h"
-# include "CHost.h"
-# include "CHostNetworkInterface.h"
+#include "CDHCPServer.h"
+#include "CHost.h"
+#include "CHostNetworkInterface.h"
 
 /* Other VBox includes: */
-# include <iprt/cidr.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/cidr.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkUtils.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkUtils.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkUtils.cpp	(revision 76606)
@@ -16,12 +16,6 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIHostNetworkUtils.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIHostNetworkUtils.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDateTime>
-# include <QDir>
-# include <QVBoxLayout>
-# if defined(RT_OS_SOLARIS)
-#  include <QFontDatabase>
-# endif
-# include <QPainter>
-# include <QScrollBar>
-# include <QTextBlock>
+#include <QDateTime>
+#include <QDir>
+#include <QVBoxLayout>
+#if defined(RT_OS_SOLARIS)
+# include <QFontDatabase>
+#endif
+#include <QPainter>
+#include <QScrollBar>
+#include <QTextBlock>
 
 /* GUI includes: */
-# include "UIVMLogPage.h"
-# include "UIVMLogViewerTextEdit.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIVMLogPage.h"
+#include "UIVMLogViewerTextEdit.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerBookmarksPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerBookmarksPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerBookmarksPanel.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QComboBox>
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QStyle>
-# ifdef RT_OS_SOLARIS
-#  include <QFontDatabase>
-# endif
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QStyle>
+#ifdef RT_OS_SOLARIS
+# include <QFontDatabase>
+#endif
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIVMLogViewerBookmarksPanel.h"
-# include "UIVMLogViewerWidget.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIVMLogViewerBookmarksPanel.h"
+#include "UIVMLogViewerWidget.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerDialog.cpp	(revision 76606)
@@ -16,32 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# if defined(RT_OS_SOLARIS)
-#  include <QFontDatabase>
-# endif
-# include <QDialogButtonBox>
-# include <QKeyEvent>
-# include <QLabel>
-# include <QPlainTextEdit>
-# include <QPushButton>
-# include <QScrollBar>
-# include <QVBoxLayout>
+#if defined(RT_OS_SOLARIS)
+# include <QFontDatabase>
+#endif
+#include <QDialogButtonBox>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QPlainTextEdit>
+#include <QPushButton>
+#include <QScrollBar>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIVMLogViewerDialog.h"
-# include "UIVMLogViewerWidget.h"
-# include "VBoxGlobal.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIVMLogViewerDialog.h"
+#include "UIVMLogViewerWidget.h"
+#include "VBoxGlobal.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp	(revision 76606)
@@ -16,34 +16,28 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QButtonGroup>
-# include <QComboBox>
-# include <QFrame>
-# include <QHBoxLayout>
-# if defined(RT_OS_SOLARIS)
-#  include <QFontDatabase>
-# endif
-# include <QLabel>
-# include <QLineEdit>
-# include <QPlainTextEdit>
-# include <QTextCursor>
-# include <QRadioButton>
-# include <QScrollArea>
+#include <QButtonGroup>
+#include <QComboBox>
+#include <QFrame>
+#include <QHBoxLayout>
+#if defined(RT_OS_SOLARIS)
+# include <QFontDatabase>
+#endif
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QTextCursor>
+#include <QRadioButton>
+#include <QScrollArea>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIVMLogPage.h"
-# include "UIVMLogViewerFilterPanel.h"
-# include "UIVMLogViewerWidget.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIVMLogPage.h"
+#include "UIVMLogViewerFilterPanel.h"
+#include "UIVMLogViewerWidget.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 /*********************************************************************************************************************************
Index: trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerOptionsPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerOptionsPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerOptionsPanel.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QComboBox>
-# include <QHBoxLayout>
-# include <QFontDatabase>
-# include <QFontDialog>
-# include <QCheckBox>
-# include <QLabel>
-# include <QSpinBox>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QFontDatabase>
+#include <QFontDialog>
+#include <QCheckBox>
+#include <QLabel>
+#include <QSpinBox>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIVMLogViewerOptionsPanel.h"
-# include "UIVMLogViewerWidget.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIVMLogViewerOptionsPanel.h"
+#include "UIVMLogViewerWidget.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerPanel.cpp	(revision 76606)
@@ -16,26 +16,21 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QComboBox>
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QPlainTextEdit>
-# include <QTextCursor>
-# include <QToolButton>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPlainTextEdit>
+#include <QTextCursor>
+#include <QToolButton>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIVMLogPage.h"
-# include "UIVMLogViewerPanel.h"
-# include "UIVMLogViewerWidget.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIVMLogPage.h"
+#include "UIVMLogViewerPanel.h"
+#include "UIVMLogViewerWidget.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerSearchPanel.cpp	(revision 76606)
@@ -16,32 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAction>
-# include <QCheckBox>
-# include <QComboBox>
-# if defined(RT_OS_SOLARIS)
-#  include <QFontDatabase>
-# endif
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QLineEdit>
-# include <QPlainTextEdit>
-# include <QTextBlock>
+#include <QAction>
+#include <QCheckBox>
+#include <QComboBox>
+#if defined(RT_OS_SOLARIS)
+# include <QFontDatabase>
+#endif
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPlainTextEdit>
+#include <QTextBlock>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIVMLogPage.h"
-# include "UIVMLogViewerSearchPanel.h"
-# include "UIVMLogViewerWidget.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIVMLogPage.h"
+#include "UIVMLogViewerSearchPanel.h"
+#include "UIVMLogViewerWidget.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 class UIVMLogViewerSearchField: public QLineEdit
Index: trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerTextEdit.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# if defined(RT_OS_SOLARIS)
-#  include <QFontDatabase>
-# endif
-# include <QMenu>
-# include <QPainter>
-# include <QPlainTextEdit>
-# include <QScrollBar>
-# include <QStyle>
-# include <QTextBlock>
+#if defined(RT_OS_SOLARIS)
+# include <QFontDatabase>
+#endif
+#include <QMenu>
+#include <QPainter>
+#include <QPlainTextEdit>
+#include <QScrollBar>
+#include <QStyle>
+#include <QTextBlock>
 
 /* GUI includes: */
-# include "UIIconPool.h"
-# include "UIVMLogViewerTextEdit.h"
-# include "UIVMLogViewerWidget.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIIconPool.h"
+#include "UIVMLogViewerTextEdit.h"
+#include "UIVMLogViewerWidget.h"
 
 /** We use a modified scrollbar style for our QPlainTextEdits to get the
Index: trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp	(revision 76606)
@@ -16,44 +16,38 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDateTime>
-# include <QDir>
-# include <QFont>
-# include <QMenu>
-# include <QPainter>
-# include <QPlainTextEdit>
-# include <QScrollBar>
-# include <QStyle>
-# include <QTextBlock>
-# include <QVBoxLayout>
-# ifdef RT_OS_SOLARIS
-#  include <QFontDatabase>
-# endif
+#include <QDateTime>
+#include <QDir>
+#include <QFont>
+#include <QMenu>
+#include <QPainter>
+#include <QPlainTextEdit>
+#include <QScrollBar>
+#include <QStyle>
+#include <QTextBlock>
+#include <QVBoxLayout>
+#ifdef RT_OS_SOLARIS
+# include <QFontDatabase>
+#endif
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "QITabWidget.h"
-# include "UIActionPool.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "UIVMLogPage.h"
-# include "UIVMLogViewerWidget.h"
-# include "UIVMLogViewerBookmarksPanel.h"
-# include "UIVMLogViewerFilterPanel.h"
-# include "UIVMLogViewerSearchPanel.h"
-# include "UIVMLogViewerOptionsPanel.h"
-# include "UIToolBar.h"
+#include "QIFileDialog.h"
+#include "QITabWidget.h"
+#include "UIActionPool.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "UIVMLogPage.h"
+#include "UIVMLogViewerWidget.h"
+#include "UIVMLogViewerBookmarksPanel.h"
+#include "UIVMLogViewerFilterPanel.h"
+#include "UIVMLogViewerSearchPanel.h"
+#include "UIVMLogViewerOptionsPanel.h"
+#include "UIToolBar.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
+
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/main.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/main.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/main.cpp	(revision 76606)
@@ -16,52 +16,42 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QMessageBox>
-
-/* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIStarter.h"
-# include "UIModalWindowManager.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils.h"
-#  include "UICocoaApplication.h"
-# endif /* VBOX_WS_MAC */
-
-/* Other VBox includes: */
-# include <iprt/buildconfig.h>
-# include <iprt/stream.h>
-# include <VBox/version.h>
-# ifdef VBOX_WITH_HARDENING
-#  include <VBox/sup.h>
-# endif
-# if !defined(VBOX_WITH_HARDENING) || defined(VBOX_GUI_WITH_SHARED_LIBRARY) && !defined(VBOX_RUNTIME_UI)
-#  include <iprt/initterm.h>
-#  ifdef VBOX_WS_MAC
-#   include <iprt/asm.h>
-#  endif
-# endif
-# ifdef VBOX_WS_X11
-#  include <iprt/env.h>
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* Qt includes: */
+#include <QApplication>
+#include <QMessageBox>
 #ifdef VBOX_WS_X11
 # ifndef Q_OS_SOLARIS
 #  include <QFontDatabase>
-# endif /* !Q_OS_SOLARIS */
-#endif /* VBOX_WS_X11 */
+# endif
+#endif
+
+/* GUI includes: */
+#include "VBoxGlobal.h"
+#include "UIStarter.h"
+#include "UIModalWindowManager.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils.h"
+# include "UICocoaApplication.h"
+#endif /* VBOX_WS_MAC */
 
 /* Other VBox includes: */
+#include <iprt/buildconfig.h>
+#include <iprt/stream.h>
+#include <VBox/err.h>
+#include <VBox/version.h>
+#ifdef VBOX_WITH_HARDENING
+# include <VBox/sup.h>
+#endif
+#if !defined(VBOX_WITH_HARDENING) || defined(VBOX_GUI_WITH_SHARED_LIBRARY) && !defined(VBOX_RUNTIME_UI)
+# include <iprt/initterm.h>
+# ifdef VBOX_WS_MAC
+#  include <iprt/asm.h>
+# endif
+#endif
+#ifdef VBOX_WS_X11
+# include <iprt/env.h>
+#endif
 #ifdef VBOX_WITH_HARDENING
 # include <iprt/ctype.h>
 #endif
-#include <VBox/err.h>
 
 /* Other includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/UIErrorPane.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/UIErrorPane.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/UIErrorPane.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAction>
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QStyle>
-# include <QTextBrowser>
-# include <QToolButton>
-# include <QVBoxLayout>
+#include <QAction>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QStyle>
+#include <QTextBrowser>
+#include <QToolButton>
+#include <QVBoxLayout>
 
 /* GUI includes */
-# include "QIWithRetranslateUI.h"
-# include "UIErrorPane.h"
+#include "QIWithRetranslateUI.h"
+#include "UIErrorPane.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneGlobal.cpp	(revision 76606)
@@ -16,27 +16,21 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QStackedLayout>
-# ifndef VBOX_WS_MAC
-#  include <QStyle>
-# endif
-# include <QUuid>
+#include <QStackedLayout>
+#ifndef VBOX_WS_MAC
+# include <QStyle>
+#endif
+#include <QUuid>
 
 /* GUI includes */
-# include "UIActionPoolManager.h"
-# include "UICloudProfileManager.h"
-# include "UIHostNetworkManager.h"
-# include "UIMediumManager.h"
-# include "UIToolPaneGlobal.h"
-# include "UIWelcomePane.h"
+#include "UIActionPoolManager.h"
+#include "UICloudProfileManager.h"
+#include "UIHostNetworkManager.h"
+#include "UIMediumManager.h"
+#include "UIToolPaneGlobal.h"
+#include "UIWelcomePane.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QStackedLayout>
-# ifndef VBOX_WS_MAC
-#  include <QStyle>
-# endif
-# include <QUuid>
+#include <QStackedLayout>
+#ifndef VBOX_WS_MAC
+# include <QStyle>
+#endif
+#include <QUuid>
 
 /* GUI includes */
-# include "UIActionPoolManager.h"
-# include "UIErrorPane.h"
-# include "UIDetails.h"
-# include "UIIconPool.h"
-# include "UISnapshotPane.h"
-# include "UIToolPaneMachine.h"
-# include "UIVirtualMachineItem.h"
-# include "UIVMLogViewerWidget.h"
+#include "UIActionPoolManager.h"
+#include "UIErrorPane.h"
+#include "UIDetails.h"
+#include "UIIconPool.h"
+#include "UISnapshotPane.h"
+#include "UIToolPaneMachine.h"
+#include "UIVirtualMachineItem.h"
+#include "UIVMLogViewerWidget.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp	(revision 76606)
@@ -16,61 +16,55 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMenuBar>
-# include <QResizeEvent>
-# include <QStandardPaths>
-# include <QStatusBar>
+#include <QMenuBar>
+#include <QResizeEvent>
+#include <QStandardPaths>
+#include <QStatusBar>
 //# include <QToolButton>
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "UIActionPoolManager.h"
-# include "UICloudProfileManager.h"
-# include "UIDesktopServices.h"
-# include "UIExtraDataManager.h"
-# include "UIHostNetworkManager.h"
-# include "UIMedium.h"
-# include "UIMediumManager.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UIVirtualBoxManager.h"
-# include "UIVirtualBoxManagerWidget.h"
-# include "UISettingsDialogSpecific.h"
-# include "UIVMLogViewerDialog.h"
-# include "UIVirtualMachineItem.h"
-# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-#  include "UIUpdateManager.h"
-# endif
-# include "UIVirtualBoxEventHandler.h"
-# include "UIWizardCloneVM.h"
-# include "UIWizardExportApp.h"
-# include "UIWizardImportApp.h"
-# ifdef VBOX_WS_MAC
-#  include "UIImageTools.h"
-#  include "UIWindowMenuManager.h"
-#  include "VBoxUtils.h"
-# endif
-# ifdef VBOX_WS_X11
-#  include "UIDesktopWidgetWatchdog.h"
-# endif
-# ifndef VBOX_WS_MAC
-#  include "UIMenuBar.h"
-# endif
+#include "QIFileDialog.h"
+#include "UIActionPoolManager.h"
+#include "UICloudProfileManager.h"
+#include "UIDesktopServices.h"
+#include "UIExtraDataManager.h"
+#include "UIHostNetworkManager.h"
+#include "UIMedium.h"
+#include "UIMediumManager.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UIVirtualBoxManager.h"
+#include "UIVirtualBoxManagerWidget.h"
+#include "UISettingsDialogSpecific.h"
+#include "UIVMLogViewerDialog.h"
+#include "UIVirtualMachineItem.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UIUpdateManager.h"
+#endif
+#include "UIVirtualBoxEventHandler.h"
+#include "UIWizardCloneVM.h"
+#include "UIWizardExportApp.h"
+#include "UIWizardImportApp.h"
+#ifdef VBOX_WS_MAC
+# include "UIImageTools.h"
+# include "UIWindowMenuManager.h"
+# include "VBoxUtils.h"
+#endif
+#ifdef VBOX_WS_X11
+# include "UIDesktopWidgetWatchdog.h"
+#endif
+#ifndef VBOX_WS_MAC
+# include "UIMenuBar.h"
+#endif
 
 /* COM includes: */
-# include "CSystemProperties.h"
+#include "CSystemProperties.h"
 
 /* Other VBox stuff: */
-# include <iprt/buildconfig.h>
-# include <VBox/version.h>
-# ifdef VBOX_WS_X11
-#  include <iprt/env.h>
-# endif /* VBOX_WS_X11 */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/buildconfig.h>
+#include <VBox/version.h>
+#ifdef VBOX_WS_X11
+# include <iprt/env.h>
+#endif /* VBOX_WS_X11 */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp	(revision 76606)
@@ -16,31 +16,25 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QStackedWidget>
-# include <QStyle>
-# include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QStackedWidget>
+#include <QStyle>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QISplitter.h"
-# include "UIActionPoolManager.h"
-# include "UIErrorString.h"
-# include "UIExtraDataManager.h"
-# include "UIChooser.h"
-# include "UIVirtualBoxManager.h"
-# include "UIVirtualBoxManagerWidget.h"
-# include "UITabBar.h"
-# include "UIToolBar.h"
-# include "UIVirtualMachineItem.h"
-# include "UITools.h"
-# ifndef VBOX_WS_MAC
-#  include "UIMenuBar.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QISplitter.h"
+#include "UIActionPoolManager.h"
+#include "UIErrorString.h"
+#include "UIExtraDataManager.h"
+#include "UIChooser.h"
+#include "UIVirtualBoxManager.h"
+#include "UIVirtualBoxManagerWidget.h"
+#include "UITabBar.h"
+#include "UIToolBar.h"
+#include "UIVirtualMachineItem.h"
+#include "UITools.h"
+#ifndef VBOX_WS_MAC
+# include "UIMenuBar.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItem.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualMachineItem.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QFileInfo>
-# include <QIcon>
+#include <QApplication>
+#include <QFileInfo>
+#include <QIcon>
 
 /* GUI includes: */
-# include "UIVirtualMachineItem.h"
-# include "VBoxGlobal.h"
-# include "UIConverter.h"
-# include "UIExtraDataManager.h"
-# ifdef VBOX_WS_MAC
-#  include <ApplicationServices/ApplicationServices.h>
-# endif /* VBOX_WS_MAC */
+#include "UIVirtualMachineItem.h"
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
+#include "UIExtraDataManager.h"
+#ifdef VBOX_WS_MAC
+# include <ApplicationServices/ApplicationServices.h>
+#endif /* VBOX_WS_MAC */
 
 /* COM includes: */
-# include "CSnapshot.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSnapshot.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/UIWelcomePane.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/UIWelcomePane.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/UIWelcomePane.cpp	(revision 76606)
@@ -16,18 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QStyle>
-# include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QStyle>
+#include <QVBoxLayout>
 
 /* GUI includes */
-# include "QIWithRetranslateUI.h"
-# include "UIIconPool.h"
-# include "UIWelcomePane.h"
+#include "QIWithRetranslateUI.h"
+#include "UIIconPool.h"
+#include "UIWelcomePane.h"
 
 /* Forward declarations: */
@@ -37,6 +33,4 @@
 class QResizeEvent;
 class QVBoxLayout;
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooser.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIChooser.h"
-# include "UIChooserModel.h"
-# include "UIChooserView.h"
-# include "UIVirtualBoxManagerWidget.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIChooser.h"
+#include "UIChooserModel.h"
+#include "UIChooserView.h"
+#include "UIVirtualBoxManagerWidget.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerKeyboard.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerKeyboard.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerKeyboard.cpp	(revision 76606)
@@ -16,17 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QKeyEvent>
+#include <QKeyEvent>
 
 /* GUI incluedes: */
-# include "UIChooserHandlerKeyboard.h"
-# include "UIChooserModel.h"
-# include "UIChooserItemGroup.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIChooserHandlerKeyboard.h"
+#include "UIChooserModel.h"
+#include "UIChooserItemGroup.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerMouse.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerMouse.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserHandlerMouse.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSceneMouseEvent>
 
 /* GUI incluedes: */
-# include "UIChooserHandlerMouse.h"
-# include "UIChooserModel.h"
-# include "UIChooserItemGroup.h"
-# include "UIChooserItemGlobal.h"
-# include "UIChooserItemMachine.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIChooserHandlerMouse.h"
+#include "UIChooserModel.h"
+#include "UIChooserItemGroup.h"
+#include "UIChooserItemGlobal.h"
+#include "UIChooserItemMachine.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp	(revision 76606)
@@ -16,31 +16,25 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleObject>
-# include <QApplication>
-# include <QStyle>
-# include <QPainter>
-# include <QGraphicsScene>
-# include <QStyleOptionFocusRect>
-# include <QGraphicsSceneMouseEvent>
-# include <QStateMachine>
-# include <QPropertyAnimation>
-# include <QSignalTransition>
-# include <QDrag>
+#include <QAccessibleObject>
+#include <QApplication>
+#include <QStyle>
+#include <QPainter>
+#include <QGraphicsScene>
+#include <QStyleOptionFocusRect>
+#include <QGraphicsSceneMouseEvent>
+#include <QStateMachine>
+#include <QPropertyAnimation>
+#include <QSignalTransition>
+#include <QDrag>
 
 /* GUI includes: */
-# include "UIChooser.h"
-# include "UIChooserItem.h"
-# include "UIChooserView.h"
-# include "UIChooserModel.h"
-# include "UIChooserItemGroup.h"
-# include "UIChooserItemGlobal.h"
-# include "UIChooserItemMachine.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIChooser.h"
+#include "UIChooserItem.h"
+#include "UIChooserView.h"
+#include "UIChooserModel.h"
+#include "UIChooserItemGroup.h"
+#include "UIChooserItemGlobal.h"
+#include "UIChooserItemMachine.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGlobal.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGraphicsScene>
-# include <QGraphicsSceneMouseEvent>
-# include <QGraphicsView>
-# include <QPainter>
-# include <QStyleOptionGraphicsItem>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIChooserItemGlobal.h"
-# include "UIChooserModel.h"
-# include "UIIconPool.h"
-# include "UIVirtualBoxManager.h"
+#include "VBoxGlobal.h"
+#include "UIChooserItemGlobal.h"
+#include "UIChooserModel.h"
+#include "UIIconPool.h"
+#include "UIVirtualBoxManager.h"
 
 /* Other VBox includes: */
 #include "iprt/cpp/utils.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp	(revision 76606)
@@ -16,30 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGraphicsScene>
-# include <QGraphicsSceneDragDropEvent>
-# include <QHBoxLayout>
-# include <QLineEdit>
-# include <QMenu>
-# include <QPainter>
-# include <QStyleOptionGraphicsItem>
+#include <QGraphicsScene>
+#include <QGraphicsSceneDragDropEvent>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QMenu>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+#include <QGraphicsProxyWidget>
 
 /* GUI includes: */
-# include "UIChooserItemGroup.h"
-# include "UIChooserItemGlobal.h"
-# include "UIChooserItemMachine.h"
-# include "UIChooserModel.h"
-# include "UIChooserView.h"
-# include "UIGraphicsRotatorButton.h"
-# include "UIIconPool.h"
-# include "UIVirtualBoxManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-#include <QGraphicsProxyWidget>
+#include "UIChooserItemGroup.h"
+#include "UIChooserItemGlobal.h"
+#include "UIChooserItemMachine.h"
+#include "UIChooserModel.h"
+#include "UIChooserView.h"
+#include "UIGraphicsRotatorButton.h"
+#include "UIIconPool.h"
+#include "UIVirtualBoxManager.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemMachine.cpp	(revision 76606)
@@ -16,34 +16,28 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGraphicsScene>
-# include <QGraphicsSceneMouseEvent>
-# include <QGraphicsView>
-# include <QPainter>
-# include <QStyleOptionGraphicsItem>
-# include <QWindow>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+#include <QWindow>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIChooserItemGroup.h"
-# include "UIChooserItemMachine.h"
-# include "UIChooserModel.h"
-# include "UIActionPoolManager.h"
-# include "UIIconPool.h"
-# include "UIImageTools.h"
-# include "UIVirtualBoxManager.h"
+#include "VBoxGlobal.h"
+#include "UIChooserItemGroup.h"
+#include "UIChooserItemMachine.h"
+#include "UIChooserModel.h"
+#include "UIActionPoolManager.h"
+#include "UIIconPool.h"
+#include "UIImageTools.h"
+#include "UIVirtualBoxManager.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CMachine.h"
+#include "COMEnums.h"
+#include "CMachine.h"
 
 /* Other VBox includes: */
 #include "iprt/cpp/utils.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserModel.cpp	(revision 76606)
@@ -16,49 +16,42 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDrag>
-# include <QGraphicsScene>
-# include <QGraphicsSceneContextMenuEvent>
-# include <QGraphicsSceneMouseEvent>
-# include <QGraphicsView>
-# include <QPropertyAnimation>
-# include <QScrollBar>
-# include <QRegExp>
-# include <QTimer>
+#include <QDrag>
+#include <QGraphicsScene>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QPropertyAnimation>
+#include <QScrollBar>
+#include <QRegExp>
+#include <QTimer>
+#include <QParallelAnimationGroup>
 
 /* GUI includes: */
-# include "QIMessageBox.h"
-# include "VBoxGlobal.h"
-# include "UIActionPoolManager.h"
-# include "UIChooser.h"
-# include "UIChooserHandlerMouse.h"
-# include "UIChooserHandlerKeyboard.h"
-# include "UIChooserItemGroup.h"
-# include "UIChooserItemGlobal.h"
-# include "UIChooserItemMachine.h"
-# include "UIChooserModel.h"
-# include "UIExtraDataDefs.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UIVirtualBoxManagerWidget.h"
-# include "UIVirtualBoxEventHandler.h"
-# include "UIWizardNewVM.h"
+#include "QIMessageBox.h"
+#include "VBoxGlobal.h"
+#include "UIActionPoolManager.h"
+#include "UIChooser.h"
+#include "UIChooserHandlerMouse.h"
+#include "UIChooserHandlerKeyboard.h"
+#include "UIChooserItemGroup.h"
+#include "UIChooserItemGlobal.h"
+#include "UIChooserItemMachine.h"
+#include "UIChooserModel.h"
+#include "UIExtraDataDefs.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UIVirtualBoxManagerWidget.h"
+#include "UIVirtualBoxEventHandler.h"
+#include "UIWizardNewVM.h"
 
 /* COM includes: */
-# include "CExtPack.h"
-# include "CExtPackManager.h"
-# include "CMachine.h"
-# include "CMedium.h"
-# include "CVirtualBox.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* Qt includes: */
-#include <QParallelAnimationGroup>
+#include "CExtPack.h"
+#include "CExtPackManager.h"
+#include "CMachine.h"
+#include "CMedium.h"
+#include "CVirtualBox.h"
+
 
 /* Type defs: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserView.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QScrollBar>
+#include <QAccessibleWidget>
+#include <QScrollBar>
 
 /* GUI includes: */
-# include "UIChooser.h"
-# include "UIChooserItem.h"
-# include "UIChooserModel.h"
-# include "UIChooserView.h"
+#include "UIChooser.h"
+#include "UIChooserItem.h"
+#include "UIChooserModel.h"
+#include "UIChooserView.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetails.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIDetails.h"
-# include "UIDetailsModel.h"
-# include "UIDetailsView.h"
-# include "UIExtraDataManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIDetails.h"
+#include "UIDetailsModel.h"
+#include "UIDetailsView.h"
+#include "UIExtraDataManager.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsContextMenu.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsContextMenu.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsContextMenu.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QListWidget>
-# include <QMetaEnum>
+#include <QHBoxLayout>
+#include <QListWidget>
+#include <QMetaEnum>
 
 /* GUI includes: */
-# include "UIConverter.h"
-# include "UIDetailsContextMenu.h"
-# include "UIDetailsModel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIConverter.h"
+#include "UIDetailsContextMenu.h"
+#include "UIDetailsModel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElement.cpp	(revision 76606)
@@ -16,30 +16,24 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGraphicsSceneMouseEvent>
-# include <QGraphicsView>
-# include <QPropertyAnimation>
-# include <QSignalTransition>
-# include <QStateMachine>
-# include <QStyleOptionGraphicsItem>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QPropertyAnimation>
+#include <QSignalTransition>
+#include <QStateMachine>
+#include <QStyleOptionGraphicsItem>
 
 /* GUI includes: */
-# include "UIActionPool.h"
-# include "UIConverter.h"
-# include "UIDetailsElement.h"
-# include "UIDetailsSet.h"
-# include "UIDetailsModel.h"
-# include "UIExtraDataManager.h"
-# include "UIGraphicsRotatorButton.h"
-# include "UIGraphicsTextPane.h"
-# include "UIIconPool.h"
-# include "UIVirtualBoxManager.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIActionPool.h"
+#include "UIConverter.h"
+#include "UIDetailsElement.h"
+#include "UIDetailsSet.h"
+#include "UIDetailsModel.h"
+#include "UIExtraDataManager.h"
+#include "UIGraphicsRotatorButton.h"
+#include "UIGraphicsTextPane.h"
+#include "UIIconPool.h"
+#include "UIVirtualBoxManager.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsElements.cpp	(revision 76606)
@@ -16,43 +16,37 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QTimer>
-# include <QGraphicsLinearLayout>
+#include <QDir>
+#include <QTimer>
+#include <QGraphicsLinearLayout>
 
 /* GUI includes: */
-# include "UIDetailsElements.h"
-# include "UIDetailsModel.h"
-# include "UIMachinePreview.h"
-# include "UIGraphicsRotatorButton.h"
-# include "VBoxGlobal.h"
-# include "UIIconPool.h"
-# include "UIConverter.h"
-# include "UIGraphicsTextPane.h"
-# include "UIErrorString.h"
+#include "UIDetailsElements.h"
+#include "UIDetailsModel.h"
+#include "UIMachinePreview.h"
+#include "UIGraphicsRotatorButton.h"
+#include "VBoxGlobal.h"
+#include "UIIconPool.h"
+#include "UIConverter.h"
+#include "UIGraphicsTextPane.h"
+#include "UIErrorString.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CMachine.h"
-# include "CSystemProperties.h"
-# include "CVRDEServer.h"
-# include "CStorageController.h"
-# include "CMediumAttachment.h"
-# include "CAudioAdapter.h"
-# include "CRecordingSettings.h"
-# include "CRecordingScreenSettings.h"
-# include "CNetworkAdapter.h"
-# include "CSerialPort.h"
-# include "CUSBController.h"
-# include "CUSBDeviceFilters.h"
-# include "CUSBDeviceFilter.h"
-# include "CSharedFolder.h"
-# include "CMedium.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "COMEnums.h"
+#include "CMachine.h"
+#include "CSystemProperties.h"
+#include "CVRDEServer.h"
+#include "CStorageController.h"
+#include "CMediumAttachment.h"
+#include "CAudioAdapter.h"
+#include "CRecordingSettings.h"
+#include "CRecordingScreenSettings.h"
+#include "CNetworkAdapter.h"
+#include "CSerialPort.h"
+#include "CUSBController.h"
+#include "CUSBDeviceFilters.h"
+#include "CUSBDeviceFilter.h"
+#include "CSharedFolder.h"
+#include "CMedium.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsGroup.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt include: */
-# include <QGraphicsScene>
-# include <QPainter>
-# include <QStyle>
-# include <QStyleOptionGraphicsItem>
+#include <QGraphicsScene>
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOptionGraphicsItem>
 
 /* GUI includes: */
-# include "UIDetailsGroup.h"
-# include "UIDetailsModel.h"
-# include "UIDetailsSet.h"
-# include "UIExtraDataManager.h"
-# include "UIVirtualMachineItem.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIDetailsGroup.h"
+#include "UIDetailsModel.h"
+#include "UIDetailsSet.h"
+#include "UIExtraDataManager.h"
+#include "UIVirtualMachineItem.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsItem.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleObject>
-# include <QApplication>
-# include <QGraphicsScene>
-# include <QPainter>
-# include <QStyleOptionGraphicsItem>
+#include <QAccessibleObject>
+#include <QApplication>
+#include <QGraphicsScene>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
 
 /* GUI includes: */
-# include "UIGraphicsTextPane.h"
-# include "UIDetails.h"
-# include "UIDetailsElement.h"
-# include "UIDetailsGroup.h"
-# include "UIDetailsModel.h"
-# include "UIDetailsSet.h"
-# include "UIDetailsView.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGraphicsTextPane.h"
+#include "UIDetails.h"
+#include "UIDetailsElement.h"
+#include "UIDetailsGroup.h"
+#include "UIDetailsModel.h"
+#include "UIDetailsSet.h"
+#include "UIDetailsView.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsModel.cpp	(revision 76606)
@@ -16,27 +16,21 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAction>
-# include <QGraphicsScene>
-# include <QGraphicsSceneContextMenuEvent>
-# include <QGraphicsView>
-# include <QMenu>
-# include <QMetaEnum>
+#include <QAction>
+#include <QGraphicsScene>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QGraphicsView>
+#include <QMenu>
+#include <QMetaEnum>
 
 /* GUI includes: */
-# include "UIConverter.h"
-# include "UIDetails.h"
-# include "UIDetailsContextMenu.h"
-# include "UIDetailsModel.h"
-# include "UIDetailsGroup.h"
-# include "UIDetailsElement.h"
-# include "UIExtraDataManager.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIConverter.h"
+#include "UIDetails.h"
+#include "UIDetailsContextMenu.h"
+#include "UIDetailsModel.h"
+#include "UIDetailsGroup.h"
+#include "UIDetailsElement.h"
+#include "UIExtraDataManager.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsSet.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QPainter>
-# include <QStyle>
-# include <QStyleOptionGraphicsItem>
+#include <QPainter>
+#include <QStyle>
+#include <QStyleOptionGraphicsItem>
 
 /* GUI includes: */
-# include "UIDetailsElements.h"
-# include "UIDetailsModel.h"
-# include "UIDetailsSet.h"
-# include "UIVirtualBoxEventHandler.h"
-# include "UIVirtualMachineItem.h"
-# include "VBoxGlobal.h"
+#include "UIDetailsElements.h"
+#include "UIDetailsModel.h"
+#include "UIDetailsSet.h"
+#include "UIVirtualBoxEventHandler.h"
+#include "UIVirtualMachineItem.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CUSBController.h"
-# include "CUSBDeviceFilters.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CUSBController.h"
+#include "CUSBDeviceFilters.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsView.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIDetailsView.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QApplication>
-# include <QScrollBar>
+#include <QAccessibleWidget>
+#include <QApplication>
+#include <QScrollBar>
 
 /* GUI includes: */
-# include "UIDetails.h"
-# include "UIDetailsModel.h"
-# include "UIDetailsView.h"
-# include "UIDetailsItem.h"
+#include "UIDetails.h"
+#include "UIDetailsModel.h"
+#include "UIDetailsView.h"
+#include "UIDetailsItem.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/details/UIMachinePreview.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGraphicsSceneContextMenuEvent>
-# include <QMenu>
-# include <QPainter>
-# include <QStyle>
-# include <QTimer>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QMenu>
+#include <QPainter>
+#include <QStyle>
+#include <QTimer>
 
 /* GUI includes: */
-# include "UIMachinePreview.h"
-# include "UIVirtualBoxEventHandler.h"
-# include "UIExtraDataManager.h"
-# include "UIImageTools.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "VBoxGlobal.h"
+#include "UIMachinePreview.h"
+#include "UIVirtualBoxEventHandler.h"
+#include "UIExtraDataManager.h"
+#include "UIImageTools.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CConsole.h"
-# include "CDisplay.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CConsole.h"
+#include "CDisplay.h"
 
 /* VirtualBox interface declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UITools.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UITools.h"
-# include "UIToolsModel.h"
-# include "UIToolsView.h"
-# include "UIVirtualBoxManagerWidget.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UITools.h"
+#include "UIToolsModel.h"
+#include "UIToolsView.h"
+#include "UIVirtualBoxManagerWidget.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsHandlerKeyboard.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsHandlerKeyboard.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsHandlerKeyboard.cpp	(revision 76606)
@@ -16,17 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QKeyEvent>
+#include <QKeyEvent>
 
 /* GUI incluedes: */
-# include "UIToolsHandlerKeyboard.h"
-# include "UIToolsModel.h"
-# include "UIToolsItem.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIToolsHandlerKeyboard.h"
+#include "UIToolsModel.h"
+#include "UIToolsItem.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsHandlerMouse.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsHandlerMouse.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsHandlerMouse.cpp	(revision 76606)
@@ -16,16 +16,10 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGraphicsSceneMouseEvent>
+#include <QGraphicsSceneMouseEvent>
 
 /* GUI incluedes: */
-# include "UIToolsHandlerMouse.h"
-# include "UIToolsModel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIToolsHandlerMouse.h"
+#include "UIToolsModel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsItem.cpp	(revision 76606)
@@ -16,28 +16,22 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleObject>
-# include <QApplication>
-# include <QGraphicsScene>
-# include <QPainter>
-# include <QPropertyAnimation>
-# include <QSignalTransition>
-# include <QStateMachine>
-# include <QStyle>
-# include <QStyleOptionGraphicsItem>
+#include <QAccessibleObject>
+#include <QApplication>
+#include <QGraphicsScene>
+#include <QPainter>
+#include <QPropertyAnimation>
+#include <QSignalTransition>
+#include <QStateMachine>
+#include <QStyle>
+#include <QStyleOptionGraphicsItem>
 
 /* GUI includes: */
-# include "UIImageTools.h"
-# include "UITools.h"
-# include "UIToolsItem.h"
-# include "UIToolsModel.h"
-# include "UIToolsView.h"
-# include "UIVirtualBoxManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIImageTools.h"
+#include "UITools.h"
+#include "UIToolsItem.h"
+#include "UIToolsModel.h"
+#include "UIToolsView.h"
+#include "UIVirtualBoxManager.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsModel.cpp	(revision 76606)
@@ -16,40 +16,34 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGraphicsScene>
-# include <QGraphicsSceneContextMenuEvent>
-# include <QGraphicsSceneMouseEvent>
-# include <QGraphicsView>
-# include <QPropertyAnimation>
-# include <QScrollBar>
-# include <QRegExp>
-# include <QTimer>
+#include <QGraphicsScene>
+#include <QGraphicsSceneContextMenuEvent>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QPropertyAnimation>
+#include <QScrollBar>
+#include <QRegExp>
+#include <QTimer>
 
 /* GUI includes: */
-# include "QIMessageBox.h"
-# include "VBoxGlobal.h"
-# include "UIActionPoolManager.h"
-# include "UIIconPool.h"
-# include "UITools.h"
-# include "UIToolsHandlerMouse.h"
-# include "UIToolsHandlerKeyboard.h"
-# include "UIToolsModel.h"
-# include "UIExtraDataDefs.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UIVirtualBoxManagerWidget.h"
-# include "UIVirtualBoxEventHandler.h"
-# include "UIWizardNewVM.h"
+#include "QIMessageBox.h"
+#include "VBoxGlobal.h"
+#include "UIActionPoolManager.h"
+#include "UIIconPool.h"
+#include "UITools.h"
+#include "UIToolsHandlerMouse.h"
+#include "UIToolsHandlerKeyboard.h"
+#include "UIToolsModel.h"
+#include "UIExtraDataDefs.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UIVirtualBoxManagerWidget.h"
+#include "UIVirtualBoxEventHandler.h"
+#include "UIWizardNewVM.h"
 
 /* COM includes: */
-# include "CExtPack.h"
-# include "CExtPackManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CExtPack.h"
+#include "CExtPackManager.h"
 
 /* Qt includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/manager/tools/UIToolsView.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QApplication>
-# include <QScrollBar>
+#include <QAccessibleWidget>
+#include <QApplication>
+#include <QScrollBar>
 
 /* GUI includes: */
-# include "UITools.h"
-# include "UIToolsItem.h"
-# include "UIToolsModel.h"
-# include "UIToolsView.h"
+#include "UITools.h"
+#include "UIToolsItem.h"
+#include "UIToolsModel.h"
+#include "UIToolsView.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/medium/UIFDCreationDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/medium/UIFDCreationDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/medium/UIFDCreationDialog.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes */
-# include<QCheckBox>
-# include<QDialogButtonBox>
-# include<QDir>
-# include<QGridLayout>
-# include<QLabel>
-# include<QPushButton>
+#include<QCheckBox>
+#include<QDialogButtonBox>
+#include<QDir>
+#include<QGridLayout>
+#include<QLabel>
+#include<QPushButton>
 
 /* GUI includes */
-# include "UIFDCreationDialog.h"
-# include "UIFilePathSelector.h"
-# include "UIMedium.h"
-# include "UIMessageCenter.h"
-# include "VBoxGlobal.h"
+#include "UIFDCreationDialog.h"
+#include "UIFilePathSelector.h"
+#include "UIMedium.h"
+#include "UIMessageCenter.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-# include "CMedium.h"
-# include "CMediumFormat.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
+#include "CMedium.h"
+#include "CMediumFormat.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QDir>
+#include <QApplication>
+#include <QDir>
 
 /* GUI includes: */
-# include "UIMedium.h"
-# include "VBoxGlobal.h"
-# include "UIConverter.h"
-# include "UIErrorString.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
+#include "UIMedium.h"
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
+#include "UIErrorString.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
 
 /* COM includes: */
-# include "CMachine.h"
-# include "CSnapshot.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMachine.h"
+#include "CSnapshot.h"
 
 QUuid   UIMedium::m_uNullID;
Index: trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDefs.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDefs.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDefs.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIMediumDefs.h"
-# include "VBoxGlobal.h"
+#include "UIMediumDefs.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CMediumFormat.h"
-# include "CSystemProperties.h"
+#include "CMediumFormat.h"
+#include "CSystemProperties.h"
 
 /* COM includes: */
-# include "CMediumFormat.h"
-# include "CSystemProperties.h"
-# include "CVirtualBox.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMediumFormat.h"
+#include "CSystemProperties.h"
+#include "CVirtualBox.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumDetailsWidget.cpp	(revision 76606)
@@ -16,36 +16,30 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QComboBox>
-# include <QLabel>
-# include <QPushButton>
-# include <QSlider>
-# include <QStackedLayout>
-# include <QStyle>
-# include <QTextEdit>
-# include <QVBoxLayout>
+#include <QComboBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QSlider>
+#include <QStackedLayout>
+#include <QStyle>
+#include <QTextEdit>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QIFileDialog.h"
-# include "QILabel.h"
-# include "QILineEdit.h"
-# include "QITabWidget.h"
-# include "QIToolButton.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "UIMediumDetailsWidget.h"
-# include "UIMediumManager.h"
-# include "UIMediumSizeEditor.h"
-# include "VBoxGlobal.h"
+#include "QIDialogButtonBox.h"
+#include "QIFileDialog.h"
+#include "QILabel.h"
+#include "QILineEdit.h"
+#include "QITabWidget.h"
+#include "QIToolButton.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "UIMediumDetailsWidget.h"
+#include "UIMediumManager.h"
+#include "UIMediumSizeEditor.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QSet>
+#include <QSet>
 
 /* GUI includes: */
-# include "UIMediumEnumerator.h"
-# include "UIThreadPool.h"
-# include "UIVirtualBoxEventHandler.h"
-# include "VBoxGlobal.h"
+#include "UIMediumEnumerator.h"
+#include "UIThreadPool.h"
+#include "UIVirtualBoxEventHandler.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CMachine.h"
-# include "CSnapshot.h"
-# include "CMediumAttachment.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "COMEnums.h"
+#include "CMachine.h"
+#include "CSnapshot.h"
+#include "CMediumAttachment.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumItem.cpp	(revision 76606)
@@ -16,28 +16,22 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QDir>
+#include <QApplication>
+#include <QDir>
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "QIMessageBox.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIMediumItem.h"
-# include "UIMessageCenter.h"
-# include "VBoxGlobal.h"
+#include "QIFileDialog.h"
+#include "QIMessageBox.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIMediumItem.h"
+#include "UIMessageCenter.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CMachine.h"
-# include "CMediumAttachment.h"
-# include "CStorageController.h"
-# include "CMediumFormat.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMachine.h"
+#include "CMediumAttachment.h"
+#include "CStorageController.h"
+#include "CMediumFormat.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp	(revision 76606)
@@ -16,48 +16,42 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QFrame>
-# include <QHBoxLayout>
-# include <QHeaderView>
-# include <QLabel>
-# include <QMenuBar>
-# include <QProgressBar>
-# include <QPushButton>
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QMenuBar>
+#include <QProgressBar>
+#include <QPushButton>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QIFileDialog.h"
-# include "QILabel.h"
-# include "QIMessageBox.h"
-# include "QITabWidget.h"
-# include "VBoxGlobal.h"
-# include "UIActionPoolManager.h"
-# include "UIExtraDataManager.h"
-# include "UIMediumDetailsWidget.h"
-# include "UIMediumItem.h"
-# include "UIMediumManager.h"
-# include "UIWizardCloneVD.h"
-# include "UIMessageCenter.h"
-# include "UIToolBar.h"
-# include "UIIconPool.h"
-# include "UIMedium.h"
+#include "QIDialogButtonBox.h"
+#include "QIFileDialog.h"
+#include "QILabel.h"
+#include "QIMessageBox.h"
+#include "QITabWidget.h"
+#include "VBoxGlobal.h"
+#include "UIActionPoolManager.h"
+#include "UIExtraDataManager.h"
+#include "UIMediumDetailsWidget.h"
+#include "UIMediumItem.h"
+#include "UIMediumManager.h"
+#include "UIWizardCloneVD.h"
+#include "UIMessageCenter.h"
+#include "UIToolBar.h"
+#include "UIIconPool.h"
+#include "UIMedium.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CMachine.h"
-# include "CMediumAttachment.h"
-# include "CMediumFormat.h"
-# include "CStorageController.h"
-# include "CSystemProperties.h"
-
-# ifdef VBOX_WS_MAC
-#  include "UIWindowMenuManager.h"
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "COMEnums.h"
+#include "CMachine.h"
+#include "CMediumAttachment.h"
+#include "CMediumFormat.h"
+#include "CStorageController.h"
+#include "CSystemProperties.h"
+
+#ifdef VBOX_WS_MAC
+# include "UIWindowMenuManager.h"
+#endif /* VBOX_WS_MAC */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSelector.cpp	(revision 76606)
@@ -16,46 +16,40 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAction>
-# include <QHeaderView>
-# include <QVBoxLayout>
-# include <QPushButton>
+#include <QAction>
+#include <QHeaderView>
+#include <QVBoxLayout>
+#include <QPushButton>
 
 /* GUI includes: */
-# include "QIComboBox.h"
-# include "QIDialogButtonBox.h"
-# include "QIFileDialog.h"
-# include "QILineEdit.h"
-# include "QIMessageBox.h"
-# include "QITabWidget.h"
-# include "QIToolButton.h"
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIFDCreationDialog.h"
-# include "UIMediumSelector.h"
-# include "UIMessageCenter.h"
-# include "UIIconPool.h"
-# include "UIMedium.h"
-# include "UIMediumItem.h"
-# include "UIToolBar.h"
+#include "QIComboBox.h"
+#include "QIDialogButtonBox.h"
+#include "QIFileDialog.h"
+#include "QILineEdit.h"
+#include "QIMessageBox.h"
+#include "QITabWidget.h"
+#include "QIToolButton.h"
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIFDCreationDialog.h"
+#include "UIMediumSelector.h"
+#include "UIMessageCenter.h"
+#include "UIIconPool.h"
+#include "UIMedium.h"
+#include "UIMediumItem.h"
+#include "UIToolBar.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CMachine.h"
-# include "CMediumAttachment.h"
-# include "CMediumFormat.h"
-# include "CStorageController.h"
-# include "CSystemProperties.h"
-
-# ifdef VBOX_WS_MAC
-#  include "UIWindowMenuManager.h"
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "COMEnums.h"
+#include "CMachine.h"
+#include "CMediumAttachment.h"
+#include "CMediumFormat.h"
+#include "CStorageController.h"
+#include "CSystemProperties.h"
+
+#ifdef VBOX_WS_MAC
+# include "UIWindowMenuManager.h"
+#endif /* VBOX_WS_MAC */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloader.cpp	(revision 76606)
@@ -16,16 +16,10 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "VBoxUtils.h"
-# include "UIDownloader.h"
-# include "UIMessageCenter.h"
-# include "UINetworkReply.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "VBoxUtils.h"
+#include "UIDownloader.h"
+#include "UIMessageCenter.h"
+#include "UINetworkReply.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QFile>
-# include <QVariant>
+#include <QDir>
+#include <QFile>
+#include <QVariant>
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "VBoxGlobal.h"
-# include "UIDownloaderAdditions.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UINetworkReply.h"
-# include "UIVersion.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIFileDialog.h"
+#include "VBoxGlobal.h"
+#include "UIDownloaderAdditions.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UINetworkReply.h"
+#include "UIVersion.h"
 
 /* Other VBox includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QFile>
-# include <QVariant>
+#include <QDir>
+#include <QFile>
+#include <QVariant>
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "VBoxGlobal.h"
-# include "UIDownloaderExtensionPack.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UINetworkReply.h"
-# include "UIVersion.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIFileDialog.h"
+#include "VBoxGlobal.h"
+#include "UIDownloaderExtensionPack.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UINetworkReply.h"
+#include "UIVersion.h"
 
 /* Other VBox includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QFile>
-# include <QVariant>
+#include <QDir>
+#include <QFile>
+#include <QVariant>
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "VBoxGlobal.h"
-# include "UIDownloaderUserManual.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UINetworkReply.h"
-# include "UIVersion.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIFileDialog.h"
+#include "VBoxGlobal.h"
+#include "UIDownloaderUserManual.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UINetworkReply.h"
+#include "UIVersion.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkCustomer.cpp	(revision 76606)
@@ -16,16 +16,10 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QUrl>
+#include <QUrl>
 
 /* Local includes: */
-# include "UINetworkCustomer.h"
-# include "UINetworkManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UINetworkCustomer.h"
+#include "UINetworkManager.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManager.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QWidget>
-# include <QUrl>
+#include <QWidget>
+#include <QUrl>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UINetworkCustomer.h"
-# include "UINetworkManager.h"
-# include "UINetworkManagerDialog.h"
-# include "UINetworkManagerIndicator.h"
-# include "UINetworkRequest.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UINetworkCustomer.h"
+#include "UINetworkManager.h"
+#include "UINetworkManagerDialog.h"
+#include "UINetworkManagerIndicator.h"
+#include "UINetworkRequest.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerDialog.cpp	(revision 76606)
@@ -16,28 +16,22 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QLabel>
-# include <QPushButton>
-# include <QStatusBar>
-# include <QKeyEvent>
+#include <QVBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QStatusBar>
+#include <QKeyEvent>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "VBoxGlobal.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UINetworkCustomer.h"
-# include "UINetworkManager.h"
-# include "UINetworkManagerDialog.h"
-# include "UINetworkRequest.h"
-# include "UINetworkRequestWidget.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIDialogButtonBox.h"
+#include "VBoxGlobal.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UINetworkCustomer.h"
+#include "UINetworkManager.h"
+#include "UINetworkManagerDialog.h"
+#include "UINetworkRequest.h"
+#include "UINetworkRequestWidget.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkManagerIndicator.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIIconPool.h"
-# include "UINetworkManagerIndicator.h"
-# include "UINetworkRequest.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIIconPool.h"
+#include "UINetworkManagerIndicator.h"
+#include "UINetworkRequest.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp	(revision 76606)
@@ -16,34 +16,24 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QFile>
-# include <QThread>
-# include <QRegExp>
-# include <QVector>
-# include <QVariant>
+#include <QDir>
+#include <QFile>
+#include <QThread>
+#include <QRegExp>
+#include <QVector>
+#include <QVariant>
 
 /* GUI includes: */
-# include "UINetworkReply.h"
-# include "UINetworkManager.h"
-# include "UIExtraDataManager.h"
-# ifndef VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
-#  include "VBoxGlobal.h"
-#  include "VBoxUtils.h"
-#  include "CSystemProperties.h"
-# else /* VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS */
-#  include <VBox/log.h>
-# endif /* VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS */
+#include "UINetworkReply.h"
+#include "UINetworkManager.h"
+#include "UIExtraDataManager.h"
+#ifndef VBOX_GUI_IN_TST_SSL_CERT_DOWNLOADS
+# include "VBoxGlobal.h"
+# include "VBoxUtils.h"
+# include "CSystemProperties.h"
+#endif
 
 /* Other VBox includes: */
-# include <iprt/initterm.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* Other VBox includes: */
+#include <iprt/initterm.h>
 #include <iprt/crypto/pem.h>
 #include <iprt/crypto/store.h>
@@ -54,4 +44,5 @@
 #include <iprt/string.h>
 #include <iprt/zip.h>
+#include <VBox/log.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequest.cpp	(revision 76606)
@@ -16,18 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UINetworkRequest.h"
-# include "UINetworkRequestWidget.h"
-# include "UINetworkManager.h"
-# include "UINetworkManagerDialog.h"
-# include "UINetworkManagerIndicator.h"
-# include "UINetworkCustomer.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UINetworkRequest.h"
+#include "UINetworkRequestWidget.h"
+#include "UINetworkManager.h"
+#include "UINetworkManagerDialog.h"
+#include "UINetworkManagerIndicator.h"
+#include "UINetworkCustomer.h"
+#include "VBoxGlobal.h"
+
 
 UINetworkRequest::UINetworkRequest(UINetworkRequestType enmType,
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkRequestWidget.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGridLayout>
-# include <QProgressBar>
-# include <QStyle>
-# include <QTimer>
+#include <QGridLayout>
+#include <QProgressBar>
+#include <QStyle>
+#include <QTimer>
 
 /* GUI includes: */
-# include "QIRichTextLabel.h"
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UINetworkManager.h"
-# include "UINetworkManagerDialog.h"
-# include "UINetworkRequest.h"
-# include "UINetworkRequestWidget.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIRichTextLabel.h"
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UINetworkManager.h"
+#include "UINetworkManagerDialog.h"
+#include "UINetworkRequest.h"
+#include "UINetworkRequestWidget.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateDefs.cpp	(revision 76606)
@@ -16,17 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCoreApplication>
-# include <QStringList>
+#include <QCoreApplication>
+#include <QStringList>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIUpdateDefs.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIUpdateDefs.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/net/UIUpdateManager.cpp	(revision 76606)
@@ -16,41 +16,35 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QPointer>
-# include <QTimer>
-# include <QUrl>
-# include <QUrlQuery>
+#include <QDir>
+#include <QPointer>
+#include <QTimer>
+#include <QUrl>
+#include <QUrlQuery>
 
 /* GUI includes: */
-# include "QIProcess.h"
-# include "VBoxGlobal.h"
-# include "VBoxUtils.h"
-# include "UIDownloaderExtensionPack.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UINetworkManager.h"
-# include "UINetworkCustomer.h"
-# include "UINetworkRequest.h"
-# include "UIUpdateDefs.h"
-# include "UIUpdateManager.h"
+#include "QIProcess.h"
+#include "VBoxGlobal.h"
+#include "VBoxUtils.h"
+#include "UIDownloaderExtensionPack.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UINetworkManager.h"
+#include "UINetworkCustomer.h"
+#include "UINetworkRequest.h"
+#include "UIUpdateDefs.h"
+#include "UIUpdateManager.h"
 
 /* COM includes: */
-# include "CExtPack.h"
-# include "CExtPackManager.h"
-# include "CSystemProperties.h"
+#include "CExtPack.h"
+#include "CExtPackManager.h"
+#include "CSystemProperties.h"
 
 /* Other VBox includes: */
 //# include <iprt/err.h>
-# include <iprt/path.h>
-# include <iprt/system.h>
-# include <VBox/version.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/path.h>
+#include <iprt/system.h>
+#include <VBox/version.h>
 
 /* enable to test the version update check */
Index: trunk/src/VBox/Frontends/VirtualBox/src/objects/UIRichTextString.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/objects/UIRichTextString.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/objects/UIRichTextString.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QPalette>
+#include <QApplication>
+#include <QPalette>
 
 /* GUI includes: */
-# include "UIRichTextString.h"
+#include "UIRichTextString.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
 #include <QStyle>
 
 /* GUI includes: */
-# include "UIAbstractDockIconPreview.h"
-# include "UIConverter.h"
-# include "UIExtraDataManager.h"
-# include "UIFrameBuffer.h"
-# include "UIMachineLogic.h"
-# include "UIMachineView.h"
-# include "UISession.h"
-# include "VBoxGlobal.h"
+#include "UIAbstractDockIconPreview.h"
+#include "UIConverter.h"
+#include "UIExtraDataManager.h"
+#include "UIFrameBuffer.h"
+#include "UIMachineLogic.h"
+#include "UIMachineView.h"
+#include "UISession.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "COMEnums.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIWindowMenuManager.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QMenu>
+#include <QApplication>
+#include <QMenu>
 
 /* GUI includes: */
-# include "UIWindowMenuManager.h"
+#include "UIWindowMenuManager.h"
 
 /* Other VBox includes: */
 #include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp	(revision 76606)
@@ -22,17 +22,11 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/initterm.h>
+#include <iprt/stream.h>
+#include <iprt/string.h>
+#include <iprt/time.h>
+#include <iprt/assert.h>
 
-# include <iprt/initterm.h>
-# include <iprt/stream.h>
-# include <iprt/string.h>
-# include <iprt/time.h>
-# include <iprt/assert.h>
-
-# include "DarwinKeyboard.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "DarwinKeyboard.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/platform/win/UIDesktopServices_win.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* VBox includes */
-# include "UIDesktopServices.h"
+#include "UIDesktopServices.h"
 
 /* Qt includes */
-# include <QDir>
-# include <QCoreApplication>
-# include <QUuid>
+#include <QDir>
+#include <QCoreApplication>
+#include <QUuid>
 
 /* System includes */
-# include <iprt/win/shlobj.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/win/shlobj.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/UIDesktopServices_x11.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* VBox includes */
-# include "UIDesktopServices.h"
+#include "UIDesktopServices.h"
 
 /* Qt includes */
-# include <QCoreApplication>
-# include <QDesktopServices>
-# include <QDir>
-# include <QFile>
-# include <QTextStream>
-# include <QUrl>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <QCoreApplication>
+#include <QDesktopServices>
+#include <QDir>
+#include <QFile>
+#include <QTextStream>
+#include <QUrl>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp	(revision 76606)
@@ -16,8 +16,4 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Define GUI log group.
  * This define should go *before* VBox/log.h include: */
@@ -25,11 +21,9 @@
 
 /* Qt includes: */
-# include <QString>
-# include <QStringList>
+#include <QString>
+#include <QStringList>
 
 /* Other VBox includes: */
-# include <VBox/log.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <VBox/log.h>
 
 /* GUI includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIConsoleEventHandler.h"
-# include "UIMainEventListener.h"
-# include "UIExtraDataManager.h"
-# include "VBoxGlobal.h"
-# include "UISession.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils.h"
-# endif /* VBOX_WS_MAC */
+#include "UIConsoleEventHandler.h"
+#include "UIMainEventListener.h"
+#include "UIExtraDataManager.h"
+#include "VBoxGlobal.h"
+#include "UISession.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils.h"
+#endif
 
 /* COM includes: */
-# include "CEventListener.h"
-# include "CEventSource.h"
-# include "CConsole.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CEventListener.h"
+#include "CEventSource.h"
+#include "CConsole.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.cpp	(revision 76606)
@@ -16,8 +16,4 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
 #include <QApplication>
@@ -33,12 +29,12 @@
 
 /* GUI includes: */
-# include "UIDnDHandler.h"
+#include "UIDnDHandler.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP_GH
-# include "CDnDSource.h"
-# ifdef RT_OS_WINDOWS
-#  include "UIDnDDataObject_win.h"
-#  include "UIDnDDropSource_win.h"
-# endif
-# include "UIDnDMIMEData.h"
+#include "CDnDSource.h"
+#ifdef RT_OS_WINDOWS
+# include "UIDnDDataObject_win.h"
+# include "UIDnDDropSource_win.h"
+#endif
+#include "UIDnDMIMEData.h"
 #endif /* VBOX_WITH_DRAG_AND_DROP_GH */
 #include "UIMessageCenter.h"
@@ -46,11 +42,9 @@
 
 /* COM includes: */
-# include "CConsole.h"
-# include "CGuest.h"
-# include "CGuestDnDSource.h"
-# include "CGuestDnDTarget.h"
-# include "CSession.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CConsole.h"
+#include "CGuest.h"
+#include "CGuestDnDSource.h"
+#include "CGuestDnDTarget.h"
+#include "CSession.h"
 
 #ifdef LOG_GROUP
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDMIMEData.cpp	(revision 76606)
@@ -16,21 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#define LOG_GROUP LOG_GROUP_GUEST_DND
 
 /* Qt includes: */
-# include <QFileInfo>
-# include <QMimeData>
-# include <QStringList>
-# include <QUrl>
+#include <QFileInfo>
+#include <QMimeData>
+#include <QStringList>
+#include <QUrl>
 
 /* GUI includes: */
-# include "UIDnDMIMEData.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-#undef LOG_GROUP
-#define LOG_GROUP LOG_GROUP_GUEST_DND
+#include "UIDnDMIMEData.h"
+
+/* Other VBox includes: */
 #include <VBox/log.h>
 #include <iprt/errcore.h>
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp	(revision 76606)
@@ -16,35 +16,33 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 /* Qt includes: */
-# include <QImage>
-# include <QRegion>
-# include <QPainter>
-# include <QTransform>
+#include <QImage>
+#include <QRegion>
+#include <QPainter>
+#include <QTransform>
+
 /* GUI includes: */
-# include "UIActionPool.h"
-# include "UIActionPoolRuntime.h"
-# include "UIFrameBuffer.h"
-# include "UISession.h"
-# include "UIMachineLogic.h"
+#include "UIActionPool.h"
+#include "UIActionPoolRuntime.h"
+#include "UIFrameBuffer.h"
+#include "UISession.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMachineView.h"
+#include "UIPopupCenter.h"
+#include "UIExtraDataManager.h"
+#include "VBoxGlobal.h"
+#ifdef VBOX_WITH_MASKED_SEAMLESS
 # include "UIMachineWindow.h"
-# include "UIMachineView.h"
-# include "UIPopupCenter.h"
-# include "UIExtraDataManager.h"
-# include "VBoxGlobal.h"
-# ifdef VBOX_WITH_MASKED_SEAMLESS
-#  include "UIMachineWindow.h"
-# endif /* VBOX_WITH_MASKED_SEAMLESS */
-# ifdef VBOX_WITH_VIDEOHWACCEL
-#  include "VBoxFBOverlay.h"
-# endif /* VBOX_WITH_VIDEOHWACCEL */
+#endif /* VBOX_WITH_MASKED_SEAMLESS */
+#ifdef VBOX_WITH_VIDEOHWACCEL
+# include "VBoxFBOverlay.h"
+#endif /* VBOX_WITH_VIDEOHWACCEL */
+
 /* COM includes: */
-# include "CConsole.h"
-# include "CDisplay.h"
-# include "CFramebuffer.h"
-# include "CDisplaySourceBitmap.h"
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CConsole.h"
+#include "CDisplay.h"
+#include "CFramebuffer.h"
+#include "CDisplaySourceBitmap.h"
 
 /* VirtualBox interface declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp	(revision 76606)
@@ -16,51 +16,45 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QHBoxLayout>
-# include <QPainter>
-# include <QStyle>
-# include <QTimer>
+#include <QAccessibleWidget>
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QStyle>
+#include <QTimer>
 
 /* GUI includes: */
-# include "UIIndicatorsPool.h"
-# include "QIWithRetranslateUI.h"
-# include "UIExtraDataManager.h"
-# include "UIMachineDefs.h"
-# include "UIConverter.h"
-# include "UIAnimationFramework.h"
-# include "UISession.h"
-# include "UIMedium.h"
-# include "UIIconPool.h"
-# include "UIHostComboEditor.h"
-# include "QIStatusBarIndicator.h"
-# include "VBoxGlobal.h"
+#include "UIIndicatorsPool.h"
+#include "QIWithRetranslateUI.h"
+#include "UIExtraDataManager.h"
+#include "UIMachineDefs.h"
+#include "UIConverter.h"
+#include "UIAnimationFramework.h"
+#include "UISession.h"
+#include "UIMedium.h"
+#include "UIIconPool.h"
+#include "UIHostComboEditor.h"
+#include "QIStatusBarIndicator.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CAudioAdapter.h"
-# include "CRecordingSettings.h"
-# include "CRecordingScreenSettings.h"
-# include "CConsole.h"
-# include "CMachine.h"
-# include "CSystemProperties.h"
-# include "CMachineDebugger.h"
-# include "CGuest.h"
-# include "CStorageController.h"
-# include "CMediumAttachment.h"
-# include "CNetworkAdapter.h"
-# include "CUSBController.h"
-# include "CUSBDeviceFilters.h"
-# include "CUSBDevice.h"
-# include "CSharedFolder.h"
-# include "CVRDEServer.h"
+#include "CAudioAdapter.h"
+#include "CRecordingSettings.h"
+#include "CRecordingScreenSettings.h"
+#include "CConsole.h"
+#include "CMachine.h"
+#include "CSystemProperties.h"
+#include "CMachineDebugger.h"
+#include "CGuest.h"
+#include "CStorageController.h"
+#include "CMediumAttachment.h"
+#include "CNetworkAdapter.h"
+#include "CUSBController.h"
+#include "CUSBDeviceFilters.h"
+#include "CUSBDevice.h"
+#include "CSharedFolder.h"
+#include "CVRDEServer.h"
 
 /* Other VBox includes: */
-# include <iprt/time.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/time.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.cpp	(revision 76606)
@@ -31,61 +31,51 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QKeyEvent>
-# include <QTimer>
-# ifdef VBOX_WS_X11
-#  include <QX11Info>
-# endif
+#include <QKeyEvent>
+#include <QTimer>
+#ifdef VBOX_WS_X11
+# include <QX11Info>
+#endif
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UIPopupCenter.h"
-# include "UIActionPool.h"
-# include "UISession.h"
-# include "UIMachineLogic.h"
-# include "UIMachineWindow.h"
-# include "UIMachineView.h"
-# include "UIHostComboEditor.h"
-# include "UIKeyboardHandlerNormal.h"
-# include "UIKeyboardHandlerFullscreen.h"
-# include "UIKeyboardHandlerSeamless.h"
-# include "UIKeyboardHandlerScale.h"
-# include "UIMouseHandler.h"
-# ifdef VBOX_WS_MAC
-#  include "UICocoaApplication.h"
-#  include "VBoxUtils-darwin.h"
-# endif /* VBOX_WS_MAC */
-
-/* COM includes: */
-# include "CKeyboard.h"
-
-/* Other VBox includes: */
-# ifdef VBOX_WS_MAC
-#  include "iprt/cpp/utils.h"
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* GUI includes: */
+#include "VBoxGlobal.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
+#include "UIActionPool.h"
+#include "UISession.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMachineView.h"
+#include "UIHostComboEditor.h"
+#include "UIKeyboardHandlerNormal.h"
+#include "UIKeyboardHandlerFullscreen.h"
+#include "UIKeyboardHandlerSeamless.h"
+#include "UIKeyboardHandlerScale.h"
+#include "UIMouseHandler.h"
 #ifdef VBOX_WS_MAC
+# include "UICocoaApplication.h"
+# include "VBoxUtils-darwin.h"
 # include "DarwinKeyboard.h"
-#endif /* VBOX_WS_MAC */
+#endif
 #ifdef VBOX_WS_WIN
 # include "WinKeyboard.h"
-#endif /* VBOX_WS_WIN */
+#endif
 #ifdef VBOX_WS_X11
 # include "XKeyboard.h"
-#endif /* VBOX_WS_X11 */
+#endif
+
+/* COM includes: */
+#include "CKeyboard.h"
+
+/* Other VBox includes: */
+#ifdef VBOX_WS_MAC
+# include "iprt/cpp/utils.h"
+#endif
 
 /* External includes: */
 #ifdef VBOX_WS_MAC
 # include <Carbon/Carbon.h>
-#endif /* VBOX_WS_MAC */
+#endif
 #ifdef VBOX_WS_X11
 # include <X11/XKBlib.h>
@@ -110,5 +100,5 @@
 
 #ifdef VBOX_WS_WIN
-UIKeyboardHandler* UIKeyboardHandler::m_spKeyboardHandler = 0;
+UIKeyboardHandler *UIKeyboardHandler::m_spKeyboardHandler = 0;
 #endif /* VBOX_WS_WIN */
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp	(revision 76606)
@@ -16,29 +16,24 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIExtraDataManager.h"
-# include "UIMachine.h"
-# include "UISession.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogic.h"
-# include "UIMachineWindow.h"
-# include "UIMessageCenter.h"
+#include "VBoxGlobal.h"
+#include "UIExtraDataManager.h"
+#include "UIMachine.h"
+#include "UISession.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMessageCenter.h"
 
 /* COM includes: */
-# include "CMachine.h"
-# include "CSession.h"
-# include "CConsole.h"
-# include "CSnapshot.h"
-# include "CProgress.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMachine.h"
+#include "CSession.h"
+#include "CConsole.h"
+#include "CSnapshot.h"
+#include "CProgress.h"
+
 
 /* static */
-UIMachine* UIMachine::m_spInstance = 0;
+UIMachine *UIMachine::m_spInstance = 0;
 
 /* static */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	(revision 76606)
@@ -16,107 +16,100 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QFileInfo>
-# include <QPainter>
-# include <QTimer>
-# include <QDateTime>
-# include <QImageWriter>
-# ifdef VBOX_WS_MAC
-#  include <QMenuBar>
-# endif /* VBOX_WS_MAC */
-# ifdef VBOX_WS_X11
-#  include <QX11Info>
-# endif /* VBOX_WS_X11 */
+#include <QDir>
+#include <QFileInfo>
+#include <QPainter>
+#include <QTimer>
+#include <QDateTime>
+#include <QImageWriter>
+#ifdef VBOX_WS_MAC
+# include <QMenuBar>
+#endif /* VBOX_WS_MAC */
+#ifdef VBOX_WS_X11
+# include <QX11Info>
+#endif /* VBOX_WS_X11 */
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "UIActionPoolRuntime.h"
-# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-#  include "UINetworkManager.h"
-#  include "UIDownloaderAdditions.h"
-# endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-# include "UIHostComboEditor.h"
-# include "UIIconPool.h"
-# include "UIKeyboardHandler.h"
-# include "UIMouseHandler.h"
-# include "UIMachineLogic.h"
-# include "UIMachineLogicFullscreen.h"
-# include "UIMachineLogicNormal.h"
-# include "UIMachineLogicSeamless.h"
-# include "UIMachineLogicScale.h"
-# include "UIFrameBuffer.h"
-# include "UIMachineView.h"
-# include "UIMachineWindow.h"
-# include "UISession.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIPopupCenter.h"
-# include "UISettingsDialogSpecific.h"
-# include "UITakeSnapshotDialog.h"
-# include "UIVMLogViewerDialog.h"
-# include "UIConverter.h"
-# include "UIModalWindowManager.h"
-# include "UIMedium.h"
+#include "QIFileDialog.h"
+#include "UIActionPoolRuntime.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManager.h"
+# include "UIDownloaderAdditions.h"
+#endif
+#include "UIHostComboEditor.h"
+#include "UIIconPool.h"
+#include "UIKeyboardHandler.h"
+#include "UIMouseHandler.h"
+#include "UIMachineLogic.h"
+#include "UIMachineLogicFullscreen.h"
+#include "UIMachineLogicNormal.h"
+#include "UIMachineLogicSeamless.h"
+#include "UIMachineLogicScale.h"
+#include "UIFrameBuffer.h"
+#include "UIMachineView.h"
+#include "UIMachineWindow.h"
+#include "UISession.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
+#include "UISettingsDialogSpecific.h"
+#include "UITakeSnapshotDialog.h"
+#include "UIVMLogViewerDialog.h"
+#include "UIConverter.h"
+#include "UIModalWindowManager.h"
+#include "UIMedium.h"
+#include "UIExtraDataManager.h"
+#include "UIAddDiskEncryptionPasswordDialog.h"
+#include "UIVMInformationDialog.h"
+#include "UIFileManagerDialog.h"
+#include "UIGuestProcessControlDialog.h"
+#ifdef VBOX_WS_MAC
+# include "DockIconPreview.h"
 # include "UIExtraDataManager.h"
-# include "UIAddDiskEncryptionPasswordDialog.h"
-# include "UIVMInformationDialog.h"
-# include "UIFileManagerDialog.h"
-# include "UIGuestProcessControlDialog.h"
-
-
-# ifdef VBOX_WS_MAC
-#  include "DockIconPreview.h"
-#  include "UIExtraDataManager.h"
-# endif /* VBOX_WS_MAC */
+#endif
 
 /* COM includes: */
-# include "CAudioAdapter.h"
-# include "CRecordingSettings.h"
-# include "CVirtualBoxErrorInfo.h"
-# include "CMachineDebugger.h"
-# include "CSnapshot.h"
-# include "CDisplay.h"
-# include "CStorageController.h"
-# include "CMediumAttachment.h"
-# include "CHostUSBDevice.h"
-# include "CUSBDevice.h"
-# include "CVRDEServer.h"
-# include "CSystemProperties.h"
-# include "CHostVideoInputDevice.h"
-# include "CEmulatedUSB.h"
-# include "CNetworkAdapter.h"
-# ifdef VBOX_WS_MAC
-#  include "CGuest.h"
-# endif /* VBOX_WS_MAC */
+#include "CAudioAdapter.h"
+#include "CRecordingSettings.h"
+#include "CVirtualBoxErrorInfo.h"
+#include "CMachineDebugger.h"
+#include "CSnapshot.h"
+#include "CDisplay.h"
+#include "CStorageController.h"
+#include "CMediumAttachment.h"
+#include "CHostUSBDevice.h"
+#include "CUSBDevice.h"
+#include "CVRDEServer.h"
+#include "CSystemProperties.h"
+#include "CHostVideoInputDevice.h"
+#include "CEmulatedUSB.h"
+#include "CNetworkAdapter.h"
+#ifdef VBOX_WS_MAC
+# include "CGuest.h"
+#endif
 
 /* Other VBox includes: */
-# include <iprt/path.h>
-# include <iprt/thread.h>
-# ifdef VBOX_WITH_DEBUGGER_GUI
-#  include <VBox/dbggui.h>
-#  include <iprt/ldr.h>
-# endif /* VBOX_WITH_DEBUGGER_GUI */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/path.h>
+#include <iprt/thread.h>
+#ifdef VBOX_WITH_DEBUGGER_GUI
+# include <VBox/dbggui.h>
+# include <iprt/ldr.h>
+#endif
 
 /* VirtualBox interface declarations: */
 #include <VBox/com/VirtualBox.h>
 
+/* External / Other VBox includes: */
 #ifdef VBOX_WS_MAC
 # include "DarwinKeyboard.h"
-#endif /* VBOX_WS_MAC */
+#endif
 #ifdef VBOX_WS_WIN
 # include "WinKeyboard.h"
-#endif /* VBOX_WS_WIN */
+#endif
 #ifdef VBOX_WS_X11
 # include <XKeyboard.h>
-#endif /* VBOX_WS_X11 */
-
-#define VBOX_WITH_REWORKED_SESSION_INFORMATION /* Define for reworked session-information window: */
+#endif
+
+#define VBOX_WITH_REWORKED_SESSION_INFORMATION /**< Define for reworked session-information window.  @todo r-bird: What's this for? */
 
 struct USBTarget
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp	(revision 76606)
@@ -16,75 +16,57 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMainWindow>
-# include <QPainter>
-# include <QScrollBar>
-# include <QTimer>
+#include <QMainWindow>
+#include <QPainter>
+#include <QScrollBar>
+#include <QTimer>
+#include <QAbstractNativeEventFilter>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIActionPoolRuntime.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UISession.h"
-# include "UIMachineLogic.h"
-# include "UIMachineWindow.h"
-# include "UIMachineViewNormal.h"
-# include "UIMachineViewFullscreen.h"
-# include "UIMachineViewSeamless.h"
-# include "UIMachineViewScale.h"
-# include "UIKeyboardHandler.h"
-# include "UIMouseHandler.h"
-# include "UIFrameBuffer.h"
-# include "VBoxFBOverlay.h"
-# ifdef VBOX_WS_MAC
-#  include "UICocoaApplication.h"
-# endif /* VBOX_WS_MAC */
-# ifdef VBOX_WITH_DRAG_AND_DROP
-#  include "UIDnDHandler.h"
-# endif /* VBOX_WITH_DRAG_AND_DROP */
-
-/* VirtualBox interface declarations: */
-# include <VBox/com/VirtualBox.h>
-
-/* COM includes: */
-# include "CConsole.h"
-# include "CDisplay.h"
-# include "CSession.h"
-# ifdef VBOX_WITH_DRAG_AND_DROP
-#  include "CDnDSource.h"
-#  include "CDnDTarget.h"
-#  include "CGuest.h"
-# endif /* VBOX_WITH_DRAG_AND_DROP */
-
-/* Other VBox includes: */
-# include <iprt/asm.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* Qt includes: */
-# include <QAbstractNativeEventFilter>
-
-/* GUI includes: */
+#include "VBoxGlobal.h"
+#include "UIActionPoolRuntime.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UISession.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMachineViewNormal.h"
+#include "UIMachineViewFullscreen.h"
+#include "UIMachineViewSeamless.h"
+#include "UIMachineViewScale.h"
+#include "UIKeyboardHandler.h"
+#include "UIMouseHandler.h"
+#include "UIFrameBuffer.h"
+#include "VBoxFBOverlay.h"
 #ifdef VBOX_WS_MAC
+# include "UICocoaApplication.h"
 # include "DarwinKeyboard.h"
 # include "DockIconPreview.h"
-#endif /* VBOX_WS_MAC */
+#endif
+#ifdef VBOX_WITH_DRAG_AND_DROP
+# include "UIDnDHandler.h"
+#endif
+
+/* VirtualBox interface declarations: */
+#include <VBox/com/VirtualBox.h>
 
 /* COM includes: */
+#include "CConsole.h"
+#include "CDisplay.h"
+#include "CSession.h"
 #include "CFramebuffer.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP
+# include "CDnDSource.h"
+# include "CDnDTarget.h"
+# include "CGuest.h"
 # include "CGuestDnDSource.h"
 # include "CGuestDnDTarget.h"
-#endif /* VBOX_WITH_DRAG_AND_DROP */
+#endif
 
 /* Other VBox includes: */
 #include <VBox/VBoxOGL.h>
 #include <VBoxVideo.h>
+#include <iprt/asm.h>
 #include <iprt/errcore.h>
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp	(revision 76606)
@@ -16,45 +16,39 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCloseEvent>
-# include <QGridLayout>
-# include <QProcess>
-# include <QStyle>
-# include <QTimer>
+#include <QCloseEvent>
+#include <QGridLayout>
+#include <QProcess>
+#include <QStyle>
+#include <QTimer>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIConverter.h"
-# include "UIModalWindowManager.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UISession.h"
-# include "UIMachineLogic.h"
-# include "UIMachineWindow.h"
-# include "UIMachineWindowNormal.h"
-# include "UIMachineWindowFullscreen.h"
-# include "UIMachineWindowSeamless.h"
-# include "UIMachineWindowScale.h"
-# include "UIMachineView.h"
-# include "UIKeyboardHandler.h"
-# include "UIMouseHandler.h"
-# include "UIVMCloseDialog.h"
-# include "VBox2DHelpers.h"
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
+#include "UIModalWindowManager.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UISession.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMachineWindowNormal.h"
+#include "UIMachineWindowFullscreen.h"
+#include "UIMachineWindowSeamless.h"
+#include "UIMachineWindowScale.h"
+#include "UIMachineView.h"
+#include "UIKeyboardHandler.h"
+#include "UIMouseHandler.h"
+#include "UIVMCloseDialog.h"
+#include "VBox2DHelpers.h"
 
 /* COM includes: */
-# include "CConsole.h"
-# include "CSnapshot.h"
+#include "CConsole.h"
+#include "CSnapshot.h"
 
 /* Other VBox includes: */
-# include <VBox/version.h>
-# ifdef VBOX_BLEEDING_EDGE
-#  include <iprt/buildconfig.h>
-# endif /* VBOX_BLEEDING_EDGE */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <VBox/version.h>
+#ifdef VBOX_BLEEDING_EDGE
+# include <iprt/buildconfig.h>
+#endif /* VBOX_BLEEDING_EDGE */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.cpp	(revision 76606)
@@ -16,53 +16,39 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMouseEvent>
-# include <QTimer>
-# ifdef VBOX_WS_X11
-#  include <QX11Info>
-# endif
+#include <QMouseEvent>
+#include <QTimer>
+#include <QTouchEvent>
+#ifdef VBOX_WS_X11
+# include <QX11Info>
+#endif
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UIPopupCenter.h"
-# include "UISession.h"
-# include "UIMachineLogic.h"
-# include "UIMachineWindow.h"
-# include "UIMachineView.h"
-# include "UIKeyboardHandler.h"
-# include "UIMouseHandler.h"
-# include "UIFrameBuffer.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif /* VBOX_WS_MAC */
-# ifdef VBOX_WS_WIN
-#  include "VBoxUtils-win.h"
-# endif /* VBOX_WS_WIN */
-
-/* COM includes: */
-# include "CDisplay.h"
-
-/* Other VBox includes: */
-# include <iprt/time.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* Qt includes: */
-#include <QTouchEvent>
-
-/* GUI includes: */
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
+#include "UISession.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMachineView.h"
+#include "UIKeyboardHandler.h"
+#include "UIMouseHandler.h"
+#include "UIFrameBuffer.h"
 #ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
 # include "CocoaEventHelper.h"
 #endif
+#ifdef VBOX_WS_WIN
+# include "VBoxUtils-win.h"
+#endif
 
 /* COM includes: */
+#include "CDisplay.h"
 #include "CMouse.h"
+
+/* Other VBox includes: */
+#include <iprt/time.h>
 
 /* External includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp	(revision 76606)
@@ -16,32 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QMenu>
+#include <QApplication>
+#include <QMenu>
 
 /* GUI includes: */
-# include "UIDefs.h"
-# include "UIMultiScreenLayout.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogic.h"
-# include "UIFrameBuffer.h"
-# include "UISession.h"
-# include "UIMessageCenter.h"
-# include "UIExtraDataManager.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "VBoxGlobal.h"
+#include "UIDefs.h"
+#include "UIMultiScreenLayout.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogic.h"
+#include "UIFrameBuffer.h"
+#include "UISession.h"
+#include "UIMessageCenter.h"
+#include "UIExtraDataManager.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CSession.h"
-# include "CConsole.h"
-# include "CMachine.h"
-# include "CDisplay.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "COMEnums.h"
+#include "CSession.h"
+#include "CConsole.h"
+#include "CMachine.h"
+#include "CDisplay.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp	(revision 76606)
@@ -16,73 +16,67 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QBitmap>
-# include <QMenuBar>
-# include <QWidget>
-# ifdef VBOX_WS_MAC
-#  include <QTimer>
-# endif /* VBOX_WS_MAC */
-
-/* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UISession.h"
-# include "UIMachine.h"
-# include "UIMedium.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogic.h"
-# include "UIMachineView.h"
-# include "UIMachineWindow.h"
-# include "UIMessageCenter.h"
-# include "UIPopupCenter.h"
-# include "UIWizardFirstRun.h"
-# include "UIConsoleEventHandler.h"
-# include "UIFrameBuffer.h"
-# include "UISettingsDialogSpecific.h"
-# ifdef VBOX_WITH_VIDEOHWACCEL
-#  include "VBox2DHelpers.h"
-# endif /* VBOX_WITH_VIDEOHWACCEL */
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif /* VBOX_WS_MAC */
-
-# ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
-#  include "UIKeyboardHandler.h"
-#  include <signal.h>
-# endif /* VBOX_GUI_WITH_KEYS_RESET_HANDLER */
-
-/* COM includes: */
-# include "CAudioAdapter.h"
-# include "CRecordingSettings.h"
-# include "CSystemProperties.h"
-# include "CStorageController.h"
-# include "CMediumAttachment.h"
-# include "CNetworkAdapter.h"
-# include "CHostNetworkInterface.h"
-# include "CVRDEServer.h"
-# include "CUSBController.h"
-# include "CUSBDeviceFilters.h"
-# include "CHostVideoInputDevice.h"
-# include "CSnapshot.h"
-# include "CMedium.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* Qt includes: */
+#include <QApplication>
+#include <QBitmap>
+#include <QMenuBar>
+#include <QWidget>
+#ifdef VBOX_WS_MAC
+# include <QTimer>
+#endif
 #ifdef VBOX_WS_WIN
 # include <QtWin>
-#endif /* VBOX_WS_WIN */
-
+#endif
 #ifdef VBOX_WS_X11
 # include <QX11Info>
+#endif
+
+/* GUI includes: */
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UISession.h"
+#include "UIMachine.h"
+#include "UIMedium.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogic.h"
+#include "UIMachineView.h"
+#include "UIMachineWindow.h"
+#include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
+#include "UIWizardFirstRun.h"
+#include "UIConsoleEventHandler.h"
+#include "UIFrameBuffer.h"
+#include "UISettingsDialogSpecific.h"
+#ifdef VBOX_WITH_VIDEOHWACCEL
+# include "VBox2DHelpers.h"
+#endif
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
+#ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
+# include "UIKeyboardHandler.h"
+# include <signal.h>
+#endif
+
+/* COM includes: */
+#include "CAudioAdapter.h"
+#include "CRecordingSettings.h"
+#include "CSystemProperties.h"
+#include "CStorageController.h"
+#include "CMediumAttachment.h"
+#include "CNetworkAdapter.h"
+#include "CHostNetworkInterface.h"
+#include "CVRDEServer.h"
+#include "CUSBController.h"
+#include "CUSBDeviceFilters.h"
+#include "CHostVideoInputDevice.h"
+#include "CSnapshot.h"
+#include "CMedium.h"
+
+/* External includes: */
+#ifdef VBOX_WS_X11
 # include <X11/Xlib.h>
 # include <X11/Xutil.h>
-#endif /* VBOX_WS_X11 */
+#endif
 
 #ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp	(revision 76606)
@@ -16,34 +16,28 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QGridLayout>
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QPushButton>
-# include <QRadioButton>
-# include <QStyle>
-# include <QVBoxLayout>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QStyle>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIIconPool.h"
-# include "UIVMCloseDialog.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UIConverter.h"
-# include "VBoxGlobal.h"
-# include "QIDialogButtonBox.h"
+#include "UIIconPool.h"
+#include "UIVMCloseDialog.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UIConverter.h"
+#include "VBoxGlobal.h"
+#include "QIDialogButtonBox.h"
 
 /* COM includes: */
-# include "CMachine.h"
-# include "CSession.h"
-# include "CConsole.h"
-# include "CSnapshot.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMachine.h"
+#include "CSession.h"
+#include "CConsole.h"
+#include "CSnapshot.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIKeyboardHandlerFullscreen.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QKeyEvent>
-# include <QTimer>
+#include <QKeyEvent>
+#include <QTimer>
 
 /* GUI includes: */
-# include "UIKeyboardHandlerFullscreen.h"
-# include "UIMachineLogic.h"
-# include "UIShortcutPool.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIKeyboardHandlerFullscreen.h"
+#include "UIMachineLogic.h"
+#include "UIShortcutPool.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp	(revision 76606)
@@ -16,32 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QTimer>
+#include <QTimer>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIMessageCenter.h"
-# include "UISession.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogicFullscreen.h"
-# include "UIMachineWindowFullscreen.h"
-# include "UIMultiScreenLayout.h"
-# include "UIShortcutPool.h"
-# include "UIMachineView.h"
-# include "QIMenu.h"
-# ifdef VBOX_WS_MAC
-#  include "UICocoaApplication.h"
-#  include "UIExtraDataManager.h"
-#  include "VBoxUtils.h"
-#  include "UIFrameBuffer.h"
-#  include <Carbon/Carbon.h>
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIMessageCenter.h"
+#include "UISession.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogicFullscreen.h"
+#include "UIMachineWindowFullscreen.h"
+#include "UIMultiScreenLayout.h"
+#include "UIShortcutPool.h"
+#include "UIMachineView.h"
+#include "QIMenu.h"
+#ifdef VBOX_WS_MAC
+# include "UICocoaApplication.h"
+# include "UIExtraDataManager.h"
+# include "VBoxUtils.h"
+# include "UIFrameBuffer.h"
+# include <Carbon/Carbon.h>
+#endif /* VBOX_WS_MAC */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp	(revision 76606)
@@ -16,31 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QMainWindow>
-# include <QTimer>
-# ifdef VBOX_WS_MAC
-#  include <QMenuBar>
-# endif /* VBOX_WS_MAC */
+#include <QApplication>
+#include <QMainWindow>
+#include <QTimer>
+#ifdef VBOX_WS_MAC
+# include <QMenuBar>
+#endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
-# include "UISession.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogicFullscreen.h"
-# include "UIMachineWindow.h"
-# include "UIMachineViewFullscreen.h"
-# include "UIFrameBuffer.h"
-# include "UIExtraDataManager.h"
-# include "UIDesktopWidgetWatchdog.h"
+#include "UISession.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogicFullscreen.h"
+#include "UIMachineWindow.h"
+#include "UIMachineViewFullscreen.h"
+#include "UIFrameBuffer.h"
+#include "UIExtraDataManager.h"
+#include "UIDesktopWidgetWatchdog.h"
 
 /* Other VBox includes: */
-# include "VBox/log.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
+#include "VBox/log.h"
+
+/* External includes: */
 #ifdef VBOX_WS_X11
 # include <limits.h>
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp	(revision 76606)
@@ -16,37 +16,31 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMenu>
-# include <QTimer>
-# ifdef VBOX_WS_WIN
-#  include <QWindow>
-# endif
+#include <QMenu>
+#include <QTimer>
+#ifdef VBOX_WS_WIN
+# include <QWindow>
+#endif
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UISession.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogicFullscreen.h"
-# include "UIMachineWindowFullscreen.h"
-# include "UIMachineView.h"
-# if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-#  include "UIMachineDefs.h"
-#  include "UIMiniToolBar.h"
-# elif defined(VBOX_WS_MAC)
-#  include "UIFrameBuffer.h"
-#  include "VBoxUtils-darwin.h"
-#  include "UICocoaApplication.h"
-# endif /* VBOX_WS_MAC */
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UISession.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogicFullscreen.h"
+#include "UIMachineWindowFullscreen.h"
+#include "UIMachineView.h"
+#if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
+# include "UIMachineDefs.h"
+# include "UIMiniToolBar.h"
+#elif defined(VBOX_WS_MAC)
+# include "UIFrameBuffer.h"
+# include "VBoxUtils-darwin.h"
+# include "UICocoaApplication.h"
+#endif /* VBOX_WS_MAC */
 
 /* COM includes: */
-# include "CSnapshot.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSnapshot.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationConfiguration.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationConfiguration.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationConfiguration.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QApplication>
+#include <QVBoxLayout>
+#include <QApplication>
 
 /* GUI includes: */
-# include "UIInformationConfiguration.h"
-# include "UIInformationDataItem.h"
-# include "UIInformationItem.h"
-# include "UIInformationView.h"
-# include "UIExtraDataManager.h"
-# include "UIInformationModel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIInformationConfiguration.h"
+#include "UIInformationDataItem.h"
+#include "UIInformationItem.h"
+#include "UIInformationView.h"
+#include "UIExtraDataManager.h"
+#include "UIInformationModel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationDataItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationDataItem.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationDataItem.cpp	(revision 76606)
@@ -16,37 +16,31 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QTimer>
+#include <QDir>
+#include <QTimer>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIMachine.h"
-# include "UISession.h"
-# include "UIConverter.h"
-# include "UIInformationItem.h"
-# include "UIInformationModel.h"
-# include "UIInformationDataItem.h"
+#include "VBoxGlobal.h"
+#include "UIMachine.h"
+#include "UISession.h"
+#include "UIConverter.h"
+#include "UIInformationItem.h"
+#include "UIInformationModel.h"
+#include "UIInformationDataItem.h"
 
 /* COM includes: */
-# include "CMedium.h"
-# include "CSerialPort.h"
-# include "CVRDEServer.h"
-# include "CAudioAdapter.h"
-# include "CSharedFolder.h"
-# include "CUSBController.h"
-# include "CNetworkAdapter.h"
-# include "CVRDEServerInfo.h"
-# include "CUSBDeviceFilter.h"
-# include "CMediumAttachment.h"
-# include "CSystemProperties.h"
-# include "CUSBDeviceFilters.h"
-# include "CStorageController.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMedium.h"
+#include "CSerialPort.h"
+#include "CVRDEServer.h"
+#include "CAudioAdapter.h"
+#include "CSharedFolder.h"
+#include "CUSBController.h"
+#include "CNetworkAdapter.h"
+#include "CVRDEServerInfo.h"
+#include "CUSBDeviceFilter.h"
+#include "CMediumAttachment.h"
+#include "CSystemProperties.h"
+#include "CUSBDeviceFilters.h"
+#include "CStorageController.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationItem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationItem.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationItem.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QPainter>
-# include <QTextDocument>
-# include <QUrl>
+#include <QApplication>
+#include <QPainter>
+#include <QTextDocument>
+#include <QUrl>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIIconPool.h"
-# include "UIInformationItem.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIIconPool.h"
+#include "UIInformationItem.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationModel.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationModel.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationModel.cpp	(revision 76606)
@@ -16,13 +16,7 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIInformationModel.h"
-# include "UIInformationDataItem.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIInformationModel.h"
+#include "UIInformationDataItem.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationRuntime.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QApplication>
+#include <QVBoxLayout>
+#include <QApplication>
 
 /* GUI includes: */
-# include "UIInformationRuntime.h"
-# include "UIInformationDataItem.h"
-# include "UIInformationItem.h"
-# include "UIInformationView.h"
-# include "UIExtraDataManager.h"
-# include "UIInformationModel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIInformationRuntime.h"
+#include "UIInformationDataItem.h"
+#include "UIInformationItem.h"
+#include "UIInformationView.h"
+#include "UIExtraDataManager.h"
+#include "UIInformationModel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationView.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationView.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIInformationView.cpp	(revision 76606)
@@ -16,17 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QClipboard>
-# include <QTextEdit>
+#include <QClipboard>
+#include <QTextEdit>
 
 /* GUI includes: */
-# include "UIInformationView.h"
-# include "UIInformationItem.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIInformationView.h"
+#include "UIInformationItem.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp	(revision 76606)
@@ -16,51 +16,44 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QPushButton>
-# include <QScrollBar>
-# include <QVBoxLayout>
+#include <QPushButton>
+#include <QScrollBar>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIVMInformationDialog.h"
-# include "UIExtraDataManager.h"
-# include "UISession.h"
-# include "UIMachineLogic.h"
-# include "UIMachineWindow.h"
-# include "UIMachineView.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "QITabWidget.h"
-# include "QIDialogButtonBox.h"
-# include "VBoxGlobal.h"
-# include "VBoxUtils.h"
-# include "UIInformationConfiguration.h"
-# include "UIInformationRuntime.h"
-# include "UIMachine.h"
+#include "UIVMInformationDialog.h"
+#include "UIExtraDataManager.h"
+#include "UISession.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMachineView.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "QITabWidget.h"
+#include "QIDialogButtonBox.h"
+#include "VBoxGlobal.h"
+#include "VBoxUtils.h"
+#include "UIInformationConfiguration.h"
+#include "UIInformationRuntime.h"
+#include "UIMachine.h"
 
 /* COM includes: */
-# include "COMEnums.h"
-# include "CMachine.h"
-# include "CConsole.h"
-# include "CSystemProperties.h"
-# include "CMachineDebugger.h"
-# include "CDisplay.h"
-# include "CStorageController.h"
-# include "CMediumAttachment.h"
-# include "CNetworkAdapter.h"
+#include "COMEnums.h"
+#include "CMachine.h"
+#include "CConsole.h"
+#include "CSystemProperties.h"
+#include "CMachineDebugger.h"
+#include "CDisplay.h"
+#include "CStorageController.h"
+#include "CMediumAttachment.h"
+#include "CNetworkAdapter.h"
+#include "CVRDEServerInfo.h"
 
 /* Other VBox includes: */
-# include <iprt/time.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-#include "CVRDEServerInfo.h"
+#include <iprt/time.h>
 
 
 /* static */
-UIVMInformationDialog* UIVMInformationDialog::s_pInstance = 0;
+UIVMInformationDialog *UIVMInformationDialog::s_pInstance = 0;
 
 void UIVMInformationDialog::invoke(UIMachineWindow *pMachineWindow)
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIKeyboardHandlerNormal.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# ifndef VBOX_WS_MAC
-#  include <QMainWindow>
-#  include <QMenuBar>
-#  include <QKeyEvent>
-#  include <QTimer>
-# endif /* !VBOX_WS_MAC */
+#ifndef VBOX_WS_MAC
+# include <QMainWindow>
+# include <QMenuBar>
+# include <QKeyEvent>
+# include <QTimer>
+#endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
-# include "UIKeyboardHandlerNormal.h"
-# ifndef VBOX_WS_MAC
-#  include "UIMachineLogic.h"
-#  include "UIMachineWindow.h"
-#  include "UIShortcutPool.h"
-# endif /* !VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIKeyboardHandlerNormal.h"
+#ifndef VBOX_WS_MAC
+# include "UIMachineLogic.h"
+# include "UIMachineWindow.h"
+# include "UIShortcutPool.h"
+#endif /* !VBOX_WS_MAC */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp	(revision 76606)
@@ -16,36 +16,30 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# ifndef VBOX_WS_MAC
-#  include <QTimer>
-# endif /* !VBOX_WS_MAC */
+#ifndef VBOX_WS_MAC
+# include <QTimer>
+#endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIMessageCenter.h"
-# include "UISession.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogicNormal.h"
-# include "UIMachineWindow.h"
-# include "UIMenuBarEditorWindow.h"
-# include "UIStatusBarEditorWindow.h"
-# include "UIExtraDataManager.h"
-# include "UIFrameBuffer.h"
-# ifndef VBOX_WS_MAC
-#  include "QIMenu.h"
-# else  /* VBOX_WS_MAC */
-#  include "VBoxUtils.h"
-# endif /* VBOX_WS_MAC */
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIMessageCenter.h"
+#include "UISession.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogicNormal.h"
+#include "UIMachineWindow.h"
+#include "UIMenuBarEditorWindow.h"
+#include "UIStatusBarEditorWindow.h"
+#include "UIExtraDataManager.h"
+#include "UIFrameBuffer.h"
+#ifndef VBOX_WS_MAC
+# include "QIMenu.h"
+#else  /* VBOX_WS_MAC */
+# include "VBoxUtils.h"
+#endif /* VBOX_WS_MAC */
 
 /* COM includes: */
-# include "CConsole.h"
-# include "CDisplay.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CConsole.h"
+#include "CDisplay.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QMainWindow>
-# include <QMenuBar>
-# include <QScrollBar>
-# include <QTimer>
+#include <QApplication>
+#include <QMainWindow>
+#include <QMenuBar>
+#include <QScrollBar>
+#include <QTimer>
 
 /* GUI includes: */
-# include "UISession.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogic.h"
-# include "UIMachineWindow.h"
-# include "UIMachineViewNormal.h"
-# include "UIFrameBuffer.h"
-# include "UIExtraDataManager.h"
-# include "UIDesktopWidgetWatchdog.h"
+#include "UISession.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMachineViewNormal.h"
+#include "UIFrameBuffer.h"
+#include "UIExtraDataManager.h"
+#include "UIDesktopWidgetWatchdog.h"
 
 /* Other VBox includes: */
-# include "VBox/log.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBox/log.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp	(revision 76606)
@@ -16,45 +16,39 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMenuBar>
-# include <QTimer>
-# include <QContextMenuEvent>
-# include <QResizeEvent>
-# include <QScrollBar>
+#include <QMenuBar>
+#include <QTimer>
+#include <QContextMenuEvent>
+#include <QResizeEvent>
+#include <QScrollBar>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIMachineWindowNormal.h"
-# include "UIActionPoolRuntime.h"
-# include "UIExtraDataManager.h"
-# include "UIIndicatorsPool.h"
-# include "UIKeyboardHandler.h"
-# include "UIMouseHandler.h"
-# include "UIMachineLogic.h"
-# include "UIMachineView.h"
-# include "UIIconPool.h"
-# include "UISession.h"
-# include "QIStatusBar.h"
-# include "QIStatusBarIndicator.h"
-# ifndef VBOX_WS_MAC
-#  include "UIMenuBar.h"
-# else  /* VBOX_WS_MAC */
-#  include "VBoxUtils.h"
-#  include "UIImageTools.h"
-#  include "UICocoaApplication.h"
-# endif /* VBOX_WS_MAC */
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIMachineWindowNormal.h"
+#include "UIActionPoolRuntime.h"
+#include "UIExtraDataManager.h"
+#include "UIIndicatorsPool.h"
+#include "UIKeyboardHandler.h"
+#include "UIMouseHandler.h"
+#include "UIMachineLogic.h"
+#include "UIMachineView.h"
+#include "UIIconPool.h"
+#include "UISession.h"
+#include "QIStatusBar.h"
+#include "QIStatusBarIndicator.h"
+#ifndef VBOX_WS_MAC
+# include "UIMenuBar.h"
+#else  /* VBOX_WS_MAC */
+# include "VBoxUtils.h"
+# include "UIImageTools.h"
+# include "UICocoaApplication.h"
+#endif /* VBOX_WS_MAC */
 
 /* COM includes: */
-# include "CConsole.h"
-# include "CMediumAttachment.h"
-# include "CUSBController.h"
-# include "CUSBDeviceFilters.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CConsole.h"
+#include "CMediumAttachment.h"
+#include "CUSBController.h"
+#include "CUSBDeviceFilters.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIKeyboardHandlerScale.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# ifndef VBOX_WS_MAC
-#  include <QKeyEvent>
-#  include <QTimer>
-# endif /* !VBOX_WS_MAC */
+#ifndef VBOX_WS_MAC
+# include <QKeyEvent>
+# include <QTimer>
+#endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
-# include "UIKeyboardHandlerScale.h"
-# ifndef VBOX_WS_MAC
-#  include "UIMachineLogic.h"
-#  include "UIShortcutPool.h"
-# endif /* !VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIKeyboardHandlerScale.h"
+#ifndef VBOX_WS_MAC
+# include "UIMachineLogic.h"
+# include "UIShortcutPool.h"
+#endif /* !VBOX_WS_MAC */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# ifndef VBOX_WS_MAC
-#  include <QTimer>
-# endif /* !VBOX_WS_MAC */
+#ifndef VBOX_WS_MAC
+# include <QTimer>
+#endif
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIMessageCenter.h"
-# include "UISession.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogicScale.h"
-# include "UIMachineWindow.h"
-# include "UIShortcutPool.h"
-# ifndef VBOX_WS_MAC
-#  include "QIMenu.h"
-# else  /* VBOX_WS_MAC */
-#  include "VBoxUtils.h"
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIMessageCenter.h"
+#include "UISession.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogicScale.h"
+#include "UIMachineWindow.h"
+#include "UIShortcutPool.h"
+#ifndef VBOX_WS_MAC
+# include "QIMenu.h"
+#else
+# include "VBoxUtils.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp	(revision 76606)
@@ -16,31 +16,25 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMainWindow>
-# include <QTimer>
+#include <QMainWindow>
+#include <QTimer>
 
 /* GUI includes */
-# include "VBoxGlobal.h"
-# include "UISession.h"
-# include "UIMachineLogic.h"
-# include "UIMachineWindow.h"
-# include "UIMachineViewScale.h"
-# include "UIFrameBuffer.h"
-# include "UIExtraDataManager.h"
-# include "UIDesktopWidgetWatchdog.h"
+#include "VBoxGlobal.h"
+#include "UISession.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindow.h"
+#include "UIMachineViewScale.h"
+#include "UIFrameBuffer.h"
+#include "UIExtraDataManager.h"
+#include "UIDesktopWidgetWatchdog.h"
 
 /* COM includes: */
-# include "CConsole.h"
-# include "CDisplay.h"
+#include "CConsole.h"
+#include "CDisplay.h"
 
 /* Other VBox includes: */
-# include "VBox/log.h"
-# include <VBox/VBoxOGL.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBox/log.h"
+#include <VBox/VBoxOGL.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMenu>
-# include <QTimer>
-# include <QSpacerItem>
-# include <QResizeEvent>
+#include <QMenu>
+#include <QTimer>
+#include <QSpacerItem>
+#include <QResizeEvent>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UISession.h"
-# include "UIMachineLogic.h"
-# include "UIMachineWindowScale.h"
-# include "UIMachineView.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils.h"
-#  include "UIImageTools.h"
-#  include "UICocoaApplication.h"
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UISession.h"
+#include "UIMachineLogic.h"
+#include "UIMachineWindowScale.h"
+#include "UIMachineView.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils.h"
+# include "UIImageTools.h"
+# include "UICocoaApplication.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIKeyboardHandlerSeamless.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-# ifndef VBOX_WS_MAC
+#ifndef VBOX_WS_MAC
 /* Qt includes: */
-#  include <QKeyEvent>
-#  include <QTimer>
-# endif /* !VBOX_WS_MAC */
+# include <QKeyEvent>
+# include <QTimer>
+#endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
-# include "UIKeyboardHandlerSeamless.h"
-# ifndef VBOX_WS_MAC
-#  include "UIMachineLogic.h"
-#  include "UIShortcutPool.h"
-# endif /* !VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIKeyboardHandlerSeamless.h"
+#ifndef VBOX_WS_MAC
+# include "UIMachineLogic.h"
+# include "UIShortcutPool.h"
+#endif /* !VBOX_WS_MAC */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineLogicSeamless.cpp	(revision 76606)
@@ -16,30 +16,24 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# ifndef VBOX_WS_MAC
-#  include <QTimer>
-# endif /* !VBOX_WS_MAC */
+#ifndef VBOX_WS_MAC
+# include <QTimer>
+#endif /* !VBOX_WS_MAC */
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIPopupCenter.h"
-# include "UISession.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogicSeamless.h"
-# include "UIMachineWindowSeamless.h"
-# include "UIMultiScreenLayout.h"
-# include "UIShortcutPool.h"
-# ifndef VBOX_WS_MAC
-#  include "QIMenu.h"
-# else  /* VBOX_WS_MAC */
-#  include "VBoxUtils.h"
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
+#include "UIPopupCenter.h"
+#include "UISession.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogicSeamless.h"
+#include "UIMachineWindowSeamless.h"
+#include "UIMultiScreenLayout.h"
+#include "UIShortcutPool.h"
+#ifndef VBOX_WS_MAC
+# include "QIMenu.h"
+#else  /* VBOX_WS_MAC */
+# include "VBoxUtils.h"
+#endif /* VBOX_WS_MAC */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp	(revision 76606)
@@ -16,33 +16,27 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QMainWindow>
-# include <QTimer>
-# ifdef VBOX_WS_MAC
-#  include <QMenuBar>
-# endif /* VBOX_WS_MAC */
+#include <QApplication>
+#include <QMainWindow>
+#include <QTimer>
+#ifdef VBOX_WS_MAC
+# include <QMenuBar>
+#endif /* VBOX_WS_MAC */
 
 /* GUI includes: */
-# include "UISession.h"
-# include "UIMachineLogicSeamless.h"
-# include "UIMachineWindow.h"
-# include "UIMachineViewSeamless.h"
-# include "UIFrameBuffer.h"
-# include "UIExtraDataManager.h"
-# include "UIDesktopWidgetWatchdog.h"
+#include "UISession.h"
+#include "UIMachineLogicSeamless.h"
+#include "UIMachineWindow.h"
+#include "UIMachineViewSeamless.h"
+#include "UIFrameBuffer.h"
+#include "UIExtraDataManager.h"
+#include "UIDesktopWidgetWatchdog.h"
 
 /* COM includes: */
-# include "CConsole.h"
-# include "CDisplay.h"
+#include "CConsole.h"
+#include "CDisplay.h"
 
 /* Other VBox includes: */
-# include "VBox/log.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBox/log.h"
 
 /* External includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp	(revision 76606)
@@ -16,33 +16,27 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QMenu>
-# include <QSpacerItem>
-# include <QTimer>
+#include <QMenu>
+#include <QSpacerItem>
+#include <QTimer>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UISession.h"
-# include "UIActionPoolRuntime.h"
-# include "UIMachineLogicSeamless.h"
-# include "UIMachineWindowSeamless.h"
-# include "UIMachineView.h"
-# if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-#  include "UIMachineDefs.h"
-#  include "UIMiniToolBar.h"
-# elif defined(VBOX_WS_MAC)
-#  include "VBoxUtils.h"
-# endif /* VBOX_WS_MAC */
+#include "VBoxGlobal.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UISession.h"
+#include "UIActionPoolRuntime.h"
+#include "UIMachineLogicSeamless.h"
+#include "UIMachineWindowSeamless.h"
+#include "UIMachineView.h"
+#if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
+# include "UIMachineDefs.h"
+# include "UIMiniToolBar.h"
+#elif defined(VBOX_WS_MAC)
+# include "VBoxUtils.h"
+#endif /* VBOX_WS_MAC */
 
 /* COM includes: */
-# include "CSnapshot.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSnapshot.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp	(revision 76606)
@@ -16,12 +16,6 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UISettingsDefs.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UISettingsDefs.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp	(revision 76606)
@@ -16,34 +16,28 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCloseEvent>
-# include <QProgressBar>
-# include <QPushButton>
-# include <QStackedWidget>
-# include <QTimer>
+#include <QCloseEvent>
+#include <QProgressBar>
+#include <QPushButton>
+#include <QStackedWidget>
+#include <QTimer>
 
 /* GUI includes: */
-# include "QIWidgetValidator.h"
-# include "VBoxGlobal.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UIPopupCenter.h"
-# include "UISettingsDialog.h"
-# include "UISettingsPage.h"
-# include "UISettingsSelector.h"
-# include "UISettingsSerializer.h"
-# include "UIToolBar.h"
-# include "UIWarningPane.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIWidgetValidator.h"
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UIPopupCenter.h"
+#include "UISettingsDialog.h"
+#include "UISettingsPage.h"
+#include "UISettingsSelector.h"
+#include "UISettingsSerializer.h"
+#include "UIToolBar.h"
+#include "UIWarningPane.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils.h"
+#endif
 
 #ifdef VBOX_WS_MAC
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	(revision 76606)
@@ -16,47 +16,41 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "QIWidgetValidator.h"
-# include "VBoxGlobal.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "UISettingsDefs.h"
-# include "UISettingsDialogSpecific.h"
-# include "UISettingsSerializer.h"
-# include "UISettingsSelector.h"
-# include "UIVirtualBoxEventHandler.h"
+#include "QIWidgetValidator.h"
+#include "VBoxGlobal.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "UISettingsDefs.h"
+#include "UISettingsDialogSpecific.h"
+#include "UISettingsSerializer.h"
+#include "UISettingsSelector.h"
+#include "UIVirtualBoxEventHandler.h"
 
 /* GUI includes: Global Preferences: */
-# include "UIGlobalSettingsDisplay.h"
-# include "UIGlobalSettingsExtension.h"
-# include "UIGlobalSettingsGeneral.h"
-# include "UIGlobalSettingsInput.h"
-# include "UIGlobalSettingsLanguage.h"
-# include "UIGlobalSettingsNetwork.h"
-# ifdef VBOX_GUI_WITH_NETWORK_MANAGER
-#  include "UIGlobalSettingsProxy.h"
-#  include "UIGlobalSettingsUpdate.h"
-# endif
+#include "UIGlobalSettingsDisplay.h"
+#include "UIGlobalSettingsExtension.h"
+#include "UIGlobalSettingsGeneral.h"
+#include "UIGlobalSettingsInput.h"
+#include "UIGlobalSettingsLanguage.h"
+#include "UIGlobalSettingsNetwork.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UIGlobalSettingsProxy.h"
+# include "UIGlobalSettingsUpdate.h"
+#endif
 
 /* GUI includes: Machine Settings: */
-# include "UIMachineSettingsAudio.h"
-# include "UIMachineSettingsDisplay.h"
-# include "UIMachineSettingsGeneral.h"
-# include "UIMachineSettingsInterface.h"
-# include "UIMachineSettingsNetwork.h"
-# include "UIMachineSettingsSerial.h"
-# include "UIMachineSettingsSF.h"
-# include "UIMachineSettingsStorage.h"
-# include "UIMachineSettingsSystem.h"
-# include "UIMachineSettingsUSB.h"
+#include "UIMachineSettingsAudio.h"
+#include "UIMachineSettingsDisplay.h"
+#include "UIMachineSettingsGeneral.h"
+#include "UIMachineSettingsInterface.h"
+#include "UIMachineSettingsNetwork.h"
+#include "UIMachineSettingsSerial.h"
+#include "UIMachineSettingsSF.h"
+#include "UIMachineSettingsStorage.h"
+#include "UIMachineSettingsSystem.h"
+#include "UIMachineSettingsUSB.h"
 
 /* COM includes: */
-# include "CUSBController.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CUSBController.h"
 
 #ifdef VBOX_WS_MAC
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.cpp	(revision 76606)
@@ -16,14 +16,8 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIConverter.h"
-# include "UISettingsPage.h"
-# include "QIWidgetValidator.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIConverter.h"
+#include "UISettingsPage.h"
+#include "QIWidgetValidator.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSelector.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QAction>
-# include <QHeaderView>
-# include <QLayout>
-# include <QTabWidget>
-# include <QToolButton>
+#include <QAccessibleWidget>
+#include <QAction>
+#include <QHeaderView>
+#include <QLayout>
+#include <QTabWidget>
+#include <QToolButton>
 
 /* GUI includes: */
-# include "QITabWidget.h"
-# include "QITreeWidget.h"
-# include "UISettingsSelector.h"
-# include "UIIconPool.h"
-# include "UISettingsPage.h"
-# include "UIToolBar.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QITabWidget.h"
+#include "QITreeWidget.h"
+#include "UISettingsSelector.h"
+#include "UIIconPool.h"
+#include "UISettingsPage.h"
+#include "UIToolBar.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QProgressBar>
-# include <QTimer>
-# include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QProgressBar>
+#include <QTimer>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QILabel.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "UISettingsPage.h"
-# include "UISettingsSerializer.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QILabel.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "UISettingsPage.h"
+#include "UISettingsSerializer.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsDisplay.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIGlobalSettingsDisplay.h"
-# include "UIMessageCenter.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIGlobalSettingsDisplay.h"
+#include "UIMessageCenter.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp	(revision 76606)
@@ -16,27 +16,21 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHeaderView>
-# include <QMenu>
-# ifdef VBOX_WS_WIN
-#  include <QTextStream>
-# endif
+#include <QHeaderView>
+#include <QMenu>
+#ifdef VBOX_WS_WIN
+# include <QTextStream>
+#endif
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "VBoxGlobal.h"
-# include "UIGlobalSettingsExtension.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
+#include "QIFileDialog.h"
+#include "VBoxGlobal.h"
+#include "UIGlobalSettingsExtension.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
 
 /* COM includes: */
-# include "CExtPack.h"
-# include "CExtPackManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CExtPack.h"
+#include "CExtPackManager.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
+#include <QDir>
 
 /* GUI includes: */
-# include "UIGlobalSettingsGeneral.h"
-# include "UIExtraDataManager.h"
-# include "UIErrorString.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGlobalSettingsGeneral.h"
+#include "UIExtraDataManager.h"
+#include "UIErrorString.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp	(revision 76606)
@@ -16,31 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAbstractItemDelegate>
-# include <QHeaderView>
-# include <QItemEditorFactory>
-# include <QTabWidget>
+#include <QAbstractItemDelegate>
+#include <QHeaderView>
+#include <QItemEditorFactory>
+#include <QTabWidget>
 
 /* GUI includes: */
-# include "QIStyledItemDelegate.h"
-# include "QITableView.h"
-# include "QIWidgetValidator.h"
-# include "VBoxGlobal.h"
-# include "UIActionPool.h"
-# include "UIGlobalSettingsInput.h"
-# include "UIHostComboEditor.h"
-# include "UIHotKeyEditor.h"
-# include "UIShortcutPool.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIStyledItemDelegate.h"
+#include "QITableView.h"
+#include "QIWidgetValidator.h"
+#include "VBoxGlobal.h"
+#include "UIActionPool.h"
+#include "UIGlobalSettingsInput.h"
+#include "UIHostComboEditor.h"
+#include "UIHotKeyEditor.h"
+#include "UIShortcutPool.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
 
 /* Qt includes: */
 #include <QShortcut>
+
 
 /* Namespaces: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp	(revision 76606)
@@ -16,29 +16,21 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QHeaderView>
-# include <QPainter>
-# include <QTranslator>
+#include <QDir>
+#include <QHeaderView>
+#include <QPainter>
+#include <QTranslator>
 
 /* GUI includes: */
-# include "UIGlobalSettingsLanguage.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "VBoxGlobal.h"
-
-/* Other VBox includes: */
-# include <iprt/param.h>
-# include <iprt/path.h>
-# include <VBox/version.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGlobalSettingsLanguage.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "VBoxGlobal.h"
 
 /* Other VBox includes: */
 #include <iprt/errcore.h>
+#include <iprt/param.h>
+#include <iprt/path.h>
+#include <VBox/version.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.cpp	(revision 76606)
@@ -16,30 +16,24 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHeaderView>
-# include <QMenu>
+#include <QHeaderView>
+#include <QMenu>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIIconPool.h"
-# include "UIConverter.h"
-# include "UIErrorString.h"
-# include "UIMessageCenter.h"
-# include "UIGlobalSettingsNetwork.h"
-# include "UIGlobalSettingsNetworkDetailsNAT.h"
+#include "VBoxGlobal.h"
+#include "UIIconPool.h"
+#include "UIConverter.h"
+#include "UIErrorString.h"
+#include "UIMessageCenter.h"
+#include "UIGlobalSettingsNetwork.h"
+#include "UIGlobalSettingsNetworkDetailsNAT.h"
 
 /* COM includes: */
-# include "CDHCPServer.h"
-# include "CNATNetwork.h"
-# include "CHostNetworkInterface.h"
+#include "CDHCPServer.h"
+#include "CNATNetwork.h"
+#include "CHostNetworkInterface.h"
 
 /* Other VBox includes: */
-# include <iprt/cidr.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/cidr.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetworkDetailsNAT.cpp	(revision 76606)
@@ -16,17 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QRegExpValidator>
+#include <QRegExpValidator>
 
 /* GUI includes: */
-# include "UIGlobalSettingsNetwork.h"
-# include "UIGlobalSettingsNetworkDetailsNAT.h"
-# include "UIGlobalSettingsPortForwardingDlg.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGlobalSettingsNetwork.h"
+#include "UIGlobalSettingsNetworkDetailsNAT.h"
+#include "UIGlobalSettingsPortForwardingDlg.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QPushButton>
-# include <QTabWidget>
+#include <QVBoxLayout>
+#include <QPushButton>
+#include <QTabWidget>
 
 /* GUI includes: */
-# include "UIGlobalSettingsPortForwardingDlg.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "QIDialogButtonBox.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGlobalSettingsPortForwardingDlg.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "QIDialogButtonBox.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QButtonGroup>
-# include <QRegExpValidator>
+#include <QButtonGroup>
+#include <QRegExpValidator>
 
 /* GUI includes: */
-# include "QIWidgetValidator.h"
-# include "UIGlobalSettingsProxy.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "VBoxGlobal.h"
-# include "VBoxUtils.h"
+#include "QIWidgetValidator.h"
+#include "UIGlobalSettingsProxy.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "VBoxGlobal.h"
+#include "VBoxUtils.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp	(revision 76606)
@@ -16,15 +16,9 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIGlobalSettingsUpdate.h"
-# include "UIExtraDataManager.h"
-# include "UIMessageCenter.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGlobalSettingsUpdate.h"
+#include "UIExtraDataManager.h"
+#include "UIMessageCenter.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp	(revision 76606)
@@ -16,17 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIConverter.h"
-# include "UIMachineSettingsAudio.h"
-# include "UIErrorString.h"
+#include "UIConverter.h"
+#include "UIMachineSettingsAudio.h"
+#include "UIErrorString.h"
 
 /* COM includes: */
-# include "CAudioAdapter.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CAudioAdapter.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp	(revision 76606)
@@ -16,29 +16,25 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "QIWidgetValidator.h"
-# include "UIConverter.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIExtraDataManager.h"
-# include "UIMachineSettingsDisplay.h"
-# include "UIErrorString.h"
-# include "VBoxGlobal.h"
-# include "VBox2DHelpers.h"
+#include "QIWidgetValidator.h"
+#include "UIConverter.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIMachineSettingsDisplay.h"
+#include "UIErrorString.h"
+#include "VBoxGlobal.h"
+#include "VBox2DHelpers.h"
 
 /* COM includes: */
-# include "CRecordingSettings.h"
-# include "CRecordingScreenSettings.h"
-# include "CExtPack.h"
-# include "CExtPackManager.h"
-# include "CVRDEServer.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CRecordingSettings.h"
+#include "CRecordingScreenSettings.h"
+#include "CExtPack.h"
+#include "CExtPackManager.h"
+#include "CVRDEServer.h"
+
 
 #define VIDEO_CAPTURE_BIT_RATE_MIN 32
 #define VIDEO_CAPTURE_BIT_RATE_MAX 2048
+
 
 /** Machine settings: Display page data structure. */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QLineEdit>
+#include <QDir>
+#include <QLineEdit>
 
 /* GUI includes: */
-# include "QIWidgetValidator.h"
-# include "VBoxGlobal.h"
-# include "UIConverter.h"
-# include "UIErrorString.h"
-# include "UIMachineSettingsGeneral.h"
-# include "UIModalWindowManager.h"
-# include "UIProgressDialog.h"
+#include "QIWidgetValidator.h"
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
+#include "UIErrorString.h"
+#include "UIMachineSettingsGeneral.h"
+#include "UIModalWindowManager.h"
+#include "UIProgressDialog.h"
 
 /* COM includes: */
-# include "CExtPack.h"
-# include "CExtPackManager.h"
-# include "CMedium.h"
-# include "CMediumAttachment.h"
-# include "CProgress.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CExtPack.h"
+#include "CExtPackManager.h"
+#include "CMedium.h"
+#include "CMediumAttachment.h"
+#include "CProgress.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsInterface.cpp	(revision 76606)
@@ -16,14 +16,8 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIActionPool.h"
-# include "UIExtraDataManager.h"
-# include "UIMachineSettingsInterface.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIActionPool.h"
+#include "UIExtraDataManager.h"
+#include "UIMachineSettingsInterface.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsNetwork.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "QIArrowButtonSwitch.h"
-# include "QITabWidget.h"
-# include "QIWidgetValidator.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "UIMachineSettingsNetwork.h"
-# include "UIErrorString.h"
-# include "VBoxGlobal.h"
+#include "QIArrowButtonSwitch.h"
+#include "QITabWidget.h"
+#include "QIWidgetValidator.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "UIMachineSettingsNetwork.h"
+#include "UIErrorString.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CNetworkAdapter.h"
-# include "CHostNetworkInterface.h"
-# include "CNATNetwork.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CNetworkAdapter.h"
+#include "CHostNetworkInterface.h"
+#include "CNATNetwork.h"
 
 /* COM includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QPushButton>
+#include <QVBoxLayout>
+#include <QPushButton>
 
 /* GUI includes: */
-# include "UIMachineSettingsPortForwardingDlg.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "QIDialogButtonBox.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIMachineSettingsPortForwardingDlg.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "QIDialogButtonBox.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHeaderView>
-# include <QMenu>
-# include <QTimer>
+#include <QHeaderView>
+#include <QMenu>
+#include <QTimer>
 
 /* GUI includes: */
-# include "UIIconPool.h"
-# include "UIMachineSettingsSF.h"
-# include "UIMachineSettingsSFDetails.h"
-# include "UIErrorString.h"
-# include "VBoxGlobal.h"
-# include "VBoxUtils.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIIconPool.h"
+#include "UIMachineSettingsSF.h"
+#include "UIMachineSettingsSFDetails.h"
+#include "UIErrorString.h"
+#include "VBoxGlobal.h"
+#include "VBoxUtils.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSFDetails.cpp	(revision 76606)
@@ -16,17 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes */
-# include <QDir>
-# include <QPushButton>
+#include <QDir>
+#include <QPushButton>
 
 /* Other includes */
-# include "UIMachineSettingsSFDetails.h"
-# include "VBoxGlobal.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIMachineSettingsSFDetails.h"
+#include "VBoxGlobal.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
+#include <QDir>
 
 /* GUI includes: */
-# include "QITabWidget.h"
-# include "QIWidgetValidator.h"
-# include "UIConverter.h"
-# include "UIMachineSettingsSerial.h"
-# include "UIErrorString.h"
-# include "VBoxGlobal.h"
+#include "QITabWidget.h"
+#include "QIWidgetValidator.h"
+#include "UIConverter.h"
+#include "UIMachineSettingsSerial.h"
+#include "UIErrorString.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CSerialPort.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSerialPort.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp	(revision 76606)
@@ -16,41 +16,34 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHeaderView>
-# include <QItemEditorFactory>
-# include <QMenu>
-# include <QMouseEvent>
-# include <QScrollBar>
-# include <QStylePainter>
-# include <QTimer>
-
-/* GUI includes: */
-# include "QIFileDialog.h"
-# include "QIMessageBox.h"
-# include "QIWidgetValidator.h"
-# include "VBoxGlobal.h"
-# include "UIIconPool.h"
-# include "UIWizardNewVD.h"
-# include "UIErrorString.h"
-# include "UIMessageCenter.h"
-# include "UIMachineSettingsStorage.h"
-# include "UIMediumSelector.h"
-# include "UIConverter.h"
-# include "UIMedium.h"
-# include "UIExtraDataManager.h"
-# include "UIModalWindowManager.h"
-
-/* COM includes: */
-# include "CStorageController.h"
-# include "CMediumAttachment.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
+#include <QHeaderView>
+#include <QItemEditorFactory>
+#include <QMenu>
+#include <QMouseEvent>
+#include <QScrollBar>
+#include <QStylePainter>
+#include <QTimer>
 #include <QCommonStyle>
 #include <QMetaProperty>
+
+/* GUI includes: */
+#include "QIFileDialog.h"
+#include "QIMessageBox.h"
+#include "QIWidgetValidator.h"
+#include "VBoxGlobal.h"
+#include "UIIconPool.h"
+#include "UIWizardNewVD.h"
+#include "UIErrorString.h"
+#include "UIMessageCenter.h"
+#include "UIMachineSettingsStorage.h"
+#include "UIMediumSelector.h"
+#include "UIConverter.h"
+#include "UIMedium.h"
+#include "UIExtraDataManager.h"
+#include "UIModalWindowManager.h"
+
+/* COM includes: */
+#include "CStorageController.h"
+#include "CMediumAttachment.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHeaderView>
+#include <QHeaderView>
 
 /* GUI includes: */
-# include "QIWidgetValidator.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "UIMachineSettingsSystem.h"
-# include "UIErrorString.h"
-# include "VBoxGlobal.h"
+#include "QIWidgetValidator.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "UIMachineSettingsSystem.h"
+#include "UIErrorString.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CBIOSSettings.h"
+#include "CBIOSSettings.h"
 
 /* Other VBox includes: */
-# include <iprt/cdefs.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/cdefs.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.cpp	(revision 76606)
@@ -16,36 +16,30 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHeaderView>
-# include <QHelpEvent>
-# include <QMenu>
-# include <QToolTip>
+#include <QHeaderView>
+#include <QHelpEvent>
+#include <QMenu>
+#include <QToolTip>
 
 /* GUI includes: */
-# include "QIWidgetValidator.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "UIMachineSettingsUSB.h"
-# include "UIMachineSettingsUSBFilterDetails.h"
-# include "UIErrorString.h"
-# include "UIToolBar.h"
-# include "VBoxGlobal.h"
+#include "QIWidgetValidator.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "UIMachineSettingsUSB.h"
+#include "UIMachineSettingsUSBFilterDetails.h"
+#include "UIErrorString.h"
+#include "UIToolBar.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CConsole.h"
-# include "CExtPack.h"
-# include "CExtPackManager.h"
-# include "CHostUSBDevice.h"
-# include "CHostUSBDeviceFilter.h"
-# include "CUSBController.h"
-# include "CUSBDevice.h"
-# include "CUSBDeviceFilter.h"
-# include "CUSBDeviceFilters.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CConsole.h"
+#include "CExtPack.h"
+#include "CExtPackManager.h"
+#include "CHostUSBDevice.h"
+#include "CHostUSBDeviceFilter.h"
+#include "CUSBController.h"
+#include "CUSBDevice.h"
+#include "CUSBDeviceFilter.h"
+#include "CUSBDeviceFilters.h"
 
 /* VirtualBox interface declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp	(revision 76606)
@@ -16,13 +16,7 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIMachineSettingsUSBFilterDetails.h"
-# include "UIConverter.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIMachineSettingsUSBFilterDetails.h"
+#include "UIConverter.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotDetailsWidget.cpp	(revision 76606)
@@ -16,52 +16,46 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QDateTime>
-# include <QDir>
-# include <QGridLayout>
-# include <QLabel>
-# include <QLineEdit>
-# include <QPainter>
-# include <QPushButton>
-# include <QScrollArea>
-# include <QTabWidget>
-# include <QTextBrowser>
-# include <QTextEdit>
-# include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QDateTime>
+#include <QDir>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPainter>
+#include <QPushButton>
+#include <QScrollArea>
+#include <QTabWidget>
+#include <QTextBrowser>
+#include <QTextEdit>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QIFlowLayout.h"
-# include "UIConverter.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIIconPool.h"
-# include "UISnapshotDetailsWidget.h"
-# include "UIMessageCenter.h"
-# include "VBoxGlobal.h"
-# include "VBoxUtils.h"
+#include "QIDialogButtonBox.h"
+#include "QIFlowLayout.h"
+#include "UIConverter.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIIconPool.h"
+#include "UISnapshotDetailsWidget.h"
+#include "UIMessageCenter.h"
+#include "VBoxGlobal.h"
+#include "VBoxUtils.h"
 
 /* COM includes: */
-# include "CAudioAdapter.h"
-# include "CRecordingSettings.h"
-# include "CRecordingScreenSettings.h"
-# include "CMachine.h"
-# include "CMedium.h"
-# include "CMediumAttachment.h"
-# include "CNetworkAdapter.h"
-# include "CSerialPort.h"
-# include "CSharedFolder.h"
-# include "CStorageController.h"
-# include "CSystemProperties.h"
-# include "CUSBController.h"
-# include "CUSBDeviceFilter.h"
-# include "CUSBDeviceFilters.h"
-# include "CVRDEServer.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CAudioAdapter.h"
+#include "CRecordingSettings.h"
+#include "CRecordingScreenSettings.h"
+#include "CMachine.h"
+#include "CMedium.h"
+#include "CMediumAttachment.h"
+#include "CNetworkAdapter.h"
+#include "CSerialPort.h"
+#include "CSharedFolder.h"
+#include "CStorageController.h"
+#include "CSystemProperties.h"
+#include "CUSBController.h"
+#include "CUSBDeviceFilter.h"
+#include "CUSBDeviceFilters.h"
+#include "CVRDEServer.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp	(revision 76606)
@@ -16,42 +16,36 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QApplication>
-# include <QDateTime>
-# include <QHeaderView>
-# include <QIcon>
-# include <QMenu>
-# include <QPointer>
-# include <QReadWriteLock>
-# include <QScrollBar>
-# include <QTimer>
-# include <QVBoxLayout>
-# include <QWriteLocker>
+#include <QAccessibleWidget>
+#include <QApplication>
+#include <QDateTime>
+#include <QHeaderView>
+#include <QIcon>
+#include <QMenu>
+#include <QPointer>
+#include <QReadWriteLock>
+#include <QScrollBar>
+#include <QTimer>
+#include <QVBoxLayout>
+#include <QWriteLocker>
 
 /* GUI includes: */
-# include "QIMessageBox.h"
-# include "QITreeWidget.h"
-# include "UIActionPoolManager.h"
-# include "UIConverter.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "UIModalWindowManager.h"
-# include "UISnapshotDetailsWidget.h"
-# include "UISnapshotPane.h"
-# include "UITakeSnapshotDialog.h"
-# include "UIToolBar.h"
-# include "UIVirtualBoxEventHandler.h"
-# include "UIWizardCloneVM.h"
+#include "QIMessageBox.h"
+#include "QITreeWidget.h"
+#include "UIActionPoolManager.h"
+#include "UIConverter.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
+#include "UISnapshotDetailsWidget.h"
+#include "UISnapshotPane.h"
+#include "UITakeSnapshotDialog.h"
+#include "UIToolBar.h"
+#include "UIVirtualBoxEventHandler.h"
+#include "UIWizardCloneVM.h"
 
 /* COM includes: */
-# include "CConsole.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CConsole.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIAddDiskEncryptionPasswordDialog.cpp	(revision 76606)
@@ -16,33 +16,27 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAbstractTableModel>
-# include <QHeaderView>
-# include <QItemEditorFactory>
-# include <QLabel>
-# include <QLineEdit>
-# include <QPushButton>
-# include <QStandardItemEditorCreator>
-# include <QTableView>
-# include <QVBoxLayout>
+#include <QAbstractTableModel>
+#include <QHeaderView>
+#include <QItemEditorFactory>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QStandardItemEditorCreator>
+#include <QTableView>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QIStyledItemDelegate.h"
-# include "QIWithRetranslateUI.h"
-# include "VBoxGlobal.h"
-# include "UIAddDiskEncryptionPasswordDialog.h"
-# include "UIIconPool.h"
-# include "UIMedium.h"
-# include "UIMessageCenter.h"
+#include "QIDialogButtonBox.h"
+#include "QIStyledItemDelegate.h"
+#include "QIWithRetranslateUI.h"
+#include "VBoxGlobal.h"
+#include "UIAddDiskEncryptionPasswordDialog.h"
+#include "UIIconPool.h"
+#include "UIMedium.h"
+#include "UIMessageCenter.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp	(revision 76606)
@@ -16,34 +16,28 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QComboBox>
-# include <QDir>
-# include <QHeaderView>
-# include <QLabel>
-# include <QLineEdit>
-# include <QSpinBox>
-# include <QTextEdit>
-# include <QVBoxLayout>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDir>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QSpinBox>
+#include <QTextEdit>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QITreeView.h"
-# include "VBoxGlobal.h"
-# include "UIGuestOSTypeSelectionButton.h"
-# include "UIApplianceEditorWidget.h"
-# include "UIConverter.h"
-# include "UIFilePathSelector.h"
-# include "UIIconPool.h"
-# include "UILineTextEdit.h"
-# include "UIMessageCenter.h"
+#include "QITreeView.h"
+#include "VBoxGlobal.h"
+#include "UIGuestOSTypeSelectionButton.h"
+#include "UIApplianceEditorWidget.h"
+#include "UIConverter.h"
+#include "UIFilePathSelector.h"
+#include "UIIconPool.h"
+#include "UILineTextEdit.h"
+#include "UIMessageCenter.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QTextEdit>
+#include <QTextEdit>
 
 /* GUI includes: */
-# include "QITreeView.h"
-# include "UIApplianceExportEditorWidget.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
+#include "QITreeView.h"
+#include "UIApplianceExportEditorWidget.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
 
 /* COM includes: */
-# include "CAppliance.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CAppliance.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QGridLayout>
-# include <QLabel>
-# include <QTextEdit>
-# include <QVBoxLayout>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QTextEdit>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIRichTextLabel.h"
-# include "QITreeView.h"
-# include "UIApplianceImportEditorWidget.h"
-# include "UIFilePathSelector.h"
-# include "UIMessageCenter.h"
-# include "UIWizardImportApp.h"
-# include "VBoxGlobal.h"
+#include "QIRichTextLabel.h"
+#include "QITreeView.h"
+#include "UIApplianceImportEditorWidget.h"
+#include "UIFilePathSelector.h"
+#include "UIMessageCenter.h"
+#include "UIWizardImportApp.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CAppliance.h"
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CAppliance.h"
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp	(revision 76606)
@@ -16,17 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QScrollBar>
+#include <QScrollBar>
 
 /* GUI includes: */
-# include "UIBootTable.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIBootTable.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIEmptyFilePathSelector.cpp	(revision 76606)
@@ -16,29 +16,23 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Local includes */
-# include "QIFileDialog.h"
-# include "QIToolButton.h"
-# include "QILabel.h"
-# include "QILineEdit.h"
-# include "UIIconPool.h"
-# include "UIEmptyFilePathSelector.h"
-# include "VBoxGlobal.h"
+#include "QIFileDialog.h"
+#include "QIToolButton.h"
+#include "QILabel.h"
+#include "QILineEdit.h"
+#include "UIIconPool.h"
+#include "UIEmptyFilePathSelector.h"
+#include "VBoxGlobal.h"
 
 /* Global includes */
-# include <iprt/assert.h>
-# include <QAction>
-# include <QApplication>
-# include <QClipboard>
-# include <QDir>
-# include <QFocusEvent>
-# include <QHBoxLayout>
-# include <QLineEdit>
-# include <QTimer>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>
+#include <QFocusEvent>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QTimer>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilePathSelector.cpp	(revision 76606)
@@ -16,33 +16,27 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAction>
-# include <QApplication>
-# include <QClipboard>
-# include <QDir>
-# include <QFocusEvent>
-# include <QHBoxLayout>
-# include <QLineEdit>
-# ifdef VBOX_WS_WIN
-#  include <QListView>
-# endif
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>
+#include <QFocusEvent>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#ifdef VBOX_WS_WIN
+# include <QListView>
+#endif
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "QILabel.h"
-# include "QILineEdit.h"
-# include "QIToolButton.h"
-# include "VBoxGlobal.h"
-# include "UIIconPool.h"
-# include "UIFilePathSelector.h"
+#include "QIFileDialog.h"
+#include "QILabel.h"
+#include "QILineEdit.h"
+#include "QIToolButton.h"
+#include "VBoxGlobal.h"
+#include "UIIconPool.h"
+#include "UIFilePathSelector.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIFilmContainer.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QHBoxLayout>
-# include <QPainter>
-# include <QScrollArea>
-# include <QScrollBar>
-# include <QStyle>
-# include <QVBoxLayout>
+#include <QCheckBox>
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QScrollArea>
+#include <QScrollBar>
+#include <QStyle>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIFilmContainer.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIFilmContainer.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestOSTypeSelectionButton.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestOSTypeSelectionButton.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestOSTypeSelectionButton.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes */
-# include <QMenu>
-# include <QSignalMapper>
-# include <QStyle>
+#include <QMenu>
+#include <QSignalMapper>
+#include <QStyle>
 
 /* GUI includes */
-# include "VBoxGlobal.h"
-# include "UIGuestOSTypeSelectionButton.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIGuestOSTypeSelectionButton.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestRAMSlider.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestRAMSlider.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIGuestRAMSlider.cpp	(revision 76606)
@@ -16,16 +16,10 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIGuestRAMSlider.h"
+#include "VBoxGlobal.h"
+#include "UIGuestRAMSlider.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHostComboEditor.cpp	(revision 76606)
@@ -16,33 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QHBoxLayout>
-# include <QKeyEvent>
-# include <QStyleOption>
-# include <QStylePainter>
-# include <QTimer>
-# ifdef VBOX_WS_X11
-#  include <QX11Info>
-# endif
-
-/* GUI includes: */
-# include "QIToolButton.h"
-# include "VBoxGlobal.h"
-# include "UIExtraDataManager.h"
-# include "UIHostComboEditor.h"
-# include "UIIconPool.h"
-# ifdef VBOX_WS_MAC
-#  include "UICocoaApplication.h"
-#  include "VBoxUtils-darwin.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-/* Qt includes: */
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QKeyEvent>
+#include <QStyleOption>
+#include <QStylePainter>
+#include <QTimer>
+#ifdef VBOX_WS_X11
+# include <QX11Info>
+#endif
 #if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
 # include <QAbstractNativeEventFilter>
@@ -50,5 +31,12 @@
 
 /* GUI includes: */
-#if defined(VBOX_WS_MAC)
+#include "QIToolButton.h"
+#include "VBoxGlobal.h"
+#include "UIExtraDataManager.h"
+#include "UIHostComboEditor.h"
+#include "UIIconPool.h"
+#ifdef VBOX_WS_MAC
+# include "UICocoaApplication.h"
+# include "VBoxUtils-darwin.h"
 # include "DarwinKeyboard.h"
 #elif defined(VBOX_WS_WIN)
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QHBoxLayout>
-# include <QLineEdit>
-# include <QKeyEvent>
-# include <QStyle>
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QKeyEvent>
+#include <QStyle>
 
 /* GUI includes; */
-# include "UIHostComboEditor.h"
-# include "UIHotKeyEditor.h"
-# include "UIIconPool.h"
-# include "QIToolButton.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIHostComboEditor.h"
+#include "UIHotKeyEditor.h"
+#include "UIIconPool.h"
+#include "QIToolButton.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UILineTextEdit.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDialogButtonBox>
-# include <QFile>
-# include <QLineEdit>
-# include <QPushButton>
-# include <QTextEdit>
-# include <QTextStream>
-# include <QVBoxLayout>
+#include <QDialogButtonBox>
+#include <QFile>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QTextStream>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIFileDialog.h"
-# include "VBoxGlobal.h"
-# include "UILineTextEdit.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIFileDialog.h"
+#include "VBoxGlobal.h"
+#include "UILineTextEdit.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediaComboBox.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAbstractItemView>
-# include <QDir>
-# include <QFileInfo>
+#include <QAbstractItemView>
+#include <QDir>
+#include <QFileInfo>
 
 /* GUI includes: */
-# include "UIMediaComboBox.h"
-# include "UIMedium.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIMediaComboBox.h"
+#include "UIMedium.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMediumSizeEditor.cpp	(revision 76606)
@@ -16,23 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGridLayout>
-# include <QLabel>
-# include <QRegExpValidator>
-# include <QSlider>
+#include <QGridLayout>
+#include <QLabel>
+#include <QRegExpValidator>
+#include <QSlider>
 
 /* GUI includes: */
-# include "QILineEdit.h"
-# include "VBoxGlobal.h"
-# include "UIMediumSizeEditor.h"
+#include "QILineEdit.h"
+#include "VBoxGlobal.h"
+#include "UIMediumSizeEditor.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
+
 
 const qulonglong UIMediumSizeEditor::m_uSectorSize = 512;
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBar.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBar.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QPainter>
-# include <QPaintEvent>
-# include <QPixmapCache>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QPixmapCache>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIImageTools.h"
-# include "UIMenuBar.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIImageTools.h"
+#include "UIMenuBar.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuBarEditorWindow.cpp	(revision 76606)
@@ -16,33 +16,27 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QHBoxLayout>
-# include <QMenu>
-# include <QMenuBar>
-# include <QMetaEnum>
-# include <QPainter>
-# include <QPaintEvent>
-# include <QStyleOptionToolButton>
-# ifndef VBOX_WS_MAC
-#  include <QCheckBox>
-# endif
+#include <QAccessibleWidget>
+#include <QHBoxLayout>
+#include <QMenu>
+#include <QMenuBar>
+#include <QMetaEnum>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QStyleOptionToolButton>
+#ifndef VBOX_WS_MAC
+# include <QCheckBox>
+#endif
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "VBoxGlobal.h"
-# include "UIActionPoolRuntime.h"
-# include "UIConverter.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIMachineWindow.h"
-# include "UIMenuBarEditorWindow.h"
-# include "UIToolBar.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "VBoxGlobal.h"
+#include "UIActionPoolRuntime.h"
+#include "UIConverter.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIMachineWindow.h"
+#include "UIMenuBarEditorWindow.h"
+#include "UIToolBar.h"
 
 /* Forward declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMenuToolBar.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QHBoxLayout>
-# include <QPainter>
-# include <QStyle>
-# include <QToolButton>
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QPainter>
+#include <QStyle>
+#include <QToolButton>
 
 /* GUI includes: */
-# include "UIMenuToolBar.h"
-# include "UIToolBar.h"
+#include "UIMenuToolBar.h"
+#include "UIToolBar.h"
 
 /* Other VBox includes: */
 #include "iprt/assert.h"
-
-#endif /* VBOX_WS_MAC */
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp	(revision 76606)
@@ -16,35 +16,29 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QLabel>
-# include <QMenu>
-# include <QMoveEvent>
-# include <QPainter>
-# include <QStateMachine>
-# include <QStyle>
-# include <QTimer>
-# include <QToolButton>
-# include <QVBoxLayout>
-# include <QWindow>
-# ifdef VBOX_WS_X11
-#  include <QWindowStateChangeEvent>
-# endif
+#include <QApplication>
+#include <QLabel>
+#include <QMenu>
+#include <QMoveEvent>
+#include <QPainter>
+#include <QStateMachine>
+#include <QStyle>
+#include <QTimer>
+#include <QToolButton>
+#include <QVBoxLayout>
+#include <QWindow>
+#ifdef VBOX_WS_X11
+# include <QWindowStateChangeEvent>
+#endif
 
 /* GUI includes: */
-# include "UIMiniToolBar.h"
-# include "UIAnimationFramework.h"
-# include "UIIconPool.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "VBoxGlobal.h"
-# ifdef VBOX_WS_X11
-#  include "UIExtraDataManager.h"
-# endif /* VBOX_WS_X11 */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIMiniToolBar.h"
+#include "UIAnimationFramework.h"
+#include "UIIconPool.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "VBoxGlobal.h"
+#ifdef VBOX_WS_X11
+# include "UIExtraDataManager.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QComboBox>
-# include <QGridLayout>
-# include <QLabel>
-# include <QVBoxLayout>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QILineEdit.h"
-# include "VBoxGlobal.h"
-# include "UIFilePathSelector.h"
-# include "UINameAndSystemEditor.h"
+#include "QILineEdit.h"
+#include "VBoxGlobal.h"
+#include "UIFilePathSelector.h"
+#include "UINameAndSystemEditor.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupBox.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QLabel>
-# include <QPainter>
-# include <QPaintEvent>
-# include <QStyle>
-# include <QVBoxLayout>
+#include <QApplication>
+#include <QLabel>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QStyle>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIPopupBox.h"
-# ifdef VBOX_WS_MAC
-#  include "UIImageTools.h"
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIPopupBox.h"
+#ifdef VBOX_WS_MAC
+# include "UIImageTools.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPane.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QPainter>
-# include <QTextEdit>
+#include <QPainter>
+#include <QTextEdit>
 
 /* GUI includes: */
-# include "UIPopupPane.h"
-# include "UIPopupPaneMessage.h"
-# include "UIPopupPaneDetails.h"
-# include "UIPopupPaneButtonPane.h"
-# include "UIAnimationFramework.h"
-# include "QIMessageBox.h"
+#include "UIPopupPane.h"
+#include "UIPopupPaneMessage.h"
+#include "UIPopupPaneDetails.h"
+#include "UIPopupPaneButtonPane.h"
+#include "UIAnimationFramework.h"
+#include "QIMessageBox.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneButtonPane.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneButtonPane.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneButtonPane.cpp	(revision 76606)
@@ -16,20 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 /* Qt includes: */
-# include <QApplication>
-# include <QHBoxLayout>
-# include <QKeyEvent>
-# include <QVBoxLayout>
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QKeyEvent>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIMessageBox.h"
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIPopupPaneButtonPane.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIMessageBox.h"
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIPopupPaneButtonPane.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneDetails.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneDetails.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneDetails.cpp	(revision 76606)
@@ -16,17 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 /* Qt includes: */
-# include <QCheckBox>
-# include <QTextDocument>
-# include <QTextEdit>
+#include <QCheckBox>
+#include <QTextDocument>
+#include <QTextEdit>
 
 /* GUI includes: */
-# include "UIAnimationFramework.h"
-# include "UIPopupPaneDetails.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIAnimationFramework.h"
+#include "UIPopupPaneDetails.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneMessage.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneMessage.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupPaneMessage.cpp	(revision 76606)
@@ -16,16 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
 /* Qt includes: */
-# include <QLabel>
-# include <QCheckBox>
+#include <QLabel>
+#include <QCheckBox>
 
 /* GUI includes: */
-# include "UIAnimationFramework.h"
-# include "UIPopupPaneMessage.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIAnimationFramework.h"
+#include "UIPopupPaneMessage.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStack.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QEvent>
-# include <QMainWindow>
-# include <QMenuBar>
-# include <QScrollArea>
-# include <QStatusBar>
-# include <QVBoxLayout>
+#include <QEvent>
+#include <QMainWindow>
+#include <QMenuBar>
+#include <QScrollArea>
+#include <QStatusBar>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIPopupStack.h"
-# include "UIPopupStackViewport.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIPopupStack.h"
+#include "UIPopupStackViewport.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStackViewport.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStackViewport.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPopupStackViewport.cpp	(revision 76606)
@@ -16,16 +16,10 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIPopupPane.h"
-# include "UIPopupStackViewport.h"
+#include "UIPopupPane.h"
+#include "UIPopupStackViewport.h"
 
 /* Other VBox includes: */
-# include <VBox/sup.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIPortForwardingTable.cpp	(revision 76606)
@@ -16,32 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAction>
-# include <QComboBox>
-# include <QHBoxLayout>
-# include <QHeaderView>
-# include <QItemEditorFactory>
-# include <QLineEdit>
-# include <QMenu>
-# include <QSpinBox>
-# include <QStyledItemDelegate>
+#include <QAction>
+#include <QComboBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QItemEditorFactory>
+#include <QLineEdit>
+#include <QMenu>
+#include <QSpinBox>
+#include <QStyledItemDelegate>
 
 /* GUI includes: */
-# include "QITableView.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "UIPortForwardingTable.h"
-# include "UIToolBar.h"
+#include "QITableView.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "UIPortForwardingTable.h"
+#include "UIToolBar.h"
 
 /* Other VBox includes: */
-# include <iprt/cidr.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/cidr.h>
 
 /* External includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp	(revision 76606)
@@ -16,37 +16,31 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCloseEvent>
-# include <QEventLoop>
-# include <QProgressBar>
-# include <QTime>
-# include <QTimer>
-# include <QVBoxLayout>
+#include <QCloseEvent>
+#include <QEventLoop>
+#include <QProgressBar>
+#include <QTime>
+#include <QTimer>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIDialogButtonBox.h"
-# include "QILabel.h"
-# include "UIErrorString.h"
-# include "UIExtraDataManager.h"
-# include "UIMainEventListener.h"
-# include "UIModalWindowManager.h"
-# include "UIProgressDialog.h"
-# include "UIProgressEventHandler.h"
-# include "UISpecialControls.h"
-# include "VBoxGlobal.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif /* VBOX_WS_MAC */
+#include "QIDialogButtonBox.h"
+#include "QILabel.h"
+#include "UIErrorString.h"
+#include "UIExtraDataManager.h"
+#include "UIMainEventListener.h"
+#include "UIModalWindowManager.h"
+#include "UIProgressDialog.h"
+#include "UIProgressEventHandler.h"
+#include "UISpecialControls.h"
+#include "VBoxGlobal.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 /* COM includes: */
-# include "CEventListener.h"
-# include "CEventSource.h"
-# include "CProgress.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CEventListener.h"
+#include "CEventSource.h"
+#include "CProgress.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIScaleFactorEditor.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIScaleFactorEditor.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIScaleFactorEditor.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QComboBox>
-# include <QGridLayout>
-# include <QLabel>
-# include <QSpacerItem>
-# include <QSpinBox>
-# include <QWidget>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QWidget>
 
 /* GUI includes: */
-# include "QIAdvancedSlider.h"
-# include "UIDesktopWidgetWatchdog.h"
-# include "UIScaleFactorEditor.h"
+#include "QIAdvancedSlider.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIScaleFactorEditor.h"
 
 /* External includes: */
-# include <math.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <math.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISlidingToolBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISlidingToolBar.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISlidingToolBar.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
+#include <QHBoxLayout>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UISlidingToolBar.h"
-# include "UIAnimationFramework.h"
-# include "UIMachineWindow.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils-darwin.h"
-# endif /* VBOX_WS_MAC */
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UISlidingToolBar.h"
+#include "UIAnimationFramework.h"
+#include "UIMachineWindow.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# ifndef VBOX_DARWIN_USE_NATIVE_CONTROLS
-#  include <QBitmap>
-#  include <QMouseEvent>
-#  include <QPainter>
-#  include <QSignalMapper>
-# endif
+#include <QHBoxLayout>
+#ifndef VBOX_DARWIN_USE_NATIVE_CONTROLS
+# include <QBitmap>
+# include <QMouseEvent>
+# include <QPainter>
+# include <QSignalMapper>
+#endif
 
 /* GUI includes: */
-# include "UIIconPool.h"
-# include "UISpecialControls.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIIconPool.h"
+#include "UISpecialControls.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIStatusBarEditorWindow.cpp	(revision 76606)
@@ -16,32 +16,26 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleWidget>
-# include <QCheckBox>
-# include <QDrag>
-# include <QHBoxLayout>
-# include <QMimeData>
-# include <QMouseEvent>
-# include <QPainter>
-# include <QPaintEvent>
-# include <QPixmap>
-# include <QStatusBar>
-# include <QStyleOption>
-# include <QStylePainter>
+#include <QAccessibleWidget>
+#include <QCheckBox>
+#include <QDrag>
+#include <QHBoxLayout>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QPaintEvent>
+#include <QPixmap>
+#include <QStatusBar>
+#include <QStyleOption>
+#include <QStylePainter>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "VBoxGlobal.h"
-# include "UIConverter.h"
-# include "UIExtraDataManager.h"
-# include "UIIconPool.h"
-# include "UIMachineWindow.h"
-# include "UIStatusBarEditorWindow.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
+#include "UIExtraDataManager.h"
+#include "UIIconPool.h"
+#include "UIMachineWindow.h"
+#include "UIStatusBarEditorWindow.h"
 
 /* Forward declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UITabBar.cpp	(revision 76606)
@@ -16,37 +16,31 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAction>
-# include <QApplication>
-# include <QDrag>
-# include <QDragEnterEvent>
-# include <QDragMoveEvent>
-# include <QDropEvent>
-# include <QEvent>
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QMimeData>
-# include <QMouseEvent>
-# include <QStyleOption>
-# include <QPainter>
-# ifdef VBOX_WS_MAC
-#  include <QStackedLayout>
-# endif
-# include <QStyle>
-# include <QToolButton>
+#include <QAction>
+#include <QApplication>
+#include <QDrag>
+#include <QDragEnterEvent>
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QEvent>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QMimeData>
+#include <QMouseEvent>
+#include <QStyleOption>
+#include <QPainter>
+#ifdef VBOX_WS_MAC
+# include <QStackedLayout>
+#endif
+#include <QStyle>
+#include <QToolButton>
 
 /* GUI includes: */
-# include "QIWithRetranslateUI.h"
-# include "UIIconPool.h"
-# include "UITabBar.h"
+#include "QIWithRetranslateUI.h"
+#include "UIIconPool.h"
+#include "UITabBar.h"
 
 /* Other VBox includes: */
-# include "iprt/assert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "iprt/assert.h"
 
 /* Forward declarations: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBar.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QLayout>
-# include <QMainWindow>
-# include <QResizeEvent>
-# ifdef VBOX_WS_MAC
-#  include <QPainter>
-# endif
+#include <QLayout>
+#include <QMainWindow>
+#include <QResizeEvent>
+#ifdef VBOX_WS_MAC
+# include <QPainter>
+#endif
 
 /* GUI includes: */
-# include "UIToolBar.h"
-# ifdef VBOX_WS_MAC
-#  include "VBoxUtils.h"
-# endif
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIToolBar.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils.h"
+#endif
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIWarningPane.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIWarningPane.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIWarningPane.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QEvent>
-# include <QLabel>
-# include <QTimer>
+#include <QHBoxLayout>
+#include <QEvent>
+#include <QLabel>
+#include <QTimer>
 
 /* GUI includes: */
-# include "QIWidgetValidator.h"
-# include "UIWarningPane.h"
+#include "QIWidgetValidator.h"
+#include "UIWarningPane.h"
 
 /* Other VBox includes: */
-# include <VBox/sup.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsButton.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QApplication>
-# include <QGraphicsScene>
-# include <QGraphicsView>
-# include <QPainter>
-# include <QStyle>
-# include <QGraphicsSceneMouseEvent>
+#include <QApplication>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QPainter>
+#include <QStyle>
+#include <QGraphicsSceneMouseEvent>
 
 /* GUI includes: */
-# include "UIGraphicsButton.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGraphicsButton.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsRotatorButton.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsRotatorButton.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsRotatorButton.cpp	(revision 76606)
@@ -16,20 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QStateMachine>
-# include <QPropertyAnimation>
-# include <QSignalTransition>
+#include <QStateMachine>
+#include <QPropertyAnimation>
+#include <QSignalTransition>
+#include <QMouseEventTransition>
 
 /* GUI includes: */
-# include "UIGraphicsRotatorButton.h"
-# include "UIIconPool.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
-#include <QMouseEventTransition>
+#include "UIGraphicsRotatorButton.h"
+#include "UIIconPool.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsTextPane.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAccessibleObject>
-# include <QPainter>
-# include <QTextLayout>
-# include <QApplication>
-# include <QFontMetrics>
-# include <QGraphicsSceneHoverEvent>
+#include <QAccessibleObject>
+#include <QPainter>
+#include <QTextLayout>
+#include <QApplication>
+#include <QFontMetrics>
+#include <QGraphicsSceneHoverEvent>
 
 /* GUI includes: */
-# include "UIGraphicsTextPane.h"
-# include "UIRichTextString.h"
-# include "VBoxGlobal.h"
+#include "UIGraphicsTextPane.h"
+#include "UIRichTextString.h"
+#include "VBoxGlobal.h"
 
 /* Other VBox includes: */
-# include <iprt/assert.h>
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include <iprt/assert.h>
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsToolBar.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsToolBar.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsToolBar.cpp	(revision 76606)
@@ -16,13 +16,7 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIGraphicsToolBar.h"
-# include "UIGraphicsButton.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGraphicsToolBar.h"
+#include "UIGraphicsButton.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsZoomButton.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsZoomButton.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/widgets/graphics/UIGraphicsZoomButton.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QStateMachine>
-# include <QSignalTransition>
-# include <QPropertyAnimation>
-# include <QPainter>
-# include <QStyleOptionGraphicsItem>
+#include <QStateMachine>
+#include <QSignalTransition>
+#include <QPropertyAnimation>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
 
 /* GUI includes: */
-# include "UIGraphicsZoomButton.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIGraphicsZoomButton.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizard.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAbstractButton>
-# include <QLayout>
-# include <QStyle>
+#include <QAbstractButton>
+#include <QLayout>
+#include <QStyle>
 
 /* GUI includes: */
-# include "UIIconPool.h"
-# include "UIWizard.h"
-# include "UIWizardPage.h"
-# include "VBoxGlobal.h"
-# include "QIRichTextLabel.h"
-# include "UIExtraDataManager.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIIconPool.h"
+#include "UIWizard.h"
+#include "UIWizardPage.h"
+#include "VBoxGlobal.h"
+#include "QIRichTextLabel.h"
+#include "UIExtraDataManager.h"
 
 /* Qt includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizardPage.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizardPage.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/UIWizardPage.cpp	(revision 76606)
@@ -16,17 +16,11 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QAbstractButton>
+#include <QAbstractButton>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIWizard.h"
-# include "UIWizardPage.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "VBoxGlobal.h"
+#include "UIWizard.h"
+#include "UIWizardPage.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVD.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIWizardCloneVD.h"
-# include "UIWizardCloneVDPageBasic1.h"
-# include "UIWizardCloneVDPageBasic2.h"
-# include "UIWizardCloneVDPageBasic3.h"
-# include "UIWizardCloneVDPageBasic4.h"
-# include "UIWizardCloneVDPageExpert.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
+#include "UIWizardCloneVD.h"
+#include "UIWizardCloneVDPageBasic1.h"
+#include "UIWizardCloneVDPageBasic2.h"
+#include "UIWizardCloneVDPageBasic3.h"
+#include "UIWizardCloneVDPageBasic4.h"
+#include "UIWizardCloneVDPageExpert.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
 
 /* COM includes: */
-# include "CMediumFormat.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMediumFormat.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic1.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIRichTextLabel.h"
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIMediaComboBox.h"
-# include "UIMedium.h"
-# include "UIWizardCloneVD.h"
-# include "UIWizardCloneVDPageBasic1.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIRichTextLabel.h"
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIMediaComboBox.h"
+#include "UIMedium.h"
+#include "UIWizardCloneVD.h"
+#include "UIWizardCloneVDPageBasic1.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic2.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QButtonGroup>
-# include <QRadioButton>
+#include <QVBoxLayout>
+#include <QButtonGroup>
+#include <QRadioButton>
 
 /* GUI includes: */
-# include "UIConverter.h"
-# include "UIWizardCloneVDPageBasic2.h"
-# include "UIWizardCloneVD.h"
-# include "VBoxGlobal.h"
-# include "QIRichTextLabel.h"
+#include "UIConverter.h"
+#include "UIWizardCloneVDPageBasic2.h"
+#include "UIWizardCloneVD.h"
+#include "VBoxGlobal.h"
+#include "QIRichTextLabel.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic3.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QButtonGroup>
-# include <QRadioButton>
-# include <QCheckBox>
+#include <QVBoxLayout>
+#include <QButtonGroup>
+#include <QRadioButton>
+#include <QCheckBox>
 
 /* GUI includes: */
-# include "UIWizardCloneVDPageBasic3.h"
-# include "UIWizardCloneVD.h"
-# include "QIRichTextLabel.h"
+#include "UIWizardCloneVDPageBasic3.h"
+#include "UIWizardCloneVD.h"
+#include "QIRichTextLabel.h"
 
 /* COM includes: */
-# include "CMediumFormat.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMediumFormat.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic4.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic4.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageBasic4.cpp	(revision 76606)
@@ -16,28 +16,22 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QVBoxLayout>
-# include <QHBoxLayout>
-# include <QLineEdit>
+#include <QDir>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLineEdit>
 
 /* GUI includes: */
-# include "UIWizardCloneVDPageBasic4.h"
-# include "UIWizardCloneVD.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIIconPool.h"
-# include "QIFileDialog.h"
-# include "QIRichTextLabel.h"
-# include "QIToolButton.h"
+#include "UIWizardCloneVDPageBasic4.h"
+#include "UIWizardCloneVD.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
+#include "UIIconPool.h"
+#include "QIFileDialog.h"
+#include "QIRichTextLabel.h"
+#include "QIToolButton.h"
 
 /* COM includes: */
-# include "CMediumFormat.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMediumFormat.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevd/UIWizardCloneVDPageExpert.cpp	(revision 76606)
@@ -16,31 +16,25 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QButtonGroup>
-# include <QCheckBox>
-# include <QGridLayout>
-# include <QGroupBox>
-# include <QHBoxLayout>
-# include <QLineEdit>
-# include <QRadioButton>
-# include <QVBoxLayout>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QRadioButton>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIConverter.h"
-# include "UIIconPool.h"
-# include "UIMediaComboBox.h"
-# include "UIMessageCenter.h"
-# include "UIWizardCloneVD.h"
-# include "UIWizardCloneVDPageExpert.h"
+#include "QIToolButton.h"
+#include "UIConverter.h"
+#include "UIIconPool.h"
+#include "UIMediaComboBox.h"
+#include "UIMessageCenter.h"
+#include "UIWizardCloneVD.h"
+#include "UIWizardCloneVDPageExpert.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp	(revision 76606)
@@ -16,22 +16,16 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIWizardCloneVM.h"
-# include "UIWizardCloneVMPageBasic1.h"
-# include "UIWizardCloneVMPageBasic2.h"
-# include "UIWizardCloneVMPageBasic3.h"
-# include "UIWizardCloneVMPageExpert.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
+#include "UIWizardCloneVM.h"
+#include "UIWizardCloneVMPageBasic1.h"
+#include "UIWizardCloneVMPageBasic2.h"
+#include "UIWizardCloneVMPageBasic3.h"
+#include "UIWizardCloneVMPageExpert.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
 
 /* COM includes: */
-# include "CConsole.h"
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CConsole.h"
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic1.cpp	(revision 76606)
@@ -16,27 +16,21 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QComboBox>
-# include <QGridLayout>
-# include <QLabel>
-# include <QVBoxLayout>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIRichTextLabel.h"
-# include "QILineEdit.h"
-# include "UIFilePathSelector.h"
-# include "UIWizardCloneVM.h"
-# include "UIWizardCloneVMPageBasic1.h"
-# include "VBoxGlobal.h"
+#include "QIRichTextLabel.h"
+#include "QILineEdit.h"
+#include "UIFilePathSelector.h"
+#include "UIWizardCloneVM.h"
+#include "UIWizardCloneVMPageBasic1.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
-# include "CVirtualBox.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CVirtualBox.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic2.cpp	(revision 76606)
@@ -16,19 +16,13 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QRadioButton>
-# include <QButtonGroup>
+#include <QVBoxLayout>
+#include <QRadioButton>
+#include <QButtonGroup>
 
 /* GUI includes: */
-# include "UIWizardCloneVMPageBasic2.h"
-# include "UIWizardCloneVM.h"
-# include "QIRichTextLabel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIWizardCloneVMPageBasic2.h"
+#include "UIWizardCloneVM.h"
+#include "QIRichTextLabel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageBasic3.cpp	(revision 76606)
@@ -16,18 +16,12 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Global includes: */
-# include <QVBoxLayout>
-# include <QRadioButton>
+#include <QVBoxLayout>
+#include <QRadioButton>
 
 /* Local includes: */
-# include "UIWizardCloneVMPageBasic3.h"
-# include "UIWizardCloneVM.h"
-# include "QIRichTextLabel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIWizardCloneVMPageBasic3.h"
+#include "UIWizardCloneVM.h"
+#include "QIRichTextLabel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVMPageExpert.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Global includes: */
-# include <QButtonGroup>
-# include <QCheckBox>
-# include <QGridLayout>
-# include <QGroupBox>
-# include <QLabel>
-# include <QRadioButton>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QRadioButton>
 
 /* Local includes: */
-# include "QILineEdit.h"
-# include "UIFilePathSelector.h"
-# include "UIWizardCloneVMPageExpert.h"
-# include "UIWizardCloneVM.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QILineEdit.h"
+#include "UIFilePathSelector.h"
+#include "UIWizardCloneVMPageExpert.h"
+#include "UIWizardCloneVM.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QFileInfo>
-# include <QVariant>
+#include <QFileInfo>
+#include <QVariant>
 
 /* GUI includes: */
-# include "UIAddDiskEncryptionPasswordDialog.h"
-# include "UIMessageCenter.h"
-# include "UIWizardExportApp.h"
-# include "UIWizardExportAppDefs.h"
-# include "UIWizardExportAppPageBasic1.h"
-# include "UIWizardExportAppPageBasic2.h"
-# include "UIWizardExportAppPageBasic3.h"
-# include "UIWizardExportAppPageExpert.h"
+#include "UIAddDiskEncryptionPasswordDialog.h"
+#include "UIMessageCenter.h"
+#include "UIWizardExportApp.h"
+#include "UIWizardExportAppDefs.h"
+#include "UIWizardExportAppPageBasic1.h"
+#include "UIWizardExportAppPageBasic2.h"
+#include "UIWizardExportAppPageBasic3.h"
+#include "UIWizardExportAppPageExpert.h"
 
 /* COM includes: */
-# include "CAppliance.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CAppliance.h"
 
 /* COM includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic1.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QILabelSeparator.h"
-# include "QIRichTextLabel.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIWizardExportApp.h"
-# include "UIWizardExportAppDefs.h"
-# include "UIWizardExportAppPageBasic1.h"
+#include "QILabelSeparator.h"
+#include "QIRichTextLabel.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
+#include "UIWizardExportApp.h"
+#include "UIWizardExportAppDefs.h"
+#include "UIWizardExportAppPageBasic1.h"
 
 /* COM includes: */
-# include "CMachine.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMachine.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic2.cpp	(revision 76606)
@@ -16,42 +16,36 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QComboBox>
-# include <QDir>
-# include <QGridLayout>
-# include <QHeaderView>
-# include <QJsonArray>
-# include <QJsonDocument>
-# include <QJsonObject>
-# include <QJsonValue>
-# include <QLabel>
-# include <QLineEdit>
-# include <QStackedWidget>
-# include <QTableWidget>
-# include <QVBoxLayout>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QDir>
+#include <QGridLayout>
+#include <QHeaderView>
+#include <QJsonArray>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QJsonValue>
+#include <QLabel>
+#include <QLineEdit>
+#include <QStackedWidget>
+#include <QTableWidget>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIRichTextLabel.h"
-# include "QIToolButton.h"
-# include "VBoxGlobal.h"
-# include "UIConverter.h"
-# include "UIEmptyFilePathSelector.h"
-# include "UIIconPool.h"
-# include "UIMessageCenter.h"
-# include "UIVirtualBoxManager.h"
-# include "UIWizardExportApp.h"
-# include "UIWizardExportAppDefs.h"
-# include "UIWizardExportAppPageBasic2.h"
+#include "QIRichTextLabel.h"
+#include "QIToolButton.h"
+#include "VBoxGlobal.h"
+#include "UIConverter.h"
+#include "UIEmptyFilePathSelector.h"
+#include "UIIconPool.h"
+#include "UIMessageCenter.h"
+#include "UIVirtualBoxManager.h"
+#include "UIWizardExportApp.h"
+#include "UIWizardExportAppDefs.h"
+#include "UIWizardExportAppPageBasic2.h"
 
 /* COM includes: */
-# include "CCloudClient.h"
-# include "CCloudProvider.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CCloudClient.h"
+#include "CCloudProvider.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageBasic3.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QILabelSeparator.h"
-# include "QIRichTextLabel.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIWizardExportApp.h"
-# include "UIWizardExportAppPageBasic3.h"
+#include "QILabelSeparator.h"
+#include "QIRichTextLabel.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
+#include "UIWizardExportApp.h"
+#include "UIWizardExportAppPageBasic3.h"
 
 /* COM includes: */
-# include "CAppliance.h"
-# include "CMachine.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CAppliance.h"
+#include "CMachine.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportAppPageExpert.cpp	(revision 76606)
@@ -16,34 +16,28 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QCheckBox>
-# include <QGridLayout>
-# include <QGroupBox>
-# include <QHeaderView>
-# include <QLabel>
-# include <QLineEdit>
-# include <QListWidget>
-# include <QRadioButton>
-# include <QStackedWidget>
-# include <QTableWidget>
-# include <QVBoxLayout>
+#include <QCheckBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QListWidget>
+#include <QRadioButton>
+#include <QStackedWidget>
+#include <QTableWidget>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "VBoxGlobal.h"
-# include "UIApplianceExportEditorWidget.h"
-# include "UIConverter.h"
-# include "UIEmptyFilePathSelector.h"
-# include "UIIconPool.h"
-# include "UIVirtualBoxManager.h"
-# include "UIWizardExportApp.h"
-# include "UIWizardExportAppDefs.h"
-# include "UIWizardExportAppPageExpert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "VBoxGlobal.h"
+#include "UIApplianceExportEditorWidget.h"
+#include "UIConverter.h"
+#include "UIEmptyFilePathSelector.h"
+#include "UIIconPool.h"
+#include "UIVirtualBoxManager.h"
+#include "UIWizardExportApp.h"
+#include "UIWizardExportAppDefs.h"
+#include "UIWizardExportAppPageExpert.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRun.cpp	(revision 76606)
@@ -16,20 +16,14 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "UIWizardFirstRun.h"
-# include "UIWizardFirstRunPageBasic.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIMedium.h"
+#include "UIWizardFirstRun.h"
+#include "UIWizardFirstRunPageBasic.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
+#include "UIMedium.h"
 
 /* COM includes: */
-# include "CStorageController.h"
-# include "CMediumAttachment.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CStorageController.h"
+#include "CMediumAttachment.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QHBoxLayout>
-# include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIRichTextLabel.h"
-# include "QIToolButton.h"
-# include "VBoxGlobal.h"
-# include "UIIconPool.h"
-# include "UIMediaComboBox.h"
-# include "UIMedium.h"
-# include "UIMessageCenter.h"
-# include "UIWizardFirstRun.h"
-# include "UIWizardFirstRunPageBasic.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIRichTextLabel.h"
+#include "QIToolButton.h"
+#include "VBoxGlobal.h"
+#include "UIIconPool.h"
+#include "UIMediaComboBox.h"
+#include "UIMedium.h"
+#include "UIMessageCenter.h"
+#include "UIWizardFirstRun.h"
+#include "UIWizardFirstRunPageBasic.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportApp.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDialogButtonBox>
-# include <QLabel>
-# include <QPushButton>
-# include <QTextEdit>
-# include <QTextStream>
-# include <QVBoxLayout>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QTextEdit>
+#include <QTextStream>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "UIWizardImportApp.h"
-# include "UIWizardImportAppPageBasic1.h"
-# include "UIWizardImportAppPageBasic2.h"
-# include "UIWizardImportAppPageExpert.h"
-# include "VBoxGlobal.h"
-# include "QIDialog.h"
-# include "QIFileDialog.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIWizardImportApp.h"
+#include "UIWizardImportAppPageBasic1.h"
+#include "UIWizardImportAppPageBasic2.h"
+#include "UIWizardImportAppPageExpert.h"
+#include "VBoxGlobal.h"
+#include "QIDialog.h"
+#include "QIFileDialog.h"
 
 #include <QPrintDialog>
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic1.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Global includes: */
-# include <QFileInfo>
-# include <QVBoxLayout>
+#include <QFileInfo>
+#include <QVBoxLayout>
 
 /* Local includes: */
-# include "UIWizardImportAppPageBasic1.h"
-# include "UIWizardImportAppPageBasic2.h"
-# include "UIWizardImportApp.h"
-# include "VBoxGlobal.h"
-# include "UIEmptyFilePathSelector.h"
-# include "QIRichTextLabel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIWizardImportAppPageBasic1.h"
+#include "UIWizardImportAppPageBasic2.h"
+#include "UIWizardImportApp.h"
+#include "VBoxGlobal.h"
+#include "UIEmptyFilePathSelector.h"
+#include "QIRichTextLabel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageBasic2.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Global includes: */
-# include <QLabel>
-# include <QPointer>
-# include <QPushButton>
-# include <QTextBrowser>
-# include <QVBoxLayout>
+#include <QLabel>
+#include <QPointer>
+#include <QPushButton>
+#include <QTextBrowser>
+#include <QVBoxLayout>
 
 /* Local includes: */
-# include "QIDialogButtonBox.h"
-# include "QIRichTextLabel.h"
-# include "UIWizardImportApp.h"
-# include "UIWizardImportAppPageBasic2.h"
+#include "QIDialogButtonBox.h"
+#include "QIRichTextLabel.h"
+#include "UIWizardImportApp.h"
+#include "UIWizardImportAppPageBasic2.h"
 
 /* COM includes: */
-# include "CAppliance.h"
-# include "CCertificate.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CAppliance.h"
+#include "CCertificate.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/importappliance/UIWizardImportAppPageExpert.cpp	(revision 76606)
@@ -16,21 +16,15 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Global includes: */
-# include <QFileInfo>
-# include <QVBoxLayout>
-# include <QGroupBox>
+#include <QFileInfo>
+#include <QVBoxLayout>
+#include <QGroupBox>
 
 /* Local includes: */
-# include "UIWizardImportAppPageExpert.h"
-# include "UIWizardImportApp.h"
-# include "VBoxGlobal.h"
-# include "UIEmptyFilePathSelector.h"
-# include "UIApplianceImportEditorWidget.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIWizardImportAppPageExpert.h"
+#include "UIWizardImportApp.h"
+#include "VBoxGlobal.h"
+#include "UIEmptyFilePathSelector.h"
+#include "UIApplianceImportEditorWidget.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVD.cpp	(revision 76606)
@@ -16,25 +16,19 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVariant>
+#include <QVariant>
 
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIWizardNewVD.h"
-# include "UIWizardNewVDPageBasic1.h"
-# include "UIWizardNewVDPageBasic2.h"
-# include "UIWizardNewVDPageBasic3.h"
-# include "UIWizardNewVDPageExpert.h"
-# include "UIMessageCenter.h"
-# include "UIMedium.h"
+#include "VBoxGlobal.h"
+#include "UIWizardNewVD.h"
+#include "UIWizardNewVDPageBasic1.h"
+#include "UIWizardNewVDPageBasic2.h"
+#include "UIWizardNewVDPageBasic3.h"
+#include "UIWizardNewVDPageExpert.h"
+#include "UIMessageCenter.h"
+#include "UIMedium.h"
 
 /* COM includes: */
-# include "CMediumFormat.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMediumFormat.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic1.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QButtonGroup>
-# include <QRadioButton>
+#include <QVBoxLayout>
+#include <QButtonGroup>
+#include <QRadioButton>
 
 /* GUI includes: */
-# include "UIConverter.h"
-# include "UIWizardNewVDPageBasic1.h"
-# include "UIWizardNewVD.h"
-# include "VBoxGlobal.h"
-# include "QIRichTextLabel.h"
+#include "UIConverter.h"
+#include "UIWizardNewVDPageBasic1.h"
+#include "UIWizardNewVD.h"
+#include "VBoxGlobal.h"
+#include "QIRichTextLabel.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic2.cpp	(revision 76606)
@@ -16,23 +16,17 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QVBoxLayout>
-# include <QButtonGroup>
-# include <QRadioButton>
-# include <QCheckBox>
+#include <QVBoxLayout>
+#include <QButtonGroup>
+#include <QRadioButton>
+#include <QCheckBox>
 
 /* GUI includes: */
-# include "UIWizardNewVDPageBasic2.h"
-# include "UIWizardNewVD.h"
-# include "QIRichTextLabel.h"
+#include "UIWizardNewVDPageBasic2.h"
+#include "UIWizardNewVD.h"
+#include "QIRichTextLabel.h"
 
 /* COM includes: */
-# include "CMediumFormat.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CMediumFormat.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageBasic3.cpp	(revision 76606)
@@ -16,35 +16,29 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QRegExpValidator>
-# include <QVBoxLayout>
-# include <QHBoxLayout>
-# include <QLineEdit>
-# include <QSlider>
-# include <QLabel>
-# include <QSpacerItem>
+#include <QDir>
+#include <QRegExpValidator>
+#include <QVBoxLayout>
+#include <QHBoxLayout>
+#include <QLineEdit>
+#include <QSlider>
+#include <QLabel>
+#include <QSpacerItem>
 
 /* GUI includes: */
-# include "UIWizardNewVDPageBasic3.h"
-# include "UIWizardNewVD.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIIconPool.h"
-# include "QIFileDialog.h"
-# include "QIRichTextLabel.h"
-# include "QIToolButton.h"
-# include "QILineEdit.h"
-# include "UIMediumSizeEditor.h"
+#include "UIWizardNewVDPageBasic3.h"
+#include "UIWizardNewVD.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
+#include "UIIconPool.h"
+#include "QIFileDialog.h"
+#include "QIRichTextLabel.h"
+#include "QIToolButton.h"
+#include "QILineEdit.h"
+#include "UIMediumSizeEditor.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-# include "CMediumFormat.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
+#include "CMediumFormat.h"
 
 /* Other VBox includes: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp	(revision 76606)
@@ -16,36 +16,30 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGridLayout>
-# include <QVBoxLayout>
-# include <QRegExpValidator>
-# include <QGroupBox>
-# include <QRadioButton>
-# include <QCheckBox>
-# include <QButtonGroup>
-# include <QLineEdit>
-# include <QSlider>
-# include <QLabel>
+#include <QGridLayout>
+#include <QVBoxLayout>
+#include <QRegExpValidator>
+#include <QGroupBox>
+#include <QRadioButton>
+#include <QCheckBox>
+#include <QButtonGroup>
+#include <QLineEdit>
+#include <QSlider>
+#include <QLabel>
 
 /* GUI includes: */
-# include "UIConverter.h"
-# include "UIWizardNewVDPageExpert.h"
-# include "UIWizardNewVD.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UIIconPool.h"
-# include "QIRichTextLabel.h"
-# include "QIToolButton.h"
-# include "QILineEdit.h"
-# include "UIMediumSizeEditor.h"
+#include "UIConverter.h"
+#include "UIWizardNewVDPageExpert.h"
+#include "UIWizardNewVD.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
+#include "UIIconPool.h"
+#include "QIRichTextLabel.h"
+#include "QIToolButton.h"
+#include "QILineEdit.h"
+#include "UIMediumSizeEditor.h"
 
 /* COM includes: */
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVM.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* GUI includes: */
-# include "VBoxGlobal.h"
-# include "UIWizardNewVM.h"
-# include "UIWizardNewVMPageBasic1.h"
-# include "UIWizardNewVMPageBasic2.h"
-# include "UIWizardNewVMPageBasic3.h"
-# include "UIWizardNewVMPageExpert.h"
-# include "UIMessageCenter.h"
-# include "UIMedium.h"
+#include "VBoxGlobal.h"
+#include "UIWizardNewVM.h"
+#include "UIWizardNewVMPageBasic1.h"
+#include "UIWizardNewVMPageBasic2.h"
+#include "UIWizardNewVMPageBasic3.h"
+#include "UIWizardNewVMPageExpert.h"
+#include "UIMessageCenter.h"
+#include "UIMedium.h"
 
 /* COM includes: */
-# include "CAudioAdapter.h"
-# include "CUSBController.h"
-# include "CUSBDeviceFilters.h"
-# include "CExtPackManager.h"
-# include "CStorageController.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CAudioAdapter.h"
+#include "CUSBController.h"
+#include "CUSBDeviceFilters.h"
+#include "CExtPackManager.h"
+#include "CStorageController.h"
 
 /* Namespaces: */
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 76606)
@@ -16,27 +16,21 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QDir>
-# include <QLineEdit>
-# include <QHBoxLayout>
-# include <QVBoxLayout>
+#include <QDir>
+#include <QLineEdit>
+#include <QHBoxLayout>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIRichTextLabel.h"
-# include "VBoxGlobal.h"
-# include "UIMessageCenter.h"
-# include "UINameAndSystemEditor.h"
-# include "UIWizardNewVMPageBasic1.h"
-# include "UIWizardNewVM.h"
+#include "QIRichTextLabel.h"
+#include "VBoxGlobal.h"
+#include "UIMessageCenter.h"
+#include "UINameAndSystemEditor.h"
+#include "UIWizardNewVMPageBasic1.h"
+#include "UIWizardNewVM.h"
 
 /* COM includes: */
-# include "CHost.h"
-# include "CSystemProperties.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "CHost.h"
+#include "CSystemProperties.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic2.cpp	(revision 76606)
@@ -16,24 +16,18 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QIntValidator>
-# include <QVBoxLayout>
-# include <QGridLayout>
-# include <QSpacerItem>
-# include <QLabel>
-# include <QSpinBox>
+#include <QIntValidator>
+#include <QVBoxLayout>
+#include <QGridLayout>
+#include <QSpacerItem>
+#include <QLabel>
+#include <QSpinBox>
 
 /* GUI includes: */
-# include "UIWizardNewVMPageBasic2.h"
-# include "UIWizardNewVM.h"
-# include "VBoxGlobal.h"
-# include "UIGuestRAMSlider.h"
-# include "QIRichTextLabel.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "UIWizardNewVMPageBasic2.h"
+#include "UIWizardNewVM.h"
+#include "VBoxGlobal.h"
+#include "UIGuestRAMSlider.h"
+#include "QIRichTextLabel.h"
 
 
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic3.cpp	(revision 76606)
@@ -16,26 +16,20 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGridLayout>
-# include <QMetaType>
-# include <QRadioButton>
-# include <QVBoxLayout>
+#include <QGridLayout>
+#include <QMetaType>
+#include <QRadioButton>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIRichTextLabel.h"
-# include "QIToolButton.h"
-# include "UIIconPool.h"
-# include "UIMediaComboBox.h"
-# include "UIMedium.h"
-# include "UIMessageCenter.h"
-# include "UIWizardNewVD.h"
-# include "UIWizardNewVM.h"
-# include "UIWizardNewVMPageBasic3.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIRichTextLabel.h"
+#include "QIToolButton.h"
+#include "UIIconPool.h"
+#include "UIMediaComboBox.h"
+#include "UIMedium.h"
+#include "UIMessageCenter.h"
+#include "UIWizardNewVD.h"
+#include "UIWizardNewVM.h"
+#include "UIWizardNewVMPageBasic3.h"
 
 UIWizardNewVMPage3::UIWizardNewVMPage3()
Index: trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
===================================================================
--- trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 76605)
+++ trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp	(revision 76606)
@@ -16,30 +16,24 @@
  */
 
-#ifdef VBOX_WITH_PRECOMPILED_HEADERS
-# include <precomp.h>
-#else  /* !VBOX_WITH_PRECOMPILED_HEADERS */
-
 /* Qt includes: */
-# include <QGridLayout>
-# include <QGroupBox>
-# include <QHBoxLayout>
-# include <QLabel>
-# include <QLineEdit>
-# include <QRadioButton>
-# include <QSpacerItem>
-# include <QSpinBox>
-# include <QVBoxLayout>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QRadioButton>
+#include <QSpacerItem>
+#include <QSpinBox>
+#include <QVBoxLayout>
 
 /* GUI includes: */
-# include "QIToolButton.h"
-# include "UIGuestRAMSlider.h"
-# include "UIIconPool.h"
-# include "UIMediaComboBox.h"
-# include "UIMedium.h"
-# include "UINameAndSystemEditor.h"
-# include "UIWizardNewVM.h"
-# include "UIWizardNewVMPageExpert.h"
-
-#endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+#include "QIToolButton.h"
+#include "UIGuestRAMSlider.h"
+#include "UIIconPool.h"
+#include "UIMediaComboBox.h"
+#include "UIMedium.h"
+#include "UINameAndSystemEditor.h"
+#include "UIWizardNewVM.h"
+#include "UIWizardNewVMPageExpert.h"
 
 
