From 0e64a9d0c290ff6eb504323dc3b30fdddefdcc85 Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sun, 27 Jan 2013 15:48:09 +0000
Subject: [PATCH] Update Atmel Studio core board templates to use different
 templates for each driver, so that the project caption contains the
 architecture. Update individual board modules to include the relevant board
 hardware drivers.

---
 Demos/Device/ClassDriver/AudioInput/asf.xml   |   2 +-
 Demos/Device/ClassDriver/AudioOutput/asf.xml  |   2 +-
 .../ClassDriver/DualVirtualSerial/asf.xml     |   2 +-
 Demos/Device/ClassDriver/GenericHID/asf.xml   |   2 +-
 Demos/Device/ClassDriver/Joystick/asf.xml     |   2 +-
 Demos/Device/ClassDriver/Keyboard/asf.xml     |   2 +-
 .../Device/ClassDriver/KeyboardMouse/asf.xml  |   2 +-
 .../KeyboardMouseMultiReport/asf.xml          |   2 +-
 Demos/Device/ClassDriver/MIDI/asf.xml         |   2 +-
 Demos/Device/ClassDriver/MassStorage/asf.xml  |   2 +-
 .../ClassDriver/MassStorageKeyboard/asf.xml   |   2 +-
 Demos/Device/ClassDriver/Mouse/asf.xml        |   2 +-
 .../Device/ClassDriver/RNDISEthernet/asf.xml  |   2 +-
 .../Device/ClassDriver/VirtualSerial/asf.xml  |   2 +-
 .../VirtualSerialMassStorage/asf.xml          |   2 +-
 .../ClassDriver/VirtualSerialMouse/asf.xml    |   2 +-
 Demos/Device/LowLevel/AudioInput/asf.xml      |   2 +-
 Demos/Device/LowLevel/AudioOutput/asf.xml     |   2 +-
 .../Device/LowLevel/DualVirtualSerial/asf.xml |   2 +-
 Demos/Device/LowLevel/GenericHID/asf.xml      |   2 +-
 Demos/Device/LowLevel/Joystick/asf.xml        |   2 +-
 Demos/Device/LowLevel/Keyboard/asf.xml        |   2 +-
 Demos/Device/LowLevel/KeyboardMouse/asf.xml   |   2 +-
 Demos/Device/LowLevel/MIDI/asf.xml            |   2 +-
 Demos/Device/LowLevel/MassStorage/asf.xml     |   2 +-
 Demos/Device/LowLevel/Mouse/asf.xml           |   2 +-
 Demos/Device/LowLevel/RNDISEthernet/asf.xml   |   2 +-
 Demos/Device/LowLevel/VirtualSerial/asf.xml   |   2 +-
 .../ClassDriver/MouseHostDevice/asf.xml       |   2 +-
 .../ClassDriver/AndroidAccessoryHost/asf.xml  |   2 +-
 Demos/Host/ClassDriver/AudioInputHost/asf.xml |   2 +-
 .../Host/ClassDriver/AudioOutputHost/asf.xml  |   2 +-
 .../JoystickHostWithParser/asf.xml            |   2 +-
 Demos/Host/ClassDriver/KeyboardHost/asf.xml   |   2 +-
 .../KeyboardHostWithParser/asf.xml            |   2 +-
 Demos/Host/ClassDriver/MIDIHost/asf.xml       |   2 +-
 .../Host/ClassDriver/MassStorageHost/asf.xml  |   2 +-
 Demos/Host/ClassDriver/MouseHost/asf.xml      |   2 +-
 .../ClassDriver/MouseHostWithParser/asf.xml   |   2 +-
 Demos/Host/ClassDriver/PrinterHost/asf.xml    |   2 +-
 .../ClassDriver/RNDISEthernetHost/asf.xml     |   2 +-
 Demos/Host/ClassDriver/StillImageHost/asf.xml |   2 +-
 .../ClassDriver/VirtualSerialHost/asf.xml     |   2 +-
 .../LowLevel/AndroidAccessoryHost/asf.xml     |   2 +-
 Demos/Host/LowLevel/AudioInputHost/asf.xml    |   2 +-
 Demos/Host/LowLevel/AudioOutputHost/asf.xml   |   2 +-
 Demos/Host/LowLevel/GenericHIDHost/asf.xml    |   2 +-
 .../LowLevel/JoystickHostWithParser/asf.xml   |   2 +-
 Demos/Host/LowLevel/KeyboardHost/asf.xml      |   2 +-
 .../LowLevel/KeyboardHostWithParser/asf.xml   |   2 +-
 Demos/Host/LowLevel/MIDIHost/asf.xml          |   2 +-
 Demos/Host/LowLevel/MassStorageHost/asf.xml   |   2 +-
 Demos/Host/LowLevel/MouseHost/asf.xml         |   2 +-
 .../Host/LowLevel/MouseHostWithParser/asf.xml |   2 +-
 Demos/Host/LowLevel/PrinterHost/asf.xml       |   2 +-
 Demos/Host/LowLevel/RNDISEthernetHost/asf.xml |   2 +-
 Demos/Host/LowLevel/StillImageHost/asf.xml    |   2 +-
 Demos/Host/LowLevel/VirtualSerialHost/asf.xml |   2 +-
 .../DeviceTemplate/DeviceApplication.c        |  29 ++-
 .../DeviceTemplate/DeviceApplication.h        |   3 +-
 LUFA/CodeTemplates/DeviceTemplate/asf.xml     |  16 +-
 LUFA/CodeTemplates/HostTemplate/asf.xml       |   2 +-
 LUFA/StudioIntegration/lufa_drivers_board.xml |  32 ++-
 .../lufa_drivers_board_names.xml              | 200 ++++++++++++++++++
 Projects/AVRISP-MKII/asf.xml                  |   2 +-
 Projects/Benito/asf.xml                       |   2 +-
 Projects/HIDReportViewer/asf.xml              |   2 +-
 Projects/LEDNotifier/asf.xml                  |   2 +-
 Projects/MIDIToneGenerator/asf.xml            |   2 +-
 Projects/Magstripe/asf.xml                    |   2 +-
 Projects/MediaController/asf.xml              |   2 +-
 Projects/MissileLauncher/asf.xml              |   2 +-
 Projects/RelayBoard/asf.xml                   |   2 +-
 Projects/SerialToLCD/asf.xml                  |   2 +-
 Projects/TempDataLogger/asf.xml               |   2 +-
 Projects/USBtoSerial/asf.xml                  |   2 +-
 Projects/Webserver/asf.xml                    |   2 +-
 Projects/XPLAINBridge/asf.xml                 |   2 +-
 78 files changed, 341 insertions(+), 85 deletions(-)

