diff --git a/Demos/Device/ClassDriver/AudioInput/asf.xml b/Demos/Device/ClassDriver/AudioInput/asf.xml
index 7edecad0d9f884a184169aac0cc3aa1083805330..71f1cdcc2791b247afcc4b749bbb846eca59c39d 100644
--- a/Demos/Device/ClassDriver/AudioInput/asf.xml
+++ b/Demos/Device/ClassDriver/AudioInput/asf.xml
@@ -1,6 +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"/>
 		<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 ca196a6e2bc19a57a8e886618f0941d8601245e1..dae49c74eb2f90f2135e6cbd8d7b2a2a846c302e 100644
--- a/Demos/Device/ClassDriver/AudioOutput/asf.xml
+++ b/Demos/Device/ClassDriver/AudioOutput/asf.xml
@@ -1,6 +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"/>
 		<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 7fdb168f6b197c404d557b9c948b367ffaaa2d80..eb9560b597c157109295b34b39f5e4d4256a0e2e 100644
--- a/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
+++ b/Demos/Device/ClassDriver/DualVirtualSerial/asf.xml
@@ -1,6 +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"/>
 		<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 3cd6f097ae5bdb9fa34584c4ad16f94769b8978c..2c50f4d3536df6aa356aacb7f346a58443f5f1e3 100644
--- a/Demos/Device/ClassDriver/GenericHID/asf.xml
+++ b/Demos/Device/ClassDriver/GenericHID/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
@@ -15,6 +16,12 @@
 		Generic HID device demo, implementing a device whose LEDs can be controlled via HID messages from the host.
 		</info>
 
+		<info type="keyword" value="Technology">
+			<keyword value="Class Driver APIs"/>
+			<keyword value="USB Device"/>
+			<keyword value="HID Class"/>
+		</info>
+
 		<device-support-alias value="lufa_avr8"/>
 		<device-support-alias value="lufa_xmega"/>
 		<device-support-alias value="lufa_uc3"/>
diff --git a/Demos/Device/ClassDriver/Joystick/asf.xml b/Demos/Device/ClassDriver/Joystick/asf.xml
index 1ed9a260697eb0e0101879f98ee12cfb4cff2bf7..aab03316d2affd42a7978efae1583af6438e2571 100644
--- a/Demos/Device/ClassDriver/Joystick/asf.xml
+++ b/Demos/Device/ClassDriver/Joystick/asf.xml
@@ -1,6 +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"/>
 		<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 33caeb0f620304766c2cb05f5f652052b779430d..4f462c5692113ed4a896100dfb254f2af5aa4ada 100644
--- a/Demos/Device/ClassDriver/Keyboard/asf.xml
+++ b/Demos/Device/ClassDriver/Keyboard/asf.xml
@@ -1,6 +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"/>
 		<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 53dd2d64e06c7e454c3f3680b96aa40f0d321e48..e2704b416ee0424729168380489f29eeb2ac9af8 100644
--- a/Demos/Device/ClassDriver/KeyboardMouse/asf.xml
+++ b/Demos/Device/ClassDriver/KeyboardMouse/asf.xml
@@ -1,6 +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"/>
 		<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 2f2c2e0191db663afb1f2b1f9a54749a0368488d..6db30d6daf5e6df3f6c6782798d99650f0af36ca 100644
--- a/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml
+++ b/Demos/Device/ClassDriver/KeyboardMouseMultiReport/asf.xml
@@ -1,6 +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"/>
 		<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 288cda0fde68b94a1977244da93d4d43cc433cf1..22402076fccc2f2481990f7c8aad01a7d76343e6 100644
--- a/Demos/Device/ClassDriver/MIDI/asf.xml
+++ b/Demos/Device/ClassDriver/MIDI/asf.xml
@@ -1,6 +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"/>
 		<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 9e08e4b51670297fd00bc72577914b8360922e54..dd8bd8418680d4f523be00fe506edcbf44dd7d1b 100644
--- a/Demos/Device/ClassDriver/MassStorage/asf.xml
+++ b/Demos/Device/ClassDriver/MassStorage/asf.xml
@@ -1,6 +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"/>
 		<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 a04765be5889662665774576f37cccdcaa96dee8..4e44c30caf04a3659688362dfc55a3b1d0255dd0 100644
