diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index a94850497ffc6594d699bd47e352dc02a19b9ac8..4d08e783d1f7ef59d15309e0eb2168707fd98c66 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -65,11 +65,11 @@
 			#include "LUFAConfig.h"
 		#endif
 
+		#include "Architectures.h"
+		#include "BoardTypes.h"
 		#include "ArchitectureSpecific.h"
 		#include "CompilerSpecific.h"
-		#include "Architectures.h"
 		#include "Attributes.h"
-		#include "BoardTypes.h"
 		
 	/* Enable C linkage for C++ Compilers: */
 		#if defined(__cplusplus)
diff --git a/LUFA/DoxygenPages/ChangeLog.txt b/LUFA/DoxygenPages/ChangeLog.txt
index 64ed7934a35fb002b0aabb65450a18413b15e823..446e5a11febc59fa9ac58a34dbf21dd102d7f987 100644
--- a/LUFA/DoxygenPages/ChangeLog.txt
+++ b/LUFA/DoxygenPages/ChangeLog.txt
@@ -39,6 +39,7 @@
   *   - Fixed misspelled HID_KEYBOARD_MODIFIER_* macros in the HID class driver (thanks to Laszlo Monda)
   *   - Fixed broken AVR32 endpoint/pipe communications when ORDERED_EP_CONFIG compile time option is not enabled (thanks to Matthias Jahr)
   *   - Fixed broken compilation for the AVR32 devices if the NO_SOF_EVENTS compile time option was not enabled (thanks to Matthias Jahr)
+  *   - Fixed compiler warning on GCC with \c -wundef compile flag is used (thanks to Georg Glock)
   *  - Library Applications:
   *   - Added reliability patches to the AVRISP-MKII Clone project's PDI/TPI protocols (thanks to Justin Mattair)
   *   - Fixed AVRISP-MKII Clone compile warning on AVR8 U4 targets even when NO_VTARGET_DETECT is enabled