56 files changed, 108 insertions, 113 deletions
diff --git a/LUFA/Drivers/Board/ADAFRUITU4/LEDs.h b/LUFA/Drivers/Board/AVR8/ADAFRUITU4/LEDs.h
index 9f5097f17..125481d0e 100644
--- a/LUFA/Drivers/Board/ADAFRUITU4/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/ADAFRUITU4/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_ADAFRUITU4_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h b/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h
index daefcdea9..0c382dfc5 100644
--- a/LUFA/Drivers/Board/ATAVRUSBRF01/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_ATAVRUSBRF01_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h b/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h
index 10456f1cd..858b21eec 100644
--- a/LUFA/Drivers/Board/ATAVRUSBRF01/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_ATAVRUSBRF01_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BENITO/Buttons.h b/LUFA/Drivers/Board/AVR8/BENITO/Buttons.h
index 141f1ed4d..3e722d62b 100644
--- a/LUFA/Drivers/Board/BENITO/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/BENITO/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_BENITO_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BENITO/LEDs.h b/LUFA/Drivers/Board/AVR8/BENITO/LEDs.h
index 596765fee..790960068 100644
--- a/LUFA/Drivers/Board/BENITO/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/BENITO/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_BENITO_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BLACKCAT/LEDs.h b/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h
index 8b322bcf7..42e2788c8 100644
--- a/LUFA/Drivers/Board/BLACKCAT/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/BLACKCAT/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_BLACKCAT_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BUI/LEDs.h b/LUFA/Drivers/Board/AVR8/BUI/LEDs.h
index d8cf7e785..aeb757a8b 100644
--- a/LUFA/Drivers/Board/BUI/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/BUI/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_BUI_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 /* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BUMBLEB/Buttons.h b/LUFA/Drivers/Board/AVR8/BUMBLEB/Buttons.h
index b4bab86cd..c3860e08a 100644
--- a/LUFA/Drivers/Board/BUMBLEB/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/BUMBLEB/Buttons.h
@@ -51,7 +51,7 @@
 #define __BUTTONS_BUMBLEB_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BUMBLEB/Joystick.h b/LUFA/Drivers/Board/AVR8/BUMBLEB/Joystick.h
index 28b09b49e..e9ff2f888 100644
--- a/LUFA/Drivers/Board/BUMBLEB/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/BUMBLEB/Joystick.h
@@ -51,7 +51,7 @@
 #define __JOYSTICK_BUMBLEB_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/BUMBLEB/LEDs.h b/LUFA/Drivers/Board/AVR8/BUMBLEB/LEDs.h
index c5ecfe87f..fa53764e0 100644
--- a/LUFA/Drivers/Board/BUMBLEB/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/BUMBLEB/LEDs.h
@@ -51,7 +51,7 @@
 #define __LEDS_BUMBLEB_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/CULV3/Buttons.h b/LUFA/Drivers/Board/AVR8/CULV3/Buttons.h
index 53bf57a0f..c9153b232 100644
--- a/LUFA/Drivers/Board/CULV3/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/CULV3/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_CULV3_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/CULV3/LEDs.h b/LUFA/Drivers/Board/AVR8/CULV3/LEDs.h
index c2af7401a..86e5c0cff 100644
--- a/LUFA/Drivers/Board/CULV3/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/CULV3/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_CULV3_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK527/Buttons.h b/LUFA/Drivers/Board/AVR8/EVK527/Buttons.h
index 98c8ce644..03c51d2e8 100644
--- a/LUFA/Drivers/Board/EVK527/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_EVK527_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK527/Dataflash.h b/LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
index 2f0ad5724..9a5d98557 100644
--- a/LUFA/Drivers/Board/EVK527/Dataflash.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/Dataflash.h
@@ -49,7 +49,8 @@
 #define __DATAFLASH_EVK527_H__
 
 	/* Includes: */
-		#include "../../Misc/AT45DB321C.h"
+		#include "../../../../Common/Common.h"
+		#include "../../../Misc/AT45DB321C.h"
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/EVK527/Joystick.h b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
index cab4423ed..696530173 100644
--- a/LUFA/Drivers/Board/EVK527/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/Joystick.h
@@ -49,7 +49,7 @@
 #define __JOYSTICK_EVK527_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK527/LEDs.h b/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h
