diff --git a/src/build/libbe/interface/Region.cpp b/src/build/libbe/interface/Region.cpp
index b69b581947..ff996dbc11 100644
--- a/src/build/libbe/interface/Region.cpp
+++ b/src/build/libbe/interface/Region.cpp
@@ -10,7 +10,7 @@
 
 #include <Region.h>
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <Debug.h>
diff --git a/src/build/libbe/interface/RegionSupport.cpp b/src/build/libbe/interface/RegionSupport.cpp
index 71cf9487a6..2c118dc248 100644
--- a/src/build/libbe/interface/RegionSupport.cpp
+++ b/src/build/libbe/interface/RegionSupport.cpp
@@ -74,7 +74,7 @@ SOFTWARE.
 
 #include "RegionSupport.h"
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <new>
 
 using std::nothrow;
diff --git a/src/kits/game/GameSoundDevice.cpp b/src/kits/game/GameSoundDevice.cpp
index ac57b56565..247844a1f6 100644
--- a/src/kits/game/GameSoundDevice.cpp
+++ b/src/kits/game/GameSoundDevice.cpp
@@ -26,7 +26,7 @@
 //					this time. Use at your own risk.
 //------------------------------------------------------------------------------
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/kits/interface/Region.cpp b/src/kits/interface/Region.cpp
index b69b581947..ff996dbc11 100644
--- a/src/kits/interface/Region.cpp
+++ b/src/kits/interface/Region.cpp
@@ -10,7 +10,7 @@
 
 #include <Region.h>
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 
 #include <Debug.h>
diff --git a/src/kits/interface/RegionSupport.cpp b/src/kits/interface/RegionSupport.cpp
index 71cf9487a6..2c118dc248 100644
--- a/src/kits/interface/RegionSupport.cpp
+++ b/src/kits/interface/RegionSupport.cpp
@@ -74,7 +74,7 @@ SOFTWARE.
 
 #include "RegionSupport.h"
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <new>
 
 using std::nothrow;
diff --git a/src/kits/mail/MailAttachment.cpp b/src/kits/mail/MailAttachment.cpp
index a2cde9067d..ef3e2f31dd 100644
--- a/src/kits/mail/MailAttachment.cpp
+++ b/src/kits/mail/MailAttachment.cpp
@@ -12,7 +12,7 @@
 #include <ByteOrder.h>
 #include <NodeInfo.h>
 
-#include <malloc.h>
+#include <stdlib.h>
 
 class _EXPORT BSimpleMailAttachment;
 class _EXPORT BAttributedMailAttachment;
diff --git a/src/kits/mail/MailComponent.cpp b/src/kits/mail/MailComponent.cpp
index ca09b11f37..a277f7ee2e 100644
--- a/src/kits/mail/MailComponent.cpp
+++ b/src/kits/mail/MailComponent.cpp
@@ -7,8 +7,8 @@
 #include <String.h>
 #include <Mime.h>
 
-#include <malloc.h>
 #include <ctype.h>
+#include <stdlib.h>
 
 class _EXPORT BMailComponent;
 class _EXPORT BTextMailComponent;
diff --git a/src/kits/mail/MailContainer.cpp b/src/kits/mail/MailContainer.cpp
index 5ca5df50d7..a348b41769 100644
--- a/src/kits/mail/MailContainer.cpp
+++ b/src/kits/mail/MailContainer.cpp
@@ -8,9 +8,9 @@
 #include <List.h>
 #include <Mime.h>
 
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <malloc.h>
 
 class _EXPORT BMIMEMultipartMailContainer;
 
diff --git a/src/kits/mail/MailMessage.cpp b/src/kits/mail/MailMessage.cpp
index eff22f3809..97027d9bc2 100644
--- a/src/kits/mail/MailMessage.cpp
+++ b/src/kits/mail/MailMessage.cpp
@@ -20,7 +20,6 @@
 #include <Messenger.h>
 #include <Path.h>
 
