diff --git a/src/ca/cacIO.h b/src/ca/cacIO.h
index e631fa80e..3f7e3ef45 100644
--- a/src/ca/cacIO.h
+++ b/src/ca/cacIO.h
@@ -38,9 +38,20 @@
 
 #include <stdarg.h>
 
+#ifdef epicsExportSharedSymbols
+#   define cacIOh_restore_epicsExportSharedSymbols
+#undef epicsExportSharedSymbols
+#endif
+
+#include "shareLib.h"
+
 #include "tsDLList.h"
 #include "epicsMutex.h"
 
+#ifdef cacIOh_restore_epicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#endif
+
 #include "shareLib.h"
 
 class cacChannel;
diff --git a/src/ca/cadef.h b/src/ca/cadef.h
index 81ef56491..687df07c2 100644
--- a/src/ca/cadef.h
+++ b/src/ca/cadef.h
@@ -41,13 +41,16 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#   include "epicsThread.h"
+#include "shareLib.h"
+
+#include "epicsThread.h"
 
 #ifdef INCLcadefh_accessh_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
 #endif
 
 #include "shareLib.h"
+
 #include "caerr.h"
 #include "db_access.h"
 #include "caeventmask.h"