Merge ~epics-core/epics-base/+git/Com:libcom-api into ~epics-core/epics-base/+git/epics-base:7.0

[mdavidsaver]

After another frustrating iteration of dllimport/export hell, I decided to see what was entailed in replacing use of shareLib.h in libCom (only). This large, but highly mechanical, change set is the result. (done with 'sed')

Adds libComAPI.h which defines LIBCOM_API and LIBCOMSTD_API. Use of the macro epicsExportSharedSymbols is replaced by LIBCOM_API_BUILDING.

Complicates encountered:

1. Defining LIBCOM_API_BUILDING at the directory level necessitates special handling of epicsTempFile.cpp (now compiled twice) and iocLogServer. This could be avoided by doing the executable builds in separate directories.

2. libComAPI.h still includes shareLib.h due to the unfortunate example in shareLib.h for working around ordering problems by un/re-defining epicsExportSharedSymbols. All code using this pattern breaks unless every Base header includes shareLib.h :( The fix is trivial, but too widespread and otherwise inconsequential to force a break now.

The end result is that no downstream/user changes are needed. I did however, go ahead and remove the now unnecessary un/re-define games from the libca headers.

[Ralph Lange (ralph-lange)]

I like the cleaner approach!

As granularity is by library, every library will need a header file like libComAPI.h with functionally identical content. Instead of replicating the code - could this header be generated at compile time?
(I'm not so much concerned about the replication itself - more about the number of places that have to be patched if the mechanism ever needs to be changed.)

[mdavidsaver (mdavidsaver)]

> could this header be generated at compile time?

To me this is a desirable end goal, but not a short term blocker.
I made a brief, unsuccessful, attempt to do this before moving on.

The problem I ran into is that the usual recipe (as I understand it)
of manually adding a rule relating each .d file to a generated header
isn't realistically scalable to the ~100 .o files which make up libCom.

[mdavidsaver (mdavidsaver)]

Meeting: Yes, after doxygen changes merged.

AI on ANJ: to look at generating libComAPI.h (and eventually others)

[Andrew Johnson (anj)]

FYI I have a working generator script, and the necessary adjustments to the build rules to create the requested API.h file before the .d files are generated.

Is it reasonable to assume that at most one API.h file will need to be generated per build directory? I can support multiples if necessary, but it would need some more work on the build rules. I don't think your LIBCOM_API_BUILDING variable would work as is in the case of building multiple DLLs in the same build dir if any of them called any others.

BTW it is possible to set variables to values that vary when building different targets, they're called Target Specific Variables by GNUmake and they apply when building prerequisites ** n of the target too. Try something like this:

BUILDING = YES
FLAGS_YES = -DLIBCOM_API_BUILDING
USR_CPPFLAGS = $(FLAGS_$(BUILDING))
iocLogServer$(exe): BUILDING = NO

I haven't tested this particular construct, but I have used target-specific variables before, there's one in modules/libcom/osi/Makefile for example.

[Andrew Johnson (anj)]

Got a better way that only defines LIBCOM_API_BUILDING when it's compiling files that will go into the library. Add the line below to the Makefile *after* the "include $(TOP)/configure/RULES"

$(LIBNAME): USR_CPPFLAGS += -DLIBCOM_API_BUILDING

Tested on Linux, I /assume/ this will work on Windows but haven't tried it yet.

[Andrew Johnson (anj)]

Correction to my Makefile line above, which should be:

$(LIBNAME) $(SHRLIBNAME): USR_CPPFLAGS += -DLIBCOM_API_BUILDING

I also have a better solution for the epicsTempFile.cpp files (there are both os/posix and os/WIN32 implementations): Rename them to .c and remove the extern "C" wrappers, then #include that inside the antelope.c file instead of the header file. I haven't tried the result on an MSVC target but the mingw cross-build works. I have pushed these changes as a separate GitHub branch since they don't depend on the libComAPI.h stuff.

[mdavidsaver (mdavidsaver)]

> Is it reasonable to assume that at most one API.h file will need to be generated per build directory?

Is it reasonable to assume that only one shared library will be built per build directory?

I can't recall wanting to do this, so I've no particular objection to this limitation.

[Ralph Lange (ralph-lange)]

Would that be a limitation applying to libCom scope only, or more general.

As a general limitation, I have a gut feeling that this will backfire / break existing user code.
We would at least have to provide a migration guide showing how to deal with situations where multiple libraries are created in one place.

[Andrew Johnson (anj)]

If there are multiple libraries being built that use generated API.h files the Makefile needs to set the correct _API_BUILDING flag while building the sources for each library. That’s actually not too hard with the target specific variable approach I’m suggesting, although I’m not quite there yet. I just need a way to generate the specific LIBNAME and/or SHRLIBNAME being built for this target given the stem, which I think I know how to do.

[Andrew Johnson (anj)]

I think I've fixed the epicsTempFile.c build issue now (we'll find out for sure tomorrow); I have rules that allow building multiple libraries per Makefile, and I have tested this with a collection of Base APIs switched, across multiple modules. I'm waiting for the other branch to succeed before I push the next one.

I do want to rename the LIBCOMSTD_API macro which expands to '__stdcall' on Windows. It doesn't need to have the library name stem in it at all as long as it checks for an existing definition. I might have suggested that we stick with the original epicsShareAPI name except that isn't a very descriptive name either, and if we're going to change it now would seem to be the best time. I considered STDCALL, __stdcall, or even the Microsoft names pascal, WINAPI or NTAPI, but it doesn't look like they have #ifndef checks so we might have to go with something like epicsStdCall. Anyone got any better ideas?

Unmerged commits

f5e2011... by mdavidsaver on 2019-11-15

drop epicsExportSharedSymbols un/re-define

fe39293... by mdavidsaver on 2019-11-23

LIBCOM_API workaround for iocLogServer

for lack of PROD_CFLAGS LIB_CFLAGS ...

7ba5084... by mdavidsaver on 2019-11-15

use LIBCOM_API

sed -i \
 -e 's|epicsShareFunc|LIBCOM_API|g' \
 -e 's|epicsShareClass|LIBCOM_API|g' \
 -e 's|epicsShareExtern|LIBCOM_API extern|g' \
 -e 's|epicsShareDef\s*||g' \
 -e 's|shareLib\.h|libComAPI.h|g' \
 -e 's|epicsShareAPI|LIBCOMSTD_API|g' \
 -e '/#define\s*epicsExportSharedSymbols/d' \
 *.{h,c,cpp}

exclude changes to shareLib.h and epicsExport.h

f6a25a6... by mdavidsaver on 2019-11-16

build epicsTempFile again

Compile epicsTempFile.cpp twice, with different dllimport/export,
for use in Com.dll and e_flex/antelope.exe (which doesn't link
against Com).

9ea95e2... by mdavidsaver on 2019-11-15

workaround for unfortunately ubiquitous example

breaks until shareLib.h was included previously.
final include sould be _after_ the #endif

> #ifdef cacIOh_restore_epicsExportSharedSymbols
> # define epicsExportSharedSymbols
> # include "shareLib.h"
> #endif

8faddf0... by mdavidsaver on 2019-11-15

add libComAPI.h

a5e6e31... by mdavidsaver on 2019-11-15

correct unfortunate example

Everything breaks unless all base headers
include shareLib.h ....

diff --git a/modules/ca/src/client/bhe.h b/modules/ca/src/client/bhe.h
index 4da9520..0534637 100644
--- a/modules/ca/src/client/bhe.h
+++ b/modules/ca/src/client/bhe.h
@@ -22,20 +22,12 @@
 #ifndef bheh
 #define bheh
 
-#ifdef epicsExportSharedSymbols
-#   define bhehEpicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "epicsTime.h"
 #include "compilerDependencies.h"
 
-#ifdef bhehEpicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "inetAddrID.h"
 #include "caProto.h"
diff --git a/modules/ca/src/client/cac.h b/modules/ca/src/client/cac.h
index 7db5c6d..6134628 100644
--- a/modules/ca/src/client/cac.h
+++ b/modules/ca/src/client/cac.h
@@ -22,11 +22,6 @@
 #ifndef cach
 #define cach
 
-#ifdef epicsExportSharedSymbols
-#   define cach_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "compilerDependencies.h"
 #include "ipAddrToAsciiAsynchronous.h"
 #include "msgForMultiplyDefinedPV.h"
@@ -35,10 +30,7 @@
 #include "freeList.h"
 #include "localHostName.h"
 
-#ifdef cach_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "nciu.h"
 #include "comBuf.h"
diff --git a/modules/ca/src/client/cacIO.h b/modules/ca/src/client/cacIO.h
index 4e8af4a..e512731 100644
--- a/modules/ca/src/client/cacIO.h
+++ b/modules/ca/src/client/cacIO.h
@@ -47,20 +47,12 @@
 #include <new>
 #include <stdarg.h>
 
-#ifdef epicsExportSharedSymbols
-#   define cacIOh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsDLList.h"
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsThread.h"
 
-#ifdef cacIOh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 
 class cacChannel;
diff --git a/modules/ca/src/client/cadef.h b/modules/ca/src/client/cadef.h
index e62dd72..d51ad5f 100644
--- a/modules/ca/src/client/cadef.h
+++ b/modules/ca/src/client/cadef.h
@@ -32,17 +32,9 @@
 #   include <stdarg.h>
 #endif
 
-#ifdef epicsExportSharedSymbols
-#   define INCLcadefh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsThread.h"
 
-#ifdef INCLcadefh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 
 #include "caerr.h"
diff --git a/modules/ca/src/client/caerr.h b/modules/ca/src/client/caerr.h
index 5393096..b846583 100644
--- a/modules/ca/src/client/caerr.h
+++ b/modules/ca/src/client/caerr.h
@@ -23,17 +23,9 @@
 #ifndef INCLcaerrh
 #define INCLcaerrh
 
-#ifdef epicsExportSharedSymbols
-#   define INCLcaerrh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#   include "epicsTypes.h"
+#include "epicsTypes.h"
 
-#ifdef INCLcaerrh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 /*  CA Status Code Definitions   */
 
diff --git a/modules/ca/src/client/db_access.h b/modules/ca/src/client/db_access.h
index 92aa5d0..b0318dc 100644
--- a/modules/ca/src/client/db_access.h
+++ b/modules/ca/src/client/db_access.h
@@ -17,18 +17,10 @@
 
 #include <stddef.h>
 
-#ifdef epicsExportSharedSymbols
-#   define INCLdb_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTypes.h"
 #include "epicsTime.h"
 
-#ifdef INCLdb_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 
 #ifdef __cplusplus
diff --git a/modules/ca/src/client/disconnectGovernorTimer.h b/modules/ca/src/client/disconnectGovernorTimer.h
index f636d62..1b83b39 100644
--- a/modules/ca/src/client/disconnectGovernorTimer.h
+++ b/modules/ca/src/client/disconnectGovernorTimer.h
@@ -26,19 +26,11 @@
 #ifndef disconnectGovernorTimerh  
 #define disconnectGovernorTimerh
 
-#ifdef epicsExportSharedSymbols
-#   define searchTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsTimer.h"
 
-#ifdef searchTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "caProto.h"
 #include "netiiu.h"
diff --git a/modules/ca/src/client/nciu.h b/modules/ca/src/client/nciu.h
index 7cba6e8..2e8231e 100644
--- a/modules/ca/src/client/nciu.h
+++ b/modules/ca/src/client/nciu.h
@@ -25,21 +25,13 @@
 #ifndef nciuh
 #define nciuh
 
-#ifdef epicsExportSharedSymbols
-#   define nciuh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "resourceLib.h"
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "epicsMutex.h"
 #include "compilerDependencies.h"
 
-#ifdef nciuh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #define CA_MINOR_PROTOCOL_REVISION 13
 #include "caProto.h"
diff --git a/modules/ca/src/client/oldAccess.h b/modules/ca/src/client/oldAccess.h
index 1337cb3..db54e13 100644
--- a/modules/ca/src/client/oldAccess.h
+++ b/modules/ca/src/client/oldAccess.h
@@ -28,19 +28,11 @@
 
 #include <memory>
 
-#ifdef epicsExportSharedSymbols
-#   define oldAccessh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsFreeList.h"
 #include "compilerDependencies.h"
 #include "osiSock.h"
 
-#ifdef oldAccessh_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "caProto.h"
 #include "cacIO.h"
diff --git a/modules/ca/src/client/repeaterClient.h b/modules/ca/src/client/repeaterClient.h
index faaf080..ff94460 100644
--- a/modules/ca/src/client/repeaterClient.h
+++ b/modules/ca/src/client/repeaterClient.h
@@ -26,19 +26,11 @@
 #ifndef repeaterClienth
 #define repeaterClienth
 
-#ifdef epicsExportSharedSymbols
-#   define repeaterClienth_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "compilerDependencies.h"
 
-#ifdef repeaterClienth_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 union osiSockAddr;
 
diff --git a/modules/ca/src/client/repeaterSubscribeTimer.h b/modules/ca/src/client/repeaterSubscribeTimer.h
index fa47684..713e422 100644
--- a/modules/ca/src/client/repeaterSubscribeTimer.h
+++ b/modules/ca/src/client/repeaterSubscribeTimer.h
@@ -28,17 +28,7 @@
 
 #include "epicsTimer.h"
 
-#ifdef epicsExportSharedSymbols
-#   define repeaterSubscribeTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
-#include "epicsTimer.h"
-
-#ifdef repeaterSubscribeTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 class epicsMutex;
 class cacContextNotify;
diff --git a/modules/ca/src/client/searchTimer.h b/modules/ca/src/client/searchTimer.h
index 7b9fe17..95b88b5 100644
--- a/modules/ca/src/client/searchTimer.h
+++ b/modules/ca/src/client/searchTimer.h
@@ -26,19 +26,11 @@
 #ifndef searchTimerh  
 #define searchTimerh
 
-#ifdef epicsExportSharedSymbols
-#   define searchTimerh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsTimer.h"
 
-#ifdef searchTimerh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "caProto.h"
 #include "netiiu.h"
diff --git a/modules/ca/src/client/syncGroup.h b/modules/ca/src/client/syncGroup.h
index 3b9c3cd..5556d88 100644
--- a/modules/ca/src/client/syncGroup.h
+++ b/modules/ca/src/client/syncGroup.h
@@ -25,21 +25,13 @@
 #ifndef syncGrouph
 #define syncGrouph
 
-#ifdef epicsExportSharedSymbols
-#   define syncGrouph_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "resourceLib.h"
 #include "epicsEvent.h"
 #include "compilerDependencies.h"
 
-#ifdef syncGrouph_restore_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "cadef.h"
 #include "cacIO.h"
diff --git a/modules/ca/src/client/tcpRecvWatchdog.h b/modules/ca/src/client/tcpRecvWatchdog.h
index 0b15e22..7e1f20c 100644
--- a/modules/ca/src/client/tcpRecvWatchdog.h
+++ b/modules/ca/src/client/tcpRecvWatchdog.h
@@ -26,17 +26,9 @@
 #ifndef tcpRecvWatchdogh  
 #define tcpRecvWatchdogh
 
-#ifdef epicsExportSharedSymbols
-#   define tcpRecvWatchdogh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTimer.h"
 
-#ifdef tcpRecvWatchdogh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 class tcpiiu;
 
diff --git a/modules/ca/src/client/tcpSendWatchdog.h b/modules/ca/src/client/tcpSendWatchdog.h
index 05a2dfe..edab731 100644
--- a/modules/ca/src/client/tcpSendWatchdog.h
+++ b/modules/ca/src/client/tcpSendWatchdog.h
@@ -27,17 +27,9 @@
 #define tcpSendWatchdogh
 
 
-#ifdef epicsExportSharedSymbols
-#   define tcpSendWatchdogh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTimer.h"
 
-#ifdef tcpSendWatchdogh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 class tcpSendWatchdog : private epicsTimerNotify {
 public:
diff --git a/modules/ca/src/client/udpiiu.h b/modules/ca/src/client/udpiiu.h
index fdf3482..bf7ea10 100644
--- a/modules/ca/src/client/udpiiu.h
+++ b/modules/ca/src/client/udpiiu.h
@@ -27,20 +27,12 @@
 
 #include <memory>
 
-#ifdef epicsExportSharedSymbols
-#   define udpiiuh_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "osiSock.h"
 #include "epicsThread.h"
 #include "epicsTime.h"
 #include "tsDLList.h"
 
-#ifdef udpiiuh_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "netiiu.h"
 #include "searchTimer.h"
diff --git a/modules/database/src/ioc/db/dbAccessDefs.h b/modules/database/src/ioc/db/dbAccessDefs.h
index 805dfd4..6f5a4c2 100644
--- a/modules/database/src/ioc/db/dbAccessDefs.h
+++ b/modules/database/src/ioc/db/dbAccessDefs.h
@@ -11,18 +11,10 @@
 #ifndef INCdbAccessDefsh
 #define INCdbAccessDefsh
 
-#ifdef epicsExportSharedSymbols
-#   define INCLdb_accessh_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "epicsTypes.h"
 #include "epicsTime.h"
 
-#ifdef INCLdb_accessh_epicsExportSharedSymbols
-#   define epicsExportSharedSymbols
-#   include "shareLib.h"
-#endif
+#include "shareLib.h"
 
 #include "dbBase.h"
 #include "dbAddr.h"
diff --git a/modules/database/src/ioc/db/dbCAC.h b/modules/database/src/ioc/db/dbCAC.h
index 2d97fac..9ead387 100644
--- a/modules/database/src/ioc/db/dbCAC.h
+++ b/modules/database/src/ioc/db/dbCAC.h
@@ -19,11 +19,6 @@
 #ifndef dbCACh
 #define dbCACh
 
-#ifdef epicsExportSharedSymbols
-#   define dbCACh_restore_epicsExportSharedSymbols
-#   undef epicsExportSharedSymbols
-#endif
-
 #include "stdlib.h"
 
 #include <memory> // std::auto_ptr
@@ -31,13 +26,19 @@
 #include "tsDLList.h"
 #include "tsFreeList.h"
 #include "resourceLib.h"
+
+#ifdef epicsExportSharedSymbols
+#   define dbCACh_restore_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include "cacIO.h"
 #include "compilerDependencies.h"
 
 #ifdef dbCACh_restore_epicsExportSharedSymbols
 #   define epicsExportSharedSymbols
-#   include "shareLib.h"
 #endif
+#include "shareLib.h"
 
 #include "db_access.h"
 #include "dbNotify.h"
diff --git a/modules/libcom/src/Makefile b/modules/libcom/src/Makefile
index 57533ba..72ddd42 100644
--- a/modules/libcom/src/Makefile
+++ b/modules/libcom/src/Makefile
@@ -14,10 +14,13 @@ include $(TOP)/configure/CONFIG
 # Uncomment this to remove the (benign) valgrind helper stubs
 #USR_CFLAGS += -DNVALGRIND
 
+USR_CPPFLAGS += -DLIBCOM_API_BUILDING
+
 INC += valgrind/valgrind.h
 
 INC += libComVersion.h
 INC += libComVersionNum.h
+INC += libComAPI.h
 
 include $(LIBCOM)/as/Makefile
 include $(LIBCOM)/bucketLib/Makefile
diff --git a/modules/libcom/src/as/asLib.h b/modules/libcom/src/as/asLib.h
index 528ce6e..d0a89fd 100644
--- a/modules/libcom/src/as/asLib.h
+++ b/modules/libcom/src/as/asLib.h
@@ -12,7 +12,7 @@
 #ifndef INCasLibh
 #define INCasLibh
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "ellLib.h"
 #include "errMdef.h"
 #include "errlog.h"
@@ -24,7 +24,7 @@ extern "C" {
 /* 0 - Use (unverified) client provided host name string.
  * 1 - Use actual client IP address.  HAG() are resolved to IPs at ACF load time.
  */
-epicsShareExtern int asCheckClientIP;
+LIBCOM_API extern int asCheckClientIP;
 
 typedef struct asgMember *ASMEMBERPVT;
 typedef struct asgClient *ASCLIENTPVT;
@@ -67,63 +67,63 @@ void *asTrapWriteBefore(ASCLIENTPVT asClientPvt,
     asTrapWriteWithData(asClientPvt, user, host, addr, 0, 0, NULL)
 
 
-epicsShareFunc long epicsShareAPI asInitialize(ASINPUTFUNCPTR inputfunction);
-epicsShareFunc long epicsShareAPI asInitFile(
+LIBCOM_API long LIBCOMSTD_API asInitialize(ASINPUTFUNCPTR inputfunction);
+LIBCOM_API long LIBCOMSTD_API asInitFile(
     const char *filename,const char *substitutions);
-epicsShareFunc long epicsShareAPI asInitFP(FILE *fp,const char *substitutions);
-epicsShareFunc long epicsShareAPI asInitMem(const char *acf, const char *substitutions);
+LIBCOM_API long LIBCOMSTD_API asInitFP(FILE *fp,const char *substitutions);
+LIBCOM_API long LIBCOMSTD_API asInitMem(const char *acf, const char *substitutions);
 /*caller must provide permanent storage for asgName*/
-epicsShareFunc long epicsShareAPI asAddMember(
+LIBCOM_API long LIBCOMSTD_API asAddMember(
     ASMEMBERPVT *asMemberPvt,const char *asgName);
-epicsShareFunc long epicsShareAPI asRemoveMember(ASMEMBERPVT *asMemberPvt);
+LIBCOM_API long LIBCOMSTD_API asRemoveMember(ASMEMBERPVT *asMemberPvt);
 /*caller must provide permanent storage for newAsgName*/
-epicsShareFunc long epicsShareAPI asChangeGroup(
+LIBCOM_API long LIBCOMSTD_API asChangeGroup(
     ASMEMBERPVT *asMemberPvt,const char *newAsgName);
-epicsShareFunc void * epicsShareAPI asGetMemberPvt(ASMEMBERPVT asMemberPvt);
-epicsShareFunc void epicsShareAPI asPutMemberPvt(
+LIBCOM_API void * LIBCOMSTD_API asGetMemberPvt(ASMEMBERPVT asMemberPvt);
+LIBCOM_API void LIBCOMSTD_API asPutMemberPvt(
     ASMEMBERPVT asMemberPvt,void *userPvt);
 /*client must provide permanent storage for user and host*/
-epicsShareFunc long epicsShareAPI asAddClient(
+LIBCOM_API long LIBCOMSTD_API asAddClient(
     ASCLIENTPVT *asClientPvt,ASMEMBERPVT asMemberPvt,
     int asl,const char *user,char *host);
 /*client must provide permanent storage for user and host*/
-epicsShareFunc long epicsShareAPI asChangeClient(
+LIBCOM_API long LIBCOMSTD_API asChangeClient(
     ASCLIENTPVT asClientPvt,int asl,const char *user,char *host);
-epicsShareFunc long epicsShareAPI asRemoveClient(ASCLIENTPVT *asClientPvt);
-epicsShareFunc void * epicsShareAPI asGetClientPvt(ASCLIENTPVT asClientPvt);
-epicsShareFunc void epicsShareAPI asPutClientPvt(
+LIBCOM_API long LIBCOMSTD_API asRemoveClient(ASCLIENTPVT *asClientPvt);
+LIBCOM_API void * LIBCOMSTD_API asGetClientPvt(ASCLIENTPVT asClientPvt);
+LIBCOM_API void LIBCOMSTD_API asPutClientPvt(
     ASCLIENTPVT asClientPvt,void *userPvt);
-epicsShareFunc long epicsShareAPI asRegisterClientCallback(
+LIBCOM_API long LIBCOMSTD_API asRegisterClientCallback(
     ASCLIENTPVT asClientPvt, ASCLIENTCALLBACK pcallback);
-epicsShareFunc long epicsShareAPI asComputeAllAsg(void);
+LIBCOM_API long LIBCOMSTD_API asComputeAllAsg(void);
 /* following declared below after ASG is declared
-epicsShareFunc long epicsShareAPI asComputeAsg(ASG *pasg);
+LIBCOM_API long LIBCOMSTD_API asComputeAsg(ASG *pasg);
 */
-epicsShareFunc long epicsShareAPI asCompute(ASCLIENTPVT asClientPvt);
-epicsShareFunc int epicsShareAPI asDump(
+LIBCOM_API long LIBCOMSTD_API asCompute(ASCLIENTPVT asClientPvt);
+LIBCOM_API int LIBCOMSTD_API asDump(
     void (*memcallback)(ASMEMBERPVT,FILE *),
     void (*clientcallback)(ASCLIENTPVT,FILE *),int verbose);
-epicsShareFunc int epicsShareAPI asDumpFP(FILE *fp,
+LIBCOM_API int LIBCOMSTD_API asDumpFP(FILE *fp,
     void (*memcallback)(ASMEMBERPVT,FILE *),
     void (*clientcallback)(ASCLIENTPVT,FILE *),int verbose);
-epicsShareFunc int epicsShareAPI asDumpUag(const char *uagname);
-epicsShareFunc int epicsShareAPI asDumpUagFP(FILE *fp,const char *uagname);
-epicsShareFunc int epicsShareAPI asDumpHag(const char *hagname);
-epicsShareFunc int epicsShareAPI asDumpHagFP(FILE *fp,const char *hagname);
-epicsShareFunc int epicsShareAPI asDumpRules(const char *asgname);
-epicsShareFunc int epicsShareAPI asDumpRulesFP(FILE *fp,const char *asgname);
-epicsShareFunc int epicsShareAPI asDumpMem(const char *asgname,
+LIBCOM_API int LIBCOMSTD_API asDumpUag(const char *uagname);
+LIBCOM_API int LIBCOMSTD_API asDumpUagFP(FILE *fp,const char *uagname);
+LIBCOM_API int LIBCOMSTD_API asDumpHag(const char *hagname);
+LIBCOM_API int LIBCOMSTD_API asDumpHagFP(FILE *fp,const char *hagname);
+LIBCOM_API int LIBCOMSTD_API asDumpRules(const char *asgname);
+LIBCOM_API int LIBCOMSTD_API asDumpRulesFP(FILE *fp,const char *asgname);
+LIBCOM_API int LIBCOMSTD_API asDumpMem(const char *asgname,
     void (*memcallback)(ASMEMBERPVT,FILE *),int clients);
-epicsShareFunc int epicsShareAPI asDumpMemFP(FILE *fp,const char *asgname,
+LIBCOM_API int LIBCOMSTD_API asDumpMemFP(FILE *fp,const char *asgname,
     void (*memcallback)(ASMEMBERPVT,FILE *),int clients);
-epicsShareFunc int epicsShareAPI asDumpHash(void);
-epicsShareFunc int epicsShareAPI asDumpHashFP(FILE *fp);
+LIBCOM_API int LIBCOMSTD_API asDumpHash(void);
+LIBCOM_API int LIBCOMSTD_API asDumpHashFP(FILE *fp);
 
-epicsShareFunc void * epicsShareAPI asTrapWriteBeforeWithData(
+LIBCOM_API void * LIBCOMSTD_API asTrapWriteBeforeWithData(
     const char *userid, const char *hostid, void *addr,
     int dbrType, int no_elements, void *data);
 
-epicsShareFunc void epicsShareAPI asTrapWriteAfterWrite(void *pvt);
+LIBCOM_API void LIBCOMSTD_API asTrapWriteAfterWrite(void *pvt);
 
 #define S_asLib_clientsExist 	(M_asLib| 1) /*Client Exists*/
 #define S_asLib_noUag 		(M_asLib| 2) /*User Access Group does not exist*/
@@ -141,7 +141,7 @@ epicsShareFunc void epicsShareAPI asTrapWriteAfterWrite(void *pvt);
 #define S_asLib_noMemory	(M_asLib|14) /*access security: no Memory */
 

 /*Private declarations */
-epicsShareExtern int asActive;
+LIBCOM_API extern int asActive;
 
 /* definition of access rights*/
 typedef enum{asNOACCESS,asREAD,asWRITE} asAccessRights;
@@ -156,7 +156,7 @@ typedef struct asBase{
 	struct gphPvt *phash;
 } ASBASE;
 
-epicsShareExtern volatile ASBASE *pasbase;
+LIBCOM_API extern volatile ASBASE *pasbase;
 
 /*Defs for User Access Groups*/
 typedef struct{
@@ -238,11 +238,11 @@ typedef struct asgClient {
 	int		trapMask;
 } ASGCLIENT;
 
-epicsShareFunc long epicsShareAPI asComputeAsg(ASG *pasg);
+LIBCOM_API long LIBCOMSTD_API asComputeAsg(ASG *pasg);
 /*following is "friend" function*/
-epicsShareFunc void * epicsShareAPI asCalloc(size_t nobj,size_t size);
-epicsShareFunc char * epicsShareAPI asStrdup(unsigned char *str);
-epicsShareFunc void asFreeAll(ASBASE *pasbase);
+LIBCOM_API void * LIBCOMSTD_API asCalloc(size_t nobj,size_t size);
+LIBCOM_API char * LIBCOMSTD_API asStrdup(unsigned char *str);
+LIBCOM_API void asFreeAll(ASBASE *pasbase);
 #ifdef __cplusplus
 }
 #endif
diff --git a/modules/libcom/src/as/asLibRoutines.c b/modules/libcom/src/as/asLibRoutines.c
index e19b639..1f72beb 100644
--- a/modules/libcom/src/as/asLibRoutines.c
+++ b/modules/libcom/src/as/asLibRoutines.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#define epicsExportSharedSymbols
 #include "osiSock.h"
 #include "epicsTypes.h"
 #include "epicsStdio.h"
@@ -36,9 +35,9 @@ static epicsMutexId asLock;
 #define UNLOCK epicsMutexUnlock(asLock)
 
 /*following must be global because asCa nneeds it*/
-epicsShareDef ASBASE volatile *pasbase=NULL;
+ASBASE volatile *pasbase=NULL;
 static ASBASE *pasbasenew=NULL;
-epicsShareDef int   asActive = FALSE;
+int   asActive = FALSE;
 
 static void         *freeListPvt = NULL;
 
@@ -82,7 +81,7 @@ static void asInitializeOnce(void *arg)
     osiSockAttach();
     asLock  = epicsMutexMustCreate();
 }
-long epicsShareAPI asInitialize(ASINPUTFUNCPTR inputfunction)
+long LIBCOMSTD_API asInitialize(ASINPUTFUNCPTR inputfunction)
 {
     ASG		*pasg;
     long	status;
@@ -167,7 +166,7 @@ long epicsShareAPI asInitialize(ASINPUTFUNCPTR inputfunction)
     return(0);
 }
 
-long epicsShareAPI asInitFile(const char *filename,const char *substitutions)
+long LIBCOMSTD_API asInitFile(const char *filename,const char *substitutions)
 {
     FILE *fp;
     long status;
@@ -222,7 +221,7 @@ static int myInputFunction(char *buf, int max_size)
     return(n);
 }
 

-long epicsShareAPI asInitFP(FILE *fp,const char *substitutions)
+long LIBCOMSTD_API asInitFP(FILE *fp,const char *substitutions)
 {
     char	buffer[BUF_SIZE];
     char	mac_buffer[BUF_SIZE];
@@ -272,7 +271,7 @@ static int memInputFunction(char *buf, int max_size)
     return ret;
 }
 
-long epicsShareAPI asInitMem(const char *acf, const char *substitutions)
+long LIBCOMSTD_API asInitMem(const char *acf, const char *substitutions)
 {
     long ret = S_asLib_InitFailed;
     if(!acf) return ret;
@@ -284,7 +283,7 @@ long epicsShareAPI asInitMem(const char *acf, const char *substitutions)
     return ret;
 }
 
-long epicsShareAPI asAddMember(ASMEMBERPVT *pasMemberPvt,const char *asgName)
+long LIBCOMSTD_API asAddMember(ASMEMBERPVT *pasMemberPvt,const char *asgName)
 {
     long	status;
 
@@ -295,7 +294,7 @@ long epicsShareAPI asAddMember(ASMEMBERPVT *pasMemberPvt,const char *asgName)
     return(status);
 }
 
-long epicsShareAPI asRemoveMember(ASMEMBERPVT *asMemberPvt)
+long LIBCOMSTD_API asRemoveMember(ASMEMBERPVT *asMemberPvt)
 {
     ASGMEMBER	*pasgmember;
 
@@ -320,7 +319,7 @@ long epicsShareAPI asRemoveMember(ASMEMBERPVT *asMemberPvt)
     return(0);
 }
 
-long epicsShareAPI asChangeGroup(ASMEMBERPVT *asMemberPvt,const char *newAsgName)
+long LIBCOMSTD_API asChangeGroup(ASMEMBERPVT *asMemberPvt,const char *newAsgName)
 {
     ASGMEMBER	*pasgmember;
     long	status;
@@ -341,7 +340,7 @@ long epicsShareAPI asChangeGroup(ASMEMBERPVT *asMemberPvt,const char *newAsgName
     return(status);
 }
 

-void * epicsShareAPI asGetMemberPvt(ASMEMBERPVT asMemberPvt)
+void * LIBCOMSTD_API asGetMemberPvt(ASMEMBERPVT asMemberPvt)
 {
     ASGMEMBER	*pasgmember = asMemberPvt;
 
@@ -350,7 +349,7 @@ void * epicsShareAPI asGetMemberPvt(ASMEMBERPVT asMemberPvt)
     return(pasgmember->userPvt);
 }
 
-void epicsShareAPI asPutMemberPvt(ASMEMBERPVT asMemberPvt,void *userPvt)
+void LIBCOMSTD_API asPutMemberPvt(ASMEMBERPVT asMemberPvt,void *userPvt)
 {
     ASGMEMBER	*pasgmember = asMemberPvt;
 
@@ -360,7 +359,7 @@ void epicsShareAPI asPutMemberPvt(ASMEMBERPVT asMemberPvt,void *userPvt)
     return;
 }
 

-long epicsShareAPI asAddClient(ASCLIENTPVT *pasClientPvt,ASMEMBERPVT asMemberPvt,
+long LIBCOMSTD_API asAddClient(ASCLIENTPVT *pasClientPvt,ASMEMBERPVT asMemberPvt,
 	int asl,const char *user,char *host)
 {
     ASGMEMBER	*pasgmember = asMemberPvt;
@@ -388,7 +387,7 @@ long epicsShareAPI asAddClient(ASCLIENTPVT *pasClientPvt,ASMEMBERPVT asMemberPvt
     return(status);
 }
 
-long epicsShareAPI asChangeClient(
+long LIBCOMSTD_API asChangeClient(
     ASCLIENTPVT asClientPvt,int asl,const char *user,char *host)
 {
     ASGCLIENT	*pasgclient = asClientPvt;
@@ -410,7 +409,7 @@ long epicsShareAPI asChangeClient(
     return(status);
 }
 
-long epicsShareAPI asRemoveClient(ASCLIENTPVT *asClientPvt)
+long LIBCOMSTD_API asRemoveClient(ASCLIENTPVT *asClientPvt)
 {
     ASGCLIENT	*pasgclient = *asClientPvt;
     ASGMEMBER	*pasgMember;
@@ -431,7 +430,7 @@ long epicsShareAPI asRemoveClient(ASCLIENTPVT *asClientPvt)
     return(0);
 }
 

-long epicsShareAPI asRegisterClientCallback(ASCLIENTPVT asClientPvt,
+long LIBCOMSTD_API asRegisterClientCallback(ASCLIENTPVT asClientPvt,
 	ASCLIENTCALLBACK pcallback)
 {
     ASGCLIENT	*pasgclient = asClientPvt;
@@ -445,7 +444,7 @@ long epicsShareAPI asRegisterClientCallback(ASCLIENTPVT asClientPvt,
     return(0);
 }
 
-void * epicsShareAPI asGetClientPvt(ASCLIENTPVT asClientPvt)
+void * LIBCOMSTD_API asGetClientPvt(ASCLIENTPVT asClientPvt)
 {
     ASGCLIENT	*pasgclient = asClientPvt;
 
@@ -454,7 +453,7 @@ void * epicsShareAPI asGetClientPvt(ASCLIENTPVT asClientPvt)
     return(pasgclient->userPvt);
 }
 
-void epicsShareAPI asPutClientPvt(ASCLIENTPVT asClientPvt,void *userPvt)
+void LIBCOMSTD_API asPutClientPvt(ASCLIENTPVT asClientPvt,void *userPvt)
 {
     ASGCLIENT	*pasgclient = asClientPvt;
     if(!asActive) return;
@@ -464,7 +463,7 @@ void epicsShareAPI asPutClientPvt(ASCLIENTPVT asClientPvt,void *userPvt)
     UNLOCK;
 }
 

-long epicsShareAPI asComputeAllAsg(void)
+long LIBCOMSTD_API asComputeAllAsg(void)
 {
     long status;
 
@@ -475,7 +474,7 @@ long epicsShareAPI asComputeAllAsg(void)
     return(status);
 }
 
-long epicsShareAPI asComputeAsg(ASG *pasg)
+long LIBCOMSTD_API asComputeAsg(ASG *pasg)
 {
     long status;
 
@@ -486,7 +485,7 @@ long epicsShareAPI asComputeAsg(ASG *pasg)
     return(status);
 }
 
-long epicsShareAPI asCompute(ASCLIENTPVT asClientPvt)
+long LIBCOMSTD_API asCompute(ASCLIENTPVT asClientPvt)
 {
     long status;
 
@@ -502,7 +501,7 @@ long epicsShareAPI asCompute(ASCLIENTPVT asClientPvt)
 static const char *asAccessName[] = {"NONE","READ","WRITE"};
 static const char *asTrapOption[] = {"NOTRAPWRITE","TRAPWRITE"};
 static const char *asLevelName[] = {"ASL0","ASL1"};
-int epicsShareAPI asDump(
+int LIBCOMSTD_API asDump(
 	void (*memcallback)(struct asgMember *,FILE *),
 	void (*clientcallback)(struct asgClient *,FILE *),
 	int verbose)
@@ -510,7 +509,7 @@ int epicsShareAPI asDump(
     return asDumpFP(stdout,memcallback,clientcallback,verbose);
 }
 
-int epicsShareAPI asDumpFP(
+int LIBCOMSTD_API asDumpFP(
 	FILE *fp,
 	void (*memcallback)(struct asgMember *,FILE *),
 	void (*clientcallback)(struct asgClient *,FILE *),
@@ -655,12 +654,12 @@ int epicsShareAPI asDumpFP(
     return(0);
 }
 

-int epicsShareAPI asDumpUag(const char *uagname)
+int LIBCOMSTD_API asDumpUag(const char *uagname)
 {
     return asDumpUagFP(stdout,uagname);
 }
 
-int epicsShareAPI asDumpUagFP(FILE *fp,const char *uagname)
+int LIBCOMSTD_API asDumpUagFP(FILE *fp,const char *uagname)
 {
     UAG		*puag;
     UAGNAME	*puagname;
@@ -686,12 +685,12 @@ int epicsShareAPI asDumpUagFP(FILE *fp,const char *uagname)
     return(0);
 }
 
-int epicsShareAPI asDumpHag(const char *hagname)
+int LIBCOMSTD_API asDumpHag(const char *hagname)
 {
     return asDumpHagFP(stdout,hagname);
 }
 
-int epicsShareAPI asDumpHagFP(FILE *fp,const char *hagname)
+int LIBCOMSTD_API asDumpHagFP(FILE *fp,const char *hagname)
 {
     HAG		*phag;
     HAGNAME	*phagname;
@@ -717,12 +716,12 @@ int epicsShareAPI asDumpHagFP(FILE *fp,const char *hagname)
     return(0);
 }
 

-int epicsShareAPI asDumpRules(const char *asgname)
+int LIBCOMSTD_API asDumpRules(const char *asgname)
 {
     return asDumpRulesFP(stdout,asgname);
 }
 
-int epicsShareAPI asDumpRulesFP(FILE *fp,const char *asgname)
+int LIBCOMSTD_API asDumpRulesFP(FILE *fp,const char *asgname)
 {
     ASG		*pasg;
     ASGINP	*pasginp;
@@ -801,13 +800,13 @@ int epicsShareAPI asDumpRulesFP(FILE *fp,const char *asgname)
     return(0);
 }
 

-int epicsShareAPI asDumpMem(const char *asgname,void (*memcallback)(ASMEMBERPVT,FILE *),
+int LIBCOMSTD_API asDumpMem(const char *asgname,void (*memcallback)(ASMEMBERPVT,FILE *),
   int clients)
 {
     return asDumpMemFP(stdout,asgname,memcallback,clients);
 }
 
-int epicsShareAPI asDumpMemFP(FILE *fp,const char *asgname,
+int LIBCOMSTD_API asDumpMemFP(FILE *fp,const char *asgname,
   void (*memcallback)(ASMEMBERPVT,FILE *),int clients)
 {
     ASG		*pasg;
@@ -858,12 +857,12 @@ int epicsShareAPI asDumpMemFP(FILE *fp,const char *asgname,
     return(0);
 }
 
-epicsShareFunc int epicsShareAPI asDumpHash(void)
+LIBCOM_API int LIBCOMSTD_API asDumpHash(void)
 {
     return asDumpHashFP(stdout);
 }
 
-epicsShareFunc int epicsShareAPI asDumpHashFP(FILE *fp)
+LIBCOM_API int LIBCOMSTD_API asDumpHashFP(FILE *fp)
 {
     if(!asActive) return(0);
     gphDumpFP(fp,pasbase->phash);
@@ -872,14 +871,14 @@ epicsShareFunc int epicsShareAPI asDumpHashFP(FILE *fp)
 

 /*Start of private routines*/
 /* asCalloc is "friend" function */
-epicsShareFunc void * epicsShareAPI asCalloc(size_t nobj,size_t size)
+LIBCOM_API void * LIBCOMSTD_API asCalloc(size_t nobj,size_t size)
 {
     void *p;
 
     p=callocMustSucceed(nobj,size,"asCalloc");
     return(p);
 }
-epicsShareFunc char * epicsShareAPI asStrdup(unsigned char *str)
+LIBCOM_API char * LIBCOMSTD_API asStrdup(unsigned char *str)
 {
 	size_t len = strlen((char *) str);
 	char *buf = asCalloc(1, len + 1);
diff --git a/modules/libcom/src/as/asTrapWrite.c b/modules/libcom/src/as/asTrapWrite.c
index 544e9a2..c6f9ab4 100644
--- a/modules/libcom/src/as/asTrapWrite.c
+++ b/modules/libcom/src/as/asTrapWrite.c
@@ -19,7 +19,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define epicsExportSharedSymbols
 #include "ellLib.h"
 #include "freeList.h"
 #include "epicsStdio.h"
@@ -71,7 +70,7 @@ static void asTrapWriteInit(void)
     pasTrapWritePvt->lock = epicsMutexMustCreate();
 }
 
-asTrapWriteId epicsShareAPI asTrapWriteRegisterListener(
+asTrapWriteId LIBCOMSTD_API asTrapWriteRegisterListener(
     asTrapWriteListener func)
 {
     listener *plistener;
@@ -84,7 +83,7 @@ asTrapWriteId epicsShareAPI asTrapWriteRegisterListener(
     return((asTrapWriteId)plistener);
 }
 
-void epicsShareAPI asTrapWriteUnregisterListener(asTrapWriteId id)
+void LIBCOMSTD_API asTrapWriteUnregisterListener(asTrapWriteId id)
 {
     listener *plistener = (listener *)id;
     writeMessage *pwriteMessage;
@@ -111,7 +110,7 @@ void epicsShareAPI asTrapWriteUnregisterListener(asTrapWriteId id)
     epicsMutexUnlock(pasTrapWritePvt->lock);
 }
 

-void * epicsShareAPI asTrapWriteBeforeWithData(
+void * LIBCOMSTD_API asTrapWriteBeforeWithData(
     const char *userid, const char *hostid, void *addr,
     int dbrType, int no_elements, void *data)
 {
@@ -149,7 +148,7 @@ void * epicsShareAPI asTrapWriteBeforeWithData(
     return pwriteMessage;
 }
 
-void epicsShareAPI asTrapWriteAfterWrite(void *pvt)
+void LIBCOMSTD_API asTrapWriteAfterWrite(void *pvt)
 {
     writeMessage *pwriteMessage = (writeMessage *)pvt;
     listenerPvt *plistenerPvt;
diff --git a/modules/libcom/src/as/asTrapWrite.h b/modules/libcom/src/as/asTrapWrite.h
index b8033cb..280ed1a 100644
--- a/modules/libcom/src/as/asTrapWrite.h
+++ b/modules/libcom/src/as/asTrapWrite.h
@@ -12,7 +12,7 @@
 #ifndef INCasTrapWriteh
 #define INCasTrapWriteh
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,9 +32,9 @@ typedef struct asTrapWriteMessage {
 typedef void *asTrapWriteId;
 typedef void(*asTrapWriteListener)(asTrapWriteMessage *pmessage,int after);
 
-epicsShareFunc asTrapWriteId epicsShareAPI asTrapWriteRegisterListener(
+LIBCOM_API asTrapWriteId LIBCOMSTD_API asTrapWriteRegisterListener(
     asTrapWriteListener func);
-epicsShareFunc void epicsShareAPI asTrapWriteUnregisterListener(
+LIBCOM_API void LIBCOMSTD_API asTrapWriteUnregisterListener(
     asTrapWriteId id);
 
 /*
diff --git a/modules/libcom/src/bucketLib/bucketLib.c b/modules/libcom/src/bucketLib/bucketLib.c
index 40df596..1912777 100644
--- a/modules/libcom/src/bucketLib/bucketLib.c
+++ b/modules/libcom/src/bucketLib/bucketLib.c
@@ -23,7 +23,6 @@
 #include <math.h>
 #include <time.h>
 
-#define epicsExportSharedSymbols
 #include "epicsAssert.h"
 #include "freeList.h"	/* bucketLib uses freeListLib inside the DLL */
 #include "bucketLib.h"
@@ -216,7 +215,7 @@ static BUCKETID bucketStringHash (BUCKET *pb, const void *pId)
 /*
  * bucketCreate()
  */
-epicsShareFunc BUCKET * epicsShareAPI bucketCreate (unsigned nHashTableEntries)
+LIBCOM_API BUCKET * LIBCOMSTD_API bucketCreate (unsigned nHashTableEntries)
 {
 	BUCKETID	mask;
 	unsigned	nbits;
@@ -283,7 +282,7 @@ epicsShareFunc BUCKET * epicsShareAPI bucketCreate (unsigned nHashTableEntries)
 /*
  * bucketFree()
  */
-epicsShareFunc int epicsShareAPI bucketFree (BUCKET *prb)
+LIBCOM_API int LIBCOMSTD_API bucketFree (BUCKET *prb)
 {
 	/*
 	 * deleting a bucket with entries in use
@@ -305,17 +304,17 @@ epicsShareFunc int epicsShareAPI bucketFree (BUCKET *prb)
 /*
  * bucketAddItem()
  */
-epicsShareFunc int epicsShareAPI 
+LIBCOM_API int LIBCOMSTD_API 
 	bucketAddItemUnsignedId(BUCKET *prb, const unsigned *pId, const void *pApp)
 {
 	return bucketAddItem(prb, &BSET[bidtUnsigned], pId, pApp);
 }
-epicsShareFunc int epicsShareAPI 
+LIBCOM_API int LIBCOMSTD_API 
 	bucketAddItemPointerId(BUCKET *prb, void * const *pId, const void *pApp)
 {
 	return bucketAddItem(prb, &BSET[bidtPointer], pId, pApp);
 }
-epicsShareFunc int epicsShareAPI 
+LIBCOM_API int LIBCOMSTD_API 
 	bucketAddItemStringId(BUCKET *prb, const char *pId, const void *pApp)
 {
 	return bucketAddItem(prb, &BSET[bidtString], pId, pApp);
@@ -395,15 +394,15 @@ static void *bucketLookupAndRemoveItem (BUCKET *prb, bucketSET *pBSET, const voi
 
 	return pApp;
 }
-epicsShareFunc void * epicsShareAPI bucketLookupAndRemoveItemUnsignedId (BUCKET *prb, const unsigned *pId)
+LIBCOM_API void * LIBCOMSTD_API bucketLookupAndRemoveItemUnsignedId (BUCKET *prb, const unsigned *pId)
 {
     return bucketLookupAndRemoveItem(prb, &BSET[bidtUnsigned], pId);
 }
-epicsShareFunc void * epicsShareAPI bucketLookupAndRemoveItemPointerId (BUCKET *prb, void * const *pId)
+LIBCOM_API void * LIBCOMSTD_API bucketLookupAndRemoveItemPointerId (BUCKET *prb, void * const *pId)
 {
 	return bucketLookupAndRemoveItem(prb, &BSET[bidtPointer], pId);
 }
-epicsShareFunc void * epicsShareAPI bucketLookupAndRemoveItemStringId (BUCKET *prb, const char *pId)
+LIBCOM_API void * LIBCOMSTD_API bucketLookupAndRemoveItemStringId (BUCKET *prb, const char *pId)
 {
 	return bucketLookupAndRemoveItem(prb, &BSET[bidtString], pId);
 }
@@ -412,17 +411,17 @@ epicsShareFunc void * epicsShareAPI bucketLookupAndRemoveItemStringId (BUCKET *p
 /*
  * bucketRemoveItem()
  */
-epicsShareFunc int epicsShareAPI 
+LIBCOM_API int LIBCOMSTD_API 
 	bucketRemoveItemUnsignedId (BUCKET *prb, const unsigned *pId)
 {
     return bucketLookupAndRemoveItem(prb, &BSET[bidtUnsigned], pId)?S_bucket_success:S_bucket_uknId;
 }
-epicsShareFunc int epicsShareAPI 
+LIBCOM_API int LIBCOMSTD_API 
 	bucketRemoveItemPointerId (BUCKET *prb, void * const *pId)
 {
 	return bucketLookupAndRemoveItem(prb, &BSET[bidtPointer], pId)?S_bucket_success:S_bucket_uknId;
 }
-epicsShareFunc int epicsShareAPI 
+LIBCOM_API int LIBCOMSTD_API 
 	bucketRemoveItemStringId (BUCKET *prb, const char *pId)
 {
 	return bucketLookupAndRemoveItem(prb, &BSET[bidtString], pId)?S_bucket_success:S_bucket_uknId;
@@ -432,17 +431,17 @@ epicsShareFunc int epicsShareAPI
 /*
  * bucketLookupItem()
  */
-epicsShareFunc void * epicsShareAPI
+LIBCOM_API void * LIBCOMSTD_API
  	bucketLookupItemUnsignedId (BUCKET *prb, const unsigned *pId)
 {
 	return bucketLookupItem(prb, &BSET[bidtUnsigned], pId);
 }
-epicsShareFunc void * epicsShareAPI
+LIBCOM_API void * LIBCOMSTD_API
 	bucketLookupItemPointerId (BUCKET *prb, void * const *pId)
 {
 	return bucketLookupItem(prb, &BSET[bidtPointer], pId);
 }
-epicsShareFunc void * epicsShareAPI
+LIBCOM_API void * LIBCOMSTD_API
 	bucketLookupItemStringId (BUCKET *prb, const char *pId)
 {
 	return bucketLookupItem(prb, &BSET[bidtString], pId);
@@ -474,7 +473,7 @@ static void *bucketLookupItem (BUCKET *pb, bucketSET *pBSET, const void *pId)
 /*
  * bucketShow()
  */
-epicsShareFunc int epicsShareAPI bucketShow(BUCKET *pb)
+LIBCOM_API int LIBCOMSTD_API bucketShow(BUCKET *pb)
 {
 	ITEM 		**ppi;
 	ITEM 		*pi;
diff --git a/modules/libcom/src/bucketLib/bucketLib.h b/modules/libcom/src/bucketLib/bucketLib.h
index 60d73b4..192d679 100644
--- a/modules/libcom/src/bucketLib/bucketLib.h
+++ b/modules/libcom/src/bucketLib/bucketLib.h
@@ -25,7 +25,7 @@ extern "C" {
 
 #include "errMdef.h"
 #include "epicsTypes.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 typedef	unsigned 	BUCKETID;
 
@@ -46,32 +46,32 @@ typedef struct bucket{
         unsigned        nInUse;
 }BUCKET;
 
-epicsShareFunc BUCKET * epicsShareAPI bucketCreate (unsigned nHashTableEntries);
-epicsShareFunc int epicsShareAPI bucketFree (BUCKET *prb);
-epicsShareFunc int epicsShareAPI bucketShow (BUCKET *pb);
+LIBCOM_API BUCKET * LIBCOMSTD_API bucketCreate (unsigned nHashTableEntries);
+LIBCOM_API int LIBCOMSTD_API bucketFree (BUCKET *prb);
+LIBCOM_API int LIBCOMSTD_API bucketShow (BUCKET *pb);
 
 /*
  * !! Identifier must exist (and remain constant) at the specified address until
  * the item is deleted from the bucket !!
  */
-epicsShareFunc int epicsShareAPI bucketAddItemUnsignedId (BUCKET *prb, 
+LIBCOM_API int LIBCOMSTD_API bucketAddItemUnsignedId (BUCKET *prb, 
 		const unsigned *pId, const void *pApp);
-epicsShareFunc int epicsShareAPI bucketAddItemPointerId (BUCKET *prb, 
+LIBCOM_API int LIBCOMSTD_API bucketAddItemPointerId (BUCKET *prb, 
 		void * const *pId, const void *pApp);
-epicsShareFunc int epicsShareAPI bucketAddItemStringId (BUCKET *prb, 
+LIBCOM_API int LIBCOMSTD_API bucketAddItemStringId (BUCKET *prb, 
 		const char *pId, const void *pApp);
 
-epicsShareFunc int epicsShareAPI bucketRemoveItemUnsignedId (BUCKET *prb, const unsigned *pId);
-epicsShareFunc int epicsShareAPI bucketRemoveItemPointerId (BUCKET *prb, void * const *pId);
-epicsShareFunc int epicsShareAPI bucketRemoveItemStringId (BUCKET *prb, const char *pId);
+LIBCOM_API int LIBCOMSTD_API bucketRemoveItemUnsignedId (BUCKET *prb, const unsigned *pId);
+LIBCOM_API int LIBCOMSTD_API bucketRemoveItemPointerId (BUCKET *prb, void * const *pId);
+LIBCOM_API int LIBCOMSTD_API bucketRemoveItemStringId (BUCKET *prb, const char *pId);
 
-epicsShareFunc void * epicsShareAPI bucketLookupItemUnsignedId (BUCKET *prb, const unsigned *pId);
-epicsShareFunc void * epicsShareAPI bucketLookupItemPointerId (BUCKET *prb, void * const *pId);
-epicsShareFunc void * epicsShareAPI bucketLookupItemStringId (BUCKET *prb, const char *pId);
+LIBCOM_API void * LIBCOMSTD_API bucketLookupItemUnsignedId (BUCKET *prb, const unsigned *pId);
+LIBCOM_API void * LIBCOMSTD_API bucketLookupItemPointerId (BUCKET *prb, void * const *pId);
+LIBCOM_API void * LIBCOMSTD_API bucketLookupItemStringId (BUCKET *prb, const char *pId);
 
-epicsShareFunc void * epicsShareAPI bucketLookupAndRemoveItemUnsignedId (BUCKET *prb, const unsigned *pId);
-epicsShareFunc void * epicsShareAPI bucketLookupAndRemoveItemPointerId (BUCKET *prb, void * const *pId);
-epicsShareFunc void * epicsShareAPI bucketLookupAndRemoveItemStringId (BUCKET *prb, const char *pId);
+LIBCOM_API void * LIBCOMSTD_API bucketLookupAndRemoveItemUnsignedId (BUCKET *prb, const unsigned *pId);
+LIBCOM_API void * LIBCOMSTD_API bucketLookupAndRemoveItemPointerId (BUCKET *prb, void * const *pId);
+LIBCOM_API void * LIBCOMSTD_API bucketLookupAndRemoveItemStringId (BUCKET *prb, const char *pId);
 
 
 /*
diff --git a/modules/libcom/src/calc/calcPerform.c b/modules/libcom/src/calc/calcPerform.c
index c0f4aeb..9bf08e9 100644
--- a/modules/libcom/src/calc/calcPerform.c
+++ b/modules/libcom/src/calc/calcPerform.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define epicsExportSharedSymbols
 #include "osiUnistd.h"
 #include "dbDefs.h"
 #include "epicsMath.h"
@@ -41,7 +40,7 @@ static int cond_search(const char **ppinst, int match);
  *
  * Evalutate the postfix expression
  */
-epicsShareFunc long
+LIBCOM_API long
     calcPerform(double *parg, double *presult, const char *pinst)
 {
     double stack[CALCPERFORM_STACK+1];	/* zero'th entry not used */
@@ -387,7 +386,7 @@ epicsShareFunc long
 #endif
 
 

-epicsShareFunc long
+LIBCOM_API long
 calcArgUsage(const char *pinst, unsigned long *pinputs, unsigned long *pstores)
 {
     unsigned long inputs = 0;
diff --git a/modules/libcom/src/calc/postfix.c b/modules/libcom/src/calc/postfix.c
index 463ceea..ad698ef 100644
--- a/modules/libcom/src/calc/postfix.c
+++ b/modules/libcom/src/calc/postfix.c
@@ -17,7 +17,6 @@
 #include <string.h>
 #include <ctype.h>
 
-#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "epicsAssert.h"
 #include "epicsStdlib.h"
@@ -25,7 +24,7 @@
 #include "epicsTypes.h"
 #include "postfix.h"
 #include "postfixPvt.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 
 /* declarations for postfix */
@@ -205,7 +204,7 @@ static int
  *
  * convert an infix expression to a postfix expression
  */
-epicsShareFunc long
+LIBCOM_API long
     postfix(const char *psrc, char *pout, short *perror)
 {
     ELEMENT stack[80];
@@ -489,7 +488,7 @@ bad:
  *
  * Return a message string appropriate for the given error code
  */
-epicsShareFunc const char *
+LIBCOM_API const char *
     calcErrorStr(short error)
 {
     static const char *errStrs[] = {
@@ -519,7 +518,7 @@ epicsShareFunc const char *
  *
  * Disassemble the given postfix instructions to stdout
  */
-epicsShareFunc void
+LIBCOM_API void
     calcExprDump(const char *pinst)
 {
     static const char *opcodes[] = {
diff --git a/modules/libcom/src/calc/postfix.h b/modules/libcom/src/calc/postfix.h
index b904920..b2037b3 100644
--- a/modules/libcom/src/calc/postfix.h
+++ b/modules/libcom/src/calc/postfix.h
@@ -14,7 +14,7 @@
 #ifndef INCpostfixh
 #define INCpostfixh
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #define CALCPERFORM_NARGS 12
 #define CALCPERFORM_STACK 80
@@ -67,19 +67,19 @@
 extern "C" {
 #endif
 
-epicsShareFunc long
+LIBCOM_API long
     postfix(const char *pinfix, char *ppostfix, short *perror);
 
-epicsShareFunc long
+LIBCOM_API long
     calcPerform(double *parg, double *presult, const char *ppostfix);
 
-epicsShareFunc long
+LIBCOM_API long
     calcArgUsage(const char *ppostfix, unsigned long *pinputs, unsigned long *pstores);
 
-epicsShareFunc const char *
+LIBCOM_API const char *
     calcErrorStr(short error);
 
-epicsShareFunc void
+LIBCOM_API void
     calcExprDump(const char *pinst);
 
 #ifdef __cplusplus
diff --git a/modules/libcom/src/cvtFast/cvtFast.c b/modules/libcom/src/cvtFast/cvtFast.c
index 106c1ba..887f0c8 100644
--- a/modules/libcom/src/cvtFast/cvtFast.c
+++ b/modules/libcom/src/cvtFast/cvtFast.c
@@ -16,7 +16,6 @@
 #include <string.h>
 #include <limits.h>
 
-#define epicsExportSharedSymbols
 #include "cvtFast.h"
 #include "epicsMath.h"
 #include "epicsStdio.h"
diff --git a/modules/libcom/src/cvtFast/cvtFast.h b/modules/libcom/src/cvtFast/cvtFast.h
index db06dda..31c04c4 100644
--- a/modules/libcom/src/cvtFast/cvtFast.h
+++ b/modules/libcom/src/cvtFast/cvtFast.h
@@ -20,7 +20,7 @@
 #include <stddef.h>
 
 #include "epicsTypes.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -29,38 +29,38 @@ extern "C" {
 /*
  * All functions return the number of characters in the output
  */
-epicsShareFunc int
+LIBCOM_API int
     cvtFloatToString(float val, char *pdest, epicsUInt16 prec);
-epicsShareFunc int
+LIBCOM_API int
     cvtDoubleToString(double val, char *pdest, epicsUInt16 prec);
 
-epicsShareFunc int
+LIBCOM_API int
     cvtFloatToExpString(float val, char *pdest, epicsUInt16 prec);
-epicsShareFunc int
+LIBCOM_API int
     cvtDoubleToExpString(double val, char *pdest, epicsUInt16 prec);
-epicsShareFunc int
+LIBCOM_API int
     cvtFloatToCompactString(float val, char *pdest, epicsUInt16 prec);
-epicsShareFunc int
+LIBCOM_API int
     cvtDoubleToCompactString(double val, char *pdest, epicsUInt16 prec);
 
-epicsShareFunc size_t
+LIBCOM_API size_t
     cvtInt32ToString(epicsInt32 val, char *pdest);
-epicsShareFunc size_t
+LIBCOM_API size_t
     cvtUInt32ToString(epicsUInt32 val, char *pdest);
-epicsShareFunc size_t
+LIBCOM_API size_t
     cvtInt64ToString(epicsInt64 val, char *pdest);
-epicsShareFunc size_t
+LIBCOM_API size_t
     cvtUInt64ToString(epicsUInt64 val, char *pdest);
 
-epicsShareFunc size_t
+LIBCOM_API size_t
     cvtInt32ToHexString(epicsInt32 val, char *pdest);
-epicsShareFunc size_t
+LIBCOM_API size_t
     cvtUInt32ToHexString(epicsUInt32 val, char *pdest);
-epicsShareFunc size_t
+LIBCOM_API size_t
     cvtInt32ToOctalString(epicsInt32 val, char *pdest);
-epicsShareFunc size_t
+LIBCOM_API size_t
     cvtInt64ToHexString(epicsInt64 val, char *pdest);
-epicsShareFunc size_t
+LIBCOM_API size_t
     cvtUInt64ToHexString(epicsUInt64 val, char *pdest);
 
 /* Support the original names */
diff --git a/modules/libcom/src/cxxTemplates/epicsSingleton.h b/modules/libcom/src/cxxTemplates/epicsSingleton.h
index 2c63d3f..89c3ab9 100644
--- a/modules/libcom/src/cxxTemplates/epicsSingleton.h
+++ b/modules/libcom/src/cxxTemplates/epicsSingleton.h
@@ -18,10 +18,10 @@
 #include <new>
 #include <cstddef>
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "epicsAssert.h"
 
-class epicsShareClass SingletonUntyped {
+class LIBCOM_API SingletonUntyped {
 public:
     SingletonUntyped ();
     ~SingletonUntyped ();
diff --git a/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp b/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp
index 8cd69d9..b878e3d 100644
--- a/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp
+++ b/modules/libcom/src/cxxTemplates/epicsSingletonMutex.cpp
@@ -14,7 +14,6 @@
 
 #include <climits>
 
-#define epicsExportSharedSymbols
 #include "epicsMutex.h"
 #include "epicsGuard.h"
 #include "epicsThread.h"
diff --git a/modules/libcom/src/cxxTemplates/resourceLib.h b/modules/libcom/src/cxxTemplates/resourceLib.h
index 7b61e23..ff7ef99 100644
--- a/modules/libcom/src/cxxTemplates/resourceLib.h
+++ b/modules/libcom/src/cxxTemplates/resourceLib.h
@@ -41,7 +41,7 @@
 
 #include "tsSLList.h"
 #include "epicsString.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 typedef size_t resTableIndex;
 
 template < class T, class ID > class resTableIter;
@@ -253,7 +253,7 @@ private:
 //
 // character string identifier
 //
-class epicsShareClass stringId {
+class LIBCOM_API stringId {
 public:
     enum allocationType {copyString, refString};
     stringId (const char * idIn, allocationType typeIn=copyString);
diff --git a/modules/libcom/src/dbmf/dbmf.c b/modules/libcom/src/dbmf/dbmf.c
index e04a7be..035e75a 100644
--- a/modules/libcom/src/dbmf/dbmf.c
+++ b/modules/libcom/src/dbmf/dbmf.c
@@ -28,7 +28,6 @@
 #define REDZONE 0
 #endif
 
-#define epicsExportSharedSymbols
 #include "cantProceed.h"
 #include "epicsMutex.h"
 #include "ellLib.h"
diff --git a/modules/libcom/src/dbmf/dbmf.h b/modules/libcom/src/dbmf/dbmf.h
index 2c8a28f..6ced560 100644
--- a/modules/libcom/src/dbmf/dbmf.h
+++ b/modules/libcom/src/dbmf/dbmf.h
@@ -17,21 +17,21 @@
 #define DBMF_H
 
 #include <stdlib.h>
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-epicsShareFunc int dbmfInit(size_t size, int chunkItems);
-epicsShareFunc void * dbmfMalloc(size_t bytes);
-epicsShareFunc char * dbmfStrdup(const char *str);
-epicsShareFunc char * dbmfStrndup(const char *str, size_t len);
-epicsShareFunc char * dbmfStrcat3(const char *lhs, const char *mid,
+LIBCOM_API int dbmfInit(size_t size, int chunkItems);
+LIBCOM_API void * dbmfMalloc(size_t bytes);
+LIBCOM_API char * dbmfStrdup(const char *str);
+LIBCOM_API char * dbmfStrndup(const char *str, size_t len);
+LIBCOM_API char * dbmfStrcat3(const char *lhs, const char *mid,
     const char *rhs);
-epicsShareFunc void dbmfFree(void *bytes);
-epicsShareFunc void dbmfFreeChunks(void);
-epicsShareFunc int dbmfShow(int level);
+LIBCOM_API void dbmfFree(void *bytes);
+LIBCOM_API void dbmfFreeChunks(void);
+LIBCOM_API int dbmfShow(int level);
 
 /* Rules:
  * 1) Size is always made a multiple of 8.
diff --git a/modules/libcom/src/ellLib/ellLib.c b/modules/libcom/src/ellLib/ellLib.c
index c539a84..184202f 100644
--- a/modules/libcom/src/ellLib/ellLib.c
+++ b/modules/libcom/src/ellLib/ellLib.c
@@ -13,7 +13,6 @@
 
 #include <stdlib.h>
 
-#define epicsExportSharedSymbols
 #include "epicsAssert.h"
 #include "ellLib.h"
 
diff --git a/modules/libcom/src/ellLib/ellLib.h b/modules/libcom/src/ellLib/ellLib.h
index 52b58d1..fab2b8d 100644
--- a/modules/libcom/src/ellLib/ellLib.h
+++ b/modules/libcom/src/ellLib/ellLib.h
@@ -13,7 +13,7 @@
 #ifndef INC_ellLib_H
 #define INC_ellLib_H
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,20 +46,20 @@ typedef void (*FREEFUNC)(void *);
 #define ellPrevious(PNODE) ((PNODE)->previous)
 #define ellFree(PLIST)     ellFree2(PLIST, free)
 
-epicsShareFunc void ellAdd (ELLLIST *pList, ELLNODE *pNode);
-epicsShareFunc void ellConcat (ELLLIST *pDstList, ELLLIST *pAddList);
-epicsShareFunc void ellDelete (ELLLIST *pList, ELLNODE *pNode);
-epicsShareFunc void ellExtract (ELLLIST *pSrcList, ELLNODE *pStartNode, ELLNODE *pEndNode, ELLLIST *pDstList);
-epicsShareFunc ELLNODE * ellGet (ELLLIST *pList);
-epicsShareFunc ELLNODE * ellPop (ELLLIST *pList);
-epicsShareFunc void ellInsert (ELLLIST *plist, ELLNODE *pPrev, ELLNODE *pNode);
-epicsShareFunc ELLNODE * ellNth (ELLLIST *pList, int nodeNum);
-epicsShareFunc ELLNODE * ellNStep (ELLNODE *pNode, int nStep);
-epicsShareFunc int  ellFind (ELLLIST *pList, ELLNODE *pNode);
+LIBCOM_API void ellAdd (ELLLIST *pList, ELLNODE *pNode);
+LIBCOM_API void ellConcat (ELLLIST *pDstList, ELLLIST *pAddList);
+LIBCOM_API void ellDelete (ELLLIST *pList, ELLNODE *pNode);
+LIBCOM_API void ellExtract (ELLLIST *pSrcList, ELLNODE *pStartNode, ELLNODE *pEndNode, ELLLIST *pDstList);
+LIBCOM_API ELLNODE * ellGet (ELLLIST *pList);
+LIBCOM_API ELLNODE * ellPop (ELLLIST *pList);
+LIBCOM_API void ellInsert (ELLLIST *plist, ELLNODE *pPrev, ELLNODE *pNode);
+LIBCOM_API ELLNODE * ellNth (ELLLIST *pList, int nodeNum);
+LIBCOM_API ELLNODE * ellNStep (ELLNODE *pNode, int nStep);
+LIBCOM_API int  ellFind (ELLLIST *pList, ELLNODE *pNode);
 typedef int (*pListCmp)(const ELLNODE* A, const ELLNODE* B);
-epicsShareFunc void ellSortStable(ELLLIST *pList, pListCmp);
-epicsShareFunc void ellFree2 (ELLLIST *pList, FREEFUNC freeFunc);
-epicsShareFunc void ellVerify (ELLLIST *pList);
+LIBCOM_API void ellSortStable(ELLLIST *pList, pListCmp);
+LIBCOM_API void ellFree2 (ELLLIST *pList, FREEFUNC freeFunc);
+LIBCOM_API void ellVerify (ELLLIST *pList);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/ellLib/ellSort.c b/modules/libcom/src/ellLib/ellSort.c
index 2f8f274..1aa6679 100644
--- a/modules/libcom/src/ellLib/ellSort.c
+++ b/modules/libcom/src/ellLib/ellSort.c
@@ -12,7 +12,6 @@
  */
 #include <stdlib.h>
 
-#define epicsExportSharedSymbols
 #include "epicsAssert.h"
 #include "ellLib.h"
 
diff --git a/modules/libcom/src/env/bldEnvData.pl b/modules/libcom/src/env/bldEnvData.pl
index 693be65..d4c4731 100644
--- a/modules/libcom/src/env/bldEnvData.pl
+++ b/modules/libcom/src/env/bldEnvData.pl
@@ -44,7 +44,7 @@ open SRC, '<', $env_defs
 
 my @vars;
 while (<SRC>) {
-    if (m/epicsShareExtern\s+const\s+ENV_PARAM\s+([A-Za-z_]\w*)\s*;/) {
+    if (m/LIBCOM_API extern\s+const\s+ENV_PARAM\s+([A-Za-z_]\w*)\s*;/) {
         push @vars, $1;
     }
 }
@@ -96,7 +96,6 @@ $sources
  */
 
 #include <stddef.h>
-#define epicsExportSharedSymbols
 #include "envDefs.h"
 
 END
@@ -113,14 +112,14 @@ foreach my $var (@vars) {
         $default = '';
     }
 
-    print OUT "epicsShareDef const ENV_PARAM $var =\n",
+    print OUT "const ENV_PARAM $var =\n",
               "    {\"$var\", \"$default\"};\n";
 }
 
 # Also provide a list of all defined parameters
 #
 print OUT "\n",
-    "epicsShareDef const ENV_PARAM* env_param_list[] = {\n",
+    "const ENV_PARAM* env_param_list[] = {\n",
     wrap('    ', '    ', join(', ', map("&$_", @vars), 'NULL')),
     "\n};\n";
 close OUT;
diff --git a/modules/libcom/src/env/envDefs.h b/modules/libcom/src/env/envDefs.h
index 2490702..fdb9125 100644
--- a/modules/libcom/src/env/envDefs.h
+++ b/modules/libcom/src/env/envDefs.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 typedef struct envParam {
     char	*name;		/* text name of the parameter */
@@ -40,65 +40,65 @@ typedef struct envParam {
 } ENV_PARAM;
 
 /*
- * bldEnvData.pl looks for "epicsShareExtern const ENV_PARAM <name>;"
+ * bldEnvData.pl looks for "LIBCOM_API extern const ENV_PARAM <name>;"
  */
-epicsShareExtern const ENV_PARAM EPICS_CA_ADDR_LIST;
-epicsShareExtern const ENV_PARAM EPICS_CA_CONN_TMO;
-epicsShareExtern const ENV_PARAM EPICS_CA_AUTO_ADDR_LIST;
-epicsShareExtern const ENV_PARAM EPICS_CA_REPEATER_PORT;
-epicsShareExtern const ENV_PARAM EPICS_CA_SERVER_PORT;
-epicsShareExtern const ENV_PARAM EPICS_CA_MAX_ARRAY_BYTES;
-epicsShareExtern const ENV_PARAM EPICS_CA_AUTO_ARRAY_BYTES;
-epicsShareExtern const ENV_PARAM EPICS_CA_MAX_SEARCH_PERIOD;
-epicsShareExtern const ENV_PARAM EPICS_CA_NAME_SERVERS;
-epicsShareExtern const ENV_PARAM EPICS_CA_MCAST_TTL;
-epicsShareExtern const ENV_PARAM EPICS_CAS_INTF_ADDR_LIST;
-epicsShareExtern const ENV_PARAM EPICS_CAS_IGNORE_ADDR_LIST;
-epicsShareExtern const ENV_PARAM EPICS_CAS_AUTO_BEACON_ADDR_LIST;
-epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_ADDR_LIST;
-epicsShareExtern const ENV_PARAM EPICS_CAS_SERVER_PORT;
-epicsShareExtern const ENV_PARAM EPICS_CA_BEACON_PERIOD; /* deprecated */
-epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_PERIOD;
-epicsShareExtern const ENV_PARAM EPICS_CAS_BEACON_PORT;
-epicsShareExtern const ENV_PARAM EPICS_BUILD_COMPILER_CLASS;
-epicsShareExtern const ENV_PARAM EPICS_BUILD_OS_CLASS;
-epicsShareExtern const ENV_PARAM EPICS_BUILD_TARGET_ARCH;
-epicsShareExtern const ENV_PARAM EPICS_TZ;
-epicsShareExtern const ENV_PARAM EPICS_TS_NTP_INET;
-epicsShareExtern const ENV_PARAM EPICS_IOC_IGNORE_SERVERS;
-epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_PORT;
-epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_INET;
-epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_FILE_LIMIT;
-epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_FILE_NAME;
-epicsShareExtern const ENV_PARAM EPICS_IOC_LOG_FILE_COMMAND;
-epicsShareExtern const ENV_PARAM IOCSH_PS1;
-epicsShareExtern const ENV_PARAM IOCSH_HISTSIZE;
-epicsShareExtern const ENV_PARAM IOCSH_HISTEDIT_DISABLE;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_ADDR_LIST;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_CONN_TMO;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_AUTO_ADDR_LIST;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_REPEATER_PORT;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_SERVER_PORT;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_MAX_ARRAY_BYTES;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_AUTO_ARRAY_BYTES;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_MAX_SEARCH_PERIOD;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_NAME_SERVERS;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_MCAST_TTL;
+LIBCOM_API extern const ENV_PARAM EPICS_CAS_INTF_ADDR_LIST;
+LIBCOM_API extern const ENV_PARAM EPICS_CAS_IGNORE_ADDR_LIST;
+LIBCOM_API extern const ENV_PARAM EPICS_CAS_AUTO_BEACON_ADDR_LIST;
+LIBCOM_API extern const ENV_PARAM EPICS_CAS_BEACON_ADDR_LIST;
+LIBCOM_API extern const ENV_PARAM EPICS_CAS_SERVER_PORT;
+LIBCOM_API extern const ENV_PARAM EPICS_CA_BEACON_PERIOD; /* deprecated */
+LIBCOM_API extern const ENV_PARAM EPICS_CAS_BEACON_PERIOD;
+LIBCOM_API extern const ENV_PARAM EPICS_CAS_BEACON_PORT;
+LIBCOM_API extern const ENV_PARAM EPICS_BUILD_COMPILER_CLASS;
+LIBCOM_API extern const ENV_PARAM EPICS_BUILD_OS_CLASS;
+LIBCOM_API extern const ENV_PARAM EPICS_BUILD_TARGET_ARCH;
+LIBCOM_API extern const ENV_PARAM EPICS_TZ;
+LIBCOM_API extern const ENV_PARAM EPICS_TS_NTP_INET;
+LIBCOM_API extern const ENV_PARAM EPICS_IOC_IGNORE_SERVERS;
+LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_PORT;
+LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_INET;
+LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_FILE_LIMIT;
+LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_FILE_NAME;
+LIBCOM_API extern const ENV_PARAM EPICS_IOC_LOG_FILE_COMMAND;
+LIBCOM_API extern const ENV_PARAM IOCSH_PS1;
+LIBCOM_API extern const ENV_PARAM IOCSH_HISTSIZE;
+LIBCOM_API extern const ENV_PARAM IOCSH_HISTEDIT_DISABLE;
 
-epicsShareExtern const ENV_PARAM *env_param_list[];
+LIBCOM_API extern const ENV_PARAM *env_param_list[];
 
 struct in_addr;
 
-epicsShareFunc char * epicsShareAPI 
+LIBCOM_API char * LIBCOMSTD_API 
 	envGetConfigParam(const ENV_PARAM *pParam, int bufDim, char *pBuf);
-epicsShareFunc const char * epicsShareAPI 
+LIBCOM_API const char * LIBCOMSTD_API 
 	envGetConfigParamPtr(const ENV_PARAM *pParam);
-epicsShareFunc long epicsShareAPI 
+LIBCOM_API long LIBCOMSTD_API 
 	envPrtConfigParam(const ENV_PARAM *pParam);
-epicsShareFunc long epicsShareAPI 
+LIBCOM_API long LIBCOMSTD_API 
 	envGetInetAddrConfigParam(const ENV_PARAM *pParam, struct in_addr *pAddr);
-epicsShareFunc long epicsShareAPI 
+LIBCOM_API long LIBCOMSTD_API 
 	envGetDoubleConfigParam(const ENV_PARAM *pParam, double *pDouble);
-epicsShareFunc long epicsShareAPI 
+LIBCOM_API long LIBCOMSTD_API 
 	envGetLongConfigParam(const ENV_PARAM *pParam, long *pLong);
-epicsShareFunc unsigned short epicsShareAPI envGetInetPortConfigParam 
+LIBCOM_API unsigned short LIBCOMSTD_API envGetInetPortConfigParam 
         (const ENV_PARAM *pEnv, unsigned short defaultPort);
-epicsShareFunc long epicsShareAPI
+LIBCOM_API long LIBCOMSTD_API
     envGetBoolConfigParam(const ENV_PARAM *pParam, int *pBool);
-epicsShareFunc long epicsShareAPI epicsPrtEnvParams(void);
-epicsShareFunc void epicsShareAPI epicsEnvSet (const char *name, const char *value);
-epicsShareFunc void epicsShareAPI epicsEnvUnset (const char *name);
-epicsShareFunc void epicsShareAPI epicsEnvShow (const char *name);
+LIBCOM_API long LIBCOMSTD_API epicsPrtEnvParams(void);
+LIBCOM_API void LIBCOMSTD_API epicsEnvSet (const char *name, const char *value);
+LIBCOM_API void LIBCOMSTD_API epicsEnvUnset (const char *name);
+LIBCOM_API void LIBCOMSTD_API epicsEnvShow (const char *name);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/env/envSubr.c b/modules/libcom/src/env/envSubr.c
index 283b132..e036138 100644
--- a/modules/libcom/src/env/envSubr.c
+++ b/modules/libcom/src/env/envSubr.c
@@ -40,7 +40,6 @@
 #include <string.h>
 #include <limits.h>
 
-#define epicsExportSharedSymbols
 #include "epicsStdlib.h"
 #include "epicsStdio.h"
 #include "epicsString.h"
@@ -79,7 +78,7 @@
 *	}
 *
 *-*/
-const char * epicsShareAPI envGetConfigParamPtr(
+const char * LIBCOMSTD_API envGetConfigParamPtr(
 const ENV_PARAM *pParam /* I pointer to config param structure */
 )
 {
@@ -137,7 +136,7 @@ const ENV_PARAM *pParam /* I pointer to config param structure */
 *	    printf("DISPLAY is %s\n", temp);
 *
 *-*/
-char * epicsShareAPI envGetConfigParam(
+char * LIBCOMSTD_API envGetConfigParam(
 const ENV_PARAM *pParam,/* I pointer to config param structure */
 int	bufDim,		/* I dimension of parameter buffer */
 char	*pBuf		/* I pointer to parameter buffer  */
@@ -189,7 +188,7 @@ char	*pBuf		/* I pointer to parameter buffer  */
 *	}
 *
 *-*/
-long epicsShareAPI envGetDoubleConfigParam(
+long LIBCOMSTD_API envGetDoubleConfigParam(
 const ENV_PARAM *pParam,/* I pointer to config param structure */
 double	*pDouble	/* O pointer to place to store value */
 )
@@ -244,7 +243,7 @@ double	*pDouble	/* O pointer to place to store value */
 *	}
 *
 *-*/
-long epicsShareAPI envGetInetAddrConfigParam(
+long LIBCOMSTD_API envGetInetAddrConfigParam(
 const ENV_PARAM *pParam,/* I pointer to config param structure */
 struct in_addr *pAddr	/* O pointer to struct to receive inet addr */
 )
@@ -301,7 +300,7 @@ struct in_addr *pAddr	/* O pointer to struct to receive inet addr */
 *	}
 *
 *-*/
-long epicsShareAPI envGetLongConfigParam(
+long LIBCOMSTD_API envGetLongConfigParam(
 const ENV_PARAM *pParam,/* I pointer to config param structure */
 long	*pLong		/* O pointer to place to store value */
 )
@@ -322,7 +321,7 @@ long	*pLong		/* O pointer to place to store value */
 }
 
 
-long epicsShareAPI
+long LIBCOMSTD_API
 envGetBoolConfigParam(const ENV_PARAM *pParam, int *pBool)
 {
     char text[20];
@@ -351,7 +350,7 @@ envGetBoolConfigParam(const ENV_PARAM *pParam, int *pBool)
 *	envPrtConfigParam(&EPICS_TS_NTP_INET);
 *
 *-*/
-long epicsShareAPI envPrtConfigParam(
+long LIBCOMSTD_API envPrtConfigParam(
 const ENV_PARAM *pParam)	/* pointer to config param structure */
 {
     const char *pVal;
@@ -381,7 +380,7 @@ const ENV_PARAM *pParam)	/* pointer to config param structure */
 *       epicsPrtEnvParams();
 *
 *-*/
-long epicsShareAPI
+long LIBCOMSTD_API
 epicsPrtEnvParams(void)
 {
     const ENV_PARAM **ppParam = env_param_list;
@@ -395,7 +394,7 @@ epicsPrtEnvParams(void)
 /*
  * envGetInetPortConfigParam ()
  */
-epicsShareFunc unsigned short epicsShareAPI envGetInetPortConfigParam 
+LIBCOM_API unsigned short LIBCOMSTD_API envGetInetPortConfigParam 
                 (const ENV_PARAM *pEnv, unsigned short defaultPort)
 {
     long        longStatus;
diff --git a/modules/libcom/src/error/errSymLib.c b/modules/libcom/src/error/errSymLib.c
index 8f59718..33fe2e5 100644
--- a/modules/libcom/src/error/errSymLib.c
+++ b/modules/libcom/src/error/errSymLib.c
@@ -19,7 +19,6 @@
 #include <math.h>
 #include <limits.h>
 
-#define epicsExportSharedSymbols
 #include "cantProceed.h"
 #include "epicsAssert.h"
 #include "epicsStdio.h"
diff --git a/modules/libcom/src/error/errSymTbl.h b/modules/libcom/src/error/errSymTbl.h
index 7fc25f7..c3c0c49 100644
--- a/modules/libcom/src/error/errSymTbl.h
+++ b/modules/libcom/src/error/errSymTbl.h
@@ -12,7 +12,7 @@
 
 #include <stddef.h>
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "epicsTypes.h"
 
 /* ERRSYMBOL - entry in symbol table */
@@ -34,14 +34,14 @@ typedef ERRSYMTAB *ERRSYMTAB_ID;
 extern "C" {
 #endif
 
-epicsShareFunc void errSymLookup(long status, char *pBuf, size_t bufLength);
-epicsShareFunc const char* errSymMsg(long status);
-epicsShareFunc void errSymTest(epicsUInt16 modnum, epicsUInt16 begErrNum,
+LIBCOM_API void errSymLookup(long status, char *pBuf, size_t bufLength);
+LIBCOM_API const char* errSymMsg(long status);
+LIBCOM_API void errSymTest(epicsUInt16 modnum, epicsUInt16 begErrNum,
     epicsUInt16 endErrNum);
-epicsShareFunc void errSymTestPrint(long errNum);
-epicsShareFunc int errSymBld(void);
-epicsShareFunc int errSymbolAdd(long errNum, const char *name);
-epicsShareFunc void errSymDump(void);
+LIBCOM_API void errSymTestPrint(long errNum);
+LIBCOM_API int errSymBld(void);
+LIBCOM_API int errSymbolAdd(long errNum, const char *name);
+LIBCOM_API void errSymDump(void);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/error/errlog.c b/modules/libcom/src/error/errlog.c
index 8445a5a..702a157 100644
--- a/modules/libcom/src/error/errlog.c
+++ b/modules/libcom/src/error/errlog.c
@@ -18,7 +18,6 @@
 #include <string.h>
 #include <errno.h>
 
-#define epicsExportSharedSymbols
 #define ERRLOG_INIT
 #include "adjustment.h"
 #include "dbDefs.h"
@@ -39,7 +38,7 @@
 #define MAX_MESSAGE_SIZE 256
 
 /*Declare storage for errVerbose */
-epicsShareDef int errVerbose = 0;
+int errVerbose = 0;
 
 static void errlogExitHandler(void *);
 static void errlogThread(void);
diff --git a/modules/libcom/src/error/errlog.h b/modules/libcom/src/error/errlog.h
index e8a4fb5..d705163 100644
--- a/modules/libcom/src/error/errlog.h
+++ b/modules/libcom/src/error/errlog.h
@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "compilerDependencies.h"
 
 #ifdef __cplusplus
@@ -30,18 +30,18 @@ typedef enum {
     errlogFatal
 } errlogSevEnum;
 
-epicsShareExtern int errVerbose;
+LIBCOM_API extern int errVerbose;
 
 
 #ifdef ERRLOG_INIT
-    epicsShareDef const char *errlogSevEnumString[] = {
+    const char *errlogSevEnumString[] = {
         "info",
         "minor",
         "major",
         "fatal"
     };
 #else
-    epicsShareExtern const char * errlogSevEnumString[];
+    LIBCOM_API extern const char * errlogSevEnumString[];
 #endif
 
 /* errMessage is a macro so it can get the file and line number */
@@ -51,38 +51,38 @@ epicsShareExtern int errVerbose;
 #define epicsPrintf errlogPrintf
 #define epicsVprintf errlogVprintf
 
-epicsShareFunc int errlogPrintf(const char *pformat, ...)
+LIBCOM_API int errlogPrintf(const char *pformat, ...)
     EPICS_PRINTF_STYLE(1,2);
-epicsShareFunc int errlogVprintf(const char *pformat, va_list pvar);
-epicsShareFunc int errlogSevPrintf(const errlogSevEnum severity,
+LIBCOM_API int errlogVprintf(const char *pformat, va_list pvar);
+LIBCOM_API int errlogSevPrintf(const errlogSevEnum severity,
     const char *pformat, ...) EPICS_PRINTF_STYLE(2,3);
-epicsShareFunc int errlogSevVprintf(const errlogSevEnum severity,
+LIBCOM_API int errlogSevVprintf(const errlogSevEnum severity,
     const char *pformat, va_list pvar);
-epicsShareFunc int errlogMessage(const char *message);
+LIBCOM_API int errlogMessage(const char *message);
 
-epicsShareFunc const char * errlogGetSevEnumString(errlogSevEnum severity);
-epicsShareFunc void errlogSetSevToLog(errlogSevEnum severity);
-epicsShareFunc errlogSevEnum errlogGetSevToLog(void);
+LIBCOM_API const char * errlogGetSevEnumString(errlogSevEnum severity);
+LIBCOM_API void errlogSetSevToLog(errlogSevEnum severity);
+LIBCOM_API errlogSevEnum errlogGetSevToLog(void);
 
-epicsShareFunc void errlogAddListener(errlogListener listener, void *pPrivate);
-epicsShareFunc int errlogRemoveListeners(errlogListener listener,
+LIBCOM_API void errlogAddListener(errlogListener listener, void *pPrivate);
+LIBCOM_API int errlogRemoveListeners(errlogListener listener,
     void *pPrivate);
 
-epicsShareFunc int eltc(int yesno);
-epicsShareFunc int errlogSetConsole(FILE *stream);
+LIBCOM_API int eltc(int yesno);
+LIBCOM_API int errlogSetConsole(FILE *stream);
 
-epicsShareFunc int errlogInit(int bufsize);
-epicsShareFunc int errlogInit2(int bufsize, int maxMsgSize);
-epicsShareFunc void errlogFlush(void);
+LIBCOM_API int errlogInit(int bufsize);
+LIBCOM_API int errlogInit2(int bufsize, int maxMsgSize);
+LIBCOM_API void errlogFlush(void);
 
-epicsShareFunc void errPrintf(long status, const char *pFileName, int lineno,
+LIBCOM_API void errPrintf(long status, const char *pFileName, int lineno,
     const char *pformat, ...) EPICS_PRINTF_STYLE(4,5);
 
-epicsShareFunc int errlogPrintfNoConsole(const char *pformat, ...)
+LIBCOM_API int errlogPrintfNoConsole(const char *pformat, ...)
     EPICS_PRINTF_STYLE(1,2);
-epicsShareFunc int errlogVprintfNoConsole(const char *pformat,va_list pvar);
+LIBCOM_API int errlogVprintfNoConsole(const char *pformat,va_list pvar);
 
-epicsShareFunc void errSymLookup(long status, char *pBuf, size_t bufLength);
+LIBCOM_API void errSymLookup(long status, char *pBuf, size_t bufLength);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/fdmgr/fdManager.cpp b/modules/libcom/src/fdmgr/fdManager.cpp
index 3bbc648..2c30333 100644
--- a/modules/libcom/src/fdmgr/fdManager.cpp
+++ b/modules/libcom/src/fdmgr/fdManager.cpp
@@ -22,7 +22,6 @@
 #include <algorithm>
 
 #define instantiateRecourceLib
-#define epicsExportSharedSymbols
 #include "epicsAssert.h"
 #include "epicsThread.h"
 #include "fdManager.h"
@@ -30,7 +29,7 @@
 
 using std :: max;
 
-epicsShareDef fdManager fileDescriptorManager;
+fdManager fileDescriptorManager;
 
 const unsigned mSecPerSec = 1000u;
 const unsigned uSecPerSec = 1000u * mSecPerSec;
@@ -41,7 +40,7 @@ const unsigned uSecPerSec = 1000u * mSecPerSec;
 // hopefully its a reasonable guess that select() and epicsThreadSleep()
 // will have the same sleep quantum 
 //
-epicsShareFunc fdManager::fdManager () : 
+LIBCOM_API fdManager::fdManager () : 
     sleepQuantum ( epicsThreadSleepQuantum () ), 
         fdSetsPtr ( new fd_set [fdrNEnums] ),
         pTimerQueue ( 0 ), maxFD ( 0 ), processInProg ( false ), 
@@ -58,7 +57,7 @@ epicsShareFunc fdManager::fdManager () :
 //
 // fdManager::~fdManager()
 //
-epicsShareFunc fdManager::~fdManager()
+LIBCOM_API fdManager::~fdManager()
 {
     fdReg   *pReg;
 
@@ -78,7 +77,7 @@ epicsShareFunc fdManager::~fdManager()
 //
 // fdManager::process()
 //
-epicsShareFunc void fdManager::process (double delay)
+LIBCOM_API void fdManager::process (double delay)
 {
     this->lazyInitTimerQueue ();
 
@@ -331,7 +330,7 @@ double fdManager::quantum ()
 //
 // lookUpFD()
 //
-epicsShareFunc fdReg *fdManager::lookUpFD (const SOCKET fd, const fdRegType type)
+LIBCOM_API fdReg *fdManager::lookUpFD (const SOCKET fd, const fdRegType type)
 {
     if (fd<0) {
         return NULL;
diff --git a/modules/libcom/src/fdmgr/fdManager.h b/modules/libcom/src/fdmgr/fdManager.h
index 59a2f35..585c2ef 100644
--- a/modules/libcom/src/fdmgr/fdManager.h
+++ b/modules/libcom/src/fdmgr/fdManager.h
@@ -19,7 +19,7 @@
 #ifndef fdManagerH_included
 #define fdManagerH_included
 
-#include "shareLib.h" // reset share lib defines
+#include "libComAPI.h" // reset share lib defines
 #include "tsDLList.h"
 #include "resourceLib.h"
 #include "epicsTime.h"
@@ -33,7 +33,7 @@ enum fdRegType {fdrRead, fdrWrite, fdrException, fdrNEnums};
 //
 // file descriptor interest id
 //
-class epicsShareClass fdRegId
+class LIBCOM_API fdRegId
 {
 public:
 
@@ -77,12 +77,12 @@ public:
     //
     class fdInterestSubscriptionAlreadyExits {};
 
-    epicsShareFunc fdManager ();
-    epicsShareFunc virtual ~fdManager ();
-    epicsShareFunc void process ( double delay ); // delay parameter is in seconds
+    LIBCOM_API fdManager ();
+    LIBCOM_API virtual ~fdManager ();
+    LIBCOM_API void process ( double delay ); // delay parameter is in seconds
 
     // returns NULL if the fd is unknown
-    epicsShareFunc class fdReg *lookUpFD (const SOCKET fd, const fdRegType type);
+    LIBCOM_API class fdReg *lookUpFD (const SOCKET fd, const fdRegType type);
 
     epicsTimer & createTimer ();
 
@@ -113,14 +113,14 @@ private:
 //
 // default file descriptor manager
 //
-epicsShareExtern fdManager fileDescriptorManager;
+LIBCOM_API extern fdManager fileDescriptorManager;
 
 //
 // fdReg
 //
 // file descriptor registration
 //
-class epicsShareClass fdReg :
+class LIBCOM_API fdReg :
     public fdRegId, public tsDLNode<fdReg>, public tsSLNode<fdReg> {
     friend class fdManager;
 
diff --git a/modules/libcom/src/fdmgr/fdmgr.cpp b/modules/libcom/src/fdmgr/fdmgr.cpp
index 342bae8..86d21bd 100644
--- a/modules/libcom/src/fdmgr/fdmgr.cpp
+++ b/modules/libcom/src/fdmgr/fdmgr.cpp
@@ -22,7 +22,6 @@
 //
 
 #include <stddef.h>
-#define epicsExportSharedSymbols
 #include "locationException.h"
 #include "epicsAssert.h"
 #include "fdManager.h"
@@ -41,14 +40,14 @@ public:
     class noFunctionSpecified {};
     class doubleDelete {};
 
-    epicsShareFunc fdRegForOldFdmgr (const SOCKET fdIn, const fdRegType type, 
+    LIBCOM_API fdRegForOldFdmgr (const SOCKET fdIn, const fdRegType type, 
 		const bool onceOnly, fdManager &manager, pCallBackFDMgr pFunc, void *pParam);
-    epicsShareFunc ~fdRegForOldFdmgr ();
+    LIBCOM_API ~fdRegForOldFdmgr ();
 
 private:
     pCallBackFDMgr pFunc;
     void *pParam;
-	epicsShareFunc virtual void callBack ();
+	LIBCOM_API virtual void callBack ();
 	fdRegForOldFdmgr ( const fdRegForOldFdmgr & );
 	fdRegForOldFdmgr & operator = ( const fdRegForOldFdmgr & );
 };
@@ -60,8 +59,8 @@ class oldFdmgr;
 //
 class timerForOldFdmgr : public epicsTimerNotify, public chronIntIdRes<timerForOldFdmgr> {
 public:
-	epicsShareFunc timerForOldFdmgr (oldFdmgr &fdmgr, double delay, pCallBackFDMgr pFunc, void *pParam);
-	epicsShareFunc virtual ~timerForOldFdmgr ();
+	LIBCOM_API timerForOldFdmgr (oldFdmgr &fdmgr, double delay, pCallBackFDMgr pFunc, void *pParam);
+	LIBCOM_API virtual ~timerForOldFdmgr ();
 
     //
     // exceptions
@@ -74,14 +73,14 @@ private:
     pCallBackFDMgr pFunc;
     void *pParam;
     unsigned id;
-    epicsShareFunc expireStatus expire ( const epicsTime & currentTime );
+    LIBCOM_API expireStatus expire ( const epicsTime & currentTime );
 	timerForOldFdmgr ( const timerForOldFdmgr & );
 	timerForOldFdmgr & operator = ( const timerForOldFdmgr & );
 };
 
 class oldFdmgr : public fdManager {
     friend class timerForOldFdmgr;
-    friend epicsShareFunc int epicsShareAPI fdmgr_clear_timeout (fdctx *pfdctx, fdmgrAlarmId id);
+    friend LIBCOM_API int LIBCOMSTD_API fdmgr_clear_timeout (fdctx *pfdctx, fdmgrAlarmId id);
 
 public:
     oldFdmgr ();
@@ -104,7 +103,7 @@ template class resTable<timerForOldFdmgr, chronIntId>;
 #   pragma warning ( pop )
 #endif
 
-epicsShareFunc fdRegForOldFdmgr::fdRegForOldFdmgr 
+LIBCOM_API fdRegForOldFdmgr::fdRegForOldFdmgr 
     (const SOCKET fdIn, const fdRegType typeIn, 
 	    const bool onceOnlyIn, fdManager &managerIn, 
         pCallBackFDMgr pFuncIn, void *pParamIn) :
@@ -116,14 +115,14 @@ epicsShareFunc fdRegForOldFdmgr::fdRegForOldFdmgr
     }
 }
 
-epicsShareFunc fdRegForOldFdmgr::~fdRegForOldFdmgr ()
+LIBCOM_API fdRegForOldFdmgr::~fdRegForOldFdmgr ()
 {
     if (this->pFunc==NULL) {
         throwWithLocation ( doubleDelete () );
     }
 }
 
-epicsShareFunc void fdRegForOldFdmgr::callBack ()
+LIBCOM_API void fdRegForOldFdmgr::callBack ()
 {
     (*this->pFunc) (this->pParam);
 }
@@ -154,7 +153,7 @@ epicsTimerNotify::expireStatus timerForOldFdmgr::expire ( const epicsTime & )
 
 oldFdmgr::oldFdmgr () {}
 
-extern "C" epicsShareFunc fdctx * epicsShareAPI fdmgr_init (void)
+extern "C" LIBCOM_API fdctx * LIBCOMSTD_API fdmgr_init (void)
 {
     oldFdmgr *pfdm;
 
@@ -169,7 +168,7 @@ extern "C" epicsShareFunc fdctx * epicsShareAPI fdmgr_init (void)
     return (fdctx *) pfdm;
 }
 
-extern "C" epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout (
+extern "C" LIBCOM_API fdmgrAlarmId LIBCOMSTD_API fdmgr_add_timeout (
     fdctx *pfdctx, struct timeval *ptimeout, pCallBackFDMgr pFunc, void *pParam)
 {
     double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (uSecPerSec);
@@ -207,7 +206,7 @@ extern "C" epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout (
     return id;
 }
 
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_timeout (fdctx *pfdctx, fdmgrAlarmId id)
+extern "C" LIBCOM_API int LIBCOMSTD_API fdmgr_clear_timeout (fdctx *pfdctx, fdmgrAlarmId id)
 {
     oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
     timerForOldFdmgr *pTimer;
@@ -227,7 +226,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_timeout (fdctx *pfdctx, 
     return 0;
 }
 
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback (
+extern "C" LIBCOM_API int LIBCOMSTD_API fdmgr_add_callback (
     fdctx *pfdctx, SOCKET fd, enum fdi_type fdi, pCallBackFDMgr pFunc, void *pParam)
 {
     oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
@@ -269,7 +268,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_callback (
     }
 }
  
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback (
+extern "C" LIBCOM_API int LIBCOMSTD_API fdmgr_clear_callback (
     fdctx *pfdctx, SOCKET fd, enum fdi_type	fdi)
 {
     oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
@@ -296,7 +295,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_callback (
     }
 }
 
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_pend_event (fdctx *pfdctx, struct timeval *ptimeout)
+extern "C" LIBCOM_API int LIBCOMSTD_API fdmgr_pend_event (fdctx *pfdctx, struct timeval *ptimeout)
 {
     oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
     double delay = ptimeout->tv_sec + ptimeout->tv_usec / static_cast <const double> (uSecPerSec);
@@ -311,7 +310,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_pend_event (fdctx *pfdctx, str
     return 0;
 }
 
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_delete (fdctx *pfdctx)
+extern "C" LIBCOM_API int LIBCOMSTD_API fdmgr_delete (fdctx *pfdctx)
 {
     oldFdmgr *pfdm = static_cast <oldFdmgr *> (pfdctx);
     delete pfdm;
@@ -321,7 +320,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_delete (fdctx *pfdctx)
 /*
  * depricated interface
  */
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_fd (fdctx *pfdctx, SOCKET fd)
+extern "C" LIBCOM_API int LIBCOMSTD_API fdmgr_clear_fd (fdctx *pfdctx, SOCKET fd)
 {
 	return fdmgr_clear_callback(pfdctx, fd, fdi_read);
 }
@@ -329,7 +328,7 @@ extern "C" epicsShareFunc int epicsShareAPI fdmgr_clear_fd (fdctx *pfdctx, SOCKE
 /*
  * depricated interface
  */
-extern "C" epicsShareFunc int epicsShareAPI fdmgr_add_fd ( 
+extern "C" LIBCOM_API int LIBCOMSTD_API fdmgr_add_fd ( 
     fdctx   *pfdctx, SOCKET  fd, void (*pfunc)(void *pParam), void *param)
 {
 	return fdmgr_add_callback (pfdctx, fd, fdi_read, pfunc, param);
diff --git a/modules/libcom/src/fdmgr/fdmgr.h b/modules/libcom/src/fdmgr/fdmgr.h
index a227335..318120e 100644
--- a/modules/libcom/src/fdmgr/fdmgr.h
+++ b/modules/libcom/src/fdmgr/fdmgr.h
@@ -24,7 +24,7 @@
 #include "bucketLib.h"
 #include "osiSock.h"
 #include "epicsThread.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -65,7 +65,7 @@ typedef unsigned fdmgrAlarmId;
  * Initialize a file descriptor manager session
  *
  */
-epicsShareFunc fdctx * epicsShareAPI fdmgr_init(void);
+LIBCOM_API fdctx * LIBCOMSTD_API fdmgr_init(void);
 
 /*
  * Specify a function to be called with a specified parameter
@@ -74,7 +74,7 @@ epicsShareFunc fdctx * epicsShareAPI fdmgr_init(void);
  * Returns fdmgrNoAlarm (zero) if alarm cant be created
  */
 #define fdmgrNoAlarm 0
-epicsShareFunc fdmgrAlarmId epicsShareAPI fdmgr_add_timeout(
+LIBCOM_API fdmgrAlarmId LIBCOMSTD_API fdmgr_add_timeout(
 fdctx           *pfdctx,	/* fd mgr ctx from fdmgr_init()		*/
 struct timeval  *ptimeout,	/* relative delay from current time	*/
 pCallBackFDMgr  pfunc,		/* function (handler) to call 		*/
@@ -85,7 +85,7 @@ void            *param		/* first parameter passed to the func	*/
  * Clear a timeout which has not executed its function (handler)
  * yet.
  */
-epicsShareFunc int epicsShareAPI fdmgr_clear_timeout(
+LIBCOM_API int LIBCOMSTD_API fdmgr_clear_timeout(
 fdctx           *pfdctx,	/* fd mgr ctx from fdmgr_init() 	*/
 fdmgrAlarmId	id		/* alarm to delete                      */
 );
@@ -107,7 +107,7 @@ fdmgrAlarmId	id		/* alarm to delete                      */
  * fdmgr_add_callback()
  * 
  */
-epicsShareFunc int epicsShareAPI fdmgr_add_callback(
+LIBCOM_API int LIBCOMSTD_API fdmgr_add_callback(
 fdctx *pfdctx,			/* fd mgr ctx from fdmgr_init() 	*/
 SOCKET fd,				/* file descriptor			*/
 enum fdi_type fdi,		/* file descriptor interest type	*/	
@@ -120,7 +120,7 @@ void *param				/* first parameter passed to the func   */
  * Clear nterest in a type of file descriptor activity (IO).
  *
  */ 
-epicsShareFunc int epicsShareAPI fdmgr_clear_callback(
+LIBCOM_API int LIBCOMSTD_API fdmgr_clear_callback(
 fdctx			*pfdctx,	/* fd mgr ctx from fdmgr_init() 	*/
 SOCKET		fd,		/* file descriptor                      */
 enum fdi_type	fdi		/* file descriptor interest type        */
@@ -135,7 +135,7 @@ enum fdi_type	fdi		/* file descriptor interest type        */
  * enough. 
  *
  */
-epicsShareFunc int epicsShareAPI fdmgr_pend_event(
+LIBCOM_API int LIBCOMSTD_API fdmgr_pend_event(
 fdctx		*pfdctx,	/* fd mgr ctx from fdmgr_init() */
 struct timeval	*ptimeout
 );
@@ -144,7 +144,7 @@ struct timeval	*ptimeout
 /*
  * obsolete interface
  */
-epicsShareFunc int epicsShareAPI fdmgr_clear_fd(
+LIBCOM_API int LIBCOMSTD_API fdmgr_clear_fd(
 fdctx		*pfdctx,		/* fd mgr ctx from fdmgr_init() */
 SOCKET	fd
 );
@@ -152,14 +152,14 @@ SOCKET	fd
 /*
  * obsolete interface
  */
-epicsShareFunc int epicsShareAPI fdmgr_add_fd(
+LIBCOM_API int LIBCOMSTD_API fdmgr_add_fd(
 fdctx   *pfdctx,		/* fd mgr ctx from fdmgr_init() */
 SOCKET  fd,
 pCallBackFDMgr pfunc,		/* function (handler) to call 		*/
 void    *param
 );
 
-epicsShareFunc int epicsShareAPI fdmgr_delete(fdctx *pfdctx);
+LIBCOM_API int LIBCOMSTD_API fdmgr_delete(fdctx *pfdctx);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/flex/Makefile b/modules/libcom/src/flex/Makefile
index 20cce5d..617c1c9 100644
--- a/modules/libcom/src/flex/Makefile
+++ b/modules/libcom/src/flex/Makefile
@@ -29,7 +29,7 @@ e_flex_SRCS += nfa.c
 e_flex_SRCS += sym.c
 e_flex_SRCS += tblcmp.c
 e_flex_SRCS += parse.c
-e_flex_OBJS += epicsTempFile$(OBJ)
+e_flex_OBJS += epicsTempFilex$(OBJ)
 
 PROD_HOST += e_flex
 
diff --git a/modules/libcom/src/flex/flex.c b/modules/libcom/src/flex/flex.c
index 008e5e6..faf61ed 100644
--- a/modules/libcom/src/flex/flex.c
+++ b/modules/libcom/src/flex/flex.c
@@ -43,7 +43,6 @@ char copyright[] =
 #endif /* not lint */
 
 
-#define epicsExportSharedSymbols
 #include "epicsTempFile.h"
 #undef epicsExportSharedSymbols
 
diff --git a/modules/libcom/src/freeList/freeList.h b/modules/libcom/src/freeList/freeList.h
index 77ebfb8..7fced89 100644
--- a/modules/libcom/src/freeList/freeList.h
+++ b/modules/libcom/src/freeList/freeList.h
@@ -13,18 +13,18 @@
 #define INCfreeListh
 
 #include <stddef.h>
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-epicsShareFunc void epicsShareAPI freeListInitPvt(void **ppvt,int size,int nmalloc);
-epicsShareFunc void * epicsShareAPI freeListCalloc(void *pvt);
-epicsShareFunc void * epicsShareAPI freeListMalloc(void *pvt);
-epicsShareFunc void epicsShareAPI freeListFree(void *pvt,void*pmem);
-epicsShareFunc void epicsShareAPI freeListCleanup(void *pvt);
-epicsShareFunc size_t epicsShareAPI freeListItemsAvail(void *pvt);
+LIBCOM_API void LIBCOMSTD_API freeListInitPvt(void **ppvt,int size,int nmalloc);
+LIBCOM_API void * LIBCOMSTD_API freeListCalloc(void *pvt);
+LIBCOM_API void * LIBCOMSTD_API freeListMalloc(void *pvt);
+LIBCOM_API void LIBCOMSTD_API freeListFree(void *pvt,void*pmem);
+LIBCOM_API void LIBCOMSTD_API freeListCleanup(void *pvt);
+LIBCOM_API size_t LIBCOMSTD_API freeListItemsAvail(void *pvt);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/freeList/freeListLib.c b/modules/libcom/src/freeList/freeListLib.c
index b489a47..9038947 100755
--- a/modules/libcom/src/freeList/freeListLib.c
+++ b/modules/libcom/src/freeList/freeListLib.c
@@ -22,7 +22,6 @@
 #define REDZONE 0
 #endif
 
-#define epicsExportSharedSymbols
 #include "cantProceed.h"
 #include "epicsMutex.h"
 #include "freeList.h"
@@ -41,7 +40,7 @@ typedef struct {
     epicsMutexId lock;
 }FREELISTPVT;
 
-epicsShareFunc void epicsShareAPI 
+LIBCOM_API void LIBCOMSTD_API 
 	freeListInitPvt(void **ppvt,int size,int nmalloc)
 {
     FREELISTPVT	*pfl;
@@ -58,7 +57,7 @@ epicsShareFunc void epicsShareAPI
     return;
 }
 
-epicsShareFunc void * epicsShareAPI freeListCalloc(void *pvt)
+LIBCOM_API void * LIBCOMSTD_API freeListCalloc(void *pvt)
 {
     FREELISTPVT *pfl = pvt;
 #   ifdef EPICS_FREELIST_DEBUG
@@ -72,7 +71,7 @@ epicsShareFunc void * epicsShareAPI freeListCalloc(void *pvt)
 #   endif
 }
 

-epicsShareFunc void * epicsShareAPI freeListMalloc(void *pvt)
+LIBCOM_API void * LIBCOMSTD_API freeListMalloc(void *pvt)
 {
     FREELISTPVT *pfl = pvt;
 #   ifdef EPICS_FREELIST_DEBUG
@@ -129,7 +128,7 @@ epicsShareFunc void * epicsShareAPI freeListMalloc(void *pvt)
 #   endif
 }
 
-epicsShareFunc void epicsShareAPI freeListFree(void *pvt,void*pmem)
+LIBCOM_API void LIBCOMSTD_API freeListFree(void *pvt,void*pmem)
 {
     FREELISTPVT	*pfl = pvt;
 #   ifdef EPICS_FREELIST_DEBUG
@@ -150,7 +149,7 @@ epicsShareFunc void epicsShareAPI freeListFree(void *pvt,void*pmem)
 #   endif
 }
 
-epicsShareFunc void epicsShareAPI freeListCleanup(void *pvt)
+LIBCOM_API void LIBCOMSTD_API freeListCleanup(void *pvt)
 {
     FREELISTPVT *pfl = pvt;
     allocMem	*phead;
@@ -169,7 +168,7 @@ epicsShareFunc void epicsShareAPI freeListCleanup(void *pvt)
     free(pvt);
 }
 
-epicsShareFunc size_t epicsShareAPI freeListItemsAvail(void *pvt)
+LIBCOM_API size_t LIBCOMSTD_API freeListItemsAvail(void *pvt)
 {
     FREELISTPVT *pfl = pvt;
     size_t nBlocksAvailable;
diff --git a/modules/libcom/src/gpHash/gpHash.h b/modules/libcom/src/gpHash/gpHash.h
index d9c0dd2..43c57f1 100644
--- a/modules/libcom/src/gpHash/gpHash.h
+++ b/modules/libcom/src/gpHash/gpHash.h
@@ -14,7 +14,7 @@
 #ifndef INC_gpHash_H
 #define INC_gpHash_H
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #include "ellLib.h"
 
@@ -32,19 +32,19 @@ extern "C" {
 #endif
 
 /*tableSize must be power of 2 in range 256 to 65536*/
-epicsShareFunc void epicsShareAPI
+LIBCOM_API void LIBCOMSTD_API
     gphInitPvt(struct gphPvt **ppvt, int tableSize);
-epicsShareFunc GPHENTRY * epicsShareAPI
+LIBCOM_API GPHENTRY * LIBCOMSTD_API
     gphFind(struct gphPvt *pvt, const char *name, void *pvtid);
-epicsShareFunc GPHENTRY * epicsShareAPI
+LIBCOM_API GPHENTRY * LIBCOMSTD_API
     gphFindParse(struct gphPvt *pvt, const char *name, size_t len, void *pvtid);
-epicsShareFunc GPHENTRY * epicsShareAPI
+LIBCOM_API GPHENTRY * LIBCOMSTD_API
     gphAdd(struct gphPvt *pvt, const char *name, void *pvtid);
-epicsShareFunc void epicsShareAPI
+LIBCOM_API void LIBCOMSTD_API
     gphDelete(struct gphPvt *pvt, const char *name, void *pvtid);
-epicsShareFunc void epicsShareAPI gphFreeMem(struct gphPvt *pvt);
-epicsShareFunc void epicsShareAPI gphDump(struct gphPvt *pvt);
-epicsShareFunc void epicsShareAPI gphDumpFP(FILE *fp, struct gphPvt *pvt);
+LIBCOM_API void LIBCOMSTD_API gphFreeMem(struct gphPvt *pvt);
+LIBCOM_API void LIBCOMSTD_API gphDump(struct gphPvt *pvt);
+LIBCOM_API void LIBCOMSTD_API gphDumpFP(FILE *fp, struct gphPvt *pvt);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/gpHash/gpHashLib.c b/modules/libcom/src/gpHash/gpHashLib.c
index a56f00a..d111e9e 100644
--- a/modules/libcom/src/gpHash/gpHashLib.c
+++ b/modules/libcom/src/gpHash/gpHashLib.c
@@ -13,7 +13,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 
-#define epicsExportSharedSymbols
 #include "cantProceed.h"
 #include "epicsMutex.h"
 #include "epicsStdioRedirect.h"
@@ -35,7 +34,7 @@ typedef struct gphPvt {
 #define MAX_SIZE 65536
 
 
-void epicsShareAPI gphInitPvt(gphPvt **ppvt, int size)
+void LIBCOMSTD_API gphInitPvt(gphPvt **ppvt, int size)
 {
     gphPvt *pgphPvt;
 
@@ -59,7 +58,7 @@ void epicsShareAPI gphInitPvt(gphPvt **ppvt, int size)
     return;
 }
 
-GPHENTRY * epicsShareAPI gphFindParse(gphPvt *pgphPvt, const char *name, size_t len, void *pvtid)
+GPHENTRY * LIBCOMSTD_API gphFindParse(gphPvt *pgphPvt, const char *name, size_t len, void *pvtid)
 {
     ELLLIST **paplist;
     ELLLIST *gphlist;
@@ -90,12 +89,12 @@ GPHENTRY * epicsShareAPI gphFindParse(gphPvt *pgphPvt, const char *name, size_t 
     return pgphNode;
 }
 
-GPHENTRY * epicsShareAPI gphFind(gphPvt *pgphPvt, const char *name, void *pvtid)
+GPHENTRY * LIBCOMSTD_API gphFind(gphPvt *pgphPvt, const char *name, void *pvtid)
 {
     return gphFindParse(pgphPvt, name, strlen(name), pvtid);
 }
 
-GPHENTRY * epicsShareAPI gphAdd(gphPvt *pgphPvt, const char *name, void *pvtid)
+GPHENTRY * LIBCOMSTD_API gphAdd(gphPvt *pgphPvt, const char *name, void *pvtid)
 {
     ELLLIST **paplist;
     ELLLIST *plist;
@@ -140,7 +139,7 @@ GPHENTRY * epicsShareAPI gphAdd(gphPvt *pgphPvt, const char *name, void *pvtid)
     return (pgphNode);
 }
 
-void epicsShareAPI gphDelete(gphPvt *pgphPvt, const char *name, void *pvtid)
+void LIBCOMSTD_API gphDelete(gphPvt *pgphPvt, const char *name, void *pvtid)
 {
     ELLLIST **paplist;
     ELLLIST *plist = NULL;
@@ -174,7 +173,7 @@ void epicsShareAPI gphDelete(gphPvt *pgphPvt, const char *name, void *pvtid)
     return;
 }
 
-void epicsShareAPI gphFreeMem(gphPvt *pgphPvt)
+void LIBCOMSTD_API gphFreeMem(gphPvt *pgphPvt)
 {
     ELLLIST **paplist;
     int h;
@@ -204,12 +203,12 @@ void epicsShareAPI gphFreeMem(gphPvt *pgphPvt)
     free(pgphPvt);
 }
 
-void epicsShareAPI gphDump(gphPvt *pgphPvt)
+void LIBCOMSTD_API gphDump(gphPvt *pgphPvt)
 {
     gphDumpFP(stdout, pgphPvt);
 }
 
-void epicsShareAPI gphDumpFP(FILE *fp, gphPvt *pgphPvt)
+void LIBCOMSTD_API gphDumpFP(FILE *fp, gphPvt *pgphPvt)
 {
     unsigned int empty = 0;
     ELLLIST **paplist;
diff --git a/modules/libcom/src/iocsh/initHooks.c b/modules/libcom/src/iocsh/initHooks.c
index 0884bdd..4c955af 100644
--- a/modules/libcom/src/iocsh/initHooks.c
+++ b/modules/libcom/src/iocsh/initHooks.c
@@ -16,7 +16,6 @@
 #include <stddef.h>
 #include <stdio.h>
 
-#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "ellLib.h"
 #include "epicsMutex.h"
diff --git a/modules/libcom/src/iocsh/initHooks.h b/modules/libcom/src/iocsh/initHooks.h
index 429a768..cedfafb 100644
--- a/modules/libcom/src/iocsh/initHooks.h
+++ b/modules/libcom/src/iocsh/initHooks.h
@@ -15,7 +15,7 @@
 #ifndef INC_initHooks_H
 #define INC_initHooks_H
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -56,10 +56,10 @@ typedef enum {
 } initHookState;
 
 typedef void (*initHookFunction)(initHookState state);
-epicsShareFunc int initHookRegister(initHookFunction func);
-epicsShareFunc void initHookAnnounce(initHookState state);
-epicsShareFunc const char *initHookName(int state);
-epicsShareFunc void initHookFree(void);
+LIBCOM_API int initHookRegister(initHookFunction func);
+LIBCOM_API void initHookAnnounce(initHookState state);
+LIBCOM_API const char *initHookName(int state);
+LIBCOM_API void initHookFree(void);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/iocsh/iocsh.cpp b/modules/libcom/src/iocsh/iocsh.cpp
index 8e4d365..2d2f053 100644
--- a/modules/libcom/src/iocsh/iocsh.cpp
+++ b/modules/libcom/src/iocsh/iocsh.cpp
@@ -19,7 +19,6 @@
 #include <ctype.h>
 #include <errno.h>
 
-#define epicsExportSharedSymbols
 #include "epicsMath.h"
 #include "errlog.h"
 #include "macLib.h"
@@ -39,7 +38,7 @@ extern "C" {
 /*
  * Global link to pdbbase
  */
-epicsShareDef struct dbBase **iocshPpdbbase;
+struct dbBase **iocshPpdbbase;
 
 /*
  * File-local information
@@ -109,7 +108,7 @@ iocshTableUnlock (void)
 /*
  * Register a command
  */
-void epicsShareAPI iocshRegister (const iocshFuncDef *piocshFuncDef,
+void LIBCOMSTD_API iocshRegister (const iocshFuncDef *piocshFuncDef,
     iocshCallFunc func)
 {
     struct iocshCommand *l, *p, *n;
@@ -152,7 +151,7 @@ void epicsShareAPI iocshRegister (const iocshFuncDef *piocshFuncDef,
 /*
  * Retrieves a previously registered function with the given name.
  */
-const iocshCmdDef * epicsShareAPI iocshFindCommand(const char *name)
+const iocshCmdDef * LIBCOMSTD_API iocshFindCommand(const char *name)
 {
     return (iocshCmdDef *) registryFind(iocshCmdID, name);
 }
@@ -165,7 +164,7 @@ static const iocshArg varCmdArg1 = { "[value]]", iocshArgString};
 static const iocshArg *varCmdArgs[2] = {&varCmdArg0, &varCmdArg1};
 static const iocshFuncDef varFuncDef = {"var", 2, varCmdArgs};
 
-void epicsShareAPI iocshRegisterVariable (const iocshVarDef *piocshVarDef)
+void LIBCOMSTD_API iocshRegisterVariable (const iocshVarDef *piocshVarDef)
 {
     struct iocshVariable *l, *p, *n;
     int i;
@@ -220,7 +219,7 @@ void epicsShareAPI iocshRegisterVariable (const iocshVarDef *piocshVarDef)
 /*
  * Retrieves a previously registered variable with the given name.
  */
-const iocshVarDef * epicsShareAPI iocshFindVariable(const char *name)
+const iocshVarDef * LIBCOMSTD_API iocshFindVariable(const char *name)
 {
     struct iocshVariable *temp = (iocshVariable *) registryFind(iocshVarID, name);
     return temp ? temp->pVarDef : 0;
@@ -229,7 +228,7 @@ const iocshVarDef * epicsShareAPI iocshFindVariable(const char *name)
 /*
  * Free storage created by iocshRegister/iocshRegisterVariable
  */
-void epicsShareAPI iocshFree(void) 
+void LIBCOMSTD_API iocshFree(void) 
 {
     struct iocshCommand *pc;
     struct iocshVariable *pv;
@@ -995,19 +994,19 @@ iocshBody (const char *pathname, const char *commandLine, const char *macros)
 /*
  * External access to the command interpreter
  */
-int epicsShareAPI
+int LIBCOMSTD_API
 iocsh (const char *pathname)
 {
     return iocshLoad(pathname, NULL);
 }
 
-int epicsShareAPI
+int LIBCOMSTD_API
 iocshCmd (const char *cmd)
 {
     return iocshRun(cmd, NULL);
 }
 
-int epicsShareAPI
+int LIBCOMSTD_API
 iocshLoad(const char *pathname, const char *macros)
 {
     if (pathname)
@@ -1015,7 +1014,7 @@ iocshLoad(const char *pathname, const char *macros)
     return iocshBody(pathname, NULL, macros);
 }
 
-int epicsShareAPI
+int LIBCOMSTD_API
 iocshRun(const char *cmd, const char *macros)
 {
     if (cmd == NULL)
@@ -1038,7 +1037,7 @@ iocshRun(const char *cmd, const char *macros)
  * and update the shared MAC_HANDLE that the iocsh uses. Which is
  * what this function is provided for.
  */
-void epicsShareAPI
+void LIBCOMSTD_API
 iocshEnvClear(const char *name)
 {
     iocshContext *context;
diff --git a/modules/libcom/src/iocsh/iocsh.h b/modules/libcom/src/iocsh/iocsh.h
index a63af64..fdb7f7c 100644
--- a/modules/libcom/src/iocsh/iocsh.h
+++ b/modules/libcom/src/iocsh/iocsh.h
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include "compilerDependencies.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #if defined(vxWorks) || defined(__rtems__)
 #define IOCSH_STATIC_FUNC
@@ -71,48 +71,48 @@ typedef struct iocshCmdDef {
     iocshCallFunc         func;
 }iocshCmdDef;
 
-epicsShareFunc void epicsShareAPI iocshRegister(
+LIBCOM_API void LIBCOMSTD_API iocshRegister(
     const iocshFuncDef *piocshFuncDef, iocshCallFunc func);
-epicsShareFunc void epicsShareAPI iocshRegisterVariable (
+LIBCOM_API void LIBCOMSTD_API iocshRegisterVariable (
     const iocshVarDef *piocshVarDef);
-epicsShareFunc const iocshCmdDef * epicsShareAPI iocshFindCommand(
+LIBCOM_API const iocshCmdDef * LIBCOMSTD_API iocshFindCommand(
     const char* name) EPICS_DEPRECATED;
-epicsShareFunc const iocshVarDef * epicsShareAPI iocshFindVariable(
+LIBCOM_API const iocshVarDef * LIBCOMSTD_API iocshFindVariable(
     const char* name);
 
 /* iocshFree frees storage used by iocshRegister*/
 /* This should only be called when iocsh is no longer needed*/
-epicsShareFunc void epicsShareAPI iocshFree(void);
+LIBCOM_API void LIBCOMSTD_API iocshFree(void);
 
 /** shorthand for @code iocshLoad(pathname, NULL) @endcode */
-epicsShareFunc int epicsShareAPI iocsh(const char *pathname);
+LIBCOM_API int LIBCOMSTD_API iocsh(const char *pathname);
 /** shorthand for @code iocshRun(cmd, NULL) @endcode */
-epicsShareFunc int epicsShareAPI iocshCmd(const char *cmd);
+LIBCOM_API int LIBCOMSTD_API iocshCmd(const char *cmd);
 /** Read and evaluate IOC shell commands from the given file.
  * @param pathname Path to script file
  * @param macros NULL or a comma seperated list of macro definitions.  eg. "VAR1=x,VAR2=y"
  * @return 0 on success, non-zero on error
  */
-epicsShareFunc int epicsShareAPI iocshLoad(const char *pathname, const char* macros);
+LIBCOM_API int LIBCOMSTD_API iocshLoad(const char *pathname, const char* macros);
 /** Evaluate a single IOC shell command
  * @param cmd Command string.  eg. "echo \"something or other\""
  * @param macros NULL or a comma seperated list of macro definitions.  eg. "VAR1=x,VAR2=y"
  * @return 0 on success, non-zero on error
  */
-epicsShareFunc int epicsShareAPI iocshRun(const char *cmd, const char* macros);
+LIBCOM_API int LIBCOMSTD_API iocshRun(const char *cmd, const char* macros);
 
 /** @brief Signal error from an IOC shell function.
  *
  * @param err 0 - success (no op), !=0 - error
  * @return The err argument value.
  */
-epicsShareFunc int iocshSetError(int err);
+LIBCOM_API int iocshSetError(int err);
 
 /* Makes macros that shadow environment variables work correctly with epicsEnvSet */
-epicsShareFunc void epicsShareAPI iocshEnvClear(const char *name);
+LIBCOM_API void LIBCOMSTD_API iocshEnvClear(const char *name);
 
 /* 'weak' link to pdbbase */
-epicsShareExtern struct dbBase **iocshPpdbbase;
+LIBCOM_API extern struct dbBase **iocshPpdbbase;
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/iocsh/libComRegister.c b/modules/libcom/src/iocsh/libComRegister.c
index c67804a..e58feb4 100644
--- a/modules/libcom/src/iocsh/libComRegister.c
+++ b/modules/libcom/src/iocsh/libComRegister.c
@@ -10,7 +10,6 @@
 
 #include <stdlib.h>
 
-#define epicsExportSharedSymbols
 #include "iocsh.h"
 #include "asLib.h"
 #include "epicsStdioRedirect.h"
@@ -396,7 +395,7 @@ static void installLastResortEventProviderCallFunc(const iocshArgBuf *args)
 
 static iocshVarDef asCheckClientIPDef[] = { { "asCheckClientIP", iocshArgInt, 0 }, { NULL, iocshArgInt, NULL } };
 
-void epicsShareAPI libComRegister(void)
+void LIBCOMSTD_API libComRegister(void)
 {
     iocshRegister(&dateFuncDef, dateCallFunc);
     iocshRegister(&echoFuncDef, echoCallFunc);
diff --git a/modules/libcom/src/iocsh/libComRegister.h b/modules/libcom/src/iocsh/libComRegister.h
index ef93f4a..faf2801 100644
--- a/modules/libcom/src/iocsh/libComRegister.h
+++ b/modules/libcom/src/iocsh/libComRegister.h
@@ -8,13 +8,13 @@
 #ifndef INC_libComRegister_H
 #define INC_libComRegister_H
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-epicsShareFunc void epicsShareAPI libComRegister(void);
+LIBCOM_API void LIBCOMSTD_API libComRegister(void);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/iocsh/registry.c b/modules/libcom/src/iocsh/registry.c
index 0b2e312..dfc8c2c 100644
--- a/modules/libcom/src/iocsh/registry.c
+++ b/modules/libcom/src/iocsh/registry.c
@@ -16,7 +16,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "cantProceed.h"
 #include "epicsFindSymbol.h"
@@ -32,7 +31,7 @@ static void registryInit(int tableSize)
     if(!gphPvt) cantProceed("registry why did gphInitPvt fail\n");
 }
     
-epicsShareFunc int epicsShareAPI registrySetTableSize(int size)
+LIBCOM_API int LIBCOMSTD_API registrySetTableSize(int size)
 {
     if(gphPvt) {
         printf("registryInit already called\n");
@@ -43,7 +42,7 @@ epicsShareFunc int epicsShareAPI registrySetTableSize(int size)
 }
     
 
-epicsShareFunc int epicsShareAPI registryAdd(
+LIBCOM_API int LIBCOMSTD_API registryAdd(
     void *registryID,const char *name,void *data)
 {
     GPHENTRY *pentry;
@@ -54,7 +53,7 @@ epicsShareFunc int epicsShareAPI registryAdd(
     return(TRUE);
 }
 
-epicsShareFunc int epicsShareAPI registryChange(
+LIBCOM_API int LIBCOMSTD_API registryChange(
     void *registryID,const char *name,void *data)
 {
     GPHENTRY *pentry;
@@ -65,7 +64,7 @@ epicsShareFunc int epicsShareAPI registryChange(
     return(TRUE);
 }
 
-epicsShareFunc void * epicsShareAPI registryFind(
+LIBCOM_API void * LIBCOMSTD_API registryFind(
     void *registryID,const char *name)
 {
     GPHENTRY *pentry;
@@ -77,14 +76,14 @@ epicsShareFunc void * epicsShareAPI registryFind(
     return(pentry->userPvt);
 }
 
-epicsShareFunc void epicsShareAPI registryFree(void)
+LIBCOM_API void LIBCOMSTD_API registryFree(void)
 {
     if(!gphPvt) return;
     gphFreeMem(gphPvt);
     gphPvt = 0;
 }
 
-epicsShareFunc int epicsShareAPI registryDump(void)
+LIBCOM_API int LIBCOMSTD_API registryDump(void)
 {
     if(!gphPvt) return(0);
     gphDump(gphPvt);
diff --git a/modules/libcom/src/iocsh/registry.h b/modules/libcom/src/iocsh/registry.h
index ea1bb7c..0739783 100644
--- a/modules/libcom/src/iocsh/registry.h
+++ b/modules/libcom/src/iocsh/registry.h
@@ -10,23 +10,23 @@
 #ifndef INCregistryh
 #define INCregistryh
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 #define DEFAULT_TABLE_SIZE 1024
 
-epicsShareFunc int epicsShareAPI registryAdd(
+LIBCOM_API int LIBCOMSTD_API registryAdd(
     void *registryID,const char *name,void *data);
-epicsShareFunc void *epicsShareAPI registryFind(
+LIBCOM_API void *LIBCOMSTD_API registryFind(
     void *registryID,const char *name);
-epicsShareFunc int epicsShareAPI registryChange(
+LIBCOM_API int LIBCOMSTD_API registryChange(
     void *registryID,const char *name,void *data);
 
-epicsShareFunc int epicsShareAPI registrySetTableSize(int size);
-epicsShareFunc void epicsShareAPI registryFree(void);
-epicsShareFunc int epicsShareAPI registryDump(void);
+LIBCOM_API int LIBCOMSTD_API registrySetTableSize(int size);
+LIBCOM_API void LIBCOMSTD_API registryFree(void);
+LIBCOM_API int LIBCOMSTD_API registryDump(void);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/libComAPI.h b/modules/libcom/src/libComAPI.h
new file mode 100644
index 0000000..949fd17
--- /dev/null
+++ b/modules/libcom/src/libComAPI.h
@@ -0,0 +1,32 @@
+#ifndef LIBCOMAPI_H
+#define LIBCOMAPI_H
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+#   define LIBCOMSTD_API __stdcall
+
+#  if defined(LIBCOM_API_BUILDING) && defined(EPICS_BUILD_DLL)
+/* building library as dll */
+#    define LIBCOM_API __declspec(dllexport)
+#  elif !defined(LIBCOM_API_BUILDING) && defined(EPICS_CALL_DLL)
+/* calling library in dll form */
+#    define LIBCOM_API __declspec(dllimport)
+#  endif
+
+#elif __GNUC__ >= 4
+#  define LIBCOM_API __attribute__ ((visibility("default")))
+#endif
+
+#if !defined(LIBCOM_API)
+#  define LIBCOM_API
+#endif
+
+#if !defined(LIBCOMSTD_API)
+#  define LIBCOMSTD_API
+#endif
+
+/* workaround for unfortunately ubiquitous example
+ * to workaround ordering issues...
+ */
+#include <shareLib.h>
+
+#endif /* LIBCOMAPI_H */
diff --git a/modules/libcom/src/libComVersion.h b/modules/libcom/src/libComVersion.h
index 60537f9..02a124d 100644
--- a/modules/libcom/src/libComVersion.h
+++ b/modules/libcom/src/libComVersion.h
@@ -9,7 +9,7 @@
 #define LIBCOMVERSION_H
 
 #include <epicsVersion.h>
-#include <shareLib.h>
+#include <libComAPI.h>
 
 #ifndef VERSION_INT
 #  define VERSION_INT(V,R,M,P) ( ((V)<<24) | ((R)<<16) | ((M)<<8) | (P))
diff --git a/modules/libcom/src/log/iocLog.c b/modules/libcom/src/log/iocLog.c
index ba78041..34a0f94 100644
--- a/modules/libcom/src/log/iocLog.c
+++ b/modules/libcom/src/log/iocLog.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <limits.h>
 
-#define epicsExportSharedSymbols
 #include "envDefs.h"
 #include "errlog.h"
 #include "logClient.h"
@@ -69,7 +68,7 @@ static int getConfig (struct in_addr *pserver_addr, unsigned short *pserver_port
 /*
  *  iocLogFlush ()
  */
-void epicsShareAPI epicsShareAPI iocLogFlush (void)
+void LIBCOMSTD_API LIBCOMSTD_API iocLogFlush (void)
 {
     if (iocLogClient!=NULL) {
         logClientFlush (iocLogClient);
@@ -119,7 +118,7 @@ static logClientId iocLogClientInit (void)
 /*
  *  iocLogInit()
  */
-int epicsShareAPI iocLogInit (void)
+int LIBCOMSTD_API iocLogInit (void)
 {
     /*
      * check for global disable
@@ -145,7 +144,7 @@ int epicsShareAPI iocLogInit (void)
 /*
  *  iocLogShow ()
  */
-void epicsShareAPI iocLogShow (unsigned level)
+void LIBCOMSTD_API iocLogShow (unsigned level)
 {
     if (iocLogClient!=NULL) {
         logClientShow (iocLogClient, level);
@@ -155,7 +154,7 @@ void epicsShareAPI iocLogShow (unsigned level)
 /*
  *  logClientInit(); deprecated
  */
-logClientId epicsShareAPI logClientInit (void)
+logClientId LIBCOMSTD_API logClientInit (void)
 {
     return iocLogClientInit ();
 }
diff --git a/modules/libcom/src/log/iocLog.h b/modules/libcom/src/log/iocLog.h
index b6f7ddf..4a59c2b 100644
--- a/modules/libcom/src/log/iocLog.h
+++ b/modules/libcom/src/log/iocLog.h
@@ -17,7 +17,7 @@
 
 #ifndef INCiocLogh
 #define INCiocLogh 1
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,10 +26,10 @@ extern "C" {
 /*
  * ioc log client interface
  */
-epicsShareExtern int iocLogDisable;
-epicsShareFunc int epicsShareAPI iocLogInit (void);
-epicsShareFunc void epicsShareAPI iocLogShow (unsigned level);
-epicsShareFunc void epicsShareAPI iocLogFlush (void);
+LIBCOM_API extern int iocLogDisable;
+LIBCOM_API int LIBCOMSTD_API iocLogInit (void);
+LIBCOM_API void LIBCOMSTD_API iocLogShow (unsigned level);
+LIBCOM_API void LIBCOMSTD_API iocLogFlush (void);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/log/iocLogServer.c b/modules/libcom/src/log/iocLogServer.c
index e707185..7da450a 100644
--- a/modules/libcom/src/log/iocLogServer.c
+++ b/modules/libcom/src/log/iocLogServer.c
@@ -16,6 +16,9 @@
  *      Date:       080791 
  */
 
+#undef LIBCOM_API_BUILDING
+#undef EPICS_BUILD_DLL
+
 #include	<stdlib.h>
 #include	<string.h>
 #include	<errno.h>
diff --git a/modules/libcom/src/log/logClient.c b/modules/libcom/src/log/logClient.c
index 44883e3..0209550 100644
--- a/modules/libcom/src/log/logClient.c
+++ b/modules/libcom/src/log/logClient.c
@@ -22,7 +22,6 @@
 #include <stdio.h>
 
 #define EPICS_PRIVATE_API
-#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "epicsEvent.h"
 #include "iocLog.h"
@@ -200,7 +199,7 @@ static void sendMessageChunk(logClient * pClient, const char * message) {
 /* 
  * logClientSend ()
  */
-void epicsShareAPI logClientSend ( logClientId id, const char * message )
+void LIBCOMSTD_API logClientSend ( logClientId id, const char * message )
 {
     logClient * pClient = ( logClient * ) id;
 
@@ -219,7 +218,7 @@ void epicsShareAPI logClientSend ( logClientId id, const char * message )
 }
 
 
-void epicsShareAPI logClientFlush ( logClientId id )
+void LIBCOMSTD_API logClientFlush ( logClientId id )
 {
     unsigned nSent;
     int status = 0;
@@ -448,7 +447,7 @@ static void logClientRestart ( logClientId id )
 /*
  *  logClientCreate()
  */
-logClientId epicsShareAPI logClientCreate (
+logClientId LIBCOMSTD_API logClientCreate (
     struct in_addr server_addr, unsigned short server_port)
 {
     logClient *pClient;
@@ -511,7 +510,7 @@ logClientId epicsShareAPI logClientCreate (
 /*
  * logClientShow ()
  */
-void epicsShareAPI logClientShow (logClientId id, unsigned level)
+void LIBCOMSTD_API logClientShow (logClientId id, unsigned level)
 {
     logClient *pClient = (logClient *) id;
 
@@ -543,7 +542,7 @@ void epicsShareAPI logClientShow (logClientId id, unsigned level)
 /*
  * iocLogPrefix()
  */
-void epicsShareAPI iocLogPrefix(const char * prefix)
+void LIBCOMSTD_API iocLogPrefix(const char * prefix)
 {
 
     /* If we have already established a log prefix, don't let the user change
diff --git a/modules/libcom/src/log/logClient.h b/modules/libcom/src/log/logClient.h
index 3b3f63a..4315af7 100644
--- a/modules/libcom/src/log/logClient.h
+++ b/modules/libcom/src/log/logClient.h
@@ -17,7 +17,7 @@
 
 #ifndef INClogClienth
 #define INClogClienth 1
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "osiSock.h" /* for 'struct in_addr' */
 
 /* include default log client interface for backward compatibility */
@@ -28,16 +28,16 @@ extern "C" {
 #endif
 
 typedef void *logClientId;
-epicsShareFunc logClientId epicsShareAPI logClientCreate (
+LIBCOM_API logClientId LIBCOMSTD_API logClientCreate (
     struct in_addr server_addr, unsigned short server_port);
-epicsShareFunc void epicsShareAPI logClientSend (logClientId id, const char *message);
-epicsShareFunc void epicsShareAPI logClientShow (logClientId id, unsigned level);
-epicsShareFunc void epicsShareAPI logClientFlush (logClientId id);
-epicsShareFunc void epicsShareAPI iocLogPrefix(const char* prefix);
+LIBCOM_API void LIBCOMSTD_API logClientSend (logClientId id, const char *message);
+LIBCOM_API void LIBCOMSTD_API logClientShow (logClientId id, unsigned level);
+LIBCOM_API void LIBCOMSTD_API logClientFlush (logClientId id);
+LIBCOM_API void LIBCOMSTD_API iocLogPrefix(const char* prefix);
 
 /* deprecated interface; retained for backward compatibility */
 /* note: implementations are in iocLog.c, not logClient.c */
-epicsShareFunc logClientId epicsShareAPI logClientInit (void);
+LIBCOM_API logClientId LIBCOMSTD_API logClientInit (void);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/macLib/macCore.c b/modules/libcom/src/macLib/macCore.c
index 6f84d6b..9e7ea57 100644
--- a/modules/libcom/src/macLib/macCore.c
+++ b/modules/libcom/src/macLib/macCore.c
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "errlog.h"
 #include "dbmf.h"
@@ -98,7 +97,7 @@ static char *Strdup( const char *string );
  * of macro definitions
  */
 long                            /* 0 = OK; <0 = ERROR */
-epicsShareAPI macCreateHandle(
+LIBCOMSTD_API macCreateHandle(
     MAC_HANDLE  **pHandle,      /* address of variable to receive pointer */
                                 /* to new macro substitution context */
 
@@ -152,7 +151,7 @@ epicsShareAPI macCreateHandle(
  * for the given handle
  */
 void
-epicsShareAPI macSuppressWarning(
+LIBCOMSTD_API macSuppressWarning(
     MAC_HANDLE  *handle,        /* opaque handle */
     int         suppress        /* 0 means issue, 1 means suppress */
 )
@@ -172,7 +171,7 @@ epicsShareAPI macSuppressWarning(
  */
 long                            /* strlen(dest), <0 if any macros are */
                                 /* undefined */
-epicsShareAPI macExpandString(
+LIBCOMSTD_API macExpandString(
     MAC_HANDLE  *handle,        /* opaque handle */
 
     const char  *src,           /* source string */
@@ -231,7 +230,7 @@ epicsShareAPI macExpandString(
  * already existed
  */
 long                            /* strlen(value) */
-epicsShareAPI macPutValue(
+LIBCOMSTD_API macPutValue(
     MAC_HANDLE  *handle,        /* opaque handle */
 
     const char  *name,          /* macro name */
@@ -299,7 +298,7 @@ epicsShareAPI macPutValue(
  * Return the value of a macro
  */
 long                            /* strlen(value), <0 if undefined */
-epicsShareAPI macGetValue(
+LIBCOMSTD_API macGetValue(
     MAC_HANDLE  *handle,        /* opaque handle */
 
     const char  *name,          /* macro name or reference */
@@ -358,7 +357,7 @@ epicsShareAPI macGetValue(
  * context
  */
 long                            /* 0 = OK; <0 = ERROR */
-epicsShareAPI macDeleteHandle(
+LIBCOMSTD_API macDeleteHandle(
     MAC_HANDLE  *handle )       /* opaque handle */
 {
     MAC_ENTRY *entry, *nextEntry;
@@ -390,7 +389,7 @@ epicsShareAPI macDeleteHandle(
  * Mark the start of a new scoping level
  */
 long                            /* 0 = OK; <0 = ERROR */
-epicsShareAPI macPushScope(
+LIBCOMSTD_API macPushScope(
     MAC_HANDLE  *handle )       /* opaque handle */
 {
     MAC_ENTRY *entry;
@@ -425,7 +424,7 @@ epicsShareAPI macPushScope(
  * Pop all macros defined since the last call to macPushScope()
  */
 long                            /* 0 = OK; <0 = ERROR */
-epicsShareAPI macPopScope(
+LIBCOMSTD_API macPopScope(
     MAC_HANDLE  *handle )       /* opaque handle */
 {
     MAC_ENTRY *entry, *nextEntry;
@@ -469,7 +468,7 @@ epicsShareAPI macPopScope(
  * Report macro details to standard output
  */
 long                            /* 0 = OK; <0 = ERROR */
-epicsShareAPI macReportMacros(
+LIBCOMSTD_API macReportMacros(
     MAC_HANDLE  *handle )       /* opaque handle */
 {
     const char *format = "%-1s %-16s %-16s %s\n";
diff --git a/modules/libcom/src/macLib/macEnv.c b/modules/libcom/src/macLib/macEnv.c
index f102748..3678911 100644
--- a/modules/libcom/src/macLib/macEnv.c
+++ b/modules/libcom/src/macLib/macEnv.c
@@ -12,18 +12,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define epicsExportSharedSymbols
 #include "errlog.h"
 #include "epicsString.h"
 #include "macLib.h"
 
-char * epicsShareAPI
+char * LIBCOMSTD_API
 macEnvExpand(const char *str)
 {
     return macDefExpand(str, NULL);
 }
 
-char * epicsShareAPI
+char * LIBCOMSTD_API
 macDefExpand(const char *str, MAC_HANDLE *macros)
 {
     MAC_HANDLE *handle;
diff --git a/modules/libcom/src/macLib/macLib.h b/modules/libcom/src/macLib/macLib.h
index 14ecdaa..4a762bc 100644
--- a/modules/libcom/src/macLib/macLib.h
+++ b/modules/libcom/src/macLib/macLib.h
@@ -19,7 +19,7 @@
  * EPICS include files needed by this file
  */
 #include "ellLib.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -46,8 +46,8 @@ typedef struct {
 /*
  * Function prototypes (core library)
  */
-epicsShareFunc long             /* 0 = OK; <0 = ERROR */
-epicsShareAPI macCreateHandle(
+LIBCOM_API long             /* 0 = OK; <0 = ERROR */
+LIBCOMSTD_API macCreateHandle(
     MAC_HANDLE  **handle,       /* address of variable to receive pointer */
                                 /* to new macro substitution context */
 
@@ -57,16 +57,16 @@ epicsShareAPI macCreateHandle(
                                 /* argument implies no macros */
 );
 
-epicsShareFunc void
-epicsShareAPI macSuppressWarning(
+LIBCOM_API void
+LIBCOMSTD_API macSuppressWarning(
     MAC_HANDLE  *handle,        /* opaque handle */
 
     int         falseTrue       /*0 means issue, 1 means suppress*/
 );
 
-epicsShareFunc long             /* strlen(dest), <0 if any macros are */
+LIBCOM_API long             /* strlen(dest), <0 if any macros are */
                                 /* undefined */
-epicsShareAPI macExpandString(
+LIBCOMSTD_API macExpandString(
     MAC_HANDLE  *handle,        /* opaque handle */
 
     const char  *src,           /* source string */
@@ -77,8 +77,8 @@ epicsShareAPI macExpandString(
 );
 
 
-epicsShareFunc long             /* strlen(value) */
-epicsShareAPI macPutValue(
+LIBCOM_API long             /* strlen(value) */
+LIBCOMSTD_API macPutValue(
     MAC_HANDLE  *handle,        /* opaque handle */
 
     const char  *name,          /* macro name */
@@ -86,8 +86,8 @@ epicsShareAPI macPutValue(
     const char  *value          /* macro value */
 );
 
-epicsShareFunc long             /* strlen(value), <0 if undefined */
-epicsShareAPI macGetValue(
+LIBCOM_API long             /* strlen(value), <0 if undefined */
+LIBCOMSTD_API macGetValue(
     MAC_HANDLE  *handle,        /* opaque handle */
 
     const char  *name,          /* macro name or reference */
@@ -98,31 +98,31 @@ epicsShareAPI macGetValue(
     long        capacity        /* capacity of destination buffer (value) */
 );
 
-epicsShareFunc long             /* 0 = OK; <0 = ERROR */
-epicsShareAPI macDeleteHandle(
+LIBCOM_API long             /* 0 = OK; <0 = ERROR */
+LIBCOMSTD_API macDeleteHandle(
     MAC_HANDLE  *handle         /* opaque handle */
 );
 
-epicsShareFunc long             /* 0 = OK; <0 = ERROR */
-epicsShareAPI macPushScope(
+LIBCOM_API long             /* 0 = OK; <0 = ERROR */
+LIBCOMSTD_API macPushScope(
     MAC_HANDLE  *handle         /* opaque handle */
 );
 
-epicsShareFunc long             /* 0 = OK; <0 = ERROR */
-epicsShareAPI macPopScope(
+LIBCOM_API long             /* 0 = OK; <0 = ERROR */
+LIBCOMSTD_API macPopScope(
     MAC_HANDLE  *handle         /* opaque handle */
 );
 
-epicsShareFunc long             /* 0 = OK; <0 = ERROR */
-epicsShareAPI macReportMacros(
+LIBCOM_API long             /* 0 = OK; <0 = ERROR */
+LIBCOMSTD_API macReportMacros(
     MAC_HANDLE  *handle         /* opaque handle */
 );
 
 /*
  * Function prototypes (utility library)
  */
-epicsShareFunc long             /* #defns encountered; <0 = ERROR */
-epicsShareAPI macParseDefns(
+LIBCOM_API long             /* #defns encountered; <0 = ERROR */
+LIBCOMSTD_API macParseDefns(
     MAC_HANDLE  *handle,        /* opaque handle; can be NULL if default */
                                 /* special characters are to be used */
 
@@ -135,8 +135,8 @@ epicsShareAPI macParseDefns(
                                 /* allocated contiguously */
 );
 
-epicsShareFunc long             /* #macros defined; <0 = ERROR */
-epicsShareAPI macInstallMacros(
+LIBCOM_API long             /* #macros defined; <0 = ERROR */
+LIBCOMSTD_API macInstallMacros(
     MAC_HANDLE  *handle,        /* opaque handle */
 
     char        *pairs[]        /* pointer to NULL-terminated array of */
@@ -145,13 +145,13 @@ epicsShareAPI macInstallMacros(
                                 /* argument implies no macros */
 );
 
-epicsShareFunc char *           /* expanded string; NULL if any undefined macros */
-epicsShareAPI macEnvExpand(
+LIBCOM_API char *           /* expanded string; NULL if any undefined macros */
+LIBCOMSTD_API macEnvExpand(
     const char *str             /* string to be expanded */
 );
 
-epicsShareFunc char *           /* expanded string; NULL if any undefined macros */
-epicsShareAPI macDefExpand(
+LIBCOM_API char *           /* expanded string; NULL if any undefined macros */
+LIBCOMSTD_API macDefExpand(
     const char *str,            /* string to be expanded */
     MAC_HANDLE *macros          /* opaque handle; can be NULL if default */
                                 /* special characters are to be used */
diff --git a/modules/libcom/src/macLib/macUtil.c b/modules/libcom/src/macLib/macUtil.c
index 7bf7354..c226198 100644
--- a/modules/libcom/src/macLib/macUtil.c
+++ b/modules/libcom/src/macLib/macUtil.c
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "errlog.h"
 #include "macLib.h"
@@ -30,7 +29,7 @@
  * values)
  */
 long				/* #defns encountered; <0 = ERROR */
-epicsShareAPI macParseDefns(
+LIBCOMSTD_API macParseDefns(
     MAC_HANDLE	*handle,	/* opaque handle; can be NULL if default */
 				/* special characters are to be used */
 
@@ -251,7 +250,7 @@ error:
  * one (preferably two) NULL pointers 
  */
 long				/* #macros defined; <0 = ERROR */
-epicsShareAPI macInstallMacros(
+LIBCOMSTD_API macInstallMacros(
     MAC_HANDLE	*handle,	/* opaque handle */
 
     char	*pairs[] )	/* pointer to NULL-terminated array of */
diff --git a/modules/libcom/src/misc/aToIPAddr.c b/modules/libcom/src/misc/aToIPAddr.c
index c21b574..ffcbb5f 100644
--- a/modules/libcom/src/misc/aToIPAddr.c
+++ b/modules/libcom/src/misc/aToIPAddr.c
@@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define epicsExportSharedSymbols
 #include "epicsTypes.h"
 #include "osiSock.h"
 
@@ -75,7 +74,7 @@ static int initIPAddr ( struct in_addr ipAddr, unsigned port,
  * "pAddrString" does not contain an address of the form
  * "n.n.n.n:p or host:p"
  */
-epicsShareFunc int epicsShareAPI 
+LIBCOM_API int LIBCOMSTD_API 
 aToIPAddr( const char *pAddrString, unsigned short defaultPort, 
                 struct sockaddr_in *pIP )
 {
diff --git a/modules/libcom/src/misc/adjustment.c b/modules/libcom/src/misc/adjustment.c
index ac10e28..ec24881 100644
--- a/modules/libcom/src/misc/adjustment.c
+++ b/modules/libcom/src/misc/adjustment.c
@@ -20,10 +20,9 @@
  * After setting the following they will be declared as exports
  *   (Appropriate for what we implenment)
  */
-#define epicsExportSharedSymbols
 #include "adjustment.h"
 
-epicsShareFunc size_t adjustToWorstCaseAlignment(size_t size)
+LIBCOM_API size_t adjustToWorstCaseAlignment(size_t size)
 {
     int align_size, adjust;
     struct test_long_word { char c; long lw; };
diff --git a/modules/libcom/src/misc/adjustment.h b/modules/libcom/src/misc/adjustment.h
index 3f15203..76d333f 100644
--- a/modules/libcom/src/misc/adjustment.h
+++ b/modules/libcom/src/misc/adjustment.h
@@ -11,13 +11,13 @@
 
 #ifndef INCadjustmenth
 #define INCadjustmenth
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-epicsShareFunc size_t adjustToWorstCaseAlignment(size_t size);
+LIBCOM_API size_t adjustToWorstCaseAlignment(size_t size);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/misc/alarm.h b/modules/libcom/src/misc/alarm.h
index 58e2b73..7fb1eed 100644
--- a/modules/libcom/src/misc/alarm.h
+++ b/modules/libcom/src/misc/alarm.h
@@ -16,7 +16,7 @@
 #ifndef INC_alarm_H
 #define INC_alarm_H
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -97,8 +97,8 @@ typedef enum {
 
 /* Name string arrays */
 
-epicsShareExtern const char *epicsAlarmSeverityStrings [ALARM_NSEV];
-epicsShareExtern const char *epicsAlarmConditionStrings [ALARM_NSTATUS];
+LIBCOM_API extern const char *epicsAlarmSeverityStrings [ALARM_NSEV];
+LIBCOM_API extern const char *epicsAlarmConditionStrings [ALARM_NSTATUS];
 
 
 #ifdef __cplusplus
diff --git a/modules/libcom/src/misc/alarmString.c b/modules/libcom/src/misc/alarmString.c
index 4db179d..b09f74b 100644
--- a/modules/libcom/src/misc/alarmString.c
+++ b/modules/libcom/src/misc/alarmString.c
@@ -9,12 +9,11 @@
 
 /* String names for alarm status and severity values */
 
-#define epicsExportSharedSymbols
 #include "alarm.h"
 
 /* ALARM SEVERITIES - must match menuAlarmSevr.dbd and alarm.h */
 
-epicsShareDef const char * epicsAlarmSeverityStrings[ALARM_NSEV] = {
+const char * epicsAlarmSeverityStrings[ALARM_NSEV] = {
     "NO_ALARM",
     "MINOR",
     "MAJOR",
@@ -24,7 +23,7 @@ epicsShareDef const char * epicsAlarmSeverityStrings[ALARM_NSEV] = {
 
 /* ALARM STATUS - must match menuAlarmStat.dbd and alarm.h */
 
-epicsShareDef const char * epicsAlarmConditionStrings[ALARM_NSTATUS] = {
+const char * epicsAlarmConditionStrings[ALARM_NSTATUS] = {
     "NO_ALARM",
     "READ",
     "WRITE",
diff --git a/modules/libcom/src/misc/cantProceed.c b/modules/libcom/src/misc/cantProceed.c
index 6c35796..d5ac257 100644
--- a/modules/libcom/src/misc/cantProceed.c
+++ b/modules/libcom/src/misc/cantProceed.c
@@ -14,13 +14,12 @@
 #include <stdlib.h>
 #include <stdarg.h>
 
-#define epicsExportSharedSymbols
 #include "errlog.h"
 #include "cantProceed.h"
 #include "epicsThread.h"
 #include "epicsStackTrace.h"
 
-epicsShareFunc void * callocMustSucceed(size_t count, size_t size, const char *msg)
+LIBCOM_API void * callocMustSucceed(size_t count, size_t size, const char *msg)
 {
     void * mem = NULL;
     if (count > 0 && size > 0) {
@@ -36,7 +35,7 @@ epicsShareFunc void * callocMustSucceed(size_t count, size_t size, const char *m
     return mem;
 }
 
-epicsShareFunc void * mallocMustSucceed(size_t size, const char *msg)
+LIBCOM_API void * mallocMustSucceed(size_t size, const char *msg)
 {
     void * mem = NULL;
     if (size > 0) {
@@ -52,7 +51,7 @@ epicsShareFunc void * mallocMustSucceed(size_t size, const char *msg)
     return mem;
 }
 
-epicsShareFunc void cantProceed(const char *msg, ...)
+LIBCOM_API void cantProceed(const char *msg, ...)
 {
     va_list pvar;
     va_start(pvar, msg);
diff --git a/modules/libcom/src/misc/cantProceed.h b/modules/libcom/src/misc/cantProceed.h
index 437f968..168f936 100644
--- a/modules/libcom/src/misc/cantProceed.h
+++ b/modules/libcom/src/misc/cantProceed.h
@@ -12,15 +12,15 @@
 #include <stdlib.h>
 
 #include "compilerDependencies.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-epicsShareFunc void cantProceed(const char *errorMessage, ...) EPICS_PRINTF_STYLE(1,2);
-epicsShareFunc void * callocMustSucceed(size_t count, size_t size, const char *errorMessage);
-epicsShareFunc void * mallocMustSucceed(size_t size, const char *errorMessage);
+LIBCOM_API void cantProceed(const char *errorMessage, ...) EPICS_PRINTF_STYLE(1,2);
+LIBCOM_API void * callocMustSucceed(size_t count, size_t size, const char *errorMessage);
+LIBCOM_API void * mallocMustSucceed(size_t size, const char *errorMessage);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/misc/epicsConvert.c b/modules/libcom/src/misc/epicsConvert.c
index 9318ceb..bbc29aa 100644
--- a/modules/libcom/src/misc/epicsConvert.c
+++ b/modules/libcom/src/misc/epicsConvert.c
@@ -11,12 +11,11 @@
 #include <float.h>
 #include <limits.h>
 
-#define epicsExportSharedSymbols
 #include "epicsMath.h"
 #include "epicsConvert.h"
 #include "cantProceed.h"
 
-epicsShareFunc float epicsConvertDoubleToFloat(double value)
+LIBCOM_API float epicsConvertDoubleToFloat(double value)
 {
     double abs;
 
diff --git a/modules/libcom/src/misc/epicsConvert.h b/modules/libcom/src/misc/epicsConvert.h
index 1c38bc3..29cdbab 100644
--- a/modules/libcom/src/misc/epicsConvert.h
+++ b/modules/libcom/src/misc/epicsConvert.h
@@ -11,13 +11,13 @@
 #ifndef INC_epicsConvert_H
 #define INC_epicsConvert_H
 
-#include <shareLib.h>
+#include <libComAPI.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-epicsShareFunc float epicsConvertDoubleToFloat(double value);
+LIBCOM_API float epicsConvertDoubleToFloat(double value);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/misc/epicsExit.c b/modules/libcom/src/misc/epicsExit.c
index 266835e..af36bce 100644
--- a/modules/libcom/src/misc/epicsExit.c
+++ b/modules/libcom/src/misc/epicsExit.c
@@ -27,7 +27,6 @@
 #include <errno.h>
 #include <string.h>
 
-#define epicsExportSharedSymbols
 #include "ellLib.h"
 #include "errlog.h"
 #include "epicsThread.h"
@@ -100,7 +99,7 @@ static void epicsExitCallAtExitsPvt(exitPvt *pep)
     }
 }
 
-epicsShareFunc void epicsExitCallAtExits(void)
+LIBCOM_API void epicsExitCallAtExits(void)
 {
     exitPvt * pep = 0;
 
@@ -119,7 +118,7 @@ epicsShareFunc void epicsExitCallAtExits(void)
     epicsMutexCleanup();
 }
 
-epicsShareFunc void epicsExitCallAtThreadExits(void)
+LIBCOM_API void epicsExitCallAtThreadExits(void)
 {
     exitPvt * pep;
 
@@ -148,7 +147,7 @@ static int epicsAtExitPvt(exitPvt *pep, epicsExitFunc func, void *arg, const cha
     return status;
 }
 
-epicsShareFunc int epicsAtThreadExit(epicsExitFunc func, void *arg)
+LIBCOM_API int epicsAtThreadExit(epicsExitFunc func, void *arg)
 {
     exitPvt * pep;
 
@@ -164,7 +163,7 @@ epicsShareFunc int epicsAtThreadExit(epicsExitFunc func, void *arg)
     return epicsAtExitPvt ( pep, func, arg, NULL );
 }
 
-epicsShareFunc int epicsAtExit3(epicsExitFunc func, void *arg, const char* name)
+LIBCOM_API int epicsAtExit3(epicsExitFunc func, void *arg, const char* name)
 {
     int status = -1;
 
@@ -180,7 +179,7 @@ epicsShareFunc int epicsAtExit3(epicsExitFunc func, void *arg, const char* name)
     return status;
 }
 
-epicsShareFunc void epicsExit(int status)
+LIBCOM_API void epicsExit(int status)
 {
     epicsExitCallAtExits();
     epicsThreadSleep(0.1);
@@ -202,7 +201,7 @@ static void exitLaterOnceFunc(void *raw)
                       &exitNow, NULL);
 }
 
-epicsShareFunc void epicsExitLater(int status)
+LIBCOM_API void epicsExitLater(int status)
 {
     epicsThreadOnce(&exitLaterOnce, &exitLaterOnceFunc, &status);
 }
diff --git a/modules/libcom/src/misc/epicsExit.h b/modules/libcom/src/misc/epicsExit.h
index 3e961cb..53abb81 100644
--- a/modules/libcom/src/misc/epicsExit.h
+++ b/modules/libcom/src/misc/epicsExit.h
@@ -9,7 +9,7 @@
 /*epicsExit.h*/
 #ifndef epicsExith
 #define epicsExith
-#include <shareLib.h>
+#include <libComAPI.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -17,14 +17,14 @@ extern "C" {
 
 typedef void (*epicsExitFunc)(void *arg);
 
-epicsShareFunc void epicsExit(int status);
-epicsShareFunc void epicsExitLater(int status);
-epicsShareFunc void epicsExitCallAtExits(void);
-epicsShareFunc int epicsAtExit3(epicsExitFunc func, void *arg, const char* name);
+LIBCOM_API void epicsExit(int status);
+LIBCOM_API void epicsExitLater(int status);
+LIBCOM_API void epicsExitCallAtExits(void);
+LIBCOM_API int epicsAtExit3(epicsExitFunc func, void *arg, const char* name);
 #define epicsAtExit(F,A) epicsAtExit3(F,A,#F)
 
-epicsShareFunc void epicsExitCallAtThreadExits(void);
-epicsShareFunc int epicsAtThreadExit(epicsExitFunc func, void *arg);
+LIBCOM_API void epicsExitCallAtThreadExits(void);
+LIBCOM_API int epicsAtThreadExit(epicsExitFunc func, void *arg);
 
 
 #ifdef __cplusplus
diff --git a/modules/libcom/src/misc/epicsStdlib.c b/modules/libcom/src/misc/epicsStdlib.c
index f434898..328f519 100644
--- a/modules/libcom/src/misc/epicsStdlib.c
+++ b/modules/libcom/src/misc/epicsStdlib.c
@@ -13,7 +13,6 @@
 #include <errno.h>
 #include <float.h>
 
-#define epicsExportSharedSymbols
 #include "epicsMath.h"
 #include "epicsStdlib.h"
 #include "epicsString.h"
@@ -22,7 +21,7 @@
 
 /* These are the conversion primitives */
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseLong(const char *str, long *to, int base, char **units)
 {
     int c;
@@ -53,7 +52,7 @@ epicsParseLong(const char *str, long *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseULong(const char *str, unsigned long *to, int base, char **units)
 {
     int c;
@@ -84,7 +83,7 @@ epicsParseULong(const char *str, unsigned long *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseLLong(const char *str, long long *to, int base, char **units)
 {
     int c;
@@ -115,7 +114,7 @@ epicsParseLLong(const char *str, long long *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseULLong(const char *str, unsigned long long *to, int base, char **units)
 {
     int c;
@@ -146,7 +145,7 @@ epicsParseULLong(const char *str, unsigned long long *to, int base, char **units
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseDouble(const char *str, double *to, char **units)
 {
     int c;
@@ -178,7 +177,7 @@ epicsParseDouble(const char *str, double *to, char **units)
 
 /* These call the primitives */
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseInt8(const char *str, epicsInt8 *to, int base, char **units)
 {
     long value;
@@ -194,7 +193,7 @@ epicsParseInt8(const char *str, epicsInt8 *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseUInt8(const char *str, epicsUInt8 *to, int base, char **units)
 {
     unsigned long value;
@@ -210,7 +209,7 @@ epicsParseUInt8(const char *str, epicsUInt8 *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseInt16(const char *str, epicsInt16 *to, int base, char **units)
 {
     long value;
@@ -226,7 +225,7 @@ epicsParseInt16(const char *str, epicsInt16 *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseUInt16(const char *str, epicsUInt16 *to, int base, char **units)
 {
     unsigned long value;
@@ -242,7 +241,7 @@ epicsParseUInt16(const char *str, epicsUInt16 *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseInt32(const char *str, epicsInt32 *to, int base, char **units)
 {
     long value;
@@ -260,7 +259,7 @@ epicsParseInt32(const char *str, epicsInt32 *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseUInt32(const char *str, epicsUInt32 *to, int base, char **units)
 {
     unsigned long value;
@@ -278,7 +277,7 @@ epicsParseUInt32(const char *str, epicsUInt32 *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseInt64(const char *str, epicsInt64 *to, int base, char **units)
 {
 #if (LONG_MAX == 0x7fffffffffffffffLL)
@@ -296,7 +295,7 @@ epicsParseInt64(const char *str, epicsInt64 *to, int base, char **units)
     return 0;
 }
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseUInt64(const char *str, epicsUInt64 *to, int base, char **units)
 {
 #if (ULONG_MAX == 0xffffffffffffffffULL)
@@ -315,7 +314,7 @@ epicsParseUInt64(const char *str, epicsUInt64 *to, int base, char **units)
 }
 
 
-epicsShareFunc int
+LIBCOM_API int
 epicsParseFloat(const char *str, float *to, char **units)
 {
     double value, abs;
@@ -339,11 +338,11 @@ epicsParseFloat(const char *str, float *to, char **units)
  *   #define epicsStrtod strtod
  *
  * If strtod() is broken, osdStrtod.h defines this prototype:
- *   epicsShareFunc double epicsStrtod(const char *str, char **endp);
+ *   LIBCOM_API double epicsStrtod(const char *str, char **endp);
  */
 
 #ifndef epicsStrtod
-epicsShareFunc double
+LIBCOM_API double
 epicsStrtod(const char *str, char **endp)
 {
     const char *cp = str;
diff --git a/modules/libcom/src/misc/epicsStdlib.h b/modules/libcom/src/misc/epicsStdlib.h
index 20b7cd2..7d4c293 100644
--- a/modules/libcom/src/misc/epicsStdlib.h
+++ b/modules/libcom/src/misc/epicsStdlib.h
@@ -15,7 +15,7 @@
 #include <stdlib.h>
 #include <limits.h>
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "osdStrtod.h"
 #include "epicsTypes.h"
 #include "errMdef.h"
@@ -31,37 +31,37 @@ extern "C" {
 #define S_stdlib_badBase      (M_stdlib | 5) /* Number base not supported */
 
 
-epicsShareFunc int
+LIBCOM_API int
     epicsParseLong(const char *str, long *to, int base, char **units);
-epicsShareFunc int
+LIBCOM_API int
     epicsParseULong(const char *str, unsigned long *to, int base, char **units);
-epicsShareFunc int
+LIBCOM_API int
     epicsParseLLong(const char *str, long long *to, int base, char **units);
-epicsShareFunc int
+LIBCOM_API int
     epicsParseULLong(const char *str, unsigned long long *to, int base, char **units);
-epicsShareFunc int
+LIBCOM_API int
     epicsParseDouble(const char *str, double *to, char **units);
 
-epicsShareFunc int
+LIBCOM_API int
     epicsParseFloat(const char *str, float *to, char **units);
 
-epicsShareFunc int
+LIBCOM_API int
     epicsParseInt8(const char *str, epicsInt8 *to, int base, char **units);
-epicsShareFunc int
+LIBCOM_API int
     epicsParseUInt8(const char *str, epicsUInt8 *to, int base, char **units);
-epicsShareFunc int
+LIBCOM_API int
     epicsParseInt16(const char *str, epicsInt16 *to, int base, char **units);
-epicsShareFunc int
+LIBCOM_API int
     epicsParseUInt16(const char *str, epicsUInt16 *to, int base, char **units);
 
-epicsShareFunc int
+LIBCOM_API int
     epicsParseInt32(const char *str, epicsInt32 *to, int base, char **units);
-epicsShareFunc int
+LIBCOM_API int
     epicsParseUInt32(const char *str, epicsUInt32 *to, int base, char **units);
 
-epicsShareFunc int
+LIBCOM_API int
     epicsParseInt64(const char *str, epicsInt64 *to, int base, char **units);
-epicsShareFunc int
+LIBCOM_API int
     epicsParseUInt64(const char *str, epicsUInt64 *to, int base, char **units);
 
 #define epicsParseFloat32(str, to, units) epicsParseFloat(str, to, units)
diff --git a/modules/libcom/src/misc/epicsString.c b/modules/libcom/src/misc/epicsString.c
index e41e21b..3f537b4 100644
--- a/modules/libcom/src/misc/epicsString.c
+++ b/modules/libcom/src/misc/epicsString.c
@@ -22,7 +22,6 @@
 #include <errno.h>
 #include <ctype.h>
 
-#define epicsExportSharedSymbols
 #include "epicsStdio.h"
 #include "cantProceed.h"
 #include "epicsString.h"
diff --git a/modules/libcom/src/misc/epicsString.h b/modules/libcom/src/misc/epicsString.h
index 093c73d..79e5f49 100644
--- a/modules/libcom/src/misc/epicsString.h
+++ b/modules/libcom/src/misc/epicsString.h
@@ -17,32 +17,32 @@
 
 #include <stdio.h>
 #include "epicsTypes.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-epicsShareFunc int epicsStrnRawFromEscaped(char *outbuf,      size_t outsize,
+LIBCOM_API int epicsStrnRawFromEscaped(char *outbuf,      size_t outsize,
                                            const char *inbuf, size_t inlen);
-epicsShareFunc int epicsStrnEscapedFromRaw(char *outbuf,      size_t outsize,
+LIBCOM_API int epicsStrnEscapedFromRaw(char *outbuf,      size_t outsize,
                                            const char *inbuf, size_t inlen);
-epicsShareFunc size_t epicsStrnEscapedFromRawSize(const char *buf, size_t len);
-epicsShareFunc int epicsStrCaseCmp(const char *s1, const char *s2);
-epicsShareFunc int epicsStrnCaseCmp(const char *s1, const char *s2, size_t len);
-epicsShareFunc char * epicsStrDup(const char *s);
-epicsShareFunc char * epicsStrnDup(const char *s, size_t len);
-epicsShareFunc int epicsStrPrintEscaped(FILE *fp, const char *s, size_t n);
+LIBCOM_API size_t epicsStrnEscapedFromRawSize(const char *buf, size_t len);
+LIBCOM_API int epicsStrCaseCmp(const char *s1, const char *s2);
+LIBCOM_API int epicsStrnCaseCmp(const char *s1, const char *s2, size_t len);
+LIBCOM_API char * epicsStrDup(const char *s);
+LIBCOM_API char * epicsStrnDup(const char *s, size_t len);
+LIBCOM_API int epicsStrPrintEscaped(FILE *fp, const char *s, size_t n);
 #define epicsStrSnPrintEscaped epicsStrnEscapedFromRaw
-epicsShareFunc size_t epicsStrnLen(const char *s, size_t maxlen);
-epicsShareFunc int epicsStrGlobMatch(const char *str, const char *pattern);
-epicsShareFunc char * epicsStrtok_r(char *s, const char *delim, char **lasts);
-epicsShareFunc unsigned int epicsStrHash(const char *str, unsigned int seed);
-epicsShareFunc unsigned int epicsMemHash(const char *str, size_t length,
+LIBCOM_API size_t epicsStrnLen(const char *s, size_t maxlen);
+LIBCOM_API int epicsStrGlobMatch(const char *str, const char *pattern);
+LIBCOM_API char * epicsStrtok_r(char *s, const char *delim, char **lasts);
+LIBCOM_API unsigned int epicsStrHash(const char *str, unsigned int seed);
+LIBCOM_API unsigned int epicsMemHash(const char *str, size_t length,
                                          unsigned int seed);
 
 /* dbTranslateEscape is deprecated, use epicsStrnRawFromEscaped instead */
-epicsShareFunc int dbTranslateEscape(char *s, const char *ct);
+LIBCOM_API int dbTranslateEscape(char *s, const char *ct);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/misc/epicsTypes.h b/modules/libcom/src/misc/epicsTypes.h
index efc6a91..399cb96 100644
--- a/modules/libcom/src/misc/epicsTypes.h
+++ b/modules/libcom/src/misc/epicsTypes.h
@@ -15,7 +15,7 @@
 #ifndef INC_epicsTypes_H
 #define INC_epicsTypes_H
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "compilerDependencies.h"
 
 #ifndef stringOf
@@ -120,7 +120,7 @@ typedef enum {
  * of type name strings.
  */
 #ifdef epicsTypesGLOBAL
-epicsShareDef const char *epicsTypeNames [lastEpicsType+1] = {
+const char *epicsTypeNames [lastEpicsType+1] = {
     "epicsInt8",
     "epicsUInt8",
     "epicsInt16",
@@ -134,7 +134,7 @@ epicsShareDef const char *epicsTypeNames [lastEpicsType+1] = {
     "epicsOldString",
 };
 #else /* epicsTypesGLOBAL */
-epicsShareExtern const char *epicsTypeNames [lastEpicsType+1];
+LIBCOM_API extern const char *epicsTypeNames [lastEpicsType+1];
 #endif /* epicsTypesGLOBAL */
 
 /*
@@ -142,7 +142,7 @@ epicsShareExtern const char *epicsTypeNames [lastEpicsType+1];
  * of type code name strings.
  */
 #ifdef epicsTypesGLOBAL
-epicsShareDef const char *epicsTypeCodeNames [lastEpicsType+1] = {
+const char *epicsTypeCodeNames [lastEpicsType+1] = {
     "epicsInt8T",
     "epicsUInt8T",
     "epicsInt16T",
@@ -156,11 +156,11 @@ epicsShareDef const char *epicsTypeCodeNames [lastEpicsType+1] = {
     "epicsOldStringT",
 };
 #else /* epicsTypesGLOBAL */
-epicsShareExtern const char *epicsTypeCodeNames [lastEpicsType+1];
+LIBCOM_API extern const char *epicsTypeCodeNames [lastEpicsType+1];
 #endif /* epicsTypesGLOBAL */
 
 #ifdef epicsTypesGLOBAL
-epicsShareDef const unsigned epicsTypeSizes [lastEpicsType+1] = {
+const unsigned epicsTypeSizes [lastEpicsType+1] = {
     sizeof (epicsInt8),
     sizeof (epicsUInt8),
     sizeof (epicsInt16),
@@ -174,7 +174,7 @@ epicsShareDef const unsigned epicsTypeSizes [lastEpicsType+1] = {
     sizeof (epicsOldString),
 };
 #else /* epicsTypesGLOBAL */
-epicsShareExtern const unsigned epicsTypeSizes [lastEpicsType+1];
+LIBCOM_API extern const unsigned epicsTypeSizes [lastEpicsType+1];
 #endif /* epicsTypesGLOBAL */
 
 /*
@@ -191,7 +191,7 @@ typedef enum {
 } epicsTypeClass;
 
 #ifdef epicsTypesGLOBAL
-epicsShareDef const epicsTypeClass epicsTypeClasses [lastEpicsType+1] = {
+const epicsTypeClass epicsTypeClasses [lastEpicsType+1] = {
     epicsIntC,
     epicsUIntC,
     epicsIntC,
@@ -205,12 +205,12 @@ epicsShareDef const epicsTypeClass epicsTypeClasses [lastEpicsType+1] = {
     epicsOldStringC
 };
 #else /* epicsTypesGLOBAL */
-epicsShareExtern const epicsTypeClass epicsTypeClasses [lastEpicsType+1];
+LIBCOM_API extern const epicsTypeClass epicsTypeClasses [lastEpicsType+1];
 #endif /* epicsTypesGLOBAL */
 
 
 #ifdef epicsTypesGLOBAL
-epicsShareDef const char *epicsTypeAnyFieldName [lastEpicsType+1] = {
+const char *epicsTypeAnyFieldName [lastEpicsType+1] = {
     "int8",
     "uInt8",
     "int16",
@@ -224,7 +224,7 @@ epicsShareDef const char *epicsTypeAnyFieldName [lastEpicsType+1] = {
     "", /* Old Style Strings will not be in epicsAny type */
 };
 #else /* epicsTypesGLOBAL */
-epicsShareExtern const char *epicsTypeAnyFieldName [lastEpicsType+1];
+LIBCOM_API extern const char *epicsTypeAnyFieldName [lastEpicsType+1];
 #endif /* epicsTypesGLOBAL */
 
 #endif /* INC_epicsTypes_H */
diff --git a/modules/libcom/src/misc/epicsUnitTest.c b/modules/libcom/src/misc/epicsUnitTest.c
index dce0598..2478989 100644
--- a/modules/libcom/src/misc/epicsUnitTest.c
+++ b/modules/libcom/src/misc/epicsUnitTest.c
@@ -20,7 +20,6 @@
 #  include <crtdbg.h>
 #endif
 
-#define epicsExportSharedSymbols
 #include "epicsThread.h"
 #include "epicsMutex.h"
 #include "epicsUnitTest.h"
diff --git a/modules/libcom/src/misc/epicsUnitTest.h b/modules/libcom/src/misc/epicsUnitTest.h
index 9a119ad..88555e0 100644
--- a/modules/libcom/src/misc/epicsUnitTest.h
+++ b/modules/libcom/src/misc/epicsUnitTest.h
@@ -15,36 +15,36 @@
 #include <stdarg.h>
 
 #include "compilerDependencies.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-epicsShareFunc void testPlan(int tests);
-epicsShareFunc int  testOkV(int pass, const char *fmt, va_list pvar);
-epicsShareFunc int  testOk(int pass, const char *fmt, ...)
+LIBCOM_API void testPlan(int tests);
+LIBCOM_API int  testOkV(int pass, const char *fmt, va_list pvar);
+LIBCOM_API int  testOk(int pass, const char *fmt, ...)
 						EPICS_PRINTF_STYLE(2, 3);
-epicsShareFunc void testPass(const char *fmt, ...)
+LIBCOM_API void testPass(const char *fmt, ...)
 						EPICS_PRINTF_STYLE(1, 2);
-epicsShareFunc void testFail(const char *fmt, ...)
+LIBCOM_API void testFail(const char *fmt, ...)
 						EPICS_PRINTF_STYLE(1, 2);
-epicsShareFunc void testSkip(int skip, const char *why);
-epicsShareFunc void testTodoBegin(const char *why);
-epicsShareFunc void testTodoEnd(void);
-epicsShareFunc int  testDiag(const char *fmt, ...)
+LIBCOM_API void testSkip(int skip, const char *why);
+LIBCOM_API void testTodoBegin(const char *why);
+LIBCOM_API void testTodoEnd(void);
+LIBCOM_API int  testDiag(const char *fmt, ...)
 						EPICS_PRINTF_STYLE(1, 2);
-epicsShareFunc void testAbort(const char *fmt, ...)
+LIBCOM_API void testAbort(const char *fmt, ...)
 						EPICS_PRINTF_STYLE(1, 2);
-epicsShareFunc int  testDone(void);
+LIBCOM_API int  testDone(void);
 
 #define testOk1(cond) testOk(cond, "%s", #cond)
 
 
 typedef int (*TESTFUNC)(void);
-epicsShareFunc void testHarness(void);
-epicsShareFunc void testHarnessExit(void *dummy);
-epicsShareFunc void runTestFunc(const char *name, TESTFUNC func);
+LIBCOM_API void testHarness(void);
+LIBCOM_API void testHarnessExit(void *dummy);
+LIBCOM_API void runTestFunc(const char *name, TESTFUNC func);
 
 #define runTest(func) runTestFunc(#func, func)
 #define testHarnessDone() testHarnessExit(0)
diff --git a/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp b/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp
index ec2c16d..4698a7a 100644
--- a/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp
+++ b/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.cpp
@@ -21,7 +21,6 @@
 //#define EPICS_FREELIST_DEBUG
 #define EPICS_PRIVATE_API
 
-#define epicsExportSharedSymbols
 #include "ipAddrToAsciiAsynchronous.h"
 #include "epicsThread.h"
 #include "epicsMutex.h"
diff --git a/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.h b/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.h
index 9aefca4..64a0efa 100644
--- a/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.h
+++ b/modules/libcom/src/misc/ipAddrToAsciiAsynchronous.h
@@ -17,16 +17,16 @@
 #define ipAddrToAsciiAsynchronous_h
 
 #include "osiSock.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
-class epicsShareClass ipAddrToAsciiCallBack {
+class LIBCOM_API ipAddrToAsciiCallBack {
 public:
     virtual void transactionComplete ( const char * pHostName ) = 0;
     virtual void show ( unsigned level ) const; 
     virtual ~ipAddrToAsciiCallBack () = 0;
 };
 
-class epicsShareClass ipAddrToAsciiTransaction {
+class LIBCOM_API ipAddrToAsciiTransaction {
 public:
     virtual void release () = 0; 
     virtual void ipAddrToAscii ( const osiSockAddr &, ipAddrToAsciiCallBack & ) = 0;
@@ -36,7 +36,7 @@ protected:
     virtual ~ipAddrToAsciiTransaction () = 0;
 };
 
-class epicsShareClass ipAddrToAsciiEngine {
+class LIBCOM_API ipAddrToAsciiEngine {
 public:
     virtual void release () = 0; 
     virtual ipAddrToAsciiTransaction & createTransaction () = 0;
diff --git a/modules/libcom/src/misc/shareLib.h b/modules/libcom/src/misc/shareLib.h
index 0d376d6..6935cdc 100644
--- a/modules/libcom/src/misc/shareLib.h
+++ b/modules/libcom/src/misc/shareLib.h
@@ -87,8 +87,8 @@
  *
  * #ifdef interfacePDQ_epicsExportSharedSymbols
  * #   define epicsExportSharedSymbols
- * #   include "shareLib.h"
  * #endif
+ * #include "shareLib.h"
  *
  * epicsShareFunc int myExtFunc ( int arg );
  * epicsShareExtern int myExtVar;
diff --git a/modules/libcom/src/misc/truncateFile.c b/modules/libcom/src/misc/truncateFile.c
index dc074d9..4271867 100644
--- a/modules/libcom/src/misc/truncateFile.c
+++ b/modules/libcom/src/misc/truncateFile.c
@@ -14,7 +14,6 @@
 #include <string.h>
 #include <limits.h>
 
-#define epicsExportSharedSymbols
 #include "epicsStdio.h"
 
 #ifndef SEEK_END
@@ -25,7 +24,7 @@
  * truncate to specified size (we dont use truncate()
  * because it is not portable)
  */
-epicsShareFunc enum TF_RETURN  truncateFile (const char *pFileName, unsigned long size)
+LIBCOM_API enum TF_RETURN  truncateFile (const char *pFileName, unsigned long size)
 {
 	long filePos;
 	FILE *pFile;
diff --git a/modules/libcom/src/misc/unixFileName.h b/modules/libcom/src/misc/unixFileName.h
index 9d7af25..0abfae3 100644
--- a/modules/libcom/src/misc/unixFileName.h
+++ b/modules/libcom/src/misc/unixFileName.h
@@ -14,7 +14,7 @@
 #ifndef unixFileNameH
 #define unixFileNameH
 
-#include <shareLib.h>
+#include <libComAPI.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -26,13 +26,13 @@ extern "C" {
 /** Return the absolute path of the current executable.
  @returns NULL or the path.  Caller must free()
  */
-epicsShareFunc
+LIBCOM_API
 char *epicsGetExecName(void);
 
 /** Return the absolute path of the directory containing the current executable.
  @returns NULL or the path.  Caller must free()
  */
-epicsShareFunc
+LIBCOM_API
 char *epicsGetExecDir(void);
 
 #ifdef __cplusplus
diff --git a/modules/libcom/src/osi/devLibVME.c b/modules/libcom/src/osi/devLibVME.c
index 6c7d93f..72e29d6 100644
--- a/modules/libcom/src/osi/devLibVME.c
+++ b/modules/libcom/src/osi/devLibVME.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define epicsExportSharedSymbols
 #include "dbDefs.h"
 #include "epicsMutex.h"
 #include "errlog.h"
diff --git a/modules/libcom/src/osi/devLibVME.h b/modules/libcom/src/osi/devLibVME.h
index 4fb17f0..2603770 100644
--- a/modules/libcom/src/osi/devLibVME.h
+++ b/modules/libcom/src/osi/devLibVME.h
@@ -20,7 +20,7 @@
 #include "dbDefs.h"
 #include "osdVME.h"
 #include "errMdef.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "devLib.h"
 
 #ifdef __cplusplus
@@ -44,7 +44,7 @@ typedef enum {
  * pointer to an array of strings for each of
  * the above address types
  */
-epicsShareExtern const char *epicsAddressTypeName[];
+LIBCOM_API extern const char *epicsAddressTypeName[];
 
 #ifdef __cplusplus
 }
@@ -67,14 +67,14 @@ extern "C" {
  *  This section applies to all bus types
  */
 
-epicsShareFunc long devAddressMap(void); /* print an address map */
+LIBCOM_API long devAddressMap(void); /* print an address map */
 
 /*
  * devBusToLocalAddr()
  *
  * OSI routine to translate bus addresses their local CPU address mapping
  */
-epicsShareFunc long devBusToLocalAddr (
+LIBCOM_API long devBusToLocalAddr (
 		epicsAddressType addrType,
 		size_t busAddr,
 		volatile void **ppLocalAddr);
@@ -84,7 +84,7 @@ epicsShareFunc long devBusToLocalAddr (
  * a bus error safe "wordSize" read at the specified address which returns 
  * unsuccessful status if the device isnt present
  */
-epicsShareFunc long devReadProbe (
+LIBCOM_API long devReadProbe (
     unsigned wordSize, volatile const void *ptr, void *pValueRead);
 
 /*
@@ -97,7 +97,7 @@ epicsShareFunc long devReadProbe (
  * Checks all naturally aligned word sizes between char and long for
  * the entire specified range of bytes.
  */
-epicsShareFunc long devNoResponseProbe(
+LIBCOM_API long devNoResponseProbe(
 			epicsAddressType addrType,
 			size_t base,
 			size_t size
@@ -109,17 +109,17 @@ epicsShareFunc long devNoResponseProbe(
  * a bus error safe "wordSize" write at the specified address which returns 
  * unsuccessful status if the device isnt present
  */
-epicsShareFunc long devWriteProbe (
+LIBCOM_API long devWriteProbe (
     unsigned wordSize, volatile void *ptr, const void *pValueWritten);
 
-epicsShareFunc long devRegisterAddress(
+LIBCOM_API long devRegisterAddress(
 			const char *pOwnerName,
 			epicsAddressType addrType,
 			size_t logicalBaseAddress,
 			size_t size, /* bytes */
 			volatile void **pPhysicalAddress);
 
-epicsShareFunc long devUnregisterAddress(
+LIBCOM_API long devUnregisterAddress(
 			epicsAddressType addrType,
 			size_t logicalBaseAddress,
 			const char *pOwnerName);
@@ -127,7 +127,7 @@ epicsShareFunc long devUnregisterAddress(
 /*
  * allocate and register an unoccupied address block
  */
-epicsShareFunc long devAllocAddress(
+LIBCOM_API long devAllocAddress(
 			const char *pOwnerName,
 			epicsAddressType addrType,
 			size_t size,
@@ -143,7 +143,7 @@ epicsShareFunc long devAllocAddress(
 /*
  * connect ISR to a VME interrupt vector
  */
-epicsShareFunc long devConnectInterruptVME(
+LIBCOM_API long devConnectInterruptVME(
 			unsigned vectorNumber,
 			void (*pFunction)(void *),
 			void  *parameter);
@@ -155,7 +155,7 @@ epicsShareFunc long devConnectInterruptVME(
  * was connected. It is used as a key to prevent a driver from inadvertently
  * removing an interrupt handler that it didn't install 
  */
-epicsShareFunc long devDisconnectInterruptVME(
+LIBCOM_API long devDisconnectInterruptVME(
 			unsigned vectorNumber,
 			void (*pFunction)(void *));
 
@@ -164,25 +164,25 @@ epicsShareFunc long devDisconnectInterruptVME(
  *
  * returns boolean
  */
-epicsShareFunc int devInterruptInUseVME (unsigned vectorNumber);
+LIBCOM_API int devInterruptInUseVME (unsigned vectorNumber);
 
 /*
  * enable VME interrupt level
  */
-epicsShareFunc long devEnableInterruptLevelVME (unsigned level);
+LIBCOM_API long devEnableInterruptLevelVME (unsigned level);
 
 /*
  * disable VME interrupt level
  */
-epicsShareFunc long devDisableInterruptLevelVME (unsigned level);
+LIBCOM_API long devDisableInterruptLevelVME (unsigned level);
 
 /*
  * Routines to allocate and free memory in the A24 memory region.
  *
  */
-epicsShareFunc void *devLibA24Malloc(size_t);
-epicsShareFunc void *devLibA24Calloc(size_t);
-epicsShareFunc void devLibA24Free(void *pBlock);
+LIBCOM_API void *devLibA24Malloc(size_t);
+LIBCOM_API void *devLibA24Calloc(size_t);
+LIBCOM_API void devLibA24Free(void *pBlock);
 
 /*
  * ISA API
@@ -195,7 +195,7 @@ epicsShareFunc void devLibA24Free(void *pBlock);
  * (not implemented)
  * (API should be reviewed)
  */
-epicsShareFunc long devConnectInterruptISA(
+LIBCOM_API long devConnectInterruptISA(
 			unsigned interruptLevel,
 			void (*pFunction)(void *),
 			void  *parameter);
@@ -209,7 +209,7 @@ epicsShareFunc long devConnectInterruptISA(
  * was connected. It is used as a key to prevent a driver from inadvertently
  * removing an interrupt handler that it didn't install 
  */
-epicsShareFunc long devDisconnectInterruptISA(
+LIBCOM_API long devDisconnectInterruptISA(
 			unsigned interruptLevel,
 			void (*pFunction)(void *));
 
@@ -219,17 +219,17 @@ epicsShareFunc long devDisconnectInterruptISA(
  *
  * returns boolean
  */
-epicsShareFunc int devInterruptLevelInUseISA (unsigned interruptLevel);
+LIBCOM_API int devInterruptLevelInUseISA (unsigned interruptLevel);
 
 /*
  * enable ISA interrupt level
  */
-epicsShareFunc long devEnableInterruptLevelISA (unsigned level);
+LIBCOM_API long devEnableInterruptLevelISA (unsigned level);
 
 /*
  * disable ISA interrupt level
  */
-epicsShareFunc long devDisableInterruptLevelISA (unsigned level);
+LIBCOM_API long devDisableInterruptLevelISA (unsigned level);
 
 /*
  * Deprecated interface
@@ -247,7 +247,7 @@ typedef enum {intVME, intVXI, intISA} epicsInterruptType;
  * devConnectInterruptISA etc. devConnectInterrupt will be removed 
  * in a future release.
  */
-epicsShareFunc long devConnectInterrupt(
+LIBCOM_API long devConnectInterrupt(
 			epicsInterruptType intType,
 			unsigned vectorNumber,
 			void (*pFunction)(void *),
@@ -261,7 +261,7 @@ epicsShareFunc long devConnectInterrupt(
  * devDisconnectInterruptISA etc. devDisconnectInterrupt will be removed 
  * in a future release.
  */
-epicsShareFunc long devDisconnectInterrupt(
+LIBCOM_API long devDisconnectInterrupt(
 			epicsInterruptType      intType,
 			unsigned                vectorNumber,
 			void		        (*pFunction)(void *));
@@ -274,7 +274,7 @@ epicsShareFunc long devDisconnectInterrupt(
  * devEnableInterruptLevelISA etc. devEnableInterruptLevel will be removed 
  * in a future release.
  */
-epicsShareFunc long devEnableInterruptLevel(
+LIBCOM_API long devEnableInterruptLevel(
     epicsInterruptType intType, unsigned level);
 
 /*
@@ -285,7 +285,7 @@ epicsShareFunc long devEnableInterruptLevel(
  * devDisableInterruptLevelPCI etc. devDisableInterruptLevel will be removed 
  * in a future release.
  */
-epicsShareFunc long devDisableInterruptLevel (
+LIBCOM_API long devDisableInterruptLevel (
     epicsInterruptType intType, unsigned level);
 
 /*
@@ -295,7 +295,7 @@ epicsShareFunc long devDisableInterruptLevel (
  * Please use devNoResponseProbe(). locationProbe() will be removed 
  * in a future release.
  */
-epicsShareFunc long locationProbe (epicsAddressType addrType, char *pLocation);
+LIBCOM_API long locationProbe (epicsAddressType addrType, char *pLocation);
 
 #endif /* NO_DEVLIB_OLD_INTERFACE */
 
diff --git a/modules/libcom/src/osi/devLibVMEImpl.h b/modules/libcom/src/osi/devLibVMEImpl.h
index e479d86..e8312ea 100644
--- a/modules/libcom/src/osi/devLibVMEImpl.h
+++ b/modules/libcom/src/osi/devLibVMEImpl.h
@@ -20,7 +20,7 @@
 #define INCdevLibImplh 1
 
 #include "dbDefs.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "devLib.h"
 
 #ifdef __cplusplus
@@ -89,7 +89,7 @@ typedef struct devLibVME {
 	int (*pDevInterruptInUseVME) (unsigned vectorNumber);
 }devLibVME;
 
-epicsShareExtern devLibVME *pdevLibVME;
+LIBCOM_API extern devLibVME *pdevLibVME;
 
 #ifndef NO_DEVLIB_COMPAT
 #  define pdevLibVirtualOS pdevLibVME
diff --git a/modules/libcom/src/osi/epicsAssert.h b/modules/libcom/src/osi/epicsAssert.h
index 6f83d3a..2c88de0 100644
--- a/modules/libcom/src/osi/epicsAssert.h
+++ b/modules/libcom/src/osi/epicsAssert.h
@@ -16,7 +16,7 @@
 #ifndef INC_epicsAssert_H
 #define INC_epicsAssert_H
 
-#include "shareLib.h"
+#include "libComAPI.h"
 #include "compilerDependencies.h"
 
 #ifdef __cplusplus
@@ -34,7 +34,7 @@ extern "C" {
 #   define assert(ignore) ((void) 0)
 #else /* NDEBUG */
 
-epicsShareFunc void epicsAssert (const char *pFile, const unsigned line,
+LIBCOM_API void epicsAssert (const char *pFile, const unsigned line,
     const char *pExp, const char *pAuthorName);
 
 #   define assert(exp) ((exp) ? (void)0 : \
diff --git a/modules/libcom/src/osi/epicsAtomicDefault.h b/modules/libcom/src/osi/epicsAtomicDefault.h
index 26115ce..9ae98ef 100644
--- a/modules/libcom/src/osi/epicsAtomicDefault.h
+++ b/modules/libcom/src/osi/epicsAtomicDefault.h
@@ -22,10 +22,10 @@ extern "C" {
 
 /*
  * struct EpicsAtomicLockKey;
- * epicsShareFunc void epicsAtomicReadMemoryBarrier ();
- * epicsShareFunc void epicsAtomicWriteMemoryBarrier ();
- * epicsShareFunc void epicsAtomicLock ( struct EpicsAtomicLockKey * );
- * epicsShareFunc void epicsAtomicUnock ( struct EpicsAtomicLockKey * );
+ * LIBCOM_API void epicsAtomicReadMemoryBarrier ();
+ * LIBCOM_API void epicsAtomicWriteMemoryBarrier ();
+ * LIBCOM_API void epicsAtomicLock ( struct EpicsAtomicLockKey * );
+ * LIBCOM_API void epicsAtomicUnock ( struct EpicsAtomicLockKey * );
  */
 
 /*
diff --git a/modules/libcom/src/osi/epicsEvent.cpp b/modules/libcom/src/osi/epicsEvent.cpp
index 237f7d2..7baec77 100644
--- a/modules/libcom/src/osi/epicsEvent.cpp
+++ b/modules/libcom/src/osi/epicsEvent.cpp
@@ -13,7 +13,6 @@
 #include <new>
 #include <exception>
 
-#define epicsExportSharedSymbols
 #include "epicsEvent.h"
 #include "epicsStdio.h"
 #include "cantProceed.h"
@@ -104,7 +103,7 @@ void epicsEvent::show ( unsigned level ) const
 
 extern "C" {
 
-epicsShareFunc epicsEventId epicsEventMustCreate (
+LIBCOM_API epicsEventId epicsEventMustCreate (
     epicsEventInitialState initialState)
 {
     epicsEventId id = epicsEventCreate (initialState);
@@ -114,14 +113,14 @@ epicsShareFunc epicsEventId epicsEventMustCreate (
     return id;
 }
 
-epicsShareFunc void epicsEventMustTrigger (epicsEventId id) {
+LIBCOM_API void epicsEventMustTrigger (epicsEventId id) {
     epicsEventStatus status = epicsEventTrigger (id);
 
     if (status != epicsEventOK)
         cantProceed ("epicsEventMustTrigger");
 }
 
-epicsShareFunc void epicsEventMustWait (epicsEventId id) {
+LIBCOM_API void epicsEventMustWait (epicsEventId id) {
     epicsEventStatus status = epicsEventWait (id);
 
     if (status != epicsEventOK)
diff --git a/modules/libcom/src/osi/epicsEvent.h b/modules/libcom/src/osi/epicsEvent.h
index e77d9a5..8a5eef2 100644
--- a/modules/libcom/src/osi/epicsEvent.h
+++ b/modules/libcom/src/osi/epicsEvent.h
@@ -9,7 +9,7 @@
 #ifndef epicsEventh
 #define epicsEventh
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 typedef struct epicsEventOSD *epicsEventId;
 
@@ -31,7 +31,7 @@ typedef enum {
 
 #ifdef __cplusplus
 
-class epicsShareClass epicsEvent {
+class LIBCOM_API epicsEvent {
 public:
     epicsEvent ( epicsEventInitialState initial = epicsEventEmpty );
     ~epicsEvent ();
@@ -52,23 +52,23 @@ private:
 extern "C" {
 #endif /*__cplusplus */
 
-epicsShareFunc epicsEventId epicsEventCreate(
+LIBCOM_API epicsEventId epicsEventCreate(
     epicsEventInitialState initialState);
-epicsShareFunc epicsEventId epicsEventMustCreate (
+LIBCOM_API epicsEventId epicsEventMustCreate (
     epicsEventInitialState initialState);
-epicsShareFunc void epicsEventDestroy(epicsEventId id);
-epicsShareFunc epicsEventStatus epicsEventTrigger(
+LIBCOM_API void epicsEventDestroy(epicsEventId id);
+LIBCOM_API epicsEventStatus epicsEventTrigger(
     epicsEventId id);
-epicsShareFunc void epicsEventMustTrigger(epicsEventId id);
+LIBCOM_API void epicsEventMustTrigger(epicsEventId id);
 #define epicsEventSignal(ID) epicsEventMustTrigger(ID)
-epicsShareFunc epicsEventStatus epicsEventWait(
+LIBCOM_API epicsEventStatus epicsEventWait(
     epicsEventId id);
-epicsShareFunc void epicsEventMustWait(epicsEventId id);
-epicsShareFunc epicsEventStatus epicsEventWaitWithTimeout(
+LIBCOM_API void epicsEventMustWait(epicsEventId id);
+LIBCOM_API epicsEventStatus epicsEventWaitWithTimeout(
     epicsEventId id, double timeOut);
-epicsShareFunc epicsEventStatus epicsEventTryWait(
+LIBCOM_API epicsEventStatus epicsEventTryWait(
     epicsEventId id);
-epicsShareFunc void epicsEventShow(
+LIBCOM_API void epicsEventShow(
     epicsEventId id, unsigned int level);
 
 #ifdef __cplusplus
diff --git a/modules/libcom/src/osi/epicsFindSymbol.h b/modules/libcom/src/osi/epicsFindSymbol.h
index 9935834..e457004 100644
--- a/modules/libcom/src/osi/epicsFindSymbol.h
+++ b/modules/libcom/src/osi/epicsFindSymbol.h
@@ -13,11 +13,11 @@
 extern "C" {
 #endif
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
-epicsShareFunc void * epicsLoadLibrary(const char *name);
-epicsShareFunc const char *epicsLoadError(void);
-epicsShareFunc void * epicsShareAPI epicsFindSymbol(const char *name);
+LIBCOM_API void * epicsLoadLibrary(const char *name);
+LIBCOM_API const char *epicsLoadError(void);
+LIBCOM_API void * LIBCOMSTD_API epicsFindSymbol(const char *name);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/osi/epicsGeneralTime.c b/modules/libcom/src/osi/epicsGeneralTime.c
index 87158d9..9735307 100644
--- a/modules/libcom/src/osi/epicsGeneralTime.c
+++ b/modules/libcom/src/osi/epicsGeneralTime.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#define epicsExportSharedSymbols
 #include "epicsTypes.h"
 #include "epicsEvent.h"
 #include "epicsMutex.h"
@@ -150,7 +149,7 @@ int generalTimeGetExceptPriority(epicsTimeStamp *pDest, int *pPrio, int ignore)
     return status;
 }
 
-int epicsShareAPI epicsTimeGetCurrent(epicsTimeStamp *pDest)
+int LIBCOMSTD_API epicsTimeGetCurrent(epicsTimeStamp *pDest)
 {
     gtProvider *ptp;
     int status = S_time_noProvider;
@@ -339,7 +338,7 @@ static int generalTimeGetEventPriority(epicsTimeStamp *pDest, int eventNumber,
     return status;
 }
 
-int epicsShareAPI epicsTimeGetEvent(epicsTimeStamp *pDest, int eventNumber)
+int LIBCOMSTD_API epicsTimeGetEvent(epicsTimeStamp *pDest, int eventNumber)
 {
     if (eventNumber == epicsTimeEventCurrentTime) {
         return epicsTimeGetCurrent(pDest);
diff --git a/modules/libcom/src/osi/epicsGeneralTime.h b/modules/libcom/src/osi/epicsGeneralTime.h
index 6bbb0b2..c6eda8c 100644
--- a/modules/libcom/src/osi/epicsGeneralTime.h
+++ b/modules/libcom/src/osi/epicsGeneralTime.h
@@ -10,7 +10,7 @@
 #ifndef INC_epicsGeneralTime_H
 #define INC_epicsGeneralTime_H
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -23,22 +23,22 @@ extern "C" {
 /* NUM_TIME_EVENTS are now allowed if supported by a custom time provider */
 /* which should provide its own advancing timestamp validation. */
 
-epicsShareFunc void generalTime_Init(void);
+LIBCOM_API void generalTime_Init(void);
 
-epicsShareFunc int  installLastResortEventProvider(void);
+LIBCOM_API int  installLastResortEventProvider(void);
 
-epicsShareFunc void generalTimeResetErrorCounts(void);
-epicsShareFunc int  generalTimeGetErrorCounts(void);
+LIBCOM_API void generalTimeResetErrorCounts(void);
+LIBCOM_API int  generalTimeGetErrorCounts(void);
 
-epicsShareFunc const char * generalTimeCurrentProviderName(void);
-epicsShareFunc const char * generalTimeEventProviderName(void);
-epicsShareFunc const char * generalTimeHighestCurrentName(void);
+LIBCOM_API const char * generalTimeCurrentProviderName(void);
+LIBCOM_API const char * generalTimeEventProviderName(void);
+LIBCOM_API const char * generalTimeHighestCurrentName(void);
 
 /* Original names, for compatibility */
 #define generalTimeCurrentTpName generalTimeCurrentProviderName
 #define generalTimeEventTpName generalTimeEventProviderName
 
-epicsShareFunc long generalTimeReport(int interest);
+LIBCOM_API long generalTimeReport(int interest);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/osi/epicsInterrupt.h b/modules/libcom/src/osi/epicsInterrupt.h
index 93b4438..b536f0a 100644
--- a/modules/libcom/src/osi/epicsInterrupt.h
+++ b/modules/libcom/src/osi/epicsInterrupt.h
@@ -13,12 +13,12 @@
 extern "C" {
 #endif
 
-#include "shareLib.h"
+#include "libComAPI.h"
 
-epicsShareFunc int epicsInterruptLock(void);
-epicsShareFunc void epicsInterruptUnlock(int key);
-epicsShareFunc int epicsInterruptIsInterruptContext(void);
-epicsShareFunc void epicsInterruptContextMessage(const char *message);
+LIBCOM_API int epicsInterruptLock(void);
+LIBCOM_API void epicsInterruptUnlock(int key);
+LIBCOM_API int epicsInterruptIsInterruptContext(void);
+LIBCOM_API void epicsInterruptContextMessage(const char *message);
 
 #ifdef __cplusplus
 }
diff --git a/modules/libcom/src/osi/epicsMath.cpp b/modules/libcom/src/osi/epicsMath.cpp
index 1388e65..3cfca0a 100644
--- a/modules/libcom/src/osi/epicsMath.cpp
+++ b/modules/libcom/src/osi/epicsMath.cpp
@@ -6,7 +6,6 @@
 \*************************************************************************/
 /* epicsMath.cpp */
 
-#define epicsExportSharedSymbols
 #include <epicsMath.h>
 
 #ifdef _MSC_VER
@@ -33,8 +32,8 @@ static float makeINF ( void )
 #endif
 
 extern "C" {
-epicsShareDef float epicsNAN = NAN;
-epicsShareDef float epicsINF = INFINITY;
+float epicsNAN = NAN;
+float epicsINF = INFINITY;
 }
 
 #ifdef _MSC_VER
diff --git a/modules/libcom/src/osi/epicsMessageQueue.cpp b/modules/libcom/src/osi/epicsMessageQueue.cpp
index 1527b3d..b5c1ad9 100644
--- a/modules/libcom/src/osi/epicsMessageQueue.cpp
+++ b/modules/libcom/src/osi/epicsMessageQueue.cpp
@@ -15,7 +15,6 @@
 
 #include <new>
 
-#define epicsExportSharedSymbols
 #include "epicsMessageQueue.h"
 #include "epicsStdio.h"
 
diff --git a/modules/libcom/src/osi/epicsMessageQueue.h b/modules/libcom/src/osi/epicsMessageQueue.h
index c6a98fd..9bd7fbd 100644
--- a/modules/libcom/src/osi/epicsMessageQueue.h
+++ b/modules/libcom/src/osi/epicsMessageQueue.h
@@ -20,13 +20,13 @@
 #define epicsMessageQueueh
 
 #include "epicsAssert.h"
-#include "shareLib.h"
+#include "libComAPI.h"
 
 typedef struct epicsMessageQueueOSD *epicsMessageQueueId;
 
 #ifdef __cplusplus
 
-class epicsShareClass epicsMessageQueue {
+class LIBCOM_API epicsMessageQueue {
 public:
     epicsMessageQueue ( unsigned int capacity,
                         unsigned int maximumMessageSize );
@@ -52,40 +52,40 @@ private: /* Prevent compiler-generated member functions */
 extern "C" {
 #endif /*__cplusplus */
 
-epicsShareFunc epicsMessageQueueId epicsShareAPI epicsMessageQueueCreate(
+LIBCOM_API epicsMessageQueueId LIBCOMSTD_API epicsMessageQueueCreate(
     unsigned int capacity,
     unsigned int maximumMessageSize);
-epicsShareFunc void epicsShareAPI epicsMessageQueueDestroy(
+LIBCOM_API void LIBCOMSTD_API epicsMessageQueueDestroy(
     epicsMessageQueueId id);
-epicsShareFunc int epicsShareAPI epicsMessageQueueTrySend(
+LIBCOM_API int LIBCOMSTD_API epicsMessageQueueTrySend(
     epicsMessageQueueId id,
     void *message,
     unsigned int messageSize);
-epicsShareFunc int epicsShareAPI epicsMessageQueueSend(
+LIBCOM_API int LIBCOMSTD_API epicsMessageQueueSend(
     epicsMessageQueueId id,
     void *message,
     unsigned int messageSize);
-epicsShareFunc int epicsShareAPI epicsMessageQueueSendWithTimeout(
+LIBCOM_API int LIBCOMSTD_API epicsMessageQueueSendWithTimeout(
     epicsMessageQueueId id,
     void *message,
     unsigned int messageSize,
     double timeout);
-epicsShareFunc int epicsShareAPI epicsMessageQueueTryReceive(
+LIBCOM_API int LIBCOMSTD_API epicsMessageQueueTryReceive(
     epicsMessageQueueId id,
     void *message,
     unsigned int size);
-epicsShareFunc int epicsShareAPI epicsMessageQueueReceive(
+LIBCOM_API int LIBCOMSTD_API epicsMessageQueueReceive(
     epicsMessageQueueId id,
     void *message,
     unsigned int size);
-epicsShareFunc int epicsShareAPI epicsMessageQueueReceiveWithTimeout(
+LIBCOM_API int LIBCOMSTD_API epicsMessageQueueReceiveWithTimeout(
     epicsMessageQueueId id,
     void *message,
     unsigned int size,
     double timeout);
-epicsShareFunc int epicsShareAPI epicsMessageQueuePending(
+LIBCOM_API int LIBCOMSTD_API epicsMessageQueuePending(
     epicsMessageQueueId id);
-epicsShareFunc void epicsShareAPI epicsMessageQueueShow(
+LIBCOM_API void LIBCOMSTD_API epicsMessageQueueShow(
     epicsMessageQueueId id,
     int level);
 
diff --git a/modules/libcom/src/osi/epicsMutex.cpp b/modules/libcom/src/osi/epicsMutex.cpp
index 0354311..6d20536 100644
--- a/modules/libcom/src/osi/epicsMutex.cpp
+++ b/modules/libcom/src/osi/epicsMutex.cpp
@@ -25,7 +25,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#define epicsExportSharedSymbols
 #include "epicsStdio.h"
 #include "epicsThread.h"
 #include "valgrind/valgrind.h"
@@ -83,7 +82,7 @@ static void epicsMutexOsiInit(void *) {
     epicsMutexGlobalLock = epicsMutexOsdCreate();
 }
 
-epicsMutexId epicsShareAPI epicsMutexOsiCreate(
+epicsMutexId LIBCOMSTD_API epicsMutexOsiCreate(
     const char *pFileName,int lineno)
 {
     epicsMutexOSD * id;
@@ -117,7 +116,7 @@ epicsMutexId epicsShareAPI epicsMutexOsiCreate(
     return(pmutexNode);
 }
 
-epicsMutexId epicsShareAPI epicsMutexOsiMustCreate(
+epicsMutexId LIBCOMSTD_API epicsMutexOsiMustCreate(
     const char *pFileName,int lineno)
 {
     epicsMutexId id = epicsMutexOsiCreate(pFileName,lineno);
@@ -125,7 +124,7 @@ epicsMutexId epicsShareAPI epicsMutexOsiMustCreate(
     return(id );
 }
 
-void epicsShareAPI epicsMutexDestroy(epicsMutexId pmutexNode)
+void LIBCOMSTD_API epicsMutexDestroy(epicsMutexId pmutexNode)
 {
     epicsMutexLockStatus lockStat =
         epicsMutexOsdLock(epicsMutexGlobalLock);
@@ -138,12 +137,12 @@ void epicsShareAPI epicsMutexDestroy(epicsMutexId pmutexNode)
     epicsMutexOsdUnlock(epicsMutexGlobalLock);
 }
 
-void epicsShareAPI epicsMutexUnlock(epicsMutexId pmutexNode)
+void LIBCOMSTD_API epicsMutexUnlock(epicsMutexId pmutexNode)
 {
     epicsMutexOsdUnlock(pmutexNode->id);
 }
 
-epicsMutexLockStatus epicsShareAPI epicsMutexLock(
+epicsMutexLockStatus LIBCOMSTD_API epicsMutexLock(
     epicsMutexId pmutexNode)
 {
     epicsMutexLockStatus status = 
@@ -156,7 +155,7 @@ epicsMutexLockStatus epicsShareAPI epicsMutexLock(
     return status;
 }