diff --git a/Android.mk b/Android.mk
index 15e281c..e502d9e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -71,7 +71,6 @@
 
 LOCAL_C_INCLUDES += \
     system/vold \
-    system/extras/ext4_utils \
     system/core/adb \
 
 LOCAL_STATIC_LIBRARIES := \
@@ -98,9 +97,6 @@
 
 LOCAL_HAL_STATIC_LIBRARIES := libhealthd
 
-LOCAL_C_INCLUDES += system/extras/ext4_utils
-LOCAL_STATIC_LIBRARIES += libext4_utils_static libz
-
 ifeq ($(AB_OTA_UPDATER),true)
     LOCAL_CFLAGS += -DAB_OTA_UPDATER=1
 endif
diff --git a/roots.cpp b/roots.cpp
index fe49f2b..14018fc 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -27,12 +27,12 @@
 #include <fcntl.h>
 
 #include <android-base/logging.h>
-
+#include <ext4_utils/make_ext4fs.h>
+#include <ext4_utils/wipe.h>
 #include <fs_mgr.h>
+
 #include "common.h"
-#include "make_ext4fs.h"
 #include "mounts.h"
-#include "wipe.h"
 #include "cryptfs.h"
 
 static struct fstab *fstab = NULL;
diff --git a/updater/Android.mk b/updater/Android.mk
index 507088d..d9fc72c 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -62,7 +62,6 @@
     $(tune2fs_static_libraries)
 
 LOCAL_CFLAGS += -Wno-unused-parameter -Werror
-LOCAL_C_INCLUDES += system/extras/ext4_utils
 LOCAL_STATIC_LIBRARIES += \
     libsparse_static \
     libz
diff --git a/updater/install.cpp b/updater/install.cpp
index 8c33c2b..24e35cf 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -40,6 +40,8 @@
 #include <android-base/properties.h>
 #include <android-base/strings.h>
 #include <android-base/stringprintf.h>
+#include <ext4_utils/make_ext4fs.h>
+#include <ext4_utils/wipe.h>
 #include <selinux/label.h>
 #include <selinux/selinux.h>
 
@@ -57,9 +59,6 @@
 #include "install.h"
 #include "tune2fs.h"
 
-#include "make_ext4fs.h"
-#include "wipe.h"
-
 // Send over the buffer to recovery though the command pipe.
 static void uiPrint(State* state, const std::string& buffer) {
     UpdaterInfo* ui = reinterpret_cast<UpdaterInfo*>(state->cookie);