diff --git a/include/freerdp/crypto/crypto.h b/include/freerdp/crypto/crypto.h
index 1295e5055..af3566595 100644
--- a/include/freerdp/crypto/crypto.h
+++ b/include/freerdp/crypto/crypto.h
@@ -35,8 +35,6 @@
 #define D2I_X509_CONST
 #endif
 
-#define EXPONENT_MAX_SIZE 4
-
 #include <freerdp/api.h>
 #include <freerdp/freerdp.h>
 #include <freerdp/crypto/certificate.h>
@@ -91,20 +89,6 @@ extern "C"
 	FREERDP_API BOOL crypto_cert_get_public_key(CryptoCert cert, BYTE** PublicKey,
 	                                            DWORD* PublicKeyLength);
 
-	FREERDP_API SSIZE_T crypto_rsa_public_encrypt(const BYTE* input, size_t length,
-	                                              const rdpCertInfo* cert, BYTE* output,
-	                                              size_t output_length);
-	FREERDP_API SSIZE_T crypto_rsa_public_decrypt(const BYTE* input, size_t length,
-	                                              const rdpCertInfo* cert, BYTE* output,
-	                                              size_t output_length);
-	FREERDP_API SSIZE_T crypto_rsa_private_encrypt(const BYTE* input, size_t length,
-	                                               const rdpRsaKey* key, BYTE* output,
-	                                               size_t output_length);
-	FREERDP_API SSIZE_T crypto_rsa_private_decrypt(const BYTE* input, size_t length,
-	                                               const rdpRsaKey* key, BYTE* output,
-	                                               size_t output_length);
-	FREERDP_API void crypto_reverse(BYTE* data, size_t length);
-
 	FREERDP_API char* crypto_base64_encode(const BYTE* data, size_t length);
 	FREERDP_API void crypto_base64_decode(const char* enc_data, size_t length, BYTE** dec_data,
 	                                      size_t* res_length);
diff --git a/libfreerdp/core/certificate.c b/libfreerdp/core/certificate.c
index d6eacbe64..f37c31913 100644
--- a/libfreerdp/core/certificate.c
+++ b/libfreerdp/core/certificate.c
@@ -36,6 +36,7 @@
 #include <openssl/rsa.h>
 
 #include "certificate.h"
+#include "../crypto/crypto.h"
 #include "../crypto/opensslcompat.h"
 
 #define TAG "com.freerdp.core"
diff --git a/libfreerdp/crypto/crypto.c b/libfreerdp/crypto/crypto.c
index 88d5eb463..d42a4250c 100644
--- a/libfreerdp/crypto/crypto.c
+++ b/libfreerdp/crypto/crypto.c
@@ -27,6 +27,8 @@
 #include <freerdp/log.h>
 #include <freerdp/crypto/crypto.h>
 
+#include "crypto.h"
+
 #define TAG FREERDP_TAG("crypto")
 
 CryptoCert crypto_cert_read(const BYTE* data, UINT32 length)
diff --git a/libfreerdp/crypto/crypto.h b/libfreerdp/crypto/crypto.h
new file mode 100644
index 000000000..668f08f3b
--- /dev/null
+++ b/libfreerdp/crypto/crypto.h
@@ -0,0 +1,54 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Cryptographic Abstraction Layer
+ *
+ * Copyright 2011-2012 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef FREERDP_LIB_CRYPTO_H
+#define FREERDP_LIB_CRYPTO_H
+
+/* OpenSSL includes windows.h */
+#include <winpr/windows.h>
+#include <winpr/custom-crypto.h>
+
+#include <freerdp/api.h>
+#include <freerdp/freerdp.h>
+#include <freerdp/crypto/certificate.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+	FREERDP_LOCAL SSIZE_T crypto_rsa_public_encrypt(const BYTE* input, size_t length,
+	                                              const rdpCertInfo* cert, BYTE* output,
+	                                              size_t output_length);
+	FREERDP_LOCAL SSIZE_T crypto_rsa_public_decrypt(const BYTE* input, size_t length,
+	                                              const rdpCertInfo* cert, BYTE* output,
+	                                              size_t output_length);
+	FREERDP_LOCAL SSIZE_T crypto_rsa_private_encrypt(const BYTE* input, size_t length,
+	                                               const rdpRsaKey* key, BYTE* output,
+	                                               size_t output_length);
+	FREERDP_LOCAL SSIZE_T crypto_rsa_private_decrypt(const BYTE* input, size_t length,
+	                                               const rdpRsaKey* key, BYTE* output,
+	                                               size_t output_length);
+	FREERDP_LOCAL void crypto_reverse(BYTE* data, size_t length);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* FREERDP_LIB_CRYPTO_H */