diff --git a/src/global.h b/src/global.h
index da997a295..afacd8499 100644
--- a/src/global.h
+++ b/src/global.h
@@ -100,4 +100,6 @@ NEUTRINO_CPP CLocaleManager	*g_Locale;
 NEUTRINO_CPP CVideoSettings	*g_videoSettings;
 NEUTRINO_CPP CRadioText		*g_Radiotext;
 
+// #define ENABLE_GUI_MOUNT
+
 #endif /* __neutrino_global_h__ */
diff --git a/src/gui/audioplayer.cpp b/src/gui/audioplayer.cpp
index f1575dc43..3e99f7b5c 100644
--- a/src/gui/audioplayer.cpp
+++ b/src/gui/audioplayer.cpp
@@ -53,7 +53,6 @@
 #include <gui/color.h>
 #include <gui/infoviewer.h>
 
-#define ENABLE_GUI_MOUNT
 #ifdef ENABLE_GUI_MOUNT
 #include <gui/nfs.h>
 #endif
diff --git a/src/gui/network_setup.cpp b/src/gui/network_setup.cpp
index db7a36d48..13d81ea53 100644
--- a/src/gui/network_setup.cpp
+++ b/src/gui/network_setup.cpp
@@ -337,12 +337,14 @@ int CNetworkSetup::showNetworkSetup()
 
 	showNetworkNTPSetup(&ntp);
 
+#ifdef ENABLE_GUI_MOUNT
 	//nfs mount submenu
 	CMenuWidget networkmounts(LOCALE_MAINSETTINGS_NETWORK, NEUTRINO_ICON_SETTINGS, width, MN_WIDGET_ID_NETWORKSETUP_MOUNTS);
 	mf = new CMenuForwarder(LOCALE_NETWORKMENU_MOUNT, true, NULL, &networkmounts, NULL, CRCInput::RC_blue, NEUTRINO_ICON_BUTTON_BLUE);
 	mf->setHint("", LOCALE_MENU_HINT_NET_MOUNT);
 	networkSettings->addItem(mf);
 	showNetworkNFSMounts(&networkmounts);
+#endif
 
 	//proxyserver submenu
 	CProxySetup proxy(LOCALE_MAINSETTINGS_NETWORK);
@@ -393,6 +395,7 @@ void CNetworkSetup::showNetworkNTPSetup(CMenuWidget *menu_ntp)
 	menu_ntp->addItem( ntp3);
 }
 
+#ifdef ENABLE_GUI_MOUNT
 void CNetworkSetup::showNetworkNFSMounts(CMenuWidget *menu_nfs)
 {
 	menu_nfs->addIntroItems(LOCALE_NETWORKMENU_MOUNT);
@@ -403,6 +406,7 @@ void CNetworkSetup::showNetworkNFSMounts(CMenuWidget *menu_nfs)
 	mf->setHint("", LOCALE_MENU_HINT_NET_NFS_UMOUNT);
 	menu_nfs->addItem(mf);
 }
+#endif
 
 typedef struct n_isettings_t
 {
diff --git a/src/gui/pictureviewer.cpp b/src/gui/pictureviewer.cpp
index 433260ccd..d392392cb 100644
--- a/src/gui/pictureviewer.cpp
+++ b/src/gui/pictureviewer.cpp
@@ -45,7 +45,10 @@
 #include <driver/rcinput.h>
 
 #include <gui/audiomute.h>
+
+#ifdef ENABLE_GUI_MOUNT
 #include <gui/nfs.h>
+#endif
 
 #include <gui/components/cc_frm.h>
 #include <gui/widget/buttons.h>
@@ -561,6 +564,7 @@ int CPictureViewerGui::show()
 			if (!playlist.empty())
 				view(selected, true);
 		}
+#ifdef ENABLE_GUI_MOUNT
 		else if (msg==CRCInput::RC_setup)
 		{
 			if (m_state==MENU)
@@ -571,6 +575,7 @@ int CPictureViewerGui::show()
 				CVFD::getInstance()->setMode(CVFD::MODE_MENU_UTF8, g_Locale->getText(LOCALE_PICTUREVIEWER_HEAD));
 			}
 		}
+#endif
 		else if (((msg==CRCInput::RC_plus) || (msg==CRCInput::RC_minus)) && decodeTflag)
 		{
 			// FIXME: do not accept volume-keys while decoding