Author: Aaron M. Ucko <amu@ucko.debian.net>
Date:   Wed, 01 Dec 2021 23:33:11 -0500
Subject: Omit convenience mbed TLS copy
--- a/c++/src/connect/Makefile.connssl.lib
+++ b/c++/src/connect/Makefile.connssl.lib
@@ -2,7 +2,9 @@
 
 CPPFLAGS = $(TLS_INCLUDE) $(ORIG_CPPFLAGS)
 
-SRC_TLS  = ncbi_gnutls ncbi_mbedtls ncbi_tls \
+SRC_TLS  = ncbi_gnutls ncbi_mbedtls ncbi_tls
+
+SRC_MBEDTLS_UNUSED = \
            mbedtls/aes mbedtls/aesni mbedtls/arc4 mbedtls/asn1parse \
            mbedtls/asn1write mbedtls/base64 mbedtls/bignum mbedtls/blowfish \
            mbedtls/camellia mbedtls/ccm mbedtls/cipher mbedtls/cipher_wrap \
--- a/c++/src/connect/connect_misc_impl.hpp
+++ b/c++/src/connect/connect_misc_impl.hpp
@@ -30,11 +30,10 @@
  *
  */
 
-#include "mbedtls/mbedtls/ncbicxx_rename_mbedtls.h"
-#include "mbedtls/mbedtls/error.h"
-#include "mbedtls/mbedtls/ctr_drbg.h"
-#include "mbedtls/mbedtls/entropy.h"
-#include "mbedtls/mbedtls/ssl.h"
+#include <mbedtls/error.h>
+#include <mbedtls/ctr_drbg.h>
+#include <mbedtls/entropy.h>
+#include <mbedtls/ssl.h>
 
 #include <corelib/ncbimisc.hpp>
 
