diff --git a/src/AsynDriverInterface.cc b/src/AsynDriverInterface.cc
index 3f264ce..ee872e3 100644
--- a/src/AsynDriverInterface.cc
+++ b/src/AsynDriverInterface.cc
@@ -21,6 +21,14 @@
 #include "StreamError.h"
 #include "StreamBuffer.h"
 
+#include "asynDriver.h"
+#include "asynOctet.h"
+#include "asynInt32.h"
+#include "asynUInt32Digital.h"
+#include "asynGpibDriver.h"
+
+#include "devStream.h"
+
 #ifdef EPICS_3_13
 #include <assert.h>
 #include <wdLib.h>
@@ -36,13 +44,6 @@ extern "C" {
 #include "iocsh.h"
 #endif
 
-#include "asynDriver.h"
-#include "asynOctet.h"
-#include "asynInt32.h"
-#include "asynUInt32Digital.h"
-#include "asynGpibDriver.h"
-
-#include "devStream.h"
 #include "MacroMagic.h"
 
 #define Z PRINTF_SIZE_T_PREFIX
diff --git a/src/StreamEpics.cc b/src/StreamEpics.cc
index c60cf16..65ba73d 100644
--- a/src/StreamEpics.cc
+++ b/src/StreamEpics.cc
@@ -65,6 +65,7 @@ extern DBBASE *pdbbase;
 #include "registryFunction.h"
 #include "epicsStdioRedirect.h"
 #include "iocsh.h"
+#include "epicsExport.h"
 
 #if defined(VERSION_INT) || EPICS_MODIFICATION >= 11
 #include "initHooks.h"
@@ -85,8 +86,6 @@ extern "C" epicsShareFunc int epicsShareAPI iocshCmd(const char *command);
 #include <sysSymTbl.h>
 #endif
 
-#include "epicsExport.h"
-
 #include "devStream.h"
 
 #define Z PRINTF_SIZE_T_PREFIX