diff --git a/Demos/Device/ClassDriver/AudioInput/asf.xml b/Demos/Device/ClassDriver/AudioInput/asf.xml
index 71f1cdcc279..87a117a0853 100644
--- a/Demos/Device/ClassDriver/AudioInput/asf.xml
+++ b/Demos/Device/ClassDriver/AudioInput/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Audio Input Device Demo (Class Driver APIs)" id="lufa.demos.device.class.audio_input.example">
 		<require idref="lufa.demos.device.class.audio_input"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/AudioOutput/asf.xml b/Demos/Device/ClassDriver/AudioOutput/asf.xml
index dae49c74eb2..0dbc88146eb 100644
--- a/Demos/Device/ClassDriver/AudioOutput/asf.xml
+++ b/Demos/Device/ClassDriver/AudioOutput/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Audio Output Device Demo (Class Driver APIs)" id="lufa.demos.device.class.audio_output.example">
 		<require idref="lufa.demos.device.class.audio_output"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml b/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
index eb9560b597c..eb06e8ad02a 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Dual Virtual Serial Device Demo (Class Driver APIs)" id="lufa.demos.device.class.dual_cdc.example">
 		<require idref="lufa.demos.device.class.dual_cdc"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/GenericHID/asf.xml b/Demos/Device/ClassDriver/GenericHID/asf.xml
index 2c50f4d3536..2c09cc4589b 100644
--- a/Demos/Device/ClassDriver/GenericHID/asf.xml
+++ b/Demos/Device/ClassDriver/GenericHID/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Generic HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.generic_hid.example">
 		<require idref="lufa.demos.device.class.generic_hid"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/Joystick/asf.xml b/Demos/Device/ClassDriver/Joystick/asf.xml
index aab03316d2a..ccb653e0383 100644
--- a/Demos/Device/ClassDriver/Joystick/asf.xml
+++ b/Demos/Device/ClassDriver/Joystick/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Joystick HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.joystick.example">
 		<require idref="lufa.demos.device.class.joystick"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/Keyboard/asf.xml b/Demos/Device/ClassDriver/Keyboard/asf.xml
index 4f462c56921..8010c309830 100644
--- a/Demos/Device/ClassDriver/Keyboard/asf.xml
+++ b/Demos/Device/ClassDriver/Keyboard/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Keyboard HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.keyboard.example">
 		<require idref="lufa.demos.device.class.keyboard"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/KeyboardMouse/asf.xml b/Demos/Device/ClassDriver/KeyboardMouse/asf.xml
index e2704b416ee..92ddb871a7e 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/asf.xml
+++ b/Demos/Device/ClassDriver/KeyboardMouse/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Keyboard and Mouse HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.keyboard_mouse.example">
 		<require idref="lufa.demos.device.class.keyboard_mouse"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml
index 6db30d6daf5..cf11fe737d4 100644
--- a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml
+++ b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Keyboard and Mouse HID (Multi Report) Device Demo (Class Driver APIs)" id="lufa.demos.device.class.keyboard_mouse_mr.example">
 		<require idref="lufa.demos.device.class.keyboard_mouse_mr"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/MIDI/asf.xml b/Demos/Device/ClassDriver/MIDI/asf.xml
index 22402076fcc..4d2600c9f1a 100644
--- a/Demos/Device/ClassDriver/MIDI/asf.xml
+++ b/Demos/Device/ClassDriver/MIDI/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="MIDI Device Demo (Class Driver APIs)" id="lufa.demos.device.class.midi.example">
 		<require idref="lufa.demos.device.class.midi"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/MassStorage/asf.xml b/Demos/Device/ClassDriver/MassStorage/asf.xml
index dd8bd841868..bcd3b7ec1d2 100644
--- a/Demos/Device/ClassDriver/MassStorage/asf.xml
+++ b/Demos/Device/ClassDriver/MassStorage/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mass Storage Device Demo (Class Driver APIs)" id="lufa.demos.device.class.mass_storage.example">
 		<require idref="lufa.demos.device.class.mass_storage"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/MassStorageKeyboard/asf.xml b/Demos/Device/ClassDriver/MassStorageKeyboard/asf.xml
index 4e44c30caf0..fb1256ec87c 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/asf.xml
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mass Storage and HID Keyboard Device Demo (Class Driver APIs)" id="lufa.demos.device.class.mass_storage_keyboard.example">
 		<require idref="lufa.demos.device.class.mass_storage_keyboard"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/Mouse/asf.xml b/Demos/Device/ClassDriver/Mouse/asf.xml
index a1827b9fec4..ea43b22f6e2 100644
--- a/Demos/Device/ClassDriver/Mouse/asf.xml
+++ b/Demos/Device/ClassDriver/Mouse/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mouse HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.mouse.example">
 		<require idref="lufa.demos.device.class.mouse"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/RNDISEthernet/asf.xml b/Demos/Device/ClassDriver/RNDISEthernet/asf.xml
index c960ea9f346..526ece60fa3 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/asf.xml
+++ b/Demos/Device/ClassDriver/RNDISEthernet/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="RNDIS Ethernet Device Demo (Class Driver APIs)" id="lufa.demos.device.class.rndis.example">
 		<require idref="lufa.demos.device.class.rndis"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/VirtualSerial/asf.xml b/Demos/Device/ClassDriver/VirtualSerial/asf.xml
index 5a533a410bd..87d6520585b 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/asf.xml
+++ b/Demos/Device/ClassDriver/VirtualSerial/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Virtual Serial CDC Device Demo (Class Driver APIs)" id="lufa.demos.device.class.cdc.example">
 		<require idref="lufa.demos.device.class.cdc"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/VirtualSerialMassStorage/asf.xml b/Demos/Device/ClassDriver/VirtualSerialMassStorage/asf.xml
index 94e58988680..f02759736d3 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/asf.xml
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Virtual Serial CDC and Mass Storage Device Demo (Class Driver APIs)" id="lufa.demos.device.class.cdc_ms.example">
 		<require idref="lufa.demos.device.class.cdc_ms"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml b/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml
index 8cb230ca599..07e21a53547 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Virtual Serial CDC and Mouse HID Device Demo (Class Driver APIs)" id="lufa.demos.device.class.cdc_mouse.example">
 		<require idref="lufa.demos.device.class.cdc_mouse"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/AudioInput/asf.xml b/Demos/Device/LowLevel/AudioInput/asf.xml
index 4c48439f881..3b62f83f2f5 100644
--- a/Demos/Device/LowLevel/AudioInput/asf.xml
+++ b/Demos/Device/LowLevel/AudioInput/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Audio Input Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.audio_input.example">
 		<require idref="lufa.demos.device.lowlevel.audio_input"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/AudioOutput/asf.xml b/Demos/Device/LowLevel/AudioOutput/asf.xml
