diff --git a/src/ca/CASG.cpp b/src/ca/CASG.cpp
index faebbcda0..e6471b95b 100644
--- a/src/ca/CASG.cpp
+++ b/src/ca/CASG.cpp
@@ -14,6 +14,7 @@
  *              (505) 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/ca/bhe.cpp b/src/ca/bhe.cpp
index ee97e60b8..fe9e09bf7 100644
--- a/src/ca/bhe.cpp
+++ b/src/ca/bhe.cpp
@@ -19,6 +19,7 @@
  *  Author: Jeff Hill
  */
 
+#include <string>
 #include <stdexcept>
 #include <limits.h>
 #include <float.h>
diff --git a/src/ca/getCallback.cpp b/src/ca/getCallback.cpp
index 45a465da1..c7efe7f3c 100644
--- a/src/ca/getCallback.cpp
+++ b/src/ca/getCallback.cpp
@@ -24,6 +24,7 @@
  *	505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/ca/getCopy.cpp b/src/ca/getCopy.cpp
index ab18f74a6..43860309c 100644
--- a/src/ca/getCopy.cpp
+++ b/src/ca/getCopy.cpp
@@ -24,6 +24,7 @@
  *	505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/ca/msgForMultiplyDefinedPV.cpp b/src/ca/msgForMultiplyDefinedPV.cpp
index 50c90f4bb..83ba2c03b 100644
--- a/src/ca/msgForMultiplyDefinedPV.cpp
+++ b/src/ca/msgForMultiplyDefinedPV.cpp
@@ -24,6 +24,7 @@
  *	505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/ca/nciu.cpp b/src/ca/nciu.cpp
index 4c7df82d6..a7670d230 100644
--- a/src/ca/nciu.cpp
+++ b/src/ca/nciu.cpp
@@ -29,6 +29,7 @@
  */
 
 #include <new>
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/ca/netReadNotifyIO.cpp b/src/ca/netReadNotifyIO.cpp
index 82e33a6f4..a344cd119 100644
--- a/src/ca/netReadNotifyIO.cpp
+++ b/src/ca/netReadNotifyIO.cpp
@@ -19,6 +19,7 @@
  *  Author: Jeff Hill
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/ca/netSubscription.cpp b/src/ca/netSubscription.cpp
index ab6e6e233..3f5c46708 100644
--- a/src/ca/netSubscription.cpp
+++ b/src/ca/netSubscription.cpp
@@ -19,6 +19,7 @@
  *  Author: Jeff Hill
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/ca/netWriteNotifyIO.cpp b/src/ca/netWriteNotifyIO.cpp
index e70e12047..87c889b44 100644
--- a/src/ca/netWriteNotifyIO.cpp
+++ b/src/ca/netWriteNotifyIO.cpp
@@ -19,6 +19,7 @@
  *  Author: Jeff Hill
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/ca/oldChannelNotify.cpp b/src/ca/oldChannelNotify.cpp
index ac061e29d..762c7bac8 100644
--- a/src/ca/oldChannelNotify.cpp
+++ b/src/ca/oldChannelNotify.cpp
@@ -23,6 +23,7 @@
  *	505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #ifdef _MSC_VER
diff --git a/src/ca/putCallback.cpp b/src/ca/putCallback.cpp
index 669747518..641284590 100644
--- a/src/ca/putCallback.cpp
+++ b/src/ca/putCallback.cpp
@@ -24,6 +24,7 @@
  *	505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp
index 6f13a6693..e4c2c2680 100644
--- a/src/ca/repeater.cpp
+++ b/src/ca/repeater.cpp
@@ -78,6 +78,7 @@
  * received).                                           -- Jeff
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/ca/syncGroupReadNotify.cpp b/src/ca/syncGroupReadNotify.cpp
index f52ba9264..4b0cfbdc4 100644
--- a/src/ca/syncGroupReadNotify.cpp
+++ b/src/ca/syncGroupReadNotify.cpp
@@ -15,6 +15,7 @@
  *              (505) 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/ca/syncGroupWriteNotify.cpp b/src/ca/syncGroupWriteNotify.cpp
index ad7116404..74d7d789c 100644
--- a/src/ca/syncGroupWriteNotify.cpp
+++ b/src/ca/syncGroupWriteNotify.cpp
@@ -15,6 +15,7 @@
  *              (505) 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
diff --git a/src/cas/generic/caNetAddr.cc b/src/cas/generic/caNetAddr.cc
index b4f47e49e..8b75b63e5 100644
--- a/src/cas/generic/caNetAddr.cc
+++ b/src/cas/generic/caNetAddr.cc
@@ -16,6 +16,7 @@
 //              johill@lanl.gov
 //
 
+#include <string>
 #include <stdexcept>
 #include <stdio.h>
 #include <string.h>
diff --git a/src/cas/generic/casAsyncIOI.cc b/src/cas/generic/casAsyncIOI.cc
index 84323125c..0513f99a7 100644
--- a/src/cas/generic/casAsyncIOI.cc
+++ b/src/cas/generic/casAsyncIOI.cc
@@ -15,6 +15,7 @@
  *              505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/cas/generic/casAsyncPVAttachIO.cc b/src/cas/generic/casAsyncPVAttachIO.cc
index 9a406fd57..ff6a065f5 100644
--- a/src/cas/generic/casAsyncPVAttachIO.cc
+++ b/src/cas/generic/casAsyncPVAttachIO.cc
@@ -15,6 +15,7 @@
  *              505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/cas/generic/casAsyncPVExistIO.cc b/src/cas/generic/casAsyncPVExistIO.cc
