diff --git a/server/include/msg_format.h b/server/include/msg_format.h
index f827d297c..f5fd509be 100644
--- a/server/include/msg_format.h
+++ b/server/include/msg_format.h
@@ -10,8 +10,9 @@
 
 #include <stdint.h>
 
-#include "config.h"
-
+/** Maximum number of dword values in a message */
+#define MSG_VALUES	16
+/** The current version number for the message format */
 #define MSG_VERSION	0
 
 /** @todo Implement more message types */
@@ -31,12 +32,12 @@ struct msg
 	unsigned type		: 2;
 	/** These bits are reserved for future extensions */
 	unsigned __padding	: 2;
-	/** Length in dwords of the whole message */
+	/** Number of valid dword values in msg::data[] */
 	uint8_t length;
 	/** The sequence number gets incremented by one for consecutive messages */
 	uint16_t sequence;
 	/** The message payload */
-	float data[MAX_VALUES];
+	float data[MSG_VALUES];
 } __attribute__((packed));
 
 #endif /* _MSG_FORMAT_H_ */
diff --git a/server/src/node.c b/server/src/node.c
index 4c638a6e4..b3dfde8c3 100644
--- a/server/src/node.c
+++ b/server/src/node.c
@@ -8,6 +8,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "cfg.h"
 #include "utils.h"
 #include "msg.h"
diff --git a/server/src/test.c b/server/src/test.c
index ed5a9f520..87efb8aa2 100644
--- a/server/src/test.c
+++ b/server/src/test.c
@@ -13,6 +13,7 @@
 #include <limits.h>
 #include <arpa/inet.h>
 
+#include "config.h"
 #include "msg.h"
 #include "node.h"
 #include "utils.h"