diff --git a/include/cfg.h b/include/cfg.h
index 994503133..aad2ee503 100644
--- a/include/cfg.h
+++ b/include/cfg.h
@@ -18,14 +18,6 @@
 
 /* Forward declarations */
 struct list;
-struct node;
-struct path;
-struct interface;
-
-struct socket;
-struct opal;
-struct gtfpga;
-struct netem;
 struct settings;
 
 /** Parse config file and store settings in supplied struct settings.
diff --git a/include/node.h b/include/node.h
index d86695d34..44d4e92c6 100644
--- a/include/node.h
+++ b/include/node.h
@@ -224,14 +224,14 @@ int node_stop(struct node *n);
  */
 int node_parse(struct node *n, config_setting_t *cfg);
 
-/** Return a pointer to a string which should be used to print this node
+/** Return a pointer to a string which should be used to print this node.
  *
  * @see node::_name‚
  * @param n A pointer to the node structure.
  */
 char * node_name(struct node *n);
 
-/** Return a pointer to a string which should be used to print this node
+/** Return a pointer to a string which should be used to print this node.
  *
  * @see node::_name_short
  * @see node_type::print
diff --git a/src/path.c b/src/path.c
index c26f41a65..b8e1d9259 100644
--- a/src/path.c
+++ b/src/path.c
@@ -15,12 +15,6 @@
 #include "timing.h"
 #include "config.h"
 
-#ifndef sigev_notify_thread_id
-  #define sigev_notify_thread_id   _sigev_un._tid
-#endif
-
-extern struct settings settings;
-
 static void path_write(struct path *p)
 {
 	list_foreach(struct node *n, &p->destinations) {
diff --git a/src/server.c b/src/server.c
index e8421dbb2..15c0a6f89 100644
--- a/src/server.c
+++ b/src/server.c
@@ -25,7 +25,7 @@
   #include "opal.h"
 #endif
 
-struct list paths;		/**< Linked list of paths */
+struct list paths;		/**< List of paths */
 struct settings settings;	/**< The global configuration */
 static config_t config;		/**< libconfig handle */
 
diff --git a/src/test.c b/src/test.c
index 174ed1bc4..6483365bd 100644
--- a/src/test.c
+++ b/src/test.c
@@ -21,16 +21,13 @@
 #include "hist.h"
 #include "timing.h"
 
-/** The global configuration */
-struct settings settings;
+struct settings settings; /** <The global configuration */
 
 static struct node *node;
 
 /* Test options */
-static int running = 1;
-
-/** Amount of messages which should be sent (default: -1 for unlimited) */
-static int count =  -1;
+static int running = 1; /**< Initiate shutdown if zero */
+static int count =  -1;	/**< Amount of messages which should be sent (default: -1 for unlimited) */
 
 /** File descriptor for Matlab results.
  * This allows you to write Matlab results in a seperate log file:
@@ -39,12 +36,10 @@ static int count =  -1;
  */
 static int fd = STDOUT_FILENO;
 
-/** Lowest value in histogram. */
-static double low = 0;
-/** Highest value in histogram. */
-static double high = 2e-4;
-/** Histogram resolution. */
-static double res = 1e-5;
+/* Histogram */
+static double low = 0;		/**< Lowest value in histogram. */
+static double high = 2e-4;	/**< Highest value in histogram. */
+static double res = 1e-5;	/**< Histogram resolution. */
 
 #define CLOCK_ID	CLOCK_MONOTONIC