diff --git a/deps/openssl/config/opensslconf.h b/deps/openssl/config/opensslconf.h
index 84e5de7c12a811..5345e6da88d012 100644
--- a/deps/openssl/config/opensslconf.h
+++ b/deps/openssl/config/opensslconf.h
@@ -1,49 +1,50 @@
 /* opensslconf.h */
 /* WARNING: Generated automatically from opensslconf.h.in by Configure. */
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
 /* OpenSSL was configured with the following options: */
-#undef OPENSSL_SYSNAME_WIN32
-#if defined(_WIN32)
-# define OPENSSL_SYSNAME_WIN32
+#ifndef OPENSSL_DOING_MAKEDEPEND
+
+
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
+# define OPENSSL_NO_EC_NISTP_64_GCC_128
+#endif
+#ifndef OPENSSL_NO_GMP
+# define OPENSSL_NO_GMP
+#endif
+#ifndef OPENSSL_NO_JPAKE
+# define OPENSSL_NO_JPAKE
+#endif
+#ifndef OPENSSL_NO_KRB5
+# define OPENSSL_NO_KRB5
+#endif
+#ifndef OPENSSL_NO_LIBUNBOUND
+# define OPENSSL_NO_LIBUNBOUND
+#endif
+#ifndef OPENSSL_NO_MD2
+# define OPENSSL_NO_MD2
+#endif
+#ifndef OPENSSL_NO_RC5
+# define OPENSSL_NO_RC5
+#endif
+#ifndef OPENSSL_NO_RFC3779
+# define OPENSSL_NO_RFC3779
+#endif
+#ifndef OPENSSL_NO_SCTP
+# define OPENSSL_NO_SCTP
+#endif
+#ifndef OPENSSL_NO_SSL_TRACE
+# define OPENSSL_NO_SSL_TRACE
+#endif
+#ifndef OPENSSL_NO_STORE
+# define OPENSSL_NO_STORE
+#endif
+#ifndef OPENSSL_NO_UNIT_TEST
+# define OPENSSL_NO_UNIT_TEST
 #endif
 
-#ifndef OPENSSL_DOING_MAKEDEPEND
-# ifndef OPENSSL_NO_CAPIENG
-#  define OPENSSL_NO_CAPIENG
-# endif
-# ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-#  define OPENSSL_NO_EC_NISTP_64_GCC_128
-# endif
-# ifndef OPENSSL_NO_GMP
-#  define OPENSSL_NO_GMP
-# endif
-# ifndef OPENSSL_NO_GOST
-#  define OPENSSL_NO_GOST
-# endif
-# ifndef OPENSSL_NO_HW_PADLOCK
-#  define OPENSSL_NO_HW_PADLOCK
-# endif
-# ifndef OPENSSL_NO_JPAKE
-#  define OPENSSL_NO_JPAKE
-# endif
-# ifndef OPENSSL_NO_KRB5
-#  define OPENSSL_NO_KRB5
-# endif
-# ifndef OPENSSL_NO_MD2
-#  define OPENSSL_NO_MD2
-# endif
-# ifndef OPENSSL_NO_RC5
-#  define OPENSSL_NO_RC5
-# endif
-# ifndef OPENSSL_NO_RFC3779
-#  define OPENSSL_NO_RFC3779
-# endif
-# ifndef OPENSSL_NO_SCTP
-#  define OPENSSL_NO_SCTP
-# endif
-# ifndef OPENSSL_NO_STORE
-#  define OPENSSL_NO_STORE
-# endif
 #endif /* OPENSSL_DOING_MAKEDEPEND */
 
 #ifndef OPENSSL_THREADS
@@ -58,267 +59,200 @@
    who haven't had the time to do the appropriate changes in their
    applications.  */
 #ifdef OPENSSL_ALGORITHM_DEFINES
-# if defined(OPENSSL_NO_CAMELLIA) && !defined(NO_CAMELLIA)
-#  define NO_CAMELLIA
-# endif
-# if defined(OPENSSL_NO_CAPIENG) && !defined(NO_CAPIENG)
-#  define NO_CAPIENG
-# endif
-# if defined(OPENSSL_NO_CAST) && !defined(NO_CAST)
-#  define NO_CAST
-# endif
-# if defined(OPENSSL_NO_CMS) && !defined(NO_CMS)
-#  define NO_CMS
-# endif
-# if defined(OPENSSL_NO_FIPS) && !defined(NO_FIPS)
-#  define NO_FIPS
+# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
+#  define NO_EC_NISTP_64_GCC_128
 # endif
 # if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
 #  define NO_GMP
 # endif
-# if defined(OPENSSL_NO_IDEA) && !defined(NO_IDEA)
-#  define NO_IDEA
-# endif
 # if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
 #  define NO_JPAKE
 # endif
 # if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
 #  define NO_KRB5
 # endif
+# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
+#  define NO_LIBUNBOUND
+# endif
 # if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
 #  define NO_MD2
 # endif
-# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
-#  define NO_MDC2
-# endif
 # if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
 #  define NO_RC5
 # endif
 # if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
 #  define NO_RFC3779
 # endif
-# if defined(OPENSSL_NO_SEED) && !defined(NO_SEED)
-#  define NO_SEED
+# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
+#  define NO_SCTP
 # endif
-# if defined(OPENSSL_NO_SHA0) && !defined(NO_SHA0)
-#  define NO_SHA0
+# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
+#  define NO_SSL_TRACE
 # endif
 # if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
 #  define NO_STORE
 # endif
-# if defined(OPENSSL_NO_WHRLPOOL) && !defined(NO_WHRLPOOL)
-#  define NO_WHRLPOOL
-# endif
-# if defined(OPENSSL_NO_MDC2) && !defined(NO_MDC2)
-#  define NO_MDC2
+# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
+#  define NO_UNIT_TEST
 # endif
 #endif
 
-/* crypto/opensslconf.h.in */
+#define OPENSSL_CPUID_OBJ
 
-#ifdef OPENSSL_DOING_MAKEDEPEND
- /* Include any symbols here that have to be explicitly set to enable a feature
-  * that should be visible to makedepend.
-  *
-  * [Our "make depend" doesn't actually look at this, we use actual build settings
-  * instead; we want to make it easy to remove subdirectories with disabled algorithms.]
-  */
-# ifndef OPENSSL_FIPS
-#  define OPENSSL_FIPS
-# endif
-#endif
+/* crypto/opensslconf.h.in */
 
 /* Generate 80386 code? */
 #undef I386_ONLY
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-# if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#  if defined(_WIN32)
-#   define ENGINESDIR "ssl/lib/engines"
-#   define OPENSSLDIR "ssl"
-#  else
-#   define ENGINESDIR "/usr/local/ssl/lib/engines"
-#   define OPENSSLDIR "/usr/local/ssl"
-#  endif
-# endif
+#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
+#define ENGINESDIR "/usr/local/ssl/lib/engines"
+#define OPENSSLDIR "/usr/local/ssl"
+#endif
 #endif
 
 #undef OPENSSL_UNISTD
 #define OPENSSL_UNISTD <unistd.h>
-#if !defined(_WIN32) && !defined(__arm__) && !defined(__mips__) && !defined(SWIG)
-# include <unistd.h>
-#endif
 
 #undef OPENSSL_EXPORT_VAR_AS_FUNCTION
-#if defined(_WIN32)
-# define OPENSSL_EXPORT_VAR_AS_FUNCTION
-#endif
 
-#if defined(HEADER_IDEA_H)
-# undef IDEA_INT
-# define IDEA_INT unsigned int
+#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
+#define IDEA_INT unsigned int
 #endif
 
-#if defined(HEADER_MD2_H)
-# undef MD2_INT
-# define MD2_INT unsigned int
+#if defined(HEADER_MD2_H) && !defined(MD2_INT)
+#define MD2_INT unsigned int
 #endif
 
-#if defined(HEADER_RC2_H)
+#if defined(HEADER_RC2_H) && !defined(RC2_INT)
 /* I need to put in a mod for the alpha - eay */
-# undef RC2_INT
-# define RC2_INT unsigned int
+#define RC2_INT unsigned int
 #endif
 
 #if defined(HEADER_RC4_H)
