diff --git a/clients/tools/ldapdelete.c b/clients/tools/ldapdelete.c
index 01c47fe645606ed8aeb05ac8ab4256e097c9ef52..35b3af8fba71a281917202f8a8c1ebcffcb9aea8 100644
--- a/clients/tools/ldapdelete.c
+++ b/clients/tools/ldapdelete.c
@@ -21,7 +21,7 @@ static int	ldapport = 0;
 static int	not, verbose, contoper;
 static LDAP	*ld;
 
-#define safe_realloc( ptr, size )	( ptr == NULL ? malloc( size ) : \
+#define safe_realloc( ptr, size )	( (ptr) == NULL ? malloc( size ) : \
 					 realloc( ptr, size ))
 
 static int dodelete LDAP_P((
diff --git a/clients/tools/ldapmodify.c b/clients/tools/ldapmodify.c
index 7f955623c95a4176b10808f05c4e90f7b9ec3781..44c04d00587ff65873cd40f3f399e1c8ef00ea9f 100644
--- a/clients/tools/ldapmodify.c
+++ b/clients/tools/ldapmodify.c
@@ -31,7 +31,7 @@ static int	ldapport = 0;
 static int	new, replace, not, verbose, contoper, force, valsfromfiles;
 static LDAP	*ld;
 
-#define safe_realloc( ptr, size )	( ptr == NULL ? malloc( size ) : \
+#define safe_realloc( ptr, size )	( (ptr) == NULL ? malloc( size ) : \
 					 realloc( ptr, size ))
 
 #define LDAPMOD_MAXLINE		4096
diff --git a/clients/tools/ldapmodrdn.c b/clients/tools/ldapmodrdn.c
index d6b3e99c0143e4e54740820bb042ce01c4cac243..9e0b92072666ebec2c494b4b7ec569be2ea94fee 100644
--- a/clients/tools/ldapmodrdn.c
+++ b/clients/tools/ldapmodrdn.c
@@ -33,7 +33,7 @@ static int	ldapport = 0;
 static int	not, verbose, contoper;
 static LDAP	*ld;
 
-#define safe_realloc( ptr, size )	( ptr == NULL ? malloc( size ) : \
+#define safe_realloc( ptr, size )	( (ptr) == NULL ? malloc( size ) : \
 					 realloc( ptr, size ))
 
 static int domodrdn LDAP_P((
diff --git a/clients/ud/print.c b/clients/ud/print.c
index 984ee0b47dca9e00ee6bcfa815543ff5f3c4360d..062c403aad8199d0b38409a2eb2dab2eccac05fc 100644
--- a/clients/ud/print.c
+++ b/clients/ud/print.c
@@ -536,7 +536,7 @@ print_one_URL( char *s, int label_lead, char *tag, int url_lead )
 }
 
 
-#define GET2BYTENUM( p )	(( *p - '0' ) * 10 + ( *(p+1) - '0' ))
+#define GET2BYTENUM( p )	(( *(p) - '0' ) * 10 + ( *((p)+1) - '0' ))
 
 static char *
 time2text( char *ldtimestr, int dateonly )
diff --git a/include/ldap.h b/include/ldap.h
index cbd7575574e3ab08d8c1e4fe58c11138394f1e09..4102153162d9feeed5d0cd1b0ab210ff65650651 100644
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -345,7 +345,7 @@ typedef struct ldapmod {
 #define LDAP_IS_LEAF			0x23 /* not LDAPv3 */
 #define LDAP_ALIAS_DEREF_PROBLEM	0x24
 
-#define LDAP_NAME_ERROR(n)	((n & 0xf0) == 0x20)
+#define LDAP_NAME_ERROR(n)	(((n) & 0xf0) == 0x20)
 #define NAME_ERROR(n)	LDAP_NAME_ERROR(n)	/* depreciated */
 
 #define LDAP_INAPPROPRIATE_AUTH		0x30
diff --git a/libraries/libavl/avl.c b/libraries/libavl/avl.c
index c48e2e63c4b3174ef9a2cad15c214f29dab12d3f..c1b1aad6cb5146967e6a984ab85ff3e83e0b5063 100644
--- a/libraries/libavl/avl.c
+++ b/libraries/libavl/avl.c
@@ -40,7 +40,7 @@ static char avl_version[] = "AVL library version 1.0\n";
 	}\
 	tmp = (*(x))->avl_right;\
 	(*(x))->avl_right = tmp->avl_left;\
-	tmp->avl_left = *x;\
+	tmp->avl_left = *(x);\
 	*(x) = tmp;\
 }
 