index b94807f5dad..522f1d0e548 100644
--- a/Demos/Device/LowLevel/AudioOutput/asf.xml
+++ b/Demos/Device/LowLevel/AudioOutput/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Audio Output Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.audio_output.example">
 		<require idref="lufa.demos.device.lowlevel.audio_output"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/DualVirtualSerial/asf.xml b/Demos/Device/LowLevel/DualVirtualSerial/asf.xml
index ad4dee5f40e..b04ce5913b8 100644
--- a/Demos/Device/LowLevel/DualVirtualSerial/asf.xml
+++ b/Demos/Device/LowLevel/DualVirtualSerial/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Dual Virtual Serial Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.dual_cdc.example">
 		<require idref="lufa.demos.device.lowlevel.dual_cdc"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/GenericHID/asf.xml b/Demos/Device/LowLevel/GenericHID/asf.xml
index 33de16eecbd..436e7b4d97f 100644
--- a/Demos/Device/LowLevel/GenericHID/asf.xml
+++ b/Demos/Device/LowLevel/GenericHID/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Generic HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.generic_hid.example">
 		<require idref="lufa.demos.device.lowlevel.generic_hid"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/Joystick/asf.xml b/Demos/Device/LowLevel/Joystick/asf.xml
index 43dbd9baa25..101dc05bac7 100644
--- a/Demos/Device/LowLevel/Joystick/asf.xml
+++ b/Demos/Device/LowLevel/Joystick/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Joystick HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.joystick.example">
 		<require idref="lufa.demos.device.lowlevel.joystick"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/Keyboard/asf.xml b/Demos/Device/LowLevel/Keyboard/asf.xml
index 605c0ef7548..9da57ae7795 100644
--- a/Demos/Device/LowLevel/Keyboard/asf.xml
+++ b/Demos/Device/LowLevel/Keyboard/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Keyboard HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.keyboard.example">
 		<require idref="lufa.demos.device.lowlevel.keyboard"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/KeyboardMouse/asf.xml b/Demos/Device/LowLevel/KeyboardMouse/asf.xml
index 2f1dfaa6e8a..ebf8055d65f 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/asf.xml
+++ b/Demos/Device/LowLevel/KeyboardMouse/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Keyboard and Mouse HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.keyboard_mouse.example">
 		<require idref="lufa.demos.device.lowlevel.keyboard_mouse"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/MIDI/asf.xml b/Demos/Device/LowLevel/MIDI/asf.xml
index 0ab2095c6d3..92ea6f05bb7 100644
--- a/Demos/Device/LowLevel/MIDI/asf.xml
+++ b/Demos/Device/LowLevel/MIDI/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="MIDI Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.midi.example">
 		<require idref="lufa.demos.device.lowlevel.midi"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/MassStorage/asf.xml b/Demos/Device/LowLevel/MassStorage/asf.xml
index 1667ac6a77f..6ffa794379a 100644
--- a/Demos/Device/LowLevel/MassStorage/asf.xml
+++ b/Demos/Device/LowLevel/MassStorage/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mass Storage Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.mass_storage.example">
 		<require idref="lufa.demos.device.lowlevel.mass_storage"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/Mouse/asf.xml b/Demos/Device/LowLevel/Mouse/asf.xml
index a596b7a5207..660f878af2c 100644
--- a/Demos/Device/LowLevel/Mouse/asf.xml
+++ b/Demos/Device/LowLevel/Mouse/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mouse HID Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.mouse.example">
 		<require idref="lufa.demos.device.lowlevel.mouse"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/RNDISEthernet/asf.xml b/Demos/Device/LowLevel/RNDISEthernet/asf.xml
index 6a2a697e100..b33bf8238af 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/asf.xml
+++ b/Demos/Device/LowLevel/RNDISEthernet/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="RNDIS Ethernet Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.rndis.example">
 		<require idref="lufa.demos.device.lowlevel.rndis"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Device/LowLevel/VirtualSerial/asf.xml b/Demos/Device/LowLevel/VirtualSerial/asf.xml
index dff598dd49f..0525dc5be11 100644
--- a/Demos/Device/LowLevel/VirtualSerial/asf.xml
+++ b/Demos/Device/LowLevel/VirtualSerial/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Virtual Serial CDC Device Demo (Low Level APIs)" id="lufa.demos.device.lowlevel.cdc.example">
 		<require idref="lufa.demos.device.lowlevel.cdc"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/DualRole/ClassDriver/MouseHostDevice/asf.xml b/Demos/DualRole/ClassDriver/MouseHostDevice/asf.xml
index 1e6dc146163..10d397f606d 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/asf.xml
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mouse HID Dual USB Mode Demo (Class Driver APIs)" id="lufa.demos.dualrole.class.mouse.example">
 		<require idref="lufa.demos.dualrole.class.mouse"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml b/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml
index c3540047631..a4332efb29e 100644
--- a/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml
+++ b/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Android Accessory Host Demo (Class Driver APIs)" id="lufa.demos.host.class.android.example">
 		<require idref="lufa.demos.host.class.android"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/AudioInputHost/asf.xml b/Demos/Host/ClassDriver/AudioInputHost/asf.xml
index d5d4f47fe12..b127a6355a8 100644
--- a/Demos/Host/ClassDriver/AudioInputHost/asf.xml
+++ b/Demos/Host/ClassDriver/AudioInputHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Audio Input Host Demo (Class Driver APIs)" id="lufa.demos.host.class.audio_input.example">
 		<require idref="lufa.demos.host.class.audio_input"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/AudioOutputHost/asf.xml b/Demos/Host/ClassDriver/AudioOutputHost/asf.xml
index 9d1d36f905a..c09757fed93 100644
--- a/Demos/Host/ClassDriver/AudioOutputHost/asf.xml
+++ b/Demos/Host/ClassDriver/AudioOutputHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Audio Output Host Demo (Class Driver APIs)" id="lufa.demos.host.class.audio_output.example">
 		<require idref="lufa.demos.host.class.audio_output"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/JoystickHostWithParser/asf.xml b/Demos/Host/ClassDriver/JoystickHostWithParser/asf.xml
index d7d1680b886..7cd2e5762d3 100644
--- a/Demos/Host/ClassDriver/JoystickHostWithParser/asf.xml
+++ b/Demos/Host/ClassDriver/JoystickHostWithParser/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Joystick HID (with parser) Host Demo (Class Driver APIs)" id="lufa.demos.host.class.joystick_parser.example">
 		<require idref="lufa.demos.host.class.joystick_parser"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/KeyboardHost/asf.xml b/Demos/Host/ClassDriver/KeyboardHost/asf.xml
index e11ec49c46e..f9633f0a51a 100644
--- a/Demos/Host/ClassDriver/KeyboardHost/asf.xml
+++ b/Demos/Host/ClassDriver/KeyboardHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Keyboard HID Host Demo (Class Driver APIs)" id="lufa.demos.host.class.keyboard.example">
 		<require idref="lufa.demos.host.class.keyboard"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/KeyboardHostWithParser/asf.xml b/Demos/Host/ClassDriver/KeyboardHostWithParser/asf.xml
