diff --git a/headers/os/storage/DiskScannerAddOn.h b/headers/private/storage/DiskScannerAddOn.h
similarity index 90%
rename from headers/os/storage/DiskScannerAddOn.h
rename to headers/private/storage/DiskScannerAddOn.h
index 986d590e0f..061c95f9e6 100644
--- a/headers/os/storage/DiskScannerAddOn.h
+++ b/headers/private/storage/DiskScannerAddOn.h
@@ -7,10 +7,9 @@
 
 #include <SupportDefs.h>
 
-struct partition_info;
-struct session_info;
-
 class BDiskScannerParameterEditor;
+class BPartition;
+class BSession;
 class BString;
 
 // BDiskScannerPartitionAddOn
@@ -22,8 +21,8 @@ public:
 	virtual const char *ShortName() = 0;
 	virtual const char *LongName() = 0;
 
-	virtual BDiskScannerParameterEditor *CreateEditor(
-		const session_info *sessionInfo, const char *parameters) = 0;
+	virtual BDiskScannerParameterEditor *CreateEditor(const BSession *session,
+		const char *parameters) = 0;
 
 private:
 	virtual	void _ReservedDiskScannerPartitionAddOn1();
@@ -45,7 +44,7 @@ public:
 	virtual const char *LongName() = 0;
 
 	virtual BDiskScannerParameterEditor *CreateEditor(
-		const partition_info *partitionInfo, const char *parameters) = 0;
+		const BPartition *partition, const char *parameters) = 0;
 
 private:
 	virtual	void _ReservedDiskScannerFSAddOn1();
@@ -64,6 +63,7 @@ public:
 	virtual ~BDiskScannerParameterEditor();
 
 	virtual BView *View();
+	virtual bool EditingDone();
 	virtual status_t GetParameters(BString *parameters);
 
 private: