diff --git a/headers/posix/string.h b/headers/posix/string.h
index 91009bd469..34d66bdf06 100644
--- a/headers/posix/string.h
+++ b/headers/posix/string.h
@@ -56,10 +56,6 @@ extern size_t	strxfrm(char *string1, const char *string2, size_t length);
 extern char		*strerror(int errorCode);
 extern int		strerror_r(int errorCode, char *buffer, size_t bufferSize);
 
-/* non-standard string functions */
-extern int		strcasecmp(const char *string1, const char *string2);
-extern int		strncasecmp(const char *string1, const char *string2, size_t length);
-
 extern char		*strcasestr(const char *string, const char *searchString);
 
 extern char		*strdup(const char *string);
@@ -78,15 +74,6 @@ extern char		*strupr(char *string);
 
 extern const char	*strsignal(int signum);
 
-/* legacy compatibility -- might be removed one day */
-#define bcmp(a, b, length) memcmp((a), (b), (length))
-#define bcopy(source, dest, length) memmove((dest), (source), (length))
-#define bzero(buffer, length) memset((buffer), 0, (length))
-
-extern int ffs(int i);
-extern char 		*index(const char *s, int c);
-extern char 		*rindex(char const *s, int c);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/headers/posix/strings.h b/headers/posix/strings.h
index 0a758bb7cf..a267758356 100644
--- a/headers/posix/strings.h
+++ b/headers/posix/strings.h
@@ -1,6 +1,34 @@
+/*
+ * Copyright 2014 Haiku, Inc. All Rights Reserved.
+ * Distributed under the terms of the MIT License.
+ */
 #ifndef _STRINGS_H_
 #define _STRINGS_H_
 
-#include <string.h>
+
+#include <sys/types.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern int ffs(int i);
+
+extern int		strcasecmp(const char *string1, const char *string2);
+extern int		strncasecmp(const char *string1, const char *string2,
+	size_t length);
+
+/* legacy compatibility -- might be removed one day */
+#define bcmp(a, b, length) memcmp((a), (b), (length))
+#define bcopy(source, dest, length) memmove((dest), (source), (length))
+#define bzero(buffer, length) memset((buffer), 0, (length))
+
+extern char 		*index(const char *s, int c);
+extern char 		*rindex(char const *s, int c);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif	/* _STRINGS_H_ */
diff --git a/headers/private/firewire/fwglue.h b/headers/private/firewire/fwglue.h
index 453ad32465..88cb374bbf 100644
--- a/headers/private/firewire/fwglue.h
+++ b/headers/private/firewire/fwglue.h
@@ -5,12 +5,14 @@
  * Authors:
  *	JiSheng Zhang
  */
-
 #ifndef _FW_GLUE_H
 #define _FW_GLUE_H
 
-#include <stdint.h>
+
 #include <dpc.h>
+#include <stdint.h>
+#include <strings.h>
+
 
 #define device_printf(dev, a...) dprintf("firewire:" a)
 #define printf(a...) dprintf(a)
diff --git a/headers/private/shared/cpu_type.h b/headers/private/shared/cpu_type.h
index fd2a3cd449..be64e2be98 100644
--- a/headers/private/shared/cpu_type.h
+++ b/headers/private/shared/cpu_type.h
@@ -10,7 +10,7 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 #include <OS.h>
 
diff --git a/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp b/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp
index c7a1c4b37e..1552a20b76 100644
--- a/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp
+++ b/src/add-ons/input_server/filters/screen_saver/ScreenSaverFilter.cpp
@@ -22,6 +22,7 @@
 #include <Screen.h>
 
 #include <new>
+#include <strings.h>
 #include <syslog.h>
 
 
diff --git a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
index bc7eaa798c..b5fe659c2e 100644
--- a/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
+++ b/src/add-ons/input_server/filters/shortcut_catcher/CommandActuators.cpp
@@ -13,7 +13,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <strings.h>
 
 #include <String.h>
 #include <Roster.h>
diff --git a/src/add-ons/input_server/filters/shortcut_catcher/KeyInfos.cpp b/src/add-ons/input_server/filters/shortcut_catcher/KeyInfos.cpp
index 2e4d8dc55b..7a5be8e316 100644
--- a/src/add-ons/input_server/filters/shortcut_catcher/KeyInfos.cpp
+++ b/src/add-ons/input_server/filters/shortcut_catcher/KeyInfos.cpp
@@ -12,7 +12,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <InterfaceDefs.h>
 
diff --git a/src/add-ons/kernel/bus_managers/pci/arch/x86/pci_msi.cpp b/src/add-ons/kernel/bus_managers/pci/arch/x86/pci_msi.cpp
index 2e2e50d54d..53dac72954 100644
--- a/src/add-ons/kernel/bus_managers/pci/arch/x86/pci_msi.cpp
+++ b/src/add-ons/kernel/bus_managers/pci/arch/x86/pci_msi.cpp
@@ -9,6 +9,8 @@
 #include "pci.h"
 #include "pci_private.h"
 
+#include <strings.h>
+
 #include <arch/x86/msi.h>
 #include <debug.h>
 
diff --git a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIController.cpp b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIController.cpp
index 2a39367298..9cc5edceb2 100644
--- a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIController.cpp
+++ b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIController.cpp
@@ -8,7 +8,7 @@
 
 #include <new>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <util/AutoLock.h>
 
diff --git a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIRequest.cpp b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIRequest.cpp
index 6e489af6c2..a7d5d39de7 100644
--- a/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIRequest.cpp
+++ b/src/add-ons/kernel/busses/scsi/virtio/VirtioSCSIRequest.cpp
@@ -7,7 +7,7 @@
 
 #include "VirtioSCSIPrivate.h"
 
-#include <string.h>
+#include <strings.h>
 
 
 VirtioSCSIRequest::VirtioSCSIRequest(bool hasLock)
