diff --git a/hal/acdb.c b/hal/acdb.c
index 4cc674d..bb8ceff 100644
--- a/hal/acdb.c
+++ b/hal/acdb.c
@@ -25,6 +25,7 @@
 #include <dlfcn.h>
 #include <cutils/log.h>
 #include <cutils/list.h>
+#include <time.h>
 #include "acdb.h"
 #include "platform_api.h"
 
diff --git a/hal/audio_extn/audio_extn.c b/hal/audio_extn/audio_extn.c
index 5db3706..28aa23a 100755
--- a/hal/audio_extn/audio_extn.c
+++ b/hal/audio_extn/audio_extn.c
@@ -45,6 +45,7 @@
 #include <fcntl.h>
 #include <cutils/properties.h>
 #include <cutils/log.h>
+#include <unistd.h>
 
 #include "audio_hw.h"
 #include "audio_extn.h"
diff --git a/hal/audio_extn/fm.c b/hal/audio_extn/fm.c
index 785da65..24facea 100644
--- a/hal/audio_extn/fm.c
+++ b/hal/audio_extn/fm.c
@@ -24,6 +24,7 @@
 #include <errno.h>
 #include <math.h>
 #include <cutils/log.h>
+#include <unistd.h>
 
 #include "audio_hw.h"
 #include "platform.h"
diff --git a/hal/audio_extn/passthru.c b/hal/audio_extn/passthru.c
index f30e044..b608043 100644
--- a/hal/audio_extn/passthru.c
+++ b/hal/audio_extn/passthru.c
@@ -33,6 +33,7 @@
 #include <cutils/atomic.h>
 #include <cutils/str_parms.h>
 #include <cutils/log.h>
+#include <unistd.h>
 #include "audio_hw.h"
 #include "audio_extn.h"
 #include "platform_api.h"
diff --git a/hal/audio_extn/soundtrigger.c b/hal/audio_extn/soundtrigger.c
index c49d779..5c8a4e3 100644
--- a/hal/audio_extn/soundtrigger.c
+++ b/hal/audio_extn/soundtrigger.c
@@ -35,6 +35,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <cutils/log.h>
+#include <unistd.h>
 #include "audio_hw.h"
 #include "audio_extn.h"
 #include "platform.h"
diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c
index 3e514cc..5daea93 100644
--- a/hal/audio_extn/spkr_protection.c
+++ b/hal/audio_extn/spkr_protection.c
@@ -43,6 +43,7 @@
 #include <stdlib.h>
 #include <dlfcn.h>
 #include <math.h>
+#include <unistd.h>
 #include <cutils/properties.h>
 #include "audio_extn.h"
 #include <linux/msm_audio_calibration.h>
diff --git a/hal/audio_extn/usb.c b/hal/audio_extn/usb.c
index 8766c0e..e8b72b0 100644
--- a/hal/audio_extn/usb.c
+++ b/hal/audio_extn/usb.c
@@ -35,6 +35,7 @@
 #include <cutils/properties.h>
 #include <ctype.h>
 #include <math.h>
+#include <unistd.h>
 
 #ifdef DYNAMIC_LOG_ENABLED
 #include <log_xml_parser.h>
diff --git a/hal/audio_extn/utils.c b/hal/audio_extn/utils.c
index e03fdc8..3bb7cfe 100644
--- a/hal/audio_extn/utils.c
+++ b/hal/audio_extn/utils.c
@@ -29,6 +29,7 @@
 #include <cutils/str_parms.h>
 #include <cutils/log.h>
 #include <cutils/misc.h>
+#include <unistd.h>
 
 
 #include "audio_hw.h"
diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 8e377f1..18e36d6 100644
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -36,6 +36,7 @@
 #include <cutils/str_parms.h>
 #include <audio_hw.h>
 #include <platform_api.h>
+#include <unistd.h>
 #include "platform.h"
 #include "audio_extn.h"
 #include "acdb.h"
diff --git a/hal/voice_extn/voice_extn.c b/hal/voice_extn/voice_extn.c
index 8bc782d..93653ca 100644
--- a/hal/voice_extn/voice_extn.c
+++ b/hal/voice_extn/voice_extn.c
@@ -24,9 +24,10 @@
 #include <errno.h>
 #include <stdlib.h>
 #include <math.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/str_parms.h>
 #include <sys/ioctl.h>
+#include <time.h>
 #include <sound/voice_params.h>
 
 #include "audio_hw.h"
diff --git a/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c b/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
index 53e371e..070937e 100644
--- a/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-aac/qdsp6/src/aenc_svr.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 
 #include <aenc_svr.h>
