diff --git a/src/AsynDriverInterface.cc b/src/AsynDriverInterface.cc
index 06f4db5..b03663e 100644
--- a/src/AsynDriverInterface.cc
+++ b/src/AsynDriverInterface.cc
@@ -27,19 +27,19 @@
 #include <wdLib.h>
 #include <sysLib.h>
 #else
-#include <epicsAssert.h>
-#include <epicsTime.h>
-#include <epicsTimer.h>
+#include "epicsAssert.h"
+#include "epicsTime.h"
+#include "epicsTimer.h"
 extern "C" {
 #include <callback.h>
 }
 #endif
 
-#include <asynDriver.h>
-#include <asynOctet.h>
-#include <asynInt32.h>
-#include <asynUInt32Digital.h>
-#include <asynGpibDriver.h>
+#include "asynDriver.h"
+#include "asynOctet.h"
+#include "asynInt32.h"
+#include "asynUInt32Digital.h"
+#include "asynGpibDriver.h"
 
 /* How things are implemented:
 
diff --git a/src/ChecksumConverter.cc b/src/ChecksumConverter.cc
index 5676318..59c2cf3 100644
--- a/src/ChecksumConverter.cc
+++ b/src/ChecksumConverter.cc
@@ -20,12 +20,12 @@
 
 #include "StreamFormatConverter.h"
 #include "StreamError.h"
+#include <ctype.h>
 #if defined(__vxworks) || defined(vxWorks) || defined(_WIN32) || defined(__rtems__)
 // These systems have no strncasecmp
-#include <epicsVersion.h>
+#include "epicsVersion.h"
 #ifdef BASE_VERSION
 // 3.13
-#include <ctype.h>
 static int strncasecmp(const char *s1, const char *s2, size_t n)
 {
     int r=0;
@@ -33,11 +33,10 @@ static int strncasecmp(const char *s1, const char *s2, size_t n)
     return r;
 }
 #else
-#include <epicsString.h>
+#include "epicsString.h"
 #define strncasecmp epicsStrnCaseCmp
 #endif
 #endif
-#include <ctype.h>
 
 typedef unsigned int (*checksumFunc)(const unsigned char* data, unsigned int len,  unsigned int init);
 
diff --git a/src/StreamEpics.cc b/src/StreamEpics.cc
index cf6a97e..84482c0 100644
--- a/src/StreamEpics.cc
+++ b/src/StreamEpics.cc
@@ -21,7 +21,7 @@
 #include "StreamCore.h"
 #include "StreamError.h"
 
-#include <epicsVersion.h>
+#include "epicsVersion.h"
 #ifdef BASE_VERSION
 #define EPICS_3_13
 #endif
@@ -31,17 +31,17 @@ extern "C" {
 #endif
 
 #define epicsAlarmGLOBAL
-#include <alarm.h>
+#include "alarm.h"
 #undef epicsAlarmGLOBAL
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
-#include <dbStaticLib.h>
-#include <drvSup.h>
-#include <recSup.h>
-#include <recGbl.h>
-#include <devLib.h>
-#include <callback.h>
+#include "dbStaticLib.h"
+#include "drvSup.h"
+#include "recSup.h"
+#include "recGbl.h"
+#include "devLib.h"
+#include "callback.h"
 
 #ifdef EPICS_3_13
 
@@ -55,14 +55,14 @@ extern DBBASE *pdbbase;
 
 #else
 
-#include <epicsTimer.h>
-#include <epicsMutex.h>
-#include <epicsEvent.h>
-#include <epicsTime.h>
-#include <epicsThread.h>
-#include <epicsString.h>
-#include <registryFunction.h>
-#include <iocsh.h>
+#include "epicsTimer.h"
+#include "epicsMutex.h"
+#include "epicsEvent.h"
+#include "epicsTime.h"
+#include "epicsThread.h"
+#include "epicsString.h"
+#include "registryFunction.h"
+#include "iocsh.h"
 
 #if EPICS_MODIFICATION<9
 extern "C" {
@@ -73,7 +73,7 @@ epicsShareFunc int epicsShareAPI iocshCmd(const char *command);
 }
 #endif
 
-#include <epicsExport.h>
+#include "epicsExport.h"
 
 #endif
 
diff --git a/src/devStream.h b/src/devStream.h
index 3509668..fb344ca 100644
--- a/src/devStream.h
+++ b/src/devStream.h
@@ -40,7 +40,7 @@
 #define DO_NOT_CONVERT 2
 #define INIT_RUN (!interruptAccept)
 
-#include <epicsVersion.h>
+#include "epicsVersion.h"
 #ifdef BASE_VERSION
 #define EPICS_3_13
 #endif
@@ -50,10 +50,10 @@ extern "C" {
 #endif
 
 #include <stdio.h>
-#include <dbCommon.h>
-#include <dbScan.h>
-#include <devSup.h>
-#include <dbAccess.h>
+#include "dbCommon.h"
+#include "dbScan.h"
+#include "devSup.h"
+#include "dbAccess.h"
 
 #if defined(__cplusplus) && defined(EPICS_3_13)
 }