index b7c9e979a..b24c9bc29 100644
--- a/LUFA/Drivers/Board/EVK527/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/EVK527/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_EVK527_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/JMDBU2/Buttons.h b/LUFA/Drivers/Board/AVR8/JMDBU2/Buttons.h
index 4f3581654..170eaeabd 100644
--- a/LUFA/Drivers/Board/JMDBU2/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/JMDBU2/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_JMDBU2_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/JMDBU2/LEDs.h b/LUFA/Drivers/Board/AVR8/JMDBU2/LEDs.h
index 3c9bdc3b4..b3847b709 100644
--- a/LUFA/Drivers/Board/JMDBU2/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/JMDBU2/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_JMDBU2_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MAXIMUS/LEDs.h b/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h
index 5297d77ed..a19bfe5bf 100644
--- a/LUFA/Drivers/Board/MAXIMUS/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/MAXIMUS/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_MAXIMUS_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MICROSIN162/Buttons.h b/LUFA/Drivers/Board/AVR8/MICROSIN162/Buttons.h
index f41d28192..46746f817 100644
--- a/LUFA/Drivers/Board/MICROSIN162/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/MICROSIN162/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_MICROSIN162_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MICROSIN162/LEDs.h b/LUFA/Drivers/Board/AVR8/MICROSIN162/LEDs.h
index 2fa39fd64..443316be5 100644
--- a/LUFA/Drivers/Board/MICROSIN162/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/MICROSIN162/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_MICROSIN162_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MINIMUS/Buttons.h b/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h
index 518db8810..3ea294fd8 100644
--- a/LUFA/Drivers/Board/MINIMUS/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/MINIMUS/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_MINIMUS_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/MINIMUS/LEDs.h b/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h
index f921918da..3dfcb3510 100644
--- a/LUFA/Drivers/Board/MINIMUS/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/MINIMUS/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_MINIMUS_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/OLIMEX162/Buttons.h b/LUFA/Drivers/Board/AVR8/OLIMEX162/Buttons.h
index 33fee1678..32a7511e8 100644
--- a/LUFA/Drivers/Board/OLIMEX162/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/OLIMEX162/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_OLIMEX162_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/OLIMEX162/LEDs.h b/LUFA/Drivers/Board/AVR8/OLIMEX162/LEDs.h
index 971c08a26..9872b9463 100644
--- a/LUFA/Drivers/Board/OLIMEX162/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/OLIMEX162/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_OLIMEX162_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h b/LUFA/Drivers/Board/AVR8/RZUSBSTICK/LEDs.h
index af8ff8cef..ed5c2c191 100644
--- a/LUFA/Drivers/Board/RZUSBSTICK/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/RZUSBSTICK/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_RZUSBSTICK_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/SPARKFUN8U2/LEDs.h b/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h
index 1d5291311..d4436d35b 100644
--- a/LUFA/Drivers/Board/SPARKFUN8U2/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_SPARKFUN8U2_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK525/Buttons.h b/LUFA/Drivers/Board/AVR8/STK525/Buttons.h
index 7e079f9a4..d67a51df1 100644
--- a/LUFA/Drivers/Board/STK525/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/STK525/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_STK525_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK525/Dataflash.h b/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h
index 3d1cffaa5..f1c99651a 100644
--- a/LUFA/Drivers/Board/STK525/Dataflash.h
+++ b/LUFA/Drivers/Board/AVR8/STK525/Dataflash.h
@@ -49,7 +49,8 @@
 #define __DATAFLASH_STK525_H__
 
 	/* Includes: */
-		#include "../../Misc/AT45DB321C.h"
+		#include "../../../../Common/Common.h"
+		#include "../../../Misc/AT45DB321C.h"
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/STK525/Joystick.h b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h
index c90e7a0d2..3504d184d 100644
--- a/LUFA/Drivers/Board/STK525/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/STK525/Joystick.h
@@ -49,7 +49,7 @@
 #define __JOYSTICK_STK525_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK525/LEDs.h b/LUFA/Drivers/Board/AVR8/STK525/LEDs.h
index 98cbb2fff..2c81fd48c 100644
--- a/LUFA/Drivers/Board/STK525/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/STK525/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_STK525_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK526/Buttons.h b/LUFA/Drivers/Board/AVR8/STK526/Buttons.h
index 2f8b06485..e2000a92e 100644
--- a/LUFA/Drivers/Board/STK526/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/STK526/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_STK526_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK526/Dataflash.h b/LUFA/Drivers/Board/AVR8/STK526/Dataflash.h
index 6688358be..1d07c9e3e 100644
--- a/LUFA/Drivers/Board/STK526/Dataflash.h
+++ b/LUFA/Drivers/Board/AVR8/STK526/Dataflash.h
@@ -49,7 +49,8 @@
 #define __DATAFLASH_STK526_H__
 
 	/* Includes: */
