Revert changes made for the partial port to the AVR32 architecture.

LUFA/Drivers/USB/HighLevel/StdDescriptors.h

@@ -41,16 +41,9 @@
 #define __USBDESCRIPTORS_H__
 
 	/* Includes: */
-		#if defined(__AVR32__)
-			#include <avr32/io.h>
-			#include <stdint.h>
-			#include <stdbool.h>
-			#include <stddef.h>
-		#elif defined(__AVR__)
-			#include <avr/pgmspace.h>
-			#include <stdbool.h>
-			#include <stddef.h>
-		#endif
+		#include <avr/pgmspace.h>
+		#include <stdbool.h>
+		#include <stddef.h>
 
 		#include "../../../Common/Common.h"
 		#include "USBMode.h"
@@ -67,7 +60,7 @@
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_USB_DRIVER)
-			#error Do not include this file directly. Include LUFA/Drivers/USB/USB.h instead.
+			#error Do not include this file directly. Include LUFA/Drivers/USB.h instead.
 		#endif
 		
 	/* Public Interface - May be used in end-application: */