diff --git a/source/build/include/build.h b/source/build/include/build.h
index 0b9b2e6d7..aca5f16d9 100644
--- a/source/build/include/build.h
+++ b/source/build/include/build.h
@@ -860,8 +860,8 @@ extern int32_t usevoxels, voxscale[MAXVOXELS];
 #ifdef USE_OPENGL
 extern int32_t usemodels, usehightile;
 extern int32_t rendmode;
-extern uint8_t globalr, globalg, globalb;
 #endif
+extern uint8_t globalr, globalg, globalb;
 EXTERN uint16_t h_xsize[MAXTILES], h_ysize[MAXTILES];
 EXTERN int8_t h_xoffs[MAXTILES], h_yoffs[MAXTILES];
 
@@ -1288,6 +1288,12 @@ void polymost_precache(int32_t dapicnum, int32_t dapalnum, int32_t datype);
 
 typedef uint16_t polytintflags_t;
 
+enum cutsceneflags {
+    CUTSCENE_FORCEFILTER = 1,
+    CUTSCENE_FORCENOFILTER = 2,
+    CUTSCENE_TEXTUREFILTER = 4,
+};
+
 #ifdef USE_OPENGL
 extern int32_t glanisotropy;
 extern int32_t glusetexcompr;
@@ -1298,12 +1304,6 @@ enum {
     TEXFILTER_ON = 5, // GL_LINEAR_MIPMAP_LINEAR
 };
 
-enum cutsceneflags {
-    CUTSCENE_FORCEFILTER = 1,
-    CUTSCENE_FORCENOFILTER = 2,
-    CUTSCENE_TEXTUREFILTER = 4,
-};
-
 extern int32_t glusetexcache, glusememcache;
 extern int32_t glmultisample, glnvmultisamplehint;
 extern int32_t glprojectionhacks;
diff --git a/source/build/include/compat.h b/source/build/include/compat.h
index bba12551f..c0b876186 100644
--- a/source/build/include/compat.h
+++ b/source/build/include/compat.h
@@ -606,7 +606,7 @@ static FORCE_INLINE int32_t Blrintf(const float x)
     return n;
 }
 #else
-#define Blrintf lrintf
+#define Blrintf(x) ((int32_t)lrintf(x))
 #endif
 
 #if defined(__arm__)
diff --git a/source/build/src/engine.cpp b/source/build/src/engine.cpp
index 0a170f0a1..c17365449 100644
--- a/source/build/src/engine.cpp
+++ b/source/build/src/engine.cpp
@@ -92,6 +92,8 @@ static inline int32_t oldnonpow2(void)
 #endif
 }
 
+uint8_t globalr = 255, globalg = 255, globalb = 255;
+
 int16_t pskybits_override = -1;
 
 //void loadvoxel(int32_t voxindex) { UNREFERENCED_PARAMATER(voxindex); }
diff --git a/source/build/src/hightile.cpp b/source/build/src/hightile.cpp
index 6267451d2..f6d9e225e 100644
--- a/source/build/src/hightile.cpp
+++ b/source/build/src/hightile.cpp
@@ -294,6 +294,9 @@ void hicsetpalettetint(int32_t palnum, char r, char g, char b, char sr, char sg,
     UNREFERENCED_PARAMETER(r);
     UNREFERENCED_PARAMETER(g);
     UNREFERENCED_PARAMETER(b);
+    UNREFERENCED_PARAMETER(sr);
+    UNREFERENCED_PARAMETER(sg);
+    UNREFERENCED_PARAMETER(sb);
     UNREFERENCED_PARAMETER(effect);
 }
 int32_t hicsetsubsttex(int32_t picnum, int32_t palnum, const char *filen, float alphacut)
diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp
index 328f25ccb..3f1a095b3 100644
--- a/source/build/src/polymost.cpp
+++ b/source/build/src/polymost.cpp
@@ -32,7 +32,6 @@ extern char textfont[2048], smalltextfont[2048];
 int32_t rendmode=0;
 int32_t usemodels=1;
 int32_t usehightile=1;
-uint8_t globalr=255, globalg=255, globalb=255;
 
 typedef struct { float x, cy[2], fy[2]; int32_t tag; int16_t n, p, ctag, ftag; } vsptyp;
 #define VSPMAX 2048 //<- careful!