diff --git a/liblog/logd_write.c b/liblog/logd_write.c
index d5d81383b..e40d2cead 100644
--- a/liblog/logd_write.c
+++ b/liblog/logd_write.c
@@ -144,6 +144,7 @@ int __android_log_write(int prio, const char *tag, const char *msg)
     if (!strcmp(tag, "HTC_RIL") ||
         !strcmp(tag, "RILJ") ||
         !strcmp(tag, "RILC") ||
+        !strcmp(tag, "RILD") ||
         !strcmp(tag, "RIL") ||
         !strcmp(tag, "AT") ||
         !strcmp(tag, "GSM") ||
diff --git a/libpixelflinger/Android.mk b/libpixelflinger/Android.mk
index 6edc56fec..510e11eb2 100644
--- a/libpixelflinger/Android.mk
+++ b/libpixelflinger/Android.mk
@@ -49,7 +49,7 @@ PIXELFLINGER_CFLAGS += -fstrict-aliasing -fomit-frame-pointer
 endif
 
 LOCAL_SHARED_LIBRARIES := \
-	libhardware	\
+	libhardware_legacy	\
 	libcutils
 
 ifneq ($(TARGET_ARCH),arm)
diff --git a/libpixelflinger/codeflinger/ARMAssembler.cpp b/libpixelflinger/codeflinger/ARMAssembler.cpp
index c5edadf82..ff7b0b3e0 100644
--- a/libpixelflinger/codeflinger/ARMAssembler.cpp
+++ b/libpixelflinger/codeflinger/ARMAssembler.cpp
@@ -23,7 +23,7 @@
 #include <cutils/properties.h>
 
 #if defined(WITH_LIB_HARDWARE)
-#include <hardware/qemu_tracing.h>
+#include <hardware_legacy/qemu_tracing.h>
 #endif
 
 #include <private/pixelflinger/ggl_context.h>