Index: /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk	(revision 49596)
@@ -123,4 +123,8 @@
  VirtualBox_DEFS        += VBOX_GUI_USE_QGL
 endif
+ifdef VBOX_WITH_LIBCURL
+ VirtualBox_DEFS        += VBOX_GUI_WITH_NETWORK_MANAGER
+ VBOX_GUI_WITH_NETWORK_MANAGER := 1
+endif
 ifdef VBOX_BLEEDING_EDGE
 VirtualBox_src/selector/UISelectorWindow.cpp_DEFS += \
@@ -141,5 +145,4 @@
 	./src/extensions/graphics \
 	./src/globals \
-	./src/net \
 	./src/medium \
 	./src/platform \
@@ -169,4 +172,9 @@
 	./src/wizards/firstrun
 
+ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+VBOX_GUI_INC_DIRS += \
+	./src/net
+endif
+	
 VirtualBox_INCS = \
 	$(VBOX_GUI_INC_DIRS) \
@@ -279,16 +287,4 @@
 	src/globals/VBoxGlobal.h \
 	src/globals/VBoxUtils.h \
-	src/net/UINetworkManager.h \
-	src/net/UINetworkManagerDialog.h \
-	src/net/UINetworkManagerIndicator.h \
-	src/net/UINetworkRequest.h \
-	src/net/UINetworkRequestWidget.h \
-	src/net/UINetworkReply.h \
-	src/net/UINetworkCustomer.h \
-	src/net/UIUpdateManager.h \
-	src/net/UIDownloader.h \
-	src/net/UIDownloaderAdditions.h \
-	src/net/UIDownloaderExtensionPack.h \
-	src/net/UIDownloaderUserManual.h \
 	src/medium/UIMediumEnumerator.h \
 	src/medium/UIMediumManager.h \
@@ -358,6 +354,4 @@
 	src/settings/global/UIGlobalSettingsNetworkDetailsHost.h \
 	src/settings/global/UIGlobalSettingsPortForwardingDlg.h \
-	src/settings/global/UIGlobalSettingsProxy.h \
-	src/settings/global/UIGlobalSettingsUpdate.h \
 	src/settings/machine/UIMachineSettingsAudio.h \
 	src/settings/machine/UIMachineSettingsDisplay.h \
@@ -438,4 +432,22 @@
 	src/wizards/firstrun/UIWizardFirstRunPageBasic.h
 
+ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+VirtualBox_QT_MOCHDRS += \
+	src/net/UINetworkManager.h \
+	src/net/UINetworkManagerDialog.h \
+	src/net/UINetworkManagerIndicator.h \
+	src/net/UINetworkRequest.h \
+	src/net/UINetworkRequestWidget.h \
+	src/net/UINetworkReply.h \
+	src/net/UINetworkCustomer.h \
+	src/net/UIUpdateManager.h \
+	src/net/UIDownloader.h \
+	src/net/UIDownloaderAdditions.h \
+	src/net/UIDownloaderExtensionPack.h \
+	src/net/UIDownloaderUserManual.h \
+	src/settings/global/UIGlobalSettingsProxy.h \
+	src/settings/global/UIGlobalSettingsUpdate.h
+endif
+
 VirtualBox_QT_MOCHDRS.darwin += \
     src/platform/darwin/UIWindowMenuManager.h
@@ -451,6 +463,4 @@
 	src/medium/UIMediumEnumerator.cpp \
 	src/medium/UIMediumManager.cpp \
-	src/net/UINetworkReply.cpp \
-	src/net/UIUpdateManager.cpp \
 	src/runtime/UIActionPoolRuntime.cpp \
 	src/runtime/UIIndicatorsPool.cpp \
@@ -465,4 +475,10 @@
 	src/widgets/UIPortForwardingTable.cpp \
 	src/wizards/importappliance/UIWizardImportApp.cpp
+
+ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+VirtualBox_QT_MOCSRCS += \
+	src/net/UINetworkReply.cpp \
+	src/net/UIUpdateManager.cpp
+endif
 
 VirtualBox_QT_MOCSRCS.darwin += \
@@ -533,17 +549,4 @@
 	src/medium/UIMediumEnumerator.cpp \
 	src/medium/UIMediumManager.cpp \