diff --git a/libraries/libldap/tmplout.c b/libraries/libldap/tmplout.c
index 7fad7c9e99847e9aa3e6d8c940c437b47c5ff5ba..c04550bb664ba54e86dd9bee8d2d584931575216 100644
--- a/libraries/libldap/tmplout.c
+++ b/libraries/libldap/tmplout.c
@@ -64,8 +64,8 @@ static int searchaction LDAP_P((
 #define OCATTRNAME		"objectClass"
 
 
-#define NONFATAL_LDAP_ERR( err )	( err == LDAP_SUCCESS || \
-	err == LDAP_TIMELIMIT_EXCEEDED || err == LDAP_SIZELIMIT_EXCEEDED )
+#define NONFATAL_LDAP_ERR( err )	( (err) == LDAP_SUCCESS || \
+	(err) == LDAP_TIMELIMIT_EXCEEDED || (err) == LDAP_SIZELIMIT_EXCEEDED )
 
 #define DEF_LDAP_URL_PREFIX	"ldap:///"
 
@@ -848,10 +848,10 @@ output_dn( char *buf, char *dn, int width, int rdncount,
 
 
 
-#define HREF_CHAR_ACCEPTABLE( c )	(( c >= '-' && c <= '9' ) ||	\
-					 ( c >= '@' && c <= 'Z' ) ||	\
-					 ( c == '_' ) ||		\
-					 ( c >= 'a' && c <= 'z' ))
+#define HREF_CHAR_ACCEPTABLE( c )	(( (c) >= '-' && (c) <= '9' ) || \
+					 ( (c) >= '@' && (c) <= 'Z' ) || \
+					 ( (c) == '_' )               || \
+					 ( (c) >= 'a' && (c) <= 'z' ))
 
 static void
 strcat_escaped( char *s1, char *s2 )
@@ -874,7 +874,7 @@ strcat_escaped( char *s1, char *s2 )
 }
 
 
-#define GET2BYTENUM( p )	(( *p - '0' ) * 10 + ( *(p+1) - '0' ))
+#define GET2BYTENUM( p )	(( *(p) - '0' ) * 10 + ( *((p)+1) - '0' ))
 
 static char *
 time2text( char *ldtimestr, int dateonly )
diff --git a/libraries/libldap/tmpltest.c b/libraries/libldap/tmpltest.c
index 697d4bc1859b7c036fe43e36ddca9986bbd29d3d..265e57e8d75303f65f9dcf18c1e422dd4b293d3f 100644
--- a/libraries/libldap/tmpltest.c
+++ b/libraries/libldap/tmpltest.c
@@ -22,7 +22,7 @@
 static void dump_tmpl	 ( struct ldap_disptmpl *tmpl );
 static void dump_srchpref( struct ldap_searchobj *sp );
 
-#define NULLSTRINGIFNULL( s )	( s == NULL ? "(null)" : s )
+#define NULLSTRINGIFNULL( s )	( (s) == NULL ? "(null)" : (s) )
 
 int
 main( int argc, char **argv )
diff --git a/servers/ldapd/syntax.c b/servers/ldapd/syntax.c
index 7035991b4e12d612778fb99eb3007612c5a7dc22..9d6032a84ff2a4ce1223a43ac6e076081f596cf7 100644
--- a/servers/ldapd/syntax.c
+++ b/servers/ldapd/syntax.c
@@ -169,8 +169,8 @@ attr_key_rfc1779(
     strcpy ( key, x );
 }
 
-#define SEPARATOR(c)	(c == ',' || c == ';')
-#define SPACE(c)	(c == ' ' || c == '\n')
+#define SEPARATOR(c)	((c) == ',' || (c) == ';')
+#define SPACE(c)    	((c) == ' ' || (c) == '\n')
 
 int
 dn_print_real(
diff --git a/servers/slapd/back-bdb2/cache.c b/servers/slapd/back-bdb2/cache.c
index f1ce3cccc3d3c6fe36c29094303e6aa295b94862..9a659bcfad0377be4e9fe47501a937c1d64f5346 100644
--- a/servers/slapd/back-bdb2/cache.c
+++ b/servers/slapd/back-bdb2/cache.c
@@ -106,24 +106,24 @@ bdb2i_cache_return_entry_rw( struct cache *cache, Entry *e, int rw )
 	if ( LEI(e)->lei_lruprev != NULL ) { \
 		LEI(LEI(e)->lei_lruprev)->lei_lrunext = LEI(e)->lei_lrunext; \
 	} else { \
-		cache->c_lruhead = LEI(e)->lei_lrunext; \
+		(cache)->c_lruhead = LEI(e)->lei_lrunext; \
 	} \
 	if ( LEI(e)->lei_lrunext != NULL ) { \
 		LEI(LEI(e)->lei_lrunext)->lei_lruprev = LEI(e)->lei_lruprev; \
 	} else { \
-		cache->c_lrutail = LEI(e)->lei_lruprev; \
+		(cache)->c_lrutail = LEI(e)->lei_lruprev; \
 	} \
 }
 
 #define LRU_ADD( cache, e ) { \
