diff --git a/sys/arch/mips/include/ecoff.h b/sys/arch/mips/include/ecoff.h
index f63c2ab3b91c..c0f30e17077f 100644
--- a/sys/arch/mips/include/ecoff.h
+++ b/sys/arch/mips/include/ecoff.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ecoff.h,v 1.3 1994/10/26 21:09:38 cgd Exp $	*/
+/*	$NetBSD: ecoff.h,v 1.4 1995/06/16 02:07:33 mellon Exp $	*/
 
 /*
  * Copyright (c) 1994 Adam Glass
@@ -41,6 +41,6 @@
         u_long ea_gp_value
 
 #define ECOFF_MAGIC_MIPSEL 0x0162
-#define ECOFF_BADMAG(ex) (ex->ef_magic != ECOFF_MAGIC_MIPSEL)
+#define ECOFF_BADMAG(ex) ((ex)->ef_magic != ECOFF_MAGIC_MIPSEL)
 
-#define ECOFF_SEGMENT_ALIGNMENT(eap) (eap->ea_vstamp < 23 ? 8 : 16)
+#define ECOFF_SEGMENT_ALIGNMENT(eap) ((eap)->ea_vstamp < 23 ? 8 : 16)
diff --git a/sys/arch/mips/include/ecoff_machdep.h b/sys/arch/mips/include/ecoff_machdep.h
index f6b7bd521cfc..e9558098bee3 100644
--- a/sys/arch/mips/include/ecoff_machdep.h
+++ b/sys/arch/mips/include/ecoff_machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ecoff_machdep.h,v 1.3 1994/10/26 21:09:38 cgd Exp $	*/
+/*	$NetBSD: ecoff_machdep.h,v 1.4 1995/06/16 02:07:33 mellon Exp $	*/
 
 /*
  * Copyright (c) 1994 Adam Glass
@@ -41,6 +41,6 @@
         u_long ea_gp_value
 
 #define ECOFF_MAGIC_MIPSEL 0x0162
-#define ECOFF_BADMAG(ex) (ex->ef_magic != ECOFF_MAGIC_MIPSEL)
+#define ECOFF_BADMAG(ex) ((ex)->ef_magic != ECOFF_MAGIC_MIPSEL)
 
-#define ECOFF_SEGMENT_ALIGNMENT(eap) (eap->ea_vstamp < 23 ? 8 : 16)
+#define ECOFF_SEGMENT_ALIGNMENT(eap) ((eap)->ea_vstamp < 23 ? 8 : 16)
diff --git a/sys/arch/pmax/include/ecoff.h b/sys/arch/pmax/include/ecoff.h
index f63c2ab3b91c..c0f30e17077f 100644
--- a/sys/arch/pmax/include/ecoff.h
+++ b/sys/arch/pmax/include/ecoff.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ecoff.h,v 1.3 1994/10/26 21:09:38 cgd Exp $	*/
+/*	$NetBSD: ecoff.h,v 1.4 1995/06/16 02:07:33 mellon Exp $	*/
 
 /*
  * Copyright (c) 1994 Adam Glass
@@ -41,6 +41,6 @@
         u_long ea_gp_value
 
 #define ECOFF_MAGIC_MIPSEL 0x0162
-#define ECOFF_BADMAG(ex) (ex->ef_magic != ECOFF_MAGIC_MIPSEL)
+#define ECOFF_BADMAG(ex) ((ex)->ef_magic != ECOFF_MAGIC_MIPSEL)
 
-#define ECOFF_SEGMENT_ALIGNMENT(eap) (eap->ea_vstamp < 23 ? 8 : 16)
+#define ECOFF_SEGMENT_ALIGNMENT(eap) ((eap)->ea_vstamp < 23 ? 8 : 16)
diff --git a/sys/arch/pmax/include/ecoff_machdep.h b/sys/arch/pmax/include/ecoff_machdep.h
index f6b7bd521cfc..e9558098bee3 100644
--- a/sys/arch/pmax/include/ecoff_machdep.h
+++ b/sys/arch/pmax/include/ecoff_machdep.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: ecoff_machdep.h,v 1.3 1994/10/26 21:09:38 cgd Exp $	*/
+/*	$NetBSD: ecoff_machdep.h,v 1.4 1995/06/16 02:07:33 mellon Exp $	*/
 
 /*
  * Copyright (c) 1994 Adam Glass
@@ -41,6 +41,6 @@
         u_long ea_gp_value
 
 #define ECOFF_MAGIC_MIPSEL 0x0162
-#define ECOFF_BADMAG(ex) (ex->ef_magic != ECOFF_MAGIC_MIPSEL)
+#define ECOFF_BADMAG(ex) ((ex)->ef_magic != ECOFF_MAGIC_MIPSEL)
 
-#define ECOFF_SEGMENT_ALIGNMENT(eap) (eap->ea_vstamp < 23 ? 8 : 16)
+#define ECOFF_SEGMENT_ALIGNMENT(eap) ((eap)->ea_vstamp < 23 ? 8 : 16)
diff --git a/sys/sys/exec_ecoff.h b/sys/sys/exec_ecoff.h
index 521acf6c5fc0..848169504a5b 100644
--- a/sys/sys/exec_ecoff.h
+++ b/sys/sys/exec_ecoff.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: exec_ecoff.h,v 1.6 1995/03/26 20:24:09 jtc Exp $	*/
+/*	$NetBSD: exec_ecoff.h,v 1.7 1995/06/16 02:07:56 mellon Exp $	*/
 
 /*
  * Copyright (c) 1994 Adam Glass
@@ -83,19 +83,19 @@ struct ecoff_scnhdr {		/* needed for size info */
         (((value) + by - 1) & ~(by - 1))
 
 #define ECOFF_BLOCK_ALIGN(eap, value) \
-        (eap->ea_magic == ECOFF_ZMAGIC ? ECOFF_ROUND(value, ECOFF_LDPGSZ) : \
+        ((eap)->ea_magic == ECOFF_ZMAGIC ? ECOFF_ROUND(value, ECOFF_LDPGSZ) : \
 	 value)
 
 #define ECOFF_TXTOFF(efp, eap) \
-        (eap->ea_magic == ECOFF_ZMAGIC ? 0 : \
-	 ECOFF_ROUND(ECOFF_HDR_SIZE + efp->ef_nsecs * \
+        ((eap)->ea_magic == ECOFF_ZMAGIC ? 0 : \
+	 ECOFF_ROUND(ECOFF_HDR_SIZE + (efp)->ef_nsecs * \
 		     sizeof(struct ecoff_scnhdr),ECOFF_SEGMENT_ALIGNMENT(eap)))
 
 #define ECOFF_DATOFF(efp, eap) \
-        (ECOFF_BLOCK_ALIGN(eap, ECOFF_TXTOFF(efp, eap) + eap->ea_tsize))
+        (ECOFF_BLOCK_ALIGN(eap, ECOFF_TXTOFF(efp, eap) + (eap)->ea_tsize))
 
 #define ECOFF_SEGMENT_ALIGN(eap, value) \
-        (ECOFF_ROUND(value, (eap->ea_magic == ECOFF_ZMAGIC ? ECOFF_LDPGSZ : \
+        (ECOFF_ROUND(value, ((eap)->ea_magic == ECOFF_ZMAGIC ? ECOFF_LDPGSZ : \
          ECOFF_SEGMENT_ALIGNMENT(eap))))
 
 #ifdef _KERNEL