diff --git a/src/kits/app/Looper.cpp b/src/kits/app/Looper.cpp
index ea1baf5e8f..61d0471545 100644
--- a/src/kits/app/Looper.cpp
+++ b/src/kits/app/Looper.cpp
@@ -28,6 +28,7 @@
 
 #include <new>
 #include <stdio.h>
+#include <stdlib.h>
 
 
 // debugging
diff --git a/src/kits/app/LooperList.cpp b/src/kits/app/LooperList.cpp
index 4fc8eedba1..42a0fe9293 100644
--- a/src/kits/app/LooperList.cpp
+++ b/src/kits/app/LooperList.cpp
@@ -15,6 +15,7 @@
 #include <Looper.h>
 
 #include <algorithm>
+#include <string.h>
 
 
 using std::vector;
diff --git a/src/kits/app/MessageAdapter.cpp b/src/kits/app/MessageAdapter.cpp
index bce5957933..23a3efbf0f 100644
--- a/src/kits/app/MessageAdapter.cpp
+++ b/src/kits/app/MessageAdapter.cpp
@@ -10,6 +10,8 @@
 #include <MessagePrivate.h>
 #include <MessageUtils.h>
 
+#include <stdlib.h>
+
 namespace BPrivate {
 
 #define R5_MESSAGE_FLAG_VALID			0x01
diff --git a/src/kits/interface/Bitmap.cpp b/src/kits/interface/Bitmap.cpp
index 3c697af2c7..ad07b6b1d6 100644
--- a/src/kits/interface/Bitmap.cpp
+++ b/src/kits/interface/Bitmap.cpp
@@ -34,6 +34,7 @@
 #include <new>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 
 // get_raw_bytes_per_row
diff --git a/src/kits/interface/GridLayout.cpp b/src/kits/interface/GridLayout.cpp
index b39033c7ae..022a479059 100644
--- a/src/kits/interface/GridLayout.cpp
+++ b/src/kits/interface/GridLayout.cpp
@@ -7,6 +7,7 @@
 
 #include <algorithm>
 #include <new>
+#include <string.h>
 
 #include <LayoutItem.h>
 #include <List.h>
diff --git a/src/kits/interface/PictureDataWriter.cpp b/src/kits/interface/PictureDataWriter.cpp
index b03916a6ae..b273a53ff8 100644
--- a/src/kits/interface/PictureDataWriter.cpp
+++ b/src/kits/interface/PictureDataWriter.cpp
@@ -9,6 +9,7 @@
 #include <PictureDataWriter.h>
 
 #include <stdio.h>
+#include <string.h>
 
 #include <DataIO.h>
 #include <Point.h>
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index d041a07efd..5d68783f02 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -14,6 +14,7 @@
 #include <ctype.h>
 #include <math.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <Application.h>
 #include <Autolock.h>
diff --git a/src/kits/mail/RemoteStorageProtocol.cpp b/src/kits/mail/RemoteStorageProtocol.cpp
index ca3de93cf2..5d3c3918c4 100644
--- a/src/kits/mail/RemoteStorageProtocol.cpp
+++ b/src/kits/mail/RemoteStorageProtocol.cpp
@@ -7,6 +7,7 @@
 #include <File.h>
 
 #include <map>
+#include <stdlib.h>
 
 class _EXPORT BRemoteMailStorageProtocol;
 
diff --git a/src/kits/shared/HashString.cpp b/src/kits/shared/HashString.cpp
index 23b4c87bfa..8598c602f8 100644
--- a/src/kits/shared/HashString.cpp
+++ b/src/kits/shared/HashString.cpp
@@ -2,7 +2,7 @@
  * Copyright 2004-2007, Ingo Weinhold, bonefish@users.sf.net. All rights reserved.
  * Distributed under the terms of the MIT License.
  */
-#include <new.h>
+#include <new>
 #include <string.h>
 
 #include "HashString.h"
@@ -118,7 +118,7 @@ HashString::_SetTo(const char *string, int32 length)
 	bool result = true;
 	Unset();
 	if (string && length > 0) {
-		fString = new(nothrow) char[length + 1];
+		fString = new(std::nothrow) char[length + 1];
 		if (fString) {
 			memcpy(fString, string, length);
 			fString[length] = '\0';
diff --git a/src/kits/storage/AppFileInfo.cpp b/src/kits/storage/AppFileInfo.cpp
index bdea3a3cbe..5977eb078f 100644
--- a/src/kits/storage/AppFileInfo.cpp
+++ b/src/kits/storage/AppFileInfo.cpp
@@ -9,6 +9,7 @@
 
 #include <new>
 #include <set>
+#include <stdlib.h>
 #include <string>
 
 #include <AppFileInfo.h>
diff --git a/src/kits/storage/Entry.cpp b/src/kits/storage/Entry.cpp
index 606765aff7..fbeb741998 100644
--- a/src/kits/storage/Entry.cpp
+++ b/src/kits/storage/Entry.cpp
@@ -24,6 +24,7 @@
 #include <fcntl.h>
 #include <new>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
diff --git a/src/kits/storage/SymLink.cpp b/src/kits/storage/SymLink.cpp
index c708325ade..691a0ed050 100644
--- a/src/kits/storage/SymLink.cpp
+++ b/src/kits/storage/SymLink.cpp
@@ -8,6 +8,7 @@
 */
 
 #include <new>
+#include <string.h>
 
 #include <SymLink.h>
 #include <Directory.h>
diff --git a/src/kits/storage/mime/database_support.cpp b/src/kits/storage/mime/database_support.cpp
index b4caca7727..eea8f47b4c 100644
--- a/src/kits/storage/mime/database_support.cpp
+++ b/src/kits/storage/mime/database_support.cpp
@@ -25,7 +25,7 @@
 #include <fs_attr.h>	// For struct attr_info
 #include <new>			// For new(nothrow)
 #include <stdio.h>
-#include <string>
+#include <string.h>
 
 #include "mime/database_support.h"
 
diff --git a/src/kits/storage/sniffer/Err.cpp b/src/kits/storage/sniffer/Err.cpp
index f69e7d4271..3906e752a1 100644
--- a/src/kits/storage/sniffer/Err.cpp
+++ b/src/kits/storage/sniffer/Err.cpp
@@ -9,6 +9,7 @@
 
 #include <sniffer/Err.h>
 #include <new>
+#include <string.h>
 
 using namespace BPrivate::Storage::Sniffer;
 
diff --git a/src/kits/translation/TranslatorRoster.cpp b/src/kits/translation/TranslatorRoster.cpp
index 211360c22b..fc0dad412b 100644
--- a/src/kits/translation/TranslatorRoster.cpp
+++ b/src/kits/translation/TranslatorRoster.cpp
@@ -33,6 +33,7 @@
 #include <new>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #ifdef HAIKU_TARGET_PLATFORM_HAIKU
 extern "C" status_t _kern_get_safemode_option(const char *parameter,