diff --git a/src/ca/bhe.h b/src/ca/bhe.h
index 15c1cca12..f57823fa6 100644
--- a/src/ca/bhe.h
+++ b/src/ca/bhe.h
@@ -28,8 +28,6 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "epicsSingleton.h"
@@ -37,11 +35,11 @@
 
 #ifdef bhehEpicsExportSharedSymbols
 #   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
 #include "inetAddrID.h"
 
-#include "shareLib.h"
 
 class tcpiiu;
 
diff --git a/src/ca/cac.h b/src/ca/cac.h
index eec3a5d9e..5da51062e 100644
--- a/src/ca/cac.h
+++ b/src/ca/cac.h
@@ -27,22 +27,20 @@
 #define cach
 
 #ifdef epicsExportSharedSymbols
-#define cach_restore_epicsExportSharedSymbols
-#undef epicsExportSharedSymbols
+#   define cach_restore_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "ipAddrToAsciiAsynchronous.h"
 #include "epicsTimer.h"
 #include "epicsEvent.h"
 #include "freeList.h"
 
 #ifdef cach_restore_epicsExportSharedSymbols
-#define epicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
 
 #include "nciu.h"
 #include "bhe.h"
diff --git a/src/ca/cacIO.h b/src/ca/cacIO.h
index 33a1aeeb2..1ebbfd84d 100644
--- a/src/ca/cacIO.h
+++ b/src/ca/cacIO.h
@@ -49,19 +49,17 @@
 
 #ifdef epicsExportSharedSymbols
 #   define cacIOh_restore_epicsExportSharedSymbols
-#undef epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "tsDLList.h"
 #include "epicsMutex.h"
 
 #ifdef cacIOh_restore_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
 
 class cacChannel;
 
diff --git a/src/ca/cadef.h b/src/ca/cadef.h
index 506a41c45..5d1fc5f7b 100644
--- a/src/ca/cadef.h
+++ b/src/ca/cadef.h
@@ -50,15 +50,13 @@
 #   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "epicsThread.h"
 
 #ifdef INCLcadefh_accessh_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
 
 #include "caerr.h"
 #include "db_access.h"
diff --git a/src/ca/caerr.h b/src/ca/caerr.h
index ec589668d..dae03fc6a 100644
--- a/src/ca/caerr.h
+++ b/src/ca/caerr.h
@@ -32,10 +32,9 @@
 
 #ifdef INCLcaerrh_accessh_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
-
 /*  CA Status Code Definitions   */
 
 #define CA_K_INFO       3   /* successful */
diff --git a/src/db/dbCAC.h b/src/db/dbCAC.h
index 28d14b6c6..029571d9a 100644
--- a/src/db/dbCAC.h
+++ b/src/db/dbCAC.h
@@ -30,24 +30,21 @@
 #define dbCACh
 
 #ifdef epicsExportSharedSymbols
-#define dbCACh_restore_epicsExportSharedSymbols
-#undef epicsExportSharedSymbols
+#   define dbCACh_restore_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
 #endif
 
-#include "shareLib.h"
-
 #include "tsDLList.h"
 #include "epicsSingleton.h"
 #include "tsFreeList.h"
 #include "resourceLib.h"
-
 #include "cacIO.h"
 
 #ifdef dbCACh_restore_epicsExportSharedSymbols
-#define epicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#   include "shareLib.h"
 #endif
 
-#include "shareLib.h"
 
 #include "db_access.h"
 #include "dbNotify.h"