diff --git a/src/cmsg.c b/src/cmsg.c
index b861772..86ffda5 100644
--- a/src/cmsg.c
+++ b/src/cmsg.c
@@ -1,4 +1,5 @@
 #include "common.h"
+#include "commands.h"
 #include "cmsg.h"
 
 #include <sys/uio.h>
diff --git a/src/cmsg.h b/src/cmsg.h
index db00449..4ba5d5f 100644
--- a/src/cmsg.h
+++ b/src/cmsg.h
@@ -1,8 +1,6 @@
 #ifndef F2B_CMSG_H_
 #define F2B_CMSG_H_
 
-#include "commands.h"
-
 #define DATA_LEN_MAX 1476 /* 1500 - (16 bytes of cmsg header + 8 bytes of udp) */
 #define DATA_ARGS_MAX 6  /* number of args in data */
 #define F2B_PROTO_VER 1
diff --git a/src/csocket.c b/src/csocket.c
index 65e1995..923a3cb 100644
--- a/src/csocket.c
+++ b/src/csocket.c
@@ -5,6 +5,7 @@
  * published by the Free Software Foundation.
  */
 #include "common.h"
+#include "commands.h"
 #include "cmsg.h"
 #include "csocket.h"
 #include "log.h"
diff --git a/src/daemon.c b/src/daemon.c
index 9ff1c59..a20af61 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -9,6 +9,7 @@
 #include "config.h"
 #include "jail.h"
 #include "backend.h"
+#include "commands.h"
 #include "cmsg.h"
 #include "csocket.h"