diff --git a/src/add-ons/kernel/bus_managers/usb/BusManager.cpp b/src/add-ons/kernel/bus_managers/usb/BusManager.cpp
index 0b872bf12d..5b98071776 100644
--- a/src/add-ons/kernel/bus_managers/usb/BusManager.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/BusManager.cpp
@@ -7,7 +7,7 @@
  *		Niels S. Reedijk
  */
 
-#include "usb_p.h"
+#include "usb_private.h"
 
 
 BusManager::BusManager(Stack *stack)
diff --git a/src/add-ons/kernel/bus_managers/usb/Device.cpp b/src/add-ons/kernel/bus_managers/usb/Device.cpp
index 1b97065d23..2d7d4b030b 100644
--- a/src/add-ons/kernel/bus_managers/usb/Device.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/Device.cpp
@@ -7,7 +7,7 @@
  *		Niels S. Reedijk
  */
 
-#include "usb_p.h"
+#include "usb_private.h"
 
 
 Device::Device(Object *parent, int8 hubAddress, uint8 hubPort,
diff --git a/src/add-ons/kernel/bus_managers/usb/Hub.cpp b/src/add-ons/kernel/bus_managers/usb/Hub.cpp
index eab5eddb62..e0d719ace5 100644
--- a/src/add-ons/kernel/bus_managers/usb/Hub.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/Hub.cpp
@@ -7,8 +7,7 @@
  *		Niels S. Reedijk
  */
 
-
-#include "usb_p.h"
+#include "usb_private.h"
 
 #include <stdio.h>
 
diff --git a/src/add-ons/kernel/bus_managers/usb/Interface.cpp b/src/add-ons/kernel/bus_managers/usb/Interface.cpp
index 095ea57f9f..7ceb7fb22d 100644
--- a/src/add-ons/kernel/bus_managers/usb/Interface.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/Interface.cpp
@@ -6,7 +6,7 @@
  *		Michael Lotz <mmlr@mlotz.ch>
  */
 
-#include "usb_p.h"
+#include "usb_private.h"
 
 
 Interface::Interface(Object *parent, uint8 interfaceIndex)
diff --git a/src/add-ons/kernel/bus_managers/usb/Object.cpp b/src/add-ons/kernel/bus_managers/usb/Object.cpp
index c07b74c8e3..363dbf5fe9 100644
--- a/src/add-ons/kernel/bus_managers/usb/Object.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/Object.cpp
@@ -6,7 +6,7 @@
  *		Michael Lotz <mmlr@mlotz.ch>
  */
 
-#include "usb_p.h"
+#include "usb_private.h"
 
 
 Object::Object(Stack *stack, BusManager *bus)
diff --git a/src/add-ons/kernel/bus_managers/usb/Pipe.cpp b/src/add-ons/kernel/bus_managers/usb/Pipe.cpp
index f693f63be3..ed1393f787 100644
--- a/src/add-ons/kernel/bus_managers/usb/Pipe.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/Pipe.cpp
@@ -7,7 +7,7 @@
  *		Niels S. Reedijk
  */
 
-#include "usb_p.h"
+#include "usb_private.h"
 
 
 Pipe::Pipe(Object *parent)
diff --git a/src/add-ons/kernel/bus_managers/usb/Stack.cpp b/src/add-ons/kernel/bus_managers/usb/Stack.cpp
index 2a06da66ee..798f373ba5 100644
--- a/src/add-ons/kernel/bus_managers/usb/Stack.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/Stack.cpp
@@ -10,7 +10,7 @@
 #include <module.h>
 #include <unistd.h>
 #include <util/kernel_cpp.h>
-#include "usb_p.h"
+#include "usb_private.h"
 #include "PhysicalMemoryAllocator.h"
 
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
diff --git a/src/add-ons/kernel/bus_managers/usb/Transfer.cpp b/src/add-ons/kernel/bus_managers/usb/Transfer.cpp
index 83868ae14c..c9aeb73c16 100644
--- a/src/add-ons/kernel/bus_managers/usb/Transfer.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/Transfer.cpp
@@ -6,7 +6,8 @@
  *		Michael Lotz <mmlr@mlotz.ch>
  *		Niels S. Reedijk
  */
-#include "usb_p.h"
+
+#include "usb_private.h"
 
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
  #include <kernel.h>
diff --git a/src/add-ons/kernel/bus_managers/usb/usb.cpp b/src/add-ons/kernel/bus_managers/usb/usb.cpp
index b6f8f01c31..7887f2ba4c 100644
--- a/src/add-ons/kernel/bus_managers/usb/usb.cpp
+++ b/src/add-ons/kernel/bus_managers/usb/usb.cpp
@@ -8,7 +8,7 @@
  */
 
 #include <util/kernel_cpp.h>
-#include "usb_p.h"
+#include "usb_private.h"
 #include <USB_rle.h>
 
 #define USB_MODULE_NAME "module"
diff --git a/src/add-ons/kernel/bus_managers/usb/usb_p.h b/src/add-ons/kernel/bus_managers/usb/usb_private.h
similarity index 100%
rename from src/add-ons/kernel/bus_managers/usb/usb_p.h
rename to src/add-ons/kernel/bus_managers/usb/usb_private.h
diff --git a/src/add-ons/kernel/busses/usb/ehci.h b/src/add-ons/kernel/busses/usb/ehci.h
index 6c5417817b..102a4fd080 100644
--- a/src/add-ons/kernel/busses/usb/ehci.h
+++ b/src/add-ons/kernel/busses/usb/ehci.h
@@ -8,7 +8,7 @@
 #ifndef EHCI_H
 #define EHCI_H
 
-#include "usb_p.h"
+#include "usb_private.h"
 #include "ehci_hardware.h"
 
 
diff --git a/src/add-ons/kernel/busses/usb/ohci.h b/src/add-ons/kernel/busses/usb/ohci.h
index 1117406116..5201136e21 100644
--- a/src/add-ons/kernel/busses/usb/ohci.h
+++ b/src/add-ons/kernel/busses/usb/ohci.h
@@ -10,7 +10,7 @@
 #ifndef OHCI_H
 #define OHCI_H
 
-#include "usb_p.h"
+#include "usb_private.h"
 #include "ohci_hardware.h"
 #include <lock.h>
 
diff --git a/src/add-ons/kernel/busses/usb/uhci.h b/src/add-ons/kernel/busses/usb/uhci.h
index 195fda68eb..07d2b663a8 100644
--- a/src/add-ons/kernel/busses/usb/uhci.h
+++ b/src/add-ons/kernel/busses/usb/uhci.h
@@ -10,7 +10,7 @@
 #ifndef UHCI_H
 #define UHCI_H
 
-#include "usb_p.h"
+#include "usb_private.h"
 #include "uhci_hardware.h"
 #include <lock.h>
 
@@ -202,7 +202,7 @@ inline	uint8						ReadReg8(uint32 reg);
 inline	uint16						ReadReg16(uint32 reg);
 inline	uint32						ReadReg32(uint32 reg);
 
-static	pci_module_info *			sPCIModule; 
+static	pci_module_info *			sPCIModule;
 
 		uint32						fRegisterBase;
 		pci_info *					fPCIInfo;