diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index 4f15dc48a0..feec88a886 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -50,6 +50,8 @@ generate_xml: $(TEMP_MANIFEST_XML)
 
 generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
 	@echo "Generating ASF cache files..."
+	@rm -f $(LUFA_ROOT)/../content.xml.cache
+	@rm -f $(LUFA_ROOT)/../ExampleProjects.xml
 	@python generate_caches.py $(LUFA_ROOT)/../
 
 	@echo "Archiving Content..."
@@ -74,4 +76,4 @@ check_filenames: $(TEMP_MANIFEST_XML)
 		fi; \
 	done;
 
-.PHONY: all clean generate_xml check_filenames generate_vsix
\ No newline at end of file
+.PHONY: all clean generate_xml generate_vsix check_filenames
diff --git a/LUFA/makefile b/LUFA/makefile
index 7fe59a20e5..5461111aeb 100644
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -50,4 +50,4 @@ else
   include Build/lufa_doxygen.mk
 endif
 
-.PHONY: all export_tar version clean
\ No newline at end of file
+.PHONY: all export_tar version clean
diff --git a/Projects/MIDIToneGenerator/asf.xml b/Projects/MIDIToneGenerator/asf.xml
index b69bb94596..dc8a602fbd 100644
--- a/Projects/MIDIToneGenerator/asf.xml
+++ b/Projects/MIDIToneGenerator/asf.xml
@@ -31,6 +31,6 @@
 		<require idref="lufa.common"/>
 		<require idref="lufa.platform"/>
 		<require idref="lufa.drivers.usb"/>
-		<require idref="lufa.drivers.leds"/>
+		<require idref="lufa.drivers.board.leds"/>
 	</module>
 </asf>
diff --git a/Projects/MediaController/asf.xml b/Projects/MediaController/asf.xml
index 853d252618..45989f973d 100644
--- a/Projects/MediaController/asf.xml
+++ b/Projects/MediaController/asf.xml
@@ -30,8 +30,8 @@
 		<require idref="lufa.common"/>
 		<require idref="lufa.platform"/>
 		<require idref="lufa.drivers.usb"/>
-		<require idref="lufa.drivers.leds"/>
-		<require idref="lufa.drivers.buttons"/>
-		<require idref="lufa.drivers.joystick"/>
+		<require idref="lufa.drivers.board.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+		<require idref="lufa.drivers.board.joystick"/>
 	</module>
 </asf>
diff --git a/Projects/MissileLauncher/asf.xml b/Projects/MissileLauncher/asf.xml
index 166ebb32dc..88527e5199 100644
--- a/Projects/MissileLauncher/asf.xml
+++ b/Projects/MissileLauncher/asf.xml
@@ -30,8 +30,8 @@
 		<require idref="lufa.common"/>
 		<require idref="lufa.platform"/>
 		<require idref="lufa.drivers.usb"/>
-		<require idref="lufa.drivers.buttons"/>
-		<require idref="lufa.drivers.joystick"/>
-		<require idref="lufa.drivers.leds"/>
+		<require idref="lufa.drivers.board.buttons"/>
+		<require idref="lufa.drivers.board.joystick"/>
+		<require idref="lufa.drivers.board.leds"/>
 	</module>
 </asf>
diff --git a/Projects/RelayBoard/asf.xml b/Projects/RelayBoard/asf.xml
index 481628feca..7b9ae42008 100644
--- a/Projects/RelayBoard/asf.xml
+++ b/Projects/RelayBoard/asf.xml
@@ -30,6 +30,6 @@
 		<require idref="lufa.common"/>
 		<require idref="lufa.platform"/>
 		<require idref="lufa.drivers.usb"/>
-		<require idref="lufa.drivers.leds"/>
+		<require idref="lufa.drivers.board.leds"/>
 	</module>
 </asf>