-	LEI(e)->lei_lrunext = cache->c_lruhead; \
+	LEI(e)->lei_lrunext = (cache)->c_lruhead; \
 	if ( LEI(e)->lei_lrunext != NULL ) { \
-		LEI(LEI(e)->lei_lrunext)->lei_lruprev = e; \
+		LEI(LEI(e)->lei_lrunext)->lei_lruprev = (e); \
 	} \
-	cache->c_lruhead = e; \
+	(cache)->c_lruhead = (e); \
 	LEI(e)->lei_lruprev = NULL; \
-	if ( cache->c_lrutail == NULL ) { \
-		cache->c_lrutail = e; \
+	if ( (cache)->c_lrutail == NULL ) { \
+		(cache)->c_lrutail = (e); \
 	} \
 }
 
diff --git a/servers/slapd/back-bdb2/search.c b/servers/slapd/back-bdb2/search.c
index 5080a5faadb3aceb2ba99a25587709926e152c8e..3090e89cca00608bae044ea4ab557ec98bbbc729 100644
--- a/servers/slapd/back-bdb2/search.c
+++ b/servers/slapd/back-bdb2/search.c
@@ -19,7 +19,7 @@ static ID_BLOCK	*subtree_candidates(BackendDB *be, Connection *conn, Operation *
 #define GRABSIZE	BUFSIZ
 
 #define MAKE_SPACE( n ) { \
-	if ( rcur + n > rbuf + rmaxsize ) { \
+	if ( rcur + (n) > rbuf + rmaxsize ) { \
 		int	offset = rcur - rbuf; \
 		rbuf =  ch_realloc( rbuf, rmaxsize + GRABSIZE ); \
 		rmaxsize += GRABSIZE; \
diff --git a/servers/slapd/back-ldbm/cache.c b/servers/slapd/back-ldbm/cache.c
index d44b14f28cbf98896637da12895c0a9386e76541..1e6d1bbd3ef66bccf17efbf03697c8acda051a8a 100644
--- a/servers/slapd/back-ldbm/cache.c
+++ b/servers/slapd/back-ldbm/cache.c
@@ -180,24 +180,24 @@ cache_return_entry_rw( struct cache *cache, Entry *e, int rw )
 	if ( LEI(e)->lei_lruprev != NULL ) { \
 		LEI(LEI(e)->lei_lruprev)->lei_lrunext = LEI(e)->lei_lrunext; \
 	} else { \
-		cache->c_lruhead = LEI(e)->lei_lrunext; \
+		(cache)->c_lruhead = LEI(e)->lei_lrunext; \
 	} \
 	if ( LEI(e)->lei_lrunext != NULL ) { \
 		LEI(LEI(e)->lei_lrunext)->lei_lruprev = LEI(e)->lei_lruprev; \
 	} else { \
-		cache->c_lrutail = LEI(e)->lei_lruprev; \
+		(cache)->c_lrutail = LEI(e)->lei_lruprev; \
 	} \
 } while(0)
 
 #define LRU_ADD( cache, e ) do { \
-	LEI(e)->lei_lrunext = cache->c_lruhead; \
+	LEI(e)->lei_lrunext = (cache)->c_lruhead; \
 	if ( LEI(e)->lei_lrunext != NULL ) { \
-		LEI(LEI(e)->lei_lrunext)->lei_lruprev = e; \
+		LEI(LEI(e)->lei_lrunext)->lei_lruprev = (e); \
 	} \
-	cache->c_lruhead = e; \
+	(cache)->c_lruhead = (e); \
 	LEI(e)->lei_lruprev = NULL; \
-	if ( cache->c_lrutail == NULL ) { \
-		cache->c_lrutail = e; \
+	if ( (cache)->c_lrutail == NULL ) { \
+		(cache)->c_lrutail = (e); \
 	} \
 } while(0)
 
diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 04e05931930dca8e1a949e167071657ea815e565..80b184893cec716aa7dc99e1ddcb00d4dae338d6 100644
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -18,7 +18,7 @@ static ID_BLOCK	*subtree_candidates(Backend *be, Connection *conn, Operation *op
 #define GRABSIZE	BUFSIZ
 
 #define MAKE_SPACE( n ) { \
-	if ( rcur + n > rbuf + rmaxsize ) { \
+	if ( rcur + (n) > rbuf + rmaxsize ) { \
 		int	offset = rcur - rbuf; \
 		rbuf =  ch_realloc( rbuf, rmaxsize + GRABSIZE ); \
 		rmaxsize += GRABSIZE; \
diff --git a/servers/slapd/phonetic.c b/servers/slapd/phonetic.c
index 65b2a748045edd379ccda15654c63f676750b5f8..f5871ee8b814c1f338f5df4cc023f5e8d0d24b8e 100644
--- a/servers/slapd/phonetic.c
+++ b/servers/slapd/phonetic.c
@@ -17,7 +17,7 @@
 
 #define iswordbreak(x)  (!isascii(x) || isspace((unsigned char) (x)) || \
 			 ispunct((unsigned char) (x)) || \
-			 isdigit((unsigned char) (x)) || x == '\0')
+			 isdigit((unsigned char) (x)) || (x) == '\0')
 
 char *
 first_word( char *s )
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 7bff6d8155043a8494b186d90a33215b5829205d..939a4e83b4bb556ee2c0c3e20565f358c882a459 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -453,11 +453,11 @@ typedef struct slap_conn {
 #if defined(LDAP_SYSLOG) && defined(LDAP_DEBUG)
 #define Statslog( level, fmt, connid, opid, arg1, arg2, arg3 )	\
 	{ \
-		if ( ldap_debug & level ) \
-			fprintf( stderr, fmt, connid, opid, arg1, arg2, arg3 );\
-		if ( ldap_syslog & level ) \
-			syslog( ldap_syslog_level, fmt, connid, opid, arg1, \
-			    arg2, arg3 ); \
+		if ( ldap_debug & (level) ) \
+			fprintf( stderr, (fmt), (connid), (opid), (arg1), (arg2), (arg3) );\
+		if ( ldap_syslog & (level) ) \
+			syslog( ldap_syslog_level, (fmt), (connid), (opid), (arg1), \
+			        (arg2), (arg3) ); \
 	}
 #else
 #define Statslog( level, fmt, connid, opid, arg1, arg2, arg3 )
diff --git a/servers/slapd/tools/chlog2replog.c b/servers/slapd/tools/chlog2replog.c
index 434977991494cfc8a7ca970f9e33992d978f4b47..92dd2a302f714dff11224f0a0e7b399b99515b88 100644
--- a/servers/slapd/tools/chlog2replog.c
+++ b/servers/slapd/tools/chlog2replog.c
@@ -122,8 +122,8 @@ dn2ldap( char *edbdn )
 }
 
 
-#define SEPARATOR(c)	(c == ',' || c == ';')
-#define SPACE(c)	(c == ' ' || c == '\n')
+#define SEPARATOR(c)	((c) == ',' || (c) == ';')
+#define SPACE(c)    	((c) == ' ' || (c) == '\n')
 
 static int
 dn2ldif( PS ps, DN dn )
diff --git a/servers/slapd/tools/ldapsyntax.c b/servers/slapd/tools/ldapsyntax.c
index 9a597ec2190d4c8a69d23d82815c0ed6e1d20eb3..4ce580697db2831a21299a2e9497ff1af7d42e0c 100644
--- a/servers/slapd/tools/ldapsyntax.c
+++ b/servers/slapd/tools/ldapsyntax.c
@@ -45,8 +45,8 @@ static void	de_crypt( char *s );
 
 extern char	*progname;
 
-#define SEPARATOR(c)	(c == ',' || c == ';')
-#define SPACE(c)	(c == ' ' || c == '\n')
+#define SEPARATOR(c)	((c) == ',' || (c) == ';')
+#define SPACE(c)    	((c) == ' ' || (c) == '\n')
 
 
 int
diff --git a/tests/progs/slapd-addel.c b/tests/progs/slapd-addel.c
index 1ed0d13400185391343ba7a91d28567ae9a61844..081cd9e2a53d16a37689d48b44eec92310857345 100644
--- a/tests/progs/slapd-addel.c
+++ b/tests/progs/slapd-addel.c
@@ -105,7 +105,7 @@ main( int argc, char **argv )
 }
 
 
-#define safe_realloc( ptr, size )   ( ptr == NULL ? malloc( size ) : \
+#define safe_realloc( ptr, size )   ( (ptr) == NULL ? malloc( size ) : \
 				realloc( ptr, size ))