diff --git a/include/villas/plugin.h b/include/villas/plugin.h
index a015c2e49..98c2e097f 100644
--- a/include/villas/plugin.h
+++ b/include/villas/plugin.h
@@ -74,7 +74,6 @@ struct plugin {
 	char *path;
 
 	enum plugin_type type;
-
 	enum state state;
 
 	int (*load)(struct plugin *p);
diff --git a/include/villas/pool.h b/include/villas/pool.h
index d09b6452c..6afe22cd8 100644
--- a/include/villas/pool.h
+++ b/include/villas/pool.h
@@ -38,11 +38,11 @@ extern "C" {
 
 /** A thread-safe memory pool */
 struct pool {
+	enum state state;
+
 	off_t  buffer_off; /**< Offset from the struct address to the underlying memory area */
 	struct memtype *mem;
 
-	enum state state;
-
 	size_t len;		/**< Length of the underlying memory area */
 
 	size_t blocksz;		/**< Length of a block in bytes */
diff --git a/include/villas/super_node.h b/include/villas/super_node.h
index 71d172e63..f81e2122a 100644
--- a/include/villas/super_node.h
+++ b/include/villas/super_node.h
@@ -35,6 +35,8 @@ extern "C" {
 
 /** Global configuration */
 struct super_node {
+	enum state state;
+
 	int priority;		/**< Process priority (lower is better) */
 	int affinity;		/**< Process affinity of the server and all created threads */
 	int hugepages;		/**< Number of hugepages to reserve. */
@@ -50,8 +52,6 @@ struct super_node {
 
 	char *name;		/**< A name of this super node. Usually the hostname. */
 
-	enum state state;
-
 	char *uri;		/**< URI of configuration */
 
 	json_t *cfg;		/**< JSON representation of the configuration. */