diff --git a/headers/os/storage/FindDirectory.h b/headers/os/storage/FindDirectory.h
index 80f6328634..f7814475ec 100644
--- a/headers/os/storage/FindDirectory.h
+++ b/headers/os/storage/FindDirectory.h
@@ -69,20 +69,11 @@ typedef enum {
 	B_USER_SOUNDS_DIRECTORY,
 	B_USER_DATA_DIRECTORY,
 	B_USER_CACHE_DIRECTORY,
-	B_USER_MAIL_DIRECTORY,
-	B_USER_QUERIES_DIRECTORY,
-	B_USER_PEOPLE_DIRECTORY,
-	B_USER_DOWNLOADS_DIRECTORY,
-	B_USER_DESKBAR_APPS_DIRECTORY,
-	B_USER_DESKBAR_PREFERENCES_DIRECTORY,
-	B_USER_DESKBAR_DEVELOP_DIRECTORY,
-	
 
 	/* Global directories. */
 	B_APPS_DIRECTORY					= 4000,
 	B_PREFERENCES_DIRECTORY,
 	B_UTILITIES_DIRECTORY,
-	B_BOOT_DISK,
 
 	/* Obsolete: Legacy BeOS definition to be phased out */
 	B_BEOS_DIRECTORY					= 1000,
diff --git a/src/kits/tracker/FSUtils.h b/src/kits/tracker/FSUtils.h
index ec9f43f855..eb359028b2 100644
--- a/src/kits/tracker/FSUtils.h
+++ b/src/kits/tracker/FSUtils.h
@@ -260,6 +260,18 @@ _IMPEXP_TRACKER void FSOpenWithDocuments(const entry_ref *executableToLaunch,
 _IMPEXP_TRACKER status_t FSLaunchUsing(const entry_ref *ref, BMessage *listOfRefs);
 
 
+// some extra directory_which values
+// move these to FindDirectory.h
+const uint32 B_USER_MAIL_DIRECTORY = 3500;
+const uint32 B_USER_QUERIES_DIRECTORY = 3501;
+const uint32 B_USER_PEOPLE_DIRECTORY = 3502;
+const uint32 B_USER_DOWNLOADS_DIRECTORY = 3503;
+const uint32 B_USER_DESKBAR_APPS_DIRECTORY = 3504;
+const uint32 B_USER_DESKBAR_PREFERENCES_DIRECTORY = 3505;
+const uint32 B_USER_DESKBAR_DEVELOP_DIRECTORY = 3506;
+const uint32 B_BOOT_DISK = 3507;
+	// map /boot into the directory_which enum for convenience
+
 class WellKnowEntryList {
 	// matches up names, id's and node_refs of well known entries in the
 	// system hierarchy
diff --git a/src/kits/tracker/IconCache.cpp b/src/kits/tracker/IconCache.cpp
index 83128d984b..e9ad7801d9 100644
--- a/src/kits/tracker/IconCache.cpp
+++ b/src/kits/tracker/IconCache.cpp
@@ -647,7 +647,7 @@ IconCache::GetWellKnownIcon(AutoLock<SimpleIconCache> *,
 		// match up well known entries in the file system with specialized
 		// icons stored in Tracker's resources
 		int32 resid = -1;
-		switch (wellKnownEntry->which) {
+		switch ((uint32)wellKnownEntry->which) {
 			case B_BOOT_DISK:
 				resid = R_BootVolumeIcon;
 				break;