diff --git a/headers/os/drivers/USB_printer.h b/headers/os/drivers/USB_printer.h
index fc4e266d03..2b0bbf67ec 100644
--- a/headers/os/drivers/USB_printer.h
+++ b/headers/os/drivers/USB_printer.h
@@ -1,36 +1,20 @@
-/* 
-** USB_printer.h
-**
-** Copyright 1999, Be Incorporated. All Rights Reserved.
-**
-*/
-
+/*
+ * Copyright 2009, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _USB_PRINTER_H
 #define _USB_PRINTER_H
 
+
 #include <Drivers.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
-/* ioctl() opcodes for usb_printer driver */
-
-enum
-{
-	USB_PRINTER_GET_DEVICE_ID = B_DEVICE_OP_CODES_END+1
+enum {
+	USB_PRINTER_GET_DEVICE_ID = B_DEVICE_OP_CODES_END + 1
 };
 
-
-/* Maximum length of the DEVICE_ID. User MUST allocate this size
-when calling USB_PRINTER_GET_DEVICE_ID ioctl() */
-
 #define USB_PRINTER_DEVICE_ID_LENGTH	256
+	/* buffer size to be handed to above ioctl() call */
 
 
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
+#endif	/* _USB_PRINTER_H */
diff --git a/headers/os/drivers/bus_manager.h b/headers/os/drivers/bus_manager.h
index e894f7f0f4..36930e44e6 100644
--- a/headers/os/drivers/bus_manager.h
+++ b/headers/os/drivers/bus_manager.h
@@ -1,21 +1,13 @@
-/*******************************************************************************
-/
-/	File:			bus_managers.h
-/
-/	Description:	bus manager API
-/
-/	Copyright 1998, Be Incorporated, All Rights Reserved.
-/
-*******************************************************************************/
-
+/*
+ * Copyright 2009, Haiku Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _BUS_MANAGER_H
 #define _BUS_MANAGER_H
 
+
 #include <module.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 typedef struct bus_manager_info bus_manager_info;
 
@@ -24,8 +16,5 @@ struct bus_manager_info {
 	status_t		(*rescan)();
 };
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif	/* _BUS_MANAGER_H */