diff --git a/console/xterm.c b/console/xterm.c
index 8e8d200b550..59d622ede00 100644
--- a/console/xterm.c
+++ b/console/xterm.c
@@ -8,6 +8,7 @@
    It does not currently support changing the title bar.
 */
 
+#include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <sys/ioctl.h>
diff --git a/controls/listbox.c b/controls/listbox.c
index 5bc1c710d2b..1c17bef3af2 100644
--- a/controls/listbox.c
+++ b/controls/listbox.c
@@ -5,6 +5,7 @@
  */
 
 #include <string.h>
+#include <stdlib.h>
 #include "wine/winuser16.h"
 #include "winuser.h"
 #include "winerror.h"
diff --git a/debugger/dbg.y b/debugger/dbg.y
index 5f87f5c0874..af14abb9b45 100644
--- a/debugger/dbg.y
+++ b/debugger/dbg.y
@@ -10,6 +10,8 @@
 #include "x11drv.h"
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <signal.h>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/debugger/registers.c b/debugger/registers.c
index dd843d7b6b2..9f6c1b2b572 100644
--- a/debugger/registers.c
+++ b/debugger/registers.c
@@ -5,6 +5,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 #include "selectors.h"
 #include "debugger.h"
 
diff --git a/graphics/d3ddevices.c b/graphics/d3ddevices.c
index f3f5e43bf00..355cfb321a1 100644
--- a/graphics/d3ddevices.c
+++ b/graphics/d3ddevices.c
@@ -4,6 +4,7 @@
    This files contains all the D3D devices that Wine supports. For the moment
    only the 'OpenGL' target is supported. */
 
+#include <string.h>
 #include "config.h"
 #include "wintypes.h"
 #include "winerror.h"
diff --git a/graphics/d3dexecutebuffer.c b/graphics/d3dexecutebuffer.c
index 787f7d61791..a175ae59aa0 100644
--- a/graphics/d3dexecutebuffer.c
+++ b/graphics/d3dexecutebuffer.c
@@ -4,6 +4,7 @@
    This files contains the implementation of Direct3DExecuteBuffer. */
 
 
+#include <string.h>
 #include "config.h"
 #include "wintypes.h"
 #include "winerror.h"
diff --git a/graphics/d3dtexture.c b/graphics/d3dtexture.c
index 533bff51e23..c5ca9014976 100644
--- a/graphics/d3dtexture.c
+++ b/graphics/d3dtexture.c
@@ -4,6 +4,7 @@
    This files contains the implementation of interface Direct3DTexture2. */
 
 
+#include <string.h>
 #include "config.h"
 #include "wintypes.h"
 #include "winerror.h"
diff --git a/graphics/escape.c b/graphics/escape.c
index 9dc13966e64..f1f952f66c4 100644
--- a/graphics/escape.c
+++ b/graphics/escape.c
@@ -4,7 +4,7 @@
  * Copyright 1994  Bob Amstadt
  */
 
-#include <stdio.h>
+#include <string.h>
 #include "wingdi.h"
 #include "gdi.h"
 #include "heap.h"
diff --git a/graphics/win16drv/font.c b/graphics/win16drv/font.c
index 089847231b8..2996ac5d89a 100644
--- a/graphics/win16drv/font.c
+++ b/graphics/win16drv/font.c
@@ -5,7 +5,7 @@
  *           1998 Huw Davies
  */
 
-#include <stdio.h>
+#include <string.h>
 #include "wine/winbase16.h"
 #include "win16drv.h"
 #include "module.h"
diff --git a/loader/ne/convert.c b/loader/ne/convert.c
index e421236a253..f2c177f2079 100644
--- a/loader/ne/convert.c
+++ b/loader/ne/convert.c
@@ -4,6 +4,7 @@
  * Copyright 1998 Ulrich Weigand
  */
 
+#include <string.h>
 #include "wine/winuser16.h"
 #include "module.h"
 #include "debug.h"
