diff --git a/polymer/eduke32/build/include/baselayer.h b/polymer/eduke32/build/include/baselayer.h
index 6555a7d44..1901bc53f 100644
--- a/polymer/eduke32/build/include/baselayer.h
+++ b/polymer/eduke32/build/include/baselayer.h
@@ -14,9 +14,6 @@ extern "C" {
 
 #define SYSTEM_POOL_SIZE (64 * 1048576)
 
-extern int32_t _buildargc;
-extern const char **_buildargv;
-
 extern char quitevent, appactive;
 
 extern int32_t vsync;
diff --git a/polymer/eduke32/build/src/sdlayer.c b/polymer/eduke32/build/src/sdlayer.c
index 94a22bbf2..c2adfc09d 100644
--- a/polymer/eduke32/build/src/sdlayer.c
+++ b/polymer/eduke32/build/src/sdlayer.c
@@ -70,8 +70,6 @@ int32_t startwin_settitle(const char *s) { UNREFERENCED_PARAMETER(s); return 0;
 #define MWHEELTICKS 10
 static uint32_t mwheelup, mwheeldown;
 
-int32_t   _buildargc = 1;
-const char **_buildargv = NULL;
 extern int32_t app_main(int32_t argc, const char *argv[]);
 
 char quitevent=0, appactive=1, novideo=0;
@@ -231,9 +229,6 @@ int32_t main(int32_t argc, char *argv[])
 #endif
     startwin_open();
 
-    _buildargc = argc;
-    _buildargv = (const char **)argv;
-
     maybe_redirect_outputs();
 
 #ifdef USE_OPENGL
@@ -242,7 +237,7 @@ int32_t main(int32_t argc, char *argv[])
 #endif
 
     baselayer_init();
-    r = app_main(_buildargc, _buildargv);
+    r = app_main(argc, argv);
 
     startwin_close();
 #ifdef HAVE_GTK2
diff --git a/polymer/eduke32/build/src/winlayer.c b/polymer/eduke32/build/src/winlayer.c
index ec45b40e7..09ea21eb6 100644
--- a/polymer/eduke32/build/src/winlayer.c
+++ b/polymer/eduke32/build/src/winlayer.c
@@ -78,8 +78,8 @@
 static mutex_t m_initprintf;
 static int32_t winlayer_have_ATI = 0;
 
-int32_t   _buildargc = 0;
-const char **_buildargv = NULL;
+static int32_t   _buildargc = 0;
+static const char **_buildargv = NULL;
 static char *argvbuf = NULL;
 extern int32_t app_main(int32_t argc, const char **argv);
 
@@ -413,13 +413,14 @@ int32_t WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPSTR lpCmdLine, in
         }
         *wp = 0;
 
-        _buildargv = (const char **)Bmalloc(sizeof(char *)*_buildargc);
+        _buildargv = (const char **)Bmalloc(sizeof(char *)*(_buildargc+1));
         wp = argvbuf;
         for (i=0; i<_buildargc; i++,wp++)
         {
             _buildargv[i] = wp;
             while (*wp) wp++;
         }
+        _buildargv[_buildargc] = NULL;
     }
 
     maybe_redirect_outputs();
diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c
index 4c4008727..d234923ff 100644
--- a/polymer/eduke32/source/game.c
+++ b/polymer/eduke32/source/game.c
@@ -8687,8 +8687,6 @@ static int32_t loaddefinitions_game(const char *fn, int32_t preload)
 }
 
 #ifdef LUNATIC
-// TODO: In Windows, argv[argc] isn't NULL as demanded by C99. (See winlayer.c:
-// "carve up...").
 const char **g_argv;
 #endif
 
diff --git a/polymer/eduke32/source/lunatic/dynsymlist b/polymer/eduke32/source/lunatic/dynsymlist
index 10c040677..5af9cea40 100644
--- a/polymer/eduke32/source/lunatic/dynsymlist
+++ b/polymer/eduke32/source/lunatic/dynsymlist
@@ -40,6 +40,8 @@ prevspritesect;
 prevspritestat;
 nextspritesect;
 nextspritestat;
+tilesizx;
+tilesizy;
 
 headsectbunch;
 nextsectbunch;
diff --git a/polymer/eduke32/source/lunatic/dynsymlist_m32 b/polymer/eduke32/source/lunatic/dynsymlist_m32
index f184078a5..1a971cabc 100644
--- a/polymer/eduke32/source/lunatic/dynsymlist_m32
+++ b/polymer/eduke32/source/lunatic/dynsymlist_m32
@@ -40,6 +40,8 @@ prevspritesect;
 prevspritestat;
 nextspritesect;
 nextspritestat;
+tilesizx;
+tilesizy;
 
 headsectbunch;
 nextsectbunch;