diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4477cc25f..6dffbd9c9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -60,20 +60,15 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
 
-if USE_EMBEDDED_ARES
-AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-              -I$(top_builddir)/include      \
-              -I$(top_srcdir)/include        \
-              -I$(top_builddir)/lib          \
-              -I$(top_srcdir)/lib            \
-              -I$(top_builddir)/ares         \
-              -I$(top_srcdir)/ares
-else
 AM_CPPFLAGS = -I$(top_builddir)/include/curl \
               -I$(top_builddir)/include      \
               -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib
+
+if USE_EMBEDDED_ARES
+AM_CPPFLAGS += -I$(top_builddir)/ares        \
+               -I$(top_srcdir)/ares
 endif
 
 # Prevent LIBS from being used for all link targets
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 62bc0b3d5..3c5885d09 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -16,7 +16,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c	\
   content_encoding.c share.c http_digest.c md4.c md5.c	\
   http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c		\
   hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c	\
-  select.c gtls.c sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c	\
+  select.c gtls.c vtls/sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c	\
   qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c		\
   curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c	\
   pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c		\
@@ -36,7 +36,7 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h	\
   connect.h llist.h hash.h content_encoding.h share.h curl_md4.h	\
   curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h	\
   strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h curl_setup.h	\
-  transfer.h select.h easyif.h multiif.h parsedate.h sslgen.h gtls.h	\
+  transfer.h select.h easyif.h multiif.h parsedate.h vtls/sslgen.h gtls.h	\
   tftp.h sockaddr.h splay.h strdup.h socks.h ssh.h nssg.h curl_base64.h	\
   rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h		\
   curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h	\
diff --git a/lib/connect.c b/lib/connect.c
index a39699ba7..c85c7c783 100644
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -71,7 +71,7 @@
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "inet_ntop.h"
 #include "inet_pton.h"
-#include "sslgen.h" /* for Curl_ssl_check_cxn() */
+#include "vtls/sslgen.h" /* for Curl_ssl_check_cxn() */
 #include "progress.h"
 #include "warnless.h"
 #include "conncache.h"
diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index 125ce6e49..07c427f89 100644
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -47,7 +47,7 @@
 #  include "curl_sspi.h"
 #endif
 
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 
 #define BUILDING_CURL_NTLM_MSGS_C
 #include "curl_ntlm_msgs.h"
diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 240537283..e6a528abb 100644
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -34,7 +34,7 @@
 
 #include "curl_base64.h"
 #include "curl_md5.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "curl_hmac.h"
 #include "curl_ntlm_msgs.h"
 #include "curl_sasl.h"
diff --git a/lib/easy.c b/lib/easy.c
index 1dbdcb768..0bd99ebdf 100644
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -54,7 +54,7 @@
 #include "urldata.h"
 #include <curl/curl.h>
 #include "transfer.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "url.h"
 #include "getinfo.h"
 #include "hostip.h"
diff --git a/lib/formdata.c b/lib/formdata.c
index f718a3e4e..4fbe92143 100644
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -32,7 +32,7 @@
 
 #include "urldata.h" /* for struct SessionHandle */
 #include "formdata.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "strequal.h"
 #include "curl_memory.h"
 #include "sendf.h"
diff --git a/lib/ftp.c b/lib/ftp.c
index abd70e070..07c000dbd 100644
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -62,7 +62,7 @@
 #include "curl_sec.h"
 #include "strtoofft.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "inet_ntop.h"
diff --git a/lib/getinfo.c b/lib/getinfo.c
index c5c00e048..5db824da2 100644
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -28,7 +28,7 @@
 #include "getinfo.h"
 
 #include "curl_memory.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h" /* Curl_getconnectinfo() */
 #include "progress.h"
 
diff --git a/lib/http.c b/lib/http.c
index 459b98bca..510f4bbc5 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -54,7 +54,7 @@
 #include "curl_base64.h"
 #include "cookie.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "http_digest.h"
 #include "curl_ntlm.h"
 #include "curl_ntlm_wb.h"
diff --git a/lib/http_digest.c b/lib/http_digest.c
index 581049dd3..cd26d5a2b 100644
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -31,7 +31,7 @@
 #include "http_digest.h"
 #include "strtok.h"
 #include "curl_memory.h"