diff --git a/misc/network.c b/misc/network.c
index 591b33be8ec..d2ffb2aba69 100644
--- a/misc/network.c
+++ b/misc/network.c
@@ -7,6 +7,7 @@
  */
 
 #include <ctype.h>
+#include <string.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <unistd.h>
diff --git a/misc/port.c b/misc/port.c
index 668bf1a6902..7f99f643e8a 100644
--- a/misc/port.c
+++ b/misc/port.c
@@ -6,6 +6,7 @@
 
 #include "config.h"
 #include <stdio.h>
+#include <string.h>
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
diff --git a/miscemu/main.c b/miscemu/main.c
index 1975abe19e8..1819592ea73 100644
--- a/miscemu/main.c
+++ b/miscemu/main.c
@@ -3,6 +3,7 @@
  *
  */
 
+#include <stdlib.h>
 #include <assert.h>
 #include "wine/winbase16.h"
 #include "callback.h"
diff --git a/multimedia/audio.c b/multimedia/audio.c
index 8078ed409ee..e9716a419f4 100644
--- a/multimedia/audio.c
+++ b/multimedia/audio.c
@@ -15,6 +15,7 @@
 #define DEBUG_MCIWAVE
 
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/multimedia/dplay.c b/multimedia/dplay.c
index 2a825f696f6..e8a14bdd34e 100644
--- a/multimedia/dplay.c
+++ b/multimedia/dplay.c
@@ -5,6 +5,7 @@
  * <presently under construction - contact hunnise@nortelnetworks.com>
  *
  */
+#include <string.h>
 #include "winerror.h"
 #include "winnt.h"
 #include "winreg.h"
diff --git a/multimedia/init.c b/multimedia/init.c
index 92f7769c4e8..729a09987cf 100644
--- a/multimedia/init.c
+++ b/multimedia/init.c
@@ -7,6 +7,7 @@
  */
 
 #include <unistd.h>
+#include <string.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include "winbase.h"
diff --git a/multimedia/mciwave.c b/multimedia/mciwave.c
index 436a254a803..249000209bb 100644
--- a/multimedia/mciwave.c
+++ b/multimedia/mciwave.c
@@ -15,6 +15,7 @@
 #define DEBUG_MCIWAVE
 
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <fcntl.h>
diff --git a/multimedia/mixer.c b/multimedia/mixer.c
index d0458e34f32..d538aeea488 100644
--- a/multimedia/mixer.c
+++ b/multimedia/mixer.c
@@ -5,6 +5,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/multimedia/mmaux.c b/multimedia/mmaux.c
index 3deac1cd251..de6fc94bb01 100644
--- a/multimedia/mmaux.c
+++ b/multimedia/mmaux.c
@@ -7,6 +7,7 @@
 #define EMULATE_SB16
 
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
diff --git a/objects/brush.c b/objects/brush.c
index cb2fa909855..ebe4e979413 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -4,7 +4,7 @@
  * Copyright 1993, 1994  Alexandre Julliard
  */
 
-#include <stdlib.h>
+#include <string.h>
 #include "winbase.h"
 #include "brush.h"
 #include "bitmap.h"
diff --git a/objects/clipping.c b/objects/clipping.c
index 99316cfdeb1..428aa272169 100644
--- a/objects/clipping.c
+++ b/objects/clipping.c
@@ -4,6 +4,7 @@
  * Copyright 1993 Alexandre Julliard
  */
 
+#include <stdlib.h>
 #include "dc.h"
 #include "metafile.h"
 #include "region.h"
diff --git a/objects/pen.c b/objects/pen.c
index 21578f157b3..3621c33544d 100644
--- a/objects/pen.c
+++ b/objects/pen.c
@@ -4,6 +4,7 @@
  * Copyright 1993 Alexandre Julliard
  */
 
+#include <string.h>
 #include "pen.h"
 #include "debug.h"
 
diff --git a/objects/region.c b/objects/region.c
index 89baa0f7da6..3e32b81d779 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -80,6 +80,8 @@ SOFTWARE.
  * the y-x-banding that's so nice to have...
  */
 
