diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 259424b4..965f8e32 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -18,7 +18,8 @@ if (DOXYGEN_FOUND)
     set(DOXYGEN_PREDEFINED DOXYGEN
                            WITH_SERVER
                            WITH_SFTP
-                           PRINTF_ATTRIBUTE(x,y))
+                           PRINTF_ATTRIBUTE\(x,y\))
+    set(DOXYGEN_DOT_GRAPH_MAX_NODES 100)
 
     set(DOXYGEN_EXCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/that_style)
     set(DOXYGEN_HTML_HEADER ${CMAKE_CURRENT_SOURCE_DIR}/that_style/header.html)
diff --git a/include/libssh/callbacks.h b/include/libssh/callbacks.h
index d0c24fd9..8ccc0511 100644
--- a/include/libssh/callbacks.h
+++ b/include/libssh/callbacks.h
@@ -934,7 +934,7 @@ LIBSSH_API int ssh_remove_channel_callbacks(ssh_channel channel,
 
 /** @} */
 
-/** @group libssh_threads
+/** @addtogroup libssh_threads
  * @{
  */
 
diff --git a/include/libssh/ed25519.h b/include/libssh/ed25519.h
index de95b31b..72a86c0b 100644
--- a/include/libssh/ed25519.h
+++ b/include/libssh/ed25519.h
@@ -24,10 +24,10 @@
 
 /**
  * @defgroup ed25519 ed25519 API
- * @internal
  * @brief API for DJB's ed25519
  *
- * @{ */
+ * @{
+ */
 
 #define ED25519_PK_LEN 32
 #define ED25519_SK_LEN 64
diff --git a/include/libssh/misc.h b/include/libssh/misc.h
index 6e5b581f..924da533 100644
--- a/include/libssh/misc.h
+++ b/include/libssh/misc.h
@@ -79,7 +79,7 @@ const void *_ssh_list_pop_head(struct ssh_list *list);
 
 /** @brief fetch the head element of a list and remove it from list
  * @param type type of the element to return
- * @param list the ssh_list to use
+ * @param ssh_list the ssh_list to use
  * @return the first element of the list, or NULL if the list is empty
  */
 #define ssh_list_pop_head(type, ssh_list)\
diff --git a/src/gssapi.c b/src/gssapi.c
index bbfcb6e6..a88dce25 100644
--- a/src/gssapi.c
+++ b/src/gssapi.c
@@ -593,6 +593,7 @@ ssh_gssapi_creds ssh_gssapi_get_creds(ssh_session session)
  * Unlike ssh_gssapi_get_creds() this is called on the client side of an ssh
  * connection.
  *
+ * @param[in] session The session
  * @param[in] creds gssapi credentials handle.
  */
 void ssh_gssapi_set_creds(ssh_session session, const ssh_gssapi_creds creds)
diff --git a/src/pcap.c b/src/pcap.c
index 9492df50..5b787a83 100644
--- a/src/pcap.c
+++ b/src/pcap.c
@@ -44,14 +44,11 @@
 #include "libssh/socket.h"
 
 /**
- * @internal
- *
  * @defgroup libssh_pcap The libssh pcap functions
  * @ingroup libssh
  *
  * The pcap file generation
  *
- *
  * @{
  */
 
@@ -98,7 +95,6 @@ struct pcaprec_hdr_s {
  * in a SSH session only. Multiple pcap contexts may be used into
  * a single pcap file.
  */
-
 struct ssh_pcap_context_struct {
 	ssh_session session;
 	ssh_pcap_file file;
@@ -280,7 +276,6 @@ void ssh_pcap_file_free(ssh_pcap_file pcap){
 /** @internal
  * @brief allocates a new ssh_pcap_context object
  */
-
 ssh_pcap_context ssh_pcap_context_new(ssh_session session){
 	ssh_pcap_context ctx = (struct ssh_pcap_context_struct *) malloc(sizeof(struct ssh_pcap_context_struct));
 	if(ctx==NULL){
@@ -523,7 +518,7 @@ int ssh_set_pcap_file(ssh_session session, ssh_pcap_file pcap){
 	session->pcap_ctx=ctx;
 	return SSH_OK;
 }
-
+/** @} */
 
 #else /* WITH_PCAP */
 
@@ -557,5 +552,3 @@ int ssh_set_pcap_file(ssh_session session, ssh_pcap_file pcapfile){
 }
 
 #endif
-
-/** @} */
diff --git a/src/socket.c b/src/socket.c
index 72918914..4580652d 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -65,8 +65,6 @@ struct sockaddr_un {
 #include "libssh/session.h"
 
 /**
- * @internal
- *
  * @defgroup libssh_socket The SSH socket functions.
  * @ingroup libssh
  *