diff --git a/options.mk b/options.mk
index 2c4b22b0..c8828aed 100644
--- a/options.mk
+++ b/options.mk
@@ -984,6 +984,8 @@ ifeq ($(WOLFTPM),1)
     $(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_packet.o \
     $(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_tis.o \
     $(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_wrap.o \
+    $(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_crypto.o \
+    $(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_util.o \
     $(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_param_enc.o
   CFLAGS+=-I$(WOLFBOOT_LIB_WOLFTPM)
   CFLAGS+=-D"WOLFBOOT_TPM"
diff --git a/stage1/Makefile b/stage1/Makefile
index a5af1526..2f0b027b 100644
--- a/stage1/Makefile
+++ b/stage1/Makefile
@@ -59,6 +59,8 @@ ifeq ($(WOLFTPM),1)
     tpm2_packet.o \
     tpm2_tis.o \
     tpm2_wrap.o \
+    tpm2_crypto.o \
+    tpm2_util.o \
     tpm2_param_enc.o \
     image.o
 endif
diff --git a/tools/tpm/Makefile b/tools/tpm/Makefile
index e9bf9f37..050554b4 100644
--- a/tools/tpm/Makefile
+++ b/tools/tpm/Makefile
@@ -67,6 +67,8 @@ OBJS_REAL=\
 	$(WOLFBOOT_LIB_WOLFTPM)/src/tpm2.o \
 	$(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_linux.o \
 	$(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_packet.o \
+	$(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_crypto.o \
+	$(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_util.o \
 	$(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_param_enc.o \
 	$(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_swtpm.o \
 	$(WOLFBOOT_LIB_WOLFTPM)/src/tpm2_tis.o \