diff --git a/src/add-ons/kernel/file_systems/cdda/Jamfile b/src/add-ons/kernel/file_systems/cdda/Jamfile
index d63d6a78ca..900880b2a6 100644
--- a/src/add-ons/kernel/file_systems/cdda/Jamfile
+++ b/src/add-ons/kernel/file_systems/cdda/Jamfile
@@ -1,8 +1,7 @@
 SubDir HAIKU_TOP src add-ons kernel file_systems cdda ;
 
-UsePrivateHeaders drivers kernel ;
+UsePrivateHeaders drivers kernel shared storage ;
 UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
-UsePrivateHeaders [ FDirName storage ] ;
 
 KernelAddon cdda :
 	kernel_interface.cpp
diff --git a/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp b/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
index 45bc7f1dea..158b8c511a 100644
--- a/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
+++ b/src/add-ons/kernel/file_systems/cdda/kernel_interface.cpp
@@ -19,6 +19,7 @@
 #include <NodeMonitor.h>
 #include <TypeConstants.h>
 
+#include <AutoDeleter.h>
 #include <util/DoublyLinkedList.h>
 
 #include "cdda.h"
@@ -458,11 +459,11 @@ open_attributes(uint32 cddbID, int deviceFD, int mode,
 	if (path == NULL)
 		return -1;
 
+	MemoryDeleter deleter(path);
 	bool create = (mode & O_WRONLY) != 0;
 
 	if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, create, path,
 			B_PATH_NAME_LENGTH) != B_OK) {
-		free(path);
 		return -1;
 	}
 
@@ -479,7 +480,6 @@ open_attributes(uint32 cddbID, int deviceFD, int mode,
 		char* deviceName = path + length;
 		if (ioctl(deviceFD, B_GET_PATH_FOR_DEVICE, deviceName,
 				B_PATH_NAME_LENGTH - length) < B_OK) {
-			free(path);
 			return B_ERROR;
 		}
 
@@ -495,10 +495,7 @@ open_attributes(uint32 cddbID, int deviceFD, int mode,
 	} else
 		strlcat(path, "/shared", B_PATH_NAME_LENGTH);
 
-	int fd = open(path, mode | (create ? O_CREAT | O_TRUNC : 0), 0644);
-
-	free(path);
-	return fd;
+	return open(path, mode | (create ? O_CREAT | O_TRUNC : 0), 0644);
 }
 
 
@@ -623,15 +620,15 @@ Volume::Mount(const char* device)
 	if (toc == NULL)
 		return B_NO_MEMORY;
 
+	MemoryDeleter deleter(toc);
+
 	status_t status = read_table_of_contents(fDevice, toc, 1024);
 	// there has to be at least one audio track
 	if (status == B_OK && count_audio_tracks(toc) == 0)
 		status = B_BAD_TYPE;
 
-	if (status != B_OK) {
-		free(toc);
+	if (status != B_OK)
 		return status;
-	}
 
 	fDiscID = compute_cddb_disc_id(*toc);
 
@@ -643,10 +640,8 @@ Volume::Mount(const char* device)
 		status = publish_vnode(FSVolume(), fRootNode->ID(), fRootNode,
 			&gCDDAVnodeOps, fRootNode->Type(), 0);
 	}
-	if (status != B_OK) {
-		free(toc);
+	if (status != B_OK)
 		return status;
-	}
 
 	bool doLookup = true;
 	cdtext text;
@@ -743,8 +738,6 @@ Volume::Mount(const char* device)
 	if (fd >= 0)
 		_RestoreAttributes(fd);
 
-	free(toc);
-
 	// determine volume title
 	DetermineName(fDiscID, fDevice, title, sizeof(title));