diff --git a/Makefile b/Makefile
index a84c477bab..29cba20252 100644
--- a/Makefile
+++ b/Makefile
@@ -493,6 +493,7 @@ HOSTLIB_SRCS = \
 	cgpt/cgpt_create.c \
 	cgpt/cgpt_prioritize.c \
 	firmware/2lib/2crc8.c \
+	firmware/2lib/2stub.c \
 	firmware/lib/cgptlib/cgptlib_internal.c \
 	firmware/lib/cgptlib/crc32.c \
 	firmware/lib/gpt_misc.c \
diff --git a/firmware/2lib/include/2common.h b/firmware/2lib/include/2common.h
index 39c8caff20..4ce6f6f8ac 100644
--- a/firmware/2lib/include/2common.h
+++ b/firmware/2lib/include/2common.h
@@ -31,6 +31,7 @@ struct vb2_public_key;
 /* Debug output printf() for tests.  Otherwise, it's platform-dependent. */
 #if defined(VBOOT_DEBUG)
 #  if defined(FOR_TEST)
+#    include <stdio.h>
 #    define VB2_DEBUG(format, args...) printf(format, ## args)
 #  else
 #    define VB2_DEBUG(format, args...) vb2ex_printf(__func__, format, ## args)