Avoid direct inclusion of malloc.h

15 files changed, 8 insertions, 15 deletions

diff --git a/common/oui.c b/common/oui.c
index a9c4af5a..0915afdf 100644
--- a/common/oui.c
+++ b/common/oui.c
@@ -29,7 +29,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
diff --git a/common/sdp-xml.c b/common/sdp-xml.c
index 2cc55c2d..1e1e07c3 100644
--- a/common/sdp-xml.c
+++ b/common/sdp-xml.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <ctype.h>
-#include <malloc.h>
 #include <string.h>
 #include <limits.h>
 #include <stdlib.h>
diff --git a/common/textfile.c b/common/textfile.c
index 021fc8fb..eef0f96a 100644
--- a/common/textfile.c
+++ b/common/textfile.c
@@ -31,7 +31,7 @@
 #include <ctype.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/file.h>
 #include <sys/stat.h>
diff --git a/eglib/gmain.c b/eglib/gmain.c
index be11056e..1ca3d67a 100644
--- a/eglib/gmain.c
+++ b/eglib/gmain.c
@@ -4,7 +4,6 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <malloc.h>
 #include <string.h>
 #include <limits.h>
 #include <sys/time.h>
diff --git a/hidd/main.c b/hidd/main.c
index 77372a11..d0883b36 100644
--- a/hidd/main.c
+++ b/hidd/main.c
@@ -31,7 +31,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <malloc.h>
+#include <string.h>
 #include <syslog.h>
 #include <signal.h>
 #include <getopt.h>
diff --git a/hidd/sdp.c b/hidd/sdp.c
index b19069e9..eaf8c136 100644
--- a/hidd/sdp.c
+++ b/hidd/sdp.c
@@ -30,7 +30,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/param.h>
diff --git a/rfcomm/main.c b/rfcomm/main.c
index f831f6a4..f21e989c 100644
--- a/rfcomm/main.c
+++ b/rfcomm/main.c
@@ -31,7 +31,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <string.h>
 #include <getopt.h>
 #include <signal.h>
diff --git a/sbc/sbc.c b/sbc/sbc.c
index 1a19ac79..6303421f 100644
--- a/sbc/sbc.c
+++ b/sbc/sbc.c
@@ -37,7 +37,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <malloc.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sys/types.h>
diff --git a/sdpd/cstate.c b/sdpd/cstate.c
index bb422ce4..d0adf08a 100644
--- a/sdpd/cstate.c
+++ b/sdpd/cstate.c
@@ -30,7 +30,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <sys/time.h>
 #include <sys/socket.h>
 
diff --git a/sdpd/request.c b/sdpd/request.c
index 757c5ad9..44b65f69 100644
--- a/sdpd/request.c
+++ b/sdpd/request.c
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <malloc.h>
+#include <string.h>
 #include <limits.h>
 #include <sys/socket.h>
 
diff --git a/sdpd/servicedb.c b/sdpd/servicedb.c
index b5ea17ca..6cc34bd3 100644
--- a/sdpd/servicedb.c
+++ b/sdpd/servicedb.c
@@ -30,7 +30,7 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include <sys/socket.h>
 
 #include <bluetooth/bluetooth.h>
diff --git a/tools/ciptool.c b/tools/ciptool.c
index 7d95953f..886e20aa 100644
--- a/tools/ciptool.c
+++ b/tools/ciptool.c
@@ -30,7 +30,7 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <malloc.h>
+#include <string.h>
 #include <getopt.h>
 #include <signal.h>
 #include <sys/poll.h>
diff --git a/tools/csr.c b/tools/csr.c
index 7895363c..b32e4162 100644
--- a/tools/csr.c
+++ b/tools/csr.c
@@ -30,7 +30,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <malloc.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
diff --git a/tools/dfutool.c b/tools/dfutool.c
index 7a8c8dee..246d92a4 100644
--- a/tools/dfutool.c
+++ b/tools/dfutool.c
@@ -33,7 +33,6 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include <malloc.h>
 #include <string.h>
 #include <libgen.h>
 #include <endian.h>
diff --git a/tools/l2ping.c b/tools/l2ping.c
index 1be911ae..1e2aab6d 100644
--- a/tools/l2ping.c
+++ b/tools/l2ping.c
@@ -31,7 +31,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <malloc.h>
+#include <string.h>
 #include <getopt.h>
 #include <signal.h>
 #include <sys/time.h>