Added Class, ClassDevice, ClassHost and ClassCommon to the internal class driver source filenames to prevent ambiguities.

git-svn-id: http://lufa-lib.googlecode.com/svn/trunk@1978 d5102386-fcda-11dd-9fdb-3debd5008f28

46 files changed, 53 insertions, 53 deletions

diff --git a/LUFA/Drivers/USB/Class/Audio.h b/LUFA/Drivers/USB/Class/AudioClass.h
index 5d02b4d4..ff6eb919 100644
--- a/LUFA/Drivers/USB/Class/Audio.h
+++ b/LUFA/Drivers/USB/Class/AudioClass.h
@@ -67,11 +67,11 @@
 		#include "../Core/USBMode.h"
 
 		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/Audio.h"
+			#include "Device/AudioClassDevice.h"
 		#endif
 
 		#if defined(USB_CAN_BE_HOST)
-			#include "Host/Audio.h"
+			#include "Host/AudioClassHost.h"
 		#endif
 
 #endif
diff --git a/LUFA/Drivers/USB/Class/CDC.h b/LUFA/Drivers/USB/Class/CDCClass.h
index 935291cd..4e3a06d6 100644
--- a/LUFA/Drivers/USB/Class/CDC.h
+++ b/LUFA/Drivers/USB/Class/CDCClass.h
@@ -67,11 +67,11 @@
 		#include "../Core/USBMode.h"
 
 		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/CDC.h"
+			#include "Device/CDCClassDevice.h"
 		#endif
 
 		#if defined(USB_CAN_BE_HOST)
-			#include "Host/CDC.h"
+			#include "Host/CDCClassHost.h"
 		#endif
 
 #endif
diff --git a/LUFA/Drivers/USB/Class/Common/Audio.h b/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
index 32a66409..32a66409 100644
--- a/LUFA/Drivers/USB/Class/Common/Audio.h
+++ b/LUFA/Drivers/USB/Class/Common/AudioClassCommon.h
diff --git a/LUFA/Drivers/USB/Class/Common/CDC.h b/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
index 45e0c585..45e0c585 100644
--- a/LUFA/Drivers/USB/Class/Common/CDC.h
+++ b/LUFA/Drivers/USB/Class/Common/CDCClassCommon.h
diff --git a/LUFA/Drivers/USB/Class/Common/HID.h b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h
index 95b3484f..95b3484f 100644
--- a/LUFA/Drivers/USB/Class/Common/HID.h
+++ b/LUFA/Drivers/USB/Class/Common/HIDClassCommon.h
diff --git a/LUFA/Drivers/USB/Class/Common/HIDParser.h b/LUFA/Drivers/USB/Class/Common/HIDParser.h
index e4912133..3e3bb237 100644
--- a/LUFA/Drivers/USB/Class/Common/HIDParser.h
+++ b/LUFA/Drivers/USB/Class/Common/HIDParser.h
@@ -70,7 +70,7 @@
 		#include "../../../../Common/Common.h"
 
 		#include "HIDReportData.h"
-		#include "../Common/HID.h"
+		#include "HIDClassCommon.h"
 		
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Common/MIDI.h b/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h
index a273589e..72554997 100644
--- a/LUFA/Drivers/USB/Class/Common/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Common/MIDIClassCommon.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../Core/StdDescriptors.h"
-		#include "Audio.h"
+		#include "AudioClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Common/MassStorage.h b/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h
index 49246ba7..49246ba7 100644
--- a/LUFA/Drivers/USB/Class/Common/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Common/MassStorageClassCommon.h
diff --git a/LUFA/Drivers/USB/Class/Common/Printer.h b/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h
index 3d52be30..3d52be30 100644
--- a/LUFA/Drivers/USB/Class/Common/Printer.h
+++ b/LUFA/Drivers/USB/Class/Common/PrinterClassCommon.h
diff --git a/LUFA/Drivers/USB/Class/Common/RNDIS.h b/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h
index f931de82..30840f5a 100644
--- a/LUFA/Drivers/USB/Class/Common/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Common/RNDISClassCommon.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../Core/StdDescriptors.h"
-		#include "CDC.h"
+		#include "CDCClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Common/StillImage.h b/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h
index 4f418ad9..4f418ad9 100644
--- a/LUFA/Drivers/USB/Class/Common/StillImage.h
+++ b/LUFA/Drivers/USB/Class/Common/StillImageClassCommon.h
diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
index cdbe1a0d..d8c5d29e 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.c
+++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_AUDIO_DRIVER
 #define  __INCLUDE_FROM_AUDIO_DEVICE_C