+#include <stdlib.h>
+#include <string.h>
 #include "region.h"
 #include "winuser.h"
 #include "debug.h"
diff --git a/objects/text.c b/objects/text.c
index 52b359e6224..286824a223e 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -5,7 +5,7 @@
  *
  */
 
-#include <stdlib.h>
+#include <string.h>
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/winuser16.h"
diff --git a/ole/olefont.c b/ole/olefont.c
index 8b645882521..6f3e78e70a8 100644
--- a/ole/olefont.c
+++ b/ole/olefont.c
@@ -7,7 +7,7 @@
  * Copyright 1999 Francis Beaudet
  */
 #include <assert.h>
-
+#include <string.h>
 #include "windows.h"
 #include "winerror.h"
 #include "oleauto.h"
diff --git a/ole/oleobj.c b/ole/oleobj.c
index 38dfb0eb7db..361c4121758 100644
--- a/ole/oleobj.c
+++ b/ole/oleobj.c
@@ -5,6 +5,7 @@
  */
 
 
+#include <string.h>
 #include "ole.h"
 #include "ole2.h"
 #include "winerror.h"
diff --git a/scheduler/event.c b/scheduler/event.c
index 9dd1b0f41da..61b1ca66faf 100644
--- a/scheduler/event.c
+++ b/scheduler/event.c
@@ -5,6 +5,7 @@
  */
 
 #include <assert.h>
+#include <string.h>
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"
diff --git a/scheduler/k32obj.c b/scheduler/k32obj.c
index 1f6f991b235..36919389283 100644
--- a/scheduler/k32obj.c
+++ b/scheduler/k32obj.c
@@ -5,6 +5,7 @@
  */
 
 #include <assert.h>
+#include <string.h>
 #include "winerror.h"
 #include "k32obj.h"
 #include "heap.h"
diff --git a/scheduler/mutex.c b/scheduler/mutex.c
index f809a619321..91eae648b34 100644
--- a/scheduler/mutex.c
+++ b/scheduler/mutex.c
@@ -5,6 +5,7 @@
  */
 
 #include <assert.h>
+#include <string.h>
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"
diff --git a/scheduler/semaphore.c b/scheduler/semaphore.c
index d329ec9aa57..6fdcf7050b1 100644
--- a/scheduler/semaphore.c
+++ b/scheduler/semaphore.c
@@ -5,6 +5,7 @@
  */
 
 #include <assert.h>
+#include <string.h>
 #include "winerror.h"
 #include "k32obj.h"
 #include "process.h"
diff --git a/server/file.c b/server/file.c
index df7af683d6b..3bb61686950 100644
--- a/server/file.c
+++ b/server/file.c
@@ -7,6 +7,7 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <sys/errno.h>
diff --git a/server/request.c b/server/request.c
index 7e5b682e739..e25b7bbda57 100644
--- a/server/request.c
+++ b/server/request.c
@@ -7,6 +7,7 @@
 #include <assert.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/uio.h>
diff --git a/windows/defwnd.c b/windows/defwnd.c
index 265a5597712..96c91f0fca7 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -5,7 +5,7 @@
  *	     1995 Alex Korobka
  */
 
-#include <stdlib.h>
+#include <string.h>
 #include "win.h"
 #include "user.h"
 #include "heap.h"
diff --git a/windows/msgbox.c b/windows/msgbox.c
index 826d82e81c0..d71a48d1052 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -4,6 +4,7 @@
  * Copyright 1995 Bernd Schmidt
  */
 
+#include <string.h>
 #include "wine/winuser16.h"
 #include "dlgs.h"
 #include "heap.h"
diff --git a/windows/x11drv/monitor.c b/windows/x11drv/monitor.c
index 3e7fbf06c1a..291502d0ccb 100644
--- a/windows/x11drv/monitor.c
+++ b/windows/x11drv/monitor.c
@@ -9,6 +9,7 @@
 
 #ifndef X_DISPLAY_MISSING
 
+#include <stdlib.h>
 #include <X11/cursorfont.h>
 #include "ts_xlib.h"
 #include "ts_xutil.h"