diff --git a/include/xmlsec/nss/crypto.h b/include/xmlsec/nss/crypto.h
index c9c09cead..da8168f16 100644
--- a/include/xmlsec/nss/crypto.h
+++ b/include/xmlsec/nss/crypto.h
@@ -12,7 +12,7 @@
 
 #include <nspr.h>
 #include <nss.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 
 #include <xmlsec/exports.h>
 #include <xmlsec/xmlsec.h>
diff --git a/src/nss/app.c b/src/nss/app.c
index 87874ca9e..b33933ea7 100644
--- a/src/nss/app.c
+++ b/src/nss/app.c
@@ -21,7 +21,7 @@
 
 #include <nspr.h>
 #include <nss.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 #include <cert.h>
 #include <keyhi.h>
 #include <pkcs12.h>
diff --git a/src/nss/ciphers.c b/src/nss/ciphers.c
index 3d5e239aa..678070703 100644
--- a/src/nss/ciphers.c
+++ b/src/nss/ciphers.c
@@ -22,7 +22,7 @@
 #include <nspr.h>
 #include <nss.h>
 #include <secoid.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/keys.h>
diff --git a/src/nss/crypto.c b/src/nss/crypto.c
index d7488cf23..d13e38935 100644
--- a/src/nss/crypto.c
+++ b/src/nss/crypto.c
@@ -20,7 +20,7 @@
 #include <string.h>
 
 #include <nss.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 #include <prinit.h>
 
 
diff --git a/src/nss/digests.c b/src/nss/digests.c
index 7c855b09d..38070a5d5 100644
--- a/src/nss/digests.c
+++ b/src/nss/digests.c
@@ -22,7 +22,7 @@
 #include <nspr.h>
 #include <nss.h>
 #include <secoid.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/keys.h>
diff --git a/src/nss/hmac.c b/src/nss/hmac.c
index e4e4f02da..b8fc47731 100644
--- a/src/nss/hmac.c
+++ b/src/nss/hmac.c
@@ -23,7 +23,7 @@
 #include <nspr.h>
 #include <nss.h>
 #include <secoid.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/keys.h>
diff --git a/src/nss/keysstore.c b/src/nss/keysstore.c
index 2693170a9..3969cd01a 100644
--- a/src/nss/keysstore.c
+++ b/src/nss/keysstore.c
@@ -29,7 +29,7 @@
 
 #include <nss.h>
 #include <cert.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 #include <keyhi.h>
 
 #include <xmlsec/xmlsec.h>
diff --git a/src/nss/keytrans.c b/src/nss/keytrans.c
index 6851d131e..3e8ad79f6 100644
--- a/src/nss/keytrans.c
+++ b/src/nss/keytrans.c
@@ -21,7 +21,7 @@
 #include <string.h>
 
 #include <nss.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 #include <keyhi.h>
 #include <hasht.h>
 
diff --git a/src/nss/kw_aes.c b/src/nss/kw_aes.c
index 5495625e7..3b2047c12 100644
--- a/src/nss/kw_aes.c
+++ b/src/nss/kw_aes.c
@@ -24,7 +24,7 @@
 #include <string.h>
 
 #include <nss.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/keys.h>
diff --git a/src/nss/kw_des.c b/src/nss/kw_des.c
index e753bb382..ffb74bf3b 100644
--- a/src/nss/kw_des.c
+++ b/src/nss/kw_des.c
@@ -23,7 +23,7 @@
 #include <string.h>
 
 #include <nss.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 #include <hasht.h>
 
 #include <xmlsec/xmlsec.h>
diff --git a/src/nss/pkikeys.c b/src/nss/pkikeys.c
index e6b8156a5..2f2aca129 100644
--- a/src/nss/pkikeys.c
+++ b/src/nss/pkikeys.c
@@ -18,7 +18,7 @@
 
 #include <string.h>
 
-#include <pk11func.h>
+#include <pk11pub.h>
 #include <keyhi.h>
 #include <pk11pqg.h>
 
diff --git a/src/nss/x509.c b/src/nss/x509.c
index 87633b1ce..9874141a8 100644
--- a/src/nss/x509.c
+++ b/src/nss/x509.c
@@ -30,7 +30,7 @@
 #include <keyhi.h>
 #include <cert.h>
 #include <certdb.h>
-#include <pk11func.h>
+#include <pk11pub.h>
 
 #include <xmlsec/xmlsec.h>
 #include <xmlsec/base64.h>