diff --git a/headers/private/storage/DiskDevice.h b/headers/private/storage/DiskDevice.h
index 89f1b7fb38..0edb3cb721 100644
--- a/headers/private/storage/DiskDevice.h
+++ b/headers/private/storage/DiskDevice.h
@@ -1,4 +1,7 @@
-// DiskDevice.h
+//----------------------------------------------------------------------
+//  This software is part of the OpenBeOS distribution and is covered 
+//  by the OpenBeOS license.
+//---------------------------------------------------------------------
 
 #ifndef _DISK_DEVICE_H
 #define _DISK_DEVICE_H
diff --git a/headers/private/storage/DiskDeviceRoster.h b/headers/private/storage/DiskDeviceRoster.h
index 2d21974bb1..96efd0af31 100644
--- a/headers/private/storage/DiskDeviceRoster.h
+++ b/headers/private/storage/DiskDeviceRoster.h
@@ -1,4 +1,7 @@
-// DiskDeviceRoster.h
+//----------------------------------------------------------------------
+//  This software is part of the OpenBeOS distribution and is covered 
+//  by the OpenBeOS license.
+//---------------------------------------------------------------------
 
 #ifndef _DISK_DEVICE_ROSTER_H
 #define _DISK_DEVICE_ROSTER_H
@@ -73,10 +76,13 @@ public:
 										 BPartition **partition = NULL);
 		// return true if terminated early
 
-	BDiskDevice *DeviceWithID(int32 id) const;
-	BSession *SessionWithID(int32 id, BDiskDevice *device) const;
+	
+	status_t GetDeviceWithID(int32 id, BDiskDevice *device) const;
+	status_t GetSessionWithID(int32 id, BDiskDevice *device,
+							  BSession **session) const;
 		// inits device to the device containing the session
-	BPartition *PartitionWithID(int32 id, BDiskDevice *device) const;
+	status_t GetPartitionWithID(int32 id, BDiskDevice *device,
+								BPartition **partition) const;
 		// inits device to the device containing the partition
 
 	status_t StartWatching(BMessenger target,
diff --git a/headers/private/storage/DiskDeviceVisitor.h b/headers/private/storage/DiskDeviceVisitor.h
index 8b0b64f4c7..faebd48a7c 100644
--- a/headers/private/storage/DiskDeviceVisitor.h
+++ b/headers/private/storage/DiskDeviceVisitor.h
@@ -1,4 +1,7 @@
-// DiskDeviceIteration.h
+//----------------------------------------------------------------------
+//  This software is part of the OpenBeOS distribution and is covered 
+//  by the OpenBeOS license.
+//---------------------------------------------------------------------
 
 #ifndef _DISK_DEVICE_VISITOR_H
 #define _DISK_DEVICE_VISITOR_H
diff --git a/headers/private/storage/Partition.h b/headers/private/storage/Partition.h
index 21d6d5c23e..62ffc13ce7 100644
--- a/headers/private/storage/Partition.h
+++ b/headers/private/storage/Partition.h
@@ -1,4 +1,7 @@
-// Partition.h
+//----------------------------------------------------------------------
+//  This software is part of the OpenBeOS distribution and is covered 
+//  by the OpenBeOS license.
+//---------------------------------------------------------------------
 
 #ifndef _PARTITION_H
 #define _PARTITION_H
diff --git a/headers/private/storage/Session.h b/headers/private/storage/Session.h
index edca35bfc4..d101fe6b78 100644
--- a/headers/private/storage/Session.h
+++ b/headers/private/storage/Session.h
@@ -1,4 +1,7 @@
-// Session.h
+//----------------------------------------------------------------------
+//  This software is part of the OpenBeOS distribution and is covered 
+//  by the OpenBeOS license.
+//---------------------------------------------------------------------
 
 #ifndef _SESSION_H
 #define _SESSION_H