diff --git a/src/add-ons/kernel/file_systems/cdda/cdda.cpp b/src/add-ons/kernel/file_systems/cdda/cdda.cpp
index 605b5ca099..7875c6337b 100644
--- a/src/add-ons/kernel/file_systems/cdda/cdda.cpp
+++ b/src/add-ons/kernel/file_systems/cdda/cdda.cpp
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 
 struct cdtext_pack_data {
diff --git a/src/add-ons/print/transports/ipp/HttpURLConnection.cpp b/src/add-ons/print/transports/ipp/HttpURLConnection.cpp
index 1b2af479c4..729ac598bb 100644
--- a/src/add-ons/print/transports/ipp/HttpURLConnection.cpp
+++ b/src/add-ons/print/transports/ipp/HttpURLConnection.cpp
@@ -4,6 +4,7 @@
 #include <list>
 #include <algorithm>
 #include <cstring>
+#include <strings.h>
 
 #define stricmp	strcasecmp
 
diff --git a/src/add-ons/print/transports/ipp/IppSetupDlg.cpp b/src/add-ons/print/transports/ipp/IppSetupDlg.cpp
index 295c573460..25720782b7 100644
--- a/src/add-ons/print/transports/ipp/IppSetupDlg.cpp
+++ b/src/add-ons/print/transports/ipp/IppSetupDlg.cpp
@@ -2,6 +2,7 @@
 // Y.Takagi
 
 #include <string.h>
+#include <strings.h>
 
 #include <Button.h>
 #include <Rect.h>
diff --git a/src/add-ons/print/transports/ipp/IppTransport.cpp b/src/add-ons/print/transports/ipp/IppTransport.cpp
index 65b7c767bf..522eebddb1 100644
--- a/src/add-ons/print/transports/ipp/IppTransport.cpp
+++ b/src/add-ons/print/transports/ipp/IppTransport.cpp
@@ -9,6 +9,7 @@
 #include <pwd.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 #include "URL.h"
diff --git a/src/add-ons/print/transports/ipp/IppURLConnection.cpp b/src/add-ons/print/transports/ipp/IppURLConnection.cpp
index d2516620ab..482bea1529 100644
--- a/src/add-ons/print/transports/ipp/IppURLConnection.cpp
+++ b/src/add-ons/print/transports/ipp/IppURLConnection.cpp
@@ -7,7 +7,7 @@
 #	include <net/socket.h>
 #endif
 #include <iostream>
-#include <string.h>
+#include <strings.h>
 #include <stdio.h>
 char *itoa(int i, char *buf, int unit)
 {
diff --git a/src/add-ons/translators/raw/RAW.cpp b/src/add-ons/translators/raw/RAW.cpp
index 8e435da46a..d0bec25724 100644
--- a/src/add-ons/translators/raw/RAW.cpp
+++ b/src/add-ons/translators/raw/RAW.cpp
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 
 //#define TRACE(x) printf x
diff --git a/src/apps/debuganalyzer/gui/table/TableColumns.cpp b/src/apps/debuganalyzer/gui/table/TableColumns.cpp
index 7bd940665b..17aede79f1 100644
--- a/src/apps/debuganalyzer/gui/table/TableColumns.cpp
+++ b/src/apps/debuganalyzer/gui/table/TableColumns.cpp
@@ -7,6 +7,7 @@
 #include "table/TableColumns.h"
 
 #include <stdio.h>
+#include <strings.h>
 
 #include "util/TimeUtils.h"
 
diff --git a/src/apps/deskbar/BarApp.cpp b/src/apps/deskbar/BarApp.cpp
index 5e61ec70dd..01372cb2f4 100644
--- a/src/apps/deskbar/BarApp.cpp
+++ b/src/apps/deskbar/BarApp.cpp
@@ -37,6 +37,7 @@ All rights reserved.
 #include "BarApp.h"
 
 #include <locale.h>
+#include <strings.h>
 
 #include <AppFileInfo.h>
 #include <Autolock.h>
diff --git a/src/apps/deskbar/ExpandoMenuBar.cpp b/src/apps/deskbar/ExpandoMenuBar.cpp
index 2cb1994068..232a5acc6b 100644
--- a/src/apps/deskbar/ExpandoMenuBar.cpp
+++ b/src/apps/deskbar/ExpandoMenuBar.cpp
@@ -36,7 +36,7 @@ All rights reserved.
 
 #include "ExpandoMenuBar.h"
 
-#include <string.h>
+#include <strings.h>
 
 #include <Autolock.h>
 #include <Bitmap.h>
diff --git a/src/apps/deskbar/ShowHideMenuItem.cpp b/src/apps/deskbar/ShowHideMenuItem.cpp
index 4a34af94a8..a8514d9ef8 100644
--- a/src/apps/deskbar/ShowHideMenuItem.cpp
+++ b/src/apps/deskbar/ShowHideMenuItem.cpp
@@ -38,7 +38,7 @@ All rights reserved.
 
 #include <malloc.h>
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Debug.h>
 #include <Roster.h>
diff --git a/src/apps/deskbar/Switcher.cpp b/src/apps/deskbar/Switcher.cpp
index d56b1a0a64..6387e23c22 100644
--- a/src/apps/deskbar/Switcher.cpp
+++ b/src/apps/deskbar/Switcher.cpp
@@ -36,9 +36,9 @@ All rights reserved.
 
 #include "Switcher.h"
 
-#include <string.h>
-#include <stdlib.h>
 #include <float.h>
+#include <stdlib.h>
+#include <strings.h>
 
 #include <Bitmap.h>
 #include <Debug.h>
diff --git a/src/apps/deskbar/TeamMenu.cpp b/src/apps/deskbar/TeamMenu.cpp
index 4fb8273dff..46832e60e6 100644
--- a/src/apps/deskbar/TeamMenu.cpp
+++ b/src/apps/deskbar/TeamMenu.cpp
@@ -36,7 +36,7 @@ All rights reserved.
 
 #include "TeamMenu.h"
 
-#include <string.h>
+#include <strings.h>
 
 #include <Application.h>
 #include <Debug.h>
diff --git a/src/apps/deskbar/WindowMenu.cpp b/src/apps/deskbar/WindowMenu.cpp
index 42279f79d2..d4fcad4fc9 100644
--- a/src/apps/deskbar/WindowMenu.cpp
+++ b/src/apps/deskbar/WindowMenu.cpp
@@ -38,7 +38,7 @@ All rights reserved.
 
 #include <malloc.h>
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Catalog.h>
 #include <Locale.h>
diff --git a/src/apps/diskprobe/ProbeView.cpp b/src/apps/diskprobe/ProbeView.cpp
index 943889fcd6..9eb04e0083 100644
--- a/src/apps/diskprobe/ProbeView.cpp
+++ b/src/apps/diskprobe/ProbeView.cpp
@@ -8,7 +8,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Alert.h>
 #include <Application.h>
diff --git a/src/apps/icon-o-matic/generic/property/Property.cpp b/src/apps/icon-o-matic/generic/property/Property.cpp
index 15d624cbd6..5eba3e785a 100644
--- a/src/apps/icon-o-matic/generic/property/Property.cpp
+++ b/src/apps/icon-o-matic/generic/property/Property.cpp
@@ -11,7 +11,7 @@
 #include <new>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Message.h>
 
diff --git a/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp b/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp
index f26c460ac3..761497ee9b 100644
--- a/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp
+++ b/src/apps/icon-o-matic/import_export/svg/SVGImporter.cpp
@@ -8,6 +8,8 @@
 
 #include "SVGImporter.h"
 
+#include <strings.h>
+
 #include <Alert.h>
 #include <Catalog.h>
 #include <Entry.h>
diff --git a/src/apps/installer/InstallerWindow.cpp b/src/apps/installer/InstallerWindow.cpp
index a80a1d6d01..39d3d78311 100644
--- a/src/apps/installer/InstallerWindow.cpp
+++ b/src/apps/installer/InstallerWindow.cpp
@@ -8,7 +8,7 @@
 #include "InstallerWindow.h"
 
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Alert.h>
 #include <Application.h>
diff --git a/src/apps/installer/WorkerThread.cpp b/src/apps/installer/WorkerThread.cpp
index f19fe42abb..fc0180f28b 100644
--- a/src/apps/installer/WorkerThread.cpp
+++ b/src/apps/installer/WorkerThread.cpp
@@ -11,6 +11,7 @@
 
 #include <set>
 #include <string>
+#include <strings.h>
 
 #include <Alert.h>
 #include <Autolock.h>
diff --git a/src/apps/mail/Content.cpp b/src/apps/mail/Content.cpp
index 249e0d11c1..b025ae2275 100644
--- a/src/apps/mail/Content.cpp
+++ b/src/apps/mail/Content.cpp
@@ -33,10 +33,10 @@ of their respective holders. All rights reserved.
 */
 
 
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
 #include <ctype.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
 
 #include <Alert.h>
 #include <Beep.h>
diff --git a/src/apps/mail/Header.cpp b/src/apps/mail/Header.cpp
index 485c7e6c16..0232457621 100644
--- a/src/apps/mail/Header.cpp
+++ b/src/apps/mail/Header.cpp
@@ -66,7 +66,7 @@ of their respective holders. All rights reserved.
 #include <map>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <time.h>
 
 
diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp
index fd42ecb0ce..f30bf34625 100644
--- a/src/apps/mail/MailWindow.cpp
+++ b/src/apps/mail/MailWindow.cpp
@@ -35,13 +35,13 @@ of their respective holders. All rights reserved.
 
 #include "MailWindow.h"
 
+#include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include <strings.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
+#include <unistd.h>
 
 #include <Autolock.h>
 #include <Clipboard.h>
diff --git a/src/apps/mail/Prefs.cpp b/src/apps/mail/Prefs.cpp
index 45b32cd151..66bedbf28a 100644
--- a/src/apps/mail/Prefs.cpp
+++ b/src/apps/mail/Prefs.cpp
@@ -37,7 +37,7 @@ of their respective holders. All rights reserved.
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Application.h>
 #include <CharacterSet.h>
diff --git a/src/apps/mail/Signature.cpp b/src/apps/mail/Signature.cpp
index dc8bcf949e..4463125585 100644
--- a/src/apps/mail/Signature.cpp
+++ b/src/apps/mail/Signature.cpp
@@ -36,7 +36,7 @@ of their respective holders. All rights reserved.
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Clipboard.h>
 #include <InterfaceKit.h>
diff --git a/src/apps/mediaplayer/playlist/Playlist.cpp b/src/apps/mediaplayer/playlist/Playlist.cpp
index 18e17227c9..6b96fc87ea 100644
--- a/src/apps/mediaplayer/playlist/Playlist.cpp
+++ b/src/apps/mediaplayer/playlist/Playlist.cpp
@@ -26,6 +26,7 @@
 #include <debugger.h>
 #include <new>
 #include <stdio.h>
+#include <strings.h>
 
 #include <AppFileInfo.h>
 #include <Application.h>
diff --git a/src/apps/networkstatus/NetworkStatusView.cpp b/src/apps/networkstatus/NetworkStatusView.cpp
index 0ac56dc410..0bd8c2b46b 100644
--- a/src/apps/networkstatus/NetworkStatusView.cpp
+++ b/src/apps/networkstatus/NetworkStatusView.cpp
@@ -18,7 +18,7 @@
 #include <net/if.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <unistd.h>
diff --git a/src/apps/poorman/libhttpd/libhttpd.c b/src/apps/poorman/libhttpd/libhttpd.c
index f57f65f0b0..766b2ce0b1 100644
--- a/src/apps/poorman/libhttpd/libhttpd.c
+++ b/src/apps/poorman/libhttpd/libhttpd.c
@@ -50,7 +50,7 @@
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 //#include <syslog.h>
 #include <unistd.h>
 #include <stdarg.h>
diff --git a/src/apps/screenshot/Screenshot.cpp b/src/apps/screenshot/Screenshot.cpp
index f2d57f4f10..88bac5d000 100644
--- a/src/apps/screenshot/Screenshot.cpp
+++ b/src/apps/screenshot/Screenshot.cpp
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <AppDefs.h>
 #include <Bitmap.h>
diff --git a/src/apps/soundrecorder/RecorderWindow.cpp b/src/apps/soundrecorder/RecorderWindow.cpp
index f2fb731f93..7445ff9031 100644
--- a/src/apps/soundrecorder/RecorderWindow.cpp
+++ b/src/apps/soundrecorder/RecorderWindow.cpp
@@ -32,7 +32,7 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include <unistd.h>
diff --git a/src/apps/terminal/Colors.cpp b/src/apps/terminal/Colors.cpp
index 669d6b40c7..50ac11df02 100644
--- a/src/apps/terminal/Colors.cpp
+++ b/src/apps/terminal/Colors.cpp
@@ -12,6 +12,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <strings.h>
 
 #include <Application.h>
 #include <Catalog.h>
diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index cb662b60a7..481d463818 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -18,7 +18,7 @@
 #include <new>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <time.h>
 
 #include <Alert.h>
diff --git a/src/bin/addattr/addAttr.cpp b/src/bin/addattr/addAttr.cpp
index a40441349f..b4ff76516d 100644
--- a/src/bin/addattr/addAttr.cpp
+++ b/src/bin/addattr/addAttr.cpp
@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 
diff --git a/src/bin/debug/strace/strace.cpp b/src/bin/debug/strace/strace.cpp
index a232a9c101..7d53b3e850 100644
--- a/src/bin/debug/strace/strace.cpp
+++ b/src/bin/debug/strace/strace.cpp
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <errno.h>
 #include <signal.h>
 
diff --git a/src/bin/ffm.cpp b/src/bin/ffm.cpp
index fd688d5948..35868be3af 100644
--- a/src/bin/ffm.cpp
+++ b/src/bin/ffm.cpp
@@ -3,11 +3,15 @@
  * (c) 2002, Carlos Hasan, for OpenBeOS.
  */
 
-#include <string.h>
-#include <app/Application.h>
-#include <interface/InterfaceDefs.h>
 
-int main(int argc, char *argv[])
+#include <strings.h>
+
+#include <Application.h>
+#include <InterfaceDefs.h>
+
+
+int
+main(int argc, char *argv[])
 {
 	BApplication app("application/x-vnd.Haiku-ffm");
 	bool follow;
@@ -17,8 +21,7 @@ int main(int argc, char *argv[])
 			follow = true;
 		else
 			follow = false;
-	}
-	else {
+	} else {
 		follow = true;
 	}
 
diff --git a/src/bin/fwcontrol/fwcrom.c b/src/bin/fwcontrol/fwcrom.c
index 772c71d6bd..70bac5c521 100644
--- a/src/bin/fwcontrol/fwcrom.c
+++ b/src/bin/fwcontrol/fwcrom.c
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD: src/sys/dev/firewire/fwcrom.c,v 1.14 2006/02/04 21:37:39 imp
 #include <KernelExport.h>
 #include <ByteOrder.h>
 #include <string.h>
+#include <strings.h>
 #include "fwglue.h"
 #endif
 #else
diff --git a/src/bin/hey.cpp b/src/bin/hey.cpp
index df6030feb9..a086c5db18 100644
--- a/src/bin/hey.cpp
+++ b/src/bin/hey.cpp
@@ -104,6 +104,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <AppKit.h>
 #include <Path.h>
 #include <SupportDefs.h>
diff --git a/src/bin/logger.cpp b/src/bin/logger.cpp
index 1cbeb3a6d6..1898b8266e 100644
--- a/src/bin/logger.cpp
+++ b/src/bin/logger.cpp
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <syslog.h>
 #include <unistd.h>
 
diff --git a/src/bin/mail_utils/spamdbm.cpp b/src/bin/mail_utils/spamdbm.cpp
index f483d06ca0..d89cd2885f 100644
--- a/src/bin/mail_utils/spamdbm.cpp
+++ b/src/bin/mail_utils/spamdbm.cpp
@@ -467,9 +467,10 @@
 
 /* Standard C Library. */
 
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
+#include <strings.h>
 
 /* Standard C++ library. */
 
diff --git a/src/bin/mkdos/mkdos.cpp b/src/bin/mkdos/mkdos.cpp
index b6e391053c..bd653521f7 100644
--- a/src/bin/mkdos/mkdos.cpp
+++ b/src/bin/mkdos/mkdos.cpp
@@ -33,6 +33,7 @@ THE SOFTWARE.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include "fat.h"
 
diff --git a/src/bin/modifiers.cpp b/src/bin/modifiers.cpp
index fad53c5cba..a9bd96498c 100644
--- a/src/bin/modifiers.cpp
+++ b/src/bin/modifiers.cpp
@@ -8,6 +8,7 @@
 
 #include <OS.h>
 #include <stdio.h>
+#include <string.h>
 #include <strings.h>
 #include <InterfaceDefs.h>
 
diff --git a/src/bin/open.cpp b/src/bin/open.cpp
index 252fb65355..916e80692b 100644
--- a/src/bin/open.cpp
+++ b/src/bin/open.cpp
@@ -19,7 +19,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Entry.h>
 #include <List.h>
diff --git a/src/bin/screenmode/screenmode.cpp b/src/bin/screenmode/screenmode.cpp
index c25e128354..8ff1dec630 100644
--- a/src/bin/screenmode/screenmode.cpp
+++ b/src/bin/screenmode/screenmode.cpp
@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include <Alert.h>
 #include <Application.h>
diff --git a/src/bin/setmime.cpp b/src/bin/setmime.cpp
index 763c2680ab..37029e24d1 100644
--- a/src/bin/setmime.cpp
+++ b/src/bin/setmime.cpp
@@ -12,7 +12,7 @@
 #include <sstream>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <vector>
 
 #include <Application.h>
diff --git a/src/bin/translate.cpp b/src/bin/translate.cpp
index 48de3954ad..c0ba867983 100644
--- a/src/bin/translate.cpp
+++ b/src/bin/translate.cpp
@@ -17,10 +17,10 @@
 #include <Mime.h>
 #include <NodeInfo.h>
 
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
+#include <strings.h>
 
 
 extern const char *__progname;
diff --git a/src/kits/app/Application.cpp b/src/kits/app/Application.cpp
index 0e6a20abff..a0a8a1267b 100644
--- a/src/kits/app/Application.cpp
+++ b/src/kits/app/Application.cpp
@@ -16,6 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 #include <Alert.h>
diff --git a/src/kits/app/Messenger.cpp b/src/kits/app/Messenger.cpp
index 11975b85ce..9d787eed42 100644
--- a/src/kits/app/Messenger.cpp
+++ b/src/kits/app/Messenger.cpp
@@ -25,7 +25,7 @@
 
 #include <new>
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 
 // debugging
diff --git a/src/kits/app/Roster.cpp b/src/kits/app/Roster.cpp
index 749e9653e5..c3b12970ef 100644
--- a/src/kits/app/Roster.cpp
+++ b/src/kits/app/Roster.cpp
@@ -14,7 +14,7 @@
 #include <new>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 #include <AppFileInfo.h>
diff --git a/src/kits/mail/MailComponent.cpp b/src/kits/mail/MailComponent.cpp
index bcc7436ebe..2cc06244ee 100644
--- a/src/kits/mail/MailComponent.cpp
+++ b/src/kits/mail/MailComponent.cpp
@@ -9,6 +9,7 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <strings.h>
 
 class _EXPORT BMailComponent;
 class _EXPORT BTextMailComponent;
diff --git a/src/kits/mail/MailContainer.cpp b/src/kits/mail/MailContainer.cpp
index 97f07ebadb..bc8e2326c2 100644
--- a/src/kits/mail/MailContainer.cpp
+++ b/src/kits/mail/MailContainer.cpp
@@ -9,7 +9,7 @@
 #include <Mime.h>
 
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 class _EXPORT BMIMEMultipartMailContainer;
diff --git a/src/kits/mail/MailMessage.cpp b/src/kits/mail/MailMessage.cpp
index abf7de28b1..310170bb1d 100644
--- a/src/kits/mail/MailMessage.cpp
+++ b/src/kits/mail/MailMessage.cpp
@@ -20,12 +20,12 @@
 #include <Messenger.h>
 #include <Path.h>
 
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/utsname.h>
 #include <ctype.h>
 #include <parsedate.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <strings.h>
+#include <sys/utsname.h>
 
 #include <MailMessage.h>
 #include <MailAttachment.h>
diff --git a/src/kits/mail/b_mail_message.cpp b/src/kits/mail/b_mail_message.cpp
index 89a579330e..42a40b70ec 100644
--- a/src/kits/mail/b_mail_message.cpp
+++ b/src/kits/mail/b_mail_message.cpp
@@ -15,6 +15,7 @@ class _EXPORT BMailMessage;
 #include <MailMessage.h>
 
 #include <stdio.h>
+#include <strings.h>
 
 struct CharsetConversionEntry
 {
diff --git a/src/kits/mail/mail_encoding.cpp b/src/kits/mail/mail_encoding.cpp
index e0a99104a7..c542582c3a 100644
--- a/src/kits/mail/mail_encoding.cpp
+++ b/src/kits/mail/mail_encoding.cpp
@@ -6,6 +6,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <strings.h>
 
 #include <SupportDefs.h>
 
diff --git a/src/kits/mail/mail_util.cpp b/src/kits/mail/mail_util.cpp
index e7ea0a6cd6..05bb4e7efe 100644
--- a/src/kits/mail/mail_util.cpp
+++ b/src/kits/mail/mail_util.cpp
@@ -7,7 +7,7 @@
 #include <mail_util.h>
 
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <stdio.h>
 #define __USE_GNU
 #include <regex.h>
diff --git a/src/kits/network/libbind/port_after.h b/src/kits/network/libbind/port_after.h
index 5e3d5adcba..3b1325f32d 100644
--- a/src/kits/network/libbind/port_after.h
+++ b/src/kits/network/libbind/port_after.h
@@ -20,6 +20,11 @@
 #ifndef port_after_h
 #define port_after_h
 
+#ifdef __HAIKU__
+	#ifdef _STRING_H_
+		#include <strings.h>
+	#endif
+#endif
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/socket.h>
diff --git a/src/kits/shared/DriverSettingsMessageAdapter.cpp b/src/kits/shared/DriverSettingsMessageAdapter.cpp
index 93ae04c693..08b8d91d70 100644
--- a/src/kits/shared/DriverSettingsMessageAdapter.cpp
+++ b/src/kits/shared/DriverSettingsMessageAdapter.cpp
@@ -12,6 +12,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <strings.h>
 
 #include <File.h>
 #include <String.h>
diff --git a/src/kits/shared/ExpressionParser.cpp b/src/kits/shared/ExpressionParser.cpp
index 382d919e80..ced2170fa0 100644
--- a/src/kits/shared/ExpressionParser.cpp
+++ b/src/kits/shared/ExpressionParser.cpp
@@ -14,7 +14,7 @@
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <m_apm.h>
 
diff --git a/src/kits/shared/NaturalCompare.cpp b/src/kits/shared/NaturalCompare.cpp
index 1d322cc40d..9b2256fc40 100644
--- a/src/kits/shared/NaturalCompare.cpp
+++ b/src/kits/shared/NaturalCompare.cpp
@@ -11,6 +11,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <strings.h>
 
 #include <StorageDefs.h>
 #include <SupportDefs.h>
diff --git a/src/kits/storage/AddOnMonitorHandler.cpp b/src/kits/storage/AddOnMonitorHandler.cpp
index 377113596e..473ccc32a2 100644
--- a/src/kits/storage/AddOnMonitorHandler.cpp
+++ b/src/kits/storage/AddOnMonitorHandler.cpp
@@ -12,6 +12,7 @@
 #include "AddOnMonitorHandler.h"
 
 #include <string.h>
+#include <strings.h>
 
 #include <Autolock.h>
 #include <Directory.h>
diff --git a/src/kits/storage/MimeType.cpp b/src/kits/storage/MimeType.cpp
index cf6b6e66cf..d03b4d06b2 100644
--- a/src/kits/storage/MimeType.cpp
+++ b/src/kits/storage/MimeType.cpp
@@ -23,7 +23,7 @@
 #include <ctype.h>
 #include <new>
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 
 using namespace BPrivate;
diff --git a/src/kits/support/String.cpp b/src/kits/support/String.cpp
index 38a5747248..5b4ac343b6 100644
--- a/src/kits/support/String.cpp
+++ b/src/kits/support/String.cpp
@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <strings.h>
 
 #include <Debug.h>
 #include <StringList.h>
diff --git a/src/kits/textencoding/CharacterSetRoster.cpp b/src/kits/textencoding/CharacterSetRoster.cpp
index 60169ab7d8..7c5f044477 100644
--- a/src/kits/textencoding/CharacterSetRoster.cpp
+++ b/src/kits/textencoding/CharacterSetRoster.cpp
@@ -1,4 +1,5 @@
 #include <string.h>
+#include <strings.h>
 #include <CharacterSet.h>
 #include <CharacterSetRoster.h>
 #include "character_sets.h"
diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index 235641d176..ec6b5f4bb0 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -59,7 +59,7 @@ All rights reserved.
 
 #include <fs_attr.h>
 #include <image.h>
-#include <string.h>
+#include <strings.h>
 #include <stdlib.h>
 
 #include <algorithm>
diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp
index f0cdbf4b3a..5bde0fbcde 100644
--- a/src/kits/tracker/FSUtils.cpp
+++ b/src/kits/tracker/FSUtils.cpp
@@ -47,7 +47,7 @@ respective holders. All rights reserved.
 
 #include <ctype.h>
 #include <errno.h>
-#include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 #include <Alert.h>
diff --git a/src/kits/tracker/FindPanel.cpp b/src/kits/tracker/FindPanel.cpp
index bdd233c1c4..42728f78de 100644
--- a/src/kits/tracker/FindPanel.cpp
+++ b/src/kits/tracker/FindPanel.cpp
@@ -69,7 +69,7 @@ All rights reserved.
 #include <fs_attr.h>
 #include <parsedate.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <utility>
 
 #include "Attributes.h"
diff --git a/src/kits/tracker/MimeTypeList.cpp b/src/kits/tracker/MimeTypeList.cpp
index 5c2f60d089..c8c28083b3 100644
--- a/src/kits/tracker/MimeTypeList.cpp
+++ b/src/kits/tracker/MimeTypeList.cpp
@@ -34,6 +34,8 @@ All rights reserved.
 
 #include <Mime.h>
 
+#include <strings.h>
+
 #include "AutoLock.h"
 #include "MimeTypeList.h"
 #include "Thread.h"
diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp
index 67112130ea..b4f5a6010e 100644
--- a/src/kits/tracker/Model.cpp
+++ b/src/kits/tracker/Model.cpp
@@ -42,7 +42,7 @@ All rights reserved.
 #include "Model.h"
 
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <fs_info.h>
 #include <fs_attr.h>
diff --git a/src/kits/tracker/NavMenu.cpp b/src/kits/tracker/NavMenu.cpp
index 3bf231c900..70d4ab755a 100644
--- a/src/kits/tracker/NavMenu.cpp
+++ b/src/kits/tracker/NavMenu.cpp
@@ -35,8 +35,8 @@ their respective holders. All rights reserved.
 //	NavMenu is a hierarchical menu of volumes, folders, files and queries
 //	displays icons, uses the SlowMenu API for full interruptability
 
-#include <string.h>
 #include <stdlib.h>
+#include <strings.h>
 
 #include "NavMenu.h"
 
diff --git a/src/kits/tracker/OpenWithWindow.cpp b/src/kits/tracker/OpenWithWindow.cpp
index 615a6e926b..4a41722195 100644
--- a/src/kits/tracker/OpenWithWindow.cpp
+++ b/src/kits/tracker/OpenWithWindow.cpp
@@ -55,7 +55,7 @@ All rights reserved.
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 
 const char* kDefaultOpenWithTemplate = "OpenWithSettings";
diff --git a/src/kits/tracker/PoseView.cpp b/src/kits/tracker/PoseView.cpp
index 5920fee2eb..b9fcc5e140 100644
--- a/src/kits/tracker/PoseView.cpp
+++ b/src/kits/tracker/PoseView.cpp
@@ -43,7 +43,7 @@ All rights reserved.
 #include <float.h>
 #include <map>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <compat/sys/stat.h>
 
diff --git a/src/kits/tracker/Tracker.cpp b/src/kits/tracker/Tracker.cpp
index ef650dd320..f125178126 100644
--- a/src/kits/tracker/Tracker.cpp
+++ b/src/kits/tracker/Tracker.cpp
@@ -39,7 +39,7 @@ All rights reserved.
 #include <fs_info.h>
 #include <image.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <sys/resource.h>
 #include <unistd.h>
 
diff --git a/src/kits/tracker/TrackerString.cpp b/src/kits/tracker/TrackerString.cpp
index 2b80acb27b..dfa5e89437 100644
--- a/src/kits/tracker/TrackerString.cpp
+++ b/src/kits/tracker/TrackerString.cpp
@@ -36,6 +36,7 @@ All rights reserved.
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <strings.h>
 
 
 //	#pragma mark - TrackerString
diff --git a/src/kits/tracker/WidgetAttributeText.cpp b/src/kits/tracker/WidgetAttributeText.cpp
index eb90ca9c05..e2db289364 100644
--- a/src/kits/tracker/WidgetAttributeText.cpp
+++ b/src/kits/tracker/WidgetAttributeText.cpp
@@ -37,7 +37,7 @@ All rights reserved.
 
 #include <ctype.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <fs_attr.h>
 #include <parsedate.h>
diff --git a/src/kits/translation/TranslationUtils.cpp b/src/kits/translation/TranslationUtils.cpp
index 129a28dd95..b8dc27438e 100644
--- a/src/kits/translation/TranslationUtils.cpp
+++ b/src/kits/translation/TranslationUtils.cpp
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 
 using namespace BPrivate;
diff --git a/src/kits/translation/TranslatorRoster.cpp b/src/kits/translation/TranslatorRoster.cpp
index 783d32b6bb..a0b54af4af 100644
--- a/src/kits/translation/TranslatorRoster.cpp
+++ b/src/kits/translation/TranslatorRoster.cpp
@@ -16,7 +16,7 @@
 #include <TranslatorRoster.h>
 
 #include <new>
-#include <string.h>
+#include <strings.h>
 #include <stdio.h>
 #include <stdlib.h>
 
diff --git a/src/libs/compat/freebsd_network/compat/sys/kernel.h b/src/libs/compat/freebsd_network/compat/sys/kernel.h
index 615b9f760d..0124a6892b 100644
--- a/src/libs/compat/freebsd_network/compat/sys/kernel.h
+++ b/src/libs/compat/freebsd_network/compat/sys/kernel.h
@@ -7,7 +7,6 @@
 
 
 #include <stddef.h>
-#include <string.h>
 
 #include <sys/haiku-module.h>
 
diff --git a/src/libs/compat/freebsd_network/compat/sys/systm.h b/src/libs/compat/freebsd_network/compat/sys/systm.h
index a09ee05428..42c2a795bb 100644
--- a/src/libs/compat/freebsd_network/compat/sys/systm.h
+++ b/src/libs/compat/freebsd_network/compat/sys/systm.h
@@ -10,6 +10,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 
 #include <machine/atomic.h>
 #include <machine/cpufunc.h>
diff --git a/src/preferences/filetypes/ApplicationTypeWindow.cpp b/src/preferences/filetypes/ApplicationTypeWindow.cpp
index df1e7a48e2..f4e1c8f8aa 100644
--- a/src/preferences/filetypes/ApplicationTypeWindow.cpp
+++ b/src/preferences/filetypes/ApplicationTypeWindow.cpp
@@ -39,7 +39,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 
 #undef B_TRANSLATION_CONTEXT
diff --git a/src/preferences/filetypes/ApplicationTypesWindow.cpp b/src/preferences/filetypes/ApplicationTypesWindow.cpp
index b485d0f2bc..cc56ab5b73 100644
--- a/src/preferences/filetypes/ApplicationTypesWindow.cpp
+++ b/src/preferences/filetypes/ApplicationTypesWindow.cpp
@@ -36,6 +36,7 @@
 #include <VolumeRoster.h>
 
 #include <stdio.h>
+#include <strings.h>
 
 
 // TODO: think about adopting Tracker's info window style here (pressable path)
diff --git a/src/preferences/filetypes/AttributeWindow.cpp b/src/preferences/filetypes/AttributeWindow.cpp
index ad77bab679..693d79e309 100644
--- a/src/preferences/filetypes/AttributeWindow.cpp
+++ b/src/preferences/filetypes/AttributeWindow.cpp
@@ -26,7 +26,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 
 #undef B_TRANSLATION_CONTEXT
diff --git a/src/preferences/filetypes/ExtensionWindow.cpp b/src/preferences/filetypes/ExtensionWindow.cpp
index 7b036a26e6..0abd8e7d50 100644
--- a/src/preferences/filetypes/ExtensionWindow.cpp
+++ b/src/preferences/filetypes/ExtensionWindow.cpp
@@ -20,7 +20,7 @@
 #include <String.h>
 #include <TextControl.h>
 
-#include <string.h>
+#include <strings.h>
 
 
 #undef B_TRANSLATION_CONTEXT
diff --git a/src/preferences/filetypes/FileTypes.cpp b/src/preferences/filetypes/FileTypes.cpp
index de5e722b22..a5192b47f6 100644
--- a/src/preferences/filetypes/FileTypes.cpp
+++ b/src/preferences/filetypes/FileTypes.cpp
@@ -24,7 +24,7 @@
 #include <Resources.h>
 
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 
 #undef B_TRANSLATION_CONTEXT
diff --git a/src/preferences/filetypes/FileTypesWindow.cpp b/src/preferences/filetypes/FileTypesWindow.cpp
index ad9748b93d..a429f3c327 100644
--- a/src/preferences/filetypes/FileTypesWindow.cpp
+++ b/src/preferences/filetypes/FileTypesWindow.cpp
@@ -44,6 +44,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <strings.h>
 
 
 #undef B_TRANSLATION_CONTEXT
diff --git a/src/preferences/filetypes/IconView.cpp b/src/preferences/filetypes/IconView.cpp
index 577529fff5..b95781c040 100644
--- a/src/preferences/filetypes/IconView.cpp
+++ b/src/preferences/filetypes/IconView.cpp
@@ -8,7 +8,7 @@
 
 #include <new>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Application.h>
 #include <AppFileInfo.h>
diff --git a/src/preferences/filetypes/MimeTypeListView.cpp b/src/preferences/filetypes/MimeTypeListView.cpp
index 055c86f3f8..4cd5fca50c 100644
--- a/src/preferences/filetypes/MimeTypeListView.cpp
+++ b/src/preferences/filetypes/MimeTypeListView.cpp
@@ -10,6 +10,8 @@
 #include <Bitmap.h>
 #include <MessageRunner.h>
 
+#include <strings.h>
+
 
 // TODO: lazy type collecting (super types only at startup)
 
diff --git a/src/preferences/filetypes/PreferredAppMenu.cpp b/src/preferences/filetypes/PreferredAppMenu.cpp
index 2ff8154520..4882821b23 100644
--- a/src/preferences/filetypes/PreferredAppMenu.cpp
+++ b/src/preferences/filetypes/PreferredAppMenu.cpp
@@ -18,7 +18,7 @@
 #include <String.h>
 
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 
 #undef B_TRANSLATION_CONTEXT
diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp
index 5247ba7b1b..76e317d826 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -19,7 +19,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <Alert.h>
 #include <Application.h>
diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp
index 748f696277..df5d84c09e 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -13,6 +13,7 @@
 #include "ScreenSaverWindow.h"
 
 #include <stdio.h>
+#include <strings.h>
 
 #include <Alignment.h>
 #include <Application.h>
diff --git a/src/servers/app/ScreenConfigurations.cpp b/src/servers/app/ScreenConfigurations.cpp
index 6e6d732c5a..643bb169e9 100644
--- a/src/servers/app/ScreenConfigurations.cpp
+++ b/src/servers/app/ScreenConfigurations.cpp
@@ -8,6 +8,7 @@
 
 #include <new>
 #include <string.h>
+#include <strings.h>
 
 #include <Message.h>
 
diff --git a/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp b/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
index 70cb130979..ea322aac10 100644
--- a/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
+++ b/src/servers/app/drawing/interface/local/AccelerantHWInterface.cpp
@@ -26,7 +26,7 @@
 #include <safemode_defs.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <sys/ioctl.h>
 #include <syscalls.h>
 #include <syslog.h>
diff --git a/src/servers/debug/DebugServer.cpp b/src/servers/debug/DebugServer.cpp
index 8c338236d7..ef4c10cf50 100644
--- a/src/servers/debug/DebugServer.cpp
+++ b/src/servers/debug/DebugServer.cpp
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 #include <Alert.h>
diff --git a/src/servers/input/InputServer.cpp b/src/servers/input/InputServer.cpp
index 40ca36debe..c81832a4ee 100644
--- a/src/servers/input/InputServer.cpp
+++ b/src/servers/input/InputServer.cpp
@@ -32,6 +32,7 @@
 #include <String.h>
 
 #include <stdio.h>
+#include <strings.h>
 
 #include "SystemKeymap.h"
 	// this is an automatically generated file
diff --git a/src/servers/net/NetServer.cpp b/src/servers/net/NetServer.cpp
index 772cc347e9..f12ee8df00 100644
--- a/src/servers/net/NetServer.cpp
+++ b/src/servers/net/NetServer.cpp
@@ -16,7 +16,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string>
-#include <string.h>
+#include <strings.h>
 #include <syslog.h>
 #include <unistd.h>
 
diff --git a/src/servers/net/Services.cpp b/src/servers/net/Services.cpp
index 95ea5bd1e5..1ccc956b43 100644
--- a/src/servers/net/Services.cpp
+++ b/src/servers/net/Services.cpp
@@ -19,7 +19,7 @@
 #include <netinet/in.h>
 #include <new>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <vector>
diff --git a/src/servers/registrar/AppInfoList.cpp b/src/servers/registrar/AppInfoList.cpp
index 6bb17f3288..ae07b285de 100644
--- a/src/servers/registrar/AppInfoList.cpp
+++ b/src/servers/registrar/AppInfoList.cpp
@@ -26,7 +26,7 @@
 
 #include <algorithm>
 
-#include <string.h>
+#include <strings.h>
 
 #include "AppInfoList.h"
 #include "RosterAppInfo.h"
diff --git a/src/servers/registrar/RecentApps.cpp b/src/servers/registrar/RecentApps.cpp
index 499e50f373..8b949d6e2e 100644
--- a/src/servers/registrar/RecentApps.cpp
+++ b/src/servers/registrar/RecentApps.cpp
@@ -24,7 +24,7 @@
 #include <Roster.h>
 #include <storage_support.h>
 
-#include <string.h>
+#include <strings.h>
 
 #include "Debug.h"
 
diff --git a/src/servers/registrar/RecentEntries.cpp b/src/servers/registrar/RecentEntries.cpp
index 3479681877..06ac2fd1ec 100644
--- a/src/servers/registrar/RecentEntries.cpp
+++ b/src/servers/registrar/RecentEntries.cpp
@@ -17,6 +17,8 @@
 #include <new>
 #include <map>
 
+#include <strings.h>
+
 #include <AppFileInfo.h>
 #include <Entry.h>
 #include <File.h>
diff --git a/src/servers/registrar/TRoster.cpp b/src/servers/registrar/TRoster.cpp
index dcbf13c547..6ec58e3b9c 100644
--- a/src/servers/registrar/TRoster.cpp
+++ b/src/servers/registrar/TRoster.cpp
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 
 #include <Application.h>
 #include <AutoDeleter.h>
diff --git a/src/system/boot/loader/file_systems/fat/Directory.cpp b/src/system/boot/loader/file_systems/fat/Directory.cpp
index 77eaf27f3f..87a8f3f2af 100644
--- a/src/system/boot/loader/file_systems/fat/Directory.cpp
+++ b/src/system/boot/loader/file_systems/fat/Directory.cpp
@@ -10,6 +10,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 #include <new>
diff --git a/src/system/boot/loader/menu.cpp b/src/system/boot/loader/menu.cpp
index 9e2ce912dd..a972d3caf9 100644
--- a/src/system/boot/loader/menu.cpp
+++ b/src/system/boot/loader/menu.cpp
@@ -9,7 +9,7 @@
 #include "menu.h"
 
 #include <errno.h>
-#include <string.h>
+#include <strings.h>
 
 #include <algorithm>
 
diff --git a/src/system/kernel/debug/debug_builtin_commands.cpp b/src/system/kernel/debug/debug_builtin_commands.cpp
index 3648e9794f..59e5e01cd2 100644
--- a/src/system/kernel/debug/debug_builtin_commands.cpp
+++ b/src/system/kernel/debug/debug_builtin_commands.cpp
@@ -11,6 +11,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <strings.h>
 
 #include <debug.h>
 #include <kernel.h>
diff --git a/src/system/kernel/debug/safemode_settings.cpp b/src/system/kernel/debug/safemode_settings.cpp
index 61334aee7b..c0a6ca6ebd 100644
--- a/src/system/kernel/debug/safemode_settings.cpp
+++ b/src/system/kernel/debug/safemode_settings.cpp
@@ -8,6 +8,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <strings.h>
 
 #include <algorithm>
 
diff --git a/src/system/kernel/fs/vfs_boot.cpp b/src/system/kernel/fs/vfs_boot.cpp
index 5c9d95e8b1..f4f1102cd7 100644
--- a/src/system/kernel/fs/vfs_boot.cpp
+++ b/src/system/kernel/fs/vfs_boot.cpp
@@ -11,6 +11,7 @@
 #include "vfs_boot.h"
 
 #include <stdio.h>
+#include <strings.h>
 
 #include <fs_info.h>
 #include <OS.h>
diff --git a/src/system/libroot/add-ons/icu/ICUCollateData.cpp b/src/system/libroot/add-ons/icu/ICUCollateData.cpp
index d2ab5d55d0..d300b4551a 100644
--- a/src/system/libroot/add-ons/icu/ICUCollateData.cpp
+++ b/src/system/libroot/add-ons/icu/ICUCollateData.cpp
@@ -7,6 +7,7 @@
 #include "ICUCollateData.h"
 
 #include <string.h>
+#include <strings.h>
 #include <wchar.h>
 
 #include <unicode/unistr.h>
diff --git a/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp b/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp
index cc3f2cf5f1..21538c6d10 100644
--- a/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp
+++ b/src/system/libroot/add-ons/icu/ICULocaleBackend.cpp
@@ -11,6 +11,7 @@
 #include <langinfo.h>
 #include <locale.h>
 #include <string.h>
+#include <strings.h>
 
 #include <ErrnoMaintainer.h>
 
diff --git a/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp b/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp
index 60c2e3d490..03d7634dd5 100644
--- a/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp
+++ b/src/system/libroot/add-ons/icu/ICUMonetaryData.cpp
@@ -8,6 +8,7 @@
 
 #include <langinfo.h>
 #include <limits.h>
+#include <string.h>
 #include <strings.h>
 
 
diff --git a/src/system/libroot/add-ons/icu/ICUNumericData.cpp b/src/system/libroot/add-ons/icu/ICUNumericData.cpp
index 89ca7653ae..f0e12ee43d 100644
--- a/src/system/libroot/add-ons/icu/ICUNumericData.cpp
+++ b/src/system/libroot/add-ons/icu/ICUNumericData.cpp
@@ -8,6 +8,7 @@
 
 #include <langinfo.h>
 #include <locale.h>
+#include <string.h>
 #include <strings.h>
 
 
diff --git a/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp b/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
index 9307caaf76..461a0f1a63 100644
--- a/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
+++ b/src/system/libroot/add-ons/icu/ICUTimeConversion.cpp
@@ -7,6 +7,7 @@
 #include "ICUTimeConversion.h"
 
 #include <math.h>
+#include <string.h>
 #include <strings.h>
 
 #include <unicode/gregocal.h>
diff --git a/src/system/libroot/add-ons/icu/ICUTimeData.cpp b/src/system/libroot/add-ons/icu/ICUTimeData.cpp
index c1a28dc8b2..a0bfcfdbf1 100644
--- a/src/system/libroot/add-ons/icu/ICUTimeData.cpp
+++ b/src/system/libroot/add-ons/icu/ICUTimeData.cpp
@@ -7,6 +7,7 @@
 #include "ICUTimeData.h"
 
 #include <langinfo.h>
+#include <string.h>
 #include <strings.h>
 
 #include <unicode/dtfmtsym.h>
diff --git a/src/system/libroot/os/driver_settings.cpp b/src/system/libroot/os/driver_settings.cpp
index b126996b42..029e85096a 100644
--- a/src/system/libroot/os/driver_settings.cpp
+++ b/src/system/libroot/os/driver_settings.cpp
@@ -51,6 +51,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <ctype.h>
diff --git a/src/system/libroot/os/parsedate.cpp b/src/system/libroot/os/parsedate.cpp
index ef3c8703ff..c5c24c68db 100644
--- a/src/system/libroot/os/parsedate.cpp
+++ b/src/system/libroot/os/parsedate.cpp
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include <OS.h>
 
diff --git a/src/system/libroot/posix/locale/setlocale.cpp b/src/system/libroot/posix/locale/setlocale.cpp
index f4f63661b5..7977780316 100644
--- a/src/system/libroot/posix/locale/setlocale.cpp
+++ b/src/system/libroot/posix/locale/setlocale.cpp
@@ -8,7 +8,7 @@
 #include <ctype.h>
 #include <locale.h>
 #include <stdlib.h>
-#include <string.h>
+#include <strings.h>
 
 #include <ErrnoMaintainer.h>
 
diff --git a/src/system/libroot/posix/string/strcasecmp.c b/src/system/libroot/posix/string/strcasecmp.c
index d54cf79b57..a44545ae9f 100644
--- a/src/system/libroot/posix/string/strcasecmp.c
+++ b/src/system/libroot/posix/string/strcasecmp.c
@@ -32,8 +32,8 @@
  */
 
 
-#include <string.h>
 #include <ctype.h>
+#include <strings.h>
 
 
 int
diff --git a/src/system/libroot/posix/string/strcasestr.c b/src/system/libroot/posix/string/strcasestr.c
index d6a5710f09..d979e875e5 100644
--- a/src/system/libroot/posix/string/strcasestr.c
+++ b/src/system/libroot/posix/string/strcasestr.c
@@ -36,6 +36,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <strings.h>
 
 
 /*
diff --git a/src/system/libroot/posix/string/strchr.c b/src/system/libroot/posix/string/strchr.c
index ff60195566..1592886980 100644
--- a/src/system/libroot/posix/string/strchr.c
+++ b/src/system/libroot/posix/string/strchr.c
@@ -4,8 +4,9 @@
  */
 
 
-#include <sys/types.h>
 #include <string.h>
+#include <strings.h>
+#include <sys/types.h>
 
 
 char*
diff --git a/src/system/libroot/posix/string/strrchr.c b/src/system/libroot/posix/string/strrchr.c
index c975b3a6c0..0bb3195170 100644
--- a/src/system/libroot/posix/string/strrchr.c
+++ b/src/system/libroot/posix/string/strrchr.c
@@ -3,8 +3,10 @@
  * Distributed under the terms of the NewOS License.
  */
 
-#include <sys/types.h>
+
 #include <string.h>
+#include <strings.h>
+#include <sys/types.h>
 
 
 char *
diff --git a/src/system/libroot/posix/wchar/wcwidth.c b/src/system/libroot/posix/wchar/wcwidth.c
index 3e8bd8c1a6..83487446e6 100644
--- a/src/system/libroot/posix/wchar/wcwidth.c
+++ b/src/system/libroot/posix/wchar/wcwidth.c
@@ -16,7 +16,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <locale.h>
-#include <string.h>
+#include <strings.h>
 #include <wchar.h>