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

12 files changed, 12 insertions, 12 deletions

diff --git a/LUFA/Drivers/USB/Class/Device/Audio.c b/LUFA/Drivers/USB/Class/Device/AudioClassDevice.c
index cdbe1a0d9..d8c5d29eb 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 60880c29e..175bc8bf4 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 29e5c25eb..e3b05e037 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 b1eeb41dc..449b76afd 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 ec02138ab..9b5a7dd35 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 52bff7ec9..40aab3902 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 5e4bd9c2d..13454592b 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 45a756157..c73ce43bf 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 7586c2812..1e3fe3412 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 6f0539e54..ce0bcb787 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 9a89ae077..12115ee5e 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 a3b45cbc5..9953fa1a3 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)