diff --git a/headers/os/drivers/disk_device_manager.h b/headers/os/drivers/disk_device_manager.h
index f9e5fd6855..ba59f44269 100644
--- a/headers/os/drivers/disk_device_manager.h
+++ b/headers/os/drivers/disk_device_manager.h
@@ -1,15 +1,14 @@
-// disk_device_manager.h
-//
-// C API exported by the disk device manager.
-// Currently only functions of interest for partition modules/FS add-ons
-// are considered.
-
+/*
+ * Copyright 2003-2006, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _DISK_DEVICE_MANAGER_H
 #define _DISK_DEVICE_MANAGER_H
 
+
+#include <DiskDeviceDefs.h>
 #include <Drivers.h>
 
-#include <storage/DiskDeviceDefs.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/headers/private/storage/DiskDeviceDefs.h b/headers/os/storage/DiskDeviceDefs.h
similarity index 93%
rename from headers/private/storage/DiskDeviceDefs.h
rename to headers/os/storage/DiskDeviceDefs.h
index 24820e3724..f099488e00 100644
--- a/headers/private/storage/DiskDeviceDefs.h
+++ b/headers/os/storage/DiskDeviceDefs.h
@@ -1,16 +1,13 @@
-//----------------------------------------------------------------------
-//  This software is part of the OpenBeOS distribution and is covered 
-//  by the OpenBeOS license.
-//---------------------------------------------------------------------
-
+/*
+ * Copyright 2003-2006, Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _DISK_DEVICE_DEFS_H
 #define _DISK_DEVICE_DEFS_H
 
+
 #include <SupportDefs.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 typedef int32 partition_id;
 typedef int32 disk_system_id;
@@ -156,8 +153,4 @@ enum {
 // max size of parameter string buffers, including NULL terminator
 #define B_DISK_DEVICE_MAX_PARAMETER_SIZE (32 * 1024)
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif	// _DISK_DEVICE_DEFS_H