--- a/Demos/Device/ClassDriver/MassStorageKeyboard/asf.xml
+++ b/Demos/Device/ClassDriver/MassStorageKeyboard/asf.xml
@@ -1,6 +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"/>
 		<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 27764dbe3eb1a1c7f7284cbdf102fdca9449b710..a1827b9fec43b08c1182e6fa2797e07d7785a696 100644
--- a/Demos/Device/ClassDriver/Mouse/asf.xml
+++ b/Demos/Device/ClassDriver/Mouse/asf.xml
@@ -1,6 +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"/>
 		<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 46d354cf5f658e5fcc27039b86576a4f1ff7ebc6..c960ea9f346d64569d531c57e34b818e6df89e5e 100644
--- a/Demos/Device/ClassDriver/RNDISEthernet/asf.xml
+++ b/Demos/Device/ClassDriver/RNDISEthernet/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
@@ -15,6 +16,12 @@
 		Microsoft RNDIS Ethernet networking device demo, implementing a basic HTTP webserver.
 		</info>
 
+		<info type="keyword" value="Technology">
+			<keyword value="Class Driver APIs"/>
+			<keyword value="USB Device"/>
+			<keyword value="RNDIS Class"/>
+		</info>
+
 		<device-support-alias value="lufa_avr8"/>
 		<device-support-alias value="lufa_xmega"/>
 		<device-support-alias value="lufa_uc3"/>
diff --git a/Demos/Device/ClassDriver/VirtualSerial/asf.xml b/Demos/Device/ClassDriver/VirtualSerial/asf.xml
index af0f7cff6e21beaff69e84497fcacd17a1b091d4..5a533a410bdc7a5c65524ebdb5ffd93cada581d6 100644
--- a/Demos/Device/ClassDriver/VirtualSerial/asf.xml
+++ b/Demos/Device/ClassDriver/VirtualSerial/asf.xml
@@ -1,6 +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"/>
 		<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 b3fe5b76a7ec2c0e9da6e7a64244b9ab6afe251b..94e58988680e6cabe69f03b57d1d0bf5e8ae9ae1 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMassStorage/asf.xml
+++ b/Demos/Device/ClassDriver/VirtualSerialMassStorage/asf.xml
@@ -1,6 +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"/>
 		<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 8b58df151fa5faacaba85c866f53701c80df33de..8cb230ca59921a71bbdf80a5b075387f3dc9b9c3 100644
--- a/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml
+++ b/Demos/Device/ClassDriver/VirtualSerialMouse/asf.xml
@@ -1,6 +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"/>
 		<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 ad570c49cbebcb8a73ed79a2df86149b777a9456..4c48439f881f0b2384e3fd64a81dd075cef95ffa 100644
--- a/Demos/Device/LowLevel/AudioInput/asf.xml
+++ b/Demos/Device/LowLevel/AudioInput/asf.xml
@@ -1,6 +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"/>
 		<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 f3ac3ee4227025d807e44612d349997dc5132bb1..b94807f5dad79d017ade847c3a93d743110b9071 100644
--- a/Demos/Device/LowLevel/AudioOutput/asf.xml
+++ b/Demos/Device/LowLevel/AudioOutput/asf.xml
@@ -1,6 +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"/>
 		<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 5b87b4c88ce08cbcb5ac59a74b01a734001f1ba4..ad4dee5f40ec31bc9e6eb03a48b2ac4913693d5d 100644
--- a/Demos/Device/LowLevel/DualVirtualSerial/asf.xml
+++ b/Demos/Device/LowLevel/DualVirtualSerial/asf.xml
@@ -1,6 +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"/>
 		<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 147d73e1a1b1cd50b6e76d143ab15f443ef626da..33de16eecbd3ef3c7fd72a110892e6277ddc8cfc 100644
--- a/Demos/Device/LowLevel/GenericHID/asf.xml
+++ b/Demos/Device/LowLevel/GenericHID/asf.xml
@@ -1,6 +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"/>
 		<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 7453e4073dd95db79366c807ba123e6347d5fb0d..43dbd9baa25d2afdaf104a210a03f6a413f967d8 100644
