diff --git a/include/coreinit/thread.h b/include/coreinit/thread.h
index 64f0f3ff1..42e697d79 100644
--- a/include/coreinit/thread.h
+++ b/include/coreinit/thread.h
@@ -53,7 +53,7 @@ typedef uint8_t OSThreadAttributes;
 //! A bitfield of enum OS_THREAD_TYPE.
 typedef uint32_t OSThreadType;
 
-typedef int (*OSThreadEntryPointFn)(int argc, const char **argv);
+typedef int (*OSThreadEntryPointFn)(int argc, void *argv);
 typedef void (*OSThreadCleanupCallbackFn)(OSThread *thread, void *stack);
 typedef void (*OSThreadDeallocatorFn)(OSThread *thread, void *stack);
 
@@ -433,7 +433,7 @@ BOOL
 OSCreateThread(OSThread *thread,
                OSThreadEntryPointFn entry,
                int32_t argc,
-               char *argv,
+               void *argv,
                void *stack,
                uint32_t stackSize,
                int32_t priority,
diff --git a/libraries/libwhb/src/crash.c b/libraries/libwhb/src/crash.c
index f3cad2a1d..b3de2977d 100644
--- a/libraries/libwhb/src/crash.c
+++ b/libraries/libwhb/src/crash.c
@@ -44,7 +44,7 @@ static OSThread __attribute__((aligned(8)))
 sCrashThread;
 
 static int
-crashReportThread(int argc, const char **argv)
+crashReportThread(int argc, void* argv)
 {
    // Log crash dump
    WHBLogPrint(sRegistersBuffer);