diff --git a/base/networking.c b/base/networking.c
index fc0499b6..02b13f1d 100644
--- a/base/networking.c
+++ b/base/networking.c
@@ -273,7 +273,7 @@ addr6_to_str (const struct in6_addr *addr6, char *str)
  *
  * @param[in]   addr6   IP address.
  *
- * @return      IP as string. NULL otherwise.
+ * @return IP as string. NULL otherwise.
  */
 char *
 addr6_as_str (const struct in6_addr *addr6)
@@ -872,7 +872,7 @@ struct route_entry
 /**
  * @brief Get the entries of /proc/net/route as list of route_entry structs.
  *
- * @return  GSList of route_entry structs. NULL if no routes found or Error.
+ * @return GSList of route_entry structs. NULL if no routes found or Error.
  */
 static GSList *
 get_routes (void)
@@ -981,7 +981,7 @@ get_routes (void)
 /**
  * @brief Free the list of routes.
  *
- * @param GSList of route_entry structs, or NULL.
+ * @param[in]  routes  GSList of route_entry structs, or NULL.
  */
 static void
 free_routes (GSList *routes)
diff --git a/boreas/boreas_error.c b/boreas/boreas_error.c
index 2280921a..83b55772 100644
--- a/boreas/boreas_error.c
+++ b/boreas/boreas_error.c
@@ -16,7 +16,7 @@
 /**
  * @brief Transform Boreas error code into human readable error message.
  *
- * @param boreas_error Boreas error code.
+ * @param  boreas_error  Boreas error code.
  *
  * @return String representation of supplied error code.
  */
diff --git a/boreas/boreas_io.c b/boreas/boreas_io.c
index cc338712..41a715cc 100644
--- a/boreas/boreas_io.c
+++ b/boreas/boreas_io.c
@@ -47,7 +47,7 @@ set_max_scan_hosts_reached ()
  * @brief Get number of identified alive hosts.
  *
  * @return Number of identified alive hosts.
