diff --git a/source/draw.c b/source/draw.c
index c2c751f..13e2624 100644
--- a/source/draw.c
+++ b/source/draw.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 "draw.h"
 #include "vid.h"
diff --git a/source/gib_instructions.c b/source/gib_instructions.c
index 47560e1..ea67e94 100644
--- a/source/gib_instructions.c
+++ b/source/gib_instructions.c
@@ -222,4 +222,4 @@ int GIB_ExpandBackticks (char *source, char *buffer, int buffersize)
 		}
 	}
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/source/gib_parse.c b/source/gib_parse.c
index ef1dcca..f380665 100644
--- a/source/gib_parse.c
+++ b/source/gib_parse.c
@@ -226,4 +226,4 @@ int GIB_ExpandEscapes (char *source)
 		m++;
 	}
 	return 0;
-}
\ No newline at end of file
+}
diff --git a/source/gib_stack.c b/source/gib_stack.c
index efe0631..baf48b7 100644
--- a/source/gib_stack.c
+++ b/source/gib_stack.c
@@ -70,4 +70,4 @@ void GIB_SubStack_Push (gib_module_t *mod, gib_sub_t *sub, gib_var_t *local)
 void GIB_SubStack_Pop (void)
 {
 	gib_instack = realloc(gib_instack, sizeof(gib_instack_t) * (--gib_subsp));
-}
\ No newline at end of file
+}
diff --git a/source/mathlib.c b/source/mathlib.c
index 8ba87fd..9450fe3 100644
--- a/source/mathlib.c
+++ b/source/mathlib.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 <math.h>
 
diff --git a/source/msg.c b/source/msg.c
index 710ce3f..a72f28b 100644
--- a/source/msg.c
+++ b/source/msg.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 "msg.h"
 #include "qendian.h"
diff --git a/source/sizebuf.c b/source/sizebuf.c
index 53cdf89..f26a094 100644
--- a/source/sizebuf.c
+++ b/source/sizebuf.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 "sizebuf.h"
 #include "sys.h"
diff --git a/source/snd_mix.c b/source/snd_mix.c
index d5ef70d..9015b84 100644
--- a/source/snd_mix.c
+++ b/source/snd_mix.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 "sound.h"
 #include "compat.h"
diff --git a/source/wad.c b/source/wad.c
index 40e04f2..f42177b 100644
--- a/source/wad.c
+++ b/source/wad.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 "qendian.h"
 #include "wad.h"