diff --git a/src/helper/options.c b/src/helper/options.c
index 5351e8250..bbd071fd8 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -26,8 +26,8 @@
 #endif
 
 #include "configuration.h"
-/* @todo the inclusion of server.h here is a layering violation */
-#include <server/server.h>
+#include "log.h"
+#include "command.h"
 
 #include <getopt.h>