-#include "sslgen.h" /* for Curl_rand() */
+#include "vtls/sslgen.h" /* for Curl_rand() */
 #include "non-ascii.h" /* included for Curl_convert_... prototypes */
 #include "warnless.h"
 
diff --git a/lib/imap.c b/lib/imap.c
index bd03c76cd..d45751b79 100644
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -71,7 +71,7 @@
 
 #include "strtoofft.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "select.h"
diff --git a/lib/openldap.c b/lib/openldap.c
index 98793b306..72e134160 100644
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -5,7 +5,7 @@
  *                | (__| |_| |  _ <| |___
  *                 \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2010, Howard Chu, <hyc@openldap.org>
+ * Copyright (C) 2010, 2013, Howard Chu, <hyc@openldap.org>
  * Copyright (C) 2011 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
@@ -41,7 +41,7 @@
 #include "urldata.h"
 #include <curl/curl.h>
 #include "sendf.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "transfer.h"
 #include "curl_ldap.h"
 #include "curl_memory.h"
diff --git a/lib/pingpong.c b/lib/pingpong.c
index 3ebeabe53..420197e69 100644
--- a/lib/pingpong.c
+++ b/lib/pingpong.c
@@ -33,7 +33,7 @@
 #include "pingpong.h"
 #include "multiif.h"
 #include "non-ascii.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>
diff --git a/lib/pop3.c b/lib/pop3.c
index eb0164862..40a2b2fdb 100644
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -73,7 +73,7 @@
 
 #include "strtoofft.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "select.h"
diff --git a/lib/sendf.c b/lib/sendf.c
index 7b6fca610..70a65de4e 100644
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -27,7 +27,7 @@
 #include "urldata.h"
 #include "sendf.h"
 #include "connect.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "ssh.h"
 #include "multiif.h"
 #include "non-ascii.h"
diff --git a/lib/share.c b/lib/share.c
index b21c9f685..a71a26908 100644
--- a/lib/share.c
+++ b/lib/share.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -25,7 +25,7 @@
 #include <curl/curl.h>
 #include "urldata.h"
 #include "share.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "curl_memory.h"
 
 /* The last #include file should be: */
diff --git a/lib/smtp.c b/lib/smtp.c
index f35f7537e..e7e8bf1cc 100644
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -72,7 +72,7 @@
 
 #include "strtoofft.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "select.h"
diff --git a/lib/ssh.c b/lib/ssh.c
index 35cb20193..fb3255e9d 100644
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -73,7 +73,7 @@
 #include "getinfo.h"
 
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "inet_ntop.h"
diff --git a/lib/ssluse.c b/lib/ssluse.c
index d0a83f740..3743170a9 100644
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -46,7 +46,7 @@
 #include "slist.h"
 #include "strequal.h"
 #include "select.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "rawstr.h"
 #include "hostcheck.h"
 
diff --git a/lib/transfer.c b/lib/transfer.c
index e3194415b..c199b4f67 100644
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -70,7 +70,7 @@
 #include "http.h"
 #include "url.h"
 #include "getinfo.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "http_digest.h"
 #include "curl_ntlm.h"
 #include "http_negotiate.h"
diff --git a/lib/url.c b/lib/url.c
index 5903628c9..5a70c9241 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -78,7 +78,7 @@ int curl_win32_idn_to_ascii(const char *in, char **out);
 #include "netrc.h"
 
 #include "formdata.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "hostip.h"
 #include "transfer.h"
 #include "sendf.h"
diff --git a/lib/version.c b/lib/version.c
index 1f62131eb..e82698e4e 100644
--- a/lib/version.c
+++ b/lib/version.c
@@ -24,7 +24,7 @@
 
 #include <curl/curl.h>
 #include "urldata.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "http2.h"
 
 #define _MPRINTF_REPLACE /* use the internal *printf() functions */
diff --git a/lib/sslgen.c b/lib/vtls/sslgen.c
similarity index 100%
rename from lib/sslgen.c
rename to lib/vtls/sslgen.c
diff --git a/lib/sslgen.h b/lib/vtls/sslgen.h
similarity index 100%
rename from lib/sslgen.h
rename to lib/vtls/sslgen.h