diff --git a/source/cl_demo.c b/source/cl_demo.c
index e59dcd4..d858629 100644
--- a/source/cl_demo.c
+++ b/source/cl_demo.c
@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "console.h"
 #include "cl_main.h"
diff --git a/source/cl_ents.c b/source/cl_ents.c
index 0259b74..bc6f45f 100644
--- a/source/cl_ents.c
+++ b/source/cl_ents.c
@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "cl_cam.h"
 #include "cl_ents.h"
diff --git a/source/cl_input.c b/source/cl_input.c
index 254b8dc..61178c8 100644
--- a/source/cl_input.c
+++ b/source/cl_input.c
@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "checksum.h"
 #include "cl_cam.h"
diff --git a/source/gl_rmain.c b/source/gl_rmain.c
index dd65e44..87ff777 100644
--- a/source/gl_rmain.c
+++ b/source/gl_rmain.c
@@ -124,7 +124,6 @@ cvar_t	*gl_particles;
 cvar_t	*gl_lerp_anim;
 cvar_t	*gl_fb_models;
 cvar_t	*gl_fb_bmodels;
-cvar_t	*gl_texsort;
 cvar_t	*gl_multitexture;
 
 cvar_t	*r_skyname;
diff --git a/source/hash.c b/source/hash.c
index 8cdd9bc..ce750c0 100644
--- a/source/hash.c
+++ b/source/hash.c
@@ -30,6 +30,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "compat.h"
 #include "hash.h"
diff --git a/source/pr_exec.c b/source/pr_exec.c
index 67cdeeb..6123159 100644
--- a/source/pr_exec.c
+++ b/source/pr_exec.c
@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include <stdarg.h>
 
diff --git a/source/sw_model_brush.c b/source/sw_model_brush.c
index 053ea86..448e34a 100644
--- a/source/sw_model_brush.c
+++ b/source/sw_model_brush.c
@@ -32,6 +32,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "model.h"
 
diff --git a/source/sw_model_sprite.c b/source/sw_model_sprite.c
index 06b912d..29d3659 100644
--- a/source/sw_model_sprite.c
+++ b/source/sw_model_sprite.c
@@ -32,6 +32,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "d_iface.h"
 #include "model.h"