diff --git a/src/libCom/calc/calcPerform.c b/src/libCom/calc/calcPerform.c
index 5eae8843a..d77a2a2db 100644
--- a/src/libCom/calc/calcPerform.c
+++ b/src/libCom/calc/calcPerform.c
@@ -41,11 +41,10 @@
 #include	<stddef.h>
 #include	<stdio.h>
 #include	<string.h>
-#include	"epicsMath.h"
-
-#include	"dbDefs.h"
 
 #define epicsExportSharedSymbols
+#include	"dbDefs.h"
+#include	"epicsMath.h"
 #include	"postfix.h"
 #include	"postfixPvt.h"
 
diff --git a/src/libCom/env/envSubr.c b/src/libCom/env/envSubr.c
index 65086a247..256672e31 100644
--- a/src/libCom/env/envSubr.c
+++ b/src/libCom/env/envSubr.c
@@ -41,8 +41,6 @@
 #include <string.h>
 #include <limits.h>
 
-#include "shareLib.h"
-
 #define epicsExportSharedSymbols
 #include "errMdef.h"
 #include "envDefs.h"
diff --git a/src/libCom/macLib/macCore.c b/src/libCom/macLib/macCore.c
index f63758dee..c30d697a8 100644
--- a/src/libCom/macLib/macCore.c
+++ b/src/libCom/macLib/macCore.c
@@ -45,9 +45,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "errlog.h"
 
 #define epicsExportSharedSymbols
+#include "errlog.h"
 #include "dbmf.h"
 #include "macLib.h"
 
diff --git a/src/libCom/macLib/macUtil.c b/src/libCom/macLib/macUtil.c
index e87e8ba4a..65bfd2aed 100644
--- a/src/libCom/macLib/macUtil.c
+++ b/src/libCom/macLib/macUtil.c
@@ -18,9 +18,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "errlog.h"
 
 #define epicsExportSharedSymbols
+#include "errlog.h"
 #include "macLib.h"
 
 /*
diff --git a/src/libCom/misc/epicsString.c b/src/libCom/misc/epicsString.c
index fa09cc277..02d18fcba 100644
--- a/src/libCom/misc/epicsString.c
+++ b/src/libCom/misc/epicsString.c
@@ -16,10 +16,10 @@
 #include <limits.h>
 #include <errno.h>
 #include <ctype.h>
-#include "epicsStdio.h"
-#include "cantProceed.h"
 
 #define epicsExportSharedSymbols
+#include "epicsStdio.h"
+#include "cantProceed.h"
 #include "epicsString.h"
 
 epicsShareFunc int epicsShareAPI dbTranslateEscape(char *to, const char *from)
diff --git a/src/libCom/osi/epicsStdio.c b/src/libCom/osi/epicsStdio.c
index 18a5da6d7..ae163234d 100644
--- a/src/libCom/osi/epicsStdio.c
+++ b/src/libCom/osi/epicsStdio.c
@@ -17,12 +17,11 @@
 #include <fcntl.h>
 #include <errno.h>
 
+#define epicsExportSharedSymbols
 #define epicsStdioh
 #include "shareLib.h"
 #include "epicsThread.h"
-
 #undef epicsStdioh
-#define epicsExportSharedSymbols
 #define epicsStdioPVT
 #include "epicsStdio.h"
 
diff --git a/src/libCom/osi/os/default/epicsReadline.c b/src/libCom/osi/os/default/epicsReadline.c
index 25fcea5c3..51061313e 100644
--- a/src/libCom/osi/os/default/epicsReadline.c
+++ b/src/libCom/osi/os/default/epicsReadline.c
@@ -10,10 +10,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include "envDefs.h"
 
 #define epicsExportSharedSymbols
-
+#include "envDefs.h"
 #include "epicsReadline.h"
 
 #define EPICS_COMMANDLINE_LIBRARY_EPICS     0