diff --git a/adf/libadfhwc/adfhwc.cpp b/adf/libadfhwc/adfhwc.cpp
index 57e09eb64..21f245ed0 100644
--- a/adf/libadfhwc/adfhwc.cpp
+++ b/adf/libadfhwc/adfhwc.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <fcntl.h>
+#include <malloc.h>
 #include <poll.h>
 #include <pthread.h>
 #include <sys/resource.h>
diff --git a/fastbootd/commands/boot.c b/fastbootd/commands/boot.c
index 922914bc6..bb939176d 100644
--- a/fastbootd/commands/boot.c
+++ b/fastbootd/commands/boot.c
@@ -33,6 +33,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>
+#include <malloc.h>
 #include <unistd.h>
 
 #include "boot.h"
diff --git a/fastbootd/commands/partitions.c b/fastbootd/commands/partitions.c
index 3b279590e..953c56a0f 100644
--- a/fastbootd/commands/partitions.c
+++ b/fastbootd/commands/partitions.c
@@ -42,6 +42,7 @@
 #include <linux/hdreg.h>
 #include <sys/ioctl.h>
 #include <stdlib.h>
+#include <string.h>
 #include <cutils/config_utils.h>
 #include <inttypes.h>
 
diff --git a/fastbootd/commands/virtual_partitions.c b/fastbootd/commands/virtual_partitions.c
index 9da402099..b72d5b63c 100644
--- a/fastbootd/commands/virtual_partitions.c
+++ b/fastbootd/commands/virtual_partitions.c
@@ -31,6 +31,7 @@
 
 #include "commands/virtual_partitions.h"
 
+#include <malloc.h>
 #include <string.h>
 
 #include "debug.h"
diff --git a/fastbootd/config.c b/fastbootd/config.c
index 012a1978b..daac3fd10 100644
--- a/fastbootd/config.c
+++ b/fastbootd/config.c
@@ -31,6 +31,7 @@
 
 #include <errno.h>
 #include <fcntl.h>
+#include <malloc.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/fastbootd/other/gptedit.c b/fastbootd/other/gptedit.c
index d423529ae..2b65a012d 100644
--- a/fastbootd/other/gptedit.c
+++ b/fastbootd/other/gptedit.c
@@ -33,6 +33,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <cutils/klog.h>
diff --git a/fastbootd/transport.c b/fastbootd/transport.c
index 232c99929..3ba0e9a9d 100644
--- a/fastbootd/transport.c
+++ b/fastbootd/transport.c
@@ -19,6 +19,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/mman.h>
 
diff --git a/fastbootd/utils.c b/fastbootd/utils.c
index a9ab47ebe..4c3a2e811 100644
--- a/fastbootd/utils.c
+++ b/fastbootd/utils.c
@@ -36,6 +36,7 @@
 #include <sys/ioctl.h>
 #include <linux/fs.h>
 #include <stdlib.h>
+#include <string.h>
 #include <cutils/properties.h>
 
 #include "utils.h"
diff --git a/libion/ion.c b/libion/ion.c
index 27ec47a10..d1984bd06 100644
--- a/libion/ion.c
+++ b/libion/ion.c
@@ -23,6 +23,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/types.h>
diff --git a/libmemtrack/memtrack.c b/libmemtrack/memtrack.c
index 5d680830b..21d9ebdb9 100644
--- a/libmemtrack/memtrack.c
+++ b/libmemtrack/memtrack.c
@@ -21,6 +21,9 @@
 #include <log/log.h>
 
 #include <errno.h>
+#include <malloc.h>
+#include <string.h>
+
 #include <hardware/memtrack.h>
 
 #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
diff --git a/libnetutils/packet.c b/libnetutils/packet.c
index a878dd3a7..cd26d058a 100644
--- a/libnetutils/packet.c
+++ b/libnetutils/packet.c
@@ -15,6 +15,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <sys/uio.h>
 #include <sys/socket.h>
diff --git a/libsync/sync.c b/libsync/sync.c
index 489286673..d73bb111c 100644
--- a/libsync/sync.c
+++ b/libsync/sync.c
@@ -17,6 +17,7 @@
  */
 
 #include <fcntl.h>
+#include <malloc.h>
 #include <stdint.h>
 #include <string.h>
 
diff --git a/libsysutils/src/SocketClient.cpp b/libsysutils/src/SocketClient.cpp
index 835882377..bb9b6a164 100644
--- a/libsysutils/src/SocketClient.cpp
+++ b/libsysutils/src/SocketClient.cpp
@@ -1,5 +1,6 @@
 #include <alloca.h>
 #include <errno.h>
+#include <malloc.h>
 #include <pthread.h>
 #include <signal.h>
 #include <string.h>
diff --git a/logd/LogStatistics.cpp b/logd/LogStatistics.cpp
index 6f3a08869..53036e669 100644
--- a/logd/LogStatistics.cpp
+++ b/logd/LogStatistics.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <fcntl.h>
+#include <malloc.h>
 #include <stdarg.h>
 #include <time.h>
 
diff --git a/logd/LogWhiteBlackList.cpp b/logd/LogWhiteBlackList.cpp
index 9728db17b..691085480 100644
--- a/logd/LogWhiteBlackList.cpp
+++ b/logd/LogWhiteBlackList.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <ctype.h>
+#include <malloc.h>
 
 #include <utils/String8.h>
 
diff --git a/toolbox/ionice.c b/toolbox/ionice.c
index 4a182f2de..7abc261a5 100644
--- a/toolbox/ionice.c
+++ b/toolbox/ionice.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 #include <errno.h>
 
diff --git a/toolbox/lsof.c b/toolbox/lsof.c
index bee981dee..982f5aaf6 100644
--- a/toolbox/lsof.c
+++ b/toolbox/lsof.c
@@ -35,6 +35,7 @@
 #include <libgen.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <pwd.h>
diff --git a/toolbox/renice.c b/toolbox/renice.c
index 9dfeb51f9..99a06f489 100644
--- a/toolbox/renice.c
+++ b/toolbox/renice.c
@@ -32,6 +32,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <sched.h>
diff --git a/toolbox/restorecon.c b/toolbox/restorecon.c
index 35686254d..cb5799e1a 100644
--- a/toolbox/restorecon.c
+++ b/toolbox/restorecon.c
@@ -1,6 +1,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 #include <selinux/selinux.h>
 #include <selinux/android.h>