diff --git a/edify/Android.mk b/edify/Android.mk
index fbf2b1b..527698e 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -30,8 +30,9 @@
 LOCAL_CPPFLAGS := -Wno-unused-parameter
 LOCAL_CPPFLAGS += -Wno-deprecated-register
 LOCAL_MODULE := libedify
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-LOCAL_STATIC_LIBRARIES += libbase
+LOCAL_STATIC_LIBRARIES += \
+    libotautil \
+    libbase
 
 include $(BUILD_STATIC_LIBRARY)
 
diff --git a/edify/expr.cpp b/edify/expr.cpp
index 403162d..104c0fd 100644
--- a/edify/expr.cpp
+++ b/edify/expr.cpp
@@ -31,7 +31,7 @@
 #include <android-base/stringprintf.h>
 #include <android-base/strings.h>
 
-#include "error_code.h"
+#include "otautil/error_code.h"
 
 // Functions should:
 //
diff --git a/edify/expr.h b/edify/expr.h
index 3282802..770d1cf 100644
--- a/edify/expr.h
+++ b/edify/expr.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <vector>
 
-// Forward declaration to avoid including "error_code.h".
+// Forward declaration to avoid including "otautil/error_code.h".
 enum ErrorCode : int;
 enum CauseCode : int;