- * */
+ */
 int
 get_alive_hosts_count ()
 {
@@ -78,7 +78,8 @@ inc_alive_hosts_count ()
 /**
  * @brief Send Message about not vuln scanned alive hosts to ospd-openvas.
  *
- * @param num_not_scanned Number of alive hosts which were not vuln scanned.
+ * @param  num_not_scanned  Number of alive hosts which were not vuln scanned.
+ *
  * @return 0 on success, else Error.
  */
 static int
@@ -132,10 +133,11 @@ send_limit_msg (int num_not_scanned_hosts)
  * scanning all hosts, NULL is returned and the status flag
  * alive_detection_finished is set to TRUE.
  *
- * @param alive_hosts_kb  Redis connection for accessing the queue on which the
- * alive detection scanner puts found hosts.
- * @param alive_deteciton_finished  Status of alive detection process.
- * @return  If valid alive host is found return a gvm_host_t. If alive scanner
+ * @param  alive_hosts_kb  Redis connection for accessing the queue on which the
+ *                         alive detection scanner puts found hosts.
+ * @param  alive_deteciton_finished  Status of alive detection process.
+ *
+ * @return If valid alive host is found return a gvm_host_t. If alive scanner
  * finished NULL is returened and alive_deteciton_finished set. On error or if
  * no host was found return NULL.
  */
@@ -212,8 +214,8 @@ get_host_from_queue (kb_t alive_hosts_kb, gboolean *alive_deteciton_finished)
 /**
  * @brief Put host value string on queue of hosts to be considered as alive.
  *
- * @param kb KB to use.
- * @param addr_str IP addr in str representation to put on queue.
+ * @param  kb        KB to use.
+ * @param  addr_str  IP addr in str representation to put on queue.
  */
 void
 put_host_on_queue (kb_t kb, char *addr_str)
@@ -227,7 +229,8 @@ put_host_on_queue (kb_t kb, char *addr_str)
 /**
  * @brief Checks if the finish signal is already set.
  *
- * @param main_kb  kb to use
+ * @param  main_kb  kb to use
+ *
  * @return 1 if it is already set. 0 otherwise.
  */
 int
@@ -263,7 +266,7 @@ finish_signal_on_queue (kb_t main_kb)
  * @brief Reallocate finish signal in last position of the alive detection
  * queue.
  *
- * @param main_kb  kb to use
+ * @param  main_kb  kb to use
  */
 void
 realloc_finish_signal_on_queue (kb_t main_kb)
@@ -288,9 +291,8 @@ realloc_finish_signal_on_queue (kb_t main_kb)
  * If the finish signal (a string) was already put on the queue it is not put on
  * it again.
  *
- * @param error  Set to 0 on success. Is set to -1 if finish signal was already
- * put on queue. Set to -2 if function was no able to push finish string on
- * queue.
+ * @param[out] error  0 success. -1 finish signal was already put on queue.
+ *                    -2 function was not able to push finish string on queue.
  */
 void
 put_finish_signal_on_queue (void *error)
@@ -338,9 +340,9 @@ put_finish_signal_on_queue (void *error)
 /**
  * @brief Init scan restrictions.
  *
- * @param scanner Pointer to scanner struct.
- * @param max_scan_hosts  Maximum number of hosts allowed to scan. 0 equals no
- * scan limit.
+ * @param  scanner         Pointer to scanner struct.
+ * @param  max_scan_hosts  Maximum number of hosts allowed to scan. 0 equals no
+ *                         scan limit.
  */
 void
 init_scan_restrictions (scanner_t *scanner, int max_scan_hosts)
@@ -360,8 +362,8 @@ init_scan_restrictions (scanner_t *scanner, int max_scan_hosts)
  * don't put them on the queue. Put finish signal on queue if max_scan_hosts is
  * reached.
  *
- * @param scanner Scanner struct.
- * @param add_str Host address string to put on queue.
+ * @param  scanner  Scanner struct.
+ * @param  add_str  Host address string to put on queue.
  */
 void
 handle_scan_restrictions (scanner_t *scanner, gchar *addr_str)
@@ -399,8 +401,8 @@ handle_scan_restrictions (scanner_t *scanner, gchar *addr_str)
  * ospd-openvas. The number of dead hosts sent to ospd-openvas may not
  * necessarily reflect the actual number of dead hosts in the target list.
  *
- * @param hosts_data  Includes all data which is needed for calculating the
- * number of dead hosts.
+ * @param  hosts_data  Includes all data which is needed for calculating the
+ *                     number of dead hosts.
  *
  * @return number of dead hosts, or -1 in case of an error.
  */
@@ -432,8 +434,8 @@ send_dead_hosts_to_ospd_openvas (int count_dead_hosts)
 /**
  * @brief Get the openvas scan id of the current task.
  *
- * @param db_address  Address of the Redis db.
- * @param db_id ID of the scan main db.
+ * @param  db_address  Address of the Redis db.
+ * @param  db_id       ID of the scan main db.
  *
  * @return Scan id of current task or NULL on error.
  */
@@ -455,7 +457,7 @@ get_openvas_scan_id (const gchar *db_address, int db_id)
 
 /**
  * @brief Get the bitflag which describes the methods to use for alive
- * deteciton.
+ * detection.
  *
  * @param[out]  alive_test  Bitflag of all specified alive detection methods.
  *
@@ -497,6 +499,7 @@ get_alive_test_ports (void)
 
 /**
  * @brief Get the max time in seconds that boreas waits for replies.
+ *
  * Minimum is 1 second. Max is 20. If a given value is invalid or greather
  * than 20, it is set to WAIT_FOR_REPLIES_TIMEOUT
  *
diff --git a/boreas/util.c b/boreas/util.c
index 553723e1..504d3195 100644
--- a/boreas/util.c
+++ b/boreas/util.c
@@ -540,7 +540,7 @@ set_socket (socket_type_t socket_type, int *scanner_socket)
  * @param scanner     Reference to scanner struct.
  * @param alive_test  Methods of alive detection to use provided as bitflag.
  *
- * @return  0 on success, boreas_error_t on error.
+ * @return 0 on success, boreas_error_t on error.
  */
 boreas_error_t
 set_all_needed_sockets (scanner_t *scanner, alive_test_t alive_test)
diff --git a/openvasd/openvasd.c b/openvasd/openvasd.c
index 611f3c5f..f4a4ef45 100644
--- a/openvasd/openvasd.c
+++ b/openvasd/openvasd.c
@@ -680,7 +680,7 @@ openvasd_target_add_credential (openvasd_target_t *target,
  *
  * @param vt_id  The id of the VT.
  *
- * @return  The newly allocated single VT.
+ * @return The newly allocated single VT.
  */
 openvasd_vt_single_t *
 openvasd_vt_single_new (const gchar *vt_id)
diff --git a/osp/osp.c b/osp/osp.c
index 601a6cac..ba6ee601 100644
--- a/osp/osp.c
+++ b/osp/osp.c
@@ -1784,7 +1784,7 @@ osp_target_add_credential (osp_target_t *target, osp_credential_t *credential)
  *
  * @param[in]  filter  The filter string for the VT group.
  *
- * @return  The newly allocated VT group.
+ * @return The newly allocated VT group.
  */
 osp_vt_group_t *
 osp_vt_group_new (const char *filter)
@@ -1817,7 +1817,7 @@ osp_vt_group_free (osp_vt_group_t *vt_group)
  *
  * @param[in]  vt_id  The id of the VT.
  *
- * @return  The newly allocated single VT.
+ * @return The newly allocated single VT.
  */
 osp_vt_single_t *
 osp_vt_single_new (const char *vt_id)
diff --git a/util/cpeutils.c b/util/cpeutils.c
index f180556c..84ce490c 100644
--- a/util/cpeutils.c
+++ b/util/cpeutils.c
@@ -94,7 +94,7 @@ get_code (char *, const char *);
  *
  * @param[in]  uri_cpe  A CPE v2.2-conformant URI.
  *
- * @return  A formatted string CPE.
+ * @return A formatted string CPE.
  */
 char *
 uri_cpe_to_fs_cpe (const char *uri_cpe)
@@ -114,7 +114,7 @@ uri_cpe_to_fs_cpe (const char *uri_cpe)
  *
  * @param[in]  uri_cpe  A CPE v2.2-conformant URI.
  *
- * @return  A formatted string product.
+ * @return A formatted string product.
  */
 char *
 uri_cpe_to_fs_product (const char *uri_cpe)
@@ -134,7 +134,7 @@ uri_cpe_to_fs_product (const char *uri_cpe)
  *
  * @param[in]  uri_cpe  A CPE v2.2-conformant URI.
  *
- * @return  A CPE v2.2-conformant URI product.
+ * @return A CPE v2.2-conformant URI product.
  */
 char *
 uri_cpe_to_uri_product (const char *uri_cpe)
@@ -154,7 +154,7 @@ uri_cpe_to_uri_product (const char *uri_cpe)
  *
  * @param[in]  fs_cpe  A formatted string CPE.
  *
- * @return  A CPE v2.2-conformant URI.
+ * @return A CPE v2.2-conformant URI.
  */
 char *
 fs_cpe_to_uri_cpe (const char *fs_cpe)
@@ -174,7 +174,7 @@ fs_cpe_to_uri_cpe (const char *fs_cpe)
  *
  * @param[in]  fs_cpe  A formatted string CPE.
  *
- * @return  An URI product.
+ * @return An URI product.
  */
 char *
 fs_cpe_to_uri_product (const char *fs_cpe)
@@ -234,7 +234,7 @@ uri_cpe_to_cpe_struct (const char *uri_cpe, cpe_struct_t *cpe)
  *
  * @param[in]   cpe  A pointer to the CPE struct.
  *
- * @return  A CPE v2.2-conformant URI.
+ * @return A CPE v2.2-conformant URI.
  */
 char *
 cpe_struct_to_uri_cpe (const cpe_struct_t *cpe)
@@ -303,7 +303,7 @@ cpe_struct_to_uri_cpe (const cpe_struct_t *cpe)
  *
  * @param[in]   cpe  A pointer to the CPE struct.
  *
- * @return  A CPE v2.2-conformant URI product.
+ * @return A CPE v2.2-conformant URI product.
  */
 char *
 cpe_struct_to_uri_product (const cpe_struct_t *cpe)
@@ -344,7 +344,7 @@ cpe_struct_to_uri_product (const cpe_struct_t *cpe)
  *
  * @param[in]  uri_cpe  The uri cpe to get the version from.
  *
- * @return  The version of the uri cpe.
+ * @return The version of the uri cpe.
  */
 char *
 get_version_from_uri_cpe (const char *uri_cpe)
@@ -396,7 +396,7 @@ fs_cpe_to_cpe_struct (const char *fs_cpe, cpe_struct_t *cpe)
  *
  * @param[in]   cpe  A pointer to the CPE struct.
  *
- * @return  A formatted string CPE.
+ * @return A formatted string CPE.
  */
 char *
 cpe_struct_to_fs_cpe (const cpe_struct_t *cpe)
@@ -490,7 +490,7 @@ cpe_struct_to_fs_cpe (const cpe_struct_t *cpe)
  *
  * @param[in]   cpe  A pointer to the CPE struct.
  *
- * @return  A formatted string product.
+ * @return A formatted string product.
  */
 char *
 cpe_struct_to_fs_product (const cpe_struct_t *cpe)
@@ -530,7 +530,7 @@ cpe_struct_to_fs_product (const cpe_struct_t *cpe)
  * @param[in]   uri_cpe  The URI CPE.
  * @param[in]   index    The number of the component to get.
  *
- * @return  The indexth component of the URI CPE.
+ * @return The indexth component of the URI CPE.
  */
 static char *
 get_uri_component (const char *uri_cpe, int index)
@@ -580,7 +580,7 @@ get_uri_component (const char *uri_cpe, int index)
  *
  * @param[in]  component  The component to decode.
  *
- * @return  The decoded component of the URI CPE.
+ * @return The decoded component of the URI CPE.
  */
 static char *
 decode_uri_component (const char *component)
@@ -795,7 +795,7 @@ unpack_sixth_uri_component (const char *component, cpe_struct_t *cpe)
  * @param[in]   fs_cpe  The formatted string CPE.
  * @param[in]   index   The number of the component to get.
  *
- * @return  The indexth component of the formatted string CPE.
+ * @return The indexth component of the formatted string CPE.
  */
 static char *
 get_fs_component (const char *fs_cpe, int index)
@@ -863,7 +863,7 @@ get_fs_component (const char *fs_cpe, int index)
  *
  * @param[in]   component  The component to unbind.
  *
- * @return  The unbound component of the formatted string CPE.
+ * @return The unbound component of the formatted string CPE.
  */
 static char *
 unbind_fs_component (char *component)
@@ -891,8 +891,8 @@ unbind_fs_component (char *component)
  *
  * @param[in]   component  The component to add the quotings to.
  *
- * @return  The component of the formatted string CPE with all necessary
- *          quotes added.
+ * @return The component of the formatted string CPE with all necessary
+ *         quotes added.
  */
 static char *
 add_quoting (const char *component)
@@ -983,7 +983,7 @@ add_quoting (const char *component)
  *
  * @param[in]   component  The component to bind.
  *
- * @return  The bound component for the URI CPE.
+ * @return The bound component for the URI CPE.
  */
 static char *
 bind_cpe_component_for_uri (const char *component)
@@ -1004,7 +1004,7 @@ bind_cpe_component_for_uri (const char *component)
  *
  * @param[in]   component  The component to transform.
  *
- * @return  The transformed component for the URI CPE.
+ * @return The transformed component for the URI CPE.
  */
 static char *
 transform_for_uri (const char *component)
@@ -1064,10 +1064,9 @@ transform_for_uri (const char *component)
 /**
  * @brief Pack the sixth component of a URI CPE.
  *
- * @param[in]   component  The CPE struct with the components to pack into the
- *                         sixth component of a URI CPE.
+ * @param[in]  cpe  The CPE struct with the components to pack.
  *
- * @return  The packed component for the URI CPE.
+ * @return The packed component for the URI CPE.
  */
 static char *
 pack_sixth_uri_component (const cpe_struct_t *cpe)
@@ -1118,7 +1117,7 @@ pack_sixth_uri_component (const cpe_struct_t *cpe)
  *
  * @param[in]  component  The component to bind.
  *
- * @return  The bound component for the formatted string CPE.
+ * @return The bound component for the formatted string CPE.
  */
 static char *
 bind_cpe_component_for_fs (const char *component)
@@ -1140,7 +1139,7 @@ bind_cpe_component_for_fs (const char *component)
  *
  * @param[in]  component  The component to process.
  *
- * @return  The processed component for the formatted string CPE.
+ * @return The processed component for the formatted string CPE.
  */
 static char *
 process_quoted_chars (const char *component)
@@ -1184,7 +1183,7 @@ process_quoted_chars (const char *component)
 /**
  * @brief Initialize a CPE struct.
  *
- * @param[in/out]  cpe  The pointer to the CPE to initialize.
+ * @param[in,out]  cpe  The pointer to the CPE to initialize.
  */
 void
 cpe_struct_init (cpe_struct_t *cpe)
@@ -1208,7 +1207,7 @@ cpe_struct_init (cpe_struct_t *cpe)
 /**
  * @brief Free a CPE struct.
  *
- * @param[in/out]  cpe  The CPE to be freed.
+ * @param[in,out]  cpe  The CPE to be freed.
  */
 void
 cpe_struct_free (cpe_struct_t *cpe)
@@ -1242,7 +1241,7 @@ cpe_struct_free (cpe_struct_t *cpe)
 /**
  * @brief Cut of trailing ':' signs.
  *
- * @param[in/out]  str  The string to be processed.
+ * @param[in,out]  str  The string to be processed.
  */
 static void
 trim_pct (char *str)
@@ -1289,7 +1288,7 @@ get_code (char *code, const char *str)
  *                     subset of source meaning that it is matched by
  *                     source.
  *
- * @return  Returns if source is a match for target.
+ * @return Returns if source is a match for target.
  */
 gboolean
 cpe_struct_match (cpe_struct_t *source, cpe_struct_t *target)
@@ -1344,7 +1343,7 @@ cpe_struct_match (cpe_struct_t *source, cpe_struct_t *target)
  *                     subset of source meaning that it is matched by
  *                     source.
  *
- * @return  Returns if source is a match for target.
+ * @return Returns if source is a match for target.
  */
 gboolean
 cpe_struct_match_tail (cpe_struct_t *source, cpe_struct_t *target)
@@ -1385,7 +1384,7 @@ cpe_struct_match_tail (cpe_struct_t *source, cpe_struct_t *target)
  *                     is a subset of source meaning that it is matched by
  *                     source.
  *
- * @return  Returns if source is a match for target.
+ * @return Returns if source is a match for target.
  */
 static enum set_relation
 compare_component (const char *source, const char *target)
@@ -1462,7 +1461,7 @@ compare_component (const char *source, const char *target)
  *                     checked if it represents a subset of source meaning
  *                     that it is matched by source.
  *
- * @return  Returns if source is a match for target.
+ * @return Returns if source is a match for target.
  */
 static enum set_relation
 compare_strings (const char *source, const char *target)
@@ -1536,8 +1535,8 @@ compare_strings (const char *source, const char *target)
  * @param[in]  end    The end position in the string where the examination
  *                    ends.
  *
- * @return  Returns the number of unescaped escape signs in the specified
- *          part of the string.
+ * @return Returns the number of unescaped escape signs in the specified
+ *         part of the string.
  */
 static int
 count_escapes (const char *str, int start, int end)
@@ -1561,8 +1560,8 @@ count_escapes (const char *str, int start, int end)
  * @param[in]  str    The string to be examined.
  * @param[in]  index  The index where the examination starts.
  *
- * @return  Returns if an even number of escape characters precede the
- *          character at index "index".
+ * @return Returns if an even number of escape characters precede the
+ *         character at index "index".
  */
 static gboolean
 is_even_wildcards (const char *str, int index)
@@ -1582,7 +1581,7 @@ is_even_wildcards (const char *str, int index)
  *
  * @param[in]  str  The string to be examined.
  *
- * @return  Returns TRUE if the string contains wildcards. FALSE otherwise.
+ * @return Returns TRUE if the string contains wildcards. FALSE otherwise.
  */
 static gboolean
 has_wildcards (const char *str)
@@ -1613,8 +1612,8 @@ has_wildcards (const char *str)
  * @param[in]  sub_str  The string to be searched for in "str".
  * @param[in]  offset   The offset where to start the search in "str".
  *
- * @return  Returns the index where the string "sub_str" starts in "str", if
- *          the string "sub_str" was found, -1 otherwise.
+ * @return Returns the index where the string "sub_str" starts in "str", if
+ *         the string "sub_str" was found, -1 otherwise.
  */
 static int
 index_of (const char *str, const char *sub_str, int offset)
@@ -1638,8 +1637,8 @@ index_of (const char *str, const char *sub_str, int offset)
  *
  * @param[in]  str  The string to be examined.
  *
- * @return  Returns TRUE if the string "str" does not represent one of the
- *          logical values "ANY" or "NA". Returns FALSE otherwise.
+ * @return Returns TRUE if the string "str" does not represent one of the
+ *         logical values "ANY" or "NA". Returns FALSE otherwise.
  */
 static gboolean
 is_string (const char *str)
diff --git a/util/gpgmeutils.c b/util/gpgmeutils.c
index 12824526..ec613e7f 100644
--- a/util/gpgmeutils.c
+++ b/util/gpgmeutils.c
@@ -280,7 +280,7 @@ gvm_gpg_import_from_string (gpgme_ctx_t ctx, const char *key_str,
  * @param[in]  ctx        The GPGME context.
  * @param[in]  uid_email  The recipient email address to look for.
  *
- * @return  The key as a gpgme_key_t.
+ * @return The key as a gpgme_key_t.
  */
 static gpgme_key_t
 find_email_encryption_key (gpgme_ctx_t ctx, const char *uid_email)
diff --git a/util/mqtt.c b/util/mqtt.c
index 5c5bc90d..cfa20cc9 100644
--- a/util/mqtt.c
+++ b/util/mqtt.c
@@ -158,7 +158,7 @@ mqtt_set_global_client (mqtt_t *mqtt)
  *
  * @param mqtt  mqtt_t
  *
- * @return  0 on success, -1 on error.
+ * @return 0 on success, -1 on error.
  */
 static int
 mqtt_disconnect (mqtt_t *mqtt)
diff --git a/util/passwordbasedauthentication.h b/util/passwordbasedauthentication.h
index a8393e0d..85a914c3 100644
--- a/util/passwordbasedauthentication.h
+++ b/util/passwordbasedauthentication.h
@@ -18,7 +18,7 @@
  * PBASettings is used by pba_hash to control SALT, HASH function and
  * computional costs.
  *
- * */
+ */
 struct PBASettings
 {
   char pepper[MAX_PEPPER_SIZE]; /* is statically applied to the random salt */
@@ -36,7 +36,7 @@ struct PBASettings
  *
  * Returns a pointer to PBASettings on success or NULL on failure.
  *
- * */
+ */
 struct PBASettings *
 pba_init (const char *pepper, unsigned int pepper_size, unsigned int count,
           char *prefix);
diff --git a/util/tlsutils.c b/util/tlsutils.c
index 160c94f0..e9fa02a4 100644
--- a/util/tlsutils.c
+++ b/util/tlsutils.c
@@ -105,7 +105,7 @@ gvm_x509_privkey_to_pem (gnutls_x509_privkey_t privkey)
  * @param[in]  certs        The array of certificates to export
  * @param[in]  certs_count  The number of certificates to export
  *
- * @return  The certificates as a PEM string, or NULL on error.
+ * @return The certificates as a PEM string, or NULL on error.
  */
 gchar *
 gvm_x509_cert_list_to_pem (gnutls_x509_crt_t *certs, unsigned int certs_count)
@@ -137,7 +137,7 @@ gvm_x509_cert_list_to_pem (gnutls_x509_crt_t *certs, unsigned int certs_count)
  *
  * @param[in]  crl        The certificate revocation list CRL
  *
- * @return  The certificates as a PEM string, or NULL on error.
+ * @return The certificates as a PEM string, or NULL on error.
  */
 gchar *
 gvm_x509_crl_to_pem (gnutls_x509_crl_t crl)
diff --git a/util/versionutils.c b/util/versionutils.c
index 31ec59ad..26c05b03 100644
--- a/util/versionutils.c
+++ b/util/versionutils.c
@@ -47,11 +47,11 @@ str_cpy (char *, int);
  * @param[in]  version1  The first version string to compare.
  * @param[in]  version2  The second version string to compare.
  *
- * @return  Returns a value > 0 if version1 is newer than version2.
- *          Returns 0 if version1 is the same than version2.
- *          Returns a value between -1 and -4 if version2 is newer
- *          than version1.
- *          Returns -5 if the result is undefined.
+ * @return Returns a value > 0 if version1 is newer than version2.
+ *         Returns 0 if version1 is the same than version2.
+ *         Returns a value between -1 and -4 if version2 is newer
+ *         than version1.
+ *         Returns -5 if the result is undefined.
  */
 int
 cmp_versions (const char *version1, const char *version2)
@@ -176,7 +176,7 @@ cmp_versions (const char *version1, const char *version2)
  * @param[in]  version  The version string to generate the prepared
  *                      version string from.
  *
- * @return  Returns a prepared copy of the version string version.
+ * @return Returns a prepared copy of the version string version.
  */
 static gchar *
 prepare_version_string (const char *version)
@@ -271,9 +271,9 @@ prepare_version_string (const char *version)
  * @param[in]  version  The version string to get the release state from.
  * @param[in]  index    The part of the version string to check.
  *
- * @return  Returns 0 if there is no release state, returns 4 if the release
- *          state is "development" (dev), returns 3 if the state is "alpha",
- *          2 if the state is beta and 1 if the state is release candidate (rc).
+ * @return Returns 0 if there is no release state, returns 4 if the release
+ *         state is "development" (dev), returns 3 if the state is "alpha",
+ *         2 if the state is beta and 1 if the state is release candidate (rc).
  */
 static int
 get_release_state (const char *version, int index)
@@ -305,7 +305,7 @@ get_release_state (const char *version, int index)
  * @param[in]  version  The version string to get the part from.
  * @param[in]  index    The part of the version string to return.
  *
- * @return  Returns a copy of the specified part of the version string.
+ * @return Returns a copy of the specified part of the version string.
  */
 static char *
 get_part (const char *version, int index)
@@ -334,7 +334,7 @@ get_part (const char *version, int index)
  *
  * @param[in]  part  The part of the version string to check.
  *
- * @return  Returns TRUE if part contains only plain text, FALSE otherwise.
+ * @return Returns TRUE if part contains only plain text, FALSE otherwise.
  */
 static gboolean
 is_text (const char *part)
@@ -353,11 +353,11 @@ is_text (const char *part)
 /**
  * @brief Copy size characters of a string to an newly allocated new string.
  *
- * @param[in]   src   The string the first size characters are to be copied
- *                    from.
- * @param[in]   size  The number of characters to copy.
+ * @param[in]  source  The string the first size characters are to be copied
+ *                     from.
+ * @param[in]  size    The number of characters to copy.
  *
- * @return  The copy of the first size characters of src as a new string.
+ * @return The copy of the first size characters of src as a new string.
  */
 static char *
 str_cpy (char *source, int size)
diff --git a/util/xmlutils.c b/util/xmlutils.c
index 6dd8ea16..4315bd06 100644
--- a/util/xmlutils.c
+++ b/util/xmlutils.c
@@ -1937,7 +1937,7 @@ int
  * @param[in]   find_element      Name of the element to find.
  * @param[in]   find_attributes   GHashTable of attributes to find.
  *
- * @return  1 if element was found, 0 if not.
+ * @return 1 if element was found, 0 if not.
  */
 find_element_in_xml_file (gchar *file_path, gchar *find_element,
                           GHashTable *find_attributes)
@@ -2604,7 +2604,7 @@ xml_file_iterator_entity_decl (void *ctx, const xmlChar *name, int type,
  * libXML parser context from the iterator struct passed as user data.
  *
  * @param[in] ctx           parser context data / iterator data structure
- * @param[in] name          the name of the element
+ * @param[in] elem          the name of the element
  * @param[in] fullname      the attribute name
  * @param[in] type          the attribute type
  * @param[in] def           the type of default value
@@ -2632,8 +2632,6 @@ xml_file_iterator_attribute_decl (void *ctx, const xmlChar *elem,
  * @param[in] ctx           parser context data / iterator data structure
  * @param[in] name          the element name
  * @param[in] type          the element type
- * @param[in] def           the type of default value
- * @param[in] defaultValue  the attribute default value
  * @param[in] content       the element value tree
  */
 static void