diff --git a/src/ca/caProto.h b/src/ca/caProto.h
index e179af004..fa5d7163d 100644
--- a/src/ca/caProto.h
+++ b/src/ca/caProto.h
@@ -35,37 +35,37 @@
  * CA protocol number
  * TCP/UDP port number (bumped each major protocol change) 
  */
-#define CA_PROTOCOL_VERSION 4u
-#define CA_MINOR_VERSION    8u
-#define CA_VERSION_STRING   "4.8"
+#define CA_PROTOCOL_VERSION     4u
+#define CA_MINOR_VERSION        8u
+#define CA_VERSION_STRING       "4.8"
 #define CA_UKN_MINOR_VERSION    0u /* unknown minor version */
 #if CA_PROTOCOL_VERSION == 4u
-#define CA_V41(MAJOR,MINOR) ((MINOR)>=1u) 
-#define CA_V42(MAJOR,MINOR) ((MINOR)>=2u)
-#define CA_V43(MAJOR,MINOR) ((MINOR)>=3u)
-#define CA_V44(MAJOR,MINOR) ((MINOR)>=4u)
-#define CA_V45(MAJOR,MINOR) ((MINOR)>=5u)
-#define CA_V46(MAJOR,MINOR) ((MINOR)>=6u)
-#define CA_V47(MAJOR,MINOR) ((MINOR)>=7u)
-#define CA_V48(MAJOR,MINOR) ((MINOR)>=8u)
+#   define CA_V41(MAJOR,MINOR) ((MINOR)>=1u) 
+#   define CA_V42(MAJOR,MINOR) ((MINOR)>=2u)
+#   define CA_V43(MAJOR,MINOR) ((MINOR)>=3u)
+#   define CA_V44(MAJOR,MINOR) ((MINOR)>=4u)
+#   define CA_V45(MAJOR,MINOR) ((MINOR)>=5u)
+#   define CA_V46(MAJOR,MINOR) ((MINOR)>=6u)
+#   define CA_V47(MAJOR,MINOR) ((MINOR)>=7u)
+#   define CA_V48(MAJOR,MINOR) ((MINOR)>=8u)
 #elif CA_PROTOCOL_VERSION > 4u
-#define CA_V41(MAJOR,MINOR) ( 1u )
-#define CA_V42(MAJOR,MINOR) ( 1u )
-#define CA_V43(MAJOR,MINOR) ( 1u )
-#define CA_V44(MAJOR,MINOR) ( 1u )
-#define CA_V45(MAJOR,MINOR) ( 1u )
-#define CA_V46(MAJOR,MINOR) ( 1u )
-#define CA_V47(MAJOR,MINOR) ( 1u )
-#define CA_V48(MAJOR,MINOR) ( 1u )
+#   define CA_V41(MAJOR,MINOR) ( 1u )
+#   define CA_V42(MAJOR,MINOR) ( 1u )
+#   define CA_V43(MAJOR,MINOR) ( 1u )
+#   define CA_V44(MAJOR,MINOR) ( 1u )
+#   define CA_V45(MAJOR,MINOR) ( 1u )
+#   define CA_V46(MAJOR,MINOR) ( 1u )
+#   define CA_V47(MAJOR,MINOR) ( 1u )
+#   define CA_V48(MAJOR,MINOR) ( 1u )
 #else
-#define CA_V41(MAJOR,MINOR) ( 0u )
-#define CA_V42(MAJOR,MINOR) ( 0u )
-#define CA_V43(MAJOR,MINOR) ( 0u )
-#define CA_V44(MAJOR,MINOR) ( 0u )
-#define CA_V45(MAJOR,MINOR) ( 0u )
-#define CA_V46(MAJOR,MINOR) ( 0u )
-#define CA_V47(MAJOR,MINOR) ( 0u )
-#define CA_V48(MAJOR,MINOR) ( 0u )
+#   define CA_V41(MAJOR,MINOR) ( 0u )
+#   define CA_V42(MAJOR,MINOR) ( 0u )
+#   define CA_V43(MAJOR,MINOR) ( 0u )
+#   define CA_V44(MAJOR,MINOR) ( 0u )
+#   define CA_V45(MAJOR,MINOR) ( 0u )
+#   define CA_V46(MAJOR,MINOR) ( 0u )
+#   define CA_V47(MAJOR,MINOR) ( 0u )
+#   define CA_V48(MAJOR,MINOR) ( 0u )
 #endif 
 
 /*
diff --git a/src/ca/caeventmask.h b/src/ca/caeventmask.h
index e146e0001..84388ce09 100644
--- a/src/ca/caeventmask.h
+++ b/src/ca/caeventmask.h
@@ -1,9 +1,9 @@
 /*
-	$Id$
-	caeventmask.h
+    $Id$
+    caeventmask.h
 
-	Modification History
-	joh	04-16-90	Created
+    Modification History
+    joh 04-16-90    Created
 
 */
 
@@ -11,26 +11,26 @@
 #define INCLcaeventmaskh
 
 /*
-	event selections
-	(If any more than 8 of these are needed then update the 
-	select field in the event_block struct in db_event.c from 
-	unsigned char to unsigned short)
+    event selections
+    (If any more than 8 of these are needed then update the 
+    select field in the event_block struct in db_event.c from 
+    unsigned char to unsigned short)
 
 
-	DBE_VALUE 
-	Trigger an event when a significant change in the channel's value
-	occurs. Relies on the monitor deadband field under DCT.
+    DBE_VALUE 
+    Trigger an event when a significant change in the channel's value
+    occurs. Relies on the monitor deadband field under DCT.
 
-	DBE_LOG
-	Trigger an event when an archive significant change in the channel's
-	valuue occurs. Relies on the archiver monitor deadband field under DCT.
+    DBE_LOG
+    Trigger an event when an archive significant change in the channel's
+    valuue occurs. Relies on the archiver monitor deadband field under DCT.
 
-	DBE_ALARM
-	Trigger an event when the alarm state changes
+    DBE_ALARM
+    Trigger an event when the alarm state changes
 
 */
-#define	DBE_VALUE	(1<<0)	
-#define	DBE_LOG		(1<<1)
-#define	DBE_ALARM	(1<<2)	
+#define DBE_VALUE   (1<<0)  
+#define DBE_LOG     (1<<1)
+#define DBE_ALARM   (1<<2)  
 
 #endif