diff --git a/polymer/eduke32/build/include/baselayer.h b/polymer/eduke32/build/include/baselayer.h
index b8a8941d4..e2f612b11 100644
--- a/polymer/eduke32/build/include/baselayer.h
+++ b/polymer/eduke32/build/include/baselayer.h
@@ -170,7 +170,7 @@ extern int32_t inputchecked;
 int32_t inittimer(int32_t);
 void uninittimer(void);
 void sampletimer(void);
-#ifdef RENDERTYPESDL
+#if defined RENDERTYPESDL && !defined LUNATIC
 static inline uint32_t getticks(void) { return (uint32_t)SDL_GetTicks(); }
 #else
 uint32_t getticks(void);
diff --git a/polymer/eduke32/build/src/sdlayer.c b/polymer/eduke32/build/src/sdlayer.c
index fc1bbed86..9e46c13eb 100644
--- a/polymer/eduke32/build/src/sdlayer.c
+++ b/polymer/eduke32/build/src/sdlayer.c
@@ -901,6 +901,16 @@ void sampletimer(void)
         for (; n > 0; n--) usertimercallback();
 }
 
+#if defined LUNATIC
+//
+// getticks() -- returns the sdl ticks count
+//
+uint32_t getticks(void)
+{
+    return (uint32_t)SDL_GetTicks();
+}
+#endif
+
 // high-resolution timers for profiling
 
 #if SDL_MAJOR_VERSION!=1
diff --git a/polymer/eduke32/source/astub.c b/polymer/eduke32/source/astub.c
index 4c4e13beb..ecda20adf 100644
--- a/polymer/eduke32/source/astub.c
+++ b/polymer/eduke32/source/astub.c
@@ -10826,7 +10826,10 @@ static void med_handlecommon(int32_t xpos, int32_t ypos, int32_t *row, int32_t r
 
 static void EditSectorData(int16_t sectnum)
 {
-    int32_t col=1, row=0, rowmax = 6, i = -1;
+    int32_t col=1, row=0, rowmax = 6;
+#ifdef YAX_ENABLE__COMPAT
+    int32_t i = -1;
+#endif
     int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48;
 
     med_editval = 0;
@@ -10982,7 +10985,10 @@ static void EditSectorData(int16_t sectnum)
 
 static void EditWallData(int16_t wallnum)
 {
-    int32_t row=0, i = -1;
+    int32_t row=0;
+#if !defined NEW_MAP_FORMAT
+    int32_t i = -1;
+#endif
     int32_t xpos = 208, ypos = ydim-STATUS2DSIZ+48;
 
     med_editval = 0;