--- a/Demos/Device/LowLevel/Joystick/asf.xml
+++ b/Demos/Device/LowLevel/Joystick/asf.xml
@@ -1,6 +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"/>
 		<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 15a06fb81d6e74d131fc86d7a5fe0a740981d1c8..605c0ef75487350e0d8c41a7835e36f4afaa5d0e 100644
--- a/Demos/Device/LowLevel/Keyboard/asf.xml
+++ b/Demos/Device/LowLevel/Keyboard/asf.xml
@@ -1,6 +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"/>
 		<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 26541dd44e9ee9e4362e2205b63df2ea86698a72..2f1dfaa6e8ab43ad53e257953671eade549489e0 100644
--- a/Demos/Device/LowLevel/KeyboardMouse/asf.xml
+++ b/Demos/Device/LowLevel/KeyboardMouse/asf.xml
@@ -1,6 +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"/>
 		<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 553ed06622792ef34a0df676da4cf032b8480922..0ab2095c6d3b770887198cbc2ddae28657f63fd2 100644
--- a/Demos/Device/LowLevel/MIDI/asf.xml
+++ b/Demos/Device/LowLevel/MIDI/asf.xml
@@ -1,6 +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"/>
 		<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 0589f212e05b28a1dc292f9dc1369dbe0a68cacd..1667ac6a77f72d97ef3cb33878e9ed42f7425155 100644
--- a/Demos/Device/LowLevel/MassStorage/asf.xml
+++ b/Demos/Device/LowLevel/MassStorage/asf.xml
@@ -1,6 +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"/>
 		<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 e5bb07011cca7ce01cb308a9796fbe4acea5cd3e..a596b7a5207408ffdc21843ea55087f3435495e3 100644
--- a/Demos/Device/LowLevel/Mouse/asf.xml
+++ b/Demos/Device/LowLevel/Mouse/asf.xml
@@ -1,6 +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"/>
 		<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 10942617a5709164af465bee1b10d3bbd7c1e13c..6a2a697e100bc81971b25e562f49c369a5de7fae 100644
--- a/Demos/Device/LowLevel/RNDISEthernet/asf.xml
+++ b/Demos/Device/LowLevel/RNDISEthernet/asf.xml
@@ -1,6 +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"/>
 		<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 ead998ad9da5ff370468ec102f784af1b2f03ac6..dff598dd49f770a8d5aacf6618ee52b0fdde8c8c 100644
--- a/Demos/Device/LowLevel/VirtualSerial/asf.xml
+++ b/Demos/Device/LowLevel/VirtualSerial/asf.xml
@@ -1,6 +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"/>
 		<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 5f724ca607201ab8b794b37eb7e52fec453e6964..1e6dc1461631122b9ac8a9a0117f27c1978d7af4 100644
--- a/Demos/DualRole/ClassDriver/MouseHostDevice/asf.xml
+++ b/Demos/DualRole/ClassDriver/MouseHostDevice/asf.xml
@@ -1,6 +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"/>
 		<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 34c93122bc436c390103bd92083b56d4828c48c0..c35400476310fd6b5ddf0a76a28c0046c72a169a 100644
--- a/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml
+++ b/Demos/Host/ClassDriver/AndroidAccessoryHost/asf.xml
@@ -1,6 +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"/>
 		<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 6e97089ca5c3c69197f7a7a9aa5ec470b966b8dc..d5d4f47fe122f6d44e2d26ef12e9d39feb1c0cf1 100644
--- a/Demos/Host/ClassDriver/AudioInputHost/asf.xml
+++ b/Demos/Host/ClassDriver/AudioInputHost/asf.xml
@@ -1,6 +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"/>
 		<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 753393a037bc4780b6435195344a0c0a1726c359..9d1d36f905a04eb9d20d826755cc09083bfb4909 100644
--- a/Demos/Host/ClassDriver/AudioOutputHost/asf.xml
+++ b/Demos/Host/ClassDriver/AudioOutputHost/asf.xml
@@ -1,6 +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"/>
 		<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 892251b7e32b8c17e3eb7d1be5ed5739c3ae12ed..d7d1680b88649b4d4dcd746dee988e10df299936 100644