index af84bc6f240..67411594c47 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/asf.xml
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Keyboard HID (with parser) Host Demo (Class Driver APIs)" id="lufa.demos.host.class.keyboard_parser.example">
 		<require idref="lufa.demos.host.class.keyboard_parser"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/MIDIHost/asf.xml b/Demos/Host/ClassDriver/MIDIHost/asf.xml
index 492a1209980..5129fa4343d 100644
--- a/Demos/Host/ClassDriver/MIDIHost/asf.xml
+++ b/Demos/Host/ClassDriver/MIDIHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="MIDI Host Demo (Class Driver APIs)" id="lufa.demos.host.class.midi.example">
 		<require idref="lufa.demos.host.class.midi"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/MassStorageHost/asf.xml b/Demos/Host/ClassDriver/MassStorageHost/asf.xml
index 7b07416c760..2d57c745b7a 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/asf.xml
+++ b/Demos/Host/ClassDriver/MassStorageHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mass Storage Host Demo (Class Driver APIs)" id="lufa.demos.host.class.ms.example">
 		<require idref="lufa.demos.host.class.ms"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/MouseHost/asf.xml b/Demos/Host/ClassDriver/MouseHost/asf.xml
index 523ace6f63e..fb7d261418f 100644
--- a/Demos/Host/ClassDriver/MouseHost/asf.xml
+++ b/Demos/Host/ClassDriver/MouseHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mouse HID Host Demo (Class Driver APIs)" id="lufa.demos.host.class.mouse.example">
 		<require idref="lufa.demos.host.class.mouse"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/MouseHostWithParser/asf.xml b/Demos/Host/ClassDriver/MouseHostWithParser/asf.xml
index e8f8369d825..943dc28ebc4 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/asf.xml
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mouse HID (with parser) Host Demo (Class Driver APIs)" id="lufa.demos.host.class.mouse_parser.example">
 		<require idref="lufa.demos.host.class.mouse_parser"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/PrinterHost/asf.xml b/Demos/Host/ClassDriver/PrinterHost/asf.xml
index d72a86c86f8..14c92eb5b3e 100644
--- a/Demos/Host/ClassDriver/PrinterHost/asf.xml
+++ b/Demos/Host/ClassDriver/PrinterHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Printer Host Demo (Class Driver APIs)" id="lufa.demos.host.class.printer.example">
 		<require idref="lufa.demos.host.class.printer"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/RNDISEthernetHost/asf.xml b/Demos/Host/ClassDriver/RNDISEthernetHost/asf.xml
index 83d1295f6b6..c684b3677bd 100644
--- a/Demos/Host/ClassDriver/RNDISEthernetHost/asf.xml
+++ b/Demos/Host/ClassDriver/RNDISEthernetHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="RNDIS Ethernet Host Demo (Class Driver APIs)" id="lufa.demos.host.class.rndis.example">
 		<require idref="lufa.demos.host.class.rndis"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/StillImageHost/asf.xml b/Demos/Host/ClassDriver/StillImageHost/asf.xml
index 6548a38fc77..1be92f33c6b 100644
--- a/Demos/Host/ClassDriver/StillImageHost/asf.xml
+++ b/Demos/Host/ClassDriver/StillImageHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Still Image Host Demo (Class Driver APIs)" id="lufa.demos.host.class.si.example">
 		<require idref="lufa.demos.host.class.si"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/ClassDriver/VirtualSerialHost/asf.xml b/Demos/Host/ClassDriver/VirtualSerialHost/asf.xml
index ca9aaa01f4b..fa464e43d52 100644
--- a/Demos/Host/ClassDriver/VirtualSerialHost/asf.xml
+++ b/Demos/Host/ClassDriver/VirtualSerialHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Virtual Serial CDC Host Demo (Class Driver APIs)" id="lufa.demos.host.class.cdc.example">
 		<require idref="lufa.demos.host.class.cdc"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml b/Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml
index e145ce3b943..f34a078e518 100644
--- a/Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml
+++ b/Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Android Accessory Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.android.example">
 		<require idref="lufa.demos.host.lowlevel.android"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/AudioInputHost/asf.xml b/Demos/Host/LowLevel/AudioInputHost/asf.xml
index 1608f50f634..299c4a483ee 100644
--- a/Demos/Host/LowLevel/AudioInputHost/asf.xml
+++ b/Demos/Host/LowLevel/AudioInputHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Audio Input Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.audio_input.example">
 		<require idref="lufa.demos.host.lowlevel.audio_input"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/AudioOutputHost/asf.xml b/Demos/Host/LowLevel/AudioOutputHost/asf.xml
index b821eb10447..0f9f4efde7a 100644
--- a/Demos/Host/LowLevel/AudioOutputHost/asf.xml
+++ b/Demos/Host/LowLevel/AudioOutputHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Audio Output Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.audio_output.example">
 		<require idref="lufa.demos.host.lowlevel.audio_output"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/GenericHIDHost/asf.xml b/Demos/Host/LowLevel/GenericHIDHost/asf.xml
index fb3dd0a0a30..ea0388f3cb0 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/asf.xml
+++ b/Demos/Host/LowLevel/GenericHIDHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Generic HID Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.generic_hid.example">
 		<require idref="lufa.demos.host.lowlevel.generic_hid"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/JoystickHostWithParser/asf.xml b/Demos/Host/LowLevel/JoystickHostWithParser/asf.xml
index 60e92a1ec41..261ee3b78d1 100644
--- a/Demos/Host/LowLevel/JoystickHostWithParser/asf.xml
+++ b/Demos/Host/LowLevel/JoystickHostWithParser/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Joystick HID (with parser) Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.joystick_parser.example">
 		<require idref="lufa.demos.host.lowlevel.joystick_parser"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/KeyboardHost/asf.xml b/Demos/Host/LowLevel/KeyboardHost/asf.xml
index 1da831500dd..c56258a550f 100644
--- a/Demos/Host/LowLevel/KeyboardHost/asf.xml
+++ b/Demos/Host/LowLevel/KeyboardHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Keyboard HID Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.keyboard.example">
 		<require idref="lufa.demos.host.lowlevel.keyboard"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml b/Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml
index f230ca28b16..6313775e426 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Keyboard HID (with parser) Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.keyboard_parser.example">
 		<require idref="lufa.demos.host.lowlevel.keyboard_parser"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/MIDIHost/asf.xml b/Demos/Host/LowLevel/MIDIHost/asf.xml
