diff --git a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
index 3d61952684..c7dcd619be 100644
--- a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
+++ b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.c
@@ -95,7 +95,7 @@ void Serial_SendData(USART_t* const USART,
 	  Serial_SendByte(USART, *((uint8_t*)Buffer++));
 }
 
-void Serial_CreateStream(FILE* const Stream)
+void Serial_CreateStream(FILE* Stream)
 {
 	if (!(Stream))
 	{
@@ -107,7 +107,7 @@ void Serial_CreateStream(FILE* const Stream)
 	*Stream = (FILE)FDEV_SETUP_STREAM(Serial_putchar, Serial_getchar, _FDEV_SETUP_RW);
 }
 
-void Serial_CreateBlockingStream(FILE* const Stream)
+void Serial_CreateBlockingStream(FILE* Stream)
 {
 	if (!(Stream))
 	{
diff --git a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h
index 6d8e6ee6e7..b5af9c6e2c 100644
--- a/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h
+++ b/LUFA/Drivers/Peripheral/XMEGA/Serial_XMEGA.h
@@ -156,7 +156,7 @@
 			 *
 			 *  \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
 			 */
-			void Serial_CreateStream(FILE* const Stream);
+			void Serial_CreateStream(FILE* Stream);
 
 			/** Identical to \ref Serial_CreateStream(), except that reads are blocking until the calling stream function terminates
 			 *  the transfer.
@@ -166,7 +166,7 @@
 			 *
 			 *  \pre The USART must first be configured via a call to \ref Serial_Init() before the stream is used.
 			 */
-			void Serial_CreateBlockingStream(FILE* const Stream);
+			void Serial_CreateBlockingStream(FILE* Stream);
 
 		/* Inline Functions: */
 			/** Initializes the USART, ready for serial data transmission and reception. This initializes the interface to
diff --git a/Maintenance/makefile b/Maintenance/makefile
index df04037755..a0a19bcd51 100644
--- a/Maintenance/makefile
+++ b/Maintenance/makefile
@@ -19,6 +19,7 @@ function-list:
 	$(MAKE) -C $(patsubst %/,%,$(LUFA_ROOT))/LUFA doxygen DOXYGEN_OVERRIDE_PARAMS="GENERATE_HTML=no GENERATE_XML=yes"
 	@xsltproc $(patsubst %/,%,$(LUFA_ROOT))/LUFA/Documentation/xml/combine.xslt $(patsubst %/,%,$(LUFA_ROOT))/LUFA/Documentation/xml/index.xml > temp.xml
 	@xsltproc lufa_functionlist_transform.xslt temp.xml > function_list.h
+	@cat function_list.h | sort | uniq > function_list_unique.h
 	@rm temp.xml
 
 # Update all Doxygen configuration files to the latest Doxygen version - force Markdown support to be disabled