--- a/Demos/Host/ClassDriver/JoystickHostWithParser/asf.xml
+++ b/Demos/Host/ClassDriver/JoystickHostWithParser/asf.xml
@@ -1,6 +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"/>
 		<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 8d8f40540f04d31460ca123d38ce160e565fe98e..e11ec49c46eeed42ad8b1ab0a84b62d60efdcbf0 100644
--- a/Demos/Host/ClassDriver/KeyboardHost/asf.xml
+++ b/Demos/Host/ClassDriver/KeyboardHost/asf.xml
@@ -1,6 +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"/>
 		<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 fe76be7a044694e376f5f63181596f914f81154e..af84bc6f240f4aa3ef1803d89be58bd628ce6f45 100644
--- a/Demos/Host/ClassDriver/KeyboardHostWithParser/asf.xml
+++ b/Demos/Host/ClassDriver/KeyboardHostWithParser/asf.xml
@@ -1,6 +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"/>
 		<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 dfd424a56c99caf9cf2fc0e84578d9d13dd4535c..492a1209980038522b4c6a8467c218650cd86b07 100644
--- a/Demos/Host/ClassDriver/MIDIHost/asf.xml
+++ b/Demos/Host/ClassDriver/MIDIHost/asf.xml
@@ -1,6 +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"/>
 		<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 2aad2004c888639b4bedb6f166d55fb997577139..7b07416c760476cc61a6a29c1ac4189b0d2ef1a5 100644
--- a/Demos/Host/ClassDriver/MassStorageHost/asf.xml
+++ b/Demos/Host/ClassDriver/MassStorageHost/asf.xml
@@ -1,6 +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"/>
 		<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 723336f048372a45f1567445d4c644e296200b75..523ace6f63e118a3575f8ceb1c62838653a14974 100644
--- a/Demos/Host/ClassDriver/MouseHost/asf.xml
+++ b/Demos/Host/ClassDriver/MouseHost/asf.xml
@@ -1,6 +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"/>
 		<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 aa5697e350c893287b46092cf84769f2562903f6..e8f8369d82536f67137b6946cd85bbe7280604b0 100644
--- a/Demos/Host/ClassDriver/MouseHostWithParser/asf.xml
+++ b/Demos/Host/ClassDriver/MouseHostWithParser/asf.xml
@@ -1,6 +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"/>
 		<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 ad51cf7ecccbc2f9f525e37a57ebd7dbf81f2b66..d72a86c86f8bf95f8e4fe3be00a9ac5d6af056c5 100644
--- a/Demos/Host/ClassDriver/PrinterHost/asf.xml
+++ b/Demos/Host/ClassDriver/PrinterHost/asf.xml
@@ -1,6 +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"/>
 		<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 b60b684578b4a829cc7642f6f9822adb228706c9..83d1295f6b615d5be7823f53b5342b0fabbd0b83 100644
--- a/Demos/Host/ClassDriver/RNDISEthernetHost/asf.xml
+++ b/Demos/Host/ClassDriver/RNDISEthernetHost/asf.xml
@@ -1,6 +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"/>
 		<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 196477f7baea7881fdd728978571dc01ee4b2a6d..6548a38fc77dbd78b7ba1b110ed66756b3b9d4a2 100644
--- a/Demos/Host/ClassDriver/StillImageHost/asf.xml
+++ b/Demos/Host/ClassDriver/StillImageHost/asf.xml
@@ -1,6 +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"/>
 		<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 ce392283ce0bdc7e71318bc3a484f222a16d7743..ca9aaa01f4b874b44eba20d52d239a1c57538766 100644
--- a/Demos/Host/ClassDriver/VirtualSerialHost/asf.xml
+++ b/Demos/Host/ClassDriver/VirtualSerialHost/asf.xml
@@ -1,6 +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"/>
 		<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 9d2f92ca4b37265c79cc2fb2cd847e5c372179c9..e145ce3b943f80714948eae6710d9e72a3188898 100644