-	src/net/UINetworkManager.cpp \
-	src/net/UINetworkManagerDialog.cpp \
-	src/net/UINetworkManagerIndicator.cpp \
-	src/net/UINetworkRequest.cpp \
-	src/net/UINetworkRequestWidget.cpp \
-	src/net/UINetworkReply.cpp \
-	src/net/UINetworkCustomer.cpp \
-	src/net/UIDownloader.cpp \
-	src/net/UIDownloaderAdditions.cpp \
-	src/net/UIDownloaderExtensionPack.cpp \
-	src/net/UIDownloaderUserManual.cpp \
-	src/net/UIUpdateDefs.cpp \
-	src/net/UIUpdateManager.cpp \
 	src/runtime/UIActionPoolRuntime.cpp \
 	src/runtime/UIConsoleEventHandler.cpp \
@@ -614,6 +617,4 @@
 	src/settings/global/UIGlobalSettingsNetworkDetailsHost.cpp \
 	src/settings/global/UIGlobalSettingsPortForwardingDlg.cpp \
-	src/settings/global/UIGlobalSettingsProxy.cpp \
-	src/settings/global/UIGlobalSettingsUpdate.cpp \
 	src/settings/machine/UIMachineSettingsAudio.cpp \
 	src/settings/machine/UIMachineSettingsDisplay.cpp \
@@ -695,4 +696,23 @@
 	src/wizards/firstrun/UIWizardFirstRunPageBasic.cpp
 
+ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+VirtualBox_SOURCES += \
+	src/net/UINetworkManager.cpp \
+	src/net/UINetworkManagerDialog.cpp \
+	src/net/UINetworkManagerIndicator.cpp \
+	src/net/UINetworkRequest.cpp \
+	src/net/UINetworkRequestWidget.cpp \
+	src/net/UINetworkReply.cpp \
+	src/net/UINetworkCustomer.cpp \
+	src/net/UIDownloader.cpp \
+	src/net/UIDownloaderAdditions.cpp \
+	src/net/UIDownloaderExtensionPack.cpp \
+	src/net/UIDownloaderUserManual.cpp \
+	src/net/UIUpdateDefs.cpp \
+	src/net/UIUpdateManager.cpp \
+	src/settings/global/UIGlobalSettingsProxy.cpp \
+	src/settings/global/UIGlobalSettingsUpdate.cpp
+endif
+
 VirtualBox_SOURCES.darwin += \
 	src/platform/darwin/UIAbstractDockIconPreview.cpp \
Index: /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp	(revision 49596)
@@ -517,10 +517,14 @@
         case GlobalSettingsPageType_General:    strResult = "General"; break;
         case GlobalSettingsPageType_Input:      strResult = "Input"; break;
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
         case GlobalSettingsPageType_Update:     strResult = "Update"; break;
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
         case GlobalSettingsPageType_Language:   strResult = "Language"; break;
         case GlobalSettingsPageType_Display:    strResult = "Display"; break;
         case GlobalSettingsPageType_Network:    strResult = "Network"; break;
         case GlobalSettingsPageType_Extensions: strResult = "Extensions"; break;
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
         case GlobalSettingsPageType_Proxy:      strResult = "Proxy"; break;
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
         default:
         {
@@ -540,10 +544,14 @@
     keys << "General";    values << GlobalSettingsPageType_General;
     keys << "Input";      values << GlobalSettingsPageType_Input;
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     keys << "Update";     values << GlobalSettingsPageType_Update;
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     keys << "Language";   values << GlobalSettingsPageType_Language;
     keys << "Display";    values << GlobalSettingsPageType_Display;
     keys << "Network";    values << GlobalSettingsPageType_Network;
     keys << "Extensions"; values << GlobalSettingsPageType_Extensions;
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     keys << "Proxy";      values << GlobalSettingsPageType_Proxy;
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     /* Invalid type for unknown words: */
     if (!keys.contains(strGlobalSettingsPageType, Qt::CaseInsensitive))
@@ -560,10 +568,14 @@
         case GlobalSettingsPageType_General:    return QPixmap(":/machine_warning_16px.png");
         case GlobalSettingsPageType_Input:      return QPixmap(":/hostkey_warning_16px.png");
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
         case GlobalSettingsPageType_Update:     return QPixmap(":/refresh_warning_16px.png");
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
         case GlobalSettingsPageType_Language:   return QPixmap(":/site_warning_16px.png");
         case GlobalSettingsPageType_Display:    return QPixmap(":/vrdp_warning_16px.png");
         case GlobalSettingsPageType_Network:    return QPixmap(":/nw_warning_16px.png");
         case GlobalSettingsPageType_Extensions: return QPixmap(":/extension_pack_warning_16px.png");
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
         case GlobalSettingsPageType_Proxy:      return QPixmap(":/proxy_warning_16px.png");
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
         default: AssertMsgFailed(("No pixmap for %d", type)); break;
     }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.cpp	(revision 49596)