-		#include "../../Misc/AT45DB642D.h"
+		#include "../../../../Common/Common.h"
+		#include "../../../Misc/AT45DB642D.h"
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/STK526/Joystick.h b/LUFA/Drivers/Board/AVR8/STK526/Joystick.h
index 96063846d..7c024fb39 100644
--- a/LUFA/Drivers/Board/STK526/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/STK526/Joystick.h
@@ -49,7 +49,7 @@
 #define __JOYSTICK_STK526_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/STK526/LEDs.h b/LUFA/Drivers/Board/AVR8/STK526/LEDs.h
index d8ccab1ec..b77c691b1 100644
--- a/LUFA/Drivers/Board/STK526/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/STK526/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_STK526_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/TEENSY/LEDs.h b/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h
index 9ff3506f0..01818756f 100644
--- a/LUFA/Drivers/Board/TEENSY/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/TEENSY/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_TEENSY_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/UDIP/Buttons.h b/LUFA/Drivers/Board/AVR8/UDIP/Buttons.h
index d1fd4192b..61ae9b8be 100644
--- a/LUFA/Drivers/Board/UDIP/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/UDIP/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_UDIP_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/UDIP/LEDs.h b/LUFA/Drivers/Board/AVR8/UDIP/LEDs.h
index 8c5fe7d51..53789038a 100644
--- a/LUFA/Drivers/Board/UDIP/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/UDIP/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_UDIP_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/UNO/LEDs.h b/LUFA/Drivers/Board/AVR8/UNO/LEDs.h
index 66942c8e0..0205b2dff 100644
--- a/LUFA/Drivers/Board/UNO/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/UNO/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_UNO_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBFOO/Buttons.h b/LUFA/Drivers/Board/AVR8/USBFOO/Buttons.h
index da3f5e1a8..21c6a1f2a 100644
--- a/LUFA/Drivers/Board/USBFOO/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/USBFOO/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_USBFOO_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBFOO/LEDS.h b/LUFA/Drivers/Board/AVR8/USBFOO/LEDS.h
index d82b76a49..cb4625836 100644
--- a/LUFA/Drivers/Board/USBFOO/LEDS.h
+++ b/LUFA/Drivers/Board/AVR8/USBFOO/LEDS.h
@@ -49,7 +49,7 @@
 #define __LEDS_USBFOO_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBKEY/Buttons.h b/LUFA/Drivers/Board/AVR8/USBKEY/Buttons.h
index e495318ec..018bf6b12 100644
--- a/LUFA/Drivers/Board/USBKEY/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/USBKEY/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_USBKEY_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBKEY/Dataflash.h b/LUFA/Drivers/Board/AVR8/USBKEY/Dataflash.h
index e54f0d838..e54f0d838 100644
--- a/LUFA/Drivers/Board/USBKEY/Dataflash.h
+++ b/LUFA/Drivers/Board/AVR8/USBKEY/Dataflash.h
diff --git a/LUFA/Drivers/Board/USBKEY/Joystick.h b/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h
index b8ae7bc3e..65f348178 100644
--- a/LUFA/Drivers/Board/USBKEY/Joystick.h
+++ b/LUFA/Drivers/Board/AVR8/USBKEY/Joystick.h
@@ -49,7 +49,7 @@
 #define __JOYSTICK_USBKEY_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBKEY/LEDs.h b/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h
index 25cfabdf4..f7bb39873 100644
--- a/LUFA/Drivers/Board/USBKEY/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/USBKEY/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_USBKEY_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBTINYMKII/Buttons.h b/LUFA/Drivers/Board/AVR8/USBTINYMKII/Buttons.h
index 06f98feaf..20cb34054 100644
--- a/LUFA/Drivers/Board/USBTINYMKII/Buttons.h
+++ b/LUFA/Drivers/Board/AVR8/USBTINYMKII/Buttons.h
@@ -49,7 +49,7 @@
 #define __BUTTONS_USBTINYMKII_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/USBTINYMKII/LEDs.h b/LUFA/Drivers/Board/AVR8/USBTINYMKII/LEDs.h
