diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 1d81d481ec5abb53b4a0810382bf1c0c9797ae66..b7d564aa3ce7b75065e4220dfa4e97a15fd70574 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -53,9 +53,7 @@
 #define __LUFA_COMMON_H__
 
 	/* Macros: */
-		#if !defined(__DOXYGEN__)
-			#define __INCLUDE_FROM_COMMON_H
-		#endif
+		#define __INCLUDE_FROM_COMMON_H
 		
 	/* Includes: */
 		#include <stdint.h>
diff --git a/LUFA/Doxygen.conf b/LUFA/Doxygen.conf
index dadb864fe3341898a420f115c67f18c91ce21b87..393fbae514db620bc0f47cd871eafab025e7c043 100644
--- a/LUFA/Doxygen.conf
+++ b/LUFA/Doxygen.conf
@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = "LUFA Library Documentation"
+PROJECT_NAME           = "LUFA Library"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
diff --git a/LUFA/Drivers/Board/Buttons.h b/LUFA/Drivers/Board/Buttons.h
index b91c77050ae3acd5847f7b99763e8e8f4a2b6de2..e32c4ebe8fa5afe1ab3157301fa4435e3240cb01 100644
--- a/LUFA/Drivers/Board/Buttons.h
+++ b/LUFA/Drivers/Board/Buttons.h
@@ -86,10 +86,7 @@
 #define __BUTTONS_H__
 
 	/* Macros: */
-	#if !defined(__DOXYGEN__)
 		#define __INCLUDE_FROM_BUTTONS_H
-		#define INCLUDE_FROM_BUTTONS_H
-	#endif
 
 	/* Includes: */
 		#include "../../Common/Common.h"
diff --git a/LUFA/Drivers/Board/Dataflash.h b/LUFA/Drivers/Board/Dataflash.h
index 4ed77a3746913da47821df05244770d10cd8fd07..cb5b7fccc3a0f76e19e5c73e4709e6c3505655c2 100644
--- a/LUFA/Drivers/Board/Dataflash.h
+++ b/LUFA/Drivers/Board/Dataflash.h
@@ -119,10 +119,7 @@
 #define __DATAFLASH_H__
 
 	/* Macros: */
-	#if !defined(__DOXYGEN__)
 		#define __INCLUDE_FROM_DATAFLASH_H
-		#define INCLUDE_FROM_DATAFLASH_H
-	#endif
 
 	/* Includes: */
 	#include "../../Common/Common.h"
diff --git a/LUFA/Drivers/Board/Joystick.h b/LUFA/Drivers/Board/Joystick.h
index 31ec3b8ef7534baac9109e8587bb1ec5170286d2..7b8941695eacfd100d1c98ca343075d6fb325965 100644
--- a/LUFA/Drivers/Board/Joystick.h
+++ b/LUFA/Drivers/Board/Joystick.h
@@ -94,10 +94,7 @@
 #define __JOYSTICK_H__
 
 	/* Macros: */
-	#if !defined(__DOXYGEN__)
 		#define __INCLUDE_FROM_JOYSTICK_H
-		#define INCLUDE_FROM_JOYSTICK_H
-	#endif
 
 	/* Includes: */
 		#include "../../Common/Common.h"
diff --git a/LUFA/Drivers/Board/LEDs.h b/LUFA/Drivers/Board/LEDs.h
index 173ed551b8d5c1e21e2c22e20501216801f47683..7a135b8bc84c14910653c5404f34a7b7dd6e111d 100644
--- a/LUFA/Drivers/Board/LEDs.h
+++ b/LUFA/Drivers/Board/LEDs.h
@@ -102,10 +102,7 @@
 #define __LEDS_H__
 
 	/* Macros: */
-	#if !defined(__DOXYGEN__)
 		#define __INCLUDE_FROM_LEDS_H
-		#define INCLUDE_FROM_LEDS_H
-	#endif
 
 	/* Includes: */
 	#include "../../Common/Common.h"
diff --git a/LUFA/Drivers/Peripheral/ADC.h b/LUFA/Drivers/Peripheral/ADC.h
index 5a1d33032c4ce6e2e52e7b235c3e6222b0c8da61..a6e71d1a6793ff3750c53d62c31b31e88d8a94c4 100644
--- a/LUFA/Drivers/Peripheral/ADC.h
+++ b/LUFA/Drivers/Peripheral/ADC.h
@@ -59,9 +59,7 @@
 #define __ADC_H__
 
 	/* Macros: */
-		#if !defined(__DOXYGEN__)
-			#define __INCLUDE_FROM_ADC_H
-		#endif
+		#define __INCLUDE_FROM_ADC_H
 
 	/* Includes: */
 		#include "../../Common/Common.h"
diff --git a/LUFA/Drivers/Peripheral/SPI.h b/LUFA/Drivers/Peripheral/SPI.h
index 3fdc69d672fa0089f36fb5cdbe2a15a794351e66..352c9f2ee8e6f35ed61e1dc780e329ed7d6586d9 100644
--- a/LUFA/Drivers/Peripheral/SPI.h
+++ b/LUFA/Drivers/Peripheral/SPI.h
@@ -58,9 +58,7 @@
 #define __SPI_H__
 
 	/* Macros: */
-		#if !defined(__DOXYGEN__)
-			#define __INCLUDE_FROM_SPI_H
-		#endif
+		#define __INCLUDE_FROM_SPI_H
 
 	/* Includes: */
 		#include "../../Common/Common.h"
diff --git a/LUFA/Drivers/Peripheral/Serial.h b/LUFA/Drivers/Peripheral/Serial.h
index addee07e407c46edd2601b26eac4133cf30c5ab4..856c54bc738ad9612621c96239f3075dac793616 100644
--- a/LUFA/Drivers/Peripheral/Serial.h
+++ b/LUFA/Drivers/Peripheral/Serial.h
@@ -58,9 +58,7 @@
 #define __SERIAL_H__
 
 	/* Macros: */
-		#if !defined(__DOXYGEN__)
-			#define __INCLUDE_FROM_SERIAL_H
-		#endif
+		#define __INCLUDE_FROM_SERIAL_H
 
 	/* Includes: */
 		#include "../../Common/Common.h"
diff --git a/LUFA/Drivers/Peripheral/TWI.h b/LUFA/Drivers/Peripheral/TWI.h
index ae2672575d74753728a16c6fed0301b5dd44a633..8f99b3a9b67ace88c1637622ea06072f307e278d 100644
--- a/LUFA/Drivers/Peripheral/TWI.h
+++ b/LUFA/Drivers/Peripheral/TWI.h
@@ -58,9 +58,7 @@
 #define __TWI_H__
 
 	/* Macros: */
-		#if !defined(__DOXYGEN__)
-			#define __INCLUDE_FROM_TWI_H
-		#endif
+		#define __INCLUDE_FROM_TWI_H
 
 	/* Includes: */
 		#include "../../Common/Common.h"
diff --git a/LUFA/Drivers/USB/USB.h b/LUFA/Drivers/USB/USB.h
index e995fc7b6ed1976791e17773fde79d606a89f2b3..3ba6f382c586ab6c21eb94790c3d93d4edcafcc4 100644
--- a/LUFA/Drivers/USB/USB.h
+++ b/LUFA/Drivers/USB/USB.h
@@ -356,9 +356,7 @@
 #define __USB_H__
 
 	/* Macros: */
-		#if !defined(__DOXYGEN__)
-			#define __INCLUDE_FROM_USB_DRIVER
-		#endif
+		#define __INCLUDE_FROM_USB_DRIVER
 
 	/* Includes: */
 		#include "../../Common/Common.h"