diff --git a/polymer/eduke32/build/include/build.h b/polymer/eduke32/build/include/build.h
index ee765229b..ae5da5d58 100644
--- a/polymer/eduke32/build/include/build.h
+++ b/polymer/eduke32/build/include/build.h
@@ -16,6 +16,8 @@
 extern "C" {
 #endif
 
+#define PI 3.14159265358979323
+
 #define MAXSECTORSV8 4096
 #define MAXWALLSV8 16384
 #define MAXSPRITESV8 16384
diff --git a/polymer/eduke32/build/include/polymost.h b/polymer/eduke32/build/include/polymost.h
index c7da2d488..ef8d9b741 100644
--- a/polymer/eduke32/build/include/polymost.h
+++ b/polymer/eduke32/build/include/polymost.h
@@ -13,7 +13,6 @@ extern int32_t lastcullcheck;
 extern char cullmodel[MAXSPRITES];
 extern int32_t cullcheckcnt;
 
-#define PI 3.14159265358979323
 extern char TEXCACHEFILE[BMAX_PATH];
 
 typedef struct { char r, g, b, a; } coltype;
diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c
index 0691548a4..9e308f2bd 100644
--- a/polymer/eduke32/build/src/engine.c
+++ b/polymer/eduke32/build/src/engine.c
@@ -7470,6 +7470,7 @@ static void dosetaspect(void)
         for (i=0; i<xdimen; i++)
         {
             j = (x&65535); k = (x>>16); x += xinc;
+            Bassert(k >= 0 && k < (int32_t)(sizeof(radarang)/sizeof(radarang[0]))-1);
             if (j != 0) j = mulscale16(radarang[k+1]-radarang[k], j);
             radarang2[i] = (int16_t)((radarang[k]+j)>>6);
         }