Now that include files are in place in the opencryptoki subdirectory,

remove "#ifndef OPENCRYPTOKI" conditionals

contrib/pkcs11-keygen/destroyobj.c

@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 
 int
 main(int argc, char *argv[])

contrib/pkcs11-keygen/genkey.c

@@ -17,12 +17,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 
 /* Define static key template values */
 static CK_BBOOL truevalue = TRUE;

contrib/pkcs11-keygen/listobjs.c

@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 
 int
 main(int argc, char *argv[])

contrib/pkcs11-keygen/readkey.c

@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 #include <openssl/conf.h>
 #include <openssl/err.h>
 #include <openssl/rsa.h>

contrib/pkcs11-keygen/set_key_id.c

@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 
 int
 main(int argc, char *argv[])

contrib/pkcs11-keygen/writekey.c

@@ -7,12 +7,7 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/types.h>
-#ifndef OPENCRYPTOKI
-#include <security/cryptoki.h>
-#include <security/pkcs11.h>
-#else
 #include <opencryptoki/pkcs11.h>
-#endif
 #include <openssl/conf.h>
 #include <openssl/engine.h>
 #include <openssl/err.h>