diff --git a/libs/netpgp/netpgp-extra.h b/libs/netpgp/netpgp-extra.h
new file mode 100644
index 00000000..d0a34791
--- /dev/null
+++ b/libs/netpgp/netpgp-extra.h
@@ -0,0 +1,13 @@
+#ifndef __NETPGP_EXTRA_H__
+#define __NETPGP_EXTRA_H__
+
+#include <netpgp.h>
+#include "packet-parse.h"
+#include "errors.h"
+#include "netpgpdefs.h"
+#include "crypto.h"
+#include "create.h"
+unsigned rsa_generate_keypair(pgp_key_t *keydata, const int numbits, const unsigned long e, const char *hashalg, const char *cipher);
+unsigned write_seckey_body(const pgp_seckey_t *key, const uint8_t *passphrase, const size_t pplen, pgp_output_t *output);
+
+#endif // __NETPGP_EXTRA_H__
diff --git a/src/mre2ee_driver_openssl.c b/src/mre2ee_driver_openssl.c
index 6bbebbcb..5b333e11 100644
--- a/src/mre2ee_driver_openssl.c
+++ b/src/mre2ee_driver_openssl.c
@@ -48,21 +48,12 @@
 #include <openssl/rand.h>
 #include <openssl/rsa.h>
 #include <openssl/evp.h>
+#include <netpgp-extra.h>
 #include "mrmailbox.h"
 #include "mrkey.h"
 #include "mre2ee.h"
 #include "mre2ee_driver.h"
 
-#ifdef KEYGEN_NETPGP
-#include <netpgp.h>
-#include "packet-parse.h"
-#include "errors.h"
-#include "netpgpdefs.h"
-#include "crypto.h"
-#include "create.h"
-unsigned rsa_generate_keypair(pgp_key_t *keydata, const int numbits, const unsigned long e, const char *hashalg, const char *cipher);
-unsigned write_seckey_body(const pgp_seckey_t *key, const uint8_t *passphrase, const size_t pplen, pgp_output_t *output);
-#endif
 
 void mre2ee_driver_init(mrmailbox_t* mailbox)
 {