index 99fbd535b..00cfd2b43 100644
--- a/LUFA/Drivers/Board/USBTINYMKII/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/USBTINYMKII/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_USBTINYMKII_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/XPLAIN/Dataflash.h b/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
index ed4ab6a18..42c026906 100644
--- a/LUFA/Drivers/Board/XPLAIN/Dataflash.h
+++ b/LUFA/Drivers/Board/AVR8/XPLAIN/Dataflash.h
@@ -49,7 +49,8 @@
 #define __DATAFLASH_XPLAIN_H__
 
 	/* Includes: */
-		#include "../../Misc/AT45DB642D.h"
+		#include "../../../../Common/Common.h"
+		#include "../../../Misc/AT45DB642D.h"
 
 	/* Preprocessor Checks: */
 		#if !defined(__INCLUDE_FROM_DATAFLASH_H)
diff --git a/LUFA/Drivers/Board/XPLAIN/LEDs.h b/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h
index 75d4a7bc9..d00bbb6a9 100644
--- a/LUFA/Drivers/Board/XPLAIN/LEDs.h
+++ b/LUFA/Drivers/Board/AVR8/XPLAIN/LEDs.h
@@ -49,7 +49,7 @@
 #define __LEDS_XPLAIN_H__
 
 	/* Includes: */
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index e32c4ebe8..e4fe21dd0 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -94,37 +94,37 @@
 		#if (BOARD == BOARD_NONE)
 			#error The Board Buttons driver cannot be used if the makefile BOARD option is not set.
 		#elif (BOARD == BOARD_USBKEY)
-			#include "USBKEY/Buttons.h"
+			#include "AVR8/USBKEY/Buttons.h"
 		#elif (BOARD == BOARD_STK525)
-			#include "STK525/Buttons.h"
+			#include "AVR8/STK525/Buttons.h"
 		#elif (BOARD == BOARD_STK526)
-			#include "STK526/Buttons.h"
+			#include "AVR8/STK526/Buttons.h"
 		#elif (BOARD == BOARD_ATAVRUSBRF01)
-			#include "ATAVRUSBRF01/Buttons.h"
+			#include "AVR8/ATAVRUSBRF01/Buttons.h"
 		#elif (BOARD == BOARD_BUMBLEB)
-			#include "BUMBLEB/Buttons.h"
+			#include "AVR8/BUMBLEB/Buttons.h"
 		#elif (BOARD == BOARD_EVK527)
-			#include "EVK527/Buttons.h"
+			#include "AVR8/EVK527/Buttons.h"
 		#elif (BOARD == BOARD_USBTINYMKII)
-			#include "USBTINYMKII/Buttons.h"
+			#include "AVR8/USBTINYMKII/Buttons.h"
 		#elif (BOARD == BOARD_BENITO)
-			#include "BENITO/Buttons.h"
+			#include "AVR8/BENITO/Buttons.h"
 		#elif (BOARD == BOARD_JMDBU2)
-			#include "JMDBU2/Buttons.h"
+			#include "AVR8/JMDBU2/Buttons.h"
 		#elif (BOARD == BOARD_OLIMEX162)
-			#include "OLIMEX162/Buttons.h"
+			#include "AVR8/OLIMEX162/Buttons.h"
 		#elif (BOARD == BOARD_USBFOO)
-			#include "USBFOO/Buttons.h"
+			#include "AVR8/USBFOO/Buttons.h"
 		#elif (BOARD == BOARD_UDIP)
-			#include "UDIP/Buttons.h"
+			#include "AVR8/UDIP/Buttons.h"
 		#elif (BOARD == BOARD_CULV3)
-			#include "CULV3/Buttons.h"
+			#include "AVR8/CULV3/Buttons.h"
 		#elif (BOARD == BOARD_MINIMUS)
-			#include "MINIMUS/Buttons.h"
+			#include "AVR8/MINIMUS/Buttons.h"
 		#elif (BOARD == BOARD_MICROSIN162)
-			#include "MICROSIN162/Buttons.h"
+			#include "AVR8/MICROSIN162/Buttons.h"
 		#elif (BOARD == BOARD_EVK1101)
-			#include "EVK1101/Buttons.h"
+			#include "UC3/EVK1101/Buttons.h"
 		#else
 			#include "Board/Buttons.h"
 		#endif
diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index cb5b7fccc..9d68739af 100644
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -235,17 +235,15 @@
 			#if (BOARD == BOARD_NONE)
 				#error The Board Dataflash driver cannot be used if the makefile BOARD option is not set.
 			#elif (BOARD == BOARD_USBKEY)
-				#include "USBKEY/Dataflash.h"
+				#include "AVR8/USBKEY/Dataflash.h"
 			#elif (BOARD == BOARD_STK525)
-				#include "STK525/Dataflash.h"
+				#include "AVR8/STK525/Dataflash.h"
 			#elif (BOARD == BOARD_STK526)
-				#include "STK526/Dataflash.h"
-			#elif (BOARD == BOARD_XPLAIN)
-				#include "XPLAIN/Dataflash.h"
-			#elif (BOARD == BOARD_XPLAIN_REV1)
-				#include "XPLAIN/Dataflash.h"
+				#include "AVR8/STK526/Dataflash.h"
+			#elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
+				#include "AVR8/XPLAIN/Dataflash.h"
 			#elif (BOARD == BOARD_EVK527)
-				#include "EVK527/Dataflash.h"
+				#include "AVR8/EVK527/Dataflash.h"
 			#else
 				#include "Board/Dataflash.h"
 			#endif
diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h
index 7b8941695..35b989dec 100644
--- a/LUFA/Drivers/Board/Joystick.h
+++ b/LUFA/Drivers/Board/Joystick.h
@@ -102,17 +102,17 @@
 		#if (BOARD == BOARD_NONE)
 			#error The Board Joystick driver cannot be used if the makefile BOARD option is not set.
 		#elif (BOARD == BOARD_USBKEY)
-			#include "USBKEY/Joystick.h"
+			#include "AVR8/USBKEY/Joystick.h"
 		#elif (BOARD == BOARD_STK525)
-			#include "STK525/Joystick.h"
+			#include "AVR8/STK525/Joystick.h"
 		#elif (BOARD == BOARD_STK526)
-			#include "STK526/Joystick.h"
+			#include "AVR8/STK526/Joystick.h"
 		#elif (BOARD == BOARD_BUMBLEB)
-			#include "BUMBLEB/Joystick.h"
+			#include "AVR8/BUMBLEB/Joystick.h"
 		#elif (BOARD == BOARD_EVK527)
-			#include "EVK527/Joystick.h"
+			#include "AVR8/EVK527/Joystick.h"
 		#elif (BOARD == BOARD_EVK1101)
-			#include "EVK1101/Joystick.h"
+			#include "UC3/EVK1101/Joystick.h"
 		#else
 			#include "Board/Joystick.h"
 		#endif
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 628f2587b..ac7716b43 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -116,55 +116,55 @@
 		static inline void LEDs_ToggleLEDs(const uint8_t LEDMask) {};
 		static inline uint8_t LEDs_GetLEDs(void) { return 0; }
 	#elif (BOARD == BOARD_USBKEY)
-		#include "USBKEY/LEDs.h"
+		#include "AVR8/USBKEY/LEDs.h"
 	#elif (BOARD == BOARD_STK525)
-		#include "STK525/LEDs.h"
+		#include "AVR8/STK525/LEDs.h"
 	#elif (BOARD == BOARD_STK526)
-		#include "STK526/LEDs.h"
+		#include "AVR8/STK526/LEDs.h"
 	#elif (BOARD == BOARD_RZUSBSTICK)
-		#include "RZUSBSTICK/LEDs.h"
+		#include "AVR8/RZUSBSTICK/LEDs.h"
 	#elif (BOARD == BOARD_ATAVRUSBRF01)
-		#include "ATAVRUSBRF01/LEDs.h"
+		#include "AVR8/ATAVRUSBRF01/LEDs.h"
 	#elif ((BOARD == BOARD_XPLAIN) || (BOARD == BOARD_XPLAIN_REV1))
-		#include "XPLAIN/LEDs.h"
+		#include "AVR8/XPLAIN/LEDs.h"
 	#elif (BOARD == BOARD_BUMBLEB)
-		#include "BUMBLEB/LEDs.h"
+		#include "AVR8/BUMBLEB/LEDs.h"
 	#elif (BOARD == BOARD_EVK527)
-		#include "EVK527/LEDs.h"
+		#include "AVR8/EVK527/LEDs.h"
 	#elif (BOARD == BOARD_TEENSY)