+#include <unistd.h>
 
 /**
  @brief This function processes posted messages
diff --git a/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c b/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
index f283c32..b1adec5 100644
--- a/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-amrnb/qdsp6/src/aenc_svr.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 
 #include <aenc_svr.h>
+#include <unistd.h>
 
 /**
  @brief This function processes posted messages
diff --git a/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c b/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
index feda0a5..7bd71bb 100644
--- a/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-evrc/qdsp6/src/aenc_svr.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 
 #include <aenc_svr.h>
+#include <unistd.h>
 
 /**
  @brief This function processes posted messages
diff --git a/mm-audio/aenc-g711/qdsp6/src/aenc_svr.c b/mm-audio/aenc-g711/qdsp6/src/aenc_svr.c
index fa44632..d7e3daf 100644
--- a/mm-audio/aenc-g711/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-g711/qdsp6/src/aenc_svr.c
@@ -32,6 +32,7 @@
 
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include <aenc_svr.h>
 
diff --git a/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c b/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
index 6304918..e5960d8 100644
--- a/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
+++ b/mm-audio/aenc-qcelp13/qdsp6/src/aenc_svr.c
@@ -33,6 +33,7 @@
 #include <errno.h>
 
 #include <aenc_svr.h>
+#include <unistd.h>
 
 /**
  @brief This function processes posted messages
diff --git a/post_proc/asphere.c b/post_proc/asphere.c
index 3ec2818..20ca694 100644
--- a/post_proc/asphere.c
+++ b/post_proc/asphere.c
@@ -40,6 +40,7 @@
 #include <cutils/str_parms.h>
 #include <cutils/properties.h>
 #include <hardware/audio_effect.h>
+#include <pthread.h>
 #include "bundle.h"
 #include "equalizer.h"
 #include "bass_boost.h"
diff --git a/post_proc/bundle.c b/post_proc/bundle.c
index 000020d..ce0d0ec 100644
--- a/post_proc/bundle.c
+++ b/post_proc/bundle.c
@@ -44,6 +44,8 @@
 #include <system/thread_defs.h>
 #include <tinyalsa/asoundlib.h>
 #include <hardware/audio_effect.h>
+#include <pthread.h>
+#include <unistd.h>
 
 #include "bundle.h"
 #include "hw_accelerator.h"
diff --git a/post_proc/effect_api.c b/post_proc/effect_api.c
index b01acc5..3098850 100644
--- a/post_proc/effect_api.c
+++ b/post_proc/effect_api.c
@@ -62,6 +62,8 @@
 #include <sound/devdep_params.h>
 #include <linux/msm_audio.h>
 #include <errno.h>
+#include <unistd.h>
+#include <stdio.h>
 #include "effect_api.h"
 
 #ifdef DTS_EAGLE
diff --git a/post_proc/effect_util.c b/post_proc/effect_util.c
index 22780f7..4950e28 100644
--- a/post_proc/effect_util.c
+++ b/post_proc/effect_util.c
@@ -19,6 +19,8 @@
 #include <string.h>
 #include "effect_util.h"
 #include <string.h>
+#include <unistd.h>
+#include <stdio.h>
 
 #ifdef LOG_TAG
 #undef LOG_TAG
diff --git a/post_proc/volume_listener.c b/post_proc/volume_listener.c
index a8c2c53..2305bf7 100644
--- a/post_proc/volume_listener.c
+++ b/post_proc/volume_listener.c
@@ -31,6 +31,8 @@
 //#define LOG_NDEBUG 0
 #include <stdlib.h>
 #include <dlfcn.h>
+#include <unistd.h>
+#include <pthread.h>
 
 #include <cutils/list.h>
 #include <cutils/log.h>
diff --git a/visualizer/offload_visualizer.c b/visualizer/offload_visualizer.c
index 05537ec..a9664b6 100644
--- a/visualizer/offload_visualizer.c
+++ b/visualizer/offload_visualizer.c
@@ -23,6 +23,8 @@
 #include <time.h>
 #include <sys/prctl.h>
 #include <dlfcn.h>
+#include <pthread.h>
+#include <unistd.h>
 
 #include <cutils/list.h>
 #include <cutils/log.h>
diff --git a/voice_processing/voice_processing.c b/voice_processing/voice_processing.c
index 2d5d93d..caf1cf7 100644
--- a/voice_processing/voice_processing.c
+++ b/voice_processing/voice_processing.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <cutils/log.h>
 #include <cutils/list.h>
+#include <unistd.h>
 #include <hardware/audio_effect.h>
 #include <audio_effects/effect_aec.h>
 #include <audio_effects/effect_agc.h>