diff --git a/right/build/kds/.project b/right/build/kds/.project
index 69741da..53587c0 100644
--- a/right/build/kds/.project
+++ b/right/build/kds/.project
@@ -185,6 +185,11 @@
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/main.c</locationURI>
 		</link>
+		<link>
+			<name>sources/usb_api.h</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/usb_api.h</locationURI>
+		</link>
 		<link>
 			<name>sources/usb_composite_device.c</name>
 			<type>1</type>
@@ -300,11 +305,6 @@
 			<type>1</type>
 			<locationURI>PARENT-2-PROJECT_LOC/usb_interface_mouse.h</locationURI>
 		</link>
-		<link>
-			<name>sources/usb_report_item_macros.h</name>
-			<type>1</type>
-			<locationURI>PARENT-2-PROJECT_LOC/usb_report_item_macros.h</locationURI>
-		</link>
 		<link>
 			<name>startup/startup_MK22F51212.S</name>
 			<type>1</type>
diff --git a/right/usb_report_item_macros.h b/right/usb_api.h
similarity index 87%
rename from right/usb_report_item_macros.h
rename to right/usb_api.h
index da765c3..0af0117 100644
--- a/right/usb_report_item_macros.h
+++ b/right/usb_api.h
@@ -3,6 +3,12 @@
 
 // Includes:
 
+    #include "usb_device_config.h"
+    #include "usb.h"
+    #include "usb_device.h"
+    #include "include/usb/usb_device_class.h"
+    #include "include/usb/usb_device_hid.h"
+
     #include "include/lufa/Common.h"
     #include "include/lufa/HIDClassCommon.h"
 
diff --git a/right/usb_composite_device.c b/right/usb_composite_device.c
index 19e8f4f..78a6040 100644
--- a/right/usb_composite_device.c
+++ b/right/usb_composite_device.c
@@ -1,21 +1,8 @@
-#include "usb_device_config.h"
-#include "usb.h"
-#include "usb_device.h"
-#include "include/usb/usb_device_class.h"
-#include "include/usb/usb_device_hid.h"
-#include "include/usb/usb_device_ch9.h"
-#include "usb_descriptor_device.h"
-#include "usb_composite_device.h"
-#include "usb_interface_keyboard.h"
-#include "usb_interface_mouse.h"
-#include "usb_interface_generic_hid.h"
-#include "fsl_device_registers.h"
-#include "fsl_debug_console.h"
-#include <stdio.h>
-#include <stdlib.h>
 #include "fsl_common.h"
-#include "usb_descriptor_strings.h"
+#include "usb_api.h"
+#include "usb_composite_device.h"
 #include "usb_descriptor_hid.h"
+#include "usb_descriptor_strings.h"
 
 static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param);
 usb_composite_device_t UsbCompositeDevice;
@@ -104,12 +91,12 @@ static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event,
     return error;
 }
 
-void USB0_IRQHandler(void)
+void USB0_IRQHandler()
 {
     USB_DeviceKhciIsrFunction(UsbCompositeDevice.deviceHandle);
 }
 
-void USB_DeviceApplicationInit(void)
+void USB_DeviceApplicationInit()
 {
     uint8_t usbDeviceKhciIrq[] = USB_IRQS;
     uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0];
diff --git a/right/usb_composite_device.h b/right/usb_composite_device.h
index b306b3b..0cbb865 100644
--- a/right/usb_composite_device.h
+++ b/right/usb_composite_device.h
@@ -28,6 +28,6 @@
 
 //Functions:
 
-    extern void USB_DeviceApplicationInit(void);
+    extern void USB_DeviceApplicationInit();
 
 #endif
diff --git a/right/usb_descriptor_configuration.c b/right/usb_descriptor_configuration.c
index b18ce0b..94b1bf7 100644
--- a/right/usb_descriptor_configuration.c
+++ b/right/usb_descriptor_configuration.c
@@ -1,14 +1,7 @@
-#include "usb_device_config.h"
-#include "usb.h"
-#include "usb_device.h"
-#include "include/usb/usb_device_class.h"
-#include "include/usb/usb_device_hid.h"
-#include "usb_descriptor_device.h"
+#include "usb_api.h"
 #include "usb_composite_device.h"
