include strings.h where appriopriate...

instead or additionally to string.h, in preparation for functions move.
* moves str[n]casecmp() functions and others to strings.h.
* strings.h doesn't include string.h anymore.
* this solves #10949

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

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_ */

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)

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>
 

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>
 
 

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>

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>
 

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>
 

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>
 

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)

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 {

src/add-ons/print/transports/ipp/HttpURLConnection.cpp

@@ -4,6 +4,7 @@
 #include <list>
 #include <algorithm>
 #include <cstring>
+#include <strings.h>
 
 #define stricmp	strcasecmp
 

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>

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"

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)
 {

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

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"
 

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>

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>

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>

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>

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>

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>

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>

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>
 

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>

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>

src/apps/installer/WorkerThread.cpp

@@ -11,6 +11,7 @@
 
 #include <set>
 #include <string>
+#include <strings.h>
 
 #include <Alert.h>
 #include <Autolock.h>

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>

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>
 
 

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 <strings.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include <sys/stat.h>
 #include <sys/utsname.h>
+#include <unistd.h>
 
 #include <Autolock.h>
 #include <Clipboard.h>

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>

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>

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>

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>

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>

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>

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>

src/apps/terminal/Colors.cpp

@@ -12,6 +12,7 @@
 
 #include <ctype.h>
 #include <stdio.h>
+#include <strings.h>
 
 #include <Application.h>
 #include <Catalog.h>

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>

src/bin/addattr/addAttr.cpp

@@ -17,6 +17,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <unistd.h>
 
 

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>
 

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;
 	}
 

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

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>

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>
 

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. */
 

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"
 

src/bin/modifiers.cpp

@@ -8,6 +8,7 @@
 
 #include <OS.h>
 #include <stdio.h>
+#include <string.h>
 #include <strings.h>
 #include <InterfaceDefs.h>
 

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>

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>

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>

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 <strings.h>
-#include <ctype.h>
 
 
 extern const char *__progname;

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>

src/kits/app/Messenger.cpp

@@ -25,7 +25,7 @@
 
 #include <new>
 #include <stdio.h>
-#include <string.h>
+#include <strings.h>
 
 
 // debugging

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>

src/kits/mail/MailComponent.cpp

@@ -9,6 +9,7 @@
 
 #include <ctype.h>
 #include <stdlib.h>
+#include <strings.h>
 
 class _EXPORT BMailComponent;
 class _EXPORT BTextMailComponent;

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;

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>

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
 {

src/kits/mail/mail_encoding.cpp

@@ -6,6 +6,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <strings.h>
 
 #include <SupportDefs.h>
 

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>

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>

src/kits/shared/DriverSettingsMessageAdapter.cpp

@@ -12,6 +12,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <strings.h>
 
 #include <File.h>
 #include <String.h>

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>
 

src/kits/shared/NaturalCompare.cpp

@@ -11,6 +11,7 @@
 
 #include <ctype.h>
 #include <string.h>
+#include <strings.h>
 
 #include <StorageDefs.h>
 #include <SupportDefs.h>

src/kits/storage/AddOnMonitorHandler.cpp

@@ -12,6 +12,7 @@
 #include "AddOnMonitorHandler.h"
 
 #include <string.h>
+#include <strings.h>
 
 #include <Autolock.h>
 #include <Directory.h>

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;

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>

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"

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>

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>

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"

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"

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>

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"
 

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";

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>
 

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>
 

src/kits/tracker/TrackerString.cpp

@@ -36,6 +36,7 @@ All rights reserved.
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <strings.h>
 
 
 //	#pragma mark - TrackerString

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>

src/kits/translation/TranslationUtils.cpp

@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 
 using namespace BPrivate;

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>
 

src/libs/compat/freebsd_network/compat/sys/kernel.h

@@ -7,7 +7,6 @@
 
 
 #include <stddef.h>
-#include <string.h>
 
 #include <sys/haiku-module.h>
 

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>

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

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)

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

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

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

src/preferences/filetypes/FileTypesWindow.cpp

@@ -44,6 +44,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <strings.h>
 
 
 #undef B_TRANSLATION_CONTEXT

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>

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)
 

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

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>

src/preferences/screensaver/ScreenSaverWindow.cpp

@@ -13,6 +13,7 @@
 #include "ScreenSaverWindow.h"
 
 #include <stdio.h>
+#include <strings.h>
 
 #include <Alignment.h>
 #include <Application.h>

src/servers/app/ScreenConfigurations.cpp

@@ -8,6 +8,7 @@
 
 #include <new>
 #include <string.h>
+#include <strings.h>
 
 #include <Message.h>
 

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>

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>

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