diff --git a/config/DZDE01/splits.txt b/config/DZDE01/splits.txt
index c918f83e8c..fd03f414b3 100644
--- a/config/DZDE01/splits.txt
+++ b/config/DZDE01/splits.txt
@@ -4121,7 +4121,7 @@ TRK_MINNOW_revolution/debugger/embedded/MetroTRK/Os/revolution/target_options.c:
 TRK_MINNOW_revolution/debugger/embedded/MetroTRK/Os/revolution/UDP_Stubs.c:
 	.text       start:0x80395078 end:0x803950C0
 
-TRK_MINNOW_revolution/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c:
+TRK_MINNOW_revolution/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c:
 	.text       start:0x803950C0 end:0x80395380
 	.bss        start:0x804F72A0 end:0x804F77BC
 	.sbss       start:0x804FBAC8 end:0x804FBAD0
diff --git a/config/RZDE01_02/splits.txt b/config/RZDE01_02/splits.txt
index f9e7288cc1..2485f5a581 100644
--- a/config/RZDE01_02/splits.txt
+++ b/config/RZDE01_02/splits.txt
@@ -4343,7 +4343,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c:
 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c:
 	.text       start:0x803B7BF8 end:0x803B7C40
 
-TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c:
+TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c:
 	.text       start:0x803B7C40 end:0x803B7F00
 	.bss        start:0x8051D080 end:0x8051D59C
 	.sbss       start:0x80521998 end:0x805219A0
diff --git a/config/RZDJ01/splits.txt b/config/RZDJ01/splits.txt
index 79e4365152..df2fe916af 100644
--- a/config/RZDJ01/splits.txt
+++ b/config/RZDJ01/splits.txt
@@ -4337,7 +4337,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c:
 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c:
 	.text       start:0x803B96A8 end:0x803B96F0
 
-TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c:
+TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c:
 	.text       start:0x803B96F0 end:0x803B99B0
 	.bss        start:0x8051AF00 end:0x8051B41C
 	.sbss       start:0x8051F808 end:0x8051F810
diff --git a/config/RZDP01/splits.txt b/config/RZDP01/splits.txt
index e03e55be0d..17ec37a2ad 100644
--- a/config/RZDP01/splits.txt
+++ b/config/RZDP01/splits.txt
@@ -4340,7 +4340,7 @@ TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/target_options.c:
 TRK_MINNOW_DOLPHIN/debugger/embedded/MetroTRK/Os/dolphin/UDP_Stubs.c:
 	.text       start:0x803B8078 end:0x803B80C0
 
-TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_DDH_GCN/main.c:
+TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c:
 	.text       start:0x803B80C0 end:0x803B8380
 	.bss        start:0x8051D980 end:0x8051DE9C
 	.sbss       start:0x80522158 end:0x80522160
diff --git a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c
index 9e8a51a5a9..50e60d6ea9 100644
--- a/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c
+++ b/src/TRK_MINNOW_DOLPHIN/gamedev/cust_connection/cc/exi2/GCN/EXI2_GDEV_GCN/main.c
@@ -1,10 +1,17 @@
 #include "TRK_MINNOW_DOLPHIN/utils/common/CircleBuffer.h"
 #include "TRK_MINNOW_DOLPHIN/utils/common/MWTrace.h"
+#include "global.h"
 #include <dolphin/db.h>
 #include <dolphin/amc/AmcExi2Comm.h>
 
 #define GDEV_BUF_SIZE (0x500)
 
+#if PLATFORM_GCN
+#define TRACE(...) MWTRACE(__VA_ARGS__)
+#else
+#define TRACE(...) ((void)0)
+#endif
+
 static CircleBuffer gRecvCB;
 
 static u8 gRecvBuf[GDEV_BUF_SIZE];
@@ -12,9 +19,9 @@ static u8 gRecvBuf[GDEV_BUF_SIZE];
 static BOOL gIsInitialized;
 
 int gdev_cc_initialize(void* inputPendingPtrRef, EXICallback monitorCallback) {
-    MWTRACE(1, "CALLING EXI2_Init\n");
+    TRACE(1, "CALLING EXI2_Init\n");
     DBInitComm(inputPendingPtrRef, (int*)monitorCallback);
-    MWTRACE(1, "DONE CALLING EXI2_Init\n");
+    TRACE(1, "DONE CALLING EXI2_Init\n");
     CircleBufferInitialize(&gRecvCB, gRecvBuf, GDEV_BUF_SIZE);
     return 0;
 }
@@ -47,7 +54,7 @@ int gdev_cc_read(u8* data, int size) {
         return -0x2711;
     }
 
-    MWTRACE(1, "Expected packet size : 0x%08x (%ld)\n", size, size);
+    TRACE(1, "Expected packet size : 0x%08x (%ld)\n", size, size);
 
     p1 = size;
     p2 = size;
@@ -65,7 +72,7 @@ int gdev_cc_read(u8* data, int size) {
     if (retval == 0) {
         CircleBufferReadBytes(&gRecvCB, data, p1);
     } else {
-        MWTRACE(8, "cc_read : error reading bytes from EXI2 %ld\n", retval);
+        TRACE(8, "cc_read : error reading bytes from EXI2 %ld\n", retval);
     }
 
     return retval;
@@ -80,14 +87,14 @@ int gdev_cc_write(const u8* bytes, int length) {
     n_copy = length;
 
     if (gIsInitialized == FALSE) {
-        MWTRACE(8, "cc not initialized\n");
+        TRACE(8, "cc not initialized\n");
         return -0x2711;
     }
 
-    MWTRACE(8, "cc_write : Output data 0x%08x %ld bytes\n", bytes, length);
+    TRACE(8, "cc_write : Output data 0x%08x %ld bytes\n", bytes, length);
 
     while (n_copy > 0) {
-        MWTRACE(1, "cc_write sending %ld bytes\n", n_copy);
+        TRACE(1, "cc_write sending %ld bytes\n", n_copy);
         exi2Len = DBWrite((const void*)hexCopy, n_copy);
         if (exi2Len == AMC_EXI_NO_ERROR) {
             break;
@@ -110,7 +117,7 @@ int gdev_cc_post_stop() {
 }
 
 int gdev_cc_peek() {
-    int poll;
+    s32 poll;
     u8 buff[GDEV_BUF_SIZE];
 
     poll = DBQueryData();