diff --git a/ykcs11/token_vendors.c b/ykcs11/token_vendors.c
index 6fc452d..c185f7e 100644
--- a/ykcs11/token_vendors.c
+++ b/ykcs11/token_vendors.c
@@ -4,6 +4,9 @@
 #include <string.h>
 #include "debug.h"
 
+#include <stdbool.h>
+#include "../tool/util.h"
+
 static CK_RV COMMON_token_login(ykpiv_state *state, CK_USER_TYPE user, CK_UTF8CHAR_PTR pin, CK_ULONG pin_len) {
 
   int tries = 0; // TODO: this is effectively disregarded, should we add a better value in ykpiv_verify?
diff --git a/ykcs11/ykcs11.c b/ykcs11/ykcs11.c
index 4025524..32715c0 100644
--- a/ykcs11/ykcs11.c
+++ b/ykcs11/ykcs11.c
@@ -10,6 +10,9 @@
 #include "openssl_types.h"
 #include "debug.h"
 
+#include <stdbool.h>
+#include "../tool/util.h"
+
 #define YKCS11_MANUFACTURER "Yubico (www.yubico.com)"
 #define YKCS11_LIBDESC      "PKCS#11 PIV Library (SP-800-73)"
 
diff --git a/ykcs11/yubico_token.c b/ykcs11/yubico_token.c
index f2df6e2..11a8897 100644
--- a/ykcs11/yubico_token.c
+++ b/ykcs11/yubico_token.c
@@ -2,6 +2,7 @@
 #include "pkcs11.h"
 #include <string.h>
 #include "debug.h"
+#include "objects.h"
 
 #define YUBICO_MECHANISMS_NUM 5