diff --git a/libs/audio/targets/snd_disk.c b/libs/audio/targets/snd_disk.c
index 1eaaf91e6..e02078f41 100644
--- a/libs/audio/targets/snd_disk.c
+++ b/libs/audio/targets/snd_disk.c
@@ -33,6 +33,12 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/libs/audio/targets/snd_sdl.c b/libs/audio/targets/snd_sdl.c
index 78615025a..dd8e10aac 100644
--- a/libs/audio/targets/snd_sdl.c
+++ b/libs/audio/targets/snd_sdl.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 <SDL_audio.h>
 #include <SDL_byteorder.h>
diff --git a/libs/gib/gib_stack.c b/libs/gib/gib_stack.c
index d8c233d59..0d4deeee9 100644
--- a/libs/gib/gib_stack.c
+++ b/libs/gib/gib_stack.c
@@ -33,6 +33,12 @@
 # include <config.h>
 #endif
 #include <stdlib.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "QF/gib.h"
 
diff --git a/libs/gib/gib_vars.c b/libs/gib/gib_vars.c
index fedecc06c..6bde17072 100644
--- a/libs/gib/gib_vars.c
+++ b/libs/gib/gib_vars.c
@@ -33,6 +33,12 @@
 # include <config.h>
 #endif
 #include <stdlib.h>
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 
 #include "QF/gib.h"
 
diff --git a/libs/video/renderer/gl/gl_skin.c b/libs/video/renderer/gl/gl_skin.c
index 3735ba0b1..0ca5bb769 100644
--- a/libs/video/renderer/gl/gl_skin.c
+++ b/libs/video/renderer/gl/gl_skin.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 "compat.h"
 #include "QF/console.h"
diff --git a/libs/video/renderer/gl/gl_sky_clip.c b/libs/video/renderer/gl/gl_sky_clip.c
index cf32983d8..f0b632940 100644
--- a/libs/video/renderer/gl/gl_sky_clip.c
+++ b/libs/video/renderer/gl/gl_sky_clip.c
@@ -29,6 +29,7 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <stdlib.h>
 #ifdef HAVE_STRING_H
 # include <string.h>
 #endif
diff --git a/libs/video/renderer/r_main.c b/libs/video/renderer/r_main.c
index 9c438b21a..fd5815af9 100644
--- a/libs/video/renderer/r_main.c
+++ b/libs/video/renderer/r_main.c
@@ -1,3 +1,13 @@
+#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 "QF/qtypes.h"
 #include "QF/render.h"
 
diff --git a/libs/video/targets/vid_svgalib.c b/libs/video/targets/vid_svgalib.c
index a7455645d..a512e7d9a 100644
--- a/libs/video/targets/vid_svgalib.c
+++ b/libs/video/targets/vid_svgalib.c
@@ -33,6 +33,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
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
diff --git a/nq/include/chase.h b/nq/include/chase.h
index d4f59bcdd..7ec766a75 100644
--- a/nq/include/chase.h
+++ b/nq/include/chase.h
@@ -35,4 +35,4 @@ void Chase_Init_Cvars (void);
 void Chase_Reset (void);
 void Chase_Update (void);
 
-#endif __chase_h
+#endif // __chase_h
diff --git a/nq/source/host_skin.c b/nq/source/host_skin.c
index 7e0573724..f8eed0d67 100644
--- a/nq/source/host_skin.c
+++ b/nq/source/host_skin.c
@@ -80,8 +80,8 @@ Host_Color_f (void)
 		bottom = atoi (Cmd_Argv (2));
 	}
 
-	top = min (top &= 15, 13);
-	bottom = min (bottom &= 15, 13);
+	top = min (top & 15, 13);
+	bottom = min (bottom & 15, 13);
 
 	playercolor = top * 16 + bottom;
 
diff --git a/nq/source/sv_progs.c b/nq/source/sv_progs.c
index 9079d1b5b..78c736c92 100644
--- a/nq/source/sv_progs.c
+++ b/nq/source/sv_progs.c
@@ -300,7 +300,7 @@ SV_Progs_Init (void)
 	Cmd_AddCommand ("edictcount", ED_Count_f,
 					"Display summary information on the edicts in the game.");
 	Cmd_AddCommand ("profile", PR_Profile_f,
-					"FIXME: Report information about QuakeC Stuff (???) No Description");
+					"FIXME: Report information about QuakeC Stuff (\?\?\?) No Description");
 }
 
 void
diff --git a/qw/source/cl_ngraph.c b/qw/source/cl_ngraph.c
index 227f69eaa..3106d5791 100644
--- a/qw/source/cl_ngraph.c
+++ b/qw/source/cl_ngraph.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 "compat.h"
 #include "QF/cvar.h"
diff --git a/qw/source/net_packetlog.c b/qw/source/net_packetlog.c
index 262695bd2..fd77ac769 100644
--- a/qw/source/net_packetlog.c
+++ b/qw/source/net_packetlog.c
@@ -31,6 +31,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
 
 // FIXME: we did support Quake1 protocol too...
 
diff --git a/qw/source/sv_progs.c b/qw/source/sv_progs.c
index 761b9435b..a6d58a961 100644
--- a/qw/source/sv_progs.c
+++ b/qw/source/sv_progs.c
@@ -279,7 +279,7 @@ SV_Progs_Init (void)
 	Cmd_AddCommand ("edict", ED_PrintEdict_f, "Report information on a given edict in the game. (edict (edict number))");
 	Cmd_AddCommand ("edicts", ED_PrintEdicts_f, "Display information on all edicts in the game.");
 	Cmd_AddCommand ("edictcount", ED_Count_f, "Display summary information on the edicts in the game.");
-	Cmd_AddCommand ("profile", PR_Profile_f, "FIXME: Report information about QuakeC Stuff (???) No Description");
+	Cmd_AddCommand ("profile", PR_Profile_f, "FIXME: Report information about QuakeC Stuff (\?\?\?) No Description");
 }
 
 void