Merge "Add missing includes."
diff --git a/halimpl/bcm2079x/adaptation/CondVar.cpp b/halimpl/bcm2079x/adaptation/CondVar.cpp
index efd449a..c2dacdc 100644
--- a/halimpl/bcm2079x/adaptation/CondVar.cpp
+++ b/halimpl/bcm2079x/adaptation/CondVar.cpp
@@ -25,6 +25,7 @@
 #include "OverrideLog.h"
 #include "CondVar.h"
 #include <errno.h>
+#include <string.h>
 
 
 /*******************************************************************************
diff --git a/halimpl/bcm2079x/adaptation/Mutex.cpp b/halimpl/bcm2079x/adaptation/Mutex.cpp
index 37e388d..f931493 100644
--- a/halimpl/bcm2079x/adaptation/Mutex.cpp
+++ b/halimpl/bcm2079x/adaptation/Mutex.cpp
@@ -26,6 +26,7 @@
 #include "OverrideLog.h"
 #include "Mutex.h"
 #include <errno.h>
+#include <string.h>
 
 /*******************************************************************************
 **
diff --git a/halimpl/bcm2079x/adaptation/patchram.cpp b/halimpl/bcm2079x/adaptation/patchram.cpp
index f43ec2e..76947b9 100644
--- a/halimpl/bcm2079x/adaptation/patchram.cpp
+++ b/halimpl/bcm2079x/adaptation/patchram.cpp
@@ -23,6 +23,7 @@
 {
     #include "nfc_hal_post_reset.h"
 }
+#include <malloc.h>
 #include <string>
 #include <cutils/properties.h>
 #include "spdhelper.h"