diff --git a/src/helper/log.c b/src/helper/log.c
index c15b95da1..0bea1c50c 100644
--- a/src/helper/log.c
+++ b/src/helper/log.c
@@ -28,9 +28,9 @@
 #include "config.h"
 #endif
 
+#include "log.h"
+#include "command.h"
 #include "time_support.h"
-/* @todo the inclusion of server.h here is a layering violation */
-#include <server/server.h>
 
 #include <stdarg.h>