--- a/Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml
+++ b/Demos/Host/LowLevel/AndroidAccessoryHost/asf.xml
@@ -1,6 +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"/>
 		<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 45d24313ef13294381cbee7dc698af07bb46b6fc..1608f50f634a380857658485bbb6a356f319f052 100644
--- a/Demos/Host/LowLevel/AudioInputHost/asf.xml
+++ b/Demos/Host/LowLevel/AudioInputHost/asf.xml
@@ -1,6 +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"/>
 		<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 421705a7da93a2b984e1a1ae74b8c3302c068149..b821eb1044744de5ac59ca8ecedd34b9c4f05dcf 100644
--- a/Demos/Host/LowLevel/AudioOutputHost/asf.xml
+++ b/Demos/Host/LowLevel/AudioOutputHost/asf.xml
@@ -1,6 +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"/>
 		<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 b4a457b7f2d142c674cc800d93f220c1376a1dc1..fb3dd0a0a30f274c4d09d5c36c9d772420217ac3 100644
--- a/Demos/Host/LowLevel/GenericHIDHost/asf.xml
+++ b/Demos/Host/LowLevel/GenericHIDHost/asf.xml
@@ -1,6 +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"/>
 		<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 d4edfd1695de18c0f1613cbd196c41a3bfe5a15b..60e92a1ec41b2c540e7fcfefba859257a053944f 100644
--- a/Demos/Host/LowLevel/JoystickHostWithParser/asf.xml
+++ b/Demos/Host/LowLevel/JoystickHostWithParser/asf.xml
@@ -1,6 +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"/>
 		<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 a6a5519e96b0b1c49068e654a00dbbe632338df7..1da831500dd36ca73d53df010d43f74b40fd263f 100644
--- a/Demos/Host/LowLevel/KeyboardHost/asf.xml
+++ b/Demos/Host/LowLevel/KeyboardHost/asf.xml
@@ -1,6 +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"/>
 		<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 929c72462cfd16e1d28521877a36ca09d67719e9..f230ca28b1605bf24ba3e111ec95ef123236c255 100644
--- a/Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml
+++ b/Demos/Host/LowLevel/KeyboardHostWithParser/asf.xml
@@ -1,6 +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"/>
 		<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 12233b1090bda1a554708ca0f4e2a0831876c6f0..0bd2da7c81376bcb699448ed1736703d6d8ed0b9 100644
--- a/Demos/Host/LowLevel/MIDIHost/asf.xml
+++ b/Demos/Host/LowLevel/MIDIHost/asf.xml
@@ -1,6 +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"/>
 		<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 41afbc41479d60fb92ace337019da64feec79b49..6393a218b6bb92f9d733c97bd1fce3fa1e0482b0 100644
--- a/Demos/Host/LowLevel/MassStorageHost/asf.xml
+++ b/Demos/Host/LowLevel/MassStorageHost/asf.xml
@@ -1,6 +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"/>
 		<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 72958ca9de5041749940fae8c4ab85e872dae4a6..46200fd22146e6b10c02bb1407f40fb218ce5541 100644
--- a/Demos/Host/LowLevel/MouseHost/asf.xml
+++ b/Demos/Host/LowLevel/MouseHost/asf.xml
@@ -1,6 +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"/>
 		<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 2e96d4f3e57a8004432b2d38d20130c7b8af366c..765c10ad5a04aa274076de51bc7df416866875fb 100644
--- a/Demos/Host/LowLevel/MouseHostWithParser/asf.xml
+++ b/Demos/Host/LowLevel/MouseHostWithParser/asf.xml
@@ -1,6 +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"/>
 		<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 0360179e164906445282c5aeea42758a35f39502..e6c15440fde174e1835805aa60a8fa8f6027501e 100644
--- a/Demos/Host/LowLevel/PrinterHost/asf.xml
+++ b/Demos/Host/LowLevel/PrinterHost/asf.xml
@@ -1,6 +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"/>
 		<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 521746f7a43a11ccb6a328bbfeb2be716931691a..19c7bc22fe2f87ad8468e2fbe1bad3e88c800829 100644
--- a/Demos/Host/LowLevel/RNDISEthernetHost/asf.xml
+++ b/Demos/Host/LowLevel/RNDISEthernetHost/asf.xml
@@ -1,6 +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"/>
 		<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 8fe58621507091aa973fa9632e8554238917b94d..e7c2b05e67325bfbdc6407dc1d3e834ad6de438c 100644
