diff --git a/msm8084/libcopybit/copybit_c2d.cpp b/msm8084/libcopybit/copybit_c2d.cpp
index da0396f5..e3503167 100644
--- a/msm8084/libcopybit/copybit_c2d.cpp
+++ b/msm8084/libcopybit/copybit_c2d.cpp
@@ -17,7 +17,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <cutils/log.h>
+#include <log/log.h>
 #include <sys/resource.h>
 #include <sys/prctl.h>
 
diff --git a/msm8084/libexternal/external.cpp b/msm8084/libexternal/external.cpp
index 04655214..e88f7012 100644
--- a/msm8084/libexternal/external.cpp
+++ b/msm8084/libexternal/external.cpp
@@ -23,7 +23,7 @@
 #include <fcntl.h>
 #include <utils/threads.h>
 #include <utils/Errors.h>
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include <linux/msm_mdp.h>
 #include <video/msm_hdmi_modes.h>
diff --git a/msm8084/libgralloc/mapper.cpp b/msm8084/libgralloc/mapper.cpp
index 189d2055..d7627b08 100644
--- a/msm8084/libgralloc/mapper.cpp
+++ b/msm8084/libgralloc/mapper.cpp
@@ -27,7 +27,7 @@
 #include <sys/types.h>
 #include <sys/ioctl.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/atomic.h>
 
 #include <hardware/hardware.h>
diff --git a/msm8084/libhwcomposer/hwc.cpp b/msm8084/libhwcomposer/hwc.cpp
index 21e5d9f5..d25afbf5 100644
--- a/msm8084/libhwcomposer/hwc.cpp
+++ b/msm8084/libhwcomposer/hwc.cpp
@@ -21,7 +21,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/atomic.h>
 #include <EGL/egl.h>
 #include <utils/Trace.h>
diff --git a/msm8084/libhwcomposer/hwc_qclient.h b/msm8084/libhwcomposer/hwc_qclient.h
index d9553773..5dcecba8 100644
--- a/msm8084/libhwcomposer/hwc_qclient.h
+++ b/msm8084/libhwcomposer/hwc_qclient.h
@@ -32,7 +32,7 @@
 
 #include <utils/Errors.h>
 #include <sys/types.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <binder/IServiceManager.h>
 #include <media/IMediaDeathNotifier.h>
 #include <IQClient.h>
diff --git a/msm8084/libhwcomposer/hwc_uevents.cpp b/msm8084/libhwcomposer/hwc_uevents.cpp
index 4a7b8e7b..ce6b7965 100644
--- a/msm8084/libhwcomposer/hwc_uevents.cpp
+++ b/msm8084/libhwcomposer/hwc_uevents.cpp
@@ -20,7 +20,7 @@
  */
 #define UEVENT_DEBUG 0
 #include <hardware_legacy/uevent.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include <sys/resource.h>
 #include <sys/prctl.h>
 #include <string.h>
diff --git a/msm8084/libqdutils/profiler.h b/msm8084/libqdutils/profiler.h
index 5f270b02..9ac8157e 100644
--- a/msm8084/libqdutils/profiler.h
+++ b/msm8084/libqdutils/profiler.h
@@ -33,7 +33,7 @@
 #include <stdio.h>
 #include <utils/Singleton.h>
 #include <cutils/properties.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #ifndef DEBUG_CALC_FPS
 #define CALC_FPS() ((void)0)
diff --git a/msm8084/libvirtual/virtual.cpp b/msm8084/libvirtual/virtual.cpp
index 7d8b9424..5e4eec75 100644
--- a/msm8084/libvirtual/virtual.cpp
+++ b/msm8084/libvirtual/virtual.cpp
@@ -35,7 +35,7 @@
 #include <media/AudioSystem.h>
 #include <utils/threads.h>
 #include <utils/Errors.h>
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include <linux/msm_mdp.h>
 #include <linux/fb.h>