-#include "Audio.h"
+#include "AudioClassDevice.h"
 
 void Audio_Device_ProcessControlRequest(USB_ClassInfo_Audio_Device_t* const AudioInterfaceInfo)
 {
diff --git a/LUFA/Drivers/USB/Class/Device/Audio.h b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
index 60880c29..175bc8bf 100644
--- a/LUFA/Drivers/USB/Class/Device/Audio.h
+++ b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/Audio.h"
+		#include "../Common/AudioClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Device/CDC.c b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
index 29e5c25e..e3b05e03 100644
--- a/LUFA/Drivers/USB/Class/Device/CDC.c
+++ b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_CDC_DRIVER
 #define  __INCLUDE_FROM_CDC_DEVICE_C
-#include "CDC.h"
+#include "CDCClassDevice.h"
 
 void CDC_Device_ProcessControlRequest(USB_ClassInfo_CDC_Device_t* const CDCInterfaceInfo)
 {
diff --git a/LUFA/Drivers/USB/Class/Device/CDC.h b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
index b1eeb41d..449b76af 100644
--- a/LUFA/Drivers/USB/Class/Device/CDC.h
+++ b/LUFA/Drivers/USB/Class/Device/CDCClassDevice.h
@@ -72,7 +72,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/CDC.h"
+		#include "../Common/CDCClassCommon.h"
 
 		#include <stdio.h>
 
diff --git a/LUFA/Drivers/USB/Class/Device/HID.c b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c
index ec02138a..9b5a7dd3 100644
--- a/LUFA/Drivers/USB/Class/Device/HID.c
+++ b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_HID_DRIVER
 #define  __INCLUDE_FROM_HID_DEVICE_C
-#include "HID.h"
+#include "HIDClassDevice.h"
 
 void HID_Device_ProcessControlRequest(USB_ClassInfo_HID_Device_t* const HIDInterfaceInfo)
 {
diff --git a/LUFA/Drivers/USB/Class/Device/HID.h b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.h
index 52bff7ec..40aab390 100644
--- a/LUFA/Drivers/USB/Class/Device/HID.h
+++ b/LUFA/Drivers/USB/Class/Device/HIDClassDevice.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/HID.h"
+		#include "../Common/HIDClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.c b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c
index 5e4bd9c2..13454592 100644
--- a/LUFA/Drivers/USB/Class/Device/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_MIDI_DRIVER
 #define  __INCLUDE_FROM_MIDI_DEVICE_C
-#include "MIDI.h"
+#include "MIDIClassDevice.h"
 
 bool MIDI_Device_ConfigureEndpoints(USB_ClassInfo_MIDI_Device_t* const MIDIInterfaceInfo)
 {
diff --git a/LUFA/Drivers/USB/Class/Device/MIDI.h b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h
index 45a75615..c73ce43b 100644
--- a/LUFA/Drivers/USB/Class/Device/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Device/MIDIClassDevice.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/MIDI.h"
+		#include "../Common/MIDIClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.c b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c
index 7586c281..1e3fe341 100644
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_MS_DRIVER
 #define  __INCLUDE_FROM_MASSSTORAGE_DEVICE_C
-#include "MassStorage.h"
+#include "MassStorageClassDevice.h"
 
 void MS_Device_ProcessControlRequest(USB_ClassInfo_MS_Device_t* const MSInterfaceInfo)
 {
diff --git a/LUFA/Drivers/USB/Class/Device/MassStorage.h b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.h
index 6f0539e5..ce0bcb78 100644
--- a/LUFA/Drivers/USB/Class/Device/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Device/MassStorageClassDevice.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/MassStorage.h"
+		#include "../Common/MassStorageClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.c b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c
index 9a89ae07..12115ee5 100644
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_RNDIS_DRIVER
 #define  __INCLUDE_FROM_RNDIS_DEVICE_C
-#include "RNDIS.h"
+#include "RNDISClassDevice.h"
 
 static const uint32_t PROGMEM AdapterSupportedOIDList[]  =
 	{
diff --git a/LUFA/Drivers/USB/Class/Device/RNDIS.h b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.h
index a3b45cbc..9953fa1a 100644
--- a/LUFA/Drivers/USB/Class/Device/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Device/RNDISClassDevice.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/RNDIS.h"
+		#include "../Common/RNDISClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/HID.h b/LUFA/Drivers/USB/Class/HIDClass.h
index f72d47b8..71a9b2ea 100644
--- a/LUFA/Drivers/USB/Class/HID.h
+++ b/LUFA/Drivers/USB/Class/HIDClass.h
@@ -68,11 +68,11 @@
 		#include "../Core/USBMode.h"
 
 		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/HID.h"
+			#include "Device/HIDClassDevice.h"
 		#endif
 
 		#if defined(USB_CAN_BE_HOST)
-			#include "Host/HID.h"
+			#include "Host/HIDClassHost.h"
 		#endif
 
 #endif
diff --git a/LUFA/Drivers/USB/Class/Host/Audio.c b/LUFA/Drivers/USB/Class/Host/AudioClassHost.c
index d8665e4e..af6f0ec5 100644
--- a/LUFA/Drivers/USB/Class/Host/Audio.c
+++ b/LUFA/Drivers/USB/Class/Host/AudioClassHost.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_AUDIO_DRIVER
 #define  __INCLUDE_FROM_AUDIO_HOST_C
-#include "Audio.h"
+#include "AudioClassHost.h"
 
 uint8_t Audio_Host_ConfigurePipes(USB_ClassInfo_Audio_Host_t* const AudioInterfaceInfo,
                                   uint16_t ConfigDescriptorSize,
diff --git a/LUFA/Drivers/USB/Class/Host/Audio.h b/LUFA/Drivers/USB/Class/Host/AudioClassHost.h
index 310d21c0..8be5210c 100644
--- a/LUFA/Drivers/USB/Class/Host/Audio.h
+++ b/LUFA/Drivers/USB/Class/Host/AudioClassHost.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/Audio.h"
+		#include "../Common/AudioClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Host/CDC.c b/LUFA/Drivers/USB/Class/Host/CDCClassHost.c
index 2b983599..18440664 100644
--- a/LUFA/Drivers/USB/Class/Host/CDC.c
+++ b/LUFA/Drivers/USB/Class/Host/CDCClassHost.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_CDC_DRIVER
 #define  __INCLUDE_FROM_CDC_HOST_C
-#include "CDC.h"
+#include "CDCClassHost.h"
 
 uint8_t CDC_Host_ConfigurePipes(USB_ClassInfo_CDC_Host_t* const CDCInterfaceInfo,
                                 uint16_t ConfigDescriptorSize,
diff --git a/LUFA/Drivers/USB/Class/Host/CDC.h b/LUFA/Drivers/USB/Class/Host/CDCClassHost.h
index 7fd9e49f..4de50438 100644
--- a/LUFA/Drivers/USB/Class/Host/CDC.h
+++ b/LUFA/Drivers/USB/Class/Host/CDCClassHost.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/CDC.h"
+		#include "../Common/CDCClassCommon.h"
 
 		#include <stdio.h>
 
diff --git a/LUFA/Drivers/USB/Class/Host/HID.c b/LUFA/Drivers/USB/Class/Host/HIDClassHost.c
index bfbe6cf6..88e3c499 100644
--- a/LUFA/Drivers/USB/Class/Host/HID.c
+++ b/LUFA/Drivers/USB/Class/Host/HIDClassHost.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_HID_DRIVER
 #define  __INCLUDE_FROM_HID_HOST_C
-#include "HID.h"
+#include "HIDClassHost.h"
 
 uint8_t HID_Host_ConfigurePipes(USB_ClassInfo_HID_Host_t* const HIDInterfaceInfo,
                                 uint16_t ConfigDescriptorSize,
diff --git a/LUFA/Drivers/USB/Class/Host/HID.h b/LUFA/Drivers/USB/Class/Host/HIDClassHost.h
index 08410f2b..5d8c8e92 100644
--- a/LUFA/Drivers/USB/Class/Host/HID.h
+++ b/LUFA/Drivers/USB/Class/Host/HIDClassHost.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/HID.h"
+		#include "../Common/HIDClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.c b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c
index 9f7bbd4e..109b075d 100644
--- a/LUFA/Drivers/USB/Class/Host/MIDI.c
+++ b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_MIDI_DRIVER
 #define  __INCLUDE_FROM_MIDI_HOST_C
-#include "MIDI.h"
+#include "MIDIClassHost.h"
 
 uint8_t MIDI_Host_ConfigurePipes(USB_ClassInfo_MIDI_Host_t* const MIDIInterfaceInfo,
                                  uint16_t ConfigDescriptorSize,
diff --git a/LUFA/Drivers/USB/Class/Host/MIDI.h b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.h
index c4451b11..3398830e 100644
--- a/LUFA/Drivers/USB/Class/Host/MIDI.h
+++ b/LUFA/Drivers/USB/Class/Host/MIDIClassHost.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/MIDI.h"
+		#include "../Common/MIDIClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.c b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c
index 36503bf4..96550cc3 100644
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.c
+++ b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_MS_DRIVER
 #define  __INCLUDE_FROM_MASSSTORAGE_HOST_C
-#include "MassStorage.h"
+#include "MassStorageClassHost.h"
 
 uint8_t MS_Host_ConfigurePipes(USB_ClassInfo_MS_Host_t* const MSInterfaceInfo,
                                uint16_t ConfigDescriptorSize,
diff --git a/LUFA/Drivers/USB/Class/Host/MassStorage.h b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h
index f0dd475f..3b3b9fa5 100644
--- a/LUFA/Drivers/USB/Class/Host/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/Host/MassStorageClassHost.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/MassStorage.h"
+		#include "../Common/MassStorageClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Host/Printer.c b/LUFA/Drivers/USB/Class/Host/PrinterClassHost.c
index 576dd36f..8bb0acdd 100644
--- a/LUFA/Drivers/USB/Class/Host/Printer.c
+++ b/LUFA/Drivers/USB/Class/Host/PrinterClassHost.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_PRINTER_DRIVER
 #define  __INCLUDE_FROM_PRINTER_HOST_C
-#include "Printer.h"
+#include "PrinterClassHost.h"
 
 uint8_t PRNT_Host_ConfigurePipes(USB_ClassInfo_PRNT_Host_t* const PRNTInterfaceInfo,
                                  uint16_t ConfigDescriptorSize,
diff --git a/LUFA/Drivers/USB/Class/Host/Printer.h b/LUFA/Drivers/USB/Class/Host/PrinterClassHost.h
index 9f5c8161..f0fe8ee9 100644
--- a/LUFA/Drivers/USB/Class/Host/Printer.h
+++ b/LUFA/Drivers/USB/Class/Host/PrinterClassHost.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/Printer.h"
+		#include "../Common/PrinterClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.c b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c
index b942c536..61f14020 100644
--- a/LUFA/Drivers/USB/Class/Host/RNDIS.c
+++ b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_RNDIS_DRIVER
 #define  __INCLUDE_FROM_RNDIS_HOST_C
-#include "RNDIS.h"
+#include "RNDISClassHost.h"
 
 uint8_t RNDIS_Host_ConfigurePipes(USB_ClassInfo_RNDIS_Host_t* const RNDISInterfaceInfo,
                                   uint16_t ConfigDescriptorSize,
diff --git a/LUFA/Drivers/USB/Class/Host/RNDIS.h b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.h
index f90ed412..7b0acfb5 100644
--- a/LUFA/Drivers/USB/Class/Host/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/Host/RNDISClassHost.h
@@ -56,7 +56,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/RNDIS.h"
+		#include "../Common/RNDISClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.c b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c
index 48aa8643..31f58135 100644
--- a/LUFA/Drivers/USB/Class/Host/StillImage.c
+++ b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.c
@@ -35,7 +35,7 @@
 
 #define  __INCLUDE_FROM_SI_DRIVER
 #define  __INCLUDE_FROM_STILLIMAGE_HOST_C
-#include "StillImage.h"
+#include "StillImageClassHost.h"
 
 uint8_t SI_Host_ConfigurePipes(USB_ClassInfo_SI_Host_t* const SIInterfaceInfo,
                                uint16_t ConfigDescriptorSize,
diff --git a/LUFA/Drivers/USB/Class/Host/StillImage.h b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.h
index 2c5c6b1b..44894fe6 100644
--- a/LUFA/Drivers/USB/Class/Host/StillImage.h
+++ b/LUFA/Drivers/USB/Class/Host/StillImageClassHost.h
@@ -55,7 +55,7 @@
 
 	/* Includes: */
 		#include "../../USB.h"
-		#include "../Common/StillImage.h"
+		#include "../Common/StillImageClassCommon.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/Class/MIDI.h b/LUFA/Drivers/USB/Class/MIDIClass.h
index 3f7970b6..fae117b3 100644
--- a/LUFA/Drivers/USB/Class/MIDI.h
+++ b/LUFA/Drivers/USB/Class/MIDIClass.h
@@ -70,11 +70,11 @@
 		#include "../Core/USBMode.h"
 
 		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/MIDI.h"
+			#include "Device/MIDIClassDevice.h"
 		#endif
 
 		#if defined(USB_CAN_BE_HOST)
-			#include "Host/MIDI.h"
+			#include "Host/MIDIClassHost.h"
 		#endif
 
 #endif
diff --git a/LUFA/Drivers/USB/Class/MassStorage.h b/LUFA/Drivers/USB/Class/MassStorageClass.h
index 49af9dd2..003c63be 100644
--- a/LUFA/Drivers/USB/Class/MassStorage.h
+++ b/LUFA/Drivers/USB/Class/MassStorageClass.h
@@ -67,11 +67,11 @@
 		#include "../Core/USBMode.h"
 
 		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/MassStorage.h"
+			#include "Device/MassStorageClassDevice.h"
 		#endif
 
 		#if defined(USB_CAN_BE_HOST)
-			#include "Host/MassStorage.h"
+			#include "Host/MassStorageClassHost.h"
 		#endif
 
 #endif
diff --git a/LUFA/Drivers/USB/Class/Printer.h b/LUFA/Drivers/USB/Class/PrinterClass.h
index 067ce756..52edd520 100644
--- a/LUFA/Drivers/USB/Class/Printer.h
+++ b/LUFA/Drivers/USB/Class/PrinterClass.h
@@ -68,7 +68,7 @@
 		#include "../Core/USBMode.h"
 
 		#if defined(USB_CAN_BE_HOST)
-			#include "Host/Printer.h"
+			#include "Host/PrinterClassHost.h"
 		#endif
 
 #endif
diff --git a/LUFA/Drivers/USB/Class/RNDIS.h b/LUFA/Drivers/USB/Class/RNDISClass.h
index 37a58408..a85ba1d0 100644
--- a/LUFA/Drivers/USB/Class/RNDIS.h
+++ b/LUFA/Drivers/USB/Class/RNDISClass.h
@@ -67,11 +67,11 @@
 		#include "../Core/USBMode.h"
 
 		#if defined(USB_CAN_BE_DEVICE)
-			#include "Device/RNDIS.h"
+			#include "Device/RNDISClassDevice.h"
 		#endif
 
 		#if defined(USB_CAN_BE_HOST)
-			#include "Host/RNDIS.h"
+			#include "Host/RNDISClassHost.h"
 		#endif
 
 #endif
diff --git a/LUFA/Drivers/USB/Class/StillImage.h b/LUFA/Drivers/USB/Class/StillImageClass.h
index a421b155..74e93ed2 100644
--- a/LUFA/Drivers/USB/Class/StillImage.h
+++ b/LUFA/Drivers/USB/Class/StillImageClass.h
@@ -66,7 +66,7 @@
 		#include "../Core/USBMode.h"
 
 		#if defined(USB_CAN_BE_HOST)
-			#include "Host/StillImage.h"
+			#include "Host/StillImageClassHost.h"
 		#endif
 
 #endif
diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index fa4fcf1c..a5a743be 100644
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -388,14 +388,14 @@
 			#include "Core/OTG.h"
 		#endif
 		
-		#include "Class/Audio.h"
-		#include "Class/CDC.h"
-		#include "Class/HID.h"
-		#include "Class/MassStorage.h"
-		#include "Class/MIDI.h"
-		#include "Class/Printer.h"
-		#include "Class/RNDIS.h"
-		#include "Class/StillImage.h"
+		#include "Class/AudioClass.h"
+		#include "Class/CDCClass.h"
+		#include "Class/HIDClass.h"
+		#include "Class/MassStorageClass.h"
+		#include "Class/MIDIClass.h"
+		#include "Class/PrinterClass.h"
+		#include "Class/RNDISClass.h"
+		#include "Class/StillImageClass.h"
 
 #endif