-#include "usb_descriptor_keyboard_report.h"
 #include "usb_descriptor_mouse_report.h"
 #include "usb_descriptor_generic_hid_report.h"
-#include "usb_descriptor_configuration.h"
 
 uint8_t UsbConfigurationDescriptor[USB_CONFIGURATION_DESCRIPTOR_TOTAL_LENGTH] = {
 
diff --git a/right/usb_descriptor_device.c b/right/usb_descriptor_device.c
index 02ac002..46c0c12 100644
--- a/right/usb_descriptor_device.c
+++ b/right/usb_descriptor_device.c
@@ -1,9 +1,4 @@
-#include "usb_device_config.h"
-#include "usb.h"
-#include "usb_device.h"
-#include "include/usb/usb_device_class.h"
-#include "include/usb/usb_device_hid.h"
-#include "usb_descriptor_device.h"
+#include "usb_api.h"
 #include "usb_composite_device.h"
 #include "usb_descriptor_strings.h"
 
diff --git a/right/usb_descriptor_generic_hid_report.c b/right/usb_descriptor_generic_hid_report.c
index dd49c81..c81633a 100644
--- a/right/usb_descriptor_generic_hid_report.c
+++ b/right/usb_descriptor_generic_hid_report.c
@@ -1,5 +1,4 @@
-#include <stdint.h>
-#include "usb_report_item_macros.h"
+#include "usb_api.h"
 #include "usb_interface_generic_hid.h"
 #include "usb_descriptor_generic_hid_report.h"
 
diff --git a/right/usb_descriptor_hid.c b/right/usb_descriptor_hid.c
index 796452b..af1378f 100644
--- a/right/usb_descriptor_hid.c
+++ b/right/usb_descriptor_hid.c
@@ -1,8 +1,4 @@
-#include "usb_device_config.h"
-#include "usb.h"
-#include "usb_device.h"
-#include "include/usb/usb_device_class.h"
-#include "include/usb/usb_device_hid.h"
+#include "usb_api.h"
 #include "usb_descriptor_hid.h"
 #include "usb_descriptor_mouse_report.h"
 #include "usb_descriptor_generic_hid_report.h"
diff --git a/right/usb_descriptor_keyboard_report.c b/right/usb_descriptor_keyboard_report.c
index 6e5627b..7c78f67 100644
--- a/right/usb_descriptor_keyboard_report.c
+++ b/right/usb_descriptor_keyboard_report.c
@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "usb_report_item_macros.h"
+#include "usb_api.h"
 #include "usb_descriptor_keyboard_report.h"
 
 uint8_t UsbKeyboardReportDescriptor[USB_KEYBOARD_REPORT_DESCRIPTOR_LENGTH] = {
diff --git a/right/usb_descriptor_mouse_report.c b/right/usb_descriptor_mouse_report.c
index ada1e08..cc08d49 100644
--- a/right/usb_descriptor_mouse_report.c
+++ b/right/usb_descriptor_mouse_report.c
@@ -1,5 +1,4 @@
-#include <stdint.h>
-#include "usb_report_item_macros.h"
+#include "usb_api.h"
 #include "usb_descriptor_mouse_report.h"
 
 uint8_t UsbMouseReportDescriptor[USB_MOUSE_REPORT_DESCRIPTOR_LENGTH] = {
diff --git a/right/usb_descriptor_strings.c b/right/usb_descriptor_strings.c
index df79039..f8f7019 100644
--- a/right/usb_descriptor_strings.c
+++ b/right/usb_descriptor_strings.c
@@ -1,8 +1,4 @@
-#include "usb_device_config.h"
-#include "usb.h"
-#include "usb_device.h"
-#include "include/usb/usb_device_class.h"
-#include "include/usb/usb_device_hid.h"
+#include "usb_api.h"
 #include "usb_descriptor_strings.h"
 
 uint8_t UsbLanguageListStringDescriptor[USB_LANGUAGE_LIST_STRING_DESCRIPTOR_LENGTH] = {
diff --git a/right/usb_interface_generic_hid.c b/right/usb_interface_generic_hid.c
index 1c7a389..0bf19c5 100644
--- a/right/usb_interface_generic_hid.c
+++ b/right/usb_interface_generic_hid.c
@@ -1,13 +1,5 @@
 #include "include/board/board.h"
-#include "fsl_gpio.h"
-#include "usb_device_config.h"
-#include "usb.h"
-#include "usb_device.h"
-#include "include/usb/usb_device_class.h"
-#include "include/usb/usb_device_hid.h"
-#include "include/usb/usb_device_ch9.h"
-#include "usb_interface_generic_hid.h"
-#include "usb_descriptor_configuration.h"
+#include "usb_api.h"
 #include "usb_composite_device.h"
 
 static usb_device_endpoint_struct_t UsbGenericHidEndpoints[USB_GENERIC_HID_ENDPOINT_COUNT] =
diff --git a/right/usb_interface_generic_hid.h b/right/usb_interface_generic_hid.h
index c323a85..9149fbc 100644
--- a/right/usb_interface_generic_hid.h
+++ b/right/usb_interface_generic_hid.h
@@ -3,11 +3,7 @@
 
 // Includes:
 
-    #include "usb_device_config.h"
-    #include "usb.h"
-    #include "usb_device.h"
-    #include "include/usb/usb_device_class.h"
-    #include "include/usb/usb_device_hid.h"
+    #include "usb_api.h"
     #include "usb_descriptor_device.h"
 
 // Macros:
diff --git a/right/usb_interface_keyboard.h b/right/usb_interface_keyboard.h
index b429421..fe5f4d1 100644
--- a/right/usb_interface_keyboard.h
+++ b/right/usb_interface_keyboard.h
@@ -3,12 +3,7 @@
 
 // Includes:
 
-    #include "usb_device_config.h"
-    #include "usb.h"
-    #include "usb_device.h"
-    #include "include/usb/usb_device_class.h"
-    #include "include/usb/usb_device_hid.h"
-    #include "include/usb/usb_device_ch9.h"
+    #include "usb_api.h"
     #include "usb_descriptor_keyboard_report.h"
 
 // Macros:
diff --git a/right/usb_interface_mouse.c b/right/usb_interface_mouse.c
index 5d25495..a1f26d2 100644
--- a/right/usb_interface_mouse.c
+++ b/right/usb_interface_mouse.c
@@ -1,15 +1,6 @@
 #include "include/board/board.h"
-#include "fsl_gpio.h"
-#include "usb_device_config.h"
-#include "usb.h"
-#include "usb_device.h"
-#include "include/usb/usb_device_class.h"
-#include "include/usb/usb_device_hid.h"
-#include "include/usb/usb_device_ch9.h"
+#include "usb_api.h"
 #include "usb_composite_device.h"
-#include "usb_interface_mouse.h"
-#include "usb_descriptor_configuration.h"
-
 
 static usb_device_endpoint_struct_t UsbMouseEndpoints[USB_MOUSE_ENDPOINT_COUNT] = {{
     USB_MOUSE_ENDPOINT_ID | (USB_IN << USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_SHIFT),
diff --git a/right/usb_interface_mouse.h b/right/usb_interface_mouse.h
index 9948b15..2d2f4b7 100644
--- a/right/usb_interface_mouse.h
+++ b/right/usb_interface_mouse.h
@@ -1,15 +1,6 @@
 #ifndef __USB_INTERFACE_MOUSE_H__
 #define __USB_INTERFACE_MOUSE_H__
 
-// Includes:
-
-    #include "usb_device_config.h"
-    #include "usb.h"
-    #include "usb_device.h"
-    #include "include/usb/usb_device_class.h"
-    #include "include/usb/usb_device_hid.h"
-    #include "include/usb/usb_device_ch9.h"
-
 // Macros:
 
     #define USB_MOUSE_CLASS 0x03