diff --git a/src/ca/client/tools/caget.c b/src/ca/client/tools/caget.c
index ffc4244f0..383a8e1ce 100644
--- a/src/ca/client/tools/caget.c
+++ b/src/ca/client/tools/caget.c
@@ -28,12 +28,12 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "epicsStdlib.h"
-#include "epicsString.h"
+#include <epicsStdlib.h>
+#include <epicsString.h>
 
-#include "alarm.h"
-#include "cadef.h"
-#include "epicsGetopt.h"
+#include <alarm.h>
+#include <cadef.h>
+#include <epicsGetopt.h>
 #include "epicsVersion.h"
 
 #include "tool_lib.h"
@@ -396,8 +396,8 @@ int main (int argc, char *argv[])
         case 'h':               /* Print usage */
             usage();
             return 0;
-    	case 'V':
-			printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
+        case 'V':
+            printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
             return 0;
         case 't':               /* Terse output mode */
             complainIfNotPlainAndSet(&format, terse);
diff --git a/src/ca/client/tools/cainfo.c b/src/ca/client/tools/cainfo.c
index e881ef240..2263249fb 100644
--- a/src/ca/client/tools/cainfo.c
+++ b/src/ca/client/tools/cainfo.c
@@ -22,11 +22,11 @@
  */
 
 #include <stdio.h>
-#include "epicsStdlib.h"
+#include <epicsStdlib.h>
 #include "epicsVersion.h"
 
-#include "cadef.h"
-#include "epicsGetopt.h"
+#include <cadef.h>
+#include <epicsGetopt.h>
 
 #include "tool_lib.h"
 
@@ -145,8 +145,8 @@ int main (int argc, char *argv[])
         case 'h':               /* Print usage */
             usage();
             return 0;
-		case 'V':
-    		printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
+        case 'V':
+            printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
             return 0;
         case 'w':               /* Set CA timeout value */
             if(epicsScanDouble(optarg, &caTimeout) != 1)
diff --git a/src/ca/client/tools/camonitor.c b/src/ca/client/tools/camonitor.c
index 09c965ebb..a3fdecd55 100644
--- a/src/ca/client/tools/camonitor.c
+++ b/src/ca/client/tools/camonitor.c
@@ -24,12 +24,12 @@
  */
 
 #include <stdio.h>
-#include "epicsStdlib.h"
+#include <epicsStdlib.h>
 #include <string.h>
 #include "epicsVersion.h"
 
-#include "cadef.h"
-#include "epicsGetopt.h"
+#include <cadef.h>
+#include <epicsGetopt.h>
 
 #include "tool_lib.h"
 
@@ -216,8 +216,8 @@ int main (int argc, char *argv[])
         case 'h':               /* Print usage */
             usage();
             return 0;
-		case 'V':
-    		printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
+        case 'V':
+            printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
             return 0;
         case 'n':               /* Print ENUM as index numbers */
             enumAsNr=1;
diff --git a/src/ca/client/tools/caput.c b/src/ca/client/tools/caput.c
index a7ea618a6..d6db8ba7f 100644
--- a/src/ca/client/tools/caput.c
+++ b/src/ca/client/tools/caput.c
@@ -31,12 +31,12 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "epicsStdlib.h"
+#include <epicsStdlib.h>
 
-#include "cadef.h"
-#include "epicsGetopt.h"
-#include "epicsEvent.h"
-#include "epicsString.h"
+#include <cadef.h>
+#include <epicsGetopt.h>
+#include <epicsEvent.h>
+#include <epicsString.h>
 #include "epicsVersion.h"
 
 #include "tool_lib.h"
@@ -286,8 +286,8 @@ int main (int argc, char *argv[])
         case 'h':               /* Print usage */
             usage();
             return 0;
-		case 'V':
-    		printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
+        case 'V':
+            printf( "\nEPICS Version %s, CA Protocol version %s\n", EPICS_VERSION_STRING, ca_version() );
             return 0;
         case 'n':               /* Force interpret ENUM as index number */
             enumAsNr = 1;