diff --git a/extensions/gnomevfs/Makefile.in b/extensions/gnomevfs/Makefile.in
deleted file mode 100644
index 7d64e9727..000000000
--- a/extensions/gnomevfs/Makefile.in
+++ /dev/null
@@ -1,30 +0,0 @@
-# vim:set ts=8 sw=8 sts=8 noet:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DEPTH		= @DEPTH@
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-SHORT_LIBNAME	= nkgnomevfs
-IS_COMPONENT	= 1
-
-
-LOCAL_INCLUDES	= $(MOZ_GNOMEVFS_CFLAGS)
-
-EXTRA_DSO_LDOPTS = \
-		   $(XPCOM_GLUE_LDOPTS) \
-		   $(NSPR_LIBS) \
-		   $(MOZ_GNOMEVFS_LIBS) \
-		   $(NULL)
-
-# make sure this component is never statically linked into the main
-# application.  this is necessary since we don't want to force users
-# to install gnome-vfs2 in order to use the rest of mozilla ;-)
-FORCE_SHARED_LIB= 1
-
-include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in
index 64efc3e84..71ecd7629 100644
--- a/toolkit/system/gnome/Makefile.in
+++ b/toolkit/system/gnome/Makefile.in
@@ -18,7 +18,6 @@ EXTRA_DSO_LDOPTS += \
 		$(XPCOM_FROZEN_LDOPTS) \
 		$(NSPR_LIBS) \
 		$(MOZ_GCONF_LIBS) \
-		$(MOZ_GNOMEVFS_LIBS) \
 		$(GLIB_LIBS) \
 		$(MOZ_GIO_LIBS) \
 		$(NULL)
@@ -29,7 +28,6 @@ include $(topsrcdir)/config/rules.mk
 
 CXXFLAGS += \
 	$(MOZ_GCONF_CFLAGS) \
-	$(MOZ_GNOMEVFS_CFLAGS) \
 	$(MOZ_GIO_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(NULL)
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
index 24cb887c6..786411c01 100644
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -68,9 +68,6 @@ LOCAL_INCLUDES   += $(MOZ_PLATFORM_MAEMO_CFLAGS)
 endif
 
 ifeq ($(MOZ_PLATFORM_MAEMO),5)
-ifdef MOZ_ENABLE_GNOMEVFS
-LOCAL_INCLUDES   += $(MOZ_GNOMEVFS_CFLAGS)
-endif
 ifdef MOZ_ENABLE_GIO
 LOCAL_INCLUDES   += $(MOZ_GIO_CFLAGS)
 endif
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
index e4ed88a8d..6e304b602 100644
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5)
 #include <glib.h>
 #include <hildon-uri.h>
 #include <hildon-mime.h>
@@ -35,7 +35,7 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
 {
   nsresult rv = nsGNOMERegistry::LoadURL(aURI);
 
-#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5)
   if (NS_FAILED(rv)){
     HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr);
     if (action) {
@@ -85,7 +85,7 @@ nsMIMEInfoUnix::GetHasDefaultHandler(bool *_retval)
   if (*_retval)
     return NS_OK;
 
-#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5)
   HildonURIAction *action = hildon_uri_get_default_action(mSchemeOrType.get(), nullptr);
   if (action) {
     *_retval = true;
@@ -118,7 +118,7 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile *aFile)
   nsAutoCString nativePath;
   aFile->GetNativePath(nativePath);
 
-#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5)
   if(NS_SUCCEEDED(LaunchDefaultWithDBus(PromiseFlatCString(nativePath).get())))
     return NS_OK;
 #endif
@@ -157,7 +157,7 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile *aFile)
 return app->Launch(uriSpec);
 }
 
-#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5)
 
 /* This method tries to launch the associated default handler for the given 
  * mime/file via hildon specific APIs (in this case hildon_mime_open_file* 
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.h b/uriloader/exthandler/unix/nsMIMEInfoUnix.h
index cc2ba14f2..67eb1f5dd 100644
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.h
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.h
@@ -24,7 +24,7 @@ protected:
   virtual NS_HIDDEN_(nsresult) LoadUriInternal(nsIURI *aURI);
 
   virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile *aFile);
-#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5)
   nsresult LaunchDefaultWithDBus(const char *aFilePath);
   NS_IMETHOD GetPossibleApplicationHandlers(nsIMutableArray * *aPossibleAppHandlers);
 #endif
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
index 472b13d44..6656dc91e 100644
--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
@@ -1163,7 +1163,7 @@ nsresult nsOSHelperAppService::OSProtocolHandlerExists(const char * aProtocolSch
 #ifdef MOZ_WIDGET_GTK
   // Check the GNOME registry for a protocol handler
   *aHandlerExists = nsGNOMERegistry::HandlerExists(aProtocolScheme);
-#if (MOZ_PLATFORM_MAEMO == 5) && defined (MOZ_ENABLE_GNOMEVFS)
+#if (MOZ_PLATFORM_MAEMO == 5)
   *aHandlerExists = nsMIMEInfoUnix::HandlerExists(aProtocolScheme);
 #endif
 #endif