diff --git a/Android.mk b/Android.mk
index 3d99a02..59a7ef4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -60,7 +60,7 @@ common_shared_libraries := \
 	libkeymaster_messages \
 
 common_static_libraries := \
-	libbootloader_message_writer \
+	libbootloader_message \
 	libfs_mgr \
 	libfec \
 	libfec_rs \
diff --git a/cryptfs.c b/cryptfs.c
index dc6ed4c..a3ab2b9 100644
--- a/cryptfs.c
+++ b/cryptfs.c
@@ -62,7 +62,7 @@
 #include "CheckBattery.h"
 #include "Process.h"
 
-#include <bootloader_message_writer.h>
+#include <bootloader_message/bootloader_message.h>
 #include <hardware/keymaster0.h>
 #include <hardware/keymaster1.h>