diff --git a/guest/commands/usbforward/main.cpp b/guest/commands/usbforward/main.cpp
index 0ccf479..3edd78f 100644
--- a/guest/commands/usbforward/main.cpp
+++ b/guest/commands/usbforward/main.cpp
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <cutils/log.h>
+#include <log/log.h>
 #include <stdio.h>
 #include <libusb/libusb.h>
 
diff --git a/guest/commands/usbforward/transport_request.cpp b/guest/commands/usbforward/transport_request.cpp
index 9f994e9..fa68ace 100644
--- a/guest/commands/usbforward/transport_request.cpp
+++ b/guest/commands/usbforward/transport_request.cpp
@@ -16,7 +16,7 @@
 
 #include "guest/commands/usbforward/transport_request.h"
 
-#include <cutils/log.h>
+#include <log/log.h>
 
 namespace usb_forward {
 
diff --git a/guest/commands/usbforward/usb_server.cpp b/guest/commands/usbforward/usb_server.cpp
index 119c77e..8c72137 100644
--- a/guest/commands/usbforward/usb_server.cpp
+++ b/guest/commands/usbforward/usb_server.cpp
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 #include <strings.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <libusb/libusb.h>
 #include "common/libs/fs/shared_select.h"
 #include "common/libs/usbforward/protocol.h"
diff --git a/guest/hals/audio/audio_hal.h b/guest/hals/audio/audio_hal.h
index b965641..8665e8f 100644
--- a/guest/hals/audio/audio_hal.h
+++ b/guest/hals/audio/audio_hal.h
@@ -25,7 +25,7 @@
 
 #include <errno.h>
 #include <string.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <hardware/hardware.h>
 
diff --git a/guest/hals/audio/policy/vsoc_audio_policy_hal.h b/guest/hals/audio/policy/vsoc_audio_policy_hal.h
index 7f97556..00ea3d1 100644
--- a/guest/hals/audio/policy/vsoc_audio_policy_hal.h
+++ b/guest/hals/audio/policy/vsoc_audio_policy_hal.h
@@ -17,7 +17,7 @@
 
 #include <errno.h>
 #include <string.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <hardware/hardware.h>
 #include <system/audio.h>
diff --git a/guest/hals/camera/CallbackNotifier.cpp b/guest/hals/camera/CallbackNotifier.cpp
index dc67773..765d4e7 100644
--- a/guest/hals/camera/CallbackNotifier.cpp
+++ b/guest/hals/camera/CallbackNotifier.cpp
@@ -23,7 +23,7 @@
 #define LOG_TAG "EmulatedCamera_CallbackNotifier"
 #include "CallbackNotifier.h"
 #include <MetadataBufferType.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include "EmulatedCameraDevice.h"
 #include "JpegCompressor.h"
 #include "Exif.h"
diff --git a/guest/hals/camera/CameraConfiguration.cpp b/guest/hals/camera/CameraConfiguration.cpp
index ed16089..32ac332 100644
--- a/guest/hals/camera/CameraConfiguration.cpp
+++ b/guest/hals/camera/CameraConfiguration.cpp
@@ -19,7 +19,7 @@
 
 #include <android-base/file.h>
 #include <android-base/strings.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <json/json.h>
 #include <json/reader.h>
 #include <stdlib.h>
diff --git a/guest/hals/camera/Compressor.cpp b/guest/hals/camera/Compressor.cpp
index 76c4a24..3fe0bd6 100644
--- a/guest/hals/camera/Compressor.cpp
+++ b/guest/hals/camera/Compressor.cpp
@@ -18,7 +18,7 @@
 
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_JPEGStub_Compressor"
-#include <cutils/log.h>
+#include <log/log.h>
 #include <libexif/exif-data.h>
 
 Compressor::Compressor() {
diff --git a/guest/hals/camera/Converters.cpp b/guest/hals/camera/Converters.cpp
index fdbb57d..7553d95 100644
--- a/guest/hals/camera/Converters.cpp
+++ b/guest/hals/camera/Converters.cpp
@@ -21,7 +21,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_Converter"
 #include "Converters.h"
-#include <cutils/log.h>
+#include <log/log.h>
 
 namespace android {
 
diff --git a/guest/hals/camera/EmulatedBaseCamera.cpp b/guest/hals/camera/EmulatedBaseCamera.cpp
index 23f887e..dc84c9b 100644
--- a/guest/hals/camera/EmulatedBaseCamera.cpp
+++ b/guest/hals/camera/EmulatedBaseCamera.cpp
@@ -26,7 +26,7 @@
 
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_BaseCamera"
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include "EmulatedBaseCamera.h"
 
diff --git a/guest/hals/camera/EmulatedCamera.cpp b/guest/hals/camera/EmulatedCamera.cpp
index 24d6158..c483524 100644
--- a/guest/hals/camera/EmulatedCamera.cpp
+++ b/guest/hals/camera/EmulatedCamera.cpp
@@ -27,7 +27,7 @@
 
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_Camera"
-#include <cutils/log.h>
+#include <log/log.h>
 #include "EmulatedCamera.h"
 //#include "EmulatedFakeCameraDevice.h"
 #include "Converters.h"
diff --git a/guest/hals/camera/EmulatedCamera2.cpp b/guest/hals/camera/EmulatedCamera2.cpp
index 5071a8c..ccb8006 100644
--- a/guest/hals/camera/EmulatedCamera2.cpp
+++ b/guest/hals/camera/EmulatedCamera2.cpp
@@ -24,7 +24,7 @@
 
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera2_Camera"
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include "EmulatedCamera2.h"
 #include "system/camera_metadata.h"
diff --git a/guest/hals/camera/EmulatedCamera3.cpp b/guest/hals/camera/EmulatedCamera3.cpp
index 1626db9..b9aa362 100644
--- a/guest/hals/camera/EmulatedCamera3.cpp
+++ b/guest/hals/camera/EmulatedCamera3.cpp
@@ -24,7 +24,7 @@
 
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera3_Camera"
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include "EmulatedCamera3.h"
 #include "system/camera_metadata.h"
diff --git a/guest/hals/camera/EmulatedCameraDevice.cpp b/guest/hals/camera/EmulatedCameraDevice.cpp
index c16f1c8..7464cc9 100644
--- a/guest/hals/camera/EmulatedCameraDevice.cpp
+++ b/guest/hals/camera/EmulatedCameraDevice.cpp
@@ -26,7 +26,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_Device"
 #include "EmulatedCameraDevice.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include <sys/select.h>
 #include <algorithm>
 #include <cmath>
diff --git a/guest/hals/camera/EmulatedCameraFactory.cpp b/guest/hals/camera/EmulatedCameraFactory.cpp
index 24012ae..4dfe5fe 100644
--- a/guest/hals/camera/EmulatedCameraFactory.cpp
+++ b/guest/hals/camera/EmulatedCameraFactory.cpp
@@ -21,7 +21,7 @@
 
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_Factory"
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include "EmulatedFakeCamera.h"
 #include "guest/libs/platform_support/api_level_fixes.h"
diff --git a/guest/hals/camera/EmulatedCameraHotplugThread.cpp b/guest/hals/camera/EmulatedCameraHotplugThread.cpp
index 6dd4580..34a4c15 100644
--- a/guest/hals/camera/EmulatedCameraHotplugThread.cpp
+++ b/guest/hals/camera/EmulatedCameraHotplugThread.cpp
@@ -15,7 +15,7 @@
  */
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_HotplugThread"
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <fcntl.h>
 #include <sys/inotify.h>
diff --git a/guest/hals/camera/EmulatedFakeCamera.cpp b/guest/hals/camera/EmulatedFakeCamera.cpp
index 9f5858e..4153fd7 100644
--- a/guest/hals/camera/EmulatedFakeCamera.cpp
+++ b/guest/hals/camera/EmulatedFakeCamera.cpp
@@ -22,7 +22,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_FakeCamera"
 #include "EmulatedFakeCamera.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #undef min
 #undef max
diff --git a/guest/hals/camera/EmulatedFakeCameraDevice.cpp b/guest/hals/camera/EmulatedFakeCameraDevice.cpp
index d42409f..a354e69 100644
--- a/guest/hals/camera/EmulatedFakeCameraDevice.cpp
+++ b/guest/hals/camera/EmulatedFakeCameraDevice.cpp
@@ -22,7 +22,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_FakeDevice"
 #include "EmulatedFakeCameraDevice.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include "EmulatedFakeCamera.h"
 
 namespace android {
diff --git a/guest/hals/camera/EmulatedQemuCamera.cpp b/guest/hals/camera/EmulatedQemuCamera.cpp
index cd8f670..99c4797 100644
--- a/guest/hals/camera/EmulatedQemuCamera.cpp
+++ b/guest/hals/camera/EmulatedQemuCamera.cpp
@@ -22,7 +22,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_QemuCamera"
 #include "EmulatedQemuCamera.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include "EmulatedCameraFactory.h"
 
 namespace android {
diff --git a/guest/hals/camera/EmulatedQemuCamera2.cpp b/guest/hals/camera/EmulatedQemuCamera2.cpp
index 4eb8818..cf894fd 100644
--- a/guest/hals/camera/EmulatedQemuCamera2.cpp
+++ b/guest/hals/camera/EmulatedQemuCamera2.cpp
@@ -23,7 +23,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_QemuCamera2"
 #include "EmulatedQemuCamera2.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include "EmulatedCameraFactory.h"
 
diff --git a/guest/hals/camera/EmulatedQemuCameraDevice.cpp b/guest/hals/camera/EmulatedQemuCameraDevice.cpp
index 0547010..61291e8 100644
--- a/guest/hals/camera/EmulatedQemuCameraDevice.cpp
+++ b/guest/hals/camera/EmulatedQemuCameraDevice.cpp
@@ -22,7 +22,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_QemuDevice"
 #include "EmulatedQemuCameraDevice.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include "EmulatedQemuCamera.h"
 
 namespace android {
diff --git a/guest/hals/camera/Exif.cpp b/guest/hals/camera/Exif.cpp
index 43dca52..78e93a1 100644
--- a/guest/hals/camera/Exif.cpp
+++ b/guest/hals/camera/Exif.cpp
@@ -16,7 +16,7 @@
 
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_Exif"
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <inttypes.h>
 #include <math.h>
diff --git a/guest/hals/camera/JpegCompressor.cpp b/guest/hals/camera/JpegCompressor.cpp
index d2d796d..2dae838 100644
--- a/guest/hals/camera/JpegCompressor.cpp
+++ b/guest/hals/camera/JpegCompressor.cpp
@@ -23,7 +23,7 @@
 #define LOG_TAG "EmulatedCamera_JPEG"
 #include "JpegCompressor.h"
 #include <assert.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <dlfcn.h>
 
 namespace android {
diff --git a/guest/hals/camera/JpegStub.cpp b/guest/hals/camera/JpegStub.cpp
index 1eef9e2..3e02de0 100644
--- a/guest/hals/camera/JpegStub.cpp
+++ b/guest/hals/camera/JpegStub.cpp
@@ -19,7 +19,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_JPEGStub"
 #include <errno.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <stdlib.h>
 
 #include "Compressor.h"
diff --git a/guest/hals/camera/PreviewWindow.cpp b/guest/hals/camera/PreviewWindow.cpp
index ba5d80c..e498435 100644
--- a/guest/hals/camera/PreviewWindow.cpp
+++ b/guest/hals/camera/PreviewWindow.cpp
@@ -22,7 +22,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_Preview"
 #include "PreviewWindow.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include <hardware/camera.h>
 #include "EmulatedCameraDevice.h"
 #include "GrallocModule.h"
diff --git a/guest/hals/camera/QemuClient.cpp b/guest/hals/camera/QemuClient.cpp
index 34ac015..eb89702 100644
--- a/guest/hals/camera/QemuClient.cpp
+++ b/guest/hals/camera/QemuClient.cpp
@@ -22,7 +22,7 @@
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_QemuClient"
 #include "QemuClient.h"
-#include <cutils/log.h>
+#include <log/log.h>
 #include "EmulatedCamera.h"
 
 #define LOG_QUERIES 0
diff --git a/guest/hals/camera/Thumbnail.cpp b/guest/hals/camera/Thumbnail.cpp
index 4b431bb..e8f8126 100644
--- a/guest/hals/camera/Thumbnail.cpp
+++ b/guest/hals/camera/Thumbnail.cpp
@@ -18,7 +18,7 @@
 
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_Thumbnail"
-#include <cutils/log.h>
+#include <log/log.h>
 #include <libexif/exif-data.h>
 #include <libyuv.h>
 
diff --git a/guest/hals/camera/VSoCEmulatedCameraHotplugThread.cpp b/guest/hals/camera/VSoCEmulatedCameraHotplugThread.cpp
index 8fbeb56..2378dc0 100644
--- a/guest/hals/camera/VSoCEmulatedCameraHotplugThread.cpp
+++ b/guest/hals/camera/VSoCEmulatedCameraHotplugThread.cpp
@@ -15,7 +15,7 @@
  */
 #define LOG_NDEBUG 0
 #define LOG_TAG "EmulatedCamera_HotplugThread"
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <fcntl.h>
 #include <sys/stat.h>
diff --git a/guest/hals/gatekeeper/module.cpp b/guest/hals/gatekeeper/module.cpp
index c38a696..c37d543 100644
--- a/guest/hals/gatekeeper/module.cpp
+++ b/guest/hals/gatekeeper/module.cpp
@@ -17,7 +17,7 @@
 #include <hardware/hardware.h>
 #include <hardware/gatekeeper.h>
 #define LOG_TAG "CuttlefishGatekeeper"
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <string.h>
 #include <errno.h>
diff --git a/guest/hals/gps/gps_thread.cpp b/guest/hals/gps/gps_thread.cpp
index 4f00728..cea830c 100644
--- a/guest/hals/gps/gps_thread.cpp
+++ b/guest/hals/gps/gps_thread.cpp
@@ -23,7 +23,7 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/sockets.h>
 #include <hardware/gps.h>
 
diff --git a/guest/hals/gps/gps_vsoc.cpp b/guest/hals/gps/gps_vsoc.cpp
index 6a70943..b17401b 100644
--- a/guest/hals/gps/gps_vsoc.cpp
+++ b/guest/hals/gps/gps_vsoc.cpp
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <unistd.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/sockets.h>
 #include <hardware/gps.h>
 
diff --git a/guest/hals/gralloc/legacy/framebuffer.cpp b/guest/hals/gralloc/legacy/framebuffer.cpp
index 0619932..5a2b7f0 100644
--- a/guest/hals/gralloc/legacy/framebuffer.cpp
+++ b/guest/hals/gralloc/legacy/framebuffer.cpp
@@ -18,7 +18,7 @@
 #include <dlfcn.h>
 
 #include <cutils/ashmem.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 
 #include <sys/system_properties.h>
@@ -33,7 +33,6 @@
 #include <stdlib.h>
 
 #include <cutils/atomic.h>
-#include <private/android_filesystem_config.h>
 
 #if defined(__ANDROID__)
 #include <linux/fb.h>
diff --git a/guest/hals/gralloc/legacy/gralloc.cpp b/guest/hals/gralloc/legacy/gralloc.cpp
index 82ac087..960b886 100644
--- a/guest/hals/gralloc/legacy/gralloc.cpp
+++ b/guest/hals/gralloc/legacy/gralloc.cpp
@@ -27,7 +27,7 @@
 #include <sys/ioctl.h>
 
 #include <cutils/ashmem.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/atomic.h>
 #include <utils/String8.h>
 
diff --git a/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h b/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h
index ed0c72b..7f79002 100644
--- a/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h
+++ b/guest/hals/gralloc/legacy/gralloc_vsoc_priv.h
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include <cutils/native_handle.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include <linux/fb.h>
 
diff --git a/guest/hals/gralloc/legacy/mapper.cpp b/guest/hals/gralloc/legacy/mapper.cpp
index 17effa9..597e024 100644
--- a/guest/hals/gralloc/legacy/mapper.cpp
+++ b/guest/hals/gralloc/legacy/mapper.cpp
@@ -24,7 +24,7 @@
 #include <sys/types.h>
 
 #include <cutils/hashmap.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/atomic.h>
 
 #include <hardware/hardware.h>
diff --git a/guest/hals/gralloc/legacy/region_registry.cpp b/guest/hals/gralloc/legacy/region_registry.cpp
index dd5fafa..7e26c70 100644
--- a/guest/hals/gralloc/legacy/region_registry.cpp
+++ b/guest/hals/gralloc/legacy/region_registry.cpp
@@ -30,7 +30,7 @@
 #include <sys/types.h>
 
 #include <cutils/hashmap.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/atomic.h>
 
 #include <linux/ashmem.h>
diff --git a/guest/hals/hwcomposer/legacy/base_composer.cpp b/guest/hals/hwcomposer/legacy/base_composer.cpp
index a0266c5..986d241 100644
--- a/guest/hals/hwcomposer/legacy/base_composer.cpp
+++ b/guest/hals/hwcomposer/legacy/base_composer.cpp
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <hardware/gralloc.h>
 
 #include "common/vsoc/lib/screen_region_view.h"
diff --git a/guest/hals/hwcomposer/legacy/hwcomposer.cpp b/guest/hals/hwcomposer/legacy/hwcomposer.cpp
index 33122eb..9711656 100644
--- a/guest/hals/hwcomposer/legacy/hwcomposer.cpp
+++ b/guest/hals/hwcomposer/legacy/hwcomposer.cpp
@@ -44,7 +44,7 @@
 #define HWC_REMOVE_DEPRECATED_VERSIONS 1
 
 #include <cutils/compiler.h>
-#include <cutils/log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include <hardware/gralloc.h>
 #include <hardware/hardware.h>
diff --git a/guest/hals/hwcomposer/legacy/stats_keeper.cpp b/guest/hals/hwcomposer/legacy/stats_keeper.cpp
index 0c64f3e..5d87cd4 100644
--- a/guest/hals/hwcomposer/legacy/stats_keeper.cpp
+++ b/guest/hals/hwcomposer/legacy/stats_keeper.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <algorithm>
diff --git a/guest/hals/hwcomposer/legacy/vsoc_composer.cpp b/guest/hals/hwcomposer/legacy/vsoc_composer.cpp
index 2bc35b3..179e930 100644
--- a/guest/hals/hwcomposer/legacy/vsoc_composer.cpp
+++ b/guest/hals/hwcomposer/legacy/vsoc_composer.cpp
@@ -21,7 +21,7 @@
 #include <utility>
 #include <vector>
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <hardware/hwcomposer.h>
 #include <hardware/hwcomposer_defs.h>
 #include <libyuv.h>
diff --git a/guest/hals/lights/lights_vsoc.c b/guest/hals/lights/lights_vsoc.c
index d1c9c10..25694e0 100644
--- a/guest/hals/lights/lights_vsoc.c
+++ b/guest/hals/lights/lights_vsoc.c
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <cutils/log.h>
+#include <log/log.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <hardware/lights.h>
diff --git a/guest/hals/ril/vsoc_ril.h b/guest/hals/ril/vsoc_ril.h
index e7d03d8..982ff56 100644
--- a/guest/hals/ril/vsoc_ril.h
+++ b/guest/hals/ril/vsoc_ril.h
@@ -20,7 +20,7 @@
 
 #define LOG_TAG "VSoCRil"
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <sys/time.h>
diff --git a/guest/hals/sensors/sensors_hal.h b/guest/hals/sensors/sensors_hal.h
index 4e83790..5e38a1f 100644
--- a/guest/hals/sensors/sensors_hal.h
+++ b/guest/hals/sensors/sensors_hal.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <cutils/log.h>
+#include <log/log.h>
 #include <hardware/hardware.h>
 #include <hardware/sensors.h>
 
diff --git a/guest/libs/remoter/remoter_framework_pkt.h b/guest/libs/remoter/remoter_framework_pkt.h
index 9fc6173..f9e9db8 100644
--- a/guest/libs/remoter/remoter_framework_pkt.h
+++ b/guest/libs/remoter/remoter_framework_pkt.h
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 
 #include <cutils/sockets.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include "common/libs/fs/shared_fd.h"