diff --git a/Demos/Device/ClassDriver/AudioOutput/asf.xml b/Demos/Device/ClassDriver/AudioOutput/asf.xml
index 5d0081b831..c7b0768ed0 100644
--- a/Demos/Device/ClassDriver/AudioOutput/asf.xml
+++ b/Demos/Device/ClassDriver/AudioOutput/asf.xml
@@ -45,6 +45,5 @@
 		<require idref="lufa.drivers.usb"/>
 		<require idref="lufa.drivers.board"/>
 		<require idref="lufa.drivers.board.leds"/>
-		<require idref="lufa.drivers.board.buttons"/>
 	</module>
 </asf>
diff --git a/Demos/Device/ClassDriver/Joystick/asf.xml b/Demos/Device/ClassDriver/Joystick/asf.xml
index 8810726b82..e43b1c607f 100644
--- a/Demos/Device/ClassDriver/Joystick/asf.xml
+++ b/Demos/Device/ClassDriver/Joystick/asf.xml
@@ -55,6 +55,7 @@
 		<require idref="lufa.drivers.usb"/>
 		<require idref="lufa.drivers.board"/>
 		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
 		<require idref="lufa.drivers.board.joystick"/>
 	</module>
 </asf>
diff --git a/Demos/Device/LowLevel/Joystick/asf.xml b/Demos/Device/LowLevel/Joystick/asf.xml
index 378093004e..e7df499275 100644
--- a/Demos/Device/LowLevel/Joystick/asf.xml
+++ b/Demos/Device/LowLevel/Joystick/asf.xml
@@ -55,6 +55,7 @@
 		<require idref="lufa.drivers.usb"/>
 		<require idref="lufa.drivers.board"/>
 		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
 		<require idref="lufa.drivers.board.joystick"/>
 	</module>
 </asf>