1 files changed, 3 insertions, 12 deletions

diff --git a/kex.h b/kex.h
index 6465df88d..a5ae6ac05 100644
--- a/kex.h
+++ b/kex.h
@@ -30,6 +30,9 @@
 #include "crypto_api.h"
 
 #ifdef WITH_OPENSSL
+# include <openssl/bn.h>
+# include <openssl/dh.h>
+# include <openssl/ecdsa.h>
 # ifdef OPENSSL_HAS_ECC
 #  include <openssl/ec.h>
 # else /* OPENSSL_HAS_ECC */
@@ -45,18 +48,6 @@
 # define EC_POINT       void
 #endif /* WITH_OPENSSL */
 
-#ifdef WITH_OPENSSL
-#include <openssl/bn.h>
-#include <openssl/dh.h>
-#include <openssl/ec.h>
-#include <openssl/ecdsa.h>
-#else /* OPENSSL */
-#define BIGNUM          void
-#define DH              void
-#define EC_KEY          void
-#define EC_GROUP        void
-#endif /* WITH_OPENSSL */
-
 #define KEX_COOKIE_LEN  16
 
 #define KEX_DH1                         "diffie-hellman-group1-sha1"