index 0bd2da7c813..aa0a5f343df 100644
--- a/Demos/Host/LowLevel/MIDIHost/asf.xml
+++ b/Demos/Host/LowLevel/MIDIHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="MIDI Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.midi.example">
 		<require idref="lufa.demos.host.lowlevel.midi"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/MassStorageHost/asf.xml b/Demos/Host/LowLevel/MassStorageHost/asf.xml
index 6393a218b6b..a6ef8fe53af 100644
--- a/Demos/Host/LowLevel/MassStorageHost/asf.xml
+++ b/Demos/Host/LowLevel/MassStorageHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mass Storage Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.ms.example">
 		<require idref="lufa.demos.host.lowlevel.ms"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/MouseHost/asf.xml b/Demos/Host/LowLevel/MouseHost/asf.xml
index 46200fd2214..bde2295fb19 100644
--- a/Demos/Host/LowLevel/MouseHost/asf.xml
+++ b/Demos/Host/LowLevel/MouseHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mouse HID Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.mouse.example">
 		<require idref="lufa.demos.host.lowlevel.mouse"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/MouseHostWithParser/asf.xml b/Demos/Host/LowLevel/MouseHostWithParser/asf.xml
index 765c10ad5a0..eefac26074c 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/asf.xml
+++ b/Demos/Host/LowLevel/MouseHostWithParser/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Mouse HID (with parser) Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.mouse_parser.example">
 		<require idref="lufa.demos.host.lowlevel.mouse_parser"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/PrinterHost/asf.xml b/Demos/Host/LowLevel/PrinterHost/asf.xml
index e6c15440fde..320bdd21b43 100644
--- a/Demos/Host/LowLevel/PrinterHost/asf.xml
+++ b/Demos/Host/LowLevel/PrinterHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Printer Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.printer.example">
 		<require idref="lufa.demos.host.lowlevel.printer"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/RNDISEthernetHost/asf.xml b/Demos/Host/LowLevel/RNDISEthernetHost/asf.xml
index 19c7bc22fe2..319bac0ccc3 100644
--- a/Demos/Host/LowLevel/RNDISEthernetHost/asf.xml
+++ b/Demos/Host/LowLevel/RNDISEthernetHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="RNDIS Ethernet Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.rndis.example">
 		<require idref="lufa.demos.host.lowlevel.rndis"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/StillImageHost/asf.xml b/Demos/Host/LowLevel/StillImageHost/asf.xml
index e7c2b05e673..0d1db42b041 100644
--- a/Demos/Host/LowLevel/StillImageHost/asf.xml
+++ b/Demos/Host/LowLevel/StillImageHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Still Image Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.si.example">
 		<require idref="lufa.demos.host.lowlevel.si"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Demos/Host/LowLevel/VirtualSerialHost/asf.xml b/Demos/Host/LowLevel/VirtualSerialHost/asf.xml
index 23d0f22952d..22af311c2a5 100644
--- a/Demos/Host/LowLevel/VirtualSerialHost/asf.xml
+++ b/Demos/Host/LowLevel/VirtualSerialHost/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Virtual Serial CDC Host Demo (Low Level APIs)" id="lufa.demos.host.lowlevel.cdc.example">
 		<require idref="lufa.demos.host.lowlevel.cdc"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.c b/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.c
index 893c733a6eb..e107c868013 100644
--- a/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.c
+++ b/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.c
@@ -55,15 +55,30 @@ int main(void)
 /** Configures the board hardware and chip peripherals for the demo's functionality. */
 void SetupHardware(void)
 {
-	/* Disable watchdog if enabled by bootloader/fuses */
-	MCUSR &= ~(1 << WDRF);
-	wdt_disable();
+	#if (ARCH == ARCH_AVR8)
+		/* Disable watchdog if enabled by bootloader/fuses */
+		MCUSR &= ~(1 << WDRF);
+		wdt_disable();
 
-	/* Disable clock division */
-	clock_prescale_set(clock_div_1);
+		/* Disable clock division */
+		clock_prescale_set(clock_div_1);
 
-	/* Hardware Initialization */
-	USB_Init(USB_MODE_Device, USB_DEVICE_OPT_FULLSPEED | USB_OPT_AUTO_PLL);
+		/* Hardware Initialization */
+		USB_Init(USB_MODE_Device, USB_DEVICE_OPT_FULLSPEED | USB_OPT_AUTO_PLL);
+	#elif (ARCH == ARCH_XMEGA)
+		/* Start the PLL to multiply the 2MHz RC oscillator to 32MHz and switch the CPU core to run from it */
+		XMEGACLK_StartPLL(CLOCK_SRC_INT_RC2MHZ, 2000000, F_CPU);
+		XMEGACLK_SetCPUClockSource(CLOCK_SRC_PLL);
+
+		/* Start the 32MHz internal RC oscillator and start the DFLL to increase it to 48MHz using the USB SOF as a reference */
+		XMEGACLK_StartInternalOscillator(CLOCK_SRC_INT_RC32MHZ);
+		XMEGACLK_StartDFLL(CLOCK_SRC_INT_RC32MHZ, DFLL_REF_INT_USBSOF, F_USB);
+
+		PMIC.CTRL = PMIC_LOLVLEN_bm | PMIC_MEDLVLEN_bm | PMIC_HILVLEN_bm;
+
+		/* Hardware Initialization */
+		USB_Init(USB_OPT_RC32MCLKSRC | USB_OPT_BUSEVENT_PRIHIGH);
+	#endif
 }
 
 /** Event handler for the library USB Connection event. */
diff --git a/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.h b/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.h
index 9dac556a16d..bc6875bccd6 100644
--- a/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.h
+++ b/LUFA/CodeTemplates/DeviceTemplate/DeviceApplication.h
@@ -34,13 +34,14 @@
  */
 
 #ifndef _USB_DEVICE_APPLICATION_H_
-#define _USB_DEVICE_APPLICATION_
+#define _USB_DEVICE_APPLICATION_H_
 
 	/* Includes: */
 		#include <avr/io.h>
 		#include <avr/wdt.h>
 		#include <avr/power.h>
 
+		#include <LUFA/Platform/Platform.h>
 		#include <LUFA/Drivers/USB/USB.h>
 
 		#include "Descriptors.h"
diff --git a/LUFA/CodeTemplates/DeviceTemplate/asf.xml b/LUFA/CodeTemplates/DeviceTemplate/asf.xml
index 0cceef9f0e2..cdb4c605a92 100644
--- a/LUFA/CodeTemplates/DeviceTemplate/asf.xml
+++ b/LUFA/CodeTemplates/DeviceTemplate/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
-	<project caption="USB Device Template" id="lufa.templates.device.project">
+	<project caption="USB Device Template" id="lufa.templates.device.project.avr8">
 		<require idref="lufa.templates.device"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8_template"/>
 
 		<device-support value="at90usb1287"/>
@@ -11,6 +11,18 @@
 		<build type="define" name="F_USB" value="8000000UL"/>
 	</project>
 
