diff --git a/server/src/cfg.c b/server/src/cfg.c
index a16d9a227..18db5fa85 100644
--- a/server/src/cfg.c
+++ b/server/src/cfg.c
@@ -102,7 +102,7 @@ int config_parse_path(config_setting_t *cfg,
 	struct path *p = path_create();
 
 	/* Input node */
-	struct config_setting_t *cfg_in = config_setting_get_member(cfg, "in");
+	config_setting_t *cfg_in = config_setting_get_member(cfg, "in");
 	if (!cfg_in || config_setting_type(cfg_in) != CONFIG_TYPE_STRING)
 		cerror(cfg, "Invalid input node for path");
 
@@ -112,7 +112,7 @@ int config_parse_path(config_setting_t *cfg,
 		cerror(cfg_in, "Invalid input node '%s'", in);
 
 	/* Output node(s) */
-	struct config_setting_t *cfg_out = config_setting_get_member(cfg, "out");
+	config_setting_t *cfg_out = config_setting_get_member(cfg, "out");
 	if (cfg_out)
 		config_parse_nodelist(cfg_out, &p->destinations, nodes);
 
@@ -122,7 +122,7 @@ int config_parse_path(config_setting_t *cfg,
 		cerror(cfg, "Missing output node for path");
 
 	/* Optional settings */
-	struct config_setting_t *cfg_hook = config_setting_get_member(cfg, "hook");
+	config_setting_t *cfg_hook = config_setting_get_member(cfg, "hook");
 	if (cfg_hook)
 		config_parse_hooklist(cfg_hook, p->hooks);
 
diff --git a/server/src/receive.c b/server/src/receive.c
index 6b4a5d9da..66021f52a 100644
--- a/server/src/receive.c
+++ b/server/src/receive.c
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
 {
 	int reverse = 0;
 
-	struct config_t config;
+	config_t config;
 
 	_mtid = pthread_self();
 
diff --git a/server/src/send.c b/server/src/send.c
index 2346016ae..1a658d83e 100644
--- a/server/src/send.c
+++ b/server/src/send.c
@@ -28,7 +28,7 @@ struct list nodes;
 /** The global configuration */
 struct settings settings;
 
-static struct config_t config;
+static config_t config;
 static struct settings set;
 static struct msg *pool;
 static struct node *node;