diff --git a/haiku/main.cpp b/haiku/main.cpp
index 130e4938..e1cf34bb 100644
--- a/haiku/main.cpp
+++ b/haiku/main.cpp
@@ -6,7 +6,7 @@ uiprivApplication *uiprivApp;
 // TODO see if we can convert this to a string, or use a known type for status_t instead of assuming it's int(32_t)
 // - https://www.haiku-os.org/docs/api/SupportDefs_8h.html#a0969fa9dac055f91eebe733902dd928a
 // - https://review.haiku-os.org/c/haiku/+/2171/3/src/system/boot/platform/u-boot/start.cpp
-- https://github.com/haiku/haiku/blob/master/src/system/libroot/posix/string/strerror.c
+// - https://github.com/haiku/haiku/blob/master/src/system/libroot/posix/string/strerror.c
 #define uiprivInitReturnStatus(err, msg, status) uiprivInitReturnErrorf(err, "%s: %ld", msg, status)
 
 static thread_id mainThread;
@@ -22,18 +22,13 @@ bool uiprivSysInit(void *options, uiInitError *err)
 	return true;
 }
 
-void uiMain(void)
+void uiprivSysMain(void)
 {
-	if (!uiprivCheckInitializedAndThread())
-		return;
 	uiprivApp->Run();
 }
 
-// TODO if this is called beofre uiMain(), uiprivApp will be deleted; either ban doing this outright or catch this scenario
-void uiQuit(void)
+void uiprivSysQuit(void)
 {
-	if (!uiprivCheckInitializedAndThread())
-		return;
 	uiprivApp->Quit();
 }
 
diff --git a/unix/main.c b/unix/main.c
index 7c82465e..09b99d67 100644
--- a/unix/main.c
+++ b/unix/main.c
@@ -16,17 +16,13 @@ bool uiprivSysInit(void *options, uiInitError *err)
 	return true;
 }
 
-void uiMain(void)
+void uiprivSysMain(void)
 {
-	if (!uiprivCheckInitializedAndThread())
-		return;
 	gtk_main();
 }
 
-void uiQuit(void)
+void uiprivSysQuit(void)
 {
-	if (!uiprivCheckInitializedAndThread())
-		return;
 	gtk_main_quit();
 }
 
diff --git a/windows/main.cpp b/windows/main.cpp
index b930db73..3ddc85d0 100644
--- a/windows/main.cpp
+++ b/windows/main.cpp
@@ -94,13 +94,11 @@ bool uiprivSysInit(void *options, uiInitError *err)
 	return true;
 }
 
-void uiMain(void)
+void uiprivSysMain(void)
 {
 	MSG msg;
 	HRESULT hr;
 
-	if (!uiprivCheckInitializedAndThread())
-		return;
 	for (;;) {
 		hr = uiprivHrGetMessageW(&msg, NULL, 0, 0);
 		if (hr == S_FALSE)		// WM_QUIT
@@ -115,10 +113,8 @@ void uiMain(void)
 	}
 }
 
-void uiQuit(void)
+void uiprivSysQuit(void)
 {
-	if (!uiprivCheckInitializedAndThread())
-		return;
 	PostQuitMessage(0);
 }