@@ -432,4 +432,5 @@
 };
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 class UIActionSimpleNetworkAccessManager : public UIActionSimple
 {
@@ -484,4 +485,5 @@
     }
 };
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 class UIActionSimpleAbout : public UIActionSimple
@@ -650,6 +652,8 @@
     m_pool[UIActionIndex_Simple_WebSite] = new UIActionSimpleWebSite(this);
     m_pool[UIActionIndex_Simple_ResetWarnings] = new UIActionSimpleResetWarnings(this);
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     m_pool[UIActionIndex_Simple_NetworkAccessManager] = new UIActionSimpleNetworkAccessManager(this);
     m_pool[UIActionIndex_Simple_CheckForUpdates] = new UIActionSimpleCheckForUpdates(this);
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     m_pool[UIActionIndex_Simple_About] = new UIActionSimpleAbout(this);
 }
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIActionPool.h	(revision 49596)
@@ -58,6 +58,8 @@
     UIActionIndex_Simple_WebSite,
     UIActionIndex_Simple_ResetWarnings,
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     UIActionIndex_Simple_NetworkAccessManager,
     UIActionIndex_Simple_CheckForUpdates,
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     UIActionIndex_Simple_About,
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.cpp	(revision 49596)
@@ -32,5 +32,4 @@
 const char* UIDefs::GUI_RecentListCD = "GUI/RecentListCD";
 const char* UIDefs::GUI_RecentListFD = "GUI/RecentListFD";
-const char* UIDefs::GUI_PreventApplicationUpdate = "GUI/PreventApplicationUpdate";
 
 /* Selector-window definitions: */
@@ -97,7 +96,10 @@
 const char* UIDefs::GUI_InvertMessageOption = "GUI/InvertMessageOption";
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 /* Update manager definitions: */
+const char* UIDefs::GUI_PreventApplicationUpdate = "GUI/PreventApplicationUpdate";
 const char* UIDefs::GUI_UpdateDate = "GUI/UpdateDate";
 const char* UIDefs::GUI_UpdateCheckCount = "GUI/UpdateCheckCount";
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 /* Information dialog definitions: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(revision 49596)
@@ -101,5 +101,4 @@
     extern const char* GUI_RecentListCD;
     extern const char* GUI_RecentListFD;
-    extern const char* GUI_PreventApplicationUpdate;
 
     /* Selector-window declarations: */
@@ -166,7 +165,10 @@
     extern const char* GUI_InvertMessageOption;
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* Update manager declarations: */
+    extern const char* GUI_PreventApplicationUpdate;
     extern const char* GUI_UpdateDate;
     extern const char* GUI_UpdateCheckCount;
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
     /* Information dialog declarations: */
@@ -300,10 +302,14 @@
     GlobalSettingsPageType_General,
     GlobalSettingsPageType_Input,
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     GlobalSettingsPageType_Update,
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     GlobalSettingsPageType_Language,
     GlobalSettingsPageType_Display,
     GlobalSettingsPageType_Network,
     GlobalSettingsPageType_Extensions,
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     GlobalSettingsPageType_Proxy,
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     GlobalSettingsPageType_Max
 };
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp	(revision 49596)
@@ -35,6 +35,8 @@
 #include "UISelectorWindow.h"
 #include "UIProgressDialog.h"
-#include "UINetworkManager.h"
-#include "UINetworkManagerDialog.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManager.h"
+# include "UINetworkManagerDialog.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 #include "UIModalWindowManager.h"
 #include "UIMedium.h"
@@ -1982,4 +1984,14 @@
 }
 