diff --git a/msm8226/libhwcomposer/hwc_dump_layers.cpp b/msm8226/libhwcomposer/hwc_dump_layers.cpp
index 95be7916..3e680339 100644
--- a/msm8226/libhwcomposer/hwc_dump_layers.cpp
+++ b/msm8226/libhwcomposer/hwc_dump_layers.cpp
@@ -33,7 +33,7 @@
 #define LOG_NDEBUG 0
 #include <hwc_utils.h>
 #include <hwc_dump_layers.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <sys/stat.h>
 #include <comptype.h>
 #ifdef QCOM_BSP
diff --git a/msm8226/libqservice/QService.h b/msm8226/libqservice/QService.h
index a8e4cdba..ffe36572 100644
--- a/msm8226/libqservice/QService.h
+++ b/msm8226/libqservice/QService.h
@@ -32,7 +32,7 @@
 
 #include <utils/Errors.h>
 #include <sys/types.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <binder/IServiceManager.h>
 #include <IQService.h>
 #include <IQClient.h>
diff --git a/msm8960/libcopybit/copybit.cpp b/msm8960/libcopybit/copybit.cpp
index 8dcfbcf7..90581fd1 100644
--- a/msm8960/libcopybit/copybit.cpp
+++ b/msm8960/libcopybit/copybit.cpp
@@ -18,7 +18,7 @@
  * limitations under the License.
  */
 
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <linux/msm_mdp.h>
 #include <linux/fb.h>
diff --git a/msm8960/libcopybit/software_converter.cpp b/msm8960/libcopybit/software_converter.cpp
index e26b7957..4272ca6c 100644
--- a/msm8960/libcopybit/software_converter.cpp
+++ b/msm8960/libcopybit/software_converter.cpp
@@ -28,6 +28,8 @@
  */
 
 #include <cutils/log.h>
+#include <log/log.h>
+#include <string.h>
 #include <stdlib.h>
 #include <errno.h>
 #include "software_converter.h"
diff --git a/msm8960/libgenlock/genlock.cpp b/msm8960/libgenlock/genlock.cpp
index 880f8a5c..5104159f 100644
--- a/msm8960/libgenlock/genlock.cpp
+++ b/msm8960/libgenlock/genlock.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/native_handle.h>
 #include <gralloc_priv.h>
 #ifdef USE_GENLOCK
diff --git a/msm8960/libgralloc/alloc_controller.cpp b/msm8960/libgralloc/alloc_controller.cpp
index f5e466a6..fe269bfc 100644
--- a/msm8960/libgralloc/alloc_controller.cpp
+++ b/msm8960/libgralloc/alloc_controller.cpp
@@ -27,7 +27,7 @@
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <fcntl.h>
 #include <dlfcn.h>
 #include "gralloc_priv.h"
diff --git a/msm8960/libgralloc/framebuffer.cpp b/msm8960/libgralloc/framebuffer.cpp
index e35e6cba..88b0a1e4 100644
--- a/msm8960/libgralloc/framebuffer.cpp
+++ b/msm8960/libgralloc/framebuffer.cpp
@@ -17,7 +17,7 @@
 
 #include <sys/mman.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include <dlfcn.h>
 
diff --git a/msm8960/libgralloc/gpu.h b/msm8960/libgralloc/gpu.h
index b391f74d..3e267c87 100644
--- a/msm8960/libgralloc/gpu.h
+++ b/msm8960/libgralloc/gpu.h
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/ashmem.h>
 
 #include "gralloc_priv.h"
diff --git a/msm8960/libgralloc/gralloc_priv.h b/msm8960/libgralloc/gralloc_priv.h
index d9f4f4ff..2ebd9639 100644
--- a/msm8960/libgralloc/gralloc_priv.h
+++ b/msm8960/libgralloc/gralloc_priv.h
@@ -28,7 +28,7 @@
 
 #include <cutils/native_handle.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 
 #define ROUND_UP_PAGESIZE(x) ( (((unsigned long)(x)) + PAGE_SIZE-1)  & \
                                (~(PAGE_SIZE-1)) )
diff --git a/msm8960/libgralloc/ionalloc.cpp b/msm8960/libgralloc/ionalloc.cpp
index a49934e2..5c2a5264 100644
--- a/msm8960/libgralloc/ionalloc.cpp
+++ b/msm8960/libgralloc/ionalloc.cpp
@@ -32,7 +32,7 @@
 #include <sys/mman.h>
 #include <stdlib.h>
 #include <fcntl.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <errno.h>
 #include "gralloc_priv.h"
 #include "ionalloc.h"