- /* using int types make the structure larger but make the code faster
-  * on most boxes I have tested - up to %20 faster. */
- /*
-  * I don't know what does "most" mean, but declaring "int" is a must on:
-  * - Intel P6 because partial register stalls are very expensive;
-  * - elder Alpha because it lacks byte load/store instructions;
-  */
-# undef RC4_INT
-# if defined(__arm__)
-#  define RC4_INT unsigned char
-# else
-#  define RC4_INT unsigned int
-# endif
-
-  /*
-   * This enables code handling data aligned at natural CPU word
-   * boundary. See crypto/rc4/rc4_enc.c for further details.
-   */
-# undef RC4_CHUNK
-# if defined(_M_X64) || defined(__aarch64__) || defined(__x86_64__)
-#  define RC4_CHUNK unsigned long long
-# elif defined(__arm__)
-#  define RC4_CHUNK unsigned long
-# else
-   /* On x86 RC4_CHUNK is not defined */
-# endif
+#if !defined(RC4_INT)
+/* using int types make the structure larger but make the code faster
+ * on most boxes I have tested - up to %20 faster. */
+/*
+ * I don't know what does "most" mean, but declaring "int" is a must on:
+ * - Intel P6 because partial register stalls are very expensive;
+ * - elder Alpha because it lacks byte load/store instructions;
+ */
+#define RC4_INT unsigned int
+#endif
+#if !defined(RC4_CHUNK)
+/*
+ * This enables code handling data aligned at natural CPU word
+ * boundary. See crypto/rc4/rc4_enc.c for further details.
+ */
+#define RC4_CHUNK unsigned long
+#endif
 #endif
 
