diff --git a/list.c b/list.c
index 20df26c8..30dfb698 100644
--- a/list.c
+++ b/list.c
@@ -643,7 +643,6 @@ xmlListSort(xmlListPtr l)
     xmlListClear(l);
     xmlListMerge(l, lTemp);
     xmlListDelete(lTemp);
-    return;
 }
 
 /**
diff --git a/parser.c b/parser.c
index 73d80732..046909bd 100644
--- a/parser.c
+++ b/parser.c
@@ -1154,7 +1154,6 @@ xmlAddDefAttrs(xmlParserCtxtPtr ctxt,
 
 mem_error:
     xmlErrMemory(ctxt);
-    return;
 }
 
 /**
@@ -1185,7 +1184,6 @@ xmlAddSpecialAttr(xmlParserCtxtPtr ctxt,
 
 mem_error:
     xmlErrMemory(ctxt);
-    return;
 }
 
 /**
@@ -1224,7 +1222,6 @@ xmlCleanSpecialAttr(xmlParserCtxtPtr ctxt)
         xmlHashFree(ctxt->attsSpecial, NULL);
         ctxt->attsSpecial = NULL;
     }
-    return;
 }
 
 /**
@@ -3847,8 +3844,6 @@ xmlExpandPEsInEntityValue(xmlParserCtxtPtr ctxt, xmlSBuf *buf,
 
     if (chunk < str)
         xmlSBufAddString(buf, chunk, str - chunk);
-
-    return;
 }
 
 /**
@@ -4203,8 +4198,6 @@ xmlExpandEntityInAttValue(xmlParserCtxtPtr ctxt, xmlSBuf *buf,
 
     if (chunkSize > 0)
         xmlSBufAddString(buf, str - chunkSize, chunkSize);
-
-    return;
 }
 
 /**
@@ -5176,7 +5169,6 @@ not_terminated:
     xmlFatalErrMsgStr(ctxt, XML_ERR_COMMENT_NOT_FINISHED,
 			 "Comment not terminated\n", NULL);
     xmlFree(buf);
-    return;
 }
 
 /**
@@ -5330,7 +5322,6 @@ get_more:
 	}
     } while (((*in >= 0x20) && (*in <= 0x7F)) || (*in == 0x09) || (*in == 0x0a));
     xmlParseCommentComplex(ctxt, buf, len, size);
-    return;
 }
 
 
@@ -8546,7 +8537,6 @@ xmlParseEndTag1(xmlParserCtxtPtr ctxt, int line) {
 
     namePop(ctxt);
     spacePop(ctxt);
-    return;
 }
 
 /**
diff --git a/parserInternals.c b/parserInternals.c
index 7631d29c..eda94f1e 100644
--- a/parserInternals.c
+++ b/parserInternals.c
@@ -315,8 +315,6 @@ xmlCtxtVErr(xmlParserCtxtPtr ctxt, xmlNodePtr node, xmlErrorDomain domain,
         if (ctxt->recovery == 0)
             ctxt->disableSAX = 1;
     }
-
-    return;
 }
 
 /**
@@ -722,7 +720,6 @@ encoding_error:
         ctxt->input->flags |= XML_INPUT_ENCODING_ERROR;
     }
     ctxt->input->cur++;
-    return;
 }
 
 /**
diff --git a/pattern.c b/pattern.c
index 23b52744..e969a1ef 100644
--- a/pattern.c
+++ b/pattern.c
@@ -1400,7 +1400,6 @@ error_unfinished:
     ctxt->error = 1;
     ERROR5(NULL, NULL, NULL,
 	"Unfinished expression '%s'.\n", ctxt->base);
-    return;
 }
 
 /************************************************************************
diff --git a/relaxng.c b/relaxng.c
index 6838d566..b0898e02 100644
--- a/relaxng.c
+++ b/relaxng.c
@@ -10674,7 +10674,6 @@ xmlRelaxNGCleanPSVI(xmlNodePtr node) {
 	    }
 	} while (cur != NULL);
     }
-    return;
 }
 /************************************************************************
  *									*
diff --git a/schematron.c b/schematron.c
index d5e81ecf..43ab3958 100644
--- a/schematron.c
+++ b/schematron.c
@@ -951,7 +951,6 @@ xmlSchematronParseTestReportMsg(xmlSchematronParserCtxtPtr ctxt, xmlNodePtr con)
             xmlFree(select);
         }
         child = child->next;
-        continue;
     }
 }
 
diff --git a/testlimits.c b/testlimits.c
index d5459d4b..1fc1aaf9 100644
--- a/testlimits.c
+++ b/testlimits.c
@@ -462,7 +462,6 @@ internalSubsetCallback(void *ctx ATTRIBUTE_UNUSED,
                        const xmlChar * SystemID ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -478,7 +477,6 @@ externalSubsetCallback(void *ctx ATTRIBUTE_UNUSED,
                        const xmlChar * SystemID ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -559,7 +557,6 @@ entityDeclCallback(void *ctx ATTRIBUTE_UNUSED,
                    xmlChar * content ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -579,7 +576,6 @@ attributeDeclCallback(void *ctx ATTRIBUTE_UNUSED,
                       xmlEnumerationPtr tree ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -598,7 +594,6 @@ elementDeclCallback(void *ctx ATTRIBUTE_UNUSED,
                     xmlElementContentPtr content ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -617,7 +612,6 @@ notationDeclCallback(void *ctx ATTRIBUTE_UNUSED,
                      const xmlChar * systemId ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -638,7 +632,6 @@ unparsedEntityDeclCallback(void *ctx ATTRIBUTE_UNUSED,
                            const xmlChar * notationName ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -654,7 +647,6 @@ setDocumentLocatorCallback(void *ctx ATTRIBUTE_UNUSED,
                            xmlSAXLocatorPtr loc ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -667,7 +659,6 @@ static void
 startDocumentCallback(void *ctx ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -680,7 +671,6 @@ static void
 endDocumentCallback(void *ctx ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 #if 0
@@ -731,7 +721,6 @@ charactersCallback(void *ctx ATTRIBUTE_UNUSED,
                    int len ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -746,7 +735,6 @@ referenceCallback(void *ctx ATTRIBUTE_UNUSED,
                   const xmlChar * name ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -765,7 +753,6 @@ ignorableWhitespaceCallback(void *ctx ATTRIBUTE_UNUSED,
                             int len ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -783,7 +770,6 @@ processingInstructionCallback(void *ctx ATTRIBUTE_UNUSED,
                               const xmlChar * data ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -800,7 +786,6 @@ cdataBlockCallback(void *ctx ATTRIBUTE_UNUSED,
                    int len ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -815,7 +800,6 @@ commentCallback(void *ctx ATTRIBUTE_UNUSED,
                 const xmlChar * value ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -832,7 +816,6 @@ warningCallback(void *ctx ATTRIBUTE_UNUSED,
                 const char *msg ATTRIBUTE_UNUSED, ...)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -849,7 +832,6 @@ errorCallback(void *ctx ATTRIBUTE_UNUSED, const char *msg ATTRIBUTE_UNUSED,
               ...)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -865,7 +847,6 @@ static void
 fatalErrorCallback(void *ctx ATTRIBUTE_UNUSED,
                    const char *msg ATTRIBUTE_UNUSED, ...)
 {
-    return;
 }
 
 
@@ -892,7 +873,6 @@ startElementNsCallback(void *ctx ATTRIBUTE_UNUSED,
                        const xmlChar ** attributes ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 /**
@@ -909,7 +889,6 @@ endElementNsCallback(void *ctx ATTRIBUTE_UNUSED,
                      const xmlChar * URI ATTRIBUTE_UNUSED)
 {
     callbacks++;
-    return;
 }
 
 static xmlSAXHandler callbackSAX2HandlerStruct = {
diff --git a/valid.c b/valid.c
index cdd31fba..c324b6cb 100644
--- a/valid.c
+++ b/valid.c
@@ -6798,7 +6798,6 @@ xmlValidGetPotentialChildren(xmlElementContent *ctree,
  */
 static void xmlNoValidityErr(void *ctx ATTRIBUTE_UNUSED,
                                 const char *msg ATTRIBUTE_UNUSED, ...) {
-    return;
 }
 
 /**
diff --git a/xmlmemory.c b/xmlmemory.c
index f0628e2a..6618f055 100644
--- a/xmlmemory.c
+++ b/xmlmemory.c
@@ -225,8 +225,6 @@ xmlMemFree(void *ptr)
     xmlMutexUnlock(&xmlMemMutex);
 
     free(p);
-
-    return;
 }
 
 /**
diff --git a/xmlregexp.c b/xmlregexp.c
index aa13c953..364e0bb0 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -3980,7 +3980,6 @@ rollback:
 	continue;
 progress:
         progress = 1;
-	continue;
     }
     if (exec->status == XML_REGEXP_OK) {
         return(exec->state->type == XML_REGEXP_FINAL_STATE);
@@ -4995,7 +4994,6 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) {
         xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg,
 		           XML_REGEXP_CHARVAL, start, end, NULL);
     }
-    return;
 }
 
 /**
diff --git a/xmlschemas.c b/xmlschemas.c
index cae55fac..143ae2cd 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -27343,7 +27343,6 @@ exit:
 internal_error:
     vctxt->err = -1;
     xmlStopParser(vctxt->parserCtxt);
-    return;
 }
 
 static void
@@ -27387,7 +27386,6 @@ exit:
 internal_error:
     vctxt->err = -1;
     xmlStopParser(vctxt->parserCtxt);
-    return;
 }
 
 /************************************************************************
diff --git a/xpath.c b/xpath.c
index a1ce1e48..1b1c438e 100644
--- a/xpath.c
+++ b/xpath.c
@@ -4552,7 +4552,6 @@ free_obj:
 	    xmlXPathFreeNodeSet(obj->nodesetval);
 	xmlFree(obj);
     }
-    return;
 }
 
 
@@ -7459,7 +7458,6 @@ xmlXPathIdFunction(xmlXPathParserContextPtr ctxt, int nargs) {
         xmlXPathPErrMemory(ctxt);
     xmlFree(tokens);
     valuePush(ctxt, xmlXPathCacheWrapNodeSet(ctxt, ret));
-    return;
 }
 
 /**
diff --git a/xzlib.c b/xzlib.c
index 3d607ad5..30f9169c 100644
--- a/xzlib.c
+++ b/xzlib.c
@@ -110,7 +110,6 @@ xz_error(xz_statep state, int err, const char *msg)
     strcpy(state->msg, state->path);
     strcat(state->msg, ": ");
     strcat(state->msg, msg);
-    return;
 }
 
 static void