diff --git a/msm8960/libhwcomposer/hwc_vsync.cpp b/msm8960/libhwcomposer/hwc_vsync.cpp
index 96127134..726a18f0 100644
--- a/msm8960/libhwcomposer/hwc_vsync.cpp
+++ b/msm8960/libhwcomposer/hwc_vsync.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <cutils/properties.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/msm_mdp.h>
diff --git a/msm8960/liblight/lights.c b/msm8960/liblight/lights.c
index 4a43722b..b82a744d 100644
--- a/msm8960/liblight/lights.c
+++ b/msm8960/liblight/lights.c
@@ -17,7 +17,7 @@
 
 // #define LOG_NDEBUG 0
 
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <stdint.h>
 #include <string.h>
diff --git a/msm8960/liboverlay/mdpWrapper.h b/msm8960/liboverlay/mdpWrapper.h
index 1f4a0be7..4c95dcfd 100644
--- a/msm8960/liboverlay/mdpWrapper.h
+++ b/msm8960/liboverlay/mdpWrapper.h
@@ -38,7 +38,7 @@
 #include <linux/msm_mdp.h>
 #include <linux/msm_rotator.h>
 #include <sys/ioctl.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include <errno.h>
 #include "overlayUtils.h"
 
diff --git a/msm8960/liboverlay/overlayUtils.cpp b/msm8960/liboverlay/overlayUtils.cpp
index f0b61b3f..06370c72 100644
--- a/msm8960/liboverlay/overlayUtils.cpp
+++ b/msm8960/liboverlay/overlayUtils.cpp
@@ -29,7 +29,7 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include <linux/msm_mdp.h>
 #include <cutils/properties.h>
 #include "gralloc_priv.h"
diff --git a/msm8960/liboverlay/overlayUtils.h b/msm8960/liboverlay/overlayUtils.h
index b1a50e90..8ae890c3 100644
--- a/msm8960/liboverlay/overlayUtils.h
+++ b/msm8960/liboverlay/overlayUtils.h
@@ -30,7 +30,7 @@
 #ifndef OVERLAY_UTILS_H
 #define OVERLAY_UTILS_H
 
-#include <cutils/log.h> // ALOGE, etc
+#include <log/log.h> // ALOGE, etc
 #include <errno.h>
 #include <fcntl.h> // open, O_RDWR, etc
 #include <hardware/hardware.h>
@@ -42,7 +42,7 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include "gralloc_priv.h" //for interlace
 
 // Older platforms do not support Venus.
diff --git a/msm8960/libqdutils/idle_invalidator.h b/msm8960/libqdutils/idle_invalidator.h
index 82b1ac0c..622a8aca 100644
--- a/msm8960/libqdutils/idle_invalidator.h
+++ b/msm8960/libqdutils/idle_invalidator.h
@@ -30,7 +30,7 @@
 #ifndef INCLUDE_IDLEINVALIDATOR
 #define INCLUDE_IDLEINVALIDATOR
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <utils/threads.h>
 
 typedef void (*InvalidatorHandler)(void*);
diff --git a/msm8960/libqdutils/mdp_version.cpp b/msm8960/libqdutils/mdp_version.cpp
index b3f5c8ad..f27143bc 100644
--- a/msm8960/libqdutils/mdp_version.cpp
+++ b/msm8960/libqdutils/mdp_version.cpp
@@ -26,7 +26,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <cutils/log.h>
+#include <log/log.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <linux/fb.h>
diff --git a/msm8960/libqdutils/qdMetaData.cpp b/msm8960/libqdutils/qdMetaData.cpp
index 2ce3aeb8..01080afa 100644
--- a/msm8960/libqdutils/qdMetaData.cpp
+++ b/msm8960/libqdutils/qdMetaData.cpp
@@ -29,7 +29,7 @@
 
 #include <string.h>
 #include <sys/mman.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <gralloc_priv.h>
 #include "qdMetaData.h"