diff --git a/src/libCom/calc/calcPerform.c b/src/libCom/calc/calcPerform.c
index 085831f7f..37db40128 100644
--- a/src/libCom/calc/calcPerform.c
+++ b/src/libCom/calc/calcPerform.c
@@ -108,8 +108,9 @@
 #include	<stdio.h>
 #include	<string.h>
 #include	<math.h>
-#include	"dbDefs.h"
+
 #define epicsExportSharedSymbols
+#include	"dbDefs.h"
 #include	"post.h"
 
 static double	local_random();
diff --git a/src/libCom/calc/postfix.c b/src/libCom/calc/postfix.c
index e7ed805a8..47d2d7454 100644
--- a/src/libCom/calc/postfix.c
+++ b/src/libCom/calc/postfix.c
@@ -98,8 +98,8 @@
 #include	<string.h>
 #include	<ctype.h>
 
-#include	"dbDefs.h"
 #define epicsExportSharedSymbols
+#include	"dbDefs.h"
 #include	"post.h"
 
 
@@ -303,7 +303,7 @@ register short		*pno_bytes;
  *
  * convert an infix expression to a postfix expression
  */
-long postfix(char *pinfix,char *ppostfix,short *perror)
+long epicsShareAPI postfix(char *pinfix,char *ppostfix,short *perror)
 {
 	short		no_bytes;
 	register short	operand_needed;
diff --git a/src/libCom/calcPerform.c b/src/libCom/calcPerform.c
index 085831f7f..37db40128 100644
--- a/src/libCom/calcPerform.c
+++ b/src/libCom/calcPerform.c
@@ -108,8 +108,9 @@
 #include	<stdio.h>
 #include	<string.h>
 #include	<math.h>
-#include	"dbDefs.h"
+
 #define epicsExportSharedSymbols
+#include	"dbDefs.h"
 #include	"post.h"
 
 static double	local_random();
diff --git a/src/libCom/dbmf.c b/src/libCom/dbmf.c
index b26c5f05c..93ffda5ab 100644
--- a/src/libCom/dbmf.c
+++ b/src/libCom/dbmf.c
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
-#include "ellLib.h"
 
 #ifdef vxWorks
 #include <vxWorks.h>
@@ -24,6 +23,7 @@
 #endif
 
 #define epicsExportSharedSymbols
+#include "ellLib.h"
 #include "dbmf.h"
 
 /*Default values for dblfInit */
diff --git a/src/libCom/dbmf/dbmf.c b/src/libCom/dbmf/dbmf.c
index b26c5f05c..93ffda5ab 100644
--- a/src/libCom/dbmf/dbmf.c
+++ b/src/libCom/dbmf/dbmf.c
@@ -9,7 +9,6 @@
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdio.h>
-#include "ellLib.h"
 
 #ifdef vxWorks
 #include <vxWorks.h>
@@ -24,6 +23,7 @@
 #endif
 
 #define epicsExportSharedSymbols
+#include "ellLib.h"
 #include "dbmf.h"
 
 /*Default values for dblfInit */
diff --git a/src/libCom/post.h b/src/libCom/post.h
index 17cfa9dc3..511ab1c0d 100644
--- a/src/libCom/post.h
+++ b/src/libCom/post.h
@@ -34,7 +34,6 @@
  * .07  05-11-94        jba     added CONST_PI, CONST_D2R, and CONST_R2D
  */
 
-#include "shareLib.h"
 
 /*	defines for element table      */
 #define 	FETCH_A		0
@@ -115,8 +114,4 @@
 #define		NINT		75
 #define		END_STACK	127
 
-epicsShareFunc long epicsShareAPI 
-	calcPerform(double *parg, double *presult, char *post);
 
-epicsShareFunc long epicsShareAPI 
-	postfix(char *pinfix, char *ppostfix, short *perror);
diff --git a/src/libCom/postfix.c b/src/libCom/postfix.c
index e7ed805a8..47d2d7454 100644
--- a/src/libCom/postfix.c
+++ b/src/libCom/postfix.c
@@ -98,8 +98,8 @@
 #include	<string.h>
 #include	<ctype.h>
 
-#include	"dbDefs.h"
 #define epicsExportSharedSymbols
+#include	"dbDefs.h"
 #include	"post.h"
 
 
@@ -303,7 +303,7 @@ register short		*pno_bytes;
  *
  * convert an infix expression to a postfix expression
  */
-long postfix(char *pinfix,char *ppostfix,short *perror)
+long epicsShareAPI postfix(char *pinfix,char *ppostfix,short *perror)
 {
 	short		no_bytes;
 	register short	operand_needed;