+void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) const
+{
+    alert(0, MessageType_Error,
+          tr("<p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, "
+             "as the machine has no CD/DVD drives. Please add a drive using the storage page of the "
+             "virtual machine settings window.</p>")
+             .arg(strMachineName));
+}
+
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 bool UIMessageCenter::confirmCancelingAllNetworkRequests() const
 {
@@ -2053,13 +2065,4 @@
 }
 
-void UIMessageCenter::cannotMountGuestAdditions(const QString &strMachineName) const
-{
-    alert(0, MessageType_Error,
-          tr("<p>Could not insert the <b>VirtualBox Guest Additions</b> disk image file into the virtual machine <b>%1</b>, "
-             "as the machine has no CD/DVD drives. Please add a drive using the storage page of the "
-             "virtual machine settings window.</p>")
-             .arg(strMachineName));
-}
-
 void UIMessageCenter::cannotUpdateGuestAdditions(const CProgress &progress) const
 {
@@ -2150,4 +2153,5 @@
                           tr("Install", "extension pack"));
 }
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 bool UIMessageCenter::confirmInstallExtensionPack(const QString &strPackName, const QString &strPackVersion,
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h	(revision 49596)
@@ -300,5 +300,7 @@
     void cannotToggleVideoCapture(const CMachine &machine, bool fEnable);
     void remindAboutGuestAdditionsAreNotActive() const;
-
+    void cannotMountGuestAdditions(const QString &strMachineName) const;
+
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* API: Network management warnings: */
     bool confirmCancelingAllNetworkRequests() const;
@@ -312,5 +314,4 @@
     void cannotSaveGuestAdditions(const QString &strURL, const QString &strTarget) const;
     bool proposeMountGuestAdditions(const QString &strUrl, const QString &strSrc) const;
-    void cannotMountGuestAdditions(const QString &strMachineName) const;
     void cannotUpdateGuestAdditions(const CProgress &progress) const;
     bool cannotFindUserManual(const QString &strMissedLocation) const;
@@ -322,4 +323,7 @@
     void cannotSaveExtensionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const;
     bool proposeInstallExtentionPack(const QString &strExtPackName, const QString &strFrom, const QString &strTo) const;
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
+
+    /* API: Extension-pack warnings: */
     bool confirmInstallExtensionPack(const QString &strPackName, const QString &strPackVersion, const QString &strPackDescription, QWidget *pParent = 0) const;
     bool confirmReplaceExtensionPack(const QString &strPackName, const QString &strPackVersionNew, const QString &strPackVersionOld,
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.cpp	(revision 49596)
@@ -20,6 +20,8 @@
 /* GUI includes: */
 #include "UIModalWindowManager.h"
-#include "UINetworkManagerDialog.h"
-#include "UINetworkManager.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManagerDialog.h"
+# include "UINetworkManager.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 #include "UISelectorWindow.h"
 #include "UIProgressDialog.h"
@@ -101,4 +103,5 @@
 }
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 QWidget* UIModalWindowManager::networkManagerOrMainWindowShown() const
 {
@@ -107,4 +110,5 @@
     return gNetworkManager && gNetworkManager->window()->isVisible() ? gNetworkManager->window() : mainWindowShown();
 }
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 QWidget* UIModalWindowManager::realParentWindow(QWidget *pWidget)
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.h	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/UIModalWindowManager.h	(revision 49596)
@@ -48,5 +48,7 @@
     /* API: Main application window stuff: */
     QWidget* mainWindowShown() const;
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     QWidget* networkManagerOrMainWindowShown() const;
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 private slots:
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 49596)
@@ -34,5 +34,7 @@
 #include <QDir>
 #include <QLocale>
-#include <QNetworkProxy>
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include <QNetworkProxy>
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 #include <QSpinBox>
 #include <QStyleOptionSpinBox>
@@ -66,6 +68,8 @@
 #include "UIExtraDataEventHandler.h"
 #include "QIFileDialog.h"
-#include "UINetworkManager.h"
-#include "UIUpdateManager.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManager.h"
+# include "UIUpdateManager.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 #include "UIMachine.h"
 #include "UISession.h"