-#if defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)
- /* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
-  * %20 speed up (longs are 8 bytes, int's are 4). */
-# undef DES_LONG
-# define DES_LONG unsigned int
+#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
+/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
+ * %20 speed up (longs are 8 bytes, int's are 4). */
+#ifndef DES_LONG
+#define DES_LONG unsigned int
+#endif
 #endif
 
 #if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-# define CONFIG_HEADER_BN_H
+#define CONFIG_HEADER_BN_H
+#undef BN_LLONG
 
- /* Should we define BN_DIV2W here? */
+/* Should we define BN_DIV2W here? */
 
- /* Only one for the following should be defined */
- /* The prime number generation stuff may not work when
-  * EIGHT_BIT but I don't care since I've only used this mode
-  * for debuging the bignum libraries */
-# undef SIXTY_FOUR_BIT_LONG
-# undef SIXTY_FOUR_BIT
-# undef THIRTY_TWO_BIT
-# undef SIXTEEN_BIT
-# undef EIGHT_BIT
-# if defined(_M_X64) || defined(__aarch64__) || defined(__x86_64__)
-#  if defined(_LP64)
-#   define SIXTY_FOUR_BIT_LONG
-#  else
-#   define SIXTY_FOUR_BIT
-#  endif
-# elif defined(_M_IX86) || defined(__i386__) || defined(__arm__) || defined(__mips__)
-#  define THIRTY_TWO_BIT
-# endif
+/* Only one for the following should be defined */
+#define SIXTY_FOUR_BIT_LONG
+#undef SIXTY_FOUR_BIT
+#undef THIRTY_TWO_BIT
 #endif
 
 #if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-# define CONFIG_HEADER_RC4_LOCL_H
- /* if this is defined data[i] is used instead of *data, this is a %20
-  * speedup on x86 */
-# undef RC4_INDEX
-# if defined(_M_IX86) || defined(__i386__)
-#  define RC4_INDEX
-# endif
+#define CONFIG_HEADER_RC4_LOCL_H
+/* if this is defined data[i] is used instead of *data, this is a %20
+ * speedup on x86 */
+#undef RC4_INDEX
 #endif
 
 #if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-# define CONFIG_HEADER_BF_LOCL_H
-# undef BF_PTR
-# if defined(__arm__)
-#  define BF_PTR
-# endif
+#define CONFIG_HEADER_BF_LOCL_H
+#undef BF_PTR
 #endif /* HEADER_BF_LOCL_H */
 
 #if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-# define CONFIG_HEADER_DES_LOCL_H
-
-# ifndef DES_DEFAULT_OPTIONS
-   /* the following is tweaked from a config script, that is why it is a
-    * protected undef/define */
-#  undef DES_PTR
-#  if !defined(_WIN32) && (defined(_M_IX86) || defined(__i386__))
-#   define DES_PTR
-#  endif
+#define CONFIG_HEADER_DES_LOCL_H
+#ifndef DES_DEFAULT_OPTIONS
+/* the following is tweaked from a config script, that is why it is a
+ * protected undef/define */
+#ifndef DES_PTR
+#undef DES_PTR
+#endif
 
-   /* This helps C compiler generate the correct code for multiple functional
-    * units.  It reduces register dependancies at the expense of 2 more
-    * registers */
-#  undef DES_RISC1
-#  if !defined(_WIN32) && (defined(_M_IX86) || defined(__i386__))
-#   define DES_RISC1
-#  endif
+/* This helps C compiler generate the correct code for multiple functional
+ * units.  It reduces register dependancies at the expense of 2 more
+ * registers */
+#ifndef DES_RISC1
+#undef DES_RISC1
+#endif
 
-#  undef DES_RISC2
+#ifndef DES_RISC2
+#undef DES_RISC2
+#endif
 
-#  if defined(DES_RISC1) && defined(DES_RISC2)
-#   error YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#  endif
+#if defined(DES_RISC1) && defined(DES_RISC2)
+YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
+#endif
 
-  /* Unroll the inner loop, this sometimes helps, sometimes hinders.
-   * Very mucy CPU dependant */
-#  undef DES_UNROLL
-#  if !defined(_WIN32)
-#   define DES_UNROLL
-#  endif
+/* Unroll the inner loop, this sometimes helps, sometimes hinders.
+ * Very mucy CPU dependant */
+#ifndef DES_UNROLL
+#define DES_UNROLL
+#endif
 
-  /* These default values were supplied by
-   * Peter Gutman <pgut001@cs.auckland.ac.nz>
-   * They are only used if nothing else has been defined */
-# if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-   /* Special defines which change the way the code is built depending on the
-      CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
-      even newer MIPS CPU's, but at the moment one size fits all for
-      optimization options.  Older Sparc's work better with only UNROLL, but
-      there's no way to tell at compile time what it is you're running on */
-#  if defined( sun )		/* Newer Sparc's */
-#    define DES_PTR
-#    define DES_RISC1
-#    define DES_UNROLL
-#  elif defined( __ultrix )	/* Older MIPS */
-#    define DES_PTR
-#    define DES_RISC2
-#    define DES_UNROLL
-#  elif defined( __osf1__ )	/* Alpha */
-#    define DES_PTR
-#    define DES_RISC2
-#  elif defined ( _AIX )		/* RS6000 */
-    /* Unknown */
-#  elif defined( __hpux )		/* HP-PA */
-    /* Unknown */
-#  elif defined( __aux )		/* 68K */
-    /* Unknown */
-#  elif defined( __dgux )		/* 88K (but P6 in latest boxes) */
-#    define DES_UNROLL
-#  elif defined( __sgi )		/* Newer MIPS */
-#    define DES_PTR
-#    define DES_RISC2
-#    define DES_UNROLL
-#  elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
-#    define DES_PTR
-#    define DES_RISC1
-#    define DES_UNROLL
-#  endif /* Systems-specific speed defines */
-# endif
+/* These default values were supplied by
+ * Peter Gutman <pgut001@cs.auckland.ac.nz>
+ * They are only used if nothing else has been defined */
+#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
+/* Special defines which change the way the code is built depending on the
+   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
+   even newer MIPS CPU's, but at the moment one size fits all for
+   optimization options.  Older Sparc's work better with only UNROLL, but
+   there's no way to tell at compile time what it is you're running on */
+ 
+#if defined( sun )		/* Newer Sparc's */
+#  define DES_PTR
+#  define DES_RISC1
+#  define DES_UNROLL
+#elif defined( __ultrix )	/* Older MIPS */
+#  define DES_PTR
+#  define DES_RISC2
+#  define DES_UNROLL
+#elif defined( __osf1__ )	/* Alpha */
+#  define DES_PTR
+#  define DES_RISC2
+#elif defined ( _AIX )		/* RS6000 */
+  /* Unknown */
+#elif defined( __hpux )		/* HP-PA */
+  /* Unknown */
+#elif defined( __aux )		/* 68K */
+  /* Unknown */
+#elif defined( __dgux )		/* 88K (but P6 in latest boxes) */
+#  define DES_UNROLL
+#elif defined( __sgi )		/* Newer MIPS */
+#  define DES_PTR
+#  define DES_RISC2
+#  define DES_UNROLL
+#elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
+#  define DES_PTR
+#  define DES_RISC1
+#  define DES_UNROLL
+#endif /* Systems-specific speed defines */
+#endif
 
-# endif /* DES_DEFAULT_OPTIONS */
+#endif /* DES_DEFAULT_OPTIONS */
 #endif /* HEADER_DES_LOCL_H */
+#ifdef  __cplusplus
+}
+#endif
diff --git a/deps/openssl/openssl/crypto/opensslconf.h b/deps/openssl/openssl/crypto/opensslconf.h
index cd63b87ab71e7a..76c99d433ab886 100644
--- a/deps/openssl/openssl/crypto/opensslconf.h
+++ b/deps/openssl/openssl/crypto/opensslconf.h
@@ -1,253 +1 @@
-/* opensslconf.h */
-/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-/* OpenSSL was configured with the following options: */
-#ifndef OPENSSL_DOING_MAKEDEPEND
-
-
-#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
-# define OPENSSL_NO_EC_NISTP_64_GCC_128
-#endif
-#ifndef OPENSSL_NO_GMP
-# define OPENSSL_NO_GMP
-#endif
-#ifndef OPENSSL_NO_JPAKE
-# define OPENSSL_NO_JPAKE
-#endif
-#ifndef OPENSSL_NO_KRB5
-# define OPENSSL_NO_KRB5
-#endif
-#ifndef OPENSSL_NO_LIBUNBOUND
-# define OPENSSL_NO_LIBUNBOUND
-#endif
-#ifndef OPENSSL_NO_MD2
-# define OPENSSL_NO_MD2
-#endif
-#ifndef OPENSSL_NO_RC5
-# define OPENSSL_NO_RC5
-#endif
-#ifndef OPENSSL_NO_RFC3779
-# define OPENSSL_NO_RFC3779
-#endif
-#ifndef OPENSSL_NO_SCTP
-# define OPENSSL_NO_SCTP
-#endif
-#ifndef OPENSSL_NO_SSL_TRACE
-# define OPENSSL_NO_SSL_TRACE
-#endif
-#ifndef OPENSSL_NO_STORE
-# define OPENSSL_NO_STORE
-#endif
-#ifndef OPENSSL_NO_UNIT_TEST
-# define OPENSSL_NO_UNIT_TEST
-#endif
-
-#endif /* OPENSSL_DOING_MAKEDEPEND */
-
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
-# define OPENSSL_NO_DYNAMIC_ENGINE
-#endif
-
-/* The OPENSSL_NO_* macros are also defined as NO_* if the application
-   asks for it.  This is a transient feature that is provided for those
-   who haven't had the time to do the appropriate changes in their
-   applications.  */
-#ifdef OPENSSL_ALGORITHM_DEFINES
-# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
-#  define NO_EC_NISTP_64_GCC_128
-# endif
-# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
-#  define NO_GMP
-# endif
-# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
-#  define NO_JPAKE
-# endif
-# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
-#  define NO_KRB5
-# endif
-# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
-#  define NO_LIBUNBOUND
-# endif
-# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
-#  define NO_MD2
-# endif
-# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
-#  define NO_RC5
-# endif
-# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
-#  define NO_RFC3779
-# endif
-# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
-#  define NO_SCTP
-# endif
-# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
-#  define NO_SSL_TRACE
-# endif
-# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
-#  define NO_STORE
-# endif
-# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
-#  define NO_UNIT_TEST
-# endif
-#endif
-
-/* crypto/opensslconf.h.in */
-
-/* Generate 80386 code? */
-#undef I386_ONLY
-
-#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
-#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/usr/local/ssl/lib/engines"
-#define OPENSSLDIR "/usr/local/ssl"
-#endif
-#endif
-
-#undef OPENSSL_UNISTD
-#define OPENSSL_UNISTD <unistd.h>
-
-#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
-
-#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
-#define IDEA_INT unsigned int
-#endif
-
-#if defined(HEADER_MD2_H) && !defined(MD2_INT)
-#define MD2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC2_H) && !defined(RC2_INT)
-/* I need to put in a mod for the alpha - eay */
-#define RC2_INT unsigned int
-#endif
-
-#if defined(HEADER_RC4_H)
-#if !defined(RC4_INT)
-/* using int types make the structure larger but make the code faster
- * on most boxes I have tested - up to %20 faster. */
-/*
- * I don't know what does "most" mean, but declaring "int" is a must on:
- * - Intel P6 because partial register stalls are very expensive;
- * - elder Alpha because it lacks byte load/store instructions;
- */
-#define RC4_INT unsigned int
-#endif
-#if !defined(RC4_CHUNK)
-/*
- * This enables code handling data aligned at natural CPU word
- * boundary. See crypto/rc4/rc4_enc.c for further details.
- */
-#undef RC4_CHUNK
-#endif
-#endif
-
-#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
-/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
- * %20 speed up (longs are 8 bytes, int's are 4). */
-#ifndef DES_LONG
-#define DES_LONG unsigned long
-#endif
-#endif
-
-#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
-#define CONFIG_HEADER_BN_H
-#undef BN_LLONG
-
-/* Should we define BN_DIV2W here? */
-
-/* Only one for the following should be defined */
-#undef SIXTY_FOUR_BIT_LONG
-#undef SIXTY_FOUR_BIT
-#define THIRTY_TWO_BIT
-#endif
-
-#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
-#define CONFIG_HEADER_RC4_LOCL_H
-/* if this is defined data[i] is used instead of *data, this is a %20
- * speedup on x86 */
-#undef RC4_INDEX
-#endif
-
-#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
-#define CONFIG_HEADER_BF_LOCL_H
-#undef BF_PTR
-#endif /* HEADER_BF_LOCL_H */
-
-#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
-#define CONFIG_HEADER_DES_LOCL_H
-#ifndef DES_DEFAULT_OPTIONS
-/* the following is tweaked from a config script, that is why it is a
- * protected undef/define */
-#ifndef DES_PTR
-#undef DES_PTR
-#endif
-
-/* This helps C compiler generate the correct code for multiple functional
- * units.  It reduces register dependancies at the expense of 2 more
- * registers */
-#ifndef DES_RISC1
-#undef DES_RISC1
-#endif
-
-#ifndef DES_RISC2
-#undef DES_RISC2
-#endif
-
-#if defined(DES_RISC1) && defined(DES_RISC2)
-YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
-#endif
-
-/* Unroll the inner loop, this sometimes helps, sometimes hinders.
- * Very mucy CPU dependant */
-#ifndef DES_UNROLL
-#undef DES_UNROLL
-#endif
-
-/* These default values were supplied by
- * Peter Gutman <pgut001@cs.auckland.ac.nz>
- * They are only used if nothing else has been defined */
-#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
-/* Special defines which change the way the code is built depending on the
-   CPU and OS.  For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
-   even newer MIPS CPU's, but at the moment one size fits all for
-   optimization options.  Older Sparc's work better with only UNROLL, but
-   there's no way to tell at compile time what it is you're running on */
- 
-#if defined( sun )		/* Newer Sparc's */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#elif defined( __ultrix )	/* Older MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined( __osf1__ )	/* Alpha */
-#  define DES_PTR
-#  define DES_RISC2
-#elif defined ( _AIX )		/* RS6000 */
-  /* Unknown */
-#elif defined( __hpux )		/* HP-PA */
-  /* Unknown */
-#elif defined( __aux )		/* 68K */
-  /* Unknown */
-#elif defined( __dgux )		/* 88K (but P6 in latest boxes) */
-#  define DES_UNROLL
-#elif defined( __sgi )		/* Newer MIPS */
-#  define DES_PTR
-#  define DES_RISC2
-#  define DES_UNROLL
-#elif defined(i386) || defined(__i386__)	/* x86 boxes, should be gcc */
-#  define DES_PTR
-#  define DES_RISC1
-#  define DES_UNROLL
-#endif /* Systems-specific speed defines */
-#endif
-
-#endif /* DES_DEFAULT_OPTIONS */
-#endif /* HEADER_DES_LOCL_H */
-#ifdef  __cplusplus
-}
-#endif
+#include "../../config/opensslconf.h"
diff --git a/deps/openssl/openssl/include/openssl/aes.h b/deps/openssl/openssl/include/openssl/aes.h
deleted file mode 120000
index f555c13ed7b49f..00000000000000
--- a/deps/openssl/openssl/include/openssl/aes.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/aes/aes.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/aes.h b/deps/openssl/openssl/include/openssl/aes.h
new file mode 100644
index 00000000000000..f646d41f060493
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/aes.h
@@ -0,0 +1 @@
+#include "../../crypto/aes/aes.h"
diff --git a/deps/openssl/openssl/include/openssl/asn1.h b/deps/openssl/openssl/include/openssl/asn1.h
deleted file mode 120000
index dd514954a1155d..00000000000000
--- a/deps/openssl/openssl/include/openssl/asn1.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/asn1/asn1.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/asn1.h b/deps/openssl/openssl/include/openssl/asn1.h
new file mode 100644
index 00000000000000..5432ed8dc83730
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/asn1.h
@@ -0,0 +1 @@
+#include "../../crypto/asn1/asn1.h"
diff --git a/deps/openssl/openssl/include/openssl/asn1_mac.h b/deps/openssl/openssl/include/openssl/asn1_mac.h
deleted file mode 120000
index 97781d99331ba3..00000000000000
--- a/deps/openssl/openssl/include/openssl/asn1_mac.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/asn1/asn1_mac.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/asn1_mac.h b/deps/openssl/openssl/include/openssl/asn1_mac.h
new file mode 100644
index 00000000000000..214787c4774646
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/asn1_mac.h
@@ -0,0 +1 @@
+#include "../../crypto/asn1/asn1_mac.h"
diff --git a/deps/openssl/openssl/include/openssl/asn1t.h b/deps/openssl/openssl/include/openssl/asn1t.h
deleted file mode 120000
index 31c87c38853dac..00000000000000
--- a/deps/openssl/openssl/include/openssl/asn1t.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/asn1/asn1t.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/asn1t.h b/deps/openssl/openssl/include/openssl/asn1t.h
new file mode 100644
index 00000000000000..4de87a9c610d26
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/asn1t.h
@@ -0,0 +1 @@
+#include "../../crypto/asn1/asn1t.h"
diff --git a/deps/openssl/openssl/include/openssl/bio.h b/deps/openssl/openssl/include/openssl/bio.h
deleted file mode 120000
index c598b6f73a74c1..00000000000000
--- a/deps/openssl/openssl/include/openssl/bio.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/bio/bio.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/bio.h b/deps/openssl/openssl/include/openssl/bio.h
new file mode 100644
index 00000000000000..34f8a2df07eec0
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/bio.h
@@ -0,0 +1 @@
+#include "../../crypto/bio/bio.h"
diff --git a/deps/openssl/openssl/include/openssl/blowfish.h b/deps/openssl/openssl/include/openssl/blowfish.h
deleted file mode 120000
index 88bf9223423399..00000000000000
--- a/deps/openssl/openssl/include/openssl/blowfish.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/bf/blowfish.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/blowfish.h b/deps/openssl/openssl/include/openssl/blowfish.h
new file mode 100644
index 00000000000000..8d515feb0588e5
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/blowfish.h
@@ -0,0 +1 @@
+#include "../../crypto/bf/blowfish.h"
diff --git a/deps/openssl/openssl/include/openssl/bn.h b/deps/openssl/openssl/include/openssl/bn.h
deleted file mode 120000
index 5c251c135af4d4..00000000000000
--- a/deps/openssl/openssl/include/openssl/bn.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/bn/bn.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/bn.h b/deps/openssl/openssl/include/openssl/bn.h
new file mode 100644
index 00000000000000..f47d65a93f4935
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/bn.h
@@ -0,0 +1 @@
+#include "../../crypto/bn/bn.h"
diff --git a/deps/openssl/openssl/include/openssl/buffer.h b/deps/openssl/openssl/include/openssl/buffer.h
deleted file mode 120000
index 76ea7114a2b457..00000000000000
--- a/deps/openssl/openssl/include/openssl/buffer.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/buffer/buffer.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/buffer.h b/deps/openssl/openssl/include/openssl/buffer.h
new file mode 100644
index 00000000000000..1d2c2a2ec1b266
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/buffer.h
@@ -0,0 +1 @@
+#include "../../crypto/buffer/buffer.h"
diff --git a/deps/openssl/openssl/include/openssl/camellia.h b/deps/openssl/openssl/include/openssl/camellia.h
deleted file mode 120000
index ad10f9792b6bb2..00000000000000
--- a/deps/openssl/openssl/include/openssl/camellia.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/camellia/camellia.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/camellia.h b/deps/openssl/openssl/include/openssl/camellia.h
new file mode 100644
index 00000000000000..5a0a141eed5783
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/camellia.h
@@ -0,0 +1 @@
+#include "../../crypto/camellia/camellia.h"
diff --git a/deps/openssl/openssl/include/openssl/cast.h b/deps/openssl/openssl/include/openssl/cast.h
deleted file mode 120000
index b775ab04b8144a..00000000000000
--- a/deps/openssl/openssl/include/openssl/cast.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/cast/cast.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/cast.h b/deps/openssl/openssl/include/openssl/cast.h
new file mode 100644
index 00000000000000..12cf92c4a9b614
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/cast.h
@@ -0,0 +1 @@
+#include "../../crypto/cast/cast.h"
diff --git a/deps/openssl/openssl/include/openssl/cmac.h b/deps/openssl/openssl/include/openssl/cmac.h
deleted file mode 120000
index bfb70c468304ae..00000000000000
--- a/deps/openssl/openssl/include/openssl/cmac.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/cmac/cmac.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/cmac.h b/deps/openssl/openssl/include/openssl/cmac.h
new file mode 100644
index 00000000000000..a7579aeabdd0f7
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/cmac.h
@@ -0,0 +1 @@
+#include "../../crypto/cmac/cmac.h"
diff --git a/deps/openssl/openssl/include/openssl/cms.h b/deps/openssl/openssl/include/openssl/cms.h
deleted file mode 120000
index 0f651adde2c0e2..00000000000000
--- a/deps/openssl/openssl/include/openssl/cms.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/cms/cms.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/cms.h b/deps/openssl/openssl/include/openssl/cms.h
new file mode 100644
index 00000000000000..8687c7fe467ff9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/cms.h
@@ -0,0 +1 @@
+#include "../../crypto/cms/cms.h"
diff --git a/deps/openssl/openssl/include/openssl/comp.h b/deps/openssl/openssl/include/openssl/comp.h
deleted file mode 120000
index 712c9d4ae58c94..00000000000000
--- a/deps/openssl/openssl/include/openssl/comp.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/comp/comp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/comp.h b/deps/openssl/openssl/include/openssl/comp.h
new file mode 100644
index 00000000000000..d14e36cc36b816
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/comp.h
@@ -0,0 +1 @@
+#include "../../crypto/comp/comp.h"
diff --git a/deps/openssl/openssl/include/openssl/conf.h b/deps/openssl/openssl/include/openssl/conf.h
deleted file mode 120000
index 44156b189b096a..00000000000000
--- a/deps/openssl/openssl/include/openssl/conf.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/conf/conf.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/conf.h b/deps/openssl/openssl/include/openssl/conf.h
new file mode 100644
index 00000000000000..3882c82f8d065d
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/conf.h
@@ -0,0 +1 @@
+#include "../../crypto/conf/conf.h"
diff --git a/deps/openssl/openssl/include/openssl/conf_api.h b/deps/openssl/openssl/include/openssl/conf_api.h
deleted file mode 120000
index 26b42198a86af6..00000000000000
--- a/deps/openssl/openssl/include/openssl/conf_api.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/conf/conf_api.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/conf_api.h b/deps/openssl/openssl/include/openssl/conf_api.h
new file mode 100644
index 00000000000000..03933578574da9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/conf_api.h
@@ -0,0 +1 @@
+#include "../../crypto/conf/conf_api.h"
diff --git a/deps/openssl/openssl/include/openssl/crypto.h b/deps/openssl/openssl/include/openssl/crypto.h
deleted file mode 120000
index 2f3f63cb016cd9..00000000000000
--- a/deps/openssl/openssl/include/openssl/crypto.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/crypto.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/crypto.h b/deps/openssl/openssl/include/openssl/crypto.h
new file mode 100644
index 00000000000000..7e3d91e42f06da
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/crypto.h
@@ -0,0 +1 @@
+#include "../../crypto/crypto.h"
diff --git a/deps/openssl/openssl/include/openssl/des.h b/deps/openssl/openssl/include/openssl/des.h
deleted file mode 120000
index 5eb7c88b38a1ad..00000000000000
--- a/deps/openssl/openssl/include/openssl/des.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/des/des.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/des.h b/deps/openssl/openssl/include/openssl/des.h
new file mode 100644
index 00000000000000..1d6631e9b6a2c8
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/des.h
@@ -0,0 +1 @@
+#include "../../crypto/des/des.h"
diff --git a/deps/openssl/openssl/include/openssl/des_old.h b/deps/openssl/openssl/include/openssl/des_old.h
deleted file mode 120000
index 970989880523ec..00000000000000
--- a/deps/openssl/openssl/include/openssl/des_old.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/des/des_old.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/des_old.h b/deps/openssl/openssl/include/openssl/des_old.h
new file mode 100644
index 00000000000000..e5828733cca68e
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/des_old.h
@@ -0,0 +1 @@
+#include "../../crypto/des/des_old.h"
diff --git a/deps/openssl/openssl/include/openssl/dh.h b/deps/openssl/openssl/include/openssl/dh.h
deleted file mode 120000
index c0eacb5eb352f9..00000000000000
--- a/deps/openssl/openssl/include/openssl/dh.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/dh/dh.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/dh.h b/deps/openssl/openssl/include/openssl/dh.h
new file mode 100644
index 00000000000000..f70a767ac90de1
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/dh.h
@@ -0,0 +1 @@
+#include "../../crypto/dh/dh.h"
diff --git a/deps/openssl/openssl/include/openssl/dsa.h b/deps/openssl/openssl/include/openssl/dsa.h
deleted file mode 120000
index ad4695f9b6ae86..00000000000000
--- a/deps/openssl/openssl/include/openssl/dsa.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/dsa/dsa.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/dsa.h b/deps/openssl/openssl/include/openssl/dsa.h
new file mode 100644
index 00000000000000..0365acfe665be6
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/dsa.h
@@ -0,0 +1 @@
+#include "../../crypto/dsa/dsa.h"
diff --git a/deps/openssl/openssl/include/openssl/dso.h b/deps/openssl/openssl/include/openssl/dso.h
deleted file mode 120000
index b1f215dafc8997..00000000000000
--- a/deps/openssl/openssl/include/openssl/dso.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/dso/dso.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/dso.h b/deps/openssl/openssl/include/openssl/dso.h
new file mode 100644
index 00000000000000..f3c8de23065971
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/dso.h
@@ -0,0 +1 @@
+#include "../../crypto/dso/dso.h"
diff --git a/deps/openssl/openssl/include/openssl/dtls1.h b/deps/openssl/openssl/include/openssl/dtls1.h
deleted file mode 120000
index 95aef9913ab0f6..00000000000000
--- a/deps/openssl/openssl/include/openssl/dtls1.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ssl/dtls1.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/dtls1.h b/deps/openssl/openssl/include/openssl/dtls1.h
new file mode 100644
index 00000000000000..ac8ab57453cb53
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/dtls1.h
@@ -0,0 +1 @@
+#include "../../ssl/dtls1.h"
diff --git a/deps/openssl/openssl/include/openssl/e_os2.h b/deps/openssl/openssl/include/openssl/e_os2.h
deleted file mode 120000
index 0e8c03992489f9..00000000000000
--- a/deps/openssl/openssl/include/openssl/e_os2.h
+++ /dev/null
@@ -1 +0,0 @@
-../../e_os2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/e_os2.h b/deps/openssl/openssl/include/openssl/e_os2.h
new file mode 100644
index 00000000000000..ab3f1ee44f4ec2
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/e_os2.h
@@ -0,0 +1 @@
+#include "../../e_os2.h"
diff --git a/deps/openssl/openssl/include/openssl/ebcdic.h b/deps/openssl/openssl/include/openssl/ebcdic.h
deleted file mode 120000
index a7ee60e0aeef49..00000000000000
--- a/deps/openssl/openssl/include/openssl/ebcdic.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ebcdic.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ebcdic.h b/deps/openssl/openssl/include/openssl/ebcdic.h
new file mode 100644
index 00000000000000..6dedc7051d2262
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ebcdic.h
@@ -0,0 +1 @@
+#include "../../crypto/ebcdic.h"
diff --git a/deps/openssl/openssl/include/openssl/ec.h b/deps/openssl/openssl/include/openssl/ec.h
deleted file mode 120000
index 245497eda7c065..00000000000000
--- a/deps/openssl/openssl/include/openssl/ec.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ec/ec.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ec.h b/deps/openssl/openssl/include/openssl/ec.h
new file mode 100644
index 00000000000000..7d2061452608a7
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ec.h
@@ -0,0 +1 @@
+#include "../../crypto/ec/ec.h"
diff --git a/deps/openssl/openssl/include/openssl/ecdh.h b/deps/openssl/openssl/include/openssl/ecdh.h
deleted file mode 120000
index 3fd1c3ba39fd13..00000000000000
--- a/deps/openssl/openssl/include/openssl/ecdh.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ecdh/ecdh.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ecdh.h b/deps/openssl/openssl/include/openssl/ecdh.h
new file mode 100644
index 00000000000000..ad6e3dc9c7e133
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ecdh.h
@@ -0,0 +1 @@
+#include "../../crypto/ecdh/ecdh.h"
diff --git a/deps/openssl/openssl/include/openssl/ecdsa.h b/deps/openssl/openssl/include/openssl/ecdsa.h
deleted file mode 120000
index e48acc669ce0c1..00000000000000
--- a/deps/openssl/openssl/include/openssl/ecdsa.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ecdsa/ecdsa.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ecdsa.h b/deps/openssl/openssl/include/openssl/ecdsa.h
new file mode 100644
index 00000000000000..da451230932bef
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ecdsa.h
@@ -0,0 +1 @@
+#include "../../crypto/ecdsa/ecdsa.h"
diff --git a/deps/openssl/openssl/include/openssl/engine.h b/deps/openssl/openssl/include/openssl/engine.h
deleted file mode 120000
index a02073e32aad74..00000000000000
--- a/deps/openssl/openssl/include/openssl/engine.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/engine/engine.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/engine.h b/deps/openssl/openssl/include/openssl/engine.h
new file mode 100644
index 00000000000000..2dceaac6c785e9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/engine.h
@@ -0,0 +1 @@
+#include "../../crypto/engine/engine.h"
diff --git a/deps/openssl/openssl/include/openssl/err.h b/deps/openssl/openssl/include/openssl/err.h
deleted file mode 120000
index 20f65bd9c8c7cd..00000000000000
--- a/deps/openssl/openssl/include/openssl/err.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/err/err.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/err.h b/deps/openssl/openssl/include/openssl/err.h
new file mode 100644
index 00000000000000..caf89a936cd426
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/err.h
@@ -0,0 +1 @@
+#include "../../crypto/err/err.h"
diff --git a/deps/openssl/openssl/include/openssl/evp.h b/deps/openssl/openssl/include/openssl/evp.h
deleted file mode 120000
index 7e3a904ae95a7c..00000000000000
--- a/deps/openssl/openssl/include/openssl/evp.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/evp/evp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/evp.h b/deps/openssl/openssl/include/openssl/evp.h
new file mode 100644
index 00000000000000..dd7bcda8f3c8c4
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/evp.h
@@ -0,0 +1 @@
+#include "../../crypto/evp/evp.h"
diff --git a/deps/openssl/openssl/include/openssl/hmac.h b/deps/openssl/openssl/include/openssl/hmac.h
deleted file mode 120000
index de19ba7ede0c22..00000000000000
--- a/deps/openssl/openssl/include/openssl/hmac.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/hmac/hmac.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/hmac.h b/deps/openssl/openssl/include/openssl/hmac.h
new file mode 100644
index 00000000000000..202128bf52caeb
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/hmac.h
@@ -0,0 +1 @@
+#include "../../crypto/hmac/hmac.h"
diff --git a/deps/openssl/openssl/include/openssl/idea.h b/deps/openssl/openssl/include/openssl/idea.h
deleted file mode 120000
index 724fa345811368..00000000000000
--- a/deps/openssl/openssl/include/openssl/idea.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/idea/idea.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/idea.h b/deps/openssl/openssl/include/openssl/idea.h
new file mode 100644
index 00000000000000..bdf697d6805d85
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/idea.h
@@ -0,0 +1 @@
+#include "../../crypto/idea/idea.h"
diff --git a/deps/openssl/openssl/include/openssl/krb5_asn.h b/deps/openssl/openssl/include/openssl/krb5_asn.h
deleted file mode 120000
index 1172e522e4feb9..00000000000000
--- a/deps/openssl/openssl/include/openssl/krb5_asn.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/krb5/krb5_asn.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/krb5_asn.h b/deps/openssl/openssl/include/openssl/krb5_asn.h
new file mode 100644
index 00000000000000..0d3feea281f1da
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/krb5_asn.h
@@ -0,0 +1 @@
+#include "../../crypto/krb5/krb5_asn.h"
diff --git a/deps/openssl/openssl/include/openssl/kssl.h b/deps/openssl/openssl/include/openssl/kssl.h
deleted file mode 120000
index 2e5c2cd4dcbb05..00000000000000
--- a/deps/openssl/openssl/include/openssl/kssl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ssl/kssl.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/kssl.h b/deps/openssl/openssl/include/openssl/kssl.h
new file mode 100644
index 00000000000000..719634aad90ff9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/kssl.h
@@ -0,0 +1 @@
+#include "../../ssl/kssl.h"
diff --git a/deps/openssl/openssl/include/openssl/lhash.h b/deps/openssl/openssl/include/openssl/lhash.h
deleted file mode 120000
index 56eb09918c79c6..00000000000000
--- a/deps/openssl/openssl/include/openssl/lhash.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/lhash/lhash.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/lhash.h b/deps/openssl/openssl/include/openssl/lhash.h
new file mode 100644
index 00000000000000..2d3db87cd5de9a
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/lhash.h
@@ -0,0 +1 @@
+#include "../../crypto/lhash/lhash.h"
diff --git a/deps/openssl/openssl/include/openssl/md4.h b/deps/openssl/openssl/include/openssl/md4.h
deleted file mode 120000
index 4ff863e7fc9292..00000000000000
--- a/deps/openssl/openssl/include/openssl/md4.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/md4/md4.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/md4.h b/deps/openssl/openssl/include/openssl/md4.h
new file mode 100644
index 00000000000000..611806e5eafb1d
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/md4.h
@@ -0,0 +1 @@
+#include "../../crypto/md4/md4.h"
diff --git a/deps/openssl/openssl/include/openssl/md5.h b/deps/openssl/openssl/include/openssl/md5.h
deleted file mode 120000
index 26fa47eb5ce7cb..00000000000000
--- a/deps/openssl/openssl/include/openssl/md5.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/md5/md5.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/md5.h b/deps/openssl/openssl/include/openssl/md5.h
new file mode 100644
index 00000000000000..aa8cd0bf863be7
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/md5.h
@@ -0,0 +1 @@
+#include "../../crypto/md5/md5.h"
diff --git a/deps/openssl/openssl/include/openssl/mdc2.h b/deps/openssl/openssl/include/openssl/mdc2.h
deleted file mode 120000
index 0bc32f121cb32d..00000000000000
--- a/deps/openssl/openssl/include/openssl/mdc2.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/mdc2/mdc2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/mdc2.h b/deps/openssl/openssl/include/openssl/mdc2.h
new file mode 100644
index 00000000000000..ac284a179a0484
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/mdc2.h
@@ -0,0 +1 @@
+#include "../../crypto/mdc2/mdc2.h"
diff --git a/deps/openssl/openssl/include/openssl/modes.h b/deps/openssl/openssl/include/openssl/modes.h
deleted file mode 120000
index ccc172827f118b..00000000000000
--- a/deps/openssl/openssl/include/openssl/modes.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/modes/modes.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/modes.h b/deps/openssl/openssl/include/openssl/modes.h
new file mode 100644
index 00000000000000..f57fcfea800134
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/modes.h
@@ -0,0 +1 @@
+#include "../../crypto/modes/modes.h"
diff --git a/deps/openssl/openssl/include/openssl/obj_mac.h b/deps/openssl/openssl/include/openssl/obj_mac.h
deleted file mode 120000
index 0f443c828bc528..00000000000000
--- a/deps/openssl/openssl/include/openssl/obj_mac.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/objects/obj_mac.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/obj_mac.h b/deps/openssl/openssl/include/openssl/obj_mac.h
new file mode 100644
index 00000000000000..3890fa9bc419b9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/obj_mac.h
@@ -0,0 +1 @@
+#include "../../crypto/objects/obj_mac.h"
diff --git a/deps/openssl/openssl/include/openssl/objects.h b/deps/openssl/openssl/include/openssl/objects.h
deleted file mode 120000
index 7bd145ca0864ba..00000000000000
--- a/deps/openssl/openssl/include/openssl/objects.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/objects/objects.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/objects.h b/deps/openssl/openssl/include/openssl/objects.h
new file mode 100644
index 00000000000000..5365a044bdc0ca
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/objects.h
@@ -0,0 +1 @@
+#include "../../crypto/objects/objects.h"
diff --git a/deps/openssl/openssl/include/openssl/ocsp.h b/deps/openssl/openssl/include/openssl/ocsp.h
deleted file mode 120000
index 08288c84a65a1f..00000000000000
--- a/deps/openssl/openssl/include/openssl/ocsp.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ocsp/ocsp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ocsp.h b/deps/openssl/openssl/include/openssl/ocsp.h
new file mode 100644
index 00000000000000..50e2885cedb5cb
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ocsp.h
@@ -0,0 +1 @@
+#include "../../crypto/ocsp/ocsp.h"
diff --git a/deps/openssl/openssl/include/openssl/opensslconf.h b/deps/openssl/openssl/include/openssl/opensslconf.h
deleted file mode 120000
index 25d2bea96c84fa..00000000000000
--- a/deps/openssl/openssl/include/openssl/opensslconf.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/opensslconf.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/opensslconf.h b/deps/openssl/openssl/include/openssl/opensslconf.h
new file mode 100644
index 00000000000000..221be629b72248
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/opensslconf.h
@@ -0,0 +1 @@
+#include "../../crypto/opensslconf.h"
diff --git a/deps/openssl/openssl/include/openssl/opensslv.h b/deps/openssl/openssl/include/openssl/opensslv.h
deleted file mode 120000
index f314f5fc717d12..00000000000000
--- a/deps/openssl/openssl/include/openssl/opensslv.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/opensslv.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/opensslv.h b/deps/openssl/openssl/include/openssl/opensslv.h
new file mode 100644
index 00000000000000..c39a0c3882d3bb
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/opensslv.h
@@ -0,0 +1 @@
+#include "../../crypto/opensslv.h"
diff --git a/deps/openssl/openssl/include/openssl/ossl_typ.h b/deps/openssl/openssl/include/openssl/ossl_typ.h
deleted file mode 120000
index e8f42456e143cb..00000000000000
--- a/deps/openssl/openssl/include/openssl/ossl_typ.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ossl_typ.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ossl_typ.h b/deps/openssl/openssl/include/openssl/ossl_typ.h
new file mode 100644
index 00000000000000..ddd7e580dd6c8a
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ossl_typ.h
@@ -0,0 +1 @@
+#include "../../crypto/ossl_typ.h"
diff --git a/deps/openssl/openssl/include/openssl/pem.h b/deps/openssl/openssl/include/openssl/pem.h
deleted file mode 120000
index ca371423e7bd0a..00000000000000
--- a/deps/openssl/openssl/include/openssl/pem.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/pem/pem.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pem.h b/deps/openssl/openssl/include/openssl/pem.h
new file mode 100644
index 00000000000000..5bcc5c59eed0d6
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pem.h
@@ -0,0 +1 @@
+#include "../../crypto/pem/pem.h"
diff --git a/deps/openssl/openssl/include/openssl/pem2.h b/deps/openssl/openssl/include/openssl/pem2.h
deleted file mode 120000
index c734dbdc3f3d62..00000000000000
--- a/deps/openssl/openssl/include/openssl/pem2.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/pem/pem2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pem2.h b/deps/openssl/openssl/include/openssl/pem2.h
new file mode 100644
index 00000000000000..bcd3acf856be27
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pem2.h
@@ -0,0 +1 @@
+#include "../../crypto/pem/pem2.h"
diff --git a/deps/openssl/openssl/include/openssl/pkcs12.h b/deps/openssl/openssl/include/openssl/pkcs12.h
deleted file mode 120000
index eebba777899c19..00000000000000
--- a/deps/openssl/openssl/include/openssl/pkcs12.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/pkcs12/pkcs12.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pkcs12.h b/deps/openssl/openssl/include/openssl/pkcs12.h
new file mode 100644
index 00000000000000..0b5fbbfe863d5c
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pkcs12.h
@@ -0,0 +1 @@
+#include "../../crypto/pkcs12/pkcs12.h"
diff --git a/deps/openssl/openssl/include/openssl/pkcs7.h b/deps/openssl/openssl/include/openssl/pkcs7.h
deleted file mode 120000
index 73e1b23f77eb66..00000000000000
--- a/deps/openssl/openssl/include/openssl/pkcs7.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/pkcs7/pkcs7.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pkcs7.h b/deps/openssl/openssl/include/openssl/pkcs7.h
new file mode 100644
index 00000000000000..2e19d7c4c9b963
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pkcs7.h
@@ -0,0 +1 @@
+#include "../../crypto/pkcs7/pkcs7.h"
diff --git a/deps/openssl/openssl/include/openssl/pqueue.h b/deps/openssl/openssl/include/openssl/pqueue.h
deleted file mode 120000
index 93817c2dfcd9ef..00000000000000
--- a/deps/openssl/openssl/include/openssl/pqueue.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/pqueue/pqueue.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pqueue.h b/deps/openssl/openssl/include/openssl/pqueue.h
new file mode 100644
index 00000000000000..9681ff52cd255c
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pqueue.h
@@ -0,0 +1 @@
+#include "../../crypto/pqueue/pqueue.h"
diff --git a/deps/openssl/openssl/include/openssl/rand.h b/deps/openssl/openssl/include/openssl/rand.h
deleted file mode 120000
index 11231f8523913c..00000000000000
--- a/deps/openssl/openssl/include/openssl/rand.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/rand/rand.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/rand.h b/deps/openssl/openssl/include/openssl/rand.h
new file mode 100644
index 00000000000000..9d1521bd4e335d
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/rand.h
@@ -0,0 +1 @@
+#include "../../crypto/rand/rand.h"
diff --git a/deps/openssl/openssl/include/openssl/rc2.h b/deps/openssl/openssl/include/openssl/rc2.h
deleted file mode 120000
index bb5a05c5d1e753..00000000000000
--- a/deps/openssl/openssl/include/openssl/rc2.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/rc2/rc2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/rc2.h b/deps/openssl/openssl/include/openssl/rc2.h
new file mode 100644
index 00000000000000..f2f2bd1f21c0b4
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/rc2.h
@@ -0,0 +1 @@
+#include "../../crypto/rc2/rc2.h"
diff --git a/deps/openssl/openssl/include/openssl/rc4.h b/deps/openssl/openssl/include/openssl/rc4.h
deleted file mode 120000
index ef7deeb7d4a89c..00000000000000
--- a/deps/openssl/openssl/include/openssl/rc4.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/rc4/rc4.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/rc4.h b/deps/openssl/openssl/include/openssl/rc4.h
new file mode 100644
index 00000000000000..306de2f406e810
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/rc4.h
@@ -0,0 +1 @@
+#include "../../crypto/rc4/rc4.h"
diff --git a/deps/openssl/openssl/include/openssl/ripemd.h b/deps/openssl/openssl/include/openssl/ripemd.h
deleted file mode 120000
index 200f562fa7d014..00000000000000
--- a/deps/openssl/openssl/include/openssl/ripemd.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ripemd/ripemd.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ripemd.h b/deps/openssl/openssl/include/openssl/ripemd.h
new file mode 100644
index 00000000000000..11351fc819d1b7
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ripemd.h
@@ -0,0 +1 @@
+#include "../../crypto/ripemd/ripemd.h"
diff --git a/deps/openssl/openssl/include/openssl/rsa.h b/deps/openssl/openssl/include/openssl/rsa.h
deleted file mode 120000
index 3e5a6547543cb9..00000000000000
--- a/deps/openssl/openssl/include/openssl/rsa.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/rsa/rsa.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/rsa.h b/deps/openssl/openssl/include/openssl/rsa.h
new file mode 100644
index 00000000000000..975e5d355abd47
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/rsa.h
@@ -0,0 +1 @@
+#include "../../crypto/rsa/rsa.h"
diff --git a/deps/openssl/openssl/include/openssl/safestack.h b/deps/openssl/openssl/include/openssl/safestack.h
deleted file mode 120000
index 8ca5b4cc7c5c42..00000000000000
--- a/deps/openssl/openssl/include/openssl/safestack.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/stack/safestack.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/safestack.h b/deps/openssl/openssl/include/openssl/safestack.h
new file mode 100644
index 00000000000000..8a282b858ba108
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/safestack.h
@@ -0,0 +1 @@
+#include "../../crypto/stack/safestack.h"
diff --git a/deps/openssl/openssl/include/openssl/seed.h b/deps/openssl/openssl/include/openssl/seed.h
deleted file mode 120000
index 05d04a50bf8069..00000000000000
--- a/deps/openssl/openssl/include/openssl/seed.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/seed/seed.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/seed.h b/deps/openssl/openssl/include/openssl/seed.h
new file mode 100644
index 00000000000000..bbbf596df86ce5
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/seed.h
@@ -0,0 +1 @@
+#include "../../crypto/seed/seed.h"
diff --git a/deps/openssl/openssl/include/openssl/sha.h b/deps/openssl/openssl/include/openssl/sha.h
deleted file mode 120000
index 3025cd5d7e5aa2..00000000000000
--- a/deps/openssl/openssl/include/openssl/sha.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/sha/sha.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/sha.h b/deps/openssl/openssl/include/openssl/sha.h
new file mode 100644
index 00000000000000..ab9d94c38689b8
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/sha.h
@@ -0,0 +1 @@
+#include "../../crypto/sha/sha.h"
diff --git a/deps/openssl/openssl/include/openssl/srp.h b/deps/openssl/openssl/include/openssl/srp.h
deleted file mode 120000
index 16b73ebd3ddeb6..00000000000000
--- a/deps/openssl/openssl/include/openssl/srp.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/srp/srp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/srp.h b/deps/openssl/openssl/include/openssl/srp.h
new file mode 100644
index 00000000000000..8217476779e610
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/srp.h
@@ -0,0 +1 @@
+#include "../../crypto/srp/srp.h"
diff --git a/deps/openssl/openssl/include/openssl/srtp.h b/deps/openssl/openssl/include/openssl/srtp.h
deleted file mode 120000
index 9800e4ee402f35..00000000000000
--- a/deps/openssl/openssl/include/openssl/srtp.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ssl/srtp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/srtp.h b/deps/openssl/openssl/include/openssl/srtp.h
new file mode 100644
index 00000000000000..e185494a523b02
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/srtp.h
@@ -0,0 +1 @@
+#include "../../ssl/srtp.h"
diff --git a/deps/openssl/openssl/include/openssl/ssl.h b/deps/openssl/openssl/include/openssl/ssl.h
deleted file mode 120000
index e87d9be8fc6636..00000000000000
--- a/deps/openssl/openssl/include/openssl/ssl.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ssl/ssl.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ssl.h b/deps/openssl/openssl/include/openssl/ssl.h
new file mode 100644
index 00000000000000..0b0589c639a94d
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ssl.h
@@ -0,0 +1 @@
+#include "../../ssl/ssl.h"
diff --git a/deps/openssl/openssl/include/openssl/ssl2.h b/deps/openssl/openssl/include/openssl/ssl2.h
deleted file mode 120000
index 72876883c6342d..00000000000000
--- a/deps/openssl/openssl/include/openssl/ssl2.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ssl/ssl2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ssl2.h b/deps/openssl/openssl/include/openssl/ssl2.h
new file mode 100644
index 00000000000000..11b22055ea7334
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ssl2.h
@@ -0,0 +1 @@
+#include "../../ssl/ssl2.h"
diff --git a/deps/openssl/openssl/include/openssl/ssl23.h b/deps/openssl/openssl/include/openssl/ssl23.h
deleted file mode 120000
index 5605052d701347..00000000000000
--- a/deps/openssl/openssl/include/openssl/ssl23.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ssl/ssl23.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ssl23.h b/deps/openssl/openssl/include/openssl/ssl23.h
new file mode 100644
index 00000000000000..fe4dae6661ffbc
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ssl23.h
@@ -0,0 +1 @@
+#include "../../ssl/ssl23.h"
diff --git a/deps/openssl/openssl/include/openssl/ssl3.h b/deps/openssl/openssl/include/openssl/ssl3.h
deleted file mode 120000
index 5ae2507f28a184..00000000000000
--- a/deps/openssl/openssl/include/openssl/ssl3.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ssl/ssl3.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ssl3.h b/deps/openssl/openssl/include/openssl/ssl3.h
new file mode 100644
index 00000000000000..0fb66a6f752062
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ssl3.h
@@ -0,0 +1 @@
+#include "../../ssl/ssl3.h"
diff --git a/deps/openssl/openssl/include/openssl/stack.h b/deps/openssl/openssl/include/openssl/stack.h
deleted file mode 120000
index 61d342fcdc5809..00000000000000
--- a/deps/openssl/openssl/include/openssl/stack.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/stack/stack.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/stack.h b/deps/openssl/openssl/include/openssl/stack.h
new file mode 100644
index 00000000000000..295968cc186805
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/stack.h
@@ -0,0 +1 @@
+#include "../../crypto/stack/stack.h"
diff --git a/deps/openssl/openssl/include/openssl/symhacks.h b/deps/openssl/openssl/include/openssl/symhacks.h
deleted file mode 120000
index 4a1a6913cf755d..00000000000000
--- a/deps/openssl/openssl/include/openssl/symhacks.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/symhacks.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/symhacks.h b/deps/openssl/openssl/include/openssl/symhacks.h
new file mode 100644
index 00000000000000..f946f4ffc6f301
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/symhacks.h
@@ -0,0 +1 @@
+#include "../../crypto/symhacks.h"
diff --git a/deps/openssl/openssl/include/openssl/tls1.h b/deps/openssl/openssl/include/openssl/tls1.h
deleted file mode 120000
index 53d998fbd86083..00000000000000
--- a/deps/openssl/openssl/include/openssl/tls1.h
+++ /dev/null
@@ -1 +0,0 @@
-../../ssl/tls1.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/tls1.h b/deps/openssl/openssl/include/openssl/tls1.h
new file mode 100644
index 00000000000000..c43a70ff31fb4d
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/tls1.h
@@ -0,0 +1 @@
+#include "../../ssl/tls1.h"
diff --git a/deps/openssl/openssl/include/openssl/ts.h b/deps/openssl/openssl/include/openssl/ts.h
deleted file mode 120000
index a75d99db1a88dc..00000000000000
--- a/deps/openssl/openssl/include/openssl/ts.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ts/ts.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ts.h b/deps/openssl/openssl/include/openssl/ts.h
new file mode 100644
index 00000000000000..fe8a2cb51a2eea
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ts.h
@@ -0,0 +1 @@
+#include "../../crypto/ts/ts.h"
diff --git a/deps/openssl/openssl/include/openssl/txt_db.h b/deps/openssl/openssl/include/openssl/txt_db.h
deleted file mode 120000
index f672e35520c0ec..00000000000000
--- a/deps/openssl/openssl/include/openssl/txt_db.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/txt_db/txt_db.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/txt_db.h b/deps/openssl/openssl/include/openssl/txt_db.h
new file mode 100644
index 00000000000000..167621b6fa881f
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/txt_db.h
@@ -0,0 +1 @@
+#include "../../crypto/txt_db/txt_db.h"
diff --git a/deps/openssl/openssl/include/openssl/ui.h b/deps/openssl/openssl/include/openssl/ui.h
deleted file mode 120000
index b07defad72b11c..00000000000000
--- a/deps/openssl/openssl/include/openssl/ui.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ui/ui.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ui.h b/deps/openssl/openssl/include/openssl/ui.h
new file mode 100644
index 00000000000000..43dd3ae83a51b7
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ui.h
@@ -0,0 +1 @@
+#include "../../crypto/ui/ui.h"
diff --git a/deps/openssl/openssl/include/openssl/ui_compat.h b/deps/openssl/openssl/include/openssl/ui_compat.h
deleted file mode 120000
index d8c74b7c5d72f8..00000000000000
--- a/deps/openssl/openssl/include/openssl/ui_compat.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/ui/ui_compat.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ui_compat.h b/deps/openssl/openssl/include/openssl/ui_compat.h
new file mode 100644
index 00000000000000..c83f160d802112
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ui_compat.h
@@ -0,0 +1 @@
+#include "../../crypto/ui/ui_compat.h"
diff --git a/deps/openssl/openssl/include/openssl/whrlpool.h b/deps/openssl/openssl/include/openssl/whrlpool.h
deleted file mode 120000
index 125a0816f509db..00000000000000
--- a/deps/openssl/openssl/include/openssl/whrlpool.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/whrlpool/whrlpool.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/whrlpool.h b/deps/openssl/openssl/include/openssl/whrlpool.h
new file mode 100644
index 00000000000000..e2424fadde2788
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/whrlpool.h
@@ -0,0 +1 @@
+#include "../../crypto/whrlpool/whrlpool.h"
diff --git a/deps/openssl/openssl/include/openssl/x509.h b/deps/openssl/openssl/include/openssl/x509.h
deleted file mode 120000
index b2b85c52486dff..00000000000000
--- a/deps/openssl/openssl/include/openssl/x509.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/x509/x509.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/x509.h b/deps/openssl/openssl/include/openssl/x509.h
new file mode 100644
index 00000000000000..a4651a28652433
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/x509.h
@@ -0,0 +1 @@
+#include "../../crypto/x509/x509.h"
diff --git a/deps/openssl/openssl/include/openssl/x509_vfy.h b/deps/openssl/openssl/include/openssl/x509_vfy.h
deleted file mode 120000
index bb99ad49811ad4..00000000000000
--- a/deps/openssl/openssl/include/openssl/x509_vfy.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/x509/x509_vfy.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/x509_vfy.h b/deps/openssl/openssl/include/openssl/x509_vfy.h
new file mode 100644
index 00000000000000..b897aa087bdae8
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/x509_vfy.h
@@ -0,0 +1 @@
+#include "../../crypto/x509/x509_vfy.h"
diff --git a/deps/openssl/openssl/include/openssl/x509v3.h b/deps/openssl/openssl/include/openssl/x509v3.h
deleted file mode 120000
index 63d12f9dc5f788..00000000000000
--- a/deps/openssl/openssl/include/openssl/x509v3.h
+++ /dev/null
@@ -1 +0,0 @@
-../../crypto/x509v3/x509v3.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/x509v3.h b/deps/openssl/openssl/include/openssl/x509v3.h
new file mode 100644
index 00000000000000..363795e55a280a
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/x509v3.h
@@ -0,0 +1 @@
+#include "../../crypto/x509v3/x509v3.h"