diff --git a/src/std/dev/devBiDbState.c b/src/std/dev/devBiDbState.c
index 54d929373..c0d7120b2 100644
--- a/src/std/dev/devBiDbState.c
+++ b/src/std/dev/devBiDbState.c
@@ -16,8 +16,8 @@
 #include "recGbl.h"
 #include "dbLink.h"
 #include "dbAccessDefs.h"
-#include "epicsExport.h"
 #include "biRecord.h"
+#include "epicsExport.h"
 
 #define DEVSUPNAME "devBiDbState"
 
diff --git a/src/std/dev/devBoDbState.c b/src/std/dev/devBoDbState.c
index b2e8c493f..26e97ae5b 100644
--- a/src/std/dev/devBoDbState.c
+++ b/src/std/dev/devBoDbState.c
@@ -15,8 +15,8 @@
 #include "devSup.h"
 #include "recGbl.h"
 #include "dbAccessDefs.h"
-#include "epicsExport.h"
 #include "boRecord.h"
+#include "epicsExport.h"
 
 #define DEVSUPNAME "devBoDbState"
 
diff --git a/src/std/dev/devGeneralTime.c b/src/std/dev/devGeneralTime.c
index 4c42a80f4..c656c85db 100644
--- a/src/std/dev/devGeneralTime.c
+++ b/src/std/dev/devGeneralTime.c
@@ -24,12 +24,12 @@
 #include "devSup.h"
 #include "epicsString.h"
 #include "epicsGeneralTime.h"
-#include "epicsExport.h"
 
 #include "aiRecord.h"
 #include "boRecord.h"
 #include "longinRecord.h"
 #include "stringinRecord.h"
+#include "epicsExport.h"
 
 
 /********* ai record **********/
diff --git a/src/std/dev/devSoStdio.c b/src/std/dev/devSoStdio.c
index c720f7e4e..e7a2f738a 100644
--- a/src/std/dev/devSoStdio.c
+++ b/src/std/dev/devSoStdio.c
@@ -15,9 +15,8 @@
 #include "errlog.h"
 #include "recGbl.h"
 #include "recSup.h"
-#include "epicsExport.h"
-
 #include "stringoutRecord.h"
+#include "epicsExport.h"
 
 typedef int (*PRINTFFUNC)(const char *fmt, ...);
 
diff --git a/src/std/dev/devTimestamp.c b/src/std/dev/devTimestamp.c
index f8de440c4..203d7f708 100644
--- a/src/std/dev/devTimestamp.c
+++ b/src/std/dev/devTimestamp.c
@@ -17,10 +17,10 @@
 #include "alarm.h"
 #include "devSup.h"
 #include "recGbl.h"
-#include "epicsExport.h"
 
 #include "aiRecord.h"
 #include "stringinRecord.h"
+#include "epicsExport.h"
 
 
 /* Extended device support to allow INP field changes */
diff --git a/src/std/rec/aSubRecord.c b/src/std/rec/aSubRecord.c
index 1c033b3ba..540a3fb3b 100644
--- a/src/std/rec/aSubRecord.c
+++ b/src/std/rec/aSubRecord.c
@@ -32,12 +32,11 @@
 #include "devSup.h"
 #include "special.h"
 #include "registryFunction.h"
-#include "epicsExport.h"
 #include "recGbl.h"
-
 #define GEN_SIZE_OFFSET
 #include "aSubRecord.h"
 #undef  GEN_SIZE_OFFSET
+#include "epicsExport.h"
 
 
 typedef long (*GENFUNCPTR)(struct aSubRecord *);