diff --git a/src/ca/CASG.cpp b/src/ca/CASG.cpp
index 2be76e585..d35863878 100644
--- a/src/ca/CASG.cpp
+++ b/src/ca/CASG.cpp
@@ -18,6 +18,8 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "syncGroup.h"
diff --git a/src/ca/bhe.cpp b/src/ca/bhe.cpp
index 870584212..b10bed295 100644
--- a/src/ca/bhe.cpp
+++ b/src/ca/bhe.cpp
@@ -26,6 +26,8 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "virtualCircuit.h"
diff --git a/src/ca/ca_client_context.cpp b/src/ca/ca_client_context.cpp
index 472ff6669..a5ca3f743 100644
--- a/src/ca/ca_client_context.cpp
+++ b/src/ca/ca_client_context.cpp
@@ -30,6 +30,8 @@
 #include <stdio.h>
 
 #include "epicsExit.h"
+#include "errlog.h"
+#include "locationException.h"
 
 #define epicsExportSharedSymbols
 #include "iocinf.h"
diff --git a/src/ca/cacChannel.cpp b/src/ca/cacChannel.cpp
index c572584f4..d4eef28f0 100644
--- a/src/ca/cacChannel.cpp
+++ b/src/ca/cacChannel.cpp
@@ -25,12 +25,12 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
-#include "iocinf.h"
-#include "localHostName.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
+#include "iocinf.h"
+#include "localHostName.h"
 #include "cacIO.h"
-#undef epicsExportSharedSymbols
 
 const cacChannel::priLev cacChannel::priorityMax = 99u;
 const cacChannel::priLev cacChannel::priorityMin = 0u;
diff --git a/src/ca/getCallback.cpp b/src/ca/getCallback.cpp
index a5d33c7a3..9ed025c2d 100644
--- a/src/ca/getCallback.cpp
+++ b/src/ca/getCallback.cpp
@@ -26,6 +26,8 @@
 #include <string>
 #include <stdexcept>
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
diff --git a/src/ca/getCopy.cpp b/src/ca/getCopy.cpp
index 7be2d2893..ff21e299f 100644
--- a/src/ca/getCopy.cpp
+++ b/src/ca/getCopy.cpp
@@ -26,6 +26,8 @@
 #include <string>
 #include <stdexcept>
 
+#include "errlog.h"
+
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
 #define epicsExportSharedSymbols
diff --git a/src/ca/msgForMultiplyDefinedPV.cpp b/src/ca/msgForMultiplyDefinedPV.cpp
index 83bdda092..516bb63bb 100644
--- a/src/ca/msgForMultiplyDefinedPV.cpp
+++ b/src/ca/msgForMultiplyDefinedPV.cpp
@@ -28,13 +28,13 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include "errlog.h"
+
+#define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "msgForMultiplyDefinedPV.h"
 #include "cac.h"
-
-#define epicsExportSharedSymbols
 #include "caerr.h" // for ECA_DBLCHNL
-#undef epicsExportSharedSymbols
 
 msgForMultiplyDefinedPV::msgForMultiplyDefinedPV ( 
     ipAddrToAsciiEngine & engine,
diff --git a/src/ca/nciu.cpp b/src/ca/nciu.cpp
index cd007f742..9cf74fdb7 100644
--- a/src/ca/nciu.cpp
+++ b/src/ca/nciu.cpp
@@ -27,6 +27,8 @@
 
 #include "epicsAlgorithm.h"
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "cac.h"
diff --git a/src/ca/netReadNotifyIO.cpp b/src/ca/netReadNotifyIO.cpp
index 778281050..446b7175d 100644
--- a/src/ca/netReadNotifyIO.cpp
+++ b/src/ca/netReadNotifyIO.cpp
@@ -21,6 +21,8 @@
 #include <string>
 #include <stdexcept>
 
+#include "errlog.h"
+
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
 #include "iocinf.h"
diff --git a/src/ca/netSubscription.cpp b/src/ca/netSubscription.cpp
index 150685c01..04003cae3 100644
--- a/src/ca/netSubscription.cpp
+++ b/src/ca/netSubscription.cpp
@@ -21,6 +21,8 @@
 #include <string>
 #include <stdexcept>
 
+#include "errlog.h"
+
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
 #define epicsExportSharedSymbols
diff --git a/src/ca/netWriteNotifyIO.cpp b/src/ca/netWriteNotifyIO.cpp
index 554b4e16c..b9465a67d 100644
--- a/src/ca/netWriteNotifyIO.cpp
+++ b/src/ca/netWriteNotifyIO.cpp
@@ -21,6 +21,8 @@
 #include <string>
 #include <stdexcept>
 
+#include "errlog.h"
+
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
 #include "iocinf.h"
diff --git a/src/ca/oldChannelNotify.cpp b/src/ca/oldChannelNotify.cpp
index 47816b9c9..4296b7795 100644
--- a/src/ca/oldChannelNotify.cpp
+++ b/src/ca/oldChannelNotify.cpp
@@ -31,6 +31,8 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
diff --git a/src/ca/oldSubscription.cpp b/src/ca/oldSubscription.cpp
index 9b4e49c24..1b25a965b 100644
--- a/src/ca/oldSubscription.cpp
+++ b/src/ca/oldSubscription.cpp
@@ -21,6 +21,8 @@
 
 #include <stdexcept>
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
diff --git a/src/ca/putCallback.cpp b/src/ca/putCallback.cpp
index 29bbbc108..25beaa4ad 100644
--- a/src/ca/putCallback.cpp
+++ b/src/ca/putCallback.cpp
@@ -26,6 +26,8 @@
 #include <string>
 #include <stdexcept>
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "oldAccess.h"
diff --git a/src/ca/repeater.cpp b/src/ca/repeater.cpp
index a873255ff..d45d7a7aa 100644
--- a/src/ca/repeater.cpp
+++ b/src/ca/repeater.cpp
@@ -87,6 +87,7 @@
 #include "tsFreeList.h"
 #include "osiWireFormat.h"
 #include "taskwd.h"
+#include "errlog.h"
 
 #define epicsExportSharedSymbols
 #include "iocinf.h"
diff --git a/src/ca/syncGroupReadNotify.cpp b/src/ca/syncGroupReadNotify.cpp
index d86daaa28..6db733cfd 100644
--- a/src/ca/syncGroupReadNotify.cpp
+++ b/src/ca/syncGroupReadNotify.cpp
@@ -19,6 +19,8 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "syncGroup.h"
diff --git a/src/ca/syncGroupWriteNotify.cpp b/src/ca/syncGroupWriteNotify.cpp
index d9b700eb2..7082c7516 100644
--- a/src/ca/syncGroupWriteNotify.cpp
+++ b/src/ca/syncGroupWriteNotify.cpp
@@ -19,6 +19,8 @@
 
 #define epicsAssertAuthor "Jeff Hill johill@lanl.gov"
 
+#include "errlog.h"
+
 #define epicsExportSharedSymbols
 #include "iocinf.h"
 #include "syncGroup.h"
diff --git a/src/ca/test_event.cpp b/src/ca/test_event.cpp
index 974fe82b5..c39375aef 100644
--- a/src/ca/test_event.cpp
+++ b/src/ca/test_event.cpp
@@ -14,6 +14,8 @@
  *  simple stub for testing monitors
  */
 
+#include <stdio.h>
+
 #define epicsExportSharedSymbols
 #include "cadef.h"