diff --git a/headers/private/storage/DiskDevice.h b/headers/private/storage/DiskDevice.h
index 44a390348f..5ad4b949f6 100644
--- a/headers/private/storage/DiskDevice.h
+++ b/headers/private/storage/DiskDevice.h
@@ -7,6 +7,7 @@
 #define _DISK_DEVICE_H
 
 #include <DiskDeviceVisitor.h>
+#include <Messenger.h>
 #include <ObjectList.h>
 
 class BPartition;
@@ -28,10 +29,10 @@ public:
 	int32 CountPartitions() const;
 
 	const char *Path() const;
-	void GetName(BString *name, bool includeBusID = true, 
-				 bool includeLUN = false) const;
-	void GetName(char *name, bool includeBusID = true, 
-				 bool includeLUN = false) const;
+	status_t GetName(BString *name, bool includeBusID = true, 
+					 bool includeLUN = false) const;
+	status_t GetName(char *name, bool includeBusID = true, 
+					 bool includeLUN = false) const;
 
 	bool IsReadOnly() const;
 	bool IsRemovable() const;
@@ -41,10 +42,10 @@ public:
 
 	int32 UniqueID() const;
 
-	status_t Eject();
+	status_t Eject(bool update = false);
 	status_t LowLevelFormat();	// TODO: remove?
 
-	status_t Update();
+	status_t Update(bool *updated = NULL);
 
 	BSession *VisitEachSession(BDiskDeviceVisitor *visitor);
 	BPartition *VisitEachPartition(BDiskDeviceVisitor *visitor);
@@ -58,6 +59,7 @@ private:
 	BDiskDevice &operator=(const BDiskDevice &);
 
 	status_t _Unarchive(BMessage *archive);
+	status_t _Update(BMessage *archive);
 
 	bool _AddSession(BSession *session);
 
diff --git a/headers/private/storage/DiskDevicePrivate.h b/headers/private/storage/DiskDevicePrivate.h
index 982be864da..bf3616a638 100644
--- a/headers/private/storage/DiskDevicePrivate.h
+++ b/headers/private/storage/DiskDevicePrivate.h
@@ -9,6 +9,8 @@
 #include <DiskDeviceVisitor.h>
 #include <SupportDefs.h>
 
+class BMessenger;
+
 namespace BPrivate {
 
 // PartitionFilter
@@ -45,11 +47,13 @@ private:
 	int32				fID;
 };
 
+status_t get_disk_device_messenger(BMessenger *messenger);
+
 }	// namespace BPrivate
 
 using BPrivate::PartitionFilter;
 using BPrivate::PartitionFilterVisitor;
 using BPrivate::IDFinderVisitor;
-
+using BPrivate::get_disk_device_messenger;
 
 #endif	// _DISK_DEVICE_PRIVATE_H
diff --git a/headers/private/storage/Session.h b/headers/private/storage/Session.h
index 79f59b4b99..1290d66fa8 100644
--- a/headers/private/storage/Session.h
+++ b/headers/private/storage/Session.h
@@ -63,6 +63,7 @@ private:
 
 	void _Unset();
 	status_t _Unarchive(BMessage *archive);
+	status_t _Update(BMessage *archive);
 
 	void _SetDevice(BDiskDevice *device);