-		#include "TEENSY/LEDs.h"
+		#include "AVR8/TEENSY/LEDs.h"
 	#elif (BOARD == BOARD_USBTINYMKII)
-		#include "USBTINYMKII/LEDs.h"
+		#include "AVR8/USBTINYMKII/LEDs.h"
 	#elif (BOARD == BOARD_BENITO)
-		#include "BENITO/LEDs.h"
+		#include "AVR8/BENITO/LEDs.h"
 	#elif (BOARD == BOARD_JMDBU2)
-		#include "JMDBU2/LEDs.h"
+		#include "AVR8/JMDBU2/LEDs.h"
 	#elif (BOARD == BOARD_OLIMEX162)
-		#include "OLIMEX162/LEDs.h"
+		#include "AVR8/OLIMEX162/LEDs.h"
 	#elif (BOARD == BOARD_USBFOO)
-		#include "USBFOO/LEDs.h"
+		#include "AVR8/USBFOO/LEDs.h"
 	#elif (BOARD == BOARD_UDIP)
-		#include "UDIP/LEDs.h"
+		#include "AVR8/UDIP/LEDs.h"
 	#elif (BOARD == BOARD_BUI)
-		#include "BUI/LEDs.h"
+		#include "AVR8/BUI/LEDs.h"
 	#elif (BOARD == BOARD_UNO)
-		#include "UNO/LEDs.h"
+		#include "AVR8/UNO/LEDs.h"
 	#elif (BOARD == BOARD_CULV3)
-		#include "CULV3/LEDs.h"
+		#include "AVR8/CULV3/LEDs.h"
 	#elif (BOARD == BOARD_BLACKCAT)
-		#include "BLACKCAT/LEDs.h"
+		#include "AVR8/BLACKCAT/LEDs.h"
 	#elif (BOARD == BOARD_MAXIMUS)
-		#include "MAXIMUS/LEDs.h"
+		#include "AVR8/MAXIMUS/LEDs.h"
 	#elif (BOARD == BOARD_MINIMUS)
-		#include "MINIMUS/LEDs.h"
+		#include "AVR8/MINIMUS/LEDs.h"
 	#elif (BOARD == BOARD_ADAFRUITU4)
-		#include "ADAFRUITU4/LEDs.h"
+		#include "AVR8/ADAFRUITU4/LEDs.h"
 	#elif (BOARD == BOARD_MICROSIN162)
-		#include "MICROSIN162/LEDs.h"
+		#include "AVR8/MICROSIN162/LEDs.h"
 	#elif (BOARD == BOARD_SPARKFUN8U2)
-		#include "SPARKFUN8U2/LEDs.h"
+		#include "AVR8/SPARKFUN8U2/LEDs.h"
 	#elif (BOARD == BOARD_EVK1101)
-		#include "EVK1101/LEDs.h"
+		#include "UC3/EVK1101/LEDs.h"
 	#else
 		#include "Board/LEDs.h"
 	#endif
diff --git a/LUFA/Drivers/Board/EVK1101/Buttons.h b/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h
index 416569461..909c3127a 100644
--- a/LUFA/Drivers/Board/EVK1101/Buttons.h
+++ b/LUFA/Drivers/Board/UC3/EVK1101/Buttons.h
@@ -49,10 +49,7 @@
 #define __BUTTONS_EVK1101_H__
 
 	/* Includes: */
-		#include <avr32/io.h>
-		#include <stdbool.h>
-
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK1101/Joystick.h b/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h
index 790f1823a..ea20c677d 100644
--- a/LUFA/Drivers/Board/EVK1101/Joystick.h
+++ b/LUFA/Drivers/Board/UC3/EVK1101/Joystick.h
@@ -49,9 +49,7 @@
 #define __JOYSTICK_EVK1101_H__
 
 	/* Includes: */
-		#include <avr32/io.h>
-
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/Board/EVK1101/LEDs.h b/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
index ddb460795..4c7ad5db5 100644
--- a/LUFA/Drivers/Board/EVK1101/LEDs.h
+++ b/LUFA/Drivers/Board/UC3/EVK1101/LEDs.h
@@ -49,9 +49,7 @@
 #define __LEDS_EVK1101_H__
 
 	/* Includes: */
-		#include <avr32/io.h>
-
-		#include "../../../Common/Common.h"
+		#include "../../../../Common/Common.h"
 
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)