+	<project caption="USB Device Template" id="lufa.templates.device.project.xmega">
+		<require idref="lufa.templates.device"/>
+		<require idref="lufa.boards.dummy.xmega"/>
+		<generator value="as5_8_template"/>
+
+		<device-support value="atxmega256a3bu"/>
+		<config name="lufa.drivers.board.name" value="a3bu_xplained"/>
+
+		<build type="define" name="F_CPU" value="32000000UL"/>
+		<build type="define" name="F_USB" value="48000000UL"/>
+	</project>
+
 	<module type="application" id="lufa.templates.device" caption="USB Device Template">
 		<info type="description" value="summary">
 		Template for a LUFA USB device mode application.
diff --git a/LUFA/CodeTemplates/HostTemplate/asf.xml b/LUFA/CodeTemplates/HostTemplate/asf.xml
index 0c20c4b12e7..9acef597ee5 100644
--- a/LUFA/CodeTemplates/HostTemplate/asf.xml
+++ b/LUFA/CodeTemplates/HostTemplate/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="USB Host Template" id="lufa.templates.host.project">
 		<require idref="lufa.templates.host"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8_template"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/LUFA/StudioIntegration/lufa_drivers_board.xml b/LUFA/StudioIntegration/lufa_drivers_board.xml
index 89b9151836c..2e2908e15f5 100644
--- a/LUFA/StudioIntegration/lufa_drivers_board.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_board.xml
@@ -10,12 +10,40 @@
 
 <lufa>
 	<asf>
-		<board id="lufa.boards.dummy" vendor="LUFA" caption="LUFA">
-			<device-support value="avr"/>
+		<board id="lufa.boards.dummy.avr8" vendor="LUFA" caption="AVR8 Architecture">
+			<device-support value="lufa_avr8"/>
 
 			<require idref="lufa.drivers.board"/>
+			<require idref="lufa.drivers.board.info"/>
 		</board>
 
+		<board id="lufa.boards.dummy.xmega" vendor="LUFA" caption="XMEGA Architecture">
+			<device-support value="lufa_xmega"/>
+
+			<require idref="lufa.drivers.board"/>
+			<require idref="lufa.drivers.board.info"/>
+		</board>
+
+		<board id="lufa.boards.dummy.uc3" vendor="LUFA" caption="UC3 Architecture">
+			<device-support value="lufa_uc3"/>
+
+			<require idref="lufa.drivers.board"/>
+			<require idref="lufa.drivers.board.info"/>
+		</board>
+
+		<module type="driver" id="lufa.drivers.board.info" caption="LUFA Board Information Driver">
+			<device-support-alias value="lufa_avr8"/>
+			<device-support-alias value="lufa_xmega"/>
+			<device-support-alias value="lufa_uc3"/>
+
+			<build type="doxygen-entry-point" value="Group_BoardInfo"/>
+
+			<require idref="lufa.common"/>
+
+			<build type="include-path" value=".."/>
+			<build type="header-file"  subtype="api" value="Drivers/Board/Board.h"/>
+		</module>
+
 		<module type="driver" id="lufa.drivers.board.leds" caption="LUFA Board LED Driver">
 			<device-support-alias value="lufa_avr8"/>
 			<device-support-alias value="lufa_xmega"/>
diff --git a/LUFA/StudioIntegration/lufa_drivers_board_names.xml b/LUFA/StudioIntegration/lufa_drivers_board_names.xml
index 8212096187e..87ba21d9464 100644
--- a/LUFA/StudioIntegration/lufa_drivers_board_names.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_board_names.xml
@@ -25,6 +25,9 @@
 				<device-support value="atmega32u4"/>
 				<build type="define" name="BOARD" value="BOARD_ADAFRUITU4"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/ADAFRUITU4/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/ADAFRUITU4/LEDs.h"/>
 			</module>
 
@@ -32,6 +35,10 @@
 				<device-support value="at90usb1287"/>
 				<build type="define" name="BOARD" value="BOARD_ATAVRUSBRF01"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/ATAVRUSBRF01/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/ATAVRUSBRF01/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/ATAVRUSBRF01/LEDs.h"/>
 			</module>
@@ -40,6 +47,10 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_BENITO"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BENITO/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/BENITO/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/BENITO/LEDs.h"/>
 			</module>
@@ -48,6 +59,9 @@
 				<device-support value="atmega32u4"/>
 				<build type="define" name="BOARD" value="BOARD_BIGMULTIO"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BIGMULTIO/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/BIGMULTIO/LEDs.h"/>
 			</module>
 
@@ -55,6 +69,9 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_BLACKCAT"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BLACKCAT/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/BLACKCAT/LEDs.h"/>
 			</module>
 
@@ -62,6 +79,9 @@
 				<device-support value="at90usb646"/>
 				<build type="define" name="BOARD" value="BOARD_BUI"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BUI/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/BUI/LEDs.h"/>
 			</module>
 
@@ -69,6 +89,11 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_BUMBLEB"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.joystick"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/Joystick.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/BUMBLEB/LEDs.h"/>
@@ -78,6 +103,10 @@
 				<device-support value="atmega32u4"/>
 				<build type="define" name="BOARD" value="BOARD_CULV3"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/CULV3/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/CULV3/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/CULV3/LEDs.h"/>
 			</module>
@@ -86,6 +115,9 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_DUCE"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/DUCE/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/DUCE/LEDs.h"/>
 			</module>
 
@@ -95,7 +127,12 @@
 
 				<require idref="lufa.drivers.misc.at45db321c"/>
 				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
 
+				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Dataflash.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/EVK527/Joystick.h"/>
@@ -106,6 +143,10 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_JMDBU2"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/JMDBU2/LEDs.h"/>
 			</module>
@@ -114,6 +155,9 @@
 				<device-support value="atmega32u4"/>
 				<build type="define" name="BOARD" value="BOARD_LEONARDO"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/LEONARDO/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/LEONARDO/LEDs.h"/>
 			</module>
 
@@ -121,6 +165,9 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_MAXIMUS"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MAXIMUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MAXIMUS/LEDs.h"/>
 			</module>
 
@@ -128,6 +175,10 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_32U2"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/LEDs.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
 			</module>
@@ -136,6 +187,9 @@
 				<device-support value="at90usb1287"/>
 				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_A"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
 			</module>
 
@@ -143,6 +197,9 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_1"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
 			</module>
 
@@ -150,6 +207,9 @@
 				<device-support value="atmega32u4"/>
 				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_2"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
 			</module>
 
@@ -157,6 +217,9 @@
 				<device-support value="at90usb1287"/>
 				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_3"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
 			</module>
 
@@ -164,6 +227,9 @@
 				<device-support value="at90usb1287"/>
 				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_4"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
 			</module>
 
