diff --git a/apps/openssl.c b/apps/openssl.c
index 2747b67197a29c7eccdfa62f4781f1ea3c87a4f7..dcfb796176c57c82ca4618d8add12735323ab7b6 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -595,13 +595,13 @@ static int MS_CALLBACK function_cmp(const FUNCTION *a, const FUNCTION *b)
 	{
 	return strncmp(a->name,b->name,8);
 	}
-static IMPLEMENT_LHASH_COMP_FN(function, FUNCTION);
+static IMPLEMENT_LHASH_COMP_FN(function, FUNCTION)
 
 static unsigned long MS_CALLBACK function_hash(const FUNCTION *a)
 	{
 	return lh_strhash(a->name);
 	}	
-static IMPLEMENT_LHASH_HASH_FN(function, FUNCTION);
+static IMPLEMENT_LHASH_HASH_FN(function, FUNCTION)
 
 static LHASH_OF(FUNCTION) *prog_init(void)
 	{
diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 06e0b551023c64c09ba7ecda06bb487cd92afa93..c2199978a34ce8a73b11f8c65f6f4200f6b573fe 100644
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -78,7 +78,7 @@ typedef struct
 	char *value;
 	} CONF_VALUE;
 
-DECLARE_STACK_OF(CONF_VALUE);
+DECLARE_STACK_OF(CONF_VALUE)
 DECLARE_LHASH_OF(CONF_VALUE);
 
 struct conf_st;
diff --git a/crypto/err/err.c b/crypto/err/err.c
index 66d4da85560c38eb8c3f0de03b8b65b8a48874d7..94784e972d58f0245605a5d79f4fefbdaf923866 100644
--- a/crypto/err/err.c
+++ b/crypto/err/err.c
@@ -337,14 +337,14 @@ static unsigned long err_string_data_hash(const ERR_STRING_DATA *a)
 	ret=l^ERR_GET_LIB(l)^ERR_GET_FUNC(l);
 	return(ret^ret%19*13);
 	}
-static IMPLEMENT_LHASH_HASH_FN(err_string_data, ERR_STRING_DATA);
+static IMPLEMENT_LHASH_HASH_FN(err_string_data, ERR_STRING_DATA)
 
 static int err_string_data_cmp(const ERR_STRING_DATA *a,
 			       const ERR_STRING_DATA *b)
 	{
 	return (int)(a->error - b->error);
 	}
-static IMPLEMENT_LHASH_COMP_FN(err_string_data, ERR_STRING_DATA);
+static IMPLEMENT_LHASH_COMP_FN(err_string_data, ERR_STRING_DATA)
 
 static LHASH_OF(ERR_STRING_DATA) *int_err_get(int create)
 	{
@@ -430,13 +430,13 @@ static unsigned long err_state_hash(const ERR_STATE *a)
 	{
 	return CRYPTO_THREADID_hash(&a->tid);
 	}
-static IMPLEMENT_LHASH_HASH_FN(err_state, ERR_STATE);
+static IMPLEMENT_LHASH_HASH_FN(err_state, ERR_STATE)
 
 static int err_state_cmp(const ERR_STATE *a, const ERR_STATE *b)
 	{
 	return CRYPTO_THREADID_cmp(&a->tid, &b->tid);
 	}
-static IMPLEMENT_LHASH_COMP_FN(err_state, ERR_STATE);
+static IMPLEMENT_LHASH_COMP_FN(err_state, ERR_STATE)
 
 static LHASH_OF(ERR_STATE) *int_thread_get(int create)
 	{
diff --git a/crypto/ex_data.c b/crypto/ex_data.c
index 05e5ec346b965cd936159702abb117e2c74e6ba8..9e7157da1fbd61fbb1ecc9909ec0ee0667a02f96 100644
--- a/crypto/ex_data.c
+++ b/crypto/ex_data.c
@@ -253,13 +253,13 @@ static unsigned long ex_class_item_hash(const EX_CLASS_ITEM *a)
 	{
 	return a->class_index;
 	}
-static IMPLEMENT_LHASH_HASH_FN(ex_class_item, EX_CLASS_ITEM);
+static IMPLEMENT_LHASH_HASH_FN(ex_class_item, EX_CLASS_ITEM)
 
 static int ex_class_item_cmp(const EX_CLASS_ITEM *a, const EX_CLASS_ITEM *b)
 	{
 	return a->class_index - b->class_index;
 	}
-static IMPLEMENT_LHASH_COMP_FN(ex_class_item, EX_CLASS_ITEM);
+static IMPLEMENT_LHASH_COMP_FN(ex_class_item, EX_CLASS_ITEM)
 
 /* Internal functions used by the "impl_default" implementation to access the
  * state */