-#include <malloc.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/kits/mail/MailProtocol.cpp b/src/kits/mail/MailProtocol.cpp
index 4b68084025..a107fe9135 100644
--- a/src/kits/mail/MailProtocol.cpp
+++ b/src/kits/mail/MailProtocol.cpp
@@ -17,7 +17,7 @@
 
 #include <stdio.h>
 #include <fs_attr.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <assert.h>
 
 #include <MDRLanguage.h>
diff --git a/src/kits/mail/StringList.cpp b/src/kits/mail/StringList.cpp
index 428df42c3f..4e69ea53e1 100644
--- a/src/kits/mail/StringList.cpp
+++ b/src/kits/mail/StringList.cpp
@@ -6,9 +6,9 @@
 
 #include <List.h>
 
-#include <string.h>
-#include <malloc.h>
 #include <assert.h>
+#include <stdlib.h>
+#include <string.h>
 
 class _EXPORT BStringList;
 
diff --git a/src/kits/media/BufferConsumer.cpp b/src/kits/media/BufferConsumer.cpp
index 9795aff472..04b9a8141e 100644
--- a/src/kits/media/BufferConsumer.cpp
+++ b/src/kits/media/BufferConsumer.cpp
@@ -32,7 +32,7 @@
 #include <BufferGroup.h>
 #include <Buffer.h>
 #include <TimeSource.h> //for debugging
-#include <malloc.h>
+#include <stdlib.h>
 #include "debug.h"
 #include "MediaMisc.h"
 #include "DataExchange.h"
diff --git a/src/kits/media/MediaAddOn.cpp b/src/kits/media/MediaAddOn.cpp
index 2c71b1861b..f7f2727a9f 100644
--- a/src/kits/media/MediaAddOn.cpp
+++ b/src/kits/media/MediaAddOn.cpp
@@ -29,7 +29,7 @@
 
 #include <MediaAddOn.h>
 #include <string.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "debug.h"
 #include "DataExchange.h"
 
diff --git a/src/kits/media/PortPool.cpp b/src/kits/media/PortPool.cpp
index 126a930ca6..57f4c231aa 100644
--- a/src/kits/media/PortPool.cpp
+++ b/src/kits/media/PortPool.cpp
@@ -5,7 +5,7 @@
  * A pool of kernel ports
  ***********************************************************************/
 #include <OS.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "PortPool.h"
 #include "debug.h"
 
diff --git a/src/kits/media/RealtimeAlloc.cpp b/src/kits/media/RealtimeAlloc.cpp
index 263d8fdbd5..369a934caf 100644
--- a/src/kits/media/RealtimeAlloc.cpp
+++ b/src/kits/media/RealtimeAlloc.cpp
@@ -6,7 +6,7 @@
 
 #include <SupportDefs.h>
 #include <RealtimeAlloc.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "debug.h"
 
 
diff --git a/src/kits/tracker/Model.cpp b/src/kits/tracker/Model.cpp
index bebfb86582..3eaec89e71 100644
--- a/src/kits/tracker/Model.cpp
+++ b/src/kits/tracker/Model.cpp
@@ -38,7 +38,6 @@ All rights reserved.
 // Consider moving iconFrom logic to BPose
 // use a more efficient way of storing file type and preferred app strings
 
-#include <malloc.h>
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/src/kits/tracker/RegExp.cpp b/src/kits/tracker/RegExp.cpp
index f03fcc8c38..855abbe689 100644
--- a/src/kits/tracker/RegExp.cpp
+++ b/src/kits/tracker/RegExp.cpp
@@ -61,7 +61,7 @@ All rights reserved.
 // ALTERED VERSION: Adapted to ANSI C and C++ for the OpenTracker
 // project (www.opentracker.org), Jul 11, 2000.
 
-#include <malloc.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
diff --git a/src/kits/tracker/Utilities.cpp b/src/kits/tracker/Utilities.cpp
index c49266c50d..64449fae70 100644
--- a/src/kits/tracker/Utilities.cpp
+++ b/src/kits/tracker/Utilities.cpp
@@ -59,7 +59,6 @@ All rights reserved.
 #include <Window.h>
 
 #include <ctype.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>