@@ -1682,4 +1686,5 @@
 }
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 void VBoxGlobal::reloadProxySettings()
 {
@@ -1713,4 +1718,5 @@
     }
 }
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 void VBoxGlobal::createMedium(const UIMedium &medium)
@@ -3409,4 +3415,5 @@
 }
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 /* static */
 bool VBoxGlobal::shouldWeAllowApplicationUpdate(CVirtualBox &vbox)
@@ -3415,4 +3422,5 @@
     return !isApprovedByExtraData(vbox, GUI_PreventApplicationUpdate);
 }
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 /* static */
@@ -3795,6 +3803,8 @@
 void VBoxGlobal::sltProcessGlobalSettingChange()
 {
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* Reload proxy settings: */
     reloadProxySettings();
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 }
 
@@ -4384,4 +4394,5 @@
     }
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* Create network manager: */
     UINetworkManager::create();
@@ -4389,4 +4400,5 @@
     /* Schedule update manager: */
     UIUpdateManager::schedule();
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 }
 
@@ -4397,4 +4409,5 @@
     m_sfCleanupInProgress = true;
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* Shutdown update manager: */
     UIUpdateManager::shutdown();
@@ -4402,4 +4415,5 @@
     /* Destroy network manager: */
     UINetworkManager::destroy();
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
     /* Destroy action pool: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h	(revision 49596)
@@ -248,5 +248,7 @@
     CSession openExistingSession(const QString &aId) { return openSession(aId, KLockType_Shared); }
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     void reloadProxySettings();
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
     /* API: Medium-processing stuff: */
@@ -349,5 +351,7 @@
     static bool isApprovedByExtraData(CVirtualBox &vbox, const QString &strExtraDataKey);
     static bool isApprovedByExtraData(CMachine &machine, const QString &strExtraDataKey);
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     static bool shouldWeAllowApplicationUpdate(CVirtualBox &vbox);
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     static bool shouldWeShowMachine(CMachine &machine);
     static bool shouldWeAllowMachineReconfiguration(CMachine &machine,
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	(revision 49596)
@@ -31,6 +31,8 @@
 #include "QIFileDialog.h"
 #include "UIActionPoolRuntime.h"
-#include "UINetworkManager.h"
-#include "UIDownloaderAdditions.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManager.h"
+# include "UIDownloaderAdditions.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 #include "UIIconPool.h"
 #include "UIKeyboardHandler.h"
@@ -2163,4 +2165,5 @@
     }
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* If downloader is running already: */
     if (UIDownloaderAdditions::current())
@@ -2179,4 +2182,5 @@
         pDl->start();
     }
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 }
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp	(revision 49596)
@@ -29,5 +29,7 @@
 #include "UIMessageCenter.h"
 #include "UIImageTools.h"
-#include "UINetworkManager.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManager.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 /* COM includes: */
@@ -303,5 +305,7 @@
     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_ResetWarnings));
     pMenu->addSeparator();
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     pMenu->addAction(gActionPool->action(UIActionIndex_Simple_NetworkAccessManager));
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 #ifndef Q_WS_MAC
     pMenu->addSeparator();
@@ -316,6 +320,8 @@
     VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_ResetWarnings), SIGNAL(triggered()),
                         &msgCenter(), SLOT(sltResetSuppressedMessages()));
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_NetworkAccessManager), SIGNAL(triggered()),
                         gNetworkManager, SLOT(show()));
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     VBoxGlobal::connect(gActionPool->action(UIActionIndex_Simple_About), SIGNAL(triggered()),
                         &msgCenter(), SLOT(sltShowHelpAboutDialog()));
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineLogicNormal.cpp	(revision 49596)
@@ -26,7 +26,4 @@
 #include "UIMachineLogicNormal.h"
 #include "UIMachineWindow.h"
-#include "UIDownloaderAdditions.h"
-#include "UIDownloaderUserManual.h"
-#include "UIDownloaderExtensionPack.h"
 #ifdef Q_WS_MAC
 #include "VBoxUtils.h"
Index: /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineLogicScale.cpp	(revision 49596)
@@ -23,6 +23,4 @@
 #include "UIMachineLogicScale.h"
 #include "UIMachineWindow.h"
-#include "UIDownloaderAdditions.h"
-#include "UIDownloaderExtensionPack.h"
 #ifdef Q_WS_MAC
 #include "VBoxUtils.h"
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.cpp	(revision 49596)
@@ -34,9 +34,11 @@
 #include "QIFileDialog.h"
 #include "UIBar.h"
