diff --git a/arch.mk b/arch.mk
index 1bb14475..6d3512ad 100644
--- a/arch.mk
+++ b/arch.mk
@@ -2154,9 +2154,10 @@ ifeq ($(TARGET),lpc55s69)
         $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/hashcrypt_port.o
   endif
   ifeq ($(HWPUF),1)
-    CFLAGS+=-DWOLFSSL_HWPUF -DWOLFSSL_NXP_PUF
+    CFLAGS+=-DWOLFSSL_HWPUF -DWOLFSSL_NXP_HWPUF
     OBJS+=\
         $(MCUXPRESSO)/drivers/puf/fsl_puf.o \
+        $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cryptocb.o \
         $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/hwpuf_port.o
   endif
 endif
diff --git a/test-app/Makefile b/test-app/Makefile
index f8368916..c85cea4f 100644
--- a/test-app/Makefile
+++ b/test-app/Makefile
@@ -1198,9 +1198,11 @@ ifeq ($(TARGET),lpc55s69)
         $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/hashcrypt_port.o
     endif
     ifeq ($(HWPUF),1)
-      CFLAGS+=-DWOLFSSL_HWPUF -DWOLFSSL_NXP_PUF
+      CFLAGS+=-DWOLFSSL_HWPUF -DWOLFSSL_NXP_HWPUF
       APP_OBJS+=\
         $(MCUXPRESSO)/drivers/puf/fsl_puf.o \
+        $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/cryptocb.o \
+        $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/hwpuf.o \
         $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/nxp/hwpuf_port.o
     endif
     ifeq ($(WOLFCRYPT_SUPPORT),1)