diff --git a/skeletons/INTEGER.c b/skeletons/INTEGER.c
index e4e52d416233c93a58dd75e4b427ea2f53ff16e0..b477056096586b681db4d1401f82697dbe0c3cc1 100644
--- a/skeletons/INTEGER.c
+++ b/skeletons/INTEGER.c
@@ -309,7 +309,7 @@ INTEGER__xer_body_decode(asn_TYPE_descriptor_t *td, void *sptr, const void *chun
 		ST_SKIPSPACE,
 		ST_WAITDIGITS,
 		ST_DIGITS,
-		ST_EXTRASTUFF,
+		ST_EXTRASTUFF
 	} state = ST_SKIPSPACE;
 
 	/*
diff --git a/skeletons/OBJECT_IDENTIFIER.c b/skeletons/OBJECT_IDENTIFIER.c
index 0c16bfddfdb4602d41139f0dece419fd013f3411..cb9ff5756ce954f685d82b0f9c5d41cb58387c68 100644
--- a/skeletons/OBJECT_IDENTIFIER.c
+++ b/skeletons/OBJECT_IDENTIFIER.c
@@ -659,7 +659,7 @@ OBJECT_IDENTIFIER_parse_arcs(const char *oid_text, ssize_t oid_txt_length,
 	enum {
 		ST_SKIPSPACE,
 		ST_WAITDIGITS,	/* Next character is expected to be a digit */
-		ST_DIGITS,
+		ST_DIGITS
 	} state = ST_SKIPSPACE;
 
 	if(!oid_text || oid_txt_length < -1 || (arcs_slots && !arcs)) {
diff --git a/skeletons/OCTET_STRING.c b/skeletons/OCTET_STRING.c
index 58184559511f068fc25f41986441db932a3bef20..b43c18fe18dccea720fdb16eba86244205b56816 100644
--- a/skeletons/OCTET_STRING.c
+++ b/skeletons/OCTET_STRING.c
@@ -101,7 +101,7 @@ asn_TYPE_descriptor_t asn_DEF_OCTET_STRING = {
 typedef enum OS_type {
 	_TT_GENERIC	= 0,	/* Just a random OCTET STRING */
 	_TT_BIT_STRING	= 1,	/* BIT STRING type, a special case */
-	_TT_ANY		= 2,	/* ANY type, a special case too */
+	_TT_ANY		= 2	/* ANY type, a special case too */
 } OS_type_e;
 
 /*
diff --git a/skeletons/asn-decoder-template.c b/skeletons/asn-decoder-template.c
index 5116529d86ef3770dc05e664231f09b071f01e65..16a6f4ae21b8ecdc53fed9642887a4a40db212eb 100644
--- a/skeletons/asn-decoder-template.c
+++ b/skeletons/asn-decoder-template.c
@@ -32,7 +32,7 @@ static int opt_stack;	/* -s */
 static enum output_method {
 	OUT_NONE,	/* No pretty-printing */
 	OUT_PRINT,	/* -p flag */
-	OUT_XML,	/* -x flag */
+	OUT_XML		/* -x flag */
 }          opt_ometh;	/* -p or -x */
 
 #define	DEBUG(fmt, args...)	do {		\
diff --git a/skeletons/asn_internal.h b/skeletons/asn_internal.h
index 22011efa9621b36f3bf88fe0828947ee17fa60fb..84d692acc0fda96fbfa16008b8408e6407a074fa 100644
--- a/skeletons/asn_internal.h
+++ b/skeletons/asn_internal.h
@@ -39,11 +39,7 @@ void ASN_DEBUG_f(const char *fmt, ...);
 #define	ASN_DEBUG	ASN_DEBUG_f
 #endif	/* __GNUC__ */
 #else	/* EMIT_ASN_DEBUG != 1 */
-#ifdef	__GNUC__
-#define	ASN_DEBUG(fmt, args...)	((void)0)	/* Emit a no-op operator */
-#else	/* __GNUC__ */
-static void ASN_DEBUG(const char *fmt, ...) { (void)fmt; };
-#endif	/* __GNUC__ */
+static inline void ASN_DEBUG(const char *fmt, ...) { (void)fmt; }
 #endif	/* EMIT_ASN_DEBUG */
 #endif	/* ASN_DEBUG */