diff --git a/include/wolfboot/wolfboot.h b/include/wolfboot/wolfboot.h
index b9993d69c..58d142bbb 100644
--- a/include/wolfboot/wolfboot.h
+++ b/include/wolfboot/wolfboot.h
@@ -199,7 +199,7 @@ extern "C" {
 
 #endif
 
-#if defined(__WOLFBOOT) || defined (__FLASH_OTP_PRIMER) || defined (UNIT_TEST_AUTH)
+#if defined(__WOLFBOOT) || defined (__FLASH_OTP_PRIMER) || defined (UNIT_TEST_AUTH) || defined(WOLFBOOT_TPM)
 
  /* Authentication configuration */
  #if defined(WOLFBOOT_NO_SIGN)
diff --git a/tools/tpm/Makefile b/tools/tpm/Makefile
index 62e09b361..efa78a0f6 100644
--- a/tools/tpm/Makefile
+++ b/tools/tpm/Makefile
@@ -12,8 +12,8 @@ LD = gcc
 WOLFBOOTDIR = ../..
 WOLFDIR = $(WOLFBOOTDIR)/lib/wolfssl/
 WOLFTPMDIR = $(WOLFBOOTDIR)/lib/wolfTPM/
-CFLAGS = -Wall -Wextra -Werror
-CFLAGS += -DWOLFSSL_USER_SETTINGS -DWOLFTPM_USER_SETTINGS -DWOLFBOOT_TPM -DHAVE_NETDB_H
+CFLAGS = -Wall -Wextra -Werror -Wno-unused-function
+CFLAGS += -DWOLFSSL_USER_SETTINGS -DWOLFTPM_USER_SETTINGS -DWOLFBOOT_TPM -DHAVE_NETDB_H -DWOLFBOOT_SIGN_$(SIGN)
 CFLAGS += -I. -I$(WOLFDIR) -I$(WOLFTPMDIR) -I$(WOLFBOOTDIR)/include
 LDFLAGS =
 OBJDIR = ./
diff --git a/tools/tpm/policy_create.c b/tools/tpm/policy_create.c
index dc53534c9..7143d7066 100644
--- a/tools/tpm/policy_create.c
+++ b/tools/tpm/policy_create.c
@@ -29,7 +29,7 @@
 #include <wolfssl/wolfcrypt/hash.h>
 #include <wolftpm/tpm2_wrap.h>
 #include <hal/tpm_io.h>
-#include "keystore.h"
+#include "wolfboot/wolfboot.h"
 #include "tpm.h"
 
 #define DEFAULT_PCR 16
diff --git a/tools/tpm/rot.c b/tools/tpm/rot.c
index 37802f5b8..9bc53f80a 100644
--- a/tools/tpm/rot.c
+++ b/tools/tpm/rot.c
@@ -24,7 +24,7 @@
 #include <wolfssl/wolfcrypt/hash.h>
 #include <wolftpm/tpm2_wrap.h>
 #include <hal/tpm_io.h>
-#include "keystore.h"
+#include "wolfboot/wolfboot.h"
 #include "tpm.h"
 
 #include <stdio.h>