diff --git a/modules/menu/Makefile.am b/modules/menu/Makefile.am
index 11546c0..2a4317e 100644
--- a/modules/menu/Makefile.am
+++ b/modules/menu/Makefile.am
@@ -15,11 +15,15 @@ xfce4_desktop_menu_la_CFLAGS = \
 	$(LIBXFCE4MENU_CFLAGS) \
 	$(LIBX11_CFLAGS) \
 	$(LIBXFCEGUI4_CFLAGS) \
-	$(THUNAR_VFS_CFLAGS) \
 	-DSYSCONFDIR=\"$(sysconfdir)\" \
 	-DDATADIR=\"$(datadir)\" \
 	-DBINDIR=\"$(bindir)\"
 
+if ENABLE_FILE_ICONS
+xfce4_desktop_menu_la_CFLAGS += \
+	$(THUNAR_VFS_CFLAGS)
+endif
+
 xfce4_desktop_menu_la_DEPENDENCIES = \
 	$(top_builddir)/common/libxfdesktop-menu-utils.la
 
@@ -40,5 +44,9 @@ xfce4_desktop_menu_la_LIBADD = \
 	$(LIBXFCE4MENU_LIBS) \
 	$(LIBX11_LDFLAGS) \
 	$(LIBX11_LIBS) \
-	$(LIBXFCEGUI4_LIBS) \
+	$(LIBXFCEGUI4_LIBS)
+
+if ENABLE_FILE_ICONS
+xfce4_desktop_menu_la_LIBADD += \
 	$(THUNAR_VFS_LIBS)
+endif
diff --git a/modules/menu/desktop-menu.c b/modules/menu/desktop-menu.c
index 2cfb52f..d983d1b 100644
--- a/modules/menu/desktop-menu.c
+++ b/modules/menu/desktop-menu.c
@@ -63,7 +63,7 @@
 #include <libxfcegui4/libxfcegui4.h>
 #include <libxfce4menu/libxfce4menu.h>
 
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
 #include <thunar-vfs/thunar-vfs.h>
 #endif
 
@@ -82,7 +82,7 @@ typedef struct
 	
     gint idle_id;  /* source id for idled generation */
     
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
     GList *monitors;
 #endif
 } XfceDesktopMenu;
@@ -134,7 +134,7 @@ itheme_changed_cb(GtkIconTheme *itheme, gpointer user_data)
         desktop_menu->idle_id = g_idle_add(_generate_menu_idled, desktop_menu);
 }
 
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
 
 static void
 desktop_menu_something_changed(ThunarVfsMonitor *monitor,
@@ -443,7 +443,7 @@ G_MODULE_EXPORT XfceDesktopMenu *
 xfce_desktop_menu_new_impl(const gchar *menu_file,
                            gboolean deferred)
 {
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
     static XfceMenuMonitorVTable monitor_vtable = {
         NULL, /*desktop_menu_xfce_menu_monitor_file,*/
         desktop_menu_xfce_menu_monitor_directory,
@@ -460,7 +460,7 @@ xfce_desktop_menu_new_impl(const gchar *menu_file,
     else
         desktop_menu->filename = xfce_desktop_get_menufile();
     
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
     thunar_vfs_init();
     xfce_menu_monitor_set_vtable(&monitor_vtable, desktop_menu);
 #endif
@@ -469,7 +469,7 @@ xfce_desktop_menu_new_impl(const gchar *menu_file,
         desktop_menu->idle_id = g_idle_add(_generate_menu_idled, desktop_menu);
     else {
         if(!_generate_menu(desktop_menu)) {
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
             xfce_menu_monitor_set_vtable(NULL, NULL);
 #endif
             g_free(desktop_menu);
@@ -595,7 +595,7 @@ xfce_desktop_menu_destroy_impl(XfceDesktopMenu *desktop_menu)
     g_return_if_fail(desktop_menu != NULL);
     TRACE("dummy");
     
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
     xfce_menu_monitor_set_vtable(NULL, NULL);
 #endif
     
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 0e0076b..46b1410 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -9,12 +9,16 @@ xfce4_menu_plugin_CFLAGS = \
 	$(LIBX11_CFLAGS) \
 	$(LIBXFCEGUI4_CFLAGS) \
 	$(LIBXFCE4PANEL_CFLAGS) \
-	$(THUNAR_VFS_CFLAGS) \
 	$(LIBEXO_CFLAGS) \
 	-DDATADIR=\"$(datadir)\" \
 	-DLOCALEDIR=\"$(localedir)\" \
 	-DBINDIR=\"$(bindir)\"
 
+if ENABLE_FILE_ICONS
+xfce4_menu_plugin_CFLAGS += \
+	$(THUNAR_VFS_CFLAGS)
+endif
+
 xfce4_menu_plugin_DEPENDENCIES = \
 	$(top_builddir)/common/libxfdesktop-menu.la \
 	$(top_builddir)/common/libxfdesktop.la
@@ -25,9 +29,13 @@ xfce4_menu_plugin_LDADD = \
 	$(LIBX11_LIBS) \
 	$(LIBXFCEGUI4_LIBS) \
 	$(LIBXFCE4PANEL_LIBS) \
-	$(THUNAR_VFS_LIBS) \
 	$(LIBEXO_LIBS)
 
+if ENABLE_FILE_ICONS
+xfce4_menu_plugin_LDADD += \
+	$(THUNAR_VFS_LIBS)
+endif
+
 if HAVE_CYGWIN
 xfce4_menu_plugin_LDFLAGS = \
 	-no-undefined
diff --git a/panel-plugin/desktop-menu-plugin.c b/panel-plugin/desktop-menu-plugin.c
index 36fe36a..178f5c8 100644
--- a/panel-plugin/desktop-menu-plugin.c
+++ b/panel-plugin/desktop-menu-plugin.c
@@ -53,7 +53,7 @@
 #include <libxfce4panel/xfce-panel-plugin.h>
 #include <libxfce4panel/xfce-panel-convenience.h>
 
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
 #include <thunar-vfs/thunar-vfs.h>
 #endif
 
@@ -897,7 +897,7 @@ static gboolean
 desktop_menu_plugin_preinit(int argc,
                             char **argv)
 {
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
     g_thread_init(NULL);
 #endif
     return TRUE;
@@ -1019,7 +1019,7 @@ desktop_menu_plugin_construct(XfcePanelPlugin *plugin)
     
     xfce_textdomain(GETTEXT_PACKAGE, LOCALEDIR, "UTF-8");
     
-#ifdef HAVE_THUNAR_VFS
+#ifdef ENABLE_FILE_ICONS
     thunar_vfs_init();
 #endif