diff --git a/src/pkcs11/pkcs11-spy.c b/src/pkcs11/pkcs11-spy.c
index 92e635cc..83870840 100644
--- a/src/pkcs11/pkcs11-spy.c
+++ b/src/pkcs11/pkcs11-spy.c
@@ -33,12 +33,10 @@
 
 #define CRYPTOKI_EXPORTS
 #include "pkcs11-display.h"
+#include "common/libpkcs11.h"
 
 #define __PASTE(x,y)      x##y
 
-extern void *C_LoadModule(const char *name, CK_FUNCTION_LIST_PTR_PTR);
-extern CK_RV C_UnloadModule(void *module);
-
 /* Declare all spy_* Cryptoki function */
 
 /* Spy Module Function List */
diff --git a/src/pkcs11/sc-pkcs11.h b/src/pkcs11/sc-pkcs11.h
index 22e1cda6..4309b631 100644
--- a/src/pkcs11/sc-pkcs11.h
+++ b/src/pkcs11/sc-pkcs11.h
@@ -47,9 +47,6 @@ extern "C" {
 
 #define SC_PKCS11_SLOT_FOR_PINS		(SC_PKCS11_SLOT_FOR_PIN_USER | SC_PKCS11_SLOT_FOR_PIN_SIGN)
 
-extern void *C_LoadModule(const char *name, CK_FUNCTION_LIST_PTR_PTR);
-extern CK_RV C_UnloadModule(void *module);
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/tools/pkcs11-tool.c b/src/tools/pkcs11-tool.c
index b6b799a6..da2da404 100644
--- a/src/tools/pkcs11-tool.c
+++ b/src/tools/pkcs11-tool.c
@@ -60,6 +60,7 @@
 #include "libopensc/asn1.h"
 #include "common/compat_strlcat.h"
 #include "common/compat_strlcpy.h"
+#include "common/libpkcs11.h"
 #include "util.h"
 #include "libopensc/sc-ossl-compat.h"
 
@@ -69,8 +70,6 @@
 #endif
 #endif
 
-extern void *C_LoadModule(const char *name, CK_FUNCTION_LIST_PTR_PTR);
-extern CK_RV C_UnloadModule(void *module);
 #ifndef ENABLE_SHARED
 extern CK_FUNCTION_LIST pkcs11_function_list;
 #endif