diff --git a/source/cmd.c b/source/cmd.c
index 4f73326..e93aade 100644
--- a/source/cmd.c
+++ b/source/cmd.c
@@ -874,7 +874,7 @@ skipwhite:
 				data++;
 				buf[i++] = c;
 				buf[i] = 0;
-				if ((var = Cvar_FindVar(buf)))
+				if ((var = Cvar_FindVar(buf)) != 0)
 					bestvar = var;
 			}
 
diff --git a/source/cvar.c b/source/cvar.c
index 5657d53..98bcc90 100644
--- a/source/cvar.c
+++ b/source/cvar.c
@@ -44,6 +44,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 cvar_t	*cvar_vars;
 char	*cvar_null_string = "";
diff --git a/source/gl_warp.c b/source/gl_warp.c
index fcc0932..e914c25 100644
--- a/source/gl_warp.c
+++ b/source/gl_warp.c
@@ -1077,7 +1077,6 @@ void R_InitSky_32 (byte *src, int bytesperpixel)
 	unsigned	transpix;
         int             r, g, b;
 	unsigned	*rgba;
-        extern  int     skytexturenum;
 
         if (bytesperpixel == 4) {
          for (i = 0;i < 128;i++)