--- a/Demos/Host/LowLevel/StillImageHost/asf.xml
+++ b/Demos/Host/LowLevel/StillImageHost/asf.xml
@@ -1,6 +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"/>
 		<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 3c6520c81dc837d160cb2be7dcaa691cd46f7cb2..23d0f22952df6c07f96d36b8819e0f7116be04fd 100644
--- a/Demos/Host/LowLevel/VirtualSerialHost/asf.xml
+++ b/Demos/Host/LowLevel/VirtualSerialHost/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/LUFA/CodeTemplates/DeviceTemplate/asf.xml b/LUFA/CodeTemplates/DeviceTemplate/asf.xml
index 7689888dfc66d7ee8c816f163c84f1f23da0d788..0cceef9f0e2cdf4a4cc8a33f15eee7572c756edc 100644
--- a/LUFA/CodeTemplates/DeviceTemplate/asf.xml
+++ b/LUFA/CodeTemplates/DeviceTemplate/asf.xml
@@ -1,6 +1,7 @@
 <asf xmlversion="1.0">
 	<project caption="USB Device Template" id="lufa.templates.device.project">
 		<require idref="lufa.templates.device"/>
+		<require idref="lufa.boards.dummy"/>
 		<generator value="as5_8_template"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/LUFA/CodeTemplates/HostTemplate/asf.xml b/LUFA/CodeTemplates/HostTemplate/asf.xml
index d6069f4457638c53002efff2556b0cd79e477a9b..0c20c4b12e78bc0c34442ea0f472ec500d880a20 100644
--- a/LUFA/CodeTemplates/HostTemplate/asf.xml
+++ b/LUFA/CodeTemplates/HostTemplate/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8_template"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/LUFA/StudioIntegration/lufa_common.xml b/LUFA/StudioIntegration/lufa_common.xml
index d882ae82a41d78d22eb597fe467a76101a21a3a3..9e17b188be6994886c38aef1d78fdc4676038107 100644
--- a/LUFA/StudioIntegration/lufa_common.xml
+++ b/LUFA/StudioIntegration/lufa_common.xml
@@ -29,12 +29,6 @@
 			<build type="header-file" value="Common/BoardTypes.h"/>
 			<build type="header-file" value="Common/CompilerSpecific.h"/>
 			<build type="header-file" value="Common/Endianness.h"/>
-
-			<require idref="lufa.common.dummyboard"/>
 		</module>
-
-		<board id="lufa.common.dummyboard" vendor="LUFA" caption="NONE">
-			<device-support value="avr"/>
-		</board>
 	</asf>
 </lufa>
diff --git a/LUFA/StudioIntegration/lufa_drivers_board.xml b/LUFA/StudioIntegration/lufa_drivers_board.xml
index 339cefec8da1a2a27465d86ac4ff277545f49a9f..89b9151836c978b4e629f55624ab6e1da363b1fc 100644
--- a/LUFA/StudioIntegration/lufa_drivers_board.xml
+++ b/LUFA/StudioIntegration/lufa_drivers_board.xml
@@ -10,6 +10,12 @@
 
 <lufa>
 	<asf>
+		<board id="lufa.boards.dummy" vendor="LUFA" caption="LUFA">
+			<device-support value="avr"/>
+
+			<require idref="lufa.drivers.board"/>
+		</board>
+
 		<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/Projects/AVRISP-MKII/asf.xml b/Projects/AVRISP-MKII/asf.xml
