diff --git a/Android.mk b/Android.mk
index cf2b291..cbfbbd2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,12 @@
 	CheckBattery.cpp \
 	VoldUtil.c \
 	fstrim.c \
-	cryptfs.c
+	cryptfs.c \
+	Disk.cpp \
+	VolumeBase.cpp \
+	PublicVolume.cpp \
+	EmulatedVolume.cpp \
+	Utils.cpp \
 
 common_c_includes := \
 	system/extras/ext4_utils \
@@ -51,7 +56,7 @@
 	libbatteryservice
 
 vold_conlyflags := -std=c11
-vold_cflags := -Werror -Wall -Wno-missing-field-initializers
+vold_cflags := -Werror -Wall -Wno-missing-field-initializers -Wno-unused-variable -Wno-unused-parameter
 
 include $(CLEAR_VARS)