index a22604715..502e9e6f7 100644
--- a/src/cas/generic/casAsyncPVExistIO.cc
+++ b/src/cas/generic/casAsyncPVExistIO.cc
@@ -15,6 +15,7 @@
  *              505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/cas/generic/casAsyncReadIO.cc b/src/cas/generic/casAsyncReadIO.cc
index 414b71f62..ca315c8b7 100644
--- a/src/cas/generic/casAsyncReadIO.cc
+++ b/src/cas/generic/casAsyncReadIO.cc
@@ -15,6 +15,7 @@
  *              505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/cas/generic/casAsyncWriteIO.cc b/src/cas/generic/casAsyncWriteIO.cc
index 713d0b985..718377894 100644
--- a/src/cas/generic/casAsyncWriteIO.cc
+++ b/src/cas/generic/casAsyncWriteIO.cc
@@ -15,6 +15,7 @@
  *              505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/cas/generic/casMonEvent.cc b/src/cas/generic/casMonEvent.cc
index 11efa7193..e90bdd8d6 100644
--- a/src/cas/generic/casMonEvent.cc
+++ b/src/cas/generic/casMonEvent.cc
@@ -15,6 +15,7 @@
  *              505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/cas/generic/casStrmClient.cc b/src/cas/generic/casStrmClient.cc
index 26673f1ec..18d131459 100644
--- a/src/cas/generic/casStrmClient.cc
+++ b/src/cas/generic/casStrmClient.cc
@@ -30,6 +30,12 @@ typedef unsigned long arrayElementCount;
 #include "casAsyncIOI.h"
 #include "channelDestroyEvent.h"
 
+#if defined(__BORLANDC__) && defined(__linux__)
+namespace  std  {
+const nothrow_t  nothrow ;
+}
+#endif
+
 static const caHdr nill_msg = { 0u, 0u, 0u, 0u, 0u, 0u };
 
 casStrmClient::pCASMsgHandler const casStrmClient::msgHandlers[] =
diff --git a/src/cas/io/bsdSocket/ipIgnoreEntry.cpp b/src/cas/io/bsdSocket/ipIgnoreEntry.cpp
index f16167ce0..826a95b1b 100644
--- a/src/cas/io/bsdSocket/ipIgnoreEntry.cpp
+++ b/src/cas/io/bsdSocket/ipIgnoreEntry.cpp
@@ -15,6 +15,7 @@
 //              johill@lanl.gov
 //
 
+#include <string>
 #include <stdexcept>
 
 #include "osiSock.h"
diff --git a/src/db/dbChannelIO.cpp b/src/db/dbChannelIO.cpp
index d434788f3..413041e01 100644
--- a/src/db/dbChannelIO.cpp
+++ b/src/db/dbChannelIO.cpp
@@ -24,6 +24,7 @@
  *	505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #include <limits.h>
diff --git a/src/db/dbPutNotifyBlocker.cpp b/src/db/dbPutNotifyBlocker.cpp
index 0fa176218..2dad719c0 100644
--- a/src/db/dbPutNotifyBlocker.cpp
+++ b/src/db/dbPutNotifyBlocker.cpp
@@ -25,6 +25,7 @@
  *  505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #include <limits.h>
diff --git a/src/db/dbSubscriptionIO.cpp b/src/db/dbSubscriptionIO.cpp
index 46ec1dc9c..27cf98e35 100644
--- a/src/db/dbSubscriptionIO.cpp
+++ b/src/db/dbSubscriptionIO.cpp
@@ -24,6 +24,7 @@
  *	505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #include <limits.h>
diff --git a/src/gdd/gdd.cc b/src/gdd/gdd.cc
index adc0a9116..c0b34d3f3 100644
--- a/src/gdd/gdd.cc
+++ b/src/gdd/gdd.cc
@@ -17,6 +17,7 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/misc/cxxCompilerDependencies.h b/src/libCom/misc/cxxCompilerDependencies.h
index a793035d2..d75fd5c43 100644
--- a/src/libCom/misc/cxxCompilerDependencies.h
+++ b/src/libCom/misc/cxxCompilerDependencies.h
@@ -38,7 +38,7 @@
 #   endif
 #   define CXX_THROW_SPECIFICATION
 #elif defined ( __BORLANDC__ ) 
-#   if __BORLANDC__ > 0x551
+#   if __BORLANDC__ >= 0x600
 #       define CXX_PLACEMENT_DELETE
 #   endif
 #   define CXX_THROW_SPECIFICATION
diff --git a/src/libCom/test/epicsExceptionTest.cpp b/src/libCom/test/epicsExceptionTest.cpp
index 178c9ea52..5041125dd 100644
--- a/src/libCom/test/epicsExceptionTest.cpp
+++ b/src/libCom/test/epicsExceptionTest.cpp
@@ -24,6 +24,12 @@
 
 using namespace std;
 
+#if defined(__BORLANDC__) && defined(__linux__)
+namespace  std  {
+const nothrow_t  nothrow ;
+}
+#endif
+
 class myThread : public epicsThreadRunable {
 public:
     myThread ();
diff --git a/src/libCom/timer/epicsTimer.cpp b/src/libCom/timer/epicsTimer.cpp
index 8302bac54..01ae58c93 100644
--- a/src/libCom/timer/epicsTimer.cpp
+++ b/src/libCom/timer/epicsTimer.cpp
@@ -15,6 +15,7 @@
  *              505 665 1831
  */
 
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols
diff --git a/src/libCom/timer/timer.cpp b/src/libCom/timer/timer.cpp
index f19bbc4cd..ba17659e3 100644
--- a/src/libCom/timer/timer.cpp
+++ b/src/libCom/timer/timer.cpp
@@ -18,6 +18,7 @@
  */
 
 #include <typeinfo>
+#include <string>
 #include <stdexcept>
 
 #define epicsExportSharedSymbols