@@ -171,6 +237,9 @@
 				<device-support value="at90usb1287"/>
 				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_DIP"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
 			</module>
 
@@ -178,6 +247,10 @@
 				<device-support value="at90usb1287"/>
 				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_REV1"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/LEDs.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
 			</module>
@@ -186,6 +259,10 @@
 				<device-support value="at90usb1287"/>
 				<build type="define" name="BOARD" value="BOARD_MICROPENDOUS_REV2"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/LEDs.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROPENDOUS/Buttons.h"/>
 			</module>
@@ -194,6 +271,10 @@
 				<device-support value="atmega162"/>
 				<build type="define" name="BOARD" value="BOARD_MICROSIN162"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MICROSIN162/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROSIN162/LEDs.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MICROSIN162/Buttons.h"/>
 			</module>
@@ -202,6 +283,10 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_MINIMUS"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MINIMUS/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MINIMUS/LEDs.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MINIMUS/Buttons.h"/>
 			</module>
@@ -210,6 +295,9 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_MULTIO"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/MULTIO/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/MULTIO/LEDs.h"/>
 			</module>
 
@@ -217,6 +305,10 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_OLIMEX162"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX162/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX162/LEDs.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX162/Buttons.h"/>
 			</module>
@@ -225,6 +317,10 @@
 				<device-support value="atmega32u4"/>
 				<build type="define" name="BOARD" value="BOARD_OLIMEX32U4"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/LEDs.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/OLIMEX32U4/Buttons.h"/>
 			</module>
@@ -233,6 +329,10 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_OLIMEXISPMK2"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/LEDs.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXISPMK2/Buttons.h"/>
 			</module>
@@ -241,6 +341,10 @@
 				<device-support value="atmega32u4"/>
 				<build type="define" name="BOARD" value="BOARD_OLIMEXT32U4"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+				<require idref="lufa.drivers.board.buttons"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXT32U4/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXT32U4/LEDs.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/OLIMEXT32U4/Buttons.h"/>
 			</module>
@@ -249,6 +353,9 @@
 				<device-support value="at90usb1287"/>
 				<build type="define" name="BOARD" value="BOARD_RZUSBSTICK"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/RZUSBSTICK/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/RZUSBSTICK/LEDs.h"/>
 			</module>
 
@@ -256,6 +363,9 @@
 				<device-support value="atmega8u2"/>
 				<build type="define" name="BOARD" value="BOARD_SPARKFUN8U2"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/SPARKFUN8U2/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/SPARKFUN8U2/LEDs.h"/>
 			</module>
 
@@ -265,7 +375,12 @@
 
 				<require idref="lufa.drivers.misc.at45db642d"/>
 				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
 
+				<build type="header-file" value="Drivers/Board/AVR8/STK525/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/STK525/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/STK525/Dataflash.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/STK525/Joystick.h"/>
@@ -278,7 +393,12 @@
 
 				<require idref="lufa.drivers.misc.at45db642d"/>
 				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
 
+				<build type="header-file" value="Drivers/Board/AVR8/STK526/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/STK526/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/STK526/Dataflash.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/STK526/Joystick.h"/>
@@ -289,6 +409,9 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_TEENSY"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/LEDs.h"/>
 			</module>
 
@@ -296,6 +419,9 @@
 				<device-support value="at90usb646"/>
 				<build type="define" name="BOARD" value="BOARD_TEENSY2"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/TEENSY/LEDs.h"/>
 			</module>
 
@@ -303,6 +429,10 @@
 				<device-support value="atmega32u4"/>
 				<build type="define" name="BOARD" value="BOARD_TUL"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/TUL/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/TUL/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/TUL/LEDs.h"/>
 			</module>
@@ -311,6 +441,10 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_UDIP"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/UDIP/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/UDIP/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/UDIP/LEDs.h"/>
 			</module>
@@ -320,6 +454,9 @@
 				<device-support value="atmega16u2"/>
 				<build type="define" name="BOARD" value="BOARD_UNO"/>
 
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/UNO/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/UNO/LEDs.h"/>
 			</module>
 
@@ -327,6 +464,10 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_USB2AX"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/LEDs.h"/>
 			</module>
@@ -335,6 +476,10 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_USB2AX_V3"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/LEDs.h"/>
 			</module>
@@ -343,6 +488,10 @@
 				<device-support value="atmega32u2"/>
 				<build type="define" name="BOARD" value="BOARD_USB2AX_V31"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USB2AX/LEDs.h"/>
 			</module>
@@ -351,6 +500,10 @@
 				<device-support value="atmega162"/>
 				<build type="define" name="BOARD" value="BOARD_USBFOO"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USBFOO/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USBFOO/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USBFOO/LEDs.h"/>
 			</module>
@@ -362,6 +515,12 @@
 				<require idref="lufa.drivers.misc.at45db642d"/>
 				<require idref="lufa.drivers.peripheral.spi"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Dataflash.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USBKEY/Joystick.h"/>
@@ -372,6 +531,10 @@
 				<device-support value="at90usb162"/>
 				<build type="define" name="BOARD" value="BOARD_USBTINYMKII"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/USBTINYMKII/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USBTINYMKII/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/USBTINYMKII/LEDs.h"/>
 			</module>
@@ -381,7 +544,10 @@
 
 				<require idref="lufa.drivers.misc.at45db642d"/>
 				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.leds"/>
 
+				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Dataflash.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/LEDs.h"/>
 
@@ -393,7 +559,10 @@
 
 				<require idref="lufa.drivers.misc.at45db642d"/>
 				<require idref="lufa.drivers.peripheral.spi"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.leds"/>
 
+				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/Dataflash.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/XPLAIN/LEDs.h"/>
 
@@ -406,6 +575,11 @@
 				<require idref="lufa.drivers.misc.at45db642d"/>
 				<require idref="lufa.drivers.peripheral.usart_spi"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/Board.h"/>
 				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/Dataflash.h"/>
 				<build type="header-file" value="Drivers/Board/XMEGA/A3BU_XPLAINED/LEDs.h"/>
@@ -418,7 +592,11 @@
 
 				<require idref="lufa.drivers.misc.at45db642d"/>
 				<require idref="lufa.drivers.peripheral.usart_spi"/>
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.dataflash"/>
+				<require idref="lufa.drivers.board.leds"/>
 
+				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/Board.h"/>
 				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/Dataflash.h"/>
 				<build type="header-file" value="Drivers/Board/XMEGA/B1_XPLAINED/LEDs.h"/>
@@ -429,6 +607,11 @@
 			<module type="driver" id="lufa.drivers.board#evk1100" caption="EVK1100">
 				<device-support value="at32uc3a0512"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/UC3/EVK1100/Board.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/EVK1100/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/EVK1100/Joystick.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/EVK1100/LEDs.h"/>
