diff --git a/polymer/eduke32/build/include/renderlayer.h b/polymer/eduke32/build/include/renderlayer.h
index ddba9e21b..15fd6e4f5 100644
--- a/polymer/eduke32/build/include/renderlayer.h
+++ b/polymer/eduke32/build/include/renderlayer.h
@@ -6,6 +6,11 @@
 #endif
 
 #undef STARTUP_SETUP_WINDOW
-#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2 || SDL_MAJOR_VERSION==2))
+#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
 # define STARTUP_SETUP_WINDOW
 #endif
+
+#undef WM_MSGBOX_WINDOW
+#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2 || SDL_MAJOR_VERSION==2))
+# define WM_MSGBOX_WINDOW
+#endif
diff --git a/polymer/eduke32/build/src/build.c b/polymer/eduke32/build/src/build.c
index 4980fdb6e..24fca89d9 100644
--- a/polymer/eduke32/build/src/build.c
+++ b/polymer/eduke32/build/src/build.c
@@ -544,7 +544,7 @@ int32_t app_main(int32_t argc, const char **argv)
                     "\t-setup\tDisplays the configuration dialogue box before entering the editor.\n"
 #endif
                     ;
-#ifdef STARTUP_SETUP_WINDOW
+#ifdef WM_MSGBOX_WINDOW
                 wm_msgbox("Mapster32","%s",s);
 #else
                 puts(s);
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index eea455763..77c2e8efb 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -9023,7 +9023,7 @@ static void G_ShowParameterHelp(void)
               "-r\t\tRecord demo\n"
               "-s#\t\tSet skill level (1-4)\n"
               "-server\t\tStart a multiplayer game for other players to join\n"
-#if defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2))
+#ifdef STARTUP_SETUP_WINDOW
               "-setup/nosetup\tEnables/disables startup window\n"
 #endif
               "-t#\t\tSet respawn mode: 1 = Monsters, 2 = Items, 3 = Inventory, x = All\n"
@@ -9036,7 +9036,7 @@ static void G_ShowParameterHelp(void)
 //              "\n-?/--help\tDisplay this help message and exit\n"
               "\nSee eduke32 -debughelp for debug parameters"
               ;
-#if defined STARTUP_SETUP_WINDOW
+#ifdef WM_MSGBOX_WINDOW
     Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev);
     wm_msgbox(tempbuf,"%s",s);
 #else
@@ -9069,7 +9069,7 @@ static void G_ShowDebugHelp(void)
               "  diag, nojit, traces, dump, strict\n"
 #endif
               ;
-#if defined STARTUP_SETUP_WINDOW
+#ifdef WM_MSGBOX_WINDOW
     Bsnprintf(tempbuf, sizeof(tempbuf), HEAD2 " %s", s_buildRev);
     wm_msgbox(tempbuf,"%s",s);
 #else
@@ -11339,7 +11339,7 @@ int32_t app_main(int32_t argc, const char **argv)
         else if (!fg) g_gameNamePtr = "Unknown GRP";
     }
 
-#if (defined _WIN32 || (defined RENDERTYPESDL && ((defined __APPLE__ && defined OSX_STARTUPWINDOW) || defined HAVE_GTK2)))
+#ifdef STARTUP_SETUP_WINDOW
     if (i < 0 || (!g_noSetup && (ud.configversion != BYTEVERSION_JF || ud.config.ForceSetup)) || g_commandSetup)
     {
         if (quitevent || !startwin_run())