-#include "UINetworkManager.h"
-#include "UINetworkManagerIndicator.h"
-#include "UIUpdateManager.h"
-#include "UIDownloaderUserManual.h"
-#include "UIDownloaderExtensionPack.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UINetworkManager.h"
+# include "UINetworkManagerIndicator.h"
+# include "UIUpdateManager.h"
+# include "UIDownloaderUserManual.h"
+# include "UIDownloaderExtensionPack.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 #include "UIIconPool.h"
 #include "UIWizardCloneVM.h"
@@ -1322,4 +1324,5 @@
     m_pResetWarningsAction = gActionPool->action(UIActionIndex_Simple_ResetWarnings);
     pMenu->addAction(m_pResetWarningsAction);
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     pMenu->addSeparator();
     m_pNetworkAccessManager = gActionPool->action(UIActionIndex_Simple_NetworkAccessManager);
@@ -1331,4 +1334,5 @@
     else
         m_pUpdateAction->setEnabled(false);
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 #ifndef Q_WS_MAC
     pMenu->addSeparator();
@@ -1340,4 +1344,5 @@
 void UISelectorWindow::prepareStatusBar()
 {
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* Setup statusbar policy: */
     statusBar()->setContextMenuPolicy(Qt::CustomContextMenu);
@@ -1347,4 +1352,5 @@
     statusBar()->addPermanentWidget(pIndicator);
     pIndicator->updateAppearance();
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 }
 
@@ -1462,6 +1468,8 @@
     connect(m_pWebAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpWebDialog()));
     connect(m_pResetWarningsAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltResetSuppressedMessages()));
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     connect(m_pNetworkAccessManager, SIGNAL(triggered()), gNetworkManager, SLOT(show()));
     connect(m_pUpdateAction, SIGNAL(triggered()), gUpdateManager, SLOT(sltForceCheck()));
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
     connect(m_pAboutAction, SIGNAL(triggered()), &msgCenter(), SLOT(sltShowHelpAboutDialog()));
 
Index: /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/selector/UISelectorWindow.h	(revision 49596)
@@ -26,5 +26,4 @@
 /* GUI includes: */
 #include "QIWithRetranslateUI.h"
-#include "UINetworkDefs.h"
 
 /* Forward declarations: */
Index: /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	(revision 49595)
+++ /trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp	(revision 49596)
@@ -36,10 +36,14 @@
 #include "UIGlobalSettingsGeneral.h"
 #include "UIGlobalSettingsInput.h"
-#include "UIGlobalSettingsUpdate.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UIGlobalSettingsUpdate.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 #include "UIGlobalSettingsLanguage.h"
 #include "UIGlobalSettingsDisplay.h"
 #include "UIGlobalSettingsNetwork.h"
 #include "UIGlobalSettingsExtension.h"
-#include "UIGlobalSettingsProxy.h"
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
+# include "UIGlobalSettingsProxy.h"
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
 #include "UIMachineSettingsGeneral.h"
@@ -355,4 +359,5 @@
                     break;
                 }
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
                 /* Update page: */
                 case GlobalSettingsPageType_Update:
@@ -364,4 +369,5 @@
                     break;
                 }
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
                 /* Language page: */
                 case GlobalSettingsPageType_Language:
@@ -400,4 +406,5 @@
                     break;
                 }
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
                 /* Proxy page: */
                 case GlobalSettingsPageType_Proxy:
@@ -409,4 +416,5 @@
                     break;
                 }
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
                 default:
                     break;
@@ -490,6 +498,8 @@
     m_pSelector->setItemText(GlobalSettingsPageType_Input, tr("Input"));
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* Update page: */
     m_pSelector->setItemText(GlobalSettingsPageType_Update, tr("Update"));
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
     /* Language page: */
@@ -505,6 +515,8 @@
     m_pSelector->setItemText(GlobalSettingsPageType_Extensions, tr("Extensions"));
 
+#ifdef VBOX_GUI_WITH_NETWORK_MANAGER
     /* Proxy page: */
     m_pSelector->setItemText(GlobalSettingsPageType_Proxy, tr("Proxy"));
+#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
 
     /* Polish the selector: */