@@ -439,6 +622,11 @@
 			<module type="driver" id="lufa.drivers.board#evk1101" caption="EVK1101">
 				<device-support value="at32uc3b0256"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.joystick"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/UC3/EVK1101/Board.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/EVK1101/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/EVK1101/Joystick.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/EVK1101/LEDs.h"/>
@@ -449,6 +637,10 @@
 			<module type="driver" id="lufa.drivers.board#evk1104" caption="EVK1101">
 				<device-support value="at32uc3a3256"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/UC3/EVK1104/Board.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/EVK1104/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/EVK1104/LEDs.h"/>
 
@@ -458,6 +650,10 @@
 			<module type="driver" id="lufa.drivers.board#uc3a3_xplained" caption="UC3A3_XPLAINED">
 				<device-support value="at32uc3a3256"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/UC3/UC3A3_XPLAINED/Board.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/UC3A3_XPLAINED/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/UC3/UC3A3_XPLAINED/LEDs.h"/>
 
@@ -467,6 +663,10 @@
 			<module type="driver" id="lufa.drivers.board#stange_isp" caption="STANGE_ISP">
 				<device-support value="at90usb162"/>
 
+				<require idref="lufa.drivers.board.buttons"/>
+				<require idref="lufa.drivers.board.leds"/>
+
+				<build type="header-file" value="Drivers/Board/AVR8/STANGE_ISP/Board.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/STANGE_ISP/Buttons.h"/>
 				<build type="header-file" value="Drivers/Board/AVR8/STANGE_ISP/LEDs.h"/>
 
diff --git a/Projects/AVRISP-MKII/asf.xml b/Projects/AVRISP-MKII/asf.xml
index 426818d3758..44be0aa7ec0 100644
--- a/Projects/AVRISP-MKII/asf.xml
+++ b/Projects/AVRISP-MKII/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="AVRISP-MKII Clone Programmer" id="lufa.projects.avrispmkii_clone.avr8">
 		<require idref="lufa.projects.avrispmkii_clone"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/Benito/asf.xml b/Projects/Benito/asf.xml
index dab72ae5237..8d29e9457ed 100644
--- a/Projects/Benito/asf.xml
+++ b/Projects/Benito/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Benito Programmer" id="lufa.projects.benito.avr8">
 		<require idref="lufa.projects.benito"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/HIDReportViewer/asf.xml b/Projects/HIDReportViewer/asf.xml
index fa748a0769a..7999f334875 100644
--- a/Projects/HIDReportViewer/asf.xml
+++ b/Projects/HIDReportViewer/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="HID Report Viewer" id="lufa.projects.hid_viewer.avr8">
 		<require idref="lufa.projects.hid_viewer"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/LEDNotifier/asf.xml b/Projects/LEDNotifier/asf.xml
index ee334efddb5..98d4f917e0e 100644
--- a/Projects/LEDNotifier/asf.xml
+++ b/Projects/LEDNotifier/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="LED Notifier Widget" id="lufa.projects.led_notifier.avr8">
 		<require idref="lufa.projects.led_notifier"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/MIDIToneGenerator/asf.xml b/Projects/MIDIToneGenerator/asf.xml
index 2307c7fc80b..55d4a5d3ed7 100644
--- a/Projects/MIDIToneGenerator/asf.xml
+++ b/Projects/MIDIToneGenerator/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="MIDI Tone Generator" id="lufa.projects.midi_tone_gen.avr8">
 		<require idref="lufa.projects.midi_tone_gen"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/Magstripe/asf.xml b/Projects/Magstripe/asf.xml
index 249d697efd6..edb03751a18 100644
--- a/Projects/Magstripe/asf.xml
+++ b/Projects/Magstripe/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Magnetic Strip Card Reader" id="lufa.projects.magstripe.avr8">
 		<require idref="lufa.projects.magstripe"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/MediaController/asf.xml b/Projects/MediaController/asf.xml
index 0f020f452f4..64bd504a453 100644
--- a/Projects/MediaController/asf.xml
+++ b/Projects/MediaController/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Media Controller" id="lufa.projects.media_control.avr8">
 		<require idref="lufa.projects.media_control"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/MissileLauncher/asf.xml b/Projects/MissileLauncher/asf.xml
index 77366d193cd..cb35c184677 100644
--- a/Projects/MissileLauncher/asf.xml
+++ b/Projects/MissileLauncher/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Missile Launcher" id="lufa.projects.missile_launcher.avr8">
 		<require idref="lufa.projects.missile_launcher"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/RelayBoard/asf.xml b/Projects/RelayBoard/asf.xml
index 259bca42f98..3ad1c71ee7a 100644
--- a/Projects/RelayBoard/asf.xml
+++ b/Projects/RelayBoard/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Relay Board Controller" id="lufa.projects.relay_board.avr8">
 		<require idref="lufa.projects.relay_board"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/SerialToLCD/asf.xml b/Projects/SerialToLCD/asf.xml
index 6af93804b28..5d38daaddfe 100644
--- a/Projects/SerialToLCD/asf.xml
+++ b/Projects/SerialToLCD/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="USB Serial to LCD Display" id="lufa.projects.serial_to_lcd.avr8">
 		<require idref="lufa.projects.serial_to_lcd"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/TempDataLogger/asf.xml b/Projects/TempDataLogger/asf.xml
index c2039003fb0..6e5528b1ce1 100644
--- a/Projects/TempDataLogger/asf.xml
+++ b/Projects/TempDataLogger/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="Temperature Datalogger" id="lufa.projects.temp_datalogger.avr8">
 		<require idref="lufa.projects.temp_datalogger"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/USBtoSerial/asf.xml b/Projects/USBtoSerial/asf.xml
index b6b4c0a1d85..d4d90a66393 100644
--- a/Projects/USBtoSerial/asf.xml
+++ b/Projects/USBtoSerial/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="USB to Serial Converter" id="lufa.projects.usb_to_serial.avr8">
 		<require idref="lufa.projects.usb_to_serial"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/Webserver/asf.xml b/Projects/Webserver/asf.xml
index 3505f730572..abb30fe653c 100644
--- a/Projects/Webserver/asf.xml
+++ b/Projects/Webserver/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="RNDIS Webserver" id="lufa.projects.webserver.avr8">
 		<require idref="lufa.projects.webserver"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/XPLAINBridge/asf.xml b/Projects/XPLAINBridge/asf.xml
index 3936f31724a..f410b6f2efc 100644
--- a/Projects/XPLAINBridge/asf.xml
+++ b/Projects/XPLAINBridge/asf.xml
@@ -1,7 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="XPLAIN Bridge" id="lufa.projects.xplain_bridge.avr8">
 		<require idref="lufa.projects.xplain_bridge"/>
-		<require idref="lufa.boards.dummy"/>
+		<require idref="lufa.boards.dummy.avr8"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>