diff --git a/Bootloaders/CDC/BootloaderAPI.c b/Bootloaders/CDC/BootloaderAPI.c
index 8f381b99cfa24454cf7dc6cba649c37ef5bb0883..326adb4d3c3969d02bdc9cc70a1a4a00e300b0db 100644
--- a/Bootloaders/CDC/BootloaderAPI.c
+++ b/Bootloaders/CDC/BootloaderAPI.c
@@ -35,29 +35,29 @@
 
 #include "BootloaderAPI.h"
 
-void BootloaderAPI_ErasePage(uint32_t Address)
+void BootloaderAPI_ErasePage(const uint32_t Address)
 {
 	boot_page_erase_safe(Address);
 	boot_rww_enable();
 }
 
-void BootloaderAPI_WritePage(uint32_t Address)
+void BootloaderAPI_WritePage(const uint32_t Address)
 {
 	boot_page_write_safe(Address);
 	boot_rww_enable();
 }
 
-void BootloaderAPI_FillWord(uint32_t Address, uint16_t Word)
+void BootloaderAPI_FillWord(const uint32_t Address, const uint16_t Word)
 {
 	boot_page_fill_safe(Address, Word);
 }
 
-uint8_t BootloaderAPI_ReadSignature(uint16_t Address)
+uint8_t BootloaderAPI_ReadSignature(const uint16_t Address)
 {
 	return boot_signature_byte_get(Address);
 }
 
-uint8_t BootloaderAPI_ReadFuse(uint16_t Address)
+uint8_t BootloaderAPI_ReadFuse(const uint16_t Address)
 {
 	return boot_lock_fuse_bits_get(Address);
 }
@@ -67,7 +67,7 @@ uint8_t BootloaderAPI_ReadLock(void)
 	return boot_lock_fuse_bits_get(GET_LOCK_BITS);
 }
 
-void BootloaderAPI_WriteLock(uint8_t LockBits)
+void BootloaderAPI_WriteLock(const uint8_t LockBits)
 {
 	boot_lock_bits_set_safe(LockBits);
 }
diff --git a/Bootloaders/CDC/BootloaderAPI.h b/Bootloaders/CDC/BootloaderAPI.h
index e9709125d04a1512f746fa2edbae0ba1e8983b70..fd351104e5a216bc6af6db38410a6be2457832d9 100644
--- a/Bootloaders/CDC/BootloaderAPI.h
+++ b/Bootloaders/CDC/BootloaderAPI.h
@@ -44,13 +44,13 @@
 		#include <LUFA/Common/Common.h>
 	
 	/* Function Prototypes: */
-		void    BootloaderAPI_ErasePage(uint32_t Address);
-		void    BootloaderAPI_WritePage(uint32_t Address);
-		void    BootloaderAPI_FillWord(uint32_t Address, uint16_t Word);
-		uint8_t BootloaderAPI_ReadSignature(uint16_t Address);
-		uint8_t BootloaderAPI_ReadFuse(uint16_t Address);
+		void    BootloaderAPI_ErasePage(const uint32_t Address);
+		void    BootloaderAPI_WritePage(const uint32_t Address);
+		void    BootloaderAPI_FillWord(const uint32_t Address, const uint16_t Word);
+		uint8_t BootloaderAPI_ReadSignature(const uint16_t Address);
+		uint8_t BootloaderAPI_ReadFuse(const uint16_t Address);
 		uint8_t BootloaderAPI_ReadLock(void);
-		void    BootloaderAPI_WriteLock(uint8_t LockBits);
+		void    BootloaderAPI_WriteLock(const uint8_t LockBits);
 
 #endif
 
diff --git a/Bootloaders/DFU/BootloaderAPI.c b/Bootloaders/DFU/BootloaderAPI.c
index 8f381b99cfa24454cf7dc6cba649c37ef5bb0883..326adb4d3c3969d02bdc9cc70a1a4a00e300b0db 100644
--- a/Bootloaders/DFU/BootloaderAPI.c
+++ b/Bootloaders/DFU/BootloaderAPI.c
@@ -35,29 +35,29 @@
 
 #include "BootloaderAPI.h"
 
-void BootloaderAPI_ErasePage(uint32_t Address)
+void BootloaderAPI_ErasePage(const uint32_t Address)
 {
 	boot_page_erase_safe(Address);
 	boot_rww_enable();
 }
 
-void BootloaderAPI_WritePage(uint32_t Address)
+void BootloaderAPI_WritePage(const uint32_t Address)
 {
 	boot_page_write_safe(Address);
 	boot_rww_enable();
 }
 
-void BootloaderAPI_FillWord(uint32_t Address, uint16_t Word)
+void BootloaderAPI_FillWord(const uint32_t Address, const uint16_t Word)
 {
 	boot_page_fill_safe(Address, Word);
 }
 
-uint8_t BootloaderAPI_ReadSignature(uint16_t Address)
+uint8_t BootloaderAPI_ReadSignature(const uint16_t Address)
 {
 	return boot_signature_byte_get(Address);
 }
 
-uint8_t BootloaderAPI_ReadFuse(uint16_t Address)
+uint8_t BootloaderAPI_ReadFuse(const uint16_t Address)
 {
 	return boot_lock_fuse_bits_get(Address);
 }
@@ -67,7 +67,7 @@ uint8_t BootloaderAPI_ReadLock(void)
 	return boot_lock_fuse_bits_get(GET_LOCK_BITS);
 }
 
-void BootloaderAPI_WriteLock(uint8_t LockBits)
+void BootloaderAPI_WriteLock(const uint8_t LockBits)
 {
 	boot_lock_bits_set_safe(LockBits);
 }
diff --git a/Bootloaders/DFU/BootloaderAPI.h b/Bootloaders/DFU/BootloaderAPI.h
index e9709125d04a1512f746fa2edbae0ba1e8983b70..fd351104e5a216bc6af6db38410a6be2457832d9 100644
--- a/Bootloaders/DFU/BootloaderAPI.h
+++ b/Bootloaders/DFU/BootloaderAPI.h
@@ -44,13 +44,13 @@
 		#include <LUFA/Common/Common.h>
 	
 	/* Function Prototypes: */
-		void    BootloaderAPI_ErasePage(uint32_t Address);
-		void    BootloaderAPI_WritePage(uint32_t Address);
-		void    BootloaderAPI_FillWord(uint32_t Address, uint16_t Word);
-		uint8_t BootloaderAPI_ReadSignature(uint16_t Address);
-		uint8_t BootloaderAPI_ReadFuse(uint16_t Address);
+		void    BootloaderAPI_ErasePage(const uint32_t Address);
+		void    BootloaderAPI_WritePage(const uint32_t Address);
+		void    BootloaderAPI_FillWord(const uint32_t Address, const uint16_t Word);
+		uint8_t BootloaderAPI_ReadSignature(const uint16_t Address);
+		uint8_t BootloaderAPI_ReadFuse(const uint16_t Address);
 		uint8_t BootloaderAPI_ReadLock(void);
-		void    BootloaderAPI_WriteLock(uint8_t LockBits);
+		void    BootloaderAPI_WriteLock(const uint8_t LockBits);
 
 #endif