diff --git a/Jamfile b/Jamfile
index 88526e8aa..3fdbfb575 100755
--- a/Jamfile
+++ b/Jamfile
@@ -543,8 +543,14 @@ lib torrent
 
 # hide non-external symbols
 	<toolset>darwin:<cflags>-fvisibility=hidden
+	<toolset>darwin:<cxxflags>-fvisibility-inlines-hidden
+	<toolset>darwin:<linkflags>-W1,-Bsymbolic
 	<toolset>gcc:<cflags>-fvisibility=hidden
+	<toolset>gcc:<cxxflags>-fvisibility-inlines-hidden
+	<toolset>gcc:<linkflags>-W1,-Bsymbolic
 	<toolset>llvm:<cflags>-fvisibility=hidden
+	<toolset>llvm:<cxxflags>-fvisibility-inlines-hidden
+	<toolset>llvm:<linkflags>-W1,-Bsymbolic
 
 	$(usage-requirements)
 
diff --git a/configure.ac b/configure.ac
index 1cc9f3588..0901f532b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,8 @@ AS_ECHO "Checking for posix thread support:"
 AX_PTHREAD()
 
 LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$PTHREAD_CFLAGS $CFLAGS"
+CFLAGS="$PTHREAD_CFLAGS $CFLAGS -fvisibility=hidden"
+CXXFLAGS="$CXXFLAGS -fvisibility=hidden -fvisibility-inlines-hidden"
 CC="$PTHREAD_CC"
 
 AS_ECHO