index 55fc83bbc4110caeffc3c371e087bc85a42ceee9..426818d375820dbe65a63a6ece6b50abadfce0f9 100644
--- a/Projects/AVRISP-MKII/asf.xml
+++ b/Projects/AVRISP-MKII/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/Benito/asf.xml b/Projects/Benito/asf.xml
index 13b54be01592fa5c7fea50cf6d2b9ce4ba58a024..dab72ae5237ffd1418efca55959ad05ebb2d2e9c 100644
--- a/Projects/Benito/asf.xml
+++ b/Projects/Benito/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/HIDReportViewer/asf.xml b/Projects/HIDReportViewer/asf.xml
index f1d4a6b16f11713090ade6e2c097bdd9e2f59c71..fa748a0769aedfc835078624470d44a38f426086 100644
--- a/Projects/HIDReportViewer/asf.xml
+++ b/Projects/HIDReportViewer/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/LEDNotifier/asf.xml b/Projects/LEDNotifier/asf.xml
index 25dc8aca706abcd1366844832efbbf588e7c34fc..ee334efddb5274951dcba60631cc174767f63010 100644
--- a/Projects/LEDNotifier/asf.xml
+++ b/Projects/LEDNotifier/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/MIDIToneGenerator/asf.xml b/Projects/MIDIToneGenerator/asf.xml
index 0ae2e6e69d27682df938467f1e9260458ea7f22c..2307c7fc80ba019e8d1c363d9bdd6ca7cad42ead 100644
--- a/Projects/MIDIToneGenerator/asf.xml
+++ b/Projects/MIDIToneGenerator/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/Magstripe/asf.xml b/Projects/Magstripe/asf.xml
index 0d59a3a778b3212a9c01e0ccc5b349c7969462d3..249d697efd6eb80f6faf53394a8dbb20ecd0c625 100644
--- a/Projects/Magstripe/asf.xml
+++ b/Projects/Magstripe/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/MediaController/asf.xml b/Projects/MediaController/asf.xml
index ffe7600a286bf061900dd6079ef12d6720c9963e..0f020f452f4c714668a5bbaae45c70f3d7480aa0 100644
--- a/Projects/MediaController/asf.xml
+++ b/Projects/MediaController/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/MissileLauncher/asf.xml b/Projects/MissileLauncher/asf.xml
index 5cdfd7ebeb529ddf0a938a0c8d41cfe6d01fe79c..77366d193cd240d3052f46c2f7777bf50d3c6d99 100644
--- a/Projects/MissileLauncher/asf.xml
+++ b/Projects/MissileLauncher/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/RelayBoard/asf.xml b/Projects/RelayBoard/asf.xml
index 7c29c95cb71c3090d0f9e244bdb9457c97ef83f6..259bca42f98de9d45868aba68598e256bdde7159 100644
--- a/Projects/RelayBoard/asf.xml
+++ b/Projects/RelayBoard/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/SerialToLCD/asf.xml b/Projects/SerialToLCD/asf.xml
index 1a0674df274327a13278d2682b86781122d09d78..6af93804b286ef538739c841e63783894169233e 100644
--- a/Projects/SerialToLCD/asf.xml
+++ b/Projects/SerialToLCD/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/TempDataLogger/asf.xml b/Projects/TempDataLogger/asf.xml
index 5f5de99f841da7d0b24a990ec1d04ac1fff45360..c2039003fb0cf193e4f10851cfdb8dcd37c92433 100644
--- a/Projects/TempDataLogger/asf.xml
+++ b/Projects/TempDataLogger/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/USBtoSerial/asf.xml b/Projects/USBtoSerial/asf.xml
index eaebbdc6e74e603e98fc5aace2f52c02edf682f9..b6b4c0a1d85b5e1d3d8e6b742e948fd9e7373342 100644
--- a/Projects/USBtoSerial/asf.xml
+++ b/Projects/USBtoSerial/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/Webserver/asf.xml b/Projects/Webserver/asf.xml
index 4084b9d211272c73700a1892e0f944e6eac8a1a5..3505f7305725e5db49b520c4a556a5bf69d2471a 100644
--- a/Projects/Webserver/asf.xml
+++ b/Projects/Webserver/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>
diff --git a/Projects/XPLAINBridge/asf.xml b/Projects/XPLAINBridge/asf.xml
index f0414ea8ecfc64201c34a75393deac74cd4a8c5f..3936f31724a9cfa5bbf86b3b38a60ee5e606824f 100644
--- a/Projects/XPLAINBridge/asf.xml
+++ b/Projects/XPLAINBridge/asf.xml
@@ -1,6 +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"/>
 		<generator value="as5_8"/>
 
 		<device-support value="at90usb1287"/>