diff --git a/right/build/kds/.project b/right/build/kds/.project
index ed69fef..f125911 100644
--- a/right/build/kds/.project
+++ b/right/build/kds/.project
@@ -180,6 +180,11 @@
 			<type>1</type>
 			<locationURI>$%7BPARENT-3-PROJECT_LOC%7D/lib/KSDK_2.0_FRDM-K22F/middleware/usb_1.0.0/osa/usb_osa_bm.h</locationURI>
 		</link>
+		<link>
+			<name>sources/main.c</name>
+			<type>1</type>
+			<locationURI>PARENT-2-PROJECT_LOC/main.c</locationURI>
+		</link>
 		<link>
 			<name>sources/usb_composite_device.c</name>
 			<type>1</type>
diff --git a/right/main.c b/right/main.c
new file mode 100644
index 0000000..61fd614
--- /dev/null
+++ b/right/main.c
@@ -0,0 +1,16 @@
+#include "include/board/clock_config.h"
+#include "include/board/board.h"
+#include "include/board/pin_mux.h"
+#include "usb_composite_device.h"
+
+void main(void)
+{
+    BOARD_InitPins();
+    BOARD_BootClockHSRUN();
+    BOARD_InitDebugConsole();
+
+    USB_DeviceApplicationInit();
+
+    while (1U) {
+    }
+}
diff --git a/right/usb_composite_device.c b/right/usb_composite_device.c
index 046d4b4..f0f789c 100644
--- a/right/usb_composite_device.c
+++ b/right/usb_composite_device.c
@@ -10,13 +10,10 @@
 #include "usb_interface_mouse.h"
 #include "usb_interface_generic_hid.h"
 #include "fsl_device_registers.h"
-#include "include/board/clock_config.h"
-#include "include/board/board.h"
 #include "fsl_debug_console.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "fsl_common.h"
-#include "include/board/pin_mux.h"
 #include "usb_descriptor_strings.h"
 
 static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param);
@@ -111,7 +108,7 @@ void USB0_IRQHandler(void)
     USB_DeviceKhciIsrFunction(UsbCompositeDevice.deviceHandle);
 }
 
-static void USB_DeviceApplicationInit(void)
+void USB_DeviceApplicationInit(void)
 {
     uint8_t usbDeviceKhciIrq[] = USB_IRQS;
     uint8_t irqNumber = usbDeviceKhciIrq[CONTROLLER_ID - kUSB_ControllerKhci0];
@@ -131,13 +128,3 @@ static void USB_DeviceApplicationInit(void)
     USB_DeviceRun(UsbCompositeDevice.deviceHandle);
 }
 
-void main(void)
-{
-    BOARD_InitPins();
-    BOARD_BootClockHSRUN();
-    BOARD_InitDebugConsole();
-
-    USB_DeviceApplicationInit();
-    while (1U) {
-    }
-}
diff --git a/right/usb_composite_device.h b/right/usb_composite_device.h
index f00c46d..f082a3b 100644
--- a/right/usb_composite_device.h
+++ b/right/usb_composite_device.h
@@ -26,4 +26,8 @@
 
     extern usb_device_composite_struct_t UsbCompositeDevice;
 
+//Functions:
+
+    extern void USB_DeviceApplicationInit(void);
+
 #endif
diff --git a/right/usb_interface_keyboard.h b/right/usb_interface_keyboard.h
index 4f3eaa7..abd1f0a 100644
--- a/right/usb_interface_keyboard.h
+++ b/right/usb_interface_keyboard.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/usb/usb_device_ch9.h"
     #include "usb_descriptor_keyboard_report.h"
 
 // Macros:
diff --git a/right/usb_interface_mouse.h b/right/usb_interface_mouse.h
index b7e8699..b346f6e 100644
--- a/right/usb_interface_mouse.h
+++ b/right/usb_interface_mouse.h
@@ -1,6 +1,15 @@
 #ifndef __USB_DEVICE_HID_MOUSE_H__
 #define __USB_DEVICE_HID_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 (0x03U)