diff --git a/LUFA/ChangeLog.txt b/LUFA/ChangeLog.txt
index 844720834b91444bd4d9da71624d7e262209258c..3c482a1532093f4cef8a7f859afaad2d326984fa 100644
--- a/LUFA/ChangeLog.txt
+++ b/LUFA/ChangeLog.txt
@@ -43,6 +43,7 @@
   *  - Removed AVRISP_Programmer project due to code quality concerns
   *  - Fixed CDC demo not sending an empty packet after each transfer to prevent the host from buffering incomming data
   *  - Fixed documentation typoes and preprocessor checks relating to misspellings of the USE_RAM_DESCRIPTORS token (thanks to Ian Gregg)
+  *  - Fixed USBTask.h not conditionally including HostChapter9.h only when CAN_BE_DEVICE is defined (thanks to Ian Gregg)
   *
   *  \section Sec_ChangeLog090209 Version 090209
   *
diff --git a/LUFA/Drivers/USB/HighLevel/USBTask.h b/LUFA/Drivers/USB/HighLevel/USBTask.h
index 1fcc2bbb3ebc99f88157a2d580920ebc70ae907b..5bbd4f92e72d7b3f68092d43d80fbbdb6dac7abb 100644
--- a/LUFA/Drivers/USB/HighLevel/USBTask.h
+++ b/LUFA/Drivers/USB/HighLevel/USBTask.h
@@ -46,10 +46,13 @@
 		
 		#include "../../../Scheduler/Scheduler.h"
 		#include "../LowLevel/LowLevel.h"
-		#include "../LowLevel/HostChapter9.h"
 		#include "../LowLevel/USBMode.h"
 		#include "Events.h"
 		#include "StdDescriptors.h"
+
+		#if defined(USB_CAN_BE_HOST)
+			#include "../LowLevel/HostChapter9.h"
+		#endif		
 		
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/Drivers/USB/LowLevel/Endpoint.h b/LUFA/Drivers/USB/LowLevel/Endpoint.h
index 1b8bade7c8e837c4067c3ec791320dc4ec4897bb..c6aece7085fba9729fbe464b2f0da774a9ceaa43 100644
--- a/LUFA/Drivers/USB/LowLevel/Endpoint.h
+++ b/LUFA/Drivers/USB/LowLevel/Endpoint.h
@@ -46,8 +46,9 @@
 		#include "../HighLevel/USBTask.h"
 
 		#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
-		#include "StreamCallbacks.h"
+			#include "StreamCallbacks.h"
 		#endif
+		
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
 			extern "C" {
diff --git a/LUFA/Drivers/USB/LowLevel/Pipe.h b/LUFA/Drivers/USB/LowLevel/Pipe.h
index 3b7783a5de44540e72082ba51a1d5fabc01cd4e6..df3ac7ddc35ad373f83537c108d4bfa164a664e6 100644
--- a/LUFA/Drivers/USB/LowLevel/Pipe.h
+++ b/LUFA/Drivers/USB/LowLevel/Pipe.h
@@ -46,8 +46,9 @@
 		#include "../HighLevel/USBTask.h"
 
 		#if !defined(NO_STREAM_CALLBACKS) || defined(__DOXYGEN__)
-		#include "StreamCallbacks.h"
+			#include "StreamCallbacks.h"
 		#endif
+		
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
 			extern "C" {